diff --git a/arch/arc/core/arc_connect.c b/arch/arc/core/arc_connect.c
index 030f0e52b0..76a4e5a713 100644
--- a/arch/arc/core/arc_connect.c
+++ b/arch/arc/core/arc_connect.c
@@ -24,7 +24,7 @@ static struct k_spinlock arc_connect_spinlock;
 
 
 /* Generate an inter-core interrupt to the target core */
-void z_arc_connect_ici_generate(u32_t core)
+void z_arc_connect_ici_generate(uint32_t core)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_IRQ, core);
@@ -32,7 +32,7 @@ void z_arc_connect_ici_generate(u32_t core)
 }
 
 /* Acknowledge the inter-core interrupt raised by core */
-void z_arc_connect_ici_ack(u32_t core)
+void z_arc_connect_ici_ack(uint32_t core)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_ACK, core);
@@ -40,9 +40,9 @@ void z_arc_connect_ici_ack(u32_t core)
 }
 
 /* Read inter-core interrupt status */
-u32_t z_arc_connect_ici_read_status(u32_t core)
+uint32_t z_arc_connect_ici_read_status(uint32_t core)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_READ_STATUS, core);
@@ -53,9 +53,9 @@ u32_t z_arc_connect_ici_read_status(u32_t core)
 }
 
 /* Check the source of inter-core interrupt */
-u32_t z_arc_connect_ici_check_src(void)
+uint32_t z_arc_connect_ici_check_src(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_CHECK_SOURCE, 0);
@@ -68,7 +68,7 @@ u32_t z_arc_connect_ici_check_src(void)
 /* Clear the inter-core interrupt */
 void z_arc_connect_ici_clear(void)
 {
-	u32_t cpu, c;
+	uint32_t cpu, c;
 
 	LOCKED(&arc_connect_spinlock) {
 
@@ -89,7 +89,7 @@ void z_arc_connect_ici_clear(void)
 }
 
 /* Reset the cores in core_mask */
-void z_arc_connect_debug_reset(u32_t core_mask)
+void z_arc_connect_debug_reset(uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RESET,
@@ -98,7 +98,7 @@ void z_arc_connect_debug_reset(u32_t core_mask)
 }
 
 /* Halt the cores in core_mask */
-void z_arc_connect_debug_halt(u32_t core_mask)
+void z_arc_connect_debug_halt(uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_HALT,
@@ -107,7 +107,7 @@ void z_arc_connect_debug_halt(u32_t core_mask)
 }
 
 /* Run the cores in core_mask */
-void z_arc_connect_debug_run(u32_t core_mask)
+void z_arc_connect_debug_run(uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RUN,
@@ -116,7 +116,7 @@ void z_arc_connect_debug_run(u32_t core_mask)
 }
 
 /* Set core mask */
-void z_arc_connect_debug_mask_set(u32_t core_mask, u32_t mask)
+void z_arc_connect_debug_mask_set(uint32_t core_mask, uint32_t mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_MASK,
@@ -125,9 +125,9 @@ void z_arc_connect_debug_mask_set(u32_t core_mask, u32_t mask)
 }
 
 /* Read core mask */
-u32_t z_arc_connect_debug_mask_read(u32_t core_mask)
+uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_READ_MASK,
@@ -141,7 +141,7 @@ u32_t z_arc_connect_debug_mask_read(u32_t core_mask)
 /*
  * Select cores that should be halted if the core issuing the command is halted
  */
-void z_arc_connect_debug_select_set(u32_t core_mask)
+void z_arc_connect_debug_select_set(uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_SELECT,
@@ -150,9 +150,9 @@ void z_arc_connect_debug_select_set(u32_t core_mask)
 }
 
 /* Read the select value */
-u32_t z_arc_connect_debug_select_read(void)
+uint32_t z_arc_connect_debug_select_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_SELECT, 0);
@@ -163,9 +163,9 @@ u32_t z_arc_connect_debug_select_read(void)
 }
 
 /* Read the status, halt or run of all cores in the system */
-u32_t z_arc_connect_debug_en_read(void)
+uint32_t z_arc_connect_debug_en_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_EN, 0);
@@ -176,9 +176,9 @@ u32_t z_arc_connect_debug_en_read(void)
 }
 
 /* Read the last command sent */
-u32_t z_arc_connect_debug_cmd_read(void)
+uint32_t z_arc_connect_debug_cmd_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CMD, 0);
@@ -189,9 +189,9 @@ u32_t z_arc_connect_debug_cmd_read(void)
 }
 
 /* Read the value of internal MCD_CORE register */
-u32_t z_arc_connect_debug_core_read(void)
+uint32_t z_arc_connect_debug_core_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CORE, 0);
@@ -210,11 +210,11 @@ void z_arc_connect_gfrc_clear(void)
 }
 
 /* Read total 64 bits of global free running counter */
-u64_t z_arc_connect_gfrc_read(void)
+uint64_t z_arc_connect_gfrc_read(void)
 {
-	u32_t low;
-	u32_t high;
-	u32_t key;
+	uint32_t low;
+	uint32_t high;
+	uint32_t key;
 
 	/*
 	 * each core has its own arc connect interface, i.e.,
@@ -233,7 +233,7 @@ u64_t z_arc_connect_gfrc_read(void)
 
 	arch_irq_unlock(key);
 
-	return (((u64_t)high) << 32) | low;
+	return (((uint64_t)high) << 32) | low;
 }
 
 /* Enable global free running counter */
@@ -253,7 +253,7 @@ void z_arc_connect_gfrc_disable(void)
 }
 
 /* Disable global free running counter */
-void z_arc_connect_gfrc_core_set(u32_t core_mask)
+void z_arc_connect_gfrc_core_set(uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_GFRC_SET_CORE,
@@ -262,9 +262,9 @@ void z_arc_connect_gfrc_core_set(u32_t core_mask)
 }
 
 /* Set the relevant cores to halt global free running counter */
-u32_t z_arc_connect_gfrc_halt_read(void)
+uint32_t z_arc_connect_gfrc_halt_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_HALT, 0);
@@ -275,9 +275,9 @@ u32_t z_arc_connect_gfrc_halt_read(void)
 }
 
 /* Read the internal CORE register */
-u32_t z_arc_connect_gfrc_core_read(void)
+uint32_t z_arc_connect_gfrc_core_read(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_CORE, 0);
@@ -304,9 +304,9 @@ void z_arc_connect_idu_disable(void)
 }
 
 /* Read enable status of interrupt distribute unit */
-u32_t z_arc_connect_idu_read_enable(void)
+uint32_t z_arc_connect_idu_read_enable(void)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_ENABLE, 0);
@@ -320,8 +320,8 @@ u32_t z_arc_connect_idu_read_enable(void)
  * Set the triggering mode and distribution mode for the specified common
  * interrupt
  */
-void z_arc_connect_idu_set_mode(u32_t irq_num,
-	u16_t trigger_mode, u16_t distri_mode)
+void z_arc_connect_idu_set_mode(uint32_t irq_num,
+	uint16_t trigger_mode, uint16_t distri_mode)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MODE,
@@ -330,9 +330,9 @@ void z_arc_connect_idu_set_mode(u32_t irq_num,
 }
 
 /* Read the internal MODE register of the specified common interrupt */
-u32_t z_arc_connect_idu_read_mode(u32_t irq_num)
+uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MODE, irq_num);
@@ -346,7 +346,7 @@ u32_t z_arc_connect_idu_read_mode(u32_t irq_num)
  * Set the target cores to receive the specified common interrupt
  * when it is triggered
  */
-void z_arc_connect_idu_set_dest(u32_t irq_num, u32_t core_mask)
+void z_arc_connect_idu_set_dest(uint32_t irq_num, uint32_t core_mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_DEST,
@@ -355,9 +355,9 @@ void z_arc_connect_idu_set_dest(u32_t irq_num, u32_t core_mask)
 }
 
 /* Read the internal DEST register of the specified common interrupt */
-u32_t z_arc_connect_idu_read_dest(u32_t irq_num)
+uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_DEST, irq_num);
@@ -368,7 +368,7 @@ u32_t z_arc_connect_idu_read_dest(u32_t irq_num)
 }
 
 /* Assert the specified common interrupt */
-void z_arc_connect_idu_gen_cirq(u32_t irq_num)
+void z_arc_connect_idu_gen_cirq(uint32_t irq_num)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_GEN_CIRQ, irq_num);
@@ -376,7 +376,7 @@ void z_arc_connect_idu_gen_cirq(u32_t irq_num)
 }
 
 /* Acknowledge the specified common interrupt */
-void z_arc_connect_idu_ack_cirq(u32_t irq_num)
+void z_arc_connect_idu_ack_cirq(uint32_t irq_num)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_ACK_CIRQ, irq_num);
@@ -384,9 +384,9 @@ void z_arc_connect_idu_ack_cirq(u32_t irq_num)
 }
 
 /* Read the internal STATUS register of the specified common interrupt */
-u32_t z_arc_connect_idu_check_status(u32_t irq_num)
+uint32_t z_arc_connect_idu_check_status(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_STATUS, irq_num);
@@ -397,9 +397,9 @@ u32_t z_arc_connect_idu_check_status(u32_t irq_num)
 }
 
 /* Read the internal SOURCE register of the specified common interrupt */
-u32_t z_arc_connect_idu_check_source(u32_t irq_num)
+uint32_t z_arc_connect_idu_check_source(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_SOURCE, irq_num);
@@ -410,7 +410,7 @@ u32_t z_arc_connect_idu_check_source(u32_t irq_num)
 }
 
 /* Mask or unmask the specified common interrupt */
-void z_arc_connect_idu_set_mask(u32_t irq_num, u32_t mask)
+void z_arc_connect_idu_set_mask(uint32_t irq_num, uint32_t mask)
 {
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MASK,
@@ -419,9 +419,9 @@ void z_arc_connect_idu_set_mask(u32_t irq_num, u32_t mask)
 }
 
 /* Read the internal MASK register of the specified common interrupt */
-u32_t z_arc_connect_idu_read_mask(u32_t irq_num)
+uint32_t z_arc_connect_idu_read_mask(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MASK, irq_num);
@@ -435,9 +435,9 @@ u32_t z_arc_connect_idu_read_mask(u32_t irq_num)
  * Check if it is the first-acknowledging core to the common interrupt
  * if IDU is programmed in the first-acknowledged mode
  */
-u32_t z_arc_connect_idu_check_first(u32_t irq_num)
+uint32_t z_arc_connect_idu_check_first(uint32_t irq_num)
 {
-	u32_t ret = 0;
+	uint32_t ret = 0;
 
 	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_FIRST, irq_num);
diff --git a/arch/arc/core/arc_smp.c b/arch/arc/core/arc_smp.c
index 35069be880..8232824ba5 100644
--- a/arch/arc/core/arc_smp.c
+++ b/arch/arc/core/arc_smp.c
@@ -35,7 +35,7 @@ volatile struct {
  * master core that it's waken
  *
  */
-volatile u32_t arc_cpu_wake_flag;
+volatile uint32_t arc_cpu_wake_flag;
 
 volatile char *arc_cpu_sp;
 /*
@@ -98,7 +98,7 @@ static void sched_ipi_handler(void *unused)
 /* arch implementation of sched_ipi */
 void arch_sched_ipi(void)
 {
-	u32_t i;
+	uint32_t i;
 
 	/* broadcast sched_ipi request to other cores
 	 * if the target is current core, hardware will ignore it
diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
index 3c0d466fb3..a59886dc1c 100644
--- a/arch/arc/core/cache.c
+++ b/arch/arc/core/cache.c
@@ -55,7 +55,7 @@ static bool dcache_available(void)
 	return (val == 0) ? false : true;
 }
 
-static void dcache_dc_ctrl(u32_t dcache_en_mask)
+static void dcache_dc_ctrl(uint32_t dcache_en_mask)
 {
 	if (dcache_available()) {
 		z_arc_v2_aux_reg_write(_ARC_V2_DC_CTRL, dcache_en_mask);
@@ -84,9 +84,9 @@ static void dcache_enable(void)
  *
  * @return N/A
  */
-static void dcache_flush_mlines(u32_t start_addr, u32_t size)
+static void dcache_flush_mlines(uint32_t start_addr, uint32_t size)
 {
-	u32_t end_addr;
+	uint32_t end_addr;
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U)) {
@@ -94,7 +94,7 @@ static void dcache_flush_mlines(u32_t start_addr, u32_t size)
 	}
 
 	end_addr = start_addr + size - 1;
-	start_addr &= (u32_t)(~(DCACHE_LINE_SIZE - 1));
+	start_addr &= (uint32_t)(~(DCACHE_LINE_SIZE - 1));
 
 	key = arch_irq_lock(); /* --enter critical section-- */
 
@@ -137,7 +137,7 @@ static void dcache_flush_mlines(u32_t start_addr, u32_t size)
 
 void sys_cache_flush(vaddr_t start_addr, size_t size)
 {
-	dcache_flush_mlines((u32_t)start_addr, (u32_t)size);
+	dcache_flush_mlines((uint32_t)start_addr, (uint32_t)size);
 }
 
 
@@ -145,7 +145,7 @@ void sys_cache_flush(vaddr_t start_addr, size_t size)
 size_t sys_cache_line_size;
 static void init_dcache_line_size(void)
 {
-	u32_t val;
+	uint32_t val;
 
 	val = z_arc_v2_aux_reg_read(_ARC_V2_D_CACHE_BUILD);
 	__ASSERT((val&0xff) != 0U, "d-cache is not present");
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index 32b9888426..b2465f734c 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -71,7 +71,7 @@ static const struct z_exc_handle exceptions[] = {
  * @return The lowest allowed stack frame pointer, if error is a
  *         thread stack corruption, otherwise return 0.
  */
-static u32_t z_check_thread_stack_fail(const u32_t fault_addr, u32_t sp)
+static uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 {
 	const struct k_thread *thread = _current;
 
@@ -89,8 +89,8 @@ static u32_t z_check_thread_stack_fail(const u32_t fault_addr, u32_t sp)
 #else
 			sp = z_arc_v2_aux_reg_read(_ARC_V2_USER_SP);
 #endif
-			if (sp <= (u32_t)thread->stack_obj) {
-				return (u32_t)thread->stack_obj;
+			if (sp <= (uint32_t)thread->stack_obj) {
+				return (uint32_t)thread->stack_obj;
 			}
 		} else {
 			/* User thread in privilege mode */
@@ -103,10 +103,10 @@ static u32_t z_check_thread_stack_fail(const u32_t fault_addr, u32_t sp)
 		}
 	} else {
 		/* Supervisor thread */
-		if (IS_MPU_GUARD_VIOLATION((u32_t)thread->stack_obj,
+		if (IS_MPU_GUARD_VIOLATION((uint32_t)thread->stack_obj,
 			fault_addr, sp)) {
 			/* Supervisor thread stack corruption */
-			return (u32_t)thread->stack_obj + STACK_GUARD_SIZE;
+			return (uint32_t)thread->stack_obj + STACK_GUARD_SIZE;
 		}
 	}
 #else /* CONFIG_USERSPACE */
@@ -129,7 +129,7 @@ static u32_t z_check_thread_stack_fail(const u32_t fault_addr, u32_t sp)
  * These codes and parameters do not have associated* names in
  * the technical manual, just switch on the values in Table 6-5
  */
-static const char *get_protv_access_err(u32_t parameter)
+static const char *get_protv_access_err(uint32_t parameter)
 {
 	switch (parameter) {
 	case 0x1:
@@ -151,7 +151,7 @@ static const char *get_protv_access_err(u32_t parameter)
 	}
 }
 
-static void dump_protv_exception(u32_t cause, u32_t parameter)
+static void dump_protv_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
@@ -185,7 +185,7 @@ static void dump_protv_exception(u32_t cause, u32_t parameter)
 	}
 }
 
-static void dump_machine_check_exception(u32_t cause, u32_t parameter)
+static void dump_machine_check_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
@@ -233,7 +233,7 @@ static void dump_machine_check_exception(u32_t cause, u32_t parameter)
 	}
 }
 
-static void dump_privilege_exception(u32_t cause, u32_t parameter)
+static void dump_privilege_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
@@ -289,7 +289,7 @@ static void dump_privilege_exception(u32_t cause, u32_t parameter)
 	}
 }
 
-static void dump_exception_info(u32_t vector, u32_t cause, u32_t parameter)
+static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parameter)
 {
 	if (vector >= 0x10 && vector <= 0xFF) {
 		LOG_ERR("interrupt %u", vector);
@@ -363,19 +363,19 @@ static void dump_exception_info(u32_t vector, u32_t cause, u32_t parameter)
  * invokes the user provided routine k_sys_fatal_error_handler() which is
  * responsible for implementing the error handling policy.
  */
-void _Fault(z_arch_esf_t *esf, u32_t old_sp)
+void _Fault(z_arch_esf_t *esf, uint32_t old_sp)
 {
-	u32_t vector, cause, parameter;
-	u32_t exc_addr = z_arc_v2_aux_reg_read(_ARC_V2_EFA);
-	u32_t ecr = z_arc_v2_aux_reg_read(_ARC_V2_ECR);
+	uint32_t vector, cause, parameter;
+	uint32_t exc_addr = z_arc_v2_aux_reg_read(_ARC_V2_EFA);
+	uint32_t ecr = z_arc_v2_aux_reg_read(_ARC_V2_ECR);
 
 #ifdef CONFIG_USERSPACE
 	for (int i = 0; i < ARRAY_SIZE(exceptions); i++) {
-		u32_t start = (u32_t)exceptions[i].start;
-		u32_t end = (u32_t)exceptions[i].end;
+		uint32_t start = (uint32_t)exceptions[i].start;
+		uint32_t end = (uint32_t)exceptions[i].end;
 
 		if (esf->pc >= start && esf->pc < end) {
-			esf->pc = (u32_t)(exceptions[i].fixup);
+			esf->pc = (uint32_t)(exceptions[i].fixup);
 			return;
 		}
 	}
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index c1db189b82..a5db0c74d4 100644
--- a/arch/arc/core/irq_manage.c
+++ b/arch/arc/core/irq_manage.c
@@ -137,7 +137,7 @@ int arch_irq_is_enabled(unsigned int irq)
  * @return N/A
  */
 
-void z_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
+void z_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -174,7 +174,7 @@ void z_irq_spurious(void *unused)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter), void *parameter,
-			     u32_t flags)
+			     uint32_t flags)
 {
 	z_isr_install(irq, routine, parameter);
 	z_irq_priority_set(irq, priority, flags);
diff --git a/arch/arc/core/mpu/arc_core_mpu.c b/arch/arc/core/mpu/arc_core_mpu.c
index db4c7d6f0b..f8c0977167 100644
--- a/arch/arc/core/mpu/arc_core_mpu.c
+++ b/arch/arc/core/mpu/arc_core_mpu.c
@@ -36,7 +36,7 @@ int arch_mem_domain_max_partitions_get(void)
  * Reset MPU region for a single memory partition
  */
 void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
-				      u32_t partition_id)
+				      uint32_t partition_id)
 {
 	if (_current->mem_domain_info.mem_domain != domain) {
 		return;
@@ -76,7 +76,7 @@ void arch_mem_domain_destroy(struct k_mem_domain *domain)
 }
 
 void arch_mem_domain_partition_add(struct k_mem_domain *domain,
-				   u32_t partition_id)
+				   uint32_t partition_id)
 {
 	/* No-op on this architecture */
 }
diff --git a/arch/arc/core/mpu/arc_mpu.c b/arch/arc/core/mpu/arc_mpu.c
index 53051d4671..f031a7e79f 100644
--- a/arch/arc/core/mpu/arc_mpu.c
+++ b/arch/arc/core/mpu/arc_mpu.c
@@ -21,20 +21,20 @@ LOG_MODULE_REGISTER(mpu);
  * @brief Get the number of supported MPU regions
  *
  */
-static inline u8_t get_num_regions(void)
+static inline uint8_t get_num_regions(void)
 {
-	u32_t num = z_arc_v2_aux_reg_read(_ARC_V2_MPU_BUILD);
+	uint32_t num = z_arc_v2_aux_reg_read(_ARC_V2_MPU_BUILD);
 
 	num = (num & 0xFF00U) >> 8U;
 
-	return (u8_t)num;
+	return (uint8_t)num;
 }
 
 /**
  * This internal function is utilized by the MPU driver to parse the intent
  * type (i.e. THREAD_STACK_REGION) and return the correct parameter set.
  */
-static inline u32_t get_region_attr_by_type(u32_t type)
+static inline uint32_t get_region_attr_by_type(uint32_t type)
 {
 	switch (type) {
 	case THREAD_STACK_USER_REGION:
diff --git a/arch/arc/core/mpu/arc_mpu_v2_internal.h b/arch/arc/core/mpu/arc_mpu_v2_internal.h
index 640ce8666f..c4b1be8a82 100644
--- a/arch/arc/core/mpu/arc_mpu_v2_internal.h
+++ b/arch/arc/core/mpu/arc_mpu_v2_internal.h
@@ -26,10 +26,10 @@
 /**
  * This internal function initializes a MPU region
  */
-static inline void _region_init(u32_t index, u32_t region_addr, u32_t size,
-				u32_t region_attr)
+static inline void _region_init(uint32_t index, uint32_t region_addr, uint32_t size,
+				uint32_t region_attr)
 {
-	u8_t bits = find_msb_set(size) - 1;
+	uint8_t bits = find_msb_set(size) - 1;
 
 	index = index * 2U;
 
@@ -57,7 +57,7 @@ static inline void _region_init(u32_t index, u32_t region_addr, u32_t size,
  * This internal function is utilized by the MPU driver to parse the intent
  * type (i.e. THREAD_STACK_REGION) and return the correct region index.
  */
-static inline int get_region_index_by_type(u32_t type)
+static inline int get_region_index_by_type(uint32_t type)
 {
 	/*
 	 * The new MPU regions are allocated per type after the statically
@@ -90,7 +90,7 @@ static inline int get_region_index_by_type(u32_t type)
 /**
  * This internal function checks if region is enabled or not
  */
-static inline bool _is_enabled_region(u32_t r_index)
+static inline bool _is_enabled_region(uint32_t r_index)
 {
 	return ((z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + r_index * 2U)
 		 & AUX_MPU_RDB_VALID_MASK) == AUX_MPU_RDB_VALID_MASK);
@@ -99,11 +99,11 @@ static inline bool _is_enabled_region(u32_t r_index)
 /**
  * This internal function check if the given buffer in in the region
  */
-static inline bool _is_in_region(u32_t r_index, u32_t start, u32_t size)
+static inline bool _is_in_region(uint32_t r_index, uint32_t start, uint32_t size)
 {
-	u32_t r_addr_start;
-	u32_t r_addr_end;
-	u32_t r_size_lshift;
+	uint32_t r_addr_start;
+	uint32_t r_addr_end;
+	uint32_t r_size_lshift;
 
 	r_addr_start = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDB0 + r_index * 2U)
 		       & (~AUX_MPU_RDB_VALID_MASK);
@@ -122,9 +122,9 @@ static inline bool _is_in_region(u32_t r_index, u32_t start, u32_t size)
 /**
  * This internal function check if the region is user accessible or not
  */
-static inline bool _is_user_accessible_region(u32_t r_index, int write)
+static inline bool _is_user_accessible_region(uint32_t r_index, int write)
 {
-	u32_t r_ap;
+	uint32_t r_ap;
 
 	r_ap = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RDP0 + r_index * 2U);
 
@@ -146,10 +146,10 @@ static inline bool _is_user_accessible_region(u32_t r_index, int write)
  * @param base base address in RAM
  * @param size size of the region
  */
-static inline int _mpu_configure(u8_t type, u32_t base, u32_t size)
+static inline int _mpu_configure(uint8_t type, uint32_t base, uint32_t size)
 {
-	s32_t region_index =  get_region_index_by_type(type);
-	u32_t region_attr = get_region_attr_by_type(type);
+	int32_t region_index =  get_region_index_by_type(type);
+	uint32_t region_attr = get_region_attr_by_type(type);
 
 	LOG_DBG("Region info: 0x%x 0x%x", base, size);
 
@@ -200,7 +200,7 @@ void arc_core_mpu_configure_thread(struct k_thread *thread)
 	if (thread->base.user_options & K_USER) {
 		LOG_DBG("configure user thread %p's stack", thread);
 		if (_mpu_configure(THREAD_STACK_USER_REGION,
-		(u32_t)thread->stack_obj, thread->stack_info.size) < 0) {
+		(uint32_t)thread->stack_obj, thread->stack_info.size) < 0) {
 			LOG_ERR("user thread %p's stack failed", thread);
 			return;
 		}
@@ -217,9 +217,9 @@ void arc_core_mpu_configure_thread(struct k_thread *thread)
  *
  * @param region_attr region attribute of default region
  */
-void arc_core_mpu_default(u32_t region_attr)
+void arc_core_mpu_default(uint32_t region_attr)
 {
-	u32_t val =  z_arc_v2_aux_reg_read(_ARC_V2_MPU_EN) &
+	uint32_t val =  z_arc_v2_aux_reg_read(_ARC_V2_MPU_EN) &
 		    (~AUX_MPU_RDP_ATTR_MASK);
 
 	region_attr &= AUX_MPU_RDP_ATTR_MASK;
@@ -234,8 +234,8 @@ void arc_core_mpu_default(u32_t region_attr)
  * @param base    base address
  * @param region_attr region attribute
  */
-int arc_core_mpu_region(u32_t index, u32_t base, u32_t size,
-			 u32_t region_attr)
+int arc_core_mpu_region(uint32_t index, uint32_t base, uint32_t size,
+			 uint32_t region_attr)
 {
 	if (index >= get_num_regions()) {
 		return -EINVAL;
@@ -259,7 +259,7 @@ void arc_core_mpu_configure_mem_domain(struct k_thread *thread)
 {
 	int region_index =
 		get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
-	u32_t num_partitions;
+	uint32_t num_partitions;
 	struct k_mem_partition *pparts;
 	struct k_mem_domain *mem_domain = NULL;
 
@@ -316,7 +316,7 @@ void arc_core_mpu_remove_mem_domain(struct k_mem_domain *mem_domain)
  * @param partition_id  memory partition id
  */
 void arc_core_mpu_remove_mem_partition(struct k_mem_domain *domain,
-			u32_t part_id)
+			uint32_t part_id)
 {
 	ARG_UNUSED(domain);
 
@@ -351,7 +351,7 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
 	 */
 	for (r_index = 0; r_index < get_num_regions(); r_index++) {
 		if (!_is_enabled_region(r_index) ||
-		    !_is_in_region(r_index, (u32_t)addr, size)) {
+		    !_is_in_region(r_index, (uint32_t)addr, size)) {
 			continue;
 		}
 
@@ -377,8 +377,8 @@ static int arc_mpu_init(struct device *arg)
 {
 	ARG_UNUSED(arg);
 
-	u32_t num_regions;
-	u32_t i;
+	uint32_t num_regions;
+	uint32_t i;
 
 	num_regions = get_num_regions();
 
diff --git a/arch/arc/core/mpu/arc_mpu_v3_internal.h b/arch/arc/core/mpu/arc_mpu_v3_internal.h
index 6d1d80d5ac..ed6f5c93f5 100644
--- a/arch/arc/core/mpu/arc_mpu_v3_internal.h
+++ b/arch/arc/core/mpu/arc_mpu_v3_internal.h
@@ -62,14 +62,14 @@
  * memory areas where dynamic MPU programming is allowed.
  */
 struct dynamic_region_info {
-	u8_t index;
-	u32_t base;
-	u32_t size;
-	u32_t attr;
+	uint8_t index;
+	uint32_t base;
+	uint32_t size;
+	uint32_t attr;
 };
 
-static u8_t dynamic_regions_num;
-static u8_t dynamic_region_index;
+static uint8_t dynamic_regions_num;
+static uint8_t dynamic_region_index;
 
 /**
  * Global array, holding the MPU region index of
@@ -79,41 +79,41 @@ static u8_t dynamic_region_index;
 static struct dynamic_region_info dyn_reg_info[MPU_DYNAMIC_REGION_AREAS_NUM];
 #endif /* CONFIG_MPU_GAP_FILLING */
 
-static u8_t static_regions_num;
+static uint8_t static_regions_num;
 
 #ifdef CONFIG_ARC_NORMAL_FIRMWARE
 /* \todo through secure service to access mpu */
-static inline void _region_init(u32_t index, u32_t region_addr, u32_t size,
-				u32_t region_attr)
+static inline void _region_init(uint32_t index, uint32_t region_addr, uint32_t size,
+				uint32_t region_attr)
 {
 }
 
-static inline void _region_set_attr(u32_t index, u32_t attr)
+static inline void _region_set_attr(uint32_t index, uint32_t attr)
 {
 
 }
 
-static inline u32_t _region_get_attr(u32_t index)
+static inline uint32_t _region_get_attr(uint32_t index)
 {
 	return 0;
 }
 
-static inline u32_t _region_get_start(u32_t index)
+static inline uint32_t _region_get_start(uint32_t index)
 {
 	return 0;
 }
 
-static inline void _region_set_start(u32_t index, u32_t start)
+static inline void _region_set_start(uint32_t index, uint32_t start)
 {
 
 }
 
-static inline u32_t _region_get_end(u32_t index)
+static inline uint32_t _region_get_end(uint32_t index)
 {
 	return 0;
 }
 
-static inline void _region_set_end(u32_t index, u32_t end)
+static inline void _region_set_end(uint32_t index, uint32_t end)
 {
 }
 
@@ -121,7 +121,7 @@ static inline void _region_set_end(u32_t index, u32_t end)
  * This internal function probes the given addr's MPU index.if not
  * in MPU, returns error
  */
-static inline int _mpu_probe(u32_t addr)
+static inline int _mpu_probe(uint32_t addr)
 {
 	return -EINVAL;
 }
@@ -129,7 +129,7 @@ static inline int _mpu_probe(u32_t addr)
 /**
  * This internal function checks if MPU region is enabled or not
  */
-static inline bool _is_enabled_region(u32_t r_index)
+static inline bool _is_enabled_region(uint32_t r_index)
 {
 	return false;
 }
@@ -137,14 +137,14 @@ static inline bool _is_enabled_region(u32_t r_index)
 /**
  * This internal function check if the region is user accessible or not
  */
-static inline bool _is_user_accessible_region(u32_t r_index, int write)
+static inline bool _is_user_accessible_region(uint32_t r_index, int write)
 {
 	return false;
 }
 #else /* CONFIG_ARC_NORMAL_FIRMWARE */
 /* the following functions are prepared for SECURE_FRIMWARE */
-static inline void _region_init(u32_t index, u32_t region_addr, u32_t size,
-				u32_t region_attr)
+static inline void _region_init(uint32_t index, uint32_t region_addr, uint32_t size,
+				uint32_t region_attr)
 {
 	if (size < (1 << ARC_FEATURE_MPU_ALIGNMENT_BITS)) {
 		size = (1 << ARC_FEATURE_MPU_ALIGNMENT_BITS);
@@ -162,34 +162,34 @@ static inline void _region_init(u32_t index, u32_t region_addr, u32_t size,
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_RPER, region_attr);
 }
 
-static inline void _region_set_attr(u32_t index, u32_t attr)
+static inline void _region_set_attr(uint32_t index, uint32_t attr)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_RPER, attr |
 				 AUX_MPU_RPER_VALID_MASK);
 }
 
-static inline u32_t _region_get_attr(u32_t index)
+static inline uint32_t _region_get_attr(uint32_t index)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 
 	return z_arc_v2_aux_reg_read(_ARC_V2_MPU_RPER);
 }
 
-static inline u32_t _region_get_start(u32_t index)
+static inline uint32_t _region_get_start(uint32_t index)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 
 	return z_arc_v2_aux_reg_read(_ARC_V2_MPU_RSTART);
 }
 
-static inline void _region_set_start(u32_t index, u32_t start)
+static inline void _region_set_start(uint32_t index, uint32_t start)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_RSTART, start);
 }
 
-static inline u32_t _region_get_end(u32_t index)
+static inline uint32_t _region_get_end(uint32_t index)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 
@@ -197,7 +197,7 @@ static inline u32_t _region_get_end(u32_t index)
 		(1 << ARC_FEATURE_MPU_ALIGNMENT_BITS);
 }
 
-static inline void _region_set_end(u32_t index, u32_t end)
+static inline void _region_set_end(uint32_t index, uint32_t end)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, index);
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_REND, end -
@@ -208,9 +208,9 @@ static inline void _region_set_end(u32_t index, u32_t end)
  * This internal function probes the given addr's MPU index.if not
  * in MPU, returns error
  */
-static inline int _mpu_probe(u32_t addr)
+static inline int _mpu_probe(uint32_t addr)
 {
-	u32_t val;
+	uint32_t val;
 
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_PROBE, addr);
 	val = z_arc_v2_aux_reg_read(_ARC_V2_MPU_INDEX);
@@ -226,7 +226,7 @@ static inline int _mpu_probe(u32_t addr)
 /**
  * This internal function checks if MPU region is enabled or not
  */
-static inline bool _is_enabled_region(u32_t r_index)
+static inline bool _is_enabled_region(uint32_t r_index)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, r_index);
 	return ((z_arc_v2_aux_reg_read(_ARC_V2_MPU_RPER) &
@@ -236,9 +236,9 @@ static inline bool _is_enabled_region(u32_t r_index)
 /**
  * This internal function check if the region is user accessible or not
  */
-static inline bool _is_user_accessible_region(u32_t r_index, int write)
+static inline bool _is_user_accessible_region(uint32_t r_index, int write)
 {
-	u32_t r_ap;
+	uint32_t r_ap;
 
 	z_arc_v2_aux_reg_write(_ARC_V2_MPU_INDEX, r_index);
 	r_ap = z_arc_v2_aux_reg_read(_ARC_V2_MPU_RPER);
@@ -259,7 +259,7 @@ static inline bool _is_user_accessible_region(u32_t r_index, int write)
  * This internal function checks the area given by (start, size)
  * and returns the index if the area match one MPU entry
  */
-static inline int _get_region_index(u32_t start, u32_t size)
+static inline int _get_region_index(uint32_t start, uint32_t size)
 {
 	int index = _mpu_probe(start);
 
@@ -295,8 +295,8 @@ static inline int _dynamic_region_allocate_index(void)
  * @param attr region attribute
  * @return  <0 failure, >0  allocated dynamic region index
  */
-static int _dynamic_region_allocate_and_init(u32_t base, u32_t size,
-	 u32_t attr)
+static int _dynamic_region_allocate_and_init(uint32_t base, uint32_t size,
+	 uint32_t attr)
 {
 	int u_region_index = _get_region_index(base, size);
 	int region_index;
@@ -321,10 +321,10 @@ static int _dynamic_region_allocate_and_init(u32_t base, u32_t size,
 	 * region, possibly splitting the underlying region into two.
 	 */
 
-	u32_t u_region_start = _region_get_start(u_region_index);
-	u32_t u_region_end = _region_get_end(u_region_index);
-	u32_t u_region_attr = _region_get_attr(u_region_index);
-	u32_t end = base + size;
+	uint32_t u_region_start = _region_get_start(u_region_index);
+	uint32_t u_region_end = _region_get_end(u_region_index);
+	uint32_t u_region_attr = _region_get_attr(u_region_index);
+	uint32_t end = base + size;
 
 
 	if ((base == u_region_start) && (end == u_region_end)) {
@@ -397,8 +397,8 @@ static int _dynamic_region_allocate_and_init(u32_t base, u32_t size,
  */
 static void _mpu_reset_dynamic_regions(void)
 {
-	u32_t i;
-	u32_t num_regions = get_num_regions();
+	uint32_t i;
+	uint32_t num_regions = get_num_regions();
 
 	for (i = static_regions_num; i < num_regions; i++) {
 		_region_init(i, 0, 0, 0);
@@ -423,9 +423,9 @@ static void _mpu_reset_dynamic_regions(void)
  * @param   base    base address in RAM
  * @param   size    size of the region
  */
-static inline int _mpu_configure(u8_t type, u32_t base, u32_t size)
+static inline int _mpu_configure(uint8_t type, uint32_t base, uint32_t size)
 {
-	u32_t region_attr = get_region_attr_by_type(type);
+	uint32_t region_attr = get_region_attr_by_type(type);
 
 	return _dynamic_region_allocate_and_init(base, size, region_attr);
 }
@@ -434,7 +434,7 @@ static inline int _mpu_configure(u8_t type, u32_t base, u32_t size)
  * This internal function is utilized by the MPU driver to parse the intent
  * type (i.e. THREAD_STACK_REGION) and return the correct region index.
  */
-static inline int get_region_index_by_type(u32_t type)
+static inline int get_region_index_by_type(uint32_t type)
 {
 	/*
 	 * The new MPU regions are allocated per type after the statically
@@ -476,10 +476,10 @@ static inline int get_region_index_by_type(u32_t type)
  * @param   base    base address in RAM
  * @param   size    size of the region
  */
-static inline int _mpu_configure(u8_t type, u32_t base, u32_t size)
+static inline int _mpu_configure(uint8_t type, uint32_t base, uint32_t size)
 {
 	int region_index =  get_region_index_by_type(type);
-	u32_t region_attr = get_region_attr_by_type(type);
+	uint32_t region_attr = get_region_attr_by_type(type);
 
 	LOG_DBG("Region info: 0x%x 0x%x", base, size);
 
@@ -588,14 +588,14 @@ void arc_core_mpu_configure_thread(struct k_thread *thread)
 	if (thread->base.user_options & K_USER) {
 		LOG_DBG("configure user thread %p's stack", thread);
 		if (_mpu_configure(THREAD_STACK_USER_REGION,
-		(u32_t)thread->stack_obj, thread->stack_info.size) < 0) {
+		(uint32_t)thread->stack_obj, thread->stack_info.size) < 0) {
 			LOG_ERR("thread %p's stack failed", thread);
 			return;
 		}
 	}
 
 #if defined(CONFIG_MPU_GAP_FILLING)
-	u32_t num_partitions;
+	uint32_t num_partitions;
 	struct k_mem_partition *pparts;
 	struct k_mem_domain *mem_domain = thread->mem_domain_info.mem_domain;
 
@@ -610,7 +610,7 @@ void arc_core_mpu_configure_thread(struct k_thread *thread)
 		pparts = NULL;
 	}
 
-	for (u32_t i = 0; i < num_partitions; i++) {
+	for (uint32_t i = 0; i < num_partitions; i++) {
 		if (pparts->size) {
 			if (_dynamic_region_allocate_and_init(pparts->start,
 				pparts->size, pparts->attr) < 0) {
@@ -633,7 +633,7 @@ void arc_core_mpu_configure_thread(struct k_thread *thread)
  *
  * @param region_attr region attribute of default region
  */
-void arc_core_mpu_default(u32_t region_attr)
+void arc_core_mpu_default(uint32_t region_attr)
 {
 #ifdef CONFIG_ARC_NORMAL_FIRMWARE
 /* \todo through secure service to access mpu */
@@ -650,8 +650,8 @@ void arc_core_mpu_default(u32_t region_attr)
  * @param size  region size
  * @param region_attr region attribute
  */
-int arc_core_mpu_region(u32_t index, u32_t base, u32_t size,
-			 u32_t region_attr)
+int arc_core_mpu_region(uint32_t index, uint32_t base, uint32_t size,
+			 uint32_t region_attr)
 {
 	if (index >= get_num_regions()) {
 		return -EINVAL;
@@ -678,9 +678,9 @@ void arc_core_mpu_configure_mem_domain(struct k_thread *thread)
 #else
 void arc_core_mpu_configure_mem_domain(struct k_thread *thread)
 {
-	u32_t region_index;
-	u32_t num_partitions;
-	u32_t num_regions;
+	uint32_t region_index;
+	uint32_t num_partitions;
+	uint32_t num_regions;
 	struct k_mem_partition *pparts;
 	struct k_mem_domain *mem_domain = NULL;
 
@@ -728,7 +728,7 @@ void arc_core_mpu_configure_mem_domain(struct k_thread *thread)
  */
 void arc_core_mpu_remove_mem_domain(struct k_mem_domain *mem_domain)
 {
-	u32_t num_partitions;
+	uint32_t num_partitions;
 	struct k_mem_partition *pparts;
 	int index;
 
@@ -742,7 +742,7 @@ void arc_core_mpu_remove_mem_domain(struct k_mem_domain *mem_domain)
 		pparts = NULL;
 	}
 
-	for (u32_t i = 0; i < num_partitions; i++) {
+	for (uint32_t i = 0; i < num_partitions; i++) {
 		if (pparts->size) {
 			index = _get_region_index(pparts->start,
 			 pparts->size);
@@ -765,7 +765,7 @@ void arc_core_mpu_remove_mem_domain(struct k_mem_domain *mem_domain)
  * @param partition_id  memory partition id
  */
 void arc_core_mpu_remove_mem_partition(struct k_mem_domain *domain,
-			u32_t partition_id)
+			uint32_t partition_id)
 {
 	struct k_mem_partition *partition = &domain->partitions[partition_id];
 
@@ -811,9 +811,9 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
 	 * we can stop the iteration immediately once we find the
 	 * matched region that grants permission or denies access.
 	 */
-	r_index = _mpu_probe((u32_t)addr);
+	r_index = _mpu_probe((uint32_t)addr);
 	/*  match and the area is in one region */
-	if (r_index >= 0 && r_index == _mpu_probe((u32_t)addr + (size - 1))) {
+	if (r_index >= 0 && r_index == _mpu_probe((uint32_t)addr + (size - 1))) {
 		if (_is_user_accessible_region(r_index, write)) {
 			r_index = 0;
 		} else {
@@ -839,8 +839,8 @@ int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
 static int arc_mpu_init(struct device *arg)
 {
 	ARG_UNUSED(arg);
-	u32_t num_regions;
-	u32_t i;
+	uint32_t num_regions;
+	uint32_t i;
 
 	num_regions = get_num_regions();
 
diff --git a/arch/arc/core/secureshield/arc_sjli.c b/arch/arc/core/secureshield/arc_sjli.c
index 02d8c5b9f7..8a62b0bde2 100644
--- a/arch/arc/core/secureshield/arc_sjli.c
+++ b/arch/arc/core/secureshield/arc_sjli.c
@@ -19,9 +19,9 @@ static void _default_sjli_entry(void);
  * \todo: how to let user to install customized sjli entry easily, e.g.
  *  through macros or with the help of compiler?
  */
-const static u32_t _sjli_vector_table[CONFIG_SJLI_TABLE_SIZE] = {
-	[0] = (u32_t)_arc_do_secure_call,
-	[1 ... (CONFIG_SJLI_TABLE_SIZE - 1)] = (u32_t)_default_sjli_entry,
+const static uint32_t _sjli_vector_table[CONFIG_SJLI_TABLE_SIZE] = {
+	[0] = (uint32_t)_arc_do_secure_call,
+	[1 ... (CONFIG_SJLI_TABLE_SIZE - 1)] = (uint32_t)_default_sjli_entry,
 };
 
 /*
diff --git a/arch/arc/core/secureshield/secure_sys_services.c b/arch/arc/core/secureshield/secure_sys_services.c
index 34ab80068a..c284c87a06 100644
--- a/arch/arc/core/secureshield/secure_sys_services.c
+++ b/arch/arc/core/secureshield/secure_sys_services.c
@@ -22,7 +22,7 @@
  * an secure service to access secure aux regs. Check should be done
  * to decide whether the access is valid.
  */
-static s32_t arc_s_aux_read(u32_t aux_reg)
+static int32_t arc_s_aux_read(uint32_t aux_reg)
 {
 	return -1;
 }
@@ -37,7 +37,7 @@ static s32_t arc_s_aux_read(u32_t aux_reg)
  * an secure service to access secure aux regs. Check should be done
  * to decide whether the access is valid.
  */
-static s32_t arc_s_aux_write(u32_t aux_reg, u32_t val)
+static int32_t arc_s_aux_write(uint32_t aux_reg, uint32_t val)
 {
 	if (aux_reg == _ARC_V2_AUX_IRQ_ACT) {
 		/* 0 -> CONFIG_NUM_IRQ_PRIO_LEVELS allocated to secure world
@@ -64,7 +64,7 @@ static s32_t arc_s_aux_write(u32_t aux_reg, u32_t val)
  * apply one. Necessary check should be done to decide whether the apply is
  * valid
  */
-static s32_t arc_s_irq_alloc(u32_t intno)
+static int32_t arc_s_irq_alloc(uint32_t intno)
 {
 	z_arc_v2_irq_uinit_secure_set(intno, 0);
 	return 0;
diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
index ab044ea104..0190b2bd34 100644
--- a/arch/arc/core/thread.c
+++ b/arch/arc/core/thread.c
@@ -22,15 +22,15 @@
 
 /*  initial stack frame */
 struct init_stack_frame {
-	u32_t pc;
+	uint32_t pc;
 #ifdef CONFIG_ARC_HAS_SECURE
-	u32_t sec_stat;
+	uint32_t sec_stat;
 #endif
-	u32_t status32;
-	u32_t r3;
-	u32_t r2;
-	u32_t r1;
-	u32_t r0;
+	uint32_t status32;
+	uint32_t r3;
+	uint32_t r2;
+	uint32_t r1;
+	uint32_t r0;
 };
 
 /*
@@ -86,10 +86,10 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	if (options & K_USER) {
 #ifdef CONFIG_GEN_PRIV_STACKS
 		thread->arch.priv_stack_start =
-			(u32_t)z_priv_stack_find(thread->stack_obj);
+			(uint32_t)z_priv_stack_find(thread->stack_obj);
 #else
 		thread->arch.priv_stack_start =
-			(u32_t)(stackEnd + STACK_GUARD_SIZE);
+			(uint32_t)(stackEnd + STACK_GUARD_SIZE);
 #endif
 
 		priv_stack_end = (char *)Z_STACK_PTR_ALIGN(
@@ -98,8 +98,8 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 
 		/* reserve 4 bytes for the start of user sp */
 		priv_stack_end -= 4;
-		(*(u32_t *)priv_stack_end) = Z_STACK_PTR_ALIGN(
-			(u32_t)stackEnd - offset);
+		(*(uint32_t *)priv_stack_end) = Z_STACK_PTR_ALIGN(
+			(uint32_t)stackEnd - offset);
 
 #ifdef CONFIG_THREAD_USERSPACE_LOCAL_DATA
 		/* reserve stack space for the userspace local data struct */
@@ -108,8 +108,8 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 			Z_STACK_PTR_ALIGN(stackEnd -
 			sizeof(*thread->userspace_local_data) - offset);
 		/* update the start of user sp */
-		(*(u32_t *)priv_stack_end) =
-			(u32_t) thread->userspace_local_data;
+		(*(uint32_t *)priv_stack_end) =
+			(uint32_t) thread->userspace_local_data;
 #endif
 
 	} else {
@@ -139,9 +139,9 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	/* fill init context */
 	pInitCtx->status32 = 0U;
 	if (options & K_USER) {
-		pInitCtx->pc = ((u32_t)z_user_thread_entry_wrapper);
+		pInitCtx->pc = ((uint32_t)z_user_thread_entry_wrapper);
 	} else {
-		pInitCtx->pc = ((u32_t)z_thread_entry_wrapper);
+		pInitCtx->pc = ((uint32_t)z_thread_entry_wrapper);
 	}
 
 	/*
@@ -165,17 +165,17 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 		sizeof(struct init_stack_frame));
 
 	pInitCtx->status32 = 0U;
-	pInitCtx->pc = ((u32_t)z_thread_entry_wrapper);
+	pInitCtx->pc = ((uint32_t)z_thread_entry_wrapper);
 #endif
 
 #ifdef CONFIG_ARC_SECURE_FIRMWARE
 	pInitCtx->sec_stat = z_arc_v2_aux_reg_read(_ARC_V2_SEC_STAT);
 #endif
 
-	pInitCtx->r0 = (u32_t)pEntry;
-	pInitCtx->r1 = (u32_t)parameter1;
-	pInitCtx->r2 = (u32_t)parameter2;
-	pInitCtx->r3 = (u32_t)parameter3;
+	pInitCtx->r0 = (uint32_t)pEntry;
+	pInitCtx->r1 = (uint32_t)parameter1;
+	pInitCtx->r2 = (uint32_t)parameter2;
+	pInitCtx->r3 = (uint32_t)parameter3;
 
 /* stack check configuration */
 #ifdef CONFIG_ARC_STACK_CHECKING
@@ -186,21 +186,21 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 #endif
 #ifdef CONFIG_USERSPACE
 	if (options & K_USER) {
-		thread->arch.u_stack_top = (u32_t)pStackMem;
-		thread->arch.u_stack_base = (u32_t)stackEnd;
+		thread->arch.u_stack_top = (uint32_t)pStackMem;
+		thread->arch.u_stack_base = (uint32_t)stackEnd;
 		thread->arch.k_stack_top =
-			 (u32_t)(thread->arch.priv_stack_start);
-		thread->arch.k_stack_base = (u32_t)
+			 (uint32_t)(thread->arch.priv_stack_start);
+		thread->arch.k_stack_base = (uint32_t)
 		(thread->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE);
 	} else {
-		thread->arch.k_stack_top = (u32_t)pStackMem;
-		thread->arch.k_stack_base = (u32_t)stackEnd;
+		thread->arch.k_stack_top = (uint32_t)pStackMem;
+		thread->arch.k_stack_base = (uint32_t)stackEnd;
 		thread->arch.u_stack_top = 0;
 		thread->arch.u_stack_base = 0;
 	}
 #else
-	thread->arch.k_stack_top = (u32_t) pStackMem;
-	thread->arch.k_stack_base = (u32_t) stackEnd;
+	thread->arch.k_stack_top = (uint32_t) pStackMem;
+	thread->arch.k_stack_base = (uint32_t) stackEnd;
 #endif
 #endif
 
@@ -211,7 +211,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	thread->switch_handle = thread;
 	thread->arch.relinquish_cause = _CAUSE_COOP;
 	thread->callee_saved.sp =
-		(u32_t)pInitCtx - ___callee_saved_stack_t_SIZEOF;
+		(uint32_t)pInitCtx - ___callee_saved_stack_t_SIZEOF;
 
 	/* initial values in all other regs/k_thread entries are irrelevant */
 }
@@ -230,13 +230,13 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 {
 
 
-	_current->stack_info.start = (u32_t)_current->stack_obj;
+	_current->stack_info.start = (uint32_t)_current->stack_obj;
 #ifdef CONFIG_GEN_PRIV_STACKS
 	_current->arch.priv_stack_start =
-			(u32_t)z_priv_stack_find(_current->stack_obj);
+			(uint32_t)z_priv_stack_find(_current->stack_obj);
 #else
 	_current->arch.priv_stack_start =
-			(u32_t)(_current->stack_info.start +
+			(uint32_t)(_current->stack_info.start +
 				_current->stack_info.size + STACK_GUARD_SIZE);
 #endif
 
@@ -255,7 +255,7 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 	configure_mpu_thread(_current);
 
 	z_arc_userspace_enter(user_entry, p1, p2, p3,
-			      (u32_t)_current->stack_obj,
+			      (uint32_t)_current->stack_obj,
 			      _current->stack_info.size, _current);
 	CODE_UNREACHABLE;
 }
diff --git a/arch/arc/core/timestamp.c b/arch/arc/core/timestamp.c
index 87dbfd2fcf..a2ba64b54c 100644
--- a/arch/arc/core/timestamp.c
+++ b/arch/arc/core/timestamp.c
@@ -23,17 +23,17 @@
  *
  * @return 64-bit time stamp value
  */
-u64_t z_tsc_read(void)
+uint64_t z_tsc_read(void)
 {
 	unsigned int key;
-	u64_t t;
-	u32_t count;
+	uint64_t t;
+	uint32_t count;
 
 	key = arch_irq_lock();
-	t = (u64_t)z_tick_get();
+	t = (uint64_t)z_tick_get();
 	count = z_arc_v2_aux_reg_read(_ARC_V2_TMR0_COUNT);
 	arch_irq_unlock(key);
 	t *= k_ticks_to_cyc_floor64(1);
-	t += (u64_t)count;
+	t += (uint64_t)count;
 	return t;
 }
diff --git a/arch/arc/core/vector_table.c b/arch/arc/core/vector_table.c
index 3f68f0a541..9f85f3c837 100644
--- a/arch/arc/core/vector_table.c
+++ b/arch/arc/core/vector_table.c
@@ -28,39 +28,39 @@
 #include "vector_table.h"
 
 struct vector_table {
-	u32_t reset;
-	u32_t memory_error;
-	u32_t instruction_error;
-	u32_t ev_machine_check;
-	u32_t ev_tlb_miss_i;
-	u32_t ev_tlb_miss_d;
-	u32_t ev_prot_v;
-	u32_t ev_privilege_v;
-	u32_t ev_swi;
-	u32_t ev_trap;
-	u32_t ev_extension;
-	u32_t ev_div_zero;
-	u32_t ev_dc_error;
-	u32_t ev_maligned;
-	u32_t unused_1;
-	u32_t unused_2;
+	uint32_t reset;
+	uint32_t memory_error;
+	uint32_t instruction_error;
+	uint32_t ev_machine_check;
+	uint32_t ev_tlb_miss_i;
+	uint32_t ev_tlb_miss_d;
+	uint32_t ev_prot_v;
+	uint32_t ev_privilege_v;
+	uint32_t ev_swi;
+	uint32_t ev_trap;
+	uint32_t ev_extension;
+	uint32_t ev_div_zero;
+	uint32_t ev_dc_error;
+	uint32_t ev_maligned;
+	uint32_t unused_1;
+	uint32_t unused_2;
 };
 
 struct vector_table _VectorTable Z_GENERIC_SECTION(.exc_vector_table) = {
-	(u32_t)__reset,
-	(u32_t)__memory_error,
-	(u32_t)__instruction_error,
-	(u32_t)__ev_machine_check,
-	(u32_t)__ev_tlb_miss_i,
-	(u32_t)__ev_tlb_miss_d,
-	(u32_t)__ev_prot_v,
-	(u32_t)__ev_privilege_v,
-	(u32_t)__ev_swi,
-	(u32_t)__ev_trap,
-	(u32_t)__ev_extension,
-	(u32_t)__ev_div_zero,
-	(u32_t)__ev_dc_error,
-	(u32_t)__ev_maligned,
+	(uint32_t)__reset,
+	(uint32_t)__memory_error,
+	(uint32_t)__instruction_error,
+	(uint32_t)__ev_machine_check,
+	(uint32_t)__ev_tlb_miss_i,
+	(uint32_t)__ev_tlb_miss_d,
+	(uint32_t)__ev_prot_v,
+	(uint32_t)__ev_privilege_v,
+	(uint32_t)__ev_swi,
+	(uint32_t)__ev_trap,
+	(uint32_t)__ev_extension,
+	(uint32_t)__ev_div_zero,
+	(uint32_t)__ev_dc_error,
+	(uint32_t)__ev_maligned,
 	0,
 	0
 };
diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
index cbf747e92a..49b1cd7708 100644
--- a/arch/arc/include/kernel_arch_data.h
+++ b/arch/arc/include/kernel_arch_data.h
@@ -37,70 +37,70 @@ extern "C" {
 
 #ifdef CONFIG_ARC_HAS_SECURE
 struct _irq_stack_frame {
-	u32_t lp_end;
-	u32_t lp_start;
-	u32_t lp_count;
+	uint32_t lp_end;
+	uint32_t lp_start;
+	uint32_t lp_count;
 #ifdef CONFIG_CODE_DENSITY
 	/*
 	 * Currently unsupported. This is where those registers are
 	 * automatically pushed on the stack by the CPU when taking a regular
 	 * IRQ.
 	 */
-	u32_t ei_base;
-	u32_t ldi_base;
-	u32_t jli_base;
+	uint32_t ei_base;
+	uint32_t ldi_base;
+	uint32_t jli_base;
 #endif
-	u32_t r0;
-	u32_t r1;
-	u32_t r2;
-	u32_t r3;
-	u32_t r4;
-	u32_t r5;
-	u32_t r6;
-	u32_t r7;
-	u32_t r8;
-	u32_t r9;
-	u32_t r10;
-	u32_t r11;
-	u32_t r12;
-	u32_t r13;
-	u32_t blink;
-	u32_t pc;
-	u32_t sec_stat;
-	u32_t status32;
+	uint32_t r0;
+	uint32_t r1;
+	uint32_t r2;
+	uint32_t r3;
+	uint32_t r4;
+	uint32_t r5;
+	uint32_t r6;
+	uint32_t r7;
+	uint32_t r8;
+	uint32_t r9;
+	uint32_t r10;
+	uint32_t r11;
+	uint32_t r12;
+	uint32_t r13;
+	uint32_t blink;
+	uint32_t pc;
+	uint32_t sec_stat;
+	uint32_t status32;
 };
 #else
 struct _irq_stack_frame {
-	u32_t r0;
-	u32_t r1;
-	u32_t r2;
-	u32_t r3;
-	u32_t r4;
-	u32_t r5;
-	u32_t r6;
-	u32_t r7;
-	u32_t r8;
-	u32_t r9;
-	u32_t r10;
-	u32_t r11;
-	u32_t r12;
-	u32_t r13;
-	u32_t blink;
-	u32_t lp_end;
-	u32_t lp_start;
-	u32_t lp_count;
+	uint32_t r0;
+	uint32_t r1;
+	uint32_t r2;
+	uint32_t r3;
+	uint32_t r4;
+	uint32_t r5;
+	uint32_t r6;
+	uint32_t r7;
+	uint32_t r8;
+	uint32_t r9;
+	uint32_t r10;
+	uint32_t r11;
+	uint32_t r12;
+	uint32_t r13;
+	uint32_t blink;
+	uint32_t lp_end;
+	uint32_t lp_start;
+	uint32_t lp_count;
 #ifdef CONFIG_CODE_DENSITY
 	/*
 	 * Currently unsupported. This is where those registers are
 	 * automatically pushed on the stack by the CPU when taking a regular
 	 * IRQ.
 	 */
-	u32_t ei_base;
-	u32_t ldi_base;
-	u32_t jli_base;
+	uint32_t ei_base;
+	uint32_t ldi_base;
+	uint32_t jli_base;
 #endif
-	u32_t pc;
-	u32_t status32;
+	uint32_t pc;
+	uint32_t status32;
 };
 #endif
 
@@ -110,47 +110,47 @@ typedef struct _irq_stack_frame _isf_t;
 
 /* callee-saved registers pushed on the stack, not in k_thread */
 struct _callee_saved_stack {
-	u32_t r13;
-	u32_t r14;
-	u32_t r15;
-	u32_t r16;
-	u32_t r17;
-	u32_t r18;
-	u32_t r19;
-	u32_t r20;
-	u32_t r21;
-	u32_t r22;
-	u32_t r23;
-	u32_t r24;
-	u32_t r25;
-	u32_t r26;
-	u32_t fp; /* r27 */
+	uint32_t r13;
+	uint32_t r14;
+	uint32_t r15;
+	uint32_t r16;
+	uint32_t r17;
+	uint32_t r18;
+	uint32_t r19;
+	uint32_t r20;
+	uint32_t r21;
+	uint32_t r22;
+	uint32_t r23;
+	uint32_t r24;
+	uint32_t r25;
+	uint32_t r26;
+	uint32_t fp; /* r27 */
 
 #ifdef CONFIG_USERSPACE
 #ifdef CONFIG_ARC_HAS_SECURE
-	u32_t user_sp;
-	u32_t kernel_sp;
+	uint32_t user_sp;
+	uint32_t kernel_sp;
 #else
-	u32_t user_sp;
+	uint32_t user_sp;
 #endif
 #endif
 	/* r28 is the stack pointer and saved separately */
 	/* r29 is ILINK and does not need to be saved */
-	u32_t r30;
+	uint32_t r30;
 
 #ifdef CONFIG_ARC_HAS_ACCL_REGS
-	u32_t r58;
-	u32_t r59;
+	uint32_t r58;
+	uint32_t r59;
 #endif
 
 #ifdef CONFIG_FPU_SHARING
-	u32_t fpu_status;
-	u32_t fpu_ctrl;
+	uint32_t fpu_status;
+	uint32_t fpu_ctrl;
 #ifdef CONFIG_FP_FPU_DA
-	u32_t dpfp2h;
-	u32_t dpfp2l;
-	u32_t dpfp1h;
-	u32_t dpfp1l;
+	uint32_t dpfp2h;
+	uint32_t dpfp2l;
+	uint32_t dpfp1h;
+	uint32_t dpfp1l;
 #endif
 
 #endif
diff --git a/arch/arc/include/kernel_arch_func.h b/arch/arc/include/kernel_arch_func.h
index a5ad448ba3..bea594fd07 100644
--- a/arch/arc/include/kernel_arch_func.h
+++ b/arch/arc/include/kernel_arch_func.h
@@ -48,7 +48,7 @@ static ALWAYS_INLINE void arch_kernel_init(void)
  */
 static ALWAYS_INLINE int Z_INTERRUPT_CAUSE(void)
 {
-	u32_t irq_num = z_arc_v2_aux_reg_read(_ARC_V2_ICAUSE);
+	uint32_t irq_num = z_arc_v2_aux_reg_read(_ARC_V2_ICAUSE);
 
 	return irq_num;
 }
@@ -62,7 +62,7 @@ extern void z_thread_entry_wrapper(void);
 extern void z_user_thread_entry_wrapper(void);
 
 extern void z_arc_userspace_enter(k_thread_entry_t user_entry, void *p1,
-		 void *p2, void *p3, u32_t stack, u32_t size,
+		 void *p2, void *p3, uint32_t stack, uint32_t size,
 		 struct k_thread *thread);
 
 
diff --git a/arch/arc/include/v2/cache.h b/arch/arc/include/v2/cache.h
index 747a08932f..4341422529 100644
--- a/arch/arc/include/v2/cache.h
+++ b/arch/arc/include/v2/cache.h
@@ -36,11 +36,11 @@ extern "C" {
  */
 static ALWAYS_INLINE void z_icache_setup(void)
 {
-	u32_t icache_config = (
+	uint32_t icache_config = (
 		IC_CACHE_DIRECT | /* direct mapping (one-way assoc.) */
 		IC_CACHE_ENABLE   /* i-cache enabled */
 	);
-	u32_t val;
+	uint32_t val;
 
 	val = z_arc_v2_aux_reg_read(_ARC_V2_I_CACHE_BUILD);
 	val &= 0xff;
diff --git a/arch/arc/include/v2/irq.h b/arch/arc/include/v2/irq.h
index 870f7d8cf4..1f2a1a63de 100644
--- a/arch/arc/include/v2/irq.h
+++ b/arch/arc/include/v2/irq.h
@@ -53,7 +53,7 @@ extern "C" {
  */
 static ALWAYS_INLINE void z_irq_setup(void)
 {
-	u32_t aux_irq_ctrl_value = (
+	uint32_t aux_irq_ctrl_value = (
 		_ARC_V2_AUX_IRQ_CTRL_LOOP_REGS | /* save lp_xxx registers */
 #ifdef CONFIG_CODE_DENSITY
 		_ARC_V2_AUX_IRQ_CTRL_LP | /* save code density registers */
diff --git a/arch/arm/core/aarch32/cortex_a_r/fault.c b/arch/arm/core/aarch32/cortex_a_r/fault.c
index b5dccecc56..df3f676e6b 100644
--- a/arch/arm/core/aarch32/cortex_a_r/fault.c
+++ b/arch/arm/core/aarch32/cortex_a_r/fault.c
@@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(os);
 #define FAULT_DUMP_VERBOSE	(CONFIG_FAULT_DUMP == 2)
 
 #if FAULT_DUMP_VERBOSE
-static const char *get_dbgdscr_moe_string(u32_t moe)
+static const char *get_dbgdscr_moe_string(uint32_t moe)
 {
 	switch (moe) {
 	case DBGDSCR_MOE_HALT_REQUEST:
@@ -40,14 +40,14 @@ static const char *get_dbgdscr_moe_string(u32_t moe)
 static void dump_debug_event(void)
 {
 	/* Read and parse debug mode of entry */
-	u32_t dbgdscr = __get_DBGDSCR();
-	u32_t moe = (dbgdscr & DBGDSCR_MOE_Msk) >> DBGDSCR_MOE_Pos;
+	uint32_t dbgdscr = __get_DBGDSCR();
+	uint32_t moe = (dbgdscr & DBGDSCR_MOE_Msk) >> DBGDSCR_MOE_Pos;
 
 	/* Print debug event information */
 	LOG_ERR("Debug Event (%s)", get_dbgdscr_moe_string(moe));
 }
 
-static void dump_fault(u32_t status, u32_t addr)
+static void dump_fault(uint32_t status, uint32_t addr)
 {
 	/*
 	 * Dump fault status and, if applicable, tatus-specific information.
@@ -110,11 +110,11 @@ bool z_arm_fault_undef_instruction(z_arch_esf_t *esf)
 bool z_arm_fault_prefetch(z_arch_esf_t *esf)
 {
 	/* Read and parse Instruction Fault Status Register (IFSR) */
-	u32_t ifsr = __get_IFSR();
-	u32_t fs = ((ifsr & IFSR_FS1_Msk) >> 6) | (ifsr & IFSR_FS0_Msk);
+	uint32_t ifsr = __get_IFSR();
+	uint32_t fs = ((ifsr & IFSR_FS1_Msk) >> 6) | (ifsr & IFSR_FS0_Msk);
 
 	/* Read Instruction Fault Address Register (IFAR) */
-	u32_t ifar = __get_IFAR();
+	uint32_t ifar = __get_IFAR();
 
 	/* Print fault information*/
 	LOG_ERR("***** PREFETCH ABORT *****");
@@ -137,11 +137,11 @@ bool z_arm_fault_prefetch(z_arch_esf_t *esf)
 bool z_arm_fault_data(z_arch_esf_t *esf)
 {
 	/* Read and parse Data Fault Status Register (DFSR) */
-	u32_t dfsr = __get_DFSR();
-	u32_t fs = ((dfsr & DFSR_FS1_Msk) >> 6) | (dfsr & DFSR_FS0_Msk);
+	uint32_t dfsr = __get_DFSR();
+	uint32_t fs = ((dfsr & DFSR_FS1_Msk) >> 6) | (dfsr & DFSR_FS0_Msk);
 
 	/* Read Data Fault Address Register (DFAR) */
-	u32_t dfar = __get_DFAR();
+	uint32_t dfar = __get_DFAR();
 
 	/* Print fault information*/
 	LOG_ERR("***** DATA ABORT *****");
diff --git a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
index 19ea839ac5..acf1e889be 100644
--- a/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
+++ b/arch/arm/core/aarch32/cortex_m/cmse/arm_core_cmse.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <aarch32/cortex_m/cmse.h>
 
-int arm_cmse_mpu_region_get(u32_t addr)
+int arm_cmse_mpu_region_get(uint32_t addr)
 {
 	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
 
@@ -18,7 +18,7 @@ int arm_cmse_mpu_region_get(u32_t addr)
 	return -EINVAL;
 }
 
-static int arm_cmse_addr_read_write_ok(u32_t addr, int force_npriv, int rw)
+static int arm_cmse_addr_read_write_ok(uint32_t addr, int force_npriv, int rw)
 {
 	cmse_address_info_t addr_info;
 	if (force_npriv) {
@@ -30,17 +30,17 @@ static int arm_cmse_addr_read_write_ok(u32_t addr, int force_npriv, int rw)
 	return rw ? addr_info.flags.readwrite_ok : addr_info.flags.read_ok;
 }
 
-int arm_cmse_addr_read_ok(u32_t addr, int force_npriv)
+int arm_cmse_addr_read_ok(uint32_t addr, int force_npriv)
 {
 	return arm_cmse_addr_read_write_ok(addr, force_npriv, 0);
 }
 
-int arm_cmse_addr_readwrite_ok(u32_t addr, int force_npriv)
+int arm_cmse_addr_readwrite_ok(uint32_t addr, int force_npriv)
 {
 	return arm_cmse_addr_read_write_ok(addr, force_npriv, 1);
 }
 
-static int arm_cmse_addr_range_read_write_ok(u32_t addr, u32_t size,
+static int arm_cmse_addr_range_read_write_ok(uint32_t addr, uint32_t size,
 	int force_npriv, int rw)
 {
 	int flags = 0;
@@ -60,19 +60,19 @@ static int arm_cmse_addr_range_read_write_ok(u32_t addr, u32_t size,
 	}
 }
 
-int arm_cmse_addr_range_read_ok(u32_t addr, u32_t size, int force_npriv)
+int arm_cmse_addr_range_read_ok(uint32_t addr, uint32_t size, int force_npriv)
 {
 	return arm_cmse_addr_range_read_write_ok(addr, size, force_npriv, 0);
 }
 
-int arm_cmse_addr_range_readwrite_ok(u32_t addr, u32_t size, int force_npriv)
+int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npriv)
 {
 	return arm_cmse_addr_range_read_write_ok(addr, size, force_npriv, 1);
 }
 
 #if defined(CONFIG_ARM_SECURE_FIRMWARE)
 
-int arm_cmse_mpu_nonsecure_region_get(u32_t addr)
+int arm_cmse_mpu_nonsecure_region_get(uint32_t addr)
 {
 	cmse_address_info_t addr_info =	cmse_TTA((void *)addr);
 
@@ -83,7 +83,7 @@ int arm_cmse_mpu_nonsecure_region_get(u32_t addr)
 	return -EINVAL;
 }
 
-int arm_cmse_sau_region_get(u32_t addr)
+int arm_cmse_sau_region_get(uint32_t addr)
 {
 	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
 
@@ -94,7 +94,7 @@ int arm_cmse_sau_region_get(u32_t addr)
 	return -EINVAL;
 }
 
-int arm_cmse_idau_region_get(u32_t addr)
+int arm_cmse_idau_region_get(uint32_t addr)
 {
 	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
 
@@ -105,14 +105,14 @@ int arm_cmse_idau_region_get(u32_t addr)
 	return -EINVAL;
 }
 
-int arm_cmse_addr_is_secure(u32_t addr)
+int arm_cmse_addr_is_secure(uint32_t addr)
 {
 	cmse_address_info_t addr_info =	cmse_TT((void *)addr);
 
 	return addr_info.flags.secure;
 }
 
-static int arm_cmse_addr_nonsecure_read_write_ok(u32_t addr,
+static int arm_cmse_addr_nonsecure_read_write_ok(uint32_t addr,
 	int force_npriv, int rw)
 {
 	cmse_address_info_t addr_info;
@@ -126,17 +126,17 @@ static int arm_cmse_addr_nonsecure_read_write_ok(u32_t addr,
 		addr_info.flags.nonsecure_read_ok;
 }
 
-int arm_cmse_addr_nonsecure_read_ok(u32_t addr, int force_npriv)
+int arm_cmse_addr_nonsecure_read_ok(uint32_t addr, int force_npriv)
 {
 	return arm_cmse_addr_nonsecure_read_write_ok(addr, force_npriv, 0);
 }
 
-int arm_cmse_addr_nonsecure_readwrite_ok(u32_t addr, int force_npriv)
+int arm_cmse_addr_nonsecure_readwrite_ok(uint32_t addr, int force_npriv)
 {
 	return arm_cmse_addr_nonsecure_read_write_ok(addr, force_npriv, 1);
 }
 
-static int arm_cmse_addr_range_nonsecure_read_write_ok(u32_t addr, u32_t size,
+static int arm_cmse_addr_range_nonsecure_read_write_ok(uint32_t addr, uint32_t size,
 	int force_npriv, int rw)
 {
 	int flags = CMSE_NONSECURE;
@@ -156,14 +156,14 @@ static int arm_cmse_addr_range_nonsecure_read_write_ok(u32_t addr, u32_t size,
 	}
 }
 
-int arm_cmse_addr_range_nonsecure_read_ok(u32_t addr, u32_t size,
+int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size,
 	int force_npriv)
 {
 	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size,
 		force_npriv, 0);
 }
 
-int arm_cmse_addr_range_nonsecure_readwrite_ok(u32_t addr, u32_t size,
+int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
 	int force_npriv)
 {
 	return arm_cmse_addr_range_nonsecure_read_write_ok(addr, size,
diff --git a/arch/arm/core/aarch32/cortex_m/fault.c b/arch/arm/core/aarch32/cortex_m/fault.c
index c1f09216ee..ec7d75af8e 100644
--- a/arch/arm/core/aarch32/cortex_m/fault.c
+++ b/arch/arm/core/aarch32/cortex_m/fault.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(os);
 
 #if defined(CONFIG_PRINTK) || defined(CONFIG_LOG)
 #define PR_EXC(...) LOG_ERR(__VA_ARGS__)
-#define STORE_xFAR(reg_var, reg) u32_t reg_var = (u32_t)reg
+#define STORE_xFAR(reg_var, reg) uint32_t reg_var = (uint32_t)reg
 #else
 #define PR_EXC(...)
 #define STORE_xFAR(reg_var, reg)
@@ -175,11 +175,11 @@ static bool memory_fault_recoverable(z_arch_esf_t *esf)
 #ifdef CONFIG_USERSPACE
 	for (int i = 0; i < ARRAY_SIZE(exceptions); i++) {
 		/* Mask out instruction mode */
-		u32_t start = (u32_t)exceptions[i].start & ~0x1;
-		u32_t end = (u32_t)exceptions[i].end & ~0x1;
+		uint32_t start = (uint32_t)exceptions[i].start & ~0x1;
+		uint32_t end = (uint32_t)exceptions[i].end & ~0x1;
 
 		if (esf->basic.pc >= start && esf->basic.pc < end) {
-			esf->basic.pc = (u32_t)(exceptions[i].fixup);
+			esf->basic.pc = (uint32_t)(exceptions[i].fixup);
 			return true;
 		}
 	}
@@ -193,8 +193,8 @@ static bool memory_fault_recoverable(z_arch_esf_t *esf)
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
-u32_t z_check_thread_stack_fail(const u32_t fault_addr,
-	const u32_t psp);
+uint32_t z_check_thread_stack_fail(const uint32_t fault_addr,
+	const uint32_t psp);
 #endif /* CONFIG_MPU_STACK_GUARD || defined(CONFIG_USERSPACE) */
 
 /**
@@ -205,11 +205,11 @@ u32_t z_check_thread_stack_fail(const u32_t fault_addr,
  *
  * @return error code to identify the fatal error reason
  */
-static u32_t mem_manage_fault(z_arch_esf_t *esf, int from_hard_fault,
+static uint32_t mem_manage_fault(z_arch_esf_t *esf, int from_hard_fault,
 			      bool *recoverable)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
-	u32_t mmfar = -EINVAL;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t mmfar = -EINVAL;
 
 	PR_FAULT_INFO("***** MPU FAULT *****");
 
@@ -276,8 +276,8 @@ static u32_t mem_manage_fault(z_arch_esf_t *esf, int from_hard_fault,
 		 * handle the case of 'mmfar' holding the -EINVAL value.
 		 */
 		if (SCB->ICSR & SCB_ICSR_RETTOBASE_Msk) {
-			u32_t min_stack_ptr = z_check_thread_stack_fail(mmfar,
-				((u32_t) &esf[0]));
+			uint32_t min_stack_ptr = z_check_thread_stack_fail(mmfar,
+				((uint32_t) &esf[0]));
 
 			if (min_stack_ptr) {
 				/* When MemManage Stacking Error has occurred,
@@ -339,7 +339,7 @@ static u32_t mem_manage_fault(z_arch_esf_t *esf, int from_hard_fault,
  */
 static int bus_fault(z_arch_esf_t *esf, int from_hard_fault, bool *recoverable)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
 	PR_FAULT_INFO("***** BUS FAULT *****");
 
@@ -383,10 +383,10 @@ static int bus_fault(z_arch_esf_t *esf, int from_hard_fault, bool *recoverable)
 #endif /* !defined(CONFIG_ARMV7_M_ARMV8_M_FP) */
 
 #if defined(CONFIG_ARM_MPU) && defined(CONFIG_CPU_HAS_NXP_MPU)
-	u32_t sperr = SYSMPU->CESR & SYSMPU_CESR_SPERR_MASK;
-	u32_t mask = BIT(31);
+	uint32_t sperr = SYSMPU->CESR & SYSMPU_CESR_SPERR_MASK;
+	uint32_t mask = BIT(31);
 	int i;
-	u32_t ear = -EINVAL;
+	uint32_t ear = -EINVAL;
 
 	if (sperr) {
 		for (i = 0; i < SYSMPU_EAR_COUNT; i++, mask >>= 1) {
@@ -426,9 +426,9 @@ static int bus_fault(z_arch_esf_t *esf, int from_hard_fault, bool *recoverable)
 				 * inspecting the RETTOBASE flag.
 				 */
 				if (SCB->ICSR & SCB_ICSR_RETTOBASE_Msk) {
-					u32_t min_stack_ptr =
+					uint32_t min_stack_ptr =
 						z_check_thread_stack_fail(ear,
-							((u32_t) &esf[0]));
+							((uint32_t) &esf[0]));
 
 					if (min_stack_ptr) {
 						/* When BusFault Stacking Error
@@ -491,9 +491,9 @@ static int bus_fault(z_arch_esf_t *esf, int from_hard_fault, bool *recoverable)
  *
  * @return error code to identify the fatal error reason
  */
-static u32_t usage_fault(const z_arch_esf_t *esf)
+static uint32_t usage_fault(const z_arch_esf_t *esf)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
 	PR_FAULT_INFO("***** USAGE FAULT *****");
 
@@ -606,9 +606,9 @@ static void debug_monitor(const z_arch_esf_t *esf)
  *
  * @return error code to identify the fatal error reason
  */
-static u32_t hard_fault(z_arch_esf_t *esf, bool *recoverable)
+static uint32_t hard_fault(z_arch_esf_t *esf, bool *recoverable)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
 	PR_FAULT_INFO("***** HARD FAULT *****");
 
@@ -621,14 +621,14 @@ static u32_t hard_fault(z_arch_esf_t *esf, bool *recoverable)
 	 * priority. We handle the case of Kernel OOPS and Stack
 	 * Fail here.
 	 */
-	u16_t *ret_addr = (u16_t *)esf->basic.pc;
+	uint16_t *ret_addr = (uint16_t *)esf->basic.pc;
 	/* SVC is a 16-bit instruction. On a synchronous SVC
 	 * escalated to Hard Fault, the return address is the
 	 * next instruction, i.e. after the SVC.
 	 */
 #define _SVC_OPCODE 0xDF00
 
-	u16_t fault_insn = *(ret_addr - 1);
+	uint16_t fault_insn = *(ret_addr - 1);
 	if (((fault_insn & 0xff00) == _SVC_OPCODE) &&
 		((fault_insn & 0x00ff) == _SVC_CALL_RUNTIME_EXCEPT)) {
 
@@ -682,9 +682,9 @@ static void reserved_exception(const z_arch_esf_t *esf, int fault)
 }
 
 /* Handler function for ARM fault conditions. */
-static u32_t fault_handle(z_arch_esf_t *esf, int fault, bool *recoverable)
+static uint32_t fault_handle(z_arch_esf_t *esf, int fault, bool *recoverable)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
 	*recoverable = false;
 
@@ -747,8 +747,8 @@ static void secure_stack_dump(const z_arch_esf_t *secure_esf)
 	 * In case of a Non-Secure function call the top of the
 	 * stack contains the return address to Secure state.
 	 */
-	u32_t *top_of_sec_stack = (u32_t *)secure_esf;
-	u32_t sec_ret_addr;
+	uint32_t *top_of_sec_stack = (uint32_t *)secure_esf;
+	uint32_t sec_ret_addr;
 #if defined(CONFIG_ARMV7_M_ARMV8_M_FP)
 	if ((*top_of_sec_stack == INTEGRITY_SIGNATURE_STD) ||
 		(*top_of_sec_stack == INTEGRITY_SIGNATURE_EXT)) {
@@ -790,7 +790,7 @@ static void secure_stack_dump(const z_arch_esf_t *secure_esf)
  *
  * @return ESF pointer on success, otherwise return NULL
  */
-static inline z_arch_esf_t *get_esf(u32_t msp, u32_t psp, u32_t exc_return,
+static inline z_arch_esf_t *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_return,
 	bool *nested_exc)
 {
 	bool alternative_state_exc = false;
@@ -931,9 +931,9 @@ static inline z_arch_esf_t *get_esf(u32_t msp, u32_t psp, u32_t exc_return,
  * @param exc_return EXC_RETURN value present in LR after exception entry.
  *
  */
-void z_arm_fault(u32_t msp, u32_t psp, u32_t exc_return)
+void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return)
 {
-	u32_t reason = K_ERR_CPU_EXCEPTION;
+	uint32_t reason = K_ERR_CPU_EXCEPTION;
 	int fault = SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk;
 	bool recoverable, nested_exc;
 	z_arch_esf_t *esf;
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c
index 117fd7ef05..98392e89a8 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu.c
@@ -39,11 +39,11 @@ LOG_MODULE_REGISTER(mpu);
  * memory area, where dynamic memory regions may be programmed at run-time.
  */
 #if defined(CONFIG_USERSPACE)
-#define _MPU_DYNAMIC_REGIONS_AREA_START ((u32_t)&_app_smem_start)
+#define _MPU_DYNAMIC_REGIONS_AREA_START ((uint32_t)&_app_smem_start)
 #else
-#define _MPU_DYNAMIC_REGIONS_AREA_START ((u32_t)&__kernel_ram_start)
+#define _MPU_DYNAMIC_REGIONS_AREA_START ((uint32_t)&__kernel_ram_start)
 #endif /* CONFIG_USERSPACE */
-#define _MPU_DYNAMIC_REGIONS_AREA_SIZE ((u32_t)&__kernel_ram_end - \
+#define _MPU_DYNAMIC_REGIONS_AREA_SIZE ((uint32_t)&__kernel_ram_end - \
 		_MPU_DYNAMIC_REGIONS_AREA_START)
 
 /**
@@ -64,24 +64,24 @@ void z_arm_configure_static_mpu_regions(void)
 #if defined(CONFIG_COVERAGE_GCOV) && defined(CONFIG_USERSPACE)
 		const struct k_mem_partition gcov_region =
 		{
-		.start = (u32_t)&__gcov_bss_start,
-		.size = (u32_t)&__gcov_bss_size,
+		.start = (uint32_t)&__gcov_bss_start,
+		.size = (uint32_t)&__gcov_bss_size,
 		.attr = K_MEM_PARTITION_P_RW_U_RW,
 		};
 #endif /* CONFIG_COVERAGE_GCOV && CONFIG_USERSPACE */
 #if defined(CONFIG_NOCACHE_MEMORY)
 		const struct k_mem_partition nocache_region =
 		{
-		.start = (u32_t)&_nocache_ram_start,
-		.size = (u32_t)&_nocache_ram_size,
+		.start = (uint32_t)&_nocache_ram_start,
+		.size = (uint32_t)&_nocache_ram_size,
 		.attr = K_MEM_PARTITION_P_RW_U_NA_NOCACHE,
 		};
 #endif /* CONFIG_NOCACHE_MEMORY */
 #if defined(CONFIG_ARCH_HAS_RAMFUNC_SUPPORT)
 		const struct k_mem_partition ramfunc_region =
 		{
-		.start = (u32_t)&_ramfunc_ram_start,
-		.size = (u32_t)&_ramfunc_ram_size,
+		.start = (uint32_t)&_ramfunc_ram_start,
+		.size = (uint32_t)&_ramfunc_ram_size,
 		.attr = K_MEM_PARTITION_P_RX_U_RX,
 		};
 #endif /* CONFIG_ARCH_HAS_RAMFUNC_SUPPORT */
@@ -109,8 +109,8 @@ void z_arm_configure_static_mpu_regions(void)
 	 */
 	arm_core_mpu_configure_static_mpu_regions(static_regions,
 		ARRAY_SIZE(static_regions),
-		(u32_t)&_image_ram_start,
-		(u32_t)&__kernel_ram_end);
+		(uint32_t)&_image_ram_start,
+		(uint32_t)&__kernel_ram_end);
 
 #if defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
 	/* Define a constant array of k_mem_partition objects that holds the
@@ -151,7 +151,7 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 	 */
 	struct k_mem_partition *dynamic_regions[_MAX_DYNAMIC_MPU_REGIONS_NUM];
 
-	u8_t region_num = 0U;
+	uint8_t region_num = 0U;
 
 #if defined(CONFIG_USERSPACE)
 	struct k_mem_partition thread_stack;
@@ -162,7 +162,7 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 
 	if (mem_domain) {
 		LOG_DBG("configure domain: %p", mem_domain);
-		u32_t num_partitions = mem_domain->num_partitions;
+		uint32_t num_partitions = mem_domain->num_partitions;
 		struct k_mem_partition partition;
 		int i;
 
@@ -193,8 +193,8 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 	/* Thread user stack */
 	LOG_DBG("configure user thread %p's context", thread);
 	if (thread->arch.priv_stack_start) {
-		u32_t base = (u32_t)thread->stack_obj;
-		u32_t size = thread->stack_info.size +
+		uint32_t base = (uint32_t)thread->stack_obj;
+		uint32_t size = thread->stack_info.size +
 			(thread->stack_info.start - base);
 
 		__ASSERT(region_num < _MAX_DYNAMIC_MPU_REGIONS_NUM,
@@ -212,8 +212,8 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 	struct k_mem_partition guard;
 
 	/* Privileged stack guard */
-	u32_t guard_start;
-	u32_t guard_size = MPU_GUARD_ALIGN_AND_SIZE;
+	uint32_t guard_start;
+	uint32_t guard_size = MPU_GUARD_ALIGN_AND_SIZE;
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	if ((thread->base.user_options & K_FP_REGS) != 0) {
@@ -225,15 +225,15 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 	if (thread->arch.priv_stack_start) {
 		guard_start = thread->arch.priv_stack_start - guard_size;
 
-		__ASSERT((u32_t)&z_priv_stacks_ram_start <= guard_start,
+		__ASSERT((uint32_t)&z_priv_stacks_ram_start <= guard_start,
 		"Guard start: (0x%x) below privilege stacks boundary: (0x%x)",
-		guard_start, (u32_t)&z_priv_stacks_ram_start);
+		guard_start, (uint32_t)&z_priv_stacks_ram_start);
 	} else {
 		guard_start = thread->stack_info.start - guard_size;
 
-		__ASSERT((u32_t)thread->stack_obj == guard_start,
+		__ASSERT((uint32_t)thread->stack_obj == guard_start,
 		"Guard start (0x%x) not beginning at stack object (0x%x)\n",
-		guard_start, (u32_t)thread->stack_obj);
+		guard_start, (uint32_t)thread->stack_obj);
 	}
 #else
 	guard_start = thread->stack_info.start - guard_size;
@@ -318,7 +318,7 @@ void arch_mem_domain_destroy(struct k_mem_domain *domain)
 }
 
 void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
-				      u32_t partition_id)
+				      uint32_t partition_id)
 {
 	/* Request to remove a partition from a memory domain.
 	 * This resets the access permissions of the partition
@@ -335,7 +335,7 @@ void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
 }
 
 void arch_mem_domain_partition_add(struct k_mem_domain *domain,
-				   u32_t partition_id)
+				   uint32_t partition_id)
 {
 	/* No-op on this architecture */
 }
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
index 7b43cceab7..89111f86de 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
@@ -133,8 +133,8 @@ struct k_thread;
  *   requirements of the MPU hardware.
  */
 void arm_core_mpu_configure_static_mpu_regions(
-	const struct k_mem_partition *static_regions[], const u8_t regions_num,
-	const u32_t background_area_start, const u32_t background_area_end);
+	const struct k_mem_partition *static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_start, const uint32_t background_area_end);
 
 #if defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)
 
@@ -165,7 +165,7 @@ void arm_core_mpu_configure_static_mpu_regions(
  */
 void arm_core_mpu_mark_areas_for_dynamic_regions(
 	const struct k_mem_partition dyn_region_areas[],
-	const u8_t dyn_region_areas_num);
+	const uint8_t dyn_region_areas_num);
 
 #endif /* CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS */
 
@@ -185,7 +185,7 @@ void arm_core_mpu_mark_areas_for_dynamic_regions(
  * not exceed the number of (currently) available MPU indices.
  */
 void arm_core_mpu_configure_dynamic_mpu_regions(
-	const struct k_mem_partition *dynamic_regions[], u8_t regions_num);
+	const struct k_mem_partition *dynamic_regions[], uint8_t regions_num);
 
 #if defined(CONFIG_USERSPACE)
 /**
@@ -215,7 +215,7 @@ void arm_core_mpu_mem_partition_config_update(
  * @param   base    base address in RAM
  * @param   size    size of the region
  */
-void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size);
+void arm_core_mpu_configure(uint8_t type, uint32_t base, uint32_t size);
 
 /**
  * @brief configure MPU regions for the memory partitions of the memory domain
@@ -237,7 +237,7 @@ void arm_core_mpu_configure_user_context(struct k_thread *thread);
  * @param   part_index  memory partition index
  * @param   part        memory partition info
  */
-void arm_core_mpu_configure_mem_partition(u32_t part_index,
+void arm_core_mpu_configure_mem_partition(uint32_t part_index,
 					  struct k_mem_partition *part);
 
 /**
@@ -245,7 +245,7 @@ void arm_core_mpu_configure_mem_partition(u32_t part_index,
  *
  * @param   part_index  memory partition index
  */
-void arm_core_mpu_mem_partition_remove(u32_t part_index);
+void arm_core_mpu_mem_partition_remove(uint32_t part_index);
 
 /**
  * @brief Get the maximum number of available (free) MPU region indices
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c
index 88c6ff0d3d..7eaf863a52 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu.c
@@ -36,12 +36,12 @@ LOG_MODULE_DECLARE(mpu);
  * have been reserved by the MPU driver to program the static (fixed) memory
  * regions.
  */
-static u8_t static_regions_num;
+static uint8_t static_regions_num;
 
 /**
  *  Get the number of supported MPU regions.
  */
-static inline u8_t get_num_regions(void)
+static inline uint8_t get_num_regions(void)
 {
 #if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
 	defined(CONFIG_CPU_CORTEX_M3) || \
@@ -55,11 +55,11 @@ static inline u8_t get_num_regions(void)
 	return NUM_MPU_REGIONS;
 #else
 
-	u32_t type = MPU->TYPE;
+	uint32_t type = MPU->TYPE;
 
 	type = (type & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos;
 
-	return (u8_t)type;
+	return (uint8_t)type;
 #endif /* CPU_CORTEX_M0PLUS | CPU_CORTEX_M3 | CPU_CORTEX_M4 */
 }
 
@@ -76,7 +76,7 @@ static inline u8_t get_num_regions(void)
 #error "Unsupported ARM CPU"
 #endif
 
-static int region_allocate_and_init(const u8_t index,
+static int region_allocate_and_init(const uint8_t index,
 	const struct arm_mpu_region *region_conf)
 {
 	/* Attempt to allocate new region index. */
@@ -98,7 +98,7 @@ static int region_allocate_and_init(const u8_t index,
 /* This internal function programs an MPU region
  * of a given configuration at a given MPU index.
  */
-static int mpu_configure_region(const u8_t index,
+static int mpu_configure_region(const uint8_t index,
 	const struct k_mem_partition *new_region)
 {
 	struct arm_mpu_region region_conf;
@@ -122,7 +122,7 @@ static int mpu_configure_region(const u8_t index,
  * sanity check of the memory regions to be programmed.
  */
 static int mpu_configure_regions(const struct k_mem_partition
-	*regions[], u8_t regions_num, u8_t start_reg_index,
+	*regions[], uint8_t regions_num, uint8_t start_reg_index,
 	bool do_sanity_check)
 {
 	int i;
@@ -192,21 +192,21 @@ void arm_core_mpu_mem_partition_config_update(
 	k_mem_partition_attr_t *new_attr)
 {
 	/* Find the partition. ASSERT if not found. */
-	u8_t i;
-	u8_t reg_index = get_num_regions();
+	uint8_t i;
+	uint8_t reg_index = get_num_regions();
 
 	for (i = get_dyn_region_min_index(); i < get_num_regions(); i++) {
 		if (!is_enabled_region(i)) {
 			continue;
 		}
 
-		u32_t base = mpu_region_get_base(i);
+		uint32_t base = mpu_region_get_base(i);
 
 		if (base != partition->start) {
 			continue;
 		}
 
-		u32_t size = mpu_region_get_size(i);
+		uint32_t size = mpu_region_get_size(i);
 
 		if (size != partition->size) {
 			continue;
@@ -249,8 +249,8 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write)
  * @brief configure fixed (static) MPU regions.
  */
 void arm_core_mpu_configure_static_mpu_regions(const struct k_mem_partition
-	*static_regions[], const u8_t regions_num,
-	const u32_t background_area_start, const u32_t background_area_end)
+	*static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_start, const uint32_t background_area_end)
 {
 	if (mpu_configure_static_mpu_regions(static_regions, regions_num,
 					       background_area_start, background_area_end) == -EINVAL) {
@@ -266,7 +266,7 @@ void arm_core_mpu_configure_static_mpu_regions(const struct k_mem_partition
  */
 void arm_core_mpu_mark_areas_for_dynamic_regions(
 	const struct k_mem_partition dyn_region_areas[],
-	const u8_t dyn_region_areas_num)
+	const uint8_t dyn_region_areas_num)
 {
 	if (mpu_mark_areas_for_dynamic_regions(dyn_region_areas,
 						 dyn_region_areas_num) == -EINVAL) {
@@ -281,7 +281,7 @@ void arm_core_mpu_mark_areas_for_dynamic_regions(
  * @brief configure dynamic MPU regions.
  */
 void arm_core_mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
-	*dynamic_regions[], u8_t regions_num)
+	*dynamic_regions[], uint8_t regions_num)
 {
 	if (mpu_configure_dynamic_mpu_regions(dynamic_regions, regions_num)
 		== -EINVAL) {
@@ -301,7 +301,7 @@ void arm_core_mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
  */
 static int arm_mpu_init(struct device *arg)
 {
-	u32_t r_index;
+	uint32_t r_index;
 
 	if (mpu_config.num_regions > get_num_regions()) {
 		/* Attempt to configure more MPU regions than
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
index 08d903808c..01ffa4e692 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
@@ -25,7 +25,7 @@ static void mpu_init(void)
  * Note:
  *   The caller must provide a valid region index.
  */
-static void region_init(const u32_t index,
+static void region_init(const uint32_t index,
 	const struct arm_mpu_region *region_conf)
 {
 	/* Select the region you want to access */
@@ -71,7 +71,7 @@ static int mpu_partition_is_valid(const struct k_mem_partition *part)
  * power-of-two value, and the returned SIZE field value corresponds
  * to that power-of-two value.
  */
-static inline u32_t size_to_mpu_rasr_size(u32_t size)
+static inline uint32_t size_to_mpu_rasr_size(uint32_t size)
 {
 	/* The minimal supported region size is 32 bytes */
 	if (size <= 32U) {
@@ -98,7 +98,7 @@ static inline u32_t size_to_mpu_rasr_size(u32_t size)
  */
 static inline void get_region_attr_from_k_mem_partition_info(
 	arm_mpu_region_attr_t *p_attr,
-	const k_mem_partition_attr_t *attr, u32_t base, u32_t size)
+	const k_mem_partition_attr_t *attr, uint32_t base, uint32_t size)
 {
 	/* in ARMv7-M MPU the base address is not required
 	 * to determine region attributes
@@ -126,21 +126,21 @@ static inline int get_dyn_region_min_index(void)
  * This internal function converts the SIZE field value of MPU_RASR
  * to the region size (in bytes).
  */
-static inline u32_t mpu_rasr_size_to_size(u32_t rasr_size)
+static inline uint32_t mpu_rasr_size_to_size(uint32_t rasr_size)
 {
 	return 1 << (rasr_size + 1);
 }
 
-static inline u32_t mpu_region_get_base(u32_t index)
+static inline uint32_t mpu_region_get_base(uint32_t index)
 {
 	MPU->RNR = index;
 	return MPU->RBAR & MPU_RBAR_ADDR_Msk;
 }
 
-static inline u32_t mpu_region_get_size(u32_t index)
+static inline uint32_t mpu_region_get_size(uint32_t index)
 {
 	MPU->RNR = index;
-	u32_t rasr_size = (MPU->RASR & MPU_RASR_SIZE_Msk) >> MPU_RASR_SIZE_Pos;
+	uint32_t rasr_size = (MPU->RASR & MPU_RASR_SIZE_Msk) >> MPU_RASR_SIZE_Pos;
 
 	return mpu_rasr_size_to_size(rasr_size);
 }
@@ -151,11 +151,11 @@ static inline u32_t mpu_region_get_size(u32_t index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_enabled_region(u32_t index)
+static inline int is_enabled_region(uint32_t index)
 {
 	/* Lock IRQs to ensure RNR value is correct when reading RASR. */
 	unsigned int key;
-	u32_t rasr;
+	uint32_t rasr;
 
 	key = irq_lock();
 	MPU->RNR = index;
@@ -177,11 +177,11 @@ static inline int is_enabled_region(u32_t index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline u32_t get_region_ap(u32_t r_index)
+static inline uint32_t get_region_ap(uint32_t r_index)
 {
 	/* Lock IRQs to ensure RNR value is correct when reading RASR. */
 	unsigned int key;
-	u32_t rasr;
+	uint32_t rasr;
 
 	key = irq_lock();
 	MPU->RNR = r_index;
@@ -197,16 +197,16 @@ static inline u32_t get_region_ap(u32_t r_index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_in_region(u32_t r_index, u32_t start, u32_t size)
+static inline int is_in_region(uint32_t r_index, uint32_t start, uint32_t size)
 {
-	u32_t r_addr_start;
-	u32_t r_size_lshift;
-	u32_t r_addr_end;
-	u32_t end;
+	uint32_t r_addr_start;
+	uint32_t r_size_lshift;
+	uint32_t r_addr_end;
+	uint32_t end;
 
 	/* Lock IRQs to ensure RNR value is correct when reading RBAR, RASR. */
 	unsigned int key;
-	u32_t rbar, rasr;
+	uint32_t rbar, rasr;
 
 	key = irq_lock();
 	MPU->RNR = r_index;
@@ -237,9 +237,9 @@ static inline int is_in_region(u32_t r_index, u32_t start, u32_t size)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_user_accessible_region(u32_t r_index, int write)
+static inline int is_user_accessible_region(uint32_t r_index, int write)
 {
-	u32_t r_ap = get_region_ap(r_index);
+	uint32_t r_ap = get_region_ap(r_index);
 
 
 	if (write) {
@@ -255,12 +255,12 @@ static inline int is_user_accessible_region(u32_t r_index, int write)
  */
 static inline int mpu_buffer_validate(void *addr, size_t size, int write)
 {
-	s32_t r_index;
+	int32_t r_index;
 
 	/* Iterate all mpu regions in reversed order */
 	for (r_index = get_num_regions() - 1; r_index >= 0;  r_index--) {
 		if (!is_enabled_region(r_index) ||
-		    !is_in_region(r_index, (u32_t)addr, size)) {
+		    !is_in_region(r_index, (uint32_t)addr, size)) {
 			continue;
 		}
 
@@ -282,11 +282,11 @@ static inline int mpu_buffer_validate(void *addr, size_t size, int write)
 
 #endif /* CONFIG_USERSPACE */
 
-static int mpu_configure_region(const u8_t index,
+static int mpu_configure_region(const uint8_t index,
 	const struct k_mem_partition *new_region);
 
 static int mpu_configure_regions(const struct k_mem_partition
-	*regions[], u8_t regions_num, u8_t start_reg_index,
+	*regions[], uint8_t regions_num, uint8_t start_reg_index,
 	bool do_sanity_check);
 
 /* This internal function programs the static MPU regions.
@@ -298,9 +298,9 @@ static int mpu_configure_regions(const struct k_mem_partition
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_static_mpu_regions(const struct k_mem_partition
-	*static_regions[], const u8_t regions_num,
-	const u32_t background_area_base,
-	const u32_t background_area_end)
+	*static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_base,
+	const uint32_t background_area_end)
 {
 	int mpu_reg_index = static_regions_num;
 
@@ -327,7 +327,7 @@ static int mpu_configure_static_mpu_regions(const struct k_mem_partition
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
-	*dynamic_regions[], u8_t regions_num)
+	*dynamic_regions[], uint8_t regions_num)
 {
 	int mpu_reg_index = static_regions_num;
 
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
index 81d0d9bc43..e9c5a3c50a 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
@@ -57,7 +57,7 @@ static void mpu_init(void)
  * Note:
  *   The caller must provide a valid region index.
  */
-static void region_init(const u32_t index,
+static void region_init(const uint32_t index,
 	const struct arm_mpu_region *region_conf)
 {
 	ARM_MPU_SetRegion(
@@ -116,10 +116,10 @@ static int mpu_partition_is_valid(const struct k_mem_partition *part)
  * needs to be enabled.
  *
  */
-static inline int get_region_index(u32_t start, u32_t size)
+static inline int get_region_index(uint32_t start, uint32_t size)
 {
-	u32_t region_start_addr = arm_cmse_mpu_region_get(start);
-	u32_t region_end_addr = arm_cmse_mpu_region_get(start + size - 1);
+	uint32_t region_start_addr = arm_cmse_mpu_region_get(start);
+	uint32_t region_end_addr = arm_cmse_mpu_region_get(start + size - 1);
 
 	/* MPU regions are contiguous so return the region number,
 	 * if both start and end address are in the same region.
@@ -130,33 +130,33 @@ static inline int get_region_index(u32_t start, u32_t size)
 	return -EINVAL;
 }
 
-static inline u32_t mpu_region_get_base(const u32_t index)
+static inline uint32_t mpu_region_get_base(const uint32_t index)
 {
 	MPU->RNR = index;
 	return MPU->RBAR & MPU_RBAR_BASE_Msk;
 }
 
-static inline void mpu_region_set_base(const u32_t index, const u32_t base)
+static inline void mpu_region_set_base(const uint32_t index, const uint32_t base)
 {
 	MPU->RNR = index;
 	MPU->RBAR = (MPU->RBAR & (~MPU_RBAR_BASE_Msk))
 		| (base & MPU_RBAR_BASE_Msk);
 }
 
-static inline u32_t mpu_region_get_last_addr(const u32_t index)
+static inline uint32_t mpu_region_get_last_addr(const uint32_t index)
 {
 	MPU->RNR = index;
 	return (MPU->RLAR & MPU_RLAR_LIMIT_Msk) | (~MPU_RLAR_LIMIT_Msk);
 }
 
-static inline void mpu_region_set_limit(const u32_t index, const u32_t limit)
+static inline void mpu_region_set_limit(const uint32_t index, const uint32_t limit)
 {
 	MPU->RNR = index;
 	MPU->RLAR = (MPU->RLAR & (~MPU_RLAR_LIMIT_Msk))
 		| (limit & MPU_RLAR_LIMIT_Msk);
 }
 
-static inline void mpu_region_get_access_attr(const u32_t index,
+static inline void mpu_region_get_access_attr(const uint32_t index,
 	arm_mpu_region_attr_t *attr)
 {
 	MPU->RNR = index;
@@ -167,7 +167,7 @@ static inline void mpu_region_get_access_attr(const u32_t index,
 		MPU_RLAR_AttrIndx_Pos;
 }
 
-static inline void mpu_region_get_conf(const u32_t index,
+static inline void mpu_region_get_conf(const uint32_t index,
 	struct arm_mpu_region *region_conf)
 {
 	MPU->RNR = index;
@@ -193,7 +193,7 @@ static inline void mpu_region_get_conf(const u32_t index,
  */
 static inline void get_region_attr_from_k_mem_partition_info(
 	arm_mpu_region_attr_t *p_attr,
-	const k_mem_partition_attr_t *attr, u32_t base, u32_t size)
+	const k_mem_partition_attr_t *attr, uint32_t base, uint32_t size)
 {
 	p_attr->rbar = attr->rbar &
 		(MPU_RBAR_XN_Msk | MPU_RBAR_AP_Msk | MPU_RBAR_SH_Msk);
@@ -228,7 +228,7 @@ static inline int get_dyn_region_min_index(void)
 	return dyn_reg_min_index;
 }
 
-static inline u32_t mpu_region_get_size(u32_t index)
+static inline uint32_t mpu_region_get_size(uint32_t index)
 {
 	return mpu_region_get_last_addr(index) + 1
 		- mpu_region_get_base(index);
@@ -240,7 +240,7 @@ static inline u32_t mpu_region_get_size(u32_t index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_enabled_region(u32_t index)
+static inline int is_enabled_region(uint32_t index)
 {
 	MPU->RNR = index;
 
@@ -272,8 +272,8 @@ static inline int is_enabled_region(u32_t index)
  */
 static inline int mpu_buffer_validate(void *addr, size_t size, int write)
 {
-	u32_t _addr = (u32_t)addr;
-	u32_t _size = (u32_t)size;
+	uint32_t _addr = (uint32_t)addr;
+	uint32_t _size = (uint32_t)size;
 
 	if (write) {
 		if (arm_cmse_addr_range_readwrite_ok(_addr, _size, 1)) {
@@ -290,8 +290,8 @@ static inline int mpu_buffer_validate(void *addr, size_t size, int write)
 	 * Validation failure may be due to SAU/IDAU presence.
 	 * We re-check user accessibility based on MPU only.
 	 */
-	s32_t r_index_base = arm_cmse_mpu_region_get(_addr);
-	s32_t r_index_last = arm_cmse_mpu_region_get(_addr + _size - 1);
+	int32_t r_index_base = arm_cmse_mpu_region_get(_addr);
+	int32_t r_index_last = arm_cmse_mpu_region_get(_addr + _size - 1);
 
 	if ((r_index_base != -EINVAL) && (r_index_base == r_index_last)) {
 		/* Valid MPU region, check permissions on base address only. */
@@ -312,15 +312,15 @@ static inline int mpu_buffer_validate(void *addr, size_t size, int write)
 
 #endif /* CONFIG_USERSPACE */
 
-static int region_allocate_and_init(const u8_t index,
+static int region_allocate_and_init(const uint8_t index,
 	const struct arm_mpu_region *region_conf);
 
-static int mpu_configure_region(const u8_t index,
+static int mpu_configure_region(const uint8_t index,
 	const struct k_mem_partition *new_region);
 
 #if !defined(CONFIG_MPU_GAP_FILLING)
 static int mpu_configure_regions(const struct k_mem_partition
-	*regions[], u8_t regions_num, u8_t start_reg_index,
+	*regions[], uint8_t regions_num, uint8_t start_reg_index,
 	bool do_sanity_check);
 #endif
 
@@ -332,7 +332,7 @@ static int mpu_configure_regions(const struct k_mem_partition
  * area, effectively, leaving no space in this area uncovered by MPU.
  */
 static int mpu_configure_regions_and_partition(const struct k_mem_partition
-	*regions[], u8_t regions_num, u8_t start_reg_index,
+	*regions[], uint8_t regions_num, uint8_t start_reg_index,
 	bool do_sanity_check)
 {
 	int i;
@@ -367,9 +367,9 @@ static int mpu_configure_regions_and_partition(const struct k_mem_partition
 		 * The new memory region is to be placed inside the underlying
 		 * region, possibly splitting the underlying region into two.
 		 */
-		u32_t u_reg_base = mpu_region_get_base(u_reg_index);
-		u32_t u_reg_last = mpu_region_get_last_addr(u_reg_index);
-		u32_t reg_last = regions[i]->start + regions[i]->size - 1;
+		uint32_t u_reg_base = mpu_region_get_base(u_reg_index);
+		uint32_t u_reg_last = mpu_region_get_last_addr(u_reg_index);
+		uint32_t reg_last = regions[i]->start + regions[i]->size - 1;
 
 		if ((regions[i]->start == u_reg_base) &&
 			(reg_last == u_reg_last)) {
@@ -468,9 +468,9 @@ static int mpu_configure_regions_and_partition(const struct k_mem_partition
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_static_mpu_regions(const struct k_mem_partition
-	*static_regions[], const u8_t regions_num,
-	const u32_t background_area_base,
-	const u32_t background_area_end)
+	*static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_base,
+	const uint32_t background_area_end)
 {
 	int mpu_reg_index = static_regions_num;
 
@@ -495,7 +495,7 @@ static int mpu_configure_static_mpu_regions(const struct k_mem_partition
  */
 static int mpu_mark_areas_for_dynamic_regions(
 		const struct k_mem_partition dyn_region_areas[],
-		const u8_t dyn_region_areas_num)
+		const uint8_t dyn_region_areas_num)
 {
 	/* In ARMv8-M architecture we need to store the index values
 	 * and the default configuration of the MPU regions, inside
@@ -539,7 +539,7 @@ static int mpu_mark_areas_for_dynamic_regions(
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
-	*dynamic_regions[], u8_t regions_num)
+	*dynamic_regions[], uint8_t regions_num)
 {
 	int mpu_reg_index = static_regions_num;
 
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c
index 6451591e2a..af4aa46898 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c
+++ b/arch/arm/core/aarch32/cortex_m/mpu/nxp_mpu.c
@@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(mpu);
  * have been reserved by the MPU driver to program the static (fixed) memory
  * regions.
  */
-static u8_t static_regions_num;
+static uint8_t static_regions_num;
 
 /* Global MPU configuration at system initialization. */
 static void mpu_init(void)
@@ -34,7 +34,7 @@ static void mpu_init(void)
 /**
  *  Get the number of supported MPU regions.
  */
-static inline u8_t get_num_regions(void)
+static inline uint8_t get_num_regions(void)
 {
 	return FSL_FEATURE_SYSMPU_DESCRIPTOR_COUNT;
 }
@@ -71,12 +71,12 @@ static int mpu_partition_is_valid(const struct k_mem_partition *part)
  * Note:
  *   The caller must provide a valid region index.
  */
-static void region_init(const u32_t index,
+static void region_init(const uint32_t index,
 	const struct nxp_mpu_region *region_conf)
 {
-	u32_t region_base = region_conf->base;
-	u32_t region_end = region_conf->end;
-	u32_t region_attr = region_conf->attr.attr;
+	uint32_t region_base = region_conf->base;
+	uint32_t region_end = region_conf->end;
+	uint32_t region_attr = region_conf->attr.attr;
 
 	if (index == 0U) {
 		/* The MPU does not allow writes from the core to affect the
@@ -88,11 +88,11 @@ static void region_init(const u32_t index,
 		 */
 		__ASSERT(region_base == SYSMPU->WORD[index][0],
 			 "Region %d base address got 0x%08x expected 0x%08x",
-			 index, region_base, (u32_t)SYSMPU->WORD[index][0]);
+			 index, region_base, (uint32_t)SYSMPU->WORD[index][0]);
 
 		__ASSERT(region_end == SYSMPU->WORD[index][1],
 			 "Region %d end address got 0x%08x expected 0x%08x",
-			 index, region_end, (u32_t)SYSMPU->WORD[index][1]);
+			 index, region_end, (uint32_t)SYSMPU->WORD[index][1]);
 
 		/* Changes to the RGD0_WORD2 alterable fields should be done
 		 * via a write to RGDAAC0.
@@ -107,14 +107,14 @@ static void region_init(const u32_t index,
 	}
 
 	LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x", index,
-		    (u32_t)SYSMPU->WORD[index][0],
-		    (u32_t)SYSMPU->WORD[index][1],
-		    (u32_t)SYSMPU->WORD[index][2],
-		    (u32_t)SYSMPU->WORD[index][3]);
+		    (uint32_t)SYSMPU->WORD[index][0],
+		    (uint32_t)SYSMPU->WORD[index][1],
+		    (uint32_t)SYSMPU->WORD[index][2],
+		    (uint32_t)SYSMPU->WORD[index][3]);
 
 }
 
-static int region_allocate_and_init(const u8_t index,
+static int region_allocate_and_init(const uint8_t index,
 	const struct nxp_mpu_region *region_conf)
 {
 	/* Attempt to allocate new region index. */
@@ -140,7 +140,7 @@ static int region_allocate_and_init(const u8_t index,
  */
 static inline void get_region_attr_from_k_mem_partition_info(
 	nxp_mpu_region_attr_t *p_attr,
-	const k_mem_partition_attr_t *attr, u32_t base, u32_t size)
+	const k_mem_partition_attr_t *attr, uint32_t base, uint32_t size)
 {
 	/* in NXP MPU the base address and size are not required
 	 * to determine region attributes
@@ -154,7 +154,7 @@ static inline void get_region_attr_from_k_mem_partition_info(
 /* This internal function programs an MPU region
  * of a given configuration at a given MPU index.
  */
-static int mpu_configure_region(const u8_t index,
+static int mpu_configure_region(const uint8_t index,
 	const struct k_mem_partition *new_region)
 {
 	struct nxp_mpu_region region_conf;
@@ -174,7 +174,7 @@ static int mpu_configure_region(const u8_t index,
 
 #if defined(CONFIG_MPU_STACK_GUARD)
 /* This internal function partitions the SRAM MPU region */
-static int mpu_sram_partitioning(u8_t index,
+static int mpu_sram_partitioning(uint8_t index,
 	const struct k_mem_partition *p_region)
 {
 	/*
@@ -234,7 +234,7 @@ static int mpu_sram_partitioning(u8_t index,
  * sanity check of the memory regions to be programmed.
  */
 static int mpu_configure_regions(const struct k_mem_partition
-	*regions[], u8_t regions_num, u8_t start_reg_index,
+	*regions[], uint8_t regions_num, uint8_t start_reg_index,
 	bool do_sanity_check)
 {
 	int i;
@@ -294,9 +294,9 @@ static int mpu_configure_regions(const struct k_mem_partition
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_static_mpu_regions(const struct k_mem_partition
-	*static_regions[], const u8_t regions_num,
-	const u32_t background_area_base,
-	const u32_t background_area_end)
+	*static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_base,
+	const uint32_t background_area_end)
 {
 	int mpu_reg_index = static_regions_num;
 
@@ -323,7 +323,7 @@ static int mpu_configure_static_mpu_regions(const struct k_mem_partition
  * performed, the error signal is propagated to the caller of the function.
  */
 static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
-	*dynamic_regions[], u8_t regions_num)
+	*dynamic_regions[], uint8_t regions_num)
 {
 	unsigned int key;
 
@@ -397,12 +397,12 @@ void arm_core_mpu_disable(void)
 
 #if defined(CONFIG_USERSPACE)
 
-static inline u32_t mpu_region_get_base(u32_t r_index)
+static inline uint32_t mpu_region_get_base(uint32_t r_index)
 {
 	return SYSMPU->WORD[r_index][0];
 }
 
-static inline u32_t mpu_region_get_size(u32_t r_index)
+static inline uint32_t mpu_region_get_size(uint32_t r_index)
 {
 	/* <END> + 1 - <BASE> */
 	return (SYSMPU->WORD[r_index][1] + 1) - SYSMPU->WORD[r_index][0];
@@ -414,7 +414,7 @@ static inline u32_t mpu_region_get_size(u32_t r_index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_enabled_region(u32_t r_index)
+static inline int is_enabled_region(uint32_t r_index)
 {
 	return SYSMPU->WORD[r_index][3] & SYSMPU_WORD_VLD_MASK;
 }
@@ -425,11 +425,11 @@ static inline int is_enabled_region(u32_t r_index)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_in_region(u32_t r_index, u32_t start, u32_t size)
+static inline int is_in_region(uint32_t r_index, uint32_t start, uint32_t size)
 {
-	u32_t r_addr_start;
-	u32_t r_addr_end;
-	u32_t end;
+	uint32_t r_addr_start;
+	uint32_t r_addr_end;
+	uint32_t end;
 
 	r_addr_start = SYSMPU->WORD[r_index][0];
 	r_addr_end = SYSMPU->WORD[r_index][1];
@@ -454,21 +454,21 @@ void arm_core_mpu_mem_partition_config_update(
 	k_mem_partition_attr_t *new_attr)
 {
 	/* Find the partition. ASSERT if not found. */
-	u8_t i;
-	u8_t reg_index = get_num_regions();
+	uint8_t i;
+	uint8_t reg_index = get_num_regions();
 
 	for (i = static_regions_num; i < get_num_regions(); i++) {
 		if (!is_enabled_region(i)) {
 			continue;
 		}
 
-		u32_t base = mpu_region_get_base(i);
+		uint32_t base = mpu_region_get_base(i);
 
 		if (base != partition->start) {
 			continue;
 		}
 
-		u32_t size = mpu_region_get_size(i);
+		uint32_t size = mpu_region_get_size(i);
 
 		if (size != partition->size) {
 			continue;
@@ -501,9 +501,9 @@ int arm_core_mpu_get_max_available_dyn_regions(void)
  * Note:
  *   The caller must provide a valid region number.
  */
-static inline int is_user_accessible_region(u32_t r_index, int write)
+static inline int is_user_accessible_region(uint32_t r_index, int write)
 {
-	u32_t r_ap = SYSMPU->WORD[r_index][2];
+	uint32_t r_ap = SYSMPU->WORD[r_index][2];
 
 	if (write) {
 		return (r_ap & MPU_REGION_WRITE) == MPU_REGION_WRITE;
@@ -517,12 +517,12 @@ static inline int is_user_accessible_region(u32_t r_index, int write)
  */
 int arm_core_mpu_buffer_validate(void *addr, size_t size, int write)
 {
-	u8_t r_index;
+	uint8_t r_index;
 
 	/* Iterate through all MPU regions */
 	for (r_index = 0U; r_index < get_num_regions(); r_index++) {
 		if (!is_enabled_region(r_index) ||
-		    !is_in_region(r_index, (u32_t)addr, size)) {
+		    !is_in_region(r_index, (uint32_t)addr, size)) {
 			continue;
 		}
 
@@ -545,8 +545,8 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write)
  * @brief configure fixed (static) MPU regions.
  */
 void arm_core_mpu_configure_static_mpu_regions(const struct k_mem_partition
-	*static_regions[], const u8_t regions_num,
-	const u32_t background_area_start, const u32_t background_area_end)
+	*static_regions[], const uint8_t regions_num,
+	const uint32_t background_area_start, const uint32_t background_area_end)
 {
 	if (mpu_configure_static_mpu_regions(static_regions, regions_num,
 					     background_area_start, background_area_end) == -EINVAL) {
@@ -560,7 +560,7 @@ void arm_core_mpu_configure_static_mpu_regions(const struct k_mem_partition
  * @brief configure dynamic MPU regions.
  */
 void arm_core_mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
-	*dynamic_regions[], u8_t regions_num)
+	*dynamic_regions[], uint8_t regions_num)
 {
 	if (mpu_configure_dynamic_mpu_regions(dynamic_regions, regions_num)
 		== -EINVAL) {
@@ -582,7 +582,7 @@ static int nxp_mpu_init(struct device *arg)
 {
 	ARG_UNUSED(arg);
 
-	u32_t r_index;
+	uint32_t r_index;
 
 	if (mpu_config.num_regions > get_num_regions()) {
 		/* Attempt to configure more MPU regions than
diff --git a/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
index 125d917777..ddebeff459 100644
--- a/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
+++ b/arch/arm/core/aarch32/cortex_m/tz/arm_core_tz.c
@@ -8,24 +8,24 @@
 #include <aarch32/cortex_m/tz.h>
 #include <aarch32/cortex_m/exc.h>
 
-static void configure_nonsecure_vtor_offset(u32_t vtor_ns)
+static void configure_nonsecure_vtor_offset(uint32_t vtor_ns)
 {
 	SCB_NS->VTOR = vtor_ns;
 }
 
-static void configure_nonsecure_msp(u32_t msp_ns)
+static void configure_nonsecure_msp(uint32_t msp_ns)
 {
 	__TZ_set_MSP_NS(msp_ns);
 }
 
-static void configure_nonsecure_psp(u32_t psp_ns)
+static void configure_nonsecure_psp(uint32_t psp_ns)
 {
 	__TZ_set_PSP_NS(psp_ns);
 }
 
-static void configure_nonsecure_control(u32_t spsel_ns, u32_t npriv_ns)
+static void configure_nonsecure_control(uint32_t spsel_ns, uint32_t npriv_ns)
 {
-	u32_t control_ns = __TZ_get_CONTROL_NS();
+	uint32_t control_ns = __TZ_get_CONTROL_NS();
 
 	/* Only nPRIV and SPSEL bits are banked between security states. */
 	control_ns &= ~(CONTROL_SPSEL_Msk | CONTROL_nPRIV_Msk);
@@ -46,12 +46,12 @@ static void configure_nonsecure_control(u32_t spsel_ns, u32_t npriv_ns)
  * Stack Pointer Limit registers.
  */
 
-void tz_nonsecure_msplim_set(u32_t val)
+void tz_nonsecure_msplim_set(uint32_t val)
 {
 	__TZ_set_MSPLIM_NS(val);
 }
 
-void tz_nonsecure_psplim_set(u32_t val)
+void tz_nonsecure_psplim_set(uint32_t val)
 {
 	__TZ_set_PSPLIM_NS(val);
 }
@@ -71,7 +71,7 @@ void tz_nonsecure_state_setup(const tz_nonsecure_setup_conf_t *p_ns_conf)
 
 void tz_nbanked_exception_target_state_set(int secure_state)
 {
-	u32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
+	uint32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
 	if (secure_state) {
 		aircr_payload &= ~(SCB_AIRCR_BFHFNMINS_Msk);
 	} else {
@@ -84,7 +84,7 @@ void tz_nbanked_exception_target_state_set(int secure_state)
 
 void tz_nonsecure_exception_prio_config(int secure_boost)
 {
-	u32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
+	uint32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
 	if (secure_boost) {
 		aircr_payload |= SCB_AIRCR_PRIS_Msk;
 	} else {
@@ -97,7 +97,7 @@ void tz_nonsecure_exception_prio_config(int secure_boost)
 
 void tz_nonsecure_system_reset_req_block(int block)
 {
-	u32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
+	uint32_t aircr_payload = SCB->AIRCR & (~(SCB_AIRCR_VECTKEY_Msk));
 	if (block) {
 		aircr_payload |= SCB_AIRCR_SYSRESETREQS_Msk;
 	} else {
@@ -130,7 +130,7 @@ void tz_sau_configure(int enable, int allns)
 	}
 }
 
-u32_t tz_sau_number_of_regions_get(void)
+uint32_t tz_sau_number_of_regions_get(void)
 {
 	return SAU->TYPE & SAU_TYPE_SREGION_Msk;
 }
@@ -139,7 +139,7 @@ u32_t tz_sau_number_of_regions_get(void)
 #if defined (__SAUREGION_PRESENT) && (__SAUREGION_PRESENT == 1U)
 int tz_sau_region_configure_enable(tz_sau_conf_t *p_sau_conf)
 {
-	u32_t regions = tz_sau_number_of_regions_get();
+	uint32_t regions = tz_sau_number_of_regions_get();
 
 	if ((p_sau_conf->region_num == 0) ||
 		(p_sau_conf->region_num > (regions - 1))) {
diff --git a/arch/arm/core/aarch32/fatal.c b/arch/arm/core/aarch32/fatal.c
index 849a4ee69c..2021a4b2cb 100644
--- a/arch/arm/core/aarch32/fatal.c
+++ b/arch/arm/core/aarch32/fatal.c
@@ -27,10 +27,10 @@ static void esf_dump(const z_arch_esf_t *esf)
 	for (int i = 0; i < 16; i += 4) {
 		LOG_ERR("s[%2d]:  0x%08x  s[%2d]:  0x%08x"
 			"  s[%2d]:  0x%08x  s[%2d]:  0x%08x",
-			i, (u32_t)esf->s[i],
-			i + 1, (u32_t)esf->s[i + 1],
-			i + 2, (u32_t)esf->s[i + 2],
-			i + 3, (u32_t)esf->s[i + 3]);
+			i, (uint32_t)esf->s[i],
+			i + 1, (uint32_t)esf->s[i + 1],
+			i + 2, (uint32_t)esf->s[i + 2],
+			i + 3, (uint32_t)esf->s[i + 3]);
 	}
 	LOG_ERR("fpscr:  0x%08x", esf->fpscr);
 #endif
@@ -88,7 +88,7 @@ void z_do_kernel_oops(const z_arch_esf_t *esf)
 
 FUNC_NORETURN void arch_syscall_oops(void *ssf_ptr)
 {
-	u32_t *ssf_contents = ssf_ptr;
+	uint32_t *ssf_contents = ssf_ptr;
 	z_arch_esf_t oops_esf = { 0 };
 
 	/* TODO: Copy the rest of the register set out of ssf_ptr */
diff --git a/arch/arm/core/aarch32/irq_manage.c b/arch/arm/core/aarch32/irq_manage.c
index 7fdcfec332..fae6ae6c71 100644
--- a/arch/arm/core/aarch32/irq_manage.c
+++ b/arch/arm/core/aarch32/irq_manage.c
@@ -61,7 +61,7 @@ int arch_irq_is_enabled(unsigned int irq)
  *
  * @return N/A
  */
-void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
+void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	/* The kernel may reserve some of the highest priority levels.
 	 * So we offset the requested priority level with the number
@@ -135,7 +135,7 @@ int arch_irq_is_enabled(unsigned int irq)
  *
  * @return N/A
  */
-void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
+void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	arm_gic_irq_set_priority(irq, prio, flags);
 }
@@ -181,7 +181,7 @@ void _arch_isr_direct_pm(void)
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
 
 	if (_kernel.idle) {
-		s32_t idle_val = _kernel.idle;
+		int32_t idle_val = _kernel.idle;
 
 		_kernel.idle = 0;
 		z_sys_power_save_idle_exit(idle_val);
@@ -258,7 +258,7 @@ int irq_target_state_is_secure(unsigned int irq)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter), void *parameter,
-			     u32_t flags)
+			     uint32_t flags)
 {
 	z_isr_install(irq, routine, parameter);
 	z_arm_irq_priority_set(irq, priority, flags);
@@ -268,7 +268,7 @@ int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 #ifdef CONFIG_DYNAMIC_DIRECT_INTERRUPTS
 static inline void z_arm_irq_dynamic_direct_isr_dispatch(void)
 {
-	u32_t irq = __get_IPSR() - 16;
+	uint32_t irq = __get_IPSR() - 16;
 
 	if (irq < IRQ_TABLE_SIZE) {
 		struct _isr_table_entry *isr_entry = &_sw_isr_table[irq];
diff --git a/arch/arm/core/aarch32/thread.c b/arch/arm/core/aarch32/thread.c
index bd72b44f61..14893cb08c 100644
--- a/arch/arm/core/aarch32/thread.c
+++ b/arch/arm/core/aarch32/thread.c
@@ -36,7 +36,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	char *pStackMem = Z_THREAD_STACK_BUFFER(stack);
 	char *stackEnd;
 	/* Offset between the top of stack and the high end of stack area. */
-	u32_t top_of_stack_offset = 0U;
+	uint32_t top_of_stack_offset = 0U;
 
 #if defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT) \
 	&& defined(CONFIG_USERSPACE)
@@ -58,14 +58,14 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 
 #ifdef CONFIG_THREAD_USERSPACE_LOCAL_DATA
 	/* Reserve space on top of stack for local data. */
-	u32_t p_local_data = Z_STACK_PTR_ALIGN(pStackMem + stackSize
+	uint32_t p_local_data = Z_STACK_PTR_ALIGN(pStackMem + stackSize
 		- sizeof(*thread->userspace_local_data));
 
 	thread->userspace_local_data =
 		(struct _thread_userspace_local_data *)(p_local_data);
 
 	/* Top of actual stack must be moved below the user local data. */
-	top_of_stack_offset = (u32_t)
+	top_of_stack_offset = (uint32_t)
 		(pStackMem + stackSize - ((char *)p_local_data));
 
 #endif /* CONFIG_THREAD_USERSPACE_LOCAL_DATA */
@@ -105,12 +105,12 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 
 #if defined(CONFIG_USERSPACE)
 	if ((options & K_USER) != 0) {
-		pInitCtx->basic.pc = (u32_t)arch_user_mode_enter;
+		pInitCtx->basic.pc = (uint32_t)arch_user_mode_enter;
 	} else {
-		pInitCtx->basic.pc = (u32_t)z_thread_entry;
+		pInitCtx->basic.pc = (uint32_t)z_thread_entry;
 	}
 #else
-	pInitCtx->basic.pc = (u32_t)z_thread_entry;
+	pInitCtx->basic.pc = (uint32_t)z_thread_entry;
 #endif
 
 #if defined(CONFIG_CPU_CORTEX_M)
@@ -118,10 +118,10 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	pInitCtx->basic.pc &= 0xfffffffe;
 #endif
 
-	pInitCtx->basic.a1 = (u32_t)pEntry;
-	pInitCtx->basic.a2 = (u32_t)parameter1;
-	pInitCtx->basic.a3 = (u32_t)parameter2;
-	pInitCtx->basic.a4 = (u32_t)parameter3;
+	pInitCtx->basic.a1 = (uint32_t)pEntry;
+	pInitCtx->basic.a2 = (uint32_t)parameter1;
+	pInitCtx->basic.a3 = (uint32_t)parameter2;
+	pInitCtx->basic.a4 = (uint32_t)parameter3;
 
 #if defined(CONFIG_CPU_CORTEX_M)
 	pInitCtx->basic.xpsr =
@@ -133,7 +133,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 #endif /* CONFIG_COMPILER_ISA_THUMB2 */
 #endif /* CONFIG_CPU_CORTEX_M */
 
-	thread->callee_saved.psp = (u32_t)pInitCtx;
+	thread->callee_saved.psp = (uint32_t)pInitCtx;
 
 	thread->arch.basepri = 0;
 
@@ -160,7 +160,7 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 
 	/* Set up privileged stack before entering user mode */
 	_current->arch.priv_stack_start =
-		(u32_t)z_priv_stack_find(_current->stack_obj);
+		(uint32_t)z_priv_stack_find(_current->stack_obj);
 #if defined(CONFIG_MPU_STACK_GUARD)
 	/* Stack guard area reserved at the bottom of the thread's
 	 * privileged stack. Adjust the available (writable) stack
@@ -176,7 +176,7 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
 #endif /* CONFIG_MPU_STACK_GUARD */
 
 	z_arm_userspace_enter(user_entry, p1, p2, p3,
-			     (u32_t)_current->stack_info.start,
+			     (uint32_t)_current->stack_info.start,
 			     _current->stack_info.size);
 	CODE_UNREACHABLE;
 }
@@ -211,17 +211,17 @@ void configure_builtin_stack_guard(struct k_thread *thread)
 	 * thread privileged stack being allocated in higher memory area
 	 * than the default thread stack (ensured by design).
 	 */
-	u32_t guard_start =
+	uint32_t guard_start =
 		((thread->arch.priv_stack_start) &&
 			(__get_PSP() >= thread->arch.priv_stack_start)) ?
-		(u32_t)thread->arch.priv_stack_start :
-		(u32_t)thread->stack_obj;
+		(uint32_t)thread->arch.priv_stack_start :
+		(uint32_t)thread->stack_obj;
 
-	__ASSERT(thread->stack_info.start == ((u32_t)thread->stack_obj),
+	__ASSERT(thread->stack_info.start == ((uint32_t)thread->stack_obj),
 		"stack_info.start does not point to the start of the"
 		"thread allocated area.");
 #else
-	u32_t guard_start = thread->stack_info.start;
+	uint32_t guard_start = thread->stack_info.start;
 #endif
 #if defined(CONFIG_CPU_CORTEX_M_HAS_SPLIM)
 	__set_PSPLIM(guard_start);
@@ -277,7 +277,7 @@ void configure_builtin_stack_guard(struct k_thread *thread)
  * @return The lowest allowed stack frame pointer, if error is a
  *         thread stack corruption, otherwise return 0.
  */
-u32_t z_check_thread_stack_fail(const u32_t fault_addr, const u32_t psp)
+uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp)
 {
 	const struct k_thread *thread = _current;
 
@@ -286,10 +286,10 @@ u32_t z_check_thread_stack_fail(const u32_t fault_addr, const u32_t psp)
 	}
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
-	u32_t guard_len = (thread->base.user_options & K_FP_REGS) ?
+	uint32_t guard_len = (thread->base.user_options & K_FP_REGS) ?
 		MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
 #else
-	u32_t guard_len = MPU_GUARD_ALIGN_AND_SIZE;
+	uint32_t guard_len = MPU_GUARD_ALIGN_AND_SIZE;
 #endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
 
 #if defined(CONFIG_USERSPACE)
@@ -305,9 +305,9 @@ u32_t z_check_thread_stack_fail(const u32_t fault_addr, const u32_t psp)
 				return thread->arch.priv_stack_start;
 			}
 		} else {
-			if (psp < (u32_t)thread->stack_obj) {
+			if (psp < (uint32_t)thread->stack_obj) {
 				/* Thread's user stack corruption */
-				return (u32_t)thread->stack_obj;
+				return (uint32_t)thread->stack_obj;
 			}
 		}
 	} else {
@@ -421,7 +421,7 @@ void arch_switch_to_main_thread(struct k_thread *main_thread,
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	/* Set PSPLIM register for built-in stack guarding of main thread. */
 #if defined(CONFIG_CPU_CORTEX_M_HAS_SPLIM)
-	__set_PSPLIM((u32_t)main_stack);
+	__set_PSPLIM((uint32_t)main_stack);
 #else
 #error "Built-in PSP limit checks not supported by HW"
 #endif
diff --git a/arch/arm/core/aarch64/arm_mmu.c b/arch/arm/core/aarch64/arm_mmu.c
index 1ee25f3c80..b208e599aa 100644
--- a/arch/arm/core/aarch64/arm_mmu.c
+++ b/arch/arm/core/aarch64/arm_mmu.c
@@ -90,19 +90,19 @@
 	((level) == 2) ? L2_SPACE : L3_SPACE)
 #endif
 
-static u64_t base_xlat_table[NUM_BASE_LEVEL_ENTRIES]
-		__aligned(NUM_BASE_LEVEL_ENTRIES * sizeof(u64_t));
+static uint64_t base_xlat_table[NUM_BASE_LEVEL_ENTRIES]
+		__aligned(NUM_BASE_LEVEL_ENTRIES * sizeof(uint64_t));
 
-static u64_t xlat_tables[CONFIG_MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES]
-		__aligned(XLAT_TABLE_ENTRIES * sizeof(u64_t));
+static uint64_t xlat_tables[CONFIG_MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES]
+		__aligned(XLAT_TABLE_ENTRIES * sizeof(uint64_t));
 
 /* Translation table control register settings */
-static u64_t get_tcr(int el)
+static uint64_t get_tcr(int el)
 {
-	u64_t tcr;
-	u64_t pa_bits = CONFIG_ARM64_PA_BITS;
-	u64_t va_bits = CONFIG_ARM64_VA_BITS;
-	u64_t tcr_ps_bits;
+	uint64_t tcr;
+	uint64_t pa_bits = CONFIG_ARM64_PA_BITS;
+	uint64_t va_bits = CONFIG_ARM64_VA_BITS;
+	uint64_t tcr_ps_bits;
 
 	switch (pa_bits) {
 	case 48:
@@ -145,20 +145,20 @@ static u64_t get_tcr(int el)
 	return tcr;
 }
 
-static int pte_desc_type(u64_t *pte)
+static int pte_desc_type(uint64_t *pte)
 {
 	return *pte & PTE_DESC_TYPE_MASK;
 }
 
-static u64_t *calculate_pte_index(u64_t addr, int level)
+static uint64_t *calculate_pte_index(uint64_t addr, int level)
 {
 	int base_level = XLAT_TABLE_BASE_LEVEL;
-	u64_t *pte;
-	u64_t idx;
+	uint64_t *pte;
+	uint64_t idx;
 	unsigned int i;
 
 	/* Walk through all translation tables to find pte index */
-	pte = (u64_t *)base_xlat_table;
+	pte = (uint64_t *)base_xlat_table;
 	for (i = base_level; i <= XLAT_TABLE_LEVEL_MAX; i++) {
 		idx = XLAT_TABLE_VA_IDX(addr, i);
 		pte += idx;
@@ -170,26 +170,26 @@ static u64_t *calculate_pte_index(u64_t addr, int level)
 		if (pte_desc_type(pte) != PTE_TABLE_DESC)
 			return NULL;
 		/* Move to the next translation table level */
-		pte = (u64_t *)(*pte & 0x0000fffffffff000ULL);
+		pte = (uint64_t *)(*pte & 0x0000fffffffff000ULL);
 	}
 
 	return NULL;
 }
 
-static void set_pte_table_desc(u64_t *pte, u64_t *table, unsigned int level)
+static void set_pte_table_desc(uint64_t *pte, uint64_t *table, unsigned int level)
 {
 #if DUMP_PTE
 	MMU_DEBUG("%s", XLAT_TABLE_LEVEL_SPACE(level));
 	MMU_DEBUG("%p: [Table] %p\n", pte, table);
 #endif
 	/* Point pte to new table */
-	*pte = PTE_TABLE_DESC | (u64_t)table;
+	*pte = PTE_TABLE_DESC | (uint64_t)table;
 }
 
-static void set_pte_block_desc(u64_t *pte, u64_t addr_pa,
+static void set_pte_block_desc(uint64_t *pte, uint64_t addr_pa,
 			       unsigned int attrs, unsigned int level)
 {
-	u64_t desc = addr_pa;
+	uint64_t desc = addr_pa;
 	unsigned int mem_type;
 
 	desc |= (level == 3) ? PTE_PAGE_DESC : PTE_BLOCK_DESC;
@@ -247,21 +247,21 @@ static void set_pte_block_desc(u64_t *pte, u64_t addr_pa,
 }
 
 /* Returns a new reallocated table */
-static u64_t *new_prealloc_table(void)
+static uint64_t *new_prealloc_table(void)
 {
 	static unsigned int table_idx;
 
 	__ASSERT(table_idx < CONFIG_MAX_XLAT_TABLES,
 		"Enough xlat tables not allocated");
 
-	return (u64_t *)(xlat_tables[table_idx++]);
+	return (uint64_t *)(xlat_tables[table_idx++]);
 }
 
 /* Splits a block into table with entries spanning the old block */
-static void split_pte_block_desc(u64_t *pte, int level)
+static void split_pte_block_desc(uint64_t *pte, int level)
 {
-	u64_t old_block_desc = *pte;
-	u64_t *new_table;
+	uint64_t old_block_desc = *pte;
+	uint64_t *new_table;
 	unsigned int i = 0;
 	/* get address size shift bits for next level */
 	int levelshift = LEVEL_TO_VA_SIZE_SHIFT(level + 1);
@@ -284,13 +284,13 @@ static void split_pte_block_desc(u64_t *pte, int level)
 /* Create/Populate translation table(s) for given region */
 static void init_xlat_tables(const struct arm_mmu_region *region)
 {
-	u64_t *pte;
-	u64_t virt = region->base_va;
-	u64_t phys = region->base_pa;
-	u64_t size = region->size;
-	u64_t attrs = region->attrs;
-	u64_t level_size;
-	u64_t *new_table;
+	uint64_t *pte;
+	uint64_t virt = region->base_va;
+	uint64_t phys = region->base_pa;
+	uint64_t size = region->size;
+	uint64_t attrs = region->attrs;
+	uint64_t level_size;
+	uint64_t *new_table;
 	unsigned int level = XLAT_TABLE_BASE_LEVEL;
 
 	MMU_DEBUG("mmap: virt %llx phys %llx size %llx\n", virt, phys, size);
@@ -361,7 +361,7 @@ static void setup_page_tables(void)
 {
 	unsigned int index;
 	const struct arm_mmu_region *region;
-	u64_t max_va = 0, max_pa = 0;
+	uint64_t max_va = 0, max_pa = 0;
 
 	for (index = 0; index < mmu_config.num_regions; index++) {
 		region = &mmu_config.mmu_regions[index];
@@ -392,7 +392,7 @@ static void setup_page_tables(void)
 static void enable_mmu_el1(unsigned int flags)
 {
 	ARG_UNUSED(flags);
-	u64_t val;
+	uint64_t val;
 
 	/* Set MAIR, TCR and TBBR registers */
 	__asm__ volatile("msr mair_el1, %0"
@@ -405,7 +405,7 @@ static void enable_mmu_el1(unsigned int flags)
 			: "memory", "cc");
 	__asm__ volatile("msr ttbr0_el1, %0"
 			:
-			: "r" ((u64_t)base_xlat_table)
+			: "r" ((uint64_t)base_xlat_table)
 			: "memory", "cc");
 
 	/* Ensure these changes are seen before MMU is enabled */
@@ -434,7 +434,7 @@ static void enable_mmu_el1(unsigned int flags)
  */
 static int arm_mmu_init(struct device *arg)
 {
-	u64_t val;
+	uint64_t val;
 	unsigned int idx, flags = 0;
 
 	/* Current MMU code supports only EL1 */
@@ -449,9 +449,9 @@ static int arm_mmu_init(struct device *arg)
 
 	MMU_DEBUG("xlat tables:\n");
 	MMU_DEBUG("base table(L%d): %p, %d entries\n", XLAT_TABLE_BASE_LEVEL,
-			(u64_t *)base_xlat_table, NUM_BASE_LEVEL_ENTRIES);
+			(uint64_t *)base_xlat_table, NUM_BASE_LEVEL_ENTRIES);
 	for (idx = 0; idx < CONFIG_MAX_XLAT_TABLES; idx++)
-		MMU_DEBUG("%d: %p\n", idx, (u64_t *)(xlat_tables + idx));
+		MMU_DEBUG("%d: %p\n", idx, (uint64_t *)(xlat_tables + idx));
 
 	setup_page_tables();
 
diff --git a/arch/arm/core/aarch64/fatal.c b/arch/arm/core/aarch64/fatal.c
index b06100e12b..3be91bca56 100644
--- a/arch/arm/core/aarch64/fatal.c
+++ b/arch/arm/core/aarch64/fatal.c
@@ -17,9 +17,9 @@
 
 LOG_MODULE_DECLARE(os);
 
-static void print_EC_cause(u64_t esr)
+static void print_EC_cause(uint64_t esr)
 {
-	u32_t EC = (u32_t)esr >> 26;
+	uint32_t EC = (uint32_t)esr >> 26;
 
 	switch (EC) {
 	case 0b000000:
@@ -157,7 +157,7 @@ static void esf_dump(const z_arch_esf_t *esf)
 
 void z_arm64_fatal_error(unsigned int reason, const z_arch_esf_t *esf)
 {
-	u64_t el, esr, elr, far;
+	uint64_t el, esr, elr, far;
 
 	if (reason != K_ERR_SPURIOUS_IRQ) {
 		__asm__ volatile("mrs %0, CurrentEL" : "=r" (el));
diff --git a/arch/arm/core/aarch64/irq_manage.c b/arch/arm/core/aarch64/irq_manage.c
index 8219d0132f..b529f19fd5 100644
--- a/arch/arm/core/aarch64/irq_manage.c
+++ b/arch/arm/core/aarch64/irq_manage.c
@@ -47,7 +47,7 @@ int arch_irq_is_enabled(unsigned int irq)
 	return arm_gic_irq_is_enabled(irq);
 }
 
-void z_arm64_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
+void z_arm64_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	arm_gic_irq_set_priority(irq, prio, flags);
 }
@@ -56,7 +56,7 @@ void z_arm64_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter), void *parameter,
-			     u32_t flags)
+			     uint32_t flags)
 {
 	z_isr_install(irq, routine, parameter);
 	z_arm64_irq_priority_set(irq, priority, flags);
diff --git a/arch/arm/core/aarch64/thread.c b/arch/arm/core/aarch64/thread.c
index 633359290b..a1c876aafa 100644
--- a/arch/arm/core/aarch64/thread.c
+++ b/arch/arm/core/aarch64/thread.c
@@ -45,17 +45,17 @@ struct init_stack_frame {
 	/* top of the stack / most recently pushed */
 
 	/* SPSL_ELn and ELR_ELn */
-	u64_t spsr;
-	u64_t elr;
+	uint64_t spsr;
+	uint64_t elr;
 
 	/*
 	 * Used by z_thread_entry_wrapper. pulls these off the stack and
 	 * into argument registers before calling z_thread_entry()
 	 */
-	u64_t entry_point;
-	u64_t arg1;
-	u64_t arg2;
-	u64_t arg3;
+	uint64_t entry_point;
+	uint64_t arg1;
+	uint64_t arg2;
+	uint64_t arg3;
 
 	/* least recently pushed */
 };
@@ -76,10 +76,10 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	pInitCtx = (struct init_stack_frame *)(Z_STACK_PTR_ALIGN(stackEnd -
 				    sizeof(struct init_stack_frame)));
 
-	pInitCtx->entry_point = (u64_t)pEntry;
-	pInitCtx->arg1 = (u64_t)parameter1;
-	pInitCtx->arg2 = (u64_t)parameter2;
-	pInitCtx->arg3 = (u64_t)parameter3;
+	pInitCtx->entry_point = (uint64_t)pEntry;
+	pInitCtx->arg1 = (uint64_t)parameter1;
+	pInitCtx->arg2 = (uint64_t)parameter2;
+	pInitCtx->arg3 = (uint64_t)parameter3;
 
 	/*
 	 * - ELR_ELn: to be used by eret in z_thread_entry_wrapper() to return
@@ -88,7 +88,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	 * - SPSR_ELn: to enable IRQs (we are masking debug exceptions, SError
 	 *   interrupts and FIQs).
 	 */
-	pInitCtx->elr = (u64_t)z_thread_entry;
+	pInitCtx->elr = (uint64_t)z_thread_entry;
 	pInitCtx->spsr = SPSR_MODE_EL1H | DAIF_FIQ;
 
 	/*
@@ -100,6 +100,6 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	 *   task is first scheduled.
 	 */
 
-	thread->callee_saved.sp = (u64_t)pInitCtx;
-	thread->callee_saved.x30 = (u64_t)z_thread_entry_wrapper;
+	thread->callee_saved.sp = (uint64_t)pInitCtx;
+	thread->callee_saved.x30 = (uint64_t)z_thread_entry_wrapper;
 }
diff --git a/arch/arm/include/aarch32/cortex_m/cmse.h b/arch/arm/include/aarch32/cortex_m/cmse.h
index 6aed9a520c..ff5e5120d8 100644
--- a/arch/arm/include/aarch32/cortex_m/cmse.h
+++ b/arch/arm/include/aarch32/cortex_m/cmse.h
@@ -50,7 +50,7 @@ extern "C" {
  *
  * @return a valid MPU region number or -EINVAL
  */
-int arm_cmse_mpu_region_get(u32_t addr);
+int arm_cmse_mpu_region_get(uint32_t addr);
 
 /**
  * @brief Read accessibility of an address
@@ -69,7 +69,7 @@ int arm_cmse_mpu_region_get(u32_t addr);
  *
  * @return 1 if address is readable, 0 otherwise.
  */
-int arm_cmse_addr_read_ok(u32_t addr, int force_npriv);
+int arm_cmse_addr_read_ok(uint32_t addr, int force_npriv);
 
 /**
  * @brief Read and Write accessibility of an address
@@ -89,7 +89,7 @@ int arm_cmse_addr_read_ok(u32_t addr, int force_npriv);
  *
  * @return 1 if address is Read and Writable, 0 otherwise.
  */
-int arm_cmse_addr_readwrite_ok(u32_t addr, int force_npriv);
+int arm_cmse_addr_readwrite_ok(uint32_t addr, int force_npriv);
 
 /**
  * @brief Read accessibility of an address range
@@ -111,7 +111,7 @@ int arm_cmse_addr_readwrite_ok(u32_t addr, int force_npriv);
  *
  * @return 1 if address range is readable, 0 otherwise.
  */
-int arm_cmse_addr_range_read_ok(u32_t addr, u32_t size, int force_npriv);
+int arm_cmse_addr_range_read_ok(uint32_t addr, uint32_t size, int force_npriv);
 
 /**
  * @brief Read and Write accessibility of an address range
@@ -133,7 +133,7 @@ int arm_cmse_addr_range_read_ok(u32_t addr, u32_t size, int force_npriv);
  *
  * @return 1 if address range is Read and Writable, 0 otherwise.
  */
-int arm_cmse_addr_range_readwrite_ok(u32_t addr, u32_t size, int force_npriv);
+int arm_cmse_addr_range_readwrite_ok(uint32_t addr, uint32_t size, int force_npriv);
 
 /* Required for C99 compilation (required for GCC-8.x version,
  * where typeof is used instead of __typeof__)
@@ -232,7 +232,7 @@ int arm_cmse_addr_range_readwrite_ok(u32_t addr, u32_t size, int force_npriv);
  *
  * @return a valid MPU region number or -EINVAL
   */
-int arm_cmse_mpu_nonsecure_region_get(u32_t addr);
+int arm_cmse_mpu_nonsecure_region_get(uint32_t addr);
 
 /**
  * @brief Get the SAU region number of an address
@@ -250,7 +250,7 @@ int arm_cmse_mpu_nonsecure_region_get(u32_t addr);
  *
  * @return a valid SAU region number or -EINVAL
   */
-int arm_cmse_sau_region_get(u32_t addr);
+int arm_cmse_sau_region_get(uint32_t addr);
 
 /**
  * @brief Get the IDAU region number of an address
@@ -268,7 +268,7 @@ int arm_cmse_sau_region_get(u32_t addr);
  *
  * @return a valid IDAU region number or -EINVAL
   */
-int arm_cmse_idau_region_get(u32_t addr);
+int arm_cmse_idau_region_get(uint32_t addr);
 
 /**
  * @brief Security attribution of an address
@@ -280,7 +280,7 @@ int arm_cmse_idau_region_get(u32_t addr);
  *
  * @return 1 if address is Secure, 0 otherwise.
  */
-int arm_cmse_addr_is_secure(u32_t addr);
+int arm_cmse_addr_is_secure(uint32_t addr);
 
 /**
  * @brief Non-Secure Read accessibility of an address
@@ -300,7 +300,7 @@ int arm_cmse_addr_is_secure(u32_t addr);
  *
  * @return 1 if address is readable from Non-Secure state, 0 otherwise.
  */
-int arm_cmse_addr_nonsecure_read_ok(u32_t addr, int force_npriv);
+int arm_cmse_addr_nonsecure_read_ok(uint32_t addr, int force_npriv);
 
 /**
  * @brief Non-Secure Read and Write accessibility of an address
@@ -320,7 +320,7 @@ int arm_cmse_addr_nonsecure_read_ok(u32_t addr, int force_npriv);
  *
  * @return 1 if address is Read and Writable from Non-Secure state, 0 otherwise
  */
-int arm_cmse_addr_nonsecure_readwrite_ok(u32_t addr, int force_npriv);
+int arm_cmse_addr_nonsecure_readwrite_ok(uint32_t addr, int force_npriv);
 
 /**
  * @brief Non-Secure Read accessibility of an address range
@@ -342,7 +342,7 @@ int arm_cmse_addr_nonsecure_readwrite_ok(u32_t addr, int force_npriv);
  *
  * @return 1 if address range is readable, 0 otherwise.
  */
-int arm_cmse_addr_range_nonsecure_read_ok(u32_t addr, u32_t size,
+int arm_cmse_addr_range_nonsecure_read_ok(uint32_t addr, uint32_t size,
 	int force_npriv);
 
 /**
@@ -365,7 +365,7 @@ int arm_cmse_addr_range_nonsecure_read_ok(u32_t addr, u32_t size,
  *
  * @return 1 if address range is readable, 0 otherwise.
  */
-int arm_cmse_addr_range_nonsecure_readwrite_ok(u32_t addr, u32_t size,
+int arm_cmse_addr_range_nonsecure_readwrite_ok(uint32_t addr, uint32_t size,
 	int force_npriv);
 
 /**
diff --git a/arch/arm/include/aarch32/cortex_m/stack.h b/arch/arm/include/aarch32/cortex_m/stack.h
index 6a0613aea2..1fa6641399 100644
--- a/arch/arm/include/aarch32/cortex_m/stack.h
+++ b/arch/arm/include/aarch32/cortex_m/stack.h
@@ -40,13 +40,13 @@ extern K_THREAD_STACK_ARRAY_DEFINE(z_interrupt_stacks, CONFIG_MP_NUM_CPUS,
  */
 static ALWAYS_INLINE void z_arm_interrupt_stack_setup(void)
 {
-	u32_t msp = (u32_t)(Z_THREAD_STACK_BUFFER(z_interrupt_stacks[0])) +
+	uint32_t msp = (uint32_t)(Z_THREAD_STACK_BUFFER(z_interrupt_stacks[0])) +
 			    K_THREAD_STACK_SIZEOF(z_interrupt_stacks[0]);
 
 	__set_MSP(msp);
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 #if defined(CONFIG_CPU_CORTEX_M_HAS_SPLIM)
-	__set_MSPLIM((u32_t)z_interrupt_stacks[0]);
+	__set_MSPLIM((uint32_t)z_interrupt_stacks[0]);
 #else
 #error "Built-in MSP limit checks not supported by HW"
 #endif
diff --git a/arch/arm/include/aarch32/cortex_m/tz.h b/arch/arm/include/aarch32/cortex_m/tz.h
index dab11cd34c..119a7316eb 100644
--- a/arch/arm/include/aarch32/cortex_m/tz.h
+++ b/arch/arm/include/aarch32/cortex_m/tz.h
@@ -35,13 +35,13 @@ extern "C" {
  * state configuration.
  */
 typedef struct tz_nonsecure_setup_conf {
-	u32_t msp_ns;
-	u32_t psp_ns;
-	u32_t vtor_ns;
+	uint32_t msp_ns;
+	uint32_t psp_ns;
+	uint32_t vtor_ns;
 	struct {
-		u32_t npriv:1;
-		u32_t spsel:1;
-		u32_t reserved:30;
+		uint32_t npriv:1;
+		uint32_t spsel:1;
+		uint32_t reserved:30;
 	} control_ns;
 } tz_nonsecure_setup_conf_t;
 
@@ -84,7 +84,7 @@ void tz_nonsecure_state_setup(const tz_nonsecure_setup_conf_t *p_ns_conf);
  *
  * @return N/A
  */
-void tz_nonsecure_msplim_set(u32_t val);
+void tz_nonsecure_msplim_set(uint32_t val);
 
 /**
  *
@@ -101,7 +101,7 @@ void tz_nonsecure_msplim_set(u32_t val);
  *
  * @return N/A
  */
-void tz_nonsecure_psplim_set(u32_t val);
+void tz_nonsecure_psplim_set(uint32_t val);
 
 #endif /* CONFIG_ARMV8_M_MAINLINE */
 
@@ -229,7 +229,7 @@ void tz_sau_configure(int enable, int allns);
  *
  * @return The number of configured SAU regions.
  */
-u32_t tz_sau_number_of_regions_get(void);
+uint32_t tz_sau_number_of_regions_get(void);
 
 #if defined(CONFIG_CPU_HAS_ARM_SAU)
 /**
@@ -240,11 +240,11 @@ u32_t tz_sau_number_of_regions_get(void);
  * for a SAU region configuration.
  */
 typedef struct {
-	u8_t region_num;
-	u8_t enable:1;
-	u8_t nsc:1;
-	u32_t base_addr;
-	u32_t limit_addr;
+	uint8_t region_num;
+	uint8_t enable:1;
+	uint8_t nsc:1;
+	uint32_t base_addr;
+	uint32_t limit_addr;
 } tz_sau_conf_t;
 
 
diff --git a/arch/arm/include/aarch32/kernel_arch_func.h b/arch/arm/include/aarch32/kernel_arch_func.h
index ddc4fa911f..6dbd92079b 100644
--- a/arch/arm/include/aarch32/kernel_arch_func.h
+++ b/arch/arm/include/aarch32/kernel_arch_func.h
@@ -52,8 +52,8 @@ arch_thread_return_value_set(struct k_thread *thread, unsigned int value)
 
 extern FUNC_NORETURN void z_arm_userspace_enter(k_thread_entry_t user_entry,
 					       void *p1, void *p2, void *p3,
-					       u32_t stack_end,
-					       u32_t stack_start);
+					       uint32_t stack_end,
+					       uint32_t stack_start);
 
 extern void z_arm_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
 
diff --git a/arch/common/gen_isr_tables.py b/arch/common/gen_isr_tables.py
index cfb46516b8..06e692efd7 100755
--- a/arch/common/gen_isr_tables.py
+++ b/arch/common/gen_isr_tables.py
@@ -46,7 +46,7 @@ def read_intlist(intlist_path, syms):
     include/linker/intlist.ld:
 
      struct {
-       u32_t num_vectors;       <- typically CONFIG_NUM_IRQS
+       uint32_t num_vectors;       <- typically CONFIG_NUM_IRQS
        struct _isr_list isrs[]; <- Usually of smaller size than num_vectors
     }
 
@@ -55,9 +55,9 @@ def read_intlist(intlist_path, syms):
 
     struct _isr_list {
         /** IRQ line number */
-        s32_t irq;
+        int32_t irq;
         /** Flags for this IRQ, see ISR_FLAG_* definitions */
-        s32_t flags;
+        int32_t flags;
         /** ISR to call */
         void *func;
         /** Parameter for non-direct IRQs */
@@ -134,7 +134,7 @@ source_header = """
 #include <arch/cpu.h>
 
 #if defined(CONFIG_GEN_SW_ISR_TABLE) && defined(CONFIG_GEN_IRQ_VECTOR_TABLE)
-#define ISR_WRAPPER ((u32_t)&_isr_wrapper)
+#define ISR_WRAPPER ((uint32_t)&_isr_wrapper)
 #else
 #define ISR_WRAPPER NULL
 #endif
@@ -147,7 +147,7 @@ def write_source_file(fp, vt, swt, intlist, syms):
     nv = intlist["num_vectors"]
 
     if vt:
-        fp.write("u32_t __irq_vector_table _irq_vector_table[%d] = {\n" % nv)
+        fp.write("uint32_t __irq_vector_table _irq_vector_table[%d] = {\n" % nv)
         for i in range(nv):
             fp.write("\t{},\n".format(vt[i]))
         fp.write("};\n")
diff --git a/arch/common/isr_tables.c b/arch/common/isr_tables.c
index f7d11ce04b..b0cf3cd1fb 100644
--- a/arch/common/isr_tables.c
+++ b/arch/common/isr_tables.c
@@ -13,8 +13,8 @@
  * which indicates the number of interrupts specified
  */
 struct int_list_header {
-	u32_t table_size;
-	u32_t offset;
+	uint32_t table_size;
+	uint32_t offset;
 };
 
 /* These values are not included in the resulting binary, but instead form the
@@ -50,8 +50,8 @@ Z_GENERIC_SECTION(.irq_info) struct int_list_header _iheader = {
 #define IRQ_VECTOR_TABLE_DEFAULT_ISR	z_irq_spurious
 #endif /* CONFIG_GEN_SW_ISR_TABLE */
 
-u32_t __irq_vector_table _irq_vector_table[IRQ_TABLE_SIZE] = {
-	[0 ...(IRQ_TABLE_SIZE - 1)] = (u32_t)&IRQ_VECTOR_TABLE_DEFAULT_ISR,
+uint32_t __irq_vector_table _irq_vector_table[IRQ_TABLE_SIZE] = {
+	[0 ...(IRQ_TABLE_SIZE - 1)] = (uint32_t)&IRQ_VECTOR_TABLE_DEFAULT_ISR,
 };
 #endif /* CONFIG_GEN_IRQ_VECTOR_TABLE */
 
diff --git a/arch/common/sw_isr_common.c b/arch/common/sw_isr_common.c
index 11ce42d41e..030d057c9c 100644
--- a/arch/common/sw_isr_common.c
+++ b/arch/common/sw_isr_common.c
@@ -129,7 +129,7 @@ int __weak arch_irq_connect_dynamic(unsigned int irq,
 				    unsigned int priority,
 				    void (*routine)(void *),
 				    void *parameter,
-				    u32_t flags)
+				    uint32_t flags)
 {
 	ARG_UNUSED(flags);
 	ARG_UNUSED(priority);
diff --git a/arch/common/timing_info_bench.c b/arch/common/timing_info_bench.c
index 1a6860b2a5..44a1465c8f 100644
--- a/arch/common/timing_info_bench.c
+++ b/arch/common/timing_info_bench.c
@@ -6,18 +6,18 @@
 #include <kernel.h>
 #include <kernel_internal.h>
 
-u64_t  arch_timing_swap_start;
-u64_t  arch_timing_swap_end;
-u64_t  arch_timing_irq_start;
-u64_t  arch_timing_irq_end;
-u64_t  arch_timing_tick_start;
-u64_t  arch_timing_tick_end;
-u64_t  arch_timing_enter_user_mode_end;
+uint64_t  arch_timing_swap_start;
+uint64_t  arch_timing_swap_end;
+uint64_t  arch_timing_irq_start;
+uint64_t  arch_timing_irq_end;
+uint64_t  arch_timing_tick_start;
+uint64_t  arch_timing_tick_end;
+uint64_t  arch_timing_enter_user_mode_end;
 
 /* location of the time stamps*/
-u32_t arch_timing_value_swap_end;
-u64_t arch_timing_value_swap_common;
-u64_t arch_timing_value_swap_temp;
+uint32_t arch_timing_value_swap_end;
+uint64_t arch_timing_value_swap_common;
+uint64_t arch_timing_value_swap_temp;
 
 #if defined(CONFIG_NRF_RTC_TIMER)
 #include <nrfx.h>
@@ -48,13 +48,13 @@ u64_t arch_timing_value_swap_temp;
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()      (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE()  (SysTick->VAL)
-#define SUBTRACT_CLOCK_CYCLES(val)     (SysTick->LOAD - (u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)     (SysTick->LOAD - (uint32_t)val)
 
 #elif defined(CONFIG_ARC)
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()     (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE() (z_arc_v2_aux_reg_read(_ARC_V2_TMR0_COUNT))
-#define SUBTRACT_CLOCK_CYCLES(val)    ((u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)    ((uint32_t)val)
 
 #elif defined(CONFIG_NIOS2)
 #include "altera_avalon_timer_regs.h"
@@ -62,24 +62,24 @@ u64_t arch_timing_value_swap_temp;
 	(IOWR_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE, 10))
 
 #define TIMING_INFO_OS_GET_TIME()      (SUBTRACT_CLOCK_CYCLES(\
-	((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
-	| ((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE))))
+	((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
+	| ((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE))))
 
 #define TIMING_INFO_GET_TIMER_VALUE()  (\
-	((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
-	| ((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE)))
+	((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
+	| ((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE)))
 
 #define SUBTRACT_CLOCK_CYCLES(val)     \
 	((IORD_ALTERA_AVALON_TIMER_PERIODH(TIMER_0_BASE)	\
 	  << 16 |						\
 	  (IORD_ALTERA_AVALON_TIMER_PERIODL(TIMER_0_BASE)))	\
-	 - ((u32_t)val))
+	 - ((uint32_t)val))
 
 #else
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()      (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE()  (k_cycle_get_32())
-#define SUBTRACT_CLOCK_CYCLES(val)     ((u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)     ((uint32_t)val)
 #endif	/* CONFIG_NRF_RTC_TIMER */
 
 
@@ -87,7 +87,7 @@ void read_timer_start_of_swap(void)
 {
 	if (arch_timing_value_swap_end == 1U) {
 		TIMING_INFO_PRE_READ();
-		arch_timing_swap_start = (u32_t) TIMING_INFO_OS_GET_TIME();
+		arch_timing_swap_start = (uint32_t) TIMING_INFO_OS_GET_TIME();
 	}
 }
 
@@ -97,7 +97,7 @@ void read_timer_end_of_swap(void)
 		TIMING_INFO_PRE_READ();
 		arch_timing_value_swap_end = 2U;
 		arch_timing_value_swap_common =
-			(u64_t)TIMING_INFO_OS_GET_TIME();
+			(uint64_t)TIMING_INFO_OS_GET_TIME();
 	}
 }
 
@@ -107,29 +107,29 @@ void read_timer_end_of_swap(void)
 void read_timer_start_of_isr(void)
 {
 	TIMING_INFO_PRE_READ();
-	arch_timing_irq_start  = (u32_t) TIMING_INFO_GET_TIMER_VALUE();
+	arch_timing_irq_start  = (uint32_t) TIMING_INFO_GET_TIMER_VALUE();
 }
 
 void read_timer_end_of_isr(void)
 {
 	TIMING_INFO_PRE_READ();
-	arch_timing_irq_end  = (u32_t) TIMING_INFO_GET_TIMER_VALUE();
+	arch_timing_irq_end  = (uint32_t) TIMING_INFO_GET_TIMER_VALUE();
 }
 
 void read_timer_start_of_tick_handler(void)
 {
 	TIMING_INFO_PRE_READ();
-	arch_timing_tick_start  = (u32_t)TIMING_INFO_GET_TIMER_VALUE();
+	arch_timing_tick_start  = (uint32_t)TIMING_INFO_GET_TIMER_VALUE();
 }
 
 void read_timer_end_of_tick_handler(void)
 {
 	TIMING_INFO_PRE_READ();
-	 arch_timing_tick_end  = (u32_t) TIMING_INFO_GET_TIMER_VALUE();
+	 arch_timing_tick_end  = (uint32_t) TIMING_INFO_GET_TIMER_VALUE();
 }
 
 void read_timer_end_of_userspace_enter(void)
 {
 	TIMING_INFO_PRE_READ();
-	arch_timing_enter_user_mode_end = (u32_t)TIMING_INFO_GET_TIMER_VALUE();
+	arch_timing_enter_user_mode_end = (uint32_t)TIMING_INFO_GET_TIMER_VALUE();
 }
diff --git a/arch/nios2/core/cache.c b/arch/nios2/core/cache.c
index bdf1f499d6..58027cbda9 100644
--- a/arch/nios2/core/cache.c
+++ b/arch/nios2/core/cache.c
@@ -24,7 +24,7 @@
 #if ALT_CPU_ICACHE_SIZE > 0
 void z_nios2_icache_flush_all(void)
 {
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < ALT_CPU_ICACHE_SIZE; i += ALT_CPU_ICACHE_LINE_SIZE) {
 		z_nios2_icache_flush(i);
@@ -53,7 +53,7 @@ void z_nios2_icache_flush_all(void)
 #if ALT_CPU_DCACHE_SIZE > 0
 void z_nios2_dcache_flush_all(void)
 {
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < ALT_CPU_DCACHE_SIZE; i += ALT_CPU_DCACHE_LINE_SIZE) {
 		z_nios2_dcache_flush(i);
@@ -70,10 +70,10 @@ void z_nios2_dcache_flush_all(void)
  * use the z_nios2_dcache_flush() routine instead.
  */
 #if ALT_CPU_DCACHE_SIZE > 0
-void z_nios2_dcache_flush_no_writeback(void *start, u32_t len)
+void z_nios2_dcache_flush_no_writeback(void *start, uint32_t len)
 {
-	u8_t *i;
-	u8_t *end = ((char *) start) + len;
+	uint8_t *i;
+	uint8_t *end = ((char *) start) + len;
 
 	for (i = start; i < end; i += ALT_CPU_DCACHE_LINE_SIZE) {
 		__asm__ volatile ("initda (%0)" :: "r" (i));
@@ -85,7 +85,7 @@ void z_nios2_dcache_flush_no_writeback(void *start, u32_t len)
 	 * multiple of 2 (which it always is).
 	 */
 
-	if (((u32_t) start) & (ALT_CPU_DCACHE_LINE_SIZE - 1)) {
+	if (((uint32_t) start) & (ALT_CPU_DCACHE_LINE_SIZE - 1)) {
 		__asm__ volatile ("initda (%0)" :: "r" (i));
 	}
 }
diff --git a/arch/nios2/core/crt0.S b/arch/nios2/core/crt0.S
index a24ce74f2d..c9ce8de918 100644
--- a/arch/nios2/core/crt0.S
+++ b/arch/nios2/core/crt0.S
@@ -113,7 +113,7 @@ SECTION_FUNC(TEXT, __start)
 	ori r3, r3, 0xaaaa
 1:
 	/* Loop through the z_interrupt_stacks treating it as an array of
-	 * u32_t, setting each element to r3 */
+	 * uint32_t, setting each element to r3 */
 	stw r3, (r1)
 	subi r2, r2, 4
 	addi r1, r1, 4
diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c
index eef778eef1..e6188083c8 100644
--- a/arch/nios2/core/fatal.c
+++ b/arch/nios2/core/fatal.c
@@ -41,7 +41,7 @@ FUNC_NORETURN void z_nios2_fatal_error(unsigned int reason,
 #if defined(CONFIG_EXTRA_EXCEPTION_INFO) && \
 	(defined(CONFIG_PRINTK) || defined(CONFIG_LOG)) \
 	&& defined(ALT_CPU_HAS_EXTRA_EXCEPTION_INFO)
-static char *cause_str(u32_t cause_code)
+static char *cause_str(uint32_t cause_code)
 {
 	switch (cause_code) {
 	case 0:
@@ -105,7 +105,7 @@ FUNC_NORETURN void _Fault(const z_arch_esf_t *esf)
 #if defined(CONFIG_PRINTK) || defined(CONFIG_LOG)
 	/* Unfortunately, completely unavailable on Nios II/e cores */
 #ifdef ALT_CPU_HAS_EXTRA_EXCEPTION_INFO
-	u32_t exc_reg, badaddr_reg, eccftl;
+	uint32_t exc_reg, badaddr_reg, eccftl;
 	enum nios2_exception_cause cause;
 
 	exc_reg = z_nios2_creg_read(NIOS2_CR_EXCEPTION);
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
index c8c666114d..5bc9e283ac 100644
--- a/arch/nios2/core/irq_manage.c
+++ b/arch/nios2/core/irq_manage.c
@@ -33,7 +33,7 @@ FUNC_NORETURN void z_irq_spurious(void *unused)
 
 void arch_irq_enable(unsigned int irq)
 {
-	u32_t ienable;
+	uint32_t ienable;
 	unsigned int key;
 
 	key = irq_lock();
@@ -49,7 +49,7 @@ void arch_irq_enable(unsigned int irq)
 
 void arch_irq_disable(unsigned int irq)
 {
-	u32_t ienable;
+	uint32_t ienable;
 	unsigned int key;
 
 	key = irq_lock();
@@ -63,7 +63,7 @@ void arch_irq_disable(unsigned int irq)
 
 int arch_irq_is_enabled(unsigned int irq)
 {
-	u32_t ienable;
+	uint32_t ienable;
 
 	ienable = z_nios2_creg_read(NIOS2_CR_IENABLE);
 	return ienable & BIT(irq);
@@ -76,7 +76,7 @@ int arch_irq_is_enabled(unsigned int irq)
  *
  * @param ipending Bitfield of interrupts
  */
-void _enter_irq(u32_t ipending)
+void _enter_irq(uint32_t ipending)
 {
 	int index;
 
@@ -122,7 +122,7 @@ void _enter_irq(u32_t ipending)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter), void *parameter,
-			     u32_t flags)
+			     uint32_t flags)
 {
 	ARG_UNUSED(flags);
 	ARG_UNUSED(priority);
diff --git a/arch/nios2/core/thread.c b/arch/nios2/core/thread.c
index f20fe21971..f339eec347 100644
--- a/arch/nios2/core/thread.c
+++ b/arch/nios2/core/thread.c
@@ -48,8 +48,8 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	iframe->arg2 = arg2;
 	iframe->arg3 = arg3;
 
-	thread->callee_saved.sp = (u32_t)iframe;
-	thread->callee_saved.ra = (u32_t)z_thread_entry_wrapper;
+	thread->callee_saved.sp = (uint32_t)iframe;
+	thread->callee_saved.ra = (uint32_t)z_thread_entry_wrapper;
 	thread->callee_saved.key = NIOS2_STATUS_PIE_MSK;
 	/* Leave the rest of thread->callee_saved junk */
 }
diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h
index 588728eaf5..efb3582c90 100644
--- a/arch/nios2/include/kernel_arch_func.h
+++ b/arch/nios2/include/kernel_arch_func.h
@@ -58,7 +58,7 @@ void z_nios2_icache_flush_all(void);
 
 #if ALT_CPU_DCACHE_SIZE > 0
 void z_nios2_dcache_flush_all(void);
-void z_nios2_dcache_flush_no_writeback(void *start, u32_t len);
+void z_nios2_dcache_flush_no_writeback(void *start, uint32_t len);
 #else
 #define z_nios2_dcache_flush_all() do { } while (0)
 #define z_nios2_dcache_flush_no_writeback(x, y) do { } while (0)
diff --git a/arch/posix/core/irq.c b/arch/posix/core/irq.c
index 0a4c00f666..d63835f676 100644
--- a/arch/posix/core/irq.c
+++ b/arch/posix/core/irq.c
@@ -47,7 +47,7 @@ int arch_irq_is_enabled(unsigned int irq)
  */
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter),
-			     void *parameter, u32_t flags)
+			     void *parameter, uint32_t flags)
 {
 	posix_isr_declare(irq, (int)flags, routine, parameter);
 	posix_irq_priority_set(irq, priority, flags);
diff --git a/arch/posix/core/swap.c b/arch/posix/core/swap.c
index a1631eaa55..114290ad22 100644
--- a/arch/posix/core/swap.c
+++ b/arch/posix/core/swap.c
@@ -98,7 +98,7 @@ void arch_switch_to_main_thread(struct k_thread *main_thread,
 void posix_irq_check_idle_exit(void)
 {
 	if (_kernel.idle) {
-		s32_t idle_val = _kernel.idle;
+		int32_t idle_val = _kernel.idle;
 
 		_kernel.idle = 0;
 		z_sys_power_save_idle_exit(idle_val);
diff --git a/arch/riscv/core/irq_manage.c b/arch/riscv/core/irq_manage.c
index b852433e9e..247e25cfc0 100644
--- a/arch/riscv/core/irq_manage.c
+++ b/arch/riscv/core/irq_manage.c
@@ -32,7 +32,7 @@ FUNC_NORETURN void z_irq_spurious(void *unused)
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter), void *parameter,
-			     u32_t flags)
+			     uint32_t flags)
 {
 	ARG_UNUSED(flags);
 
diff --git a/arch/x86/core/acpi.c b/arch/x86/core/acpi.c
index 166c708082..1ec8c29bf7 100644
--- a/arch/x86/core/acpi.c
+++ b/arch/x86/core/acpi.c
@@ -20,8 +20,8 @@ static struct acpi_madt *madt;
 
 static bool validate_checksum(void *buf, int len)
 {
-	u8_t *cp = buf;
-	u8_t checksum = 0;
+	uint8_t *cp = buf;
+	uint8_t checksum = 0;
 
 	while (len--) {
 		checksum += *(cp++);
@@ -88,7 +88,7 @@ void z_acpi_init(void)
 	 * If it's valid, then remember it for later.
 	 */
 
-	int nr_sdts = (rsdt->sdt.length - sizeof(rsdt)) / sizeof(u32_t);
+	int nr_sdts = (rsdt->sdt.length - sizeof(rsdt)) / sizeof(uint32_t);
 	for (int i = 0; i < nr_sdts; ++i) {
 		struct acpi_sdt *sdt = UINT_TO_POINTER(rsdt->sdts[i]);
 
diff --git a/arch/x86/core/fatal.c b/arch/x86/core/fatal.c
index 8a3001adfd..44dba24c27 100644
--- a/arch/x86/core/fatal.c
+++ b/arch/x86/core/fatal.c
@@ -43,7 +43,7 @@ static inline uintptr_t esf_get_code(const z_arch_esf_t *esf)
 }
 
 #ifdef CONFIG_THREAD_STACK_INFO
-bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, u16_t cs)
+bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs)
 {
 	uintptr_t start, end;
 
@@ -89,7 +89,7 @@ struct stack_frame {
 
 #define MAX_STACK_FRAMES 8
 
-static void unwind_stack(uintptr_t base_ptr, u16_t cs)
+static void unwind_stack(uintptr_t base_ptr, uint16_t cs)
 {
 	struct stack_frame *frame;
 	int i;
@@ -342,7 +342,7 @@ void z_x86_page_fault_handler(z_arch_esf_t *esf)
 #ifdef CONFIG_X86_64
 		if ((void *)esf->rip >= exceptions[i].start &&
 		    (void *)esf->rip < exceptions[i].end) {
-			esf->rip = (u64_t)(exceptions[i].fixup);
+			esf->rip = (uint64_t)(exceptions[i].fixup);
 			return;
 		}
 #else
diff --git a/arch/x86/core/ia32/excstub.S b/arch/x86/core/ia32/excstub.S
index 16cec0fa48..cefe84cfe0 100644
--- a/arch/x86/core/ia32/excstub.S
+++ b/arch/x86/core/ia32/excstub.S
@@ -49,7 +49,7 @@
  *
  * C function prototype:
  *
- * void _exception_enter(u32_t error_code, void *handler)
+ * void _exception_enter(uint32_t error_code, void *handler)
  *
  */
 
diff --git a/arch/x86/core/ia32/fatal.c b/arch/x86/core/ia32/fatal.c
index 1c7d1c8012..c00853e1bd 100644
--- a/arch/x86/core/ia32/fatal.c
+++ b/arch/x86/core/ia32/fatal.c
@@ -127,20 +127,20 @@ struct task_state_segment _main_tss = {
 	 * In a special kernel page that, unlike all other kernel pages,
 	 * is marked present in the user page table.
 	 */
-	.esp0 = (u32_t)&z_trampoline_stack_end
+	.esp0 = (uint32_t)&z_trampoline_stack_end
 #endif
 };
 
 /* Special TSS for handling double-faults with a known good stack */
 Z_GENERIC_SECTION(.tss)
 struct task_state_segment _df_tss = {
-	.esp = (u32_t)(_df_stack + sizeof(_df_stack)),
+	.esp = (uint32_t)(_df_stack + sizeof(_df_stack)),
 	.cs = CODE_SEG,
 	.ds = DATA_SEG,
 	.es = DATA_SEG,
 	.ss = DATA_SEG,
-	.eip = (u32_t)df_handler_top,
-	.cr3 = (u32_t)&z_x86_kernel_ptables
+	.eip = (uint32_t)df_handler_top,
+	.cr3 = (uint32_t)&z_x86_kernel_ptables
 };
 
 static __used void df_handler_bottom(void)
@@ -149,8 +149,8 @@ static __used void df_handler_bottom(void)
 	int reason = K_ERR_CPU_EXCEPTION;
 
 	/* Restore the top half so it is runnable again */
-	_df_tss.esp = (u32_t)(_df_stack + sizeof(_df_stack));
-	_df_tss.eip = (u32_t)df_handler_top;
+	_df_tss.esp = (uint32_t)(_df_stack + sizeof(_df_stack));
+	_df_tss.eip = (uint32_t)df_handler_top;
 
 	LOG_ERR("Double Fault");
 #ifdef CONFIG_THREAD_STACK_INFO
@@ -181,14 +181,14 @@ static FUNC_NORETURN __used void df_handler_top(void)
 	_df_esf.eflags = _main_tss.eflags;
 
 	/* Restore the main IA task to a runnable state */
-	_main_tss.esp = (u32_t)(ARCH_THREAD_STACK_BUFFER(
+	_main_tss.esp = (uint32_t)(ARCH_THREAD_STACK_BUFFER(
 		z_interrupt_stacks[0]) + CONFIG_ISR_STACK_SIZE);
 	_main_tss.cs = CODE_SEG;
 	_main_tss.ds = DATA_SEG;
 	_main_tss.es = DATA_SEG;
 	_main_tss.ss = DATA_SEG;
-	_main_tss.eip = (u32_t)df_handler_bottom;
-	_main_tss.cr3 = (u32_t)&z_x86_kernel_ptables;
+	_main_tss.eip = (uint32_t)df_handler_bottom;
+	_main_tss.cr3 = (uint32_t)&z_x86_kernel_ptables;
 	_main_tss.eflags = 0U;
 
 	/* NT bit is set in EFLAGS so we will task switch back to _main_tss
diff --git a/arch/x86/core/ia32/float.c b/arch/x86/core/ia32/float.c
index b807ae6e8b..921e9a93e6 100644
--- a/arch/x86/core/ia32/float.c
+++ b/arch/x86/core/ia32/float.c
@@ -47,7 +47,7 @@
 #include <kernel_internal.h>
 
 /* SSE control/status register default value (used by assembler code) */
-extern u32_t _sse_mxcsr_default_value;
+extern uint32_t _sse_mxcsr_default_value;
 
 /**
  *
@@ -190,7 +190,7 @@ void k_float_enable(struct k_thread *thread, unsigned int options)
 
 	/* Indicate thread requires floating point context saving */
 
-	thread->base.user_options |= (u8_t)options;
+	thread->base.user_options |= (uint8_t)options;
 
 	/*
 	 * The current thread might not allow FP instructions, so clear CR0[TS]
diff --git a/arch/x86/core/ia32/irq_manage.c b/arch/x86/core/ia32/irq_manage.c
index 25a87a10eb..e474fdd553 100644
--- a/arch/x86/core/ia32/irq_manage.c
+++ b/arch/x86/core/ia32/irq_manage.c
@@ -169,7 +169,7 @@ static unsigned int priority_to_free_vector(unsigned int requested_priority)
  */
 static void *get_dynamic_stub(int stub_idx)
 {
-	u32_t offset;
+	uint32_t offset;
 
 	/*
 	 * Because we want the sizes of the stubs to be consistent and minimized,
@@ -181,7 +181,7 @@ static void *get_dynamic_stub(int stub_idx)
 		((stub_idx / Z_DYN_STUB_PER_BLOCK) *
 		 Z_DYN_STUB_LONG_JMP_EXTRA_SIZE);
 
-	return (void *)((u32_t)&z_dynamic_stubs_begin + offset);
+	return (void *)((uint32_t)&z_dynamic_stubs_begin + offset);
 }
 
 extern const struct pseudo_descriptor z_x86_idt;
@@ -192,13 +192,13 @@ static void idt_vector_install(int vector, void *irq_handler)
 
 	key = irq_lock();
 	z_init_irq_gate(&z_x86_idt.entries[vector], CODE_SEG,
-		       (u32_t)irq_handler, 0);
+		       (uint32_t)irq_handler, 0);
 	irq_unlock(key);
 }
 
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 		void (*routine)(void *parameter), void *parameter,
-		u32_t flags)
+		uint32_t flags)
 {
 	int vector, stub_idx, key;
 
@@ -233,7 +233,7 @@ int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
  *
  * @param stub_idx Index into the dyn_irq_list array
  */
-void z_x86_dynamic_irq_handler(u8_t stub_idx)
+void z_x86_dynamic_irq_handler(uint8_t stub_idx)
 {
 	dyn_irq_list[stub_idx].handler(dyn_irq_list[stub_idx].param);
 }
diff --git a/arch/x86/core/ia32/thread.c b/arch/x86/core/ia32/thread.c
index 409c8b13c3..39fe356896 100644
--- a/arch/x86/core/ia32/thread.c
+++ b/arch/x86/core/ia32/thread.c
@@ -23,13 +23,13 @@
  * for when z_swap() switches to it for the first time.
  */
 struct _x86_initial_frame {
-	u32_t swap_retval;
-	u32_t ebp;
-	u32_t ebx;
-	u32_t esi;
-	u32_t edi;
+	uint32_t swap_retval;
+	uint32_t ebp;
+	uint32_t ebx;
+	uint32_t esi;
+	uint32_t edi;
 	void *thread_entry;
-	u32_t eflags;
+	uint32_t eflags;
 	k_thread_entry_t entry;
 	void *p1;
 	void *p2;
@@ -101,7 +101,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	initial_frame->p3 = parameter3;
 	initial_frame->eflags = EFLAGS_INITIAL;
 #ifdef _THREAD_WRAPPER_REQUIRED
-	initial_frame->edi = (u32_t)swap_entry;
+	initial_frame->edi = (uint32_t)swap_entry;
 	initial_frame->thread_entry = z_x86_thread_entry_wrapper;
 #else
 	initial_frame->thread_entry = swap_entry;
diff --git a/arch/x86/core/ia32/userspace.S b/arch/x86/core/ia32/userspace.S
index 05d43d6878..3ac93a3e89 100644
--- a/arch/x86/core/ia32/userspace.S
+++ b/arch/x86/core/ia32/userspace.S
@@ -279,8 +279,8 @@ z_x86_user_string_nlen_fixup:
 
 /* FUNC_NORETURN void z_x86_userspace_enter(k_thread_entry_t user_entry,
  *					   void *p1, void *p2, void *p3,
- *					   u32_t stack_end,
- *					   u32_t stack_start)
+ *					   uint32_t stack_end,
+ *					   uint32_t stack_start)
  *
  * A one-way trip to userspace.
  */
diff --git a/arch/x86/core/intel64/cpu.c b/arch/x86/core/intel64/cpu.c
index b98a328bf2..288c3c35e2 100644
--- a/arch/x86/core/intel64/cpu.c
+++ b/arch/x86/core/intel64/cpu.c
@@ -18,28 +18,28 @@
  * The symbol is weak so that boards/SoC files can override.
  */
 
-__weak u8_t x86_cpu_loapics[] = { 0, 1, 2, 3 };
+__weak uint8_t x86_cpu_loapics[] = { 0, 1, 2, 3 };
 
 extern char x86_ap_start[];  /* AP entry point in locore.S */
 
-extern u8_t _exception_stack[];
-extern u8_t _exception_stack1[];
-extern u8_t _exception_stack2[];
-extern u8_t _exception_stack3[];
+extern uint8_t _exception_stack[];
+extern uint8_t _exception_stack1[];
+extern uint8_t _exception_stack2[];
+extern uint8_t _exception_stack3[];
 
 #ifdef CONFIG_X86_KPTI
-extern u8_t z_x86_trampoline_stack[];
-extern u8_t z_x86_trampoline_stack1[];
-extern u8_t z_x86_trampoline_stack2[];
-extern u8_t z_x86_trampoline_stack3[];
+extern uint8_t z_x86_trampoline_stack[];
+extern uint8_t z_x86_trampoline_stack1[];
+extern uint8_t z_x86_trampoline_stack2[];
+extern uint8_t z_x86_trampoline_stack3[];
 #endif /* CONFIG_X86_KPTI */
 
 Z_GENERIC_SECTION(.tss)
 struct x86_tss64 tss0 = {
 #ifdef CONFIG_X86_KPTI
-	.ist2 = (u64_t) z_x86_trampoline_stack + Z_X86_TRAMPOLINE_STACK_SIZE,
+	.ist2 = (uint64_t) z_x86_trampoline_stack + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist7 = (u64_t) _exception_stack + CONFIG_EXCEPTION_STACK_SIZE,
+	.ist7 = (uint64_t) _exception_stack + CONFIG_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[0])
 };
@@ -48,9 +48,9 @@ struct x86_tss64 tss0 = {
 Z_GENERIC_SECTION(.tss)
 struct x86_tss64 tss1 = {
 #ifdef CONFIG_X86_KPTI
-	.ist2 = (u64_t) z_x86_trampoline_stack1 + Z_X86_TRAMPOLINE_STACK_SIZE,
+	.ist2 = (uint64_t) z_x86_trampoline_stack1 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist7 = (u64_t) _exception_stack1 + CONFIG_EXCEPTION_STACK_SIZE,
+	.ist7 = (uint64_t) _exception_stack1 + CONFIG_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[1])
 };
@@ -60,9 +60,9 @@ struct x86_tss64 tss1 = {
 Z_GENERIC_SECTION(.tss)
 struct x86_tss64 tss2 = {
 #ifdef CONFIG_X86_KPTI
-	.ist2 = (u64_t) z_x86_trampoline_stack2 + Z_X86_TRAMPOLINE_STACK_SIZE,
+	.ist2 = (uint64_t) z_x86_trampoline_stack2 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist7 = (u64_t) _exception_stack2 + CONFIG_EXCEPTION_STACK_SIZE,
+	.ist7 = (uint64_t) _exception_stack2 + CONFIG_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[2])
 };
@@ -72,9 +72,9 @@ struct x86_tss64 tss2 = {
 Z_GENERIC_SECTION(.tss)
 struct x86_tss64 tss3 = {
 #ifdef CONFIG_X86_KPTI
-	.ist2 = (u64_t) z_x86_trampoline_stack3 + Z_X86_TRAMPOLINE_STACK_SIZE,
+	.ist2 = (uint64_t) z_x86_trampoline_stack3 + Z_X86_TRAMPOLINE_STACK_SIZE,
 #endif
-	.ist7 = (u64_t) _exception_stack3 + CONFIG_EXCEPTION_STACK_SIZE,
+	.ist7 = (uint64_t) _exception_stack3 + CONFIG_EXCEPTION_STACK_SIZE,
 	.iomapb = 0xFFFF,
 	.cpu = &(_kernel.cpus[3])
 };
@@ -86,7 +86,7 @@ struct x86_cpuboot x86_cpuboot[] = {
 	{
 		.tr = X86_KERNEL_CPU0_TR,
 		.gs_base = &tss0,
-		.sp = (u64_t) (z_interrupt_stacks[0] + CONFIG_ISR_STACK_SIZE +
+		.sp = (uint64_t) (z_interrupt_stacks[0] + CONFIG_ISR_STACK_SIZE +
 			       ARCH_THREAD_STACK_RESERVED),
 		.fn = z_x86_prep_c,
 #ifdef CONFIG_X86_MMU
@@ -121,10 +121,10 @@ struct x86_cpuboot x86_cpuboot[] = {
 void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
 		    arch_cpustart_t fn, void *arg)
 {
-	u8_t vector = ((unsigned long) x86_ap_start) >> 12;
-	u8_t apic_id = x86_cpu_loapics[cpu_num];
+	uint8_t vector = ((unsigned long) x86_ap_start) >> 12;
+	uint8_t apic_id = x86_cpu_loapics[cpu_num];
 
-	x86_cpuboot[cpu_num].sp = (u64_t) Z_THREAD_STACK_BUFFER(stack) + sz;
+	x86_cpuboot[cpu_num].sp = (uint64_t) Z_THREAD_STACK_BUFFER(stack) + sz;
 	x86_cpuboot[cpu_num].fn = fn;
 	x86_cpuboot[cpu_num].arg = arg;
 #ifdef CONFIG_X86_MMU
@@ -151,10 +151,10 @@ FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot)
 
 #ifdef CONFIG_USERSPACE
 	/* Set landing site for 'syscall' instruction */
-	z_x86_msr_write(X86_LSTAR_MSR, (u64_t)z_x86_syscall_entry_stub);
+	z_x86_msr_write(X86_LSTAR_MSR, (uint64_t)z_x86_syscall_entry_stub);
 
 	/* Set segment descriptors for syscall privilege transitions */
-	z_x86_msr_write(X86_STAR_MSR, (u64_t)X86_STAR_UPPER << 32);
+	z_x86_msr_write(X86_STAR_MSR, (uint64_t)X86_STAR_UPPER << 32);
 
 	/* Mask applied to RFLAGS when making a syscall */
 	z_x86_msr_write(X86_FMASK_MSR, EFLAGS_SYSCALL);
diff --git a/arch/x86/core/intel64/irq.c b/arch/x86/core/intel64/irq.c
index 9077906542..9b62c8f6c2 100644
--- a/arch/x86/core/intel64/irq.c
+++ b/arch/x86/core/intel64/irq.c
@@ -70,9 +70,9 @@ static int allocate_vector(unsigned int priority)
  */
 
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
-		void (*func)(void *arg), void *arg, u32_t flags)
+		void (*func)(void *arg), void *arg, uint32_t flags)
 {
-	u32_t key;
+	uint32_t key;
 	int vector;
 
 	__ASSERT(irq <= CONFIG_MAX_IRQ_LINES, "IRQ %u out of range", irq);
diff --git a/arch/x86/core/multiboot.c b/arch/x86/core/multiboot.c
index e9150195ad..cb0d14a950 100644
--- a/arch/x86/core/multiboot.c
+++ b/arch/x86/core/multiboot.c
@@ -42,10 +42,10 @@ void z_multiboot_init(struct multiboot_info *info)
 
 	if ((info->flags & MULTIBOOT_INFO_FLAGS_MMAP) &&
 	    (x86_memmap_source < X86_MEMMAP_SOURCE_MULTIBOOT_MMAP)) {
-		u32_t address = info->mmap_addr;
+		uint32_t address = info->mmap_addr;
 		struct multiboot_mmap *mmap;
 		int index = 0;
-		u32_t type;
+		uint32_t type;
 
 		while ((address < (info->mmap_addr + info->mmap_length)) &&
 		       (index < CONFIG_X86_MEMMAP_ENTRIES)) {
@@ -124,9 +124,9 @@ static int multiboot_framebuf_init(struct device *dev)
 		 * the pitch and adjust the start address center our canvas.
 		 */
 
-		u16_t adj_x;
-		u16_t adj_y;
-		u32_t *buffer;
+		uint16_t adj_x;
+		uint16_t adj_y;
+		uint32_t *buffer;
 
 		adj_x = info->fb_width - CONFIG_MULTIBOOT_FRAMEBUF_X;
 		adj_y = info->fb_height - CONFIG_MULTIBOOT_FRAMEBUF_Y;
diff --git a/arch/x86/core/pcie.c b/arch/x86/core/pcie.c
index 6bf284bff2..a1d8b7985b 100644
--- a/arch/x86/core/pcie.c
+++ b/arch/x86/core/pcie.c
@@ -32,7 +32,7 @@
  * Helper function for exported configuration functions. Configuration access
  * ain't atomic, so spinlock to keep drivers from clobbering each other.
  */
-static void pcie_conf(pcie_bdf_t bdf, unsigned int reg, bool write, u32_t *data)
+static void pcie_conf(pcie_bdf_t bdf, unsigned int reg, bool write, uint32_t *data)
 {
 	static struct k_spinlock lock;
 	k_spinlock_key_t k;
@@ -56,15 +56,15 @@ static void pcie_conf(pcie_bdf_t bdf, unsigned int reg, bool write, u32_t *data)
 
 /* these functions are explained in include/drivers/pcie/pcie.h */
 
-u32_t pcie_conf_read(pcie_bdf_t bdf, unsigned int reg)
+uint32_t pcie_conf_read(pcie_bdf_t bdf, unsigned int reg)
 {
-	u32_t data;
+	uint32_t data;
 
 	pcie_conf(bdf, reg, false, &data);
 	return data;
 }
 
-void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, u32_t data)
+void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, uint32_t data)
 {
 	pcie_conf(bdf, reg, true, &data);
 }
@@ -73,13 +73,13 @@ void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, u32_t data)
 
 /* these functions are explained in include/drivers/pcie/msi.h */
 
-u32_t pcie_msi_map(unsigned int irq)
+uint32_t pcie_msi_map(unsigned int irq)
 {
 	ARG_UNUSED(irq);
 	return 0xFEE00000U;  /* standard delivery to BSP local APIC */
 }
 
-u16_t pcie_msi_mdr(unsigned int irq)
+uint16_t pcie_msi_mdr(unsigned int irq)
 {
 	unsigned char vector = Z_IRQ_TO_INTERRUPT_VECTOR(irq);
 
diff --git a/arch/x86/core/reboot_rst_cnt.c b/arch/x86/core/reboot_rst_cnt.c
index a4fa94529a..1de24fbb34 100644
--- a/arch/x86/core/reboot_rst_cnt.c
+++ b/arch/x86/core/reboot_rst_cnt.c
@@ -22,7 +22,7 @@
 
 static inline void cold_reboot(void)
 {
-	u8_t reset_value = X86_RST_CNT_CPU_RST | X86_RST_CNT_SYS_RST |
+	uint8_t reset_value = X86_RST_CNT_CPU_RST | X86_RST_CNT_SYS_RST |
 				X86_RST_CNT_FULL_RST;
 	sys_out8(reset_value, X86_RST_CNT_REG);
 }
diff --git a/arch/x86/core/spec_ctrl.c b/arch/x86/core/spec_ctrl.c
index 8603dba6e4..25a44d69ee 100644
--- a/arch/x86/core/spec_ctrl.c
+++ b/arch/x86/core/spec_ctrl.c
@@ -25,9 +25,9 @@
 #define CPUID_SPEC_CTRL_IBRS	BIT(26)
 
 #if defined(CONFIG_DISABLE_SSBD) || defined(CONFIG_ENABLE_EXTENDED_IBRS)
-static u32_t cpuid_extended_features(void)
+static uint32_t cpuid_extended_features(void)
 {
-	u32_t eax, ebx, ecx = 0U, edx;
+	uint32_t eax, ebx, ecx = 0U, edx;
 
 	if (__get_cpuid(CPUID_EXTENDED_FEATURES_LVL,
 			&eax, &ebx, &ecx, &edx) == 0) {
@@ -41,8 +41,8 @@ static int spec_ctrl_init(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	u32_t enable_bits = 0U;
-	u32_t cpuid7 = cpuid_extended_features();
+	uint32_t enable_bits = 0U;
+	uint32_t cpuid7 = cpuid_extended_features();
 
 #ifdef CONFIG_DISABLE_SSBD
 	if ((cpuid7 & CPUID_SPEC_CTRL_SSBD) != 0U) {
@@ -55,7 +55,7 @@ static int spec_ctrl_init(struct device *dev)
 	}
 #endif
 	if (enable_bits != 0U) {
-		u64_t cur = z_x86_msr_read(X86_SPEC_CTRL_MSR);
+		uint64_t cur = z_x86_msr_read(X86_SPEC_CTRL_MSR);
 
 		z_x86_msr_write(X86_SPEC_CTRL_MSR,
 			       cur | enable_bits);
diff --git a/arch/x86/core/userspace.c b/arch/x86/core/userspace.c
index 2e737d4064..11da53fa9a 100644
--- a/arch/x86/core/userspace.c
+++ b/arch/x86/core/userspace.c
@@ -68,7 +68,7 @@ void z_x86_swap_update_page_tables(struct k_thread *incoming)
 FUNC_NORETURN static void drop_to_user(k_thread_entry_t user_entry,
 				       void *p1, void *p2, void *p3)
 {
-	u32_t stack_end;
+	uint32_t stack_end;
 
 	/* Transition will reset stack pointer to initial, discarding
 	 * any old context since this is a one-way operation
diff --git a/arch/x86/core/x86_mmu.c b/arch/x86/core/x86_mmu.c
index f06c971143..9ded09481f 100644
--- a/arch/x86/core/x86_mmu.c
+++ b/arch/x86/core/x86_mmu.c
@@ -76,7 +76,7 @@ MMU_BOOT_REGION(&__kernel_ram_start, &__kernel_ram_size,
  */
 
 #ifdef CONFIG_X86_64
-static inline void pml4e_update_pdpt(u64_t *pml4e, struct x86_mmu_pdpt *pdpt)
+static inline void pml4e_update_pdpt(uint64_t *pml4e, struct x86_mmu_pdpt *pdpt)
 {
 	uintptr_t pdpt_addr = (uintptr_t)pdpt;
 
@@ -85,7 +85,7 @@ static inline void pml4e_update_pdpt(u64_t *pml4e, struct x86_mmu_pdpt *pdpt)
 }
 #endif /* CONFIG_X86_64 */
 
-static inline void pdpte_update_pd(u64_t *pdpte, struct x86_mmu_pd *pd)
+static inline void pdpte_update_pd(uint64_t *pdpte, struct x86_mmu_pd *pd)
 {
 	uintptr_t pd_addr = (uintptr_t)pd;
 
@@ -96,7 +96,7 @@ static inline void pdpte_update_pd(u64_t *pdpte, struct x86_mmu_pd *pd)
 		  (pd_addr & Z_X86_MMU_PDPTE_PD_MASK));
 }
 
-static inline void pde_update_pt(u64_t *pde, struct x86_mmu_pt *pt)
+static inline void pde_update_pt(uint64_t *pde, struct x86_mmu_pt *pt)
 {
 	uintptr_t pt_addr = (uintptr_t)pt;
 
@@ -106,7 +106,7 @@ static inline void pde_update_pt(u64_t *pde, struct x86_mmu_pt *pt)
 		(pt_addr & Z_X86_MMU_PDE_PT_MASK));
 }
 
-static inline void pte_update_addr(u64_t *pte, uintptr_t addr)
+static inline void pte_update_addr(uint64_t *pte, uintptr_t addr)
 {
 	*pte = ((*pte & ~Z_X86_MMU_PTE_ADDR_MASK) |
 		(addr & Z_X86_MMU_PTE_ADDR_MASK));
@@ -121,7 +121,7 @@ static inline void pte_update_addr(u64_t *pte, uintptr_t addr)
  * Not trying to capture every flag, just the most interesting stuff,
  * Present, write, XD, user, in typically encountered combinations.
  */
-static bool dump_entry_flags(const char *name, u64_t flags)
+static bool dump_entry_flags(const char *name, uint64_t flags)
 {
 	if ((flags & Z_X86_MMU_P) == 0) {
 		LOG_ERR("%s: Non-present", name);
@@ -140,7 +140,7 @@ static bool dump_entry_flags(const char *name, u64_t flags)
 
 void z_x86_dump_mmu_flags(struct x86_page_tables *ptables, uintptr_t addr)
 {
-	u64_t entry;
+	uint64_t entry;
 
 #ifdef CONFIG_X86_64
 	entry = *z_x86_get_pml4e(ptables, addr);
@@ -174,7 +174,7 @@ void z_x86_dump_mmu_flags(struct x86_page_tables *ptables, uintptr_t addr)
 	}
 }
 
-static char get_entry_code(u64_t value)
+static char get_entry_code(uint64_t value)
 {
 	char ret;
 
@@ -209,7 +209,7 @@ static char get_entry_code(u64_t value)
 	return ret;
 }
 
-static void print_entries(u64_t entries_array[], size_t count)
+static void print_entries(uint64_t entries_array[], size_t count)
 {
 	int column = 0;
 
@@ -245,7 +245,7 @@ static void z_x86_dump_pd(struct x86_mmu_pd *pd, uintptr_t base, int index)
 
 	for (int i = 0; i < Z_X86_NUM_PD_ENTRIES; i++) {
 		struct x86_mmu_pt *pt;
-		u64_t pde = pd->entry[i];
+		uint64_t pde = pd->entry[i];
 
 		if (((pde & Z_X86_MMU_P) == 0) || ((pde & Z_X86_MMU_PS) != 0)) {
 			/* Skip non-present, or 2MB directory entries, there's
@@ -268,7 +268,7 @@ static void z_x86_dump_pdpt(struct x86_mmu_pdpt *pdpt, uintptr_t base,
 
 	for (int i = 0; i < Z_X86_NUM_PDPT_ENTRIES; i++) {
 		struct x86_mmu_pd *pd;
-		u64_t pdpte = pdpt->entry[i];
+		uint64_t pdpte = pdpt->entry[i];
 
 		if ((pdpte & Z_X86_MMU_P) == 0) {
 			continue;
@@ -292,7 +292,7 @@ static void z_x86_dump_pml4(struct x86_mmu_pml4 *pml4)
 
 	for (int i = 0; i < Z_X86_NUM_PML4_ENTRIES; i++) {
 		struct x86_mmu_pdpt *pdpt;
-		u64_t pml4e = pml4->entry[i];
+		uint64_t pml4e = pml4->entry[i];
 
 		if ((pml4e & Z_X86_MMU_P) == 0) {
 			continue;
@@ -316,7 +316,7 @@ void z_x86_dump_page_tables(struct x86_page_tables *ptables)
 #endif
 
 void z_x86_mmu_get_flags(struct x86_page_tables *ptables, void *addr,
-			 u64_t *pde_flags, u64_t *pte_flags)
+			 uint64_t *pde_flags, uint64_t *pte_flags)
 {
 	*pde_flags = *z_x86_get_pde(ptables, (uintptr_t)addr) &
 		~Z_X86_MMU_PDE_PT_MASK;
@@ -358,7 +358,7 @@ static int x86_mmu_validate_pt(struct x86_mmu_pt *pt, uintptr_t addr,
 	int ret = 0;
 
 	while (true) {
-		u64_t pte = *z_x86_pt_get_pte(pt, pos);
+		uint64_t pte = *z_x86_pt_get_pte(pt, pos);
 
 		if ((pte & Z_X86_MMU_P) == 0 || (pte & Z_X86_MMU_US) == 0 ||
 		    (write && (pte & Z_X86_MMU_RW) == 0)) {
@@ -387,7 +387,7 @@ static int x86_mmu_validate_pd(struct x86_mmu_pd *pd, uintptr_t addr,
 	size_t to_examine;
 
 	while (remaining) {
-		u64_t pde = *z_x86_pd_get_pde(pd, pos);
+		uint64_t pde = *z_x86_pd_get_pde(pd, pos);
 
 		if ((pde & Z_X86_MMU_P) == 0 || (pde & Z_X86_MMU_US) == 0 ||
 		    (write && (pde & Z_X86_MMU_RW) == 0)) {
@@ -429,7 +429,7 @@ static int x86_mmu_validate_pdpt(struct x86_mmu_pdpt *pdpt, uintptr_t addr,
 	size_t to_examine;
 
 	while (remaining) {
-		u64_t pdpte = *z_x86_pdpt_get_pdpte(pdpt, pos);
+		uint64_t pdpte = *z_x86_pdpt_get_pdpte(pdpt, pos);
 
 		if ((pdpte & Z_X86_MMU_P) == 0) {
 			/* Non-present */
@@ -478,7 +478,7 @@ static int x86_mmu_validate_pml4(struct x86_mmu_pml4 *pml4, uintptr_t addr,
 	size_t to_examine;
 
 	while (remaining) {
-		u64_t pml4e = *z_x86_pml4_get_pml4e(pml4, pos);
+		uint64_t pml4e = *z_x86_pml4_get_pml4e(pml4, pos);
 		struct x86_mmu_pdpt *pdpt;
 
 		if ((pml4e & Z_X86_MMU_P) == 0 || (pml4e & Z_X86_MMU_US) == 0 ||
@@ -553,7 +553,7 @@ static inline void tlb_flush_page(void *addr)
 				 Z_X86_MMU_PCD)
 
 void z_x86_mmu_set_flags(struct x86_page_tables *ptables, void *ptr,
-			 size_t size, u64_t flags, u64_t mask, bool flush)
+			 size_t size, uint64_t flags, uint64_t mask, bool flush)
 {
 	uintptr_t addr = (uintptr_t)ptr;
 
@@ -572,13 +572,13 @@ void z_x86_mmu_set_flags(struct x86_page_tables *ptables, void *ptr,
 	 * modified.
 	 */
 	while (size != 0) {
-		u64_t *pte;
-		u64_t *pde;
-		u64_t *pdpte;
+		uint64_t *pte;
+		uint64_t *pde;
+		uint64_t *pdpte;
 #ifdef CONFIG_X86_64
-		u64_t *pml4e;
+		uint64_t *pml4e;
 #endif
-		u64_t cur_flags = flags;
+		uint64_t cur_flags = flags;
 		bool exec = (flags & Z_X86_MMU_XD) == 0;
 
 #ifdef CONFIG_X86_64
@@ -678,7 +678,7 @@ static inline bool is_within_system_ram(uintptr_t addr)
 /* Ignored bit posiition at all levels */
 #define IGNORED		BIT64(11)
 
-static void maybe_clear_xd(u64_t *entry, bool exec)
+static void maybe_clear_xd(uint64_t *entry, bool exec)
 {
 	/* Execute disable bit needs special handling, we should only set it at
 	 * intermediate levels if ALL containing pages have XD set (instead of
@@ -696,17 +696,17 @@ static void maybe_clear_xd(u64_t *entry, bool exec)
 }
 
 static void add_mmu_region_page(struct x86_page_tables *ptables,
-				uintptr_t addr, u64_t flags, bool user_table)
+				uintptr_t addr, uint64_t flags, bool user_table)
 {
 #ifdef CONFIG_X86_64
-	u64_t *pml4e;
+	uint64_t *pml4e;
 #endif
 	struct x86_mmu_pdpt *pdpt;
-	u64_t *pdpte;
+	uint64_t *pdpte;
 	struct x86_mmu_pd *pd;
-	u64_t *pde;
+	uint64_t *pde;
 	struct x86_mmu_pt *pt;
-	u64_t *pte;
+	uint64_t *pte;
 	bool exec = (flags & Z_X86_MMU_XD) == 0;
 
 #ifdef CONFIG_X86_KPTI
@@ -795,7 +795,7 @@ static void add_mmu_region(struct x86_page_tables *ptables,
 			   bool user_table)
 {
 	size_t size;
-	u64_t flags;
+	uint64_t flags;
 	uintptr_t addr;
 
 	__ASSERT((rgn->address & MMU_PAGE_MASK) == 0U,
@@ -818,7 +818,7 @@ static void add_mmu_region(struct x86_page_tables *ptables,
 }
 
 
-void z_x86_add_mmu_region(uintptr_t addr, size_t size, u64_t flags)
+void z_x86_add_mmu_region(uintptr_t addr, size_t size, uint64_t flags)
 {
 	struct mmu_region rgn = {
 		.address = addr,
@@ -883,7 +883,7 @@ static uintptr_t thread_pdpt_create(uintptr_t pages,
 	uintptr_t pos = pages, phys_addr = Z_X86_PDPT_START;
 
 	for (int i = 0; i < Z_X86_NUM_PDPT; i++, phys_addr += Z_X86_PDPT_AREA) {
-		u64_t *pml4e;
+		uint64_t *pml4e;
 		struct x86_mmu_pdpt *master_pdpt, *dest_pdpt;
 
 		/* obtain master PDPT tables for the address range and copy
@@ -911,7 +911,7 @@ static uintptr_t thread_pd_create(uintptr_t pages,
 	uintptr_t pos = pages, phys_addr = Z_X86_PD_START;
 
 	for (int i = 0; i < Z_X86_NUM_PD; i++, phys_addr += Z_X86_PD_AREA) {
-		u64_t *pdpte;
+		uint64_t *pdpte;
 		struct x86_mmu_pd *master_pd, *dest_pd;
 
 		/* Obtain PD in master tables for the address range and copy
@@ -941,7 +941,7 @@ static uintptr_t thread_pt_create(uintptr_t pages,
 	uintptr_t pos = pages, phys_addr = Z_X86_PT_START;
 
 	for (int i = 0; i < Z_X86_NUM_PT; i++, phys_addr += Z_X86_PT_AREA) {
-		u64_t *pde;
+		uint64_t *pde;
 		struct x86_mmu_pt *master_pt, *dest_pt;
 
 		/* Same as we did with the directories, obtain PT in master
@@ -1067,7 +1067,7 @@ static void reset_mem_partition(struct x86_page_tables *thread_ptables,
 	__ASSERT((size & MMU_PAGE_MASK) == 0U, "unaligned size provided");
 
 	while (size != 0) {
-		u64_t *thread_pte, *master_pte;
+		uint64_t *thread_pte, *master_pte;
 
 		thread_pte = z_x86_get_pte(thread_ptables, addr);
 		master_pte = z_x86_get_pte(&USER_PTABLES, addr);
@@ -1082,8 +1082,8 @@ static void reset_mem_partition(struct x86_page_tables *thread_ptables,
 static void apply_mem_partition(struct x86_page_tables *ptables,
 				struct k_mem_partition *partition)
 {
-	u64_t x86_attr;
-	u64_t mask;
+	uint64_t x86_attr;
+	uint64_t mask;
 
 	if (IS_ENABLED(CONFIG_X86_KPTI)) {
 		x86_attr = partition->attr | Z_X86_MMU_P;
@@ -1171,7 +1171,7 @@ void z_x86_thread_pt_init(struct k_thread *thread)
  * configuration applied.
  */
 void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
-				      u32_t partition_id)
+				      uint32_t partition_id)
 {
 	sys_dnode_t *node, *next_node;
 
@@ -1230,7 +1230,7 @@ void arch_mem_domain_thread_remove(struct k_thread *thread)
 }
 
 void arch_mem_domain_partition_add(struct k_mem_domain *domain,
-				   u32_t partition_id)
+				   uint32_t partition_id)
 {
 	sys_dnode_t *node, *next_node;
 
diff --git a/arch/x86/include/intel64/kernel_arch_data.h b/arch/x86/include/intel64/kernel_arch_data.h
index c46cddadef..06212a5d26 100644
--- a/arch/x86/include/intel64/kernel_arch_data.h
+++ b/arch/x86/include/intel64/kernel_arch_data.h
@@ -20,9 +20,9 @@ extern char _locore_start[], _locore_end[];
 
 struct x86_cpuboot {
 	volatile int ready;	/* CPU has started */
-	u16_t tr;		/* selector for task register */
+	uint16_t tr;		/* selector for task register */
 	struct x86_tss64 *gs_base; /* Base address for GS segment */
-	u64_t sp;		/* initial stack pointer */
+	uint64_t sp;		/* initial stack pointer */
 	arch_cpustart_t fn;	/* kernel entry function */
 	void *arg;		/* argument for above function */
 #ifdef CONFIG_X86_MMU
@@ -32,7 +32,7 @@ struct x86_cpuboot {
 
 typedef struct x86_cpuboot x86_cpuboot_t;
 
-extern u8_t x86_cpu_loapics[];	/* CPU logical ID -> local APIC ID */
+extern uint8_t x86_cpu_loapics[];	/* CPU logical ID -> local APIC ID */
 
 #endif /* _ASMLANGUAGE */
 
diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h
index eef7dfd1a8..e0620c2743 100644
--- a/arch/x86/include/kernel_arch_func.h
+++ b/arch/x86/include/kernel_arch_func.h
@@ -87,7 +87,7 @@ void z_x86_page_fault_handler(z_arch_esf_t *esf);
  * @param cs Code segment of faulting context
  * @return true if addr/size region is not within the thread stack
  */
-bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, u16_t cs);
+bool z_x86_check_stack_bounds(uintptr_t addr, size_t size, uint16_t cs);
 #endif /* CONFIG_THREAD_STACK_INFO */
 
 #ifdef CONFIG_USERSPACE
diff --git a/arch/xtensa/core/irq_manage.c b/arch/xtensa/core/irq_manage.c
index 4f6c97a8fb..de7ecaa6c5 100644
--- a/arch/xtensa/core/irq_manage.c
+++ b/arch/xtensa/core/irq_manage.c
@@ -27,7 +27,7 @@
  * @return N/A
  */
 
-void z_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
+void z_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	__ASSERT(prio < XCHAL_EXCM_LEVEL + 1,
 		 "invalid priority %d! values must be less than %d\n",
@@ -41,7 +41,7 @@ void z_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
 #ifndef CONFIG_MULTI_LEVEL_INTERRUPTS
 int z_arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			       void (*routine)(void *parameter),
-			       void *parameter, u32_t flags)
+			       void *parameter, uint32_t flags)
 {
 	ARG_UNUSED(flags);
 	ARG_UNUSED(priority);
@@ -52,7 +52,7 @@ int z_arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 #else /* !CONFIG_MULTI_LEVEL_INTERRUPTS */
 int z_arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			       void (*routine)(void *parameter),
-			       void *parameter, u32_t flags)
+			       void *parameter, uint32_t flags)
 {
 	return z_soc_irq_connect_dynamic(irq, priority, routine, parameter,
 					 flags);
diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c
index aba74df6e1..b17ec722f8 100644
--- a/arch/xtensa/core/xtensa-asm2.c
+++ b/arch/xtensa/core/xtensa-asm2.c
@@ -139,7 +139,7 @@ static inline unsigned int get_bits(int offset, int num_bits, unsigned int val)
 #define DEF_INT_C_HANDLER(l)				\
 void *xtensa_int##l##_c(void *interrupted_stack)	\
 {							   \
-	u32_t irqs, intenable, m;			   \
+	uint32_t irqs, intenable, m;			   \
 	__asm__ volatile("rsr.interrupt %0" : "=r"(irqs)); \
 	__asm__ volatile("rsr.intenable %0" : "=r"(intenable)); \
 	irqs &= intenable;					\
@@ -188,7 +188,7 @@ void *xtensa_excint1_c(int *interrupted_stack)
 		bsa[BSA_PC_OFF/4] += 3;
 
 	} else {
-		u32_t ps = bsa[BSA_PS_OFF/4];
+		uint32_t ps = bsa[BSA_PS_OFF/4];
 
 		__asm__ volatile("rsr.excvaddr %0" : "=r"(vaddr));
 
@@ -219,7 +219,7 @@ void *xtensa_excint1_c(int *interrupted_stack)
 
 int z_xtensa_irq_is_enabled(unsigned int irq)
 {
-	u32_t ie;
+	uint32_t ie;
 
 	__asm__ volatile("rsr.intenable %0" : "=r"(ie));
 
diff --git a/boards/arc/em_starterkit/pmodmux.c b/boards/arc/em_starterkit/pmodmux.c
index 3c4d9e1e2e..f41689b3d5 100644
--- a/boards/arc/em_starterkit/pmodmux.c
+++ b/boards/arc/em_starterkit/pmodmux.c
@@ -126,7 +126,7 @@
 
 static int pmod_mux_init(struct device *device)
 {
-	volatile u32_t *mux_regs = (u32_t *)(PMODMUX_BASE_ADDR);
+	volatile uint32_t *mux_regs = (uint32_t *)(PMODMUX_BASE_ADDR);
 
 	mux_regs[SPI_MAP_CTRL] =  SPI_MAP_CTRL_DEFAULT;
 	mux_regs[UART_MAP_CTRL] = UART_MAP_CTRL_DEFAULT;
diff --git a/boards/arm/lpcxpresso54114/pinmux.c b/boards/arm/lpcxpresso54114/pinmux.c
index 9ad0dc2b60..258382f3b0 100644
--- a/boards/arm/lpcxpresso54114/pinmux.c
+++ b/boards/arm/lpcxpresso54114/pinmux.c
@@ -25,7 +25,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 
 #if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm0), nxp_lpc_usart, okay) && CONFIG_SERIAL
 	/* USART0 RX,  TX */
-	const u32_t port0_pin0_config = (
+	const uint32_t port0_pin0_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
@@ -35,7 +35,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 			IOCON_PIO_OPENDRAIN_DI
 			);
 
-	const u32_t port0_pin1_config = (
+	const uint32_t port0_pin1_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
@@ -51,7 +51,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
-	const u32_t port0_pin29_config = (
+	const uint32_t port0_pin29_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
@@ -62,7 +62,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 
 	pinmux_pin_set(port0, 29, port0_pin29_config);
 
-	const u32_t port0_pin24_config = (
+	const uint32_t port0_pin24_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_INV_DI |
 			IOCON_PIO_DIGITAL_EN |
@@ -71,7 +71,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 			);
 	pinmux_pin_set(port0,  24, port0_pin24_config);
 
-	const u32_t port0_pin31_config = (
+	const uint32_t port0_pin31_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
@@ -81,7 +81,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 			);
 	pinmux_pin_set(port0,  31, port0_pin31_config);
 
-	const u32_t port0_pin4_config = (
+	const uint32_t port0_pin4_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
@@ -94,7 +94,7 @@ static int lpcxpresso_54114_pinmux_init(struct device *dev)
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
-	const u32_t port1_pin10_config = (
+	const uint32_t port1_pin10_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
diff --git a/boards/arm/lpcxpresso55s16/pinmux.c b/boards/arm/lpcxpresso55s16/pinmux.c
index 2bd22bd25a..0156944ef5 100644
--- a/boards/arm/lpcxpresso55s16/pinmux.c
+++ b/boards/arm/lpcxpresso55s16/pinmux.c
@@ -25,7 +25,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw0), gpios, pin)
 	/* Wakeup button */
-	const u32_t sw0_config = (
+	const uint32_t sw0_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -37,7 +37,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw1), gpios, pin)
 	/* USR button */
-	const u32_t sw1_config = (
+	const uint32_t sw1_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -49,7 +49,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw2), gpios, pin)
 	/* ISP button */
-	const u32_t sw2_config = (
+	const uint32_t sw2_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -61,7 +61,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(led0), gpios, pin)
 	/* Red LED */
-	const u32_t led0_config = (
+	const uint32_t led0_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -73,7 +73,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(led1), gpios, pin)
 	/* Green LED */
-	const u32_t led1_config = (
+	const uint32_t led1_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -85,7 +85,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(led2), gpios, pin)
 	/* Blue LED */
-	const u32_t led2_config = (
+	const uint32_t led2_config = (
 		IOCON_PIO_FUNC0 |
 		IOCON_PIO_INV_DI |
 		IOCON_PIO_DIGITAL_EN |
@@ -97,7 +97,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 
 #if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm0), nxp_lpc_usart, okay) && CONFIG_SERIAL
 	/* USART0 RX, TX */
-	const u32_t port0_pin29_config = (
+	const uint32_t port0_pin29_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
@@ -105,7 +105,7 @@ static int lpcxpresso_55s16_pinmux_init(struct device *dev)
 			IOCON_PIO_SLEW_STANDARD |
 			IOCON_PIO_OPENDRAIN_DI
 			);
-	const u32_t port0_pin30_config = (
+	const uint32_t port0_pin30_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
diff --git a/boards/arm/lpcxpresso55s69/pinmux.c b/boards/arm/lpcxpresso55s69/pinmux.c
index e212474884..37fc154d95 100644
--- a/boards/arm/lpcxpresso55s69/pinmux.c
+++ b/boards/arm/lpcxpresso55s69/pinmux.c
@@ -25,7 +25,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
 
 #if DT_NODE_HAS_COMPAT_STATUS(DT_NODELABEL(flexcomm0), nxp_lpc_usart, okay) && CONFIG_SERIAL
 	/* USART0 RX,  TX */
-	const u32_t port0_pin29_config = (
+	const uint32_t port0_pin29_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
@@ -34,7 +34,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
 			IOCON_PIO_OPENDRAIN_DI
 			);
 
-	const u32_t port0_pin30_config = (
+	const uint32_t port0_pin30_config = (
 			IOCON_PIO_FUNC1 |
 			IOCON_PIO_MODE_INACT |
 			IOCON_PIO_INV_DI |
@@ -49,7 +49,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
 #endif
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw0), gpios, pin)
-	const u32_t sw0_config = (
+	const uint32_t sw0_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
@@ -63,7 +63,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
 
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw1), gpios, pin)
-	const u32_t sw1_config = (
+	const uint32_t sw1_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
@@ -76,7 +76,7 @@ static int lpcxpresso_55s69_pinmux_init(struct device *dev)
 #endif
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw2), gpios, pin)
-	const u32_t sw2_config = (
+	const uint32_t sw2_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_MODE_PULLUP |
 			IOCON_PIO_INV_DI |
diff --git a/boards/arm/mimxrt1050_evk/pinmux.c b/boards/arm/mimxrt1050_evk/pinmux.c
index 8afad26686..be9b8f6079 100644
--- a/boards/arm/mimxrt1050_evk/pinmux.c
+++ b/boards/arm/mimxrt1050_evk/pinmux.c
@@ -29,17 +29,17 @@ static gpio_pin_config_t enet_gpio_config = {
  */
 
 static void mimxrt1050_evk_usdhc_pinmux(
-	u16_t nusdhc, bool init,
-	u32_t speed, u32_t strength)
+	uint16_t nusdhc, bool init,
+	uint32_t speed, uint32_t strength)
 {
-	u32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 				IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
 				IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
-	u32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 				IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
diff --git a/boards/arm/mimxrt1060_evk/pinmux.c b/boards/arm/mimxrt1060_evk/pinmux.c
index 961ea3c4d2..bab14ac590 100644
--- a/boards/arm/mimxrt1060_evk/pinmux.c
+++ b/boards/arm/mimxrt1060_evk/pinmux.c
@@ -31,10 +31,10 @@ static gpio_pin_config_t enet_gpio_config = {
  *Hyst. Enable Field: Hysteresis Enabled.
  */
 
-static void mimxrt1060_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed,
-					u32_t strength)
+static void mimxrt1060_evk_usdhc_pinmux(uint16_t nusdhc, bool init, uint32_t speed,
+					uint32_t strength)
 {
-	u32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 			 IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 			 IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
 			 IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
@@ -42,7 +42,7 @@ static void mimxrt1060_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed,
 			 IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
 			 IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
 
-	u32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 		    IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 		    IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 		    IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
diff --git a/boards/arm/mimxrt1064_evk/pinmux.c b/boards/arm/mimxrt1064_evk/pinmux.c
index 829c7f12e8..0d243c945a 100644
--- a/boards/arm/mimxrt1064_evk/pinmux.c
+++ b/boards/arm/mimxrt1064_evk/pinmux.c
@@ -31,10 +31,10 @@ static gpio_pin_config_t enet_gpio_config = {
  *Hyst. Enable Field: Hysteresis Enabled.
  */
 
-static void mimxrt1064_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed,
-					u32_t strength)
+static void mimxrt1064_evk_usdhc_pinmux(uint16_t nusdhc, bool init, uint32_t speed,
+					uint32_t strength)
 {
-	u32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 			 IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 			 IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
 			 IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
@@ -42,7 +42,7 @@ static void mimxrt1064_evk_usdhc_pinmux(u16_t nusdhc, bool init, u32_t speed,
 			 IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
 			 IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
 
-	u32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 		    IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 		    IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 		    IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
diff --git a/boards/arm/mm_swiftio/mmswiftio_flexspi_nor_config.h b/boards/arm/mm_swiftio/mmswiftio_flexspi_nor_config.h
index 4aba23b694..58c8c3caa4 100644
--- a/boards/arm/mm_swiftio/mmswiftio_flexspi_nor_config.h
+++ b/boards/arm/mm_swiftio/mmswiftio_flexspi_nor_config.h
@@ -114,9 +114,9 @@ enum { kSerialFlash_1Pad = 1,
 
 
 struct flexspi_lut_seq_t {
-	u8_t seqNum;
-	u8_t seqId;
-	u16_t reserved;
+	uint8_t seqNum;
+	uint8_t seqId;
+	uint16_t reserved;
 };
 
 
@@ -129,54 +129,54 @@ enum { kDeviceConfigCmdType_Generic,
 
 
 struct flexspi_mem_config_t {
-	u32_t tag;
-	u32_t version;
-	u32_t reserved0;
-	u8_t readSampleClkSrc;
-	u8_t csHoldTime;
-	u8_t csSetupTime;
-	u8_t columnAddressWidth;
+	uint32_t tag;
+	uint32_t version;
+	uint32_t reserved0;
+	uint8_t readSampleClkSrc;
+	uint8_t csHoldTime;
+	uint8_t csSetupTime;
+	uint8_t columnAddressWidth;
 
-	u8_t deviceModeCfgEnable;
-	u8_t deviceModeType;
+	uint8_t deviceModeCfgEnable;
+	uint8_t deviceModeType;
 
-	u16_t waitTimeCfgCommands;
+	uint16_t waitTimeCfgCommands;
 
 	struct flexspi_lut_seq_t deviceModeSeq;
 
-	u32_t deviceModeArg;
-	u8_t configCmdEnable;
-	u8_t configModeType[3];
+	uint32_t deviceModeArg;
+	uint8_t configCmdEnable;
+	uint8_t configModeType[3];
 	struct flexspi_lut_seq_t configCmdSeqs[3];
-	u32_t reserved1;
-	u32_t configCmdArgs[3];
-	u32_t reserved2;
-	u32_t controllerMiscOption;
+	uint32_t reserved1;
+	uint32_t configCmdArgs[3];
+	uint32_t reserved2;
+	uint32_t controllerMiscOption;
 
-	u8_t deviceType;
-	u8_t sflashPadType;
-	u8_t serialClkFreq;
+	uint8_t deviceType;
+	uint8_t sflashPadType;
+	uint8_t serialClkFreq;
 
-	u8_t lutCustomSeqEnable;
+	uint8_t lutCustomSeqEnable;
 
-	u32_t reserved3[2];
-	u32_t sflashA1Size;
-	u32_t sflashA2Size;
-	u32_t sflashB1Size;
-	u32_t sflashB2Size;
-	u32_t csPadSettingOverride;
-	u32_t sclkPadSettingOverride;
-	u32_t dataPadSettingOverride;
-	u32_t dqsPadSettingOverride;
-	u32_t timeoutInMs;
-	u32_t commandInterval;
-	u16_t dataValidTime[2];
-	u16_t busyOffset;
-	u16_t busyBitPolarity;
+	uint32_t reserved3[2];
+	uint32_t sflashA1Size;
+	uint32_t sflashA2Size;
+	uint32_t sflashB1Size;
+	uint32_t sflashB2Size;
+	uint32_t csPadSettingOverride;
+	uint32_t sclkPadSettingOverride;
+	uint32_t dataPadSettingOverride;
+	uint32_t dqsPadSettingOverride;
+	uint32_t timeoutInMs;
+	uint32_t commandInterval;
+	uint16_t dataValidTime[2];
+	uint16_t busyOffset;
+	uint16_t busyBitPolarity;
 
-	u32_t lookupTable[64];
+	uint32_t lookupTable[64];
 	struct flexspi_lut_seq_t lutCustomSeq[12];
-	u32_t reserved4[4];
+	uint32_t reserved4[4];
 };
 
 
@@ -217,17 +217,17 @@ struct flexspi_mem_config_t {
 
 struct flexspi_nor_config_t {
 	struct flexspi_mem_config_t memConfig;
-	u32_t pageSize;
-	u32_t sectorSize;
-	u8_t ipcmdSerialClkFreq;
-	u8_t isUniformBlockSize;
-	u8_t reserved0[2];
-	u8_t serialNorType;
-	u8_t needExitNoCmdMode;
-	u8_t halfClkForNonReadCmd;
-	u8_t needRestoreNoCmdMode;
-	u32_t blockSize;
-	u32_t reserve2[11];
+	uint32_t pageSize;
+	uint32_t sectorSize;
+	uint8_t ipcmdSerialClkFreq;
+	uint8_t isUniformBlockSize;
+	uint8_t reserved0[2];
+	uint8_t serialNorType;
+	uint8_t needExitNoCmdMode;
+	uint8_t halfClkForNonReadCmd;
+	uint8_t needRestoreNoCmdMode;
+	uint32_t blockSize;
+	uint32_t reserve2[11];
 };
 
 #ifdef __cplusplus
diff --git a/boards/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c b/boards/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c
index ff1074c12b..cac7fa33cc 100644
--- a/boards/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c
+++ b/boards/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c
@@ -16,7 +16,7 @@ __attribute__((section(".boot_hdr.dcd_data")))
 #pragma location = ".boot_hdr.dcd_data"
 #endif
 
-const u8_t dcd_data[] = {
+const uint8_t dcd_data[] = {
 	0xD2,
 
 	0x04, 0x30,
@@ -289,6 +289,6 @@ const u8_t dcd_data[] = {
 };
 
 #else
-const u8_t dcd_data[] = { 0x00 };
+const uint8_t dcd_data[] = { 0x00 };
 #endif
 #endif
diff --git a/boards/arm/mm_swiftio/pinmux.c b/boards/arm/mm_swiftio/pinmux.c
index 0d0531b3ba..1f3d989f6b 100644
--- a/boards/arm/mm_swiftio/pinmux.c
+++ b/boards/arm/mm_swiftio/pinmux.c
@@ -29,17 +29,17 @@ static gpio_pin_config_t enet_gpio_config = {
  */
 
 static void mm_swiftio_usdhc_pinmux(
-	u16_t nusdhc, bool init,
-	u32_t speed, u32_t strength)
+	uint16_t nusdhc, bool init,
+	uint32_t speed, uint32_t strength)
 {
-	u32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t cmd_data = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 				IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
 				IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
-	u32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+	uint32_t clk = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
 				IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
 				IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
diff --git a/boards/arm/mps2_an385/pinmux.c b/boards/arm/mps2_an385/pinmux.c
index ebe1cc1cb1..b9d4bd40d5 100644
--- a/boards/arm/mps2_an385/pinmux.c
+++ b/boards/arm/mps2_an385/pinmux.c
@@ -117,9 +117,9 @@
  */
 static void arm_mps2_pinmux_defaults(void)
 {
-	u32_t gpio_0 = 0U;
-	u32_t gpio_1 = 0U;
-	u32_t gpio_2 = 0U;
+	uint32_t gpio_0 = 0U;
+	uint32_t gpio_1 = 0U;
+	uint32_t gpio_2 = 0U;
 
 	/* Set GPIO Alternate Functions */
 
diff --git a/boards/arm/mps2_an521/pinmux.c b/boards/arm/mps2_an521/pinmux.c
index ebc2797456..116736f3dd 100644
--- a/boards/arm/mps2_an521/pinmux.c
+++ b/boards/arm/mps2_an521/pinmux.c
@@ -117,9 +117,9 @@
  */
 static void arm_mps2_pinmux_defaults(void)
 {
-	u32_t gpio_0 = 0;
-	u32_t gpio_1 = 0;
-	u32_t gpio_2 = 0;
+	uint32_t gpio_0 = 0;
+	uint32_t gpio_1 = 0;
+	uint32_t gpio_2 = 0;
 
 	/* Set GPIO Alternate Functions */
 
diff --git a/boards/arm/nrf9160dk_nrf52840/board.c b/boards/arm/nrf9160dk_nrf52840/board.c
index 44147c7123..58ae7608b4 100644
--- a/boards/arm/nrf9160dk_nrf52840/board.c
+++ b/boards/arm/nrf9160dk_nrf52840/board.c
@@ -56,8 +56,8 @@ LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_NRF9160DK_LOG_LEVEL);
  */
 
 __packed struct pin_config {
-	u8_t pin;
-	u8_t val;
+	uint8_t pin;
+	uint8_t val;
 };
 
 /* The following tables specify the configuration of each pin based on the
@@ -183,7 +183,7 @@ static int pins_configure(struct device *port, const struct pin_config cfg[],
 		 * so configure the pin as output with the proper initial
 		 * state.
 		 */
-		u32_t flag = (cfg[i].val ? GPIO_OUTPUT_LOW
+		uint32_t flag = (cfg[i].val ? GPIO_OUTPUT_LOW
 					 : GPIO_OUTPUT_HIGH);
 		err = gpio_pin_configure(port, cfg[i].pin, flag);
 		if (err) {
@@ -198,9 +198,9 @@ static int pins_configure(struct device *port, const struct pin_config cfg[],
 }
 
 static void chip_reset(struct device *gpio,
-		       struct gpio_callback *cb, u32_t pins)
+		       struct gpio_callback *cb, uint32_t pins)
 {
-	const u32_t stamp = k_cycle_get_32();
+	const uint32_t stamp = k_cycle_get_32();
 
 	printk("GPIO reset line asserted, device reset.\n");
 	printk("Bye @ cycle32 %u\n", stamp);
@@ -208,7 +208,7 @@ static void chip_reset(struct device *gpio,
 	NVIC_SystemReset();
 }
 
-static void reset_pin_wait_low(struct device *port, u32_t pin)
+static void reset_pin_wait_low(struct device *port, uint32_t pin)
 {
 	int val;
 
@@ -221,7 +221,7 @@ static void reset_pin_wait_low(struct device *port, u32_t pin)
 static int reset_pin_configure(struct device *p0, struct device *p1)
 {
 	int err;
-	u32_t pin = 0;
+	uint32_t pin = 0;
 	struct device *port = NULL;
 
 	static struct gpio_callback gpio_ctx;
diff --git a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c
index e654a28119..80d62b33aa 100644
--- a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c
+++ b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c
@@ -22,19 +22,19 @@
 
 static struct k_spinlock lock;
 
-static u32_t last_count;
+static uint32_t last_count;
 
-static u32_t counter_sub(u32_t a, u32_t b)
+static uint32_t counter_sub(uint32_t a, uint32_t b)
 {
 	return (a - b) & COUNTER_MAX;
 }
 
-static void set_comparator(u32_t cyc)
+static void set_comparator(uint32_t cyc)
 {
 	nrf_timer_cc_set(TIMER, 0, cyc & COUNTER_MAX);
 }
 
-static u32_t counter(void)
+static uint32_t counter(void)
 {
 	nrf_timer_task_trigger(TIMER, nrf_timer_capture_task_get(1));
 
@@ -47,13 +47,13 @@ void timer0_nrf_isr(void *arg)
 	TIMER->EVENTS_COMPARE[0] = 0;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t t = counter();
-	u32_t dticks = counter_sub(t, last_count) / CYC_PER_TICK;
+	uint32_t t = counter();
+	uint32_t dticks = counter_sub(t, last_count) / CYC_PER_TICK;
 
 	last_count += dticks * CYC_PER_TICK;
 
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
-		u32_t next = last_count + CYC_PER_TICK;
+		uint32_t next = last_count + CYC_PER_TICK;
 
 		/* As below: we're guaranteed to get an interrupt as
 		 * long as it's set two or more cycles in the future
@@ -103,16 +103,16 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #ifdef CONFIG_TICKLESS_KERNEL
 	ticks = (ticks == K_TICKS_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t cyc, dt, t = counter();
+	uint32_t cyc, dt, t = counter();
 	bool zli_fixup = IS_ENABLED(CONFIG_ZERO_LATENCY_IRQS);
 
 	/* Round up to next tick boundary */
@@ -164,23 +164,23 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif /* CONFIG_TICKLESS_KERNEL */
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = counter_sub(counter(), last_count) / CYC_PER_TICK;
+	uint32_t ret = counter_sub(counter(), last_count) / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = counter_sub(counter(), last_count) + last_count;
+	uint32_t ret = counter_sub(counter(), last_count) + last_count;
 
 	k_spin_unlock(&lock, key);
 	return ret;
diff --git a/boards/arm/thingy52_nrf52832/board.c b/boards/arm/thingy52_nrf52832/board.c
index 1d81408bc8..f904570918 100644
--- a/boards/arm/thingy52_nrf52832/board.c
+++ b/boards/arm/thingy52_nrf52832/board.c
@@ -13,7 +13,7 @@
 
 struct pwr_ctrl_cfg {
 	const char *port;
-	u32_t pin;
+	uint32_t pin;
 };
 
 static int pwr_ctrl_init(struct device *dev)
diff --git a/boards/arm/v2m_beetle/pinmux.c b/boards/arm/v2m_beetle/pinmux.c
index e926db0dfa..4ebcd8781b 100644
--- a/boards/arm/v2m_beetle/pinmux.c
+++ b/boards/arm/v2m_beetle/pinmux.c
@@ -94,8 +94,8 @@
  */
 static void arm_v2m_beetle_pinmux_defaults(void)
 {
-	u32_t gpio_0 = 0U;
-	u32_t gpio_1 = 0U;
+	uint32_t gpio_0 = 0U;
+	uint32_t gpio_1 = 0U;
 
 	/* Set GPIO Alternate Functions */
 
diff --git a/boards/arm/v2m_musca/pinmux.c b/boards/arm/v2m_musca/pinmux.c
index cc8f46ce95..be78dd15ac 100644
--- a/boards/arm/v2m_musca/pinmux.c
+++ b/boards/arm/v2m_musca/pinmux.c
@@ -37,7 +37,7 @@ static void arm_musca_pinmux_defaults(void)
  */
 static void arm_musca_pinmux_defaults(void)
 {
-	volatile u32_t *scc = (u32_t *)DT_REG_ADDR(DT_INST(0, arm_scc));
+	volatile uint32_t *scc = (uint32_t *)DT_REG_ADDR(DT_INST(0, arm_scc));
 
 	/* there is only altfunc1, so steer all alt funcs to use 1 */
 	scc[IOMUX_ALTF1_INSEL] = 0xffff;
diff --git a/boards/arm/v2m_musca_b1/pinmux.c b/boards/arm/v2m_musca_b1/pinmux.c
index 71e82ad926..1d3d4074a0 100644
--- a/boards/arm/v2m_musca_b1/pinmux.c
+++ b/boards/arm/v2m_musca_b1/pinmux.c
@@ -37,7 +37,7 @@ static void arm_musca_b1_pinmux_defaults(void)
  */
 static void arm_musca_b1_pinmux_defaults(void)
 {
-	volatile u32_t *scc = (u32_t *)DT_REG_ADDR(DT_INST(0, arm_scc));
+	volatile uint32_t *scc = (uint32_t *)DT_REG_ADDR(DT_INST(0, arm_scc));
 
 	/* there is only altfunc1, so steer all alt funcs to use 1 */
 	scc[IOMUX_ALTF1_INSEL] = 0xffff;
diff --git a/boards/posix/native_posix/board_irq.h b/boards/posix/native_posix/board_irq.h
index 2eaac01d85..46f349f45a 100644
--- a/boards/posix/native_posix/board_irq.h
+++ b/boards/posix/native_posix/board_irq.h
@@ -17,7 +17,7 @@ extern "C" {
 
 void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(void *),
 		       void *isr_param_p);
-void posix_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags);
+void posix_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags);
 
 /**
  * Configure a static interrupt.
diff --git a/boards/posix/native_posix/cmdline_common.c b/boards/posix/native_posix/cmdline_common.c
index 2f2cf58790..9528eaa93d 100644
--- a/boards/posix/native_posix/cmdline_common.c
+++ b/boards/posix/native_posix/cmdline_common.c
@@ -146,16 +146,16 @@ void cmd_read_option_value(const char *str, void *dest, const char type,
 		endptr = (char *)str + strlen(str);
 		break;
 	case 'u':
-		*(u32_t *)dest = strtoul(str, &endptr, 0);
+		*(uint32_t *)dest = strtoul(str, &endptr, 0);
 		break;
 	case 'U':
-		*(u64_t *)dest = strtoull(str, &endptr, 0);
+		*(uint64_t *)dest = strtoull(str, &endptr, 0);
 		break;
 	case 'i':
-		*(s32_t *)dest = strtol(str, &endptr, 0);
+		*(int32_t *)dest = strtol(str, &endptr, 0);
 		break;
 	case 'I':
-		*(s64_t *)dest = strtoll(str, &endptr, 0);
+		*(int64_t *)dest = strtoll(str, &endptr, 0);
 		break;
 	case 'd':
 		*(double *)dest = strtod(str, &endptr);
@@ -201,16 +201,16 @@ void cmd_args_set_defaults(struct args_struct_t args_struct[])
 			*(char **)args_struct[count].dest = NULL;
 			break;
 		case 'u':
-			*(u32_t *)args_struct[count].dest = UINT32_MAX;
+			*(uint32_t *)args_struct[count].dest = UINT32_MAX;
 			break;
 		case 'U':
-			*(u64_t *)args_struct[count].dest = UINT64_MAX;
+			*(uint64_t *)args_struct[count].dest = UINT64_MAX;
 			break;
 		case 'i':
-			*(s32_t *)args_struct[count].dest = INT32_MAX;
+			*(int32_t *)args_struct[count].dest = INT32_MAX;
 			break;
 		case 'I':
-			*(s64_t *)args_struct[count].dest = INT64_MAX;
+			*(int64_t *)args_struct[count].dest = INT64_MAX;
 			break;
 		case 'd':
 			*(double *)args_struct[count].dest = NAN;
diff --git a/boards/posix/native_posix/hw_models_top.c b/boards/posix/native_posix/hw_models_top.c
index cc87695900..629efe48c5 100644
--- a/boards/posix/native_posix/hw_models_top.c
+++ b/boards/posix/native_posix/hw_models_top.c
@@ -24,14 +24,14 @@
 #include <sys/util.h>
 
 
-static u64_t simu_time; /* The actual time as known by the HW models */
-static u64_t end_of_time = NEVER; /* When will this device stop */
+static uint64_t simu_time; /* The actual time as known by the HW models */
+static uint64_t end_of_time = NEVER; /* When will this device stop */
 
 /* List of HW model timers: */
-extern u64_t hw_timer_timer; /* When should this timer_model be called */
-extern u64_t irq_ctrl_timer;
+extern uint64_t hw_timer_timer; /* When should this timer_model be called */
+extern uint64_t irq_ctrl_timer;
 #ifdef CONFIG_HAS_SDL
-extern u64_t sdl_event_timer;
+extern uint64_t sdl_event_timer;
 #endif
 
 static enum {
@@ -44,7 +44,7 @@ static enum {
 	NONE
 } next_timer_index = NONE;
 
-static u64_t *Timer_list[NUMBER_OF_TIMERS] = {
+static uint64_t *Timer_list[NUMBER_OF_TIMERS] = {
 	&hw_timer_timer,
 	&irq_ctrl_timer,
 #ifdef CONFIG_HAS_SDL
@@ -52,7 +52,7 @@ static u64_t *Timer_list[NUMBER_OF_TIMERS] = {
 #endif
 };
 
-static u64_t next_timer_time;
+static uint64_t next_timer_time;
 
 /* Have we received a SIGTERM or SIGINT */
 static volatile sig_atomic_t signaled_end;
@@ -169,7 +169,7 @@ void hwm_main_loop(void)
 /**
  * Set the simulated time when the process will stop
  */
-void hwm_set_end_of_time(u64_t new_end_of_time)
+void hwm_set_end_of_time(uint64_t new_end_of_time)
 {
 	end_of_time = new_end_of_time;
 }
@@ -177,12 +177,12 @@ void hwm_set_end_of_time(u64_t new_end_of_time)
 /**
  * Return the current time as known by the device
  */
-u64_t hwm_get_time(void)
+uint64_t hwm_get_time(void)
 {
 	return simu_time;
 }
 
-u64_t posix_get_hw_cycle(void)
+uint64_t posix_get_hw_cycle(void)
 {
 	return hwm_get_time();
 }
diff --git a/boards/posix/native_posix/hw_models_top.h b/boards/posix/native_posix/hw_models_top.h
index 2430811015..87ad2f3943 100644
--- a/boards/posix/native_posix/hw_models_top.h
+++ b/boards/posix/native_posix/hw_models_top.h
@@ -19,8 +19,8 @@ extern "C" {
 void hwm_main_loop(void);
 void hwm_init(void);
 void hwm_cleanup(void);
-void hwm_set_end_of_time(u64_t new_end_of_time);
-u64_t hwm_get_time(void);
+void hwm_set_end_of_time(uint64_t new_end_of_time);
+uint64_t hwm_get_time(void);
 void hwm_find_next_timer(void);
 
 #ifdef __cplusplus
diff --git a/boards/posix/native_posix/irq_ctrl.c b/boards/posix/native_posix/irq_ctrl.c
index 8cf8ec9b7a..76dcaffefe 100644
--- a/boards/posix/native_posix/irq_ctrl.c
+++ b/boards/posix/native_posix/irq_ctrl.c
@@ -16,11 +16,11 @@
 #include "posix_soc.h"
 #include "zephyr/types.h"
 
-u64_t irq_ctrl_timer = NEVER;
+uint64_t irq_ctrl_timer = NEVER;
 
 
-static u64_t irq_status;  /* pending interrupts */
-static u64_t irq_premask; /* interrupts before the mask */
+static uint64_t irq_status;  /* pending interrupts */
+static uint64_t irq_premask; /* interrupts before the mask */
 
 /*
  * Mask of which interrupts will actually cause the cpu to vector into its
@@ -30,7 +30,7 @@ static u64_t irq_premask; /* interrupts before the mask */
  * If the irq_mask enables and interrupt pending in irq_premask, it will cause
  * the controller to raise the interrupt immediately
  */
-static u64_t irq_mask;
+static uint64_t irq_mask;
 
 /*
  * Interrupts lock/disable. When set, interrupts are registered
@@ -40,7 +40,7 @@ static u64_t irq_mask;
 static bool irqs_locked;
 static bool lock_ignore; /* For the hard fake IRQ, temporarily ignore lock */
 
-static u8_t irq_prio[N_IRQS]; /* Priority of each interrupt */
+static uint8_t irq_prio[N_IRQS]; /* Priority of each interrupt */
 /* note that prio = 0 == highest, prio=255 == lowest */
 
 static int currently_running_prio = 256; /* 255 is the lowest prio interrupt */
@@ -77,7 +77,7 @@ void hw_irq_ctrl_prio_set(unsigned int irq, unsigned int prio)
 	irq_prio[irq] = prio;
 }
 
-u8_t hw_irq_ctrl_get_prio(unsigned int irq)
+uint8_t hw_irq_ctrl_get_prio(unsigned int irq)
 {
 	return irq_prio[irq];
 }
@@ -94,14 +94,14 @@ int hw_irq_ctrl_get_highest_prio_irq(void)
 		return -1;
 	}
 
-	u64_t irq_status = hw_irq_ctrl_get_irq_status();
+	uint64_t irq_status = hw_irq_ctrl_get_irq_status();
 	int winner = -1;
 	int winner_prio = 256;
 
 	while (irq_status != 0U) {
 		int irq_nbr = find_lsb_set(irq_status) - 1;
 
-		irq_status &= ~((u64_t) 1 << irq_nbr);
+		irq_status &= ~((uint64_t) 1 << irq_nbr);
 		if ((winner_prio > (int)irq_prio[irq_nbr])
 		   && (currently_running_prio > (int)irq_prio[irq_nbr])) {
 			winner = irq_nbr;
@@ -112,14 +112,14 @@ int hw_irq_ctrl_get_highest_prio_irq(void)
 }
 
 
-u32_t hw_irq_ctrl_get_current_lock(void)
+uint32_t hw_irq_ctrl_get_current_lock(void)
 {
 	return irqs_locked;
 }
 
-u32_t hw_irq_ctrl_change_lock(u32_t new_lock)
+uint32_t hw_irq_ctrl_change_lock(uint32_t new_lock)
 {
-	u32_t previous_lock = irqs_locked;
+	uint32_t previous_lock = irqs_locked;
 
 	irqs_locked = new_lock;
 
@@ -150,23 +150,23 @@ void hw_irq_ctrl_clear_all_irqs(void)
 
 void hw_irq_ctrl_disable_irq(unsigned int irq)
 {
-	irq_mask &= ~((u64_t)1<<irq);
+	irq_mask &= ~((uint64_t)1<<irq);
 }
 
 int hw_irq_ctrl_is_irq_enabled(unsigned int irq)
 {
-	return (irq_mask & ((u64_t)1 << irq))?1:0;
+	return (irq_mask & ((uint64_t)1 << irq))?1:0;
 }
 
-u64_t hw_irq_ctrl_get_irq_mask(void)
+uint64_t hw_irq_ctrl_get_irq_mask(void)
 {
 	return irq_mask;
 }
 
 void hw_irq_ctrl_clear_irq(unsigned int irq)
 {
-	irq_status  &= ~((u64_t)1<<irq);
-	irq_premask &= ~((u64_t)1<<irq);
+	irq_status  &= ~((uint64_t)1<<irq);
+	irq_premask &= ~((uint64_t)1<<irq);
 }
 
 
@@ -180,8 +180,8 @@ void hw_irq_ctrl_clear_irq(unsigned int irq)
  */
 void hw_irq_ctrl_enable_irq(unsigned int irq)
 {
-	irq_mask |= ((u64_t)1<<irq);
-	if (irq_premask & ((u64_t)1<<irq)) { /* if IRQ is pending */
+	irq_mask |= ((uint64_t)1<<irq);
+	if (irq_premask & ((uint64_t)1<<irq)) { /* if IRQ is pending */
 		hw_irq_ctrl_raise_im_from_sw(irq);
 	}
 }
@@ -190,10 +190,10 @@ void hw_irq_ctrl_enable_irq(unsigned int irq)
 static inline void hw_irq_ctrl_irq_raise_prefix(unsigned int irq)
 {
 	if (irq < N_IRQS) {
-		irq_premask |= ((u64_t)1<<irq);
+		irq_premask |= ((uint64_t)1<<irq);
 
 		if (irq_mask & (1 << irq)) {
-			irq_status |= ((u64_t)1<<irq);
+			irq_status |= ((uint64_t)1<<irq);
 		}
 	} else if (irq == PHONY_HARD_IRQ) {
 		lock_ignore = true;
diff --git a/boards/posix/native_posix/native_rtc.c b/boards/posix/native_posix/native_rtc.c
index 7715e3b835..f8a3c152ca 100644
--- a/boards/posix/native_posix/native_rtc.c
+++ b/boards/posix/native_posix/native_rtc.c
@@ -17,15 +17,15 @@
  * Return the (simulation) time in microseconds
  * where clock_type is one of RTC_CLOCK_*
  */
-u64_t native_rtc_gettime_us(int clock_type)
+uint64_t native_rtc_gettime_us(int clock_type)
 {
 	if (clock_type == RTC_CLOCK_BOOT) {
 		return hwm_get_time();
 	} else if (clock_type == RTC_CLOCK_REALTIME) { /* RTC_CLOCK_REALTIME */
 		return hwtimer_get_simu_rtc_time();
 	} else if (clock_type == RTC_CLOCK_PSEUDOHOSTREALTIME) {
-		u32_t nsec;
-		u64_t sec;
+		uint32_t nsec;
+		uint64_t sec;
 
 		hwtimer_get_pseudohost_rtc_time(&nsec, &sec);
 		return sec * 1000000UL + nsec / 1000U;
@@ -41,10 +41,10 @@ u64_t native_rtc_gettime_us(int clock_type)
  * get the simulation time split in nsec and seconds
  * where clock_type is one of RTC_CLOCK_*
  */
-void native_rtc_gettime(int clock_type, u32_t *nsec, u64_t *sec)
+void native_rtc_gettime(int clock_type, uint32_t *nsec, uint64_t *sec)
 {
 	if (clock_type == RTC_CLOCK_BOOT || clock_type == RTC_CLOCK_REALTIME) {
-		u64_t us = native_rtc_gettime_us(clock_type);
+		uint64_t us = native_rtc_gettime_us(clock_type);
 		*nsec = (us % 1000000UL) * 1000U;
 		*sec  = us / 1000000UL;
 	} else { /* RTC_CLOCK_PSEUDOHOSTREALTIME */
@@ -57,7 +57,7 @@ void native_rtc_gettime(int clock_type, u32_t *nsec, u64_t *sec)
  * Note that this only affects the RTC_CLOCK_REALTIME and
  * RTC_CLOCK_PSEUDOHOSTREALTIME clocks.
  */
-void native_rtc_offset(s64_t delta_us)
+void native_rtc_offset(int64_t delta_us)
 {
 	hwtimer_adjust_rtc_offset(delta_us);
 }
diff --git a/boards/posix/native_posix/native_rtc.h b/boards/posix/native_posix/native_rtc.h
index 7adbc45cfd..aaff5ae9d9 100644
--- a/boards/posix/native_posix/native_rtc.h
+++ b/boards/posix/native_posix/native_rtc.h
@@ -41,7 +41,7 @@ extern "C" {
  *
  * @return Number of microseconds
  */
-u64_t native_rtc_gettime_us(int clock_type);
+uint64_t native_rtc_gettime_us(int clock_type);
 
 /**
  * @brief Get the value of a clock split in in nsec and seconds
@@ -50,7 +50,7 @@ u64_t native_rtc_gettime_us(int clock_type);
  * @param nsec Pointer to store the nanoseconds
  * @param nsec Pointer to store the seconds
  */
-void native_rtc_gettime(int clock_type, u32_t *nsec, u64_t *sec);
+void native_rtc_gettime(int clock_type, uint32_t *nsec, uint64_t *sec);
 
 /**
  * @brief Offset the real time clock by a number of microseconds.
@@ -60,7 +60,7 @@ void native_rtc_gettime(int clock_type, u32_t *nsec, u64_t *sec);
  * @param delta_us Number of microseconds to offset. The value is added to all
  * offsetable clocks.
  */
-void native_rtc_offset(s64_t delta_us);
+void native_rtc_offset(int64_t delta_us);
 
 /**
  * @brief Adjust the speed of the clock source by a multiplicative factor
diff --git a/boards/posix/native_posix/sdl_events.c b/boards/posix/native_posix/sdl_events.c
index 8b2511e01d..0e0bda4541 100644
--- a/boards/posix/native_posix/sdl_events.c
+++ b/boards/posix/native_posix/sdl_events.c
@@ -11,7 +11,7 @@
 #include "soc.h"
 #include "hw_models_top.h"
 
-u64_t sdl_event_timer;
+uint64_t sdl_event_timer;
 
 static void sdl_handle_window_event(const SDL_Event *event)
 {
diff --git a/boards/posix/native_posix/timer_model.c b/boards/posix/native_posix/timer_model.c
index aa97dde7ff..9fd99bbc10 100644
--- a/boards/posix/native_posix/timer_model.c
+++ b/boards/posix/native_posix/timer_model.c
@@ -42,7 +42,7 @@
  * Note: the caller has to allocate the destination buffer (at least 17 chars)
  */
 #include <stdio.h>
-static char *us_time_to_str(char *dest, u64_t time)
+static char *us_time_to_str(char *dest, uint64_t time)
 {
 	if (time != NEVER) {
 		unsigned int hour;
@@ -64,13 +64,13 @@ static char *us_time_to_str(char *dest, u64_t time)
 }
 #endif
 
-u64_t hw_timer_timer;
+uint64_t hw_timer_timer;
 
-u64_t hw_timer_tick_timer;
-u64_t hw_timer_awake_timer;
+uint64_t hw_timer_tick_timer;
+uint64_t hw_timer_awake_timer;
 
-static u64_t tick_p; /* Period of the ticker */
-static s64_t silent_ticks;
+static uint64_t tick_p; /* Period of the ticker */
+static int64_t silent_ticks;
 
 static bool real_time_mode =
 #if defined(CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME)
@@ -85,7 +85,7 @@ static bool reset_rtc; /*"Reset" the RTC on boot*/
  * When this executable started running, this value shall not be changed after
  * boot
  */
-static u64_t boot_time;
+static uint64_t boot_time;
 
 /*
  * Ratio of the simulated clock to the real host time
@@ -103,21 +103,21 @@ static double clock_ratio = 1.0;
  *
  * This variable is only kept for debugging purposes
  */
-static s64_t last_drift_offset;
+static int64_t last_drift_offset;
 #endif
 
 /*
  * Offsets of the RTC relative to the hardware models simu_time
  * "simu_time" == simulated time which starts at 0 on boot
  */
-static s64_t rtc_offset;
+static int64_t rtc_offset;
 
 /* Last host/real time when the ratio was adjusted */
-static u64_t last_radj_rtime;
+static uint64_t last_radj_rtime;
 /* Last simulated time when the ratio was adjusted */
-static u64_t last_radj_stime;
+static uint64_t last_radj_stime;
 
-extern u64_t posix_get_hw_cycle(void);
+extern uint64_t posix_get_hw_cycle(void);
 
 void hwtimer_set_real_time_mode(bool new_rt)
 {
@@ -138,12 +138,12 @@ static inline void host_clock_gettime(struct timespec *tv)
 #endif
 }
 
-u64_t get_host_us_time(void)
+uint64_t get_host_us_time(void)
 {
 	struct timespec tv;
 
 	host_clock_gettime(&tv);
-	return (u64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
+	return (uint64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
 }
 
 void hwtimer_init(void)
@@ -159,10 +159,10 @@ void hwtimer_init(void)
 	}
 	if (!reset_rtc) {
 		struct timespec tv;
-		u64_t realhosttime;
+		uint64_t realhosttime;
 
 		clock_gettime(CLOCK_REALTIME, &tv);
-		realhosttime = (u64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
+		realhosttime = (uint64_t)tv.tv_sec * 1e6 + tv.tv_nsec / 1000;
 
 		rtc_offset += realhosttime;
 	}
@@ -176,7 +176,7 @@ void hwtimer_cleanup(void)
 /**
  * Enable the HW timer tick interrupts with a period <period> in micoseconds
  */
-void hwtimer_enable(u64_t period)
+void hwtimer_enable(uint64_t period)
 {
 	tick_p = period;
 	hw_timer_tick_timer = hwm_get_time() + tick_p;
@@ -187,12 +187,12 @@ void hwtimer_enable(u64_t period)
 static void hwtimer_tick_timer_reached(void)
 {
 	if (real_time_mode) {
-		u64_t expected_rt = (hw_timer_tick_timer - last_radj_stime)
+		uint64_t expected_rt = (hw_timer_tick_timer - last_radj_stime)
 				    / clock_ratio
 				    + last_radj_rtime;
-		u64_t real_time = get_host_us_time();
+		uint64_t real_time = get_host_us_time();
 
-		s64_t diff = expected_rt - real_time;
+		int64_t diff = expected_rt - real_time;
 
 #if DEBUG_NP_TIMER
 		char es[30];
@@ -236,7 +236,7 @@ static void hwtimer_awake_timer_reached(void)
 
 void hwtimer_timer_reached(void)
 {
-	u64_t Now = hw_timer_timer;
+	uint64_t Now = hw_timer_timer;
 
 	if (hw_timer_awake_timer == Now) {
 		hwtimer_awake_timer_reached();
@@ -255,7 +255,7 @@ void hwtimer_timer_reached(void)
  *
  * This is meant for k_busy_wait() like functionality
  */
-void hwtimer_wake_in_time(u64_t time)
+void hwtimer_wake_in_time(uint64_t time)
 {
 	if (hw_timer_awake_timer > time) {
 		hw_timer_awake_timer = time;
@@ -267,12 +267,12 @@ void hwtimer_wake_in_time(u64_t time)
  * The kernel wants to skip the next sys_ticks tick interrupts
  * If sys_ticks == 0, the next interrupt will be raised.
  */
-void hwtimer_set_silent_ticks(s64_t sys_ticks)
+void hwtimer_set_silent_ticks(int64_t sys_ticks)
 {
 	silent_ticks = sys_ticks;
 }
 
-s64_t hwtimer_get_pending_silent_ticks(void)
+int64_t hwtimer_get_pending_silent_ticks(void)
 {
 	return silent_ticks;
 }
@@ -291,7 +291,7 @@ void hwtimer_reset_rtc(void)
  * Set a time offset (microseconds) of the RTC simulated time
  * Note: This should not be used after starting
  */
-void hwtimer_set_rtc_offset(s64_t offset)
+void hwtimer_set_rtc_offset(int64_t offset)
 {
 	rtc_offset = offset;
 }
@@ -308,7 +308,7 @@ void hwtimer_set_rt_ratio(double ratio)
 /**
  * Increase or decrease the RTC simulated time by offset_delta
  */
-void hwtimer_adjust_rtc_offset(s64_t offset_delta)
+void hwtimer_adjust_rtc_offset(int64_t offset_delta)
 {
 	rtc_offset += offset_delta;
 }
@@ -318,8 +318,8 @@ void hwtimer_adjust_rtc_offset(s64_t offset_delta)
  */
 void hwtimer_adjust_rt_ratio(double ratio_correction)
 {
-	u64_t current_stime = hwm_get_time();
-	s64_t s_diff = current_stime - last_radj_stime;
+	uint64_t current_stime = hwm_get_time();
+	int64_t s_diff = current_stime - last_radj_stime;
 	/* Accumulated real time drift time since last adjustment: */
 
 	last_radj_rtime += s_diff / clock_ratio;
@@ -327,7 +327,7 @@ void hwtimer_adjust_rt_ratio(double ratio_correction)
 
 #if DEBUG_NP_TIMER
 	char ct[30];
-	s64_t r_drift = (long double)(clock_ratio-1.0)/(clock_ratio)*s_diff;
+	int64_t r_drift = (long double)(clock_ratio-1.0)/(clock_ratio)*s_diff;
 
 	last_drift_offset += r_drift;
 	us_time_to_str(ct, current_stime);
@@ -351,7 +351,7 @@ void hwtimer_adjust_rt_ratio(double ratio_correction)
 /**
  * Return the current simulated RTC time in microseconds
  */
-s64_t hwtimer_get_simu_rtc_time(void)
+int64_t hwtimer_get_simu_rtc_time(void)
 {
 	return hwm_get_time() + rtc_offset;
 }
@@ -367,7 +367,7 @@ s64_t hwtimer_get_simu_rtc_time(void)
  * This will be the case in general if native_posix is not able to run at or
  * faster than real time.
  */
-void hwtimer_get_pseudohost_rtc_time(u32_t *nsec, u64_t *sec)
+void hwtimer_get_pseudohost_rtc_time(uint32_t *nsec, uint64_t *sec)
 {
 	/*
 	 * Note: long double has a 64bits mantissa in x86.
@@ -396,8 +396,8 @@ void hwtimer_get_pseudohost_rtc_time(u32_t *nsec, u64_t *sec)
 
 	host_clock_gettime(&tv);
 
-	u64_t rt_us = (u64_t)tv.tv_sec * 1000000ULL + tv.tv_nsec / 1000;
-	u32_t rt_ns = tv.tv_nsec % 1000;
+	uint64_t rt_us = (uint64_t)tv.tv_sec * 1000000ULL + tv.tv_nsec / 1000;
+	uint32_t rt_ns = tv.tv_nsec % 1000;
 
 	long double drt_us = (long double)rt_us - last_radj_rtime;
 	long double drt_ns = drt_us * 1000.0 + (long double)rt_ns;
diff --git a/boards/posix/native_posix/timer_model.h b/boards/posix/native_posix/timer_model.h
index 2bcdfbe35f..2c782d69da 100644
--- a/boards/posix/native_posix/timer_model.h
+++ b/boards/posix/native_posix/timer_model.h
@@ -18,19 +18,19 @@ void hwtimer_init(void);
 void hwtimer_cleanup(void);
 void hwtimer_set_real_time_mode(bool new_rt);
 void hwtimer_timer_reached(void);
-void hwtimer_wake_in_time(u64_t time);
-void hwtimer_set_silent_ticks(s64_t sys_ticks);
-void hwtimer_enable(u64_t period);
-s64_t hwtimer_get_pending_silent_ticks(void);
+void hwtimer_wake_in_time(uint64_t time);
+void hwtimer_set_silent_ticks(int64_t sys_ticks);
+void hwtimer_enable(uint64_t period);
+int64_t hwtimer_get_pending_silent_ticks(void);
 
 void hwtimer_reset_rtc(void);
-void hwtimer_set_rtc_offset(s64_t offset);
+void hwtimer_set_rtc_offset(int64_t offset);
 void hwtimer_set_rt_ratio(double ratio);
 
-void hwtimer_adjust_rtc_offset(s64_t offset_delta);
+void hwtimer_adjust_rtc_offset(int64_t offset_delta);
 void hwtimer_adjust_rt_ratio(double ratio_correction);
-s64_t hwtimer_get_simu_rtc_time(void);
-void hwtimer_get_pseudohost_rtc_time(u32_t *nsec, u64_t *sec);
+int64_t hwtimer_get_simu_rtc_time(void);
+void hwtimer_get_pseudohost_rtc_time(uint32_t *nsec, uint64_t *sec);
 
 #ifdef __cplusplus
 }
diff --git a/boards/posix/nrf52_bsim/board_irq.h b/boards/posix/nrf52_bsim/board_irq.h
index d590d5d243..6330ee0110 100644
--- a/boards/posix/nrf52_bsim/board_irq.h
+++ b/boards/posix/nrf52_bsim/board_irq.h
@@ -17,7 +17,7 @@ extern "C" {
 
 void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(void *),
 		       void *isr_param_p);
-void posix_irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags);
+void posix_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags);
 
 /**
  * Configure a static interrupt.
diff --git a/boards/posix/nrf52_bsim/irq_handler.c b/boards/posix/nrf52_bsim/irq_handler.c
index 16ea4feeba..6fcd989e8f 100644
--- a/boards/posix/nrf52_bsim/irq_handler.c
+++ b/boards/posix/nrf52_bsim/irq_handler.c
@@ -122,7 +122,7 @@ static inline void vector_to_irq(int irq_nbr, int *may_swap)
  */
 void posix_irq_handler(void)
 {
-	u64_t irq_lock;
+	uint64_t irq_lock;
 	int irq_nbr;
 	static int may_swap;
 
diff --git a/boards/posix/nrf52_bsim/k_busy_wait.c b/boards/posix/nrf52_bsim/k_busy_wait.c
index 5dcb68824b..cc85a50faf 100644
--- a/boards/posix/nrf52_bsim/k_busy_wait.c
+++ b/boards/posix/nrf52_bsim/k_busy_wait.c
@@ -16,7 +16,7 @@
  * Note that interrupts may be received in the meanwhile and that therefore this
  * thread may lose context
  */
-void arch_busy_wait(u32_t usec_to_wait)
+void arch_busy_wait(uint32_t usec_to_wait)
 {
 	bs_time_t time_end = tm_get_hw_time() + usec_to_wait;
 
diff --git a/boards/posix/nrf52_bsim/main.c b/boards/posix/nrf52_bsim/main.c
index fcf64d4f87..7e1d2f740c 100644
--- a/boards/posix/nrf52_bsim/main.c
+++ b/boards/posix/nrf52_bsim/main.c
@@ -38,7 +38,7 @@ uint8_t inner_main_clean_up(int exit_code)
 
 	bs_clean_back_channels();
 
-	u8_t bst_result = bst_delete();
+	uint8_t bst_result = bst_delete();
 
 	if (bst_result != 0U) {
 		bs_trace_raw_time(2, "main: The TESTCASE FAILED with return "
diff --git a/boards/posix/nrf52_bsim/radio_sim_nrfxx.h b/boards/posix/nrf52_bsim/radio_sim_nrfxx.h
index 980b9c7031..cca9a15bcc 100644
--- a/boards/posix/nrf52_bsim/radio_sim_nrfxx.h
+++ b/boards/posix/nrf52_bsim/radio_sim_nrfxx.h
@@ -206,10 +206,10 @@ static inline void hal_radio_ram_prio_setup(void)
 
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -225,58 +225,58 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg30dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg30dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg30dBm;
 	}
 
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -289,7 +289,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -302,7 +302,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -310,7 +310,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52832_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -323,7 +323,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -336,7 +336,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -349,7 +349,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -357,7 +357,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52832_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
diff --git a/doc/guides/documentation/index.rst b/doc/guides/documentation/index.rst
index df2f4b1336..3fe5817216 100644
--- a/doc/guides/documentation/index.rst
+++ b/doc/guides/documentation/index.rst
@@ -398,10 +398,10 @@ For example::
 
       struct z_object {
          char *name;
-         u8_t perms[CONFIG_MAX_THREAD_BYTES];
-         u8_t type;
-         u8_t flags;
-         u32_t data;
+         uint8_t perms[CONFIG_MAX_THREAD_BYTES];
+         uint8_t type;
+         uint8_t flags;
+         uint32_t data;
       } __packed;
 
 Note the blank line between the ``code-block`` directive and the first
@@ -414,10 +414,10 @@ This would be rendered as:
 
       struct z_object {
          char *name;
-         u8_t perms[CONFIG_MAX_THREAD_BYTES];
-         u8_t type;
-         u8_t flags;
-         u32_t data;
+         uint8_t perms[CONFIG_MAX_THREAD_BYTES];
+         uint8_t type;
+         uint8_t flags;
+         uint32_t data;
       } __packed;
 
 
diff --git a/doc/guides/dts/howtos.rst b/doc/guides/dts/howtos.rst
index 33d4175adc..e286ff55a7 100644
--- a/doc/guides/dts/howtos.rst
+++ b/doc/guides/dts/howtos.rst
@@ -370,13 +370,13 @@ device-specific configuration and data structures and API functions, like this:
    	/* per-device values to store in RAM */
    };
    struct my_dev_cfg {
-   	u32_t freq; /* Just an example: initial clock frequency in Hz */
+   	uint32_t freq; /* Just an example: initial clock frequency in Hz */
    	/* other configuration to store in ROM */
    };
 
    /* Implement driver API functions (drivers/some_api.h callbacks): */
-   static int my_driver_api_func1(struct device *dev, u32_t *foo) { /* ... */ }
-   static int my_driver_api_func2(struct device *dev, u64_t bar) { /* ... */ }
+   static int my_driver_api_func1(struct device *dev, uint32_t *foo) { /* ... */ }
+   static int my_driver_api_func2(struct device *dev, uint64_t bar) { /* ... */ }
    static struct some_api my_api_funcs = {
    	.func1 = my_driver_api_func1,
    	.func2 = my_driver_api_func2,
diff --git a/doc/guides/tracing/index.rst b/doc/guides/tracing/index.rst
index b4d0798033..9dc4805c3d 100644
--- a/doc/guides/tracing/index.rst
+++ b/doc/guides/tracing/index.rst
@@ -77,10 +77,10 @@ CTF Top-Layer Example
 The CTF_EVENT macro will serialize each argument to a field::
 
   /* Example for illustration */
-  static inline void ctf_top_foo(u32_t thread_id, ctf_bounded_string_t name)
+  static inline void ctf_top_foo(uint32_t thread_id, ctf_bounded_string_t name)
   {
     CTF_EVENT(
-      CTF_LITERAL(u8_t, 42),
+      CTF_LITERAL(uint8_t, 42),
       thread_id,
       name,
       "hello, I was emitted from function: ",
diff --git a/doc/reference/drivers/index.rst b/doc/reference/drivers/index.rst
index 3088fb61fc..017e955582 100644
--- a/doc/reference/drivers/index.rst
+++ b/doc/reference/drivers/index.rst
@@ -279,7 +279,7 @@ with a different interrupt line. In ``drivers/subsystem/subsystem_my_driver.h``:
   typedef void (*my_driver_config_irq_t)(struct device *device);
 
   struct my_driver_config {
-        u32_t base_addr;
+        uint32_t base_addr;
         my_driver_config_irq_t config_func;
   };
 
diff --git a/doc/reference/kernel/data_passing/mailboxes.rst b/doc/reference/kernel/data_passing/mailboxes.rst
index e01cea886c..6b431a75f5 100644
--- a/doc/reference/kernel/data_passing/mailboxes.rst
+++ b/doc/reference/kernel/data_passing/mailboxes.rst
@@ -254,7 +254,7 @@ portion of the message isn't used.
         while (1) {
 
             /* generate random value to send */
-            u32_t random_value = sys_rand32_get();
+            uint32_t random_value = sys_rand32_get();
 
             /* prepare to send empty message */
             send_msg.info = random_value;
diff --git a/doc/reference/kernel/data_passing/message_queues.rst b/doc/reference/kernel/data_passing/message_queues.rst
index 41bdc1e504..ed5d836de8 100644
--- a/doc/reference/kernel/data_passing/message_queues.rst
+++ b/doc/reference/kernel/data_passing/message_queues.rst
@@ -79,9 +79,9 @@ that is capable of holding 10 items, each of which is 12 bytes long.
 .. code-block:: c
 
     struct data_item_type {
-        u32_t field1;
-	u32_t field2;
-	u32_t field3;
+        uint32_t field1;
+	uint32_t field2;
+	uint32_t field3;
     };
 
     char __aligned(4) my_msgq_buffer[10 * sizeof(data_item_type)];
diff --git a/doc/reference/kernel/other/interrupts.rst b/doc/reference/kernel/other/interrupts.rst
index 05528360f1..7d6fa4e4e6 100644
--- a/doc/reference/kernel/other/interrupts.rst
+++ b/doc/reference/kernel/other/interrupts.rst
@@ -329,9 +329,9 @@ struct _isr_list which is placed in a special .intList section:
 
     struct _isr_list {
         /** IRQ line number */
-        s32_t irq;
+        int32_t irq;
         /** Flags for this IRQ, see ISR_FLAG_* definitions */
-        s32_t flags;
+        int32_t flags;
         /** ISR to call */
         void *func;
         /** Parameter for non-direct IRQs */
@@ -347,8 +347,8 @@ the .intList section preceded by a header:
     struct {
         void *spurious_irq_handler;
         void *sw_irq_handler;
-        u32_t num_isrs;
-        u32_t num_vectors;
+        uint32_t num_isrs;
+        uint32_t num_vectors;
         struct _isr_list isrs[];  <- of size num_isrs
     };
 
diff --git a/doc/reference/kernel/other/ring_buffers.rst b/doc/reference/kernel/other/ring_buffers.rst
index a5ddefcb2d..40cc0b56bd 100644
--- a/doc/reference/kernel/other/ring_buffers.rst
+++ b/doc/reference/kernel/other/ring_buffers.rst
@@ -130,7 +130,7 @@ is capable of holding 64 words of data and metadata information.
 
     struct my_struct {
         struct ring_buf rb;
-        u32_t buffer[MY_RING_BUF_SIZE];
+        uint32_t buffer[MY_RING_BUF_SIZE];
         ...
     };
     struct my_struct ms;
@@ -177,7 +177,7 @@ A data item is added to a ring buffer by calling
 
 .. code-block:: c
 
-    u32_t data[MY_DATA_WORDS];
+    uint32_t data[MY_DATA_WORDS];
     int ret;
 
     ret = ring_buf_item_put(&ring_buf, TYPE_FOO, 0, data, SIZE32_OF(data));
@@ -205,8 +205,8 @@ Bytes are copied to a **byte mode** ring buffer by calling
 
 .. code-block:: c
 
-    u8_t my_data[MY_RING_BUF_BYTES];
-    u32_t ret;
+    uint8_t my_data[MY_RING_BUF_BYTES];
+    uint32_t ret;
 
     ret = ring_buf_put(&ring_buf, my_data, SIZE_OF(my_data));
     if (ret != SIZE_OF(my_data)) {
@@ -219,9 +219,9 @@ ring buffer's memory.  For example:
 
 .. code-block:: c
 
-    u32_t size;
-    u32_t rx_size;
-    u8_t *data;
+    uint32_t size;
+    uint32_t rx_size;
+    uint8_t *data;
     int err;
 
     /* Allocate buffer within a ring buffer memory. */
@@ -245,16 +245,16 @@ A data item is removed from a ring buffer by calling
 
 .. code-block:: c
 
-    u32_t my_data[MY_DATA_WORDS];
-    u16_t my_type;
-    u8_t  my_value;
-    u8_t  my_size;
+    uint32_t my_data[MY_DATA_WORDS];
+    uint16_t my_type;
+    uint8_t  my_value;
+    uint8_t  my_size;
     int ret;
 
     my_size = SIZE32_OF(my_data);
     ret = ring_buf_item_get(&ring_buf, &my_type, &my_value, my_data, &my_size);
     if (ret == -EMSGSIZE) {
-        printk("Buffer is too small, need %d u32_t\n", my_size);
+        printk("Buffer is too small, need %d uint32_t\n", my_size);
     } else if (ret == -EAGAIN) {
         printk("Ring buffer is empty\n");
     } else {
@@ -268,7 +268,7 @@ Data bytes are copied out from a **byte mode** ring buffer by calling
 
 .. code-block:: c
 
-    u8_t my_data[MY_DATA_BYTES];
+    uint8_t my_data[MY_DATA_BYTES];
     size_t  ret;
 
     ret = ring_buf_get(&ring_buf, my_data, sizeof(my_data));
@@ -284,9 +284,9 @@ operations on the ring buffer's memory.  For example:
 
 .. code-block:: c
 
-    u32_t size;
-    u32_t proc_size;
-    u8_t *data;
+    uint32_t size;
+    uint32_t proc_size;
+    uint8_t *data;
     int err;
 
     /* Get buffer within a ring buffer memory. */
diff --git a/doc/reference/kernel/threads/index.rst b/doc/reference/kernel/threads/index.rst
index 244e82bcae..48f35e15d4 100644
--- a/doc/reference/kernel/threads/index.rst
+++ b/doc/reference/kernel/threads/index.rst
@@ -277,12 +277,12 @@ each thread calls a specific routine.
 
     int call_tracking_routine(void)
     {
-        u32_t call_count;
+        uint32_t call_count;
 
         if (k_is_in_isr()) {
 	    /* ignore any call made by an ISR */
         } else {
-            call_count = (u32_t)k_thread_custom_data_get();
+            call_count = (uint32_t)k_thread_custom_data_get();
             call_count++;
             k_thread_custom_data_set((void *)call_count);
 	}
diff --git a/doc/reference/kernel/timing/clocks.rst b/doc/reference/kernel/timing/clocks.rst
index 726c838f22..5e90891e57 100644
--- a/doc/reference/kernel/timing/clocks.rst
+++ b/doc/reference/kernel/timing/clocks.rst
@@ -321,10 +321,10 @@ code.  For example, consider this design:
 
 .. code-block:: c
 
-    void my_wait_for_event(struct my_subsys *obj, s32_t timeout_in_ms)
+    void my_wait_for_event(struct my_subsys *obj, int32_t timeout_in_ms)
     {
         while (true) {
-            u32_t start = k_uptime_get_32();
+            uint32_t start = k_uptime_get_32();
 
             if (is_event_complete(obj)) {
                 return;
@@ -350,7 +350,7 @@ expire.  So such a loop might look like:
     void my_wait_for_event(struct my_subsys *obj, k_timeout_t timeout_in_ms)
     {
         /* Compute the end time from the timeout */
-        u64_t end = z_timeout_end_calc(timeout_in_ms);
+        uint64_t end = z_timeout_end_calc(timeout_in_ms);
 
         while (end < k_uptime_ticks()) {
                 if (is_event_complete(obj)) {
diff --git a/doc/reference/logging/index.rst b/doc/reference/logging/index.rst
index 4f318edf92..4d3ed9a570 100644
--- a/doc/reference/logging/index.rst
+++ b/doc/reference/logging/index.rst
@@ -247,7 +247,7 @@ In order to use instance level filtering following steps must be performed:
 
    struct foo_object {
    	LOG_INSTANCE_PTR_DECLARE(log);
-   	u32_t id;
+   	uint32_t id;
    }
 
 - module must provide macro for instantiation. In that macro, logger instance
diff --git a/doc/reference/networking/can_api.rst b/doc/reference/networking/can_api.rst
index 256454e74c..11f1aef8a4 100644
--- a/doc/reference/networking/can_api.rst
+++ b/doc/reference/networking/can_api.rst
@@ -169,7 +169,7 @@ occurred. It does not block until the message is sent like the example above.
 
 .. code-block:: C
 
-  void tx_irq_callback(u32_t error_flags, void *arg)
+  void tx_irq_callback(uint32_t error_flags, void *arg)
   {
           char *sender = (char *)arg;
 
diff --git a/doc/reference/networking/coap.rst b/doc/reference/networking/coap.rst
index 8fb6fa02d9..777711d03e 100644
--- a/doc/reference/networking/coap.rst
+++ b/doc/reference/networking/coap.rst
@@ -89,8 +89,8 @@ the ``.well-known/core`` CoAP message.
     /* Initialize the CoAP message */
     char *path = "test";
     struct coap_packet request;
-    u8_t data[100];
-    u8_t payload[20];
+    uint8_t data[100];
+    uint8_t payload[20];
 
     coap_packet_init(&request, data, sizeof(data),
                      1, COAP_TYPE_CON, 8, coap_next_token(),
@@ -104,7 +104,7 @@ the ``.well-known/core`` CoAP message.
     coap_packet_append_payload_marker(&request);
 
     /* Append payload */
-    coap_packet_append_payload(&request, (u8_t *)payload,
+    coap_packet_append_payload(&request, (uint8_t *)payload,
                                sizeof(payload) - 1);
 
     /* send over sockets */
diff --git a/doc/reference/networking/lwm2m.rst b/doc/reference/networking/lwm2m.rst
index bb6fdbaece..5b94c4e871 100644
--- a/doc/reference/networking/lwm2m.rst
+++ b/doc/reference/networking/lwm2m.rst
@@ -259,7 +259,7 @@ for:
 
 .. code-block:: c
 
-	static int device_reboot_cb(u16_t obj_inst_id)
+	static int device_reboot_cb(uint16_t obj_inst_id)
 	{
 		LOG_INF("Device rebooting.");
 		LOG_PANIC();
diff --git a/doc/reference/networking/mqtt.rst b/doc/reference/networking/mqtt.rst
index 438a5a8112..f32b4be871 100644
--- a/doc/reference/networking/mqtt.rst
+++ b/doc/reference/networking/mqtt.rst
@@ -36,8 +36,8 @@ defined:
 .. code-block:: c
 
    /* Buffers for MQTT client. */
-   static u8_t rx_buffer[256];
-   static u8_t tx_buffer[256];
+   static uint8_t rx_buffer[256];
+   static uint8_t tx_buffer[256];
 
    /* MQTT client context */
    static struct mqtt_client client_ctx;
@@ -77,7 +77,7 @@ used. An example configuration for TCP transport is shown below:
    /* MQTT client configuration */
    client_ctx.broker = &broker;
    client_ctx.evt_cb = mqtt_evt_handler;
-   client_ctx.client_id.utf8 = (u8_t *)"zephyr_mqtt_client";
+   client_ctx.client_id.utf8 = (uint8_t *)"zephyr_mqtt_client";
    client_ctx.client_id.size = sizeof("zephyr_mqtt_client") - 1;
    client_ctx.password = NULL;
    client_ctx.user_name = NULL;
diff --git a/doc/reference/networking/net_buf.rst b/doc/reference/networking/net_buf.rst
index 42d5394190..17a30a0819 100644
--- a/doc/reference/networking/net_buf.rst
+++ b/doc/reference/networking/net_buf.rst
@@ -77,9 +77,9 @@ Add
 
      void *net_buf_add(struct net_buf *buf, size_t len);
      void *net_buf_add_mem(struct net_buf *buf, const void *mem, size_t len);
-     u8_t *net_buf_add_u8(struct net_buf *buf, u8_t value);
-     void net_buf_add_le16(struct net_buf *buf, u16_t value);
-     void net_buf_add_le32(struct net_buf *buf, u32_t value);
+     uint8_t *net_buf_add_u8(struct net_buf *buf, uint8_t value);
+     void net_buf_add_le16(struct net_buf *buf, uint16_t value);
+     void net_buf_add_le32(struct net_buf *buf, uint32_t value);
 
 Push
   Prepend data to the beginning of the buffer. Modifies both the data
@@ -89,8 +89,8 @@ Push
   .. code-block:: c
 
      void *net_buf_push(struct net_buf *buf, size_t len);
-     void net_buf_push_u8(struct net_buf *buf, u8_t value);
-     void net_buf_push_le16(struct net_buf *buf, u16_t value);
+     void net_buf_push_u8(struct net_buf *buf, uint8_t value);
+     void net_buf_push_le16(struct net_buf *buf, uint16_t value);
 
 Pull
   Remove data from the beginning of the buffer. Modifies both the data
@@ -101,9 +101,9 @@ Pull
 
      void *net_buf_pull(struct net_buf *buf, size_t len);
      void *net_buf_pull_mem(struct net_buf *buf, size_t len);
-     u8_t net_buf_pull_u8(struct net_buf *buf);
-     u16_t net_buf_pull_le16(struct net_buf *buf);
-     u32_t net_buf_pull_le32(struct net_buf *buf);
+     uint8_t net_buf_pull_u8(struct net_buf *buf);
+     uint16_t net_buf_pull_le16(struct net_buf *buf);
+     uint32_t net_buf_pull_le32(struct net_buf *buf);
 
 The Add and Push operations are used when encoding data into the buffer,
 whereas Pull is used when decoding data from a buffer.
diff --git a/doc/reference/networking/net_mgmt.rst b/doc/reference/networking/net_mgmt.rst
index 54e7e74622..75c0e205a3 100644
--- a/doc/reference/networking/net_mgmt.rst
+++ b/doc/reference/networking/net_mgmt.rst
@@ -86,7 +86,7 @@ An example follows.
 
 	struct net_mgmt_event_callback callback;
 
-	void callback_handler(struct net_mgmt_event_callback *cb, u32_t mgmt_event,
+	void callback_handler(struct net_mgmt_event_callback *cb, uint32_t mgmt_event,
 			      struct net_if *iface)
 	{
 		if (mgmt_event == NET_EVENT_xxx) {
@@ -126,7 +126,7 @@ You define your handler modeled with this signature:
 
 .. code-block:: c
 
-   static int your_handler(u32_t mgmt_event, struct net_if *iface,
+   static int your_handler(uint32_t mgmt_event, struct net_if *iface,
                            void *data, size_t len);
 
 and then register it with an associated mgmt_request code:
diff --git a/doc/reference/networking/net_pkt.rst b/doc/reference/networking/net_pkt.rst
index 9d22a94669..2dca1b7761 100644
--- a/doc/reference/networking/net_pkt.rst
+++ b/doc/reference/networking/net_pkt.rst
@@ -216,7 +216,7 @@ Now, let's write 8 bytes:
     net_pkt_write(pkt, data, 8);
 
 The buffer length is now 8 bytes.
-There are various helpers to write a byte, or big endian u16_t, u32_t.
+There are various helpers to write a byte, or big endian uint16_t, uint32_t.
 
 .. code-block:: c
 
diff --git a/doc/reference/power_management/index.rst b/doc/reference/power_management/index.rst
index 33a110b0d5..9c374be4f0 100644
--- a/doc/reference/power_management/index.rst
+++ b/doc/reference/power_management/index.rst
@@ -158,7 +158,7 @@ the following function.
 
 .. code-block:: c
 
-   enum power_states sys_pm_policy_next_state(s32_t ticks);
+   enum power_states sys_pm_policy_next_state(int32_t ticks);
 
 Dummy
 -----
@@ -279,7 +279,7 @@ Default Initializer Function
 
 .. code-block:: c
 
-   int device_pm_control_nop(struct device *unused_device, u32_t unused_ctrl_command, void *unused_context);
+   int device_pm_control_nop(struct device *unused_device, uint32_t unused_ctrl_command, void *unused_context);
 
 
 If the driver doesn't implement any power control operations, the driver can
@@ -315,7 +315,7 @@ Device Set Power State
 
 .. code-block:: c
 
-   int device_set_power_state(struct device *device, u32_t device_power_state, device_pm_cb cb, void *arg);
+   int device_set_power_state(struct device *device, uint32_t device_power_state, device_pm_cb cb, void *arg);
 
 Calls the :c:func:`device_pm_control()` handler function implemented by the
 device driver with DEVICE_PM_SET_POWER_STATE command.
@@ -325,7 +325,7 @@ Device Get Power State
 
 .. code-block:: c
 
-   int device_get_power_state(struct device *device, u32_t * device_power_state);
+   int device_get_power_state(struct device *device, uint32_t * device_power_state);
 
 Calls the :c:func:`device_pm_control()` handler function implemented by the
 device driver with DEVICE_PM_GET_POWER_STATE command.
diff --git a/doc/reference/shell/index.rst b/doc/reference/shell/index.rst
index cf4a5336f5..fcd8ddb8f8 100644
--- a/doc/reference/shell/index.rst
+++ b/doc/reference/shell/index.rst
@@ -154,7 +154,7 @@ Newly added commands can be prompted or autocompleted with the :kbd:`Tab` key.
 	static char dynamic_cmd_buffer[10][50];
 
 	/* commands counter */
-	static u8_t dynamic_cmd_cnt;
+	static uint8_t dynamic_cmd_cnt;
 
 	/* Function returning command dynamically created
 	 * in  dynamic_cmd_buffer.
diff --git a/doc/reference/usermode/memory_domain.rst b/doc/reference/usermode/memory_domain.rst
index be708c24e7..89cdd42d3b 100644
--- a/doc/reference/usermode/memory_domain.rst
+++ b/doc/reference/usermode/memory_domain.rst
@@ -195,7 +195,7 @@ a read-write partition for it which may be added to a domain:
 
 .. code-block:: c
 
-    u8_t __aligned(32) buf[32];
+    uint8_t __aligned(32) buf[32];
 
     K_MEM_PARTITION_DEFINE(my_partition, buf, sizeof(buf),
                            K_MEM_PARTITION_P_RW_U_RW);
@@ -346,8 +346,8 @@ a memory domain.
 .. code-block:: c
 
     /* the start address of the MPU region needs to align with its size */
-    u8_t __aligned(32) app0_buf[32];
-    u8_t __aligned(32) app1_buf[32];
+    uint8_t __aligned(32) app0_buf[32];
+    uint8_t __aligned(32) app1_buf[32];
 
     K_MEM_PARTITION_DEFINE(app0_part0, app0_buf, sizeof(app0_buf),
                            K_MEM_PARTITION_P_RW_U_RW);
@@ -368,8 +368,8 @@ memory domain one by one.
 .. code-block:: c
 
     /* the start address of the MPU region needs to align with its size */
-    u8_t __aligned(32) app0_buf[32];
-    u8_t __aligned(32) app1_buf[32];
+    uint8_t __aligned(32) app0_buf[32];
+    uint8_t __aligned(32) app1_buf[32];
 
     K_MEM_PARTITION_DEFINE(app0_part0, app0_buf, sizeof(app0_buf),
                            K_MEM_PARTITION_P_RW_U_RW);
diff --git a/doc/reference/usermode/syscalls.rst b/doc/reference/usermode/syscalls.rst
index 0198d2cac1..e100b1f0dd 100644
--- a/doc/reference/usermode/syscalls.rst
+++ b/doc/reference/usermode/syscalls.rst
@@ -325,7 +325,7 @@ For example:
 
 .. code-block:: c
 
-    static int z_vrfy_k_sem_take(struct k_sem *sem, s32_t timeout)
+    static int z_vrfy_k_sem_take(struct k_sem *sem, int32_t timeout)
     {
         Z_OOPS(Z_SYSCALL_OBJ(sem, K_OBJ_SEM));
         return z_impl_k_sem_take(sem, timeout);
diff --git a/drivers/adc/adc_common.c b/drivers/adc/adc_common.c
index 8959e035e7..df513f7d89 100644
--- a/drivers/adc/adc_common.c
+++ b/drivers/adc/adc_common.c
@@ -7,11 +7,11 @@
 #include <drivers/adc.h>
 
 int adc_gain_invert(enum adc_gain gain,
-		    s32_t *value)
+		    int32_t *value)
 {
 	struct gain_desc {
-		u8_t mul;
-		u8_t div;
+		uint8_t mul;
+		uint8_t div;
 	};
 	static const struct gain_desc gains[] = {
 		[ADC_GAIN_1_6] = {.mul = 6, .div = 1},
@@ -32,7 +32,7 @@ int adc_gain_invert(enum adc_gain gain,
 	};
 	int rv = -EINVAL;
 
-	if ((u8_t)gain < ARRAY_SIZE(gains)) {
+	if ((uint8_t)gain < ARRAY_SIZE(gains)) {
 		const struct gain_desc *gdp = &gains[gain];
 
 		if ((gdp->mul != 0) && (gdp->div != 0)) {
diff --git a/drivers/adc/adc_context.h b/drivers/adc/adc_context.h
index 3b4267e0d4..6c86d71e04 100644
--- a/drivers/adc/adc_context.h
+++ b/drivers/adc/adc_context.h
@@ -56,7 +56,7 @@ struct adc_context {
 
 	struct adc_sequence sequence;
 	struct adc_sequence_options options;
-	u16_t sampling_index;
+	uint16_t sampling_index;
 };
 
 #ifdef ADC_CONTEXT_USES_KERNEL_TIMER
@@ -92,8 +92,8 @@ static inline void adc_context_request_next_sampling(struct adc_context *ctx)
 #ifdef ADC_CONTEXT_USES_KERNEL_TIMER
 static inline void adc_context_enable_timer(struct adc_context *ctx)
 {
-	u32_t interval_us = ctx->options.interval_us;
-	u32_t interval_ms = ceiling_fraction(interval_us, 1000UL);
+	uint32_t interval_us = ctx->options.interval_us;
+	uint32_t interval_ms = ceiling_fraction(interval_us, 1000UL);
 
 	k_timer_start(&ctx->timer, K_NO_WAIT, K_MSEC(interval_ms));
 }
diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c
index f3eeaf167d..b2b6893b62 100644
--- a/drivers/adc/adc_lmp90xxx.c
+++ b/drivers/adc/adc_lmp90xxx.c
@@ -109,14 +109,14 @@ LOG_MODULE_REGISTER(adc_lmp90xxx);
 struct lmp90xxx_config {
 	const char *spi_dev_name;
 	const char *spi_cs_dev_name;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	struct spi_config spi_cfg;
 	const char *drdyb_dev_name;
 	gpio_pin_t drdyb_pin;
 	gpio_dt_flags_t drdyb_flags;
-	u8_t rtd_current;
-	u8_t resolution;
-	u8_t channels;
+	uint8_t rtd_current;
+	uint8_t resolution;
+	uint8_t channels;
 };
 
 struct lmp90xxx_data {
@@ -125,16 +125,16 @@ struct lmp90xxx_data {
 	struct spi_cs_control spi_cs;
 	struct gpio_callback drdyb_cb;
 	struct k_mutex ura_lock;
-	u8_t ura;
-	s32_t *buffer;
-	s32_t *repeat_buffer;
-	u32_t channels;
+	uint8_t ura;
+	int32_t *buffer;
+	int32_t *repeat_buffer;
+	uint32_t channels;
 	bool calibrate;
-	u8_t channel_odr[LMP90XXX_MAX_CHANNELS];
+	uint8_t channel_odr[LMP90XXX_MAX_CHANNELS];
 #ifdef CONFIG_ADC_LMP90XXX_GPIO
 	struct k_mutex gpio_lock;
-	u8_t gpio_dircn;
-	u8_t gpio_dat;
+	uint8_t gpio_dircn;
+	uint8_t gpio_dat;
 #endif /* CONFIG_ADC_LMP90XXX_GPIO */
 	struct k_thread thread;
 	struct k_sem acq_sem;
@@ -148,7 +148,7 @@ struct lmp90xxx_data {
  * Approximated LMP90xxx acquisition times in milliseconds. These are
  * used for the initial delay when polling for data ready.
  */
-static const s32_t lmp90xxx_odr_delay_tbl[8] = {
+static const int32_t lmp90xxx_odr_delay_tbl[8] = {
 	596, /* 13.42/8 = 1.6775 SPS */
 	298, /* 13.42/4 = 3.355 SPS */
 	149, /* 13.42/2 = 6.71 SPS */
@@ -159,7 +159,7 @@ static const s32_t lmp90xxx_odr_delay_tbl[8] = {
 	5,   /* 214.65 SPS (default) */
 };
 
-static inline u8_t lmp90xxx_inst2_sz(size_t len)
+static inline uint8_t lmp90xxx_inst2_sz(size_t len)
 {
 	if (len == 1) {
 		return LMP90XXX_INST2_SZ_1;
@@ -172,14 +172,14 @@ static inline u8_t lmp90xxx_inst2_sz(size_t len)
 	}
 }
 
-static int lmp90xxx_read_reg(struct device *dev, u8_t addr, u8_t *dptr,
+static int lmp90xxx_read_reg(struct device *dev, uint8_t addr, uint8_t *dptr,
 			     size_t len)
 {
 	const struct lmp90xxx_config *config = dev->config_info;
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t ura = LMP90XXX_URA(addr);
-	u8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura };
-	u8_t inst2 = LMP90XXX_INST2_R | LMP90XXX_LRA(addr);
+	uint8_t ura = LMP90XXX_URA(addr);
+	uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura };
+	uint8_t inst2 = LMP90XXX_INST2_R | LMP90XXX_LRA(addr);
 	struct spi_buf tx_buf[2];
 	struct spi_buf rx_buf[2];
 	struct spi_buf_set tx;
@@ -241,19 +241,19 @@ static int lmp90xxx_read_reg(struct device *dev, u8_t addr, u8_t *dptr,
 	return err;
 }
 
-static int lmp90xxx_read_reg8(struct device *dev, u8_t addr, u8_t *val)
+static int lmp90xxx_read_reg8(struct device *dev, uint8_t addr, uint8_t *val)
 {
 	return lmp90xxx_read_reg(dev, addr, val, sizeof(val));
 }
 
-static int lmp90xxx_write_reg(struct device *dev, u8_t addr, u8_t *dptr,
+static int lmp90xxx_write_reg(struct device *dev, uint8_t addr, uint8_t *dptr,
 			      size_t len)
 {
 	const struct lmp90xxx_config *config = dev->config_info;
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t ura = LMP90XXX_URA(addr);
-	u8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura };
-	u8_t inst2 = LMP90XXX_INST2_WB | LMP90XXX_LRA(addr);
+	uint8_t ura = LMP90XXX_URA(addr);
+	uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura };
+	uint8_t inst2 = LMP90XXX_INST2_WB | LMP90XXX_LRA(addr);
 	struct spi_buf tx_buf[3];
 	struct spi_buf_set tx;
 	int i = 0;
@@ -305,7 +305,7 @@ static int lmp90xxx_write_reg(struct device *dev, u8_t addr, u8_t *dptr,
 	return err;
 }
 
-static int lmp90xxx_write_reg8(struct device *dev, u8_t addr, u8_t val)
+static int lmp90xxx_write_reg8(struct device *dev, uint8_t addr, uint8_t val)
 {
 	return lmp90xxx_write_reg(dev, addr, &val, sizeof(val));
 }
@@ -325,7 +325,7 @@ static int lmp90xxx_soft_reset(struct device *dev)
 				   LMP90XXX_REG_AND_CNV_RST);
 }
 
-static inline bool lmp90xxx_has_channel(struct device *dev, u8_t channel)
+static inline bool lmp90xxx_has_channel(struct device *dev, uint8_t channel)
 {
 	const struct lmp90xxx_config *config = dev->config_info;
 
@@ -336,7 +336,7 @@ static inline bool lmp90xxx_has_channel(struct device *dev, u8_t channel)
 	}
 }
 
-static inline bool lmp90xxx_has_input(struct device *dev, u8_t input)
+static inline bool lmp90xxx_has_input(struct device *dev, uint8_t input)
 {
 	const struct lmp90xxx_config *config = dev->config_info;
 
@@ -351,9 +351,9 @@ static inline bool lmp90xxx_has_input(struct device *dev, u8_t input)
 	}
 }
 
-static inline int lmp90xxx_acq_time_to_odr(u16_t acq_time)
+static inline int lmp90xxx_acq_time_to_odr(uint16_t acq_time)
 {
-	u16_t acq_value;
+	uint16_t acq_value;
 
 	if (acq_time == ADC_ACQ_TIME_DEFAULT) {
 		return LMP90XXX_DEFAULT_ODR;
@@ -380,10 +380,10 @@ static int lmp90xxx_adc_channel_setup(struct device *dev,
 				      const struct adc_channel_cfg *channel_cfg)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t chx_inputcn = LMP90XXX_BURNOUT_EN(0); /* No burnout currents */
-	u8_t chx_config = LMP90XXX_BUF_EN(0);      /* No buffer */
-	u8_t payload[2];
-	u8_t addr;
+	uint8_t chx_inputcn = LMP90XXX_BURNOUT_EN(0); /* No burnout currents */
+	uint8_t chx_config = LMP90XXX_BUF_EN(0);      /* No buffer */
+	uint8_t payload[2];
+	uint8_t addr;
 	int ret;
 
 	switch (channel_cfg->reference) {
@@ -471,9 +471,9 @@ static int lmp90xxx_adc_channel_setup(struct device *dev,
 
 static int lmp90xxx_validate_buffer_size(const struct adc_sequence *sequence)
 {
-	u8_t channels = 0;
+	uint8_t channels = 0;
 	size_t needed;
-	u32_t mask;
+	uint32_t mask;
 
 	for (mask = BIT(LMP90XXX_MAX_CHANNELS - 1); mask != 0; mask >>= 1) {
 		if (mask & sequence->channels) {
@@ -481,7 +481,7 @@ static int lmp90xxx_validate_buffer_size(const struct adc_sequence *sequence)
 		}
 	}
 
-	needed = channels * sizeof(s32_t);
+	needed = channels * sizeof(int32_t);
 	if (sequence->options) {
 		needed *= (1 + sequence->options->extra_samplings);
 	}
@@ -566,16 +566,16 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel,
-				     s32_t *result)
+static int lmp90xxx_adc_read_channel(struct device *dev, uint8_t channel,
+				     int32_t *result)
 {
 	const struct lmp90xxx_config *config = dev->config_info;
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t adc_done;
-	u8_t ch_scan;
-	u8_t buf[4]; /* ADC_DOUT + CRC */
-	s32_t delay;
-	u8_t odr;
+	uint8_t adc_done;
+	uint8_t ch_scan;
+	uint8_t buf[4]; /* ADC_DOUT + CRC */
+	int32_t delay;
+	uint8_t odr;
 	int err;
 
 	/* Single channel, single scan mode */
@@ -630,7 +630,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel,
 	}
 
 	if (IS_ENABLED(CONFIG_ADC_LMP90XXX_CRC)) {
-		u8_t crc = crc8(buf, 3, 0x31, 0, false) ^ 0xFFU;
+		uint8_t crc = crc8(buf, 3, 0x31, 0, false) ^ 0xFFU;
 
 		if (buf[3] != crc) {
 			LOG_ERR("CRC mismatch (0x%02x vs. 0x%02x)", buf[3],
@@ -640,7 +640,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel,
 	}
 
 	/* Read result, get rid of CRC, and sign extend result */
-	*result = (s32_t)sys_get_be32(buf);
+	*result = (int32_t)sys_get_be32(buf);
 	*result >>= (32 - config->resolution);
 
 	return 0;
@@ -649,9 +649,9 @@ static int lmp90xxx_adc_read_channel(struct device *dev, u8_t channel,
 static void lmp90xxx_acquisition_thread(struct device *dev)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */
-	s32_t result = 0;
-	u8_t channel;
+	uint8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */
+	int32_t result = 0;
+	uint8_t channel;
 	int err;
 
 	while (true) {
@@ -686,7 +686,7 @@ static void lmp90xxx_acquisition_thread(struct device *dev)
 				result);
 
 			/*
-			 * ADC samples are stored as s32_t regardless of the
+			 * ADC samples are stored as int32_t regardless of the
 			 * resolution in order to provide a uniform interface
 			 * for the driver.
 			 */
@@ -699,7 +699,7 @@ static void lmp90xxx_acquisition_thread(struct device *dev)
 }
 
 static void lmp90xxx_drdyb_callback(struct device *port,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct lmp90xxx_data *data =
 		CONTAINER_OF(cb, struct lmp90xxx_data, drdyb_cb);
@@ -709,11 +709,11 @@ static void lmp90xxx_drdyb_callback(struct device *port,
 }
 
 #ifdef CONFIG_ADC_LMP90XXX_GPIO
-int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin)
+int lmp90xxx_gpio_set_output(struct device *dev, uint8_t pin)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (pin > LMP90XXX_GPIO_MAX) {
 		return -EINVAL;
@@ -734,11 +734,11 @@ int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin)
 	return err;
 }
 
-int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin)
+int lmp90xxx_gpio_set_input(struct device *dev, uint8_t pin)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (pin > LMP90XXX_GPIO_MAX) {
 		return -EINVAL;
@@ -759,11 +759,11 @@ int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin)
 	return err;
 }
 
-int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value)
+int lmp90xxx_gpio_set_pin_value(struct device *dev, uint8_t pin, bool value)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (pin > LMP90XXX_GPIO_MAX) {
 		return -EINVAL;
@@ -786,11 +786,11 @@ int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value)
 	return err;
 }
 
-int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value)
+int lmp90xxx_gpio_get_pin_value(struct device *dev, uint8_t pin, bool *value)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (pin > LMP90XXX_GPIO_MAX) {
 		return -EINVAL;
@@ -811,7 +811,7 @@ int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value)
 int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t tmp;
+	uint8_t tmp;
 	int err;
 
 	k_mutex_lock(&data->gpio_lock, K_FOREVER);
@@ -830,7 +830,7 @@ int lmp90xxx_gpio_port_set_masked_raw(struct device *dev,
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	mask &= LMP90XXX_GPIO_DAT_MASK;
 
@@ -851,7 +851,7 @@ int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	tmp = pins & LMP90XXX_GPIO_DAT_MASK;
 
@@ -873,7 +873,7 @@ int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev,
 {
 	struct lmp90xxx_data *data = dev->driver_data;
 	int err = 0;
-	u8_t tmp;
+	uint8_t tmp;
 
 	tmp = pins & LMP90XXX_GPIO_DAT_MASK;
 
@@ -893,7 +893,7 @@ int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev,
 int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins)
 {
 	struct lmp90xxx_data *data = dev->driver_data;
-	u8_t tmp;
+	uint8_t tmp;
 	int err;
 
 	tmp = pins & LMP90XXX_GPIO_DAT_MASK;
diff --git a/drivers/adc/adc_mchp_xec.c b/drivers/adc/adc_mchp_xec.c
index 91860d5100..e6492ec248 100644
--- a/drivers/adc/adc_mchp_xec.c
+++ b/drivers/adc/adc_mchp_xec.c
@@ -31,22 +31,22 @@ LOG_MODULE_REGISTER(adc_mchp_xec);
 
 struct adc_xec_data {
 	struct adc_context ctx;
-	u16_t *buffer;
-	u16_t *repeat_buffer;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
 };
 
 struct adc_xec_regs {
-	u32_t control_reg;
-	u32_t delay_reg;
-	u32_t status_reg;
-	u32_t single_reg;
-	u32_t repeat_reg;
-	u32_t channel_read_reg[8];
-	u32_t unused[18];
-	u32_t config_reg;
-	u32_t vref_channel_reg;
-	u32_t vref_control_reg;
-	u32_t sar_control_reg;
+	uint32_t control_reg;
+	uint32_t delay_reg;
+	uint32_t status_reg;
+	uint32_t single_reg;
+	uint32_t repeat_reg;
+	uint32_t channel_read_reg[8];
+	uint32_t unused[18];
+	uint32_t config_reg;
+	uint32_t vref_channel_reg;
+	uint32_t vref_control_reg;
+	uint32_t sar_control_reg;
 };
 
 #define ADC_XEC_REG_BASE						\
@@ -80,7 +80,7 @@ static int adc_xec_channel_setup(struct device *dev,
 				 const struct adc_channel_cfg *channel_cfg)
 {
 	struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE;
-	u32_t reg;
+	uint32_t reg;
 
 	ARG_UNUSED(dev);
 
@@ -125,7 +125,7 @@ static bool adc_xec_validate_buffer_size(const struct adc_sequence *sequence)
 {
 	int chan_count = 0;
 	size_t buff_need;
-	u32_t chan_mask;
+	uint32_t chan_mask;
 
 	for (chan_mask = 0x80; chan_mask != 0; chan_mask >>= 1) {
 		if (chan_mask & sequence->channels) {
@@ -133,7 +133,7 @@ static bool adc_xec_validate_buffer_size(const struct adc_sequence *sequence)
 		}
 	}
 
-	buff_need = chan_count * sizeof(u16_t);
+	buff_need = chan_count * sizeof(uint16_t);
 
 	if (sequence->options) {
 		buff_need *= 1 + sequence->options->extra_samplings;
@@ -151,7 +151,7 @@ static int adc_xec_start_read(struct device *dev,
 {
 	struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE;
 	struct adc_xec_data *data = dev->driver_data;
-	u32_t reg;
+	uint32_t reg;
 
 	if (sequence->channels & ~BIT_MASK(MCHP_ADC_MAX_CHAN)) {
 		LOG_ERR("Incorrect channels, bitmask 0x%x", sequence->channels);
@@ -224,10 +224,10 @@ static void xec_adc_get_sample(struct device *dev)
 {
 	struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE;
 	struct adc_xec_data *data = dev->driver_data;
-	u32_t idx;
-	u32_t channels = adc_regs->status_reg;
-	u32_t ch_status = channels;
-	u32_t bit;
+	uint32_t idx;
+	uint32_t channels = adc_regs->status_reg;
+	uint32_t ch_status = channels;
+	uint32_t bit;
 
 	/*
 	 * Using the enabled channel bit set, from
@@ -240,7 +240,7 @@ static void xec_adc_get_sample(struct device *dev)
 	while (bit != 0) {
 		idx = bit - 1;
 
-		*data->buffer = (u16_t)adc_regs->channel_read_reg[idx];
+		*data->buffer = (uint16_t)adc_regs->channel_read_reg[idx];
 		data->buffer++;
 
 		channels &= ~BIT(idx);
@@ -255,7 +255,7 @@ static void adc_xec_isr(struct device *dev)
 {
 	struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE;
 	struct adc_xec_data *data = dev->driver_data;
-	u32_t reg;
+	uint32_t reg;
 
 	/* Clear START_SINGLE bit and clear SINGLE_DONE_STATUS */
 	reg = adc_regs->control_reg;
diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c
index 9369ceecad..8139687f36 100644
--- a/drivers/adc/adc_mcp320x.c
+++ b/drivers/adc/adc_mcp320x.c
@@ -28,19 +28,19 @@ LOG_MODULE_REGISTER(adc_mcp320x, CONFIG_ADC_LOG_LEVEL);
 struct mcp320x_config {
 	const char *spi_dev_name;
 	const char *spi_cs_dev_name;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	struct spi_config spi_cfg;
-	u8_t channels;
+	uint8_t channels;
 };
 
 struct mcp320x_data {
 	struct adc_context ctx;
 	struct device *spi_dev;
 	struct spi_cs_control spi_cs;
-	u16_t *buffer;
-	u16_t *repeat_buffer;
-	u8_t channels;
-	u8_t differential;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
+	uint8_t channels;
+	uint8_t differential;
 	struct k_thread thread;
 	struct k_sem sem;
 
@@ -86,9 +86,9 @@ static int mcp320x_validate_buffer_size(struct device *dev,
 					const struct adc_sequence *sequence)
 {
 	const struct mcp320x_config *config = dev->config_info;
-	u8_t channels = 0;
+	uint8_t channels = 0;
 	size_t needed;
-	u32_t mask;
+	uint32_t mask;
 
 	for (mask = BIT(config->channels - 1); mask != 0; mask >>= 1) {
 		if (mask & sequence->channels) {
@@ -96,7 +96,7 @@ static int mcp320x_validate_buffer_size(struct device *dev,
 		}
 	}
 
-	needed = channels * sizeof(u16_t);
+	needed = channels * sizeof(uint16_t);
 	if (sequence->options) {
 		needed *= (1 + sequence->options->extra_samplings);
 	}
@@ -178,12 +178,12 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 	}
 }
 
-static int mcp320x_read_channel(struct device *dev, u8_t channel, u16_t *result)
+static int mcp320x_read_channel(struct device *dev, uint8_t channel, uint16_t *result)
 {
 	const struct mcp320x_config *config = dev->config_info;
 	struct mcp320x_data *data = dev->driver_data;
-	u8_t tx_bytes[2];
-	u8_t rx_bytes[2];
+	uint8_t tx_bytes[2];
+	uint8_t rx_bytes[2];
 	int err;
 	const struct spi_buf tx_buf[2] = {
 		{
@@ -239,8 +239,8 @@ static int mcp320x_read_channel(struct device *dev, u8_t channel, u16_t *result)
 static void mcp320x_acquisition_thread(struct device *dev)
 {
 	struct mcp320x_data *data = dev->driver_data;
-	u16_t result = 0;
-	u8_t channel;
+	uint16_t result = 0;
+	uint8_t channel;
 	int err;
 
 	while (true) {
diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c
index 21743c0397..a25eb5fbc8 100644
--- a/drivers/adc/adc_mcux_adc12.c
+++ b/drivers/adc/adc_mcux_adc12.c
@@ -31,16 +31,16 @@ struct mcux_adc12_config {
 struct mcux_adc12_data {
 	struct device *dev;
 	struct adc_context ctx;
-	u16_t *buffer;
-	u16_t *repeat_buffer;
-	u32_t channels;
-	u8_t channel_id;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
+	uint32_t channels;
+	uint8_t channel_id;
 };
 
 static int mcux_adc12_channel_setup(struct device *dev,
 				    const struct adc_channel_cfg *channel_cfg)
 {
-	u8_t channel_id = channel_cfg->channel_id;
+	uint8_t channel_id = channel_cfg->channel_id;
 
 	if (channel_id > (ADC_SC1_ADCH_MASK >> ADC_SC1_ADCH_SHIFT)) {
 		LOG_ERR("Invalid channel %d", channel_id);
@@ -79,7 +79,7 @@ static int mcux_adc12_start_read(struct device *dev,
 	adc12_resolution_t resolution;
 	ADC_Type *base = config->base;
 	int error;
-	u32_t tmp32;
+	uint32_t tmp32;
 
 	switch (sequence->resolution) {
 	case 8:
@@ -156,7 +156,7 @@ static void mcux_adc12_start_channel(struct device *dev)
 	struct mcux_adc12_data *data = dev->driver_data;
 
 	adc12_channel_config_t channel_config;
-	u32_t channel_group = 0U;
+	uint32_t channel_group = 0U;
 
 	data->channel_id = find_lsb_set(data->channels) - 1;
 
@@ -194,8 +194,8 @@ static void mcux_adc12_isr(void *arg)
 	const struct mcux_adc12_config *config = dev->config_info;
 	struct mcux_adc12_data *data = dev->driver_data;
 	ADC_Type *base = config->base;
-	u32_t channel_group = 0U;
-	u16_t result;
+	uint32_t channel_group = 0U;
+	uint16_t result;
 
 	result = ADC12_GetChannelConversionValue(base, channel_group);
 	LOG_DBG("Finished channel %d. Result is 0x%04x",
diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c
index 49de71843d..4921401d47 100644
--- a/drivers/adc/adc_mcux_adc16.c
+++ b/drivers/adc/adc_mcux_adc16.c
@@ -25,16 +25,16 @@ struct mcux_adc16_config {
 struct mcux_adc16_data {
 	struct device *dev;
 	struct adc_context ctx;
-	u16_t *buffer;
-	u16_t *repeat_buffer;
-	u32_t channels;
-	u8_t channel_id;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
+	uint32_t channels;
+	uint8_t channel_id;
 };
 
 static int mcux_adc16_channel_setup(struct device *dev,
 				    const struct adc_channel_cfg *channel_cfg)
 {
-	u8_t channel_id = channel_cfg->channel_id;
+	uint8_t channel_id = channel_cfg->channel_id;
 
 	if (channel_id > (ADC_SC1_ADCH_MASK >> ADC_SC1_ADCH_SHIFT)) {
 		LOG_ERR("Channel %d is not valid", channel_id);
@@ -71,7 +71,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	adc16_hardware_average_mode_t mode;
 	adc16_resolution_t resolution;
 	int error;
-	u32_t tmp32;
+	uint32_t tmp32;
 	ADC_Type *base = config->base;
 
 	switch (sequence->resolution) {
@@ -166,7 +166,7 @@ static void mcux_adc16_start_channel(struct device *dev)
 	struct mcux_adc16_data *data = dev->driver_data;
 
 	adc16_channel_config_t channel_config;
-	u32_t channel_group = 0U;
+	uint32_t channel_group = 0U;
 
 	data->channel_id = find_lsb_set(data->channels) - 1;
 
@@ -208,8 +208,8 @@ static void mcux_adc16_isr(void *arg)
 	const struct mcux_adc16_config *config = dev->config_info;
 	struct mcux_adc16_data *data = dev->driver_data;
 	ADC_Type *base = config->base;
-	u32_t channel_group = 0U;
-	u16_t result;
+	uint32_t channel_group = 0U;
+	uint16_t result;
 
 	result = ADC16_GetChannelConversionValue(base, channel_group);
 	LOG_DBG("Finished channel %d. Result is 0x%04x",
diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c
index 40de7efdcf..7d40437e03 100644
--- a/drivers/adc/adc_nrfx_adc.c
+++ b/drivers/adc/adc_nrfx_adc.c
@@ -18,7 +18,7 @@ struct driver_data {
 	struct adc_context ctx;
 
 	nrf_adc_value_t *buffer;
-	u8_t active_channels;
+	uint8_t active_channels;
 };
 
 static struct driver_data m_data = {
@@ -34,7 +34,7 @@ static nrfx_adc_channel_t m_channels[CONFIG_ADC_NRFX_ADC_CHANNEL_COUNT];
 static int adc_nrfx_channel_setup(struct device *dev,
 				  const struct adc_channel_cfg *channel_cfg)
 {
-	u8_t channel_id = channel_cfg->channel_id;
+	uint8_t channel_id = channel_cfg->channel_id;
 	nrf_adc_config_t *config = &m_channels[channel_id].config;
 
 	if (channel_id >= CONFIG_ADC_NRFX_ADC_CHANNEL_COUNT) {
@@ -118,7 +118,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 }
 
 static int check_buffer_size(const struct adc_sequence *sequence,
-			     u8_t active_channels)
+			     uint8_t active_channels)
 {
 	size_t needed_buffer_size;
 
@@ -139,9 +139,9 @@ static int check_buffer_size(const struct adc_sequence *sequence,
 static int start_read(struct device *dev, const struct adc_sequence *sequence)
 {
 	int error;
-	u32_t selected_channels = sequence->channels;
-	u8_t active_channels;
-	u8_t channel_id;
+	uint32_t selected_channels = sequence->channels;
+	uint8_t active_channels;
+	uint8_t channel_id;
 	nrf_adc_config_resolution_t nrf_resolution;
 
 	/* Signal an error if channel selection is invalid (no channels or
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index f67d52943e..77b98f4533 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 struct driver_data {
 	struct adc_context ctx;
 
-	u8_t positive_inputs[SAADC_CH_NUM];
+	uint8_t positive_inputs[SAADC_CH_NUM];
 };
 
 static struct driver_data m_data = {
@@ -36,7 +36,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		.resistor_n = NRF_SAADC_RESISTOR_DISABLED,
 		.burst      = NRF_SAADC_BURST_DISABLED,
 	};
-	u8_t channel_id = channel_cfg->channel_id;
+	uint8_t channel_id = channel_cfg->channel_id;
 
 	if (channel_id >= SAADC_CH_NUM) {
 		return -EINVAL;
@@ -186,7 +186,7 @@ static int set_resolution(const struct adc_sequence *sequence)
 }
 
 static int set_oversampling(const struct adc_sequence *sequence,
-			    u8_t active_channels)
+			    uint8_t active_channels)
 {
 	nrf_saadc_oversample_t nrf_oversampling;
 
@@ -235,7 +235,7 @@ static int set_oversampling(const struct adc_sequence *sequence,
 }
 
 static int check_buffer_size(const struct adc_sequence *sequence,
-			     u8_t active_channels)
+			     uint8_t active_channels)
 {
 	size_t needed_buffer_size;
 
@@ -256,9 +256,9 @@ static int check_buffer_size(const struct adc_sequence *sequence,
 static int start_read(struct device *dev, const struct adc_sequence *sequence)
 {
 	int error;
-	u32_t selected_channels = sequence->channels;
-	u8_t active_channels;
-	u8_t channel_id;
+	uint32_t selected_channels = sequence->channels;
+	uint8_t active_channels;
+	uint8_t channel_id;
 
 	/* Signal an error if channel selection is invalid (no channels or
 	 * a non-existing one is selected).
diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c
index 1bd9227334..50b40e8129 100644
--- a/drivers/adc/adc_sam0.c
+++ b/drivers/adc/adc_sam0.c
@@ -28,16 +28,16 @@ struct adc_sam0_data {
 	struct adc_context ctx;
 	struct device *dev;
 
-	u16_t *buffer;
+	uint16_t *buffer;
 
 	/*
 	 * Saved initial start, so we can reset the advances we've done
 	 * if required
 	 */
-	u16_t *repeat_buffer;
+	uint16_t *repeat_buffer;
 
 #ifdef ADC_SAM0_REFERENCE_GLITCH
-	u8_t reference_changed;
+	uint8_t reference_changed;
 #endif
 };
 
@@ -45,15 +45,15 @@ struct adc_sam0_cfg {
 	Adc *regs;
 
 #ifdef MCLK
-	u32_t mclk_mask;
-	u32_t gclk_mask;
-	u16_t gclk_id;
+	uint32_t mclk_mask;
+	uint32_t gclk_mask;
+	uint16_t gclk_id;
 #else
-	u32_t gclk;
+	uint32_t gclk;
 #endif
 
-	u32_t freq;
-	u16_t prescaler;
+	uint32_t freq;
+	uint16_t prescaler;
 
 	void (*config_func)(struct device *dev);
 };
@@ -75,10 +75,10 @@ static void wait_synchronization(Adc *const adc)
 }
 
 static int adc_sam0_acquisition_to_clocks(struct device *dev,
-					  u16_t acquisition_time)
+					  uint16_t acquisition_time)
 {
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);
-	u64_t scaled_acq;
+	uint64_t scaled_acq;
 
 	switch (ADC_ACQ_TIME_UNIT(acquisition_time)) {
 	case ADC_ACQ_TIME_TICKS:
@@ -88,11 +88,11 @@ static int adc_sam0_acquisition_to_clocks(struct device *dev,
 
 		return (int)ADC_ACQ_TIME_VALUE(acquisition_time) - 1;
 	case ADC_ACQ_TIME_MICROSECONDS:
-		scaled_acq = (u64_t)ADC_ACQ_TIME_VALUE(acquisition_time) *
+		scaled_acq = (uint64_t)ADC_ACQ_TIME_VALUE(acquisition_time) *
 			     1000000U;
 		break;
 	case ADC_ACQ_TIME_NANOSECONDS:
-		scaled_acq = (u64_t)ADC_ACQ_TIME_VALUE(acquisition_time) *
+		scaled_acq = (uint64_t)ADC_ACQ_TIME_VALUE(acquisition_time) *
 			     1000U;
 		break;
 	default:
@@ -125,7 +125,7 @@ static int adc_sam0_channel_setup(struct device *dev,
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);
 	Adc *const adc = cfg->regs;
 	int retval;
-	u8_t SAMPCTRL = 0;
+	uint8_t SAMPCTRL = 0;
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
 		retval = adc_sam0_acquisition_to_clocks(dev,
@@ -142,7 +142,7 @@ static int adc_sam0_channel_setup(struct device *dev,
 	wait_synchronization(adc);
 
 
-	u8_t REFCTRL;
+	uint8_t REFCTRL;
 
 	switch (channel_cfg->reference) {
 	case ADC_REF_INTERNAL:
@@ -189,7 +189,7 @@ static int adc_sam0_channel_setup(struct device *dev,
 	}
 
 
-	u32_t INPUTCTRL = 0;
+	uint32_t INPUTCTRL = 0;
 
 	switch (channel_cfg->gain) {
 	case ADC_GAIN_1:
@@ -316,11 +316,11 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 }
 
 static int check_buffer_size(const struct adc_sequence *sequence,
-			     u8_t active_channels)
+			     uint8_t active_channels)
 {
 	size_t needed_buffer_size;
 
-	needed_buffer_size = active_channels * sizeof(u16_t);
+	needed_buffer_size = active_channels * sizeof(uint16_t);
 	if (sequence->options) {
 		needed_buffer_size *= (1U + sequence->options->extra_samplings);
 	}
@@ -434,11 +434,11 @@ static void adc_sam0_isr(void *arg)
 	struct adc_sam0_data *data = DEV_DATA(dev);
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);
 	Adc *const adc = cfg->regs;
-	u16_t result;
+	uint16_t result;
 
 	adc->INTFLAG.reg = ADC_INTFLAG_MASK;
 
-	result = (u16_t)(adc->RESULT.reg);
+	result = (uint16_t)(adc->RESULT.reg);
 
 #ifdef ADC_SAM0_REFERENCE_GLITCH
 	if (data->reference_changed) {
@@ -535,25 +535,25 @@ static const struct adc_driver_api adc_sam0_api = {
 #define ADC_SAM0_BIASCOMP_SHIFT(n)					\
 	(ADC0_FUSES_BIASCOMP_Pos + DT_INST_PROP(n, calib_offset))
 #define ADC_SAM0_BIASCOMP(n)						\
-	(((*(u32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASCOMP_SHIFT(n)) & 0x7)
+	(((*(uint32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASCOMP_SHIFT(n)) & 0x7)
 
 #define ADC_SAM0_BIASR2R_SHIFT(n)					\
 	(ADC0_FUSES_BIASR2R_Pos + DT_INST_PROP(n, calib_offset))
 #define ADC_SAM0_BIASR2R(n)						\
-	(((*(u32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASR2R_SHIFT(n)) & 0x7)
+	(((*(uint32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASR2R_SHIFT(n)) & 0x7)
 
 #define ADC_SAM0_BIASREFBUF_SHIFT(n)					\
 	(ADC0_FUSES_BIASREFBUF_Pos + DT_INST_PROP(n, calib_offset))
 #define ADC_SAM0_BIASREFBUF(n)						\
-	(((*(u32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASREFBUF_SHIFT(n)) & 0x7)
+	(((*(uint32_t *)NVMCTRL_SW0) >> ADC_SAM0_BIASREFBUF_SHIFT(n)) & 0x7)
 
 #define ADC_SAM0_CONFIGURE(n)						\
 do {									\
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);		\
 	Adc * const adc = cfg->regs;					\
-	u32_t comp = ADC_SAM0_BIASCOMP(n);				\
-	u32_t r2r = ADC_SAM0_BIASR2R(n);				\
-	u32_t rbuf = ADC_SAM0_BIASREFBUF(n);				\
+	uint32_t comp = ADC_SAM0_BIASCOMP(n);				\
+	uint32_t r2r = ADC_SAM0_BIASR2R(n);				\
+	uint32_t rbuf = ADC_SAM0_BIASREFBUF(n);				\
 	adc->CALIB.reg = ADC_CALIB_BIASCOMP(comp) |			\
 			 ADC_CALIB_BIASR2R(r2r) |			\
 			 ADC_CALIB_BIASREFBUF(rbuf);			\
@@ -572,13 +572,13 @@ do {									\
 	const struct adc_sam0_cfg *const cfg = DEV_CFG(dev);		\
 	Adc * const adc = cfg->regs;					\
 	/* Linearity is split across two words */			\
-	u32_t lin = ((*(u32_t *)ADC_FUSES_LINEARITY_0_ADDR) &		\
+	uint32_t lin = ((*(uint32_t *)ADC_FUSES_LINEARITY_0_ADDR) &		\
 		     ADC_FUSES_LINEARITY_0_Msk) >>			\
 		     ADC_FUSES_LINEARITY_0_Pos;				\
-	lin |= (((*(u32_t *)ADC_FUSES_LINEARITY_1_ADDR) &		\
+	lin |= (((*(uint32_t *)ADC_FUSES_LINEARITY_1_ADDR) &		\
 		 ADC_FUSES_LINEARITY_1_Msk) >>				\
 		 ADC_FUSES_LINEARITY_1_Pos) << 4;			\
-	u32_t bias = ((*(u32_t *)ADC_FUSES_BIASCAL_ADDR) &		\
+	uint32_t bias = ((*(uint32_t *)ADC_FUSES_BIASCAL_ADDR) &		\
 		      ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;	\
 	adc->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) |			\
 			 ADC_CALIB_LINEARITY_CAL(lin);			\
diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
index e3c11336e7..34ff6f925d 100644
--- a/drivers/adc/adc_sam_afec.c
+++ b/drivers/adc/adc_sam_afec.c
@@ -40,25 +40,25 @@ struct adc_sam_data {
 	struct device *dev;
 
 	/* Pointer to the buffer in the sequence. */
-	u16_t *buffer;
+	uint16_t *buffer;
 
 	/* Pointer to the beginning of a sample. Consider the number of
 	 * channels in the sequence: this buffer changes by that amount
 	 * so all the channels would get repeated.
 	 */
-	u16_t *repeat_buffer;
+	uint16_t *repeat_buffer;
 
 	/* Bit mask of the channels to be sampled. */
-	u32_t channels;
+	uint32_t channels;
 
 	/* Index of the channel being sampled. */
-	u8_t channel_id;
+	uint8_t channel_id;
 };
 
 struct adc_sam_cfg {
 	Afec *regs;
 	cfg_func_t cfg_func;
-	u32_t periph_id;
+	uint32_t periph_id;
 	struct soc_gpio_pin afec_trg_pin;
 };
 
@@ -74,7 +74,7 @@ static int adc_sam_channel_setup(struct device *dev,
 	const struct adc_sam_cfg * const cfg = DEV_CFG(dev);
 	Afec *const afec = cfg->regs;
 
-	u8_t channel_id = channel_cfg->channel_id;
+	uint8_t channel_id = channel_cfg->channel_id;
 
 	/* Clear the gain bits for the channel. */
 	afec->AFEC_CGR &= ~(3 << channel_id * 2U);
@@ -168,10 +168,10 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx,
 }
 
 static int check_buffer_size(const struct adc_sequence *sequence,
-			     u8_t active_channels)
+			     uint8_t active_channels)
 {
 	size_t needed_buffer_size;
-	needed_buffer_size = active_channels * sizeof(u16_t);
+	needed_buffer_size = active_channels * sizeof(uint16_t);
 	if (sequence->options) {
 		needed_buffer_size *= (1 + sequence->options->extra_samplings);
 	}
@@ -187,7 +187,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 {
 	struct adc_sam_data *data = DEV_DATA(dev);
 	int error = 0;
-	u32_t channels = sequence->channels;
+	uint32_t channels = sequence->channels;
 
 	data->channels = 0U;
 
@@ -214,8 +214,8 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 		return -EINVAL;
 	}
 
-	u8_t num_active_channels = 0U;
-	u8_t channel = 0U;
+	uint8_t num_active_channels = 0U;
+	uint8_t channel = 0U;
 
 	while (channels > 0) {
 		if (channels & 1) {
@@ -330,13 +330,13 @@ static void adc_sam_isr(void *arg)
 	struct adc_sam_data *data = DEV_DATA(dev);
 	const struct adc_sam_cfg *const cfg = DEV_CFG(dev);
 	Afec *const afec = cfg->regs;
-	u16_t result;
+	uint16_t result;
 
 	afec->AFEC_CHDR |= BIT(data->channel_id);
 	afec->AFEC_IDR |= BIT(data->channel_id);
 
 	afec->AFEC_CSELR = AFEC_CSELR_CSEL(data->channel_id);
-	result = (u16_t)(afec->AFEC_CDR);
+	result = (uint16_t)(afec->AFEC_CDR);
 
 	*data->buffer++ = result;
 	data->channels &= ~BIT(data->channel_id);
diff --git a/drivers/adc/adc_shell.c b/drivers/adc/adc_shell.c
index b404011cd8..19d63e895b 100644
--- a/drivers/adc/adc_shell.c
+++ b/drivers/adc/adc_shell.c
@@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(adc_shell);
 struct adc_hdl {
 	char *device_name;
 	struct adc_channel_cfg channel_config;
-	u8_t resolution;
+	uint8_t resolution;
 };
 
 #define ADC_HDL_LIST_ENTRY(inst)					\
@@ -69,19 +69,19 @@ struct adc_hdl adc_list[] = {
 };
 
 struct args_index {
-	s8_t adc;
-	s8_t parent_adc;
-	u8_t channel;
-	u8_t conf;
-	u8_t acq_unit;
+	int8_t adc;
+	int8_t parent_adc;
+	uint8_t channel;
+	uint8_t conf;
+	uint8_t acq_unit;
 };
 
 struct args_number {
-	u8_t help;
-	u8_t channel;
-	u8_t acq_time;
-	u8_t resolution;
-	u8_t read;
+	uint8_t help;
+	uint8_t channel;
+	uint8_t acq_time;
+	uint8_t resolution;
+	uint8_t read;
 };
 
 static const struct args_index args_indx = {
@@ -143,7 +143,7 @@ static int cmd_adc_channel(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 	adc_list[chosen_adc].channel_config.channel_id =
-		(u8_t)strtol(argv[args_indx.conf], NULL, 10);
+		(uint8_t)strtol(argv[args_indx.conf], NULL, 10);
 	retval = adc_channel_setup(adc_dev,
 			&adc_list[chosen_adc].channel_config);
 	LOG_DBG("Channel setup returned %i\n", retval);
@@ -209,7 +209,7 @@ static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv)
 	int retval = 0;
 	struct device *adc_dev;
 	int chosen_adc;
-	u16_t acq_time;
+	uint16_t acq_time;
 
 	if (argc != args_no.acq_time) {
 		shell_fprintf(shell, SHELL_NORMAL,
@@ -233,7 +233,7 @@ static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv)
 		shell_error(shell, "<time> must be digits");
 		return -EINVAL;
 	}
-	acq_time = (u16_t)strtol(argv[args_indx.conf], NULL, 10);
+	acq_time = (uint16_t)strtol(argv[args_indx.conf], NULL, 10);
 	if (!strcmp(argv[args_indx.acq_unit], "us")) {
 		adc_list[chosen_adc].channel_config.acquisition_time =
 			ADC_ACQ_TIME(ADC_ACQ_TIME_MICROSECONDS, acq_time);
@@ -281,7 +281,7 @@ static int cmd_adc_reso(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 	adc_list[chosen_adc].resolution =
-		(u8_t)strtol(argv[args_indx.conf], NULL, 10);
+		(uint8_t)strtol(argv[args_indx.conf], NULL, 10);
 	retval = adc_channel_setup(adc_dev,
 			&adc_list[chosen_adc].channel_config);
 	return retval;
@@ -340,7 +340,7 @@ static int cmd_adc_read(const struct shell *shell, size_t argc, char **argv)
 	int retval = 0;
 	int chosen_adc = -1;
 	struct device *adc_dev;
-	u16_t m_sample_buffer[BUFFER_SIZE];
+	uint16_t m_sample_buffer[BUFFER_SIZE];
 
 	if (argc != args_no.read) {
 		shell_fprintf(shell, SHELL_NORMAL,
@@ -352,7 +352,7 @@ static int cmd_adc_read(const struct shell *shell, size_t argc, char **argv)
 		shell_error(shell, "Device not in device list");
 		return 0;
 	}
-	u8_t adc_channel_id = strtol(argv[args_indx.channel], NULL, 10);
+	uint8_t adc_channel_id = strtol(argv[args_indx.channel], NULL, 10);
 
 	adc_dev = device_get_binding(adc_list[chosen_adc].device_name);
 	if (adc_dev == NULL) {
@@ -381,9 +381,9 @@ static int cmd_adc_print(const struct shell *shell, size_t argc, char **argv)
 	int i;
 	char *gain = "1";
 	char *ref = "INTERNAL";
-	u16_t acq_time;
-	u8_t channel_id;
-	u8_t resolution;
+	uint16_t acq_time;
+	uint8_t channel_id;
+	uint8_t resolution;
 
 	chosen_adc = get_adc_from_list(argv[args_indx.adc]);
 	if (chosen_adc < 0) {
diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index a5a0602b80..9b3dd02f32 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(adc_stm32);
 #if !defined(CONFIG_SOC_SERIES_STM32F0X) && \
 	!defined(CONFIG_SOC_SERIES_STM32L0X)
 #define RANK(n)		LL_ADC_REG_RANK_##n
-static const u32_t table_rank[] = {
+static const uint32_t table_rank[] = {
 	RANK(1),
 	RANK(2),
 	RANK(3),
@@ -49,7 +49,7 @@ static const u32_t table_rank[] = {
 };
 
 #define SEQ_LEN(n)	LL_ADC_REG_SEQ_SCAN_ENABLE_##n##RANKS
-static const u32_t table_seq_len[] = {
+static const uint32_t table_seq_len[] = {
 	LL_ADC_REG_SEQ_SCAN_DISABLE,
 	SEQ_LEN(2),
 	SEQ_LEN(3),
@@ -70,7 +70,7 @@ static const u32_t table_seq_len[] = {
 #endif
 
 #define RES(n)		LL_ADC_RESOLUTION_##n##B
-static const u32_t table_resolution[] = {
+static const uint32_t table_resolution[] = {
 #if defined(CONFIG_SOC_SERIES_STM32F1X)
 	RES(12),
 #elif !defined(CONFIG_SOC_SERIES_STM32H7X)
@@ -95,8 +95,8 @@ static const u32_t table_resolution[] = {
  * So all half cycles are counted as one.
  */
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32F1X)
-static const u16_t acq_time_tbl[8] = {2, 8, 14, 29, 42, 56, 72, 240};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {2, 8, 14, 29, 42, 56, 72, 240};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(1,   _5),
 	SMP_TIME(7,   S_5),
 	SMP_TIME(13,  S_5),
@@ -109,8 +109,8 @@ static const u32_t table_samp_time[] = {
 #elif defined(CONFIG_SOC_SERIES_STM32F2X) || \
 	defined(CONFIG_SOC_SERIES_STM32F4X) || \
 	defined(CONFIG_SOC_SERIES_STM32F7X)
-static const u16_t acq_time_tbl[8] = {3, 15, 28, 56, 84, 112, 144, 480};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {3, 15, 28, 56, 84, 112, 144, 480};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(3,   S),
 	SMP_TIME(15,  S),
 	SMP_TIME(28,  S),
@@ -122,8 +122,8 @@ static const u32_t table_samp_time[] = {
 };
 #elif defined(CONFIG_SOC_SERIES_STM32F3X)
 #ifdef ADC5_V1_1
-static const u16_t acq_time_tbl[8] = {2, 3, 5, 8, 20, 62, 182, 602};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {2, 3, 5, 8, 20, 62, 182, 602};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(1,   _5),
 	SMP_TIME(2,   S_5),
 	SMP_TIME(4,   S_5),
@@ -134,8 +134,8 @@ static const u32_t table_samp_time[] = {
 	SMP_TIME(601, S_5),
 };
 #else
-static const u16_t acq_time_tbl[8] = {2, 8, 14, 29, 42, 56, 72, 240};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {2, 8, 14, 29, 42, 56, 72, 240};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(1,   _5),
 	SMP_TIME(7,   S_5),
 	SMP_TIME(13,  S_5),
@@ -147,8 +147,8 @@ static const u32_t table_samp_time[] = {
 };
 #endif /* ADC5_V1_1 */
 #elif defined(CONFIG_SOC_SERIES_STM32L0X)
-static const u16_t acq_time_tbl[8] = {2, 4, 8, 13, 20, 40, 80, 161};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {2, 4, 8, 13, 20, 40, 80, 161};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(1,   _5),
 	SMP_TIME(3,   S_5),
 	SMP_TIME(7,   S_5),
@@ -161,8 +161,8 @@ static const u32_t table_samp_time[] = {
 #elif defined(CONFIG_SOC_SERIES_STM32L4X) || \
 	defined(CONFIG_SOC_SERIES_STM32WBX) || \
 	defined(CONFIG_SOC_SERIES_STM32G4X)
-static const u16_t acq_time_tbl[8] = {3, 7, 13, 25, 48, 93, 248, 641};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {3, 7, 13, 25, 48, 93, 248, 641};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(2,   S_5),
 	SMP_TIME(6,   S_5),
 	SMP_TIME(12,  S_5),
@@ -173,8 +173,8 @@ static const u32_t table_samp_time[] = {
 	SMP_TIME(640, S_5),
 };
 #elif defined(CONFIG_SOC_SERIES_STM32L1X)
-static const u16_t acq_time_tbl[8] = {5, 10, 17, 25, 49, 97, 193, 385};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {5, 10, 17, 25, 49, 97, 193, 385};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(4,   S),
 	SMP_TIME(9,   S),
 	SMP_TIME(16,  S),
@@ -185,8 +185,8 @@ static const u32_t table_samp_time[] = {
 	SMP_TIME(384, S),
 };
 #elif defined(CONFIG_SOC_SERIES_STM32H7X)
-static const u16_t acq_time_tbl[8] = {2, 3, 9, 17, 33, 65, 388, 811};
-static const u32_t table_samp_time[] = {
+static const uint16_t acq_time_tbl[8] = {2, 3, 9, 17, 33, 65, 388, 811};
+static const uint32_t table_samp_time[] = {
 	SMP_TIME(1,   _5),
 	SMP_TIME(2,   S_5),
 	SMP_TIME(8,   S_5),
@@ -204,13 +204,13 @@ static const u32_t table_samp_time[] = {
 struct adc_stm32_data {
 	struct adc_context ctx;
 	struct device *dev;
-	u16_t *buffer;
-	u16_t *repeat_buffer;
+	uint16_t *buffer;
+	uint16_t *repeat_buffer;
 
-	u8_t resolution;
-	u8_t channel_count;
+	uint8_t resolution;
+	uint8_t channel_count;
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32L0X)
-	s8_t acq_time_index;
+	int8_t acq_time_index;
 #endif
 };
 
@@ -224,11 +224,11 @@ struct adc_stm32_cfg {
 };
 
 static int check_buffer_size(const struct adc_sequence *sequence,
-			     u8_t active_channels)
+			     uint8_t active_channels)
 {
 	size_t needed_buffer_size;
 
-	needed_buffer_size = active_channels * sizeof(u16_t);
+	needed_buffer_size = active_channels * sizeof(uint16_t);
 
 	if (sequence->options) {
 		needed_buffer_size *= (1 + sequence->options->extra_samplings);
@@ -268,7 +268,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	const struct adc_stm32_cfg *config = dev->config_info;
 	struct adc_stm32_data *data = dev->driver_data;
 	ADC_TypeDef *adc = (ADC_TypeDef *)config->base;
-	u8_t resolution;
+	uint8_t resolution;
 	int err;
 
 	switch (sequence->resolution) {
@@ -311,13 +311,13 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 		return -EINVAL;
 	}
 
-	u32_t channels = sequence->channels;
+	uint32_t channels = sequence->channels;
 
 	data->buffer = sequence->buffer;
-	u8_t index;
+	uint8_t index;
 
 	index = find_lsb_set(channels) - 1;
-	u32_t channel = __LL_ADC_DECIMAL_NB_TO_CHANNEL(index);
+	uint32_t channel = __LL_ADC_DECIMAL_NB_TO_CHANNEL(index);
 #if defined(CONFIG_SOC_SERIES_STM32H7X)
 	/*
 	 * Each channel in the sequence must be previously enabled in PCSEL.
@@ -429,7 +429,7 @@ static int adc_stm32_read_async(struct device *dev,
 }
 #endif
 
-static int adc_stm32_check_acq_time(u16_t acq_time)
+static int adc_stm32_check_acq_time(uint16_t acq_time)
 {
 	for (int i = 0; i < 8; i++) {
 		if (acq_time == ADC_ACQ_TIME(ADC_ACQ_TIME_TICKS,
@@ -446,8 +446,8 @@ static int adc_stm32_check_acq_time(u16_t acq_time)
 	return -EINVAL;
 }
 
-static void adc_stm32_setup_speed(struct device *dev, u8_t id,
-				  u8_t acq_time_index)
+static void adc_stm32_setup_speed(struct device *dev, uint8_t id,
+				  uint8_t acq_time_index)
 {
 	const struct adc_stm32_cfg *config =
 		(const struct adc_stm32_cfg *)dev->config_info;
@@ -648,7 +648,7 @@ static int adc_stm32_init(struct device *dev)
 	 * ADC modules on these series have to wait for some cycles to be
 	 * enabled.
 	 */
-	u32_t adc_rate, wait_cycles;
+	uint32_t adc_rate, wait_cycles;
 
 	if (clock_control_get_rate(clk,
 		(clock_control_subsys_t *) &config->pclken, &adc_rate) < 0) {
@@ -673,7 +673,7 @@ static int adc_stm32_init(struct device *dev)
 	 * still not stabilized, this will wait for a short time to ensure ADC
 	 * modules are properly enabled.
 	 */
-	u32_t countTimeout = 0;
+	uint32_t countTimeout = 0;
 
 	while (LL_ADC_IsActiveFlag_ADRDY(adc) == 0) {
 		if (LL_ADC_IsEnabled(adc) == 0UL) {
diff --git a/drivers/audio/decimation/pdm_decim_fir.h b/drivers/audio/decimation/pdm_decim_fir.h
index 589a7a82c0..ad41fc06c7 100644
--- a/drivers/audio/decimation/pdm_decim_fir.h
+++ b/drivers/audio/decimation/pdm_decim_fir.h
@@ -23,7 +23,7 @@ struct pdm_decim {
 	int relative_stopband;
 	int passband_ripple;
 	int stopband_ripple;
-	const s32_t *coef;
+	const int32_t *coef;
 };
 
 struct pdm_decim **pdm_decim_get_fir_list(void);
diff --git a/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
index d6c92e1fc1..6b9836baaf 100644
--- a/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_02_4288_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_02_4288_5100_010_095[91] = {
+static const int32_t fir_int32_02_4288_5100_010_095[91] = {
 	-193886,
 	104552,
 	2140521,
diff --git a/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
index 3a56104a1f..e4f07331b9 100644
--- a/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_02_4375_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_02_4375_5100_010_095[101] = {
+static const int32_t fir_int32_02_4375_5100_010_095[101] = {
 	-587830,
 	-2653881,
 	-5154608,
diff --git a/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
index 7ec22efdc2..65a8b65321 100644
--- a/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_03_3850_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_03_3850_5100_010_095[93] = {
+static const int32_t fir_int32_03_3850_5100_010_095[93] = {
 	44212,
 	-302176,
 	-1360920,
diff --git a/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
index 252abe21f2..5193ac73ef 100644
--- a/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_03_4375_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_03_4375_5100_010_095[157] = {
+static const int32_t fir_int32_03_4375_5100_010_095[157] = {
 	350904,
 	1127891,
 	2233546,
diff --git a/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
index b5478e2093..f1c45ebbd0 100644
--- a/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_04_4375_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_04_4375_5100_010_095[211] = {
+static const int32_t fir_int32_04_4375_5100_010_095[211] = {
 	126017,
 	745791,
 	1735783,
diff --git a/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
index 1f1d3db35c..48674ee427 100644
--- a/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_05_4331_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_05_4331_5100_010_095[251] = {
+static const int32_t fir_int32_05_4331_5100_010_095[251] = {
 	-250963,
 	-530472,
 	-956449,
diff --git a/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c b/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
index 524058ddd1..c2d5fc0d4c 100644
--- a/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
+++ b/drivers/audio/decimation/pdm_decim_int32_06_4156_5100_010_095.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_06_4156_5100_010_095[249] = {
+static const int32_t fir_int32_06_4156_5100_010_095[249] = {
 	-145670,
 	-159762,
 	-183049,
diff --git a/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c b/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
index e1619fb838..9a8d624ce1 100644
--- a/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
+++ b/drivers/audio/decimation/pdm_decim_int32_08_4156_5380_010_090.c
@@ -12,7 +12,7 @@
 
 #include "pdm_decim_fir.h"
 
-static const s32_t fir_int32_08_4156_5380_010_090[247] = {
+static const int32_t fir_int32_08_4156_5380_010_090[247] = {
 	-337052,
 	-90075,
 	37780,
diff --git a/drivers/audio/intel_dmic.c b/drivers/audio/intel_dmic.c
index be8e82377d..0670d140e0 100644
--- a/drivers/audio/intel_dmic.c
+++ b/drivers/audio/intel_dmic.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(audio_dmic);
 /*
  * Maximum number of PDM controller instances supported by this driver
  * configuration data types are selected based on this max.
- * For example, u32_t is selected when a config parameter is 4bits wide
+ * For example, uint32_t is selected when a config parameter is 4bits wide
  * and 8 instances fit within a 32 bit type
  */
 #define MAX_PDM_CONTROLLERS_SUPPORTED	8
@@ -42,17 +42,17 @@ LOG_MODULE_REGISTER(audio_dmic);
 #define DMIC_FIR_PIPELINE_OVERHEAD 5
 
 struct decim_modes {
-	s16_t clkdiv[DMIC_MAX_MODES];
-	s16_t mcic[DMIC_MAX_MODES];
-	s16_t mfir[DMIC_MAX_MODES];
+	int16_t clkdiv[DMIC_MAX_MODES];
+	int16_t mcic[DMIC_MAX_MODES];
+	int16_t mfir[DMIC_MAX_MODES];
 	int num_of_modes;
 };
 
 struct matched_modes {
-	s16_t clkdiv[DMIC_MAX_MODES];
-	s16_t mcic[DMIC_MAX_MODES];
-	s16_t mfir_a[DMIC_MAX_MODES];
-	s16_t mfir_b[DMIC_MAX_MODES];
+	int16_t clkdiv[DMIC_MAX_MODES];
+	int16_t mcic[DMIC_MAX_MODES];
+	int16_t mfir_a[DMIC_MAX_MODES];
+	int16_t mfir_b[DMIC_MAX_MODES];
 	int num_of_modes;
 };
 
@@ -68,8 +68,8 @@ struct dmic_configuration {
 	int fir_b_shift;
 	int fir_a_length;
 	int fir_b_length;
-	s32_t fir_a_scale;
-	s32_t fir_b_scale;
+	int32_t fir_a_scale;
+	int32_t fir_b_scale;
 };
 
 /* Minimum OSR is always applied for 48 kHz and less sample rates */
@@ -85,11 +85,11 @@ struct dmic_configuration {
 #define DMIC_HW_FIR_COEF_MAX ((1 << (DMIC_HW_BITS_FIR_COEF - 1)) - 1)
 #define DMIC_HW_FIR_COEF_Q (DMIC_HW_BITS_FIR_COEF - 1)
 
-/* Internal precision in gains computation, e.g. Q4.28 in s32_t */
+/* Internal precision in gains computation, e.g. Q4.28 in int32_t */
 #define DMIC_FIR_SCALE_Q 28
 
 /* Fractional multiplication with shift and round
- * Note that the parameters px and py must be cast to (s64_t) if other type.
+ * Note that the parameters px and py must be cast to (int64_t) if other type.
  */
 #define Q_MULTSR_32X32(px, py, qx, qy, qp) \
 	((((px) * (py) >> ((qx)+(qy)-(qp)-1)) + 1) >> 1)
@@ -109,9 +109,9 @@ struct dmic_configuration {
 /* queue size to hold buffers in process */
 #define DMIC_BUF_Q_LEN		2
 
-#define DMIC_REG_RD(reg)	(*((volatile u32_t *)(PDM_BASE + (reg))))
+#define DMIC_REG_RD(reg)	(*((volatile uint32_t *)(PDM_BASE + (reg))))
 #define DMIC_REG_WR(reg, val)	\
-	(*((volatile u32_t *)(PDM_BASE + (reg))) = (val))
+	(*((volatile uint32_t *)(PDM_BASE + (reg))) = (val))
 #define DMIC_REG_UPD(reg, mask, val)		\
 	DMIC_REG_WR((reg), (DMIC_REG_RD((reg)) & ~(mask)) | ((val) & (mask)))
 
@@ -127,18 +127,18 @@ struct _stream_data {
 /* DMIC private data */
 static struct _dmic_pdata {
 	enum dmic_state state;
-	u16_t fifo_a;
-	u16_t fifo_b;
-	u16_t mic_en_mask;
-	u8_t num_streams;
-	u8_t reserved;
+	uint16_t fifo_a;
+	uint16_t fifo_b;
+	uint16_t mic_en_mask;
+	uint8_t num_streams;
+	uint8_t reserved;
 	struct _stream_data streams[DMIC_MAX_STREAMS];
 	struct device *dma_dev;
 } dmic_private;
 
-static inline void dmic_parse_channel_map(u32_t channel_map_lo,
-		u32_t channel_map_hi, u8_t channel, u8_t *pdm, enum pdm_lr *lr);
-static inline u8_t dmic_parse_clk_skew_map(u32_t skew_map, u8_t pdm);
+static inline void dmic_parse_channel_map(uint32_t channel_map_lo,
+		uint32_t channel_map_hi, uint8_t channel, uint8_t *pdm, enum pdm_lr *lr);
+static inline uint8_t dmic_parse_clk_skew_map(uint32_t skew_map, uint8_t pdm);
 static void dmic_stop(void);
 
 /* This function searches from vec[] (of length vec_length) integer values
@@ -148,7 +148,7 @@ static void dmic_stop(void);
  * to 1 to receive only the first match in ascending order. It avoids need
  * for an array for idx.
  */
-int find_equal_int16(s16_t idx[], s16_t vec[], int n, int vec_length,
+int find_equal_int16(int16_t idx[], int16_t vec[], int n, int vec_length,
 	int max_results)
 {
 	int nresults = 0;
@@ -167,7 +167,7 @@ int find_equal_int16(s16_t idx[], s16_t vec[], int n, int vec_length,
 }
 
 /* Return the smallest value found in the vector */
-s16_t find_min_int16(s16_t vec[], int vec_length)
+int16_t find_min_int16(int16_t vec[], int vec_length)
 {
 	int i;
 	int min = vec[0];
@@ -180,12 +180,12 @@ s16_t find_min_int16(s16_t vec[], int vec_length)
 }
 
 /* Return the largest absolute value found in the vector. Note that
- * smallest negative value need to be saturated to preset as s32_t.
+ * smallest negative value need to be saturated to preset as int32_t.
  */
-s32_t find_max_abs_int32(s32_t vec[], int vec_length)
+int32_t find_max_abs_int32(int32_t vec[], int vec_length)
 {
 	int i;
-	s64_t amax = (vec[0] > 0) ? vec[0] : -vec[0];
+	int64_t amax = (vec[0] > 0) ? vec[0] : -vec[0];
 
 	for (i = 1; i < vec_length; i++) {
 		amax = (vec[i] > amax) ? vec[i] : amax;
@@ -198,7 +198,7 @@ s32_t find_max_abs_int32(s32_t vec[], int vec_length)
 /* Count the left shift amount to normalize a 32 bit signed integer value
  * without causing overflow. Input value 0 will result to 31.
  */
-int norm_int32(s32_t val)
+int norm_int32(int32_t val)
 {
 	if (val == 0) {
 		return 31;
@@ -218,7 +218,7 @@ int norm_int32(s32_t val)
  * used microphone component datasheet.
  */
 static void find_modes(struct decim_modes *modes,
-		struct dmic_cfg *config, u32_t fs)
+		struct dmic_cfg *config, uint32_t fs)
 {
 	int clkdiv_min;
 	int clkdiv_max;
@@ -353,7 +353,7 @@ static void find_modes(struct decim_modes *modes,
 static void match_modes(struct matched_modes *c, struct decim_modes *a,
 		struct decim_modes *b)
 {
-	s16_t idx[DMIC_MAX_MODES];
+	int16_t idx[DMIC_MAX_MODES];
 	int idx_length;
 	int i;
 	int n;
@@ -452,23 +452,23 @@ static struct pdm_decim *get_fir(struct dmic_configuration *cfg, int mfir)
 /* Calculate scale and shift to use for FIR coefficients. Scale is applied
  * before write to HW coef RAM. Shift will be programmed to HW register.
  */
-static int fir_coef_scale(s32_t *fir_scale, int *fir_shift, int add_shift,
-	const s32_t coef[], int coef_length, s32_t gain)
+static int fir_coef_scale(int32_t *fir_scale, int *fir_shift, int add_shift,
+	const int32_t coef[], int coef_length, int32_t gain)
 {
-	s32_t amax;
-	s32_t new_amax;
-	s32_t fir_gain;
+	int32_t amax;
+	int32_t new_amax;
+	int32_t fir_gain;
 	int shift;
 
 	/* Multiply gain passed from CIC with output full scale. */
-	fir_gain = Q_MULTSR_32X32((s64_t)gain, DMIC_HW_SENS_Q28,
+	fir_gain = Q_MULTSR_32X32((int64_t)gain, DMIC_HW_SENS_Q28,
 		DMIC_FIR_SCALE_Q, 28, DMIC_FIR_SCALE_Q);
 
 	/* Find the largest FIR coefficient value. */
-	amax = find_max_abs_int32((s32_t *)coef, coef_length);
+	amax = find_max_abs_int32((int32_t *)coef, coef_length);
 
 	/* Scale max. tap value with FIR gain. */
-	new_amax = Q_MULTSR_32X32((s64_t)amax, fir_gain, 31,
+	new_amax = Q_MULTSR_32X32((int64_t)amax, fir_gain, 31,
 		DMIC_FIR_SCALE_Q, DMIC_FIR_SCALE_Q);
 	if (new_amax <= 0) {
 		return -EINVAL;
@@ -518,12 +518,12 @@ static int fir_coef_scale(s32_t *fir_scale, int *fir_shift, int add_shift,
 static int select_mode(struct dmic_configuration *cfg,
 	struct matched_modes *modes)
 {
-	s32_t g_cic;
-	s32_t fir_in_max;
-	s32_t cic_out_max;
-	s32_t gain_to_fir;
-	s16_t idx[DMIC_MAX_MODES];
-	s16_t *mfir;
+	int32_t g_cic;
+	int32_t fir_in_max;
+	int32_t cic_out_max;
+	int32_t gain_to_fir;
+	int16_t idx[DMIC_MAX_MODES];
+	int16_t *mfir;
 	int n = 1;
 	int mmin;
 	int count;
@@ -612,7 +612,7 @@ static int select_mode(struct dmic_configuration *cfg,
 		cic_out_max = g_cic << -cfg->cic_shift;
 	}
 
-	gain_to_fir = (s32_t)((((s64_t)fir_in_max) << DMIC_FIR_SCALE_Q) /
+	gain_to_fir = (int32_t)((((int64_t)fir_in_max) << DMIC_FIR_SCALE_Q) /
 		cic_out_max);
 
 	/* Calculate FIR scale and shift */
@@ -651,13 +651,13 @@ static int select_mode(struct dmic_configuration *cfg,
 	return 0;
 }
 
-static int source_ipm_helper(struct pdm_chan_cfg *config, u32_t *source_mask,
-		u8_t *controller_mask, u8_t *stereo_mask, u8_t *swap_mask)
+static int source_ipm_helper(struct pdm_chan_cfg *config, uint32_t *source_mask,
+		uint8_t *controller_mask, uint8_t *stereo_mask, uint8_t *swap_mask)
 {
-	u8_t pdm_ix;
-	u8_t chan_ix;
+	uint8_t pdm_ix;
+	uint8_t chan_ix;
 	enum pdm_lr lr;
-	u16_t pdm_lr_mask = 0U;
+	uint16_t pdm_lr_mask = 0U;
 	int ipm = 0;
 
 	/* clear outputs */
@@ -717,15 +717,15 @@ static int source_ipm_helper(struct pdm_chan_cfg *config, u32_t *source_mask,
 static int configure_registers(struct device *dev,
 		struct dmic_configuration *hw_cfg, struct dmic_cfg *config)
 {
-	u8_t skew;
-	u8_t swap_mask;
-	u8_t edge_mask;
-	u8_t stereo_mask;
-	u8_t controller_mask;
-	u32_t val;
-	s32_t ci;
-	u32_t cu;
-	u32_t coeff_ix;
+	uint8_t skew;
+	uint8_t swap_mask;
+	uint8_t edge_mask;
+	uint8_t stereo_mask;
+	uint8_t controller_mask;
+	uint32_t val;
+	int32_t ci;
+	uint32_t cu;
+	uint32_t coeff_ix;
 	int ipm;
 	int of0;
 	int of1;
@@ -754,7 +754,7 @@ static int configure_registers(struct device *dev,
 	fir_start_a = 0;
 	fir_start_b = 0;
 
-	u32_t source_mask;
+	uint32_t source_mask;
 
 	/* OUTCONTROL0 and OUTCONTROL1 */
 	of0 = (config->streams[0].pcm_width == 32U) ? 2 : 0;
@@ -919,7 +919,7 @@ static int configure_registers(struct device *dev,
 	/* Write coef RAM A with scaled coefficient in reverse order */
 	length = hw_cfg->fir_a_length;
 	for (j = 0; j < length; j++) {
-		ci = (s32_t)Q_MULTSR_32X32((s64_t)hw_cfg->fir_a->coef[j],
+		ci = (int32_t)Q_MULTSR_32X32((int64_t)hw_cfg->fir_a->coef[j],
 				hw_cfg->fir_a_scale, 31, DMIC_FIR_SCALE_Q,
 				DMIC_HW_FIR_COEF_Q);
 		cu = FIR_COEF_A(ci);
@@ -932,7 +932,7 @@ static int configure_registers(struct device *dev,
 	/* Write coef RAM B with scaled coefficient in reverse order */
 	length = hw_cfg->fir_b_length;
 	for (j = 0; j < length; j++) {
-		ci = (s32_t)Q_MULTSR_32X32((s64_t)hw_cfg->fir_b->coef[j],
+		ci = (int32_t)Q_MULTSR_32X32((int64_t)hw_cfg->fir_b->coef[j],
 				hw_cfg->fir_b_scale, 31, DMIC_FIR_SCALE_Q,
 				DMIC_HW_FIR_COEF_Q);
 		cu = FIR_COEF_B(ci);
@@ -949,7 +949,7 @@ static int configure_registers(struct device *dev,
 	return 0;
 }
 
-static void dmic_dma_callback(void *arg, u32_t chan, int err_code)
+static void dmic_dma_callback(void *arg, uint32_t chan, int err_code)
 {
 	void *buffer;
 	size_t size;
@@ -1287,9 +1287,9 @@ static int dmic_trigger_device(struct device *dev, enum dmic_trigger cmd)
 	return 0;
 }
 
-static inline u8_t dmic_parse_clk_skew_map(u32_t skew_map, u8_t pdm)
+static inline uint8_t dmic_parse_clk_skew_map(uint32_t skew_map, uint8_t pdm)
 {
-	return (u8_t)((skew_map >> ((pdm & BIT_MASK(3)) * 4U)) & BIT_MASK(4));
+	return (uint8_t)((skew_map >> ((pdm & BIT_MASK(3)) * 4U)) & BIT_MASK(4));
 }
 
 static int dmic_initialize_device(struct device *dev)
@@ -1333,8 +1333,8 @@ static int dmic_configure_device(struct device *dev, struct dmic_cfg *config)
 	return ret;
 }
 
-static int dmic_read_device(struct device *dev, u8_t stream,
-		void **buffer, size_t *size, s32_t timeout)
+static int dmic_read_device(struct device *dev, uint8_t stream,
+		void **buffer, size_t *size, int32_t timeout)
 {
 	int ret;
 
@@ -1357,11 +1357,11 @@ static int dmic_read_device(struct device *dev, u8_t stream,
 	return ret;
 }
 
-int dmic_configure_dma(struct pcm_stream_cfg *config, u8_t num_streams)
+int dmic_configure_dma(struct pcm_stream_cfg *config, uint8_t num_streams)
 {
 	int ret = 0;
 	int stream;
-	u32_t channel;
+	uint32_t channel;
 	struct dma_block_config dma_block;
 	struct dma_config dma_cfg = {
 		.dma_slot		= DMA_HANDSHAKE_DMIC_RXA,
@@ -1397,8 +1397,8 @@ int dmic_configure_dma(struct pcm_stream_cfg *config, u8_t num_streams)
 		LOG_DBG("Configuring stream %u DMA ch%u handshake %u", stream,
 				channel, dma_cfg.dma_slot);
 
-		dma_block.source_address = (u32_t)NULL;
-		dma_block.dest_address = (u32_t)NULL;
+		dma_block.source_address = (uint32_t)NULL;
+		dma_block.dest_address = (uint32_t)NULL;
 		dma_block.block_size = 0U;
 		dma_block.next_block = NULL;
 
@@ -1411,25 +1411,25 @@ int dmic_configure_dma(struct pcm_stream_cfg *config, u8_t num_streams)
 	return ret;
 }
 
-int dmic_reload_dma(u32_t channel, void *buffer, size_t size)
+int dmic_reload_dma(uint32_t channel, void *buffer, size_t size)
 {
-	u32_t source;
+	uint32_t source;
 
 	source = (channel == DMA_CHANNEL_DMIC_RXA) ? OUTDATA0 : OUTDATA1;
 
 	LOG_DBG("Loading buffer %p size %u to channel %u", buffer, size,
 			channel);
 	return dma_reload(dmic_private.dma_dev, channel,
-			PDM_BASE + source, (u32_t)buffer, size);
+			PDM_BASE + source, (uint32_t)buffer, size);
 }
 
-int dmic_start_dma(u32_t channel)
+int dmic_start_dma(uint32_t channel)
 {
 	LOG_DBG("Starting DMA channel %u", channel);
 	return dma_start(dmic_private.dma_dev, channel);
 }
 
-int dmic_stop_dma(u32_t channel)
+int dmic_stop_dma(uint32_t channel)
 {
 	LOG_DBG("Stopping DMA channel %u", channel);
 	return dma_stop(dmic_private.dma_dev, channel);
diff --git a/drivers/audio/intel_dmic.h b/drivers/audio/intel_dmic.h
index d9552798b8..04f22a09b6 100644
--- a/drivers/audio/intel_dmic.h
+++ b/drivers/audio/intel_dmic.h
@@ -229,9 +229,9 @@
 #define DMA_HANDSHAKE_DMIC_RXA			0
 #define DMA_HANDSHAKE_DMIC_RXB			1
 
-int dmic_configure_dma(struct pcm_stream_cfg *config, u8_t num_streams);
-int dmic_reload_dma(u32_t channel, void *buffer, size_t size);
-int dmic_start_dma(u32_t channel);
-int dmic_stop_dma(u32_t channel);
+int dmic_configure_dma(struct pcm_stream_cfg *config, uint8_t num_streams);
+int dmic_reload_dma(uint32_t channel, void *buffer, size_t size);
+int dmic_start_dma(uint32_t channel);
+int dmic_stop_dma(uint32_t channel);
 
 #endif /* __INTEL_DMIC_H__ */
diff --git a/drivers/audio/mpxxdtyy-i2s.c b/drivers/audio/mpxxdtyy-i2s.c
index 1626e98be3..04265698b0 100644
--- a/drivers/audio/mpxxdtyy-i2s.c
+++ b/drivers/audio/mpxxdtyy-i2s.c
@@ -20,8 +20,8 @@ LOG_MODULE_DECLARE(mpxxdtyy);
 
 K_MEM_SLAB_DEFINE(rx_pdm_i2s_mslab, PDM_BLOCK_MAX_SIZE_BYTES, NUM_RX_BLOCKS, 1);
 
-int mpxxdtyy_i2s_read(struct device *dev, u8_t stream, void **buffer,
-		      size_t *size, s32_t timeout)
+int mpxxdtyy_i2s_read(struct device *dev, uint8_t stream, void **buffer,
+		      size_t *size, int32_t timeout)
 {
 	int ret;
 	struct mpxxdtyy_data *const data = DEV_DATA(dev);
@@ -93,9 +93,9 @@ int mpxxdtyy_i2s_configure(struct device *dev, struct dmic_cfg *cfg)
 {
 	int ret;
 	struct mpxxdtyy_data *const data = DEV_DATA(dev);
-	u8_t chan_size = cfg->streams->pcm_width;
-	u32_t audio_freq = cfg->streams->pcm_rate;
-	u16_t factor;
+	uint8_t chan_size = cfg->streams->pcm_width;
+	uint32_t audio_freq = cfg->streams->pcm_rate;
+	uint16_t factor;
 
 	/* PCM buffer size */
 	data->pcm_mem_slab = cfg->streams->mem_slab;
diff --git a/drivers/audio/mpxxdtyy.c b/drivers/audio/mpxxdtyy.c
index 3dd304d8a9..88d422926c 100644
--- a/drivers/audio/mpxxdtyy.c
+++ b/drivers/audio/mpxxdtyy.c
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(mpxxdtyy);
 
 #define CHANNEL_MASK	0x55
 
-static u8_t ch_demux[128] = {
+static uint8_t ch_demux[128] = {
   0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03,
   0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03,
   0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07,
@@ -33,29 +33,29 @@ static u8_t ch_demux[128] = {
   0x0c, 0x0d, 0x0c, 0x0d, 0x0e, 0x0f, 0x0e, 0x0f
 };
 
-static u8_t left_channel(u8_t a, u8_t b)
+static uint8_t left_channel(uint8_t a, uint8_t b)
 {
 	return ch_demux[a & CHANNEL_MASK] | (ch_demux[b & CHANNEL_MASK] << 4);
 }
 
-static u8_t right_channel(u8_t a, u8_t b)
+static uint8_t right_channel(uint8_t a, uint8_t b)
 {
 	a >>= 1;
 	b >>= 1;
 	return ch_demux[a & CHANNEL_MASK] | (ch_demux[b & CHANNEL_MASK] << 4);
 }
 
-u16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg)
+uint16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg)
 {
 	struct mpxxdtyy_data *const data = DEV_DATA(dev);
 	TPDMFilter_InitStruct *pdm_filter = &data->pdm_filter[0];
-	u16_t factor;
-	u32_t audio_freq = cfg->streams->pcm_rate;
+	uint16_t factor;
+	uint32_t audio_freq = cfg->streams->pcm_rate;
 	int i;
 
 	/* calculate oversampling factor based on pdm clock */
 	for (factor = 64U; factor <= 128U; factor += 64U) {
-		u32_t pdm_bit_clk = (audio_freq * factor *
+		uint32_t pdm_bit_clk = (audio_freq * factor *
 				     cfg->channel.req_num_chan);
 
 		if (pdm_bit_clk >= cfg->io.min_pdm_clk_freq &&
@@ -89,7 +89,7 @@ int sw_filter_lib_run(TPDMFilter_InitStruct *pdm_filter,
 		      size_t pdm_size, size_t pcm_size)
 {
 	int i;
-	u8_t a, b;
+	uint8_t a, b;
 
 	if (pdm_block == NULL || pcm_block == NULL || pdm_filter == NULL) {
 		return -EINVAL;
@@ -98,16 +98,16 @@ int sw_filter_lib_run(TPDMFilter_InitStruct *pdm_filter,
 	for (i = 0; i < pdm_size/2; i++) {
 		switch (pdm_filter[0].In_MicChannels) {
 		case 1: /* MONO */
-			((u16_t *)pdm_block)[i] = HTONS(((u16_t *)pdm_block)[i]);
+			((uint16_t *)pdm_block)[i] = HTONS(((uint16_t *)pdm_block)[i]);
 			break;
 
 		case 2: /* STEREO */
 			if (pdm_filter[0].In_MicChannels > 1) {
-				a = ((u8_t *)pdm_block)[2*i];
-				b = ((u8_t *)pdm_block)[2*i + 1];
+				a = ((uint8_t *)pdm_block)[2*i];
+				b = ((uint8_t *)pdm_block)[2*i + 1];
 
-				((u8_t *)pdm_block)[2*i] = left_channel(a, b);
-				((u8_t *)pdm_block)[2*i + 1] = right_channel(a, b);
+				((uint8_t *)pdm_block)[2*i] = left_channel(a, b);
+				((uint8_t *)pdm_block)[2*i + 1] = right_channel(a, b);
 			}
 			break;
 
@@ -119,16 +119,16 @@ int sw_filter_lib_run(TPDMFilter_InitStruct *pdm_filter,
 	switch (pdm_filter[0].Decimation) {
 	case 64:
 		for (i = 0; i < pdm_filter[0].In_MicChannels; i++) {
-			Open_PDM_Filter_64(&((u8_t *) pdm_block)[i],
-					   &((u16_t *) pcm_block)[i],
+			Open_PDM_Filter_64(&((uint8_t *) pdm_block)[i],
+					   &((uint16_t *) pcm_block)[i],
 					   pdm_filter->MaxVolume,
 					   &pdm_filter[i]);
 		}
 		break;
 	case 128:
 		for (i = 0; i < pdm_filter[0].In_MicChannels; i++) {
-			Open_PDM_Filter_128(&((u8_t *) pdm_block)[i],
-					    &((u16_t *) pcm_block)[i],
+			Open_PDM_Filter_128(&((uint8_t *) pdm_block)[i],
+					    &((uint16_t *) pcm_block)[i],
 					    pdm_filter->MaxVolume,
 					    &pdm_filter[i]);
 		}
diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h
index 81b3c8c158..31aefe064a 100644
--- a/drivers/audio/mpxxdtyy.h
+++ b/drivers/audio/mpxxdtyy.h
@@ -32,14 +32,14 @@ struct mpxxdtyy_data {
 	struct k_mem_slab	*pcm_mem_slab;
 };
 
-u16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg);
+uint16_t sw_filter_lib_init(struct device *dev, struct dmic_cfg *cfg);
 int sw_filter_lib_run(TPDMFilter_InitStruct *pdm_filter,
 		      void *pdm_block, void *pcm_block,
 		      size_t pdm_size, size_t pcm_size);
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s)
-int mpxxdtyy_i2s_read(struct device *dev, u8_t stream, void **buffer,
-		      size_t *size, s32_t timeout);
+int mpxxdtyy_i2s_read(struct device *dev, uint8_t stream, void **buffer,
+		      size_t *size, int32_t timeout);
 int mpxxdtyy_i2s_trigger(struct device *dev, enum dmic_trigger cmd);
 int mpxxdtyy_i2s_configure(struct device *dev, struct dmic_cfg *cfg);
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2s) */
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index 3d72e03a6d..adda40bc59 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -27,10 +27,10 @@ LOG_MODULE_REGISTER(tlv320dac310x);
 struct codec_driver_config {
 	struct device	*i2c_device;
 	const char	*i2c_dev_name;
-	u8_t		i2c_address;
+	uint8_t		i2c_address;
 	struct device	*gpio_device;
 	const char	*gpio_dev_name;
-	u32_t		gpio_pin;
+	uint32_t		gpio_pin;
 	int		gpio_flags;
 };
 
@@ -55,8 +55,8 @@ static struct codec_driver_data codec_device_data;
 #define DEV_DATA(dev) \
 	((struct codec_driver_data *const)(dev)->driver_data)
 
-static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val);
-static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val);
+static void codec_write_reg(struct device *dev, struct reg_addr reg, uint8_t val);
+static void codec_read_reg(struct device *dev, struct reg_addr reg, uint8_t *val);
 static void codec_soft_reset(struct device *dev);
 static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg);
 static int codec_configure_clocks(struct device *dev,
@@ -195,7 +195,7 @@ static int codec_apply_properties(struct device *dev)
 	return 0;
 }
 
-static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val)
+static void codec_write_reg(struct device *dev, struct reg_addr reg, uint8_t val)
 {
 	struct codec_driver_data *const dev_data = DEV_DATA(dev);
 	struct codec_driver_config *const dev_cfg = DEV_CFG(dev);
@@ -213,7 +213,7 @@ static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val)
 			reg.page, reg.reg_addr, val);
 }
 
-static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val)
+static void codec_read_reg(struct device *dev, struct reg_addr reg, uint8_t *val)
 {
 	struct codec_driver_data *const dev_data = DEV_DATA(dev);
 	struct codec_driver_config *const dev_cfg = DEV_CFG(dev);
@@ -239,7 +239,7 @@ static void codec_soft_reset(struct device *dev)
 
 static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg)
 {
-	u8_t val;
+	uint8_t val;
 
 	/* configure I2S interface */
 	val = IF_CTRL_IFTYPE(IF_CTRL_IFTYPE_I2S);
@@ -352,11 +352,11 @@ static int codec_configure_clocks(struct device *dev,
 
 	/* set NDAC, then MDAC, followed by OSR */
 	codec_write_reg(dev, NDAC_DIV_ADDR,
-			(u8_t)(NDAC_DIV(ndac) | NDAC_POWER_UP_MASK));
+			(uint8_t)(NDAC_DIV(ndac) | NDAC_POWER_UP_MASK));
 	codec_write_reg(dev, MDAC_DIV_ADDR,
-			(u8_t)(MDAC_DIV(mdac) | MDAC_POWER_UP_MASK));
-	codec_write_reg(dev, OSR_MSB_ADDR, (u8_t)((osr >> 8) & OSR_MSB_MASK));
-	codec_write_reg(dev, OSR_LSB_ADDR, (u8_t)(osr & OSR_LSB_MASK));
+			(uint8_t)(MDAC_DIV(mdac) | MDAC_POWER_UP_MASK));
+	codec_write_reg(dev, OSR_MSB_ADDR, (uint8_t)((osr >> 8) & OSR_MSB_MASK));
+	codec_write_reg(dev, OSR_LSB_ADDR, (uint8_t)(osr & OSR_LSB_MASK));
 
 	if (i2s->options & I2S_OPT_BIT_CLK_MASTER) {
 		codec_write_reg(dev, BCLK_DIV_ADDR,
@@ -415,7 +415,7 @@ static enum osr_multiple codec_get_osr_multiple(audio_dai_cfg_t *cfg)
 
 static void codec_configure_output(struct device *dev)
 {
-	u8_t val;
+	uint8_t val;
 
 	/*
 	 * set common mode voltage to 1.65V (half of AVDD)
@@ -455,16 +455,16 @@ static void codec_configure_output(struct device *dev)
 
 static int codec_set_output_volume(struct device *dev, int vol)
 {
-	u8_t vol_val;
+	uint8_t vol_val;
 	int vol_index;
-	u8_t vol_array[] = {
+	uint8_t vol_array[] = {
 		107, 108, 110, 113, 116, 120, 125, 128, 132, 138, 144
 	};
 
 	if ((vol > CODEC_OUTPUT_VOLUME_MAX) ||
 			(vol < CODEC_OUTPUT_VOLUME_MIN)) {
 		LOG_ERR("Invalid volume %d.%d dB",
-				vol >> 1, ((u32_t)vol & 1) ? 5 : 0);
+				vol >> 1, ((uint32_t)vol & 1) ? 5 : 0);
 		return -EINVAL;
 	}
 
@@ -483,7 +483,7 @@ static int codec_set_output_volume(struct device *dev, int vol)
 		}
 		vol_val = HPX_ANA_VOL_LOW_THRESH + vol_index + 1;
 	} else {
-		vol_val = (u8_t)vol;
+		vol_val = (uint8_t)vol;
 	}
 
 	codec_write_reg(dev, HPL_ANA_VOL_CTRL_ADDR, HPX_ANA_VOL(vol_val));
@@ -494,7 +494,7 @@ static int codec_set_output_volume(struct device *dev, int vol)
 #if (LOG_LEVEL >= LOG_LEVEL_DEBUG)
 static void codec_read_all_regs(struct device *dev)
 {
-	u8_t val;
+	uint8_t val;
 
 	codec_read_reg(dev, SOFT_RESET_ADDR, &val);
 	codec_read_reg(dev, NDAC_DIV_ADDR, &val);
diff --git a/drivers/audio/tlv320dac310x.h b/drivers/audio/tlv320dac310x.h
index 4453b6ac09..19089a6285 100644
--- a/drivers/audio/tlv320dac310x.h
+++ b/drivers/audio/tlv320dac310x.h
@@ -127,8 +127,8 @@ extern "C" {
 #define TIMER_MCLK_DIV_VAL(val)	((val) & TIMER_MCLK_DIV_MASK)
 
 struct reg_addr {
-	u8_t page; 		/* page number */
-	u8_t reg_addr; 		/* register address */
+	uint8_t page; 		/* page number */
+	uint8_t reg_addr; 		/* register address */
 };
 
 enum proc_block {
diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
index 754c88dded..3919a9adfd 100644
--- a/drivers/bluetooth/hci/h4.c
+++ b/drivers/bluetooth/hci/h4.c
@@ -41,26 +41,26 @@ static struct {
 	struct net_buf *buf;
 	struct k_fifo   fifo;
 
-	u16_t    remaining;
-	u16_t    discard;
+	uint16_t    remaining;
+	uint16_t    discard;
 
 	bool     have_hdr;
 	bool     discardable;
 
-	u8_t     hdr_len;
+	uint8_t     hdr_len;
 
-	u8_t     type;
+	uint8_t     type;
 	union {
 		struct bt_hci_evt_hdr evt;
 		struct bt_hci_acl_hdr acl;
-		u8_t hdr[4];
+		uint8_t hdr[4];
 	};
 } rx = {
 	.fifo = Z_FIFO_INITIALIZER(rx.fifo),
 };
 
 static struct {
-	u8_t type;
+	uint8_t type;
 	struct net_buf *buf;
 	struct k_fifo   fifo;
 } tx = {
@@ -98,7 +98,7 @@ static inline void get_acl_hdr(void)
 	struct bt_hci_acl_hdr *hdr = &rx.acl;
 	int to_read = sizeof(*hdr) - rx.remaining;
 
-	rx.remaining -= uart_fifo_read(h4_dev, (u8_t *)hdr + to_read,
+	rx.remaining -= uart_fifo_read(h4_dev, (uint8_t *)hdr + to_read,
 				       rx.remaining);
 	if (!rx.remaining) {
 		rx.remaining = sys_le16_to_cpu(hdr->len);
@@ -112,7 +112,7 @@ static inline void get_evt_hdr(void)
 	struct bt_hci_evt_hdr *hdr = &rx.evt;
 	int to_read = rx.hdr_len - rx.remaining;
 
-	rx.remaining -= uart_fifo_read(h4_dev, (u8_t *)hdr + to_read,
+	rx.remaining -= uart_fifo_read(h4_dev, (uint8_t *)hdr + to_read,
 				       rx.remaining);
 	if (rx.hdr_len == sizeof(*hdr) && rx.remaining < sizeof(*hdr)) {
 		switch (rx.evt.evt) {
@@ -221,7 +221,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 
 static size_t h4_discard(struct device *uart, size_t len)
 {
-	u8_t buf[33];
+	uint8_t buf[33];
 
 	return uart_fifo_read(uart, buf, MIN(len, sizeof(buf)));
 }
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
index 6b71be25d6..77a000cf6a 100644
--- a/drivers/bluetooth/hci/h5.c
+++ b/drivers/bluetooth/hci/h5.c
@@ -46,7 +46,7 @@ static struct k_delayed_work retx_work;
 #define HCI_3WIRE_LINK_PKT	0x0f
 #define HCI_VENDOR_PKT		0xff
 
-static bool reliable_packet(u8_t type)
+static bool reliable_packet(uint8_t type)
 {
 	switch (type) {
 	case HCI_COMMAND_PKT:
@@ -91,11 +91,11 @@ static struct h5 {
 	struct k_fifo		rx_queue;
 	struct k_fifo		unack_queue;
 
-	u8_t			tx_win;
-	u8_t			tx_ack;
-	u8_t			tx_seq;
+	uint8_t			tx_win;
+	uint8_t			tx_ack;
+	uint8_t			tx_seq;
 
-	u8_t			rx_ack;
+	uint8_t			rx_ack;
 
 	enum {
 		UNINIT,
@@ -111,13 +111,13 @@ static struct h5 {
 	}			rx_state;
 } h5;
 
-static u8_t unack_queue_len;
+static uint8_t unack_queue_len;
 
-static const u8_t sync_req[] = { 0x01, 0x7e };
-static const u8_t sync_rsp[] = { 0x02, 0x7d };
+static const uint8_t sync_req[] = { 0x01, 0x7e };
+static const uint8_t sync_rsp[] = { 0x02, 0x7d };
 /* Third byte may change */
-static u8_t conf_req[3] = { 0x03, 0xfc };
-static const u8_t conf_rsp[] = { 0x04, 0x7b };
+static uint8_t conf_req[3] = { 0x03, 0xfc };
+static const uint8_t conf_rsp[] = { 0x04, 0x7b };
 
 /* H5 signal buffers pool */
 #define MAX_SIG_LEN	3
@@ -137,7 +137,7 @@ static void h5_reset_rx(void)
 	h5.rx_state = START;
 }
 
-static int h5_unslip_byte(u8_t *byte)
+static int h5_unslip_byte(uint8_t *byte)
 {
 	int count;
 
@@ -166,8 +166,8 @@ static int h5_unslip_byte(u8_t *byte)
 
 static void process_unack(void)
 {
-	u8_t next_seq = h5.tx_seq;
-	u8_t number_removed = unack_queue_len;
+	uint8_t next_seq = h5.tx_seq;
+	uint8_t number_removed = unack_queue_len;
 
 	if (!unack_queue_len) {
 		return;
@@ -213,7 +213,7 @@ static void process_unack(void)
 	}
 }
 
-static void h5_print_header(const u8_t *hdr, const char *str)
+static void h5_print_header(const uint8_t *hdr, const char *str)
 {
 	if (H5_HDR_RELIABLE(hdr)) {
 		BT_DBG("%s REL: seq %u ack %u crc %u type %u len %u",
@@ -228,7 +228,7 @@ static void h5_print_header(const u8_t *hdr, const char *str)
 }
 
 #if defined(CONFIG_BT_DEBUG_HCI_DRIVER)
-static void hexdump(const char *str, const u8_t *packet, size_t length)
+static void hexdump(const char *str, const uint8_t *packet, size_t length)
 {
 	int n = 0;
 
@@ -262,7 +262,7 @@ static void hexdump(const char *str, const u8_t *packet, size_t length)
 #define hexdump(str, packet, length)
 #endif
 
-static u8_t h5_slip_byte(u8_t byte)
+static uint8_t h5_slip_byte(uint8_t byte)
 {
 	switch (byte) {
 	case SLIP_DELIMITER:
@@ -279,9 +279,9 @@ static u8_t h5_slip_byte(u8_t byte)
 	}
 }
 
-static void h5_send(const u8_t *payload, u8_t type, int len)
+static void h5_send(const uint8_t *payload, uint8_t type, int len)
 {
-	u8_t hdr[4];
+	uint8_t hdr[4];
 	int i;
 
 	hexdump("<= ", payload, len);
@@ -340,7 +340,7 @@ static void retx_timeout(struct k_work *work)
 		/* Queue unack packets to the beginning of the queue */
 		while ((buf = net_buf_get(&h5.unack_queue, K_NO_WAIT))) {
 			/* include also packet type */
-			net_buf_push(buf, sizeof(u8_t));
+			net_buf_push(buf, sizeof(uint8_t));
 			net_buf_put(&h5.tx_queue, buf);
 			h5.tx_seq = (h5.tx_seq - 1) & 0x07;
 			unack_queue_len--;
@@ -362,7 +362,7 @@ static void ack_timeout(struct k_work *work)
 	h5_send(NULL, HCI_3WIRE_ACK_PKT, 0);
 }
 
-static void h5_process_complete_packet(u8_t *hdr)
+static void h5_process_complete_packet(uint8_t *hdr)
 {
 	struct net_buf *buf;
 
@@ -406,7 +406,7 @@ static void h5_process_complete_packet(u8_t *hdr)
 	}
 }
 
-static inline struct net_buf *get_evt_buf(u8_t evt)
+static inline struct net_buf *get_evt_buf(uint8_t evt)
 {
 	return bt_buf_get_evt(evt, false, K_NO_WAIT);
 }
@@ -414,9 +414,9 @@ static inline struct net_buf *get_evt_buf(u8_t evt)
 static void bt_uart_isr(struct device *unused)
 {
 	static int remaining;
-	u8_t byte;
+	uint8_t byte;
 	int ret;
-	static u8_t hdr[4];
+	static uint8_t hdr[4];
 
 	ARG_UNUSED(unused);
 
@@ -560,14 +560,14 @@ static void bt_uart_isr(struct device *unused)
 	}
 }
 
-static u8_t h5_get_type(struct net_buf *buf)
+static uint8_t h5_get_type(struct net_buf *buf)
 {
 	return net_buf_pull_u8(buf);
 }
 
 static int h5_queue(struct net_buf *buf)
 {
-	u8_t type;
+	uint8_t type;
 
 	BT_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf), buf->len);
 
@@ -599,7 +599,7 @@ static void tx_thread(void)
 
 	while (true) {
 		struct net_buf *buf;
-		u8_t type;
+		uint8_t type;
 
 		BT_DBG("link_state %u", h5.link_state);
 
@@ -631,7 +631,7 @@ static void tx_thread(void)
 	}
 }
 
-static void h5_set_txwin(u8_t *conf)
+static void h5_set_txwin(uint8_t *conf)
 {
 	conf[2] = h5.tx_win & 0x07;
 }
diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c
index 6ae94823ee..680e27fdbc 100644
--- a/drivers/bluetooth/hci/ipm_stm32wb.c
+++ b/drivers/bluetooth/hci/ipm_stm32wb.c
@@ -23,13 +23,13 @@
 
 /* Private variables ---------------------------------------------------------*/
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer;
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static u8_t EvtPool[POOL_SIZE];
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE];
 PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer;
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static u8_t
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
 	SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255];
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static u8_t
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
 	BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255];
-PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static u8_t
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
 	HciAclDataBuffer[sizeof(TL_PacketHeader_t) + 5 + 251];
 
 static void syscmd_status_not(SHCI_TL_CmdStatus_t status);
@@ -50,14 +50,14 @@ static K_SEM_DEFINE(acl_data_ack, 1, 1);
 static K_SEM_DEFINE(ipm_busy, 1, 1);
 
 struct aci_set_tx_power {
-	u8_t cmd;
-	u8_t value[2];
+	uint8_t cmd;
+	uint8_t value[2];
 };
 
 struct aci_set_ble_addr {
-	u8_t config_offset;
-	u8_t length;
-	u8_t value[6];
+	uint8_t config_offset;
+	uint8_t length;
+	uint8_t value[6];
 } __packed;
 
 #define ACI_WRITE_SET_TX_POWER_LEVEL       BT_OP(BT_OGF_VS, 0xFC0F)
@@ -133,7 +133,7 @@ static void tryfix_event(TL_Evt_t *tev)
 	}
 
 	struct bt_hci_evt_le_enh_conn_complete *evt =
-			(void *)((u8_t *)mev + (sizeof(*mev)));
+			(void *)((uint8_t *)mev + (sizeof(*mev)));
 
 	if (!bt_addr_cmp(&evt->peer_addr.a, BT_ADDR_NONE)) {
 		BT_WARN("Invalid peer addr %s", bt_addr_le_str(&evt->peer_addr));
@@ -187,7 +187,7 @@ static void bt_ipm_rx_thread(void)
 			BT_DBG("ACL: handle %x, len %x",
 			       acl_hdr.handle, acl_hdr.len);
 			net_buf_add_mem(buf, &acl_hdr, sizeof(acl_hdr));
-			net_buf_add_mem(buf, (u8_t *)&acl->acl_data,
+			net_buf_add_mem(buf, (uint8_t *)&acl->acl_data,
 					acl_hdr.len);
 			break;
 		default:
@@ -289,7 +289,7 @@ void transport_init(void)
 	TL_Init();
 
 	/**< System channel initialization */
-	shci_init_config.p_cmdbuffer = (u8_t *)&SystemCmdBuffer;
+	shci_init_config.p_cmdbuffer = (uint8_t *)&SystemCmdBuffer;
 	shci_init_config.StatusNotCallBack = syscmd_status_not;
 	shci_init(sysevt_received, (void *) &shci_init_config);
 
@@ -301,7 +301,7 @@ void transport_init(void)
 	TL_MM_Init(&tl_mm_config);
 
 	/**< BLE channel initialization */
-	tl_ble_config.p_cmdbuffer = (u8_t *)&BleCmdBuffer;
+	tl_ble_config.p_cmdbuffer = (uint8_t *)&BleCmdBuffer;
 	tl_ble_config.p_AclDataBuffer = HciAclDataBuffer;
 	tl_ble_config.IoBusEvtCallBack = TM_EvtReceivedCb;
 	tl_ble_config.IoBusAclDataTxAck = TM_AclDataAck;
@@ -392,9 +392,9 @@ static void start_ble_rf(void)
 bt_addr_t *bt_get_ble_addr(void)
 {
 	bt_addr_t *bd_addr;
-	u32_t udn;
-	u32_t company_id;
-	u32_t device_id;
+	uint32_t udn;
+	uint32_t company_id;
+	uint32_t device_id;
 
 	/* Get the 64 bit Unique Device Number UID */
 	/* The UID is used by firmware to derive   */
diff --git a/drivers/bluetooth/hci/rpmsg.c b/drivers/bluetooth/hci/rpmsg.c
index 7158f57e80..c0ffce865c 100644
--- a/drivers/bluetooth/hci/rpmsg.c
+++ b/drivers/bluetooth/hci/rpmsg.c
@@ -23,9 +23,9 @@
 int bt_rpmsg_platform_init(void);
 int bt_rpmsg_platform_send(struct net_buf *buf);
 
-static bool is_hci_event_discardable(const u8_t *evt_data)
+static bool is_hci_event_discardable(const uint8_t *evt_data)
 {
-	u8_t evt_type = evt_data[0];
+	uint8_t evt_type = evt_data[0];
 
 	switch (evt_type) {
 #if defined(CONFIG_BT_BREDR)
@@ -34,7 +34,7 @@ static bool is_hci_event_discardable(const u8_t *evt_data)
 		return true;
 #endif
 	case BT_HCI_EVT_LE_META_EVENT: {
-		u8_t subevt_type = evt_data[sizeof(struct bt_hci_evt_hdr)];
+		uint8_t subevt_type = evt_data[sizeof(struct bt_hci_evt_hdr)];
 
 		switch (subevt_type) {
 		case BT_HCI_EVT_LE_ADVERTISING_REPORT:
@@ -48,7 +48,7 @@ static bool is_hci_event_discardable(const u8_t *evt_data)
 	}
 }
 
-static struct net_buf *bt_rpmsg_evt_recv(u8_t *data, size_t remaining,
+static struct net_buf *bt_rpmsg_evt_recv(uint8_t *data, size_t remaining,
 					 bool *prio)
 {
 	bool discardable;
@@ -90,7 +90,7 @@ static struct net_buf *bt_rpmsg_evt_recv(u8_t *data, size_t remaining,
 	return buf;
 }
 
-static struct net_buf *bt_rpmsg_acl_recv(u8_t *data, size_t remaining)
+static struct net_buf *bt_rpmsg_acl_recv(uint8_t *data, size_t remaining)
 {
 	struct bt_hci_acl_hdr hdr;
 	struct net_buf *buf;
@@ -124,9 +124,9 @@ static struct net_buf *bt_rpmsg_acl_recv(u8_t *data, size_t remaining)
 	return buf;
 }
 
-void bt_rpmsg_rx(u8_t *data, size_t len)
+void bt_rpmsg_rx(uint8_t *data, size_t len)
 {
-	u8_t pkt_indicator;
+	uint8_t pkt_indicator;
 	bool prio = false;
 	struct net_buf *buf = NULL;
 	size_t remaining = len;
@@ -165,7 +165,7 @@ void bt_rpmsg_rx(u8_t *data, size_t len)
 static int bt_rpmsg_send(struct net_buf *buf)
 {
 	int err;
-	u8_t pkt_indicator;
+	uint8_t pkt_indicator;
 
 	BT_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf), buf->len);
 
diff --git a/drivers/bluetooth/hci/rpmsg_nrf53.c b/drivers/bluetooth/hci/rpmsg_nrf53.c
index 6a5d497981..b02390679d 100644
--- a/drivers/bluetooth/hci/rpmsg_nrf53.c
+++ b/drivers/bluetooth/hci/rpmsg_nrf53.c
@@ -15,7 +15,7 @@
 #define LOG_MODULE_NAME bt_hci_driver_nrf53
 #include "common/log.h"
 
-void bt_rpmsg_rx(u8_t *data, size_t len);
+void bt_rpmsg_rx(uint8_t *data, size_t len);
 
 static K_SEM_DEFINE(ready_sem, 0, 1);
 static K_SEM_DEFINE(rx_sem, 0, 1);
@@ -84,12 +84,12 @@ static void virtio_set_status(struct virtio_device *vdev, unsigned char status)
 	sys_write8(status, VDEV_STATUS_ADDR);
 }
 
-static u32_t virtio_get_features(struct virtio_device *vdev)
+static uint32_t virtio_get_features(struct virtio_device *vdev)
 {
 	return BIT(VIRTIO_RPMSG_F_NS);
 }
 
-static void virtio_set_features(struct virtio_device *vdev, u32_t features)
+static void virtio_set_features(struct virtio_device *vdev, uint32_t features)
 {
 	/* No need for implementation */
 }
@@ -112,14 +112,14 @@ const struct virtio_dispatch dispatch = {
 	.notify = virtio_notify,
 };
 
-static void ipm_callback(void *context, u32_t id, volatile void *data)
+static void ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	BT_DBG("Got callback of id %u", id);
 	k_sem_give(&rx_sem);
 }
 
 static int endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len,
-	u32_t src, void *priv)
+	uint32_t src, void *priv)
 {
 	BT_DBG("Received message of %u bytes.", len);
 	BT_HEXDUMP_DBG((uint8_t *)data, len, "Data:");
@@ -134,7 +134,7 @@ static void rpmsg_service_unbind(struct rpmsg_endpoint *ep)
 	rpmsg_destroy_ept(ep);
 }
 
-static void ns_bind_cb(struct rpmsg_device *rdev, const char *name, u32_t dest)
+static void ns_bind_cb(struct rpmsg_device *rdev, const char *name, uint32_t dest)
 {
 	(void)rpmsg_create_ept(&ep,
 				rdev,
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index 600961462b..156e3da3b1 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -65,8 +65,8 @@
  */
 #define SPI_MAX_MSG_LEN		255 /* As defined by X-NUCLEO-IDB04A1 BSP */
 
-static u8_t rxmsg[SPI_MAX_MSG_LEN];
-static u8_t txmsg[SPI_MAX_MSG_LEN];
+static uint8_t rxmsg[SPI_MAX_MSG_LEN];
+static uint8_t txmsg[SPI_MAX_MSG_LEN];
 
 static struct device		*irq_dev;
 static struct device		*rst_dev;
@@ -82,10 +82,10 @@ static struct k_thread spi_rx_thread_data;
 
 #if defined(CONFIG_BT_DEBUG_HCI_DRIVER)
 #include <sys/printk.h>
-static inline void spi_dump_message(const u8_t *pre, u8_t *buf,
-				    u8_t size)
+static inline void spi_dump_message(const uint8_t *pre, uint8_t *buf,
+				    uint8_t size)
 {
-	u8_t i, c;
+	uint8_t i, c;
 
 	printk("%s (%d): ", pre, size);
 	for (i = 0U; i < size; i++) {
@@ -101,7 +101,7 @@ static inline void spi_dump_message(const u8_t *pre, u8_t *buf,
 }
 #else
 static inline
-void spi_dump_message(const u8_t *pre, u8_t *buf, u8_t size) {}
+void spi_dump_message(const uint8_t *pre, uint8_t *buf, uint8_t size) {}
 #endif
 
 #if defined(CONFIG_BT_SPI_BLUENRG)
@@ -110,7 +110,7 @@ static struct device *cs_dev;
 /* It can be required to be increased for */
 /* some particular cases. */
 #define IRQ_HIGH_MAX_READ 3
-static u8_t attempts;
+static uint8_t attempts;
 #endif /* CONFIG_BT_SPI_BLUENRG */
 
 #if defined(CONFIG_BT_BLUENRG_ACI)
@@ -119,9 +119,9 @@ static u8_t attempts;
 #define BLUENRG_ACI_LL_MODE                 0x01
 
 struct bluenrg_aci_cmd_ll_param {
-    u8_t cmd;
-    u8_t length;
-    u8_t value;
+    uint8_t cmd;
+    uint8_t length;
+    uint8_t value;
 };
 static int bt_spi_send_aci_config_data_controller_mode(void);
 #endif /* CONFIG_BT_BLUENRG_ACI */
@@ -146,8 +146,8 @@ static const struct spi_buf_set spi_rx = {
 	.count = 1
 };
 
-static inline int bt_spi_transceive(void *tx, u32_t tx_len,
-				    void *rx, u32_t rx_len)
+static inline int bt_spi_transceive(void *tx, uint32_t tx_len,
+				    void *rx, uint32_t rx_len)
 {
 	spi_tx_buf.buf = tx;
 	spi_tx_buf.len = (size_t)tx_len;
@@ -156,25 +156,25 @@ static inline int bt_spi_transceive(void *tx, u32_t tx_len,
 	return spi_transceive(spi_dev, &spi_conf, &spi_tx, &spi_rx);
 }
 
-static inline u16_t bt_spi_get_cmd(u8_t *txmsg)
+static inline uint16_t bt_spi_get_cmd(uint8_t *txmsg)
 {
 	return (txmsg[CMD_OCF] << 8) | txmsg[CMD_OGF];
 }
 
-static inline u16_t bt_spi_get_evt(u8_t *rxmsg)
+static inline uint16_t bt_spi_get_evt(uint8_t *rxmsg)
 {
 	return (rxmsg[EVT_VENDOR_CODE_MSB] << 8) | rxmsg[EVT_VENDOR_CODE_LSB];
 }
 
 static void bt_spi_isr(struct device *unused1, struct gpio_callback *unused2,
-		       u32_t unused3)
+		       uint32_t unused3)
 {
 	BT_DBG("");
 
 	k_sem_give(&sem_request);
 }
 
-static void bt_spi_handle_vendor_evt(u8_t *rxmsg)
+static void bt_spi_handle_vendor_evt(uint8_t *rxmsg)
 {
 	switch (bt_spi_get_evt(rxmsg)) {
 	case EVT_BLUE_INITIALIZED:
@@ -306,10 +306,10 @@ static int bt_spi_send_aci_config_data_controller_mode(void)
 static void bt_spi_rx_thread(void)
 {
 	struct net_buf *buf;
-	u8_t header_master[5] = { SPI_READ, 0x00, 0x00, 0x00, 0x00 };
-	u8_t header_slave[5];
+	uint8_t header_master[5] = { SPI_READ, 0x00, 0x00, 0x00, 0x00 };
+	uint8_t header_slave[5];
 	struct bt_hci_acl_hdr acl_hdr;
-	u8_t size = 0U;
+	uint8_t size = 0U;
 	int ret;
 
 	(void)memset(&txmsg, 0xFF, SPI_MAX_MSG_LEN);
@@ -399,7 +399,7 @@ static void bt_spi_rx_thread(void)
 
 static int bt_spi_send(struct net_buf *buf)
 {
-	u8_t header[5] = { SPI_WRITE, 0x00,  0x00,  0x00,  0x00 };
+	uint8_t header[5] = { SPI_WRITE, 0x00,  0x00,  0x00,  0x00 };
 	int pending;
 	int ret;
 
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
index 3b34c2fc54..657a726a62 100644
--- a/drivers/bluetooth/hci/userchan.c
+++ b/drivers/bluetooth/hci/userchan.c
@@ -55,7 +55,7 @@ static int uc_fd = -1;
 
 static int bt_dev_index = -1;
 
-static struct net_buf *get_rx(const u8_t *buf)
+static struct net_buf *get_rx(const uint8_t *buf)
 {
 	if (buf[0] == H4_EVT) {
 		return bt_buf_get_evt(buf[1], false, K_FOREVER);
@@ -80,7 +80,7 @@ static void rx_thread(void *p1, void *p2, void *p3)
 	BT_DBG("started");
 
 	while (1) {
-		static u8_t frame[512];
+		static uint8_t frame[512];
 		struct net_buf *buf;
 		ssize_t len;
 
@@ -148,7 +148,7 @@ static int uc_send(struct net_buf *buf)
 	return 0;
 }
 
-static int user_chan_open(u16_t index)
+static int user_chan_open(uint16_t index)
 {
 	struct sockaddr_hci addr;
 	int fd;
diff --git a/drivers/bluetooth/util.h b/drivers/bluetooth/util.h
index 503800c0a9..74bd38dd94 100644
--- a/drivers/bluetooth/util.h
+++ b/drivers/bluetooth/util.h
@@ -8,7 +8,7 @@
 
 static inline void bt_uart_drain(struct device *dev)
 {
-	u8_t c;
+	uint8_t c;
 
 	while (uart_fifo_read(dev, &c, 1)) {
 		continue;
diff --git a/drivers/can/can_common.c b/drivers/can/can_common.c
index eb49b4169e..0e9746d650 100644
--- a/drivers/can/can_common.c
+++ b/drivers/can/can_common.c
@@ -56,7 +56,7 @@ static inline void can_work_buffer_init(struct can_frame_buffer *buffer)
 static inline int can_work_buffer_put(struct zcan_frame *frame,
 				      struct can_frame_buffer *buffer)
 {
-	u16_t next_head = WORK_BUF_MOD_SIZE(buffer->head + 1);
+	uint16_t next_head = WORK_BUF_MOD_SIZE(buffer->head + 1);
 
 	if (buffer->head == WORK_BUF_FULL) {
 		return -1;
@@ -87,7 +87,7 @@ struct zcan_frame *can_work_buffer_get_next(struct can_frame_buffer *buffer)
 
 static inline void can_work_buffer_free_next(struct can_frame_buffer *buffer)
 {
-	u16_t next_tail = WORK_BUF_MOD_SIZE(buffer->tail + 1);
+	uint16_t next_tail = WORK_BUF_MOD_SIZE(buffer->tail + 1);
 
 	if (buffer->head == buffer->tail) {
 		return;
diff --git a/drivers/can/can_handlers.c b/drivers/can/can_handlers.c
index 6b2fee13de..2fbe95075a 100644
--- a/drivers/can/can_handlers.c
+++ b/drivers/can/can_handlers.c
@@ -8,13 +8,13 @@
 #include <drivers/can.h>
 
 static inline int z_vrfy_can_configure(struct device *dev, enum can_mode mode,
-				       u32_t bitrate)
+				       uint32_t bitrate)
 {
 
 	Z_OOPS(Z_SYSCALL_DRIVER_CAN(dev, configure));
 
 	return z_impl_can_configure((struct device *)dev, (enum can_mode)mode,
-				   (u32_t)bitrate);
+				   (uint32_t)bitrate);
 }
 #include <syscalls/can_configure_mrsh.c>
 
diff --git a/drivers/can/can_loopback.c b/drivers/can/can_loopback.c
index 03675f19d9..a93ffc242d 100644
--- a/drivers/can/can_loopback.c
+++ b/drivers/can/can_loopback.c
@@ -46,7 +46,7 @@ static void dispatch_frame(const struct zcan_frame *frame,
 static inline int check_filter_match(const struct zcan_frame *frame,
 				     const struct zcan_filter *filter)
 {
-	u32_t id, mask, frame_id;
+	uint32_t id, mask, frame_id;
 
 	frame_id = frame->id_type == CAN_STANDARD_IDENTIFIER ?
 			frame->std_id : frame->ext_id;
@@ -193,7 +193,7 @@ void can_loopback_detach(struct device *dev, int filter_id)
 }
 
 int can_loopback_configure(struct device *dev, enum can_mode mode,
-				u32_t bitrate)
+				uint32_t bitrate)
 {
 	struct can_loopback_data *data = DEV_DATA(dev);
 
diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c
index 2cd5074e93..fb97e15481 100644
--- a/drivers/can/can_mcp2515.c
+++ b/drivers/can/can_mcp2515.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(mcp2515_can);
 
 static int mcp2515_cmd_soft_reset(struct device *dev)
 {
-	u8_t cmd_buf[] = { MCP2515_OPCODE_RESET };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_RESET };
 
 	const struct spi_buf tx_buf = {
 		.buf = cmd_buf, .len = sizeof(cmd_buf),
@@ -31,10 +31,10 @@ static int mcp2515_cmd_soft_reset(struct device *dev)
 	return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx);
 }
 
-static int mcp2515_cmd_bit_modify(struct device *dev, u8_t reg_addr, u8_t mask,
-				  u8_t data)
+static int mcp2515_cmd_bit_modify(struct device *dev, uint8_t reg_addr, uint8_t mask,
+				  uint8_t data)
 {
-	u8_t cmd_buf[] = { MCP2515_OPCODE_BIT_MODIFY, reg_addr, mask, data };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_BIT_MODIFY, reg_addr, mask, data };
 
 	const struct spi_buf tx_buf = {
 		.buf = cmd_buf, .len = sizeof(cmd_buf),
@@ -46,10 +46,10 @@ static int mcp2515_cmd_bit_modify(struct device *dev, u8_t reg_addr, u8_t mask,
 	return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx);
 }
 
-static int mcp2515_cmd_write_reg(struct device *dev, u8_t reg_addr,
-				 u8_t *buf_data, u8_t buf_len)
+static int mcp2515_cmd_write_reg(struct device *dev, uint8_t reg_addr,
+				 uint8_t *buf_data, uint8_t buf_len)
 {
-	u8_t cmd_buf[] = { MCP2515_OPCODE_WRITE, reg_addr };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_WRITE, reg_addr };
 
 	struct spi_buf tx_buf[] = {
 		{ .buf = cmd_buf, .len = sizeof(cmd_buf) },
@@ -76,12 +76,12 @@ static int mcp2515_cmd_write_reg(struct device *dev, u8_t reg_addr,
  *   4: TX Buffer 2, Start at TXB2SIDH (0x51)
  *   5: TX Buffer 2, Start at TXB2D0 (0x56)
  */
-static int mcp2515_cmd_load_tx_buffer(struct device *dev, u8_t abc,
-				 u8_t *buf_data, u8_t buf_len)
+static int mcp2515_cmd_load_tx_buffer(struct device *dev, uint8_t abc,
+				 uint8_t *buf_data, uint8_t buf_len)
 {
 	__ASSERT(abc <= 5, "abc <= 5");
 
-	u8_t cmd_buf[] = { MCP2515_OPCODE_LOAD_TX_BUFFER | abc };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_LOAD_TX_BUFFER | abc };
 
 	struct spi_buf tx_buf[] = {
 		{ .buf = cmd_buf, .len = sizeof(cmd_buf) },
@@ -101,11 +101,11 @@ static int mcp2515_cmd_load_tx_buffer(struct device *dev, u8_t abc,
  * opcode that respectively initiate transmission for buffers TXB0, TXB1 and
  * TXB2.
  */
-static int mcp2515_cmd_rts(struct device *dev, u8_t nnn)
+static int mcp2515_cmd_rts(struct device *dev, uint8_t nnn)
 {
 	__ASSERT(nnn < BIT(MCP2515_TX_CNT), "nnn < BIT(MCP2515_TX_CNT)");
 
-	u8_t cmd_buf[] = { MCP2515_OPCODE_RTS | nnn };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_RTS | nnn };
 
 	struct spi_buf tx_buf[] = {
 		{ .buf = cmd_buf, .len = sizeof(cmd_buf) }
@@ -117,10 +117,10 @@ static int mcp2515_cmd_rts(struct device *dev, u8_t nnn)
 	return spi_write(DEV_DATA(dev)->spi, &DEV_DATA(dev)->spi_cfg, &tx);
 }
 
-static int mcp2515_cmd_read_reg(struct device *dev, u8_t reg_addr,
-				u8_t *buf_data, u8_t buf_len)
+static int mcp2515_cmd_read_reg(struct device *dev, uint8_t reg_addr,
+				uint8_t *buf_data, uint8_t buf_len)
 {
-	u8_t cmd_buf[] = { MCP2515_OPCODE_READ, reg_addr };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_READ, reg_addr };
 
 	struct spi_buf tx_buf[] = {
 		{ .buf = cmd_buf, .len = sizeof(cmd_buf) },
@@ -152,12 +152,12 @@ static int mcp2515_cmd_read_reg(struct device *dev, u8_t reg_addr,
  *   2: Receive Buffer 1, Start at RXB1SIDH (0x71)
  *   3: Receive Buffer 1, Start at RXB1D0 (0x76)
  */
-static int mcp2515_cmd_read_rx_buffer(struct device *dev, u8_t nm,
-				u8_t *buf_data, u8_t buf_len)
+static int mcp2515_cmd_read_rx_buffer(struct device *dev, uint8_t nm,
+				uint8_t *buf_data, uint8_t buf_len)
 {
 	__ASSERT(nm <= 0x03, "nm <= 0x03");
 
-	u8_t cmd_buf[] = { MCP2515_OPCODE_READ_RX_BUFFER | (nm << 1) };
+	uint8_t cmd_buf[] = { MCP2515_OPCODE_READ_RX_BUFFER | (nm << 1) };
 
 	struct spi_buf tx_buf[] = {
 		{ .buf = cmd_buf, .len = sizeof(cmd_buf) },
@@ -178,7 +178,7 @@ static int mcp2515_cmd_read_rx_buffer(struct device *dev, u8_t nm,
 			      &tx, &rx);
 }
 
-static u8_t mcp2515_convert_canmode_to_mcp2515mode(enum can_mode mode)
+static uint8_t mcp2515_convert_canmode_to_mcp2515mode(enum can_mode mode)
 {
 	switch (mode) {
 	case CAN_NORMAL_MODE:
@@ -194,11 +194,11 @@ static u8_t mcp2515_convert_canmode_to_mcp2515mode(enum can_mode mode)
 }
 
 static void mcp2515_convert_zcanframe_to_mcp2515frame(const struct zcan_frame
-						      *source, u8_t *target)
+						      *source, uint8_t *target)
 {
-	u8_t rtr;
-	u8_t dlc;
-	u8_t data_idx = 0U;
+	uint8_t rtr;
+	uint8_t dlc;
+	uint8_t data_idx = 0U;
 
 	if (source->id_type == CAN_STANDARD_IDENTIFIER) {
 		target[MCP2515_FRAME_OFFSET_SIDH] = source->std_id >> 3;
@@ -224,10 +224,10 @@ static void mcp2515_convert_zcanframe_to_mcp2515frame(const struct zcan_frame
 	}
 }
 
-static void mcp2515_convert_mcp2515frame_to_zcanframe(const u8_t *source,
+static void mcp2515_convert_mcp2515frame_to_zcanframe(const uint8_t *source,
 						      struct zcan_frame *target)
 {
-	u8_t data_idx = 0U;
+	uint8_t data_idx = 0U;
 
 	if (source[MCP2515_FRAME_OFFSET_SIDL] & BIT(3)) {
 		target->id_type = CAN_EXTENDED_IDENTIFIER;
@@ -253,9 +253,9 @@ static void mcp2515_convert_mcp2515frame_to_zcanframe(const u8_t *source,
 	}
 }
 
-const int mcp2515_set_mode(struct device *dev, u8_t mcp2515_mode)
+const int mcp2515_set_mode(struct device *dev, uint8_t mcp2515_mode)
 {
-	u8_t canstat;
+	uint8_t canstat;
 
 	mcp2515_cmd_bit_modify(dev, MCP2515_ADDR_CANCTRL,
 			       MCP2515_CANCTRL_MODE_MASK,
@@ -272,51 +272,51 @@ const int mcp2515_set_mode(struct device *dev, u8_t mcp2515_mode)
 }
 
 static int mcp2515_configure(struct device *dev, enum can_mode mode,
-			     u32_t bitrate)
+			     uint32_t bitrate)
 {
 	const struct mcp2515_config *dev_cfg = DEV_CFG(dev);
 	struct mcp2515_data *dev_data = DEV_DATA(dev);
 	int ret;
 
 	/* CNF3, CNF2, CNF1, CANINTE */
-	u8_t config_buf[4];
+	uint8_t config_buf[4];
 
 	if (bitrate == 0) {
 		bitrate = dev_cfg->bus_speed;
 	}
 
-	const u8_t bit_length = 1 + dev_cfg->tq_prop + dev_cfg->tq_bs1 +
+	const uint8_t bit_length = 1 + dev_cfg->tq_prop + dev_cfg->tq_bs1 +
 				dev_cfg->tq_bs2;
 
 	/* CNF1; SJW<7:6> | BRP<5:0> */
-	u8_t brp = (dev_cfg->osc_freq / (bit_length * bitrate * 2)) - 1;
-	const u8_t sjw = (dev_cfg->tq_sjw - 1) << 6;
-	u8_t cnf1 = sjw | brp;
+	uint8_t brp = (dev_cfg->osc_freq / (bit_length * bitrate * 2)) - 1;
+	const uint8_t sjw = (dev_cfg->tq_sjw - 1) << 6;
+	uint8_t cnf1 = sjw | brp;
 
 	/* CNF2; BTLMODE<7>|SAM<6>|PHSEG1<5:3>|PRSEG<2:0> */
-	const u8_t btlmode = 1 << 7;
-	const u8_t sam = 0 << 6;
-	const u8_t phseg1 = (dev_cfg->tq_bs1 - 1) << 3;
-	const u8_t prseg = (dev_cfg->tq_prop - 1);
+	const uint8_t btlmode = 1 << 7;
+	const uint8_t sam = 0 << 6;
+	const uint8_t phseg1 = (dev_cfg->tq_bs1 - 1) << 3;
+	const uint8_t prseg = (dev_cfg->tq_prop - 1);
 
-	const u8_t cnf2 = btlmode | sam | phseg1 | prseg;
+	const uint8_t cnf2 = btlmode | sam | phseg1 | prseg;
 
 	/* CNF3; SOF<7>|WAKFIL<6>|UND<5:3>|PHSEG2<2:0> */
-	const u8_t sof = 0 << 7;
-	const u8_t wakfil = 0 << 6;
-	const u8_t und = 0 << 3;
-	const u8_t phseg2 = (dev_cfg->tq_bs2 - 1);
+	const uint8_t sof = 0 << 7;
+	const uint8_t wakfil = 0 << 6;
+	const uint8_t und = 0 << 3;
+	const uint8_t phseg2 = (dev_cfg->tq_bs2 - 1);
 
-	const u8_t cnf3 = sof | wakfil | und | phseg2;
+	const uint8_t cnf3 = sof | wakfil | und | phseg2;
 
-	const u8_t caninte = MCP2515_INTE_RX0IE | MCP2515_INTE_RX1IE |
+	const uint8_t caninte = MCP2515_INTE_RX0IE | MCP2515_INTE_RX1IE |
 			     MCP2515_INTE_TX0IE | MCP2515_INTE_TX1IE |
 			     MCP2515_INTE_TX2IE | MCP2515_INTE_ERRIE;
 
 	/* Receive everything, filtering done in driver, RXB0 roll over into
 	 * RXB1 */
-	const u8_t rx0_ctrl = BIT(6) | BIT(5) | BIT(2);
-	const u8_t rx1_ctrl = BIT(6) | BIT(5);
+	const uint8_t rx0_ctrl = BIT(6) | BIT(5) | BIT(2);
+	const uint8_t rx1_ctrl = BIT(6) | BIT(5);
 
 	__ASSERT((dev_cfg->tq_sjw >= 1) && (dev_cfg->tq_sjw <= 4),
 		 "1 <= SJW <= 4");
@@ -386,11 +386,11 @@ static int mcp2515_send(struct device *dev, const struct zcan_frame *msg,
 		 void *callback_arg)
 {
 	struct mcp2515_data *dev_data = DEV_DATA(dev);
-	u8_t tx_idx = 0U;
-	u8_t abc;
-	u8_t nnn;
-	u8_t len;
-	u8_t tx_frame[MCP2515_FRAME_LEN];
+	uint8_t tx_idx = 0U;
+	uint8_t abc;
+	uint8_t nnn;
+	uint8_t len;
+	uint8_t tx_frame[MCP2515_FRAME_LEN];
 
 	if (msg->dlc > CAN_MAX_DLC) {
 		LOG_ERR("DLC of %d exceeds maximum (%d)",
@@ -494,7 +494,7 @@ static void mcp2515_register_state_change_isr(struct device *dev,
 	dev_data->state_change_isr = isr;
 }
 
-static u8_t mcp2515_filter_match(struct zcan_frame *msg,
+static uint8_t mcp2515_filter_match(struct zcan_frame *msg,
 				 struct zcan_filter *filter)
 {
 	if (msg->id_type != filter->id_type) {
@@ -521,7 +521,7 @@ static u8_t mcp2515_filter_match(struct zcan_frame *msg,
 static void mcp2515_rx_filter(struct device *dev, struct zcan_frame *msg)
 {
 	struct mcp2515_data *dev_data = DEV_DATA(dev);
-	u8_t filter_idx = 0U;
+	uint8_t filter_idx = 0U;
 	can_rx_callback_t callback;
 	struct zcan_frame tmp_msg;
 
@@ -547,13 +547,13 @@ static void mcp2515_rx_filter(struct device *dev, struct zcan_frame *msg)
 	k_mutex_unlock(&dev_data->mutex);
 }
 
-static void mcp2515_rx(struct device *dev, u8_t rx_idx)
+static void mcp2515_rx(struct device *dev, uint8_t rx_idx)
 {
 	__ASSERT(rx_idx < MCP2515_RX_CNT, "rx_idx < MCP2515_RX_CNT");
 
 	struct zcan_frame msg;
-	u8_t rx_frame[MCP2515_FRAME_LEN];
-	u8_t nm;
+	uint8_t rx_frame[MCP2515_FRAME_LEN];
+	uint8_t nm;
 
 	/* Address Pointer selection */
 	nm = 2 * rx_idx;
@@ -564,7 +564,7 @@ static void mcp2515_rx(struct device *dev, u8_t rx_idx)
 	mcp2515_rx_filter(dev, &msg);
 }
 
-static void mcp2515_tx_done(struct device *dev, u8_t tx_idx)
+static void mcp2515_tx_done(struct device *dev, uint8_t tx_idx)
 {
 	struct mcp2515_data *dev_data = DEV_DATA(dev);
 
@@ -583,8 +583,8 @@ static void mcp2515_tx_done(struct device *dev, u8_t tx_idx)
 static enum can_state mcp2515_get_state(struct device *dev,
 					struct can_bus_err_cnt *err_cnt)
 {
-	u8_t eflg;
-	u8_t err_cnt_buf[2];
+	uint8_t eflg;
+	uint8_t err_cnt_buf[2];
 	int ret;
 
 	ret = mcp2515_cmd_read_reg(dev, MCP2515_ADDR_EFLG, &eflg, sizeof(eflg));
@@ -644,7 +644,7 @@ static void mcp2515_handle_interrupts(struct device *dev)
 	const struct mcp2515_config *dev_cfg = DEV_CFG(dev);
 	struct mcp2515_data *dev_data = DEV_DATA(dev);
 	int ret;
-	u8_t canintf;
+	uint8_t canintf;
 
 	/* Loop until INT pin is inactive (all interrupt flags handled) */
 	while (1) {
@@ -718,7 +718,7 @@ static void mcp2515_int_thread(struct device *dev)
 }
 
 static void mcp2515_int_gpio_callback(struct device *dev,
-				      struct gpio_callback *cb, u32_t pins)
+				      struct gpio_callback *cb, uint32_t pins)
 {
 	struct mcp2515_data *dev_data =
 		CONTAINER_OF(cb, struct mcp2515_data, int_gpio_cb);
diff --git a/drivers/can/can_mcp2515.h b/drivers/can/can_mcp2515.h
index 6aae4e237c..d9657bf47a 100644
--- a/drivers/can/can_mcp2515.h
+++ b/drivers/can/can_mcp2515.h
@@ -42,10 +42,10 @@ struct mcp2515_data {
 	/* tx data */
 	struct k_sem tx_sem;
 	struct mcp2515_tx_cb tx_cb[MCP2515_TX_CNT];
-	u8_t tx_busy_map;
+	uint8_t tx_busy_map;
 
 	/* filter data */
-	u32_t filter_usage;
+	uint32_t filter_usage;
 	can_rx_callback_t rx_cb[CONFIG_CAN_MCP2515_MAX_FILTER];
 	void *cb_arg[CONFIG_CAN_MCP2515_MAX_FILTER];
 	struct zcan_filter filter[CONFIG_CAN_MCP2515_MAX_FILTER];
@@ -59,24 +59,24 @@ struct mcp2515_data {
 struct mcp2515_config {
 	/* spi configuration */
 	const char *spi_port;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	const char *spi_cs_port;
-	u32_t spi_freq;
-	u8_t spi_slave;
+	uint32_t spi_freq;
+	uint8_t spi_slave;
 
 	/* interrupt configuration */
-	u8_t int_pin;
+	uint8_t int_pin;
 	const char *int_port;
 	size_t int_thread_stack_size;
 	int int_thread_priority;
 
 	/* CAN timing */
-	u8_t tq_sjw;
-	u8_t tq_prop;
-	u8_t tq_bs1;
-	u8_t tq_bs2;
-	u32_t bus_speed;
-	u32_t osc_freq;
+	uint8_t tq_sjw;
+	uint8_t tq_prop;
+	uint8_t tq_bs1;
+	uint8_t tq_bs2;
+	uint32_t bus_speed;
+	uint32_t osc_freq;
 };
 
 /* MCP2515 Opcodes */
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c
index 8c2dcfff39..23af9056ef 100644
--- a/drivers/can/can_mcux_flexcan.c
+++ b/drivers/can/can_mcux_flexcan.c
@@ -45,9 +45,9 @@ LOG_MODULE_REGISTER(can_mcux_flexcan);
 
 /* Convert from back from FLEXCAN IDs to Zephyr CAN IDs. */
 #define FLEXCAN_ID_TO_ZCAN_ID_STD(id) \
-	((u32_t)((((u32_t)(id)) & CAN_ID_STD_MASK) >> CAN_ID_STD_SHIFT))
+	((uint32_t)((((uint32_t)(id)) & CAN_ID_STD_MASK) >> CAN_ID_STD_SHIFT))
 #define FLEXCAN_ID_TO_ZCAN_ID_EXT(id) \
-	((u32_t)((((u32_t)(id)) & (CAN_ID_STD_MASK | CAN_ID_EXT_MASK)) \
+	((uint32_t)((((uint32_t)(id)) & (CAN_ID_STD_MASK | CAN_ID_EXT_MASK)) \
 	>> CAN_ID_EXT_SHIFT))
 
 struct mcux_flexcan_config {
@@ -55,11 +55,11 @@ struct mcux_flexcan_config {
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
 	int clk_source;
-	u32_t bitrate;
-	u32_t sjw;
-	u32_t prop_seg;
-	u32_t phase_seg1;
-	u32_t phase_seg2;
+	uint32_t bitrate;
+	uint32_t sjw;
+	uint32_t prop_seg;
+	uint32_t phase_seg1;
+	uint32_t phase_seg2;
 	void (*irq_config_func)(struct device *dev);
 };
 
@@ -93,12 +93,12 @@ struct mcux_flexcan_data {
 };
 
 static int mcux_flexcan_configure(struct device *dev, enum can_mode mode,
-				  u32_t bitrate)
+				  uint32_t bitrate)
 {
 	const struct mcux_flexcan_config *config = dev->config_info;
 	flexcan_config_t flexcan_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	clock_dev = device_get_binding(config->clock_name);
 	if (clock_dev == NULL) {
@@ -185,7 +185,7 @@ static void mcux_flexcan_copy_frame_to_zframe(const flexcan_frame_t *src,
 
 static void mcux_flexcan_copy_zfilter_to_mbconfig(const struct zcan_filter *src,
 						  flexcan_rx_mb_config_t *dest,
-						  u32_t *mask)
+						  uint32_t *mask)
 {
 	if (src->id_type == CAN_STANDARD_IDENTIFIER) {
 		dest->format = kFLEXCAN_FrameFormatStandard;
@@ -303,7 +303,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr,
 	struct mcux_flexcan_data *data = dev->driver_data;
 	flexcan_mb_transfer_t xfer;
 	status_t status;
-	u32_t mask;
+	uint32_t mask;
 	int alloc = CAN_NO_FREE_FILTER;
 	int i;
 
@@ -362,7 +362,7 @@ static enum can_state mcux_flexcan_get_state(struct device *dev,
 					     struct can_bus_err_cnt *err_cnt)
 {
 	const struct mcux_flexcan_config *config = dev->config_info;
-	u32_t status_flags;
+	uint32_t status_flags;
 
 	if (err_cnt) {
 		FLEXCAN_GetBusErrCount(config->base, &err_cnt->tx_err_cnt,
@@ -388,7 +388,7 @@ int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout)
 {
 	const struct mcux_flexcan_config *config = dev->config_info;
 	int ret = 0;
-	u64_t start_time;
+	uint64_t start_time;
 
 	if (mcux_flexcan_get_state(dev, NULL) != CAN_BUS_OFF) {
 		return 0;
@@ -441,7 +441,7 @@ static void mcux_flexcan_detach(struct device *dev, int filter_id)
 }
 
 static inline void mcux_flexcan_transfer_error_status(struct device *dev,
-						      u32_t error)
+						      uint32_t error)
 {
 	const struct mcux_flexcan_config *config = dev->config_info;
 	struct mcux_flexcan_data *data = dev->driver_data;
@@ -518,7 +518,7 @@ static inline void mcux_flexcan_transfer_error_status(struct device *dev,
 }
 
 static inline void mcux_flexcan_transfer_tx_idle(struct device *dev,
-						 u32_t mb)
+						 uint32_t mb)
 {
 	struct mcux_flexcan_data *data = dev->driver_data;
 	can_tx_callback_t function;
@@ -543,7 +543,7 @@ static inline void mcux_flexcan_transfer_tx_idle(struct device *dev,
 }
 
 static inline void mcux_flexcan_transfer_rx_idle(struct device *dev,
-						 u32_t mb)
+						 uint32_t mb)
 {
 	const struct mcux_flexcan_config *config = dev->config_info;
 	struct mcux_flexcan_data *data = dev->driver_data;
@@ -580,7 +580,7 @@ static inline void mcux_flexcan_transfer_rx_idle(struct device *dev,
 
 static void mcux_flexcan_transfer_callback(CAN_Type *base,
 					   flexcan_handle_t *handle,
-					   status_t status, u32_t result,
+					   status_t status, uint32_t result,
 					   void *userData)
 {
 	struct device *dev = (struct device *)userData;
diff --git a/drivers/can/can_net.c b/drivers/can/can_net.c
index c132e06886..3379d4eb19 100644
--- a/drivers/can/can_net.c
+++ b/drivers/can/can_net.c
@@ -42,21 +42,21 @@ struct mcast_filter_mapping *can_get_mcast_filter(struct net_can_context *ctx,
 	return NULL;
 }
 
-static inline u8_t can_get_frame_datalength(struct zcan_frame *frame)
+static inline uint8_t can_get_frame_datalength(struct zcan_frame *frame)
 {
 	/* TODO: Needs update when CAN FD support is added */
 	return frame->dlc;
 }
 
-static inline u16_t can_get_lladdr_src(struct zcan_frame *frame)
+static inline uint16_t can_get_lladdr_src(struct zcan_frame *frame)
 {
 	return (frame->ext_id >> CAN_NET_IF_ADDR_SRC_POS) &
 	       CAN_NET_IF_ADDR_MASK;
 }
 
-static inline u16_t can_get_lladdr_dest(struct zcan_frame *frame)
+static inline uint16_t can_get_lladdr_dest(struct zcan_frame *frame)
 {
-	u16_t addr = (frame->ext_id >> CAN_NET_IF_ADDR_DEST_POS) &
+	uint16_t addr = (frame->ext_id >> CAN_NET_IF_ADDR_DEST_POS) &
 		     CAN_NET_IF_ADDR_MASK;
 
 	if (frame->ext_id & CAN_NET_IF_ADDR_MCAST_MASK) {
@@ -78,14 +78,14 @@ static inline void can_set_lladdr(struct net_pkt *pkt, struct zcan_frame *frame)
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_canbus_lladdr);
 	net_pkt_lladdr_dst(pkt)->type = NET_LINK_CANBUS;
 	net_buf_add_be16(buf, can_get_lladdr_dest(frame));
-	net_buf_pull(buf, sizeof(u16_t));
+	net_buf_pull(buf, sizeof(uint16_t));
 
 	/* Do the same as above for the source address */
 	net_pkt_lladdr_src(pkt)->addr = buf->data;
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_canbus_lladdr);
 	net_pkt_lladdr_src(pkt)->type = NET_LINK_CANBUS;
 	net_buf_add_be16(buf, can_get_lladdr_src(frame));
-	net_buf_pull(buf, sizeof(u16_t));
+	net_buf_pull(buf, sizeof(uint16_t));
 }
 
 static int net_can_send(struct device *dev, const struct zcan_frame *frame,
@@ -149,7 +149,7 @@ static inline int attach_mcast_filter(struct net_can_context *ctx,
 		.ext_id_mask = CAN_NET_IF_ADDR_MCAST_MASK |
 			       CAN_NET_IF_ADDR_DEST_MASK
 	};
-	const u16_t group =
+	const uint16_t group =
 		sys_be16_to_cpu(UNALIGNED_GET((&addr->s6_addr16[7])));
 	int filter_id;
 
@@ -243,8 +243,8 @@ static inline int can_attach_unicast_filter(struct net_can_context *ctx)
 		.rtr_mask = 1,
 		.ext_id_mask = CAN_NET_IF_ADDR_DEST_MASK
 	};
-	const u8_t *link_addr = net_if_get_link_addr(ctx->iface)->addr;
-	const u16_t dest = sys_be16_to_cpu(UNALIGNED_GET((u16_t *) link_addr));
+	const uint8_t *link_addr = net_if_get_link_addr(ctx->iface)->addr;
+	const uint16_t dest = sys_be16_to_cpu(UNALIGNED_GET((uint16_t *) link_addr));
 	int filter_id;
 
 	filter.ext_id = (dest << CAN_NET_IF_ADDR_DEST_POS);
diff --git a/drivers/can/can_shell.c b/drivers/can/can_shell.c
index 898e0edbfe..8a911c353f 100644
--- a/drivers/can/can_shell.c
+++ b/drivers/can/can_shell.c
@@ -81,7 +81,7 @@ static inline int read_frame_options(const struct shell *shell, int pos,
 }
 
 static inline int read_bitrate(const struct shell *shell, int pos, char **argv,
-			       u32_t *bitrate)
+			       uint32_t *bitrate)
 {
 	char *end_ptr;
 	long val;
@@ -92,13 +92,13 @@ static inline int read_bitrate(const struct shell *shell, int pos, char **argv,
 		return -EINVAL;
 	}
 
-	*bitrate = (u32_t)val;
+	*bitrate = (uint32_t)val;
 
 	return ++pos;
 }
 
 static inline int read_id(const struct shell *shell, int pos, char **argv,
-			  bool ext, u32_t *id)
+			  bool ext, uint32_t *id)
 {
 	char *end_ptr;
 	long val;
@@ -118,13 +118,13 @@ static inline int read_id(const struct shell *shell, int pos, char **argv,
 		return -EINVAL;
 	}
 
-	*id = (u32_t)val;
+	*id = (uint32_t)val;
 
 	return ++pos;
 }
 
 static inline int read_mask(const struct shell *shell, int pos, char **argv,
-			  bool ext, u32_t *mask)
+			  bool ext, uint32_t *mask)
 {
 	char *end_ptr;
 	long val;
@@ -144,16 +144,16 @@ static inline int read_mask(const struct shell *shell, int pos, char **argv,
 		return -EINVAL;
 	}
 
-	*mask = (u32_t)val;
+	*mask = (uint32_t)val;
 
 	return ++pos;
 }
 
 static inline int read_data(const struct shell *shell, int pos, char **argv,
-			    size_t argc, u8_t *data, u8_t *dlc)
+			    size_t argc, uint8_t *data, uint8_t *dlc)
 {
 	int i;
-	u8_t *data_ptr = data;
+	uint8_t *data_ptr = data;
 
 	if (argc - pos > CAN_MAX_DLC) {
 		shell_error(shell, "Too many databytes. Max is %d",
@@ -213,7 +213,7 @@ static int cmd_config(const struct shell *shell, size_t argc, char **argv)
 	int pos = 1;
 	bool silent = false, loopback = false;
 	enum can_mode mode;
-	u32_t bitrate;
+	uint32_t bitrate;
 	int ret;
 
 	can_dev = device_get_binding(argv[pos]);
@@ -262,7 +262,7 @@ static int cmd_send(const struct shell *shell, size_t argc, char **argv)
 	bool rtr = false, ext = false;
 	struct zcan_frame frame;
 	int ret;
-	u32_t id;
+	uint32_t id;
 
 	can_dev = device_get_binding(argv[pos]);
 	if (!can_dev) {
@@ -313,7 +313,7 @@ static int cmd_attach(const struct shell *shell, size_t argc, char **argv)
 	bool rtr = false, ext = false, rtr_mask = false;
 	struct zcan_filter filter;
 	int ret;
-	u32_t id, mask;
+	uint32_t id, mask;
 
 	can_dev = device_get_binding(argv[pos]);
 	if (!can_dev) {
diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
index d865dce8db..e2ddd64278 100644
--- a/drivers/can/can_stm32.c
+++ b/drivers/can/can_stm32.c
@@ -30,8 +30,8 @@ LOG_MODULE_DECLARE(can_driver, CONFIG_CAN_LOG_LEVEL);
  * filter_in_bank[enum can_filter_type] = number of filters in bank for this type
  * reg_demand[enum can_filter_type] = how many registers are used for this type
  */
-static const u8_t filter_in_bank[] = {2, 4, 1, 2};
-static const u8_t reg_demand[] = {2, 1, 4, 2};
+static const uint8_t filter_in_bank[] = {2, 4, 1, 2};
+static const uint8_t reg_demand[] = {2, 1, 4, 2};
 
 static void can_stm32_signal_tx_complete(struct can_mailbox *mb)
 {
@@ -126,7 +126,7 @@ static inline void can_stm32_bus_state_change_isr(CAN_TypeDef *can,
 static inline
 void can_stm32_tx_isr_handler(CAN_TypeDef *can, struct can_stm32_data *data)
 {
-	u32_t bus_off;
+	uint32_t bus_off;
 
 	bus_off = can->ESR & CAN_ESR_BOFF;
 
@@ -250,7 +250,7 @@ static void can_stm32_state_change_isr(void *arg)
 
 static int can_enter_init_mode(CAN_TypeDef *can)
 {
-	u32_t start_time;
+	uint32_t start_time;
 
 	can->MCR |= CAN_MCR_INRQ;
 	start_time = k_cycle_get_32();
@@ -267,7 +267,7 @@ static int can_enter_init_mode(CAN_TypeDef *can)
 
 static int can_leave_init_mode(CAN_TypeDef *can)
 {
-	u32_t start_time;
+	uint32_t start_time;
 
 	can->MCR &= ~CAN_MCR_INRQ;
 	start_time = k_cycle_get_32();
@@ -283,7 +283,7 @@ static int can_leave_init_mode(CAN_TypeDef *can)
 
 static int can_leave_sleep_mode(CAN_TypeDef *can)
 {
-	u32_t start_time;
+	uint32_t start_time;
 
 	can->MCR &= ~CAN_MCR_SLEEP;
 	start_time = k_cycle_get_32();
@@ -298,19 +298,19 @@ static int can_leave_sleep_mode(CAN_TypeDef *can)
 }
 
 int can_stm32_runtime_configure(struct device *dev, enum can_mode mode,
-				u32_t bitrate)
+				uint32_t bitrate)
 {
 	CAN_HandleTypeDef hcan;
 	const struct can_stm32_config *cfg = DEV_CFG(dev);
 	CAN_TypeDef *can = cfg->can;
 	struct can_stm32_data *data = DEV_DATA(dev);
 	struct device *clock;
-	u32_t clock_rate;
-	u32_t prescaler;
-	u32_t reg_mode;
-	u32_t ts1;
-	u32_t ts2;
-	u32_t sjw;
+	uint32_t clock_rate;
+	uint32_t prescaler;
+	uint32_t reg_mode;
+	uint32_t ts1;
+	uint32_t ts2;
+	uint32_t sjw;
 	int ret;
 
 	clock = device_get_binding(STM32_CLOCK_CONTROL_NAME);
@@ -506,7 +506,7 @@ int can_stm32_recover(struct device *dev, k_timeout_t timeout)
 	struct can_stm32_data *data = DEV_DATA(dev);
 	CAN_TypeDef *can = cfg->can;
 	int ret = CAN_TIMEOUT;
-	s64_t start_time;
+	int64_t start_time;
 
 	if (!(can->ESR & CAN_ESR_BOFF)) {
 		return 0;
@@ -548,7 +548,7 @@ int can_stm32_send(struct device *dev, const struct zcan_frame *msg,
 	const struct can_stm32_config *cfg = DEV_CFG(dev);
 	struct can_stm32_data *data = DEV_DATA(dev);
 	CAN_TypeDef *can = cfg->can;
-	u32_t transmit_status_register = can->TSR;
+	uint32_t transmit_status_register = can->TSR;
 	CAN_TxMailBox_TypeDef *mailbox = NULL;
 	struct can_mailbox *mb = NULL;
 
@@ -690,21 +690,21 @@ static int can_stm32_shift_arr(void **arr, int start, int count)
 	return 0;
 }
 
-enum can_filter_type can_stm32_get_filter_type(int bank_nr, u32_t mode_reg,
-					       u32_t scale_reg)
+enum can_filter_type can_stm32_get_filter_type(int bank_nr, uint32_t mode_reg,
+					       uint32_t scale_reg)
 {
-	u32_t mode_masked  = (mode_reg  >> bank_nr) & 0x01;
-	u32_t scale_masked = (scale_reg >> bank_nr) & 0x01;
+	uint32_t mode_masked  = (mode_reg  >> bank_nr) & 0x01;
+	uint32_t scale_masked = (scale_reg >> bank_nr) & 0x01;
 	enum can_filter_type type = (scale_masked << 1) | mode_masked;
 
 	return type;
 }
 
-static int can_calc_filter_index(int filter_nr, u32_t mode_reg, u32_t scale_reg)
+static int can_calc_filter_index(int filter_nr, uint32_t mode_reg, uint32_t scale_reg)
 {
 	int filter_bank = filter_nr / 4;
 	int cnt = 0;
-	u32_t mode_masked, scale_masked;
+	uint32_t mode_masked, scale_masked;
 	enum can_filter_type filter_type;
 	/*count filters in the banks before */
 	for (int i = 0; i < filter_bank; i++) {
@@ -723,7 +723,7 @@ static int can_calc_filter_index(int filter_nr, u32_t mode_reg, u32_t scale_reg)
 static void can_stm32_set_filter_bank(int filter_nr,
 				      CAN_FilterRegister_TypeDef *filter_reg,
 				      enum can_filter_type filter_type,
-				      u32_t id, u32_t mask)
+				      uint32_t id, uint32_t mask)
 {
 	switch (filter_type) {
 	case CAN_FILTER_STANDARD:
@@ -775,11 +775,11 @@ static void can_stm32_set_filter_bank(int filter_nr,
 }
 
 static inline void can_stm32_set_mode_scale(enum can_filter_type filter_type,
-					    u32_t *mode_reg, u32_t *scale_reg,
+					    uint32_t *mode_reg, uint32_t *scale_reg,
 					    int  bank_nr)
 {
-	u32_t mode_reg_bit  = (filter_type & 0x01) << bank_nr;
-	u32_t scale_reg_bit = (filter_type >>   1) << bank_nr;
+	uint32_t mode_reg_bit  = (filter_type & 0x01) << bank_nr;
+	uint32_t scale_reg_bit = (filter_type >>   1) << bank_nr;
 
 	*mode_reg &= ~(1 << bank_nr);
 	*mode_reg |= mode_reg_bit;
@@ -788,21 +788,21 @@ static inline void can_stm32_set_mode_scale(enum can_filter_type filter_type,
 	*scale_reg |= scale_reg_bit;
 }
 
-static inline u32_t can_generate_std_mask(const struct zcan_filter *filter)
+static inline uint32_t can_generate_std_mask(const struct zcan_filter *filter)
 {
 	return  (filter->std_id_mask << CAN_FIRX_STD_ID_POS) |
 		(filter->rtr_mask    << CAN_FIRX_STD_RTR_POS) |
 		(1U                  << CAN_FIRX_STD_IDE_POS);
 }
 
-static inline u32_t can_generate_ext_mask(const struct zcan_filter *filter)
+static inline uint32_t can_generate_ext_mask(const struct zcan_filter *filter)
 {
 	return  (filter->ext_id_mask << CAN_FIRX_EXT_EXT_ID_POS) |
 		(filter->rtr_mask    << CAN_FIRX_EXT_RTR_POS) |
 		(1U                  << CAN_FIRX_EXT_IDE_POS);
 }
 
-static inline u32_t can_generate_std_id(const struct zcan_filter *filter)
+static inline uint32_t can_generate_std_id(const struct zcan_filter *filter)
 {
 
 	return  (filter->std_id << CAN_FIRX_STD_ID_POS) |
@@ -810,7 +810,7 @@ static inline u32_t can_generate_std_id(const struct zcan_filter *filter)
 
 }
 
-static inline u32_t can_generate_ext_id(const struct zcan_filter *filter)
+static inline uint32_t can_generate_ext_id(const struct zcan_filter *filter)
 {
 	return  (filter->ext_id << CAN_FIRX_EXT_EXT_ID_POS) |
 		(filter->rtr    << CAN_FIRX_EXT_RTR_POS) |
@@ -822,12 +822,12 @@ static inline int can_stm32_set_filter(const struct zcan_filter *filter,
 				       CAN_TypeDef *can,
 				       int *filter_index)
 {
-	u32_t mask = 0U;
-	u32_t id = 0U;
+	uint32_t mask = 0U;
+	uint32_t id = 0U;
 	int filter_nr = 0;
 	int filter_index_new = CAN_NO_FREE_FILTER;
 	int bank_nr;
-	u32_t bank_bit;
+	uint32_t bank_bit;
 	int register_demand;
 	enum can_filter_type filter_type;
 	enum can_filter_type bank_mode;
@@ -864,8 +864,8 @@ static inline int can_stm32_set_filter(const struct zcan_filter *filter,
 		    filter_type);
 
 	do {
-		u64_t usage_shifted = (device_data->filter_usage >> filter_nr);
-		u64_t usage_demand_mask = (1ULL << register_demand) - 1;
+		uint64_t usage_shifted = (device_data->filter_usage >> filter_nr);
+		uint64_t usage_demand_mask = (1ULL << register_demand) - 1;
 		bool bank_is_empty;
 
 		bank_nr = filter_nr / 4;
@@ -900,8 +900,8 @@ static inline int can_stm32_set_filter(const struct zcan_filter *filter,
 	if (filter_type != bank_mode) {
 		int shift_width, start_index;
 		int res;
-		u32_t mode_reg  = can->FM1R;
-		u32_t scale_reg = can->FS1R;
+		uint32_t mode_reg  = can->FM1R;
+		uint32_t scale_reg = can->FS1R;
 
 		can_stm32_set_mode_scale(filter_type, &mode_reg, &scale_reg,
 					 bank_nr);
@@ -990,11 +990,11 @@ void can_stm32_detach(struct device *dev, int filter_nr)
 	CAN_TypeDef *can = cfg->master_can;
 	int bank_nr;
 	int filter_index;
-	u32_t bank_bit;
-	u32_t mode_reg;
-	u32_t scale_reg;
+	uint32_t bank_bit;
+	uint32_t mode_reg;
+	uint32_t scale_reg;
 	enum can_filter_type type;
-	u32_t reset_mask;
+	uint32_t reset_mask;
 
 	__ASSERT_NO_MSG(filter_nr >= 0 && filter_nr < CAN_MAX_NUMBER_OF_FILTERS);
 
diff --git a/drivers/can/can_stm32.h b/drivers/can/can_stm32.h
index df643dcefc..e53f77382d 100644
--- a/drivers/can/can_stm32.h
+++ b/drivers/can/can_stm32.h
@@ -43,7 +43,7 @@ struct can_mailbox {
 	can_tx_callback_t tx_callback;
 	void *callback_arg;
 	struct k_sem tx_int_sem;
-	u32_t error_flags;
+	uint32_t error_flags;
 };
 
 
@@ -61,7 +61,7 @@ struct can_stm32_data {
 	struct can_mailbox mb0;
 	struct can_mailbox mb1;
 	struct can_mailbox mb2;
-	u64_t filter_usage;
+	uint64_t filter_usage;
 	can_rx_callback_t rx_cb[CONFIG_CAN_MAX_FILTER];
 	void *cb_arg[CONFIG_CAN_MAX_FILTER];
 	can_state_change_isr_t state_change_isr;
@@ -70,10 +70,10 @@ struct can_stm32_data {
 struct can_stm32_config {
 	CAN_TypeDef *can;   /*!< CAN Registers*/
 	CAN_TypeDef *master_can;   /*!< CAN Registers for shared filter */
-	u32_t bus_speed;
-	u8_t sjw;
-	u8_t prop_ts1;
-	u8_t ts2;
+	uint32_t bus_speed;
+	uint8_t sjw;
+	uint8_t prop_ts1;
+	uint8_t ts2;
 	struct stm32_pclken pclken;
 	void (*config_irq)(CAN_TypeDef *can);
 };
diff --git a/drivers/can/socket_can_generic.h b/drivers/can/socket_can_generic.h
index 25f56075bb..ceddc90699 100644
--- a/drivers/can/socket_can_generic.h
+++ b/drivers/can/socket_can_generic.h
@@ -43,7 +43,7 @@ static inline void socket_can_iface_init(struct net_if *iface)
 	LOG_DBG("Init CAN interface %p dev %p", iface, dev);
 }
 
-static inline void tx_irq_callback(u32_t error_flags, void *arg)
+static inline void tx_irq_callback(uint32_t error_flags, void *arg)
 {
 	char *caller_str = (char *)arg;
 	if (error_flags) {
diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c
index 7a55235da5..f1a0a499e0 100644
--- a/drivers/clock_control/beetle_clock_control.c
+++ b/drivers/clock_control/beetle_clock_control.c
@@ -23,15 +23,15 @@
 
 struct beetle_clock_control_cfg_t {
 	/* Clock Control ID */
-	u32_t clock_control_id;
+	uint32_t clock_control_id;
 	/* Clock control freq */
-	u32_t freq;
+	uint32_t freq;
 };
 
-static inline void beetle_set_clock(volatile u32_t *base,
-				    u8_t bit, enum arm_soc_state_t state)
+static inline void beetle_set_clock(volatile uint32_t *base,
+				    uint8_t bit, enum arm_soc_state_t state)
 {
-	u32_t key;
+	uint32_t key;
 
 	key = irq_lock();
 
@@ -52,31 +52,31 @@ static inline void beetle_set_clock(volatile u32_t *base,
 	irq_unlock(key);
 }
 
-static inline void beetle_ahb_set_clock_on(u8_t bit,
+static inline void beetle_ahb_set_clock_on(uint8_t bit,
 					   enum arm_soc_state_t state)
 {
-	beetle_set_clock((volatile u32_t *)&(__BEETLE_SYSCON->ahbclkcfg0set),
+	beetle_set_clock((volatile uint32_t *)&(__BEETLE_SYSCON->ahbclkcfg0set),
 			 bit, state);
 }
 
-static inline void beetle_ahb_set_clock_off(u8_t bit,
+static inline void beetle_ahb_set_clock_off(uint8_t bit,
 					    enum arm_soc_state_t state)
 {
-	beetle_set_clock((volatile u32_t *)&(__BEETLE_SYSCON->ahbclkcfg0clr),
+	beetle_set_clock((volatile uint32_t *)&(__BEETLE_SYSCON->ahbclkcfg0clr),
 			 bit, state);
 }
 
-static inline void beetle_apb_set_clock_on(u8_t bit,
+static inline void beetle_apb_set_clock_on(uint8_t bit,
 					   enum arm_soc_state_t state)
 {
-	beetle_set_clock((volatile u32_t *)&(__BEETLE_SYSCON->apbclkcfg0set),
+	beetle_set_clock((volatile uint32_t *)&(__BEETLE_SYSCON->apbclkcfg0set),
 			 bit, state);
 }
 
-static inline void beetle_apb_set_clock_off(u8_t bit,
+static inline void beetle_apb_set_clock_off(uint8_t bit,
 					    enum arm_soc_state_t state)
 {
-	beetle_set_clock((volatile u32_t *)&(__BEETLE_SYSCON->apbclkcfg0clr),
+	beetle_set_clock((volatile uint32_t *)&(__BEETLE_SYSCON->apbclkcfg0clr),
 			 bit, state);
 }
 
@@ -86,7 +86,7 @@ static inline int beetle_clock_control_on(struct device *dev,
 	struct arm_clock_control_t *beetle_cc =
 				(struct arm_clock_control_t *)(sub_system);
 
-	u8_t bit = 0U;
+	uint8_t bit = 0U;
 
 	switch (beetle_cc->bus) {
 	case CMSDK_AHB:
@@ -110,7 +110,7 @@ static inline int beetle_clock_control_off(struct device *dev,
 	struct arm_clock_control_t *beetle_cc =
 				(struct arm_clock_control_t *)(sub_system);
 
-	u8_t bit = 0U;
+	uint8_t bit = 0U;
 
 	switch (beetle_cc->bus) {
 	case CMSDK_AHB:
@@ -129,12 +129,12 @@ static inline int beetle_clock_control_off(struct device *dev,
 
 static int beetle_clock_control_get_subsys_rate(struct device *clock,
 					      clock_control_subsys_t sub_system,
-					      u32_t *rate)
+					      uint32_t *rate)
 {
 #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL
 	const struct beetle_clock_control_cfg_t * const cfg =
 						clock->config_info;
-	u32_t nc_mainclk = beetle_round_freq(cfg->freq);
+	uint32_t nc_mainclk = beetle_round_freq(cfg->freq);
 
 	*rate = nc_mainclk;
 #else
@@ -154,9 +154,9 @@ static const struct clock_control_driver_api beetle_clock_control_api = {
 };
 
 #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL
-static u32_t beetle_round_freq(u32_t mainclk)
+static uint32_t beetle_round_freq(uint32_t mainclk)
 {
-	u32_t nc_mainclk = 0U;
+	uint32_t nc_mainclk = 0U;
 
 	/*
 	 * Verify that the frequency is in the supported range otherwise
@@ -175,9 +175,9 @@ static u32_t beetle_round_freq(u32_t mainclk)
 	return nc_mainclk;
 }
 
-static u32_t beetle_get_prescaler(u32_t mainclk)
+static uint32_t beetle_get_prescaler(uint32_t mainclk)
 {
-	u32_t pre_mainclk = 0U;
+	uint32_t pre_mainclk = 0U;
 
 	/*
 	 * Verify that the frequency is in the supported range otherwise
@@ -196,10 +196,10 @@ static u32_t beetle_get_prescaler(u32_t mainclk)
 	return pre_mainclk;
 }
 
-static int beetle_pll_enable(u32_t mainclk)
+static int beetle_pll_enable(uint32_t mainclk)
 {
 
-	u32_t pre_mainclk = beetle_get_prescaler(mainclk);
+	uint32_t pre_mainclk = beetle_get_prescaler(mainclk);
 
 	/* Set PLLCTRL Register */
 	__BEETLE_SYSCON->pllctrl = BEETLE_PLL_CONFIGURATION;
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
index 67aa04bfc6..51c94e6d9c 100644
--- a/drivers/clock_control/clock_control_mcux_ccm.c
+++ b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -36,9 +36,9 @@ static int mcux_ccm_off(struct device *dev,
 
 static int mcux_ccm_get_subsys_rate(struct device *dev,
 				    clock_control_subsys_t sub_system,
-				    u32_t *rate)
+				    uint32_t *rate)
 {
-	u32_t clock_name = (u32_t) sub_system;
+	uint32_t clock_name = (uint32_t) sub_system;
 
 	switch (clock_name) {
 
@@ -57,7 +57,7 @@ static int mcux_ccm_get_subsys_rate(struct device *dev,
 
 	case IMX_CCM_LPSPI_CLK:
 	{
-		u32_t lpspi_mux = CLOCK_GetMux(kCLOCK_LpspiMux);
+		uint32_t lpspi_mux = CLOCK_GetMux(kCLOCK_LpspiMux);
 		clock_name_t lpspi_clock = lpspi_clocks[lpspi_mux];
 
 		*rate = CLOCK_GetFreq(lpspi_clock)
diff --git a/drivers/clock_control/clock_control_mcux_mcg.c b/drivers/clock_control/clock_control_mcux_mcg.c
index 219e2b169c..cd3d822411 100644
--- a/drivers/clock_control/clock_control_mcux_mcg.c
+++ b/drivers/clock_control/clock_control_mcux_mcg.c
@@ -30,11 +30,11 @@ static int mcux_mcg_off(struct device *dev, clock_control_subsys_t sub_system)
 
 static int mcux_mcg_get_rate(struct device *dev,
 			     clock_control_subsys_t sub_system,
-			     u32_t *rate)
+			     uint32_t *rate)
 {
 	clock_name_t clock_name;
 
-	switch ((u32_t) sub_system) {
+	switch ((uint32_t) sub_system) {
 	case KINETIS_MCG_FIXED_FREQ_CLK:
 		clock_name = kCLOCK_McgFixedFreqClk;
 		break;
diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c
index 18fbee2b3a..985fd8bb10 100644
--- a/drivers/clock_control/clock_control_mcux_pcc.c
+++ b/drivers/clock_control/clock_control_mcux_pcc.c
@@ -19,7 +19,7 @@
 LOG_MODULE_REGISTER(clock_control_mcux_pcc);
 
 struct mcux_pcc_config {
-	u32_t base_address;
+	uint32_t base_address;
 };
 
 #define DEV_CFG(dev)  ((struct mcux_pcc_config *)(dev->config_info))
@@ -31,7 +31,7 @@ struct mcux_pcc_config {
 static inline clock_ip_name_t clock_ip(struct device *dev,
 				       clock_control_subsys_t sub_system)
 {
-	u32_t offset = POINTER_TO_UINT(sub_system);
+	uint32_t offset = POINTER_TO_UINT(sub_system);
 
 	return MAKE_PCC_REGADDR(DEV_BASE(dev), offset);
 }
@@ -50,7 +50,7 @@ static int mcux_pcc_off(struct device *dev, clock_control_subsys_t sub_system)
 
 static int mcux_pcc_get_rate(struct device *dev,
 			       clock_control_subsys_t sub_system,
-			       u32_t *rate)
+			       uint32_t *rate)
 {
 	*rate = CLOCK_GetIpFreq(clock_ip(dev, sub_system));
 	return 0;
diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c
index bd8ac50a1a..2d7d0653a0 100644
--- a/drivers/clock_control/clock_control_mcux_scg.c
+++ b/drivers/clock_control/clock_control_mcux_scg.c
@@ -30,11 +30,11 @@ static int mcux_scg_off(struct device *dev, clock_control_subsys_t sub_system)
 
 static int mcux_scg_get_rate(struct device *dev,
 			     clock_control_subsys_t sub_system,
-			     u32_t *rate)
+			     uint32_t *rate)
 {
 	clock_name_t clock_name;
 
-	switch ((u32_t) sub_system) {
+	switch ((uint32_t) sub_system) {
 	case KINETIS_SCG_CORESYS_CLK:
 		clock_name = kCLOCK_CoreSysClk;
 		break;
diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
index c9d1e952d7..552785f712 100644
--- a/drivers/clock_control/clock_control_mcux_sim.c
+++ b/drivers/clock_control/clock_control_mcux_sim.c
@@ -35,11 +35,11 @@ static int mcux_sim_off(struct device *dev, clock_control_subsys_t sub_system)
 
 static int mcux_sim_get_subsys_rate(struct device *dev,
 				    clock_control_subsys_t sub_system,
-				    u32_t *rate)
+				    uint32_t *rate)
 {
 	clock_name_t clock_name;
 
-	switch ((u32_t) sub_system) {
+	switch ((uint32_t) sub_system) {
 	case KINETIS_SIM_LPO_CLK:
 		clock_name = kCLOCK_LpoClk;
 		break;
diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c
index b45518a0cf..d770bccc70 100644
--- a/drivers/clock_control/clock_control_rv32m1_pcc.c
+++ b/drivers/clock_control/clock_control_rv32m1_pcc.c
@@ -15,7 +15,7 @@
 LOG_MODULE_REGISTER(clock_control);
 
 struct rv32m1_pcc_config {
-	u32_t base_address;
+	uint32_t base_address;
 };
 
 #define DEV_CFG(dev)  ((struct rv32m1_pcc_config *)(dev->config_info))
@@ -24,7 +24,7 @@ struct rv32m1_pcc_config {
 static inline clock_ip_name_t clock_ip(struct device *dev,
 				       clock_control_subsys_t sub_system)
 {
-	u32_t offset = POINTER_TO_UINT(sub_system);
+	uint32_t offset = POINTER_TO_UINT(sub_system);
 
 	return MAKE_PCC_REGADDR(DEV_BASE(dev), offset);
 }
@@ -43,7 +43,7 @@ static int rv32m1_pcc_off(struct device *dev, clock_control_subsys_t sub_system)
 
 static int rv32m1_pcc_get_rate(struct device *dev,
 			       clock_control_subsys_t sub_system,
-			       u32_t *rate)
+			       uint32_t *rate)
 {
 	*rate = CLOCK_GetIpFreq(clock_ip(dev, sub_system));
 	return 0;
diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
index 79bdf18736..e92224ee2a 100644
--- a/drivers/clock_control/clock_stm32_ll_common.c
+++ b/drivers/clock_control/clock_stm32_ll_common.c
@@ -71,7 +71,7 @@ static void config_bus_clk_init(LL_UTILS_ClkInitTypeDef *clk_init)
 #endif /* CONFIG_SOC_SERIES_STM32F0X && CONFIG_SOC_SERIES_STM32G0X */
 }
 
-static u32_t get_bus_clock(u32_t clock, u32_t prescaler)
+static uint32_t get_bus_clock(uint32_t clock, uint32_t prescaler)
 {
 	return clock / prescaler;
 }
@@ -181,7 +181,7 @@ static inline int stm32_clock_control_off(struct device *dev,
 
 static int stm32_clock_control_get_subsys_rate(struct device *clock,
 						clock_control_subsys_t sub_system,
-						u32_t *rate)
+						uint32_t *rate)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	/*
@@ -190,11 +190,11 @@ static int stm32_clock_control_get_subsys_rate(struct device *clock,
 	 * since it will be updated after clock configuration and hence
 	 * more likely to contain actual clock speed
 	 */
-	u32_t ahb_clock = SystemCoreClock;
-	u32_t apb1_clock = get_bus_clock(ahb_clock,
+	uint32_t ahb_clock = SystemCoreClock;
+	uint32_t apb1_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_APB1_PRESCALER);
 #if !defined (CONFIG_SOC_SERIES_STM32F0X) && !defined (CONFIG_SOC_SERIES_STM32G0X)
-	u32_t apb2_clock = get_bus_clock(ahb_clock,
+	uint32_t apb2_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_APB2_PRESCALER);
 #endif /* CONFIG_SOC_SERIES_STM32F0X && CONFIG_SOC_SERIES_STM32G0X */
 
@@ -247,7 +247,7 @@ static struct clock_control_driver_api stm32_clock_control_api = {
  * Unconditionally switch the system clock source to HSI.
  */
 __unused
-static void stm32_clock_switch_to_hsi(u32_t ahb_prescaler)
+static void stm32_clock_switch_to_hsi(uint32_t ahb_prescaler)
 {
 	/* Enable HSI if not enabled */
 	if (LL_RCC_HSI_IsReady() != 1) {
@@ -285,7 +285,7 @@ static inline void stm32_clock_control_mco_init(void)
 static int stm32_clock_control_init(struct device *dev)
 {
 	LL_UTILS_ClkInitTypeDef s_ClkInitStruct;
-	u32_t hclk_prescaler;
+	uint32_t hclk_prescaler;
 
 	ARG_UNUSED(dev);
 
diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c
index d523967a7b..0be6ac3e7c 100644
--- a/drivers/clock_control/clock_stm32_ll_h7.c
+++ b/drivers/clock_control/clock_stm32_ll_h7.c
@@ -56,7 +56,7 @@ static void config_bus_prescalers(void)
 }
 #endif /* CONFIG_CPU_CORTEX_M4 */
 
-static u32_t get_bus_clock(u32_t clock, u32_t prescaler)
+static uint32_t get_bus_clock(uint32_t clock, uint32_t prescaler)
 {
 	return clock / prescaler;
 }
@@ -153,7 +153,7 @@ static inline int stm32_clock_control_off(struct device *dev,
 
 static int stm32_clock_control_get_subsys_rate(struct device *clock,
 					clock_control_subsys_t sub_system,
-						u32_t *rate)
+						uint32_t *rate)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 	/*
@@ -163,18 +163,18 @@ static int stm32_clock_control_get_subsys_rate(struct device *clock,
 	 * more likely to contain actual clock speed
 	 */
 #if defined(CONFIG_CPU_CORTEX_M4)
-	u32_t ahb_clock = SystemCoreClock;
+	uint32_t ahb_clock = SystemCoreClock;
 #else
-	u32_t ahb_clock = get_bus_clock(SystemCoreClock,
+	uint32_t ahb_clock = get_bus_clock(SystemCoreClock,
 				CONFIG_CLOCK_STM32_HPRE);
 #endif
-	u32_t apb1_clock = get_bus_clock(ahb_clock,
+	uint32_t apb1_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_D2PPRE1);
-	u32_t apb2_clock = get_bus_clock(ahb_clock,
+	uint32_t apb2_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_D2PPRE2);
-	u32_t apb3_clock = get_bus_clock(ahb_clock,
+	uint32_t apb3_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_D1PPRE);
-	u32_t apb4_clock = get_bus_clock(ahb_clock,
+	uint32_t apb4_clock = get_bus_clock(ahb_clock,
 				CONFIG_CLOCK_STM32_D3PPRE);
 
 	ARG_UNUSED(clock);
diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c
index 642af657f5..bb5d7d224c 100644
--- a/drivers/clock_control/clock_stm32_ll_mp1.c
+++ b/drivers/clock_control/clock_stm32_ll_mp1.c
@@ -116,7 +116,7 @@ static inline int stm32_clock_control_off(struct device *dev,
 
 static int stm32_clock_control_get_subsys_rate(struct device *clock,
 					clock_control_subsys_t sub_system,
-					u32_t *rate)
+					uint32_t *rate)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
 
diff --git a/drivers/clock_control/nrf_clock_calibration.c b/drivers/clock_control/nrf_clock_calibration.c
index 242b3730f6..53fd2db22a 100644
--- a/drivers/clock_control/nrf_clock_calibration.c
+++ b/drivers/clock_control/nrf_clock_calibration.c
@@ -32,8 +32,8 @@ LOG_MODULE_DECLARE(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
  */
 
 static atomic_t cal_process_in_progress;
-static s16_t prev_temperature; /* Previous temperature measurement. */
-static u8_t calib_skip_cnt; /* Counting down skipped calibrations. */
+static int16_t prev_temperature; /* Previous temperature measurement. */
+static uint8_t calib_skip_cnt; /* Counting down skipped calibrations. */
 static volatile int total_cnt; /* Total number of calibrations. */
 static volatile int total_skips_cnt; /* Total number of skipped calibrations. */
 
@@ -156,13 +156,13 @@ static void on_hw_cal_done(void)
 }
 
 /* Convert sensor value to 0.25'C units. */
-static inline s16_t sensor_value_to_temp_unit(struct sensor_value *val)
+static inline int16_t sensor_value_to_temp_unit(struct sensor_value *val)
 {
-	return (s16_t)(4 * val->val1 + val->val2 / 250000);
+	return (int16_t)(4 * val->val1 + val->val2 / 250000);
 }
 
 /* Function reads from temperature sensor and converts to 0.25'C units. */
-static int get_temperature(s16_t *tvp)
+static int get_temperature(int16_t *tvp)
 {
 	struct sensor_value sensor_val;
 	int rc = sensor_sample_fetch(temp_sensor);
@@ -183,8 +183,8 @@ static int get_temperature(s16_t *tvp)
  */
 static void measure_temperature(struct k_work *work)
 {
-	s16_t temperature = 0;
-	s16_t diff = 0;
+	int16_t temperature = 0;
+	int16_t diff = 0;
 	bool started = false;
 	int rc;
 
diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c
index 4225519b8d..b337e9ac64 100644
--- a/drivers/clock_control/nrf_power_clock.c
+++ b/drivers/clock_control/nrf_power_clock.c
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 /* Clock subsys structure */
 struct nrf_clock_control_sub_data {
 	sys_slist_t list;	/* List of users requesting callback */
-	u8_t ref;		/* Users counter */
+	uint8_t ref;		/* Users counter */
 	bool started;		/* Indicated that clock is started */
 };
 
@@ -64,7 +64,7 @@ static void clkstarted_handle(struct device *dev,
 /* Return true if given event has enabled interrupt and is triggered. Event
  * is cleared.
  */
-static bool clock_event_check_and_clean(nrf_clock_event_t evt, u32_t intmask)
+static bool clock_event_check_and_clean(nrf_clock_event_t evt, uint32_t intmask)
 {
 	bool ret = nrf_clock_event_check(NRF_CLOCK, evt) &&
 			nrf_clock_int_enable_check(NRF_CLOCK, intmask);
@@ -234,7 +234,7 @@ static int clock_async_start(struct device *dev,
 	const struct nrf_clock_control_sub_config *config;
 	struct nrf_clock_control_sub_data *clk_data;
 	int key;
-	u8_t ref;
+	uint8_t ref;
 
 	__ASSERT_NO_MSG(type < CLOCK_CONTROL_NRF_TYPE_COUNT);
 	config = get_sub_config(dev, type);
@@ -369,7 +369,7 @@ static void clkstarted_handle(struct device *dev,
 }
 
 #if defined(CONFIG_USB_NRFX)
-static bool power_event_check_and_clean(nrf_power_event_t evt, u32_t intmask)
+static bool power_event_check_and_clean(nrf_power_event_t evt, uint32_t intmask)
 {
 	bool ret = nrf_power_event_check(NRF_POWER, evt) &&
 			nrf_power_int_enable_check(NRF_POWER, intmask);
@@ -441,7 +441,7 @@ void nrf_power_clock_isr(void *arg)
 #ifdef CONFIG_USB_NRFX
 void nrf5_power_usb_power_int_enable(bool enable)
 {
-	u32_t mask;
+	uint32_t mask;
 
 	mask = NRF_POWER_INT_USBDETECTED_MASK |
 	       NRF_POWER_INT_USBREMOVED_MASK |
diff --git a/drivers/console/gsm_mux.c b/drivers/console/gsm_mux.c
index 4b0923ec9c..63eebd0ad2 100644
--- a/drivers/console/gsm_mux.c
+++ b/drivers/console/gsm_mux.c
@@ -88,23 +88,23 @@ struct gsm_mux {
 	enum gsm_mux_state state;
 
 	/* Control DLCI is not included in this list so -1 here */
-	u8_t dlci_to_create[CONFIG_GSM_MUX_DLCI_MAX - 1];
+	uint8_t dlci_to_create[CONFIG_GSM_MUX_DLCI_MAX - 1];
 
-	u16_t msg_len;     /* message length */
-	u16_t received;    /* bytes so far received */
+	uint16_t msg_len;     /* message length */
+	uint16_t received;    /* bytes so far received */
 
 	struct k_delayed_work t2_timer;
 	sys_slist_t pending_ctrls;
 
-	u16_t t1_timeout_value; /* T1 default value */
-	u16_t t2_timeout_value; /* T2 default value */
+	uint16_t t1_timeout_value; /* T1 default value */
+	uint16_t t2_timeout_value; /* T2 default value */
 
 	/* Information from currently read packet */
-	u8_t address;      /* dlci address (only one byte address supported) */
-	u8_t control;      /* type of the frame */
-	u8_t fcs;          /* calculated frame check sequence */
-	u8_t received_fcs; /* packet fcs */
-	u8_t retries;      /* N2 counter */
+	uint8_t address;      /* dlci address (only one byte address supported) */
+	uint8_t control;      /* type of the frame */
+	uint8_t fcs;          /* calculated frame check sequence */
+	uint8_t received_fcs; /* packet fcs */
+	uint8_t retries;      /* N2 counter */
 
 	bool in_use : 1;
 	bool is_initiator : 1;   /* Did we initiate the connection attempt */
@@ -140,8 +140,8 @@ struct gsm_dlci {
 	enum gsm_dlci_state state;
 	enum gsm_dlci_mode mode;
 	int num;
-	u32_t req_start;
-	u8_t retries;
+	uint32_t req_start;
+	uint8_t retries;
 	bool refuse_service : 1; /* Do not try to talk to this channel */
 	bool in_use : 1;
 };
@@ -149,8 +149,8 @@ struct gsm_dlci {
 struct gsm_control_msg {
 	sys_snode_t node;
 	struct net_buf *buf;
-	u32_t req_start;
-	u8_t cmd;
+	uint32_t req_start;
+	uint8_t cmd;
 	bool finished : 1;
 };
 
@@ -178,7 +178,7 @@ static sys_slist_t ctrls_free_entries;
 
 static bool gsm_mux_init_done;
 
-static const char *get_frame_type_str(u8_t frame_type)
+static const char *get_frame_type_str(uint8_t frame_type)
 {
 	switch (frame_type) {
 	case FT_RR:
@@ -204,8 +204,8 @@ static const char *get_frame_type_str(u8_t frame_type)
 	return NULL;
 }
 
-static void hexdump_packet(const char *header, u8_t address, bool cmd_rsp,
-			   u8_t control, const u8_t *data, size_t len)
+static void hexdump_packet(const char *header, uint8_t address, bool cmd_rsp,
+			   uint8_t control, const uint8_t *data, size_t len)
 {
 	const char *frame_type;
 	char out[128];
@@ -269,17 +269,17 @@ print:
 	}
 }
 
-static u8_t gsm_mux_fcs_add_buf(u8_t fcs, const u8_t *buf, size_t len)
+static uint8_t gsm_mux_fcs_add_buf(uint8_t fcs, const uint8_t *buf, size_t len)
 {
 	return crc8(buf, len, FCS_POLYNOMIAL, fcs, true);
 }
 
-static u8_t gsm_mux_fcs_add(u8_t fcs, u8_t recv_byte)
+static uint8_t gsm_mux_fcs_add(uint8_t fcs, uint8_t recv_byte)
 {
 	return gsm_mux_fcs_add_buf(fcs, &recv_byte, 1);
 }
 
-static bool gsm_mux_read_ea(int *value, u8_t recv_byte)
+static bool gsm_mux_read_ea(int *value, uint8_t recv_byte)
 {
 	/* As the value can be larger than one byte, collect the read
 	 * bytes to given variable.
@@ -291,7 +291,7 @@ static bool gsm_mux_read_ea(int *value, u8_t recv_byte)
 	return recv_byte & EA;
 }
 
-static bool gsm_mux_read_msg_len(struct gsm_mux *mux, u8_t recv_byte)
+static bool gsm_mux_read_msg_len(struct gsm_mux *mux, uint8_t recv_byte)
 {
 	int value = mux->msg_len;
 	bool ret;
@@ -345,7 +345,7 @@ static int gsm_dlci_process_data(struct gsm_dlci *dlci, bool cmd,
 	return len;
 }
 
-static struct gsm_dlci *gsm_dlci_get(struct gsm_mux *mux, u8_t dlci_address)
+static struct gsm_dlci *gsm_dlci_get(struct gsm_mux *mux, uint8_t dlci_address)
 {
 	int i;
 
@@ -360,7 +360,7 @@ static struct gsm_dlci *gsm_dlci_get(struct gsm_mux *mux, u8_t dlci_address)
 	return NULL;
 }
 
-static int gsm_mux_modem_send(struct gsm_mux *mux, const u8_t *buf, size_t size)
+static int gsm_mux_modem_send(struct gsm_mux *mux, const uint8_t *buf, size_t size)
 {
 	if (mux->uart == NULL) {
 		return -ENOENT;
@@ -374,15 +374,15 @@ static int gsm_mux_modem_send(struct gsm_mux *mux, const u8_t *buf, size_t size)
 }
 
 static int gsm_mux_send_data_msg(struct gsm_mux *mux, bool cmd,
-				 struct gsm_dlci *dlci, u8_t frame_type,
-				 const u8_t *buf, size_t size)
+				 struct gsm_dlci *dlci, uint8_t frame_type,
+				 const uint8_t *buf, size_t size)
 {
-	u8_t hdr[7];
+	uint8_t hdr[7];
 	int pos;
 	int ret;
 
 	hdr[0] = SOF_MARKER;
-	hdr[1] = (dlci->num << 2) | ((u8_t)cmd << 1) | EA;
+	hdr[1] = (dlci->num << 2) | ((uint8_t)cmd << 1) | EA;
 	hdr[2] = frame_type;
 
 	if (size < 128) {
@@ -422,12 +422,12 @@ static int gsm_mux_send_data_msg(struct gsm_mux *mux, bool cmd,
 }
 
 static int gsm_mux_send_control_msg(struct gsm_mux *mux, bool cmd,
-				    u8_t dlci_address, u8_t frame_type)
+				    uint8_t dlci_address, uint8_t frame_type)
 {
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	buf[0] = SOF_MARKER;
-	buf[1] = (dlci_address << 2) | ((u8_t)cmd << 1) | EA;
+	buf[1] = (dlci_address << 2) | ((uint8_t)cmd << 1) | EA;
 	buf[2] = frame_type;
 	buf[3] = EA;
 	buf[4] = 0xFF - gsm_mux_fcs_add_buf(FCS_INIT_VALUE, buf + 1, 3);
@@ -439,22 +439,22 @@ static int gsm_mux_send_control_msg(struct gsm_mux *mux, bool cmd,
 	return gsm_mux_modem_send(mux, buf, sizeof(buf));
 }
 
-static int gsm_mux_send_command(struct gsm_mux *mux, u8_t dlci_address,
-				u8_t frame_type)
+static int gsm_mux_send_command(struct gsm_mux *mux, uint8_t dlci_address,
+				uint8_t frame_type)
 {
 	return gsm_mux_send_control_msg(mux, true, dlci_address, frame_type);
 }
 
-static int gsm_mux_send_response(struct gsm_mux *mux, u8_t dlci_address,
-				 u8_t frame_type)
+static int gsm_mux_send_response(struct gsm_mux *mux, uint8_t dlci_address,
+				 uint8_t frame_type)
 {
 	return gsm_mux_send_control_msg(mux, false, dlci_address, frame_type);
 }
 
-static void dlci_run_timer(u32_t current_time)
+static void dlci_run_timer(uint32_t current_time)
 {
 	struct gsm_dlci *dlci, *next;
-	u32_t new_timer = UINT_MAX;
+	uint32_t new_timer = UINT_MAX;
 
 	if (k_delayed_work_remaining_get(&t1_timer)) {
 		k_delayed_work_cancel(&t1_timer);
@@ -462,7 +462,7 @@ static void dlci_run_timer(u32_t current_time)
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&dlci_active_t1_timers,
 					  dlci, next, node) {
-		u32_t current_timer = dlci->req_start +
+		uint32_t current_timer = dlci->req_start +
 			dlci->mux->t1_timeout_value - current_time;
 
 		new_timer = MIN(current_timer, new_timer);
@@ -548,7 +548,7 @@ static bool handle_t1_timeout(struct gsm_dlci *dlci)
 
 static void dlci_t1_timeout(struct k_work *work)
 {
-	u32_t current_time = k_uptime_get_32();
+	uint32_t current_time = k_uptime_get_32();
 	struct gsm_dlci *entry, *next;
 	sys_snode_t *prev_node = NULL;
 
@@ -556,7 +556,7 @@ static void dlci_t1_timeout(struct k_work *work)
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&dlci_active_t1_timers,
 					  entry, next, node) {
-		if ((s32_t)(entry->req_start +
+		if ((int32_t)(entry->req_start +
 			    entry->mux->t1_timeout_value - current_time) > 0) {
 			prev_node = &entry->node;
 			break;
@@ -586,7 +586,7 @@ static struct gsm_control_msg *gsm_ctrl_msg_get_free(void)
 }
 
 static struct gsm_control_msg *gsm_mux_alloc_control_msg(struct net_buf *buf,
-							 u8_t cmd)
+							 uint8_t cmd)
 {
 	struct gsm_control_msg *msg;
 
@@ -615,12 +615,12 @@ static void ctrl_msg_cleanup(struct gsm_control_msg *entry, bool pending)
 static void gsm_mux_t2_timeout(struct k_work *work)
 {
 	struct gsm_mux *mux = CONTAINER_OF(work, struct gsm_mux, t2_timer);
-	u32_t current_time = k_uptime_get_32();
+	uint32_t current_time = k_uptime_get_32();
 	struct gsm_control_msg *entry, *next;
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&mux->pending_ctrls, entry, next,
 					  node) {
-		if ((s32_t)(entry->req_start + T2_MSEC - current_time) > 0) {
+		if ((int32_t)(entry->req_start + T2_MSEC - current_time) > 0) {
 			break;
 		}
 
@@ -639,8 +639,8 @@ static void gsm_mux_t2_timeout(struct k_work *work)
 	}
 }
 
-static int gsm_mux_send_control_message(struct gsm_mux *mux, u8_t dlci_address,
-					int cmd, u8_t *data, size_t data_len)
+static int gsm_mux_send_control_message(struct gsm_mux *mux, uint8_t dlci_address,
+					int cmd, uint8_t *data, size_t data_len)
 {
 	struct gsm_control_msg *ctrl;
 	struct net_buf *buf;
@@ -749,7 +749,7 @@ int gsm_mux_disconnect(struct gsm_mux *mux, k_timeout_t timeout)
 }
 
 static int gsm_mux_control_reply(struct gsm_dlci *dlci, bool sub_cr,
-				 u8_t sub_cmd, const u8_t *buf, size_t len)
+				 uint8_t sub_cmd, const uint8_t *buf, size_t len)
 {
 	/* As this is a reply to received command, set the value according
 	 * to initiator status. See GSM 07.10 page 17.
@@ -763,7 +763,7 @@ static int gsm_mux_control_reply(struct gsm_dlci *dlci, bool sub_cr,
 static bool get_field(struct net_buf *buf, int *ret_value)
 {
 	int value = 0;
-	u8_t recv_byte;
+	uint8_t recv_byte;
 
 	while (buf->len) {
 		recv_byte = net_buf_pull_u8(buf);
@@ -787,7 +787,7 @@ static bool get_field(struct net_buf *buf, int *ret_value)
 static int gsm_mux_msc_reply(struct gsm_dlci *dlci, bool cmd,
 			     struct net_buf *buf, size_t len)
 {
-	u32_t modem_sig = 0, break_sig = 0;
+	uint32_t modem_sig = 0, break_sig = 0;
 	int ret;
 
 	ret = get_field(buf, &modem_sig);
@@ -814,7 +814,7 @@ static int gsm_mux_msc_reply(struct gsm_dlci *dlci, bool cmd,
 
 static int gsm_mux_control_message(struct gsm_dlci *dlci, struct net_buf *buf)
 {
-	u32_t command = 0, len = 0;
+	uint32_t command = 0, len = 0;
 	int ret = 0;
 	bool cr;
 
@@ -940,7 +940,7 @@ static int gsm_dlci_process_command(struct gsm_dlci *dlci, bool cmd,
 	return ret;
 }
 
-static void gsm_dlci_free(struct gsm_mux *mux, u8_t address)
+static void gsm_dlci_free(struct gsm_mux *mux, uint8_t address)
 {
 	struct gsm_dlci *dlci;
 	int i;
@@ -976,7 +976,7 @@ static struct gsm_dlci *gsm_dlci_get_free(void)
 	return CONTAINER_OF(node, struct gsm_dlci, node);
 }
 
-static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *mux, u8_t address,
+static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *mux, uint8_t address,
 		struct device *uart, gsm_mux_dlci_created_cb_t dlci_created_cb,
 		void *user_data)
 {
@@ -1010,7 +1010,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *mux, u8_t address,
 
 static int gsm_mux_process_pkt(struct gsm_mux *mux)
 {
-	u8_t dlci_address = mux->address >> 2;
+	uint8_t dlci_address = mux->address >> 2;
 	int ret = 0;
 	bool cmd;   /* C/R bit, command (true) / response (false) */
 	struct gsm_dlci *dlci;
@@ -1181,7 +1181,7 @@ const char *gsm_mux_state_str(enum gsm_mux_state state)
 static void validate_state_transition(enum gsm_mux_state current,
 				      enum gsm_mux_state new)
 {
-	static const u8_t valid_transitions[] = {
+	static const uint8_t valid_transitions[] = {
 		[GSM_MUX_SOF] = 1 << GSM_MUX_ADDRESS,
 		[GSM_MUX_ADDRESS] = 1 << GSM_MUX_CONTROL,
 		[GSM_MUX_CONTROL] = 1 << GSM_MUX_LEN_0,
@@ -1235,7 +1235,7 @@ void gsm_mux_change_state(struct gsm_mux *mux, enum gsm_mux_state new_state)
 	mux->state = new_state;
 }
 
-static void gsm_mux_process_data(struct gsm_mux *mux, u8_t recv_byte)
+static void gsm_mux_process_data(struct gsm_mux *mux, uint8_t recv_byte)
 {
 	size_t bytes_added;
 
@@ -1377,7 +1377,7 @@ static void gsm_mux_process_data(struct gsm_mux *mux, u8_t recv_byte)
 	}
 }
 
-void gsm_mux_recv_buf(struct gsm_mux *mux, u8_t *buf, int len)
+void gsm_mux_recv_buf(struct gsm_mux *mux, uint8_t *buf, int len)
 {
 	int i = 0;
 
@@ -1429,7 +1429,7 @@ fail:
 	return ret;
 }
 
-int gsm_dlci_send(struct gsm_dlci *dlci, const u8_t *buf, size_t size)
+int gsm_dlci_send(struct gsm_dlci *dlci, const uint8_t *buf, size_t size)
 {
 	/* Mux the data and send to UART */
 	return gsm_mux_send_data_msg(dlci->mux, true, dlci, FT_UIH, buf, size);
@@ -1487,8 +1487,8 @@ struct gsm_mux *gsm_mux_create(struct device *uart)
 	return mux;
 }
 
-int gsm_mux_send(struct gsm_mux *mux, u8_t dlci_address,
-		 const u8_t *buf, size_t size)
+int gsm_mux_send(struct gsm_mux *mux, uint8_t dlci_address,
+		 const uint8_t *buf, size_t size)
 {
 	struct gsm_dlci *dlci;
 
diff --git a/drivers/console/gsm_mux.h b/drivers/console/gsm_mux.h
index 268b86c22a..9a113a559f 100644
--- a/drivers/console/gsm_mux.h
+++ b/drivers/console/gsm_mux.h
@@ -17,9 +17,9 @@
 struct gsm_mux;
 struct gsm_dlci;
 
-void gsm_mux_recv_buf(struct gsm_mux *mux, u8_t *buf, int len);
-int gsm_mux_send(struct gsm_mux *mux, u8_t dlci_address,
-		 const u8_t *buf, size_t size);
+void gsm_mux_recv_buf(struct gsm_mux *mux, uint8_t *buf, int len);
+int gsm_mux_send(struct gsm_mux *mux, uint8_t dlci_address,
+		 const uint8_t *buf, size_t size);
 struct gsm_mux *gsm_mux_create(struct device *uart);
 int gsm_mux_disconnect(struct gsm_mux *mux, k_timeout_t timeout);
 void gsm_mux_init(void);
@@ -34,5 +34,5 @@ int gsm_dlci_create(struct gsm_mux *mux,
 		    gsm_mux_dlci_created_cb_t dlci_created_cb,
 		    void *user_data,
 		    struct gsm_dlci **dlci);
-int gsm_dlci_send(struct gsm_dlci *dlci, const u8_t *buf, size_t size);
+int gsm_dlci_send(struct gsm_dlci *dlci, const uint8_t *buf, size_t size);
 int gsm_dlci_id(struct gsm_dlci *dlci);
diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c
index 47876c37ba..77e94d6be5 100644
--- a/drivers/console/ipm_console_receiver.c
+++ b/drivers/console/ipm_console_receiver.c
@@ -18,8 +18,8 @@
 
 static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 {
-	u8_t size32;
-	u16_t type;
+	uint8_t size32;
+	uint16_t type;
 	int ret, key;
 	struct device *d;
 	const struct ipm_console_receiver_config_info *config_info;
@@ -37,7 +37,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 		k_sem_take(&driver_data->sem, K_FOREVER);
 
 		ret = ring_buf_item_get(&driver_data->rb, &type,
-					(u8_t *)&config_info->line_buf[pos],
+					(uint8_t *)&config_info->line_buf[pos],
 					NULL, &size32);
 		if (ret) {
 			/* Shouldn't ever happen... */
@@ -84,7 +84,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 	}
 }
 
-static void ipm_console_receive_callback(void *context, u32_t id,
+static void ipm_console_receive_callback(void *context, uint32_t id,
 					 volatile void *data)
 {
 	struct device *d;
diff --git a/drivers/console/native_posix_console.c b/drivers/console/native_posix_console.c
index 354156f987..d178de7314 100644
--- a/drivers/console/native_posix_console.c
+++ b/drivers/console/native_posix_console.c
@@ -61,7 +61,7 @@ void posix_flush_stdout(void)
 
 static struct k_fifo *avail_queue;
 static struct k_fifo *lines_queue;
-static u8_t (*completion_cb)(char *line, u8_t len);
+static uint8_t (*completion_cb)(char *line, uint8_t len);
 static bool stdin_is_tty;
 
 static K_THREAD_STACK_DEFINE(stack, CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);
@@ -91,7 +91,7 @@ static inline void found_eof(void)
  * return > 0 if it was a directive (command starts with '!')
  * return 2 if the driver directive requires to pause processing input
  */
-static int catch_directive(char *s, s32_t *towait)
+static int catch_directive(char *s, int32_t *towait)
 {
 	while (*s != 0  && isspace(*s)) {
 		s++;
@@ -155,10 +155,10 @@ static int stdin_not_ready(void)
  * This function returns how long the thread should wait in ms,
  * before checking again the stdin buffer
  */
-static s32_t attempt_read_from_stdin(void)
+static int32_t attempt_read_from_stdin(void)
 {
 	static struct console_input *cmd;
-	s32_t towait = CONFIG_NATIVE_STDIN_POLL_PERIOD;
+	int32_t towait = CONFIG_NATIVE_STDIN_POLL_PERIOD;
 
 	while (1) {
 		char *ret;
@@ -249,7 +249,7 @@ static void native_stdio_runner(void *p1, void *p2, void *p3)
 	stdin_is_tty = isatty(STDIN_FILENO);
 
 	while (1) {
-		s32_t wait_time = attempt_read_from_stdin();
+		int32_t wait_time = attempt_read_from_stdin();
 
 		k_sleep(wait_time);
 	}
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index e882ca37dd..2cb98e69ce 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -117,7 +117,7 @@ extern void __printk_hook_install(int (*fn)(int));
 #if defined(CONFIG_CONSOLE_HANDLER)
 static struct k_fifo *avail_queue;
 static struct k_fifo *lines_queue;
-static u8_t (*completion_cb)(char *line, u8_t len);
+static uint8_t (*completion_cb)(char *line, uint8_t len);
 
 /* Control characters */
 #define BS                 0x08
@@ -134,7 +134,7 @@ static u8_t (*completion_cb)(char *line, u8_t len);
 #define ANSI_HOME          'H'
 #define ANSI_DEL           '~'
 
-static int read_uart(struct device *uart, u8_t *buf, unsigned int size)
+static int read_uart(struct device *uart, uint8_t *buf, unsigned int size)
 {
 	int rx;
 
@@ -169,7 +169,7 @@ static inline void cursor_restore(void)
 	printk("\x1b[u");
 }
 
-static void insert_char(char *pos, char c, u8_t end)
+static void insert_char(char *pos, char c, uint8_t end)
 {
 	char tmp;
 
@@ -197,7 +197,7 @@ static void insert_char(char *pos, char c, u8_t end)
 	cursor_restore();
 }
 
-static void del_char(char *pos, u8_t end)
+static void del_char(char *pos, uint8_t end)
 {
 	uart_poll_out(uart_console_dev, '\b');
 
@@ -236,9 +236,9 @@ enum {
 
 static atomic_t esc_state;
 static unsigned int ansi_val, ansi_val_2;
-static u8_t cur, end;
+static uint8_t cur, end;
 
-static void handle_ansi(u8_t byte, char *line)
+static void handle_ansi(uint8_t byte, char *line)
 {
 	if (atomic_test_and_clear_bit(&esc_state, ESC_ANSI_FIRST)) {
 		if (!isdigit(byte)) {
@@ -441,7 +441,7 @@ static void uart_console_isr(struct device *unused)
 	while (uart_irq_update(uart_console_dev) &&
 	       uart_irq_is_pending(uart_console_dev)) {
 		static struct console_input *cmd;
-		u8_t byte;
+		uint8_t byte;
 		int rx;
 
 		if (!uart_irq_rx_ready(uart_console_dev)) {
@@ -539,7 +539,7 @@ static void uart_console_isr(struct device *unused)
 
 static void console_input_init(void)
 {
-	u8_t c;
+	uint8_t c;
 
 	uart_irq_rx_disable(uart_console_dev);
 	uart_irq_tx_disable(uart_console_dev);
@@ -555,7 +555,7 @@ static void console_input_init(void)
 }
 
 void uart_register_input(struct k_fifo *avail, struct k_fifo *lines,
-			 u8_t (*completion)(char *str, u8_t len))
+			 uint8_t (*completion)(char *str, uint8_t len))
 {
 	avail_queue = avail;
 	lines_queue = lines;
@@ -611,7 +611,7 @@ static int uart_console_init(struct device *arg)
 
 #if defined(CONFIG_USB_UART_DTR_WAIT)
 	while (1) {
-		u32_t dtr = 0U;
+		uint32_t dtr = 0U;
 
 		uart_line_ctrl_get(uart_console_dev, UART_LINE_CTRL_DTR, &dtr);
 		if (dtr) {
diff --git a/drivers/console/uart_mcumgr.c b/drivers/console/uart_mcumgr.c
index 40416005f5..f265e59862 100644
--- a/drivers/console/uart_mcumgr.c
+++ b/drivers/console/uart_mcumgr.c
@@ -73,7 +73,7 @@ static int uart_mcumgr_read_chunk(void *buf, int capacity)
 /**
  * Processes a single incoming byte.
  */
-static struct uart_mcumgr_rx_buf *uart_mcumgr_rx_byte(u8_t byte)
+static struct uart_mcumgr_rx_buf *uart_mcumgr_rx_byte(uint8_t byte)
 {
 	struct uart_mcumgr_rx_buf *rx_buf;
 
@@ -118,7 +118,7 @@ static struct uart_mcumgr_rx_buf *uart_mcumgr_rx_byte(u8_t byte)
 static void uart_mcumgr_isr(struct device *unused)
 {
 	struct uart_mcumgr_rx_buf *rx_buf;
-	u8_t buf[32];
+	uint8_t buf[32];
 	int chunk_len;
 	int i;
 
@@ -146,7 +146,7 @@ static void uart_mcumgr_isr(struct device *unused)
  */
 static int uart_mcumgr_send_raw(const void *data, int len, void *arg)
 {
-	const u8_t *u8p;
+	const uint8_t *u8p;
 
 	u8p = data;
 	while (len--) {
@@ -156,14 +156,14 @@ static int uart_mcumgr_send_raw(const void *data, int len, void *arg)
 	return 0;
 }
 
-int uart_mcumgr_send(const u8_t *data, int len)
+int uart_mcumgr_send(const uint8_t *data, int len)
 {
 	return mcumgr_serial_tx_pkt(data, len, uart_mcumgr_send_raw, NULL);
 }
 
 static void uart_mcumgr_setup(struct device *uart)
 {
-	u8_t c;
+	uint8_t c;
 
 	uart_irq_rx_disable(uart);
 	uart_irq_tx_disable(uart);
diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c
index b7abd833b6..f52bcabe8a 100644
--- a/drivers/console/uart_mux.c
+++ b/drivers/console/uart_mux.c
@@ -60,7 +60,7 @@ struct uart_mux {
 	atomic_t init_done;
 
 	/* Temporary buffer when reading data in ISR */
-	u8_t rx_buf[CONFIG_UART_MUX_TEMP_BUF_SIZE];
+	uint8_t rx_buf[CONFIG_UART_MUX_TEMP_BUF_SIZE];
 };
 
 #define DEFINE_UART_MUX(x, _)						\
@@ -154,7 +154,7 @@ static void uart_mux_cb_work(struct k_work *work)
 static void uart_mux_rx_work(struct k_work *work)
 {
 	struct uart_mux *uart_mux;
-	u8_t *data;
+	uint8_t *data;
 	size_t len;
 	int ret;
 
@@ -191,7 +191,7 @@ static void uart_mux_tx_work(struct k_work *work)
 {
 	struct uart_mux_dev_data *dev_data =
 		CONTAINER_OF(work, struct uart_mux_dev_data, tx_work);
-	u8_t *data;
+	uint8_t *data;
 	size_t len;
 
 	len = ring_buf_get_claim(dev_data->tx_ringbuf, &data,
@@ -271,7 +271,7 @@ static void uart_mux_isr(void *user_data)
 
 static void uart_mux_flush_isr(struct device *dev)
 {
-	u8_t c;
+	uint8_t c;
 
 	while (uart_fifo_read(dev, &c, 1) > 0) {
 		continue;
@@ -460,7 +460,7 @@ static int uart_mux_config_get(struct device *dev, struct uart_config *cfg)
 	return -ENOTSUP;
 }
 
-static int uart_mux_fifo_fill(struct device *dev, const u8_t *tx_data, int len)
+static int uart_mux_fifo_fill(struct device *dev, const uint8_t *tx_data, int len)
 {
 	struct uart_mux_dev_data *dev_data;
 	size_t wrote;
@@ -494,10 +494,10 @@ static int uart_mux_fifo_fill(struct device *dev, const u8_t *tx_data, int len)
 	return wrote;
 }
 
-static int uart_mux_fifo_read(struct device *dev, u8_t *rx_data, const int size)
+static int uart_mux_fifo_read(struct device *dev, uint8_t *rx_data, const int size)
 {
 	struct uart_mux_dev_data *dev_data;
-	u32_t len;
+	uint32_t len;
 
 	if (dev == NULL) {
 		return -EINVAL;
@@ -728,7 +728,7 @@ struct device *z_impl_uart_mux_find(int dlci_address)
 	return NULL;
 }
 
-int uart_mux_send(struct device *uart, const u8_t *buf, size_t size)
+int uart_mux_send(struct device *uart, const uint8_t *buf, size_t size)
 {
 	struct uart_mux_dev_data *dev_data = DEV_DATA(uart);
 
@@ -759,7 +759,7 @@ int uart_mux_send(struct device *uart, const u8_t *buf, size_t size)
 	return 0;
 }
 
-int uart_mux_recv(struct device *mux, struct gsm_dlci *dlci, u8_t *data,
+int uart_mux_recv(struct device *mux, struct gsm_dlci *dlci, uint8_t *data,
 		  size_t len)
 {
 	struct uart_mux_dev_data *dev_data = DEV_DATA(mux);
diff --git a/drivers/console/uart_mux_internal.h b/drivers/console/uart_mux_internal.h
index 1e6551d613..a1e7ceaa5e 100644
--- a/drivers/console/uart_mux_internal.h
+++ b/drivers/console/uart_mux_internal.h
@@ -20,7 +20,7 @@ extern "C" {
  *
  * @return 0 if data was sent, <0 if error
  */
-int uart_mux_send(struct device *uart, const u8_t *buf, size_t size);
+int uart_mux_send(struct device *uart, const uint8_t *buf, size_t size);
 
 /**
  * @brief Receive unmuxed data.
@@ -34,7 +34,7 @@ int uart_mux_send(struct device *uart, const u8_t *buf, size_t size);
  * @retval <0 Error
  */
 int uart_mux_recv(struct device *mux, struct gsm_dlci *dlci,
-			    u8_t *data, size_t len);
+			    uint8_t *data, size_t len);
 
 #ifdef __cplusplus
 }
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index 629f988f23..23b15b09f9 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL);
 
 static struct device *uart_pipe_dev;
 
-static u8_t *recv_buf;
+static uint8_t *recv_buf;
 static size_t recv_buf_len;
 static uart_pipe_recv_cb app_cb;
 static size_t recv_off;
@@ -64,7 +64,7 @@ static void uart_pipe_isr(struct device *dev)
 	}
 }
 
-int uart_pipe_send(const u8_t *data, int len)
+int uart_pipe_send(const uint8_t *data, int len)
 {
 	LOG_HEXDUMP_DBG(data, len, "TX");
 
@@ -77,7 +77,7 @@ int uart_pipe_send(const u8_t *data, int len)
 
 static void uart_pipe_setup(struct device *uart)
 {
-	u8_t c;
+	uint8_t c;
 
 	uart_irq_rx_disable(uart);
 	uart_irq_tx_disable(uart);
@@ -92,7 +92,7 @@ static void uart_pipe_setup(struct device *uart)
 	uart_irq_rx_enable(uart);
 }
 
-void uart_pipe_register(u8_t *buf, size_t len, uart_pipe_recv_cb cb)
+void uart_pipe_register(uint8_t *buf, size_t len, uart_pipe_recv_cb cb)
 {
 	recv_buf = buf;
 	recv_buf_len = len;
diff --git a/drivers/counter/counter_cmos.c b/drivers/counter/counter_cmos.c
index 51d012b80d..9ed3c208da 100644
--- a/drivers/counter/counter_cmos.c
+++ b/drivers/counter/counter_cmos.c
@@ -32,7 +32,7 @@
  */
 
 struct state {
-	u8_t second,
+	uint8_t second,
 	     minute,
 	     hour,
 	     day,
@@ -54,7 +54,7 @@ struct state {
  * the members of 'struct state'.
  */
 
-const u8_t addrs[] = { 0, 2, 4, 7, 8, 9, 10, 11 };
+const uint8_t addrs[] = { 0, 2, 4, 7, 8, 9, 10, 11 };
 
 /*
  * Interesting bits in 'struct state'.
@@ -69,11 +69,11 @@ const u8_t addrs[] = { 0, 2, 4, 7, 8, 9, 10, 11 };
  * we have to spinlock to make the access atomic.
  */
 
-static u8_t read_register(u8_t addr)
+static uint8_t read_register(uint8_t addr)
 {
 	static struct k_spinlock lock;
 	k_spinlock_key_t k;
-	u8_t val;
+	uint8_t val;
 
 	k = k_spin_lock(&lock);
 	sys_out8(addr, X86_CMOS_ADDR);
@@ -88,9 +88,9 @@ static u8_t read_register(u8_t addr)
 void read_state(struct state *state)
 {
 	int i;
-	u8_t *p;
+	uint8_t *p;
 
-	p = (u8_t *) state;
+	p = (uint8_t *) state;
 	for (i = 0; i < sizeof(*state); ++i) {
 		*p++ = read_register(addrs[i]);
 	}
@@ -98,7 +98,7 @@ void read_state(struct state *state)
 
 /* Convert 8-bit (2-digit) BCD to binary equivalent. */
 
-static inline u8_t decode_bcd(u8_t val)
+static inline uint8_t decode_bcd(uint8_t val)
 {
 	return (((val >> 4) & 0x0F) * 10) + (val & 0x0F);
 }
@@ -107,7 +107,7 @@ static inline u8_t decode_bcd(u8_t val)
  * Hinnant's algorithm to calculate the number of days offset from the epoch.
  */
 
-static u32_t hinnant(int y, int m, int d)
+static uint32_t hinnant(int y, int m, int d)
 {
 	unsigned yoe;
 	unsigned doy;
@@ -128,13 +128,13 @@ static u32_t hinnant(int y, int m, int d)
  * This function is long, but linear and easy to follow.
  */
 
-int get_value(struct device *dev, u32_t *ticks)
+int get_value(struct device *dev, uint32_t *ticks)
 {
 	struct state state, state2;
-	u64_t *pun = (u64_t *) &state;
-	u64_t *pun2 = (u64_t *) &state2;
+	uint64_t *pun = (uint64_t *) &state;
+	uint64_t *pun2 = (uint64_t *) &state2;
 	bool pm;
-	u32_t epoch;
+	uint32_t epoch;
 
 	ARG_UNUSED(dev);
 
@@ -162,7 +162,7 @@ int get_value(struct device *dev, u32_t *ticks)
 	}
 
 	if (!(state.status_b & STATUS_B_BIN)) {
-		u8_t *cp = (u8_t *) &state;
+		uint8_t *cp = (uint8_t *) &state;
 		int i;
 
 		for (i = 0; i < NR_BCD_VALS; ++i) {
diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c
index 820a706d4d..e4ab3710f5 100644
--- a/drivers/counter/counter_gecko_rtcc.c
+++ b/drivers/counter/counter_gecko_rtcc.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(counter_gecko, CONFIG_COUNTER_LOG_LEVEL);
 struct counter_gecko_config {
 	struct counter_config_info info;
 	void (*irq_config)(void);
-	u32_t prescaler;
+	uint32_t prescaler;
 };
 
 struct counter_gecko_alarm_data {
@@ -52,9 +52,9 @@ struct counter_gecko_data {
 #endif
 
 /* Map channel id to CC channel provided by the RTCC module */
-static u8_t chan_id2cc_idx(u8_t chan_id)
+static uint8_t chan_id2cc_idx(uint8_t chan_id)
 {
-	u8_t cc_idx;
+	uint8_t cc_idx;
 
 	switch (chan_id) {
 	case 0:
@@ -85,7 +85,7 @@ static int counter_gecko_stop(struct device *dev)
 	return 0;
 }
 
-static int counter_gecko_get_value(struct device *dev, u32_t *ticks)
+static int counter_gecko_get_value(struct device *dev, uint32_t *ticks)
 {
 	ARG_UNUSED(dev);
 
@@ -97,8 +97,8 @@ static int counter_gecko_set_top_value(struct device *dev,
 				       const struct counter_top_cfg *cfg)
 {
 	struct counter_gecko_data *const dev_data = DEV_DATA(dev);
-	u32_t ticks;
-	u32_t flags;
+	uint32_t ticks;
+	uint32_t flags;
 	int err = 0;
 
 #ifdef CONFIG_SOC_GECKO_HAS_ERRATA_RTCC_E201
@@ -146,27 +146,27 @@ static int counter_gecko_set_top_value(struct device *dev,
 	return err;
 }
 
-static u32_t counter_gecko_get_top_value(struct device *dev)
+static uint32_t counter_gecko_get_top_value(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
 	return RTCC_ChannelCCVGet(1);
 }
 
-static u32_t counter_gecko_get_max_relative_alarm(struct device *dev)
+static uint32_t counter_gecko_get_max_relative_alarm(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
 	return RTCC_ChannelCCVGet(1);
 }
 
-static int counter_gecko_set_alarm(struct device *dev, u8_t chan_id,
+static int counter_gecko_set_alarm(struct device *dev, uint8_t chan_id,
 				   const struct counter_alarm_cfg *alarm_cfg)
 {
-	u32_t count = RTCC_CounterGet();
+	uint32_t count = RTCC_CounterGet();
 	struct counter_gecko_data *const dev_data = DEV_DATA(dev);
-	u32_t top_value = counter_gecko_get_top_value(dev);
-	u32_t ccv;
+	uint32_t top_value = counter_gecko_get_top_value(dev);
+	uint32_t ccv;
 
 	if ((top_value != 0) && (alarm_cfg->ticks > top_value)) {
 		return -EINVAL;
@@ -181,13 +181,13 @@ static int counter_gecko_set_alarm(struct device *dev, u8_t chan_id,
 		if (top_value == 0) {
 			ccv = count + alarm_cfg->ticks;
 		} else {
-			u64_t ccv64 = count + alarm_cfg->ticks;
+			uint64_t ccv64 = count + alarm_cfg->ticks;
 
-			ccv = (u32_t)(ccv64 % top_value);
+			ccv = (uint32_t)(ccv64 % top_value);
 		}
 	}
 
-	u8_t cc_idx = chan_id2cc_idx(chan_id);
+	uint8_t cc_idx = chan_id2cc_idx(chan_id);
 
 	RTCC_IntClear(RTCC_IF_CC0 << cc_idx);
 
@@ -204,11 +204,11 @@ static int counter_gecko_set_alarm(struct device *dev, u8_t chan_id,
 	return 0;
 }
 
-static int counter_gecko_cancel_alarm(struct device *dev, u8_t chan_id)
+static int counter_gecko_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	struct counter_gecko_data *const dev_data = DEV_DATA(dev);
 
-	u8_t cc_idx = chan_id2cc_idx(chan_id);
+	uint8_t cc_idx = chan_id2cc_idx(chan_id);
 
 	/* Disable the compare interrupt */
 	RTCC_IntDisable(RTCC_IF_CC0 << cc_idx);
@@ -224,7 +224,7 @@ static int counter_gecko_cancel_alarm(struct device *dev, u8_t chan_id)
 	return 0;
 }
 
-static u32_t counter_gecko_get_pending_int(struct device *dev)
+static uint32_t counter_gecko_get_pending_int(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
@@ -330,8 +330,8 @@ ISR_DIRECT_DECLARE(counter_gecko_isr_0)
 	struct device *const dev = DEVICE_GET(counter_gecko_0);
 	struct counter_gecko_data *const dev_data = DEV_DATA(dev);
 	counter_alarm_callback_t alarm_callback;
-	u32_t count = RTCC_CounterGet();
-	u32_t flags = RTCC_IntGetEnabled();
+	uint32_t count = RTCC_CounterGet();
+	uint32_t flags = RTCC_IntGetEnabled();
 
 	RTCC_IntClear(flags);
 
@@ -341,7 +341,7 @@ ISR_DIRECT_DECLARE(counter_gecko_isr_0)
 		}
 	}
 	for (int i = 0; i < RTCC_ALARM_NUM; i++) {
-		u8_t cc_idx = chan_id2cc_idx(i);
+		uint8_t cc_idx = chan_id2cc_idx(i);
 
 		if (flags & (RTCC_IF_CC0 << cc_idx)) {
 			if (dev_data->alarm[i].callback) {
diff --git a/drivers/counter/counter_handlers.c b/drivers/counter/counter_handlers.c
index 5f373972c6..0a78a54764 100644
--- a/drivers/counter/counter_handlers.c
+++ b/drivers/counter/counter_handlers.c
@@ -32,40 +32,40 @@ static inline bool z_vrfy_counter_is_counting_up(const struct device *dev)
 }
 #include <syscalls/counter_is_counting_up_mrsh.c>
 
-static inline u8_t z_vrfy_counter_get_num_of_channels(const struct device *dev)
+static inline uint8_t z_vrfy_counter_get_num_of_channels(const struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_get_num_of_channels((const struct device *)dev);
 }
 #include <syscalls/counter_get_num_of_channels_mrsh.c>
 
-static inline u32_t z_vrfy_counter_get_frequency(const struct device *dev)
+static inline uint32_t z_vrfy_counter_get_frequency(const struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_get_frequency((const struct device *)dev);
 }
 #include <syscalls/counter_get_frequency_mrsh.c>
 
-static inline u32_t z_vrfy_counter_us_to_ticks(const struct device *dev,
-					       u64_t us)
+static inline uint32_t z_vrfy_counter_us_to_ticks(const struct device *dev,
+					       uint64_t us)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_us_to_ticks((const struct device *)dev,
-					  (u64_t)us);
+					  (uint64_t)us);
 }
 #include <syscalls/counter_us_to_ticks_mrsh.c>
 
-static inline u64_t z_vrfy_counter_ticks_to_us(const struct device *dev,
-					       u32_t ticks)
+static inline uint64_t z_vrfy_counter_ticks_to_us(const struct device *dev,
+					       uint32_t ticks)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_ticks_to_us((const struct device *)dev,
-					  (u32_t)ticks);
+					  (uint32_t)ticks);
 }
 #include <syscalls/counter_ticks_to_us_mrsh.c>
 
 static inline int z_vrfy_counter_get_value(struct device *dev,
-					   u32_t *ticks)
+					   uint32_t *ticks)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_value));
 	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(ticks, sizeof(*ticks)));
@@ -74,7 +74,7 @@ static inline int z_vrfy_counter_get_value(struct device *dev,
 #include <syscalls/counter_get_value_mrsh.c>
 
 static inline int z_vrfy_counter_set_channel_alarm(struct device *dev,
-			u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg)
+			uint8_t chan_id, const struct counter_alarm_cfg *alarm_cfg)
 {
 	struct counter_alarm_cfg cfg_copy;
 
@@ -83,17 +83,17 @@ static inline int z_vrfy_counter_set_channel_alarm(struct device *dev,
 	Z_OOPS(Z_SYSCALL_VERIFY_MSG(cfg_copy.callback == 0,
 				    "callbacks may not be set from user mode"));
 	return z_impl_counter_set_channel_alarm((struct device *)dev,
-		(u8_t)chan_id, (const struct counter_alarm_cfg *)&cfg_copy);
+		(uint8_t)chan_id, (const struct counter_alarm_cfg *)&cfg_copy);
 
 }
 #include <syscalls/counter_set_channel_alarm_mrsh.c>
 
 static inline int z_vrfy_counter_cancel_channel_alarm(struct device *dev,
-						      u8_t chan_id)
+						      uint8_t chan_id)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, cancel_alarm));
 	return z_vrfy_counter_cancel_channel_alarm((struct device *)dev,
-						   (u8_t)chan_id);
+						   (uint8_t)chan_id);
 }
 #include <syscalls/counter_cancel_channel_alarm_mrsh.c>
 
@@ -113,29 +113,29 @@ static inline int z_vrfy_counter_set_top_value(struct device *dev,
 }
 #include <syscalls/counter_set_top_value_mrsh.c>
 
-static inline u32_t z_vrfy_counter_get_top_value(struct device *dev)
+static inline uint32_t z_vrfy_counter_get_top_value(struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_top_value));
 	return z_impl_counter_get_top_value((struct device *)dev);
 }
 #include <syscalls/counter_get_top_value_mrsh.c>
 
-static inline u32_t z_vrfy_counter_get_max_top_value(const struct device *dev)
+static inline uint32_t z_vrfy_counter_get_max_top_value(const struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_get_max_top_value((struct device *)dev);
 }
 #include <syscalls/counter_get_max_top_value_mrsh.c>
 
-static inline u32_t z_vrfy_counter_get_max_relative_alarm(struct device *dev)
+static inline uint32_t z_vrfy_counter_get_max_relative_alarm(struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_COUNTER(dev, get_max_relative_alarm));
 	return z_impl_counter_get_max_relative_alarm((struct device *)dev);
 }
 #include <syscalls/counter_get_max_relative_alarm_mrsh.c>
 
-static inline u32_t z_vrfy_counter_get_guard_period(struct device *dev,
-							u32_t flags)
+static inline uint32_t z_vrfy_counter_get_guard_period(struct device *dev,
+							uint32_t flags)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_get_guard_period((struct device *)dev, flags);
@@ -143,7 +143,7 @@ static inline u32_t z_vrfy_counter_get_guard_period(struct device *dev,
 #include <syscalls/counter_get_guard_period_mrsh.c>
 
 static inline int z_vrfy_counter_set_guard_period(struct device *dev,
-						   u32_t ticks, u32_t flags)
+						   uint32_t ticks, uint32_t flags)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
 	return z_impl_counter_set_guard_period((struct device *)dev, ticks,
diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c
index 4a3b9beac5..583fed412f 100644
--- a/drivers/counter/counter_imx_epit.c
+++ b/drivers/counter/counter_imx_epit.c
@@ -15,7 +15,7 @@
 struct imx_epit_config {
 	struct counter_config_info info;
 	EPIT_Type *base;
-	u16_t prescaler;
+	uint16_t prescaler;
 };
 
 struct imx_epit_data {
@@ -87,7 +87,7 @@ static int imx_epit_stop(struct device *dev)
 	return 0;
 }
 
-static int imx_epit_get_value(struct device *dev, u32_t *ticks)
+static int imx_epit_get_value(struct device *dev, uint32_t *ticks)
 {
 	EPIT_Type *base = get_epit_config(dev)->base;
 
@@ -121,21 +121,21 @@ static int imx_epit_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t imx_epit_get_pending_int(struct device *dev)
+static uint32_t imx_epit_get_pending_int(struct device *dev)
 {
 	EPIT_Type *base = get_epit_config(dev)->base;
 
 	return EPIT_GetStatusFlag(base) ? 1U : 0U;
 }
 
-static u32_t imx_epit_get_top_value(struct device *dev)
+static uint32_t imx_epit_get_top_value(struct device *dev)
 {
 	EPIT_Type *base = get_epit_config(dev)->base;
 
 	return EPIT_GetCounterLoadValue(base);
 }
 
-static u32_t imx_epit_get_max_relative_alarm(struct device *dev)
+static uint32_t imx_epit_get_max_relative_alarm(struct device *dev)
 {
 	return COUNTER_MAX_RELOAD;
 }
diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
index c9502ae702..9be39c6335 100644
--- a/drivers/counter/counter_ll_stm32_rtc.c
+++ b/drivers/counter/counter_ll_stm32_rtc.c
@@ -47,7 +47,7 @@ struct rtc_stm32_config {
 
 struct rtc_stm32_data {
 	counter_alarm_callback_t callback;
-	u32_t ticks;
+	uint32_t ticks;
 	void *user_data;
 };
 
@@ -80,11 +80,11 @@ static int rtc_stm32_stop(struct device *dev)
 }
 
 
-static u32_t rtc_stm32_read(struct device *dev)
+static uint32_t rtc_stm32_read(struct device *dev)
 {
 	struct tm now = { 0 };
 	time_t ts;
-	u32_t rtc_date, rtc_time, ticks;
+	uint32_t rtc_date, rtc_time, ticks;
 
 	ARG_UNUSED(dev);
 
@@ -116,13 +116,13 @@ static u32_t rtc_stm32_read(struct device *dev)
 	return ticks;
 }
 
-static int rtc_stm32_get_value(struct device *dev, u32_t *ticks)
+static int rtc_stm32_get_value(struct device *dev, uint32_t *ticks)
 {
 	*ticks = rtc_stm32_read(dev);
 	return 0;
 }
 
-static int rtc_stm32_set_alarm(struct device *dev, u8_t chan_id,
+static int rtc_stm32_set_alarm(struct device *dev, uint8_t chan_id,
 				const struct counter_alarm_cfg *alarm_cfg)
 {
 	struct tm alarm_tm;
@@ -130,8 +130,8 @@ static int rtc_stm32_set_alarm(struct device *dev, u8_t chan_id,
 	LL_RTC_AlarmTypeDef rtc_alarm;
 	struct rtc_stm32_data *data = DEV_DATA(dev);
 
-	u32_t now = rtc_stm32_read(dev);
-	u32_t ticks = alarm_cfg->ticks;
+	uint32_t now = rtc_stm32_read(dev);
+	uint32_t ticks = alarm_cfg->ticks;
 
 	if (data->callback != NULL) {
 		LOG_DBG("Alarm busy\n");
@@ -185,7 +185,7 @@ static int rtc_stm32_set_alarm(struct device *dev, u8_t chan_id,
 }
 
 
-static int rtc_stm32_cancel_alarm(struct device *dev, u8_t chan_id)
+static int rtc_stm32_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	LL_RTC_DisableWriteProtection(RTC);
 	LL_RTC_ClearFlag_ALRA(RTC);
@@ -199,13 +199,13 @@ static int rtc_stm32_cancel_alarm(struct device *dev, u8_t chan_id)
 }
 
 
-static u32_t rtc_stm32_get_pending_int(struct device *dev)
+static uint32_t rtc_stm32_get_pending_int(struct device *dev)
 {
 	return LL_RTC_IsActiveFlag_ALRA(RTC) != 0;
 }
 
 
-static u32_t rtc_stm32_get_top_value(struct device *dev)
+static uint32_t rtc_stm32_get_top_value(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 
@@ -229,7 +229,7 @@ static int rtc_stm32_set_top_value(struct device *dev,
 }
 
 
-static u32_t rtc_stm32_get_max_relative_alarm(struct device *dev)
+static uint32_t rtc_stm32_get_max_relative_alarm(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 
@@ -243,7 +243,7 @@ void rtc_stm32_isr(void *arg)
 	struct rtc_stm32_data *data = DEV_DATA(dev);
 	counter_alarm_callback_t alarm_callback = data->callback;
 
-	u32_t now = rtc_stm32_read(dev);
+	uint32_t now = rtc_stm32_read(dev);
 
 	if (LL_RTC_IsActiveFlag_ALRA(RTC) != 0) {
 
diff --git a/drivers/counter/counter_mchp_xec.c b/drivers/counter/counter_mchp_xec.c
index 35149422d5..b525dcfb87 100644
--- a/drivers/counter/counter_mchp_xec.c
+++ b/drivers/counter/counter_mchp_xec.c
@@ -33,10 +33,10 @@ LOG_MODULE_REGISTER(counter_mchp_xec, CONFIG_COUNTER_LOG_LEVEL);
 struct counter_xec_config {
 	struct counter_config_info info;
 	void (*config_func)(void);
-	u32_t base_address;
-	u16_t prescaler;
-	u8_t girq_id;
-	u8_t girq_bit;
+	uint32_t base_address;
+	uint16_t prescaler;
+	uint8_t girq_id;
+	uint8_t girq_bit;
 };
 
 struct counter_xec_data {
@@ -98,7 +98,7 @@ static int counter_xec_stop(struct device *dev)
 	return 0;
 }
 
-static int counter_xec_get_value(struct device *dev, u32_t *ticks)
+static int counter_xec_get_value(struct device *dev, uint32_t *ticks)
 {
 	BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev);
 
@@ -106,7 +106,7 @@ static int counter_xec_get_value(struct device *dev, u32_t *ticks)
 	return 0;
 }
 
-static int counter_xec_set_alarm(struct device *dev, u8_t chan_id,
+static int counter_xec_set_alarm(struct device *dev, uint8_t chan_id,
 				 const struct counter_alarm_cfg *alarm_cfg)
 {
 	BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev);
@@ -151,7 +151,7 @@ static int counter_xec_set_alarm(struct device *dev, u8_t chan_id,
 }
 
 
-static int counter_xec_cancel_alarm(struct device *dev, u8_t chan_id)
+static int counter_xec_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev);
 	struct counter_xec_data *data = COUNTER_XEC_DATA(dev);
@@ -172,14 +172,14 @@ static int counter_xec_cancel_alarm(struct device *dev, u8_t chan_id)
 	return 0;
 }
 
-static u32_t counter_xec_get_pending_int(struct device *dev)
+static uint32_t counter_xec_get_pending_int(struct device *dev)
 {
 	BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev);
 
 	return counter->STS;
 }
 
-static u32_t counter_xec_get_top_value(struct device *dev)
+static uint32_t counter_xec_get_top_value(struct device *dev)
 {
 	BTMR_Type *counter = COUNTER_XEC_REG_BASE(dev);
 
@@ -241,7 +241,7 @@ static int counter_xec_set_top_value(struct device *dev,
 	return ret;
 }
 
-static u32_t counter_xec_get_max_relative_alarm(struct device *dev)
+static uint32_t counter_xec_get_max_relative_alarm(struct device *dev)
 {
 	const struct counter_xec_config *counter_cfg = COUNTER_XEC_CONFIG(dev);
 
diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c
index 8315c234ea..a418cc382b 100644
--- a/drivers/counter/counter_mcux_gpt.c
+++ b/drivers/counter/counter_mcux_gpt.c
@@ -44,7 +44,7 @@ static int mcux_gpt_stop(struct device *dev)
 	return 0;
 }
 
-static int mcux_gpt_get_value(struct device *dev, u32_t *ticks)
+static int mcux_gpt_get_value(struct device *dev, uint32_t *ticks)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 
@@ -52,14 +52,14 @@ static int mcux_gpt_get_value(struct device *dev, u32_t *ticks)
 	return 0;
 }
 
-static int mcux_gpt_set_alarm(struct device *dev, u8_t chan_id,
+static int mcux_gpt_set_alarm(struct device *dev, uint8_t chan_id,
 			      const struct counter_alarm_cfg *alarm_cfg)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 	struct mcux_gpt_data *data = dev->driver_data;
 
-	u32_t current = GPT_GetCurrentTimerCount(config->base);
-	u32_t ticks = alarm_cfg->ticks;
+	uint32_t current = GPT_GetCurrentTimerCount(config->base);
+	uint32_t ticks = alarm_cfg->ticks;
 
 	if (chan_id != 0) {
 		LOG_ERR("Invalid channel id");
@@ -84,7 +84,7 @@ static int mcux_gpt_set_alarm(struct device *dev, u8_t chan_id,
 	return 0;
 }
 
-static int mcux_gpt_cancel_alarm(struct device *dev, u8_t chan_id)
+static int mcux_gpt_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 	struct mcux_gpt_data *data = dev->driver_data;
@@ -105,8 +105,8 @@ void mcux_gpt_isr(void *p)
 	struct device *dev = p;
 	const struct mcux_gpt_config *config = dev->config_info;
 	struct mcux_gpt_data *data = dev->driver_data;
-	u32_t current = GPT_GetCurrentTimerCount(config->base);
-	u32_t status;
+	uint32_t current = GPT_GetCurrentTimerCount(config->base);
+	uint32_t status;
 
 	status =  GPT_GetStatusFlags(config->base, kGPT_OutputCompare1Flag |
 				     kGPT_RollOverFlag);
@@ -126,7 +126,7 @@ void mcux_gpt_isr(void *p)
 	}
 }
 
-static u32_t mcux_gpt_get_pending_int(struct device *dev)
+static uint32_t mcux_gpt_get_pending_int(struct device *dev)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 
@@ -153,14 +153,14 @@ static int mcux_gpt_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t mcux_gpt_get_top_value(struct device *dev)
+static uint32_t mcux_gpt_get_top_value(struct device *dev)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 
 	return config->info.max_top_value;
 }
 
-static u32_t mcux_gpt_get_max_relative_alarm(struct device *dev)
+static uint32_t mcux_gpt_get_max_relative_alarm(struct device *dev)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 
@@ -171,7 +171,7 @@ static int mcux_gpt_init(struct device *dev)
 {
 	const struct mcux_gpt_config *config = dev->config_info;
 	gpt_config_t gptConfig;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	/* Adjust divider to match expected freq */
 	clock_freq = CLOCK_GetFreq(config->clock_source);
diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c
index 5a2d093dd5..21662d76af 100644
--- a/drivers/counter/counter_mcux_lptmr.c
+++ b/drivers/counter/counter_mcux_lptmr.c
@@ -48,7 +48,7 @@ static int mcux_lptmr_stop(struct device *dev)
 	return 0;
 }
 
-static int mcux_lptmr_get_value(struct device *dev, u32_t *ticks)
+static int mcux_lptmr_get_value(struct device *dev, uint32_t *ticks)
 {
 	const struct mcux_lptmr_config *config = dev->config_info;
 
@@ -85,25 +85,25 @@ static int mcux_lptmr_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t mcux_lptmr_get_pending_int(struct device *dev)
+static uint32_t mcux_lptmr_get_pending_int(struct device *dev)
 {
 	const struct mcux_lptmr_config *config = dev->config_info;
-	u32_t mask = LPTMR_CSR_TCF_MASK | LPTMR_CSR_TIE_MASK;
-	u32_t flags;
+	uint32_t mask = LPTMR_CSR_TCF_MASK | LPTMR_CSR_TIE_MASK;
+	uint32_t flags;
 
 	flags = LPTMR_GetStatusFlags(config->base);
 
 	return ((flags & mask) == mask);
 }
 
-static u32_t mcux_lptmr_get_top_value(struct device *dev)
+static uint32_t mcux_lptmr_get_top_value(struct device *dev)
 {
 	const struct mcux_lptmr_config *config = dev->config_info;
 
 	return (config->base->CMR & LPTMR_CMR_COMPARE_MASK) + 1U;
 }
 
-static u32_t mcux_lptmr_get_max_relative_alarm(struct device *dev)
+static uint32_t mcux_lptmr_get_max_relative_alarm(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
@@ -116,7 +116,7 @@ static void mcux_lptmr_isr(void *arg)
 	struct device *dev = arg;
 	const struct mcux_lptmr_config *config = dev->config_info;
 	struct mcux_lptmr_data *data = dev->driver_data;
-	u32_t flags;
+	uint32_t flags;
 
 	flags = LPTMR_GetStatusFlags(config->base);
 	LPTMR_ClearStatusFlags(config->base, flags);
diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c
index b8d4faba68..768c4ead9b 100644
--- a/drivers/counter/counter_mcux_rtc.c
+++ b/drivers/counter/counter_mcux_rtc.c
@@ -59,13 +59,13 @@ static int mcux_rtc_stop(struct device *dev)
 	return 0;
 }
 
-static u32_t mcux_rtc_read(struct device *dev)
+static uint32_t mcux_rtc_read(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 	const struct mcux_rtc_config *config =
 		CONTAINER_OF(info, struct mcux_rtc_config, info);
 
-	u32_t ticks = config->base->TSR;
+	uint32_t ticks = config->base->TSR;
 
 	/*
 	 * Read TSR seconds twice in case it glitches during an update.
@@ -81,13 +81,13 @@ static u32_t mcux_rtc_read(struct device *dev)
 	return ticks;
 }
 
-static int mcux_rtc_get_value(struct device *dev, u32_t *ticks)
+static int mcux_rtc_get_value(struct device *dev, uint32_t *ticks)
 {
 	*ticks = mcux_rtc_read(dev);
 	return 0;
 }
 
-static int mcux_rtc_set_alarm(struct device *dev, u8_t chan_id,
+static int mcux_rtc_set_alarm(struct device *dev, uint8_t chan_id,
 			      const struct counter_alarm_cfg *alarm_cfg)
 {
 	const struct counter_config_info *info = dev->config_info;
@@ -95,8 +95,8 @@ static int mcux_rtc_set_alarm(struct device *dev, u8_t chan_id,
 		CONTAINER_OF(info, struct mcux_rtc_config, info);
 	struct mcux_rtc_data *data = dev->driver_data;
 
-	u32_t ticks = alarm_cfg->ticks;
-	u32_t current = mcux_rtc_read(dev);
+	uint32_t ticks = alarm_cfg->ticks;
+	uint32_t current = mcux_rtc_read(dev);
 
 	LOG_DBG("Current time is %d ticks", current);
 
@@ -127,7 +127,7 @@ static int mcux_rtc_set_alarm(struct device *dev, u8_t chan_id,
 	return 0;
 }
 
-static int mcux_rtc_cancel_alarm(struct device *dev, u8_t chan_id)
+static int mcux_rtc_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	struct mcux_rtc_data *data = dev->driver_data;
 
@@ -166,7 +166,7 @@ static int mcux_rtc_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t mcux_rtc_get_pending_int(struct device *dev)
+static uint32_t mcux_rtc_get_pending_int(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 	const struct mcux_rtc_config *config =
@@ -175,14 +175,14 @@ static u32_t mcux_rtc_get_pending_int(struct device *dev)
 	return RTC_GetStatusFlags(config->base) & RTC_SR_TAF_MASK;
 }
 
-static u32_t mcux_rtc_get_top_value(struct device *dev)
+static uint32_t mcux_rtc_get_top_value(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 
 	return info->max_top_value;
 }
 
-static u32_t mcux_rtc_get_max_relative_alarm(struct device *dev)
+static uint32_t mcux_rtc_get_max_relative_alarm(struct device *dev)
 {
 	const struct counter_config_info *info = dev->config_info;
 
@@ -197,7 +197,7 @@ static void mcux_rtc_isr(void *arg)
 		CONTAINER_OF(info, struct mcux_rtc_config, info);
 	struct mcux_rtc_data *data = dev->driver_data;
 	counter_alarm_callback_t cb;
-	u32_t current = mcux_rtc_read(dev);
+	uint32_t current = mcux_rtc_read(dev);
 
 
 	LOG_DBG("Current time is %d ticks", current);
diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c
index 3478196fc3..9010ca971f 100644
--- a/drivers/counter/counter_nrfx_rtc.c
+++ b/drivers/counter/counter_nrfx_rtc.c
@@ -39,12 +39,12 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_COUNTER_LOG_LEVEL);
 struct counter_nrfx_data {
 	counter_top_callback_t top_cb;
 	void *top_user_data;
-	u32_t top;
-	u32_t guard_period;
+	uint32_t top;
+	uint32_t guard_period;
 	/* Store channel interrupt pending and CC adjusted flags. */
 	atomic_t ipend_adj;
 #if CONFIG_COUNTER_RTC_WITH_PPI_WRAP
-	u8_t ppi_ch;
+	uint8_t ppi_ch;
 #endif
 };
 
@@ -92,19 +92,19 @@ static int stop(struct device *dev)
 	return 0;
 }
 
-static u32_t read(struct device *dev)
+static uint32_t read(struct device *dev)
 {
 	return nrf_rtc_counter_get(get_nrfx_config(dev)->rtc);
 }
 
-static int get_value(struct device *dev, u32_t *ticks)
+static int get_value(struct device *dev, uint32_t *ticks)
 {
 	*ticks = read(dev);
 	return 0;
 }
 
 /* Return true if value equals 2^n - 1 */
-static inline bool is_bit_mask(u32_t val)
+static inline bool is_bit_mask(uint32_t val)
 {
 	return !(val & (val + 1));
 }
@@ -112,7 +112,7 @@ static inline bool is_bit_mask(u32_t val)
 /* Function calculates distance between to values assuming that one first
  * argument is in front and that values wrap.
  */
-static u32_t ticks_sub(struct device *dev, u32_t val, u32_t old, u32_t top)
+static uint32_t ticks_sub(struct device *dev, uint32_t val, uint32_t old, uint32_t top)
 {
 	if (IS_FIXED_TOP(dev)) {
 		return (val - old) & COUNTER_MAX_TOP_VALUE;
@@ -125,7 +125,7 @@ static u32_t ticks_sub(struct device *dev, u32_t val, u32_t old, u32_t top)
 
 }
 
-static u32_t skip_zero_on_custom_top(u32_t val, u32_t top)
+static uint32_t skip_zero_on_custom_top(uint32_t val, uint32_t top)
 {
 	/* From Product Specification: If a CC register value is 0 when
 	 * a CLEAR task is set, this will not trigger a COMPARE event.
@@ -137,9 +137,9 @@ static u32_t skip_zero_on_custom_top(u32_t val, u32_t top)
 	return val;
 }
 
-static u32_t ticks_add(struct device *dev, u32_t val1, u32_t val2, u32_t top)
+static uint32_t ticks_add(struct device *dev, uint32_t val1, uint32_t val2, uint32_t top)
 {
-	u32_t sum = val1 + val2;
+	uint32_t sum = val1 + val2;
 
 	if (IS_FIXED_TOP(dev)) {
 		ARG_UNUSED(top);
@@ -154,7 +154,7 @@ static u32_t ticks_add(struct device *dev, u32_t val1, u32_t val2, u32_t top)
 	return skip_zero_on_custom_top(sum, top);
 }
 
-static void set_cc_int_pending(struct device *dev, u8_t chan)
+static void set_cc_int_pending(struct device *dev, uint8_t chan)
 {
 	atomic_or(&get_dev_data(dev)->ipend_adj, BIT(chan));
 	NRFX_IRQ_PENDING_SET(NRFX_IRQ_NUMBER_GET(get_nrfx_config(dev)->rtc));
@@ -173,8 +173,8 @@ static void set_cc_int_pending(struct device *dev, u8_t chan)
  * is used in the callback to return original CC value which was requested by
  * the user.
  */
-static void handle_next_tick_case(struct device *dev, u8_t chan,
-				  u32_t now, u32_t val)
+static void handle_next_tick_case(struct device *dev, uint8_t chan,
+				  uint32_t now, uint32_t val)
 {
 	val = ticks_add(dev, val, 1, get_dev_data(dev)->top);
 	nrf_rtc_cc_set(get_nrfx_config(dev)->rtc, chan, val);
@@ -215,19 +215,19 @@ static void handle_next_tick_case(struct device *dev, u8_t chan,
  *		  enabled.
  *
  */
-static int set_cc(struct device *dev, u8_t chan, u32_t val, u32_t flags)
+static int set_cc(struct device *dev, uint8_t chan, uint32_t val, uint32_t flags)
 {
 	__ASSERT_NO_MSG(get_dev_data(dev)->guard_period <
 			get_dev_data(dev)->top);
 	NRF_RTC_Type  *rtc = get_nrfx_config(dev)->rtc;
 	nrf_rtc_event_t evt;
-	u32_t prev_val;
-	u32_t top;
-	u32_t now;
-	u32_t diff;
-	u32_t int_mask = RTC_CHANNEL_INT_MASK(chan);
+	uint32_t prev_val;
+	uint32_t top;
+	uint32_t now;
+	uint32_t diff;
+	uint32_t int_mask = RTC_CHANNEL_INT_MASK(chan);
 	int err = 0;
-	u32_t max_rel_val;
+	uint32_t max_rel_val;
 	bool absolute = flags & COUNTER_ALARM_CFG_ABSOLUTE;
 	bool irq_on_late;
 
@@ -321,7 +321,7 @@ static int set_cc(struct device *dev, u8_t chan, u32_t val, u32_t flags)
 	return err;
 }
 
-static int set_channel_alarm(struct device *dev, u8_t chan,
+static int set_channel_alarm(struct device *dev, uint8_t chan,
 			     const struct counter_alarm_cfg *alarm_cfg)
 {
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
@@ -342,7 +342,7 @@ static int set_channel_alarm(struct device *dev, u8_t chan,
 	return set_cc(dev, chan, alarm_cfg->ticks, alarm_cfg->flags);
 }
 
-static void disable(struct device *dev, u8_t chan)
+static void disable(struct device *dev, uint8_t chan)
 {
 	const struct counter_nrfx_config *config = get_nrfx_config(dev);
 	NRF_RTC_Type *rtc = config->rtc;
@@ -354,14 +354,14 @@ static void disable(struct device *dev, u8_t chan)
 	config->ch_data[chan].callback = NULL;
 }
 
-static int cancel_alarm(struct device *dev, u8_t chan_id)
+static int cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	disable(dev, chan_id);
 
 	return 0;
 }
 
-static int ppi_setup(struct device *dev, u8_t chan)
+static int ppi_setup(struct device *dev, uint8_t chan)
 {
 #if CONFIG_COUNTER_RTC_WITH_PPI_WRAP
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
@@ -386,8 +386,8 @@ static int ppi_setup(struct device *dev, u8_t chan)
 	nrf_rtc_publish_set(rtc->p_reg, evt, data->ppi_ch);
 	(void)nrfx_dppi_channel_enable(data->ppi_ch);
 #else /* DPPI_PRESENT */
-	u32_t evt_addr;
-	u32_t task_addr;
+	uint32_t evt_addr;
+	uint32_t task_addr;
 
 	evt_addr = nrf_rtc_event_address_get(rtc, evt);
 	task_addr = nrf_rtc_task_address_get(rtc, NRF_RTC_TASK_CLEAR);
@@ -404,11 +404,11 @@ static int ppi_setup(struct device *dev, u8_t chan)
 	return 0;
 }
 
-static void ppi_free(struct device *dev, u8_t chan)
+static void ppi_free(struct device *dev, uint8_t chan)
 {
 #if CONFIG_COUNTER_RTC_WITH_PPI_WRAP
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
-	u8_t ppi_ch = get_dev_data(dev)->ppi_ch;
+	uint8_t ppi_ch = get_dev_data(dev)->ppi_ch;
 	NRF_RTC_Type *rtc = nrfx_config->rtc;
 
 	if (!nrfx_config->use_ppi) {
@@ -468,7 +468,7 @@ static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg)
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
 	NRF_RTC_Type *rtc = nrfx_config->rtc;
 	struct counter_nrfx_data *dev_data = get_dev_data(dev);
-	u32_t top_ch = COUNTER_GET_TOP_CH(dev);
+	uint32_t top_ch = COUNTER_GET_TOP_CH(dev);
 	int err = 0;
 
 	if (IS_FIXED_TOP(dev)) {
@@ -517,12 +517,12 @@ static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg)
 	return err;
 }
 
-static u32_t get_pending_int(struct device *dev)
+static uint32_t get_pending_int(struct device *dev)
 {
 	return 0;
 }
 
-static int init_rtc(struct device *dev, u32_t prescaler)
+static int init_rtc(struct device *dev, uint32_t prescaler)
 {
 	struct device *clock;
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
@@ -550,22 +550,22 @@ static int init_rtc(struct device *dev, u32_t prescaler)
 	return err;
 }
 
-static u32_t get_top_value(struct device *dev)
+static uint32_t get_top_value(struct device *dev)
 {
 	return get_dev_data(dev)->top;
 }
 
-static u32_t get_max_relative_alarm(struct device *dev)
+static uint32_t get_max_relative_alarm(struct device *dev)
 {
 	return get_dev_data(dev)->top;
 }
 
-static u32_t get_guard_period(struct device *dev, u32_t flags)
+static uint32_t get_guard_period(struct device *dev, uint32_t flags)
 {
 	return get_dev_data(dev)->guard_period;
 }
 
-static int set_guard_period(struct device *dev, u32_t guard, u32_t flags)
+static int set_guard_period(struct device *dev, uint32_t guard, uint32_t flags)
 {
 	get_dev_data(dev)->guard_period = guard;
 	return 0;
@@ -597,11 +597,11 @@ static void top_irq_handle(struct device *dev)
 	}
 }
 
-static void alarm_irq_handle(struct device *dev, u32_t chan)
+static void alarm_irq_handle(struct device *dev, uint32_t chan)
 {
 	NRF_RTC_Type *rtc = get_nrfx_config(dev)->rtc;
 	nrf_rtc_event_t evt = RTC_CHANNEL_EVENT_ADDR(chan);
-	u32_t int_mask = RTC_CHANNEL_INT_MASK(chan);
+	uint32_t int_mask = RTC_CHANNEL_INT_MASK(chan);
 	bool hw_irq_pending = nrf_rtc_event_check(rtc, evt) &&
 			      nrf_rtc_int_enable_check(rtc, int_mask);
 	bool sw_irq_pending = get_dev_data(dev)->ipend_adj & BIT(chan);
@@ -619,7 +619,7 @@ static void alarm_irq_handle(struct device *dev, u32_t chan)
 		chdata->callback = NULL;
 
 		if (cb) {
-			u32_t cc = nrf_rtc_cc_get(rtc, chan);
+			uint32_t cc = nrf_rtc_cc_get(rtc, chan);
 
 			if (get_dev_data(dev)->ipend_adj & CC_ADJ_MASK(chan)) {
 				cc = ticks_sub(dev, cc, 1,
@@ -635,7 +635,7 @@ static void irq_handler(struct device *dev)
 {
 	top_irq_handle(dev);
 
-	for (u32_t i = 0; i < counter_get_num_of_channels(dev); i++) {
+	for (uint32_t i = 0; i < counter_get_num_of_channels(dev); i++) {
 		alarm_irq_handle(dev, i);
 	}
 }
diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c
index a8cf16e9f9..2ec0937d61 100644
--- a/drivers/counter/counter_nrfx_timer.c
+++ b/drivers/counter/counter_nrfx_timer.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
 struct counter_nrfx_data {
 	counter_top_callback_t top_cb;
 	void *top_user_data;
-	u32_t guard_period;
+	uint32_t guard_period;
 	atomic_t cc_int_pending;
 };
 
@@ -78,17 +78,17 @@ static int stop(struct device *dev)
 	return 0;
 }
 
-static u32_t get_top_value(struct device *dev)
+static uint32_t get_top_value(struct device *dev)
 {
 	return nrf_timer_cc_get(get_nrfx_config(dev)->timer, TOP_CH);
 }
 
-static u32_t get_max_relative_alarm(struct device *dev)
+static uint32_t get_max_relative_alarm(struct device *dev)
 {
 	return get_top_value(dev);
 }
 
-static u32_t read(struct device *dev)
+static uint32_t read(struct device *dev)
 {
 	NRF_TIMER_Type *timer = get_nrfx_config(dev)->timer;
 
@@ -98,21 +98,21 @@ static u32_t read(struct device *dev)
 	return nrf_timer_cc_get(timer, COUNTER_READ_CC);
 }
 
-static int get_value(struct device *dev, u32_t *ticks)
+static int get_value(struct device *dev, uint32_t *ticks)
 {
 	*ticks = read(dev);
 	return 0;
 }
 
 /* Return true if value equals 2^n - 1 */
-static inline bool is_bit_mask(u32_t val)
+static inline bool is_bit_mask(uint32_t val)
 {
 	return !(val & (val + 1));
 }
 
-static u32_t ticks_add(u32_t val1, u32_t val2, u32_t top)
+static uint32_t ticks_add(uint32_t val1, uint32_t val2, uint32_t top)
 {
-	u32_t to_top;
+	uint32_t to_top;
 
 	if (likely(is_bit_mask(top))) {
 		return (val1 + val2) & top;
@@ -123,7 +123,7 @@ static u32_t ticks_add(u32_t val1, u32_t val2, u32_t top)
 	return (val2 <= to_top) ? val1 + val2 : val2 - to_top;
 }
 
-static u32_t ticks_sub(u32_t val, u32_t old, u32_t top)
+static uint32_t ticks_sub(uint32_t val, uint32_t old, uint32_t top)
 {
 	if (likely(is_bit_mask(top))) {
 		return (val - old) & top;
@@ -133,26 +133,26 @@ static u32_t ticks_sub(u32_t val, u32_t old, u32_t top)
 	return (val >= old) ? (val - old) : val + top + 1 - old;
 }
 
-static void set_cc_int_pending(struct device *dev, u8_t chan)
+static void set_cc_int_pending(struct device *dev, uint8_t chan)
 {
 	atomic_or(&get_dev_data(dev)->cc_int_pending, BIT(chan));
 	NRFX_IRQ_PENDING_SET(NRFX_IRQ_NUMBER_GET(get_nrfx_config(dev)->timer));
 }
 
-static int set_cc(struct device *dev, u8_t id, u32_t val, u32_t flags)
+static int set_cc(struct device *dev, uint8_t id, uint32_t val, uint32_t flags)
 {
 	__ASSERT_NO_MSG(get_dev_data(dev)->guard_period < get_top_value(dev));
 	bool absolute = flags & COUNTER_ALARM_CFG_ABSOLUTE;
 	bool irq_on_late;
 	NRF_TIMER_Type  *reg = get_nrfx_config(dev)->timer;
-	u8_t chan = ID_TO_CC(id);
+	uint8_t chan = ID_TO_CC(id);
 	nrf_timer_event_t evt = nrf_timer_compare_event_get(chan);
-	u32_t top = get_top_value(dev);
+	uint32_t top = get_top_value(dev);
 	int err = 0;
-	u32_t prev_val;
-	u32_t now;
-	u32_t diff;
-	u32_t max_rel_val;
+	uint32_t prev_val;
+	uint32_t now;
+	uint32_t diff;
+	uint32_t max_rel_val;
 
 	__ASSERT(nrf_timer_int_enable_check(reg,
 				nrf_timer_compare_int_get(chan)) == 0,
@@ -212,7 +212,7 @@ static int set_cc(struct device *dev, u8_t id, u32_t val, u32_t flags)
 	return err;
 }
 
-static int set_alarm(struct device *dev, u8_t chan,
+static int set_alarm(struct device *dev, uint8_t chan,
 			const struct counter_alarm_cfg *alarm_cfg)
 {
 	const struct counter_nrfx_config *nrfx_config = get_nrfx_config(dev);
@@ -232,10 +232,10 @@ static int set_alarm(struct device *dev, u8_t chan,
 	return set_cc(dev, chan, alarm_cfg->ticks, alarm_cfg->flags);
 }
 
-static int cancel_alarm(struct device *dev, u8_t chan_id)
+static int cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	const struct counter_nrfx_config *config = get_nrfx_config(dev);
-	u32_t int_mask =  nrf_timer_compare_int_get(ID_TO_CC(chan_id));
+	uint32_t int_mask =  nrf_timer_compare_int_get(ID_TO_CC(chan_id));
 
 	nrf_timer_int_disable(config->timer, int_mask);
 	config->ch_data[chan_id].callback = NULL;
@@ -282,7 +282,7 @@ static int set_top_value(struct device *dev, const struct counter_top_cfg *cfg)
 	return err;
 }
 
-static u32_t get_pending_int(struct device *dev)
+static uint32_t get_pending_int(struct device *dev)
 {
 	return 0;
 }
@@ -303,12 +303,12 @@ static int init_timer(struct device *dev,
 	return 0;
 }
 
-static u32_t get_guard_period(struct device *dev, u32_t flags)
+static uint32_t get_guard_period(struct device *dev, uint32_t flags)
 {
 	return get_dev_data(dev)->guard_period;
 }
 
-static int set_guard_period(struct device *dev, u32_t guard, u32_t flags)
+static int set_guard_period(struct device *dev, uint32_t guard, uint32_t flags)
 {
 	__ASSERT_NO_MSG(guard < get_top_value(dev));
 
@@ -329,11 +329,11 @@ static void top_irq_handle(struct device *dev)
 	}
 }
 
-static void alarm_irq_handle(struct device *dev, u32_t id)
+static void alarm_irq_handle(struct device *dev, uint32_t id)
 {
-	u32_t cc = ID_TO_CC(id);
+	uint32_t cc = ID_TO_CC(id);
 	NRF_TIMER_Type *reg = get_nrfx_config(dev)->timer;
-	u32_t int_mask = nrf_timer_compare_int_get(cc);
+	uint32_t int_mask = nrf_timer_compare_int_get(cc);
 	nrf_timer_event_t evt = nrf_timer_compare_event_get(cc);
 	bool hw_irq_pending = nrf_timer_event_check(reg, evt) &&
 			      nrf_timer_int_enable_check(reg, int_mask);
@@ -352,7 +352,7 @@ static void alarm_irq_handle(struct device *dev, u32_t id)
 		chdata->callback = NULL;
 
 		if (cb) {
-			u32_t cc_val = nrf_timer_cc_get(reg, cc);
+			uint32_t cc_val = nrf_timer_cc_get(reg, cc);
 
 			cb(dev, id, cc_val, chdata->user_data);
 		}
@@ -363,7 +363,7 @@ static void irq_handler(struct device *dev)
 {
 	top_irq_handle(dev);
 
-	for (u32_t i = 0; i < counter_get_num_of_channels(dev); i++) {
+	for (uint32_t i = 0; i < counter_get_num_of_channels(dev); i++) {
 		alarm_irq_handle(dev, i);
 	}
 }
diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c
index c7abd983dd..a22269f31f 100644
--- a/drivers/counter/counter_sam0_tc32.c
+++ b/drivers/counter/counter_sam0_tc32.c
@@ -29,14 +29,14 @@ struct counter_sam0_tc32_config {
 	struct counter_config_info info;
 	TcCount32 *regs;
 #ifdef MCLK
-	volatile u32_t *mclk;
-	u32_t mclk_mask;
-	u16_t gclk_id;
+	volatile uint32_t *mclk;
+	uint32_t mclk_mask;
+	uint16_t gclk_id;
 #else
-	u32_t pm_apbcmask;
-	u16_t gclk_clkctrl_id;
+	uint32_t pm_apbcmask;
+	uint16_t gclk_clkctrl_id;
 #endif
-	u16_t prescaler;
+	uint16_t prescaler;
 
 	void (*irq_config_func)(struct device *dev);
 };
@@ -106,7 +106,7 @@ static int counter_sam0_tc32_stop(struct device *dev)
 	return 0;
 }
 
-static u32_t counter_sam0_tc32_read(struct device *dev)
+static uint32_t counter_sam0_tc32_read(struct device *dev)
 {
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
@@ -115,21 +115,21 @@ static u32_t counter_sam0_tc32_read(struct device *dev)
 	return tc->COUNT.reg;
 }
 
-static int counter_sam0_tc32_get_value(struct device *dev, u32_t *ticks)
+static int counter_sam0_tc32_get_value(struct device *dev, uint32_t *ticks)
 {
 	*ticks = counter_sam0_tc32_read(dev);
 	return 0;
 }
 
-static void counter_sam0_tc32_relative_alarm(struct device *dev, u32_t ticks)
+static void counter_sam0_tc32_relative_alarm(struct device *dev, uint32_t ticks)
 {
 	struct counter_sam0_tc32_data *data = DEV_DATA(dev);
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
-	u32_t before;
-	u32_t target;
-	u32_t after;
-	u32_t max;
+	uint32_t before;
+	uint32_t target;
+	uint32_t after;
+	uint32_t max;
 
 	read_synchronize_count(tc);
 	before = tc->COUNT.reg;
@@ -179,7 +179,7 @@ out_future:
 	tc->INTENSET.reg = TC_INTFLAG_MC1;
 }
 
-static int counter_sam0_tc32_set_alarm(struct device *dev, u8_t chan_id,
+static int counter_sam0_tc32_set_alarm(struct device *dev, uint8_t chan_id,
 				       const struct counter_alarm_cfg *alarm_cfg)
 {
 	struct counter_sam0_tc32_data *data = DEV_DATA(dev);
@@ -216,7 +216,7 @@ static int counter_sam0_tc32_set_alarm(struct device *dev, u8_t chan_id,
 	return 0;
 }
 
-static int counter_sam0_tc32_cancel_alarm(struct device *dev, u8_t chan_id)
+static int counter_sam0_tc32_cancel_alarm(struct device *dev, uint8_t chan_id)
 {
 	struct counter_sam0_tc32_data *data = DEV_DATA(dev);
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
@@ -280,7 +280,7 @@ static int counter_sam0_tc32_set_top_value(struct device *dev,
 	return err;
 }
 
-static u32_t counter_sam0_tc32_get_pending_int(struct device *dev)
+static uint32_t counter_sam0_tc32_get_pending_int(struct device *dev)
 {
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
@@ -288,7 +288,7 @@ static u32_t counter_sam0_tc32_get_pending_int(struct device *dev)
 	return tc->INTFLAG.reg & (TC_INTFLAG_MC0 | TC_INTFLAG_MC1);
 }
 
-static u32_t counter_sam0_tc32_get_top_value(struct device *dev)
+static uint32_t counter_sam0_tc32_get_top_value(struct device *dev)
 {
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
@@ -301,7 +301,7 @@ static u32_t counter_sam0_tc32_get_top_value(struct device *dev)
 	return tc->CC[0].reg;
 }
 
-static u32_t counter_sam0_tc32_get_max_relative_alarm(struct device *dev)
+static uint32_t counter_sam0_tc32_get_max_relative_alarm(struct device *dev)
 {
 	return counter_sam0_tc32_get_top_value(dev) - 1;
 }
@@ -312,7 +312,7 @@ static void counter_sam0_tc32_isr(void *arg)
 	struct counter_sam0_tc32_data *data = DEV_DATA(dev);
 	const struct counter_sam0_tc32_config *const cfg = DEV_CFG(dev);
 	TcCount32 *tc = cfg->regs;
-	u8_t status = tc->INTFLAG.reg;
+	uint8_t status = tc->INTFLAG.reg;
 
 	/* Acknowledge all interrupts */
 	tc->INTFLAG.reg = status;
diff --git a/drivers/counter/dualtimer_cmsdk_apb.h b/drivers/counter/dualtimer_cmsdk_apb.h
index c1bffab638..b30a8e39dc 100644
--- a/drivers/counter/dualtimer_cmsdk_apb.h
+++ b/drivers/counter/dualtimer_cmsdk_apb.h
@@ -14,41 +14,41 @@ extern "C" {
 
 struct dualtimer_cmsdk_apb {
 	/* Offset: 0x000 (R/W) Timer 1 Load */
-	volatile u32_t timer1load;
+	volatile uint32_t timer1load;
 	/* Offset: 0x004 (R/ ) Timer 1 Counter Current Value */
-	volatile u32_t timer1value;
+	volatile uint32_t timer1value;
 	/* Offset: 0x008 (R/W) Timer 1 Control */
-	volatile u32_t timer1ctrl;
+	volatile uint32_t timer1ctrl;
 	/* Offset: 0x00C ( /W) Timer 1 Interrupt Clear */
-	volatile u32_t timer1intclr;
+	volatile uint32_t timer1intclr;
 	/* Offset: 0x010 (R/ ) Timer 1 Raw Interrupt Status */
-	volatile u32_t timer1ris;
+	volatile uint32_t timer1ris;
 	/* Offset: 0x014 (R/ ) Timer 1 Masked Interrupt Status */
-	volatile u32_t timer1mis;
+	volatile uint32_t timer1mis;
 	/* Offset: 0x018 (R/W) Background Load Register */
-	volatile u32_t timer1bgload;
+	volatile uint32_t timer1bgload;
 	/* Reserved */
-	volatile u32_t reserved0;
+	volatile uint32_t reserved0;
 	/* Offset: 0x020 (R/W) Timer 2 Load */
-	volatile u32_t timer2load;
+	volatile uint32_t timer2load;
 	/* Offset: 0x024 (R/ ) Timer 2 Counter Current Value */
-	volatile u32_t timer2value;
+	volatile uint32_t timer2value;
 	/* Offset: 0x028 (R/W) Timer 2 Control */
-	volatile u32_t timer2ctrl;
+	volatile uint32_t timer2ctrl;
 	/* Offset: 0x02C ( /W) Timer 2 Interrupt Clear */
-	volatile u32_t timer2intclr;
+	volatile uint32_t timer2intclr;
 	/* Offset: 0x030 (R/ ) Timer 2 Raw Interrupt Status */
-	volatile u32_t timer2ris;
+	volatile uint32_t timer2ris;
 	/* Offset: 0x034 (R/ ) Timer 2 Masked Interrupt Status */
-	volatile u32_t timer2mis;
+	volatile uint32_t timer2mis;
 	/* Offset: 0x038 (R/W) Background Load Register */
-	volatile u32_t timer2bgload;
+	volatile uint32_t timer2bgload;
 	/* Reserved */
-	volatile u32_t reserved1[945];
+	volatile uint32_t reserved1[945];
 	/* Offset: 0xF00 (R/W) Integration Test Control Register */
-	volatile u32_t itcr;
+	volatile uint32_t itcr;
 	/* Offset: 0xF04 ( /W) Integration Test Output Set Register */
-	volatile u32_t itop;
+	volatile uint32_t itop;
 };
 
 #define DUALTIMER_CTRL_EN	(1 << 7)
diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c
index 5ef70bb3fa..cbe8ac3ca5 100644
--- a/drivers/counter/maxim_ds3231.c
+++ b/drivers/counter/maxim_ds3231.c
@@ -34,32 +34,32 @@ enum {
 };
 
 struct register_map {
-	u8_t sec;
-	u8_t min;
-	u8_t hour;
-	u8_t dow;
-	u8_t dom;
-	u8_t moncen;
-	u8_t year;
+	uint8_t sec;
+	uint8_t min;
+	uint8_t hour;
+	uint8_t dow;
+	uint8_t dom;
+	uint8_t moncen;
+	uint8_t year;
 
 	struct {
-		u8_t sec;
-		u8_t min;
-		u8_t hour;
-		u8_t date;
+		uint8_t sec;
+		uint8_t min;
+		uint8_t hour;
+		uint8_t date;
 	} __packed alarm1;
 
 	struct {
-		u8_t min;
-		u8_t hour;
-		u8_t date;
+		uint8_t min;
+		uint8_t hour;
+		uint8_t date;
 	} __packed alarm2;
 
-	u8_t ctrl;
-	u8_t ctrl_stat;
-	u8_t aging;
-	s8_t temp_units;
-	u8_t temp_frac256;
+	uint8_t ctrl;
+	uint8_t ctrl_stat;
+	uint8_t aging;
+	int8_t temp_units;
+	uint8_t temp_frac256;
 };
 
 struct gpios {
@@ -73,7 +73,7 @@ struct ds3231_config {
 	struct counter_config_info generic;
 	const char *bus_name;
 	struct gpios isw_gpios;
-	u16_t addr;
+	uint16_t addr;
 };
 
 struct ds3231_data {
@@ -96,14 +96,14 @@ struct ds3231_data {
 	struct gpio_callback isw_callback;
 
 	/* syncclock captured in the last ISW interrupt handler */
-	u32_t isw_syncclock;
+	uint32_t isw_syncclock;
 
 	struct maxim_ds3231_syncpoint syncpoint;
 	struct maxim_ds3231_syncpoint new_sp;
 
 	time_t rtc_registers;
 	time_t rtc_base;
-	u32_t syncclock_base;
+	uint32_t syncclock_base;
 
 	/* Pointer to the structure used to notify when a synchronize
 	 * or set operation completes.  Null when nobody's waiting for
@@ -118,20 +118,20 @@ struct ds3231_data {
 
 	/* Handlers and state when using the counter alarm API. */
 	counter_alarm_callback_t counter_handler[2];
-	u32_t counter_ticks[2];
+	uint32_t counter_ticks[2];
 
 	/* Handlers and state for DS3231 alarm API. */
 	maxim_ds3231_alarm_callback_handler_t alarm_handler[2];
 	void *alarm_user_data[2];
-	u8_t alarm_flags[2];
+	uint8_t alarm_flags[2];
 
 	/* Flags recording requests for ISW monitoring. */
-	u8_t isw_mon_req;
+	uint8_t isw_mon_req;
 #define ISW_MON_REQ_Alarm 0x01
 #define ISW_MON_REQ_Sync 0x02
 
 	/* Status of synchronization operations. */
-	u8_t sync_state;
+	uint8_t sync_state;
 	bool sync_signal;
 };
 
@@ -145,17 +145,17 @@ struct ds3231_data {
  * Caches and returns the value with the changes applied.
  */
 static int sc_ctrl(struct device *dev,
-		   u8_t set,
-		   u8_t clear)
+		   uint8_t set,
+		   uint8_t clear)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
 	struct register_map *rp = &data->registers;
-	u8_t ctrl = (rp->ctrl & ~clear) | set;
+	uint8_t ctrl = (rp->ctrl & ~clear) | set;
 	int rc = ctrl;
 
 	if (rp->ctrl != ctrl) {
-		u8_t buf[2] = {
+		uint8_t buf[2] = {
 			offsetof(struct register_map, ctrl),
 			ctrl,
 		};
@@ -169,8 +169,8 @@ static int sc_ctrl(struct device *dev,
 }
 
 int maxim_ds3231_ctrl_update(struct device *dev,
-			     u8_t set_bits,
-			     u8_t clear_bits)
+			     uint8_t set_bits,
+			     uint8_t clear_bits)
 {
 	struct ds3231_data *data = dev->driver_data;
 
@@ -195,25 +195,25 @@ int maxim_ds3231_ctrl_update(struct device *dev,
  * clears and sets).
  */
 static inline int rsc_stat(struct device *dev,
-			   u8_t set,
-			   u8_t clear)
+			   uint8_t set,
+			   uint8_t clear)
 {
-	u8_t const ign = MAXIM_DS3231_REG_STAT_OSF | MAXIM_DS3231_ALARM1
+	uint8_t const ign = MAXIM_DS3231_REG_STAT_OSF | MAXIM_DS3231_ALARM1
 			 | MAXIM_DS3231_ALARM2;
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
 	struct register_map *rp = &data->registers;
-	u8_t addr = offsetof(struct register_map, ctrl_stat);
+	uint8_t addr = offsetof(struct register_map, ctrl_stat);
 	int rc;
 
 	rc = i2c_write_read(data->i2c, cfg->addr,
 			    &addr, sizeof(addr),
 			    &rp->ctrl_stat, sizeof(rp->ctrl_stat));
 	if (rc >= 0) {
-		u8_t stat = rp->ctrl_stat & ~clear;
+		uint8_t stat = rp->ctrl_stat & ~clear;
 
 		if (rp->ctrl_stat != stat) {
-			u8_t buf[2] = {
+			uint8_t buf[2] = {
 				addr,
 				stat | (ign & ~(set | clear)),
 			};
@@ -227,8 +227,8 @@ static inline int rsc_stat(struct device *dev,
 }
 
 int maxim_ds3231_stat_update(struct device *dev,
-			     u8_t set_bits,
-			     u8_t clear_bits)
+			     uint8_t set_bits,
+			     uint8_t clear_bits)
 {
 	struct ds3231_data *data = dev->driver_data;
 
@@ -250,7 +250,7 @@ static void validate_isw_monitoring(struct device *dev)
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
 	const struct register_map *rp = &data->registers;
-	u8_t isw_mon_req = 0;
+	uint8_t isw_mon_req = 0;
 
 	if (rp->ctrl & (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2)) {
 		isw_mon_req |= ISW_MON_REQ_Alarm;
@@ -292,14 +292,14 @@ static void validate_isw_monitoring(struct device *dev)
 	}
 }
 
-static const u8_t *decode_time(struct tm *tp,
-			       const u8_t *rp,
+static const uint8_t *decode_time(struct tm *tp,
+			       const uint8_t *rp,
 			       bool with_sec)
 {
-	u8_t reg;
+	uint8_t reg;
 
 	if (with_sec) {
-		u8_t reg = *rp++;
+		uint8_t reg = *rp++;
 
 		tp->tm_sec = 10 * ((reg >> 4) & 0x07) + (reg & 0x0F);
 	}
@@ -325,7 +325,7 @@ static const u8_t *decode_time(struct tm *tp,
 	return rp;
 }
 
-static u8_t decode_alarm(const u8_t *ap,
+static uint8_t decode_alarm(const uint8_t *ap,
 			 bool with_sec,
 			 time_t *tp)
 {
@@ -337,9 +337,9 @@ static u8_t decode_alarm(const u8_t *ap,
 		 */
 		.tm_year = 78,
 	};
-	const u8_t *dp = decode_time(&tm, ap, with_sec);
-	u8_t flags = 0;
-	u8_t amf = MAXIM_DS3231_ALARM_FLAGS_IGNDA;
+	const uint8_t *dp = decode_time(&tm, ap, with_sec);
+	uint8_t flags = 0;
+	uint8_t amf = MAXIM_DS3231_ALARM_FLAGS_IGNDA;
 
 	/* Done decoding time, now decode day/date. */
 	if (REG_DAYDATE_DOW & *dp) {
@@ -372,13 +372,13 @@ static u8_t decode_alarm(const u8_t *ap,
 	return flags;
 }
 
-static int encode_alarm(u8_t *ap,
+static int encode_alarm(uint8_t *ap,
 			bool with_sec,
 			time_t time,
-			u8_t flags)
+			uint8_t flags)
 {
 	struct tm tm;
-	u8_t val;
+	uint8_t val;
 
 	(void)gmtime_r(&time, &tm);
 
@@ -427,7 +427,7 @@ static int encode_alarm(u8_t *ap,
 	return 0;
 }
 
-static u32_t decode_rtc(struct ds3231_data *data)
+static uint32_t decode_rtc(struct ds3231_data *data)
 {
 	struct tm tm = { 0 };
 	const struct register_map *rp = &data->registers;
@@ -450,9 +450,9 @@ static int update_registers(struct device *dev)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
-	u32_t syncclock;
+	uint32_t syncclock;
 	int rc;
-	u8_t addr = 0;
+	uint8_t addr = 0;
 
 	data->syncclock_base = maxim_ds3231_read_syncclock(dev);
 	rc = i2c_write_read(data->i2c, cfg->addr,
@@ -468,14 +468,14 @@ static int update_registers(struct device *dev)
 }
 
 int maxim_ds3231_get_alarm(struct device *dev,
-			   u8_t id,
+			   uint8_t id,
 			   struct maxim_ds3231_alarm *cp)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
 	int rv = 0;
-	u8_t addr;
-	u8_t len;
+	uint8_t addr;
+	uint8_t len;
 
 	if (id == 0) {
 		addr = offsetof(struct register_map, alarm1);
@@ -491,7 +491,7 @@ int maxim_ds3231_get_alarm(struct device *dev,
 	k_sem_take(&data->lock, K_FOREVER);
 
 	/* Update alarm structure */
-	u8_t *rbp = &data->registers.sec + addr;
+	uint8_t *rbp = &data->registers.sec + addr;
 
 	rv = i2c_write_read(data->i2c, cfg->addr,
 			    &addr, sizeof(addr),
@@ -515,7 +515,7 @@ out:
 }
 
 static int cancel_alarm(struct device *dev,
-			u8_t id)
+			uint8_t id)
 {
 	struct ds3231_data *data = dev->driver_data;
 
@@ -526,7 +526,7 @@ static int cancel_alarm(struct device *dev,
 }
 
 static int ds3231_counter_cancel_alarm(struct device *dev,
-				       u8_t id)
+				       uint8_t id)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
@@ -553,13 +553,13 @@ out:
 }
 
 static int set_alarm(struct device *dev,
-		     u8_t id,
+		     uint8_t id,
 		     const struct maxim_ds3231_alarm *cp)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
-	u8_t addr;
-	u8_t len;
+	uint8_t addr;
+	uint8_t len;
 
 	if (id == 0) {
 		addr = offsetof(struct register_map, alarm1);
@@ -571,7 +571,7 @@ static int set_alarm(struct device *dev,
 		return -EINVAL;
 	}
 
-	u8_t buf[5] = { addr };
+	uint8_t buf[5] = { addr };
 	int rc = encode_alarm(buf + 1, (id == 0), cp->time, cp->flags);
 
 	if (rc < 0) {
@@ -602,7 +602,7 @@ static int set_alarm(struct device *dev,
 }
 
 int maxim_ds3231_set_alarm(struct device *dev,
-			   u8_t id,
+			   uint8_t id,
 			   const struct maxim_ds3231_alarm *cp)
 {
 	struct ds3231_data *data = dev->driver_data;
@@ -620,7 +620,7 @@ int maxim_ds3231_check_alarms(struct device *dev)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct register_map *rp = &data->registers;
-	u8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2);
+	uint8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2);
 
 	k_sem_take(&data->lock, K_FOREVER);
 
@@ -642,7 +642,7 @@ static int check_handled_alarms(struct device *dev)
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct register_map *rp = &data->registers;
-	u8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2);
+	uint8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2);
 
 	/* Fetch and clear only the alarm flags that are
 	 * interrupt-enabled.  Leave any flags that are not enabled;
@@ -660,8 +660,8 @@ static int check_handled_alarms(struct device *dev)
 }
 
 static void counter_alarm_forwarder(struct device *dev,
-				    u8_t id,
-				    u32_t syncclock,
+				    uint8_t id,
+				    uint32_t syncclock,
 				    void *ud)
 {
 	/* Dummy handler marking a counter callback. */
@@ -679,7 +679,7 @@ static void alarm_worker(struct k_work *work)
 	int af = check_handled_alarms(ds3231);
 
 	while (af > 0) {
-		u8_t id;
+		uint8_t id;
 
 		for (id = 0; id < cfg->generic.channels; ++id) {
 			if ((af & (MAXIM_DS3231_ALARM1 << id)) == 0) {
@@ -700,7 +700,7 @@ static void alarm_worker(struct k_work *work)
 
 			if (handler == counter_alarm_forwarder) {
 				counter_alarm_callback_t cb = data->counter_handler[id];
-				u32_t ticks = data->counter_ticks[id];
+				uint32_t ticks = data->counter_ticks[id];
 
 				data->counter_handler[id] = NULL;
 				data->counter_ticks[id] = 0;
@@ -738,7 +738,7 @@ static void alarm_worker(struct k_work *work)
 static void sqw_worker(struct k_work *work)
 {
 	struct ds3231_data *data = CONTAINER_OF(work, struct ds3231_data, sqw_work);
-	u32_t syncclock = maxim_ds3231_read_syncclock(data->ds3231);
+	uint32_t syncclock = maxim_ds3231_read_syncclock(data->ds3231);
 
 	/* This is a placeholder for potential application-controlled
 	 * use of the square wave functionality.
@@ -752,7 +752,7 @@ static int read_time(struct device *dev,
 {
 	struct ds3231_data *data = dev->driver_data;
 	const struct ds3231_config *cfg = dev->config_info;
-	u8_t addr = 0;
+	uint8_t addr = 0;
 
 	int rc = i2c_write_read(data->i2c, cfg->addr,
 				&addr, sizeof(addr),
@@ -766,7 +766,7 @@ static int read_time(struct device *dev,
 }
 
 static int ds3231_counter_get_value(struct device *dev,
-				    u32_t *ticks)
+				    uint32_t *ticks)
 {
 	struct ds3231_data *data = dev->driver_data;
 	time_t time = 0;
@@ -854,11 +854,11 @@ static void sync_timer_handler(struct k_timer *tmr)
 static void sync_prep_write(struct device *dev)
 {
 	struct ds3231_data *data = dev->driver_data;
-	u32_t syncclock = maxim_ds3231_read_syncclock(dev);
-	u32_t offset = syncclock - data->new_sp.syncclock;
-	u32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(dev);
-	u32_t offset_s = offset / syncclock_Hz;
-	u32_t offset_ms = (offset % syncclock_Hz) * 1000U / syncclock_Hz;
+	uint32_t syncclock = maxim_ds3231_read_syncclock(dev);
+	uint32_t offset = syncclock - data->new_sp.syncclock;
+	uint32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(dev);
+	uint32_t offset_s = offset / syncclock_Hz;
+	uint32_t offset_ms = (offset % syncclock_Hz) * 1000U / syncclock_Hz;
 	time_t when = data->new_sp.rtc.tv_sec;
 
 	when += offset_s;
@@ -869,7 +869,7 @@ static void sync_prep_write(struct device *dev)
 		when += 1;
 	}
 
-	u32_t rem_ms = MSEC_PER_SEC - offset_ms;
+	uint32_t rem_ms = MSEC_PER_SEC - offset_ms;
 
 	if (rem_ms < 5) {
 		when += 1;
@@ -880,7 +880,7 @@ static void sync_prep_write(struct device *dev)
 
 	data->sync_state = SYNCSM_FINISH_WRITE;
 	k_timer_start(&data->sync_timer, K_MSEC(rem_ms), K_NO_WAIT);
-	LOG_INF("sync %u in %u ms after %u", (u32_t)when, rem_ms, syncclock);
+	LOG_INF("sync %u in %u ms after %u", (uint32_t)when, rem_ms, syncclock);
 }
 
 static void sync_finish_write(struct device *dev)
@@ -889,9 +889,9 @@ static void sync_finish_write(struct device *dev)
 	const struct ds3231_config *cfg = dev->config_info;
 	time_t when = data->new_sp.rtc.tv_sec;
 	struct tm tm;
-	u8_t buf[8];
-	u8_t *bp = buf;
-	u8_t val;
+	uint8_t buf[8];
+	uint8_t *bp = buf;
+	uint8_t val;
 
 	*bp++ = offsetof(struct register_map, sec);
 
@@ -921,14 +921,14 @@ static void sync_finish_write(struct device *dev)
 	val = ((tm.tm_year / 10) << 4) | (tm.tm_year % 10);
 	*bp++ = val;
 
-	u32_t syncclock = maxim_ds3231_read_syncclock(dev);
+	uint32_t syncclock = maxim_ds3231_read_syncclock(dev);
 	int rc = i2c_write(data->i2c, buf, bp - buf, cfg->addr);
 
 	if (rc >= 0) {
 		data->syncpoint.rtc.tv_sec = when;
 		data->syncpoint.rtc.tv_nsec = 0;
 		data->syncpoint.syncclock = syncclock;
-		LOG_INF("sync %u at %u", (u32_t)when, syncclock);
+		LOG_INF("sync %u at %u", (uint32_t)when, syncclock);
 	}
 	sync_finish(dev, rc);
 }
@@ -936,7 +936,7 @@ static void sync_finish_write(struct device *dev)
 static void sync_worker(struct k_work *work)
 {
 	struct ds3231_data *data = CONTAINER_OF(work, struct ds3231_data, sync_work);
-	u32_t syncclock = maxim_ds3231_read_syncclock(data->ds3231);
+	uint32_t syncclock = maxim_ds3231_read_syncclock(data->ds3231);
 	bool unlock = true;
 
 	k_sem_take(&data->lock, K_FOREVER);
@@ -969,7 +969,7 @@ static void sync_worker(struct k_work *work)
 
 static void isw_gpio_callback(struct device *port,
 			      struct gpio_callback *cb,
-			      u32_t pins)
+			      uint32_t pins)
 {
 	struct ds3231_data *data = CONTAINER_OF(cb, struct ds3231_data,
 						isw_callback);
@@ -1210,7 +1210,7 @@ static int ds3231_counter_stop(struct device *dev)
 }
 
 int ds3231_counter_set_alarm(struct device *dev,
-			     u8_t id,
+			     uint8_t id,
 			     const struct counter_alarm_cfg *alarm_cfg)
 {
 	struct ds3231_data *data = dev->driver_data;
@@ -1241,7 +1241,7 @@ int ds3231_counter_set_alarm(struct device *dev,
 	}
 
 	struct maxim_ds3231_alarm alarm = {
-		.time = (u32_t)when,
+		.time = (uint32_t)when,
 		.handler = counter_alarm_forwarder,
 		.user_data = alarm_cfg->user_data,
 		.flags = MAXIM_DS3231_ALARM_FLAGS_AUTODISABLE,
@@ -1265,12 +1265,12 @@ out:
 	return rc;
 }
 
-static u32_t ds3231_counter_get_top_value(struct device *dev)
+static uint32_t ds3231_counter_get_top_value(struct device *dev)
 {
 	return UINT32_MAX;
 }
 
-static u32_t ds3231_counter_get_pending_int(struct device *dev)
+static uint32_t ds3231_counter_get_pending_int(struct device *dev)
 {
 	return 0;
 }
@@ -1281,7 +1281,7 @@ static int ds3231_counter_set_top_value(struct device *dev,
 	return -ENOTSUP;
 }
 
-static u32_t ds3231_counter_get_max_relative_alarm(struct device *dev)
+static uint32_t ds3231_counter_get_max_relative_alarm(struct device *dev)
 {
 	return UINT32_MAX;
 }
diff --git a/drivers/counter/timer_cmsdk_apb.h b/drivers/counter/timer_cmsdk_apb.h
index 1a92832deb..1906677300 100644
--- a/drivers/counter/timer_cmsdk_apb.h
+++ b/drivers/counter/timer_cmsdk_apb.h
@@ -14,16 +14,16 @@ extern "C" {
 
 struct timer_cmsdk_apb {
 	/* Offset: 0x000 (R/W) control register */
-	volatile u32_t ctrl;
+	volatile uint32_t ctrl;
 	/* Offset: 0x004 (R/W) current value register */
-	volatile u32_t value;
+	volatile uint32_t value;
 	/* Offset: 0x008 (R/W) reload value register */
-	volatile u32_t reload;
+	volatile uint32_t reload;
 	union {
 		/* Offset: 0x00C (R/ ) interrupt status register */
-		volatile u32_t intstatus;
+		volatile uint32_t intstatus;
 		/* Offset: 0x00C ( /W) interruptclear register */
-		volatile u32_t intclear;
+		volatile uint32_t intclear;
 	};
 };
 
diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c
index 6e7dd4794f..7fe3c2f372 100644
--- a/drivers/counter/timer_dtmr_cmsdk_apb.c
+++ b/drivers/counter/timer_dtmr_cmsdk_apb.c
@@ -32,7 +32,7 @@ struct dtmr_cmsdk_apb_cfg {
 struct dtmr_cmsdk_apb_dev_data {
 	counter_top_callback_t top_callback;
 	void *top_user_data;
-	u32_t load;
+	uint32_t load;
 };
 
 static int dtmr_cmsdk_apb_start(struct device *dev)
@@ -61,7 +61,7 @@ static int dtmr_cmsdk_apb_stop(struct device *dev)
 	return 0;
 }
 
-static int dtmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks)
+static int dtmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks)
 {
 	const struct dtmr_cmsdk_apb_cfg * const cfg =
 						dev->config_info;
@@ -106,16 +106,16 @@ static int dtmr_cmsdk_apb_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t dtmr_cmsdk_apb_get_top_value(struct device *dev)
+static uint32_t dtmr_cmsdk_apb_get_top_value(struct device *dev)
 {
 	struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data;
 
-	u32_t ticks = data->load;
+	uint32_t ticks = data->load;
 
 	return ticks;
 }
 
-static u32_t dtmr_cmsdk_apb_get_pending_int(struct device *dev)
+static uint32_t dtmr_cmsdk_apb_get_pending_int(struct device *dev)
 {
 	const struct dtmr_cmsdk_apb_cfg * const cfg =
 						dev->config_info;
diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c
index 45cdfc4894..bdbc808619 100644
--- a/drivers/counter/timer_tmr_cmsdk_apb.c
+++ b/drivers/counter/timer_tmr_cmsdk_apb.c
@@ -33,7 +33,7 @@ struct tmr_cmsdk_apb_dev_data {
 	counter_top_callback_t top_callback;
 	void *top_user_data;
 
-	u32_t load;
+	uint32_t load;
 };
 
 static int tmr_cmsdk_apb_start(struct device *dev)
@@ -60,7 +60,7 @@ static int tmr_cmsdk_apb_stop(struct device *dev)
 	return 0;
 }
 
-static int tmr_cmsdk_apb_get_value(struct device *dev, u32_t *ticks)
+static int tmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks)
 {
 	const struct tmr_cmsdk_apb_cfg * const cfg =
 						dev->config_info;
@@ -101,16 +101,16 @@ static int tmr_cmsdk_apb_set_top_value(struct device *dev,
 	return 0;
 }
 
-static u32_t tmr_cmsdk_apb_get_top_value(struct device *dev)
+static uint32_t tmr_cmsdk_apb_get_top_value(struct device *dev)
 {
 	struct tmr_cmsdk_apb_dev_data *data = dev->driver_data;
 
-	u32_t ticks = data->load;
+	uint32_t ticks = data->load;
 
 	return ticks;
 }
 
-static u32_t tmr_cmsdk_apb_get_pending_int(struct device *dev)
+static uint32_t tmr_cmsdk_apb_get_pending_int(struct device *dev)
 {
 	const struct tmr_cmsdk_apb_cfg * const cfg =
 						dev->config_info;
diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c
index 9b955ab3ec..ec76fc01a2 100644
--- a/drivers/crypto/crypto_ataes132a.c
+++ b/drivers/crypto/crypto_ataes132a.c
@@ -37,17 +37,17 @@ static void ataes132a_init_states(void)
 	}
 }
 
-static int ataes132a_send_command(struct device *dev, u8_t opcode,
-				  u8_t mode, u8_t *params,
-				  u8_t nparams, u8_t *response,
-				  u8_t *nresponse)
+static int ataes132a_send_command(struct device *dev, uint8_t opcode,
+				  uint8_t mode, uint8_t *params,
+				  uint8_t nparams, uint8_t *response,
+				  uint8_t *nresponse)
 {
 	int retry_count = 0;
 	struct ataes132a_device_data *data = dev->driver_data;
 	const struct ataes132a_device_config *cfg = dev->config_info;
-	u8_t count;
-	u8_t status;
-	u8_t crc[2];
+	uint8_t count;
+	uint8_t status;
+	uint8_t crc[2];
 	int i, i2c_return;
 
 	count = nparams + 5;
@@ -168,7 +168,7 @@ int ataes132a_init(struct device *dev)
 {
 	struct ataes132a_device_data *ataes132a = dev->driver_data;
 	const struct ataes132a_device_config *cfg = dev->config_info;
-	u32_t i2c_cfg;
+	uint32_t i2c_cfg;
 
 	LOG_DBG("ATAES132A INIT");
 
@@ -190,19 +190,19 @@ int ataes132a_init(struct device *dev)
 }
 
 int ataes132a_aes_ccm_decrypt(struct device *dev,
-			      u8_t key_id,
+			      uint8_t key_id,
 			      struct ataes132a_mac_mode *mac_mode,
 			      struct ataes132a_mac_packet *mac_packet,
 			      struct cipher_aead_pkt *aead_op,
-			      u8_t *nonce_buf)
+			      uint8_t *nonce_buf)
 {
-	u8_t command_mode = 0x0;
+	uint8_t command_mode = 0x0;
 	struct ataes132a_device_data *data = dev->driver_data;
-	u8_t out_len;
-	u8_t in_buf_len;
-	u8_t return_code;
-	u8_t expected_out_len;
-	u8_t param_buffer[52];
+	uint8_t out_len;
+	uint8_t in_buf_len;
+	uint8_t return_code;
+	uint8_t expected_out_len;
+	uint8_t param_buffer[52];
 
 	if (!aead_op) {
 		LOG_ERR("Parameter cannot be null");
@@ -390,18 +390,18 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 }
 
 int ataes132a_aes_ccm_encrypt(struct device *dev,
-			      u8_t key_id,
+			      uint8_t key_id,
 			      struct ataes132a_mac_mode *mac_mode,
 			      struct cipher_aead_pkt *aead_op,
-			      u8_t *nonce_buf,
-			      u8_t *mac_count)
+			      uint8_t *nonce_buf,
+			      uint8_t *mac_count)
 {
-	u8_t command_mode = 0x0;
+	uint8_t command_mode = 0x0;
 	struct ataes132a_device_data *data = dev->driver_data;
-	u8_t buf_len;
-	u8_t out_len;
-	u8_t return_code;
-	u8_t param_buffer[40];
+	uint8_t buf_len;
+	uint8_t out_len;
+	uint8_t return_code;
+	uint8_t param_buffer[40];
 
 	if (!aead_op) {
 		LOG_ERR("Parameter cannot be null");
@@ -578,14 +578,14 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 }
 
 int ataes132a_aes_ecb_block(struct device *dev,
-			    u8_t key_id,
+			    uint8_t key_id,
 			    struct cipher_pkt *pkt)
 {
 	struct ataes132a_device_data *data = dev->driver_data;
-	u8_t buf_len;
-	u8_t out_len;
-	u8_t return_code;
-	u8_t param_buffer[19];
+	uint8_t buf_len;
+	uint8_t out_len;
+	uint8_t return_code;
+	uint8_t param_buffer[19];
 
 	if (!pkt) {
 		LOG_ERR("Parameter cannot be null");
@@ -666,16 +666,16 @@ int ataes132a_aes_ecb_block(struct device *dev,
 }
 
 static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
-			      struct cipher_aead_pkt *aead_op, u8_t *nonce)
+			      struct cipher_aead_pkt *aead_op, uint8_t *nonce)
 {
 	struct device *dev = ctx->device;
 	struct ataes132a_driver_state *state = ctx->drv_sessn_state;
 	struct ataes132a_mac_mode mac_mode;
-	u8_t key_id;
+	uint8_t key_id;
 
 	key_id = state->key_id;
 
-	assert(*(u8_t *)ctx->key.handle == key_id);
+	assert(*(uint8_t *)ctx->key.handle == key_id);
 
 	/* Removing all this salt from the MAC reduces the protection
 	 * but allows any other crypto implementations to authorize
@@ -715,16 +715,16 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
 }
 
 static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
-			       struct cipher_aead_pkt *aead_op, u8_t *nonce)
+			       struct cipher_aead_pkt *aead_op, uint8_t *nonce)
 {
 	struct device *dev = ctx->device;
 	struct ataes132a_driver_state *state = ctx->drv_sessn_state;
 	struct ataes132a_mac_mode mac_mode;
-	u8_t key_id;
+	uint8_t key_id;
 
 	key_id = state->key_id;
 
-	assert(*(u8_t *)ctx->key.handle == key_id);
+	assert(*(uint8_t *)ctx->key.handle == key_id);
 
 	/* Removing all this salt from the MAC reduces the protection
 	 * but allows any other crypto implementations to authorize
@@ -764,11 +764,11 @@ static int do_block(struct cipher_ctx *ctx, struct cipher_pkt *pkt)
 {
 	struct device *dev = ctx->device;
 	struct ataes132a_driver_state *state = ctx->drv_sessn_state;
-	u8_t key_id;
+	uint8_t key_id;
 
 	key_id = state->key_id;
 
-	assert(*(u8_t *)ctx->key.handle == key_id);
+	assert(*(uint8_t *)ctx->key.handle == key_id);
 
 	if (pkt->out_buf_max < 16) {
 		LOG_ERR("Not enough space available in out buffer.");
@@ -796,10 +796,10 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx,
 				   enum cipher_algo algo, enum cipher_mode mode,
 				   enum cipher_op op_type)
 {
-	u8_t key_id = *((u8_t *)ctx->key.handle);
+	uint8_t key_id = *((uint8_t *)ctx->key.handle);
 	struct ataes132a_device_data *data = dev->driver_data;
 	const struct ataes132a_device_config *cfg = dev->config_info;
-	u8_t config;
+	uint8_t config;
 
 	if (ataes132a_state[key_id].in_use) {
 		LOG_ERR("Session in progress");
diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h
index ef7e21d2a2..49c35d1f37 100644
--- a/drivers/crypto/crypto_ataes132a_priv.h
+++ b/drivers/crypto/crypto_ataes132a_priv.h
@@ -110,14 +110,14 @@
 
 #define CRC16_POLY 0x8005
 
-void ataes132a_atmel_crc(u8_t *input, u8_t length,
-			 u8_t *output)
+void ataes132a_atmel_crc(uint8_t *input, uint8_t length,
+			 uint8_t *output)
 {
 	int i, j;
-	u8_t bit;
-	u16_t crc;
-	u16_t double_carry;
-	u8_t higher_crc_bit;
+	uint8_t bit;
+	uint16_t crc;
+	uint16_t double_carry;
+	uint8_t higher_crc_bit;
 
 	for (i = 0, crc = 0U; i < length; i++) {
 		for (j = 7; j >=  0; j--) {
@@ -133,15 +133,15 @@ void ataes132a_atmel_crc(u8_t *input, u8_t length,
 		}
 	}
 
-	*(u16_t *)output = crc << 8 | crc >> 8;
+	*(uint16_t *)output = crc << 8 | crc >> 8;
 }
 
-static inline int burst_write_i2c(struct device *dev, u16_t dev_addr,
-				  u16_t start_addr, u8_t *buf,
-				  u8_t num_bytes)
+static inline int burst_write_i2c(struct device *dev, uint16_t dev_addr,
+				  uint16_t start_addr, uint8_t *buf,
+				  uint8_t num_bytes)
 {
 	const struct i2c_driver_api *api = dev->driver_api;
-	u8_t addr_buffer[2];
+	uint8_t addr_buffer[2];
 	struct i2c_msg msg[2];
 
 	addr_buffer[1] = start_addr & 0xFF;
@@ -158,12 +158,12 @@ static inline int burst_write_i2c(struct device *dev, u16_t dev_addr,
 }
 
 
-static inline int burst_read_i2c(struct device *dev, u16_t dev_addr,
-				 u16_t start_addr, u8_t *buf,
-				 u8_t num_bytes)
+static inline int burst_read_i2c(struct device *dev, uint16_t dev_addr,
+				 uint16_t start_addr, uint8_t *buf,
+				 uint8_t num_bytes)
 {
 	const struct i2c_driver_api *api = dev->driver_api;
-	u8_t addr_buffer[2];
+	uint8_t addr_buffer[2];
 	struct i2c_msg msg[2];
 
 	addr_buffer[1] = start_addr & 0xFF;
@@ -179,35 +179,35 @@ static inline int burst_read_i2c(struct device *dev, u16_t dev_addr,
 	return api->transfer(dev, msg, 2, dev_addr);
 }
 
-static inline int read_reg_i2c(struct device *dev, u16_t dev_addr,
-			       u16_t reg_addr, u8_t *value)
+static inline int read_reg_i2c(struct device *dev, uint16_t dev_addr,
+			       uint16_t reg_addr, uint8_t *value)
 {
 	return burst_read_i2c(dev, dev_addr, reg_addr, value, 1);
 }
 
-static inline int write_reg_i2c(struct device *dev, u16_t dev_addr,
-				u16_t reg_addr, u8_t value)
+static inline int write_reg_i2c(struct device *dev, uint16_t dev_addr,
+				uint16_t reg_addr, uint8_t value)
 {
 	return burst_write_i2c(dev, dev_addr, reg_addr, &value, 1);
 }
 
 struct ataes132a_device_config {
 	const char *i2c_port;
-	u16_t i2c_addr;
-	u8_t i2c_speed;
+	uint16_t i2c_addr;
+	uint8_t i2c_speed;
 };
 
 struct ataes132a_device_data {
 	struct device *i2c;
-	u8_t command_buffer[64];
+	uint8_t command_buffer[64];
 	struct k_sem device_sem;
 };
 
 struct ataes132a_driver_state {
 	bool in_use;
-	u8_t key_id;
-	u8_t key_config;
-	u8_t chip_config;
+	uint8_t key_id;
+	uint8_t key_config;
+	uint8_t chip_config;
 };
 
 /**
@@ -216,9 +216,9 @@ struct ataes132a_driver_state {
  */
 struct ataes132a_mac_packet {
 	/** Key storage id used on CCM encryption */
-	u8_t encryption_key_id;
+	uint8_t encryption_key_id;
 	/** MAC Count value */
-	u8_t encryption_mac_count;
+	uint8_t encryption_mac_count;
 };
 
 /**
@@ -312,11 +312,11 @@ int ataes132a_init(struct device *i2c_dev);
  * @return Returns 0 in case of success and an error code otherwise.
  */
 int ataes132a_aes_ccm_decrypt(struct device *i2c_dev,
-			      u8_t key_id,
+			      uint8_t key_id,
 			      struct ataes132a_mac_mode *mac_mode,
 			      struct ataes132a_mac_packet *mac_packet,
 			      struct cipher_aead_pkt *aead_op,
-			      u8_t *nonce_buf);
+			      uint8_t *nonce_buf);
 
  /**
   * @brief ATAES132A CCM encrypt function
@@ -360,11 +360,11 @@ int ataes132a_aes_ccm_decrypt(struct device *i2c_dev,
   * @return Returns 0 in case of success and an error code otherwise.
   */
 int ataes132a_aes_ccm_encrypt(struct device *i2c_dev,
-			      u8_t key_id,
+			      uint8_t key_id,
 			      struct ataes132a_mac_mode *mac_mode,
 			      struct cipher_aead_pkt *aead_op,
-			      u8_t *nonce_buf,
-			      u8_t *mac_count);
+			      uint8_t *nonce_buf,
+			      uint8_t *mac_count);
 
 /**
  * @brief ATAES132A ECM block function
@@ -388,7 +388,7 @@ int ataes132a_aes_ccm_encrypt(struct device *i2c_dev,
  * @return Returns 0 in case of success and an error code otherwise.
  */
 int ataes132a_aes_ecb_block(struct device *i2c_dev,
-			    u8_t key_id,
+			    uint8_t key_id,
 			    struct cipher_pkt *pkt);
 
 #endif /* ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_ */
diff --git a/drivers/crypto/crypto_mtls_shim.c b/drivers/crypto/crypto_mtls_shim.c
index 0c14c74c8d..b6e85a1f44 100644
--- a/drivers/crypto/crypto_mtls_shim.c
+++ b/drivers/crypto/crypto_mtls_shim.c
@@ -108,10 +108,10 @@ int mtls_ecb_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt)
 	return 0;
 }
 
-int mtls_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, u8_t *iv)
+int mtls_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret, iv_bytes;
-	u8_t *p_iv, iv_loc[16];
+	uint8_t *p_iv, iv_loc[16];
 	mbedtls_aes_context *cbc_ctx = MTLS_GET_CTX(ctx, aes);
 
 	if ((ctx->flags & CAP_NO_IV_PREFIX) == 0U) {
@@ -139,10 +139,10 @@ int mtls_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, u8_t *iv)
 	return 0;
 }
 
-int mtls_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, u8_t *iv)
+int mtls_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret, iv_bytes;
-	u8_t *p_iv, iv_loc[16];
+	uint8_t *p_iv, iv_loc[16];
 	mbedtls_aes_context *cbc_ctx = MTLS_GET_CTX(ctx, aes);
 
 	if ((ctx->flags & CAP_NO_IV_PREFIX) == 0U) {
@@ -168,7 +168,7 @@ int mtls_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *pkt, u8_t *iv)
 
 static int mtls_ccm_encrypt_auth(struct cipher_ctx *ctx,
 				 struct cipher_aead_pkt *apkt,
-				 u8_t *nonce)
+				 uint8_t *nonce)
 {
 	mbedtls_ccm_context *mtls_ctx = MTLS_GET_CTX(ctx, ccm);
 	int ret;
@@ -197,7 +197,7 @@ static int mtls_ccm_encrypt_auth(struct cipher_ctx *ctx,
 
 static int mtls_ccm_decrypt_auth(struct cipher_ctx *ctx,
 				 struct cipher_aead_pkt *apkt,
-				 u8_t *nonce)
+				 uint8_t *nonce)
 {
 	mbedtls_ccm_context *mtls_ctx = MTLS_GET_CTX(ctx, ccm);
 	int ret;
@@ -229,7 +229,7 @@ static int mtls_ccm_decrypt_auth(struct cipher_ctx *ctx,
 #ifdef CONFIG_MBEDTLS_CIPHER_GCM_ENABLED
 static int mtls_gcm_encrypt_auth(struct cipher_ctx *ctx,
 				 struct cipher_aead_pkt *apkt,
-				 u8_t *nonce)
+				 uint8_t *nonce)
 {
 	mbedtls_gcm_context *mtls_ctx = MTLS_GET_CTX(ctx, gcm);
 	int ret;
@@ -257,7 +257,7 @@ static int mtls_gcm_encrypt_auth(struct cipher_ctx *ctx,
 
 static int mtls_gcm_decrypt_auth(struct cipher_ctx *ctx,
 				 struct cipher_aead_pkt *apkt,
-				 u8_t *nonce)
+				 uint8_t *nonce)
 {
 	mbedtls_gcm_context *mtls_ctx = MTLS_GET_CTX(ctx, gcm);
 	int ret;
diff --git a/drivers/crypto/crypto_nrf_ecb.c b/drivers/crypto/crypto_nrf_ecb.c
index 173a7d0cb9..09712136ef 100644
--- a/drivers/crypto/crypto_nrf_ecb.c
+++ b/drivers/crypto/crypto_nrf_ecb.c
@@ -15,9 +15,9 @@
 LOG_MODULE_REGISTER(crypto_nrf_ecb, CONFIG_CRYPTO_LOG_LEVEL);
 
 struct ecb_data {
-	u8_t key[ECB_AES_KEY_SIZE];
-	u8_t cleartext[ECB_AES_BLOCK_SIZE];
-	u8_t ciphertext[ECB_AES_BLOCK_SIZE];
+	uint8_t key[ECB_AES_KEY_SIZE];
+	uint8_t cleartext[ECB_AES_BLOCK_SIZE];
+	uint8_t ciphertext[ECB_AES_BLOCK_SIZE];
 };
 
 struct nrf_ecb_drv_state {
diff --git a/drivers/crypto/crypto_stm32.c b/drivers/crypto/crypto_stm32.c
index 8df84414bd..8ba0cc1bfd 100644
--- a/drivers/crypto/crypto_stm32.c
+++ b/drivers/crypto/crypto_stm32.c
@@ -24,13 +24,13 @@ LOG_MODULE_REGISTER(crypto_stm32);
 #define CRYP_SUPPORT (CAP_RAW_KEY | CAP_SEPARATE_IO_BUFS | CAP_SYNC_OPS | \
 		      CAP_NO_IV_PREFIX)
 #define BLOCK_LEN_BYTES 16
-#define BLOCK_LEN_WORDS (BLOCK_LEN_BYTES / sizeof(u32_t))
+#define BLOCK_LEN_WORDS (BLOCK_LEN_BYTES / sizeof(uint32_t))
 #define CRYPTO_MAX_SESSION CONFIG_CRYPTO_STM32_MAX_SESSION
 
 struct crypto_stm32_session crypto_stm32_sessions[CRYPTO_MAX_SESSION];
 
-static void copy_reverse_words(u8_t *dst_buf, int dst_len,
-			       u8_t *src_buf, int src_len)
+static void copy_reverse_words(uint8_t *dst_buf, int dst_len,
+			       uint8_t *src_buf, int src_len)
 {
 	int i;
 
@@ -38,13 +38,13 @@ static void copy_reverse_words(u8_t *dst_buf, int dst_len,
 	__ASSERT_NO_MSG((dst_len % 4) == 0);
 
 	memcpy(dst_buf, src_buf, src_len);
-	for (i = 0; i < dst_len; i += sizeof(u32_t)) {
-		sys_mem_swap(&dst_buf[i], sizeof(u32_t));
+	for (i = 0; i < dst_len; i += sizeof(uint32_t)) {
+		sys_mem_swap(&dst_buf[i], sizeof(uint32_t));
 	}
 }
 
-static int do_encrypt(struct cipher_ctx *ctx, u8_t *in_buf, int in_len,
-		      u8_t *out_buf)
+static int do_encrypt(struct cipher_ctx *ctx, uint8_t *in_buf, int in_len,
+		      uint8_t *out_buf)
 {
 	HAL_StatusTypeDef status;
 
@@ -73,8 +73,8 @@ static int do_encrypt(struct cipher_ctx *ctx, u8_t *in_buf, int in_len,
 	return 0;
 }
 
-static int do_decrypt(struct cipher_ctx *ctx, u8_t *in_buf, int in_len,
-		      u8_t *out_buf)
+static int do_decrypt(struct cipher_ctx *ctx, uint8_t *in_buf, int in_len,
+		      uint8_t *out_buf)
 {
 	HAL_StatusTypeDef status;
 
@@ -146,15 +146,15 @@ static int crypto_stm32_ecb_decrypt(struct cipher_ctx *ctx,
 }
 
 static int crypto_stm32_cbc_encrypt(struct cipher_ctx *ctx,
-				    struct cipher_pkt *pkt, u8_t *iv)
+				    struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret;
-	u32_t vec[BLOCK_LEN_WORDS];
+	uint32_t vec[BLOCK_LEN_WORDS];
 	int out_offset = 0;
 
 	struct crypto_stm32_session *session = CRYPTO_STM32_SESSN(ctx);
 
-	copy_reverse_words((u8_t *)vec, sizeof(vec), iv, BLOCK_LEN_BYTES);
+	copy_reverse_words((uint8_t *)vec, sizeof(vec), iv, BLOCK_LEN_BYTES);
 	session->config.pInitVect = vec;
 
 	if ((ctx->flags & CAP_NO_IV_PREFIX) == 0U) {
@@ -173,15 +173,15 @@ static int crypto_stm32_cbc_encrypt(struct cipher_ctx *ctx,
 }
 
 static int crypto_stm32_cbc_decrypt(struct cipher_ctx *ctx,
-				    struct cipher_pkt *pkt, u8_t *iv)
+				    struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret;
-	u32_t vec[BLOCK_LEN_WORDS];
+	uint32_t vec[BLOCK_LEN_WORDS];
 	int in_offset = 0;
 
 	struct crypto_stm32_session *session = CRYPTO_STM32_SESSN(ctx);
 
-	copy_reverse_words((u8_t *)vec, sizeof(vec), iv, BLOCK_LEN_BYTES);
+	copy_reverse_words((uint8_t *)vec, sizeof(vec), iv, BLOCK_LEN_BYTES);
 	session->config.pInitVect = vec;
 
 	if ((ctx->flags & CAP_NO_IV_PREFIX) == 0U) {
@@ -198,15 +198,15 @@ static int crypto_stm32_cbc_decrypt(struct cipher_ctx *ctx,
 }
 
 static int crypto_stm32_ctr_encrypt(struct cipher_ctx *ctx,
-				    struct cipher_pkt *pkt, u8_t *iv)
+				    struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret;
-	u32_t ctr[BLOCK_LEN_WORDS] = {0};
+	uint32_t ctr[BLOCK_LEN_WORDS] = {0};
 	int ivlen = ctx->keylen - (ctx->mode_params.ctr_info.ctr_len >> 3);
 
 	struct crypto_stm32_session *session = CRYPTO_STM32_SESSN(ctx);
 
-	copy_reverse_words((u8_t *)ctr, sizeof(ctr), iv, ivlen);
+	copy_reverse_words((uint8_t *)ctr, sizeof(ctr), iv, ivlen);
 	session->config.pInitVect = ctr;
 
 	ret = do_encrypt(ctx, pkt->in_buf, pkt->in_len, pkt->out_buf);
@@ -218,15 +218,15 @@ static int crypto_stm32_ctr_encrypt(struct cipher_ctx *ctx,
 }
 
 static int crypto_stm32_ctr_decrypt(struct cipher_ctx *ctx,
-				    struct cipher_pkt *pkt, u8_t *iv)
+				    struct cipher_pkt *pkt, uint8_t *iv)
 {
 	int ret;
-	u32_t ctr[BLOCK_LEN_WORDS] = {0};
+	uint32_t ctr[BLOCK_LEN_WORDS] = {0};
 	int ivlen = ctx->keylen - (ctx->mode_params.ctr_info.ctr_len >> 3);
 
 	struct crypto_stm32_session *session = CRYPTO_STM32_SESSN(ctx);
 
-	copy_reverse_words((u8_t *)ctr, sizeof(ctr), iv, ivlen);
+	copy_reverse_words((uint8_t *)ctr, sizeof(ctr), iv, ivlen);
 	session->config.pInitVect = ctr;
 
 	ret = do_decrypt(ctx, pkt->in_buf, pkt->in_len, pkt->out_buf);
@@ -369,7 +369,7 @@ static int crypto_stm32_session_setup(struct device *dev,
 		}
 	}
 
-	copy_reverse_words((u8_t *)session->key, CRYPTO_STM32_AES_MAX_KEY_LEN,
+	copy_reverse_words((uint8_t *)session->key, CRYPTO_STM32_AES_MAX_KEY_LEN,
 			   ctx->key.bit_stream, ctx->keylen);
 
 	session->config.pKey = session->key;
diff --git a/drivers/crypto/crypto_stm32_priv.h b/drivers/crypto/crypto_stm32_priv.h
index d35d0ea28f..4f1455b181 100644
--- a/drivers/crypto/crypto_stm32_priv.h
+++ b/drivers/crypto/crypto_stm32_priv.h
@@ -23,7 +23,7 @@ struct crypto_stm32_data {
 
 struct crypto_stm32_session {
 	CRYP_ConfigTypeDef config;
-	u32_t key[CRYPTO_STM32_AES_MAX_KEY_LEN / sizeof(u32_t)];
+	uint32_t key[CRYPTO_STM32_AES_MAX_KEY_LEN / sizeof(uint32_t)];
 	bool in_use;
 };
 
diff --git a/drivers/crypto/crypto_tc_shim.c b/drivers/crypto/crypto_tc_shim.c
index c563417f02..49bdee3c24 100644
--- a/drivers/crypto/crypto_tc_shim.c
+++ b/drivers/crypto/crypto_tc_shim.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(tinycrypt);
 static struct tc_shim_drv_state tc_driver_state[CRYPTO_MAX_SESSION];
 
 static int do_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
-			  u8_t *iv)
+			  uint8_t *iv)
 {
 	struct tc_shim_drv_state *data =  ctx->drv_sessn_state;
 
@@ -46,7 +46,7 @@ static int do_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
 }
 
 static int do_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
-			  u8_t *iv)
+			  uint8_t *iv)
 {
 	struct tc_shim_drv_state *data =  ctx->drv_sessn_state;
 
@@ -74,10 +74,10 @@ static int do_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
 }
 
 static int do_ctr_op(struct cipher_ctx *ctx, struct cipher_pkt *op,
-		     u8_t *iv)
+		     uint8_t *iv)
 {
 	struct tc_shim_drv_state *data =  ctx->drv_sessn_state;
-	u8_t ctr[16] = {0};	/* CTR mode Counter =  iv:ctr */
+	uint8_t ctr[16] = {0};	/* CTR mode Counter =  iv:ctr */
 	int ivlen = ctx->keylen - (ctx->mode_params.ctr_info.ctr_len >> 3);
 
 	/* Tinycrypt takes the last 4 bytes of the counter parameter as the
@@ -99,7 +99,7 @@ static int do_ctr_op(struct cipher_ctx *ctx, struct cipher_pkt *op,
 }
 
 static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
-			     struct cipher_aead_pkt *aead_op, u8_t *nonce)
+			     struct cipher_aead_pkt *aead_op, uint8_t *nonce)
 {
 	struct tc_ccm_mode_struct ccm;
 	struct tc_shim_drv_state *data =  ctx->drv_sessn_state;
@@ -139,7 +139,7 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
 }
 
 static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
-			       struct cipher_aead_pkt *aead_op, u8_t *nonce)
+			       struct cipher_aead_pkt *aead_op, uint8_t *nonce)
 {
 	struct tc_ccm_mode_struct ccm;
 	struct tc_shim_drv_state *data =  ctx->drv_sessn_state;
diff --git a/drivers/dac/dac_handlers.c b/drivers/dac/dac_handlers.c
index be5795fd65..e6da298e4b 100644
--- a/drivers/dac/dac_handlers.c
+++ b/drivers/dac/dac_handlers.c
@@ -23,7 +23,7 @@ static inline int z_vrfy_dac_channel_setup(struct device *dev,
 #include <syscalls/dac_channel_setup_mrsh.c>
 
 static inline int z_vrfy_dac_write_value(struct device *dev,
-					u8_t channel, u32_t value)
+					uint8_t channel, uint32_t value)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_DAC(dev, write_value));
 
diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c
index d5cbe620d1..dcfc582d77 100644
--- a/drivers/dac/dac_mcux_dac.c
+++ b/drivers/dac/dac_mcux_dac.c
@@ -52,7 +52,7 @@ static int mcux_dac_channel_setup(struct device *dev,
 	return 0;
 }
 
-static int mcux_dac_write_value(struct device *dev, u8_t channel, u32_t value)
+static int mcux_dac_write_value(struct device *dev, uint8_t channel, uint32_t value)
 {
 	const struct mcux_dac_config *config = dev->config_info;
 	struct mcux_dac_data *data = dev->driver_data;
diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c
index 3ae90e62c7..14818ae397 100644
--- a/drivers/dac/dac_mcux_dac32.c
+++ b/drivers/dac/dac_mcux_dac32.c
@@ -54,7 +54,7 @@ static int mcux_dac32_channel_setup(struct device *dev,
 	return 0;
 }
 
-static int mcux_dac32_write_value(struct device *dev, u8_t channel, u32_t value)
+static int mcux_dac32_write_value(struct device *dev, uint8_t channel, uint32_t value)
 {
 	const struct mcux_dac32_config *config = dev->config_info;
 	struct mcux_dac32_data *data = dev->driver_data;
diff --git a/drivers/dac/dac_shell.c b/drivers/dac/dac_shell.c
index 246d54f548..1a2346443e 100644
--- a/drivers/dac/dac_shell.c
+++ b/drivers/dac/dac_shell.c
@@ -14,10 +14,10 @@
 #include <stdlib.h>
 
 struct args_index {
-	u8_t device;
-	u8_t channel;
-	u8_t value;
-	u8_t resolution;
+	uint8_t device;
+	uint8_t channel;
+	uint8_t value;
+	uint8_t resolution;
 };
 
 static const struct args_index args_indx = {
@@ -54,8 +54,8 @@ static int cmd_setup(const struct shell *shell, size_t argc, char **argv)
 static int cmd_write_value(const struct shell *shell, size_t argc, char **argv)
 {
 	struct device *dac;
-	u8_t channel;
-	u32_t value;
+	uint8_t channel;
+	uint32_t value;
 	int err;
 
 	dac = device_get_binding(argv[args_indx.device]);
diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c
index b9cadef315..f7f8cbccb3 100644
--- a/drivers/dac/dac_stm32.c
+++ b/drivers/dac/dac_stm32.c
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(dac_stm32);
 #define STM32_FIRST_CHANNEL		1
 
 #define CHAN(n)		LL_DAC_CHANNEL_##n
-static const u32_t table_channels[] = {
+static const uint32_t table_channels[] = {
 	CHAN(1),
 #ifdef LL_DAC_CHANNEL_2
 	CHAN(2),
@@ -46,12 +46,12 @@ struct dac_stm32_cfg {
 
 /* Runtime driver data */
 struct dac_stm32_data {
-	u8_t channel_count;
-	u8_t resolution;
+	uint8_t channel_count;
+	uint8_t resolution;
 };
 
 static int dac_stm32_write_value(struct device *dev,
-					u8_t channel, u32_t value)
+					uint8_t channel, uint32_t value)
 {
 	struct dac_stm32_data *data = dev->driver_data;
 	const struct dac_stm32_cfg *cfg = dev->config_info;
diff --git a/drivers/display/display_dummy.c b/drivers/display/display_dummy.c
index b90f98239e..f41c85f30e 100644
--- a/drivers/display/display_dummy.c
+++ b/drivers/display/display_dummy.c
@@ -24,16 +24,16 @@ static int dummy_display_init(struct device *dev)
 	return 0;
 }
 
-static int dummy_display_write(const struct device *dev, const u16_t x,
-			       const u16_t y,
+static int dummy_display_write(const struct device *dev, const uint16_t x,
+			       const uint16_t y,
 			       const struct display_buffer_descriptor *desc,
 			       const void *buf)
 {
 	return 0;
 }
 
-static int dummy_display_read(const struct device *dev, const u16_t x,
-			      const u16_t y,
+static int dummy_display_read(const struct device *dev, const uint16_t x,
+			      const uint16_t y,
 			      const struct display_buffer_descriptor *desc,
 			      void *buf)
 {
@@ -56,13 +56,13 @@ static int dummy_display_blanking_on(const struct device *dev)
 }
 
 static int dummy_display_set_brightness(const struct device *dev,
-					const u8_t brightness)
+					const uint8_t brightness)
 {
 	return 0;
 }
 
 static int dummy_display_set_contrast(const struct device *dev,
-				      const u8_t contrast)
+				      const uint8_t contrast)
 {
 	return 0;
 }
diff --git a/drivers/display/display_framebuf.c b/drivers/display/display_framebuf.c
index 623786e30e..b0503fc579 100644
--- a/drivers/display/display_framebuf.c
+++ b/drivers/display/display_framebuf.c
@@ -30,13 +30,13 @@ static void *framebuf_get_framebuffer(const struct device *dev)
 }
 
 static int framebuf_set_brightness(const struct device *dev,
-				   const u8_t brightness)
+				   const uint8_t brightness)
 {
 	return -ENOTSUP;
 }
 
 static int framebuf_set_contrast(const struct device *dev,
-				 const u8_t contrast)
+				 const uint8_t contrast)
 {
 	return -ENOTSUP;
 }
@@ -76,21 +76,21 @@ static void framebuf_get_capabilities(const struct device *dev,
 	caps->current_orientation = DISPLAY_ORIENTATION_NORMAL;
 }
 
-static int framebuf_write(const struct device *dev, const u16_t x,
-			  const u16_t y,
+static int framebuf_write(const struct device *dev, const uint16_t x,
+			  const uint16_t y,
 			  const struct display_buffer_descriptor *desc,
 			  const void *buf)
 {
 	struct framebuf_dev_data *data = FRAMEBUF_DATA(dev);
-	u32_t *dst = data->buffer;
-	const u32_t *src = buf;
-	u32_t row;
+	uint32_t *dst = data->buffer;
+	const uint32_t *src = buf;
+	uint32_t row;
 
 	dst += x;
 	dst += (y * data->pitch);
 
 	for (row = 0; row < desc->height; ++row) {
-		(void) memcpy(dst, src, desc->width * sizeof(u32_t));
+		(void) memcpy(dst, src, desc->width * sizeof(uint32_t));
 		dst += data->pitch;
 		src += desc->pitch;
 	}
@@ -98,21 +98,21 @@ static int framebuf_write(const struct device *dev, const u16_t x,
 	return 0;
 }
 
-static int framebuf_read(const struct device *dev, const u16_t x,
-			 const u16_t y,
+static int framebuf_read(const struct device *dev, const uint16_t x,
+			 const uint16_t y,
 			 const struct display_buffer_descriptor *desc,
 			 void *buf)
 {
 	struct framebuf_dev_data *data = FRAMEBUF_DATA(dev);
-	u32_t *src = data->buffer;
-	u32_t *dst = buf;
-	u32_t row;
+	uint32_t *src = data->buffer;
+	uint32_t *dst = buf;
+	uint32_t row;
 
 	src += x;
 	src += (y * data->pitch);
 
 	for (row = 0; row < desc->height; ++row) {
-		(void) memcpy(dst, src, desc->width * sizeof(u32_t));
+		(void) memcpy(dst, src, desc->width * sizeof(uint32_t));
 		src += data->pitch;
 		dst += desc->pitch;
 	}
diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c
index 501a1cb41f..6e8d90af36 100644
--- a/drivers/display/display_ili9340.c
+++ b/drivers/display/display_ili9340.c
@@ -117,10 +117,10 @@ static int ili9340_init(struct device *dev)
 	return 0;
 }
 
-static void ili9340_set_mem_area(struct ili9340_data *data, const u16_t x,
-				 const u16_t y, const u16_t w, const u16_t h)
+static void ili9340_set_mem_area(struct ili9340_data *data, const uint16_t x,
+				 const uint16_t y, const uint16_t w, const uint16_t h)
 {
-	u16_t spi_data[2];
+	uint16_t spi_data[2];
 
 	spi_data[0] = sys_cpu_to_be16(x);
 	spi_data[1] = sys_cpu_to_be16(x + w - 1);
@@ -131,18 +131,18 @@ static void ili9340_set_mem_area(struct ili9340_data *data, const u16_t x,
 	ili9340_transmit(data, ILI9340_CMD_PAGE_ADDR, &spi_data[0], 4);
 }
 
-static int ili9340_write(const struct device *dev, const u16_t x,
-			 const u16_t y,
+static int ili9340_write(const struct device *dev, const uint16_t x,
+			 const uint16_t y,
 			 const struct display_buffer_descriptor *desc,
 			 const void *buf)
 {
 	struct ili9340_data *data = (struct ili9340_data *)dev->driver_data;
-	const u8_t *write_data_start = (u8_t *) buf;
+	const uint8_t *write_data_start = (uint8_t *) buf;
 	struct spi_buf tx_buf;
 	struct spi_buf_set tx_bufs;
-	u16_t write_cnt;
-	u16_t nbr_of_writes;
-	u16_t write_h;
+	uint16_t write_cnt;
+	uint16_t nbr_of_writes;
+	uint16_t write_h;
 
 	__ASSERT(desc->width <= desc->pitch, "Pitch is smaller then width");
 	__ASSERT((desc->pitch * ILI9340_RGB_SIZE * desc->height) <= desc->bu_size,
@@ -178,8 +178,8 @@ static int ili9340_write(const struct device *dev, const u16_t x,
 	return 0;
 }
 
-static int ili9340_read(const struct device *dev, const u16_t x,
-			const u16_t y,
+static int ili9340_read(const struct device *dev, const uint16_t x,
+			const uint16_t y,
 			const struct display_buffer_descriptor *desc,
 			void *buf)
 {
@@ -212,13 +212,13 @@ static int ili9340_display_blanking_on(const struct device *dev)
 }
 
 static int ili9340_set_brightness(const struct device *dev,
-				  const u8_t brightness)
+				  const uint8_t brightness)
 {
 	LOG_WRN("Set brightness not implemented");
 	return -ENOTSUP;
 }
 
-static int ili9340_set_contrast(const struct device *dev, const u8_t contrast)
+static int ili9340_set_contrast(const struct device *dev, const uint8_t contrast)
 {
 	LOG_ERR("Set contrast not supported");
 	return -ENOTSUP;
@@ -265,7 +265,7 @@ static void ili9340_get_capabilities(const struct device *dev,
 	capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL;
 }
 
-void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data,
+void ili9340_transmit(struct ili9340_data *data, uint8_t cmd, void *tx_data,
 		      size_t tx_len)
 {
 	struct spi_buf tx_buf = { .buf = &cmd, .len = 1 };
diff --git a/drivers/display/display_ili9340.h b/drivers/display/display_ili9340.h
index 2ea4e60537..1ded21876f 100644
--- a/drivers/display/display_ili9340.h
+++ b/drivers/display/display_ili9340.h
@@ -62,7 +62,7 @@ struct ili9340_data;
  * @param tx_len Number of bytes in tx_data buffer
  *
  */
-void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data,
+void ili9340_transmit(struct ili9340_data *data, uint8_t cmd, void *tx_data,
 		      size_t tx_len);
 
 /**
diff --git a/drivers/display/display_ili9340_adafruit_1480.c b/drivers/display/display_ili9340_adafruit_1480.c
index c1cf880306..67c2d2e768 100644
--- a/drivers/display/display_ili9340_adafruit_1480.c
+++ b/drivers/display/display_ili9340_adafruit_1480.c
@@ -8,7 +8,7 @@
 
 void ili9340_lcd_init(struct ili9340_data *data)
 {
-	u8_t tx_data[15];
+	uint8_t tx_data[15];
 
 	tx_data[0] = 0x23;
 	ili9340_transmit(data, ILI9340_CMD_POWER_CTRL_1, tx_data, 1);
diff --git a/drivers/display/display_ili9340_seeed_tftv2.c b/drivers/display/display_ili9340_seeed_tftv2.c
index 1312b32d42..87a0ebcf8d 100644
--- a/drivers/display/display_ili9340_seeed_tftv2.c
+++ b/drivers/display/display_ili9340_seeed_tftv2.c
@@ -15,8 +15,8 @@
 
 void ili9340_lcd_init(struct ili9340_data *p_ili9340)
 {
-	u8_t cmd;
-	u8_t data[15];
+	uint8_t cmd;
+	uint8_t data[15];
 
 	/* Software reset */
 	cmd = ILI9340_CMD_SOFTWARE_RESET;
diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c
index 5f3fb83aee..34e707aa37 100644
--- a/drivers/display/display_mcux_elcdif.c
+++ b/drivers/display/display_mcux_elcdif.c
@@ -28,7 +28,7 @@ struct mcux_elcdif_config {
 	void (*irq_config_func)(struct device *dev);
 	elcdif_rgb_mode_config_t rgb_mode;
 	enum display_pixel_format pixel_format;
-	u8_t bits_per_pixel;
+	uint8_t bits_per_pixel;
 };
 
 struct mcux_elcdif_data {
@@ -36,23 +36,23 @@ struct mcux_elcdif_data {
 	struct k_sem sem;
 	size_t pixel_bytes;
 	size_t fb_bytes;
-	u8_t write_idx;
+	uint8_t write_idx;
 };
 
-static int mcux_elcdif_write(const struct device *dev, const u16_t x,
-			     const u16_t y,
+static int mcux_elcdif_write(const struct device *dev, const uint16_t x,
+			     const uint16_t y,
 			     const struct display_buffer_descriptor *desc,
 			     const void *buf)
 {
 	const struct mcux_elcdif_config *config = dev->config_info;
 	struct mcux_elcdif_data *data = dev->driver_data;
 
-	u8_t write_idx = data->write_idx;
-	u8_t read_idx = !write_idx;
+	uint8_t write_idx = data->write_idx;
+	uint8_t read_idx = !write_idx;
 
 	int h_idx;
-	const u8_t *src;
-	u8_t *dst;
+	const uint8_t *src;
+	uint8_t *dst;
 
 	__ASSERT((data->pixel_bytes * desc->pitch * desc->height) <=
 		 desc->buf_size, "Input buffer too small");
@@ -87,8 +87,8 @@ static int mcux_elcdif_write(const struct device *dev, const u16_t x,
 	return 0;
 }
 
-static int mcux_elcdif_read(const struct device *dev, const u16_t x,
-			    const u16_t y,
+static int mcux_elcdif_read(const struct device *dev, const uint16_t x,
+			    const uint16_t y,
 			    const struct display_buffer_descriptor *desc,
 			    void *buf)
 {
@@ -115,14 +115,14 @@ static int mcux_elcdif_display_blanking_on(const struct device *dev)
 }
 
 static int mcux_elcdif_set_brightness(const struct device *dev,
-				      const u8_t brightness)
+				      const uint8_t brightness)
 {
 	LOG_WRN("Set brightness not implemented");
 	return -ENOTSUP;
 }
 
 static int mcux_elcdif_set_contrast(const struct device *dev,
-				    const u8_t contrast)
+				    const uint8_t contrast)
 {
 	LOG_ERR("Set contrast not implemented");
 	return -ENOTSUP;
@@ -169,7 +169,7 @@ static void mcux_elcdif_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct mcux_elcdif_config *config = dev->config_info;
 	struct mcux_elcdif_data *data = dev->driver_data;
-	u32_t status;
+	uint32_t status;
 
 	status = ELCDIF_GetInterruptStatus(config->base);
 	ELCDIF_ClearInterruptStatus(config->base, status);
diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c
index ed657ed0e1..bae598fed8 100644
--- a/drivers/display/display_sdl.c
+++ b/drivers/display/display_sdl.c
@@ -21,7 +21,7 @@ struct sdl_display_data {
 	SDL_Texture *texture;
 	bool display_on;
 	enum display_pixel_format current_pixel_format;
-	u8_t buf[4 * CONFIG_SDL_DISPLAY_X_RES * CONFIG_SDL_DISPLAY_Y_RES];
+	uint8_t buf[4 * CONFIG_SDL_DISPLAY_X_RES * CONFIG_SDL_DISPLAY_Y_RES];
 };
 
 static struct sdl_display_data sdl_display_data;
@@ -93,91 +93,91 @@ static void sdl_display_write_argb8888(void *disp_buf,
 	memcpy(disp_buf, buf, desc->pitch * 4U * desc->height);
 }
 
-static void sdl_display_write_rgb888(u8_t *disp_buf,
+static void sdl_display_write_rgb888(uint8_t *disp_buf,
 		const struct display_buffer_descriptor *desc, const void *buf)
 {
-	u32_t w_idx;
-	u32_t h_idx;
-	u32_t pixel;
-	const u8_t *byte_ptr;
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint32_t pixel;
+	const uint8_t *byte_ptr;
 
 	__ASSERT((desc->pitch * 3U * desc->height) <= desc->buf_size,
 			"Input buffer to small");
 
 	for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
 		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
-			byte_ptr = (const u8_t *)buf +
+			byte_ptr = (const uint8_t *)buf +
 				((h_idx * desc->pitch) + w_idx) * 3U;
 			pixel = *byte_ptr << 16;
 			pixel |= *(byte_ptr + 1) << 8;
 			pixel |= *(byte_ptr + 2);
-			*((u32_t *)disp_buf) = pixel;
+			*((uint32_t *)disp_buf) = pixel;
 			disp_buf += 4;
 		}
 	}
 }
 
-static void sdl_display_write_rgb565(u8_t *disp_buf,
+static void sdl_display_write_rgb565(uint8_t *disp_buf,
 		const struct display_buffer_descriptor *desc, const void *buf)
 {
-	u32_t w_idx;
-	u32_t h_idx;
-	u32_t pixel;
-	const u16_t *pix_ptr;
-	u16_t rgb565;
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint32_t pixel;
+	const uint16_t *pix_ptr;
+	uint16_t rgb565;
 
 	__ASSERT((desc->pitch * 2U * desc->height) <= desc->buf_size,
 			"Input buffer to small");
 
 	for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
 		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
-			pix_ptr = (const u16_t *)buf +
+			pix_ptr = (const uint16_t *)buf +
 				((h_idx * desc->pitch) + w_idx);
 			rgb565 = sys_be16_to_cpu(*pix_ptr);
 			pixel = (((rgb565 >> 11) & 0x1F) * 255 / 31) << 16;
 			pixel |= (((rgb565 >> 5) & 0x3F) * 255 / 63) << 8;
 			pixel |= (rgb565 & 0x1F) * 255 / 31;
-			*((u32_t *)disp_buf) = pixel;
+			*((uint32_t *)disp_buf) = pixel;
 			disp_buf += 4;
 		}
 	}
 }
 
-static void sdl_display_write_bgr565(u8_t *disp_buf,
+static void sdl_display_write_bgr565(uint8_t *disp_buf,
 		const struct display_buffer_descriptor *desc, const void *buf)
 {
-	u32_t w_idx;
-	u32_t h_idx;
-	u32_t pixel;
-	const u16_t *pix_ptr;
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint32_t pixel;
+	const uint16_t *pix_ptr;
 
 	__ASSERT((desc->pitch * 2U * desc->height) <= desc->buf_size,
 			"Input buffer to small");
 
 	for (h_idx = 0U; h_idx < desc->height; ++h_idx) {
 		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
-			pix_ptr = (const u16_t *)buf +
+			pix_ptr = (const uint16_t *)buf +
 				((h_idx * desc->pitch) + w_idx);
 			pixel = (((*pix_ptr >> 11) & 0x1F) * 255 / 31) << 16;
 			pixel |= (((*pix_ptr >> 5) & 0x3F) * 255 / 63) << 8;
 			pixel |= (*pix_ptr & 0x1F) * 255 / 31;
-			*((u32_t *)disp_buf) = pixel;
+			*((uint32_t *)disp_buf) = pixel;
 			disp_buf += 4;
 		}
 	}
 }
 
-static void sdl_display_write_mono(u8_t *disp_buf,
+static void sdl_display_write_mono(uint8_t *disp_buf,
 		const struct display_buffer_descriptor *desc, const void *buf,
 		const bool one_is_black)
 {
-	u32_t w_idx;
-	u32_t h_idx;
-	u32_t tile_idx;
-	u32_t pixel;
-	const u8_t *byte_ptr;
-	u32_t one_color;
-	u8_t *disp_buf_start;
+	uint32_t w_idx;
+	uint32_t h_idx;
+	uint32_t tile_idx;
+	uint32_t pixel;
+	const uint8_t *byte_ptr;
+	uint32_t one_color;
+	uint8_t *disp_buf_start;
 
 	__ASSERT((desc->pitch * desc->height) <= (desc->buf_size * 8U),
 			"Input buffer to small");
@@ -192,7 +192,7 @@ static void sdl_display_write_mono(u8_t *disp_buf,
 
 	for (tile_idx = 0U; tile_idx < desc->height/8U; ++tile_idx) {
 		for (w_idx = 0U; w_idx < desc->width; ++w_idx) {
-			byte_ptr = (const u8_t *)buf +
+			byte_ptr = (const uint8_t *)buf +
 				((tile_idx * desc->pitch) + w_idx);
 			disp_buf_start = disp_buf;
 			for (h_idx = 0U; h_idx < 8; ++h_idx) {
@@ -201,7 +201,7 @@ static void sdl_display_write_mono(u8_t *disp_buf,
 				} else {
 					pixel = (~one_color) & 0x00FFFFFF;
 				}
-				*((u32_t *)disp_buf) = pixel;
+				*((uint32_t *)disp_buf) = pixel;
 				disp_buf += (desc->width * 4U);
 			}
 			disp_buf = disp_buf_start;
@@ -211,8 +211,8 @@ static void sdl_display_write_mono(u8_t *disp_buf,
 	}
 }
 
-static int sdl_display_write(const struct device *dev, const u16_t x,
-			     const u16_t y,
+static int sdl_display_write(const struct device *dev, const uint16_t x,
+			     const uint16_t y,
 			     const struct display_buffer_descriptor *desc,
 			     const void *buf)
 {
@@ -258,8 +258,8 @@ static int sdl_display_write(const struct device *dev, const u16_t x,
 	return 0;
 }
 
-static int sdl_display_read(const struct device *dev, const u16_t x,
-			    const u16_t y,
+static int sdl_display_read(const struct device *dev, const uint16_t x,
+			    const uint16_t y,
 			    const struct display_buffer_descriptor *desc,
 			    void *buf)
 {
@@ -319,13 +319,13 @@ static int sdl_display_blanking_on(const struct device *dev)
 }
 
 static int sdl_display_set_brightness(const struct device *dev,
-		const u8_t brightness)
+		const uint8_t brightness)
 {
 	return -ENOTSUP;
 }
 
 static int sdl_display_set_contrast(const struct device *dev,
-		const u8_t contrast)
+		const uint8_t contrast)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c
index b293344281..50613bacd3 100644
--- a/drivers/display/display_st7789v.c
+++ b/drivers/display/display_st7789v.c
@@ -28,13 +28,13 @@ LOG_MODULE_REGISTER(display_st7789v);
 #define ST7789V_RESET_PIN	DT_INST_GPIO_PIN(0, reset_gpios)
 #define ST7789V_RESET_FLAGS	DT_INST_GPIO_FLAGS(0, reset_gpios)
 
-static u8_t st7789v_porch_param[] = DT_INST_PROP(0, porch_param);
-static u8_t st7789v_cmd2en_param[] = DT_INST_PROP(0, cmd2en_param);
-static u8_t st7789v_pwctrl1_param[] = DT_INST_PROP(0, pwctrl1_param);
-static u8_t st7789v_pvgam_param[] = DT_INST_PROP(0, pvgam_param);
-static u8_t st7789v_nvgam_param[] = DT_INST_PROP(0, nvgam_param);
-static u8_t st7789v_ram_param[] = DT_INST_PROP(0, ram_param);
-static u8_t st7789v_rgb_param[] = DT_INST_PROP(0, rgb_param);
+static uint8_t st7789v_porch_param[] = DT_INST_PROP(0, porch_param);
+static uint8_t st7789v_cmd2en_param[] = DT_INST_PROP(0, cmd2en_param);
+static uint8_t st7789v_pwctrl1_param[] = DT_INST_PROP(0, pwctrl1_param);
+static uint8_t st7789v_pvgam_param[] = DT_INST_PROP(0, pvgam_param);
+static uint8_t st7789v_nvgam_param[] = DT_INST_PROP(0, nvgam_param);
+static uint8_t st7789v_ram_param[] = DT_INST_PROP(0, ram_param);
+static uint8_t st7789v_rgb_param[] = DT_INST_PROP(0, rgb_param);
 
 struct st7789v_data {
 	struct device *spi_dev;
@@ -48,12 +48,12 @@ struct st7789v_data {
 #endif
 	struct device *cmd_data_gpio;
 
-	u16_t height;
-	u16_t width;
-	u16_t x_offset;
-	u16_t y_offset;
+	uint16_t height;
+	uint16_t width;
+	uint16_t x_offset;
+	uint16_t y_offset;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -64,7 +64,7 @@ struct st7789v_data {
 #endif
 
 static void st7789v_set_lcd_margins(struct st7789v_data *data,
-			     u16_t x_offset, u16_t y_offset)
+			     uint16_t x_offset, uint16_t y_offset)
 {
 	data->x_offset = x_offset;
 	data->y_offset = y_offset;
@@ -75,8 +75,8 @@ static void st7789v_set_cmd(struct st7789v_data *data, int is_cmd)
 	gpio_pin_set(data->cmd_data_gpio, ST7789V_CMD_DATA_PIN, is_cmd);
 }
 
-static void st7789v_transmit(struct st7789v_data *data, u8_t cmd,
-		u8_t *tx_data, size_t tx_count)
+static void st7789v_transmit(struct st7789v_data *data, uint8_t cmd,
+		uint8_t *tx_data, size_t tx_count)
 {
 	struct spi_buf tx_buf = { .buf = &cmd, .len = 1 };
 	struct spi_buf_set tx_bufs = { .buffers = &tx_buf, .count = 1 };
@@ -130,44 +130,44 @@ static int st7789v_blanking_off(const struct device *dev)
 }
 
 static int st7789v_read(const struct device *dev,
-			const u16_t x,
-			const u16_t y,
+			const uint16_t x,
+			const uint16_t y,
 			const struct display_buffer_descriptor *desc,
 			void *buf)
 {
 	return -ENOTSUP;
 }
 
-static void st7789v_set_mem_area(struct st7789v_data *data, const u16_t x,
-				 const u16_t y, const u16_t w, const u16_t h)
+static void st7789v_set_mem_area(struct st7789v_data *data, const uint16_t x,
+				 const uint16_t y, const uint16_t w, const uint16_t h)
 {
-	u16_t spi_data[2];
+	uint16_t spi_data[2];
 
-	u16_t ram_x = x + data->x_offset;
-	u16_t ram_y = y + data->y_offset;
+	uint16_t ram_x = x + data->x_offset;
+	uint16_t ram_y = y + data->y_offset;
 
 	spi_data[0] = sys_cpu_to_be16(ram_x);
 	spi_data[1] = sys_cpu_to_be16(ram_x + w - 1);
-	st7789v_transmit(data, ST7789V_CMD_CASET, (u8_t *)&spi_data[0], 4);
+	st7789v_transmit(data, ST7789V_CMD_CASET, (uint8_t *)&spi_data[0], 4);
 
 	spi_data[0] = sys_cpu_to_be16(ram_y);
 	spi_data[1] = sys_cpu_to_be16(ram_y + h - 1);
-	st7789v_transmit(data, ST7789V_CMD_RASET, (u8_t *)&spi_data[0], 4);
+	st7789v_transmit(data, ST7789V_CMD_RASET, (uint8_t *)&spi_data[0], 4);
 }
 
 static int st7789v_write(const struct device *dev,
-			 const u16_t x,
-			 const u16_t y,
+			 const uint16_t x,
+			 const uint16_t y,
 			 const struct display_buffer_descriptor *desc,
 			 const void *buf)
 {
 	struct st7789v_data *data = (struct st7789v_data *)dev->driver_data;
-	const u8_t *write_data_start = (u8_t *) buf;
+	const uint8_t *write_data_start = (uint8_t *) buf;
 	struct spi_buf tx_buf;
 	struct spi_buf_set tx_bufs;
-	u16_t write_cnt;
-	u16_t nbr_of_writes;
-	u16_t write_h;
+	uint16_t write_cnt;
+	uint16_t nbr_of_writes;
+	uint16_t write_h;
 
 	__ASSERT(desc->width <= desc->pitch, "Pitch is smaller then width");
 	__ASSERT((desc->pitch * ST7789V_PIXEL_SIZE * desc->height) <= desc->buf_size,
@@ -209,13 +209,13 @@ static void *st7789v_get_framebuffer(const struct device *dev)
 }
 
 static int st7789v_set_brightness(const struct device *dev,
-			   const u8_t brightness)
+			   const uint8_t brightness)
 {
 	return -ENOTSUP;
 }
 
 static int st7789v_set_contrast(const struct device *dev,
-			 const u8_t contrast)
+			 const uint8_t contrast)
 {
 	return -ENOTSUP;
 }
@@ -265,7 +265,7 @@ static int st7789v_set_orientation(const struct device *dev,
 
 static void st7789v_lcd_init(struct st7789v_data *p_st7789v)
 {
-	u8_t tmp;
+	uint8_t tmp;
 
 	st7789v_set_lcd_margins(p_st7789v, p_st7789v->x_offset,
 				p_st7789v->y_offset);
@@ -407,7 +407,7 @@ static void st7789v_enter_sleep(struct st7789v_data *data)
 	st7789v_transmit(data, ST7789V_CMD_SLEEP_IN, NULL, 0);
 }
 
-static int st7789v_pm_control(struct device *dev, u32_t ctrl_command,
+static int st7789v_pm_control(struct device *dev, uint32_t ctrl_command,
 				 void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
@@ -415,7 +415,7 @@ static int st7789v_pm_control(struct device *dev, u32_t ctrl_command,
 
 	switch (ctrl_command) {
 	case DEVICE_PM_SET_POWER_STATE:
-		if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			st7789v_exit_sleep(data);
 			data->pm_state = DEVICE_PM_ACTIVE_STATE;
 			ret = 0;
@@ -426,7 +426,7 @@ static int st7789v_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 		break;
 	case DEVICE_PM_GET_POWER_STATE:
-		*((u32_t *)context) = data->pm_state;
+		*((uint32_t *)context) = data->pm_state;
 		break;
 	default:
 		ret = -EINVAL;
diff --git a/drivers/display/gd7965.c b/drivers/display/gd7965.c
index 26ae332dd0..f8e0180a60 100644
--- a/drivers/display/gd7965.c
+++ b/drivers/display/gd7965.c
@@ -66,16 +66,16 @@ struct gd7965_data {
 #endif
 };
 
-static u8_t gd7965_softstart[] = DT_INST_PROP(0, softstart);
-static u8_t gd7965_pwr[] = DT_INST_PROP(0, pwr);
+static uint8_t gd7965_softstart[] = DT_INST_PROP(0, softstart);
+static uint8_t gd7965_pwr[] = DT_INST_PROP(0, pwr);
 
 /* Border and data polarity settings */
-static u8_t bdd_polarity;
+static uint8_t bdd_polarity;
 
 static bool blanking_on = true;
 
 static inline int gd7965_write_cmd(struct gd7965_data *driver,
-				   u8_t cmd, u8_t *data, size_t len)
+				   uint8_t cmd, uint8_t *data, size_t len)
 {
 	struct spi_buf buf = {.buf = &cmd, .len = sizeof(cmd)};
 	struct spi_buf_set buf_set = {.buffers = &buf, .count = 1};
@@ -147,14 +147,14 @@ static int gd7965_blanking_on(const struct device *dev)
 	return 0;
 }
 
-static int gd7965_write(const struct device *dev, const u16_t x, const u16_t y,
+static int gd7965_write(const struct device *dev, const uint16_t x, const uint16_t y,
 			const struct display_buffer_descriptor *desc,
 			const void *buf)
 {
 	struct gd7965_data *driver = dev->driver_data;
-	u16_t x_end_idx = x + desc->width - 1;
-	u16_t y_end_idx = y + desc->height - 1;
-	u8_t ptl[GD7965_PTL_REG_LENGTH] = {0};
+	uint16_t x_end_idx = x + desc->width - 1;
+	uint16_t y_end_idx = y + desc->height - 1;
+	uint8_t ptl[GD7965_PTL_REG_LENGTH] = {0};
 	size_t buf_len;
 
 	LOG_DBG("x %u, y %u, height %u, width %u, pitch %u",
@@ -198,7 +198,7 @@ static int gd7965_write(const struct device *dev, const u16_t x, const u16_t y,
 		return -EIO;
 	}
 
-	if (gd7965_write_cmd(driver, GD7965_CMD_DTM2, (u8_t *)buf, buf_len)) {
+	if (gd7965_write_cmd(driver, GD7965_CMD_DTM2, (uint8_t *)buf, buf_len)) {
 		return -EIO;
 	}
 
@@ -223,7 +223,7 @@ static int gd7965_write(const struct device *dev, const u16_t x, const u16_t y,
 	return 0;
 }
 
-static int gd7965_read(const struct device *dev, const u16_t x, const u16_t y,
+static int gd7965_read(const struct device *dev, const uint16_t x, const uint16_t y,
 		       const struct display_buffer_descriptor *desc, void *buf)
 {
 	LOG_ERR("not supported");
@@ -237,13 +237,13 @@ static void *gd7965_get_framebuffer(const struct device *dev)
 }
 
 static int gd7965_set_brightness(const struct device *dev,
-				 const u8_t brightness)
+				 const uint8_t brightness)
 {
 	LOG_WRN("not supported");
 	return -ENOTSUP;
 }
 
-static int gd7965_set_contrast(const struct device *dev, u8_t contrast)
+static int gd7965_set_contrast(const struct device *dev, uint8_t contrast)
 {
 	LOG_WRN("not supported");
 	return -ENOTSUP;
@@ -280,7 +280,7 @@ static int gd7965_set_pixel_format(const struct device *dev,
 }
 
 static int gd7965_clear_and_write_buffer(struct device *dev,
-					 u8_t pattern, bool update)
+					 uint8_t pattern, bool update)
 {
 	struct display_buffer_descriptor desc = {
 		.buf_size = GD7965_NUMOF_PAGES,
@@ -288,7 +288,7 @@ static int gd7965_clear_and_write_buffer(struct device *dev,
 		.height = 1,
 		.pitch = EPD_PANEL_WIDTH,
 	};
-	u8_t *line;
+	uint8_t *line;
 
 	line = k_malloc(GD7965_NUMOF_PAGES);
 	if (line == NULL) {
@@ -314,7 +314,7 @@ static int gd7965_clear_and_write_buffer(struct device *dev,
 static int gd7965_controller_init(struct device *dev)
 {
 	struct gd7965_data *driver = dev->driver_data;
-	u8_t tmp[GD7965_TRES_REG_LENGTH];
+	uint8_t tmp[GD7965_TRES_REG_LENGTH];
 
 	gpio_pin_set(driver->reset, GD7965_RESET_PIN, 1);
 	k_sleep(GD7965_RESET_DELAY);
diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c
index d1a768deac..8d1be4537a 100644
--- a/drivers/display/grove_lcd_rgb.c
+++ b/drivers/display/grove_lcd_rgb.c
@@ -23,20 +23,20 @@ LOG_MODULE_REGISTER(grove_lcd);
 #define GROVE_RGB_BACKLIGHT_ADDR	(0x62)
 
 struct command {
-	u8_t control;
-	u8_t data;
+	uint8_t control;
+	uint8_t data;
 };
 
 struct glcd_data {
 	struct device *i2c;
-	u8_t input_set;
-	u8_t display_switch;
-	u8_t function;
+	uint8_t input_set;
+	uint8_t display_switch;
+	uint8_t function;
 };
 
 struct glcd_driver {
-	u16_t	lcd_addr;
-	u16_t	rgb_addr;
+	uint16_t	lcd_addr;
+	uint16_t	rgb_addr;
 };
 
 
@@ -74,7 +74,7 @@ struct glcd_driver {
 #define REGISTER_G	0x03
 #define REGISTER_B	0x02
 
-static u8_t color_define[][3] = {
+static uint8_t color_define[][3] = {
 	{ 255, 255, 255 },	/* white */
 	{ 255, 0,   0   },      /* red */
 	{ 0,   255, 0   },      /* green */
@@ -85,15 +85,15 @@ static u8_t color_define[][3] = {
 /********************************************
  *  PRIVATE FUNCTIONS
  *******************************************/
-static void rgb_reg_set(struct device * const i2c, u8_t addr, u8_t dta)
+static void rgb_reg_set(struct device * const i2c, uint8_t addr, uint8_t dta)
 {
-	u8_t data[2] = { addr, dta };
+	uint8_t data[2] = { addr, dta };
 
 	i2c_write(i2c, data, sizeof(data), GROVE_RGB_BACKLIGHT_ADDR);
 }
 
 
-static inline void sleep(u32_t sleep_in_ms)
+static inline void sleep(uint32_t sleep_in_ms)
 {
 	k_busy_wait(SLEEP_IN_US(sleep_in_ms));
 }
@@ -102,12 +102,12 @@ static inline void sleep(u32_t sleep_in_ms)
 /********************************************
  *  PUBLIC FUNCTIONS
  *******************************************/
-void glcd_print(struct device *port, char *data, u32_t size)
+void glcd_print(struct device *port, char *data, uint32_t size)
 {
 	const struct glcd_driver * const rom = (const struct glcd_driver *)
 						port->config_info;
 	struct glcd_data *dev = port->driver_data;
-	u8_t buf[] = { GLCD_CMD_SET_CGRAM_ADDR, 0 };
+	uint8_t buf[] = { GLCD_CMD_SET_CGRAM_ADDR, 0 };
 	int i;
 
 	for (i = 0; i < size; i++) {
@@ -117,7 +117,7 @@ void glcd_print(struct device *port, char *data, u32_t size)
 }
 
 
-void glcd_cursor_pos_set(struct device *port, u8_t col, u8_t row)
+void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row)
 {
 	const struct glcd_driver * const rom = (const struct glcd_driver *)
 						port->config_info;
@@ -143,7 +143,7 @@ void glcd_clear(struct device *port)
 	const struct glcd_driver * const rom = (const struct glcd_driver *)
 						port->config_info;
 	struct glcd_data *dev = port->driver_data;
-	u8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR };
+	uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR };
 
 	i2c_write(dev->i2c, clear, sizeof(clear), rom->lcd_addr);
 	LOG_DBG("clear, delay 20 ms");
@@ -151,12 +151,12 @@ void glcd_clear(struct device *port)
 }
 
 
-void glcd_display_state_set(struct device *port, u8_t opt)
+void glcd_display_state_set(struct device *port, uint8_t opt)
 {
 	const struct glcd_driver * const rom = (const struct glcd_driver *)
 						port->config_info;
 	struct glcd_data *dev = port->driver_data;
-	u8_t data[] = { 0, 0 };
+	uint8_t data[] = { 0, 0 };
 
 	dev->display_switch = opt;
 	data[1] = (opt | GLCD_CMD_DISPLAY_SWITCH);
@@ -168,7 +168,7 @@ void glcd_display_state_set(struct device *port, u8_t opt)
 }
 
 
-u8_t glcd_display_state_get(struct device *port)
+uint8_t glcd_display_state_get(struct device *port)
 {
 	struct glcd_data *dev = port->driver_data;
 
@@ -176,11 +176,11 @@ u8_t glcd_display_state_get(struct device *port)
 }
 
 
-void glcd_input_state_set(struct device *port, u8_t opt)
+void glcd_input_state_set(struct device *port, uint8_t opt)
 {
 	const struct glcd_driver * const rom = port->config_info;
 	struct glcd_data *dev = port->driver_data;
-	u8_t data[] = { 0, 0 };
+	uint8_t data[] = { 0, 0 };
 
 	dev->input_set = opt;
 	data[1] = (opt | GLCD_CMD_INPUT_SET);
@@ -191,7 +191,7 @@ void glcd_input_state_set(struct device *port, u8_t opt)
 }
 
 
-u8_t glcd_input_state_get(struct device *port)
+uint8_t glcd_input_state_get(struct device *port)
 {
 	struct glcd_data *dev = port->driver_data;
 
@@ -199,7 +199,7 @@ u8_t glcd_input_state_get(struct device *port)
 }
 
 
-void glcd_color_select(struct device *port, u8_t color)
+void glcd_color_select(struct device *port, uint8_t color)
 {
 	if (color > 3) {
 		LOG_WRN("selected color is too high a value");
@@ -211,7 +211,7 @@ void glcd_color_select(struct device *port, u8_t color)
 }
 
 
-void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b)
+void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b)
 {
 	struct glcd_data * const dev = port->driver_data;
 
@@ -221,11 +221,11 @@ void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b)
 }
 
 
-void glcd_function_set(struct device *port, u8_t opt)
+void glcd_function_set(struct device *port, uint8_t opt)
 {
 	const struct glcd_driver * const rom = port->config_info;
 	struct glcd_data *dev = port->driver_data;
-	u8_t data[] = { 0, 0 };
+	uint8_t data[] = { 0, 0 };
 
 	dev->function = opt;
 	data[1] = (opt | GLCD_CMD_FUNCTION_SET);
@@ -237,7 +237,7 @@ void glcd_function_set(struct device *port, u8_t opt)
 }
 
 
-u8_t glcd_function_get(struct device *port)
+uint8_t glcd_function_get(struct device *port)
 {
 	struct glcd_data *dev = port->driver_data;
 
@@ -248,7 +248,7 @@ u8_t glcd_function_get(struct device *port)
 int glcd_initialize(struct device *port)
 {
 	struct glcd_data *dev = port->driver_data;
-	u8_t cmd;
+	uint8_t cmd;
 
 	LOG_DBG("initialize called");
 
diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c
index 1247b406ac..3b4f043451 100644
--- a/drivers/display/mb_display.c
+++ b/drivers/display/mb_display.c
@@ -86,21 +86,21 @@ struct mb_display {
 
 	struct k_timer  timer;       /* Rendering timer */
 
-	u8_t            img_count;   /* Image count */
+	uint8_t            img_count;   /* Image count */
 
-	u8_t            cur_img;     /* Current image or character to show */
+	uint8_t            cur_img;     /* Current image or character to show */
 
-	u8_t            scroll:3,    /* Scroll shift */
+	uint8_t            scroll:3,    /* Scroll shift */
 			first:1,     /* First frame of a scroll sequence */
 			loop:1,      /* Loop to beginning */
 			text:1,      /* We're showing a string (not image) */
 			img_sep:1;   /* One column image separation */
 
 	/* The following variables track the currently shown image */
-	u8_t            cur;         /* Currently rendered row */
-	u32_t           row[3];      /* Content (columns) for each row */
-	s64_t           expiry;      /* When to stop showing current image */
-	s32_t           duration;    /* Duration for each shown image */
+	uint8_t            cur;         /* Currently rendered row */
+	uint32_t           row[3];      /* Content (columns) for each row */
+	int64_t           expiry;      /* When to stop showing current image */
+	int32_t           duration;    /* Duration for each shown image */
 
 	union {
 		const struct mb_image *img; /* Array of images to show */
@@ -112,7 +112,7 @@ struct mb_display {
 };
 
 struct x_y {
-	u8_t x:4,
+	uint8_t x:4,
 	     y:4;
 };
 
@@ -126,7 +126,7 @@ static const struct x_y map[DISPLAY_ROWS][DISPLAY_COLS] = {
 };
 
 /* Mask of all the column bits */
-static const u32_t col_mask = (((~0UL) << LED_COL1_GPIO_PIN) &
+static const uint32_t col_mask = (((~0UL) << LED_COL1_GPIO_PIN) &
 			       ((~0UL) >> (31 - LED_COL9_GPIO_PIN)));
 
 static inline const struct mb_image *get_font(char ch)
@@ -171,9 +171,9 @@ static void start_image(struct mb_display *disp, const struct mb_image *img)
 
 #define ROW_PIN(n) (LED_ROW1_GPIO_PIN + (n))
 
-static inline void update_pins(struct mb_display *disp, u32_t val)
+static inline void update_pins(struct mb_display *disp, uint32_t val)
 {
-	u32_t pin, prev = (disp->cur + 2) % 3;
+	uint32_t pin, prev = (disp->cur + 2) % 3;
 
 	/* Disable the previous row */
 	gpio_pin_set_raw(disp->dev, ROW_PIN(prev), 0);
@@ -241,7 +241,7 @@ static inline bool last_frame(struct mb_display *disp)
 	}
 }
 
-static inline u8_t scroll_steps(struct mb_display *disp)
+static inline uint8_t scroll_steps(struct mb_display *disp)
 {
 	return 5 + disp->img_sep;
 }
@@ -329,7 +329,7 @@ static struct mb_display display = {
 	.timer = Z_TIMER_INITIALIZER(display.timer, show_row, clear_display),
 };
 
-static void start_scroll(struct mb_display *disp, s32_t duration)
+static void start_scroll(struct mb_display *disp, int32_t duration)
 {
 	/* Divide total duration by number of scrolling steps */
 	if (duration) {
@@ -344,7 +344,7 @@ static void start_scroll(struct mb_display *disp, s32_t duration)
 	start_image(disp, get_font(' '));
 }
 
-static void start_single(struct mb_display *disp, s32_t duration)
+static void start_single(struct mb_display *disp, int32_t duration)
 {
 	disp->duration = duration;
 
@@ -355,8 +355,8 @@ static void start_single(struct mb_display *disp, s32_t duration)
 	}
 }
 
-void mb_display_image(struct mb_display *disp, u32_t mode, s32_t duration,
-		      const struct mb_image *img, u8_t img_count)
+void mb_display_image(struct mb_display *disp, uint32_t mode, int32_t duration,
+		      const struct mb_image *img, uint8_t img_count)
 {
 	reset_display(disp);
 
@@ -387,8 +387,8 @@ void mb_display_stop(struct mb_display *disp)
 	reset_display(disp);
 }
 
-void mb_display_print(struct mb_display *disp, u32_t mode,
-		      s32_t duration, const char *fmt, ...)
+void mb_display_print(struct mb_display *disp, uint32_t mode,
+		      int32_t duration, const char *fmt, ...)
 {
 	va_list ap;
 
diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c
index db50f81869..b9b6417522 100644
--- a/drivers/display/ssd1306.c
+++ b/drivers/display/ssd1306.c
@@ -49,12 +49,12 @@ LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL);
 struct ssd1306_data {
 	struct device *reset;
 	struct device *i2c;
-	u8_t contrast;
-	u8_t scan_mode;
+	uint8_t contrast;
+	uint8_t scan_mode;
 };
 
 static inline int ssd1306_reg_read(struct ssd1306_data *driver,
-				   u8_t reg, u8_t * const val)
+				   uint8_t reg, uint8_t * const val)
 {
 	return i2c_reg_read_byte(driver->i2c,
 				 DT_INST_REG_ADDR(0),
@@ -62,15 +62,15 @@ static inline int ssd1306_reg_read(struct ssd1306_data *driver,
 }
 
 static inline int ssd1306_reg_write(struct ssd1306_data *driver,
-				    u8_t reg, u8_t val)
+				    uint8_t reg, uint8_t val)
 {
 	return i2c_reg_write_byte(driver->i2c,
 				  DT_INST_REG_ADDR(0),
 				  reg, val);
 }
 
-static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg,
-				     u8_t mask, u8_t val)
+static inline int ssd1306_reg_update(struct ssd1306_data *driver, uint8_t reg,
+				     uint8_t mask, uint8_t val)
 {
 	return i2c_reg_update_byte(driver->i2c,
 				   DT_INST_REG_ADDR(0),
@@ -80,7 +80,7 @@ static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg,
 static inline int ssd1306_set_panel_orientation(struct device *dev)
 {
 	struct ssd1306_data *driver = dev->driver_data;
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		(SSD1306_PANEL_SEGMENT_REMAP ?
 		 SSD1306_SET_SEGMENT_MAP_REMAPED :
@@ -98,7 +98,7 @@ static inline int ssd1306_set_panel_orientation(struct device *dev)
 static inline int ssd1306_set_timing_setting(struct device *dev)
 {
 	struct ssd1306_data *driver = dev->driver_data;
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_CLOCK_DIV_RATIO,
 		SSD1306_CONTROL_BYTE_CMD,
@@ -120,7 +120,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev)
 static inline int ssd1306_set_hardware_config(struct device *dev)
 {
 	struct ssd1306_data *driver = dev->driver_data;
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_START_LINE,
 		SSD1306_CONTROL_BYTE_CMD,
@@ -144,7 +144,7 @@ static inline int ssd1306_set_hardware_config(struct device *dev)
 static inline int ssd1306_set_charge_pump(const struct device *dev)
 {
 	struct ssd1306_data *driver = dev->driver_data;
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 #if defined(CONFIG_SSD1306_DEFAULT)
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_CHARGE_PUMP_ON,
@@ -181,7 +181,7 @@ static int ssd1306_suspend(const struct device *dev)
 				 SSD1306_DISPLAY_OFF);
 }
 
-static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
+static int ssd1306_write(const struct device *dev, const uint16_t x, const uint16_t y,
 			 const struct display_buffer_descriptor *desc,
 			 const void *buf)
 {
@@ -213,7 +213,7 @@ static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
 		x, y, desc->pitch, desc->width, desc->height, buf_len);
 
 #if defined(CONFIG_SSD1306_DEFAULT)
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_MEM_ADDRESSING_MODE,
 		SSD1306_CONTROL_BYTE_CMD,
@@ -241,11 +241,11 @@ static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
 	return i2c_burst_write(driver->i2c,
 			       DT_INST_REG_ADDR(0),
 			       SSD1306_CONTROL_LAST_BYTE_DATA,
-			       (u8_t *)buf, buf_len);
+			       (uint8_t *)buf, buf_len);
 
 #elif defined(CONFIG_SSD1306_SH1106_COMPATIBLE)
-	u8_t x_offset = x + DT_INST_PROP(0, segment_offset);
-	u8_t cmd_buf[] = {
+	uint8_t x_offset = x + DT_INST_PROP(0, segment_offset);
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_LOWER_COL_ADDRESS |
 			(x_offset & SSD1306_SET_LOWER_COL_ADDRESS_MASK),
@@ -255,9 +255,9 @@ static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
 		SSD1306_CONTROL_LAST_BYTE_CMD,
 		SSD1306_SET_PAGE_START_ADDRESS | (y / 8)
 	};
-	u8_t *buf_ptr = (u8_t *)buf;
+	uint8_t *buf_ptr = (uint8_t *)buf;
 
-	for (u8_t n = 0; n < desc->height / 8; n++) {
+	for (uint8_t n = 0; n < desc->height / 8; n++) {
 		cmd_buf[sizeof(cmd_buf) - 1] =
 			SSD1306_SET_PAGE_START_ADDRESS | (n + (y / 8));
 		LOG_HEXDUMP_DBG(cmd_buf, sizeof(cmd_buf), "cmd_buf");
@@ -275,7 +275,7 @@ static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
 		}
 
 		buf_ptr = buf_ptr + desc->width;
-		if (buf_ptr > ((u8_t *)buf + buf_len)) {
+		if (buf_ptr > ((uint8_t *)buf + buf_len)) {
 			LOG_ERR("Exceeded buffer length");
 			return -1;
 		}
@@ -285,8 +285,8 @@ static int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
 	return 0;
 }
 
-static int ssd1306_read(const struct device *dev, const u16_t x,
-			const u16_t y,
+static int ssd1306_read(const struct device *dev, const uint16_t x,
+			const uint16_t y,
 			const struct display_buffer_descriptor *desc,
 			void *buf)
 {
@@ -301,16 +301,16 @@ static void *ssd1306_get_framebuffer(const struct device *dev)
 }
 
 static int ssd1306_set_brightness(const struct device *dev,
-				  const u8_t brightness)
+				  const uint8_t brightness)
 {
 	LOG_WRN("Unsupported");
 	return -ENOTSUP;
 }
 
-static int ssd1306_set_contrast(const struct device *dev, const u8_t contrast)
+static int ssd1306_set_contrast(const struct device *dev, const uint8_t contrast)
 {
 	struct ssd1306_data *driver = dev->driver_data;
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_CONTRAST_CTRL,
 		SSD1306_CONTROL_LAST_BYTE_CMD,
@@ -354,7 +354,7 @@ static int ssd1306_init_device(struct device *dev)
 {
 	struct ssd1306_data *driver = dev->driver_data;
 
-	u8_t cmd_buf[] = {
+	uint8_t cmd_buf[] = {
 		SSD1306_CONTROL_BYTE_CMD,
 		SSD1306_SET_ENTIRE_DISPLAY_OFF,
 		SSD1306_CONTROL_LAST_BYTE_CMD,
diff --git a/drivers/display/ssd16xx.c b/drivers/display/ssd16xx.c
index a2b31c768e..e5e7f1e1c0 100644
--- a/drivers/display/ssd16xx.c
+++ b/drivers/display/ssd16xx.c
@@ -64,16 +64,16 @@ struct ssd16xx_data {
 #if defined(SSD16XX_CS_CNTRL)
 	struct spi_cs_control cs_ctrl;
 #endif
-	u8_t scan_mode;
+	uint8_t scan_mode;
 };
 
-static u8_t ssd16xx_lut_initial[] = DT_INST_PROP(0, lut_initial);
-static u8_t ssd16xx_lut_default[] = DT_INST_PROP(0, lut_default);
+static uint8_t ssd16xx_lut_initial[] = DT_INST_PROP(0, lut_initial);
+static uint8_t ssd16xx_lut_default[] = DT_INST_PROP(0, lut_default);
 #if DT_INST_NODE_HAS_PROP(0, softstart)
-static u8_t ssd16xx_softstart[] = DT_INST_PROP(0, softstart);
+static uint8_t ssd16xx_softstart[] = DT_INST_PROP(0, softstart);
 #endif
-static u8_t ssd16xx_gdv[] = DT_INST_PROP(0, gdv);
-static u8_t ssd16xx_sdv[] = DT_INST_PROP(0, sdv);
+static uint8_t ssd16xx_gdv[] = DT_INST_PROP(0, gdv);
+static uint8_t ssd16xx_sdv[] = DT_INST_PROP(0, sdv);
 
 #if !DT_INST_NODE_HAS_PROP(0, lut_initial)
 #error "No initial waveform look up table (LUT) selected!"
@@ -84,7 +84,7 @@ static u8_t ssd16xx_sdv[] = DT_INST_PROP(0, sdv);
 #endif
 
 static inline int ssd16xx_write_cmd(struct ssd16xx_data *driver,
-				    u8_t cmd, u8_t *data, size_t len)
+				    uint8_t cmd, uint8_t *data, size_t len)
 {
 	int err;
 	struct spi_buf buf = {.buf = &cmd, .len = sizeof(cmd)};
@@ -120,10 +120,10 @@ static inline void ssd16xx_busy_wait(struct ssd16xx_data *driver)
 	}
 }
 
-static inline size_t push_x_param(u8_t *data, u16_t x)
+static inline size_t push_x_param(uint8_t *data, uint16_t x)
 {
 #if DT_INST_PROP(0, pp_width_bits) == 8
-	data[0] = (u8_t)x;
+	data[0] = (uint8_t)x;
 	return 1;
 #elif DT_INST_PROP(0, pp_width_bits) == 16
 	sys_put_le16(sys_cpu_to_le16(x), data);
@@ -133,10 +133,10 @@ static inline size_t push_x_param(u8_t *data, u16_t x)
 #endif
 }
 
-static inline size_t push_y_param(u8_t *data, u16_t y)
+static inline size_t push_y_param(uint8_t *data, uint16_t y)
 {
 #if DT_INST_PROP(0, pp_height_bits) == 8
-	data[0] = (u8_t)y;
+	data[0] = (uint8_t)y;
 	return 1;
 #elif DT_INST_PROP(0, pp_height_bits) == 16
 	sys_put_le16(sys_cpu_to_le16(y), data);
@@ -148,10 +148,10 @@ static inline size_t push_y_param(u8_t *data, u16_t y)
 
 
 static inline int ssd16xx_set_ram_param(struct ssd16xx_data *driver,
-					u16_t sx, u16_t ex, u16_t sy, u16_t ey)
+					uint16_t sx, uint16_t ex, uint16_t sy, uint16_t ey)
 {
 	int err;
-	u8_t tmp[4];
+	uint8_t tmp[4];
 	size_t len;
 
 	len  = push_x_param(tmp, sx);
@@ -172,10 +172,10 @@ static inline int ssd16xx_set_ram_param(struct ssd16xx_data *driver,
 }
 
 static inline int ssd16xx_set_ram_ptr(struct ssd16xx_data *driver,
-				      u16_t x, u16_t y)
+				      uint16_t x, uint16_t y)
 {
 	int err;
-	u8_t tmp[2];
+	uint8_t tmp[2];
 	size_t len;
 
 	len = push_x_param(tmp, x);
@@ -211,7 +211,7 @@ static int ssd16xx_blanking_on(const struct device *dev)
 static int ssd16xx_update_display(const struct device *dev)
 {
 	struct ssd16xx_data *driver = dev->driver_data;
-	u8_t tmp;
+	uint8_t tmp;
 	int err;
 
 	tmp = (SSD16XX_CTRL2_ENABLE_CLK |
@@ -229,19 +229,19 @@ static int ssd16xx_update_display(const struct device *dev)
 				 NULL, 0);
 }
 
-static int ssd16xx_write(const struct device *dev, const u16_t x,
-			 const u16_t y,
+static int ssd16xx_write(const struct device *dev, const uint16_t x,
+			 const uint16_t y,
 			 const struct display_buffer_descriptor *desc,
 			 const void *buf)
 {
 	struct ssd16xx_data *driver = dev->driver_data;
 	int err;
 	size_t buf_len;
-	u16_t x_start;
-	u16_t x_end;
-	u16_t y_start;
-	u16_t y_end;
-	u16_t panel_h = EPD_PANEL_HEIGHT -
+	uint16_t x_start;
+	uint16_t x_end;
+	uint16_t y_start;
+	uint16_t y_end;
+	uint16_t panel_h = EPD_PANEL_HEIGHT -
 			EPD_PANEL_HEIGHT % EPD_PANEL_NUMOF_ROWS_PER_PAGE;
 
 	if (desc->pitch < desc->width) {
@@ -319,7 +319,7 @@ static int ssd16xx_write(const struct device *dev, const u16_t x,
 		return err;
 	}
 
-	err = ssd16xx_write_cmd(driver, SSD16XX_CMD_WRITE_RAM, (u8_t *)buf,
+	err = ssd16xx_write_cmd(driver, SSD16XX_CMD_WRITE_RAM, (uint8_t *)buf,
 				buf_len);
 	if (err < 0) {
 		return err;
@@ -328,8 +328,8 @@ static int ssd16xx_write(const struct device *dev, const u16_t x,
 	return ssd16xx_update_display(dev);
 }
 
-static int ssd16xx_read(const struct device *dev, const u16_t x,
-			const u16_t y,
+static int ssd16xx_read(const struct device *dev, const uint16_t x,
+			const uint16_t y,
 			const struct display_buffer_descriptor *desc,
 			void *buf)
 {
@@ -344,13 +344,13 @@ static void *ssd16xx_get_framebuffer(const struct device *dev)
 }
 
 static int ssd16xx_set_brightness(const struct device *dev,
-				  const u8_t brightness)
+				  const uint8_t brightness)
 {
 	LOG_WRN("not supported");
 	return -ENOTSUP;
 }
 
-static int ssd16xx_set_contrast(const struct device *dev, u8_t contrast)
+static int ssd16xx_set_contrast(const struct device *dev, uint8_t contrast)
 {
 	LOG_WRN("not supported");
 	return -ENOTSUP;
@@ -390,14 +390,14 @@ static int ssd16xx_set_pixel_format(const struct device *dev,
 	return -ENOTSUP;
 }
 
-static int ssd16xx_clear_cntlr_mem(struct device *dev, u8_t ram_cmd,
+static int ssd16xx_clear_cntlr_mem(struct device *dev, uint8_t ram_cmd,
 				   bool update)
 {
 	struct ssd16xx_data *driver = dev->driver_data;
-	u8_t clear_page[EPD_PANEL_WIDTH];
-	u16_t panel_h = EPD_PANEL_HEIGHT /
+	uint8_t clear_page[EPD_PANEL_WIDTH];
+	uint16_t panel_h = EPD_PANEL_HEIGHT /
 			EPD_PANEL_NUMOF_ROWS_PER_PAGE;
-	u8_t scan_mode = SSD16XX_DATA_ENTRY_XIYDY;
+	uint8_t scan_mode = SSD16XX_DATA_ENTRY_XIYDY;
 
 	/*
 	 * Clear unusable memory area when the resolution of the panel is not
@@ -442,7 +442,7 @@ static int ssd16xx_clear_cntlr_mem(struct device *dev, u8_t ram_cmd,
 static int ssd16xx_controller_init(struct device *dev)
 {
 	int err;
-	u8_t tmp[3];
+	uint8_t tmp[3];
 	size_t len;
 	struct ssd16xx_data *driver = dev->driver_data;
 
diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c
index 039e77097c..836cf1611c 100644
--- a/drivers/dma/dma_dw.c
+++ b/drivers/dma/dma_dw.c
@@ -43,14 +43,14 @@ LOG_MODULE_REGISTER(dma_dw);
 #define DW_DMA_CFG_TRIES	10000
 #define INT_MASK_ALL		0xFF00
 
-static ALWAYS_INLINE void dw_write(u32_t dma_base, u32_t reg, u32_t value)
+static ALWAYS_INLINE void dw_write(uint32_t dma_base, uint32_t reg, uint32_t value)
 {
-	*((volatile u32_t*)(dma_base + reg)) = value;
+	*((volatile uint32_t*)(dma_base + reg)) = value;
 }
 
-static ALWAYS_INLINE u32_t dw_read(u32_t dma_base, u32_t reg)
+static ALWAYS_INLINE uint32_t dw_read(uint32_t dma_base, uint32_t reg)
 {
-	return *((volatile u32_t*)(dma_base + reg));
+	return *((volatile uint32_t*)(dma_base + reg));
 }
 
 static void dw_dma_isr(void *arg)
@@ -60,11 +60,11 @@ static void dw_dma_isr(void *arg)
 	struct dw_dma_dev_data *const dev_data = DEV_DATA(dev);
 	struct dma_chan_data *chan_data;
 
-	u32_t status_tfr = 0U;
-	u32_t status_block = 0U;
-	u32_t status_err = 0U;
-	u32_t status_intr;
-	u32_t channel;
+	uint32_t status_tfr = 0U;
+	uint32_t status_block = 0U;
+	uint32_t status_err = 0U;
+	uint32_t status_intr;
+	uint32_t channel;
 
 	status_intr = dw_read(dev_cfg->base, DW_INTR_STATUS);
 	if (!status_intr) {
@@ -114,16 +114,16 @@ static void dw_dma_isr(void *arg)
 	}
 }
 
-static int dw_dma_config(struct device *dev, u32_t channel,
+static int dw_dma_config(struct device *dev, uint32_t channel,
 			 struct dma_config *cfg)
 {
 	struct dw_dma_dev_data *const dev_data = DEV_DATA(dev);
 	const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct dma_chan_data *chan_data;
 	struct dma_block_config *cfg_blocks;
-	u32_t m_size;
-	u32_t tr_width;
-	u32_t ctrl_lo;
+	uint32_t m_size;
+	uint32_t tr_width;
+	uint32_t ctrl_lo;
 
 	if (channel >= DW_MAX_CHAN) {
 		return -EINVAL;
@@ -248,8 +248,8 @@ static int dw_dma_config(struct device *dev, u32_t channel,
 	return 0;
 }
 
-static int dw_dma_reload(struct device *dev, u32_t channel,
-		u32_t src, u32_t dst, size_t size)
+static int dw_dma_reload(struct device *dev, uint32_t channel,
+		uint32_t src, uint32_t dst, size_t size)
 {
 	struct dw_dma_dev_data *const dev_data = DEV_DATA(dev);
 	const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev);
@@ -267,7 +267,7 @@ static int dw_dma_reload(struct device *dev, u32_t channel,
 	return 0;
 }
 
-static int dw_dma_transfer_start(struct device *dev, u32_t channel)
+static int dw_dma_transfer_start(struct device *dev, uint32_t channel)
 {
 	const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev);
 
@@ -281,7 +281,7 @@ static int dw_dma_transfer_start(struct device *dev, u32_t channel)
 	return 0;
 }
 
-static int dw_dma_transfer_stop(struct device *dev, u32_t channel)
+static int dw_dma_transfer_stop(struct device *dev, uint32_t channel)
 {
 	const struct dw_dma_dev_cfg *const dev_cfg = DEV_CFG(dev);
 
diff --git a/drivers/dma/dma_dw.h b/drivers/dma/dma_dw.h
index a407358e25..00b06c1654 100644
--- a/drivers/dma/dma_dw.h
+++ b/drivers/dma/dma_dw.h
@@ -30,12 +30,12 @@ extern "C" {
 
 /* data for each DMA channel */
 struct dma_chan_data {
-	u32_t direction;
+	uint32_t direction;
 	void *blkcallback_arg;
-	void (*dma_blkcallback)(void *arg, u32_t channel,
+	void (*dma_blkcallback)(void *arg, uint32_t channel,
 		int error_code);
 	void *tfrcallback_arg;
-	void (*dma_tfrcallback)(void *arg, u32_t channel,
+	void (*dma_tfrcallback)(void *arg, uint32_t channel,
 		int error_code);
 };
 
@@ -93,8 +93,8 @@ struct dma_chan_data {
 
 /* TODO: add FIFO sizes */
 struct chan_arbit_data {
-	u16_t class;
-	u16_t weight;
+	uint16_t class;
+	uint16_t weight;
 };
 
 struct dw_drv_plat_data {
@@ -109,7 +109,7 @@ struct dw_dma_dev_data {
 
 /* Device constant configuration parameters */
 struct dw_dma_dev_cfg {
-	u32_t base;
+	uint32_t base;
 	void (*irq_config)(void);
 };
 
diff --git a/drivers/dma/dma_handlers.c b/drivers/dma/dma_handlers.c
index 78084b2493..5cae00927b 100644
--- a/drivers/dma/dma_handlers.c
+++ b/drivers/dma/dma_handlers.c
@@ -11,14 +11,14 @@
  * the validity of the channel ID and returning -errno if it's bogus
  */
 
-static inline int z_vrfy_dma_start(struct device *dev, u32_t channel)
+static inline int z_vrfy_dma_start(struct device *dev, uint32_t channel)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_DMA(dev, start));
 	return z_impl_dma_start((struct device *)dev, channel);
 }
 #include <syscalls/dma_start_mrsh.c>
 
-static inline int z_vrfy_dma_stop(struct device *dev, u32_t channel)
+static inline int z_vrfy_dma_stop(struct device *dev, uint32_t channel)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_DMA(dev, stop));
 	return z_impl_dma_stop((struct device *)dev, channel);
diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c
index 3ee9fa36dd..85283fa916 100644
--- a/drivers/dma/dma_nios2_msgdma.c
+++ b/drivers/dma/dma_nios2_msgdma.c
@@ -23,10 +23,10 @@ LOG_MODULE_REGISTER(dma_nios2);
 struct nios2_msgdma_dev_cfg {
 	alt_msgdma_dev *msgdma_dev;
 	alt_msgdma_standard_descriptor desc;
-	u32_t direction;
+	uint32_t direction;
 	struct k_sem sem_lock;
 	void *callback_arg;
-	void (*dma_callback)(void *arg, u32_t id,
+	void (*dma_callback)(void *arg, uint32_t id,
 			     int error_code);
 };
 
@@ -48,7 +48,7 @@ static void nios2_msgdma_callback(void *context)
 	struct nios2_msgdma_dev_cfg *dev_cfg =
 				DEV_CFG((struct device *)context);
 	int err_code;
-	u32_t status;
+	uint32_t status;
 
 	status = IORD_ALTERA_MSGDMA_CSR_STATUS(dev_cfg->msgdma_dev->csr_base);
 
@@ -65,13 +65,13 @@ static void nios2_msgdma_callback(void *context)
 	dev_cfg->dma_callback(dev_cfg->callback_arg, 0, err_code);
 }
 
-static int nios2_msgdma_config(struct device *dev, u32_t channel,
+static int nios2_msgdma_config(struct device *dev, uint32_t channel,
 			       struct dma_config *cfg)
 {
 	struct nios2_msgdma_dev_cfg *dev_cfg = DEV_CFG(dev);
 	struct dma_block_config *dma_block;
 	int status;
-	u32_t control;
+	uint32_t control;
 
 	/* Nios-II MSGDMA supports only one channel per DMA core */
 	if (channel != 0U) {
@@ -150,7 +150,7 @@ static int nios2_msgdma_config(struct device *dev, u32_t channel,
 	return status;
 }
 
-static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel)
+static int nios2_msgdma_transfer_start(struct device *dev, uint32_t channel)
 {
 	struct nios2_msgdma_dev_cfg *cfg = DEV_CFG(dev);
 	int status;
@@ -173,11 +173,11 @@ static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel)
 	return status;
 }
 
-static int nios2_msgdma_transfer_stop(struct device *dev, u32_t channel)
+static int nios2_msgdma_transfer_stop(struct device *dev, uint32_t channel)
 {
 	struct nios2_msgdma_dev_cfg *cfg = DEV_CFG(dev);
 	int ret = -EIO;
-	u32_t status;
+	uint32_t status;
 
 	k_sem_take(&cfg->sem_lock, K_FOREVER);
 	/* Stop the DMA Dispatcher */
diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c
index dad970b5fc..b7002794f0 100644
--- a/drivers/dma/dma_sam0.c
+++ b/drivers/dma/dma_sam0.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(dma_sam0, CONFIG_DMA_LOG_LEVEL);
 
 #define DMA_REGS	((Dmac *)DT_INST_REG_ADDR(0))
 
-typedef void (*dma_callback)(void *callback_arg, u32_t channel,
+typedef void (*dma_callback)(void *callback_arg, uint32_t channel,
 			     int error_code);
 
 struct dma_sam0_channel {
@@ -39,8 +39,8 @@ static void dma_sam0_isr(void *arg)
 	struct device *dev = arg;
 	struct dma_sam0_data *data = DEV_DATA(dev);
 	struct dma_sam0_channel *chdata;
-	u16_t pend = DMA_REGS->INTPEND.reg;
-	u32_t channel;
+	uint16_t pend = DMA_REGS->INTPEND.reg;
+	uint32_t channel;
 
 	/* Acknowledge all interrupts for the channel in pend */
 	DMA_REGS->INTPEND.reg = pend;
@@ -65,7 +65,7 @@ static void dma_sam0_isr(void *arg)
 }
 
 /* Configure a channel */
-static int dma_sam0_config(struct device *dev, u32_t channel,
+static int dma_sam0_config(struct device *dev, uint32_t channel,
 			   struct dma_config *config)
 {
 	struct dma_sam0_data *data = DEV_DATA(dev);
@@ -263,7 +263,7 @@ inval:
 	return -EINVAL;
 }
 
-static int dma_sam0_start(struct device *dev, u32_t channel)
+static int dma_sam0_start(struct device *dev, uint32_t channel)
 {
 	int key = irq_lock();
 
@@ -294,7 +294,7 @@ static int dma_sam0_start(struct device *dev, u32_t channel)
 	return 0;
 }
 
-static int dma_sam0_stop(struct device *dev, u32_t channel)
+static int dma_sam0_stop(struct device *dev, uint32_t channel)
 {
 	int key = irq_lock();
 
@@ -314,8 +314,8 @@ static int dma_sam0_stop(struct device *dev, u32_t channel)
 	return 0;
 }
 
-static int dma_sam0_reload(struct device *dev, u32_t channel,
-			   u32_t src, u32_t dst, size_t size)
+static int dma_sam0_reload(struct device *dev, uint32_t channel,
+			   uint32_t src, uint32_t dst, size_t size)
 {
 	struct dma_sam0_data *data = DEV_DATA(dev);
 	DmacDescriptor *desc = &data->descriptors[channel];
@@ -358,11 +358,11 @@ inval:
 	return -EINVAL;
 }
 
-static int dma_sam0_get_status(struct device *dev, u32_t channel,
+static int dma_sam0_get_status(struct device *dev, uint32_t channel,
 			       struct dma_status *stat)
 {
 	struct dma_sam0_data *data = DEV_DATA(dev);
-	u32_t act;
+	uint32_t act;
 
 	if (channel >= DMAC_CH_NUM || stat == NULL) {
 		return -EINVAL;
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index 65ee8d10ec..170655efb5 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -36,8 +36,8 @@ struct sam_xdmac_channel_cfg {
 struct sam_xdmac_dev_cfg {
 	Xdmac *regs;
 	void (*irq_config)(void);
-	u8_t periph_id;
-	u8_t irq_id;
+	uint8_t periph_id;
+	uint8_t irq_id;
 };
 
 /* Device run time data */
@@ -58,8 +58,8 @@ static void sam_xdmac_isr(void *arg)
 	struct sam_xdmac_dev_data *const dev_data = DEV_DATA(dev);
 	Xdmac *const xdmac = dev_cfg->regs;
 	struct sam_xdmac_channel_cfg *channel_cfg;
-	u32_t isr_status;
-	u32_t err;
+	uint32_t isr_status;
+	uint32_t err;
 
 	/* Get global interrupt status */
 	isr_status = xdmac->XDMAC_GIS;
@@ -82,7 +82,7 @@ static void sam_xdmac_isr(void *arg)
 	}
 }
 
-int sam_xdmac_channel_configure(struct device *dev, u32_t channel,
+int sam_xdmac_channel_configure(struct device *dev, uint32_t channel,
 				struct sam_xdmac_channel_config *param)
 {
 	const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev);
@@ -124,7 +124,7 @@ int sam_xdmac_channel_configure(struct device *dev, u32_t channel,
 	return 0;
 }
 
-int sam_xdmac_transfer_configure(struct device *dev, u32_t channel,
+int sam_xdmac_transfer_configure(struct device *dev, uint32_t channel,
 				 struct sam_xdmac_transfer_config *param)
 {
 	const struct sam_xdmac_dev_cfg *const dev_cfg = DEV_CFG(dev);
@@ -176,14 +176,14 @@ int sam_xdmac_transfer_configure(struct device *dev, u32_t channel,
 	return 0;
 }
 
-static int sam_xdmac_config(struct device *dev, u32_t channel,
+static int sam_xdmac_config(struct device *dev, uint32_t channel,
 			    struct dma_config *cfg)
 {
 	struct sam_xdmac_dev_data *const dev_data = DEV_DATA(dev);
 	struct sam_xdmac_channel_config channel_cfg;
 	struct sam_xdmac_transfer_config transfer_cfg;
-	u32_t burst_size;
-	u32_t data_size;
+	uint32_t burst_size;
+	uint32_t data_size;
 	int ret;
 
 	if (channel >= DMA_CHANNELS_NO) {
@@ -270,7 +270,7 @@ static int sam_xdmac_config(struct device *dev, u32_t channel,
 	return ret;
 }
 
-int sam_xdmac_transfer_start(struct device *dev, u32_t channel)
+int sam_xdmac_transfer_start(struct device *dev, uint32_t channel)
 {
 	Xdmac *const xdmac = DEV_CFG(dev)->regs;
 
@@ -291,7 +291,7 @@ int sam_xdmac_transfer_start(struct device *dev, u32_t channel)
 	return 0;
 }
 
-int sam_xdmac_transfer_stop(struct device *dev, u32_t channel)
+int sam_xdmac_transfer_stop(struct device *dev, uint32_t channel)
 {
 	Xdmac *const xdmac = DEV_CFG(dev)->regs;
 
diff --git a/drivers/dma/dma_sam_xdmac.h b/drivers/dma/dma_sam_xdmac.h
index e7b4425a2f..505560958d 100644
--- a/drivers/dma/dma_sam_xdmac.h
+++ b/drivers/dma/dma_sam_xdmac.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 /** DMA transfer callback */
-typedef void (*dma_callback)(void *arg, u32_t channel, int error_code);
+typedef void (*dma_callback)(void *arg, uint32_t channel, int error_code);
 
 /* XDMA_MBR_UBC */
 #define XDMA_UBC_NDE (0x1u << 24)
@@ -40,89 +40,89 @@ typedef void (*dma_callback)(void *arg, u32_t channel, int error_code);
 /** DMA channel configuration parameters */
 struct sam_xdmac_channel_config {
 	/** Configuration Register */
-	u32_t cfg;
+	uint32_t cfg;
 	/** Data Stride / Memory Set Pattern Register */
-	u32_t ds_msp;
+	uint32_t ds_msp;
 	/** Source Microblock Stride */
-	u32_t sus;
+	uint32_t sus;
 	/** Destination Microblock Stride */
-	u32_t dus;
+	uint32_t dus;
 	/** Channel Interrupt Enable */
-	u32_t cie;
+	uint32_t cie;
 };
 
 /** DMA transfer configuration parameters */
 struct sam_xdmac_transfer_config {
 	/** Microblock length */
-	u32_t ublen;
+	uint32_t ublen;
 	/** Source Address */
-	u32_t sa;
+	uint32_t sa;
 	/** Destination Address */
-	u32_t da;
+	uint32_t da;
 	/** Block length (The length of the block is (blen+1) microblocks) */
-	u32_t blen;
+	uint32_t blen;
 	/** Next descriptor address */
-	u32_t nda;
+	uint32_t nda;
 	/** Next descriptor configuration */
-	u32_t ndc;
+	uint32_t ndc;
 };
 
 /** DMA Master transfer linked list view 0 structure */
 struct sam_xdmac_linked_list_desc_view0 {
 	/** Next Descriptor Address */
-	u32_t mbr_nda;
+	uint32_t mbr_nda;
 	/** Microblock Control */
-	u32_t mbr_ubc;
+	uint32_t mbr_ubc;
 	/** Transfer Address */
-	u32_t mbr_ta;
+	uint32_t mbr_ta;
 };
 
 /** DMA Master transfer linked list view 1 structure */
 struct sam_xdmac_linked_list_desc_view1 {
 	/** Next Descriptor Address */
-	u32_t mbr_nda;
+	uint32_t mbr_nda;
 	/** Microblock Control */
-	u32_t mbr_ubc;
+	uint32_t mbr_ubc;
 	/** Source Address */
-	u32_t mbr_sa;
+	uint32_t mbr_sa;
 	/** Destination Address */
-	u32_t mbr_da;
+	uint32_t mbr_da;
 };
 
 /** DMA Master transfer linked list view 2 structure */
 struct sam_xdmac_linked_list_desc_view2 {
 	/** Next Descriptor Address */
-	u32_t mbr_nda;
+	uint32_t mbr_nda;
 	/** Microblock Control */
-	u32_t mbr_ubc;
+	uint32_t mbr_ubc;
 	/** Source Address */
-	u32_t mbr_sa;
+	uint32_t mbr_sa;
 	/** Destination Address */
-	u32_t mbr_da;
+	uint32_t mbr_da;
 	/** Configuration Register */
-	u32_t mbr_cfg;
+	uint32_t mbr_cfg;
 };
 
 /** DMA Master transfer linked list view 3 structure */
 struct sam_xdmac_linked_list_desc_view3 {
 	/** Next Descriptor Address */
-	u32_t mbr_nda;
+	uint32_t mbr_nda;
 	/** Microblock Control */
-	u32_t mbr_ubc;
+	uint32_t mbr_ubc;
 	/** Source Address */
-	u32_t mbr_sa;
+	uint32_t mbr_sa;
 	/** Destination Address */
-	u32_t mbr_da;
+	uint32_t mbr_da;
 	/** Configuration Register */
-	u32_t mbr_cfg;
+	uint32_t mbr_cfg;
 	/** Block Control */
-	u32_t mbr_bc;
+	uint32_t mbr_bc;
 	/** Data Stride */
-	u32_t mbr_ds;
+	uint32_t mbr_ds;
 	/** Source Microblock Stride */
-	u32_t mbr_sus;
+	uint32_t mbr_sus;
 	/** Destination Microblock Stride */
-	u32_t mbr_dus;
+	uint32_t mbr_dus;
 };
 
 #ifdef __cplusplus
diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c
index 222e1740d9..bfff7b8847 100644
--- a/drivers/dma/dma_stm32.c
+++ b/drivers/dma/dma_stm32.c
@@ -24,19 +24,19 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(dma_stm32, CONFIG_DMA_LOG_LEVEL);
 
-static u32_t table_m_size[] = {
+static uint32_t table_m_size[] = {
 	LL_DMA_MDATAALIGN_BYTE,
 	LL_DMA_MDATAALIGN_HALFWORD,
 	LL_DMA_MDATAALIGN_WORD,
 };
 
-static u32_t table_p_size[] = {
+static uint32_t table_p_size[] = {
 	LL_DMA_PDATAALIGN_BYTE,
 	LL_DMA_PDATAALIGN_HALFWORD,
 	LL_DMA_PDATAALIGN_WORD,
 };
 
-static void dma_stm32_dump_stream_irq(struct device *dev, u32_t id)
+static void dma_stm32_dump_stream_irq(struct device *dev, uint32_t id)
 {
 	const struct dma_stm32_config *config = dev->config_info;
 	DMA_TypeDef *dma = (DMA_TypeDef *)(config->base);
@@ -44,7 +44,7 @@ static void dma_stm32_dump_stream_irq(struct device *dev, u32_t id)
 	stm32_dma_dump_stream_irq(dma, id);
 }
 
-static void dma_stm32_clear_stream_irq(struct device *dev, u32_t id)
+static void dma_stm32_clear_stream_irq(struct device *dev, uint32_t id)
 {
 	const struct dma_stm32_config *config = dev->config_info;
 	DMA_TypeDef *dma = (DMA_TypeDef *)(config->base);
@@ -125,10 +125,10 @@ static int dma_stm32_width_config(struct dma_config *config,
 				    bool source_periph,
 				    DMA_TypeDef *dma,
 				    LL_DMA_InitTypeDef *DMA_InitStruct,
-				    u32_t id)
+				    uint32_t id)
 {
-	u32_t periph, memory;
-	u32_t m_size = 0, p_size = 0;
+	uint32_t periph, memory;
+	uint32_t m_size = 0, p_size = 0;
 
 	if (source_periph) {
 		periph = config->source_data_size;
@@ -148,7 +148,7 @@ static int dma_stm32_width_config(struct dma_config *config,
 	return 0;
 }
 
-static int dma_stm32_get_priority(u8_t priority, u32_t *ll_priority)
+static int dma_stm32_get_priority(uint8_t priority, uint32_t *ll_priority)
 {
 	switch (priority) {
 	case 0x0:
@@ -172,7 +172,7 @@ static int dma_stm32_get_priority(u8_t priority, u32_t *ll_priority)
 }
 
 static int dma_stm32_get_direction(enum dma_channel_direction direction,
-				   u32_t *ll_direction)
+				   uint32_t *ll_direction)
 {
 	switch (direction) {
 	case MEMORY_TO_MEMORY:
@@ -193,7 +193,7 @@ static int dma_stm32_get_direction(enum dma_channel_direction direction,
 }
 
 static int dma_stm32_get_memory_increment(enum dma_addr_adj increment,
-					  u32_t *ll_increment)
+					  uint32_t *ll_increment)
 {
 	switch (increment) {
 	case DMA_ADDR_ADJ_INCREMENT:
@@ -213,7 +213,7 @@ static int dma_stm32_get_memory_increment(enum dma_addr_adj increment,
 }
 
 static int dma_stm32_get_periph_increment(enum dma_addr_adj increment,
-					  u32_t *ll_increment)
+					  uint32_t *ll_increment)
 {
 	switch (increment) {
 	case DMA_ADDR_ADJ_INCREMENT:
@@ -233,10 +233,10 @@ static int dma_stm32_get_periph_increment(enum dma_addr_adj increment,
 }
 
 #ifdef CONFIG_DMAMUX_STM32
-int dma_stm32_configure(struct device *dev, u32_t id,
+int dma_stm32_configure(struct device *dev, uint32_t id,
 			       struct dma_config *config)
 #else
-static int dma_stm32_configure(struct device *dev, u32_t id,
+static int dma_stm32_configure(struct device *dev, uint32_t id,
 			       struct dma_config *config)
 #endif /* CONFIG_DMAMUX_STM32 */
 {
@@ -246,7 +246,7 @@ static int dma_stm32_configure(struct device *dev, u32_t id,
 					dev->config_info;
 	DMA_TypeDef *dma = (DMA_TypeDef *)dev_config->base;
 	LL_DMA_InitTypeDef DMA_InitStruct;
-	u32_t msize;
+	uint32_t msize;
 	int ret;
 
 	/* give channel from index 0 */
@@ -335,7 +335,7 @@ static int dma_stm32_configure(struct device *dev, u32_t id,
 					config->head_block->dest_address;
 	}
 
-	u16_t memory_addr_adj = 0, periph_addr_adj = 0;
+	uint16_t memory_addr_adj = 0, periph_addr_adj = 0;
 
 	ret = dma_stm32_get_priority(config->channel_priority,
 				     &DMA_InitStruct.Priority);
@@ -451,7 +451,7 @@ static int dma_stm32_configure(struct device *dev, u32_t id,
 	return ret;
 }
 
-static int dma_stm32_disable_stream(DMA_TypeDef *dma, u32_t id)
+static int dma_stm32_disable_stream(DMA_TypeDef *dma, uint32_t id)
 {
 	int count = 0;
 
@@ -470,11 +470,11 @@ static int dma_stm32_disable_stream(DMA_TypeDef *dma, u32_t id)
 }
 
 #ifdef CONFIG_DMAMUX_STM32
-int dma_stm32_reload(struct device *dev, u32_t id,
-			    u32_t src, u32_t dst, size_t size)
+int dma_stm32_reload(struct device *dev, uint32_t id,
+			    uint32_t src, uint32_t dst, size_t size)
 #else
-static int dma_stm32_reload(struct device *dev, u32_t id,
-			    u32_t src, u32_t dst, size_t size)
+static int dma_stm32_reload(struct device *dev, uint32_t id,
+			    uint32_t src, uint32_t dst, size_t size)
 #endif /* CONFIG_DMAMUX_STM32 */
 {
 	const struct dma_stm32_config *config = dev->config_info;
@@ -519,9 +519,9 @@ static int dma_stm32_reload(struct device *dev, u32_t id,
 }
 
 #ifdef CONFIG_DMAMUX_STM32
-int dma_stm32_start(struct device *dev, u32_t id)
+int dma_stm32_start(struct device *dev, uint32_t id)
 #else
-static int dma_stm32_start(struct device *dev, u32_t id)
+static int dma_stm32_start(struct device *dev, uint32_t id)
 #endif /* CONFIG_DMAMUX_STM32 */
 {
 	const struct dma_stm32_config *config = dev->config_info;
@@ -544,9 +544,9 @@ static int dma_stm32_start(struct device *dev, u32_t id)
 }
 
 #ifdef CONFIG_DMAMUX_STM32
-int dma_stm32_stop(struct device *dev, u32_t id)
+int dma_stm32_stop(struct device *dev, uint32_t id)
 #else
-static int dma_stm32_stop(struct device *dev, u32_t id)
+static int dma_stm32_stop(struct device *dev, uint32_t id)
 #endif /* CONFIG_DMAMUX_STM32 */
 {
 	struct dma_stm32_data *data = dev->driver_data;
diff --git a/drivers/dma/dma_stm32.h b/drivers/dma/dma_stm32.h
index 5b10ffc0bf..4547721cbe 100644
--- a/drivers/dma/dma_stm32.h
+++ b/drivers/dma/dma_stm32.h
@@ -11,16 +11,16 @@
 #define DMA_STM32_MAX_DATA_ITEMS	0xffff
 
 struct dma_stm32_stream {
-	u32_t direction;
+	uint32_t direction;
 #ifdef CONFIG_DMAMUX_STM32
 	int mux_channel; /* stores the dmamux channel */
 #endif /* CONFIG_DMAMUX_STM32 */
 	bool source_periph;
 	bool busy;
-	u32_t src_size;
-	u32_t dst_size;
+	uint32_t src_size;
+	uint32_t dst_size;
 	void *callback_arg; /* holds the client data */
-	void (*dma_callback)(void *arg, u32_t id,
+	void (*dma_callback)(void *arg, uint32_t id,
 			     int error_code);
 };
 
@@ -33,7 +33,7 @@ struct dma_stm32_config {
 	struct stm32_pclken pclken;
 	void (*config_irq)(struct device *dev);
 	bool support_m2m;
-	u32_t base;
+	uint32_t base;
 };
 
 #ifdef CONFIG_DMA_STM32_V1
@@ -45,43 +45,43 @@ struct dma_stm32_config {
 #define STREAM_OFFSET 1
 #endif /* CONFIG_DMA_STM32_V1 */
 
-extern u32_t table_ll_stream[];
-extern u32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx);
+extern uint32_t table_ll_stream[];
+extern uint32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx);
 extern void (*func_ll_clear_tc[])(DMA_TypeDef *DMAx);
-extern u32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx);
+extern uint32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx);
 extern void (*func_ll_clear_ht[])(DMA_TypeDef *DMAx);
 #ifdef CONFIG_DMA_STM32_V2
-extern u32_t (*func_ll_is_active_gi[])(DMA_TypeDef *DMAx);
+extern uint32_t (*func_ll_is_active_gi[])(DMA_TypeDef *DMAx);
 extern void (*func_ll_clear_gi[])(DMA_TypeDef *DMAx);
 #endif
 #ifdef CONFIG_DMA_STM32_V1
-extern u32_t table_ll_channel[];
+extern uint32_t table_ll_channel[];
 #endif
 
-void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, u32_t id);
-void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, u32_t id);
-bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, u32_t id);
-bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, u32_t id);
-void stm32_dma_enable_stream(DMA_TypeDef *dma, u32_t id);
-int stm32_dma_disable_stream(DMA_TypeDef *dma, u32_t id);
-void stm32_dma_config_channel_function(DMA_TypeDef *dma, u32_t id, u32_t slot);
+void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, uint32_t id);
+void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, uint32_t id);
+bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, uint32_t id);
+bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, uint32_t id);
+void stm32_dma_enable_stream(DMA_TypeDef *dma, uint32_t id);
+int stm32_dma_disable_stream(DMA_TypeDef *dma, uint32_t id);
+void stm32_dma_config_channel_function(DMA_TypeDef *dma, uint32_t id, uint32_t slot);
 
 #ifdef CONFIG_DMA_STM32_V1
-void stm32_dma_disable_fifo_irq(DMA_TypeDef *dma, u32_t id);
+void stm32_dma_disable_fifo_irq(DMA_TypeDef *dma, uint32_t id);
 bool stm32_dma_check_fifo_mburst(LL_DMA_InitTypeDef *DMAx);
-u32_t stm32_dma_get_fifo_threshold(u16_t fifo_mode_control);
-u32_t stm32_dma_get_mburst(struct dma_config *config, bool source_periph);
-u32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph);
+uint32_t stm32_dma_get_fifo_threshold(uint16_t fifo_mode_control);
+uint32_t stm32_dma_get_mburst(struct dma_config *config, bool source_periph);
+uint32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph);
 #endif
 
 #ifdef CONFIG_DMAMUX_STM32
 /* dma_stm32_ api functions are exported to the dmamux_stm32 */
-int dma_stm32_configure(struct device *dev, u32_t id,
+int dma_stm32_configure(struct device *dev, uint32_t id,
 			       struct dma_config *config);
-int dma_stm32_reload(struct device *dev, u32_t id,
-			    u32_t src, u32_t dst, size_t size);
-int dma_stm32_start(struct device *dev, u32_t id);
-int dma_stm32_stop(struct device *dev, u32_t id);
+int dma_stm32_reload(struct device *dev, uint32_t id,
+			    uint32_t src, uint32_t dst, size_t size);
+int dma_stm32_start(struct device *dev, uint32_t id);
+int dma_stm32_stop(struct device *dev, uint32_t id);
 #endif /* CONFIG_DMAMUX_STM32 */
 
 #endif /* DMA_STM32_H_*/
diff --git a/drivers/dma/dma_stm32_v1.c b/drivers/dma/dma_stm32_v1.c
index 3129abd7c6..2257c879be 100644
--- a/drivers/dma/dma_stm32_v1.c
+++ b/drivers/dma/dma_stm32_v1.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(dma_stm32_v1);
 /* DMA burst length */
 #define BURST_TRANS_LENGTH_1			0
 
-u32_t table_ll_stream[] = {
+uint32_t table_ll_stream[] = {
 	LL_DMA_STREAM_0,
 	LL_DMA_STREAM_1,
 	LL_DMA_STREAM_2,
@@ -29,7 +29,7 @@ u32_t table_ll_stream[] = {
 	LL_DMA_STREAM_7,
 };
 
-u32_t table_ll_channel[] = {
+uint32_t table_ll_channel[] = {
 	LL_DMA_CHANNEL_0,
 	LL_DMA_CHANNEL_1,
 	LL_DMA_CHANNEL_2,
@@ -62,7 +62,7 @@ void (*func_ll_clear_tc[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_ClearFlag_TC7,
 };
 
-u32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
+uint32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_HT0,
 	LL_DMA_IsActiveFlag_HT1,
 	LL_DMA_IsActiveFlag_HT2,
@@ -73,7 +73,7 @@ u32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_HT7,
 };
 
-u32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx) = {
+uint32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_TC0,
 	LL_DMA_IsActiveFlag_TC1,
 	LL_DMA_IsActiveFlag_TC2,
@@ -117,7 +117,7 @@ static void (*func_ll_clear_fe[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_ClearFlag_FE7,
 };
 
-static u32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
+static uint32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_TE0,
 	LL_DMA_IsActiveFlag_TE1,
 	LL_DMA_IsActiveFlag_TE2,
@@ -128,7 +128,7 @@ static u32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_TE7,
 };
 
-static u32_t (*func_ll_is_active_dme[])(DMA_TypeDef *DMAx) = {
+static uint32_t (*func_ll_is_active_dme[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_DME0,
 	LL_DMA_IsActiveFlag_DME1,
 	LL_DMA_IsActiveFlag_DME2,
@@ -139,7 +139,7 @@ static u32_t (*func_ll_is_active_dme[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_DME7,
 };
 
-static u32_t (*func_ll_is_active_fe[])(DMA_TypeDef *DMAx) = {
+static uint32_t (*func_ll_is_active_fe[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_FE0,
 	LL_DMA_IsActiveFlag_FE1,
 	LL_DMA_IsActiveFlag_FE2,
@@ -150,7 +150,7 @@ static u32_t (*func_ll_is_active_fe[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_FE7,
 };
 
-void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, uint32_t id)
 {
 	LOG_INF("tc: %d, ht: %d, te: %d, dme: %d, fe: %d",
 		func_ll_is_active_tc[id](dma),
@@ -160,14 +160,14 @@ void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, u32_t id)
 		func_ll_is_active_fe[id](dma));
 }
 
-void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, uint32_t id)
 {
 	func_ll_clear_te[id](dma);
 	func_ll_clear_dme[id](dma);
 	func_ll_clear_fe[id](dma);
 }
 
-bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, u32_t id)
+bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, uint32_t id)
 {
 	if (func_ll_is_active_fe[id](dma) && LL_DMA_IsEnabledIT_FE(dma, id)) {
 		return true;
@@ -176,7 +176,7 @@ bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, u32_t id)
 	return false;
 }
 
-bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, u32_t id)
+bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, uint32_t id)
 {
 	if (func_ll_is_active_fe[id](dma) && LL_DMA_IsEnabledIT_FE(dma, id)) {
 		LOG_ERR("FiFo error.");
@@ -189,12 +189,12 @@ bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, u32_t id)
 	return false;
 }
 
-void stm32_dma_enable_stream(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_enable_stream(DMA_TypeDef *dma, uint32_t id)
 {
 	LL_DMA_EnableStream(dma, table_ll_stream[id]);
 }
 
-int stm32_dma_disable_stream(DMA_TypeDef *dma, u32_t id)
+int stm32_dma_disable_stream(DMA_TypeDef *dma, uint32_t id)
 {
 
 	if (!LL_DMA_IsEnabledStream(dma, table_ll_stream[id])) {
@@ -205,20 +205,20 @@ int stm32_dma_disable_stream(DMA_TypeDef *dma, u32_t id)
 	return -EAGAIN;
 }
 
-void stm32_dma_disable_fifo_irq(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_disable_fifo_irq(DMA_TypeDef *dma, uint32_t id)
 {
 	LL_DMA_DisableIT_FE(dma, table_ll_stream[id]);
 }
 
-void stm32_dma_config_channel_function(DMA_TypeDef *dma, u32_t id, u32_t slot)
+void stm32_dma_config_channel_function(DMA_TypeDef *dma, uint32_t id, uint32_t slot)
 {
 	LL_DMA_SetChannelSelection(dma, table_ll_stream[id],
 			table_ll_channel[slot]);
 }
 
-u32_t stm32_dma_get_mburst(struct dma_config *config, bool source_periph)
+uint32_t stm32_dma_get_mburst(struct dma_config *config, bool source_periph)
 {
-	u32_t memory_burst;
+	uint32_t memory_burst;
 
 	if (source_periph) {
 		memory_burst = config->dest_burst_length;
@@ -242,9 +242,9 @@ u32_t stm32_dma_get_mburst(struct dma_config *config, bool source_periph)
 	}
 }
 
-u32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph)
+uint32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph)
 {
-	u32_t periph_burst;
+	uint32_t periph_burst;
 
 	if (source_periph) {
 		periph_burst = config->source_burst_length;
@@ -278,9 +278,9 @@ u32_t stm32_dma_get_pburst(struct dma_config *config, bool source_periph)
  */
 bool stm32_dma_check_fifo_mburst(LL_DMA_InitTypeDef *DMAx)
 {
-	u32_t msize = DMAx->MemoryOrM2MDstDataSize;
-	u32_t fifo_level = DMAx->FIFOThreshold;
-	u32_t mburst = DMAx->MemBurst;
+	uint32_t msize = DMAx->MemoryOrM2MDstDataSize;
+	uint32_t fifo_level = DMAx->FIFOThreshold;
+	uint32_t mburst = DMAx->MemBurst;
 
 	switch (msize) {
 	case LL_DMA_MDATAALIGN_BYTE:
@@ -331,7 +331,7 @@ bool stm32_dma_check_fifo_mburst(LL_DMA_InitTypeDef *DMAx)
 	}
 }
 
-u32_t stm32_dma_get_fifo_threshold(u16_t fifo_mode_control)
+uint32_t stm32_dma_get_fifo_threshold(uint16_t fifo_mode_control)
 {
 	switch (fifo_mode_control) {
 	case 0:
diff --git a/drivers/dma/dma_stm32_v2.c b/drivers/dma/dma_stm32_v2.c
index be4c9b57b5..9356e09179 100644
--- a/drivers/dma/dma_stm32_v2.c
+++ b/drivers/dma/dma_stm32_v2.c
@@ -15,7 +15,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(dma_stm32_v2);
 
-u32_t table_ll_stream[] = {
+uint32_t table_ll_stream[] = {
 	LL_DMA_CHANNEL_1,
 	LL_DMA_CHANNEL_2,
 	LL_DMA_CHANNEL_3,
@@ -66,7 +66,7 @@ void (*func_ll_clear_tc[])(DMA_TypeDef *DMAx) = {
 #endif /* LL_DMA_IFCR_CTCIF8 */
 };
 
-u32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
+uint32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_HT1,
 	LL_DMA_IsActiveFlag_HT2,
 	LL_DMA_IsActiveFlag_HT3,
@@ -83,7 +83,7 @@ u32_t (*func_ll_is_active_ht[])(DMA_TypeDef *DMAx) = {
 #endif /* LL_DMA_ISR_HTIF8 */
 };
 
-u32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx) = {
+uint32_t (*func_ll_is_active_tc[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_TC1,
 	LL_DMA_IsActiveFlag_TC2,
 	LL_DMA_IsActiveFlag_TC3,
@@ -134,7 +134,7 @@ void (*func_ll_clear_gi[])(DMA_TypeDef *DMAx) = {
 #endif /* LL_DMA_IFCR_CGIF8 */
 };
 
-static u32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
+static uint32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_TE1,
 	LL_DMA_IsActiveFlag_TE2,
 	LL_DMA_IsActiveFlag_TE3,
@@ -152,7 +152,7 @@ static u32_t (*func_ll_is_active_te[])(DMA_TypeDef *DMAx) = {
 };
 
 
-u32_t (*func_ll_is_active_gi[])(DMA_TypeDef *DMAx) = {
+uint32_t (*func_ll_is_active_gi[])(DMA_TypeDef *DMAx) = {
 	LL_DMA_IsActiveFlag_GI1,
 	LL_DMA_IsActiveFlag_GI2,
 	LL_DMA_IsActiveFlag_GI3,
@@ -170,7 +170,7 @@ u32_t (*func_ll_is_active_gi[])(DMA_TypeDef *DMAx) = {
 
 };
 
-void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, uint32_t id)
 {
 	LOG_INF("tc: %d, ht: %d, te: %d, gi: %d",
 		func_ll_is_active_tc[id](dma),
@@ -179,12 +179,12 @@ void stm32_dma_dump_stream_irq(DMA_TypeDef *dma, u32_t id)
 		func_ll_is_active_gi[id](dma));
 }
 
-void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_clear_stream_irq(DMA_TypeDef *dma, uint32_t id)
 {
 	func_ll_clear_te[id](dma);
 }
 
-bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, u32_t id)
+bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, uint32_t id)
 {
 	if (func_ll_is_active_te[id](dma)) {
 		return true;
@@ -193,18 +193,18 @@ bool stm32_dma_is_irq_happened(DMA_TypeDef *dma, u32_t id)
 	return false;
 }
 
-bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, u32_t id)
+bool stm32_dma_is_unexpected_irq_happened(DMA_TypeDef *dma, uint32_t id)
 {
 	/* Preserve for future amending. */
 	return false;
 }
 
-void stm32_dma_enable_stream(DMA_TypeDef *dma, u32_t id)
+void stm32_dma_enable_stream(DMA_TypeDef *dma, uint32_t id)
 {
 	LL_DMA_EnableChannel(dma, table_ll_stream[id]);
 }
 
-int stm32_dma_disable_stream(DMA_TypeDef *dma, u32_t id)
+int stm32_dma_disable_stream(DMA_TypeDef *dma, uint32_t id)
 {
 	if (!LL_DMA_IsEnabledChannel(dma, table_ll_stream[id])) {
 		return 0;
diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c
index 5807e9c24c..4c9c67802e 100644
--- a/drivers/dma/dmamux_stm32.c
+++ b/drivers/dma/dmamux_stm32.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(dmamux_stm32, CONFIG_DMA_LOG_LEVEL);
 
 #define DT_DRV_COMPAT st_stm32_dmamux
 
-int dmamux_stm32_configure(struct device *dev, u32_t id,
+int dmamux_stm32_configure(struct device *dev, uint32_t id,
 				struct dma_config *config)
 {
 	/* device is the dmamux, id is the dmamux channel from 0 */
@@ -76,7 +76,7 @@ int dmamux_stm32_configure(struct device *dev, u32_t id,
 	return 0;
 }
 
-int dmamux_stm32_start(struct device *dev, u32_t id)
+int dmamux_stm32_start(struct device *dev, uint32_t id)
 {
 	const struct dmamux_stm32_config *dev_config =
 				dev->config_info;
@@ -97,7 +97,7 @@ int dmamux_stm32_start(struct device *dev, u32_t id)
 	return 0;
 }
 
-int dmamux_stm32_stop(struct device *dev, u32_t id)
+int dmamux_stm32_stop(struct device *dev, uint32_t id)
 {
 	const struct dmamux_stm32_config *dev_config =
 				dev->config_info;
@@ -118,8 +118,8 @@ int dmamux_stm32_stop(struct device *dev, u32_t id)
 	return 0;
 }
 
-int dmamux_stm32_reload(struct device *dev, u32_t id,
-			    u32_t src, u32_t dst, size_t size)
+int dmamux_stm32_reload(struct device *dev, uint32_t id,
+			    uint32_t src, uint32_t dst, size_t size)
 {
 	const struct dmamux_stm32_config *dev_config =
 				dev->config_info;
diff --git a/drivers/dma/dmamux_stm32.h b/drivers/dma/dmamux_stm32.h
index 238b2d181d..1cb19f3781 100644
--- a/drivers/dma/dmamux_stm32.h
+++ b/drivers/dma/dmamux_stm32.h
@@ -10,27 +10,27 @@
 /* this is the configuration of one dmamux channel */
 struct dmamux_stm32_channel {
 	struct device *dev_dma; /* pointer to the associated dma instance */
-	u8_t dma_id; /* ref of the associated dma stream for this instance */
+	uint8_t dma_id; /* ref of the associated dma stream for this instance */
 };
 
 /* the table of all the dmamux channel */
 struct dmamux_stm32_data {
 	struct dmamux_stm32_channel *mux_channels;
 	void *callback_arg;
-	void (*dmamux_callback)(void *arg, u32_t id,
+	void (*dmamux_callback)(void *arg, uint32_t id,
 				int error_code);
 };
 
 /* this is the configuration of the dmamux IP */
 struct dmamux_stm32_config {
 	struct stm32_pclken pclken;
-	u32_t base;
-	u8_t channel_nb;	/* total nb of channels */
-	u8_t gen_nb;	/* total nb of Request generator */
-	u8_t req_nb;	/* total nb of Peripheral Request inputs */
+	uint32_t base;
+	uint8_t channel_nb;	/* total nb of channels */
+	uint8_t gen_nb;	/* total nb of Request generator */
+	uint8_t req_nb;	/* total nb of Peripheral Request inputs */
 };
 
-u32_t table_ll_channel[] = {
+uint32_t table_ll_channel[] = {
 	LL_DMAMUX_CHANNEL_0,
 	LL_DMAMUX_CHANNEL_1,
 	LL_DMAMUX_CHANNEL_2,
@@ -71,7 +71,7 @@ u32_t table_ll_channel[] = {
 #endif /* LL_DMAMUX_CHANNEL_15 */
 };
 
-u32_t (*func_ll_is_active_so[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
+uint32_t (*func_ll_is_active_so[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
 	LL_DMAMUX_IsActiveFlag_SO0,
 	LL_DMAMUX_IsActiveFlag_SO1,
 	LL_DMAMUX_IsActiveFlag_SO2,
@@ -149,7 +149,7 @@ void (*func_ll_clear_so[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
 #endif /* DMAMUX_CSR_SOF15 */
 };
 
-u32_t (*func_ll_is_active_rgo[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
+uint32_t (*func_ll_is_active_rgo[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
 	LL_DMAMUX_IsActiveFlag_RGO0,
 	LL_DMAMUX_IsActiveFlag_RGO1,
 	LL_DMAMUX_IsActiveFlag_RGO2,
diff --git a/drivers/eeprom/eeprom_at2x.c b/drivers/eeprom/eeprom_at2x.c
index 6b880ff55a..aa22a705e3 100644
--- a/drivers/eeprom/eeprom_at2x.c
+++ b/drivers/eeprom/eeprom_at2x.c
@@ -36,18 +36,18 @@ LOG_MODULE_REGISTER(eeprom_at2x);
 
 struct eeprom_at2x_config {
 	const char *bus_dev_name;
-	u16_t bus_addr;
-	u32_t max_freq;
+	uint16_t bus_addr;
+	uint32_t max_freq;
 	const char *spi_cs_dev_name;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	gpio_pin_t wp_gpio_pin;
 	gpio_dt_flags_t wp_gpio_flags;
 	const char *wp_gpio_name;
 	size_t size;
 	size_t pagesize;
-	u8_t addr_width;
+	uint8_t addr_width;
 	bool readonly;
-	u16_t timeout;
+	uint16_t timeout;
 	eeprom_api_read read_fn;
 	eeprom_api_write write_fn;
 };
@@ -140,7 +140,7 @@ static int eeprom_at2x_write(struct device *dev, off_t offset, const void *buf,
 {
 	const struct eeprom_at2x_config *config = dev->config_info;
 	struct eeprom_at2x_data *data = dev->driver_data;
-	const u8_t *pbuf = buf;
+	const uint8_t *pbuf = buf;
 	int ret;
 
 	if (config->readonly) {
@@ -203,8 +203,8 @@ static int eeprom_at24_read(struct device *dev, off_t offset, void *buf,
 {
 	const struct eeprom_at2x_config *config = dev->config_info;
 	struct eeprom_at2x_data *data = dev->driver_data;
-	s64_t timeout;
-	u8_t addr[2];
+	int64_t timeout;
+	uint8_t addr[2];
 	int err;
 
 	if (config->addr_width == 16) {
@@ -237,8 +237,8 @@ static int eeprom_at24_write(struct device *dev, off_t offset,
 	const struct eeprom_at2x_config *config = dev->config_info;
 	struct eeprom_at2x_data *data = dev->driver_data;
 	int count = eeprom_at2x_limit_write_count(dev, offset, len);
-	u8_t block[config->addr_width / 8 + count];
-	s64_t timeout;
+	uint8_t block[config->addr_width / 8 + count];
+	int64_t timeout;
 	int i = 0;
 	int err;
 
@@ -278,11 +278,11 @@ static int eeprom_at24_write(struct device *dev, off_t offset,
 #endif /* CONFIG_EEPROM_AT24 */
 
 #ifdef CONFIG_EEPROM_AT25
-static int eeprom_at25_rdsr(struct device *dev, u8_t *status)
+static int eeprom_at25_rdsr(struct device *dev, uint8_t *status)
 {
 	struct eeprom_at2x_data *data = dev->driver_data;
-	u8_t rdsr[2] = { EEPROM_AT25_RDSR, 0 };
-	u8_t sr[2];
+	uint8_t rdsr[2] = { EEPROM_AT25_RDSR, 0 };
+	uint8_t sr[2];
 	int err;
 	const struct spi_buf tx_buf = {
 		.buf = rdsr,
@@ -312,8 +312,8 @@ static int eeprom_at25_rdsr(struct device *dev, u8_t *status)
 static int eeprom_at25_wait_for_idle(struct device *dev)
 {
 	const struct eeprom_at2x_config *config = dev->config_info;
-	s64_t timeout;
-	u8_t status;
+	int64_t timeout;
+	uint8_t status;
 	int err;
 
 	timeout = k_uptime_get() + config->timeout;
@@ -339,8 +339,8 @@ static int eeprom_at25_read(struct device *dev, off_t offset, void *buf,
 	const struct eeprom_at2x_config *config = dev->config_info;
 	struct eeprom_at2x_data *data = dev->driver_data;
 	size_t cmd_len = 1 + config->addr_width / 8;
-	u8_t cmd[4] = { EEPROM_AT25_READ, 0, 0, 0 };
-	u8_t *paddr;
+	uint8_t cmd[4] = { EEPROM_AT25_READ, 0, 0, 0 };
+	uint8_t *paddr;
 	int err;
 	const struct spi_buf tx_buf = {
 		.buf = cmd,
@@ -402,7 +402,7 @@ static int eeprom_at25_read(struct device *dev, off_t offset, void *buf,
 static int eeprom_at25_wren(struct device *dev)
 {
 	struct eeprom_at2x_data *data = dev->driver_data;
-	u8_t cmd = EEPROM_AT25_WREN;
+	uint8_t cmd = EEPROM_AT25_WREN;
 	const struct spi_buf tx_buf = {
 		.buf = &cmd,
 		.len = 1,
@@ -421,9 +421,9 @@ static int eeprom_at25_write(struct device *dev, off_t offset,
 	const struct eeprom_at2x_config *config = dev->config_info;
 	struct eeprom_at2x_data *data = dev->driver_data;
 	int count = eeprom_at2x_limit_write_count(dev, offset, len);
-	u8_t cmd[4] = { EEPROM_AT25_WRITE, 0, 0, 0 };
+	uint8_t cmd[4] = { EEPROM_AT25_WRITE, 0, 0, 0 };
 	size_t cmd_len = 1 + config->addr_width / 8;
-	u8_t *paddr;
+	uint8_t *paddr;
 	int err;
 	const struct spi_buf tx_bufs[2] = {
 		{
diff --git a/drivers/eeprom/eeprom_shell.c b/drivers/eeprom/eeprom_shell.c
index b3f26003e7..1d8e53499e 100644
--- a/drivers/eeprom/eeprom_shell.c
+++ b/drivers/eeprom/eeprom_shell.c
@@ -14,11 +14,11 @@
 #include <stdlib.h>
 
 struct args_index {
-	u8_t device;
-	u8_t offset;
-	u8_t length;
-	u8_t data;
-	u8_t pattern;
+	uint8_t device;
+	uint8_t offset;
+	uint8_t length;
+	uint8_t data;
+	uint8_t pattern;
 };
 
 static const struct args_index args_indx = {
@@ -31,7 +31,7 @@ static const struct args_index args_indx = {
 
 static int cmd_read(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
+	uint8_t buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
 	struct device *eeprom;
 	off_t offset;
 	size_t len;
@@ -68,8 +68,8 @@ static int cmd_read(const struct shell *shell, size_t argc, char **argv)
 
 static int cmd_write(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
-	u8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
+	uint8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
+	uint8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
 	struct device *eeprom;
 	unsigned long byte;
 	off_t offset;
@@ -143,8 +143,8 @@ static int cmd_size(const struct shell *shell, size_t argc, char **argv)
 
 static int cmd_fill(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
-	u8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
+	uint8_t wr_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
+	uint8_t rd_buf[CONFIG_EEPROM_SHELL_BUFFER_SIZE];
 	struct device *eeprom;
 	unsigned long pattern;
 	off_t offset;
diff --git a/drivers/eeprom/eeprom_simulator.c b/drivers/eeprom/eeprom_simulator.c
index a8d2fb9ed5..bf80bd0049 100644
--- a/drivers/eeprom/eeprom_simulator.c
+++ b/drivers/eeprom/eeprom_simulator.c
@@ -85,12 +85,12 @@ STATS_NAME(eeprom_sim_thresholds, max_len)
 STATS_NAME_END(eeprom_sim_thresholds);
 
 #ifdef CONFIG_ARCH_POSIX
-static u8_t *mock_eeprom;
+static uint8_t *mock_eeprom;
 static int eeprom_fd = -1;
 static const char *eeprom_file_path;
 static const char default_eeprom_file_path[] = "eeprom.bin";
 #else
-static u8_t mock_eeprom[DT_INST_PROP(0, size)];
+static uint8_t mock_eeprom[DT_INST_PROP(0, size)];
 #endif /* CONFIG_ARCH_POSIX */
 
 static int eeprom_range_is_valid(struct device *dev, off_t offset, size_t len)
diff --git a/drivers/eeprom/eeprom_stm32.c b/drivers/eeprom/eeprom_stm32.c
index 87d8e5dc12..128afe96dc 100644
--- a/drivers/eeprom/eeprom_stm32.c
+++ b/drivers/eeprom/eeprom_stm32.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(eeprom_stm32);
 K_MUTEX_DEFINE(lock);
 
 struct eeprom_stm32_config {
-	u32_t addr;
+	uint32_t addr;
 	size_t size;
 };
 
@@ -24,7 +24,7 @@ static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf,
 				size_t len)
 {
 	const struct eeprom_stm32_config *config = dev->config_info;
-	u8_t *pbuf = buf;
+	uint8_t *pbuf = buf;
 
 	if (!len) {
 		return 0;
@@ -38,7 +38,7 @@ static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf,
 	k_mutex_lock(&lock, K_FOREVER);
 
 	while (len) {
-		*pbuf = *(__IO u8_t*)(config->addr + offset);
+		*pbuf = *(__IO uint8_t*)(config->addr + offset);
 
 		pbuf++;
 		offset++;
@@ -54,7 +54,7 @@ static int eeprom_stm32_write(struct device *dev, off_t offset,
 				const void *buf, size_t len)
 {
 	const struct eeprom_stm32_config *config = dev->config_info;
-	const u8_t *pbuf = buf;
+	const uint8_t *pbuf = buf;
 	HAL_StatusTypeDef ret = HAL_OK;
 
 	if (!len) {
diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c
index 70cffc0f21..680736bb18 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -20,7 +20,7 @@ struct entropy_cc13xx_cc26xx_data {
 	struct k_sem lock;
 	struct k_sem sync;
 	struct ring_buf pool;
-	u8_t data[CONFIG_ENTROPY_CC13XX_CC26XX_POOL_SIZE];
+	uint8_t data[CONFIG_ENTROPY_CC13XX_CC26XX_POOL_SIZE];
 };
 
 DEVICE_DECLARE(entropy_cc13xx_cc26xx);
@@ -31,11 +31,11 @@ get_dev_data(struct device *dev)
 	return dev->driver_data;
 }
 
-static int entropy_cc13xx_cc26xx_get_entropy(struct device *dev, u8_t *buf,
-					     u16_t len)
+static int entropy_cc13xx_cc26xx_get_entropy(struct device *dev, uint8_t *buf,
+					     uint16_t len)
 {
 	struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev);
-	u32_t cnt;
+	uint32_t cnt;
 
 	TRNGIntEnable(TRNG_NUMBER_READY);
 
@@ -58,8 +58,8 @@ static int entropy_cc13xx_cc26xx_get_entropy(struct device *dev, u8_t *buf,
 static void entropy_cc13xx_cc26xx_isr(void *arg)
 {
 	struct entropy_cc13xx_cc26xx_data *data = get_dev_data(arg);
-	u32_t src, cnt, off;
-	u32_t num[2];
+	uint32_t src, cnt, off;
+	uint32_t num[2];
 
 	/* Interrupt service routine as described in TRM section 18.6.1.3.2 */
 	src = TRNGStatusGet();
@@ -69,7 +69,7 @@ static void entropy_cc13xx_cc26xx_isr(void *arg)
 		num[1] = TRNGNumberGet(TRNG_HI_WORD);
 		num[0] = TRNGNumberGet(TRNG_LOW_WORD);
 
-		cnt = ring_buf_put(&data->pool, (u8_t *)num, sizeof(num));
+		cnt = ring_buf_put(&data->pool, (uint8_t *)num, sizeof(num));
 
 		/* When pool is full disable interrupt and stop reading numbers */
 		if (cnt != sizeof(num)) {
diff --git a/drivers/entropy/entropy_esp32.c b/drivers/entropy/entropy_esp32.c
index d4910bb7df..42d5efa8c3 100644
--- a/drivers/entropy/entropy_esp32.c
+++ b/drivers/entropy/entropy_esp32.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <drivers/entropy.h>
 
-static inline u32_t entropy_esp32_get_u32(void)
+static inline uint32_t entropy_esp32_get_u32(void)
 {
 	/*
 	 * APB Address:   0x60035144 (Safe,slower writes)
@@ -19,7 +19,7 @@ static inline u32_t entropy_esp32_get_u32(void)
 	 * https://www.esp32.com/viewtopic.php?f=2&t=3033&p=14227
 	 * also check: ECO and Workarounds for Bugs Document, point 3.3
 	 */
-	volatile u32_t *rng_data_reg = (u32_t *)DT_INST_REG_ADDR(0);
+	volatile uint32_t *rng_data_reg = (uint32_t *)DT_INST_REG_ADDR(0);
 
 	/* Read just once.  This is not optimal as the generator has
 	 * limited throughput due to scarce sources of entropy, specially
@@ -28,10 +28,10 @@ static inline u32_t entropy_esp32_get_u32(void)
 	return *rng_data_reg;
 }
 
-static int entropy_esp32_get_entropy(struct device *device, u8_t *buf, u16_t len)
+static int entropy_esp32_get_entropy(struct device *device, uint8_t *buf, uint16_t len)
 {
 	while (len) {
-		u32_t v = entropy_esp32_get_u32();
+		uint32_t v = entropy_esp32_get_u32();
 
 		if (len >= sizeof(v)) {
 			memcpy(buf, &v, sizeof(v));
diff --git a/drivers/entropy/entropy_gecko_trng.c b/drivers/entropy/entropy_gecko_trng.c
index 50bd3cf47e..c5b3de52ca 100644
--- a/drivers/entropy/entropy_gecko_trng.c
+++ b/drivers/entropy/entropy_gecko_trng.c
@@ -11,10 +11,10 @@
  #include "soc.h"
  #include "em_cmu.h"
 
-static void entropy_gecko_trng_read(u8_t *output, size_t len)
+static void entropy_gecko_trng_read(uint8_t *output, size_t len)
 {
-	u32_t tmp;
-	u32_t *data = (u32_t *) output;
+	uint32_t tmp;
+	uint32_t *data = (uint32_t *) output;
 
 	/* Read known good available data. */
 	while (len >= 4) {
@@ -26,12 +26,12 @@ static void entropy_gecko_trng_read(u8_t *output, size_t len)
 		 * and FIFO data is available.
 		 */
 		tmp = TRNG0->FIFO;
-		memcpy(data, (const u8_t *) &tmp, len);
+		memcpy(data, (const uint8_t *) &tmp, len);
 	}
 }
 
-static int entropy_gecko_trng_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_gecko_trng_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	size_t count = 0;
 	size_t available;
@@ -53,8 +53,8 @@ static int entropy_gecko_trng_get_entropy(struct device *dev, u8_t *buffer,
 	return 0;
 }
 
-static int entropy_gecko_trng_get_entropy_isr(struct device *dev, u8_t *buf,
-					u16_t len, u32_t flags)
+static int entropy_gecko_trng_get_entropy_isr(struct device *dev, uint8_t *buf,
+					uint16_t len, uint32_t flags)
 {
 
 	if ((flags & ENTROPY_BUSYWAIT) == 0U) {
diff --git a/drivers/entropy/entropy_handlers.c b/drivers/entropy/entropy_handlers.c
index 98a4e001f2..56719c0f97 100644
--- a/drivers/entropy/entropy_handlers.c
+++ b/drivers/entropy/entropy_handlers.c
@@ -8,12 +8,12 @@
 #include <syscall_handler.h>
 
 static inline int z_vrfy_entropy_get_entropy(struct device *dev,
-					     u8_t *buffer,
-					     u16_t len)
+					     uint8_t *buffer,
+					     uint16_t len)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_ENTROPY(dev, get_entropy));
 	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buffer, len));
-	return z_impl_entropy_get_entropy((struct device *)dev, (u8_t *)buffer,
+	return z_impl_entropy_get_entropy((struct device *)dev, (uint8_t *)buffer,
 					 len);
 }
 #include <syscalls/entropy_get_entropy_mrsh.c>
diff --git a/drivers/entropy/entropy_litex.c b/drivers/entropy/entropy_litex.c
index 270c6c6d0e..d5b1b1bac2 100644
--- a/drivers/entropy/entropy_litex.c
+++ b/drivers/entropy/entropy_litex.c
@@ -18,11 +18,11 @@
 #define PRBS_WIDTH      DT_INST_REG_SIZE(0)
 #define SUBREG_SIZE_BIT 8
 
-static inline unsigned int prbs_read(volatile u32_t *reg_status,
-					 volatile u32_t reg_width)
+static inline unsigned int prbs_read(volatile uint32_t *reg_status,
+					 volatile uint32_t reg_width)
 {
-	u32_t shifted_data, shift, i;
-	u32_t result = 0;
+	uint32_t shifted_data, shift, i;
+	uint32_t result = 0;
 
 	for (i = 0; i < reg_width; ++i) {
 		shifted_data = *(reg_status + i);
@@ -33,12 +33,12 @@ static inline unsigned int prbs_read(volatile u32_t *reg_status,
 	return result;
 }
 
-static int entropy_prbs_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_prbs_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	while (length > 0) {
 		size_t to_copy;
-		u32_t value;
+		uint32_t value;
 
 		value = prbs_read(PRBS_STATUS, PRBS_WIDTH);
 		to_copy = MIN(length, sizeof(value));
diff --git a/drivers/entropy/entropy_mcux_rng.c b/drivers/entropy/entropy_mcux_rng.c
index 4c13538093..9f5c9476be 100644
--- a/drivers/entropy/entropy_mcux_rng.c
+++ b/drivers/entropy/entropy_mcux_rng.c
@@ -17,8 +17,8 @@ struct mcux_entropy_config {
 	RNG_Type *base;
 };
 
-static int entropy_mcux_rng_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_mcux_rng_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	const struct mcux_entropy_config *config = dev->config_info;
 	status_t status;
diff --git a/drivers/entropy/entropy_mcux_rnga.c b/drivers/entropy/entropy_mcux_rnga.c
index 854c62adb8..f46313fc51 100644
--- a/drivers/entropy/entropy_mcux_rnga.c
+++ b/drivers/entropy/entropy_mcux_rnga.c
@@ -13,10 +13,10 @@
 
 #include "fsl_rnga.h"
 
-static u8_t entropy_mcux_rnga_get_uint8(void)
+static uint8_t entropy_mcux_rnga_get_uint8(void)
 {
-	u32_t random;
-	u8_t output = 0U;
+	uint32_t random;
+	uint8_t output = 0U;
 	int i;
 
 	RNGA_SetMode(RNG, kRNGA_ModeNormal);
@@ -38,8 +38,8 @@ static u8_t entropy_mcux_rnga_get_uint8(void)
 	return output;
 }
 
-static int entropy_mcux_rnga_get_entropy(struct device *dev, u8_t *buffer,
-					u16_t length)
+static int entropy_mcux_rnga_get_entropy(struct device *dev, uint8_t *buffer,
+					uint16_t length)
 {
 	int i;
 
@@ -65,7 +65,7 @@ DEVICE_AND_API_INIT(entropy_mcux_rnga, DT_INST_LABEL(0),
 
 static int entropy_mcux_rnga_init(struct device *dev)
 {
-	u32_t seed = k_cycle_get_32();
+	uint32_t seed = k_cycle_get_32();
 
 	ARG_UNUSED(dev);
 
diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c
index cb70965466..e8960d2130 100644
--- a/drivers/entropy/entropy_mcux_trng.c
+++ b/drivers/entropy/entropy_mcux_trng.c
@@ -17,8 +17,8 @@ struct mcux_entropy_config {
 	TRNG_Type *base;
 };
 
-static int entropy_mcux_trng_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_mcux_trng_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	const struct mcux_entropy_config *config = dev->config_info;
 	status_t status;
diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c
index ba84d0a08d..fb3e9ce206 100644
--- a/drivers/entropy/entropy_nrf5.c
+++ b/drivers/entropy/entropy_nrf5.c
@@ -69,15 +69,15 @@
  */
 
 struct rng_pool {
-	u8_t first_alloc;
-	u8_t first_read;
-	u8_t last;
-	u8_t mask;
-	u8_t threshold;
-	u8_t buffer[0];
+	uint8_t first_alloc;
+	uint8_t first_read;
+	uint8_t last;
+	uint8_t mask;
+	uint8_t threshold;
+	uint8_t buffer[0];
 };
 
-#define RNG_POOL_DEFINE(name, len) u8_t name[sizeof(struct rng_pool) + (len)]
+#define RNG_POOL_DEFINE(name, len) uint8_t name[sizeof(struct rng_pool) + (len)]
 
 BUILD_ASSERT((CONFIG_ENTROPY_NRF5_ISR_POOL_SIZE &
 	      (CONFIG_ENTROPY_NRF5_ISR_POOL_SIZE - 1)) == 0,
@@ -121,13 +121,13 @@ static int random_byte_get(void)
 #if defined(CONFIG_BT_CTLR_FAST_ENC)
 #pragma GCC optimize ("Ofast")
 #endif
-static u16_t rng_pool_get(struct rng_pool *rngp, u8_t *buf, u16_t len)
+static uint16_t rng_pool_get(struct rng_pool *rngp, uint8_t *buf, uint16_t len)
 {
-	u32_t last  = rngp->last;
-	u32_t mask  = rngp->mask;
-	u8_t *dst   = buf;
-	u32_t first, available;
-	u32_t other_read_in_progress;
+	uint32_t last  = rngp->last;
+	uint32_t mask  = rngp->mask;
+	uint8_t *dst   = buf;
+	uint32_t first, available;
+	uint32_t other_read_in_progress;
 	unsigned int key;
 
 	key = irq_lock();
@@ -178,11 +178,11 @@ static u16_t rng_pool_get(struct rng_pool *rngp, u8_t *buf, u16_t len)
 }
 #pragma GCC pop_options
 
-static int rng_pool_put(struct rng_pool *rngp, u8_t byte)
+static int rng_pool_put(struct rng_pool *rngp, uint8_t byte)
 {
-	u8_t first = rngp->first_read;
-	u8_t last  = rngp->last;
-	u8_t mask  = rngp->mask;
+	uint8_t first = rngp->first_read;
+	uint8_t last  = rngp->last;
+	uint8_t mask  = rngp->mask;
 
 	/* Signal error if the pool is full. */
 	if (((last - first) & mask) == mask) {
@@ -195,7 +195,7 @@ static int rng_pool_put(struct rng_pool *rngp, u8_t byte)
 	return 0;
 }
 
-static void rng_pool_init(struct rng_pool *rngp, u16_t size, u8_t threshold)
+static void rng_pool_init(struct rng_pool *rngp, uint16_t size, uint8_t threshold)
 {
 	rngp->first_alloc = 0U;
 	rngp->first_read  = 0U;
@@ -227,13 +227,13 @@ static void isr(void *arg)
 	}
 }
 
-static int entropy_nrf5_get_entropy(struct device *device, u8_t *buf, u16_t len)
+static int entropy_nrf5_get_entropy(struct device *device, uint8_t *buf, uint16_t len)
 {
 	/* Check if this API is called on correct driver instance. */
 	__ASSERT_NO_MSG(&entropy_nrf5_data == DEV_DATA(device));
 
 	while (len) {
-		u16_t bytes;
+		uint16_t bytes;
 
 		k_sem_take(&entropy_nrf5_data.sem_lock, K_FOREVER);
 		bytes = rng_pool_get((struct rng_pool *)(entropy_nrf5_data.thr),
@@ -253,10 +253,10 @@ static int entropy_nrf5_get_entropy(struct device *device, u8_t *buf, u16_t len)
 	return 0;
 }
 
-static int entropy_nrf5_get_entropy_isr(struct device *dev, u8_t *buf, u16_t len,
-					u32_t flags)
+static int entropy_nrf5_get_entropy_isr(struct device *dev, uint8_t *buf, uint16_t len,
+					uint32_t flags)
 {
-	u16_t cnt = len;
+	uint16_t cnt = len;
 
 	/* Check if this API is called on correct driver instance. */
 	__ASSERT_NO_MSG(&entropy_nrf5_data == DEV_DATA(dev));
diff --git a/drivers/entropy/entropy_rv32m1_trng.c b/drivers/entropy/entropy_rv32m1_trng.c
index 7f36f8c4d6..b96e94be12 100644
--- a/drivers/entropy/entropy_rv32m1_trng.c
+++ b/drivers/entropy/entropy_rv32m1_trng.c
@@ -17,8 +17,8 @@ struct rv32m1_entropy_config {
 	TRNG_Type *base;
 };
 
-static int entropy_rv32m1_trng_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_rv32m1_trng_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	const struct rv32m1_entropy_config *config = dev->config_info;
 	status_t status;
diff --git a/drivers/entropy/entropy_sam.c b/drivers/entropy/entropy_sam.c
index 488ee67a42..7cdb25e2b5 100644
--- a/drivers/entropy/entropy_sam.c
+++ b/drivers/entropy/entropy_sam.c
@@ -39,7 +39,7 @@ static inline uint32_t _data(Trng * const trng)
 #endif
 }
 
-static int entropy_sam_wait_ready(Trng * const trng, u32_t flags)
+static int entropy_sam_wait_ready(Trng * const trng, uint32_t flags)
 {
 	/* According to the reference manual, the generator provides
 	 * one 32-bit random value every 84 peripheral clock cycles.
@@ -72,14 +72,14 @@ static int entropy_sam_wait_ready(Trng * const trng, u32_t flags)
 	return 0;
 }
 
-static int entropy_sam_get_entropy_internal(struct device *dev, u8_t *buffer,
-				   u16_t length, u32_t flags)
+static int entropy_sam_get_entropy_internal(struct device *dev, uint8_t *buffer,
+				   uint16_t length, uint32_t flags)
 {
 	Trng *const trng = DEV_CFG(dev)->regs;
 
 	while (length > 0) {
 		size_t to_copy;
-		u32_t value;
+		uint32_t value;
 		int res;
 
 		res = entropy_sam_wait_ready(trng, flags);
@@ -98,16 +98,16 @@ static int entropy_sam_get_entropy_internal(struct device *dev, u8_t *buffer,
 	return 0;
 }
 
-static int entropy_sam_get_entropy(struct device *dev, u8_t *buffer,
-				   u16_t length)
+static int entropy_sam_get_entropy(struct device *dev, uint8_t *buffer,
+				   uint16_t length)
 {
 	return entropy_sam_get_entropy_internal(dev, buffer, length, 0);
 }
 
-static int entropy_sam_get_entropy_isr(struct device *dev, u8_t *buffer,
-				   u16_t length, u32_t flags)
+static int entropy_sam_get_entropy_isr(struct device *dev, uint8_t *buffer,
+				   uint16_t length, uint32_t flags)
 {
-	u16_t cnt = length;
+	uint16_t cnt = length;
 
 
 	if ((flags & ENTROPY_BUSYWAIT) == 0U) {
@@ -118,7 +118,7 @@ static int entropy_sam_get_entropy_isr(struct device *dev, u8_t *buffer,
 
 		do {
 			size_t to_copy;
-			u32_t value;
+			uint32_t value;
 
 			if (!_ready(trng)) {
 
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index f08f66aa7a..23fd8f5051 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/drivers/entropy/entropy_stm32.c
@@ -99,11 +99,11 @@ static int entropy_stm32_wait_ready(RNG_TypeDef *rng)
 	}
 }
 
-static int entropy_stm32_rng_get_entropy(struct device *dev, u8_t *buffer,
-					 u16_t length)
+static int entropy_stm32_rng_get_entropy(struct device *dev, uint8_t *buffer,
+					 uint16_t length)
 {
 	struct entropy_stm32_rng_dev_data *dev_data;
-	int n = sizeof(u32_t);
+	int n = sizeof(uint32_t);
 	int res;
 
 	__ASSERT_NO_MSG(dev != NULL);
@@ -119,8 +119,8 @@ static int entropy_stm32_rng_get_entropy(struct device *dev, u8_t *buffer,
 	}
 
 	while (length > 0) {
-		u32_t rndbits;
-		u8_t *p_rndbits = (u8_t *)&rndbits;
+		uint32_t rndbits;
+		uint8_t *p_rndbits = (uint8_t *)&rndbits;
 
 		res = entropy_stm32_wait_ready(dev_data->rng);
 		if (res < 0)
@@ -128,7 +128,7 @@ static int entropy_stm32_rng_get_entropy(struct device *dev, u8_t *buffer,
 
 		rndbits = LL_RNG_ReadRandData32(dev_data->rng);
 
-		if (length < sizeof(u32_t))
+		if (length < sizeof(uint32_t))
 			n = length;
 
 		for (int i = 0; i < n; i++) {
diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c
index 7fa786dae7..1da1b1bb9c 100644
--- a/drivers/entropy/fake_entropy_native_posix.c
+++ b/drivers/entropy/fake_entropy_native_posix.c
@@ -25,8 +25,8 @@
 
 static unsigned int seed = 0x5678;
 
-static int entropy_native_posix_get_entropy(struct device *dev, u8_t *buffer,
-					    u16_t length)
+static int entropy_native_posix_get_entropy(struct device *dev, uint8_t *buffer,
+					    uint16_t length)
 {
 	ARG_UNUSED(dev);
 
@@ -47,8 +47,8 @@ static int entropy_native_posix_get_entropy(struct device *dev, u8_t *buffer,
 	return 0;
 }
 
-static int entropy_native_posix_get_entropy_isr(struct device *dev, u8_t *buf,
-						u16_t len, u32_t flags)
+static int entropy_native_posix_get_entropy_isr(struct device *dev, uint8_t *buf,
+						uint16_t len, uint32_t flags)
 {
 	ARG_UNUSED(flags);
 
diff --git a/drivers/espi/espi_handlers.c b/drivers/espi/espi_handlers.c
index 44c0f39c14..6e8dff328a 100644
--- a/drivers/espi/espi_handlers.c
+++ b/drivers/espi/espi_handlers.c
@@ -31,15 +31,15 @@ static inline bool z_vrfy_espi_get_channel_status(struct device *dev,
 
 static inline int z_vrfy_espi_read_lpc_request(struct device *dev,
 					       enum lpc_peripheral_opcode op,
-					       u32_t *data)
+					       uint32_t *data)
 {
 	int ret;
-	u32_t data_copy;
+	uint32_t data_copy;
 
 	Z_OOPS(Z_SYSCALL_DRIVER_ESPI(dev, read_lpc_request));
 
 	ret = z_impl_espi_read_lpc_request(dev, op, &data_copy);
-	Z_OOPS(z_user_to_copy(data, &data_copy, sizeof(u8_t)));
+	Z_OOPS(z_user_to_copy(data, &data_copy, sizeof(uint8_t)));
 
 	return ret;
 }
@@ -47,9 +47,9 @@ static inline int z_vrfy_espi_read_lpc_request(struct device *dev,
 
 static inline int z_vrfy_espi_write_lpc_request(struct device *dev,
 						enum lpc_peripheral_opcode op,
-						u32_t *data)
+						uint32_t *data)
 {
-	u32_t data_copy;
+	uint32_t data_copy;
 
 	Z_OOPS(Z_SYSCALL_DRIVER_ESPI(dev, write_lpc_request));
 	Z_OOPS(z_user_from_copy(&data_copy, data, sizeof(*data)));
@@ -60,7 +60,7 @@ static inline int z_vrfy_espi_write_lpc_request(struct device *dev,
 
 static inline int z_vrfy_espi_send_vwire(struct device *dev,
 					 enum espi_vwire_signal signal,
-					 u8_t level)
+					 uint8_t level)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_ESPI(dev, send_vwire));
 
@@ -70,15 +70,15 @@ static inline int z_vrfy_espi_send_vwire(struct device *dev,
 
 static inline int z_vrfy_espi_receive_vwire(struct device *dev,
 					    enum espi_vwire_signal signal,
-					    u8_t *level)
+					    uint8_t *level)
 {
 	int ret;
-	u8_t level_copy;
+	uint8_t level_copy;
 
 	Z_OOPS(Z_SYSCALL_DRIVER_ESPI(dev, receive_vwire));
 
 	ret = z_impl_espi_receive_vwire(dev, signal, &level_copy);
-	Z_OOPS(z_user_to_copy(level, &level_copy, sizeof(u8_t)));
+	Z_OOPS(z_user_to_copy(level, &level_copy, sizeof(uint8_t)));
 
 	return ret;
 }
diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c
index f6c353330b..141b94e3d7 100644
--- a/drivers/espi/espi_mchp_xec.c
+++ b/drivers/espi/espi_mchp_xec.c
@@ -46,15 +46,15 @@
 LOG_MODULE_REGISTER(espi, CONFIG_ESPI_LOG_LEVEL);
 
 struct espi_isr {
-	u32_t girq_bit;
+	uint32_t girq_bit;
 	void (*the_isr)(struct device *dev);
 };
 
 struct espi_xec_config {
-	u32_t base_addr;
-	u8_t bus_girq_id;
-	u8_t vw_girq_id;
-	u8_t pc_girq_id;
+	uint32_t base_addr;
+	uint8_t bus_girq_id;
+	uint8_t vw_girq_id;
+	uint8_t pc_girq_id;
 };
 
 struct espi_xec_data {
@@ -62,15 +62,15 @@ struct espi_xec_data {
 	struct k_sem tx_lock;
 	struct k_sem rx_lock;
 	struct k_sem flash_lock;
-	u8_t plt_rst_asserted;
-	u8_t espi_rst_asserted;
-	u8_t sx_state;
+	uint8_t plt_rst_asserted;
+	uint8_t espi_rst_asserted;
+	uint8_t sx_state;
 };
 
 struct xec_signal {
-	u8_t xec_reg_idx;
-	u8_t bit;
-	u8_t dir;
+	uint8_t xec_reg_idx;
+	uint8_t bit;
+	uint8_t dir;
 };
 
 enum mchp_msvw_regs {
@@ -191,16 +191,16 @@ static const struct xec_signal vw_tbl[] = {
 					     ESPI_MASTER_TO_SLAVE},
 };
 
-static u32_t slave_rx_mem[MAX_OOB_BUFFER_SIZE];
-static u32_t slave_tx_mem[MAX_OOB_BUFFER_SIZE];
-static u32_t slave_mem[MAX_SLAVE_BUFFER_SIZE];
+static uint32_t slave_rx_mem[MAX_OOB_BUFFER_SIZE];
+static uint32_t slave_tx_mem[MAX_OOB_BUFFER_SIZE];
+static uint32_t slave_mem[MAX_SLAVE_BUFFER_SIZE];
 
 static int espi_xec_configure(struct device *dev, struct espi_cfg *cfg)
 {
-	u8_t iomode = 0;
-	u8_t cap0 = ESPI_CAP_REGS->GLB_CAP0;
-	u8_t cap1 = ESPI_CAP_REGS->GLB_CAP1;
-	u8_t cur_iomode = (cap1 & MCHP_ESPI_GBL_CAP1_IO_MODE_MASK) >>
+	uint8_t iomode = 0;
+	uint8_t cap0 = ESPI_CAP_REGS->GLB_CAP0;
+	uint8_t cap1 = ESPI_CAP_REGS->GLB_CAP1;
+	uint8_t cur_iomode = (cap1 & MCHP_ESPI_GBL_CAP1_IO_MODE_MASK) >>
 			   MCHP_ESPI_GBL_CAP1_IO_MODE_POS;
 
 	/* Set frequency */
@@ -313,7 +313,7 @@ static bool espi_xec_channel_ready(struct device *dev, enum espi_channel ch)
 
 static int espi_xec_read_lpc_request(struct device *dev,
 				     enum lpc_peripheral_opcode op,
-				     u32_t  *data)
+				     uint32_t  *data)
 {
 	ARG_UNUSED(dev);
 
@@ -346,12 +346,12 @@ static int espi_xec_read_lpc_request(struct device *dev,
 
 static int espi_xec_write_lpc_request(struct device *dev,
 				      enum lpc_peripheral_opcode op,
-				      u32_t *data)
+				      uint32_t *data)
 {
 	struct espi_xec_config *config =
 		(struct espi_xec_config *) (dev->config_info);
 
-	volatile u32_t __attribute__((unused)) dummy;
+	volatile uint32_t __attribute__((unused)) dummy;
 
 	if (op >= E8042_START_OPCODE && op <= E8042_MAX_OPCODE) {
 		/* Make sure kbc 8042 is on */
@@ -388,11 +388,11 @@ static int espi_xec_write_lpc_request(struct device *dev,
 }
 
 static int espi_xec_send_vwire(struct device *dev,
-			       enum espi_vwire_signal signal, u8_t level)
+			       enum espi_vwire_signal signal, uint8_t level)
 {
 	struct xec_signal signal_info = vw_tbl[signal];
-	u8_t xec_id = signal_info.xec_reg_idx;
-	u8_t src_id = signal_info.bit;
+	uint8_t xec_id = signal_info.xec_reg_idx;
+	uint8_t src_id = signal_info.bit;
 
 	if ((src_id >= ESPI_VWIRE_SRC_ID_MAX) ||
 	    (xec_id >= ESPI_MSVW_IDX_MAX)) {
@@ -401,21 +401,21 @@ static int espi_xec_send_vwire(struct device *dev,
 
 	if (signal_info.dir == ESPI_MASTER_TO_SLAVE) {
 		ESPI_MSVW_REG *reg = &(ESPI_M2S_VW_REGS->MSVW00) + xec_id;
-		u8_t *p8 = (u8_t *)&reg->SRC;
+		uint8_t *p8 = (uint8_t *)&reg->SRC;
 
 		*(p8 + (uintptr_t) src_id) = level;
 	}
 
 	if (signal_info.dir == ESPI_SLAVE_TO_MASTER) {
 		ESPI_SMVW_REG *reg = &(ESPI_S2M_VW_REGS->SMVW00) + xec_id;
-		u8_t *p8 = (u8_t *)&reg->SRC;
+		uint8_t *p8 = (uint8_t *)&reg->SRC;
 
 		*(p8 + (uintptr_t) src_id) = level;
 
 		/* Ensure eSPI virtual wire packet is transmitted
 		 * There is no interrupt, so need to poll register
 		 */
-		u8_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
+		uint8_t rd_cnt = ESPI_XEC_VWIRE_SEND_TIMEOUT;
 
 		while (reg->SRC_CHG && rd_cnt--) {
 			k_busy_wait(100);
@@ -426,11 +426,11 @@ static int espi_xec_send_vwire(struct device *dev,
 }
 
 static int espi_xec_receive_vwire(struct device *dev,
-				  enum espi_vwire_signal signal, u8_t *level)
+				  enum espi_vwire_signal signal, uint8_t *level)
 {
 	struct xec_signal signal_info = vw_tbl[signal];
-	u8_t xec_id = signal_info.xec_reg_idx;
-	u8_t src_id = signal_info.bit;
+	uint8_t xec_id = signal_info.xec_reg_idx;
+	uint8_t src_id = signal_info.bit;
 
 	if ((src_id >= ESPI_VWIRE_SRC_ID_MAX) ||
 	    (xec_id >= ESPI_SMVW_IDX_MAX) || (level == NULL)) {
@@ -454,7 +454,7 @@ static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt)
 {
 	int ret;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
-	u8_t err_mask = MCHP_ESPI_OOB_TX_STS_IBERR |
+	uint8_t err_mask = MCHP_ESPI_OOB_TX_STS_IBERR |
 			MCHP_ESPI_OOB_TX_STS_OVRUN |
 			MCHP_ESPI_OOB_TX_STS_BADREQ;
 
@@ -500,7 +500,7 @@ static int espi_xec_receive_oob(struct device *dev,
 				struct espi_oob_packet *pckt)
 {
 	int ret;
-	u8_t err_mask = MCHP_ESPI_OOB_RX_STS_IBERR |
+	uint8_t err_mask = MCHP_ESPI_OOB_RX_STS_IBERR |
 			MCHP_ESPI_OOB_RX_STS_OVRUN;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 
@@ -515,7 +515,7 @@ static int espi_xec_receive_oob(struct device *dev,
 	}
 
 	/* Check if buffer passed to driver can fit the received buffer */
-	u32_t rcvd_len = ESPI_OOB_REGS->RX_LEN & MCHP_ESPI_OOB_RX_LEN_MASK;
+	uint32_t rcvd_len = ESPI_OOB_REGS->RX_LEN & MCHP_ESPI_OOB_RX_LEN_MASK;
 
 	if (rcvd_len > pckt->len) {
 		LOG_ERR("space rcvd %d vs %d", rcvd_len, pckt->len);
@@ -533,7 +533,7 @@ static int espi_xec_flash_read(struct device *dev,
 {
 	int ret;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
-	u32_t err_mask = MCHP_ESPI_FC_STS_IBERR |
+	uint32_t err_mask = MCHP_ESPI_FC_STS_IBERR |
 			MCHP_ESPI_FC_STS_FAIL |
 			MCHP_ESPI_FC_STS_OVFL |
 			MCHP_ESPI_FC_STS_BADREQ;
@@ -553,7 +553,7 @@ static int espi_xec_flash_read(struct device *dev,
 	ESPI_FC_REGS->FL_ADDR_MSW = 0;
 	ESPI_FC_REGS->FL_ADDR_LSW = pckt->flash_addr;
 	ESPI_FC_REGS->MEM_ADDR_MSW = 0;
-	ESPI_FC_REGS->MEM_ADDR_LSW = (u32_t)&slave_mem[0];
+	ESPI_FC_REGS->MEM_ADDR_LSW = (uint32_t)&slave_mem[0];
 	ESPI_FC_REGS->XFR_LEN = pckt->len;
 	ESPI_FC_REGS->CTRL = MCHP_ESPI_FC_CTRL_FUNC(MCHP_ESPI_FC_CTRL_RD0);
 	ESPI_FC_REGS->CTRL |= MCHP_ESPI_FC_CTRL_START;
@@ -580,7 +580,7 @@ static int espi_xec_flash_write(struct device *dev,
 			       struct espi_flash_packet *pckt)
 {
 	int ret;
-	u32_t err_mask = MCHP_ESPI_FC_STS_IBERR |
+	uint32_t err_mask = MCHP_ESPI_FC_STS_IBERR |
 			MCHP_ESPI_FC_STS_OVRUN |
 			MCHP_ESPI_FC_STS_FAIL |
 			MCHP_ESPI_FC_STS_BADREQ;
@@ -604,7 +604,7 @@ static int espi_xec_flash_write(struct device *dev,
 	ESPI_FC_REGS->FL_ADDR_MSW = 0;
 	ESPI_FC_REGS->FL_ADDR_LSW = pckt->flash_addr;
 	ESPI_FC_REGS->MEM_ADDR_MSW = 0;
-	ESPI_FC_REGS->MEM_ADDR_LSW = (u32_t)&slave_mem[0];
+	ESPI_FC_REGS->MEM_ADDR_LSW = (uint32_t)&slave_mem[0];
 	ESPI_FC_REGS->XFR_LEN = pckt->len;
 	ESPI_FC_REGS->CTRL = MCHP_ESPI_FC_CTRL_FUNC(MCHP_ESPI_FC_CTRL_WR0);
 	ESPI_FC_REGS->CTRL |= MCHP_ESPI_FC_CTRL_START;
@@ -638,7 +638,7 @@ static int espi_xec_manage_callback(struct device *dev,
 static void send_slave_bootdone(struct device *dev)
 {
 	int ret;
-	u8_t boot_done;
+	uint8_t boot_done;
 
 	ret = espi_xec_receive_vwire(dev, ESPI_VWIRE_SIGNAL_SLV_BOOT_DONE,
 				     &boot_done);
@@ -659,8 +659,8 @@ static void espi_init_oob(struct device *dev)
 
 	ESPI_OOB_REGS->TX_ADDR_MSW = 0;
 	ESPI_OOB_REGS->RX_ADDR_MSW = 0;
-	ESPI_OOB_REGS->TX_ADDR_LSW = (u32_t)&slave_tx_mem[0];
-	ESPI_OOB_REGS->RX_ADDR_LSW = (u32_t)&slave_rx_mem[0];
+	ESPI_OOB_REGS->TX_ADDR_LSW = (uint32_t)&slave_tx_mem[0];
+	ESPI_OOB_REGS->RX_ADDR_LSW = (uint32_t)&slave_rx_mem[0];
 	ESPI_OOB_REGS->RX_LEN = 0x00FF0000;
 	ESPI_OOB_REGS->RX_CTRL |= MCHP_ESPI_OOB_RX_CTRL_AVAIL;
 
@@ -700,7 +700,7 @@ static void espi_bus_init(struct device *dev)
 
 static void espi_rst_isr(struct device *dev)
 {
-	u8_t rst_sts;
+	uint8_t rst_sts;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 	struct espi_event evt = { ESPI_BUS_RESET, 0, 0 };
 
@@ -788,7 +788,7 @@ static void configure_sirq(void)
 #endif
 }
 
-static void setup_espi_io_config(struct device *dev, u16_t host_address)
+static void setup_espi_io_config(struct device *dev, uint16_t host_address)
 {
 	ESPI_EIO_BAR_REGS->EC_BAR_IOC = (host_address << 16) |
 		MCHP_ESPI_IO_BAR_HOST_VALID;
@@ -804,7 +804,7 @@ static void setup_espi_io_config(struct device *dev, u16_t host_address)
 
 static void espi_pc_isr(struct device *dev)
 {
-	u32_t status = ESPI_PC_REGS->PC_STATUS;
+	uint32_t status = ESPI_PC_REGS->PC_STATUS;
 
 	if (status & MCHP_ESPI_PC_STS_EN_CHG) {
 		if (status & MCHP_ESPI_PC_STS_EN) {
@@ -822,7 +822,7 @@ static void espi_vwire_chanel_isr(struct device *dev)
 	struct espi_event evt = { .evt_type = ESPI_BUS_EVENT_CHANNEL_READY,
 				  .evt_details = 0,
 				  .evt_data = 0 };
-	u32_t status;
+	uint32_t status;
 
 	status = ESPI_IO_VW_REGS->VW_EN_STS;
 
@@ -842,7 +842,7 @@ static void espi_vwire_chanel_isr(struct device *dev)
 #ifdef CONFIG_ESPI_OOB_CHANNEL
 static void espi_oob_down_isr(struct device *dev)
 {
-	u32_t status;
+	uint32_t status;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 
 	status = ESPI_OOB_REGS->RX_STS;
@@ -858,7 +858,7 @@ static void espi_oob_down_isr(struct device *dev)
 
 static void espi_oob_up_isr(struct device *dev)
 {
-	u32_t status;
+	uint32_t status;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 
 	status = ESPI_OOB_REGS->TX_STS;
@@ -887,7 +887,7 @@ static void espi_oob_up_isr(struct device *dev)
 #ifdef CONFIG_ESPI_FLASH_CHANNEL
 static void espi_flash_isr(struct device *dev)
 {
-	u32_t status;
+	uint32_t status;
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 	struct espi_event evt = { ESPI_BUS_EVENT_CHANNEL_READY, 0, 0 };
 
@@ -922,7 +922,7 @@ static void vw_pltrst_isr(struct device *dev)
 	struct espi_event evt = { ESPI_BUS_EVENT_VWIRE_RECEIVED,
 		ESPI_VWIRE_SIGNAL_PLTRST, 0
 	};
-	u8_t status = 0;
+	uint8_t status = 0;
 
 	espi_xec_receive_vwire(dev, ESPI_VWIRE_SIGNAL_PLTRST, &status);
 	if (status) {
@@ -943,7 +943,7 @@ static void notify_system_state(struct device *dev,
 {
 	struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
 	struct espi_event evt = { ESPI_BUS_EVENT_VWIRE_RECEIVED, 0, 0 };
-	u8_t status = 0;
+	uint8_t status = 0;
 
 	espi_xec_receive_vwire(dev, signal, &status);
 	if (!status) {
@@ -958,7 +958,7 @@ static void notify_system_state(struct device *dev,
 static void notify_host_warning(struct device *dev,
 				enum espi_vwire_signal signal)
 {
-	u8_t status;
+	uint8_t status;
 
 	espi_xec_receive_vwire(dev, signal, &status);
 
@@ -1045,7 +1045,7 @@ static void ibf_kbc_isr(struct device *dev)
 	 * and the lower byte speficies if the host sent
 	 * a command or data. 1 = Command.
 	 */
-	u32_t isr_data = ((KBC_REGS->EC_DATA & 0xFF) << E8042_ISR_DATA_POS) |
+	uint32_t isr_data = ((KBC_REGS->EC_DATA & 0xFF) << E8042_ISR_DATA_POS) |
 				((KBC_REGS->EC_KBC_STS & MCHP_KBC_STS_CD) <<
 				 E8042_ISR_CMD_DATA_POS);
 
@@ -1095,7 +1095,7 @@ const struct espi_isr espi_bus_isr[] = {
 	{MCHP_ESPI_VW_EN_GIRQ_VAL, espi_vwire_chanel_isr},
 };
 
-u8_t vw_wires_int_en[] = {
+uint8_t vw_wires_int_en[] = {
 	ESPI_VWIRE_SIGNAL_SLP_S3,
 	ESPI_VWIRE_SIGNAL_SLP_S4,
 	ESPI_VWIRE_SIGNAL_SLP_S5,
@@ -1124,16 +1124,16 @@ const struct espi_isr peripherals_isr[] = {
 	{MCHP_PORT80_DEBUG1_GIRQ_VAL, port81_isr},
 };
 
-static u8_t bus_isr_cnt = sizeof(espi_bus_isr) / sizeof(struct espi_isr);
-static u8_t m2s_vwires_isr_cnt =
+static uint8_t bus_isr_cnt = sizeof(espi_bus_isr) / sizeof(struct espi_isr);
+static uint8_t m2s_vwires_isr_cnt =
 	sizeof(m2s_vwires_isr) / sizeof(struct espi_isr);
-static u8_t periph_isr_cnt = sizeof(peripherals_isr) / sizeof(struct espi_isr);
+static uint8_t periph_isr_cnt = sizeof(peripherals_isr) / sizeof(struct espi_isr);
 
 static void espi_xec_bus_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	const struct espi_xec_config *config = dev->config_info;
-	u32_t girq_result;
+	uint32_t girq_result;
 
 	girq_result = MCHP_GIRQ_RESULT(config->bus_girq_id);
 
@@ -1154,7 +1154,7 @@ static void espi_xec_vw_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	const struct espi_xec_config *config = dev->config_info;
-	u32_t girq_result;
+	uint32_t girq_result;
 
 	girq_result = MCHP_GIRQ_RESULT(config->vw_girq_id);
 
@@ -1175,7 +1175,7 @@ static void espi_xec_periph_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	const struct espi_xec_config *config = dev->config_info;
-	u32_t girq_result;
+	uint32_t girq_result;
 
 	girq_result = MCHP_GIRQ_RESULT(config->pc_girq_id);
 
@@ -1270,9 +1270,9 @@ static int espi_xec_init(struct device *dev)
 
 	/* Enable VWires interrupts */
 	for (int i = 0; i < sizeof(vw_wires_int_en); i++) {
-		u8_t signal = vw_wires_int_en[i];
+		uint8_t signal = vw_wires_int_en[i];
 		struct xec_signal signal_info = vw_tbl[signal];
-		u8_t xec_id = signal_info.xec_reg_idx;
+		uint8_t xec_id = signal_info.xec_reg_idx;
 		ESPI_MSVW_REG *reg = &(ESPI_M2S_VW_REGS->MSVW00) + xec_id;
 
 		mec_espi_msvw_irq_sel_set(reg, signal_info.bit,
diff --git a/drivers/ethernet/eth.h b/drivers/ethernet/eth.h
index 27c9d81a19..c0ad94c042 100644
--- a/drivers/ethernet/eth.h
+++ b/drivers/ethernet/eth.h
@@ -29,9 +29,9 @@
 	UTIL_AND(DT_NODE_HAS_PROP(node, local_mac_address),\
 			(!NODE_MAC_ADDR_NULL(node)))
 
-static inline void gen_random_mac(u8_t *mac_addr, u8_t b0, u8_t b1, u8_t b2)
+static inline void gen_random_mac(uint8_t *mac_addr, uint8_t b0, uint8_t b1, uint8_t b2)
 {
-	u32_t entropy;
+	uint32_t entropy;
 
 	entropy = sys_rand32_get();
 
diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c
index 2ad6f2e18e..44ca416a75 100644
--- a/drivers/ethernet/eth_e1000.c
+++ b/drivers/ethernet/eth_e1000.c
@@ -111,7 +111,7 @@ static struct net_pkt *e1000_rx(struct e1000_dev *dev)
 		goto out;
 	}
 
-	buf = INT_TO_POINTER((u32_t)dev->rx.addr);
+	buf = INT_TO_POINTER((uint32_t)dev->rx.addr);
 	len = dev->rx.len - 4;
 
 	if (len <= 0) {
@@ -141,7 +141,7 @@ out:
 static void e1000_isr(struct device *device)
 {
 	struct e1000_dev *dev = device->driver_data;
-	u32_t icr = ior32(dev, ICR); /* Cleared upon read */
+	uint32_t icr = ior32(dev, ICR); /* Cleared upon read */
 
 	icr &= ~(ICR_TXDW | ICR_TXQE);
 
@@ -187,13 +187,13 @@ static struct device DEVICE_NAME_GET(eth_e1000);
 static void e1000_init(struct net_if *iface)
 {
 	struct e1000_dev *dev = net_if_get_device(iface)->driver_data;
-	u32_t ral, rah;
+	uint32_t ral, rah;
 
 	dev->iface = iface;
 
 	/* Setup TX descriptor */
 
-	iow32(dev, TDBAL, (u32_t) &dev->tx);
+	iow32(dev, TDBAL, (uint32_t) &dev->tx);
 	iow32(dev, TDBAH, 0);
 	iow32(dev, TDLEN, 1*16);
 
@@ -207,7 +207,7 @@ static void e1000_init(struct net_if *iface)
 	dev->rx.addr = POINTER_TO_INT(dev->rxb);
 	dev->rx.len = sizeof(dev->rxb);
 
-	iow32(dev, RDBAL, (u32_t) &dev->rx);
+	iow32(dev, RDBAL, (uint32_t) &dev->rx);
 	iow32(dev, RDBAH, 0);
 	iow32(dev, RDLEN, 1*16);
 
diff --git a/drivers/ethernet/eth_e1000_priv.h b/drivers/ethernet/eth_e1000_priv.h
index e3824e7efe..9de0a7dde3 100644
--- a/drivers/ethernet/eth_e1000_priv.h
+++ b/drivers/ethernet/eth_e1000_priv.h
@@ -55,33 +55,33 @@ enum e1000_reg_t {
 
 /* Legacy TX Descriptor */
 struct e1000_tx {
-	u64_t addr;
-	u16_t len;
-	u8_t  cso;
-	u8_t  cmd;
-	u8_t  sta;
-	u8_t  css;
-	u16_t special;
+	uint64_t addr;
+	uint16_t len;
+	uint8_t  cso;
+	uint8_t  cmd;
+	uint8_t  sta;
+	uint8_t  css;
+	uint16_t special;
 };
 
 /* Legacy RX Descriptor */
 struct e1000_rx {
-	u64_t addr;
-	u16_t len;
-	u16_t csum;
-	u8_t  sta;
-	u8_t  err;
-	u16_t special;
+	uint64_t addr;
+	uint16_t len;
+	uint16_t csum;
+	uint8_t  sta;
+	uint8_t  err;
+	uint16_t special;
 };
 
 struct e1000_dev {
 	volatile struct e1000_tx tx __aligned(16);
 	volatile struct e1000_rx rx __aligned(16);
-	u32_t address;
+	uint32_t address;
 	struct net_if *iface;
-	u8_t mac[ETH_ALEN];
-	u8_t txb[NET_ETH_MTU];
-	u8_t rxb[NET_ETH_MTU];
+	uint8_t mac[ETH_ALEN];
+	uint8_t txb[NET_ETH_MTU];
+	uint8_t rxb[NET_ETH_MTU];
 };
 
 static const char *e1000_reg_to_string(enum e1000_reg_t r)
@@ -94,7 +94,7 @@ static const char *e1000_reg_to_string(enum e1000_reg_t r)
 
 #define ior32(_dev, _reg)						\
 ({									\
-	u32_t val = sys_read32((_dev)->address + (_reg));		\
+	uint32_t val = sys_read32((_dev)->address + (_reg));		\
 	LOG_DBG("ior32 %s 0x%08x", e1000_reg_to_string(_reg), val); 	\
 	val;								\
 })
diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c
index 5c781683e4..947f3585b5 100644
--- a/drivers/ethernet/eth_enc28j60.c
+++ b/drivers/ethernet/eth_enc28j60.c
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 static int eth_enc28j60_soft_reset(struct device *dev)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[2] = { ENC28J60_SPI_SC, 0xFF };
+	uint8_t buf[2] = { ENC28J60_SPI_SC, 0xFF };
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 1,
@@ -44,10 +44,10 @@ static int eth_enc28j60_soft_reset(struct device *dev)
 	return spi_write(context->spi, &context->spi_cfg, &tx);
 }
 
-static void eth_enc28j60_set_bank(struct device *dev, u16_t reg_addr)
+static void eth_enc28j60_set_bank(struct device *dev, uint16_t reg_addr)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[2];
+	uint8_t buf[2];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -78,11 +78,11 @@ static void eth_enc28j60_set_bank(struct device *dev, u16_t reg_addr)
 	}
 }
 
-static void eth_enc28j60_write_reg(struct device *dev, u16_t reg_addr,
-				   u8_t value)
+static void eth_enc28j60_write_reg(struct device *dev, uint16_t reg_addr,
+				   uint8_t value)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[2];
+	uint8_t buf[2];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -98,11 +98,11 @@ static void eth_enc28j60_write_reg(struct device *dev, u16_t reg_addr,
 	spi_write(context->spi, &context->spi_cfg, &tx);
 }
 
-static void eth_enc28j60_read_reg(struct device *dev, u16_t reg_addr,
-				  u8_t *value)
+static void eth_enc28j60_read_reg(struct device *dev, uint16_t reg_addr,
+				  uint8_t *value)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[3];
+	uint8_t buf[3];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -118,7 +118,7 @@ static void eth_enc28j60_read_reg(struct device *dev, u16_t reg_addr,
 		.buffers = &rx_buf,
 		.count = 1
 	};
-	u8_t rx_size = 2U;
+	uint8_t rx_size = 2U;
 
 	if (reg_addr & 0xF000) {
 		rx_size = 3U;
@@ -137,11 +137,11 @@ static void eth_enc28j60_read_reg(struct device *dev, u16_t reg_addr,
 	}
 }
 
-static void eth_enc28j60_set_eth_reg(struct device *dev, u16_t reg_addr,
-				     u8_t value)
+static void eth_enc28j60_set_eth_reg(struct device *dev, uint16_t reg_addr,
+				     uint8_t value)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[2];
+	uint8_t buf[2];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -158,11 +158,11 @@ static void eth_enc28j60_set_eth_reg(struct device *dev, u16_t reg_addr,
 }
 
 
-static void eth_enc28j60_clear_eth_reg(struct device *dev, u16_t reg_addr,
-				       u8_t value)
+static void eth_enc28j60_clear_eth_reg(struct device *dev, uint16_t reg_addr,
+				       uint8_t value)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[2];
+	uint8_t buf[2];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -178,11 +178,11 @@ static void eth_enc28j60_clear_eth_reg(struct device *dev, u16_t reg_addr,
 	spi_write(context->spi, &context->spi_cfg, &tx);
 }
 
-static void eth_enc28j60_write_mem(struct device *dev, u8_t *data_buffer,
-				   u16_t buf_len)
+static void eth_enc28j60_write_mem(struct device *dev, uint8_t *data_buffer,
+				   uint16_t buf_len)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[1] = { ENC28J60_SPI_WBM };
+	uint8_t buf[1] = { ENC28J60_SPI_WBM };
 	struct spi_buf tx_buf[2] = {
 		{
 			.buf = buf,
@@ -193,8 +193,8 @@ static void eth_enc28j60_write_mem(struct device *dev, u8_t *data_buffer,
 		.buffers = tx_buf,
 		.count = 2
 	};
-	u16_t num_segments;
-	u16_t num_remaining;
+	uint16_t num_segments;
+	uint16_t num_remaining;
 	int i;
 
 	num_segments = buf_len / MAX_BUFFER_LENGTH;
@@ -220,11 +220,11 @@ static void eth_enc28j60_write_mem(struct device *dev, u8_t *data_buffer,
 	}
 }
 
-static void eth_enc28j60_read_mem(struct device *dev, u8_t *data_buffer,
-				  u16_t buf_len)
+static void eth_enc28j60_read_mem(struct device *dev, uint8_t *data_buffer,
+				  uint16_t buf_len)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t buf[1] = { ENC28J60_SPI_RBM };
+	uint8_t buf[1] = { ENC28J60_SPI_RBM };
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 1
@@ -243,8 +243,8 @@ static void eth_enc28j60_read_mem(struct device *dev, u8_t *data_buffer,
 		.buffers = rx_buf,
 		.count = 2
 	};
-	u16_t num_segments;
-	u16_t num_remaining;
+	uint16_t num_segments;
+	uint16_t num_remaining;
 	int i;
 
 	num_segments = buf_len / MAX_BUFFER_LENGTH;
@@ -271,10 +271,10 @@ static void eth_enc28j60_read_mem(struct device *dev, u8_t *data_buffer,
 	}
 }
 
-static void eth_enc28j60_write_phy(struct device *dev, u16_t reg_addr,
-				   s16_t data)
+static void eth_enc28j60_write_phy(struct device *dev, uint16_t reg_addr,
+				   int16_t data)
 {
-	u8_t data_mistat;
+	uint8_t data_mistat;
 
 	eth_enc28j60_set_bank(dev, ENC28J60_REG_MIREGADR);
 	eth_enc28j60_write_reg(dev, ENC28J60_REG_MIREGADR, reg_addr);
@@ -292,7 +292,7 @@ static void eth_enc28j60_write_phy(struct device *dev, u16_t reg_addr,
 
 static void eth_enc28j60_gpio_callback(struct device *dev,
 				       struct gpio_callback *cb,
-				       u32_t pins)
+				       uint32_t pins)
 {
 	struct eth_enc28j60_runtime *context =
 		CONTAINER_OF(cb, struct eth_enc28j60_runtime, gpio_cb);
@@ -302,7 +302,7 @@ static void eth_enc28j60_gpio_callback(struct device *dev,
 
 static void eth_enc28j60_init_buffers(struct device *dev)
 {
-	u8_t data_estat;
+	uint8_t data_estat;
 
 	/* Reception buffers initialization */
 	eth_enc28j60_set_bank(dev, ENC28J60_REG_ERXSTL);
@@ -351,7 +351,7 @@ static void eth_enc28j60_init_mac(struct device *dev)
 {
 	const struct eth_enc28j60_config *config = dev->config_info;
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u8_t data_macon;
+	uint8_t data_macon;
 
 	eth_enc28j60_set_bank(dev, ENC28J60_REG_MACON1);
 
@@ -413,7 +413,7 @@ static void eth_enc28j60_init_phy(struct device *dev)
 }
 
 static struct net_if *get_iface(struct eth_enc28j60_runtime *ctx,
-				u16_t vlan_tag)
+				uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -434,12 +434,12 @@ static struct net_if *get_iface(struct eth_enc28j60_runtime *ctx,
 static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u16_t tx_bufaddr = ENC28J60_TXSTART;
-	u16_t len = net_pkt_get_len(pkt);
-	u8_t per_packet_control;
-	u16_t tx_bufaddr_end;
+	uint16_t tx_bufaddr = ENC28J60_TXSTART;
+	uint16_t len = net_pkt_get_len(pkt);
+	uint8_t per_packet_control;
+	uint16_t tx_bufaddr_end;
 	struct net_buf *frag;
-	u8_t tx_end;
+	uint8_t tx_end;
 
 	LOG_DBG("pkt %p (len %u)", pkt, len);
 
@@ -504,12 +504,12 @@ static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt)
 	return 0;
 }
 
-static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag)
+static int eth_enc28j60_rx(struct device *dev, uint16_t *vlan_tag)
 {
 	const struct eth_enc28j60_config *config = dev->config_info;
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u16_t lengthfr;
-	u8_t counter;
+	uint16_t lengthfr;
+	uint8_t counter;
 
 	/* Errata 6. The Receive Packet Pending Interrupt Flag (EIR.PKTIF)
 	 * does not reliably/accurately report the status of pending packet.
@@ -525,12 +525,12 @@ static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag)
 
 	do {
 		struct net_buf *pkt_buf = NULL;
-		u16_t frm_len = 0U;
-		u8_t info[RSV_SIZE];
+		uint16_t frm_len = 0U;
+		uint8_t info[RSV_SIZE];
 		struct net_pkt *pkt;
-		u16_t next_packet;
-		u8_t rdptl = 0U;
-		u8_t rdpth = 0U;
+		uint16_t next_packet;
+		uint8_t rdptl = 0U;
+		uint8_t rdpth = 0U;
 
 		/* remove read fifo address to packet header address */
 		eth_enc28j60_set_bank(dev, ENC28J60_REG_ERXRDPTL);
@@ -541,7 +541,7 @@ static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag)
 
 		/* Read address for next packet */
 		eth_enc28j60_read_mem(dev, info, 2);
-		next_packet = info[0] | (u16_t)info[1] << 8;
+		next_packet = info[0] | (uint16_t)info[1] << 8;
 
 		/* Errata 14. Even values in ERXRDPT
 		 * may corrupt receive buffer.
@@ -576,7 +576,7 @@ static int eth_enc28j60_rx(struct device *dev, u16_t *vlan_tag)
 
 		do {
 			size_t frag_len;
-			u8_t *data_ptr;
+			uint8_t *data_ptr;
 			size_t spi_frame_len;
 
 			data_ptr = pkt_buf->data;
@@ -660,8 +660,8 @@ done:
 static void eth_enc28j60_rx_thread(struct device *dev)
 {
 	struct eth_enc28j60_runtime *context = dev->driver_data;
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
-	u8_t int_stat;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint8_t int_stat;
 
 	while (true) {
 		k_sem_take(&context->int_sem, K_FOREVER);
diff --git a/drivers/ethernet/eth_enc28j60_priv.h b/drivers/ethernet/eth_enc28j60_priv.h
index b90d03b7e4..14a73eeea4 100644
--- a/drivers/ethernet/eth_enc28j60_priv.h
+++ b/drivers/ethernet/eth_enc28j60_priv.h
@@ -215,15 +215,15 @@
 
 struct eth_enc28j60_config {
 	const char *gpio_port;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 	const char *spi_port;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	const char *spi_cs_port;
-	u32_t spi_freq;
-	u8_t spi_slave;
-	u8_t full_duplex;
-	s32_t timeout;
+	uint32_t spi_freq;
+	uint8_t spi_slave;
+	uint8_t full_duplex;
+	int32_t timeout;
 };
 
 struct eth_enc28j60_runtime {
@@ -231,7 +231,7 @@ struct eth_enc28j60_runtime {
 	K_THREAD_STACK_MEMBER(thread_stack,
 			      CONFIG_ETH_ENC28J60_RX_THREAD_STACK_SIZE);
 	struct k_thread thread;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 	struct device *gpio;
 	struct device *spi;
 	struct spi_cs_control spi_cs;
diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c
index 88834d1619..a84f51ce3a 100644
--- a/drivers/ethernet/eth_enc424j600.c
+++ b/drivers/ethernet/eth_enc424j600.c
@@ -23,10 +23,10 @@
 
 LOG_MODULE_REGISTER(ethdrv, CONFIG_ETHERNET_LOG_LEVEL);
 
-static void enc424j600_write_sbc(struct device *dev, u8_t cmd)
+static void enc424j600_write_sbc(struct device *dev, uint8_t cmd)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[2] = { cmd, 0xFF };
+	uint8_t buf[2] = { cmd, 0xFF };
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 1,
@@ -39,11 +39,11 @@ static void enc424j600_write_sbc(struct device *dev, u8_t cmd)
 	spi_write(context->spi, &context->spi_cfg, &tx);
 }
 
-static void enc424j600_write_sfru(struct device *dev, u8_t addr,
-				      u16_t value)
+static void enc424j600_write_sfru(struct device *dev, uint8_t addr,
+				      uint16_t value)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[4];
+	uint8_t buf[4];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = sizeof(buf)
@@ -61,11 +61,11 @@ static void enc424j600_write_sfru(struct device *dev, u8_t addr,
 	spi_write(context->spi, &context->spi_cfg, &tx);
 }
 
-static void enc424j600_read_sfru(struct device *dev, u8_t addr,
-				     u16_t *value)
+static void enc424j600_read_sfru(struct device *dev, uint8_t addr,
+				     uint16_t *value)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[4];
+	uint8_t buf[4];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 2
@@ -87,18 +87,18 @@ static void enc424j600_read_sfru(struct device *dev, u8_t addr,
 	buf[1] = addr;
 
 	if (!spi_transceive(context->spi, &context->spi_cfg, &tx, &rx)) {
-		*value = ((u16_t)buf[3] << 8 | buf[2]);
+		*value = ((uint16_t)buf[3] << 8 | buf[2]);
 	} else {
 		LOG_DBG("Failure while reading register 0x%02x", addr);
 		*value = 0U;
 	}
 }
 
-static void enc424j600_modify_sfru(struct device *dev, u8_t opcode,
-				   u16_t addr, u16_t value)
+static void enc424j600_modify_sfru(struct device *dev, uint8_t opcode,
+				   uint16_t addr, uint16_t value)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[4];
+	uint8_t buf[4];
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = sizeof(buf)
@@ -123,9 +123,9 @@ static void enc424j600_modify_sfru(struct device *dev, u8_t opcode,
 	enc424j600_modify_sfru(dev, ENC424J600_NBC_BFCU, addr, value)
 
 
-static void enc424j600_write_phy(struct device *dev, u16_t addr, u16_t data)
+static void enc424j600_write_phy(struct device *dev, uint16_t addr, uint16_t data)
 {
-	u16_t mistat;
+	uint16_t mistat;
 
 	enc424j600_write_sfru(dev, ENC424J600_SFR2_MIREGADRL, addr);
 	enc424j600_write_sfru(dev, ENC424J600_SFR3_MIWRL, data);
@@ -136,9 +136,9 @@ static void enc424j600_write_phy(struct device *dev, u16_t addr, u16_t data)
 	} while ((mistat & ENC424J600_MISTAT_BUSY));
 }
 
-static void enc424j600_read_phy(struct device *dev, u16_t addr, u16_t *data)
+static void enc424j600_read_phy(struct device *dev, uint16_t addr, uint16_t *data)
 {
-	u16_t mistat;
+	uint16_t mistat;
 
 	enc424j600_write_sfru(dev, ENC424J600_SFR2_MIREGADRL, addr);
 	enc424j600_write_sfru(dev, ENC424J600_SFR2_MICMDL,
@@ -153,11 +153,11 @@ static void enc424j600_read_phy(struct device *dev, u16_t addr, u16_t *data)
 	enc424j600_read_sfru(dev, ENC424J600_SFR3_MIRDL, data);
 }
 
-static void enc424j600_write_mem(struct device *dev, u8_t opcode,
-				 u8_t *data_buffer, u16_t buf_len)
+static void enc424j600_write_mem(struct device *dev, uint8_t opcode,
+				 uint8_t *data_buffer, uint16_t buf_len)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[1] = { opcode };
+	uint8_t buf[1] = { opcode };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buf,
@@ -179,11 +179,11 @@ static void enc424j600_write_mem(struct device *dev, u8_t opcode,
 	}
 }
 
-static void enc424j600_read_mem(struct device *dev, u8_t opcode,
-				u8_t *data_buffer, u16_t buf_len)
+static void enc424j600_read_mem(struct device *dev, uint8_t opcode,
+				uint8_t *data_buffer, uint16_t buf_len)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t buf[1] = { opcode };
+	uint8_t buf[1] = { opcode };
 	const struct spi_buf tx_buf = {
 		.buf = buf,
 		.len = 1
@@ -215,7 +215,7 @@ static void enc424j600_read_mem(struct device *dev, u8_t opcode,
 
 static void enc424j600_gpio_callback(struct device *dev,
 				       struct gpio_callback *cb,
-				       u32_t pins)
+				       uint32_t pins)
 {
 	struct enc424j600_runtime *context =
 		CONTAINER_OF(cb, struct enc424j600_runtime, gpio_cb);
@@ -225,7 +225,7 @@ static void enc424j600_gpio_callback(struct device *dev,
 
 static void enc424j600_init_filters(struct device *dev)
 {
-	u16_t tmp;
+	uint16_t tmp;
 
 	enc424j600_write_sfru(dev, ENC424J600_SFR1_ERXFCONL,
 			      ENC424J600_ERXFCON_CRCEN |
@@ -241,7 +241,7 @@ static void enc424j600_init_filters(struct device *dev)
 
 static void enc424j600_init_phy(struct device *dev)
 {
-	u16_t tmp;
+	uint16_t tmp;
 
 	enc424j600_write_phy(dev, ENC424J600_PSFR_PHANA,
 			     ENC424J600_PHANA_ADPAUS_SYMMETRIC_ONLY |
@@ -263,8 +263,8 @@ static void enc424j600_init_phy(struct device *dev)
 
 static void enc424j600_setup_mac(struct device *dev)
 {
-	u16_t tmp;
-	u16_t macon2;
+	uint16_t tmp;
+	uint16_t macon2;
 
 	if (CONFIG_ETHERNET_LOG_LEVEL == LOG_LEVEL_DBG) {
 		enc424j600_read_phy(dev, ENC424J600_PSFR_PHANLPA, &tmp);
@@ -305,9 +305,9 @@ static void enc424j600_setup_mac(struct device *dev)
 static int enc424j600_tx(struct device *dev, struct net_pkt *pkt)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u16_t len = net_pkt_get_len(pkt);
+	uint16_t len = net_pkt_get_len(pkt);
 	struct net_buf *frag;
-	u16_t tmp;
+	uint16_t tmp;
 
 	LOG_DBG("pkt %p (len %u)", pkt, len);
 
@@ -345,12 +345,12 @@ static int enc424j600_rx(struct device *dev)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
 	const struct enc424j600_config *config = dev->config_info;
-	u8_t info[ENC424J600_RSV_SIZE + ENC424J600_PTR_NXP_PKT_SIZE];
+	uint8_t info[ENC424J600_RSV_SIZE + ENC424J600_PTR_NXP_PKT_SIZE];
 	struct net_buf *pkt_buf = NULL;
 	struct net_pkt *pkt;
-	u16_t frm_len = 0U;
-	u32_t status;
-	u16_t tmp;
+	uint16_t frm_len = 0U;
+	uint32_t status;
+	uint16_t tmp;
 
 	k_sem_take(&context->tx_rx_sem, K_FOREVER);
 
@@ -396,7 +396,7 @@ static int enc424j600_rx(struct device *dev)
 
 	do {
 		size_t frag_len;
-		u8_t *data_ptr;
+		uint8_t *data_ptr;
 		size_t spi_frame_len;
 
 		data_ptr = pkt_buf->data;
@@ -442,9 +442,9 @@ done:
 static void enc424j600_rx_thread(struct device *dev)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u16_t eir;
-	u16_t estat;
-	u8_t counter;
+	uint16_t eir;
+	uint16_t estat;
+	uint8_t counter;
 
 	while (true) {
 		k_sem_take(&context->int_sem, K_FOREVER);
@@ -456,13 +456,13 @@ static void enc424j600_rx_thread(struct device *dev)
 		LOG_DBG("ESTAT: 0x%04x", estat);
 
 		if (eir & ENC424J600_EIR_PKTIF) {
-			counter = (u8_t)estat;
+			counter = (uint8_t)estat;
 			while (counter) {
 				enc424j600_rx(dev);
 				enc424j600_read_sfru(dev,
 						     ENC424J600_SFRX_ESTATL,
 						     &estat);
-				counter = (u8_t)estat;
+				counter = (uint8_t)estat;
 				LOG_DBG("ESTAT: 0x%04x", estat);
 			}
 			goto done;
@@ -518,7 +518,7 @@ static void enc424j600_iface_init(struct net_if *iface)
 static int enc424j600_start_device(struct device *dev)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u16_t tmp;
+	uint16_t tmp;
 
 	if (!context->suspended) {
 		LOG_INF("Not suspended");
@@ -548,7 +548,7 @@ static int enc424j600_start_device(struct device *dev)
 static int enc424j600_stop_device(struct device *dev)
 {
 	struct enc424j600_runtime *context = dev->driver_data;
-	u16_t tmp;
+	uint16_t tmp;
 
 	if (context->suspended) {
 		LOG_WRN("Already suspended");
@@ -598,8 +598,8 @@ static int enc424j600_init(struct device *dev)
 {
 	const struct enc424j600_config *config = dev->config_info;
 	struct enc424j600_runtime *context = dev->driver_data;
-	u8_t retries = ENC424J600_DEFAULT_NUMOF_RETRIES;
-	u16_t tmp;
+	uint8_t retries = ENC424J600_DEFAULT_NUMOF_RETRIES;
+	uint16_t tmp;
 
 	/* SPI config */
 	context->spi_cfg.operation = SPI_WORD_SET(8);
diff --git a/drivers/ethernet/eth_enc424j600_priv.h b/drivers/ethernet/eth_enc424j600_priv.h
index ee8b48f6f4..cf7fa4ec39 100644
--- a/drivers/ethernet/eth_enc424j600_priv.h
+++ b/drivers/ethernet/eth_enc424j600_priv.h
@@ -274,15 +274,15 @@
 
 struct enc424j600_config {
 	const char *gpio_port;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 	const char *spi_port;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	const char *spi_cs_port;
-	u32_t spi_freq;
-	u8_t spi_slave;
-	u8_t full_duplex;
-	s32_t timeout;
+	uint32_t spi_freq;
+	uint8_t spi_slave;
+	uint8_t full_duplex;
+	int32_t timeout;
 };
 
 struct enc424j600_runtime {
@@ -292,7 +292,7 @@ struct enc424j600_runtime {
 			      CONFIG_ETH_ENC424J600_RX_THREAD_STACK_SIZE);
 
 	struct k_thread thread;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 	struct device *gpio;
 	struct device *spi;
 	struct spi_cs_control spi_cs;
@@ -300,7 +300,7 @@ struct enc424j600_runtime {
 	struct gpio_callback gpio_cb;
 	struct k_sem tx_rx_sem;
 	struct k_sem int_sem;
-	u16_t next_pkt_ptr;
+	uint16_t next_pkt_ptr;
 	bool suspended : 1;
 	bool iface_initialized : 1;
 };
diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c
index 39098b849a..9ba1df7826 100644
--- a/drivers/ethernet/eth_gecko.c
+++ b/drivers/ethernet/eth_gecko.c
@@ -31,21 +31,21 @@ LOG_MODULE_REGISTER(eth_gecko, CONFIG_ETHERNET_LOG_LEVEL);
 
 #include "eth.h"
 
-static u8_t dma_tx_buffer[ETH_TX_BUF_COUNT][ETH_TX_BUF_SIZE]
+static uint8_t dma_tx_buffer[ETH_TX_BUF_COUNT][ETH_TX_BUF_SIZE]
 __aligned(ETH_BUF_ALIGNMENT);
-static u8_t dma_rx_buffer[ETH_RX_BUF_COUNT][ETH_RX_BUF_SIZE]
+static uint8_t dma_rx_buffer[ETH_RX_BUF_COUNT][ETH_RX_BUF_SIZE]
 __aligned(ETH_BUF_ALIGNMENT);
 static struct eth_buf_desc dma_tx_desc_tab[ETH_TX_BUF_COUNT]
 __aligned(ETH_DESC_ALIGNMENT);
 static struct eth_buf_desc dma_rx_desc_tab[ETH_RX_BUF_COUNT]
 __aligned(ETH_DESC_ALIGNMENT);
-static u32_t tx_buf_idx;
-static u32_t rx_buf_idx;
+static uint32_t tx_buf_idx;
+static uint32_t rx_buf_idx;
 
 
-static void link_configure(ETH_TypeDef *eth, u32_t flags)
+static void link_configure(ETH_TypeDef *eth, uint32_t flags)
 {
-	u32_t val;
+	uint32_t val;
 
 	__ASSERT_NO_MSG(eth != NULL);
 
@@ -67,7 +67,7 @@ static void eth_gecko_setup_mac(struct device *dev)
 {
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
-	u32_t link_status;
+	uint32_t link_status;
 	int result;
 
 	/* PHY auto-negotiate link parameters */
@@ -88,12 +88,12 @@ static void eth_gecko_setup_mac(struct device *dev)
 
 static void eth_init_tx_buf_desc(void)
 {
-	u32_t address;
+	uint32_t address;
 	int i;
 
 	/* Initialize TX buffer descriptors */
 	for (i = 0; i < ETH_TX_BUF_COUNT; i++) {
-		address = (u32_t) dma_tx_buffer[i];
+		address = (uint32_t) dma_tx_buffer[i];
 		dma_tx_desc_tab[i].address = address;
 		dma_tx_desc_tab[i].status = ETH_TX_USED;
 	}
@@ -105,11 +105,11 @@ static void eth_init_tx_buf_desc(void)
 
 static void eth_init_rx_buf_desc(void)
 {
-	u32_t address;
+	uint32_t address;
 	int i;
 
 	for (i = 0; i < ETH_RX_BUF_COUNT; i++) {
-		address = (u32_t) dma_rx_buffer[i];
+		address = (uint32_t) dma_rx_buffer[i];
 		dma_rx_desc_tab[i].address = address & ETH_RX_ADDRESS;
 		dma_rx_desc_tab[i].status = 0;
 	}
@@ -128,7 +128,7 @@ static void rx_error_handler(ETH_TypeDef *eth)
 
 	/* Reset RX buffer descriptor list */
 	eth_init_rx_buf_desc();
-	eth->RXQPTR = (u32_t)dma_rx_desc_tab;
+	eth->RXQPTR = (uint32_t)dma_rx_desc_tab;
 
 	/* Restart reception */
 	ETH_RX_ENABLE(eth);
@@ -140,9 +140,9 @@ static struct net_pkt *frame_get(struct device *dev)
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
 	struct net_pkt *rx_frame = NULL;
-	u16_t frag_len, total_len;
-	u32_t sofIdx, eofIdx;
-	u32_t i, j;
+	uint16_t frag_len, total_len;
+	uint32_t sofIdx, eofIdx;
+	uint32_t i, j;
 
 	__ASSERT_NO_MSG(dev != NULL);
 	__ASSERT_NO_MSG(dev_data != NULL);
@@ -197,7 +197,7 @@ static struct net_pkt *frame_get(struct device *dev)
 			LOG_ERR("Failed to obtain RX buffer");
 			ETH_RX_DISABLE(eth);
 			eth_init_rx_buf_desc();
-			eth->RXQPTR = (u32_t)dma_rx_desc_tab;
+			eth->RXQPTR = (uint32_t)dma_rx_desc_tab;
 			ETH_RX_ENABLE(eth);
 			return rx_frame;
 		}
@@ -265,8 +265,8 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 	struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev);
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
-	u16_t total_len;
-	u8_t *dma_buffer;
+	uint16_t total_len;
+	uint8_t *dma_buffer;
 	int res = 0;
 
 	__ASSERT_NO_MSG(dev != NULL);
@@ -297,7 +297,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 		goto error;
 	}
 
-	dma_buffer = (u8_t *)dma_tx_desc_tab[tx_buf_idx].address;
+	dma_buffer = (uint8_t *)dma_tx_desc_tab[tx_buf_idx].address;
 	if (net_pkt_read(pkt, dma_buffer, total_len)) {
 		LOG_ERR("Failed to read packet into buffer");
 		res = -EIO;
@@ -373,13 +373,13 @@ static void eth_isr(void *arg)
 	struct eth_gecko_dev_data *const dev_data = DEV_DATA(dev);
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
-	u32_t int_clr = 0;
-	u32_t int_stat = eth->IFCR;
-	u32_t tx_irq_mask = (ETH_IENS_TXCMPLT | ETH_IENS_TXUNDERRUN |
+	uint32_t int_clr = 0;
+	uint32_t int_stat = eth->IFCR;
+	uint32_t tx_irq_mask = (ETH_IENS_TXCMPLT | ETH_IENS_TXUNDERRUN |
 				ETH_IENS_RTRYLMTORLATECOL |
 				ETH_IENS_TXUSEDBITREAD |
 				ETH_IENS_AMBAERR);
-	u32_t rx_irq_mask = (ETH_IENS_RXCMPLT | ETH_IENS_RXUSEDBITREAD);
+	uint32_t rx_irq_mask = (ETH_IENS_RXCMPLT | ETH_IENS_RXUSEDBITREAD);
 
 	__ASSERT_NO_MSG(arg != NULL);
 	__ASSERT_NO_MSG(dev_data != NULL);
@@ -433,7 +433,7 @@ static void eth_init_pins(struct device *dev)
 {
 	const struct eth_gecko_dev_cfg *const cfg = DEV_CFG(dev);
 	ETH_TypeDef *eth = cfg->regs;
-	u32_t idx;
+	uint32_t idx;
 
 	__ASSERT_NO_MSG(dev != NULL);
 	__ASSERT_NO_MSG(cfg != NULL);
@@ -488,7 +488,7 @@ static int eth_init(struct device *dev)
 	return 0;
 }
 
-static void generate_mac(u8_t mac_addr[6])
+static void generate_mac(uint8_t mac_addr[6])
 {
 #if DT_INST_PROP(0, zephyr_random_mac_address)
 	gen_random_mac(mac_addr, SILABS_OUI_B0, SILABS_OUI_B1, SILABS_OUI_B2);
@@ -555,8 +555,8 @@ static void eth_iface_init(struct net_if *iface)
 	eth_init_rx_buf_desc();
 
 	/* Point to locations of TX/RX DMA descriptor lists */
-	eth->TXQPTR = (u32_t)dma_tx_desc_tab;
-	eth->RXQPTR = (u32_t)dma_rx_desc_tab;
+	eth->TXQPTR = (uint32_t)dma_tx_desc_tab;
+	eth->RXQPTR = (uint32_t)dma_rx_desc_tab;
 
 	/* DMA RX size configuration */
 	eth->DMACFG = (eth->DMACFG & ~_ETH_DMACFG_RXBUFSIZE_MASK) |
diff --git a/drivers/ethernet/eth_gecko_priv.h b/drivers/ethernet/eth_gecko_priv.h
index 56cea19ba1..1f35bc343f 100644
--- a/drivers/ethernet/eth_gecko_priv.h
+++ b/drivers/ethernet/eth_gecko_priv.h
@@ -63,8 +63,8 @@
 #define ETH_TX_DISABLE(base)  (base->NETWORKCTRL &= ~ETH_NETWORKCTRL_ENBTX)
 
 struct eth_buf_desc {
-	u32_t address;
-	u32_t status;
+	uint32_t address;
+	uint32_t status;
 };
 
 struct eth_gecko_pin_list {
@@ -76,7 +76,7 @@ struct eth_gecko_pin_list {
 struct eth_gecko_dev_cfg {
 	ETH_TypeDef *regs;
 	const struct eth_gecko_pin_list *pin_list;
-	u32_t pin_list_size;
+	uint32_t pin_list_size;
 	void (*config_func)(void);
 	struct phy_gecko_dev phy;
 };
@@ -84,7 +84,7 @@ struct eth_gecko_dev_cfg {
 /* Device run time data */
 struct eth_gecko_dev_data {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct k_sem tx_sem;
 	struct k_sem rx_sem;
 
diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c
index 34ac2b9e5e..d00bf427b3 100644
--- a/drivers/ethernet/eth_liteeth.c
+++ b/drivers/ethernet/eth_liteeth.c
@@ -59,13 +59,13 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 struct eth_liteeth_dev_data {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
-	u8_t txslot;
-	u8_t rxslot;
+	uint8_t txslot;
+	uint8_t rxslot;
 
-	u8_t *tx_buf[2];
-	u8_t *rx_buf[2];
+	uint8_t *tx_buf[2];
+	uint8_t *rx_buf[2];
 };
 
 struct eth_liteeth_config {
@@ -84,7 +84,7 @@ static int eth_initialize(struct device *dev)
 static int eth_tx(struct device *dev, struct net_pkt *pkt)
 {
 	int key;
-	u16_t len;
+	uint16_t len;
 	struct eth_liteeth_dev_data *context = dev->driver_data;
 
 	key = irq_lock();
@@ -119,7 +119,7 @@ static void eth_rx(struct device *port)
 	struct eth_liteeth_dev_data *context = port->driver_data;
 
 	unsigned int key, r;
-	u16_t len = 0;
+	uint16_t len = 0;
 
 	key = irq_lock();
 
@@ -220,13 +220,13 @@ static void eth_iface_init(struct net_if *iface)
 
 	/* setup tx slots */
 	context->txslot = 0;
-	context->tx_buf[0] = (u8_t *)LITEETH_SLOT_TX0;
-	context->tx_buf[1] = (u8_t *)LITEETH_SLOT_TX1;
+	context->tx_buf[0] = (uint8_t *)LITEETH_SLOT_TX0;
+	context->tx_buf[1] = (uint8_t *)LITEETH_SLOT_TX1;
 
 	/* setup rx slots */
 	context->rxslot = 0;
-	context->rx_buf[0] = (u8_t *)LITEETH_SLOT_RX0;
-	context->rx_buf[1] = (u8_t *)LITEETH_SLOT_RX1;
+	context->rx_buf[0] = (uint8_t *)LITEETH_SLOT_RX0;
+	context->rx_buf[1] = (uint8_t *)LITEETH_SLOT_RX1;
 
 	init_done = true;
 }
diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
index a2d6bd1ec3..01f39812e9 100644
--- a/drivers/ethernet/eth_mcux.c
+++ b/drivers/ethernet/eth_mcux.c
@@ -118,11 +118,11 @@ struct eth_context {
 	enum eth_mcux_phy_state phy_state;
 	bool enabled;
 	bool link_up;
-	u32_t phy_addr;
+	uint32_t phy_addr;
 	phy_duplex_t phy_duplex;
 	phy_speed_t phy_speed;
-	u8_t mac_addr[6];
-	void (*generate_mac)(u8_t *);
+	uint8_t mac_addr[6];
+	void (*generate_mac)(uint8_t *);
 	struct k_work phy_work;
 	struct k_delayed_work delayed_phy_work;
 	/* TODO: FIXME. This Ethernet frame sized buffer is used for
@@ -140,7 +140,7 @@ struct eth_context {
 	 * Note that we do not copy FCS into this buffer thus the
 	 * size is 1514 bytes.
 	 */
-	u8_t frame_buf[NET_ETH_MAX_FRAME_SIZE]; /* Max MTU + ethernet header */
+	uint8_t frame_buf[NET_ETH_MAX_FRAME_SIZE]; /* Max MTU + ethernet header */
 };
 
 #ifdef CONFIG_HAS_MCUX_CACHE
@@ -177,17 +177,17 @@ static int ts_tx_rd, ts_tx_wr;
 	ROUND_UP(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)
 #endif /* CONFIG_NET_VLAN */
 
-static u8_t __aligned(ENET_BUFF_ALIGNMENT)
+static uint8_t __aligned(ENET_BUFF_ALIGNMENT)
 rx_buffer[CONFIG_ETH_MCUX_RX_BUFFERS][ETH_MCUX_BUFFER_SIZE];
 
-static u8_t __aligned(ENET_BUFF_ALIGNMENT)
+static uint8_t __aligned(ENET_BUFF_ALIGNMENT)
 tx_buffer[CONFIG_ETH_MCUX_TX_BUFFERS][ETH_MCUX_BUFFER_SIZE];
 
 #ifdef CONFIG_NET_POWER_MANAGEMENT
 static void eth_mcux_phy_enter_reset(struct eth_context *context);
 void eth_mcux_phy_stop(struct eth_context *context);
 
-static int eth_mcux_device_pm_control(struct device *dev, u32_t command,
+static int eth_mcux_device_pm_control(struct device *dev, uint32_t command,
 				      void *context, device_pm_cb cb, void *arg)
 {
 	struct eth_context *eth_ctx = (struct eth_context *)dev->driver_data;
@@ -201,7 +201,7 @@ static int eth_mcux_device_pm_control(struct device *dev, u32_t command,
 	}
 
 	if (command == DEVICE_PM_SET_POWER_STATE) {
-		if (*(u32_t *)context == DEVICE_PM_SUSPEND_STATE) {
+		if (*(uint32_t *)context == DEVICE_PM_SUSPEND_STATE) {
 			LOG_DBG("Suspending");
 
 			ret = net_if_suspend(eth_ctx->iface);
@@ -216,7 +216,7 @@ static int eth_mcux_device_pm_control(struct device *dev, u32_t command,
 			ENET_Deinit(eth_ctx->base);
 			clock_control_off(eth_ctx->clock_dev,
 				(clock_control_subsys_t)eth_ctx->clock);
-		} else if (*(u32_t *)context == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*(uint32_t *)context == DEVICE_PM_ACTIVE_STATE) {
 			LOG_DBG("Resuming");
 
 			clock_control_on(eth_ctx->clock_dev,
@@ -242,7 +242,7 @@ out:
 #define ETH_MCUX_PM_FUNC device_pm_control_nop
 #endif /* CONFIG_NET_POWER_MANAGEMENT */
 
-static void eth_mcux_decode_duplex_and_speed(u32_t status,
+static void eth_mcux_decode_duplex_and_speed(uint32_t status,
 					     phy_duplex_t *p_phy_duplex,
 					     phy_speed_t *p_phy_speed)
 {
@@ -266,7 +266,7 @@ static void eth_mcux_decode_duplex_and_speed(u32_t status,
 	}
 }
 
-static inline struct net_if *get_iface(struct eth_context *ctx, u16_t vlan_tag)
+static inline struct net_if *get_iface(struct eth_context *ctx, uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -364,11 +364,11 @@ void eth_mcux_phy_stop(struct eth_context *context)
 
 static void eth_mcux_phy_event(struct eth_context *context)
 {
-	u32_t status;
+	uint32_t status;
 	bool link_up;
 #ifdef CONFIG_SOC_SERIES_IMX_RT
 	status_t res;
-	u32_t ctrl2;
+	uint32_t ctrl2;
 #endif
 	phy_duplex_t phy_duplex = kPHY_FullDuplex;
 	phy_speed_t phy_speed = kPHY_Speed100M;
@@ -510,7 +510,7 @@ static void eth_mcux_phy_setup(struct eth_context *context)
 {
 #ifdef CONFIG_SOC_SERIES_IMX_RT
 	status_t res;
-	u32_t oms_override;
+	uint32_t oms_override;
 
 	/* Disable MII interrupts to prevent triggering PHY events. */
 	ENET_DisableInterrupts(context->base, ENET_EIR_MII_MASK);
@@ -629,7 +629,7 @@ static bool eth_get_ptp_data(struct net_if *iface, struct net_pkt *pkt,
 static int eth_tx(struct device *dev, struct net_pkt *pkt)
 {
 	struct eth_context *context = dev->driver_data;
-	u16_t total_len = net_pkt_get_len(pkt);
+	uint16_t total_len = net_pkt_get_len(pkt);
 	status_t status;
 	unsigned int imask;
 #if defined(CONFIG_PTP_CLOCK_MCUX)
@@ -691,8 +691,8 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 static void eth_rx(struct device *iface)
 {
 	struct eth_context *context = iface->driver_data;
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
-	u32_t frame_length = 0U;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint32_t frame_length = 0U;
 	struct net_pkt *pkt;
 	status_t status;
 	unsigned int imask;
@@ -880,7 +880,7 @@ static void eth_callback(ENET_Type *base, enet_handle_t *handle,
 
 #if DT_INST_PROP(0, zephyr_random_mac_address) || \
     DT_INST_PROP(1, zephyr_random_mac_address)
-static void generate_random_mac(u8_t *mac_addr)
+static void generate_random_mac(uint8_t *mac_addr)
 {
 	gen_random_mac(mac_addr, FREESCALE_OUI_B0,
 		       FREESCALE_OUI_B1, FREESCALE_OUI_B2);
@@ -890,14 +890,14 @@ static void generate_random_mac(u8_t *mac_addr)
 #if !DT_INST_NODE_HAS_PROP(0, local_mac_address) || \
 	DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) && \
 	!DT_INST_NODE_HAS_PROP(1, local_mac_address)
-static void generate_eth0_unique_mac(u8_t *mac_addr)
+static void generate_eth0_unique_mac(uint8_t *mac_addr)
 {
 	/* Trivially "hash" up to 128 bits of MCU unique identifier */
 #ifdef CONFIG_SOC_SERIES_IMX_RT
-	u32_t id = OCOTP->CFG1 ^ OCOTP->CFG2;
+	uint32_t id = OCOTP->CFG1 ^ OCOTP->CFG2;
 #endif
 #ifdef CONFIG_SOC_SERIES_KINETIS_K6X
-	u32_t id = SIM->UIDH ^ SIM->UIDMH ^ SIM->UIDML ^ SIM->UIDL;
+	uint32_t id = SIM->UIDH ^ SIM->UIDMH ^ SIM->UIDML ^ SIM->UIDL;
 #endif
 
 	mac_addr[0] |= 0x02; /* force LAA bit */
@@ -909,7 +909,7 @@ static void generate_eth0_unique_mac(u8_t *mac_addr)
 #endif
 
 #if DT_NODE_HAS_STATUS(DT_DRV_INST(1), okay) && !DT_INST_NODE_HAS_PROP(1, local_mac_address)
-static void generate_eth1_unique_mac(u8_t *mac_addr)
+static void generate_eth1_unique_mac(uint8_t *mac_addr)
 {
 	generate_eth0_unique_mac(mac_addr);
 	mac_addr[5]++;
@@ -920,7 +920,7 @@ static void eth_mcux_init(struct device *dev)
 {
 	struct eth_context *context = dev->driver_data;
 	enet_config_t enet_config;
-	u32_t sys_clock;
+	uint32_t sys_clock;
 	enet_buffer_config_t buffer_config = {
 		.rxBdNumber = CONFIG_ETH_MCUX_RX_BUFFERS,
 		.txBdNumber = CONFIG_ETH_MCUX_TX_BUFFERS,
@@ -932,11 +932,11 @@ static void eth_mcux_init(struct device *dev)
 		.txBufferAlign = tx_buffer[0],
 	};
 #if defined(CONFIG_PTP_CLOCK_MCUX)
-	u8_t ptp_multicast[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E };
+	uint8_t ptp_multicast[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E };
 #endif
 #if defined(CONFIG_MDNS_RESPONDER) || defined(CONFIG_MDNS_RESOLVER)
 	/* standard multicast MAC address */
-	u8_t mdns_multicast[6] = { 0x01, 0x00, 0x5E, 0x00, 0x00, 0xFB };
+	uint8_t mdns_multicast[6] = { 0x01, 0x00, 0x5E, 0x00, 0x00, 0xFB };
 #endif
 
 	context->phy_state = eth_mcux_phy_state_initial;
@@ -1141,7 +1141,7 @@ static void eth_mcux_dispacher_isr(void *p)
 {
 	struct device *dev = p;
 	struct eth_context *context = dev->driver_data;
-	u32_t EIR = ENET_GetInterruptStatus(context->base);
+	uint32_t EIR = ENET_GetInterruptStatus(context->base);
 	int irq_lock_key = irq_lock();
 
 	if (EIR & (kENET_RxBufferInterrupt | kENET_RxFrameInterrupt)) {
@@ -1184,7 +1184,7 @@ static void eth_mcux_error_isr(void *p)
 {
 	struct device *dev = p;
 	struct eth_context *context = dev->driver_data;
-	u32_t pending = ENET_GetInterruptStatus(context->base);
+	uint32_t pending = ENET_GetInterruptStatus(context->base);
 
 	if (pending & ENET_EIR_MII_MASK) {
 		k_work_submit(&context->phy_work);
@@ -1370,7 +1370,7 @@ static int ptp_clock_mcux_rate_adjust(struct device *dev, float ratio)
 	struct ptp_context *ptp_context = dev->driver_data;
 	struct eth_context *context = ptp_context->eth_context;
 	int corr;
-	s32_t mul;
+	int32_t mul;
 	float val;
 
 	/* No change needed. */
diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c
index 4e8947815c..da68c7e2fe 100644
--- a/drivers/ethernet/eth_native_posix.c
+++ b/drivers/ethernet/eth_native_posix.c
@@ -46,9 +46,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #endif
 
 struct eth_context {
-	u8_t recv[NET_ETH_MTU + ETH_HDR_LEN];
-	u8_t send[NET_ETH_MTU + ETH_HDR_LEN];
-	u8_t mac_addr[6];
+	uint8_t recv[NET_ETH_MTU + ETH_HDR_LEN];
+	uint8_t send[NET_ETH_MTU + ETH_HDR_LEN];
+	uint8_t mac_addr[6];
 	struct net_linkaddr ll_addr;
 	struct net_if *iface;
 	const char *if_name;
@@ -87,7 +87,7 @@ static struct gptp_hdr *check_gptp_msg(struct net_if *iface,
 				       struct net_pkt *pkt,
 				       bool is_tx)
 {
-	u8_t *msg_start = net_pkt_data(pkt);
+	uint8_t *msg_start = net_pkt_data(pkt);
 	struct gptp_hdr *gptp_hdr;
 	int eth_hlen;
 
@@ -212,7 +212,7 @@ static struct net_linkaddr *eth_get_mac(struct eth_context *ctx)
 }
 
 static inline struct net_if *get_iface(struct eth_context *ctx,
-				       u16_t vlan_tag)
+				       uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -232,11 +232,11 @@ static inline struct net_if *get_iface(struct eth_context *ctx,
 
 #if defined(CONFIG_NET_VLAN)
 static struct net_pkt *prepare_vlan_pkt(struct eth_context *ctx,
-					int count, u16_t *vlan_tag, int *status)
+					int count, uint16_t *vlan_tag, int *status)
 {
 	struct net_eth_vlan_hdr *hdr = (struct net_eth_vlan_hdr *)ctx->recv;
 	struct net_pkt *pkt;
-	u8_t pos;
+	uint8_t pos;
 
 	if (IS_ENABLED(CONFIG_ETH_NATIVE_POSIX_VLAN_TAG_STRIP)) {
 		count -= NET_ETH_VLAN_HDR_SIZE;
@@ -317,7 +317,7 @@ static struct net_pkt *prepare_non_vlan_pkt(struct eth_context *ctx,
 
 static int read_data(struct eth_context *ctx, int fd)
 {
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct net_if *iface;
 	struct net_pkt *pkt = NULL;
 	int status;
@@ -527,7 +527,7 @@ static int set_config(struct device *dev,
 
 #if defined(CONFIG_NET_VLAN)
 static int vlan_setup(struct device *dev, struct net_if *iface,
-		      u16_t tag, bool enable)
+		      uint16_t tag, bool enable)
 {
 	if (enable) {
 		net_lldp_set_lldpdu(iface);
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
index 8feea49663..a99c2b4cd9 100644
--- a/drivers/ethernet/eth_sam_gmac.c
+++ b/drivers/ethernet/eth_sam_gmac.c
@@ -59,28 +59,28 @@ static inline void dcache_is_enabled(void)
 {
 	dcache_enabled = (SCB->CCR & SCB_CCR_DC_Msk);
 }
-static inline void dcache_invalidate(u32_t addr, u32_t size)
+static inline void dcache_invalidate(uint32_t addr, uint32_t size)
 {
 	if (!dcache_enabled) {
 		return;
 	}
 
 	/* Make sure it is aligned to 32B */
-	u32_t start_addr = addr & (u32_t)~(GMAC_DCACHE_ALIGNMENT - 1);
-	u32_t size_full = size + addr - start_addr;
+	uint32_t start_addr = addr & (uint32_t)~(GMAC_DCACHE_ALIGNMENT - 1);
+	uint32_t size_full = size + addr - start_addr;
 
 	SCB_InvalidateDCache_by_Addr((uint32_t *)start_addr, size_full);
 }
 
-static inline void dcache_clean(u32_t addr, u32_t size)
+static inline void dcache_clean(uint32_t addr, uint32_t size)
 {
 	if (!dcache_enabled) {
 		return;
 	}
 
 	/* Make sure it is aligned to 32B */
-	u32_t start_addr = addr & (u32_t)~(GMAC_DCACHE_ALIGNMENT - 1);
-	u32_t size_full = size + addr - start_addr;
+	uint32_t start_addr = addr & (uint32_t)~(GMAC_DCACHE_ALIGNMENT - 1);
+	uint32_t size_full = size + addr - start_addr;
 
 	SCB_CleanDCache_by_Addr((uint32_t *)start_addr, size_full);
 }
@@ -245,16 +245,16 @@ static inline void set_receive_buf_queue_pointer(
 {
 	/* Set Receive Buffer Queue Pointer Register */
 	if (queue->que_idx == GMAC_QUE_0) {
-		gmac->GMAC_RBQB = (u32_t)queue->rx_desc_list.buf;
+		gmac->GMAC_RBQB = (uint32_t)queue->rx_desc_list.buf;
 	} else {
 		gmac->GMAC_RBQBAPQ[queue->que_idx - 1] =
-			(u32_t)queue->rx_desc_list.buf;
+			(uint32_t)queue->rx_desc_list.buf;
 	}
 }
 
 static inline void disable_all_priority_queue_interrupt(Gmac *gmac)
 {
-	u32_t idx;
+	uint32_t idx;
 
 	for (idx = 0; idx < GMAC_PRIORITY_QUEUE_NUM; idx++) {
 		gmac->GMAC_IDRPQ[idx] = UINT32_MAX;
@@ -269,9 +269,9 @@ static int priority_queue_init(Gmac *gmac, struct gmac_queue *queue)
 
 	__ASSERT_NO_MSG(queue->rx_desc_list.len > 0);
 	__ASSERT_NO_MSG(queue->tx_desc_list.len > 0);
-	__ASSERT(!((u32_t)queue->rx_desc_list.buf & ~GMAC_RBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)queue->rx_desc_list.buf & ~GMAC_RBQB_ADDR_Msk),
 		 "RX descriptors have to be word aligned");
-	__ASSERT(!((u32_t)queue->tx_desc_list.buf & ~GMAC_TBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)queue->tx_desc_list.buf & ~GMAC_TBQB_ADDR_Msk),
 		 "TX descriptors have to be word aligned");
 
 	/* Extract queue index for easier referencing */
@@ -297,9 +297,9 @@ static int priority_queue_init(Gmac *gmac, struct gmac_queue *queue)
 		GMAC_RBSRPQ_RBS(CONFIG_NET_BUF_DATA_SIZE >> 6);
 
 	/* Set Receive Buffer Queue Pointer Register */
-	gmac->GMAC_RBQBAPQ[queue_index] = (u32_t)queue->rx_desc_list.buf;
+	gmac->GMAC_RBQBAPQ[queue_index] = (uint32_t)queue->rx_desc_list.buf;
 	/* Set Transmit Buffer Queue Pointer Register */
-	gmac->GMAC_TBQBAPQ[queue_index] = (u32_t)queue->tx_desc_list.buf;
+	gmac->GMAC_TBQBAPQ[queue_index] = (uint32_t)queue->tx_desc_list.buf;
 
 	/* Enable RX/TX completion and error interrupts */
 	gmac->GMAC_IERPQ[queue_index] = GMAC_INTPQ_EN_FLAGS;
@@ -318,9 +318,9 @@ static int priority_queue_init_as_idle(Gmac *gmac, struct gmac_queue *queue)
 	struct gmac_desc_list *rx_desc_list = &queue->rx_desc_list;
 	struct gmac_desc_list *tx_desc_list = &queue->tx_desc_list;
 
-	__ASSERT(!((u32_t)rx_desc_list->buf & ~GMAC_RBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)rx_desc_list->buf & ~GMAC_RBQB_ADDR_Msk),
 		 "RX descriptors have to be word aligned");
-	__ASSERT(!((u32_t)tx_desc_list->buf & ~GMAC_TBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)tx_desc_list->buf & ~GMAC_TBQB_ADDR_Msk),
 		 "TX descriptors have to be word aligned");
 	__ASSERT((rx_desc_list->len == 1U) && (tx_desc_list->len == 1U),
 		 "Priority queues are currently not supported, descriptor "
@@ -336,9 +336,9 @@ static int priority_queue_init_as_idle(Gmac *gmac, struct gmac_queue *queue)
 	tx_desc_list->buf[0].w1 = GMAC_TXW1_USED | GMAC_TXW1_WRAP;
 
 	/* Set Receive Buffer Queue Pointer Register */
-	gmac->GMAC_RBQBAPQ[queue->que_idx - 1] = (u32_t)rx_desc_list->buf;
+	gmac->GMAC_RBQBAPQ[queue->que_idx - 1] = (uint32_t)rx_desc_list->buf;
 	/* Set Transmit Buffer Queue Pointer Register */
-	gmac->GMAC_TBQBAPQ[queue->que_idx - 1] = (u32_t)tx_desc_list->buf;
+	gmac->GMAC_TBQBAPQ[queue->que_idx - 1] = (uint32_t)tx_desc_list->buf;
 
 	LOG_INF("Queue %d set to idle", queue->que_idx);
 
@@ -362,7 +362,7 @@ static inline void set_receive_buf_queue_pointer(
 	Gmac *gmac,
 	struct gmac_queue *queue)
 {
-	gmac->GMAC_RBQB = (u32_t)queue->rx_desc_list.buf;
+	gmac->GMAC_RBQB = (uint32_t)queue->rx_desc_list.buf;
 }
 
 static int queue_init(Gmac *gmac, struct gmac_queue *queue)
@@ -379,7 +379,7 @@ static int eth_sam_gmac_setup_qav(Gmac *gmac, int queue_id, bool enable);
 
 static inline void eth_sam_gmac_init_qav(Gmac *gmac)
 {
-	u32_t idx;
+	uint32_t idx;
 
 	for (idx = GMAC_QUE_1; idx <= GMAC_ACTIVE_PRIORITY_QUEUE_NUM; idx++) {
 		eth_sam_gmac_setup_qav(gmac, idx, true);
@@ -405,9 +405,9 @@ static void ring_buf_reset(struct ring_buf *rb)
 /*
  * Get one 32 bit item from the ring buffer
  */
-static u32_t ring_buf_get(struct ring_buf *rb)
+static uint32_t ring_buf_get(struct ring_buf *rb)
 {
-	u32_t val;
+	uint32_t val;
 
 	__ASSERT(rb->tail != rb->head,
 		 "retrieving data from empty ring buffer");
@@ -421,7 +421,7 @@ static u32_t ring_buf_get(struct ring_buf *rb)
 /*
  * Put one 32 bit item into the ring buffer
  */
-static void ring_buf_put(struct ring_buf *rb, u32_t val)
+static void ring_buf_put(struct ring_buf *rb, uint32_t val)
 {
 	rb->buf[rb->head] = val;
 	MODULO_INC(rb->head, rb->len);
@@ -434,7 +434,7 @@ static void ring_buf_put(struct ring_buf *rb, u32_t val)
 /*
  * Free pre-reserved RX buffers
  */
-static void free_rx_bufs(struct net_buf **rx_frag_list, u16_t len)
+static void free_rx_bufs(struct net_buf **rx_frag_list, uint16_t len)
 {
 	for (int i = 0; i < len; i++) {
 		if (rx_frag_list[i]) {
@@ -447,8 +447,8 @@ static void free_rx_bufs(struct net_buf **rx_frag_list, u16_t len)
 /*
  * Set MAC Address for frame filtering logic
  */
-static void mac_addr_set(Gmac *gmac, u8_t index,
-				 u8_t mac_addr[6])
+static void mac_addr_set(Gmac *gmac, uint8_t index,
+				 uint8_t mac_addr[6])
 {
 	__ASSERT(index < 4, "index has to be in the range 0..3");
 
@@ -468,7 +468,7 @@ static int rx_descriptors_init(Gmac *gmac, struct gmac_queue *queue)
 	struct gmac_desc_list *rx_desc_list = &queue->rx_desc_list;
 	struct net_buf **rx_frag_list = queue->rx_frag_list;
 	struct net_buf *rx_buf;
-	u8_t *rx_buf_addr;
+	uint8_t *rx_buf_addr;
 
 	__ASSERT_NO_MSG(rx_frag_list);
 
@@ -485,12 +485,12 @@ static int rx_descriptors_init(Gmac *gmac, struct gmac_queue *queue)
 		rx_frag_list[i] = rx_buf;
 
 		rx_buf_addr = rx_buf->data;
-		__ASSERT(!((u32_t)rx_buf_addr & ~GMAC_RXW0_ADDR),
+		__ASSERT(!((uint32_t)rx_buf_addr & ~GMAC_RXW0_ADDR),
 			 "Misaligned RX buffer address");
 		__ASSERT(rx_buf->size == CONFIG_NET_BUF_DATA_SIZE,
 			 "Incorrect length of RX data buffer");
 		/* Give ownership to GMAC and remove the wrap bit */
-		rx_desc_list->buf[i].w0 = (u32_t)rx_buf_addr & GMAC_RXW0_ADDR;
+		rx_desc_list->buf[i].w0 = (uint32_t)rx_buf_addr & GMAC_RXW0_ADDR;
 		rx_desc_list->buf[i].w1 = 0U;
 	}
 
@@ -532,7 +532,7 @@ static struct gptp_hdr *check_gptp_msg(struct net_if *iface,
 				       struct net_pkt *pkt,
 				       bool is_tx)
 {
-	u8_t *msg_start = net_pkt_data(pkt);
+	uint8_t *msg_start = net_pkt_data(pkt);
 	struct ethernet_context *eth_ctx;
 	struct gptp_hdr *gptp_hdr;
 	int eth_hlen;
@@ -605,7 +605,7 @@ static inline struct net_ptp_time get_ptp_event_rx_ts(Gmac *gmac)
 {
 	struct net_ptp_time ts;
 
-	ts.second = ((u64_t)(gmac->GMAC_EFRSH & 0xffff) << 32)
+	ts.second = ((uint64_t)(gmac->GMAC_EFRSH & 0xffff) << 32)
 			   | gmac->GMAC_EFRSL;
 	ts.nanosecond = gmac->GMAC_EFRN;
 
@@ -616,7 +616,7 @@ static inline struct net_ptp_time get_ptp_peer_event_rx_ts(Gmac *gmac)
 {
 	struct net_ptp_time ts;
 
-	ts.second = ((u64_t)(gmac->GMAC_PEFRSH & 0xffff) << 32)
+	ts.second = ((uint64_t)(gmac->GMAC_PEFRSH & 0xffff) << 32)
 		    | gmac->GMAC_PEFRSL;
 	ts.nanosecond = gmac->GMAC_PEFRN;
 
@@ -627,7 +627,7 @@ static inline struct net_ptp_time get_ptp_event_tx_ts(Gmac *gmac)
 {
 	struct net_ptp_time ts;
 
-	ts.second = ((u64_t)(gmac->GMAC_EFTSH & 0xffff) << 32)
+	ts.second = ((uint64_t)(gmac->GMAC_EFTSH & 0xffff) << 32)
 			   | gmac->GMAC_EFTSL;
 	ts.nanosecond = gmac->GMAC_EFTN;
 
@@ -638,7 +638,7 @@ static inline struct net_ptp_time get_ptp_peer_event_tx_ts(Gmac *gmac)
 {
 	struct net_ptp_time ts;
 
-	ts.second = ((u64_t)(gmac->GMAC_PEFTSH & 0xffff) << 32)
+	ts.second = ((uint64_t)(gmac->GMAC_PEFTSH & 0xffff) << 32)
 		    | gmac->GMAC_PEFTSL;
 	ts.nanosecond = gmac->GMAC_PEFTN;
 
@@ -649,7 +649,7 @@ static inline struct net_ptp_time get_current_ts(Gmac *gmac)
 {
 	struct net_ptp_time ts;
 
-	ts.second = ((u64_t)(gmac->GMAC_TSH & 0xffff) << 32) | gmac->GMAC_TSL;
+	ts.second = ((uint64_t)(gmac->GMAC_TSH & 0xffff) << 32) | gmac->GMAC_TSL;
 	ts.nanosecond = gmac->GMAC_TN;
 
 	return ts;
@@ -699,7 +699,7 @@ static inline void timestamp_rx_pkt(Gmac *gmac, struct gptp_hdr *hdr,
 #endif
 
 static inline struct net_if *get_iface(struct eth_sam_dev_data *ctx,
-				       u16_t vlan_tag)
+				       uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -730,7 +730,7 @@ static void tx_completed(Gmac *gmac, struct gmac_queue *queue)
 	struct net_buf *frag;
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 	struct net_pkt *pkt;
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct gptp_hdr *hdr;
 	struct eth_sam_dev_data *dev_data =
 		CONTAINER_OF(queue, struct eth_sam_dev_data,
@@ -864,9 +864,9 @@ static void rx_error_handler(Gmac *gmac, struct gmac_queue *queue)
  *
  * According to 802.3 MDC should be less then 2.5 MHz.
  */
-static int get_mck_clock_divisor(u32_t mck)
+static int get_mck_clock_divisor(uint32_t mck)
 {
-	u32_t mck_divisor;
+	uint32_t mck_divisor;
 
 	if (mck <= 20000000U) {
 		mck_divisor = GMAC_NCFGR_CLK_MCK_8;
@@ -932,7 +932,7 @@ static int eth_sam_gmac_get_qav_status(Gmac *gmac, int queue_id, bool *enabled)
 static int eth_sam_gmac_setup_qav_idle_slope(Gmac *gmac, int queue_id,
 					     unsigned int idle_slope)
 {
-	u32_t cbscr_val;
+	uint32_t cbscr_val;
 
 	/* Verify queue id */
 	if (queue_id < GMAC_QUE_1 || queue_id > GMAC_ACTIVE_PRIORITY_QUEUE_NUM) {
@@ -954,9 +954,9 @@ static int eth_sam_gmac_setup_qav_idle_slope(Gmac *gmac, int queue_id,
 	return 0;
 }
 
-static u32_t eth_sam_gmac_get_bandwidth(Gmac *gmac)
+static uint32_t eth_sam_gmac_get_bandwidth(Gmac *gmac)
 {
-	u32_t bandwidth;
+	uint32_t bandwidth;
 
 	/* See if we operate in 10Mbps or 100Mbps mode,
 	 * Note: according to the manual, portTransmitRate is 0x07735940 for
@@ -997,7 +997,7 @@ static int eth_sam_gmac_get_qav_idle_slope(Gmac *gmac, int queue_id,
 static int eth_sam_gmac_get_qav_delta_bandwidth(Gmac *gmac, int queue_id,
 						unsigned int *delta_bandwidth)
 {
-	u32_t bandwidth;
+	uint32_t bandwidth;
 	unsigned int idle_slope;
 	int ret;
 
@@ -1024,8 +1024,8 @@ static int eth_sam_gmac_get_qav_delta_bandwidth(Gmac *gmac, int queue_id,
 static int eth_sam_gmac_setup_qav_delta_bandwidth(Gmac *gmac, int queue_id,
 						  int queue_share)
 {
-	u32_t bandwidth;
-	u32_t idle_slope;
+	uint32_t bandwidth;
+	uint32_t idle_slope;
 
 	/* Verify queue id */
 	if (queue_id < GMAC_QUE_1 || queue_id > GMAC_ACTIVE_PRIORITY_QUEUE_NUM) {
@@ -1049,7 +1049,7 @@ static void gmac_setup_ptp_clock_divisors(Gmac *gmac)
 	int div;
 	int i;
 
-	u8_t cns, acns, nit;
+	uint8_t cns, acns, nit;
 
 	min_cycles = MCK_FREQ_HZ;
 	min_period = NSEC_PER_SEC;
@@ -1079,7 +1079,7 @@ static void gmac_setup_ptp_clock_divisors(Gmac *gmac)
 }
 #endif
 
-static int gmac_init(Gmac *gmac, u32_t gmac_ncfgr_val)
+static int gmac_init(Gmac *gmac, uint32_t gmac_ncfgr_val)
 {
 	int mck_divisor;
 
@@ -1156,9 +1156,9 @@ static int gmac_init(Gmac *gmac, u32_t gmac_ncfgr_val)
 	return 0;
 }
 
-static void link_configure(Gmac *gmac, u32_t flags)
+static void link_configure(Gmac *gmac, uint32_t flags)
 {
-	u32_t val;
+	uint32_t val;
 
 	val = gmac->GMAC_NCFGR;
 
@@ -1176,9 +1176,9 @@ static int nonpriority_queue_init(Gmac *gmac, struct gmac_queue *queue)
 
 	__ASSERT_NO_MSG(queue->rx_desc_list.len > 0);
 	__ASSERT_NO_MSG(queue->tx_desc_list.len > 0);
-	__ASSERT(!((u32_t)queue->rx_desc_list.buf & ~GMAC_RBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)queue->rx_desc_list.buf & ~GMAC_RBQB_ADDR_Msk),
 		 "RX descriptors have to be word aligned");
-	__ASSERT(!((u32_t)queue->tx_desc_list.buf & ~GMAC_TBQB_ADDR_Msk),
+	__ASSERT(!((uint32_t)queue->tx_desc_list.buf & ~GMAC_TBQB_ADDR_Msk),
 		 "TX descriptors have to be word aligned");
 
 	/* Setup descriptor lists */
@@ -1204,9 +1204,9 @@ static int nonpriority_queue_init(Gmac *gmac, struct gmac_queue *queue)
 #endif
 
 	/* Set Receive Buffer Queue Pointer Register */
-	gmac->GMAC_RBQB = (u32_t)queue->rx_desc_list.buf;
+	gmac->GMAC_RBQB = (uint32_t)queue->rx_desc_list.buf;
 	/* Set Transmit Buffer Queue Pointer Register */
-	gmac->GMAC_TBQB = (u32_t)queue->tx_desc_list.buf;
+	gmac->GMAC_TBQB = (uint32_t)queue->tx_desc_list.buf;
 
 	/* Configure GMAC DMA transfer */
 	gmac->GMAC_DCFGR =
@@ -1239,11 +1239,11 @@ static struct net_pkt *frame_get(struct gmac_queue *queue)
 	struct net_buf *frag;
 	struct net_buf *new_frag;
 	struct net_buf *last_frag = NULL;
-	u8_t *frag_data;
-	u32_t frag_len;
-	u32_t frame_len = 0U;
-	u16_t tail;
-	u8_t wrap;
+	uint8_t *frag_data;
+	uint32_t frag_len;
+	uint32_t frame_len = 0U;
+	uint16_t tail;
+	uint8_t wrap;
 
 	/* Check if there exists a complete frame in RX descriptor list */
 	tail = rx_desc_list->tail;
@@ -1285,7 +1285,7 @@ static struct net_pkt *frame_get(struct gmac_queue *queue)
 	       && !frame_is_complete) {
 		frag = rx_frag_list[tail];
 		frag_data =
-			(u8_t *)(rx_desc->w0 & GMAC_RXW0_ADDR);
+			(uint8_t *)(rx_desc->w0 & GMAC_RXW0_ADDR);
 		__ASSERT(frag->data == frag_data,
 			 "RX descriptor and buffer list desynchronized");
 		frame_is_complete = (bool)(rx_desc->w1 & GMAC_RXW1_EOF);
@@ -1300,7 +1300,7 @@ static struct net_pkt *frame_get(struct gmac_queue *queue)
 		/* Link frame fragments only if RX net buffer is valid */
 		if (rx_frame != NULL) {
 			/* Assure cache coherency after DMA write operation */
-			dcache_invalidate((u32_t)frag_data, frag->size);
+			dcache_invalidate((uint32_t)frag_data, frag->size);
 
 			/* Get a new data net buffer from the buffer pool */
 			new_frag = net_pkt_get_frag(rx_frame, K_NO_WAIT);
@@ -1329,7 +1329,7 @@ static struct net_pkt *frame_get(struct gmac_queue *queue)
 		__DMB();  /* data memory barrier */
 		/* Update buffer descriptor address word */
 		wrap = (tail == rx_desc_list->len-1U ? GMAC_RXW0_WRAP : 0);
-		rx_desc->w0 = ((u32_t)frag->data & GMAC_RXW0_ADDR) | wrap;
+		rx_desc->w0 = ((uint32_t)frag->data & GMAC_RXW0_ADDR) | wrap;
 
 		MODULO_INC(tail, rx_desc_list->len);
 		rx_desc = &rx_desc_list->buf[tail];
@@ -1347,7 +1347,7 @@ static void eth_rx(struct gmac_queue *queue)
 	struct eth_sam_dev_data *dev_data =
 		CONTAINER_OF(queue, struct eth_sam_dev_data,
 			     queue_list[queue->que_idx]);
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct net_pkt *rx_frame;
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 	struct device *const dev = net_if_get_device(dev_data->iface);
@@ -1418,7 +1418,7 @@ static void eth_rx(struct gmac_queue *queue)
 	((NET_TC_TX_COUNT != NET_TC_RX_COUNT) && defined(CONFIG_NET_VLAN)))
 static int priority2queue(enum net_priority priority)
 {
-	static const u8_t queue_priority_map[] = {
+	static const uint8_t queue_priority_map[] = {
 #if GMAC_ACTIVE_QUEUE_NUM == 1
 		0, 0, 0, 0, 0, 0, 0, 0
 #endif
@@ -1453,16 +1453,16 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 	struct gmac_desc *tx_desc;
 	struct gmac_desc *tx_first_desc;
 	struct net_buf *frag;
-	u8_t *frag_data;
-	u16_t frag_len;
-	u32_t err_tx_flushed_count_at_entry;
+	uint8_t *frag_data;
+	uint16_t frag_len;
+	uint32_t err_tx_flushed_count_at_entry;
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 	unsigned int key;
 #endif
-	u8_t pkt_prio;
+	uint8_t pkt_prio;
 #if GMAC_MULTIPLE_TX_PACKETS == 0
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct gptp_hdr *hdr;
 #if defined(CONFIG_NET_VLAN)
 	struct net_eth_hdr *eth_hdr;
@@ -1502,7 +1502,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 		frag_len = frag->len;
 
 		/* Assure cache coherency before DMA read operation */
-		dcache_clean((u32_t)frag_data, frag->size);
+		dcache_clean((uint32_t)frag_data, frag->size);
 
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 		k_sem_take(&queue->tx_desc_sem, K_FOREVER);
@@ -1524,7 +1524,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 		tx_desc = &tx_desc_list->buf[tx_desc_list->head];
 
 		/* Update buffer descriptor address word */
-		tx_desc->w0 = (u32_t)frag_data;
+		tx_desc->w0 = (uint32_t)frag_data;
 
 		/* Update buffer descriptor status word (clear used bit except
 		 * for the first frag).
@@ -1634,7 +1634,7 @@ static void queue0_isr(void *arg)
 	struct gmac_desc_list *rx_desc_list;
 	struct gmac_desc_list *tx_desc_list;
 	struct gmac_desc *tail_desc;
-	u32_t isr;
+	uint32_t isr;
 
 	/* Interrupt Status Register is cleared on read */
 	isr = gmac->GMAC_ISR;
@@ -1685,7 +1685,7 @@ static inline void priority_queue_isr(void *arg, unsigned int queue_idx)
 	struct gmac_desc_list *rx_desc_list;
 	struct gmac_desc_list *tx_desc_list;
 	struct gmac_desc *tail_desc;
-	u32_t isrpq;
+	uint32_t isrpq;
 
 	isrpq = gmac->GMAC_ISRPQ[queue_idx - 1];
 	LOG_DBG("GMAC_ISRPQ%d=0x%08x", queue_idx - 1,  isrpq);
@@ -1782,10 +1782,10 @@ static int eth_initialize(struct device *dev)
 }
 
 #ifdef CONFIG_ETH_SAM_GMAC_MAC_I2C_EEPROM
-static void get_mac_addr_from_i2c_eeprom(u8_t mac_addr[6])
+static void get_mac_addr_from_i2c_eeprom(uint8_t mac_addr[6])
 {
 	struct device *dev;
-	u32_t iaddr = CONFIG_ETH_SAM_GMAC_MAC_I2C_INT_ADDRESS;
+	uint32_t iaddr = CONFIG_ETH_SAM_GMAC_MAC_I2C_INT_ADDRESS;
 
 	dev = device_get_binding(CONFIG_ETH_SAM_GMAC_MAC_I2C_DEV_NAME);
 	if (!dev) {
@@ -1799,7 +1799,7 @@ static void get_mac_addr_from_i2c_eeprom(u8_t mac_addr[6])
 }
 #endif
 
-static void generate_mac(u8_t mac_addr[6])
+static void generate_mac(uint8_t mac_addr[6])
 {
 #if defined(CONFIG_ETH_SAM_GMAC_MAC_I2C_EEPROM)
 	get_mac_addr_from_i2c_eeprom(mac_addr);
@@ -1815,7 +1815,7 @@ static void monitor_work_handler(struct k_work *work)
 	struct device *const dev = net_if_get_device(dev_data->iface);
 	const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev);
 	bool link_status;
-	u32_t link_config;
+	uint32_t link_config;
 	int result;
 
 	/* Poll PHY link status */
@@ -1857,7 +1857,7 @@ static void eth0_iface_init(struct net_if *iface)
 	struct eth_sam_dev_data *const dev_data = DEV_DATA(dev);
 	const struct eth_sam_dev_cfg *const cfg = DEV_CFG(dev);
 	static bool init_done;
-	u32_t gmac_ncfgr_val;
+	uint32_t gmac_ncfgr_val;
 	int result;
 	int i;
 
@@ -2218,12 +2218,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que0,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que0,
+				.buf = (uint32_t *)tx_frag_list_que0,
 				.len = ARRAY_SIZE(tx_frag_list_que0),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que0,
+				.buf = (uint32_t *)tx_frame_list_que0,
 				.len = ARRAY_SIZE(tx_frame_list_que0),
 			},
 #endif
@@ -2243,12 +2243,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que1,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que1,
+				.buf = (uint32_t *)tx_frag_list_que1,
 				.len = ARRAY_SIZE(tx_frag_list_que1),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que1,
+				.buf = (uint32_t *)tx_frame_list_que1,
 				.len = ARRAY_SIZE(tx_frame_list_que1),
 			}
 #endif
@@ -2270,12 +2270,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que2,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que2,
+				.buf = (uint32_t *)tx_frag_list_que2,
 				.len = ARRAY_SIZE(tx_frag_list_que2),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que2,
+				.buf = (uint32_t *)tx_frame_list_que2,
 				.len = ARRAY_SIZE(tx_frame_list_que2),
 			}
 #endif
@@ -2297,12 +2297,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que3,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que3,
+				.buf = (uint32_t *)tx_frag_list_que3,
 				.len = ARRAY_SIZE(tx_frag_list_que3),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que3,
+				.buf = (uint32_t *)tx_frame_list_que3,
 				.len = ARRAY_SIZE(tx_frame_list_que3),
 			}
 #endif
@@ -2324,12 +2324,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que4,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que4,
+				.buf = (uint32_t *)tx_frag_list_que4,
 				.len = ARRAY_SIZE(tx_frag_list_que4),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que4,
+				.buf = (uint32_t *)tx_frame_list_que4,
 				.len = ARRAY_SIZE(tx_frame_list_que4),
 			}
 #endif
@@ -2351,12 +2351,12 @@ static struct eth_sam_dev_data eth0_data = {
 			.rx_frag_list = rx_frag_list_que5,
 #if GMAC_MULTIPLE_TX_PACKETS == 1
 			.tx_frag_list = {
-				.buf = (u32_t *)tx_frag_list_que5,
+				.buf = (uint32_t *)tx_frag_list_que5,
 				.len = ARRAY_SIZE(tx_frag_list_que5),
 			},
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 			.tx_frames = {
-				.buf = (u32_t *)tx_frame_list_que5,
+				.buf = (uint32_t *)tx_frame_list_que5,
 				.len = ARRAY_SIZE(tx_frame_list_que5),
 			}
 #endif
@@ -2400,7 +2400,7 @@ static int ptp_clock_sam_gmac_get(struct device *dev,
 	const struct eth_sam_dev_cfg *const cfg = DEV_CFG(ptp_context->eth_dev);
 	Gmac *gmac = cfg->regs;
 
-	tm->second = ((u64_t)(gmac->GMAC_TSH & 0xffff) << 32) | gmac->GMAC_TSL;
+	tm->second = ((uint64_t)(gmac->GMAC_TSH & 0xffff) << 32) | gmac->GMAC_TSL;
 	tm->nanosecond = gmac->GMAC_TN;
 
 	return 0;
diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h
index 6d68b8e4ac..e76b180b4f 100644
--- a/drivers/ethernet/eth_sam_gmac_priv.h
+++ b/drivers/ethernet/eth_sam_gmac_priv.h
@@ -209,24 +209,24 @@ enum queue_idx {
 
 /** Minimal ring buffer implementation */
 struct ring_buf {
-	u32_t *buf;
-	u16_t len;
-	u16_t head;
-	u16_t tail;
+	uint32_t *buf;
+	uint16_t len;
+	uint16_t head;
+	uint16_t tail;
 };
 
 /** Receive/transmit buffer descriptor */
 struct gmac_desc {
-	u32_t w0;
-	u32_t w1;
+	uint32_t w0;
+	uint32_t w1;
 };
 
 /** Ring list of receive/transmit buffer descriptors */
 struct gmac_desc_list {
 	struct gmac_desc *buf;
-	u16_t len;
-	u16_t head;
-	u16_t tail;
+	uint16_t len;
+	uint16_t head;
+	uint16_t tail;
 };
 
 /** GMAC Queue data */
@@ -249,11 +249,11 @@ struct gmac_queue {
 #endif
 
 	/** Number of RX frames dropped by the driver */
-	volatile u32_t err_rx_frames_dropped;
+	volatile uint32_t err_rx_frames_dropped;
 	/** Number of times receive queue was flushed */
-	volatile u32_t err_rx_flushed_count;
+	volatile uint32_t err_rx_flushed_count;
 	/** Number of times transmit queue was flushed */
-	volatile u32_t err_tx_flushed_count;
+	volatile uint32_t err_tx_flushed_count;
 
 	enum queue_idx que_idx;
 };
@@ -261,9 +261,9 @@ struct gmac_queue {
 /* Device constant configuration parameters */
 struct eth_sam_dev_cfg {
 	Gmac *regs;
-	u32_t periph_id;
+	uint32_t periph_id;
 	const struct soc_gpio_pin *pin_list;
-	u32_t pin_list_size;
+	uint32_t pin_list_size;
 	void (*config_func)(void);
 	struct phy_sam_gmac_dev phy;
 };
@@ -274,7 +274,7 @@ struct eth_sam_dev_data {
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
 	struct device *ptp_clock;
 #endif
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct k_delayed_work monitor_work;
 	bool link_up;
 	struct gmac_queue queue_list[GMAC_QUEUE_NUM];
diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c
index aec8bb6e8e..464b15a7e8 100644
--- a/drivers/ethernet/eth_smsc911x.c
+++ b/drivers/ethernet/eth_smsc911x.c
@@ -45,7 +45,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac[6];
+	uint8_t mac[6];
 #if defined(CONFIG_NET_STATISTICS_ETHERNET)
 	struct net_stats_eth stats;
 #endif
@@ -53,9 +53,9 @@ struct eth_context {
 
 /* SMSC911x helper functions */
 
-static int smsc_mac_regread(u8_t reg, u32_t *val)
+static int smsc_mac_regread(uint8_t reg, uint32_t *val)
 {
-	u32_t cmd = MAC_CSR_CMD_BUSY | MAC_CSR_CMD_READ | reg;
+	uint32_t cmd = MAC_CSR_CMD_BUSY | MAC_CSR_CMD_READ | reg;
 
 	SMSC9220->MAC_CSR_CMD = cmd;
 
@@ -67,9 +67,9 @@ static int smsc_mac_regread(u8_t reg, u32_t *val)
 	return 0;
 }
 
-static int smsc_mac_regwrite(u8_t reg, u32_t val)
+static int smsc_mac_regwrite(uint8_t reg, uint32_t val)
 {
-	u32_t cmd = MAC_CSR_CMD_BUSY | MAC_CSR_CMD_WRITE | reg;
+	uint32_t cmd = MAC_CSR_CMD_BUSY | MAC_CSR_CMD_WRITE | reg;
 
 	SMSC9220->MAC_CSR_DATA = val;
 
@@ -81,10 +81,10 @@ static int smsc_mac_regwrite(u8_t reg, u32_t val)
 	return 0;
 }
 
-int smsc_phy_regread(u8_t regoffset, u32_t *data)
+int smsc_phy_regread(uint8_t regoffset, uint32_t *data)
 {
-	u32_t val = 0U;
-	u32_t phycmd = 0U;
+	uint32_t val = 0U;
+	uint32_t phycmd = 0U;
 	unsigned int time_out = REG_WRITE_TIMEOUT;
 
 	if (smsc_mac_regread(SMSC9220_MAC_MII_ACC, &val) < 0) {
@@ -126,10 +126,10 @@ int smsc_phy_regread(u8_t regoffset, u32_t *data)
 	return 0;
 }
 
-int smsc_phy_regwrite(u8_t regoffset, u32_t data)
+int smsc_phy_regwrite(uint8_t regoffset, uint32_t data)
 {
-	u32_t val = 0U;
-	u32_t phycmd = 0U;
+	uint32_t val = 0U;
+	uint32_t phycmd = 0U;
 	unsigned int time_out = REG_WRITE_TIMEOUT;
 
 	if (smsc_mac_regread(SMSC9220_MAC_MII_ACC, &val) < 0) {
@@ -168,9 +168,9 @@ int smsc_phy_regwrite(u8_t regoffset, u32_t data)
 	return 0;
 }
 
-static int smsc_read_mac_address(u8_t *mac)
+static int smsc_read_mac_address(uint8_t *mac)
 {
-	u32_t tmp;
+	uint32_t tmp;
 	int res;
 
 	res = smsc_mac_regread(SMSC9220_MAC_ADDRL, &tmp);
@@ -178,25 +178,25 @@ static int smsc_read_mac_address(u8_t *mac)
 		return res;
 	}
 
-	mac[0] = (u8_t)(tmp >> 0);
-	mac[1] = (u8_t)(tmp >> 8);
-	mac[2] = (u8_t)(tmp >> 16);
-	mac[3] = (u8_t)(tmp >> 24);
+	mac[0] = (uint8_t)(tmp >> 0);
+	mac[1] = (uint8_t)(tmp >> 8);
+	mac[2] = (uint8_t)(tmp >> 16);
+	mac[3] = (uint8_t)(tmp >> 24);
 
 	res = smsc_mac_regread(SMSC9220_MAC_ADDRH, &tmp);
 	if (res < 0) {
 		return res;
 	}
 
-	mac[4] = (u8_t)(tmp >> 0);
-	mac[5] = (u8_t)(tmp >> 8);
+	mac[4] = (uint8_t)(tmp >> 0);
+	mac[5] = (uint8_t)(tmp >> 8);
 
 	return 0;
 }
 
 static int smsc_check_id(void)
 {
-	u32_t id = SMSC9220->ID_REV;
+	uint32_t id = SMSC9220->ID_REV;
 
 	/* If bottom and top halves of the word are the same,
 	 * the hardware is (likely) not present.
@@ -255,7 +255,7 @@ void smsc_init_irqs(void)
 
 static int smsc_check_phy(void)
 {
-	u32_t phyid1, phyid2;
+	uint32_t phyid1, phyid2;
 
 	if (smsc_phy_regread(SMSC9220_PHY_ID1, &phyid1)) {
 		return -1;
@@ -271,7 +271,7 @@ static int smsc_check_phy(void)
 
 int smsc_reset_phy(void)
 {
-	u32_t val;
+	uint32_t val;
 
 	if (smsc_phy_regread(SMSC9220_PHY_BCONTROL, &val)) {
 		return -1;
@@ -291,7 +291,7 @@ int smsc_reset_phy(void)
  */
 void smsc_advertise_caps(void)
 {
-	u32_t aneg_adv = 0U;
+	uint32_t aneg_adv = 0U;
 
 	smsc_phy_regread(SMSC9220_PHY_ANEG_ADV, &aneg_adv);
 	aneg_adv |= 0xDE0;
@@ -302,8 +302,8 @@ void smsc_advertise_caps(void)
 
 void smsc_establish_link(void)
 {
-	u32_t bcr = 0U;
-	u32_t hw_cfg = 0U;
+	uint32_t bcr = 0U;
+	uint32_t hw_cfg = 0U;
 
 	smsc_phy_regread(SMSC9220_PHY_BCONTROL, &bcr);
 	bcr |= (1 << 12) | (1 << 9);
@@ -323,7 +323,7 @@ static inline void smsc_enable_xmit(void)
 
 void smsc_enable_mac_xmit(void)
 {
-	u32_t mac_cr = 0U;
+	uint32_t mac_cr = 0U;
 
 	smsc_mac_regread(SMSC9220_MAC_CR, &mac_cr);
 
@@ -335,7 +335,7 @@ void smsc_enable_mac_xmit(void)
 
 void smsc_enable_mac_recv(void)
 {
-	u32_t mac_cr = 0U;
+	uint32_t mac_cr = 0U;
 
 	smsc_mac_regread(SMSC9220_MAC_CR, &mac_cr);
 	mac_cr |= (1 << 2);     /* Recv enable */
@@ -446,9 +446,9 @@ static void eth_initialize(struct net_if *iface)
 	ethernet_init(iface);
 }
 
-static int smsc_write_tx_fifo(const u8_t *buf, u32_t len, bool is_last)
+static int smsc_write_tx_fifo(const uint8_t *buf, uint32_t len, bool is_last)
 {
-	u32_t *buf32;
+	uint32_t *buf32;
 
 	__ASSERT_NO_MSG(((uintptr_t)buf & 3) == 0);
 
@@ -462,7 +462,7 @@ static int smsc_write_tx_fifo(const u8_t *buf, u32_t len, bool is_last)
 		return -1;
 	}
 
-	buf32 = (u32_t *)buf;
+	buf32 = (uint32_t *)buf;
 	len /= 4U;
 	do {
 		SMSC9220->TX_DATA_PORT = *buf32++;
@@ -473,10 +473,10 @@ static int smsc_write_tx_fifo(const u8_t *buf, u32_t len, bool is_last)
 
 static int eth_tx(struct device *dev, struct net_pkt *pkt)
 {
-	u16_t total_len = net_pkt_get_len(pkt);
-	static u8_t tx_buf[NET_ETH_MAX_FRAME_SIZE] __aligned(4);
-	u32_t txcmd_a, txcmd_b;
-	u32_t tx_stat;
+	uint16_t total_len = net_pkt_get_len(pkt);
+	static uint8_t tx_buf[NET_ETH_MAX_FRAME_SIZE] __aligned(4);
+	uint32_t txcmd_a, txcmd_b;
+	uint32_t tx_stat;
 	int res;
 
 	txcmd_a = (1/*is_first_segment*/ << 13) | (1/*is_last_segment*/ << 12)
@@ -534,9 +534,9 @@ static inline void smsc_wait_discard_pkt(void)
 	}
 }
 
-static int smsc_read_rx_fifo(struct net_pkt *pkt, u32_t len)
+static int smsc_read_rx_fifo(struct net_pkt *pkt, uint32_t len)
 {
-	u32_t buf32;
+	uint32_t buf32;
 
 	__ASSERT_NO_MSG((len & 3) == 0U && len >= 4U);
 
@@ -545,7 +545,7 @@ static int smsc_read_rx_fifo(struct net_pkt *pkt, u32_t len)
 	do {
 		buf32 = SMSC9220->RX_DATA_PORT;
 
-		if (net_pkt_write(pkt, &buf32, sizeof(u32_t))) {
+		if (net_pkt_write(pkt, &buf32, sizeof(uint32_t))) {
 			return -1;
 		}
 	} while (--len);
@@ -553,11 +553,11 @@ static int smsc_read_rx_fifo(struct net_pkt *pkt, u32_t len)
 	return 0;
 }
 
-static struct net_pkt *smsc_recv_pkt(struct device *dev, u32_t pkt_size)
+static struct net_pkt *smsc_recv_pkt(struct device *dev, uint32_t pkt_size)
 {
 	struct eth_context *context = dev->driver_data;
 	struct net_pkt *pkt;
-	u32_t rem_size;
+	uint32_t rem_size;
 
 	/* Round up to next DWORD size */
 	rem_size = (pkt_size + 3) & ~3;
@@ -580,7 +580,7 @@ static struct net_pkt *smsc_recv_pkt(struct device *dev, u32_t pkt_size)
 
 	/* Discard FCS */
 	{
-		u32_t __unused dummy = SMSC9220->RX_DATA_PORT;
+		uint32_t __unused dummy = SMSC9220->RX_DATA_PORT;
 	}
 
 	/* Adjust len of the last buf down for DWORD alignment */
@@ -594,7 +594,7 @@ static struct net_pkt *smsc_recv_pkt(struct device *dev, u32_t pkt_size)
 
 static void eth_smsc911x_isr(struct device *dev)
 {
-	u32_t int_status = SMSC9220->INT_STS;
+	uint32_t int_status = SMSC9220->INT_STS;
 	struct eth_context *context = dev->driver_data;
 
 	LOG_DBG("%s: INT_STS=%x INT_EN=%x", __func__,
@@ -602,11 +602,11 @@ static void eth_smsc911x_isr(struct device *dev)
 
 	if (int_status & BIT(SMSC9220_INTERRUPT_RXSTATUS_FIFO_LEVEL)) {
 		struct net_pkt *pkt;
-		u32_t pkt_size, val;
-		u32_t rx_stat;
+		uint32_t pkt_size, val;
+		uint32_t rx_stat;
 
 		val = SMSC9220->RX_FIFO_INF;
-		u32_t pkt_pending = BFIELD(val, RX_FIFO_INF_RXSUSED);
+		uint32_t pkt_pending = BFIELD(val, RX_FIFO_INF_RXSUSED);
 
 		LOG_DBG("in RX FIFO: pkts: %u, bytes: %u",
 			pkt_pending,
diff --git a/drivers/ethernet/eth_smsc911x_priv.h b/drivers/ethernet/eth_smsc911x_priv.h
index 6aeeefcecb..89e6ffe73d 100644
--- a/drivers/ethernet/eth_smsc911x_priv.h
+++ b/drivers/ethernet/eth_smsc911x_priv.h
@@ -39,9 +39,9 @@
 #define __IO
 #endif
 
-#define uint32_t u32_t
-#define uint16_t u16_t
-#define uint8_t u8_t
+#define uint32_t uint32_t
+#define uint16_t uint16_t
+#define uint8_t uint8_t
 
 #define GET_BITFIELD(val, lsb, msb) \
 	(((val) >> (lsb)) & ((1 << ((msb) - (lsb) + 1)) - 1))
diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c
index 21ce337ad9..12371042cc 100644
--- a/drivers/ethernet/eth_stellaris.c
+++ b/drivers/ethernet/eth_stellaris.c
@@ -22,8 +22,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 static void eth_stellaris_assign_mac(struct device *dev)
 {
-	u8_t mac_addr[6] = DT_INST_PROP(0, local_mac_address);
-	u32_t value = 0x0;
+	uint8_t mac_addr[6] = DT_INST_PROP(0, local_mac_address);
+	uint32_t value = 0x0;
 
 	value |= mac_addr[0];
 	value |= mac_addr[1] << 8;
@@ -48,7 +48,7 @@ static void eth_stellaris_flush(struct device *dev)
 	}
 }
 
-static void eth_stellaris_send_byte(struct device *dev, u8_t byte)
+static void eth_stellaris_send_byte(struct device *dev, uint8_t byte)
 {
 	struct eth_stellaris_runtime *dev_data = DEV_DATA(dev);
 
@@ -65,7 +65,7 @@ static int eth_stellaris_send(struct device *dev, struct net_pkt *pkt)
 {
 	struct eth_stellaris_runtime *dev_data = DEV_DATA(dev);
 	struct net_buf *frag;
-	u16_t i, data_len;
+	uint16_t i, data_len;
 
 	/* Frame transmission
 	 *
@@ -105,7 +105,7 @@ static int eth_stellaris_send(struct device *dev, struct net_pkt *pkt)
 static void eth_stellaris_rx_error(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
-	u32_t val;
+	uint32_t val;
 
 	eth_stats_update_errors_rx(iface);
 
@@ -123,9 +123,9 @@ static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev,
 {
 	int frame_len, bytes_left;
 	struct net_pkt *pkt;
-	u32_t reg_val;
-	u16_t count;
-	u8_t *data;
+	uint32_t reg_val;
+	uint16_t count;
+	uint8_t *data;
 
 	/*
 	 * The Ethernet frame received from the hardware has the
@@ -155,7 +155,7 @@ static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev,
 	 * ethernet frame.
 	 */
 	count = 2U;
-	data = (u8_t *)&reg_val + 2;
+	data = (uint8_t *)&reg_val + 2;
 	if (net_pkt_write(pkt, data, count)) {
 		goto error;
 	}
@@ -167,7 +167,7 @@ static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev,
 	for (; bytes_left > 7; bytes_left -= 4) {
 		reg_val = sys_read32(REG_MACDATA);
 		count = 4U;
-		data = (u8_t *)&reg_val;
+		data = (uint8_t *)&reg_val;
 		if (net_pkt_write(pkt, data, count)) {
 			goto error;
 		}
@@ -185,7 +185,7 @@ static struct net_pkt *eth_stellaris_rx_pkt(struct device *dev,
 		}
 
 		count = bytes_left - 4;
-		data = (u8_t *)&reg_val;
+		data = (uint8_t *)&reg_val;
 		if (net_pkt_write(pkt, data, count)) {
 			goto error;
 		}
@@ -233,7 +233,7 @@ static void eth_stellaris_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	struct eth_stellaris_runtime *dev_data = DEV_DATA(dev);
 	int isr_val = sys_read32(REG_MACRIS);
-	u32_t lock;
+	uint32_t lock;
 
 	lock = irq_lock();
 
@@ -299,7 +299,7 @@ static struct net_stats_eth *eth_stellaris_stats(struct device *dev)
 
 static int eth_stellaris_dev_init(struct device *dev)
 {
-	u32_t value;
+	uint32_t value;
 
 	/* Assign MAC address to Hardware */
 	eth_stellaris_assign_mac(dev);
diff --git a/drivers/ethernet/eth_stellaris_priv.h b/drivers/ethernet/eth_stellaris_priv.h
index 16240d6bbd..c0d523ca74 100644
--- a/drivers/ethernet/eth_stellaris_priv.h
+++ b/drivers/ethernet/eth_stellaris_priv.h
@@ -50,10 +50,10 @@
 
 struct eth_stellaris_runtime {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct k_sem tx_sem;
 	bool tx_err;
-	u32_t tx_word;
+	uint32_t tx_word;
 	int tx_pos;
 #if defined(CONFIG_NET_STATISTICS_ETHERNET)
 	struct net_stats_eth stats;
@@ -63,9 +63,9 @@ struct eth_stellaris_runtime {
 typedef void (*eth_stellaris_config_irq_t)(struct device *dev);
 
 struct eth_stellaris_config {
-	u32_t mac_base;
-	u32_t sys_ctrl_base;
-	u32_t irq_num;
+	uint32_t mac_base;
+	uint32_t sys_ctrl_base;
+	uint32_t irq_num;
 	eth_stellaris_config_irq_t config_func;
 };
 
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index fed4039d3c..30a6807890 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -36,19 +36,19 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 	    DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 static ETH_DMADescTypeDef dma_rx_desc_tab[ETH_RXBUFNB] __dtcm_noinit_section;
 static ETH_DMADescTypeDef dma_tx_desc_tab[ETH_TXBUFNB] __dtcm_noinit_section;
-static u8_t dma_rx_buffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __dtcm_noinit_section;
-static u8_t dma_tx_buffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __dtcm_noinit_section;
+static uint8_t dma_rx_buffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __dtcm_noinit_section;
+static uint8_t dma_tx_buffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __dtcm_noinit_section;
 #else
 static ETH_DMADescTypeDef dma_rx_desc_tab[ETH_RXBUFNB] __aligned(4);
 static ETH_DMADescTypeDef dma_tx_desc_tab[ETH_TXBUFNB] __aligned(4);
-static u8_t dma_rx_buffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __aligned(4);
-static u8_t dma_tx_buffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __aligned(4);
+static uint8_t dma_rx_buffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __aligned(4);
+static uint8_t dma_tx_buffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __aligned(4);
 #endif /* CONFIG_ETH_STM32_HAL_USE_DTCM_FOR_DMA_BUFFER */
 
 #if defined(CONFIG_NET_L2_CANBUS_ETH_TRANSLATOR)
 #include <net/can.h>
 
-static void set_mac_to_translator_addr(u8_t *mac_addr)
+static void set_mac_to_translator_addr(uint8_t *mac_addr)
 {
 	/* Set the last 14 bit to the translator  link layer address to avoid
 	 * address collissions with the 6LoCAN address range
@@ -58,7 +58,7 @@ static void set_mac_to_translator_addr(u8_t *mac_addr)
 }
 
 static void enable_canbus_eth_translator_filter(ETH_HandleTypeDef *heth,
-						u8_t *mac_addr)
+						uint8_t *mac_addr)
 {
 	heth->Instance->MACA1LR = (mac_addr[3] << 24U) | (mac_addr[2] << 16U) |
 				  (mac_addr[1] << 8U) | mac_addr[0];
@@ -72,7 +72,7 @@ static inline void disable_mcast_filter(ETH_HandleTypeDef *heth)
 {
 	__ASSERT_NO_MSG(heth != NULL);
 
-	u32_t tmp = heth->Instance->MACFFR;
+	uint32_t tmp = heth->Instance->MACFFR;
 
 	/* disable multicast filtering */
 	tmp &= ~(ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE |
@@ -96,9 +96,9 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 {
 	struct eth_stm32_hal_dev_data *dev_data = DEV_DATA(dev);
 	ETH_HandleTypeDef *heth;
-	u8_t *dma_buffer;
+	uint8_t *dma_buffer;
 	int res;
-	u16_t total_len;
+	uint16_t total_len;
 	__IO ETH_DMADescTypeDef *dma_tx_desc;
 
 	__ASSERT_NO_MSG(pkt != NULL);
@@ -118,11 +118,11 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 	}
 
 	dma_tx_desc = heth->TxDesc;
-	while ((dma_tx_desc->Status & ETH_DMATXDESC_OWN) != (u32_t)RESET) {
+	while ((dma_tx_desc->Status & ETH_DMATXDESC_OWN) != (uint32_t)RESET) {
 		k_yield();
 	}
 
-	dma_buffer = (u8_t *)(dma_tx_desc->Buffer1Addr);
+	dma_buffer = (uint8_t *)(dma_tx_desc->Buffer1Addr);
 
 	if (net_pkt_read(pkt, dma_buffer, total_len)) {
 		res = -EIO;
@@ -138,7 +138,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 	/* When Transmit Underflow flag is set, clear it and issue a
 	 * Transmit Poll Demand to resume transmission.
 	 */
-	if ((heth->Instance->DMASR & ETH_DMASR_TUS) != (u32_t)RESET) {
+	if ((heth->Instance->DMASR & ETH_DMASR_TUS) != (uint32_t)RESET) {
 		/* Clear TUS ETHERNET DMA flag */
 		heth->Instance->DMASR = ETH_DMASR_TUS;
 		/* Resume DMA transmission*/
@@ -155,7 +155,7 @@ error:
 }
 
 static struct net_if *get_iface(struct eth_stm32_hal_dev_data *ctx,
-				u16_t vlan_tag)
+				uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -173,14 +173,14 @@ static struct net_if *get_iface(struct eth_stm32_hal_dev_data *ctx,
 #endif
 }
 
-static struct net_pkt *eth_rx(struct device *dev, u16_t *vlan_tag)
+static struct net_pkt *eth_rx(struct device *dev, uint16_t *vlan_tag)
 {
 	struct eth_stm32_hal_dev_data *dev_data;
 	ETH_HandleTypeDef *heth;
 	__IO ETH_DMADescTypeDef *dma_rx_desc;
 	struct net_pkt *pkt;
-	u16_t total_len;
-	u8_t *dma_buffer;
+	uint16_t total_len;
+	uint8_t *dma_buffer;
 	int i;
 
 	__ASSERT_NO_MSG(dev != NULL);
@@ -197,7 +197,7 @@ static struct net_pkt *eth_rx(struct device *dev, u16_t *vlan_tag)
 	}
 
 	total_len = heth->RxFrameInfos.length;
-	dma_buffer = (u8_t *)heth->RxFrameInfos.buffer;
+	dma_buffer = (uint8_t *)heth->RxFrameInfos.buffer;
 
 	pkt = net_pkt_rx_alloc_with_buffer(get_iface(dev_data, *vlan_tag),
 					   total_len, AF_UNSPEC, 0, K_NO_WAIT);
@@ -230,7 +230,7 @@ release_desc:
 	/* When Rx Buffer unavailable flag is set: clear it
 	 * and resume reception.
 	 */
-	if ((heth->Instance->DMASR & ETH_DMASR_RBUS) != (u32_t)RESET) {
+	if ((heth->Instance->DMASR & ETH_DMASR_RBUS) != (uint32_t)RESET) {
 		/* Clear RBUS ETHERNET DMA flag */
 		heth->Instance->DMASR = ETH_DMASR_RBUS;
 		/* Resume DMA reception */
@@ -267,12 +267,12 @@ release_desc:
 
 static void rx_thread(void *arg1, void *unused1, void *unused2)
 {
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct device *dev;
 	struct eth_stm32_hal_dev_data *dev_data;
 	struct net_pkt *pkt;
 	int res;
-	u32_t status;
+	uint32_t status;
 
 	__ASSERT_NO_MSG(arg1 != NULL);
 	ARG_UNUSED(unused1);
@@ -361,7 +361,7 @@ void HAL_ETH_RxCpltCallback(ETH_HandleTypeDef *heth_handle)
 }
 
 #if defined(CONFIG_ETH_STM32_HAL_RANDOM_MAC)
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	gen_random_mac(mac_addr, ST_OUI_B0, ST_OUI_B1, ST_OUI_B2);
 }
@@ -372,7 +372,7 @@ static int eth_initialize(struct device *dev)
 	struct eth_stm32_hal_dev_data *dev_data;
 	const struct eth_stm32_hal_dev_cfg *cfg;
 	ETH_HandleTypeDef *heth;
-	u8_t hal_ret;
+	uint8_t hal_ret;
 	int ret = 0;
 
 	__ASSERT_NO_MSG(dev != NULL);
diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h
index ba6605a0b0..24605975b0 100644
--- a/drivers/ethernet/eth_stm32_hal_priv.h
+++ b/drivers/ethernet/eth_stm32_hal_priv.h
@@ -32,7 +32,7 @@ struct eth_stm32_hal_dev_cfg {
 /* Device run time data */
 struct eth_stm32_hal_dev_data {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	ETH_HandleTypeDef heth;
 	/* clock device */
 	struct device *clock;
diff --git a/drivers/ethernet/phy_gecko.c b/drivers/ethernet/phy_gecko.c
index d08fed6f6d..6ea7decefd 100644
--- a/drivers/ethernet/phy_gecko.c
+++ b/drivers/ethernet/phy_gecko.c
@@ -36,7 +36,7 @@ static void mdio_bus_disable(ETH_TypeDef *eth)
 /* Wait PHY operation complete. */
 static int mdio_bus_wait(ETH_TypeDef *eth)
 {
-	u32_t retries = 100U;  /* will wait up to 1 s */
+	uint32_t retries = 100U;  /* will wait up to 1 s */
 
 	while (!(eth->NETWORKSTATUS & ETH_NETWORKSTATUS_MANDONE)) {
 		if (retries-- == 0U) {
@@ -51,8 +51,8 @@ static int mdio_bus_wait(ETH_TypeDef *eth)
 }
 
 /* Send command to PHY over MDIO serial bus */
-static int mdio_bus_send(ETH_TypeDef *eth, u8_t phy_addr, u8_t reg_addr,
-			 u8_t rw, u16_t data)
+static int mdio_bus_send(ETH_TypeDef *eth, uint8_t phy_addr, uint8_t reg_addr,
+			 uint8_t rw, uint16_t data)
 {
 	int retval;
 
@@ -77,11 +77,11 @@ static int mdio_bus_send(ETH_TypeDef *eth, u8_t phy_addr, u8_t reg_addr,
 }
 
 /* Read PHY register. */
-static int phy_read(const struct phy_gecko_dev *phy, u8_t reg_addr,
-		    u32_t *value)
+static int phy_read(const struct phy_gecko_dev *phy, uint8_t reg_addr,
+		    uint32_t *value)
 {
 	ETH_TypeDef *const eth = phy->regs;
-	u8_t phy_addr = phy->address;
+	uint8_t phy_addr = phy->address;
 	int retval;
 
 	retval = mdio_bus_send(eth, phy_addr, reg_addr, 1, 0);
@@ -96,11 +96,11 @@ static int phy_read(const struct phy_gecko_dev *phy, u8_t reg_addr,
 }
 
 /* Write PHY register. */
-static int phy_write(const struct phy_gecko_dev *phy, u8_t reg_addr,
-		     u32_t value)
+static int phy_write(const struct phy_gecko_dev *phy, uint8_t reg_addr,
+		     uint32_t value)
 {
 	ETH_TypeDef *const eth = phy->regs;
-	u8_t phy_addr = phy->address;
+	uint8_t phy_addr = phy->address;
 
 	return mdio_bus_send(eth, phy_addr, reg_addr, 0, value);
 }
@@ -108,8 +108,8 @@ static int phy_write(const struct phy_gecko_dev *phy, u8_t reg_addr,
 /* Issue a PHY soft reset. */
 static int phy_soft_reset(const struct phy_gecko_dev *phy)
 {
-	u32_t phy_reg;
-	u32_t retries = 12U;
+	uint32_t phy_reg;
+	uint32_t retries = 12U;
 	int retval;
 
 	/* Issue a soft reset */
@@ -162,11 +162,11 @@ int phy_gecko_init(const struct phy_gecko_dev *phy)
 	return 0;
 }
 
-u32_t phy_gecko_id_get(const struct phy_gecko_dev *phy)
+uint32_t phy_gecko_id_get(const struct phy_gecko_dev *phy)
 {
 	ETH_TypeDef *const eth = phy->regs;
-	u32_t phy_reg;
-	u32_t phy_id;
+	uint32_t phy_reg;
+	uint32_t phy_id;
 
 	mdio_bus_enable(eth);
 
@@ -188,13 +188,13 @@ u32_t phy_gecko_id_get(const struct phy_gecko_dev *phy)
 }
 
 int phy_gecko_auto_negotiate(const struct phy_gecko_dev *phy,
-				u32_t *status)
+				uint32_t *status)
 {
 	ETH_TypeDef *const eth = phy->regs;
-	u32_t val;
-	u32_t ability_adv;
-	u32_t ability_rcvd;
-	u32_t retries = PHY_AUTONEG_TIMEOUT_MS / 100;
+	uint32_t val;
+	uint32_t ability_adv;
+	uint32_t ability_rcvd;
+	uint32_t retries = PHY_AUTONEG_TIMEOUT_MS / 100;
 	int retval;
 
 	mdio_bus_enable(eth);
@@ -267,7 +267,7 @@ auto_negotiate_exit:
 bool phy_gecko_is_linked(const struct phy_gecko_dev *phy)
 {
 	ETH_TypeDef *const eth = phy->regs;
-	u32_t phy_reg;
+	uint32_t phy_reg;
 	bool phy_linked = false;
 
 	mdio_bus_enable(eth);
diff --git a/drivers/ethernet/phy_gecko.h b/drivers/ethernet/phy_gecko.h
index 554f0c7acb..f5f5f8a90f 100644
--- a/drivers/ethernet/phy_gecko.h
+++ b/drivers/ethernet/phy_gecko.h
@@ -17,7 +17,7 @@ extern "C" {
 
 struct phy_gecko_dev {
 	ETH_TypeDef *regs;
-	u8_t address;
+	uint8_t address;
 };
 
 /**
@@ -36,14 +36,14 @@ int phy_gecko_init(const struct phy_gecko_dev *phy);
  * @return 0 on success or a negative error value on failure
  */
 int phy_gecko_auto_negotiate(const struct phy_gecko_dev *phy,
-				u32_t *status);
+				uint32_t *status);
 /**
  * @brief Get PHY ID value.
  *
  * @param phy PHY instance
  * @return PHY ID value or 0xFFFFFFFF on failure
  */
-u32_t phy_gecko_id_get(const struct phy_gecko_dev *phy);
+uint32_t phy_gecko_id_get(const struct phy_gecko_dev *phy);
 
 /**
  * @brief Get PHY linked status.
diff --git a/drivers/ethernet/phy_sam_gmac.c b/drivers/ethernet/phy_sam_gmac.c
index da2b1298bf..84f1aabbf1 100644
--- a/drivers/ethernet/phy_sam_gmac.c
+++ b/drivers/ethernet/phy_sam_gmac.c
@@ -43,7 +43,7 @@ static void mdio_bus_disable(Gmac *gmac)
 /* Wait PHY operation complete. */
 static int mdio_bus_wait(Gmac *gmac)
 {
-	u32_t retries = 100U;  /* will wait up to 1 s */
+	uint32_t retries = 100U;  /* will wait up to 1 s */
 
 	while (!(gmac->GMAC_NSR & GMAC_NSR_IDLE))   {
 		if (retries-- == 0U) {
@@ -58,8 +58,8 @@ static int mdio_bus_wait(Gmac *gmac)
 }
 
 /* Send command to PHY over MDIO serial bus */
-static int mdio_bus_send(Gmac *gmac, u8_t phy_addr, u8_t reg_addr,
-			 u8_t rw, u16_t data)
+static int mdio_bus_send(Gmac *gmac, uint8_t phy_addr, uint8_t reg_addr,
+			 uint8_t rw, uint16_t data)
 {
 	int retval;
 
@@ -81,11 +81,11 @@ static int mdio_bus_send(Gmac *gmac, u8_t phy_addr, u8_t reg_addr,
 }
 
 /* Read PHY register. */
-static int phy_read(const struct phy_sam_gmac_dev *phy, u8_t reg_addr,
-		    u32_t *value)
+static int phy_read(const struct phy_sam_gmac_dev *phy, uint8_t reg_addr,
+		    uint32_t *value)
 {
 	Gmac *const gmac = phy->regs;
-	u8_t phy_addr = phy->address;
+	uint8_t phy_addr = phy->address;
 	int retval;
 
 	retval = mdio_bus_send(gmac, phy_addr, reg_addr, 1, 0);
@@ -100,11 +100,11 @@ static int phy_read(const struct phy_sam_gmac_dev *phy, u8_t reg_addr,
 }
 
 /* Write PHY register. */
-static int phy_write(const struct phy_sam_gmac_dev *phy, u8_t reg_addr,
-		     u32_t value)
+static int phy_write(const struct phy_sam_gmac_dev *phy, uint8_t reg_addr,
+		     uint32_t value)
 {
 	Gmac *const gmac = phy->regs;
-	u8_t phy_addr = phy->address;
+	uint8_t phy_addr = phy->address;
 
 	return mdio_bus_send(gmac, phy_addr, reg_addr, 0, value);
 }
@@ -112,8 +112,8 @@ static int phy_write(const struct phy_sam_gmac_dev *phy, u8_t reg_addr,
 /* Issue a PHY soft reset. */
 static int phy_soft_reset(const struct phy_sam_gmac_dev *phy)
 {
-	u32_t phy_reg;
-	u32_t retries = 12U;
+	uint32_t phy_reg;
+	uint32_t retries = 12U;
 	int retval;
 
 	/* Issue a soft reset */
@@ -166,11 +166,11 @@ int phy_sam_gmac_init(const struct phy_sam_gmac_dev *phy)
 	return 0;
 }
 
-u32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy)
+uint32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy)
 {
 	Gmac *const gmac = phy->regs;
-	u32_t phy_reg;
-	u32_t phy_id;
+	uint32_t phy_reg;
+	uint32_t phy_id;
 
 	mdio_bus_enable(gmac);
 
@@ -194,7 +194,7 @@ u32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy)
 bool phy_sam_gmac_link_status_get(const struct phy_sam_gmac_dev *phy)
 {
 	Gmac * const gmac = phy->regs;
-	u32_t bmsr;
+	uint32_t bmsr;
 
 	mdio_bus_enable(gmac);
 
@@ -208,13 +208,13 @@ bool phy_sam_gmac_link_status_get(const struct phy_sam_gmac_dev *phy)
 }
 
 int phy_sam_gmac_auto_negotiate(const struct phy_sam_gmac_dev *phy,
-				u32_t *status)
+				uint32_t *status)
 {
 	Gmac *const gmac = phy->regs;
-	u32_t val;
-	u32_t ability_adv;
-	u32_t ability_rcvd;
-	u32_t retries = PHY_AUTONEG_TIMEOUT_MS / 100;
+	uint32_t val;
+	uint32_t ability_adv;
+	uint32_t ability_rcvd;
+	uint32_t retries = PHY_AUTONEG_TIMEOUT_MS / 100;
 	int retval;
 
 	mdio_bus_enable(gmac);
diff --git a/drivers/ethernet/phy_sam_gmac.h b/drivers/ethernet/phy_sam_gmac.h
index d721e5afd0..3d6c881a4d 100644
--- a/drivers/ethernet/phy_sam_gmac.h
+++ b/drivers/ethernet/phy_sam_gmac.h
@@ -24,7 +24,7 @@ extern "C" {
 
 struct phy_sam_gmac_dev {
 	Gmac *regs;
-	u8_t address;
+	uint8_t address;
 };
 
 /**
@@ -43,7 +43,7 @@ int phy_sam_gmac_init(const struct phy_sam_gmac_dev *phy);
  * @return 0 on success or a negative error value on failure
  */
 int phy_sam_gmac_auto_negotiate(const struct phy_sam_gmac_dev *phy,
-				u32_t *status);
+				uint32_t *status);
 
 /**
  * @brief Get PHY ID value.
@@ -51,7 +51,7 @@ int phy_sam_gmac_auto_negotiate(const struct phy_sam_gmac_dev *phy,
  * @param phy PHY instance
  * @return PHY ID value or 0xFFFFFFFF on failure
  */
-u32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy);
+uint32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy);
 
 /**
  * @brief Get PHY link status.
diff --git a/drivers/flash/flash_gecko.c b/drivers/flash/flash_gecko.c
index e2539dc1e7..9fb7a2f4e4 100644
--- a/drivers/flash/flash_gecko.c
+++ b/drivers/flash/flash_gecko.c
@@ -28,8 +28,8 @@ struct flash_gecko_data {
 #define DEV_DATA(dev) \
 	((struct flash_gecko_data *const)(dev)->driver_data)
 
-static bool write_range_is_valid(off_t offset, u32_t size);
-static bool read_range_is_valid(off_t offset, u32_t size);
+static bool write_range_is_valid(off_t offset, uint32_t size);
+static bool read_range_is_valid(off_t offset, uint32_t size);
 static int erase_flash_block(off_t offset, size_t size);
 
 static int flash_gecko_read(struct device *dev, off_t offset, void *data,
@@ -43,7 +43,7 @@ static int flash_gecko_read(struct device *dev, off_t offset, void *data,
 		return 0;
 	}
 
-	memcpy(data, (u8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, size);
+	memcpy(data, (uint8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, size);
 
 	return 0;
 }
@@ -66,7 +66,7 @@ static int flash_gecko_write(struct device *dev, off_t offset,
 
 	k_sem_take(&dev_data->mutex, K_FOREVER);
 
-	address = (u8_t *)CONFIG_FLASH_BASE_ADDRESS + offset;
+	address = (uint8_t *)CONFIG_FLASH_BASE_ADDRESS + offset;
 	msc_ret = MSC_WriteWord(address, data, size);
 	if (msc_ret < 0) {
 		ret = -EIO;
@@ -132,14 +132,14 @@ static int flash_gecko_write_protection(struct device *dev, bool enable)
  * - A flash address to write to must be aligned to words.
  * - Number of bytes to write must be divisible by 4.
  */
-static bool write_range_is_valid(off_t offset, u32_t size)
+static bool write_range_is_valid(off_t offset, uint32_t size)
 {
 	return read_range_is_valid(offset, size)
-		&& (offset % sizeof(u32_t) == 0)
+		&& (offset % sizeof(uint32_t) == 0)
 		&& (size % 4 == 0U);
 }
 
-static bool read_range_is_valid(off_t offset, u32_t size)
+static bool read_range_is_valid(off_t offset, uint32_t size)
 {
 	return (offset + size) <= (CONFIG_FLASH_SIZE * 1024);
 }
@@ -151,7 +151,7 @@ static int erase_flash_block(off_t offset, size_t size)
 	int ret = 0;
 
 	for (off_t tmp = offset; tmp < offset + size; tmp += FLASH_PAGE_SIZE) {
-		address = (u8_t *)CONFIG_FLASH_BASE_ADDRESS + tmp;
+		address = (uint8_t *)CONFIG_FLASH_BASE_ADDRESS + tmp;
 		msc_ret = MSC_ErasePage(address);
 		if (msc_ret < 0) {
 			ret = -EIO;
diff --git a/drivers/flash/flash_handlers.c b/drivers/flash/flash_handlers.c
index 5158453f5e..dde1768943 100644
--- a/drivers/flash/flash_handlers.c
+++ b/drivers/flash/flash_handlers.c
@@ -55,7 +55,7 @@ static inline int z_vrfy_flash_get_page_info_by_offs(struct device *dev,
 #include <syscalls/flash_get_page_info_by_offs_mrsh.c>
 
 static inline int z_vrfy_flash_get_page_info_by_idx(struct device *dev,
-					 u32_t idx,
+					 uint32_t idx,
 					 struct flash_pages_info *info)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_FLASH(dev, page_layout));
diff --git a/drivers/flash/flash_page_layout.c b/drivers/flash/flash_page_layout.c
index 1ac9f21605..0b579006bf 100644
--- a/drivers/flash/flash_page_layout.c
+++ b/drivers/flash/flash_page_layout.c
@@ -13,7 +13,7 @@ static int flash_get_page_info(struct device *dev, off_t offs,
 	const struct flash_pages_layout *layout;
 	size_t page_count = 0;
 	off_t group_offs = 0;
-	u32_t num_in_group;
+	uint32_t num_in_group;
 	off_t end = 0;
 	size_t layout_size;
 
@@ -58,7 +58,7 @@ int z_impl_flash_get_page_info_by_offs(struct device *dev, off_t offs,
 	return flash_get_page_info(dev, offs, true, info);
 }
 
-int z_impl_flash_get_page_info_by_idx(struct device *dev, u32_t page_index,
+int z_impl_flash_get_page_info_by_idx(struct device *dev, uint32_t page_index,
 				     struct flash_pages_info *info)
 {
 	return flash_get_page_info(dev, page_index, false, info);
diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c
index f5403ae88b..c2f923edfd 100644
--- a/drivers/flash/flash_sam.c
+++ b/drivers/flash/flash_sam.c
@@ -91,8 +91,8 @@ static int flash_sam_wait_ready(struct device *dev)
 {
 	Efc *const efc = DEV_CFG(dev)->regs;
 
-	u64_t timeout_time = k_uptime_get() + SAM_FLASH_TIMEOUT_MS;
-	u32_t fsr;
+	uint64_t timeout_time = k_uptime_get() + SAM_FLASH_TIMEOUT_MS;
+	uint32_t fsr;
 
 	do {
 		fsr = efc->EEFC_FSR;
@@ -129,8 +129,8 @@ static int flash_sam_write_page(struct device *dev, off_t offset,
 				const void *data, size_t len)
 {
 	Efc *const efc = DEV_CFG(dev)->regs;
-	const u32_t *src = data;
-	u32_t *dst = (u32_t *)((u8_t *)CONFIG_FLASH_BASE_ADDRESS + offset);
+	const uint32_t *src = data;
+	uint32_t *dst = (uint32_t *)((uint8_t *)CONFIG_FLASH_BASE_ADDRESS + offset);
 
 	LOG_DBG("offset = 0x%lx, len = %zu", (long)offset, len);
 
@@ -155,7 +155,7 @@ static int flash_sam_write(struct device *dev, off_t offset,
 			    const void *data, size_t len)
 {
 	int rc;
-	const u8_t *data8 = data;
+	const uint8_t *data8 = data;
 
 	LOG_DBG("offset = 0x%lx, len = %zu", (long)offset, len);
 
@@ -219,7 +219,7 @@ static int flash_sam_read(struct device *dev, off_t offset, void *data,
 		return -EINVAL;
 	}
 
-	memcpy(data, (u8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, len);
+	memcpy(data, (uint8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, len);
 
 	return 0;
 }
diff --git a/drivers/flash/flash_sam0.c b/drivers/flash/flash_sam0.c
index 0edfb4aaed..b611b64d38 100644
--- a/drivers/flash/flash_sam0.c
+++ b/drivers/flash/flash_sam0.c
@@ -43,11 +43,11 @@ LOG_MODULE_REGISTER(flash_sam0);
 
 #define PAGES_PER_ROW (ROW_SIZE / FLASH_PAGE_SIZE)
 
-#define FLASH_MEM(_a) ((u32_t *)((u8_t *)((_a) + CONFIG_FLASH_BASE_ADDRESS)))
+#define FLASH_MEM(_a) ((uint32_t *)((uint8_t *)((_a) + CONFIG_FLASH_BASE_ADDRESS)))
 
 struct flash_sam0_data {
 #if CONFIG_SOC_FLASH_SAM0_EMULATE_BYTE_PAGES
-	u8_t buf[ROW_SIZE];
+	uint8_t buf[ROW_SIZE];
 	off_t offset;
 #endif
 
@@ -133,9 +133,9 @@ static int flash_sam0_check_status(off_t offset)
 static int flash_sam0_write_page(struct device *dev, off_t offset,
 				 const void *data)
 {
-	const u32_t *src = data;
-	const u32_t *end = src + FLASH_PAGE_SIZE / sizeof(*src);
-	u32_t *dst = FLASH_MEM(offset);
+	const uint32_t *src = data;
+	const uint32_t *end = src + FLASH_PAGE_SIZE / sizeof(*src);
+	uint32_t *dst = FLASH_MEM(offset);
 	int err;
 
 #ifdef NVMCTRL_CTRLA_CMD_PBC
@@ -147,7 +147,7 @@ static int flash_sam0_write_page(struct device *dev, off_t offset,
 
 	/* Ensure writes happen 32 bits at a time. */
 	for (; src != end; src++, dst++) {
-		*dst = UNALIGNED_GET((u32_t *)src);
+		*dst = UNALIGNED_GET((uint32_t *)src);
 	}
 
 #ifdef NVMCTRL_CTRLA_CMD_WP
@@ -216,7 +216,7 @@ static int flash_sam0_write(struct device *dev, off_t offset,
 			    const void *data, size_t len)
 {
 	struct flash_sam0_data *ctx = dev->driver_data;
-	const u8_t *pdata = data;
+	const uint8_t *pdata = data;
 	off_t addr;
 	int err;
 
@@ -253,7 +253,7 @@ static int flash_sam0_write(struct device *dev, off_t offset,
 static int flash_sam0_write(struct device *dev, off_t offset,
 			    const void *data, size_t len)
 {
-	const u8_t *pdata = data;
+	const uint8_t *pdata = data;
 	int err;
 	size_t idx;
 
@@ -299,7 +299,7 @@ static int flash_sam0_read(struct device *dev, off_t offset, void *data,
 		return err;
 	}
 
-	memcpy(data, (u8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, len);
+	memcpy(data, (uint8_t *)CONFIG_FLASH_BASE_ADDRESS + offset, len);
 
 	return 0;
 }
diff --git a/drivers/flash/flash_shell.c b/drivers/flash/flash_shell.c
index 75e5ffc7e3..aec4d573b0 100644
--- a/drivers/flash/flash_shell.c
+++ b/drivers/flash/flash_shell.c
@@ -20,10 +20,10 @@
 extern struct device __device_start[];
 extern struct device __device_end[];
 
-static u8_t test_arr[TEST_ARR_SIZE];
+static uint8_t test_arr[TEST_ARR_SIZE];
 
 static int parse_helper(const struct shell *shell, size_t *argc,
-		char **argv[], struct device **flash_dev, u32_t *addr)
+		char **argv[], struct device **flash_dev, uint32_t *addr)
 {
 	char *endptr;
 
@@ -50,9 +50,9 @@ static int parse_helper(const struct shell *shell, size_t *argc,
 static int cmd_erase(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct device *flash_dev;
-	u32_t page_addr;
+	uint32_t page_addr;
 	int result;
-	u32_t size;
+	uint32_t size;
 
 	result = parse_helper(shell, &argc, &argv, &flash_dev, &page_addr);
 	if (result) {
@@ -90,10 +90,10 @@ static int cmd_erase(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_write(const struct shell *shell, size_t argc, char *argv[])
 {
-	u32_t check_array[BUF_ARRAY_CNT];
-	u32_t buf_array[BUF_ARRAY_CNT];
+	uint32_t check_array[BUF_ARRAY_CNT];
+	uint32_t buf_array[BUF_ARRAY_CNT];
 	struct device *flash_dev;
-	u32_t w_addr;
+	uint32_t w_addr;
 	int ret;
 	int j = 0;
 
@@ -138,7 +138,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct device *flash_dev;
-	u32_t addr;
+	uint32_t addr;
 	int cnt;
 	int ret;
 
@@ -154,7 +154,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
 	}
 
 	while (cnt--) {
-		u32_t data;
+		uint32_t data;
 
 		flash_read(flash_dev, addr, &data, sizeof(data));
 		shell_print(shell, "0x%08x ", data);
@@ -169,10 +169,10 @@ static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_test(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct device *flash_dev;
-	u32_t repeat;
+	uint32_t repeat;
 	int result;
-	u32_t addr;
-	u32_t size;
+	uint32_t addr;
+	uint32_t size;
 
 	result = parse_helper(shell, &argc, &argv, &flash_dev, &addr);
 	if (result) {
@@ -189,8 +189,8 @@ static int cmd_test(const struct shell *shell, size_t argc, char *argv[])
 
 	flash_write_protection_set(flash_dev, 0);
 
-	for (u32_t i = 0; i < size; i++) {
-		test_arr[i] = (u8_t)i;
+	for (uint32_t i = 0; i < size; i++) {
+		test_arr[i] = (uint8_t)i;
 	}
 
 	while (repeat--) {
diff --git a/drivers/flash/flash_simulator.c b/drivers/flash/flash_simulator.c
index 82728ed0f3..263dd5de12 100644
--- a/drivers/flash/flash_simulator.c
+++ b/drivers/flash/flash_simulator.c
@@ -127,12 +127,12 @@ STATS_NAME(flash_sim_thresholds, max_len)
 STATS_NAME_END(flash_sim_thresholds);
 
 #ifdef CONFIG_ARCH_POSIX
-static u8_t *mock_flash;
+static uint8_t *mock_flash;
 static int flash_fd = -1;
 static const char *flash_file_path;
 static const char default_flash_file_path[] = "flash.bin";
 #else
-static u8_t mock_flash[FLASH_SIMULATOR_FLASH_SIZE];
+static uint8_t mock_flash[FLASH_SIMULATOR_FLASH_SIZE];
 #endif /* CONFIG_ARCH_POSIX */
 
 static bool write_protection;
@@ -215,9 +215,9 @@ static int flash_sim_write(struct device *dev, const off_t offset,
 	STATS_INC(flash_sim_stats, flash_write_calls);
 
 	/* check if any unit has been already programmed */
-	for (u32_t i = 0; i < len; i += FLASH_SIMULATOR_PROG_UNIT) {
+	for (uint32_t i = 0; i < len; i += FLASH_SIMULATOR_PROG_UNIT) {
 
-		u8_t buf[FLASH_SIMULATOR_PROG_UNIT];
+		uint8_t buf[FLASH_SIMULATOR_PROG_UNIT];
 
 		memset(buf, 0xFF, sizeof(buf));
 		if (memcmp(buf, FLASH(offset + i), sizeof(buf))) {
@@ -244,7 +244,7 @@ static int flash_sim_write(struct device *dev, const off_t offset,
 		}
 	}
 
-	for (u32_t i = 0; i < len; i++) {
+	for (uint32_t i = 0; i < len; i++) {
 		if (data_part_ignored) {
 			if (i >= flash_sim_thresholds.max_len) {
 				return 0;
@@ -252,7 +252,7 @@ static int flash_sim_write(struct device *dev, const off_t offset,
 		}
 
 		/* only pull bits to zero */
-		*(FLASH(offset + i)) &= *((u8_t *)data + i);
+		*(FLASH(offset + i)) &= *((uint8_t *)data + i);
 	}
 
 	STATS_INCN(flash_sim_stats, bytes_written, len);
@@ -267,13 +267,13 @@ static int flash_sim_write(struct device *dev, const off_t offset,
 	return 0;
 }
 
-static void unit_erase(const u32_t unit)
+static void unit_erase(const uint32_t unit)
 {
 	const off_t unit_addr = FLASH_SIMULATOR_BASE_OFFSET +
 				(unit * FLASH_SIMULATOR_ERASE_UNIT);
 
 	/* byte pattern to fill the flash with */
-	u8_t byte_pattern = 0xFF;
+	uint8_t byte_pattern = 0xFF;
 
 	/* erase the memory unit by pulling all bits to one */
 	memset(FLASH(unit_addr), byte_pattern,
@@ -309,11 +309,11 @@ static int flash_sim_erase(struct device *dev, const off_t offset,
 	}
 
 	/* the first unit to be erased */
-	u32_t unit_start = (offset - FLASH_SIMULATOR_BASE_OFFSET) /
+	uint32_t unit_start = (offset - FLASH_SIMULATOR_BASE_OFFSET) /
 			   FLASH_SIMULATOR_ERASE_UNIT;
 
 	/* erase as many units as necessary and increase their erase counter */
-	for (u32_t i = 0; i < len / FLASH_SIMULATOR_ERASE_UNIT; i++) {
+	for (uint32_t i = 0; i < len / FLASH_SIMULATOR_ERASE_UNIT; i++) {
 		ERASE_CYCLES_INC(unit_start + i);
 		unit_erase(unit_start + i);
 	}
diff --git a/drivers/flash/flash_stm32.c b/drivers/flash/flash_stm32.c
index a914730e23..483ce52fe6 100644
--- a/drivers/flash/flash_stm32.c
+++ b/drivers/flash/flash_stm32.c
@@ -97,7 +97,7 @@ static inline void _flash_stm32_sem_give(struct device *dev)
 #if !defined(CONFIG_SOC_SERIES_STM32WBX)
 static int flash_stm32_check_status(struct device *dev)
 {
-	u32_t const error =
+	uint32_t const error =
 #if defined(FLASH_FLAG_PGAERR)
 		FLASH_FLAG_PGAERR |
 #endif
@@ -129,7 +129,7 @@ static int flash_stm32_check_status(struct device *dev)
 
 int flash_stm32_wait_flash_idle(struct device *dev)
 {
-	s64_t timeout_time = k_uptime_get() + STM32_FLASH_TIMEOUT;
+	int64_t timeout_time = k_uptime_get() + STM32_FLASH_TIMEOUT;
 	int rc;
 
 	rc = flash_stm32_check_status(dev);
@@ -194,7 +194,7 @@ static int flash_stm32_read(struct device *dev, off_t offset, void *data,
 
 	LOG_DBG("Read offset: %ld, len: %zu", (long int) offset, len);
 
-	memcpy(data, (u8_t *) CONFIG_FLASH_BASE_ADDRESS + offset, len);
+	memcpy(data, (uint8_t *) CONFIG_FLASH_BASE_ADDRESS + offset, len);
 
 	return 0;
 }
diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h
index 1191d07f0d..ab1c94f00b 100644
--- a/drivers/flash/flash_stm32.h
+++ b/drivers/flash/flash_stm32.h
@@ -38,7 +38,7 @@ struct flash_stm32_priv {
 #ifdef CONFIG_FLASH_PAGE_LAYOUT
 static inline bool flash_stm32_range_exists(struct device *dev,
 					    off_t offset,
-					    u32_t len)
+					    uint32_t len)
 {
 	struct flash_pages_info info;
 
@@ -48,7 +48,7 @@ static inline bool flash_stm32_range_exists(struct device *dev,
 #endif	/* CONFIG_FLASH_PAGE_LAYOUT */
 
 bool flash_stm32_valid_range(struct device *dev, off_t offset,
-			     u32_t len, bool write);
+			     uint32_t len, bool write);
 
 int flash_stm32_write_range(struct device *dev, unsigned int offset,
 			    const void *data, unsigned int len);
diff --git a/drivers/flash/flash_stm32f0x.c b/drivers/flash/flash_stm32f0x.c
index 04e3b22d82..1a313152b8 100644
--- a/drivers/flash/flash_stm32f0x.c
+++ b/drivers/flash/flash_stm32f0x.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 /* offset and len must be aligned on 2 for write
  * positive and not beyond end of flash
  */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 2 == 0 && len % 2 == 0U)) &&
@@ -33,11 +33,11 @@ static unsigned int get_page(off_t offset)
 	return offset / FLASH_PAGE_SIZE;
 }
 
-static int write_hword(struct device *dev, off_t offset, u16_t val)
+static int write_hword(struct device *dev, off_t offset, uint16_t val)
 {
-	volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint16_t *flash = (uint16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -77,8 +77,8 @@ static int write_hword(struct device *dev, off_t offset, u16_t val)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
-	u32_t tmp;
+	uint32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -135,7 +135,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i += 2, offset += 2U) {
-		rc = write_hword(dev, offset, ((const u16_t *) data)[i>>1]);
+		rc = write_hword(dev, offset, ((const uint16_t *) data)[i>>1]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32f1x.c b/drivers/flash/flash_stm32f1x.c
index d9322ba0cb..5049e5cece 100644
--- a/drivers/flash/flash_stm32f1x.c
+++ b/drivers/flash/flash_stm32f1x.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 /* offset and len must be aligned on 2 for write
  * positive and not beyond end of flash
  */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 2 == 0 && len % 2 == 0U)) &&
@@ -34,11 +34,11 @@ static unsigned int get_page(off_t offset)
 	return offset / FLASH_PAGE_SIZE;
 }
 
-static int write_hword(struct device *dev, off_t offset, u16_t val)
+static int write_hword(struct device *dev, off_t offset, uint16_t val)
 {
-	volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint16_t *flash = (uint16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -78,8 +78,8 @@ static int write_hword(struct device *dev, off_t offset, u16_t val)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
-	u32_t tmp;
+	uint32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -136,7 +136,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i += 2, offset += 2U) {
-		rc = write_hword(dev, offset, ((const u16_t *) data)[i>>1]);
+		rc = write_hword(dev, offset, ((const uint16_t *) data)[i>>1]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32f3x.c b/drivers/flash/flash_stm32f3x.c
index 922b0beb17..7de25ccd41 100644
--- a/drivers/flash/flash_stm32f3x.c
+++ b/drivers/flash/flash_stm32f3x.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 /* offset and len must be aligned on 2 for write
  * , positive and not beyond end of flash */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 2 == 0 && len % 2 == 0U)) &&
@@ -36,7 +36,7 @@ static unsigned int get_page(off_t offset)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
+	uint32_t page_address = CONFIG_FLASH_BASE_ADDRESS;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -84,11 +84,11 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset,
 }
 
 
-static int write_hword(struct device *dev, off_t offset, u16_t val)
+static int write_hword(struct device *dev, off_t offset, uint16_t val)
 {
-	volatile u16_t *flash = (u16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint16_t *flash = (uint16_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -132,7 +132,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i += 2, offset += 2U) {
-		rc = write_hword(dev, offset, ((const u16_t *) data)[i>>1]);
+		rc = write_hword(dev, offset, ((const uint16_t *) data)[i>>1]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32f4x.c b/drivers/flash/flash_stm32f4x.c
index 6b1d00a552..67b280ed3b 100644
--- a/drivers/flash/flash_stm32f4x.c
+++ b/drivers/flash/flash_stm32f4x.c
@@ -13,9 +13,9 @@
 
 #include "flash_stm32.h"
 
-#define STM32F4X_SECTOR_MASK		((u32_t) 0xFFFFFF07)
+#define STM32F4X_SECTOR_MASK		((uint32_t) 0xFFFFFF07)
 
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	ARG_UNUSED(write);
@@ -34,10 +34,10 @@ bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
 	return flash_stm32_range_exists(dev, offset, len);
 }
 
-static int write_byte(struct device *dev, off_t offset, u8_t val)
+static int write_byte(struct device *dev, off_t offset, uint8_t val)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -57,7 +57,7 @@ static int write_byte(struct device *dev, off_t offset, u8_t val)
 	/* flush the register write */
 	tmp = regs->CR;
 
-	*((u8_t *) offset + CONFIG_FLASH_BASE_ADDRESS) = val;
+	*((uint8_t *) offset + CONFIG_FLASH_BASE_ADDRESS) = val;
 
 	rc = flash_stm32_wait_flash_idle(dev);
 	regs->CR &= (~FLASH_CR_PG);
@@ -65,10 +65,10 @@ static int write_byte(struct device *dev, off_t offset, u8_t val)
 	return rc;
 }
 
-static int erase_sector(struct device *dev, u32_t sector)
+static int erase_sector(struct device *dev, uint32_t sector)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -109,8 +109,8 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset,
 				 unsigned int len)
 {
 	struct flash_pages_info info;
-	u32_t start_sector, end_sector;
-	u32_t i;
+	uint32_t start_sector, end_sector;
+	uint32_t i;
 	int rc = 0;
 
 	rc = flash_get_page_info_by_offs(dev, offset, &info);
@@ -140,7 +140,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i++, offset++) {
-		rc = write_byte(dev, offset, ((const u8_t *) data)[i]);
+		rc = write_byte(dev, offset, ((const uint8_t *) data)[i]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32f7x.c b/drivers/flash/flash_stm32f7x.c
index 0030958d36..4095102f02 100644
--- a/drivers/flash/flash_stm32f7x.c
+++ b/drivers/flash/flash_stm32f7x.c
@@ -14,9 +14,9 @@
 
 #include "flash_stm32.h"
 
-#define STM32F7X_SECTOR_MASK		((u32_t) 0xFFFFFF07)
+#define STM32F7X_SECTOR_MASK		((uint32_t) 0xFFFFFF07)
 
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	ARG_UNUSED(write);
@@ -24,7 +24,7 @@ bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
 	return flash_stm32_range_exists(dev, offset, len);
 }
 
-static int write_byte(struct device *dev, off_t offset, u8_t val)
+static int write_byte(struct device *dev, off_t offset, uint8_t val)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	int rc;
@@ -46,7 +46,7 @@ static int write_byte(struct device *dev, off_t offset, u8_t val)
 	__DSB();
 
 	/* write the data */
-	*((u8_t *) offset + CONFIG_FLASH_BASE_ADDRESS) = val;
+	*((uint8_t *) offset + CONFIG_FLASH_BASE_ADDRESS) = val;
 	/* flush the register write */
 	__DSB();
 
@@ -56,7 +56,7 @@ static int write_byte(struct device *dev, off_t offset, u8_t val)
 	return rc;
 }
 
-static int erase_sector(struct device *dev, u32_t sector)
+static int erase_sector(struct device *dev, uint32_t sector)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	int rc;
@@ -104,8 +104,8 @@ int flash_stm32_block_erase_loop(struct device *dev, unsigned int offset,
 				 unsigned int len)
 {
 	struct flash_pages_info info;
-	u32_t start_sector, end_sector;
-	u32_t i;
+	uint32_t start_sector, end_sector;
+	uint32_t i;
 	int rc = 0;
 
 	rc = flash_get_page_info_by_offs(dev, offset, &info);
@@ -135,7 +135,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i++, offset++) {
-		rc = write_byte(dev, offset, ((const u8_t *) data)[i]);
+		rc = write_byte(dev, offset, ((const uint8_t *) data)[i]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32g0x.c b/drivers/flash/flash_stm32g0x.c
index dca01e1200..485c3839d5 100644
--- a/drivers/flash/flash_stm32g0x.c
+++ b/drivers/flash/flash_stm32g0x.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
  * offset and len must be aligned on 8 for write,
  * positive and not beyond end of flash
  */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 8 == 0 && len % 8 == 0)) &&
@@ -43,11 +43,11 @@ static unsigned int get_page(off_t offset)
 	return offset >> STM32G0X_PAGE_SHIFT;
 }
 
-static int write_dword(struct device *dev, off_t offset, u64_t val)
+static int write_dword(struct device *dev, off_t offset, uint64_t val)
 {
-	volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint32_t *flash = (uint32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -74,8 +74,8 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 	tmp = regs->CR;
 
 	/* Perform the data write operation at the desired memory address */
-	flash[0] = (u32_t)val;
-	flash[1] = (u32_t)(val >> 32);
+	flash[0] = (uint32_t)val;
+	flash[1] = (uint32_t)(val >> 32);
 
 	/* Wait until the BSY bit is cleared */
 	rc = flash_stm32_wait_flash_idle(dev);
@@ -89,7 +89,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -144,7 +144,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i += 8, offset += 8) {
-		rc = write_dword(dev, offset, ((const u64_t *) data)[i>>3]);
+		rc = write_dword(dev, offset, ((const uint64_t *) data)[i>>3]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32g4x.c b/drivers/flash/flash_stm32g4x.c
index 2824f150f7..38fb733652 100644
--- a/drivers/flash/flash_stm32g4x.c
+++ b/drivers/flash/flash_stm32g4x.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
  * offset and len must be aligned on 8 for write,
  * positive and not beyond end of flash
  */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 8 == 0 && len % 8 == 0U)) &&
@@ -39,11 +39,11 @@ static unsigned int get_page(off_t offset)
 	return offset >> STM32G4X_PAGE_SHIFT;
 }
 
-static int write_dword(struct device *dev, off_t offset, u64_t val)
+static int write_dword(struct device *dev, off_t offset, uint64_t val)
 {
-	volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint32_t *flash = (uint32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -72,8 +72,8 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 	tmp = regs->CR;
 
 	/* Perform the data write operation at the desired memory address */
-	flash[0] = (u32_t)val;
-	flash[1] = (u32_t)(val >> 32);
+	flash[0] = (uint32_t)val;
+	flash[1] = (uint32_t)(val >> 32);
 
 	/* Wait until the BSY bit is cleared */
 	rc = flash_stm32_wait_flash_idle(dev);
@@ -87,7 +87,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -166,7 +166,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 	int i, rc = 0;
 
 	for (i = 0; i < len; i += 8, offset += 8) {
-		rc = write_dword(dev, offset, ((const u64_t *) data)[i>>3]);
+		rc = write_dword(dev, offset, ((const uint64_t *) data)[i>>3]);
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32l4x.c b/drivers/flash/flash_stm32l4x.c
index 5fb2cf99a4..ffdb4ed97c 100644
--- a/drivers/flash/flash_stm32l4x.c
+++ b/drivers/flash/flash_stm32l4x.c
@@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 /* offset and len must be aligned on 8 for write
  * , positive and not beyond end of flash */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 8 == 0 && len % 8 == 0U)) &&
@@ -45,14 +45,14 @@ static unsigned int get_page(off_t offset)
 	return offset >> STM32L4X_PAGE_SHIFT;
 }
 
-static int write_dword(struct device *dev, off_t offset, u64_t val)
+static int write_dword(struct device *dev, off_t offset, uint64_t val)
 {
-	volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint32_t *flash = (uint32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 #if defined(FLASH_OPTR_DUALBANK) || defined(FLASH_OPTR_DBANK)
 	bool dcache_enabled = false;
 #endif /* FLASH_OPTR_DUALBANK || FLASH_OPTR_DBANK */
-	u32_t tmp;
+	uint32_t tmp;
 	int rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -90,8 +90,8 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 	tmp = regs->CR;
 
 	/* Perform the data write operation at the desired memory address */
-	flash[0] = (u32_t)val;
-	flash[1] = (u32_t)(val >> 32);
+	flash[0] = (uint32_t)val;
+	flash[1] = (uint32_t)(val >> 32);
 
 	/* Wait until the BSY bit is cleared */
 	rc = flash_stm32_wait_flash_idle(dev);
@@ -116,8 +116,8 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 static int erase_page(struct device *dev, unsigned int page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
-	u16_t pages_per_bank;
+	uint32_t tmp;
+	uint16_t pages_per_bank;
 	int rc;
 
 #if !defined(FLASH_OPTR_DUALBANK) && !defined(FLASH_OPTR_DBANK)
@@ -206,7 +206,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 
 	for (i = 0; i < len; i += 8, offset += 8U) {
 		rc = write_dword(dev, offset,
-				UNALIGNED_GET((const u64_t *) data + (i >> 3)));
+				UNALIGNED_GET((const uint64_t *) data + (i >> 3)));
 		if (rc < 0) {
 			return rc;
 		}
diff --git a/drivers/flash/flash_stm32wbx.c b/drivers/flash/flash_stm32wbx.c
index 23cd953631..11f1663eff 100644
--- a/drivers/flash/flash_stm32wbx.c
+++ b/drivers/flash/flash_stm32wbx.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 /* offset and len must be aligned on 8 for write,
  * positive and not beyond end of flash
  */
-bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
+bool flash_stm32_valid_range(struct device *dev, off_t offset, uint32_t len,
 			     bool write)
 {
 	return (!write || (offset % 8 == 0 && len % 8 == 0U)) &&
@@ -34,16 +34,16 @@ bool flash_stm32_valid_range(struct device *dev, off_t offset, u32_t len,
 /*
  * Up to 255 4K pages
  */
-static u32_t get_page(off_t offset)
+static uint32_t get_page(off_t offset)
 {
 	return offset >> STM32WBX_PAGE_SHIFT;
 }
 
-static int write_dword(struct device *dev, off_t offset, u64_t val)
+static int write_dword(struct device *dev, off_t offset, uint64_t val)
 {
-	volatile u32_t *flash = (u32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
+	volatile uint32_t *flash = (uint32_t *)(offset + CONFIG_FLASH_BASE_ADDRESS);
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t tmp;
+	uint32_t tmp;
 	int ret, rc;
 
 	/* if the control register is locked, do not fail silently */
@@ -69,8 +69,8 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 	tmp = regs->CR;
 
 	/* Perform the data write operation at the desired memory address */
-	flash[0] = (u32_t)val;
-	flash[1] = (u32_t)(val >> 32);
+	flash[0] = (uint32_t)val;
+	flash[1] = (uint32_t)(val >> 32);
 
 	/* Wait until the BSY bit is cleared */
 	rc = flash_stm32_wait_flash_idle(dev);
@@ -81,7 +81,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
 	return 0;
 }
 
-static int erase_page(struct device *dev, u32_t page)
+static int erase_page(struct device *dev, uint32_t page)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
 	int rc;
@@ -140,7 +140,7 @@ int flash_stm32_write_range(struct device *dev, unsigned int offset,
 
 	for (i = 0; i < len; i += 8, offset += 8U) {
 		rc = write_dword(dev, offset,
-				UNALIGNED_GET((const u64_t *) data + (i >> 3)));
+				UNALIGNED_GET((const uint64_t *) data + (i >> 3)));
 		if (rc < 0) {
 			return rc;
 		}
@@ -172,7 +172,7 @@ void flash_stm32_page_layout(struct device *dev,
 int flash_stm32_check_status(struct device *dev)
 {
 	FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
-	u32_t error = 0;
+	uint32_t error = 0;
 
 	/* Save Flash errors */
 	error = (regs->SR & FLASH_FLAG_SR_ERRORS);
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index f6a32b31a2..34bc0721fc 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -42,7 +42,7 @@ LOG_MODULE_REGISTER(qspi_nor, CONFIG_FLASH_LOG_LEVEL);
  * If no data to transmit/receive - pass 0.
  */
 struct qspi_buf {
-	u8_t *buf;
+	uint8_t *buf;
 	size_t len;
 };
 
@@ -55,7 +55,7 @@ struct qspi_buf {
  * @param rx_buf structure used for RX purposes. Can be NULL if not used.
  */
 struct qspi_cmd {
-	u8_t op_code;
+	uint8_t op_code;
 	const struct qspi_buf *tx_buf;
 	const struct qspi_buf *rx_buf;
 };
@@ -108,7 +108,7 @@ static inline bool qspi_is_used_read_quad_mode(nrf_qspi_readoc_t lines)
 	}
 }
 
-static inline int qspi_get_lines_write(u8_t lines)
+static inline int qspi_get_lines_write(uint8_t lines)
 {
 	register int ret = -EINVAL;
 
@@ -132,7 +132,7 @@ static inline int qspi_get_lines_write(u8_t lines)
 	return ret;
 }
 
-static inline int qspi_get_lines_read(u8_t lines)
+static inline int qspi_get_lines_read(uint8_t lines)
 {
 	register int ret = -EINVAL;
 
@@ -167,7 +167,7 @@ static inline int qspi_get_lines_read(u8_t lines)
  * @retval NRF_SPI_PRESCALER in case of success or;
  *		   -EINVAL in case of failure
  */
-static inline nrf_qspi_frequency_t get_nrf_qspi_prescaler(u32_t frequency)
+static inline nrf_qspi_frequency_t get_nrf_qspi_prescaler(uint32_t frequency)
 {
 	register int ret = -EINVAL;
 
@@ -309,7 +309,7 @@ static int qspi_send_cmd(struct device *dev, const struct qspi_cmd *cmd)
 }
 
 /* QSPI erase */
-static int qspi_erase(struct device *dev, u32_t addr, u32_t size)
+static int qspi_erase(struct device *dev, uint32_t addr, uint32_t size)
 {
 	/* Check input parameters */
 	if (!size) {
@@ -322,7 +322,7 @@ static int qspi_erase(struct device *dev, u32_t addr, u32_t size)
 	qspi_lock(dev);
 	while ((rv == 0) && (size > 0)) {
 		nrfx_err_t res = !NRFX_SUCCESS;
-		u32_t adj = 0;
+		uint32_t adj = 0;
 
 		if (size == params->size) {
 			/* chip erase */
@@ -434,7 +434,7 @@ static int qspi_nrfx_configure(struct device *dev)
 				return -EIO;
 			}
 
-			u8_t tx = BIT(CONFIG_NORDIC_QSPI_NOR_QE_BIT);
+			uint8_t tx = BIT(CONFIG_NORDIC_QSPI_NOR_QE_BIT);
 
 			const struct qspi_buf tx_buff = { .buf = &tx, .len = sizeof(tx), };
 
@@ -462,7 +462,7 @@ static int qspi_nrfx_configure(struct device *dev)
 static inline int qspi_nor_read_id(struct device *dev,
 				   const struct qspi_nor_config *const flash_id)
 {
-	u8_t rx_b[QSPI_NOR_MAX_ID_LEN];
+	uint8_t rx_b[QSPI_NOR_MAX_ID_LEN];
 	const struct qspi_buf q_rx_buf = {
 		.buf = rx_b,
 		.len = QSPI_NOR_MAX_ID_LEN
@@ -492,7 +492,7 @@ static int qspi_nor_read(struct device *dev, off_t addr, void *dest,
 {
 	void *dptr = dest;
 	size_t dlen = size;
-	u8_t __aligned(4) buf[4];
+	uint8_t __aligned(4) buf[4];
 
 	if (!dest) {
 		return -EINVAL;
diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
index 031ce10d6f..369b122751 100644
--- a/drivers/flash/soc_flash_mcux.c
+++ b/drivers/flash/soc_flash_mcux.c
@@ -40,7 +40,7 @@ struct flash_priv {
 	 * HACK: flash write protection is managed in software.
 	 */
 	struct k_sem write_lock;
-	u32_t pflash_block_base;
+	uint32_t pflash_block_base;
 };
 
 /*
@@ -55,7 +55,7 @@ struct flash_priv {
 static int flash_mcux_erase(struct device *dev, off_t offset, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 	status_t rc;
 	unsigned int key;
 
@@ -78,7 +78,7 @@ static int flash_mcux_read(struct device *dev, off_t offset,
 				void *data, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 
 	/*
 	 * The MCUX supports different flash chips whose valid ranges are
@@ -96,7 +96,7 @@ static int flash_mcux_write(struct device *dev, off_t offset,
 				const void *data, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 	status_t rc;
 	unsigned int key;
 
@@ -179,7 +179,7 @@ static int flash_mcux_init(struct device *dev)
 	FLASH_GetProperty(&priv->config, kFLASH_PropertyPflash0BlockBaseAddr,
 			  &pflash_block_base);
 #endif
-	priv->pflash_block_base = (u32_t) pflash_block_base;
+	priv->pflash_block_base = (uint32_t) pflash_block_base;
 
 	return (rc == kStatus_Success) ? 0 : -EIO;
 }
diff --git a/drivers/flash/soc_flash_nios2_qspi.c b/drivers/flash/soc_flash_nios2_qspi.c
index d1c5d8227b..c44222e62b 100644
--- a/drivers/flash/soc_flash_nios2_qspi.c
+++ b/drivers/flash/soc_flash_nios2_qspi.c
@@ -65,11 +65,11 @@ static int flash_nios2_qspi_erase(struct device *dev, off_t offset, size_t len)
 {
 	struct flash_nios2_qspi_config *flash_cfg = dev->driver_data;
 	alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev;
-	u32_t block_offset, offset_in_block, length_to_erase;
-	u32_t erase_offset = offset; /* address of next byte to erase */
-	u32_t remaining_length = len; /* length of data left to be erased */
-	u32_t flag_status;
-	s32_t rc = 0, i, timeout;
+	uint32_t block_offset, offset_in_block, length_to_erase;
+	uint32_t erase_offset = offset; /* address of next byte to erase */
+	uint32_t remaining_length = len; /* length of data left to be erased */
+	uint32_t flag_status;
+	int32_t rc = 0, i, timeout;
 
 	k_sem_take(&flash_cfg->sem_lock, K_FOREVER);
 	/*
@@ -161,12 +161,12 @@ static int flash_nios2_qspi_write_block(struct device *dev, int block_offset,
 {
 	struct flash_nios2_qspi_config *flash_cfg = dev->driver_data;
 	alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev;
-	u32_t buffer_offset = 0U; /* offset into data buffer to get write data */
-	s32_t remaining_length = len; /* length left to write */
-	u32_t write_offset = mem_offset; /* offset into flash to write too */
-	u32_t word_to_write, padding, bytes_to_copy;
-	u32_t flag_status;
-	s32_t rc = 0;
+	uint32_t buffer_offset = 0U; /* offset into data buffer to get write data */
+	int32_t remaining_length = len; /* length left to write */
+	uint32_t write_offset = mem_offset; /* offset into flash to write too */
+	uint32_t word_to_write, padding, bytes_to_copy;
+	uint32_t flag_status;
+	int32_t rc = 0;
 
 	while (remaining_length > 0) {
 		/* initialize word to write to blank word */
@@ -219,8 +219,8 @@ static int flash_nios2_qspi_write_block(struct device *dev, int block_offset,
 		}
 
 		/* prepare the word to be written */
-		memcpy((u8_t *)&word_to_write + padding,
-				(const u8_t *)data + buffer_offset,
+		memcpy((uint8_t *)&word_to_write + padding,
+				(const uint8_t *)data + buffer_offset,
 				bytes_to_copy);
 
 		/* enable write */
@@ -258,11 +258,11 @@ static int flash_nios2_qspi_write(struct device *dev, off_t offset,
 {
 	struct flash_nios2_qspi_config *flash_cfg = dev->driver_data;
 	alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev;
-	u32_t block_offset, offset_in_block, length_to_write;
-	u32_t write_offset = offset; /* address of next byte to write */
-	u32_t buffer_offset = 0U; /* offset into source buffer */
-	u32_t remaining_length = len; /* length of data left to be written */
-	s32_t rc = 0, i;
+	uint32_t block_offset, offset_in_block, length_to_write;
+	uint32_t write_offset = offset; /* address of next byte to write */
+	uint32_t buffer_offset = 0U; /* offset into source buffer */
+	uint32_t remaining_length = len; /* length of data left to be written */
+	int32_t rc = 0, i;
 
 	k_sem_take(&flash_cfg->sem_lock, K_FOREVER);
 	/*
@@ -302,7 +302,7 @@ static int flash_nios2_qspi_write(struct device *dev, off_t offset,
 
 		rc = flash_nios2_qspi_write_block(dev,
 				block_offset, write_offset,
-				(const u8_t *)data + buffer_offset,
+				(const uint8_t *)data + buffer_offset,
 				length_to_write);
 		if (rc < 0) {
 			goto qspi_write_err;
@@ -324,11 +324,11 @@ static int flash_nios2_qspi_read(struct device *dev, off_t offset,
 {
 	struct flash_nios2_qspi_config *flash_cfg = dev->driver_data;
 	alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev;
-	u32_t buffer_offset = 0U; /* offset into data buffer to get read data */
-	u32_t remaining_length = len; /* length left to read */
-	u32_t read_offset = offset; /* offset into flash to read from */
-	u32_t word_to_read, bytes_to_copy;
-	s32_t rc = 0;
+	uint32_t buffer_offset = 0U; /* offset into data buffer to get read data */
+	uint32_t remaining_length = len; /* length left to read */
+	uint32_t read_offset = offset; /* offset into flash to read from */
+	uint32_t word_to_read, bytes_to_copy;
+	int32_t rc = 0;
 
 	/*
 	 * check if offset and length are within the range
@@ -355,7 +355,7 @@ static int flash_nios2_qspi_read(struct device *dev, off_t offset,
 		}
 		/* read from flash 32 bits at a time */
 		word_to_read = IORD_32DIRECT(qspi_dev->data_base, read_offset);
-		memcpy((u8_t *)data, (u8_t *)&word_to_read + offset -
+		memcpy((uint8_t *)data, (uint8_t *)&word_to_read + offset -
 		       read_offset, bytes_to_copy);
 		/* update offset and length variables */
 		read_offset += NIOS2_WRITE_BLOCK_SIZE;
@@ -374,7 +374,7 @@ static int flash_nios2_qspi_read(struct device *dev, off_t offset,
 
 		/* read from flash 32 bits at a time */
 		word_to_read = IORD_32DIRECT(qspi_dev->data_base, read_offset);
-		memcpy((u8_t *)data + buffer_offset, &word_to_read,
+		memcpy((uint8_t *)data + buffer_offset, &word_to_read,
 		       bytes_to_copy);
 		/* update offset and length variables */
 		read_offset += bytes_to_copy;
@@ -390,8 +390,8 @@ static int flash_nios2_qspi_write_protection(struct device *dev, bool enable)
 {
 	struct flash_nios2_qspi_config *flash_cfg = dev->driver_data;
 	alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev;
-	u32_t status, lock_val;
-	s32_t rc = 0, timeout;
+	uint32_t status, lock_val;
+	int32_t rc = 0, timeout;
 
 	k_sem_take(&flash_cfg->sem_lock, K_FOREVER);
 	/* set write enable */
diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
index fb877d4a6d..2cedcd0c40 100644
--- a/drivers/flash/soc_flash_nrf.c
+++ b/drivers/flash/soc_flash_nrf.c
@@ -73,16 +73,16 @@
 #define FLASH_OP_ONGOING (-1)
 
 struct flash_context {
-	u32_t data_addr;  /* Address of data to write. */
-	u32_t flash_addr; /* Address of flash to write or erase. */
-	u32_t len;        /* Size off data to write or erase [B]. */
+	uint32_t data_addr;  /* Address of data to write. */
+	uint32_t flash_addr; /* Address of flash to write or erase. */
+	uint32_t len;        /* Size off data to write or erase [B]. */
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
-	u8_t  enable_time_limit; /* execution limited to timeslot. */
-	u32_t interval;   /* timeslot interval. */
-	u32_t slot;       /* timeslot length. */
+	uint8_t  enable_time_limit; /* execution limited to timeslot. */
+	uint32_t interval;   /* timeslot interval. */
+	uint32_t slot;       /* timeslot length. */
 #endif /* CONFIG_SOC_FLASH_NRF_RADIO_SYNC */
 #if defined(CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE)
-	u32_t flash_addr_next;
+	uint32_t flash_addr_next;
 #endif /* CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE */
 }; /*< Context type for f. @ref write_op @ref erase_op */
 
@@ -102,7 +102,7 @@ static int write_op(void *context); /* instance of flash_op_handler_t */
 static int write_in_timeslice(off_t addr, const void *data, size_t len);
 
 static int erase_op(void *context); /* instance of flash_op_handler_t */
-static int erase_in_timeslice(u32_t addr, u32_t size);
+static int erase_in_timeslice(uint32_t addr, uint32_t size);
 #endif /* CONFIG_SOC_FLASH_NRF_RADIO_SYNC */
 
 #if defined(CONFIG_MULTITHREADING)
@@ -119,9 +119,9 @@ static struct k_sem sem_lock;
 
 
 static int write(off_t addr, const void *data, size_t len);
-static int erase(u32_t addr, u32_t size);
+static int erase(uint32_t addr, uint32_t size);
 
-static inline bool is_aligned_32(u32_t data)
+static inline bool is_aligned_32(uint32_t data)
 {
 	return (data & 0x3) ? false : true;
 }
@@ -193,7 +193,7 @@ static int flash_nrf_write(struct device *dev, off_t addr,
 	}
 
 #if !IS_ENABLED(CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS)
-	if (!is_aligned_32(addr) || (len % sizeof(u32_t))) {
+	if (!is_aligned_32(addr) || (len % sizeof(uint32_t))) {
 		return -EINVAL;
 	}
 #endif
@@ -220,8 +220,8 @@ static int flash_nrf_write(struct device *dev, off_t addr,
 
 static int flash_nrf_erase(struct device *dev, off_t addr, size_t size)
 {
-	u32_t pg_size = nrfx_nvmc_flash_page_size_get();
-	u32_t n_pages = size / pg_size;
+	uint32_t pg_size = nrfx_nvmc_flash_page_size_get();
+	uint32_t n_pages = size / pg_size;
 	int ret;
 
 	if (is_regular_addr_valid(addr, size)) {
@@ -315,7 +315,7 @@ DEVICE_AND_API_INIT(nrf_flash, DT_INST_LABEL(0), nrf_flash_init,
 
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
 
-static inline int _ticker_stop(u8_t inst_idx, u8_t u_id, u8_t tic_id)
+static inline int _ticker_stop(uint8_t inst_idx, uint8_t u_id, uint8_t tic_id)
 {
 	int ret = ticker_stop(inst_idx, u_id, tic_id, NULL, NULL);
 
@@ -327,12 +327,12 @@ static inline int _ticker_stop(u8_t inst_idx, u8_t u_id, u8_t tic_id)
 	return ret;
 }
 
-static void time_slot_callback_work(u32_t ticks_at_expire, u32_t remainder,
-				    u16_t lazy, void *context)
+static void time_slot_callback_work(uint32_t ticks_at_expire, uint32_t remainder,
+				    uint16_t lazy, void *context)
 {
 	struct flash_op_desc *op_desc;
-	u8_t instance_index;
-	u8_t ticker_id;
+	uint8_t instance_index;
+	uint8_t ticker_id;
 
 	__ASSERT(ll_radio_state_is_idle(),
 		 "Radio is on during flash operation.\n");
@@ -351,11 +351,11 @@ static void time_slot_callback_work(u32_t ticks_at_expire, u32_t remainder,
 	}
 }
 
-static void time_slot_delay(u32_t ticks_at_expire, u32_t ticks_delay,
+static void time_slot_delay(uint32_t ticks_at_expire, uint32_t ticks_delay,
 			    ticker_timeout_func callback, void *context)
 {
-	u8_t instance_index;
-	u8_t ticker_id;
+	uint8_t instance_index;
+	uint8_t ticker_id;
 	int err;
 
 	ll_timeslice_ticker_id_get(&instance_index, &ticker_id);
@@ -390,8 +390,8 @@ static void time_slot_delay(u32_t ticks_at_expire, u32_t ticks_delay,
 	}
 }
 
-static void time_slot_callback_abort(u32_t ticks_at_expire, u32_t remainder,
-				     u16_t lazy, void *context)
+static void time_slot_callback_abort(uint32_t ticks_at_expire, uint32_t remainder,
+				     uint16_t lazy, void *context)
 {
 	ll_radio_state_abort();
 	time_slot_delay(ticks_at_expire,
@@ -400,8 +400,8 @@ static void time_slot_callback_abort(u32_t ticks_at_expire, u32_t remainder,
 			context);
 }
 
-static void time_slot_callback_prepare(u32_t ticks_at_expire, u32_t remainder,
-				       u16_t lazy, void *context)
+static void time_slot_callback_prepare(uint32_t ticks_at_expire, uint32_t remainder,
+				       uint16_t lazy, void *context)
 {
 	time_slot_delay(ticks_at_expire,
 			HAL_TICKER_US_TO_TICKS(FLASH_RADIO_ABORT_DELAY_US),
@@ -411,10 +411,10 @@ static void time_slot_callback_prepare(u32_t ticks_at_expire, u32_t remainder,
 
 static int work_in_time_slice(struct flash_op_desc *p_flash_op_desc)
 {
-	u8_t instance_index;
-	u8_t ticker_id;
+	uint8_t instance_index;
+	uint8_t ticker_id;
 	int result;
-	u32_t err;
+	uint32_t err;
 	struct flash_context *context = p_flash_op_desc->context;
 
 	ll_timeslice_ticker_id_get(&instance_index, &ticker_id);
@@ -451,7 +451,7 @@ static int work_in_time_slice(struct flash_op_desc *p_flash_op_desc)
 	return result;
 }
 
-static int erase_in_timeslice(u32_t addr, u32_t size)
+static int erase_in_timeslice(uint32_t addr, uint32_t size)
 {
 	struct flash_context context = {
 		.flash_addr = addr,
@@ -475,7 +475,7 @@ static int erase_in_timeslice(u32_t addr, u32_t size)
 static int write_in_timeslice(off_t addr, const void *data, size_t len)
 {
 	struct flash_context context = {
-		.data_addr = (u32_t) data,
+		.data_addr = (uint32_t) data,
 		.flash_addr = addr,
 		.len = len,
 		.enable_time_limit = 1, /* enable time limit */
@@ -495,13 +495,13 @@ static int write_in_timeslice(off_t addr, const void *data, size_t len)
 
 static int erase_op(void *context)
 {
-	u32_t pg_size = nrfx_nvmc_flash_page_size_get();
+	uint32_t pg_size = nrfx_nvmc_flash_page_size_get();
 	struct flash_context *e_ctx = context;
 
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
-	u32_t ticks_begin = 0U;
-	u32_t ticks_diff;
-	u32_t i = 0U;
+	uint32_t ticks_begin = 0U;
+	uint32_t ticks_diff;
+	uint32_t i = 0U;
 
 	if (e_ctx->enable_time_limit) {
 		ticks_begin = ticker_ticks_now_get();
@@ -553,7 +553,7 @@ static int erase_op(void *context)
 	return (e_ctx->len > 0) ? FLASH_OP_ONGOING : FLASH_OP_DONE;
 }
 
-static void shift_write_context(u32_t shift, struct flash_context *w_ctx)
+static void shift_write_context(uint32_t shift, struct flash_context *w_ctx)
 {
 	w_ctx->flash_addr += shift;
 	w_ctx->data_addr += shift;
@@ -565,9 +565,9 @@ static int write_op(void *context)
 	struct flash_context *w_ctx = context;
 
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
-	u32_t ticks_begin = 0U;
-	u32_t ticks_diff;
-	u32_t i = 1U;
+	uint32_t ticks_begin = 0U;
+	uint32_t ticks_diff;
+	uint32_t i = 1U;
 
 	if (w_ctx->enable_time_limit) {
 		ticks_begin = ticker_ticks_now_get();
@@ -576,7 +576,7 @@ static int write_op(void *context)
 #if IS_ENABLED(CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS)
 	/* If not aligned, write unaligned beginning */
 	if (!is_aligned_32(w_ctx->flash_addr)) {
-		u32_t count = sizeof(u32_t) - (w_ctx->flash_addr & 0x3);
+		uint32_t count = sizeof(uint32_t) - (w_ctx->flash_addr & 0x3);
 
 		if (count > w_ctx->len) {
 			count = w_ctx->len;
@@ -603,11 +603,11 @@ static int write_op(void *context)
 	}
 #endif /* CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS */
 	/* Write all the 4-byte aligned data */
-	while (w_ctx->len >= sizeof(u32_t)) {
+	while (w_ctx->len >= sizeof(uint32_t)) {
 		nrfx_nvmc_word_write(w_ctx->flash_addr,
-				     UNALIGNED_GET((u32_t *)w_ctx->data_addr));
+				     UNALIGNED_GET((uint32_t *)w_ctx->data_addr));
 
-		shift_write_context(sizeof(u32_t), w_ctx);
+		shift_write_context(sizeof(uint32_t), w_ctx);
 
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
 		i++;
@@ -639,7 +639,7 @@ static int write_op(void *context)
 	return FLASH_OP_DONE;
 }
 
-static int erase(u32_t addr, u32_t size)
+static int erase(uint32_t addr, uint32_t size)
 {
 	struct flash_context context = {
 		.flash_addr = addr,
@@ -658,7 +658,7 @@ static int erase(u32_t addr, u32_t size)
 static int write(off_t addr, const void *data, size_t len)
 {
 	struct flash_context context = {
-		.data_addr = (u32_t) data,
+		.data_addr = (uint32_t) data,
 		.flash_addr = addr,
 		.len = len,
 #if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
diff --git a/drivers/flash/soc_flash_rv32m1.c b/drivers/flash/soc_flash_rv32m1.c
index d7fc85893c..cad81bc4f6 100644
--- a/drivers/flash/soc_flash_rv32m1.c
+++ b/drivers/flash/soc_flash_rv32m1.c
@@ -25,7 +25,7 @@ struct flash_priv {
 	 * HACK: flash write protection is managed in software.
 	 */
 	struct k_sem write_lock;
-	u32_t pflash_block_base;
+	uint32_t pflash_block_base;
 };
 
 /*
@@ -40,7 +40,7 @@ struct flash_priv {
 static int flash_mcux_erase(struct device *dev, off_t offset, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 	status_t rc;
 	unsigned int key;
 
@@ -63,7 +63,7 @@ static int flash_mcux_read(struct device *dev, off_t offset,
 				void *data, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 
 	/*
 	 * The MCUX supports different flash chips whose valid ranges are
@@ -81,7 +81,7 @@ static int flash_mcux_write(struct device *dev, off_t offset,
 				const void *data, size_t len)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t addr;
+	uint32_t addr;
 	status_t rc;
 	unsigned int key;
 
@@ -147,7 +147,7 @@ static const struct flash_driver_api flash_mcux_api = {
 static int flash_mcux_init(struct device *dev)
 {
 	struct flash_priv *priv = dev->driver_data;
-	u32_t pflash_block_base;
+	uint32_t pflash_block_base;
 	status_t rc;
 
 	CLOCK_EnableClock(kCLOCK_Mscm);
@@ -158,7 +158,7 @@ static int flash_mcux_init(struct device *dev)
 
 	FLASH_GetProperty(&priv->config, kFLASH_PropertyPflashBlockBaseAddr,
 			(uint32_t *)&pflash_block_base);
-	priv->pflash_block_base = (u32_t) pflash_block_base;
+	priv->pflash_block_base = (uint32_t) pflash_block_base;
 
 	return (rc == kStatus_Success) ? 0 : -EIO;
 }
diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c
index 072e44c11d..60b5e12038 100644
--- a/drivers/flash/spi_flash_at45.c
+++ b/drivers/flash/spi_flash_at45.c
@@ -55,7 +55,7 @@ struct spi_flash_at45_data {
 	struct spi_cs_control spi_cs;
 	struct k_sem lock;
 #if IS_ENABLED(CONFIG_DEVICE_POWER_MANAGEMENT)
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -67,13 +67,13 @@ struct spi_flash_at45_config {
 #if IS_ENABLED(CONFIG_FLASH_PAGE_LAYOUT)
 	struct flash_pages_layout pages_layout;
 #endif
-	u32_t chip_size;
-	u16_t block_size;
-	u16_t page_size;
-	u16_t t_enter_dpd; /* in microseconds */
-	u16_t t_exit_dpd;  /* in microseconds */
+	uint32_t chip_size;
+	uint16_t block_size;
+	uint16_t page_size;
+	uint16_t t_enter_dpd; /* in microseconds */
+	uint16_t t_exit_dpd;  /* in microseconds */
 	bool use_udpd;
-	u8_t jedec_id[3];
+	uint8_t jedec_id[3];
 };
 
 static struct spi_flash_at45_data *get_dev_data(struct device *dev)
@@ -100,9 +100,9 @@ static int check_jedec_id(struct device *dev)
 {
 	const struct spi_flash_at45_config *cfg = get_dev_config(dev);
 	int err;
-	u8_t const *expected_id = cfg->jedec_id;
-	u8_t read_id[sizeof(cfg->jedec_id)];
-	const u8_t opcode = CMD_READ_ID;
+	uint8_t const *expected_id = cfg->jedec_id;
+	uint8_t read_id[sizeof(cfg->jedec_id)];
+	const uint8_t opcode = CMD_READ_ID;
 	const struct spi_buf tx_buf[] = {
 		{
 			.buf = (void *)&opcode,
@@ -147,10 +147,10 @@ static int check_jedec_id(struct device *dev)
  * - Byte 1 to MSB
  * of the pointed parameter.
  */
-static int read_status_register(struct device *dev, u16_t *status)
+static int read_status_register(struct device *dev, uint16_t *status)
 {
 	int err;
-	const u8_t opcode = CMD_READ_STATUS;
+	const uint8_t opcode = CMD_READ_STATUS;
 	const struct spi_buf tx_buf[] = {
 		{
 			.buf = (void *)&opcode,
@@ -163,7 +163,7 @@ static int read_status_register(struct device *dev, u16_t *status)
 		},
 		{
 			.buf = status,
-			.len = sizeof(u16_t),
+			.len = sizeof(uint16_t),
 		}
 	};
 	DEF_BUF_SET(tx_buf_set, tx_buf);
@@ -185,7 +185,7 @@ static int read_status_register(struct device *dev, u16_t *status)
 static int wait_until_ready(struct device *dev)
 {
 	int err;
-	u16_t status;
+	uint16_t status;
 
 	do {
 		err = read_status_register(dev, &status);
@@ -197,8 +197,8 @@ static int wait_until_ready(struct device *dev)
 static int configure_page_size(struct device *dev)
 {
 	int err;
-	u16_t status;
-	u8_t const conf_binary_page_size[] = CMD_BINARY_PAGE_SIZE;
+	uint16_t status;
+	uint8_t const conf_binary_page_size[] = CMD_BINARY_PAGE_SIZE;
 	const struct spi_buf tx_buf[] = {
 		{
 			.buf = (void *)conf_binary_page_size,
@@ -247,7 +247,7 @@ static int spi_flash_at45_read(struct device *dev, off_t offset,
 		return -ENODEV;
 	}
 
-	u8_t const op_and_addr[] = {
+	uint8_t const op_and_addr[] = {
 		CMD_READ,
 		(offset >> 16) & 0xFF,
 		(offset >> 8)  & 0xFF,
@@ -289,7 +289,7 @@ static int perform_write(struct device *dev, off_t offset,
 			 const void *data, size_t len)
 {
 	int err;
-	u8_t const op_and_addr[] = {
+	uint8_t const op_and_addr[] = {
 		IS_ENABLED(CONFIG_SPI_FLASH_AT45_USE_READ_MODIFY_WRITE)
 			? CMD_MODIFY
 			: CMD_WRITE,
@@ -361,7 +361,7 @@ static int spi_flash_at45_write(struct device *dev, off_t offset,
 static int perform_chip_erase(struct device *dev)
 {
 	int err;
-	u8_t const chip_erase_cmd[] = CMD_CHIP_ERASE;
+	uint8_t const chip_erase_cmd[] = CMD_CHIP_ERASE;
 	const struct spi_buf tx_buf[] = {
 		{
 			.buf = (void *)&chip_erase_cmd,
@@ -390,10 +390,10 @@ static bool is_erase_possible(size_t entity_size,
 		(offset & (entity_size - 1)) == 0);
 }
 
-static int perform_erase_op(struct device *dev, u8_t opcode, off_t offset)
+static int perform_erase_op(struct device *dev, uint8_t opcode, off_t offset)
 {
 	int err;
-	u8_t const op_and_addr[] = {
+	uint8_t const op_and_addr[] = {
 		opcode,
 		(offset >> 16) & 0xFF,
 		(offset >> 8)  & 0xFF,
@@ -499,7 +499,7 @@ static void spi_flash_at45_pages_layout(
 }
 #endif /* IS_ENABLED(CONFIG_FLASH_PAGE_LAYOUT) */
 
-static int power_down_op(struct device *dev, u8_t opcode, u32_t delay)
+static int power_down_op(struct device *dev, uint8_t opcode, uint32_t delay)
 {
 	int err = 0;
 	const struct spi_buf tx_buf[] = {
@@ -569,7 +569,7 @@ static int spi_flash_at45_init(struct device *dev)
 }
 
 #if IS_ENABLED(CONFIG_DEVICE_POWER_MANAGEMENT)
-static int spi_flash_at45_pm_control(struct device *dev, u32_t ctrl_command,
+static int spi_flash_at45_pm_control(struct device *dev, uint32_t ctrl_command,
 				     void *context, device_pm_cb cb, void *arg)
 {
 	struct spi_flash_at45_data *dev_data = get_dev_data(dev);
@@ -577,7 +577,7 @@ static int spi_flash_at45_pm_control(struct device *dev, u32_t ctrl_command,
 	int err = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != dev_data->pm_state) {
 			switch (new_state) {
@@ -607,7 +607,7 @@ static int spi_flash_at45_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = dev_data->pm_state;
+		*((uint32_t *)context) = dev_data->pm_state;
 	}
 
 	if (cb) {
diff --git a/drivers/flash/spi_flash_w25qxxdv.c b/drivers/flash/spi_flash_w25qxxdv.c
index e97602c15c..8e6c228e1c 100644
--- a/drivers/flash/spi_flash_w25qxxdv.c
+++ b/drivers/flash/spi_flash_w25qxxdv.c
@@ -28,10 +28,10 @@
 #endif
 
 static int spi_flash_wb_access(struct spi_flash_data *ctx,
-			       u8_t cmd, bool addressed, off_t offset,
+			       uint8_t cmd, bool addressed, off_t offset,
 			       void *data, size_t length, bool write)
 {
-	u8_t access[4];
+	uint8_t access[4];
 	struct spi_buf buf[2] = {
 		{
 			.buf = access
@@ -48,9 +48,9 @@ static int spi_flash_wb_access(struct spi_flash_data *ctx,
 	access[0] = cmd;
 
 	if (addressed) {
-		access[1] = (u8_t) (offset >> 16);
-		access[2] = (u8_t) (offset >> 8);
-		access[3] = (u8_t) offset;
+		access[1] = (uint8_t) (offset >> 16);
+		access[2] = (uint8_t) (offset >> 8);
+		access[3] = (uint8_t) offset;
 
 		buf[0].len = 4;
 	} else {
@@ -74,17 +74,17 @@ static int spi_flash_wb_access(struct spi_flash_data *ctx,
 static inline int spi_flash_wb_id(struct device *dev)
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
-	u32_t temp_data;
-	u8_t buf[3];
+	uint32_t temp_data;
+	uint8_t buf[3];
 
 	if (spi_flash_wb_access(driver_data, W25QXXDV_CMD_RDID,
 				false, 0, buf, 3, false) != 0) {
 		return -EIO;
 	}
 
-	temp_data = ((u32_t) buf[0]) << 16;
-	temp_data |= ((u32_t) buf[1]) << 8;
-	temp_data |= (u32_t) buf[2];
+	temp_data = ((uint32_t) buf[0]) << 16;
+	temp_data |= ((uint32_t) buf[1]) << 8;
+	temp_data |= (uint32_t) buf[2];
 
 	if (temp_data != CONFIG_SPI_FLASH_W25QXXDV_DEVICE_ID) {
 		return -ENODEV;
@@ -93,7 +93,7 @@ static inline int spi_flash_wb_id(struct device *dev)
 	return 0;
 }
 
-static u8_t spi_flash_wb_reg_read(struct device *dev, u8_t reg)
+static uint8_t spi_flash_wb_reg_read(struct device *dev, uint8_t reg)
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
 
@@ -107,14 +107,14 @@ static u8_t spi_flash_wb_reg_read(struct device *dev, u8_t reg)
 
 static inline void wait_for_flash_idle(struct device *dev)
 {
-	u8_t reg;
+	uint8_t reg;
 
 	do {
 		reg = spi_flash_wb_reg_read(dev, W25QXXDV_CMD_RDSR);
 	} while (reg & W25QXXDV_WIP_BIT);
 }
 
-static int spi_flash_wb_reg_write(struct device *dev, u8_t reg)
+static int spi_flash_wb_reg_write(struct device *dev, uint8_t reg)
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
 
@@ -152,7 +152,7 @@ static int spi_flash_wb_write_protection_set_with_lock(struct device *dev,
 						       bool enable, bool lock)
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
-	u8_t reg = 0U;
+	uint8_t reg = 0U;
 	int ret;
 
 	if (lock) {
@@ -184,7 +184,7 @@ static int spi_flash_wb_write_protection_set(struct device *dev, bool enable)
 static int spi_flash_wb_program_page(struct device *dev, off_t offset,
 		const void *data, size_t len)
 {
-	u8_t reg;
+	uint8_t reg;
 	struct spi_flash_data *const driver_data = dev->driver_data;
 
 	__ASSERT(len <= CONFIG_SPI_FLASH_W25QXXDV_PAGE_PROGRAM_SIZE,
@@ -215,7 +215,7 @@ static int spi_flash_wb_write(struct device *dev, off_t offset,
 	int ret;
 	off_t page_offset;
 	/* Cast `data`  to prevent `void*` arithmetic */
-	const u8_t *data_ptr = data;
+	const uint8_t *data_ptr = data;
 	struct spi_flash_data *const driver_data = dev->driver_data;
 
 	if (offset < 0) {
@@ -275,7 +275,7 @@ static inline int spi_flash_wb_erase_internal(struct device *dev,
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
 	bool need_offset = true;
-	u8_t erase_opcode;
+	uint8_t erase_opcode;
 
 	if (offset < 0) {
 		return -ENOTSUP;
@@ -319,9 +319,9 @@ static int spi_flash_wb_erase(struct device *dev, off_t offset, size_t size)
 {
 	struct spi_flash_data *const driver_data = dev->driver_data;
 	int ret = 0;
-	u32_t new_offset = offset;
-	u32_t size_remaining = size;
-	u8_t reg;
+	uint32_t new_offset = offset;
+	uint32_t size_remaining = size;
+	uint8_t reg;
 
 	if ((offset < 0) || ((offset & W25QXXDV_SECTOR_MASK) != 0) ||
 	    ((size + offset) > CONFIG_SPI_FLASH_W25QXXDV_FLASH_SIZE) ||
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
index d64c51d86e..d5bbff4be2 100644
--- a/drivers/flash/spi_nor.c
+++ b/drivers/flash/spi_nor.c
@@ -79,7 +79,7 @@ struct spi_nor_data {
 	/* Low 32-bits of uptime counter at which device last entered
 	 * deep power-down.
 	 */
-	u32_t ts_enter_dpd;
+	uint32_t ts_enter_dpd;
 #endif
 	struct k_sem sem;
 };
@@ -101,7 +101,7 @@ static inline void delay_until_exit_dpd_ok(const struct device *const dev)
 {
 #if DT_INST_NODE_HAS_PROP(0, has_dpd)
 	struct spi_nor_data *const driver_data = dev->driver_data;
-	s32_t since = (s32_t)(k_uptime_get_32() - driver_data->ts_enter_dpd);
+	int32_t since = (int32_t)(k_uptime_get_32() - driver_data->ts_enter_dpd);
 
 	/* If the time is negative the 32-bit counter has wrapped,
 	 * which is certainly long enough no further delay is
@@ -120,7 +120,7 @@ static inline void delay_until_exit_dpd_ok(const struct device *const dev)
 		 * until it reaches zero before we can proceed.
 		 */
 		if (since < 0) {
-			k_sleep(K_MSEC((u32_t)-since));
+			k_sleep(K_MSEC((uint32_t)-since));
 		}
 	}
 #endif /* DT_INST_NODE_HAS_PROP(0, has_dpd) */
@@ -139,12 +139,12 @@ static inline void delay_until_exit_dpd_ok(const struct device *const dev)
  * @return 0 on success, negative errno code otherwise
  */
 static int spi_nor_access(const struct device *const dev,
-			  u8_t opcode, bool is_addressed, off_t addr,
+			  uint8_t opcode, bool is_addressed, off_t addr,
 			  void *data, size_t length, bool is_write)
 {
 	struct spi_nor_data *const driver_data = dev->driver_data;
 
-	u8_t buf[4] = {
+	uint8_t buf[4] = {
 		opcode,
 		(addr & 0xFF0000) >> 16,
 		(addr & 0xFF00) >> 8,
@@ -281,7 +281,7 @@ static void release_device(struct device *dev)
 static inline int spi_nor_read_id(struct device *dev,
 				  const struct spi_nor_config *const flash_id)
 {
-	u8_t buf[SPI_NOR_MAX_ID_LEN];
+	uint8_t buf[SPI_NOR_MAX_ID_LEN];
 
 	if (spi_nor_cmd_read(dev, SPI_NOR_CMD_RDID, buf,
 	    SPI_NOR_MAX_ID_LEN) != 0) {
@@ -304,7 +304,7 @@ static inline int spi_nor_read_id(struct device *dev,
 static int spi_nor_wait_until_ready(struct device *dev)
 {
 	int ret;
-	u8_t reg;
+	uint8_t reg;
 
 	do {
 		ret = spi_nor_cmd_read(dev, SPI_NOR_CMD_RDSR, &reg, 1);
@@ -369,7 +369,7 @@ static int spi_nor_write(struct device *dev, off_t addr, const void *src,
 		}
 
 		size -= to_write;
-		src = (const u8_t *)src + to_write;
+		src = (const uint8_t *)src + to_write;
 		addr += to_write;
 
 		spi_nor_wait_until_ready(dev);
diff --git a/drivers/flash/spi_nor.h b/drivers/flash/spi_nor.h
index f5014cc785..3d086658ab 100644
--- a/drivers/flash/spi_nor.h
+++ b/drivers/flash/spi_nor.h
@@ -13,13 +13,13 @@
 
 struct spi_nor_config {
 	/* JEDEC id from devicetree */
-	u8_t id[SPI_NOR_MAX_ID_LEN];
+	uint8_t id[SPI_NOR_MAX_ID_LEN];
 
 	/* Indicates support for BE32K */
 	bool has_be32k;
 
 	/* Size from devicetree, in bytes */
-	u32_t size;
+	uint32_t size;
 };
 
 /* Status register bits */
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
index e1d74eddf2..b0f12166a0 100644
--- a/drivers/gpio/gpio_cc13xx_cc26xx.c
+++ b/drivers/gpio/gpio_cc13xx_cc26xx.c
@@ -34,7 +34,7 @@ struct gpio_cc13xx_cc26xx_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
 	sys_slist_t callbacks;
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 static struct gpio_cc13xx_cc26xx_data gpio_cc13xx_cc26xx_data_0;
@@ -44,15 +44,15 @@ static const struct gpio_driver_config gpio_cc13xx_cc26xx_cfg_0 = {
 };
 
 static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port,
-	u32_t mask);
+	uint32_t mask);
 static int gpio_cc13xx_cc26xx_port_clear_bits_raw(struct device *port,
-	u32_t mask);
+	uint32_t mask);
 
 static int gpio_cc13xx_cc26xx_config(struct device *port,
 				     gpio_pin_t pin,
 				     gpio_flags_t flags)
 {
-	u32_t config = 0;
+	uint32_t config = 0;
 
 	__ASSERT_NO_MSG(pin < NUM_IO_MAX);
 
@@ -108,7 +108,7 @@ static int gpio_cc13xx_cc26xx_config(struct device *port,
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_get_raw(struct device *port, u32_t *value)
+static int gpio_cc13xx_cc26xx_port_get_raw(struct device *port, uint32_t *value)
 {
 	__ASSERT_NO_MSG(value != NULL);
 
@@ -118,7 +118,7 @@ static int gpio_cc13xx_cc26xx_port_get_raw(struct device *port, u32_t *value)
 }
 
 static int gpio_cc13xx_cc26xx_port_set_masked_raw(struct device *port,
-	u32_t mask, u32_t value)
+	uint32_t mask, uint32_t value)
 {
 	GPIO_setMultiDio(mask & value);
 	GPIO_clearMultiDio(mask & ~value);
@@ -126,7 +126,7 @@ static int gpio_cc13xx_cc26xx_port_set_masked_raw(struct device *port,
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port, u32_t mask)
+static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port, uint32_t mask)
 {
 	GPIO_setMultiDio(mask);
 
@@ -134,14 +134,14 @@ static int gpio_cc13xx_cc26xx_port_set_bits_raw(struct device *port, u32_t mask)
 }
 
 static int gpio_cc13xx_cc26xx_port_clear_bits_raw(struct device *port,
-	u32_t mask)
+	uint32_t mask)
 {
 	GPIO_clearMultiDio(mask);
 
 	return 0;
 }
 
-static int gpio_cc13xx_cc26xx_port_toggle_bits(struct device *port, u32_t mask)
+static int gpio_cc13xx_cc26xx_port_toggle_bits(struct device *port, uint32_t mask)
 {
 	GPIO_toggleMultiDio(mask);
 
@@ -153,7 +153,7 @@ static int gpio_cc13xx_cc26xx_pin_interrupt_configure(struct device *port,
 		enum gpio_int_trig trig)
 {
 	struct gpio_cc13xx_cc26xx_data *data = port->driver_data;
-	u32_t config = 0;
+	uint32_t config = 0;
 
 	if (mode != GPIO_INT_MODE_DISABLED) {
 		if (mode == GPIO_INT_MODE_EDGE) {
@@ -213,7 +213,7 @@ static int gpio_cc13xx_cc26xx_disable_callback(struct device *port,
 	return 0;
 }
 
-static u32_t gpio_cc13xx_cc26xx_get_pending_int(struct device *dev)
+static uint32_t gpio_cc13xx_cc26xx_get_pending_int(struct device *dev)
 {
 	return GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
 }
@@ -225,8 +225,8 @@ static void gpio_cc13xx_cc26xx_isr(void *arg)
 	struct device *dev = arg;
 	struct gpio_cc13xx_cc26xx_data *data = dev->driver_data;
 
-	u32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
-	u32_t enabled = status & data->pin_callback_enables;
+	uint32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK);
+	uint32_t enabled = status & data->pin_callback_enables;
 
 	GPIO_clearEventMultiDio(status);
 
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
index 2c107e8b85..13654f69ef 100644
--- a/drivers/gpio/gpio_cc32xx.c
+++ b/drivers/gpio/gpio_cc32xx.c
@@ -30,7 +30,7 @@
 /* Reserved */
 #define PIN_XX  0xFF
 
-static const u8_t pinTable[] = {
+static const uint8_t pinTable[] = {
 	/* 00     01      02      03      04      05      06      07  */
 	PIN_50, PIN_55, PIN_57, PIN_58, PIN_59, PIN_60, PIN_61, PIN_62,
 	/* 08     09      10      11      12      13      14      15  */
@@ -49,7 +49,7 @@ struct gpio_cc32xx_config {
 	/* base address of GPIO port */
 	unsigned long port_base;
 	/* GPIO port number */
-	u8_t port_num;
+	uint8_t port_num;
 };
 
 struct gpio_cc32xx_data {
@@ -58,7 +58,7 @@ struct gpio_cc32xx_data {
 	/* list of registered callbacks */
 	sys_slist_t callbacks;
 	/* callback enable pin bitmask */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 #define DEV_CFG(dev) \
@@ -66,8 +66,8 @@ struct gpio_cc32xx_data {
 #define DEV_DATA(dev) \
 	((struct gpio_cc32xx_data *)(dev)->driver_data)
 
-static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask);
-static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask);
+static int gpio_cc32xx_port_set_bits_raw(struct device *port, uint32_t mask);
+static int gpio_cc32xx_port_clear_bits_raw(struct device *port, uint32_t mask);
 
 static inline int gpio_cc32xx_config(struct device *port,
 				     gpio_pin_t pin,
@@ -104,7 +104,7 @@ static inline int gpio_cc32xx_config(struct device *port,
 	return 0;
 }
 
-static int gpio_cc32xx_port_get_raw(struct device *port, u32_t *value)
+static int gpio_cc32xx_port_get_raw(struct device *port, uint32_t *value)
 {
 	const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
 	unsigned long port_base = gpio_config->port_base;
@@ -115,8 +115,8 @@ static int gpio_cc32xx_port_get_raw(struct device *port, u32_t *value)
 	return 0;
 }
 
-static int gpio_cc32xx_port_set_masked_raw(struct device *port, u32_t mask,
-					  u32_t value)
+static int gpio_cc32xx_port_set_masked_raw(struct device *port, uint32_t mask,
+					  uint32_t value)
 {
 	const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
 	unsigned long port_base = gpio_config->port_base;
@@ -126,7 +126,7 @@ static int gpio_cc32xx_port_set_masked_raw(struct device *port, u32_t mask,
 	return 0;
 }
 
-static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask)
+static int gpio_cc32xx_port_set_bits_raw(struct device *port, uint32_t mask)
 {
 	const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
 	unsigned long port_base = gpio_config->port_base;
@@ -136,7 +136,7 @@ static int gpio_cc32xx_port_set_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask)
+static int gpio_cc32xx_port_clear_bits_raw(struct device *port, uint32_t mask)
 {
 	const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
 	unsigned long port_base = gpio_config->port_base;
@@ -146,7 +146,7 @@ static int gpio_cc32xx_port_clear_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_cc32xx_port_toggle_bits(struct device *port, u32_t mask)
+static int gpio_cc32xx_port_toggle_bits(struct device *port, uint32_t mask)
 {
 	const struct gpio_cc32xx_config *gpio_config = DEV_CFG(port);
 	unsigned long port_base = gpio_config->port_base;
@@ -245,10 +245,10 @@ static void gpio_cc32xx_port_isr(void *arg)
 	struct device *dev = arg;
 	const struct gpio_cc32xx_config *config = DEV_CFG(dev);
 	struct gpio_cc32xx_data *data = DEV_DATA(dev);
-	u32_t enabled_int, int_status;
+	uint32_t enabled_int, int_status;
 
 	/* See which interrupts triggered: */
-	int_status  = (u32_t)MAP_GPIOIntStatus(config->port_base, 1);
+	int_status  = (uint32_t)MAP_GPIOIntStatus(config->port_base, 1);
 
 	enabled_int = int_status & data->pin_callback_enables;
 
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index db5fff62e2..8c0a095fb9 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -44,7 +44,7 @@ struct gpio_cmsdk_ahb_dev_data {
 	sys_slist_t gpio_cb;
 };
 
-static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -53,8 +53,8 @@ static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, u32_t mask,
-					 u32_t value)
+static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, uint32_t mask,
+					 uint32_t value)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -63,7 +63,7 @@ static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -72,7 +72,7 @@ static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -81,7 +81,7 @@ static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -90,7 +90,7 @@ static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int cmsdk_ahb_gpio_config(struct device *dev, u32_t mask, gpio_flags_t flags)
+static int cmsdk_ahb_gpio_config(struct device *dev, uint32_t mask, gpio_flags_t flags)
 {
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 
@@ -189,7 +189,7 @@ static void gpio_cmsdk_ahb_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info;
 	struct gpio_cmsdk_ahb_dev_data *data = dev->driver_data;
-	u32_t int_stat;
+	uint32_t int_stat;
 
 	int_stat = cfg->port->intstatus;
 
diff --git a/drivers/gpio/gpio_cmsdk_ahb.h b/drivers/gpio/gpio_cmsdk_ahb.h
index 7070c1dc98..7f1c05eb0f 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.h
+++ b/drivers/gpio/gpio_cmsdk_ahb.h
@@ -15,41 +15,41 @@ extern "C" {
 /* ARM LTD CMSDK AHB General Purpose Input/Output (GPIO) */
 struct gpio_cmsdk_ahb {
 	/* Offset: 0x000 (r/w) data register */
-	volatile u32_t data;
+	volatile uint32_t data;
 	/* Offset: 0x004 (r/w) data output latch register */
-	volatile u32_t dataout;
-	volatile u32_t reserved0[2];
+	volatile uint32_t dataout;
+	volatile uint32_t reserved0[2];
 	/* Offset: 0x010 (r/w) output enable set register */
-	volatile u32_t outenableset;
+	volatile uint32_t outenableset;
 	/* Offset: 0x014 (r/w) output enable clear register */
-	volatile u32_t outenableclr;
+	volatile uint32_t outenableclr;
 	/* Offset: 0x018 (r/w) alternate function set register */
-	volatile u32_t altfuncset;
+	volatile uint32_t altfuncset;
 	/* Offset: 0x01c (r/w) alternate function clear register */
-	volatile u32_t altfuncclr;
+	volatile uint32_t altfuncclr;
 	/* Offset: 0x020 (r/w) interrupt enable set register */
-	volatile u32_t intenset;
+	volatile uint32_t intenset;
 	/* Offset: 0x024 (r/w) interrupt enable clear register */
-	volatile u32_t intenclr;
+	volatile uint32_t intenclr;
 	/* Offset: 0x028 (r/w) interrupt type set register */
-	volatile u32_t inttypeset;
+	volatile uint32_t inttypeset;
 	/* Offset: 0x02c (r/w) interrupt type clear register */
-	volatile u32_t inttypeclr;
+	volatile uint32_t inttypeclr;
 	/* Offset: 0x030 (r/w) interrupt polarity set register */
-	volatile u32_t intpolset;
+	volatile uint32_t intpolset;
 	/* Offset: 0x034 (r/w) interrupt polarity clear register */
-	volatile u32_t intpolclr;
+	volatile uint32_t intpolclr;
 	union {
 		/* Offset: 0x038 (r/ ) interrupt status register */
-		volatile u32_t intstatus;
+		volatile uint32_t intstatus;
 		/* Offset: 0x038 ( /w) interrupt clear register */
-		volatile u32_t  intclear;
+		volatile uint32_t  intclear;
 	};
-	volatile u32_t reserved1[241];
+	volatile uint32_t reserved1[241];
 	/* Offset: 0x400 - 0x7fc lower byte masked access register (r/w) */
-	volatile u32_t lb_masked[256];
+	volatile uint32_t lb_masked[256];
 	/* Offset: 0x800 - 0xbfc upper byte masked access register (r/w) */
-	volatile u32_t ub_masked[256];
+	volatile uint32_t ub_masked[256];
 };
 
 #ifdef __cplusplus
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 48bb23e21e..b7af323717 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -32,27 +32,27 @@
 #include <power/power.h>
 #endif
 
-static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask);
-static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask);
+static int gpio_dw_port_set_bits_raw(struct device *port, uint32_t mask);
+static int gpio_dw_port_clear_bits_raw(struct device *port, uint32_t mask);
 
 /*
  * ARC architecture configure IP through IO auxiliary registers.
  * Other architectures as ARM and x86 configure IP through MMIO registers
  */
 #ifdef GPIO_DW_IO_ACCESS
-static inline u32_t dw_read(u32_t base_addr, u32_t offset)
+static inline uint32_t dw_read(uint32_t base_addr, uint32_t offset)
 {
 	return sys_in32(base_addr + offset);
 }
 
-static inline void dw_write(u32_t base_addr, u32_t offset,
-			    u32_t val)
+static inline void dw_write(uint32_t base_addr, uint32_t offset,
+			    uint32_t val)
 {
 	sys_out32(val, base_addr + offset);
 }
 
-static void dw_set_bit(u32_t base_addr, u32_t offset,
-		       u32_t bit, bool value)
+static void dw_set_bit(uint32_t base_addr, uint32_t offset,
+		       uint32_t bit, bool value)
 {
 	if (!value) {
 		sys_io_clear_bit(base_addr + offset, bit);
@@ -61,19 +61,19 @@ static void dw_set_bit(u32_t base_addr, u32_t offset,
 	}
 }
 #else
-static inline u32_t dw_read(u32_t base_addr, u32_t offset)
+static inline uint32_t dw_read(uint32_t base_addr, uint32_t offset)
 {
 	return sys_read32(base_addr + offset);
 }
 
-static inline void dw_write(u32_t base_addr, u32_t offset,
-			    u32_t val)
+static inline void dw_write(uint32_t base_addr, uint32_t offset,
+			    uint32_t val)
 {
 	sys_write32(val, base_addr + offset);
 }
 
-static void dw_set_bit(u32_t base_addr, u32_t offset,
-		       u32_t bit, bool value)
+static void dw_set_bit(uint32_t base_addr, uint32_t offset,
+		       uint32_t bit, bool value)
 {
 	if (!value) {
 		sys_clear_bit(base_addr + offset, bit);
@@ -118,14 +118,14 @@ static inline void gpio_dw_clock_off(struct device *port)
 #define gpio_dw_clock_off(...)
 #endif
 
-static inline int dw_base_to_block_base(u32_t base_addr)
+static inline int dw_base_to_block_base(uint32_t base_addr)
 {
 	return (base_addr & 0xFFFFFFC0);
 }
 
-static inline int dw_derive_port_from_base(u32_t base_addr)
+static inline int dw_derive_port_from_base(uint32_t base_addr)
 {
-	u32_t port = (base_addr & 0x3f) / 12U;
+	uint32_t port = (base_addr & 0x3f) / 12U;
 	return port;
 }
 
@@ -134,9 +134,9 @@ static inline int dw_interrupt_support(const struct gpio_dw_config *config)
 	return ((int)(config->irq_num) > 0U);
 }
 
-static inline u32_t dw_get_ext_port(u32_t base_addr)
+static inline uint32_t dw_get_ext_port(uint32_t base_addr)
 {
-	u32_t ext_port;
+	uint32_t ext_port;
 
 	/* 4-port GPIO implementation translates from base address to port */
 	switch (dw_derive_port_from_base(base_addr)) {
@@ -158,9 +158,9 @@ static inline u32_t dw_get_ext_port(u32_t base_addr)
 	return ext_port;
 }
 
-static inline u32_t dw_get_data_port(u32_t base_addr)
+static inline uint32_t dw_get_data_port(uint32_t base_addr)
 {
-	u32_t dr_port;
+	uint32_t dr_port;
 
 	/* 4-port GPIO implementation translates from base address to port */
 	switch (dw_derive_port_from_base(base_addr)) {
@@ -182,9 +182,9 @@ static inline u32_t dw_get_data_port(u32_t base_addr)
 	return dr_port;
 }
 
-static inline u32_t dw_get_dir_port(u32_t base_addr)
+static inline uint32_t dw_get_dir_port(uint32_t base_addr)
 {
-	u32_t ddr_port;
+	uint32_t ddr_port;
 
 	/* 4-port GPIO implementation translates from base address to port */
 	switch (dw_derive_port_from_base(base_addr)) {
@@ -212,11 +212,11 @@ static int gpio_dw_pin_interrupt_configure(struct device *port,
 {
 	struct gpio_dw_runtime *context = port->driver_data;
 	const struct gpio_dw_config *config = port->config_info;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t dir_port = dw_get_dir_port(port_base_addr);
-	u32_t data_port = dw_get_data_port(port_base_addr);
-	u32_t dir_reg;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t dir_port = dw_get_dir_port(port_base_addr);
+	uint32_t data_port = dw_get_data_port(port_base_addr);
+	uint32_t dir_reg;
 
 	/* Check for invalid pin number */
 	if (pin >= config->bits) {
@@ -272,13 +272,13 @@ static int gpio_dw_pin_interrupt_configure(struct device *port,
 }
 
 static inline void dw_pin_config(struct device *port,
-				 u32_t pin, int flags)
+				 uint32_t pin, int flags)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
 	const struct gpio_dw_config *config = port->config_info;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t dir_port = dw_get_dir_port(port_base_addr);
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t dir_port = dw_get_dir_port(port_base_addr);
 	bool pin_is_output, need_debounce;
 
 	/* Set init value then direction */
@@ -308,7 +308,7 @@ static inline int gpio_dw_config(struct device *port,
 				 gpio_flags_t flags)
 {
 	const struct gpio_dw_config *config = port->config_info;
-	u32_t io_flags;
+	uint32_t io_flags;
 
 	/* Check for invalid pin number */
 	if (pin >= config->bits) {
@@ -339,12 +339,12 @@ static inline int gpio_dw_config(struct device *port,
 	return 0;
 }
 
-static int gpio_dw_port_get_raw(struct device *port, u32_t *value)
+static int gpio_dw_port_get_raw(struct device *port, uint32_t *value)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t ext_port = dw_get_ext_port(port_base_addr);
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t ext_port = dw_get_ext_port(port_base_addr);
 
 	*value = dw_read(base_addr, ext_port);
 
@@ -352,13 +352,13 @@ static int gpio_dw_port_get_raw(struct device *port, u32_t *value)
 }
 
 static int gpio_dw_port_set_masked_raw(struct device *port,
-				       u32_t mask, u32_t value)
+				       uint32_t mask, uint32_t value)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t data_port = dw_get_data_port(port_base_addr);
-	u32_t pins;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t data_port = dw_get_data_port(port_base_addr);
+	uint32_t pins;
 
 	pins = dw_read(base_addr, data_port);
 	pins = (pins & ~mask) | (mask & value);
@@ -367,13 +367,13 @@ static int gpio_dw_port_set_masked_raw(struct device *port,
 	return 0;
 }
 
-static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask)
+static int gpio_dw_port_set_bits_raw(struct device *port, uint32_t mask)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t data_port = dw_get_data_port(port_base_addr);
-	u32_t pins;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t data_port = dw_get_data_port(port_base_addr);
+	uint32_t pins;
 
 	pins = dw_read(base_addr, data_port);
 	pins |= mask;
@@ -382,13 +382,13 @@ static int gpio_dw_port_set_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask)
+static int gpio_dw_port_clear_bits_raw(struct device *port, uint32_t mask)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t data_port = dw_get_data_port(port_base_addr);
-	u32_t pins;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t data_port = dw_get_data_port(port_base_addr);
+	uint32_t pins;
 
 	pins = dw_read(base_addr, data_port);
 	pins &= ~mask;
@@ -397,13 +397,13 @@ static int gpio_dw_port_clear_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_dw_port_toggle_bits(struct device *port, u32_t mask)
+static int gpio_dw_port_toggle_bits(struct device *port, uint32_t mask)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t port_base_addr = context->base_addr;
-	u32_t data_port = dw_get_data_port(port_base_addr);
-	u32_t pins;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t port_base_addr = context->base_addr;
+	uint32_t data_port = dw_get_data_port(port_base_addr);
+	uint32_t pins;
 
 	pins = dw_read(base_addr, data_port);
 	pins ^= mask;
@@ -425,8 +425,8 @@ static inline int gpio_dw_enable_callback(struct device *port,
 					  gpio_pin_t pin)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t data_port = dw_get_data_port(context->base_addr);
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t data_port = dw_get_data_port(context->base_addr);
 
 	if (data_port != SWPORTA_DR) {
 		return -ENOTSUP;
@@ -442,8 +442,8 @@ static inline int gpio_dw_disable_callback(struct device *port,
 					   gpio_pin_t pin)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t data_port = dw_get_data_port(context->base_addr);
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t data_port = dw_get_data_port(context->base_addr);
 
 	if (data_port != SWPORTA_DR) {
 		return -ENOTSUP;
@@ -455,14 +455,14 @@ static inline int gpio_dw_disable_callback(struct device *port,
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static void gpio_dw_set_power_state(struct device *port, u32_t power_state)
+static void gpio_dw_set_power_state(struct device *port, uint32_t power_state)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
 
 	context->device_power_state = power_state;
 }
 
-static u32_t gpio_dw_get_power_state(struct device *port)
+static uint32_t gpio_dw_get_power_state(struct device *port)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
 
@@ -488,19 +488,19 @@ static inline int gpio_dw_resume_from_suspend_port(struct device *port)
 * Implements the driver control management functionality
 * the *context may include IN data or/and OUT data
 */
-static int gpio_dw_device_ctrl(struct device *port, u32_t ctrl_command,
+static int gpio_dw_device_ctrl(struct device *port, uint32_t ctrl_command,
 			       void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		if (*((u32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
 			ret = gpio_dw_suspend_port(port);
-		} else if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = gpio_dw_resume_from_suspend_port(port);
 		}
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = gpio_dw_get_power_state(port);
+		*((uint32_t *)context) = gpio_dw_get_power_state(port);
 	}
 
 	if (cb) {
@@ -519,8 +519,8 @@ static void gpio_dw_isr(void *arg)
 {
 	struct device *port = (struct device *)arg;
 	struct gpio_dw_runtime *context = port->driver_data;
-	u32_t base_addr = dw_base_to_block_base(context->base_addr);
-	u32_t int_status;
+	uint32_t base_addr = dw_base_to_block_base(context->base_addr);
+	uint32_t int_status;
 
 	int_status = dw_read(base_addr, INTSTATUS);
 
@@ -556,7 +556,7 @@ static int gpio_dw_initialize(struct device *port)
 {
 	struct gpio_dw_runtime *context = port->driver_data;
 	const struct gpio_dw_config *config = port->config_info;
-	u32_t base_addr;
+	uint32_t base_addr;
 
 	if (dw_interrupt_support(config)) {
 
diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h
index 09088eb271..5b94ebcc7a 100644
--- a/drivers/gpio/gpio_dw.h
+++ b/drivers/gpio/gpio_dw.h
@@ -20,8 +20,8 @@ typedef void (*gpio_config_irq_t)(struct device *port);
 struct gpio_dw_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
-	u32_t bits;
-	u32_t irq_num; /* set to 0 if GPIO port cannot interrupt */
+	uint32_t bits;
+	uint32_t irq_num; /* set to 0 if GPIO port cannot interrupt */
 	gpio_config_irq_t config_func;
 
 #ifdef CONFIG_GPIO_DW_SHARED_IRQ
@@ -36,13 +36,13 @@ struct gpio_dw_config {
 struct gpio_dw_runtime {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
-	u32_t base_addr;
+	uint32_t base_addr;
 #ifdef CONFIG_GPIO_DW_CLOCK_GATE
 	struct device *clock;
 #endif
 	sys_slist_t callbacks;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t device_power_state;
+	uint32_t device_power_state;
 #endif
 };
 
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index 61eb910db6..d2df7489ec 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -22,7 +22,7 @@
 
 #include "gpio_utils.h"
 
-#define GET_GPIO_PIN_REG(pin) ((u32_t *)GPIO_REG(pin))
+#define GET_GPIO_PIN_REG(pin) ((uint32_t *)GPIO_REG(pin))
 
 /* ESP3 TRM v4.0 and gpio_reg.h header both incorrectly identify bit3
  * as being the bit selecting PRO CPU interrupt enable. It's actually
@@ -44,16 +44,16 @@ struct gpio_esp32_data {
 	struct device *pinmux;
 
 	struct {
-		volatile u32_t *set_reg;
-		volatile u32_t *clear_reg;
-		volatile u32_t *input_reg;
-		volatile u32_t *output_reg;
-		volatile u32_t *irq_status_reg;
-		volatile u32_t *irq_ack_reg;
+		volatile uint32_t *set_reg;
+		volatile uint32_t *clear_reg;
+		volatile uint32_t *input_reg;
+		volatile uint32_t *output_reg;
+		volatile uint32_t *irq_status_reg;
+		volatile uint32_t *irq_ack_reg;
 		int pin_offset;
 	} port;
 
-	u32_t cb_pins;
+	uint32_t cb_pins;
 	sys_slist_t cb;
 };
 
@@ -62,9 +62,9 @@ static int gpio_esp32_config(struct device *dev,
 			     gpio_flags_t flags)
 {
 	struct gpio_esp32_data *data = dev->driver_data;
-	u32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */
-	u32_t *reg = GET_GPIO_PIN_REG(io_pin);
-	u32_t func;
+	uint32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */
+	uint32_t *reg = GET_GPIO_PIN_REG(io_pin);
+	uint32_t func;
 	int r;
 
 	/* Query pinmux to validate pin number. */
@@ -116,7 +116,7 @@ static int gpio_esp32_config(struct device *dev,
 	return 0;
 }
 
-static int gpio_esp32_port_get_raw(struct device *port, u32_t *value)
+static int gpio_esp32_port_get_raw(struct device *port, uint32_t *value)
 {
 	struct gpio_esp32_data *data = port->driver_data;
 
@@ -126,10 +126,10 @@ static int gpio_esp32_port_get_raw(struct device *port, u32_t *value)
 }
 
 static int gpio_esp32_port_set_masked_raw(struct device *port,
-					  u32_t mask, u32_t value)
+					  uint32_t mask, uint32_t value)
 {
 	struct gpio_esp32_data *data = port->driver_data;
-	u32_t key;
+	uint32_t key;
 
 	key = irq_lock();
 	*data->port.output_reg = (*data->port.output_reg & ~mask)
@@ -140,7 +140,7 @@ static int gpio_esp32_port_set_masked_raw(struct device *port,
 }
 
 static int gpio_esp32_port_set_bits_raw(struct device *port,
-					u32_t pins)
+					uint32_t pins)
 {
 	struct gpio_esp32_data *data = port->driver_data;
 
@@ -149,7 +149,7 @@ static int gpio_esp32_port_set_bits_raw(struct device *port,
 }
 
 static int gpio_esp32_port_clear_bits_raw(struct device *port,
-					  u32_t pins)
+					  uint32_t pins)
 {
 	struct gpio_esp32_data *data = port->driver_data;
 
@@ -158,10 +158,10 @@ static int gpio_esp32_port_clear_bits_raw(struct device *port,
 }
 
 static int gpio_esp32_port_toggle_bits(struct device *port,
-				       u32_t pins)
+				       uint32_t pins)
 {
 	struct gpio_esp32_data *data = port->driver_data;
-	u32_t key;
+	uint32_t key;
 
 	key = irq_lock();
 	*data->port.output_reg = (*data->port.output_reg ^ pins);
@@ -220,11 +220,11 @@ static int gpio_esp32_pin_interrupt_configure(struct device *port,
 					      enum gpio_int_trig trig)
 {
 	struct gpio_esp32_data *data = port->driver_data;
-	u32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */
-	u32_t *reg = GET_GPIO_PIN_REG(io_pin);
+	uint32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */
+	uint32_t *reg = GET_GPIO_PIN_REG(io_pin);
 	int intr_trig_mode = convert_int_type(mode, trig);
-	u32_t reg_val;
-	u32_t key;
+	uint32_t reg_val;
+	uint32_t key;
 
 	if (intr_trig_mode < 0) {
 		return intr_trig_mode;
@@ -283,7 +283,7 @@ static int gpio_esp32_disable_callback(struct device *dev,
 static void gpio_esp32_fire_callbacks(struct device *device)
 {
 	struct gpio_esp32_data *data = device->driver_data;
-	u32_t values = *data->port.irq_status_reg;
+	uint32_t values = *data->port.irq_status_reg;
 
 	*data->port.irq_ack_reg = values;
 	if (values & data->cb_pins) {
@@ -336,12 +336,12 @@ static const struct gpio_driver_api gpio_esp32_driver = {
 #if defined(CONFIG_GPIO_ESP32_0)
 static struct gpio_esp32_data gpio_0_data = { /* 0..31 */
 	.port = {
-		.set_reg = (u32_t *)GPIO_OUT_W1TS_REG,
-		.clear_reg = (u32_t *)GPIO_OUT_W1TC_REG,
-		.input_reg = (u32_t *)GPIO_IN_REG,
-		.output_reg = (u32_t *)GPIO_OUT_REG,
-		.irq_status_reg = (u32_t *)GPIO_STATUS_REG,
-		.irq_ack_reg = (u32_t *)GPIO_STATUS_W1TC_REG,
+		.set_reg = (uint32_t *)GPIO_OUT_W1TS_REG,
+		.clear_reg = (uint32_t *)GPIO_OUT_W1TC_REG,
+		.input_reg = (uint32_t *)GPIO_IN_REG,
+		.output_reg = (uint32_t *)GPIO_OUT_REG,
+		.irq_status_reg = (uint32_t *)GPIO_STATUS_REG,
+		.irq_ack_reg = (uint32_t *)GPIO_STATUS_W1TC_REG,
 		.pin_offset = 0,
 	}
 };
@@ -350,12 +350,12 @@ static struct gpio_esp32_data gpio_0_data = { /* 0..31 */
 #if defined(CONFIG_GPIO_ESP32_1)
 static struct gpio_esp32_data gpio_1_data = { /* 32..39 */
 	.port = {
-		.set_reg = (u32_t *)GPIO_OUT1_W1TS_REG,
-		.clear_reg = (u32_t *)GPIO_OUT1_W1TC_REG,
-		.input_reg = (u32_t *)GPIO_IN1_REG,
-		.output_reg = (u32_t *)GPIO_OUT1_REG,
-		.irq_status_reg = (u32_t *)GPIO_STATUS1_REG,
-		.irq_ack_reg = (u32_t *)GPIO_STATUS1_W1TC_REG,
+		.set_reg = (uint32_t *)GPIO_OUT1_W1TS_REG,
+		.clear_reg = (uint32_t *)GPIO_OUT1_W1TC_REG,
+		.input_reg = (uint32_t *)GPIO_IN1_REG,
+		.output_reg = (uint32_t *)GPIO_OUT1_REG,
+		.irq_status_reg = (uint32_t *)GPIO_STATUS1_REG,
+		.irq_ack_reg = (uint32_t *)GPIO_STATUS1_W1TC_REG,
 		.pin_offset = 32,
 	}
 };
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index 330667579e..4190796d77 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -62,7 +62,7 @@ struct gpio_gecko_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 static inline void gpio_gecko_add_port(struct gpio_gecko_common_data *data,
@@ -125,7 +125,7 @@ static int gpio_gecko_configure(struct device *dev,
 	return 0;
 }
 
-static int gpio_gecko_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_gecko_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_gecko_config *config = dev->config_info;
 	GPIO_P_TypeDef *gpio_base = config->gpio_base;
@@ -135,8 +135,8 @@ static int gpio_gecko_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_gecko_port_set_masked_raw(struct device *dev, u32_t mask,
-					  u32_t value)
+static int gpio_gecko_port_set_masked_raw(struct device *dev, uint32_t mask,
+					  uint32_t value)
 {
 	const struct gpio_gecko_config *config = dev->config_info;
 	GPIO_P_TypeDef *gpio_base = config->gpio_base;
@@ -146,7 +146,7 @@ static int gpio_gecko_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_gecko_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_gecko_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_gecko_config *config = dev->config_info;
 	GPIO_P_TypeDef *gpio_base = config->gpio_base;
@@ -160,7 +160,7 @@ static int gpio_gecko_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_gecko_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_gecko_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_gecko_config *config = dev->config_info;
 	GPIO_P_TypeDef *gpio_base = config->gpio_base;
@@ -174,7 +174,7 @@ static int gpio_gecko_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_gecko_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_gecko_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_gecko_config *config = dev->config_info;
 	GPIO_P_TypeDef *gpio_base = config->gpio_base;
@@ -264,7 +264,7 @@ static void gpio_gecko_common_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	struct gpio_gecko_common_data *data = dev->driver_data;
-	u32_t enabled_int, int_status;
+	uint32_t enabled_int, int_status;
 	struct device *port_dev;
 	struct gpio_gecko_data *port_data;
 
diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c
index 5dfb5a31c9..89f807b029 100644
--- a/drivers/gpio/gpio_ht16k33.c
+++ b/drivers/gpio/gpio_ht16k33.c
@@ -29,7 +29,7 @@ struct gpio_ht16k33_cfg {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
 	char *parent_dev_name;
-	u8_t keyscan_idx;
+	uint8_t keyscan_idx;
 };
 
 struct gpio_ht16k33_data {
@@ -122,7 +122,7 @@ static int gpio_ht16k33_pin_interrupt_configure(struct device *port,
 }
 
 void ht16k33_process_keyscan_row_data(struct device *dev,
-				      u32_t keys)
+				      uint32_t keys)
 {
 	struct gpio_ht16k33_data *data = dev->driver_data;
 
@@ -152,7 +152,7 @@ static int gpio_ht16k33_disable_callback(struct device *dev,
 	return -ENOTSUP;
 }
 
-static u32_t gpio_ht16k33_get_pending_int(struct device *dev)
+static uint32_t gpio_ht16k33_get_pending_int(struct device *dev)
 {
 	struct gpio_ht16k33_data *data = dev->driver_data;
 
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index 398ae41798..3c65e499a3 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -27,7 +27,7 @@ struct imx_gpio_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 static int imx_gpio_configure(struct device *port, gpio_pin_t pin,
@@ -68,7 +68,7 @@ static int imx_gpio_configure(struct device *port, gpio_pin_t pin,
 	return 0;
 }
 
-static int imx_gpio_port_get_raw(struct device *port, u32_t *value)
+static int imx_gpio_port_get_raw(struct device *port, uint32_t *value)
 {
 	const struct imx_gpio_config *config = port->config_info;
 	GPIO_Type *base = config->base;
@@ -131,10 +131,10 @@ static int imx_gpio_pin_interrupt_configure(struct device *port,
 	const struct imx_gpio_config *config = port->config_info;
 	struct imx_gpio_data *data = port->driver_data;
 	GPIO_Type *base = config->base;
-	volatile u32_t *icr_reg;
+	volatile uint32_t *icr_reg;
 	unsigned int key;
-	u32_t icr_val;
-	u8_t shift;
+	uint32_t icr_val;
+	uint8_t shift;
 
 	if (((base->GDIR & BIT(pin)) != 0U)
 	    && (mode != GPIO_INT_MODE_DISABLED)) {
@@ -216,7 +216,7 @@ static void imx_gpio_port_isr(void *arg)
 	struct device *port = (struct device *)arg;
 	const struct imx_gpio_config *config = port->config_info;
 	struct imx_gpio_data *data = port->driver_data;
-	u32_t enabled_int;
+	uint32_t enabled_int;
 
 	enabled_int = config->base->ISR & data->pin_callback_enables;
 	config->base->ISR = enabled_int;
diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c
index 538405944f..b60f4fce67 100644
--- a/drivers/gpio/gpio_intel_apl.c
+++ b/drivers/gpio/gpio_intel_apl.c
@@ -106,17 +106,17 @@ BUILD_ASSERT(DT_INST_IRQN(0) == 14);
 struct gpio_intel_apl_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
-	u32_t	reg_base;
+	uint32_t	reg_base;
 
-	u8_t	pin_offset;
-	u8_t	num_pins;
+	uint8_t	pin_offset;
+	uint8_t	num_pins;
 };
 
 struct gpio_intel_apl_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
 	/* Pad base address */
-	u32_t		pad_base;
+	uint32_t		pad_base;
 
 	sys_slist_t	cb;
 };
@@ -126,15 +126,15 @@ struct gpio_intel_apl_data {
  * @brief Check if host has permission to alter this GPIO pin.
  *
  * @param "struct device *dev" Device struct
- * @param "u32_t raw_pin" Raw GPIO pin
+ * @param "uint32_t raw_pin" Raw GPIO pin
  *
  * @return true if host owns the GPIO pin, false otherwise
  */
-static bool check_perm(struct device *dev, u32_t raw_pin)
+static bool check_perm(struct device *dev, uint32_t raw_pin)
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
 	struct gpio_intel_apl_data *data = dev->driver_data;
-	u32_t offset, val;
+	uint32_t offset, val;
 
 	/* First is to establish that host software owns the pin */
 
@@ -179,7 +179,7 @@ static void gpio_intel_apl_isr(void *arg)
 	const struct gpio_intel_apl_config *cfg;
 	struct gpio_intel_apl_data *data;
 	struct gpio_callback *cb, *tmp;
-	u32_t reg, int_sts, cur_mask, acc_mask;
+	uint32_t reg, int_sts, cur_mask, acc_mask;
 	int isr_dev;
 
 	for (isr_dev = 0; isr_dev < nr_isr_devs; ++isr_dev) {
@@ -211,7 +211,7 @@ static int gpio_intel_apl_config(struct device *dev,
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
 	struct gpio_intel_apl_data *data = dev->driver_data;
-	u32_t raw_pin, reg, cfg0, cfg1;
+	uint32_t raw_pin, reg, cfg0, cfg1;
 
 	/* Only support push-pull mode */
 	if ((flags & GPIO_SINGLE_ENDED) != 0U) {
@@ -286,8 +286,8 @@ static int gpio_intel_apl_pin_interrupt_configure(struct device *dev,
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
 	struct gpio_intel_apl_data *data = dev->driver_data;
-	u32_t raw_pin, cfg0, cfg1;
-	u32_t reg, reg_en, reg_sts;
+	uint32_t raw_pin, cfg0, cfg1;
+	uint32_t reg, reg_en, reg_sts;
 
 	/* no double-edge triggering according to data sheet */
 	if (trig == GPIO_INT_TRIG_BOTH) {
@@ -384,7 +384,7 @@ static int gpio_intel_apl_enable_callback(struct device *dev,
 					  gpio_pin_t pin)
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
-	u32_t raw_pin, reg;
+	uint32_t raw_pin, reg;
 
 	pin = k_array_index_sanitize(pin, cfg->num_pins + 1);
 
@@ -409,7 +409,7 @@ static int gpio_intel_apl_disable_callback(struct device *dev,
 					   gpio_pin_t pin)
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
-	u32_t raw_pin, reg;
+	uint32_t raw_pin, reg;
 
 	pin = k_array_index_sanitize(pin, cfg->num_pins + 1);
 
@@ -426,12 +426,12 @@ static int gpio_intel_apl_disable_callback(struct device *dev,
 	return 0;
 }
 
-static int port_get_raw(struct device *dev, u32_t mask, u32_t *value,
+static int port_get_raw(struct device *dev, uint32_t mask, uint32_t *value,
 			bool read_tx)
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
 	struct gpio_intel_apl_data *data = dev->driver_data;
-	u32_t pin, raw_pin, reg_addr, reg_val, cmp;
+	uint32_t pin, raw_pin, reg_addr, reg_val, cmp;
 
 	if (read_tx) {
 		cmp = PAD_CFG0_TXSTATE;
@@ -466,11 +466,11 @@ static int port_get_raw(struct device *dev, u32_t mask, u32_t *value,
 	return 0;
 }
 
-static int port_set_raw(struct device *dev, u32_t mask, u32_t value)
+static int port_set_raw(struct device *dev, uint32_t mask, uint32_t value)
 {
 	const struct gpio_intel_apl_config *cfg = dev->config_info;
 	struct gpio_intel_apl_data *data = dev->driver_data;
-	u32_t pin, raw_pin, reg_addr, reg_val;
+	uint32_t pin, raw_pin, reg_addr, reg_val;
 
 	while (mask != 0) {
 		pin = find_lsb_set(mask) - 1;
@@ -502,10 +502,10 @@ static int port_set_raw(struct device *dev, u32_t mask, u32_t value)
 	return 0;
 }
 
-static int gpio_intel_apl_port_set_masked_raw(struct device *dev, u32_t mask,
-					      u32_t value)
+static int gpio_intel_apl_port_set_masked_raw(struct device *dev, uint32_t mask,
+					      uint32_t value)
 {
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_get_raw(dev, mask, &port_val, true);
 
@@ -516,19 +516,19 @@ static int gpio_intel_apl_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_intel_apl_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_intel_apl_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	return gpio_intel_apl_port_set_masked_raw(dev, mask, mask);
 }
 
-static int gpio_intel_apl_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_intel_apl_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	return gpio_intel_apl_port_set_masked_raw(dev, mask, 0);
 }
 
-static int gpio_intel_apl_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_intel_apl_port_toggle_bits(struct device *dev, uint32_t mask)
 {
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_get_raw(dev, mask, &port_val, true);
 
@@ -539,7 +539,7 @@ static int gpio_intel_apl_port_toggle_bits(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_intel_apl_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_intel_apl_port_get_raw(struct device *dev, uint32_t *value)
 {
 	return port_get_raw(dev, 0xFFFFFFFF, value, false);
 }
diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c
index 86895d8e5d..5a28f2554c 100644
--- a/drivers/gpio/gpio_litex.c
+++ b/drivers/gpio/gpio_litex.c
@@ -30,7 +30,7 @@ static const char *LITEX_LOG_CANNOT_CHANGE_DIR =
 	"Cannot change port direction selected in device tree\n";
 
 struct gpio_litex_cfg {
-	volatile u32_t *reg_addr;
+	volatile uint32_t *reg_addr;
 	int reg_size;
 	int nr_gpios;
 	bool port_is_output;
@@ -48,7 +48,7 @@ struct gpio_litex_data {
 /* Helper functions for bit / port access */
 
 static inline void set_bit(const struct gpio_litex_cfg *config,
-			   u32_t bit, bool val)
+			   uint32_t bit, bool val)
 {
 	int regv, new_regv;
 
@@ -57,19 +57,19 @@ static inline void set_bit(const struct gpio_litex_cfg *config,
 	litex_write(config->reg_addr, config->reg_size, new_regv);
 }
 
-static inline u32_t get_bit(const struct gpio_litex_cfg *config, u32_t bit)
+static inline uint32_t get_bit(const struct gpio_litex_cfg *config, uint32_t bit)
 {
 	int regv = litex_read(config->reg_addr, config->reg_size);
 
 	return !!(regv & BIT(bit));
 }
 
-static inline void set_port(const struct gpio_litex_cfg *config, u32_t value)
+static inline void set_port(const struct gpio_litex_cfg *config, uint32_t value)
 {
 	litex_write(config->reg_addr, config->reg_size, value);
 }
 
-static inline u32_t get_port(const struct gpio_litex_cfg *config)
+static inline uint32_t get_port(const struct gpio_litex_cfg *config)
 {
 	int regv = litex_read(config->reg_addr, config->reg_size);
 
@@ -142,7 +142,7 @@ static int gpio_litex_port_set_masked_raw(struct device *dev,
 					  gpio_port_value_t value)
 {
 	const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev);
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_val = get_port(gpio_config);
 	port_val = (port_val & ~mask) | (value & mask);
@@ -155,7 +155,7 @@ static int gpio_litex_port_set_bits_raw(struct device *dev,
 					gpio_port_pins_t pins)
 {
 	const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev);
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_val = get_port(gpio_config);
 	port_val |= pins;
@@ -168,7 +168,7 @@ static int gpio_litex_port_clear_bits_raw(struct device *dev,
 					  gpio_port_pins_t pins)
 {
 	const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev);
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_val = get_port(gpio_config);
 	port_val &= ~pins;
@@ -181,7 +181,7 @@ static int gpio_litex_port_toggle_bits(struct device *dev,
 				       gpio_port_pins_t pins)
 {
 	const struct gpio_litex_cfg *gpio_config = DEV_GPIO_CFG(dev);
-	u32_t port_val;
+	uint32_t port_val;
 
 	port_val = get_port(gpio_config);
 	port_val ^= pins;
@@ -222,7 +222,7 @@ static const struct gpio_driver_api gpio_litex_driver_api = {
 \
 	static const struct gpio_litex_cfg gpio_litex_cfg_##n = { \
 		.reg_addr = \
-		(volatile u32_t *) DT_INST_REG_ADDR(n), \
+		(volatile uint32_t *) DT_INST_REG_ADDR(n), \
 		.reg_size = DT_INST_REG_SIZE(n), \
 		.nr_gpios = DT_INST_PROP(n, ngpios), \
 		.port_is_output = DT_INST_PROP(n, port_is_output), \
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index 09fd76906f..2d6a4db007 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -14,12 +14,12 @@
 #include "gpio_utils.h"
 
 #define GPIO_IN_BASE(config) \
-	((__IO u32_t *)(GPIO_PARIN_BASE + (config->port_num << 2)))
+	((__IO uint32_t *)(GPIO_PARIN_BASE + (config->port_num << 2)))
 
 #define GPIO_OUT_BASE(config) \
-	((__IO u32_t *)(GPIO_PAROUT_BASE + (config->port_num << 2)))
+	((__IO uint32_t *)(GPIO_PAROUT_BASE + (config->port_num << 2)))
 
-static const u32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = {
+static const uint32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = {
 	(MCHP_GPIO_PORT_A_BITMAP),
 	(MCHP_GPIO_PORT_B_BITMAP),
 	(MCHP_GPIO_PORT_C_BITMAP),
@@ -34,26 +34,26 @@ struct gpio_xec_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 struct gpio_xec_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
-	__IO u32_t *pcr1_base;
-	u8_t girq_id;
-	u32_t port_num;
-	u32_t flags;
+	__IO uint32_t *pcr1_base;
+	uint8_t girq_id;
+	uint32_t port_num;
+	uint32_t flags;
 };
 
 static int gpio_xec_configure(struct device *dev,
 			      gpio_pin_t pin, gpio_flags_t flags)
 {
 	const struct gpio_xec_config *config = dev->config_info;
-	__IO u32_t *current_pcr1;
-	u32_t pcr1 = 0U;
-	u32_t mask = 0U;
-	__IO u32_t *gpio_out_reg = GPIO_OUT_BASE(config);
+	__IO uint32_t *current_pcr1;
+	uint32_t pcr1 = 0U;
+	uint32_t mask = 0U;
+	__IO uint32_t *gpio_out_reg = GPIO_OUT_BASE(config);
 
 	/* Validate pin number range in terms of current port */
 	if ((valid_ctrl_masks[config->port_num] & BIT(pin)) == 0U) {
@@ -134,10 +134,10 @@ static int gpio_xec_pin_interrupt_configure(struct device *dev,
 {
 	const struct gpio_xec_config *config = dev->config_info;
 	struct gpio_xec_data *drv_data = dev->driver_data;
-	__IO u32_t *current_pcr1;
-	u32_t pcr1 = 0U;
-	u32_t mask = 0U;
-	u32_t gpio_interrupt = 0U;
+	__IO uint32_t *current_pcr1;
+	uint32_t pcr1 = 0U;
+	uint32_t mask = 0U;
+	uint32_t gpio_interrupt = 0U;
 
 	/* Validate pin number range in terms of current port */
 	if ((valid_ctrl_masks[config->port_num] & BIT(pin)) == 0U) {
@@ -212,61 +212,61 @@ static int gpio_xec_pin_interrupt_configure(struct device *dev,
 	return 0;
 }
 
-static int gpio_xec_port_set_masked_raw(struct device *dev, u32_t mask,
-					u32_t value)
+static int gpio_xec_port_set_masked_raw(struct device *dev, uint32_t mask,
+					uint32_t value)
 {
 	const struct gpio_xec_config *config = dev->config_info;
 
 	/* GPIO output registers are used for writing */
-	__IO u32_t *gpio_base = GPIO_OUT_BASE(config);
+	__IO uint32_t *gpio_base = GPIO_OUT_BASE(config);
 
 	*gpio_base = (*gpio_base & ~mask) | (mask & value);
 
 	return 0;
 }
 
-static int gpio_xec_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_xec_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_xec_config *config = dev->config_info;
 
 	/* GPIO output registers are used for writing */
-	__IO u32_t *gpio_base = GPIO_OUT_BASE(config);
+	__IO uint32_t *gpio_base = GPIO_OUT_BASE(config);
 
 	*gpio_base |= mask;
 
 	return 0;
 }
 
-static int gpio_xec_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_xec_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_xec_config *config = dev->config_info;
 
 	/* GPIO output registers are used for writing */
-	__IO u32_t *gpio_base = GPIO_OUT_BASE(config);
+	__IO uint32_t *gpio_base = GPIO_OUT_BASE(config);
 
 	*gpio_base &= ~mask;
 
 	return 0;
 }
 
-static int gpio_xec_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_xec_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_xec_config *config = dev->config_info;
 
 	/* GPIO output registers are used for writing */
-	__IO u32_t *gpio_base = GPIO_OUT_BASE(config);
+	__IO uint32_t *gpio_base = GPIO_OUT_BASE(config);
 
 	*gpio_base ^= mask;
 
 	return 0;
 }
 
-static int gpio_xec_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_xec_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_xec_config *config = dev->config_info;
 
 	/* GPIO input registers are used for reading */
-	__IO u32_t *gpio_base = GPIO_IN_BASE(config);
+	__IO uint32_t *gpio_base = GPIO_IN_BASE(config);
 
 	*value = *gpio_base;
 
@@ -308,8 +308,8 @@ static void gpio_gpio_xec_port_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_xec_config *config = dev->config_info;
 	struct gpio_xec_data *data = dev->driver_data;
-	u32_t girq_result;
-	u32_t enabled_int;
+	uint32_t girq_result;
+	uint32_t enabled_int;
 
 	/* Figure out which interrupts have been triggered from the EC
 	 * aggregator result register
@@ -344,7 +344,7 @@ static const struct gpio_xec_config gpio_xec_port000_036_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_000_036)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_000_036)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_000_036)),
 	.port_num = MCHP_GPIO_000_036,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_000_036), irq)
 	.girq_id = MCHP_GIRQ11_ID,
@@ -389,7 +389,7 @@ static const struct gpio_xec_config gpio_xec_port040_076_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_040_076)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_040_076)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_040_076)),
 	.port_num = MCHP_GPIO_040_076,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_040_076), irq)
 	.girq_id = MCHP_GIRQ10_ID,
@@ -434,7 +434,7 @@ static const struct gpio_xec_config gpio_xec_port100_136_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_100_136)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_100_136)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_100_136)),
 	.port_num = MCHP_GPIO_100_136,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_100_136), irq)
 	.girq_id = MCHP_GIRQ09_ID,
@@ -479,7 +479,7 @@ static const struct gpio_xec_config gpio_xec_port140_176_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_140_176)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_140_176)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_140_176)),
 	.port_num = MCHP_GPIO_140_176,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_140_176), irq)
 	.girq_id = MCHP_GIRQ08_ID,
@@ -524,7 +524,7 @@ static const struct gpio_xec_config gpio_xec_port200_236_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_200_236)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_200_236)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_200_236)),
 	.port_num = MCHP_GPIO_200_236,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_200_236), irq)
 	.girq_id = MCHP_GIRQ12_ID,
@@ -569,7 +569,7 @@ static const struct gpio_xec_config gpio_xec_port240_276_config = {
 		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_NODE(
 					DT_NODELABEL(gpio_240_276)),
 	},
-	.pcr1_base = (u32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_240_276)),
+	.pcr1_base = (uint32_t *) DT_REG_ADDR(DT_NODELABEL(gpio_240_276)),
 	.port_num = MCHP_GPIO_240_276,
 #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_240_276), irq)
 	.girq_id = MCHP_GIRQ26_ID,
diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c
index 6ea7f90e6f..f54972a548 100644
--- a/drivers/gpio/gpio_mcp23s17.c
+++ b/drivers/gpio/gpio_mcp23s17.c
@@ -37,15 +37,15 @@ LOG_MODULE_REGISTER(gpio_mcp23s17);
  *
  * @return 0 if successful, failed otherwise.
  */
-static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf)
+static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
 	int ret;
-	u16_t port_data;
+	uint16_t port_data;
 
-	u8_t addr = MCP23S17_ADDR | MCP23S17_READBIT;
-	u8_t buffer_tx[4] = { addr, reg, 0, 0 };
+	uint8_t addr = MCP23S17_ADDR | MCP23S17_READBIT;
+	uint8_t buffer_tx[4] = { addr, reg, 0, 0 };
 
 	const struct spi_buf tx_buf = {
 		.buf = buffer_tx,
@@ -61,7 +61,7 @@ static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf)
 			.len = 2
 		},
 		{
-			.buf = (u8_t *)&port_data,
+			.buf = (uint8_t *)&port_data,
 			.len = 2
 		}
 	};
@@ -95,20 +95,20 @@ static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf)
  *
  * @return 0 if successful, failed otherwise.
  */
-static int write_port_regs(struct device *dev, u8_t reg, u16_t value)
+static int write_port_regs(struct device *dev, uint8_t reg, uint16_t value)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
 	int ret;
-	u16_t port_data;
+	uint16_t port_data;
 
 	LOG_DBG("MCP23S17: Write: REG[0x%X] = 0x%X, REG[0x%X] = 0x%X",
 		reg, (value & 0xFF), (reg + 1), (value >> 8));
 
 	port_data = sys_cpu_to_le16(value);
 
-	u8_t addr = MCP23S17_ADDR;
-	u8_t buffer_tx[2] = { addr, reg };
+	uint8_t addr = MCP23S17_ADDR;
+	uint8_t buffer_tx[2] = { addr, reg };
 
 	const struct spi_buf tx_buf[2] = {
 		{
@@ -116,7 +116,7 @@ static int write_port_regs(struct device *dev, u8_t reg, u16_t value)
 			.len = 2,
 		},
 		{
-			.buf = (u8_t *)&port_data,
+			.buf = (uint8_t *)&port_data,
 			.len = 2,
 		}
 	};
@@ -143,12 +143,12 @@ static int write_port_regs(struct device *dev, u8_t reg, u16_t value)
  *
  * @return 0 if successful, failed otherwise
  */
-static int setup_pin_dir(struct device *dev, u32_t pin, int flags)
+static int setup_pin_dir(struct device *dev, uint32_t pin, int flags)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
-	u16_t *dir = &drv_data->reg_cache.iodir;
-	u16_t *output = &drv_data->reg_cache.gpio;
+	uint16_t *dir = &drv_data->reg_cache.iodir;
+	uint16_t *output = &drv_data->reg_cache.gpio;
 	int ret;
 
 	if ((flags & GPIO_OUTPUT) != 0U) {
@@ -181,11 +181,11 @@ static int setup_pin_dir(struct device *dev, u32_t pin, int flags)
  *
  * @return 0 if successful, failed otherwise
  */
-static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags)
+static int setup_pin_pullupdown(struct device *dev, uint32_t pin, int flags)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
-	u16_t port;
+	uint16_t port;
 	int ret;
 
 	/* Setup pin pull up or pull down */
@@ -242,11 +242,11 @@ done:
 	return ret;
 }
 
-static int mcp23s17_port_get_raw(struct device *dev, u32_t *value)
+static int mcp23s17_port_get_raw(struct device *dev, uint32_t *value)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
-	u16_t buf;
+	uint16_t buf;
 	int ret;
 
 	/* Can't do SPI bus operations from an ISR */
@@ -269,11 +269,11 @@ done:
 }
 
 static int mcp23s17_port_set_masked_raw(struct device *dev,
-					u32_t mask, u32_t value)
+					uint32_t mask, uint32_t value)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
-	u16_t buf;
+	uint16_t buf;
 	int ret;
 
 	/* Can't do SPI bus operations from an ISR */
@@ -296,21 +296,21 @@ static int mcp23s17_port_set_masked_raw(struct device *dev,
 	return ret;
 }
 
-static int mcp23s17_port_set_bits_raw(struct device *dev, u32_t mask)
+static int mcp23s17_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	return mcp23s17_port_set_masked_raw(dev, mask, mask);
 }
 
-static int mcp23s17_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int mcp23s17_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	return mcp23s17_port_set_masked_raw(dev, mask, 0);
 }
 
-static int mcp23s17_port_toggle_bits(struct device *dev, u32_t mask)
+static int mcp23s17_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	struct mcp23s17_drv_data *const drv_data =
 		(struct mcp23s17_drv_data *const)dev->driver_data;
-	u16_t buf;
+	uint16_t buf;
 	int ret;
 
 	/* Can't do SPI bus operations from an ISR */
diff --git a/drivers/gpio/gpio_mcp23s17.h b/drivers/gpio/gpio_mcp23s17.h
index 0ce9de1d50..08791d1e66 100644
--- a/drivers/gpio/gpio_mcp23s17.h
+++ b/drivers/gpio/gpio_mcp23s17.h
@@ -51,10 +51,10 @@ struct mcp23s17_config {
 	struct gpio_driver_config common;
 
 	const char *const spi_dev_name;
-	const u16_t slave;
-	const u32_t freq;
+	const uint16_t slave;
+	const uint32_t freq;
 	const char *const cs_dev;
-	const u32_t cs_pin;
+	const uint32_t cs_pin;
 };
 
 /** Runtime driver data */
@@ -70,17 +70,17 @@ struct mcp23s17_drv_data {
 	struct k_sem lock;
 
 	struct {
-		u16_t iodir;
-		u16_t ipol;
-		u16_t gpinten;
-		u16_t defval;
-		u16_t intcon;
-		u16_t iocon;
-		u16_t gppu;
-		u16_t intf;
-		u16_t intcap;
-		u16_t gpio;
-		u16_t olat;
+		uint16_t iodir;
+		uint16_t ipol;
+		uint16_t gpinten;
+		uint16_t defval;
+		uint16_t intcon;
+		uint16_t iocon;
+		uint16_t gppu;
+		uint16_t intf;
+		uint16_t intcap;
+		uint16_t gpio;
+		uint16_t olat;
 	} reg_cache;
 };
 
diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c
index b32ea5ecb0..9b527ed3bc 100644
--- a/drivers/gpio/gpio_mcux.c
+++ b/drivers/gpio/gpio_mcux.c
@@ -30,7 +30,7 @@ struct gpio_mcux_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 static int gpio_mcux_configure(struct device *dev,
@@ -39,8 +39,8 @@ static int gpio_mcux_configure(struct device *dev,
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
 	PORT_Type *port_base = config->port_base;
-	u32_t mask = 0U;
-	u32_t pcr = 0U;
+	uint32_t mask = 0U;
+	uint32_t pcr = 0U;
 
 	/* Check for an invalid pin number */
 	if (pin >= ARRAY_SIZE(port_base->PCR)) {
@@ -100,7 +100,7 @@ static int gpio_mcux_configure(struct device *dev,
 	return 0;
 }
 
-static int gpio_mcux_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_mcux_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -110,8 +110,8 @@ static int gpio_mcux_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_mcux_port_set_masked_raw(struct device *dev, u32_t mask,
-					 u32_t value)
+static int gpio_mcux_port_set_masked_raw(struct device *dev, uint32_t mask,
+					 uint32_t value)
 {
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -121,7 +121,7 @@ static int gpio_mcux_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_mcux_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mcux_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -131,7 +131,7 @@ static int gpio_mcux_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mcux_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mcux_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -141,7 +141,7 @@ static int gpio_mcux_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mcux_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_mcux_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -151,8 +151,8 @@ static int gpio_mcux_port_toggle_bits(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
-		u32_t pin, enum gpio_int_mode mode,
+static uint32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
+		uint32_t pin, enum gpio_int_mode mode,
 		enum gpio_int_trig trig)
 {
 	port_interrupt_t port_interrupt = 0;
@@ -210,7 +210,7 @@ static int gpio_mcux_pin_interrupt_configure(struct device *dev,
 		return -ENOTSUP;
 	}
 
-	u32_t pcr = get_port_pcr_irqc_value_from_flags(dev, pin, mode, trig);
+	uint32_t pcr = get_port_pcr_irqc_value_from_flags(dev, pin, mode, trig);
 
 	port_base->PCR[pin] = (port_base->PCR[pin] & ~PORT_PCR_IRQC_MASK) | pcr;
 
@@ -252,7 +252,7 @@ static void gpio_mcux_port_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_mcux_config *config = dev->config_info;
 	struct gpio_mcux_data *data = dev->driver_data;
-	u32_t enabled_int, int_status;
+	uint32_t enabled_int, int_status;
 
 	int_status = config->port_base->ISFR;
 	enabled_int = int_status & data->pin_callback_enables;
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index ded2123e72..4a68afd3db 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -27,7 +27,7 @@ struct mcux_igpio_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
 static int mcux_igpio_configure(struct device *dev,
@@ -61,7 +61,7 @@ static int mcux_igpio_configure(struct device *dev,
 	return 0;
 }
 
-static int mcux_igpio_port_get_raw(struct device *dev, u32_t *value)
+static int mcux_igpio_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct mcux_igpio_config *config = dev->config_info;
 	GPIO_Type *base = config->base;
@@ -71,8 +71,8 @@ static int mcux_igpio_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int mcux_igpio_port_set_masked_raw(struct device *dev, u32_t mask,
-		u32_t value)
+static int mcux_igpio_port_set_masked_raw(struct device *dev, uint32_t mask,
+		uint32_t value)
 {
 	const struct mcux_igpio_config *config = dev->config_info;
 	GPIO_Type *base = config->base;
@@ -82,7 +82,7 @@ static int mcux_igpio_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int mcux_igpio_port_set_bits_raw(struct device *dev, u32_t mask)
+static int mcux_igpio_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct mcux_igpio_config *config = dev->config_info;
 	GPIO_Type *base = config->base;
@@ -92,7 +92,7 @@ static int mcux_igpio_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int mcux_igpio_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int mcux_igpio_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct mcux_igpio_config *config = dev->config_info;
 	GPIO_Type *base = config->base;
@@ -102,7 +102,7 @@ static int mcux_igpio_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int mcux_igpio_port_toggle_bits(struct device *dev, u32_t mask)
+static int mcux_igpio_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct mcux_igpio_config *config = dev->config_info;
 	GPIO_Type *base = config->base;
@@ -120,7 +120,7 @@ static int mcux_igpio_pin_interrupt_configure(struct device *dev,
 	struct mcux_igpio_data *data = dev->driver_data;
 	GPIO_Type *base = config->base;
 	unsigned int key;
-	u8_t icr;
+	uint8_t icr;
 	int shift;
 
 	if (mode == GPIO_INT_MODE_DISABLED) {
@@ -202,7 +202,7 @@ static void mcux_igpio_port_isr(void *arg)
 	const struct mcux_igpio_config *config = dev->config_info;
 	struct mcux_igpio_data *data = dev->driver_data;
 	GPIO_Type *base = config->base;
-	u32_t enabled_int, int_flags;
+	uint32_t enabled_int, int_flags;
 
 	int_flags = base->ISR;
 	enabled_int = int_flags & data->pin_callback_enables;
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 708df141ae..f63d4ea3d1 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -39,7 +39,7 @@ struct gpio_mcux_lpc_config {
 	GPIO_Type *gpio_base;
 	PINT_Type *pint_base;
 	IOCON_Type *pinmux_base;
-	u32_t port_no;
+	uint32_t port_no;
 	clock_ip_name_t clock_ip_name;
 };
 
@@ -49,13 +49,13 @@ struct gpio_mcux_lpc_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 	/* pin association with PINT id */
 	pint_pin_int_t pint_id[32];
 	/* ISR allocated in device tree to this port */
-	u32_t isr_list[8];
+	uint32_t isr_list[8];
 	/* index to to table above */
-	u32_t isr_list_idx;
+	uint32_t isr_list_idx;
 };
 
 static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin,
@@ -63,7 +63,7 @@ static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin,
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
-	u32_t port = config->port_no;
+	uint32_t port = config->port_no;
 
 	if (((flags & GPIO_INPUT) != 0) && ((flags & GPIO_OUTPUT) != 0)) {
 		return -ENOTSUP;
@@ -75,7 +75,7 @@ static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin,
 
 	if (flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) {
 		IOCON_Type *pinmux_base = config->pinmux_base;
-		u32_t *pinconfig = (u32_t *)&(pinmux_base->PIO[port][pin]);
+		uint32_t *pinconfig = (uint32_t *)&(pinmux_base->PIO[port][pin]);
 
 		*pinconfig &= ~(IOCON_PIO_MODE_PULLUP|IOCON_PIO_MODE_PULLDOWN);
 		if ((flags & GPIO_PULL_UP) != 0) {
@@ -100,7 +100,7 @@ static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin,
 	return 0;
 }
 
-static int gpio_mcux_lpc_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_mcux_lpc_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -110,12 +110,12 @@ static int gpio_mcux_lpc_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, u32_t mask,
-					     u32_t value)
+static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, uint32_t mask,
+					     uint32_t value)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
-	u32_t port = config->port_no;
+	uint32_t port = config->port_no;
 
 	/* Writing 0 allows R+W, 1 disables the pin */
 	gpio_base->MASK[port] = ~mask;
@@ -126,7 +126,7 @@ static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -136,7 +136,7 @@ static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -146,7 +146,7 @@ static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -161,9 +161,9 @@ static void gpio_mcux_lpc_port_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_mcux_lpc_config *config = dev->config_info;
 	struct gpio_mcux_lpc_data *data = dev->driver_data;
-	u32_t enabled_int;
-	u32_t int_flags;
-	u32_t pin;
+	uint32_t enabled_int;
+	uint32_t int_flags;
+	uint32_t pin;
 
 	for (pin = 0; pin < 32; pin++) {
 		if (data->pint_id[pin] != NO_PINT_INT) {
@@ -180,10 +180,10 @@ static void gpio_mcux_lpc_port_isr(void *arg)
 	}
 }
 
-static u32_t get_free_isr(struct gpio_mcux_lpc_data *data)
+static uint32_t get_free_isr(struct gpio_mcux_lpc_data *data)
 {
-	u32_t i;
-	u32_t isr;
+	uint32_t i;
+	uint32_t isr;
 
 	for (i = 0; i < data->isr_list_idx; i++) {
 		if (data->isr_list[i] != -1) {
@@ -199,9 +199,9 @@ static u32_t get_free_isr(struct gpio_mcux_lpc_data *data)
 /* Function configures INPUTMUX device to route pin interrupts to a certain
  * PINT. PINT no. is unknown, rather it's determined from ISR no.
  */
-static u32_t attach_pin_to_isr(u32_t port, u32_t pin, u32_t isr_no)
+static uint32_t attach_pin_to_isr(uint32_t port, uint32_t pin, uint32_t isr_no)
 {
-	u32_t pint_idx;
+	uint32_t pint_idx;
 	/* Connect trigger sources to PINT */
 	INPUTMUX_Init(INPUTMUX);
 
@@ -236,9 +236,9 @@ static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev,
 	struct gpio_mcux_lpc_data *data = dev->driver_data;
 	pint_pin_enable_t interruptMode = kPINT_PinIntEnableNone;
 	GPIO_Type *gpio_base = config->gpio_base;
-	u32_t port = config->port_no;
-	u32_t isr;
-	u32_t pint_idx;
+	uint32_t port = config->port_no;
+	uint32_t isr;
+	uint32_t pint_idx;
 
 	/* Ensure pin used as interrupt is set as input*/
 	if ((mode & GPIO_INT_ENABLE) &&
diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c
index 3a158aee24..fa40e6649b 100644
--- a/drivers/gpio/gpio_mmio32.c
+++ b/drivers/gpio/gpio_mmio32.c
@@ -48,7 +48,7 @@ static int gpio_mmio32_config(struct device *dev,
 
 	if ((flags & GPIO_OUTPUT) != 0) {
 		unsigned int key;
-		volatile u32_t *reg = config->reg;
+		volatile uint32_t *reg = config->reg;
 
 		key = irq_lock();
 		if ((flags & GPIO_OUTPUT_INIT_HIGH) != 0) {
@@ -62,7 +62,7 @@ static int gpio_mmio32_config(struct device *dev,
 	return 0;
 }
 
-static int gpio_mmio32_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_mmio32_port_get_raw(struct device *dev, uint32_t *value)
 {
 	struct gpio_mmio32_context *context = dev->driver_data;
 	const struct gpio_mmio32_config *config = context->config;
@@ -72,12 +72,12 @@ static int gpio_mmio32_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_mmio32_port_set_masked_raw(struct device *dev, u32_t mask,
-					  u32_t value)
+static int gpio_mmio32_port_set_masked_raw(struct device *dev, uint32_t mask,
+					  uint32_t value)
 {
 	struct gpio_mmio32_context *context = dev->driver_data;
 	const struct gpio_mmio32_config *config = context->config;
-	volatile u32_t *reg = config->reg;
+	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
 	mask &= config->mask;
@@ -91,11 +91,11 @@ static int gpio_mmio32_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_mmio32_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mmio32_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->driver_data;
 	const struct gpio_mmio32_config *config = context->config;
-	volatile u32_t *reg = config->reg;
+	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
 	mask &= config->mask;
@@ -108,11 +108,11 @@ static int gpio_mmio32_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mmio32_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_mmio32_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->driver_data;
 	const struct gpio_mmio32_config *config = context->config;
-	volatile u32_t *reg = config->reg;
+	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
 	mask &= config->mask;
@@ -125,11 +125,11 @@ static int gpio_mmio32_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_mmio32_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_mmio32_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	struct gpio_mmio32_context *context = dev->driver_data;
 	const struct gpio_mmio32_config *config = context->config;
-	volatile u32_t *reg = config->reg;
+	volatile uint32_t *reg = config->reg;
 	unsigned int key;
 
 	mask &= config->mask;
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index 53fa20c514..22903aa289 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -18,23 +18,23 @@ struct gpio_nrfx_data {
 	/* Mask holding information about which pins have been configured to
 	 * trigger interrupts using gpio_nrfx_config function.
 	 */
-	u32_t pin_int_en;
+	uint32_t pin_int_en;
 
 	/* Mask holding information about which pins have enabled callbacks
 	 * using gpio_nrfx_enable_callback function.
 	 */
-	u32_t int_en;
+	uint32_t int_en;
 
-	u32_t int_active_level;
-	u32_t trig_edge;
-	u32_t double_edge;
+	uint32_t int_active_level;
+	uint32_t trig_edge;
+	uint32_t double_edge;
 };
 
 struct gpio_nrfx_cfg {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
 	NRF_GPIO_Type *port;
-	u8_t port_num;
+	uint8_t port_num;
 };
 
 static inline struct gpio_nrfx_data *get_port_data(struct device *port)
@@ -47,9 +47,9 @@ static inline const struct gpio_nrfx_cfg *get_port_cfg(struct device *port)
 	return port->config_info;
 }
 
-static int gpiote_channel_alloc(u32_t abs_pin, nrf_gpiote_polarity_t polarity)
+static int gpiote_channel_alloc(uint32_t abs_pin, nrf_gpiote_polarity_t polarity)
 {
-	for (u8_t channel = 0; channel < GPIOTE_CH_NUM; ++channel) {
+	for (uint8_t channel = 0; channel < GPIOTE_CH_NUM; ++channel) {
 		if (!nrf_gpiote_te_is_enabled(NRF_GPIOTE, channel)) {
 			nrf_gpiote_event_t evt =
 				offsetof(NRF_GPIOTE_Type, EVENTS_IN[channel]);
@@ -66,9 +66,9 @@ static int gpiote_channel_alloc(u32_t abs_pin, nrf_gpiote_polarity_t polarity)
 	return -ENODEV;
 }
 
-static void gpiote_channel_free(u32_t abs_pin)
+static void gpiote_channel_free(uint32_t abs_pin)
 {
-	u32_t intenset = nrf_gpiote_int_enable_check(NRF_GPIOTE,
+	uint32_t intenset = nrf_gpiote_int_enable_check(NRF_GPIOTE,
 						     NRF_GPIOTE_INT_IN_MASK);
 
 	for (size_t i = 0; i < GPIOTE_CH_NUM; i++) {
@@ -81,8 +81,8 @@ static void gpiote_channel_free(u32_t abs_pin)
 	}
 }
 
-static inline u32_t sense_for_pin(const struct gpio_nrfx_data *data,
-				  u32_t pin)
+static inline uint32_t sense_for_pin(const struct gpio_nrfx_data *data,
+				  uint32_t pin)
 {
 	if ((BIT(pin) & data->int_active_level) != 0U) {
 		return NRF_GPIO_PIN_SENSE_HIGH;
@@ -90,11 +90,11 @@ static inline u32_t sense_for_pin(const struct gpio_nrfx_data *data,
 	return NRF_GPIO_PIN_SENSE_LOW;
 }
 
-static int gpiote_pin_int_cfg(struct device *port, u32_t pin)
+static int gpiote_pin_int_cfg(struct device *port, uint32_t pin)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
 	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
-	u32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
+	uint32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
 	int res = 0;
 
 	gpiote_channel_free(abs_pin);
@@ -119,7 +119,7 @@ static int gpiote_pin_int_cfg(struct device *port, u32_t pin)
 			res = gpiote_channel_alloc(abs_pin, pol);
 		} else {
 		/* For level triggering we use sense mechanism. */
-			u32_t sense = sense_for_pin(data, pin);
+			uint32_t sense = sense_for_pin(data, pin);
 
 			nrf_gpio_cfg_sense_set(abs_pin, sense);
 		}
@@ -199,7 +199,7 @@ static int gpio_nrfx_config(struct device *port,
 	return 0;
 }
 
-static int gpio_nrfx_port_get_raw(struct device *port, u32_t *value)
+static int gpio_nrfx_port_get_raw(struct device *port, uint32_t *value)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
 
@@ -208,11 +208,11 @@ static int gpio_nrfx_port_get_raw(struct device *port, u32_t *value)
 	return 0;
 }
 
-static int gpio_nrfx_port_set_masked_raw(struct device *port, u32_t mask,
-					 u32_t value)
+static int gpio_nrfx_port_set_masked_raw(struct device *port, uint32_t mask,
+					 uint32_t value)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
-	u32_t value_tmp;
+	uint32_t value_tmp;
 
 	value_tmp = nrf_gpio_port_out_read(reg) & ~mask;
 	nrf_gpio_port_out_write(reg, value_tmp | (mask & value));
@@ -220,7 +220,7 @@ static int gpio_nrfx_port_set_masked_raw(struct device *port, u32_t mask,
 	return 0;
 }
 
-static int gpio_nrfx_port_set_bits_raw(struct device *port, u32_t mask)
+static int gpio_nrfx_port_set_bits_raw(struct device *port, uint32_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
 
@@ -229,7 +229,7 @@ static int gpio_nrfx_port_set_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_nrfx_port_clear_bits_raw(struct device *port, u32_t mask)
+static int gpio_nrfx_port_clear_bits_raw(struct device *port, uint32_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
 
@@ -238,10 +238,10 @@ static int gpio_nrfx_port_clear_bits_raw(struct device *port, u32_t mask)
 	return 0;
 }
 
-static int gpio_nrfx_port_toggle_bits(struct device *port, u32_t mask)
+static int gpio_nrfx_port_toggle_bits(struct device *port, uint32_t mask)
 {
 	NRF_GPIO_Type *reg = get_port_cfg(port)->port;
-	u32_t value;
+	uint32_t value;
 
 	value = nrf_gpio_port_out_read(reg);
 	nrf_gpio_port_out_write(reg, value ^ mask);
@@ -254,7 +254,7 @@ static int gpio_nrfx_pin_interrupt_configure(struct device *port,
 		enum gpio_int_trig trig)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
-	u32_t abs_pin = NRF_GPIO_PIN_MAP(get_port_cfg(port)->port_num, pin);
+	uint32_t abs_pin = NRF_GPIO_PIN_MAP(get_port_cfg(port)->port_num, pin);
 
 	if ((mode == GPIO_INT_MODE_EDGE) &&
 	    (nrf_gpio_pin_dir_get(abs_pin) == NRF_GPIO_PIN_DIR_OUTPUT)) {
@@ -285,7 +285,7 @@ static int gpio_nrfx_manage_callback(struct device *port,
 }
 
 static int gpio_nrfx_pin_manage_callback(struct device *port,
-					 u32_t pin,
+					 uint32_t pin,
 					 bool enable)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
@@ -320,14 +320,14 @@ static const struct gpio_driver_api gpio_nrfx_drv_api_funcs = {
 	.disable_callback = gpio_nrfx_pin_disable_callback
 };
 
-static inline u32_t get_level_pins(struct device *port)
+static inline uint32_t get_level_pins(struct device *port)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
 
 	/* Take into consideration only pins that were configured to
 	 * trigger interrupts and have callback enabled.
 	 */
-	u32_t out = data->int_en & data->pin_int_en;
+	uint32_t out = data->int_en & data->pin_int_en;
 
 	/* Exclude pins that trigger interrupts by edge. */
 	out &= ~data->trig_edge & ~data->double_edge;
@@ -343,15 +343,15 @@ static void cfg_level_pins(struct device *port)
 {
 	const struct gpio_nrfx_data *data = get_port_data(port);
 	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
-	u32_t pin = 0U;
-	u32_t bit = 1U << pin;
-	u32_t level_pins = get_level_pins(port);
+	uint32_t pin = 0U;
+	uint32_t bit = 1U << pin;
+	uint32_t level_pins = get_level_pins(port);
 
 	/* Configure sense detection on all pins that use it. */
 	while (level_pins) {
 		if (level_pins & bit) {
-			u32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
-			u32_t sense = sense_for_pin(data, pin);
+			uint32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
+			uint32_t sense = sense_for_pin(data, pin);
 
 			nrf_gpio_cfg_sense_set(abs_pin, sense);
 			level_pins &= ~bit;
@@ -368,30 +368,30 @@ static void cfg_level_pins(struct device *port)
  *
  * @return Bitmask where 1 marks pin as trigger source.
  */
-static u32_t check_level_trigger_pins(struct device *port)
+static uint32_t check_level_trigger_pins(struct device *port)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
 	const struct gpio_nrfx_cfg *cfg = get_port_cfg(port);
-	u32_t level_pins = get_level_pins(port);
-	u32_t port_in = nrf_gpio_port_in_read(cfg->port);
+	uint32_t level_pins = get_level_pins(port);
+	uint32_t port_in = nrf_gpio_port_in_read(cfg->port);
 
 	/* Extract which pins have logic level same as interrupt trigger level.
 	 */
-	u32_t pin_states = ~(port_in ^ data->int_active_level);
+	uint32_t pin_states = ~(port_in ^ data->int_active_level);
 
 	/* Discard pins that aren't configured for level. */
-	u32_t out = pin_states & level_pins;
+	uint32_t out = pin_states & level_pins;
 
 	/* Disable sense detection on all pins that use it, whether
 	 * they appear to have triggered or not.  This ensures
 	 * nobody's requesting DETECT.
 	 */
-	u32_t pin = 0U;
-	u32_t bit = 1U << pin;
+	uint32_t pin = 0U;
+	uint32_t bit = 1U << pin;
 
 	while (level_pins) {
 		if (level_pins & bit) {
-			u32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
+			uint32_t abs_pin = NRF_GPIO_PIN_MAP(cfg->port_num, pin);
 
 			nrf_gpio_cfg_sense_set(abs_pin, NRF_GPIO_PIN_NOSENSE);
 			level_pins &= ~bit;
@@ -403,7 +403,7 @@ static u32_t check_level_trigger_pins(struct device *port)
 	return out;
 }
 
-static inline void fire_callbacks(struct device *port, u32_t pins)
+static inline void fire_callbacks(struct device *port, uint32_t pins)
 {
 	struct gpio_nrfx_data *data = get_port_data(port);
 	sys_slist_t *list = &data->callbacks;
@@ -435,7 +435,7 @@ DEVICE_DECLARE(gpio_nrfx_p1);
 
 static void gpiote_event_handler(void)
 {
-	u32_t fired_triggers[GPIO_COUNT] = {0};
+	uint32_t fired_triggers[GPIO_COUNT] = {0};
 	bool port_event = nrf_gpiote_event_check(NRF_GPIOTE,
 						 NRF_GPIOTE_EVENT_PORT);
 
@@ -462,7 +462,7 @@ static void gpiote_event_handler(void)
 
 		if (nrf_gpiote_int_enable_check(NRF_GPIOTE, BIT(i)) &&
 		    nrf_gpiote_event_check(NRF_GPIOTE, evt)) {
-			u32_t abs_pin = nrf_gpiote_event_pin_get(NRF_GPIOTE, i);
+			uint32_t abs_pin = nrf_gpiote_event_pin_get(NRF_GPIOTE, i);
 			/* Divide absolute pin number to port and pin parts. */
 			fired_triggers[abs_pin / 32U] |= BIT(abs_pin % 32);
 			nrf_gpiote_event_clear(NRF_GPIOTE, evt);
diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c
index cfbcb8547b..c517d577c4 100644
--- a/drivers/gpio/gpio_pca95xx.c
+++ b/drivers/gpio/gpio_pca95xx.c
@@ -63,9 +63,9 @@ struct gpio_pca95xx_config {
 	const char * const i2c_master_dev_name;
 
 	/** The slave address of the chip */
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 
-	u8_t capabilities;
+	uint8_t capabilities;
 };
 
 /** Runtime driver data */
@@ -77,10 +77,10 @@ struct gpio_pca95xx_drv_data {
 	struct device *i2c_master;
 
 	struct {
-		u16_t output;
-		u16_t dir;
-		u16_t pud_en;
-		u16_t pud_sel;
+		uint16_t output;
+		uint16_t dir;
+		uint16_t pud_en;
+		uint16_t pud_sel;
 	} reg_cache;
 
 	struct k_sem lock;
@@ -97,19 +97,19 @@ struct gpio_pca95xx_drv_data {
  *
  * @return 0 if successful, failed otherwise.
  */
-static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf)
+static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf)
 {
 	const struct gpio_pca95xx_config * const config =
 		dev->config_info;
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
 	struct device * const i2c_master = drv_data->i2c_master;
-	u16_t i2c_addr = config->i2c_slave_addr;
-	u16_t port_data;
+	uint16_t i2c_addr = config->i2c_slave_addr;
+	uint16_t port_data;
 	int ret;
 
 	ret = i2c_burst_read(i2c_master, i2c_addr, reg,
-			     (u8_t *)&port_data, sizeof(port_data));
+			     (uint8_t *)&port_data, sizeof(port_data));
 	if (ret != 0) {
 		LOG_ERR("PCA95XX[0x%X]: error reading register 0x%X (%d)",
 			i2c_addr, reg, ret);
@@ -136,16 +136,16 @@ static int read_port_regs(struct device *dev, u8_t reg, u16_t *buf)
  *
  * @return 0 if successful, failed otherwise.
  */
-static int write_port_regs(struct device *dev, u8_t reg,
-			   u16_t *cache, u16_t value)
+static int write_port_regs(struct device *dev, uint8_t reg,
+			   uint16_t *cache, uint16_t value)
 {
 	const struct gpio_pca95xx_config * const config =
 		dev->config_info;
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
 	struct device * const i2c_master = drv_data->i2c_master;
-	u16_t i2c_addr = config->i2c_slave_addr;
-	u16_t port_data;
+	uint16_t i2c_addr = config->i2c_slave_addr;
+	uint16_t port_data;
 	int ret;
 
 	LOG_DBG("PCA95XX[0x%X]: Write: REG[0x%X] = 0x%X, REG[0x%X] = "
@@ -155,7 +155,7 @@ static int write_port_regs(struct device *dev, u8_t reg,
 	port_data = sys_cpu_to_le16(value);
 
 	ret = i2c_burst_write(i2c_master, i2c_addr, reg,
-			      (u8_t *)&port_data, sizeof(port_data));
+			      (uint8_t *)&port_data, sizeof(port_data));
 	if (ret == 0) {
 		*cache = value;
 	} else {
@@ -166,7 +166,7 @@ static int write_port_regs(struct device *dev, u8_t reg,
 	return ret;
 }
 
-static inline int update_output_regs(struct device *dev, u16_t value)
+static inline int update_output_regs(struct device *dev, uint16_t value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
@@ -175,7 +175,7 @@ static inline int update_output_regs(struct device *dev, u16_t value)
 			       &drv_data->reg_cache.output, value);
 }
 
-static inline int update_direction_regs(struct device *dev, u16_t value)
+static inline int update_direction_regs(struct device *dev, uint16_t value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
@@ -184,7 +184,7 @@ static inline int update_direction_regs(struct device *dev, u16_t value)
 			       &drv_data->reg_cache.dir, value);
 }
 
-static inline int update_pul_sel_regs(struct device *dev, u16_t value)
+static inline int update_pul_sel_regs(struct device *dev, uint16_t value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
@@ -193,7 +193,7 @@ static inline int update_pul_sel_regs(struct device *dev, u16_t value)
 			       &drv_data->reg_cache.pud_sel, value);
 }
 
-static inline int update_pul_en_regs(struct device *dev, u16_t value)
+static inline int update_pul_en_regs(struct device *dev, uint16_t value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
@@ -211,12 +211,12 @@ static inline int update_pul_en_regs(struct device *dev, u16_t value)
  *
  * @return 0 if successful, failed otherwise
  */
-static int setup_pin_dir(struct device *dev, u32_t pin, int flags)
+static int setup_pin_dir(struct device *dev, uint32_t pin, int flags)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
-	u16_t reg_dir = drv_data->reg_cache.dir;
-	u16_t reg_out = drv_data->reg_cache.output;
+	uint16_t reg_dir = drv_data->reg_cache.dir;
+	uint16_t reg_out = drv_data->reg_cache.output;
 	int ret;
 
 	/* For each pin, 0 == output, 1 == input */
@@ -250,13 +250,13 @@ static int setup_pin_dir(struct device *dev, u32_t pin, int flags)
  *
  * @return 0 if successful, failed otherwise
  */
-static int setup_pin_pullupdown(struct device *dev, u32_t pin, int flags)
+static int setup_pin_pullupdown(struct device *dev, uint32_t pin, int flags)
 {
 	const struct gpio_pca95xx_config * const config =
 		dev->config_info;
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
-	u16_t reg_pud;
+	uint16_t reg_pud;
 	int ret;
 
 	if ((config->capabilities & PCA_HAS_PUD) == 0) {
@@ -318,7 +318,7 @@ static int gpio_pca95xx_config(struct device *dev,
 #if (CONFIG_GPIO_LOG_LEVEL >= LOG_LEVEL_DEBUG)
 	const struct gpio_pca95xx_config * const config =
 		dev->config_info;
-	u16_t i2c_addr = config->i2c_slave_addr;
+	uint16_t i2c_addr = config->i2c_slave_addr;
 #endif
 
 	/* Does not support disconnected pin */
@@ -359,11 +359,11 @@ done:
 	return ret;
 }
 
-static int gpio_pca95xx_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_pca95xx_port_get_raw(struct device *dev, uint32_t *value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
-	u16_t buf;
+	uint16_t buf;
 	int ret;
 
 	/* Can't do I2C bus operations from an ISR */
@@ -386,11 +386,11 @@ done:
 }
 
 static int gpio_pca95xx_port_set_masked_raw(struct device *dev,
-					      u32_t mask, u32_t value)
+					      uint32_t mask, uint32_t value)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
-	u16_t reg_out;
+	uint16_t reg_out;
 	int ret;
 
 	/* Can't do I2C bus operations from an ISR */
@@ -410,21 +410,21 @@ static int gpio_pca95xx_port_set_masked_raw(struct device *dev,
 	return ret;
 }
 
-static int gpio_pca95xx_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_pca95xx_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	return gpio_pca95xx_port_set_masked_raw(dev, mask, mask);
 }
 
-static int gpio_pca95xx_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_pca95xx_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	return gpio_pca95xx_port_set_masked_raw(dev, mask, 0);
 }
 
-static int gpio_pca95xx_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_pca95xx_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	struct gpio_pca95xx_drv_data * const drv_data =
 		(struct gpio_pca95xx_drv_data * const)dev->driver_data;
-	u16_t reg_out;
+	uint16_t reg_out;
 	int ret;
 
 	/* Can't do I2C bus operations from an ISR */
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
index 363be99e8b..e61635bc77 100644
--- a/drivers/gpio/gpio_rv32m1.c
+++ b/drivers/gpio/gpio_rv32m1.c
@@ -35,11 +35,11 @@ struct gpio_rv32m1_data {
 	/* port ISR callback routine address */
 	sys_slist_t callbacks;
 	/* pin callback routine enable flags, by pin number */
-	u32_t pin_callback_enables;
+	uint32_t pin_callback_enables;
 };
 
-static u32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
-		u32_t pin, enum gpio_int_mode mode,
+static uint32_t get_port_pcr_irqc_value_from_flags(struct device *dev,
+		uint32_t pin, enum gpio_int_mode mode,
 		enum gpio_int_trig trig)
 {
 	port_interrupt_t port_interrupt = 0;
@@ -78,8 +78,8 @@ static int gpio_rv32m1_configure(struct device *dev,
 	GPIO_Type *gpio_base = config->gpio_base;
 	PORT_Type *port_base = config->port_base;
 	struct gpio_rv32m1_data *data = dev->driver_data;
-	u32_t mask = 0U;
-	u32_t pcr = 0U;
+	uint32_t mask = 0U;
+	uint32_t pcr = 0U;
 
 	/* Check for an invalid pin number */
 	if (pin >= ARRAY_SIZE(port_base->PCR)) {
@@ -156,7 +156,7 @@ static int gpio_rv32m1_configure(struct device *dev,
 
 	return 0;
 }
-static int gpio_rv32m1_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_rv32m1_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -166,8 +166,8 @@ static int gpio_rv32m1_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_rv32m1_port_set_masked_raw(struct device *dev, u32_t mask,
-		u32_t value)
+static int gpio_rv32m1_port_set_masked_raw(struct device *dev, uint32_t mask,
+		uint32_t value)
 {
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -177,7 +177,7 @@ static int gpio_rv32m1_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_rv32m1_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_rv32m1_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -187,7 +187,7 @@ static int gpio_rv32m1_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -197,7 +197,7 @@ static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_rv32m1_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_rv32m1_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	GPIO_Type *gpio_base = config->gpio_base;
@@ -226,7 +226,7 @@ static int gpio_rv32m1_pin_interrupt_configure(struct device *dev,
 		return -ENOTSUP;
 	}
 
-	u32_t pcr = get_port_pcr_irqc_value_from_flags(dev, pin, mode, trig);
+	uint32_t pcr = get_port_pcr_irqc_value_from_flags(dev, pin, mode, trig);
 
 	port_base->PCR[pin] = (port_base->PCR[pin] & ~PORT_PCR_IRQC_MASK) | pcr;
 
@@ -271,7 +271,7 @@ static void gpio_rv32m1_port_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_rv32m1_config *config = dev->config_info;
 	struct gpio_rv32m1_data *data = dev->driver_data;
-	u32_t enabled_int, int_status;
+	uint32_t enabled_int, int_status;
 
 	int_status = config->port_base->ISFR;
 	enabled_int = int_status & data->pin_callback_enables;
diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c
index 817f577eac..4bbf66ed7a 100644
--- a/drivers/gpio/gpio_sam.c
+++ b/drivers/gpio/gpio_sam.c
@@ -22,7 +22,7 @@ struct gpio_sam_config {
 	struct gpio_driver_config common;
 	Pio *regs;
 	config_func_t config_func;
-	u32_t periph_id;
+	uint32_t periph_id;
 };
 
 struct gpio_sam_runtime {
@@ -38,7 +38,7 @@ struct gpio_sam_runtime {
 
 #define GPIO_SAM_ALL_PINS    0xFFFFFFFF
 
-static int gpio_sam_port_configure(struct device *dev, u32_t mask,
+static int gpio_sam_port_configure(struct device *dev, uint32_t mask,
 				   gpio_flags_t flags)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
@@ -151,7 +151,7 @@ static int gpio_sam_config(struct device *dev, gpio_pin_t pin,
 	return gpio_sam_port_configure(dev, BIT(pin), flags);
 }
 
-static int gpio_sam_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_sam_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
@@ -161,8 +161,8 @@ static int gpio_sam_port_get_raw(struct device *dev, u32_t *value)
 	return 0;
 }
 
-static int gpio_sam_port_set_masked_raw(struct device *dev, u32_t mask,
-					u32_t value)
+static int gpio_sam_port_set_masked_raw(struct device *dev, uint32_t mask,
+					uint32_t value)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
@@ -172,7 +172,7 @@ static int gpio_sam_port_set_masked_raw(struct device *dev, u32_t mask,
 	return 0;
 }
 
-static int gpio_sam_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_sam_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
@@ -183,7 +183,7 @@ static int gpio_sam_port_set_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_sam_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_sam_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
@@ -194,7 +194,7 @@ static int gpio_sam_port_clear_bits_raw(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_sam_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_sam_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
@@ -205,7 +205,7 @@ static int gpio_sam_port_toggle_bits(struct device *dev, u32_t mask)
 	return 0;
 }
 
-static int gpio_sam_port_interrupt_configure(struct device *dev, u32_t mask,
+static int gpio_sam_port_interrupt_configure(struct device *dev, uint32_t mask,
 					     enum gpio_int_mode mode,
 					     enum gpio_int_trig trig)
 {
@@ -229,7 +229,7 @@ static int gpio_sam_port_interrupt_configure(struct device *dev, u32_t mask,
 			pio->PIO_LSR = mask;
 		}
 
-		u32_t rising_edge;
+		uint32_t rising_edge;
 
 		if (trig == GPIO_INT_TRIG_HIGH) {
 			rising_edge = mask;
@@ -266,7 +266,7 @@ static void gpio_sam_isr(void *arg)
 	const struct gpio_sam_config * const cfg = DEV_CFG(dev);
 	Pio * const pio = cfg->regs;
 	struct gpio_sam_runtime *context = dev->driver_data;
-	u32_t int_stat;
+	uint32_t int_stat;
 
 	int_stat = pio->PIO_ISR;
 
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 00743cfc91..ab609cd2a7 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -24,7 +24,7 @@ struct gpio_sam0_config {
 	struct gpio_driver_config common;
 	PortGroup *regs;
 #ifdef CONFIG_SAM0_EIC
-	u8_t id;
+	uint8_t id;
 #endif
 };
 
@@ -43,7 +43,7 @@ struct gpio_sam0_data {
 	((struct gpio_sam0_data *const)(dev)->driver_data)
 
 #ifdef CONFIG_SAM0_EIC
-static void gpio_sam0_isr(u32_t pins, void *arg)
+static void gpio_sam0_isr(uint32_t pins, void *arg)
 {
 	struct device *const dev = (struct device *) arg;
 	struct gpio_sam0_data *const data = DEV_DATA(dev);
@@ -122,7 +122,7 @@ static int gpio_sam0_port_set_masked_raw(struct device *dev,
 					 gpio_port_value_t value)
 {
 	const struct gpio_sam0_config *config = DEV_CFG(dev);
-	u32_t out = config->regs->OUT.reg;
+	uint32_t out = config->regs->OUT.reg;
 
 	config->regs->OUT.reg = (out & ~mask) | (value & mask);
 
@@ -274,7 +274,7 @@ int gpio_sam0_disable_callback(struct device *dev, gpio_pin_t pin)
 	return sam0_eic_disable_interrupt(config->id, pin);
 }
 
-static u32_t gpio_sam0_get_pending_int(struct device *dev)
+static uint32_t gpio_sam0_get_pending_int(struct device *dev)
 {
 	const struct gpio_sam0_config *config = DEV_CFG(dev);
 
diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c
index 1c6e0fb8b8..05468a2525 100644
--- a/drivers/gpio/gpio_shell.c
+++ b/drivers/gpio/gpio_shell.c
@@ -19,17 +19,17 @@
 LOG_MODULE_REGISTER(gpio_shell);
 
 struct args_index {
-	u8_t port;
-	u8_t index;
-	u8_t mode;
-	u8_t value;
+	uint8_t port;
+	uint8_t index;
+	uint8_t mode;
+	uint8_t value;
 };
 
 struct args_number {
-	u8_t conf;
-	u8_t set;
-	u8_t get;
-	u8_t listen;
+	uint8_t conf;
+	uint8_t set;
+	uint8_t get;
+	uint8_t listen;
 };
 
 static const struct args_index args_indx = {
@@ -48,14 +48,14 @@ static const struct args_number args_no = {
 
 static int cmd_gpio_conf(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t index = 0U;
+	uint8_t index = 0U;
 	int type = GPIO_OUTPUT;
 	struct device *dev;
 
 	if (argc == args_no.conf &&
 	    isdigit((unsigned char)argv[args_indx.index][0]) &&
 	    isalpha((unsigned char)argv[args_indx.mode][0])) {
-		index = (u8_t)atoi(argv[args_indx.index]);
+		index = (uint8_t)atoi(argv[args_indx.index]);
 		if (!strcmp(argv[args_indx.mode], "in")) {
 			type = GPIO_INPUT;
 		} else if (!strcmp(argv[args_indx.mode], "out")) {
@@ -84,7 +84,7 @@ static int cmd_gpio_get(const struct shell *shell,
 			size_t argc, char **argv)
 {
 	struct device *dev;
-	u8_t index = 0U;
+	uint8_t index = 0U;
 	int rc;
 
 	if (argc == args_no.get && isdigit((unsigned char)argv[args_indx.index][0])) {
@@ -97,7 +97,7 @@ static int cmd_gpio_get(const struct shell *shell,
 	dev = device_get_binding(argv[args_indx.port]);
 
 	if (dev != NULL) {
-		index = (u8_t)atoi(argv[2]);
+		index = (uint8_t)atoi(argv[2]);
 		shell_print(shell, "Reading %s pin %d",
 			     argv[args_indx.port], index);
 		rc = gpio_pin_get(dev, index);
@@ -116,8 +116,8 @@ static int cmd_gpio_set(const struct shell *shell,
 			size_t argc, char **argv)
 {
 	struct device *dev;
-	u8_t index = 0U;
-	u8_t value = 0U;
+	uint8_t index = 0U;
+	uint8_t value = 0U;
 
 	if (argc == args_no.set &&
 	    isdigit((unsigned char)argv[args_indx.index][0]) &&
@@ -131,7 +131,7 @@ static int cmd_gpio_set(const struct shell *shell,
 	dev = device_get_binding(argv[args_indx.port]);
 
 	if (dev != NULL) {
-		index = (u8_t)atoi(argv[2]);
+		index = (uint8_t)atoi(argv[2]);
 		shell_print(shell, "Writing to %s pin %d",
 			    argv[args_indx.port], index);
 		gpio_pin_set(dev, index, value);
diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c
index f843aad526..79d022d51f 100644
--- a/drivers/gpio/gpio_sifive.c
+++ b/drivers/gpio/gpio_sifive.c
@@ -47,7 +47,7 @@ struct gpio_sifive_config {
 	struct gpio_driver_config common;
 	uintptr_t            gpio_base_addr;
 	/* multi-level encoded interrupt corresponding to pin 0 */
-	u32_t                gpio_irq_base;
+	uint32_t                gpio_irq_base;
 	sifive_cfg_func_t    gpio_cfg_func;
 };
 
@@ -120,7 +120,7 @@ static void gpio_sifive_irq_handler(void *arg)
 	const struct gpio_sifive_config *cfg = DEV_GPIO_CFG(dev);
 
 	/* Calculate pin and mask from base level 2 line */
-	u8_t pin = 1 + (riscv_plic_get_irq() - (u8_t)(cfg->gpio_irq_base >> 8));
+	uint8_t pin = 1 + (riscv_plic_get_irq() - (uint8_t)(cfg->gpio_irq_base >> 8));
 
 	/* This peripheral tracks each condition separately: a
 	 * transition from low to high will mark the pending bit for
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index 03b6c0fefb..cd1a47a342 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -18,8 +18,8 @@ typedef void (*config_func_t)(struct device *dev);
 struct gpio_stellaris_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
-	u32_t base;
-	u32_t port_map;
+	uint32_t base;
+	uint32_t port_map;
 	config_func_t config_func;
 };
 
@@ -62,8 +62,8 @@ static void gpio_stellaris_isr(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
 	struct gpio_stellaris_runtime *context = DEV_DATA(dev);
-	u32_t base = cfg->base;
-	u32_t int_stat = sys_read32(GPIO_REG_ADDR(base, GPIO_MIS_OFFSET));
+	uint32_t base = cfg->base;
+	uint32_t int_stat = sys_read32(GPIO_REG_ADDR(base, GPIO_MIS_OFFSET));
 
 	gpio_fire_callbacks(&context->cb, dev, int_stat);
 
@@ -74,8 +74,8 @@ static int gpio_stellaris_configure(struct device *dev,
 				    gpio_pin_t pin, gpio_flags_t flags)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
-	u32_t port_map = cfg->port_map;
+	uint32_t base = cfg->base;
+	uint32_t port_map = cfg->port_map;
 
 	if ((flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) != 0) {
 		return -ENOTSUP;
@@ -86,7 +86,7 @@ static int gpio_stellaris_configure(struct device *dev,
 	}
 
 	/* Check for pin availability */
-	if (!sys_test_bit((u32_t)&port_map, pin)) {
+	if (!sys_test_bit((uint32_t)&port_map, pin)) {
 		return -EINVAL;
 	}
 
@@ -114,52 +114,52 @@ static int gpio_stellaris_configure(struct device *dev,
 	return 0;
 }
 
-static int gpio_stellaris_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_stellaris_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	*value = sys_read32(GPIO_RW_MASK_ADDR(base, GPIO_DATA_OFFSET, 0xff));
 
 	return 0;
 }
 
-static int gpio_stellaris_port_set_masked_raw(struct device *dev, u32_t mask,
-					 u32_t value)
+static int gpio_stellaris_port_set_masked_raw(struct device *dev, uint32_t mask,
+					 uint32_t value)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	sys_write32(value, GPIO_RW_MASK_ADDR(base, GPIO_DATA_OFFSET, mask));
 
 	return 0;
 }
 
-static int gpio_stellaris_port_set_bits_raw(struct device *dev, u32_t mask)
+static int gpio_stellaris_port_set_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	sys_write32(mask, GPIO_RW_MASK_ADDR(base, GPIO_DATA_OFFSET, mask));
 
 	return 0;
 }
 
-static int gpio_stellaris_port_clear_bits_raw(struct device *dev, u32_t mask)
+static int gpio_stellaris_port_clear_bits_raw(struct device *dev, uint32_t mask)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	sys_write32(0, GPIO_RW_MASK_ADDR(base, GPIO_DATA_OFFSET, mask));
 
 	return 0;
 }
 
-static int gpio_stellaris_port_toggle_bits(struct device *dev, u32_t mask)
+static int gpio_stellaris_port_toggle_bits(struct device *dev, uint32_t mask)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
-	u32_t value;
+	uint32_t base = cfg->base;
+	uint32_t value;
 
 	value = sys_read32(GPIO_RW_MASK_ADDR(base, GPIO_DATA_OFFSET, 0xff));
 	value ^= mask;
@@ -173,7 +173,7 @@ static int gpio_stellaris_pin_interrupt_configure(struct device *dev,
 		enum gpio_int_trig trig)
 {
 	const struct gpio_stellaris_config *cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	/* Check if GPIO port needs interrupt support */
 	if (mode == GPIO_INT_MODE_DISABLED) {
@@ -213,7 +213,7 @@ static int gpio_stellaris_enable_callback(struct device *dev,
 					  gpio_pin_t pin)
 {
 	const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	sys_set_bit(GPIO_REG_ADDR(base, GPIO_IM_OFFSET), pin);
 
@@ -224,7 +224,7 @@ static int gpio_stellaris_disable_callback(struct device *dev,
 					   gpio_pin_t pin)
 {
 	const struct gpio_stellaris_config * const cfg = DEV_CFG(dev);
-	u32_t base = cfg->base;
+	uint32_t base = cfg->base;
 
 	sys_clear_bit(GPIO_REG_ADDR(base, GPIO_IM_OFFSET), pin);
 
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 28fff40c7c..b86414b519 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -89,9 +89,9 @@ static int gpio_stm32_flags_to_conf(int flags, int *pincfg)
 /**
  * @brief Translate pin to pinval that the LL library needs
  */
-static inline u32_t stm32_pinval_get(int pin)
+static inline uint32_t stm32_pinval_get(int pin)
 {
-	u32_t pinval;
+	uint32_t pinval;
 
 #ifdef CONFIG_SOC_SERIES_STM32F1X
 	pinval = (1 << pin) << GPIO_PIN_MASK_POS;
@@ -109,7 +109,7 @@ static inline u32_t stm32_pinval_get(int pin)
 /**
  * @brief Configure the hardware.
  */
-int gpio_stm32_configure(u32_t *base_addr, int pin, int conf, int altf)
+int gpio_stm32_configure(uint32_t *base_addr, int pin, int conf, int altf)
 {
 	GPIO_TypeDef *gpio = (GPIO_TypeDef *)base_addr;
 
@@ -118,7 +118,7 @@ int gpio_stm32_configure(u32_t *base_addr, int pin, int conf, int altf)
 #ifdef CONFIG_SOC_SERIES_STM32F1X
 	ARG_UNUSED(altf);
 
-	u32_t temp = conf & (STM32_MODE_INOUT_MASK << STM32_MODE_INOUT_SHIFT);
+	uint32_t temp = conf & (STM32_MODE_INOUT_MASK << STM32_MODE_INOUT_SHIFT);
 
 	if (temp == STM32_MODE_INPUT) {
 		temp = conf & (STM32_CNF_IN_MASK << STM32_CNF_IN_SHIFT);
@@ -222,7 +222,7 @@ static inline uint32_t gpio_stm32_pin_to_exti_line(int pin)
 
 static void gpio_stm32_set_exti_source(int port, int pin)
 {
-	u32_t line = gpio_stm32_pin_to_exti_line(pin);
+	uint32_t line = gpio_stm32_pin_to_exti_line(pin);
 
 #if defined(CONFIG_SOC_SERIES_STM32L0X) && defined(LL_SYSCFG_EXTI_PORTH)
 	/*
@@ -249,7 +249,7 @@ static void gpio_stm32_set_exti_source(int port, int pin)
 
 static int gpio_stm32_get_exti_source(int pin)
 {
-	u32_t line = gpio_stm32_pin_to_exti_line(pin);
+	uint32_t line = gpio_stm32_pin_to_exti_line(pin);
 	int port;
 
 #ifdef CONFIG_SOC_SERIES_STM32F1X
@@ -309,7 +309,7 @@ static int gpio_stm32_enable_int(int port, int pin)
 	return 0;
 }
 
-static int gpio_stm32_port_get_raw(struct device *dev, u32_t *value)
+static int gpio_stm32_port_get_raw(struct device *dev, uint32_t *value)
 {
 	const struct gpio_stm32_config *cfg = dev->config_info;
 	GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base;
@@ -325,7 +325,7 @@ static int gpio_stm32_port_set_masked_raw(struct device *dev,
 {
 	const struct gpio_stm32_config *cfg = dev->config_info;
 	GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base;
-	u32_t port_value;
+	uint32_t port_value;
 
 	port_value = LL_GPIO_ReadOutputPort(gpio);
 	LL_GPIO_WriteOutputPort(gpio, (port_value & ~mask) | (mask & value));
@@ -576,7 +576,7 @@ static int gpio_stm32_init(struct device *device)
 		.common = {						       \
 			 .port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(16U), \
 		},							       \
-		.base = (u32_t *)__base_addr,				       \
+		.base = (uint32_t *)__base_addr,				       \
 		.port = __port,						       \
 		.pclken = { .bus = __bus, .enr = __cenr }		       \
 	};								       \
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 74d3ae653d..17283fd924 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -206,7 +206,7 @@ struct gpio_stm32_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
 	/* port base address */
-	u32_t *base;
+	uint32_t *base;
 	/* IO port */
 	int port;
 	struct stm32_pclken pclken;
@@ -219,7 +219,7 @@ struct gpio_stm32_data {
 	/* gpio_driver_data needs to be first */
 	struct gpio_driver_data common;
 	/* Enabled INT pins generating a cb */
-	u32_t cb_pins;
+	uint32_t cb_pins;
 	/* user ISR cb */
 	sys_slist_t cb;
 };
@@ -232,6 +232,6 @@ struct gpio_stm32_data {
  * @param func GPIO mode
  * @param altf Alternate function
  */
-int gpio_stm32_configure(u32_t *base_addr, int pin, int conf, int altf);
+int gpio_stm32_configure(uint32_t *base_addr, int pin, int conf, int altf);
 
 #endif /* ZEPHYR_DRIVERS_GPIO_GPIO_STM32_H_ */
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index 5424fc522b..2888e5f7d0 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -28,32 +28,32 @@ LOG_MODULE_REGISTER(sx1509b, CONFIG_GPIO_LOG_LEVEL);
 #define NUM_PINS 16
 
 /* Max to select all pins supported on the device. */
-#define ALL_PINS ((u16_t)BIT_MASK(NUM_PINS))
+#define ALL_PINS ((uint16_t)BIT_MASK(NUM_PINS))
 
 /* Reset delay is 2.5 ms, round up for Zephyr resolution */
 #define RESET_DELAY_MS 3
 
 /** Cache of the output configuration and data of the pins. */
 struct sx1509b_pin_state {
-	u16_t input_disable;    /* 0x00 */
-	u16_t long_slew;        /* 0x02 */
-	u16_t low_drive;        /* 0x04 */
-	u16_t pull_up;          /* 0x06 */
-	u16_t pull_down;        /* 0x08 */
-	u16_t open_drain;       /* 0x0A */
-	u16_t polarity;         /* 0x0C */
-	u16_t dir;              /* 0x0E */
-	u16_t data;             /* 0x10 */
+	uint16_t input_disable;    /* 0x00 */
+	uint16_t long_slew;        /* 0x02 */
+	uint16_t low_drive;        /* 0x04 */
+	uint16_t pull_up;          /* 0x06 */
+	uint16_t pull_down;        /* 0x08 */
+	uint16_t open_drain;       /* 0x0A */
+	uint16_t polarity;         /* 0x0C */
+	uint16_t dir;              /* 0x0E */
+	uint16_t data;             /* 0x10 */
 } __packed;
 
 struct sx1509b_irq_state {
-	u16_t interrupt_mask;   /* 0x12 */
-	u32_t interrupt_sense;  /* 0x14, 0x16 */
+	uint16_t interrupt_mask;   /* 0x12 */
+	uint32_t interrupt_sense;  /* 0x14, 0x16 */
 } __packed;
 
 struct sx1509b_debounce_state {
-	u8_t debounce_config;	/* 0x22 */
-	u16_t debounce_enable;  /* 0x23 */
+	uint8_t debounce_config;	/* 0x22 */
+	uint16_t debounce_enable;  /* 0x23 */
 } __packed;
 
 /** Runtime driver data */
@@ -74,7 +74,7 @@ struct sx1509b_drv_data {
 	/* user ISR cb */
 	sys_slist_t cb;
 	/* Enabled INT pins generating a cb */
-	u16_t cb_pins;
+	uint16_t cb_pins;
 #endif /* CONFIG_GPIO_SX1509B_INTERRUPT */
 
 };
@@ -89,7 +89,7 @@ struct sx1509b_config {
 	gpio_pin_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 #endif /* CONFIG_GPIO_SX1509B_INTERRUPT */
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 /* General configuration register addresses */
@@ -148,10 +148,10 @@ enum {
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_reg_write_word_be(struct device *dev, u16_t dev_addr,
-					u8_t reg_addr, u16_t value)
+static inline int i2c_reg_write_word_be(struct device *dev, uint16_t dev_addr,
+					uint8_t reg_addr, uint16_t value)
 {
-	u8_t tx_buf[3] = { reg_addr, value >> 8, value & 0xff };
+	uint8_t tx_buf[3] = { reg_addr, value >> 8, value & 0xff };
 
 	return i2c_write(dev, tx_buf, 3, dev_addr);
 }
@@ -167,10 +167,10 @@ static inline int i2c_reg_write_word_be(struct device *dev, u16_t dev_addr,
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_reg_write_byte_be(struct device *dev, u16_t dev_addr,
-					u8_t reg_addr, u8_t value)
+static inline int i2c_reg_write_byte_be(struct device *dev, uint16_t dev_addr,
+					uint8_t reg_addr, uint8_t value)
 {
-	u8_t tx_buf[3] = { reg_addr, value };
+	uint8_t tx_buf[3] = { reg_addr, value };
 
 	return i2c_write(dev, tx_buf, 2, dev_addr);
 }
@@ -182,14 +182,14 @@ static int sx1509b_handle_interrupt(void *arg)
 	const struct sx1509b_config *cfg = dev->config_info;
 	struct sx1509b_drv_data *drv_data = dev->driver_data;
 	int ret = 0;
-	u16_t int_source;
-	u8_t cmd = SX1509B_REG_INTERRUPT_SOURCE;
+	uint16_t int_source;
+	uint8_t cmd = SX1509B_REG_INTERRUPT_SOURCE;
 
 	k_sem_take(&drv_data->lock, K_FOREVER);
 
 	ret = i2c_write_read(drv_data->i2c_master, cfg->i2c_slave_addr,
 			     &cmd, sizeof(cmd),
-			     (u8_t *)&int_source, sizeof(int_source));
+			     (uint8_t *)&int_source, sizeof(int_source));
 	if (ret != 0) {
 		goto out;
 	}
@@ -220,7 +220,7 @@ static void sx1509b_work_handler(struct k_work *work)
 }
 
 static void sx1509_int_cb(struct device *dev, struct gpio_callback *gpio_cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	struct sx1509b_drv_data *drv_data = CONTAINER_OF(gpio_cb,
 		struct sx1509b_drv_data, gpio_cb);
@@ -239,7 +239,7 @@ static int sx1509b_config(struct device *dev,
 	struct sx1509b_drv_data *drv_data = dev->driver_data;
 	struct sx1509b_pin_state *pins = &drv_data->pin_state;
 	struct {
-		u8_t reg;
+		uint8_t reg;
 		struct sx1509b_pin_state pins;
 	} __packed pin_buf;
 	struct sx1509b_debounce_state *debounce = &drv_data->debounce_state;
@@ -349,7 +349,7 @@ static int sx1509b_config(struct device *dev,
 
 	if (rc == 0) {
 		struct {
-			u8_t reg;
+			uint8_t reg;
 			struct sx1509b_debounce_state debounce;
 		} __packed debounce_buf;
 
@@ -375,7 +375,7 @@ static int port_get(struct device *dev,
 {
 	const struct sx1509b_config *cfg = dev->config_info;
 	struct sx1509b_drv_data *drv_data = dev->driver_data;
-	u16_t pin_data;
+	uint16_t pin_data;
 	int rc = 0;
 
 	/* Can't do I2C bus operations from an ISR */
@@ -385,7 +385,7 @@ static int port_get(struct device *dev,
 
 	k_sem_take(&drv_data->lock, K_FOREVER);
 
-	u8_t cmd = SX1509B_REG_DATA;
+	uint8_t cmd = SX1509B_REG_DATA;
 
 	rc = i2c_write_read(drv_data->i2c_master, cfg->i2c_slave_addr,
 			    &cmd, sizeof(cmd),
@@ -414,12 +414,12 @@ static int port_write(struct device *dev,
 
 	const struct sx1509b_config *cfg = dev->config_info;
 	struct sx1509b_drv_data *drv_data = dev->driver_data;
-	u16_t *outp = &drv_data->pin_state.data;
+	uint16_t *outp = &drv_data->pin_state.data;
 
 	k_sem_take(&drv_data->lock, K_FOREVER);
 
-	u16_t orig_out = *outp;
-	u16_t out = ((orig_out & ~mask) | (value & mask)) ^ toggle;
+	uint16_t orig_out = *outp;
+	uint16_t out = ((orig_out & ~mask) | (value & mask)) ^ toggle;
 	int rc = i2c_reg_write_word_be(drv_data->i2c_master, cfg->i2c_slave_addr,
 				       SX1509B_REG_DATA, out);
 	if (rc == 0) {
@@ -480,7 +480,7 @@ static int pin_interrupt_configure(struct device *dev,
 	struct sx1509b_drv_data *drv_data = dev->driver_data;
 	struct sx1509b_irq_state *irq = &drv_data->irq_state;
 	struct {
-		u8_t reg;
+		uint8_t reg;
 		struct sx1509b_irq_state irq;
 	} __packed irq_buf;
 
diff --git a/drivers/gpio/gpio_utils.h b/drivers/gpio/gpio_utils.h
index 4486fe010e..3eea00237f 100644
--- a/drivers/gpio/gpio_utils.h
+++ b/drivers/gpio/gpio_utils.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_GPIO_GPIO_UTILS_H_
 
 #define GPIO_PORT_PIN_MASK_FROM_NGPIOS(ngpios)			\
-	((gpio_port_pins_t)(((u64_t)1 << (ngpios)) - 1U))
+	((gpio_port_pins_t)(((uint64_t)1 << (ngpios)) - 1U))
 
 #define GPIO_PORT_PIN_MASK_FROM_DT_NODE(node_id)		\
 	GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_PROP(node_id, ngpios))
@@ -60,7 +60,7 @@ static inline int gpio_manage_callback(sys_slist_t *callbacks,
  */
 static inline void gpio_fire_callbacks(sys_slist_t *list,
 					struct device *port,
-					u32_t pins)
+					uint32_t pins)
 {
 	struct gpio_callback *cb, *tmp;
 
diff --git a/drivers/hwinfo/hwinfo_esp32.c b/drivers/hwinfo/hwinfo_esp32.c
index 55ec4665a5..eaa9fa813c 100644
--- a/drivers/hwinfo/hwinfo_esp32.c
+++ b/drivers/hwinfo/hwinfo_esp32.c
@@ -10,11 +10,11 @@
 #include <drivers/hwinfo.h>
 #include <string.h>
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
-	u32_t rdata1 = sys_read32(EFUSE_BLK0_RDATA1_REG);
-	u32_t rdata2 = sys_read32(EFUSE_BLK0_RDATA2_REG);
-	u8_t id[6];
+	uint32_t rdata1 = sys_read32(EFUSE_BLK0_RDATA1_REG);
+	uint32_t rdata2 = sys_read32(EFUSE_BLK0_RDATA2_REG);
+	uint8_t id[6];
 
 	/* The first word provides the lower 32 bits of the MAC
 	 * address; the low 16 bits of the second word provide the
@@ -22,12 +22,12 @@ ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
 	 * (apparently) a checksum, and reserved.  See ESP32 Technical
 	 * Reference Manual V4.1 section 20.5.
 	 */
-	id[0] = (u8_t)(rdata2 >> 8);
-	id[1] = (u8_t)(rdata2 >> 0);
-	id[2] = (u8_t)(rdata1 >> 24);
-	id[3] = (u8_t)(rdata1 >> 16);
-	id[4] = (u8_t)(rdata1 >> 8);
-	id[5] = (u8_t)(rdata1 >> 0);
+	id[0] = (uint8_t)(rdata2 >> 8);
+	id[1] = (uint8_t)(rdata2 >> 0);
+	id[2] = (uint8_t)(rdata1 >> 24);
+	id[3] = (uint8_t)(rdata1 >> 16);
+	id[4] = (uint8_t)(rdata1 >> 8);
+	id[5] = (uint8_t)(rdata1 >> 0);
 
 	if (length > sizeof(id)) {
 		length = sizeof(id);
diff --git a/drivers/hwinfo/hwinfo_handlers.c b/drivers/hwinfo/hwinfo_handlers.c
index af8de709b7..1a34f962d5 100644
--- a/drivers/hwinfo/hwinfo_handlers.c
+++ b/drivers/hwinfo/hwinfo_handlers.c
@@ -7,10 +7,10 @@
 #include <syscall_handler.h>
 #include <drivers/hwinfo.h>
 
-ssize_t z_vrfy_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_vrfy_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buffer, length));
 
-	return z_impl_hwinfo_get_device_id((u8_t *)buffer, (size_t)length);
+	return z_impl_hwinfo_get_device_id((uint8_t *)buffer, (size_t)length);
 }
 #include <syscalls/hwinfo_get_device_id_mrsh.c>
diff --git a/drivers/hwinfo/hwinfo_imxrt.c b/drivers/hwinfo/hwinfo_imxrt.c
index 60b3e4003d..2f9b939794 100644
--- a/drivers/hwinfo/hwinfo_imxrt.c
+++ b/drivers/hwinfo/hwinfo_imxrt.c
@@ -10,10 +10,10 @@
 #include <sys/byteorder.h>
 
 struct imxrt_uid {
-	u32_t id[2];
+	uint32_t id[2];
 };
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	struct imxrt_uid dev_id;
 
diff --git a/drivers/hwinfo/hwinfo_litex.c b/drivers/hwinfo/hwinfo_litex.c
index aadacb4a52..5cc73785be 100644
--- a/drivers/hwinfo/hwinfo_litex.c
+++ b/drivers/hwinfo/hwinfo_litex.c
@@ -12,15 +12,15 @@
 #include <device.h>
 #include <sys/util.h>
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
-	u32_t volatile *ptr = (u32_t volatile *)(DT_INST_REG_ADDR(0));
-	ssize_t end = MIN(length, (DT_INST_REG_SIZE(0) / sizeof(u32_t)));
+	uint32_t volatile *ptr = (uint32_t volatile *)(DT_INST_REG_ADDR(0));
+	ssize_t end = MIN(length, (DT_INST_REG_SIZE(0) / sizeof(uint32_t)));
 
 	for (int i = 0; i < end; i++) {
 		/* In LiteX even though registers are 32-bit wide, each one
 		   contains meaningful data only in the lowest 8 bits */
-		buffer[i] = (u8_t)(ptr[i] & 0xff);
+		buffer[i] = (uint8_t)(ptr[i] & 0xff);
 	}
 
 	return end;
diff --git a/drivers/hwinfo/hwinfo_mcux_sim.c b/drivers/hwinfo/hwinfo_mcux_sim.c
index 2f0d85be67..1299d0afdd 100644
--- a/drivers/hwinfo/hwinfo_mcux_sim.c
+++ b/drivers/hwinfo/hwinfo_mcux_sim.c
@@ -25,10 +25,10 @@
 				       HWINFO_DEVICE_ID_LENGTH_M + \
 				       HWINFO_DEVICE_ID_LENGTH_H)
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
-	u32_t id[HWINFO_DEVICE_ID_LENGTH_TOTAL];
-	u32_t *idp = id;
+	uint32_t id[HWINFO_DEVICE_ID_LENGTH_TOTAL];
+	uint32_t *idp = id;
 
 #if defined(SIM_UIDH)
 	*idp++ = sys_cpu_to_be32(SIM->UIDH);
diff --git a/drivers/hwinfo/hwinfo_nrf.c b/drivers/hwinfo/hwinfo_nrf.c
index efed51dd0f..a9a6a04fd1 100644
--- a/drivers/hwinfo/hwinfo_nrf.c
+++ b/drivers/hwinfo/hwinfo_nrf.c
@@ -11,10 +11,10 @@
 #include <sys/byteorder.h>
 
 struct nrf_uid {
-	u32_t id[2];
+	uint32_t id[2];
 };
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	struct nrf_uid dev_id;
 
diff --git a/drivers/hwinfo/hwinfo_sam.c b/drivers/hwinfo/hwinfo_sam.c
index b6c633c42f..8e3f95320c 100644
--- a/drivers/hwinfo/hwinfo_sam.c
+++ b/drivers/hwinfo/hwinfo_sam.c
@@ -10,9 +10,9 @@
 #include <soc.h>
 #include <string.h>
 
-static u8_t sam_uid[16];
+static uint8_t sam_uid[16];
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	if (length > sizeof(sam_uid)) {
 		length = sizeof(sam_uid);
@@ -34,7 +34,7 @@ ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
 __ramfunc static void hwinfo_sam_read_device_id(void)
 {
 	Efc *efc = (Efc *)DT_REG_ADDR(DT_INST(0, atmel_sam_flash_controller));
-	u8_t *flash = (u8_t *)CONFIG_FLASH_BASE_ADDRESS;
+	uint8_t *flash = (uint8_t *)CONFIG_FLASH_BASE_ADDRESS;
 	int i;
 
 	/* Switch the flash controller to the unique identifier area. The flash
@@ -65,7 +65,7 @@ __ramfunc static void hwinfo_sam_read_device_id(void)
 static int hwinfo_sam_init(struct device *arg)
 {
 	Efc *efc = (Efc *)DT_REG_ADDR(DT_INST(0, atmel_sam_flash_controller));
-	u32_t fmr;
+	uint32_t fmr;
 	int key;
 
 	/* Disable interrupts. */
diff --git a/drivers/hwinfo/hwinfo_sam0.c b/drivers/hwinfo/hwinfo_sam0.c
index 308dd560a9..96e73b5311 100644
--- a/drivers/hwinfo/hwinfo_sam0.c
+++ b/drivers/hwinfo/hwinfo_sam0.c
@@ -12,20 +12,20 @@
 #include <sys/byteorder.h>
 
 struct sam0_uid {
-	u32_t id[4];
+	uint32_t id[4];
 };
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	struct sam0_uid dev_id;
 
-	dev_id.id[0] = sys_cpu_to_be32(*(const u32_t *)
+	dev_id.id[0] = sys_cpu_to_be32(*(const uint32_t *)
 				       DT_INST_REG_ADDR_BY_IDX(0, 0));
-	dev_id.id[1] = sys_cpu_to_be32(*(const u32_t *)
+	dev_id.id[1] = sys_cpu_to_be32(*(const uint32_t *)
 				       DT_INST_REG_ADDR_BY_IDX(0, 1));
-	dev_id.id[2] = sys_cpu_to_be32(*(const u32_t *)
+	dev_id.id[2] = sys_cpu_to_be32(*(const uint32_t *)
 				       DT_INST_REG_ADDR_BY_IDX(0, 2));
-	dev_id.id[3] = sys_cpu_to_be32(*(const u32_t *)
+	dev_id.id[3] = sys_cpu_to_be32(*(const uint32_t *)
 				       DT_INST_REG_ADDR_BY_IDX(0, 3));
 
 	if (length > sizeof(dev_id.id)) {
diff --git a/drivers/hwinfo/hwinfo_shell.c b/drivers/hwinfo/hwinfo_shell.c
index 7ac7e2b378..f626c083b2 100644
--- a/drivers/hwinfo/hwinfo_shell.c
+++ b/drivers/hwinfo/hwinfo_shell.c
@@ -12,7 +12,7 @@
 
 static int cmd_get_device_id(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t dev_id[16];
+	uint8_t dev_id[16];
 	ssize_t length;
 	int i;
 
diff --git a/drivers/hwinfo/hwinfo_stm32.c b/drivers/hwinfo/hwinfo_stm32.c
index 14ce97b6b5..988f7bb28d 100644
--- a/drivers/hwinfo/hwinfo_stm32.c
+++ b/drivers/hwinfo/hwinfo_stm32.c
@@ -10,10 +10,10 @@
 #include <sys/byteorder.h>
 
 struct stm32_uid {
-	u32_t id[3];
+	uint32_t id[3];
 };
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	struct stm32_uid dev_id;
 
diff --git a/drivers/hwinfo/hwinfo_weak_impl.c b/drivers/hwinfo/hwinfo_weak_impl.c
index fbc6fff36f..a0f8bae3cf 100644
--- a/drivers/hwinfo/hwinfo_weak_impl.c
+++ b/drivers/hwinfo/hwinfo_weak_impl.c
@@ -6,7 +6,7 @@
 
 #include <drivers/hwinfo.h>
 
-ssize_t __weak z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
+ssize_t __weak z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/i2c/i2c-priv.h b/drivers/i2c/i2c-priv.h
index ce78bc0575..f1bf19e913 100644
--- a/drivers/i2c/i2c-priv.h
+++ b/drivers/i2c/i2c-priv.h
@@ -15,7 +15,7 @@
 extern "C" {
 #endif
 
-static inline u32_t i2c_map_dt_bitrate(u32_t bitrate)
+static inline uint32_t i2c_map_dt_bitrate(uint32_t bitrate)
 {
 	switch (bitrate) {
 	case I2C_BITRATE_STANDARD:
diff --git a/drivers/i2c/i2c_bitbang.c b/drivers/i2c/i2c_bitbang.c
index 30e5f92eff..85765d660c 100644
--- a/drivers/i2c/i2c_bitbang.c
+++ b/drivers/i2c/i2c_bitbang.c
@@ -37,9 +37,9 @@
 #define T_BUF		T_LOW
 
 #define NS_TO_SYS_CLOCK_HW_CYCLES(ns) \
-	((u64_t)sys_clock_hw_cycles_per_sec() * (ns) / NSEC_PER_SEC + 1)
+	((uint64_t)sys_clock_hw_cycles_per_sec() * (ns) / NSEC_PER_SEC + 1)
 
-int i2c_bitbang_configure(struct i2c_bitbang *context, u32_t dev_config)
+int i2c_bitbang_configure(struct i2c_bitbang *context, uint32_t dev_config)
 {
 	/* Check for features we don't support */
 	if (I2C_ADDR_10_BITS & dev_config) {
@@ -80,7 +80,7 @@ static int i2c_get_sda(struct i2c_bitbang *context)
 
 static void i2c_delay(unsigned int cycles_to_wait)
 {
-	u32_t start = k_cycle_get_32();
+	uint32_t start = k_cycle_get_32();
 
 	/* Wait until the given number of cycles have passed */
 	while (k_cycle_get_32() - start < cycles_to_wait) {
@@ -156,9 +156,9 @@ static bool i2c_read_bit(struct i2c_bitbang *context)
 	return bit;
 }
 
-static bool i2c_write_byte(struct i2c_bitbang *context, u8_t byte)
+static bool i2c_write_byte(struct i2c_bitbang *context, uint8_t byte)
 {
-	u8_t mask = 1 << 7;
+	uint8_t mask = 1 << 7;
 
 	do {
 		i2c_write_bit(context, byte & mask);
@@ -168,7 +168,7 @@ static bool i2c_write_byte(struct i2c_bitbang *context, u8_t byte)
 	return !i2c_read_bit(context);
 }
 
-static u8_t i2c_read_byte(struct i2c_bitbang *context)
+static uint8_t i2c_read_byte(struct i2c_bitbang *context)
 {
 	unsigned int byte = 1U;
 
@@ -181,10 +181,10 @@ static u8_t i2c_read_byte(struct i2c_bitbang *context)
 }
 
 int i2c_bitbang_transfer(struct i2c_bitbang *context,
-			   struct i2c_msg *msgs, u8_t num_msgs,
-			   u16_t slave_address)
+			   struct i2c_msg *msgs, uint8_t num_msgs,
+			   uint16_t slave_address)
 {
-	u8_t *buf, *buf_end;
+	uint8_t *buf, *buf_end;
 	unsigned int flags;
 	int result = -EIO;
 
diff --git a/drivers/i2c/i2c_bitbang.h b/drivers/i2c/i2c_bitbang.h
index 413e8ec448..aa0a8dd6bd 100644
--- a/drivers/i2c/i2c_bitbang.h
+++ b/drivers/i2c/i2c_bitbang.h
@@ -28,7 +28,7 @@ struct i2c_bitbang_io {
 struct i2c_bitbang {
 	const struct i2c_bitbang_io	*io;
 	void				*io_context;
-	u32_t				delays[2];
+	uint32_t				delays[2];
 };
 
 /**
@@ -46,7 +46,7 @@ void i2c_bitbang_init(struct i2c_bitbang *bitbang,
  * Implementation of the functionality required by the 'configure' function
  * in struct i2c_driver_api.
  */
-int i2c_bitbang_configure(struct i2c_bitbang *bitbang, u32_t dev_config);
+int i2c_bitbang_configure(struct i2c_bitbang *bitbang, uint32_t dev_config);
 
 /**
  * Implementation of the functionality required by the 'recover_bus'
@@ -59,5 +59,5 @@ int i2c_bitbang_recover_bus(struct i2c_bitbang *bitbang);
  * in struct i2c_driver_api.
  */
 int i2c_bitbang_transfer(struct i2c_bitbang *bitbang,
-			   struct i2c_msg *msgs, u8_t num_msgs,
-			   u16_t slave_address);
+			   struct i2c_msg *msgs, uint8_t num_msgs,
+			   uint16_t slave_address);
diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c
index 00e4173d94..21fe50c080 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -28,20 +28,20 @@ DEVICE_DECLARE(i2c_cc13xx_cc26xx);
 struct i2c_cc13xx_cc26xx_data {
 	struct k_sem lock;
 	struct k_sem complete;
-	volatile u32_t error;
+	volatile uint32_t error;
 #ifdef CONFIG_SYS_POWER_MANAGEMENT
 	Power_NotifyObj postNotify;
-	u32_t dev_config;
+	uint32_t dev_config;
 #endif
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
 struct i2c_cc13xx_cc26xx_config {
-	u32_t base;
-	u32_t scl_pin;
-	u32_t sda_pin;
+	uint32_t base;
+	uint32_t scl_pin;
+	uint32_t sda_pin;
 };
 
 static inline struct i2c_cc13xx_cc26xx_data *get_dev_data(struct device *dev)
@@ -55,10 +55,10 @@ get_dev_config(struct device *dev)
 	return dev->config_info;
 }
 
-static int i2c_cc13xx_cc26xx_transmit(struct device *dev, const u8_t *buf,
-				      u32_t len, u16_t addr)
+static int i2c_cc13xx_cc26xx_transmit(struct device *dev, const uint8_t *buf,
+				      uint32_t len, uint16_t addr)
 {
-	const u32_t base = get_dev_config(dev)->base;
+	const uint32_t base = get_dev_config(dev)->base;
 	struct i2c_cc13xx_cc26xx_data *data = get_dev_data(dev);
 
 	/* Sending address without data is not supported */
@@ -123,10 +123,10 @@ send_error_stop:
 	return -EIO;
 }
 
-static int i2c_cc13xx_cc26xx_receive(struct device *dev, u8_t *buf, u32_t len,
-				     u16_t addr)
+static int i2c_cc13xx_cc26xx_receive(struct device *dev, uint8_t *buf, uint32_t len,
+				     uint16_t addr)
 {
-	const u32_t base = get_dev_config(dev)->base;
+	const uint32_t base = get_dev_config(dev)->base;
 	struct i2c_cc13xx_cc26xx_data *data = get_dev_data(dev);
 
 	/* Sending address without data is not supported */
@@ -196,7 +196,7 @@ recv_error_stop:
 }
 
 static int i2c_cc13xx_cc26xx_transfer(struct device *dev, struct i2c_msg *msgs,
-				      u8_t num_msgs, u16_t addr)
+				      uint8_t num_msgs, uint16_t addr)
 {
 	int ret = 0;
 
@@ -242,7 +242,7 @@ static int i2c_cc13xx_cc26xx_transfer(struct device *dev, struct i2c_msg *msgs,
 }
 
 #define CPU_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
-static int i2c_cc13xx_cc26xx_configure(struct device *dev, u32_t dev_config)
+static int i2c_cc13xx_cc26xx_configure(struct device *dev, uint32_t dev_config)
 {
 	bool fast;
 
@@ -282,7 +282,7 @@ static int i2c_cc13xx_cc26xx_configure(struct device *dev, u32_t dev_config)
 
 static void i2c_cc13xx_cc26xx_isr(void *arg)
 {
-	const u32_t base = get_dev_config(arg)->base;
+	const uint32_t base = get_dev_config(arg)->base;
 	struct i2c_cc13xx_cc26xx_data *data = get_dev_data(arg);
 
 	if (I2CMasterIntStatus(base, true)) {
@@ -306,7 +306,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
 {
 	struct device *dev = (struct device *)clientArg;
 	int ret = Power_NOTIFYDONE;
-	s16_t res_id;
+	int16_t res_id;
 
 	/* Reconfigure the hardware if returning from sleep */
 	if (eventType == PowerCC26XX_AWAKE_STANDBY) {
@@ -329,7 +329,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 static int i2c_cc13xx_cc26xx_set_power_state(struct device *dev,
-	u32_t new_state)
+	uint32_t new_state)
 {
 	int ret = 0;
 
@@ -366,13 +366,13 @@ static int i2c_cc13xx_cc26xx_set_power_state(struct device *dev,
 	return ret;
 }
 
-static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
+static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, uint32_t ctrl_command,
 	void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != get_dev_data(dev)->pm_state) {
 			ret = i2c_cc13xx_cc26xx_set_power_state(dev,
@@ -380,7 +380,7 @@ static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = get_dev_data(dev)->pm_state;
+		*((uint32_t *)context) = get_dev_data(dev)->pm_state;
 	}
 
 	if (cb) {
@@ -393,7 +393,7 @@ static int i2c_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
 
 static int i2c_cc13xx_cc26xx_init(struct device *dev)
 {
-	u32_t cfg;
+	uint32_t cfg;
 	int err;
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index bb5104d655..a5d07a2c31 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -64,8 +64,8 @@ enum i2c_cc32xx_state {
 };
 
 struct i2c_cc32xx_config {
-	u32_t base;
-	u32_t bitrate;
+	uint32_t base;
+	uint32_t bitrate;
 	unsigned int irq_no;
 };
 
@@ -76,16 +76,16 @@ struct i2c_cc32xx_data {
 	volatile enum i2c_cc32xx_state state;
 
 	struct i2c_msg msg; /* Cache msg for transfer state machine */
-	u16_t  slave_addr; /* Cache slave address for ISR use */
+	uint16_t  slave_addr; /* Cache slave address for ISR use */
 };
 
 static void configure_i2c_irq(const struct i2c_cc32xx_config *config);
 
 #define I2C_CLK_FREQ(n) DT_PROP(DT_INST_PHANDLE(n, clocks), clock_frequency)
-static int i2c_cc32xx_configure(struct device *dev, u32_t dev_config_raw)
+static int i2c_cc32xx_configure(struct device *dev, uint32_t dev_config_raw)
 {
-	u32_t base = DEV_BASE(dev);
-	u32_t bitrate_id;
+	uint32_t base = DEV_BASE(dev);
+	uint32_t bitrate_id;
 
 	if (!(dev_config_raw & I2C_MODE_MASTER)) {
 		return -EINVAL;
@@ -112,10 +112,10 @@ static int i2c_cc32xx_configure(struct device *dev, u32_t dev_config_raw)
 }
 
 static void i2c_cc32xx_prime_transfer(struct device *dev, struct i2c_msg *msg,
-				      u16_t addr)
+				      uint16_t addr)
 {
 	struct i2c_cc32xx_data *data = DEV_DATA(dev);
-	u32_t base = DEV_BASE(dev);
+	uint32_t base = DEV_BASE(dev);
 
 	/* Initialize internal counters and buf pointers: */
 	data->msg = *msg;
@@ -157,7 +157,7 @@ static void i2c_cc32xx_prime_transfer(struct device *dev, struct i2c_msg *msg,
 }
 
 static int i2c_cc32xx_transfer(struct device *dev, struct i2c_msg *msgs,
-			       u8_t num_msgs, u16_t addr)
+			       uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_cc32xx_data *data = DEV_DATA(dev);
 	int retval = 0;
@@ -190,7 +190,7 @@ static int i2c_cc32xx_transfer(struct device *dev, struct i2c_msg *msgs,
 	return retval;
 }
 
-static void i2c_cc32xx_isr_handle_write(u32_t base,
+static void i2c_cc32xx_isr_handle_write(uint32_t base,
 					 struct i2c_cc32xx_data *data)
 {
 	/* Decrement write Counter */
@@ -227,7 +227,7 @@ static void i2c_cc32xx_isr_handle_write(u32_t base,
 	}
 }
 
-static void i2c_cc32xx_isr_handle_read(u32_t base,
+static void i2c_cc32xx_isr_handle_read(uint32_t base,
 					struct i2c_cc32xx_data *data)
 {
 
@@ -262,10 +262,10 @@ static void i2c_cc32xx_isr_handle_read(u32_t base,
 static void i2c_cc32xx_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
-	u32_t base = DEV_BASE(dev);
+	uint32_t base = DEV_BASE(dev);
 	struct i2c_cc32xx_data *data = DEV_DATA(dev);
-	u32_t err_status;
-	u32_t int_status;
+	uint32_t err_status;
+	uint32_t int_status;
 
 	/* Get the error  status of the I2C controller */
 	err_status = MAP_I2CMasterErr(base);
@@ -324,12 +324,12 @@ static void i2c_cc32xx_isr(void *arg)
 
 static int i2c_cc32xx_init(struct device *dev)
 {
-	u32_t base = DEV_BASE(dev);
+	uint32_t base = DEV_BASE(dev);
 	const struct i2c_cc32xx_config *config = DEV_CFG(dev);
 	struct i2c_cc32xx_data *data = DEV_DATA(dev);
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int error;
-	u32_t regval;
+	uint32_t regval;
 
 	k_sem_init(&data->mutex, 1, UINT_MAX);
 	k_sem_init(&data->transfer_complete, 0, UINT_MAX);
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index 292848f1ae..17e2036186 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -37,10 +37,10 @@ LOG_MODULE_REGISTER(i2c_dw);
 static inline void i2c_dw_data_ask(struct device *dev)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
-	u32_t data;
-	u8_t tx_empty;
-	s8_t rx_empty;
-	u8_t cnt;
+	uint32_t data;
+	uint8_t tx_empty;
+	int8_t rx_empty;
+	uint8_t cnt;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
 
@@ -120,7 +120,7 @@ static void i2c_dw_data_read(struct device *dev)
 static int i2c_dw_data_send(struct device *dev)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
-	u32_t data = 0U;
+	uint32_t data = 0U;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
 
@@ -164,7 +164,7 @@ static int i2c_dw_data_send(struct device *dev)
 static inline void i2c_dw_transfer_complete(struct device *dev)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
-	u32_t value;
+	uint32_t value;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
 
@@ -179,7 +179,7 @@ static void i2c_dw_isr(void *arg)
 	struct device *port = (struct device *)arg;
 	struct i2c_dw_dev_config * const dw = port->driver_data;
 	union ic_interrupt_register intr_stat;
-	u32_t value;
+	uint32_t value;
 	int ret = 0;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
@@ -255,10 +255,10 @@ done:
 }
 
 
-static int i2c_dw_setup(struct device *dev, u16_t slave_address)
+static int i2c_dw_setup(struct device *dev, uint16_t slave_address)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
-	u32_t value;
+	uint32_t value;
 	union ic_con_register ic_con;
 	volatile struct i2c_dw_registers * const regs = dw->regs;
 
@@ -378,13 +378,13 @@ static int i2c_dw_setup(struct device *dev, u16_t slave_address)
 }
 
 static int i2c_dw_transfer(struct device *dev,
-			   struct i2c_msg *msgs, u8_t num_msgs,
-			   u16_t slave_address)
+			   struct i2c_msg *msgs, uint8_t num_msgs,
+			   uint16_t slave_address)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
 	struct i2c_msg *cur_msg = msgs;
-	u8_t msg_left = num_msgs;
-	u8_t pflags;
+	uint8_t msg_left = num_msgs;
+	uint8_t pflags;
 	int ret;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
@@ -489,11 +489,11 @@ static int i2c_dw_transfer(struct device *dev,
 	return ret;
 }
 
-static int i2c_dw_runtime_configure(struct device *dev, u32_t config)
+static int i2c_dw_runtime_configure(struct device *dev, uint32_t config)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
-	u32_t	value = 0U;
-	u32_t	rc = 0U;
+	uint32_t	value = 0U;
+	uint32_t	rc = 0U;
 
 	volatile struct i2c_dw_registers * const regs = dw->regs;
 
diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h
index 89628e6b50..e513263ea9 100644
--- a/drivers/i2c/i2c_dw.h
+++ b/drivers/i2c/i2c_dw.h
@@ -96,7 +96,7 @@ typedef void (*i2c_isr_cb_t)(struct device *port);
 
 struct i2c_dw_rom_config {
 	i2c_isr_cb_t	config_func;
-	u32_t		bitrate;
+	uint32_t		bitrate;
 #ifdef I2C_DW_PCIE_ENABLED
 	bool		pcie;
 	pcie_bdf_t	pcie_bdf;
@@ -107,19 +107,19 @@ struct i2c_dw_rom_config {
 struct i2c_dw_dev_config {
 	struct i2c_dw_registers *regs;
 	struct k_sem		device_sync_sem;
-	u32_t app_config;
+	uint32_t app_config;
 
 
-	u8_t			*xfr_buf;
-	u32_t		xfr_len;
-	u32_t		rx_pending;
+	uint8_t			*xfr_buf;
+	uint32_t		xfr_len;
+	uint32_t		rx_pending;
 
-	u16_t		hcnt;
-	u16_t		lcnt;
+	uint16_t		hcnt;
+	uint16_t		lcnt;
 
-	volatile u8_t	state;  /* last direction of transfer */
-	u8_t			request_bytes;
-	u8_t			xfr_flags;
+	volatile uint8_t	state;  /* last direction of transfer */
+	uint8_t			request_bytes;
+	uint8_t			xfr_flags;
 	bool			support_hs_mode;
 };
 
diff --git a/drivers/i2c/i2c_dw_registers.h b/drivers/i2c/i2c_dw_registers.h
index 0e537d169a..6b883f1ba7 100644
--- a/drivers/i2c/i2c_dw_registers.h
+++ b/drivers/i2c/i2c_dw_registers.h
@@ -23,17 +23,17 @@ extern "C" {
 #define IC_CON_MASTER_MODE			(1 << 0)
 
 union ic_con_register {
-	u16_t                raw;
+	uint16_t                raw;
 	struct {
-		u16_t         master_mode : 1 __packed;
-		u16_t         speed : 2 __packed;
-		u16_t         addr_slave_10bit : 1 __packed;
-		u16_t         addr_master_10bit : 1 __packed;
-		u16_t         restart_en : 1 __packed;
-		u16_t         slave_disable : 1 __packed;
-		u16_t         stop_det : 1 __packed;
-		u16_t         tx_empty_ctl : 1 __packed;
-		u16_t         rx_fifo_full : 1 __packed;
+		uint16_t         master_mode : 1 __packed;
+		uint16_t         speed : 2 __packed;
+		uint16_t         addr_slave_10bit : 1 __packed;
+		uint16_t         addr_master_10bit : 1 __packed;
+		uint16_t         restart_en : 1 __packed;
+		uint16_t         slave_disable : 1 __packed;
+		uint16_t         stop_det : 1 __packed;
+		uint16_t         tx_empty_ctl : 1 __packed;
+		uint16_t         rx_fifo_full : 1 __packed;
 	} bits;
 };
 
@@ -45,13 +45,13 @@ union ic_con_register {
 #define IC_DATA_CMD_RESTART		(1 << 10)
 
 union ic_data_cmd_register {
-	u16_t                raw;
+	uint16_t                raw;
 	struct {
-	       u16_t         dat : 8 __packed;
-	       u16_t         cmd : 1 __packed;
-	       u16_t         stop : 1 __packed;
-	       u16_t         restart : 1 __packed;
-	       u16_t         reserved : 4 __packed;
+	       uint16_t         dat : 8 __packed;
+	       uint16_t         cmd : 1 __packed;
+	       uint16_t         stop : 1 __packed;
+	       uint16_t         restart : 1 __packed;
+	       uint16_t         reserved : 4 __packed;
 	} bits;
 };
 
@@ -60,11 +60,11 @@ union ic_data_cmd_register {
 #define IC_ENABLE_ABORT			(1 << 1)
 
 union ic_enable_register {
-	u16_t		raw;
+	uint16_t		raw;
 	struct {
-		u16_t	enable : 1 __packed;
-		u16_t	abort : 1 __packed;
-		u16_t	reserved : 13 __packed;
+		uint16_t	enable : 1 __packed;
+		uint16_t	abort : 1 __packed;
+		uint16_t	reserved : 13 __packed;
 	} bits;
 };
 
@@ -87,78 +87,78 @@ union ic_enable_register {
 
 
 union ic_interrupt_register {
-	u16_t			raw;
+	uint16_t			raw;
 	struct {
-		u16_t	rx_under : 1 __packed;
-		u16_t	rx_over : 1 __packed;
-		u16_t	rx_full : 1 __packed;
-		u16_t	tx_over : 1 __packed;
-		u16_t	tx_empty : 1 __packed;
-		u16_t	rd_req : 1 __packed;
-		u16_t	tx_abrt : 1 __packed;
-		u16_t	rx_done : 1 __packed;
-		u16_t	activity : 1 __packed;
-		u16_t	stop_det : 1 __packed;
-		u16_t	start_det : 1 __packed;
-		u16_t	gen_call : 1 __packed;
-		u16_t	restart_det : 1 __packed;
-		u16_t	mst_on_hold : 1 __packed;
-		u16_t	reserved : 2 __packed;
+		uint16_t	rx_under : 1 __packed;
+		uint16_t	rx_over : 1 __packed;
+		uint16_t	rx_full : 1 __packed;
+		uint16_t	tx_over : 1 __packed;
+		uint16_t	tx_empty : 1 __packed;
+		uint16_t	rd_req : 1 __packed;
+		uint16_t	tx_abrt : 1 __packed;
+		uint16_t	rx_done : 1 __packed;
+		uint16_t	activity : 1 __packed;
+		uint16_t	stop_det : 1 __packed;
+		uint16_t	start_det : 1 __packed;
+		uint16_t	gen_call : 1 __packed;
+		uint16_t	restart_det : 1 __packed;
+		uint16_t	mst_on_hold : 1 __packed;
+		uint16_t	reserved : 2 __packed;
 	} bits;
 };
 
 
 /* IC_TAR */
 union ic_tar_register {
-	u16_t		raw;
+	uint16_t		raw;
 	struct {
-		u16_t	ic_tar : 10 __packed;
-		u16_t	gc_or_start : 1 __packed;
-		u16_t	special : 1 __packed;
-		u16_t	ic_10bitaddr_master : 1 __packed;
-		u16_t	reserved : 3 __packed;
+		uint16_t	ic_tar : 10 __packed;
+		uint16_t	gc_or_start : 1 __packed;
+		uint16_t	special : 1 __packed;
+		uint16_t	ic_10bitaddr_master : 1 __packed;
+		uint16_t	reserved : 3 __packed;
 	} bits;
 };
 
 
 /* IC_SAR */
 union ic_sar_register {
-	u16_t		raw;
+	uint16_t		raw;
 	struct {
-		u16_t	ic_sar : 10 __packed;
-		u16_t	reserved : 6 __packed;
+		uint16_t	ic_sar : 10 __packed;
+		uint16_t	reserved : 6 __packed;
 	} bits;
 };
 
 
 /* IC_STATUS */
 union ic_status_register {
-	u32_t		raw;
+	uint32_t		raw;
 	struct {
-		u32_t	activity : 1 __packed;
-		u32_t	tfnf : 1 __packed;
-		u32_t	tfe : 1 __packed;
-		u32_t	rfne : 1 __packed;
-		u32_t	rff : 1 __packed;
-		u32_t	mst_activity : 1 __packed;
-		u32_t	slv_activity : 1 __packed;
-		u32_t	reserved : 24 __packed;
+		uint32_t	activity : 1 __packed;
+		uint32_t	tfnf : 1 __packed;
+		uint32_t	tfe : 1 __packed;
+		uint32_t	rfne : 1 __packed;
+		uint32_t	rff : 1 __packed;
+		uint32_t	mst_activity : 1 __packed;
+		uint32_t	slv_activity : 1 __packed;
+		uint32_t	reserved : 24 __packed;
 	} bits;
 };
 
 
 union ic_comp_param_1_register {
-	u32_t			raw;
+	uint32_t			raw;
 	struct {
-		u32_t		apb_data_width : 2 __packed;
-		u32_t		max_speed_mode : 2 __packed;
-		u32_t		hc_count_values : 1 __packed;
-		u32_t		intr_io : 1 __packed;
-		u32_t		has_dma : 1 __packed;
-		u32_t		add_encoded_params : 1 __packed;
-		u32_t		rx_buffer_depth : 8 __packed;
-		u32_t		tx_buffer_depth : 8 __packed;
-		u32_t		reserved : 7 __packed;
+		uint32_t		apb_data_width : 2 __packed;
+		uint32_t		max_speed_mode : 2 __packed;
+		uint32_t		hc_count_values : 1 __packed;
+		uint32_t		intr_io : 1 __packed;
+		uint32_t		has_dma : 1 __packed;
+		uint32_t		add_encoded_params : 1 __packed;
+		uint32_t		rx_buffer_depth : 8 __packed;
+		uint32_t		tx_buffer_depth : 8 __packed;
+		uint32_t		reserved : 7 __packed;
 	} bits;
 };
 
@@ -177,80 +177,80 @@ union ic_comp_param_1_register {
  */
 struct i2c_dw_registers {
 	union ic_con_register ic_con;	/* offset 0x00 */
-	u16_t dummy1;
+	uint16_t dummy1;
 	union ic_tar_register ic_tar;	/* offset 0x04 */
-	u16_t dummy2;
+	uint16_t dummy2;
 	union ic_sar_register ic_sar;	/* offset 0x08 */
-	u16_t dummy3;
-	u16_t ic_hs_maddr;		/* offset 0x0C */
-	u16_t dummy4;
+	uint16_t dummy3;
+	uint16_t ic_hs_maddr;		/* offset 0x0C */
+	uint16_t dummy4;
 	union ic_data_cmd_register ic_data_cmd;		/* offset 0x10 */
-	u16_t dummy5;
-	u16_t ic_ss_scl_hcnt;	/* offset 0x14 */
-	u16_t dummy6;
-	u16_t ic_ss_scl_lcnt;	/* offset 0x18 */
-	u16_t dummy7;
-	u16_t ic_fs_scl_hcnt;	/* offset 0x1C */
-	u16_t dummy8;
-	u16_t ic_fs_scl_lcnt;	/* offset 0x20 */
-	u16_t dummy9;
-	u16_t ic_hs_scl_hcnt;	/* offset 0x24 */
-	u16_t dummy10;
-	u16_t ic_hs_scl_lcnt;	/* offset 0x28 */
-	u16_t dummy11;
+	uint16_t dummy5;
+	uint16_t ic_ss_scl_hcnt;	/* offset 0x14 */
+	uint16_t dummy6;
+	uint16_t ic_ss_scl_lcnt;	/* offset 0x18 */
+	uint16_t dummy7;
+	uint16_t ic_fs_scl_hcnt;	/* offset 0x1C */
+	uint16_t dummy8;
+	uint16_t ic_fs_scl_lcnt;	/* offset 0x20 */
+	uint16_t dummy9;
+	uint16_t ic_hs_scl_hcnt;	/* offset 0x24 */
+	uint16_t dummy10;
+	uint16_t ic_hs_scl_lcnt;	/* offset 0x28 */
+	uint16_t dummy11;
 	union ic_interrupt_register ic_intr_stat;	/* offset 0x2C */
-	u16_t dummy12;
+	uint16_t dummy12;
 	union ic_interrupt_register ic_intr_mask;	/* offset 0x30 */
-	u16_t dummy13;
+	uint16_t dummy13;
 	union ic_interrupt_register ic_raw_intr_stat;	/* offset 0x34 */
-	u16_t dummy14;
-	u16_t ic_rx_tl;		/* offset 0x38 */
-	u16_t dummy15;
-	u16_t ic_tx_tl;		/* offset 0x3C */
-	u16_t dummy16;
-	u16_t ic_clr_intr;		/* offset 0x40 */
-	u16_t dummy17;
-	u16_t ic_clr_rx_under;	/* offset 0x44 */
-	u16_t dummy18;
-	u16_t ic_clr_rx_over;	/* offset 0x48 */
-	u16_t dummy19;
-	u16_t ic_clr_tx_over;	/* offset 0x4C */
-	u16_t dummy20;
-	u16_t ic_clr_rd_req;		/* offset 0x50 */
-	u16_t dummy21;
-	u16_t ic_clr_tx_abrt;	/* offset 0x54 */
-	u16_t dummy22;
-	u16_t ic_clr_rx_done;	/* offset 0x58 */
-	u16_t dummy23;
-	u16_t ic_clr_activity;	/* offset 0x5C */
-	u16_t dummy24;
-	u16_t ic_clr_stop_det;	/* offset 0x60 */
-	u16_t dummy25;
-	u16_t ic_clr_start_det;	/* offset 0x64 */
-	u16_t dummy26;
-	u16_t ic_clr_gen_call;	/* offset 0x68 */
-	u16_t dummy27;
+	uint16_t dummy14;
+	uint16_t ic_rx_tl;		/* offset 0x38 */
+	uint16_t dummy15;
+	uint16_t ic_tx_tl;		/* offset 0x3C */
+	uint16_t dummy16;
+	uint16_t ic_clr_intr;		/* offset 0x40 */
+	uint16_t dummy17;
+	uint16_t ic_clr_rx_under;	/* offset 0x44 */
+	uint16_t dummy18;
+	uint16_t ic_clr_rx_over;	/* offset 0x48 */
+	uint16_t dummy19;
+	uint16_t ic_clr_tx_over;	/* offset 0x4C */
+	uint16_t dummy20;
+	uint16_t ic_clr_rd_req;		/* offset 0x50 */
+	uint16_t dummy21;
+	uint16_t ic_clr_tx_abrt;	/* offset 0x54 */
+	uint16_t dummy22;
+	uint16_t ic_clr_rx_done;	/* offset 0x58 */
+	uint16_t dummy23;
+	uint16_t ic_clr_activity;	/* offset 0x5C */
+	uint16_t dummy24;
+	uint16_t ic_clr_stop_det;	/* offset 0x60 */
+	uint16_t dummy25;
+	uint16_t ic_clr_start_det;	/* offset 0x64 */
+	uint16_t dummy26;
+	uint16_t ic_clr_gen_call;	/* offset 0x68 */
+	uint16_t dummy27;
 	union ic_enable_register ic_enable;	/* offset 0x6c */
-	u16_t dummy28;
+	uint16_t dummy28;
 	union ic_status_register ic_status;	/* offset 0x70 */
-	u32_t ic_txflr;		/* offset 0x74 */
-	u32_t ic_rxflr;		/* offset 0x78 */
-	u32_t ic_sda_hold;		/* offset 0x7C */
-	u32_t ic_tx_abrt_source;	/* offset 0x80 */
-	u32_t ic_slv_data_nack_only; /* offset 0x84 */
-	u32_t ic_dma_cr;		/* offset 0x88 */
-	u32_t ic_dma_tdlr;		/* offset 0x8C */
-	u32_t ic_dma_rdlr;		/* offset 0x90 */
-	u32_t ic_sda_setup;		/* offset 0x94 */
-	u32_t ic_ack_general_call;	/* offset 0x98 */
-	u32_t ic_enable_status;	/* offset 0x9C */
-	u32_t ic_fs_spklen;		/* offset 0xA0 */
-	u32_t ic_hs_spklen;		/* offset 0xA4 */
-	u16_t ic_clr_restart_det;	/* offset 0xA8 */
-	u8_t	 filler[74];
+	uint32_t ic_txflr;		/* offset 0x74 */
+	uint32_t ic_rxflr;		/* offset 0x78 */
+	uint32_t ic_sda_hold;		/* offset 0x7C */
+	uint32_t ic_tx_abrt_source;	/* offset 0x80 */
+	uint32_t ic_slv_data_nack_only; /* offset 0x84 */
+	uint32_t ic_dma_cr;		/* offset 0x88 */
+	uint32_t ic_dma_tdlr;		/* offset 0x8C */
+	uint32_t ic_dma_rdlr;		/* offset 0x90 */
+	uint32_t ic_sda_setup;		/* offset 0x94 */
+	uint32_t ic_ack_general_call;	/* offset 0x98 */
+	uint32_t ic_enable_status;	/* offset 0x9C */
+	uint32_t ic_fs_spklen;		/* offset 0xA0 */
+	uint32_t ic_hs_spklen;		/* offset 0xA4 */
+	uint16_t ic_clr_restart_det;	/* offset 0xA8 */
+	uint8_t	 filler[74];
 	union ic_comp_param_1_register ic_comp_param_1;	/* offset 0xF4 */
-	u32_t ic_comp_version;	/* offset 0xF8 */
-	u32_t ic_comp_type;		/* offset 0xFC */
+	uint32_t ic_comp_version;	/* offset 0xF8 */
+	uint32_t ic_comp_type;		/* offset 0xFC */
 };
 
 #ifdef __cplusplus
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index a077d5d1d5..a3cd90e068 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -46,18 +46,18 @@ enum i2c_esp32_opcodes {
 };
 
 struct i2c_esp32_cmd {
-	u32_t num_bytes : 8;
-	u32_t ack_en : 1;
-	u32_t ack_exp : 1;
-	u32_t ack_val : 1;
-	u32_t opcode : 3;
-	u32_t reserved : 17;
-	u32_t done : 1;
+	uint32_t num_bytes : 8;
+	uint32_t ack_en : 1;
+	uint32_t ack_exp : 1;
+	uint32_t ack_val : 1;
+	uint32_t opcode : 3;
+	uint32_t reserved : 17;
+	uint32_t done : 1;
 };
 
 struct i2c_esp32_data {
-	u32_t dev_config;
-	u16_t address;
+	uint32_t dev_config;
+	uint16_t address;
 
 	struct k_sem fifo_sem;
 	struct k_sem transfer_sem;
@@ -94,8 +94,8 @@ struct i2c_esp32_config {
 		int line;
 	} irq;
 
-	const u32_t default_config;
-	const u32_t bitrate;
+	const uint32_t default_config;
+	const uint32_t bitrate;
 };
 
 static int i2c_esp32_configure_pins(int pin, int matrix_out, int matrix_in)
@@ -127,17 +127,17 @@ static int i2c_esp32_configure_pins(int pin, int matrix_out, int matrix_in)
 }
 
 static int i2c_esp32_configure_speed(const struct i2c_esp32_config *config,
-				     u32_t speed)
+				     uint32_t speed)
 {
-	static const u32_t speed_to_freq_tbl[] = {
+	static const uint32_t speed_to_freq_tbl[] = {
 		[I2C_SPEED_STANDARD] = KHZ(100),
 		[I2C_SPEED_FAST] = KHZ(400),
 		[I2C_SPEED_FAST_PLUS] = MHZ(1),
 		[I2C_SPEED_HIGH] = 0,
 		[I2C_SPEED_ULTRA] = 0
 	};
-	u32_t freq_hz = speed_to_freq_tbl[speed];
-	u32_t period;
+	uint32_t freq_hz = speed_to_freq_tbl[speed];
+	uint32_t period;
 
 	if (!freq_hz) {
 		return -ENOTSUP;
@@ -170,12 +170,12 @@ static int i2c_esp32_configure_speed(const struct i2c_esp32_config *config,
 	return 0;
 }
 
-static int i2c_esp32_configure(struct device *dev, u32_t dev_config)
+static int i2c_esp32_configure(struct device *dev, uint32_t dev_config)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
 	struct i2c_esp32_data *data = dev->driver_data;
 	unsigned int key = irq_lock();
-	u32_t v = 0U;
+	uint32_t v = 0U;
 	int ret;
 
 	ret = i2c_esp32_configure_pins(config->pins.scl,
@@ -207,7 +207,7 @@ static int i2c_esp32_configure(struct device *dev, u32_t dev_config)
 		v |= I2C_MS_MODE;
 		sys_write32(0, I2C_SLAVE_ADDR_REG(config->index));
 	} else {
-		u32_t addr = (data->address & I2C_SLAVE_ADDR_V);
+		uint32_t addr = (data->address & I2C_SLAVE_ADDR_V);
 
 		if (dev_config & I2C_ADDR_10_BITS) {
 			addr |= I2C_ADDR_10BIT_EN;
@@ -256,7 +256,7 @@ out:
 
 static inline void i2c_esp32_reset_fifo(const struct i2c_esp32_config *config)
 {
-	u32_t reg = I2C_FIFO_CONF_REG(config->index);
+	uint32_t reg = I2C_FIFO_CONF_REG(config->index);
 
 	/* Writing 1 and then 0 to these bits will reset the I2C fifo */
 	esp32_set_mask32(I2C_TX_FIFO_RST | I2C_RX_FIFO_RST, reg);
@@ -282,7 +282,7 @@ static int i2c_esp32_transmit(struct device *dev)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
 	struct i2c_esp32_data *data = dev->driver_data;
-	u32_t status;
+	uint32_t status;
 
 	/* Start transmission and wait for the ISR to give the semaphore */
 	sys_set_bit(I2C_CTR_REG(config->index), I2C_TRANS_START_S);
@@ -345,11 +345,11 @@ static volatile struct i2c_esp32_cmd *
 i2c_esp32_write_addr(struct device *dev,
 		     volatile struct i2c_esp32_cmd *cmd,
 		     struct i2c_msg *msg,
-		     u16_t addr)
+		     uint16_t addr)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
 	struct i2c_esp32_data *data = dev->driver_data;
-	u32_t addr_len = 1U;
+	uint32_t addr_len = 1U;
 
 	i2c_esp32_reset_fifo(config);
 
@@ -373,13 +373,13 @@ i2c_esp32_write_addr(struct device *dev,
 	return cmd;
 }
 
-static int i2c_esp32_read_msg(struct device *dev, u16_t addr,
+static int i2c_esp32_read_msg(struct device *dev, uint16_t addr,
 			      struct i2c_msg msg)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
 	volatile struct i2c_esp32_cmd *cmd =
 		(void *)I2C_COMD0_REG(config->index);
-	u32_t i;
+	uint32_t i;
 	int ret;
 
 	/* Set the R/W bit to R */
@@ -393,7 +393,7 @@ static int i2c_esp32_read_msg(struct device *dev, u16_t addr,
 
 	for (; msg.len; cmd = (void *)I2C_COMD0_REG(config->index)) {
 		volatile struct i2c_esp32_cmd *wait_cmd = NULL;
-		u32_t to_read = MIN(I2C_ESP32_BUFFER_SIZE, msg.len - 1);
+		uint32_t to_read = MIN(I2C_ESP32_BUFFER_SIZE, msg.len - 1);
 
 		/* Might be the last byte, in which case, `to_read` will
 		 * be 0 here.  See comment below.
@@ -443,7 +443,7 @@ static int i2c_esp32_read_msg(struct device *dev, u16_t addr,
 		}
 
 		for (i = 0U; i < to_read; i++) {
-			u32_t v = sys_read32(I2C_DATA_APB_REG(config->index));
+			uint32_t v = sys_read32(I2C_DATA_APB_REG(config->index));
 
 			*msg.buf++ = v & I2C_FIFO_RDATA;
 		}
@@ -455,7 +455,7 @@ static int i2c_esp32_read_msg(struct device *dev, u16_t addr,
 	return 0;
 }
 
-static int i2c_esp32_write_msg(struct device *dev, u16_t addr,
+static int i2c_esp32_write_msg(struct device *dev, uint16_t addr,
 			       struct i2c_msg msg)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
@@ -469,8 +469,8 @@ static int i2c_esp32_write_msg(struct device *dev, u16_t addr,
 	cmd = i2c_esp32_write_addr(dev, cmd, &msg, addr);
 
 	for (; msg.len; cmd = (void *)I2C_COMD0_REG(config->index)) {
-		u32_t to_send = MIN(I2C_ESP32_BUFFER_SIZE, msg.len);
-		u32_t i;
+		uint32_t to_send = MIN(I2C_ESP32_BUFFER_SIZE, msg.len);
+		uint32_t i;
 		int ret;
 
 		/* Copy data to TX fifo */
@@ -507,11 +507,11 @@ static int i2c_esp32_write_msg(struct device *dev, u16_t addr,
 }
 
 static int i2c_esp32_transfer(struct device *dev, struct i2c_msg *msgs,
-			      u8_t num_msgs, u16_t addr)
+			      uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_esp32_data *data = dev->driver_data;
 	int ret = 0;
-	u8_t i;
+	uint8_t i;
 
 	k_sem_take(&data->transfer_sem, K_FOREVER);
 
@@ -666,7 +666,7 @@ static int i2c_esp32_init(struct device *dev)
 {
 	const struct i2c_esp32_config *config = dev->config_info;
 	struct i2c_esp32_data *data = dev->driver_data;
-	u32_t bitrate_cfg = i2c_map_dt_bitrate(config->bitrate);
+	uint32_t bitrate_cfg = i2c_map_dt_bitrate(config->bitrate);
 	unsigned int key = irq_lock();
 
 	k_sem_init(&data->fifo_sem, 1, 1);
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index 4ee8ddcc79..87fb4c4477 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -31,20 +31,20 @@ struct i2c_gecko_config {
 	I2C_TypeDef *base;
 	CMU_Clock_TypeDef clock;
 	I2C_Init_TypeDef i2cInit;
-	u32_t bitrate;
+	uint32_t bitrate;
 	struct soc_gpio_pin pin_sda;
 	struct soc_gpio_pin pin_scl;
 #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
-	u8_t loc_sda;
-	u8_t loc_scl;
+	uint8_t loc_sda;
+	uint8_t loc_scl;
 #else
-	u8_t loc;
+	uint8_t loc;
 #endif
 };
 
 struct i2c_gecko_data {
 	struct k_sem device_sync_sem;
-	u32_t dev_config;
+	uint32_t dev_config;
 };
 
 void i2c_gecko_config_pins(struct device *dev,
@@ -66,12 +66,12 @@ void i2c_gecko_config_pins(struct device *dev,
 #endif
 }
 
-static int i2c_gecko_configure(struct device *dev, u32_t dev_config_raw)
+static int i2c_gecko_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	I2C_TypeDef *base = DEV_BASE(dev);
 	struct i2c_gecko_config *config = DEV_CFG(dev);
 	struct i2c_gecko_data *data = DEV_DATA(dev);
-	u32_t baudrate;
+	uint32_t baudrate;
 
 	if (!(I2C_MODE_MASTER & dev_config_raw)) {
 		return -EINVAL;
@@ -100,13 +100,13 @@ static int i2c_gecko_configure(struct device *dev, u32_t dev_config_raw)
 }
 
 static int i2c_gecko_transfer(struct device *dev, struct i2c_msg *msgs,
-			      u8_t num_msgs, u16_t addr)
+			      uint8_t num_msgs, uint16_t addr)
 {
 	I2C_TypeDef *base = DEV_BASE(dev);
 	struct i2c_gecko_data *data = DEV_DATA(dev);
 	I2C_TransferSeq_TypeDef seq;
 	I2C_TransferReturn_TypeDef ret = -EIO;
-	u32_t timeout = 300000U;
+	uint32_t timeout = 300000U;
 
 	if (!num_msgs) {
 		return 0;
@@ -166,7 +166,7 @@ finish:
 static int i2c_gecko_init(struct device *dev)
 {
 	struct i2c_gecko_config *config = DEV_CFG(dev);
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int error;
 
 	CMU_ClockEnable(config->clock, true);
diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c
index 111d73c563..350ff1fcd8 100644
--- a/drivers/i2c/i2c_gpio.c
+++ b/drivers/i2c/i2c_gpio.c
@@ -45,7 +45,7 @@ struct i2c_gpio_config {
 	gpio_pin_t sda_pin;
 	gpio_dt_flags_t scl_flags;
 	gpio_dt_flags_t sda_flags;
-	u32_t bitrate;
+	uint32_t bitrate;
 };
 
 /* Driver instance data */
@@ -86,7 +86,7 @@ static const struct i2c_bitbang_io io_fns = {
 	.get_sda = &i2c_gpio_get_sda,
 };
 
-static int i2c_gpio_configure(struct device *dev, u32_t dev_config)
+static int i2c_gpio_configure(struct device *dev, uint32_t dev_config)
 {
 	struct i2c_gpio_context *context = dev->driver_data;
 
@@ -94,7 +94,7 @@ static int i2c_gpio_configure(struct device *dev, u32_t dev_config)
 }
 
 static int i2c_gpio_transfer(struct device *dev, struct i2c_msg *msgs,
-				u8_t num_msgs, u16_t slave_address)
+				uint8_t num_msgs, uint16_t slave_address)
 {
 	struct i2c_gpio_context *context = dev->driver_data;
 
@@ -119,7 +119,7 @@ static int i2c_gpio_init(struct device *dev)
 {
 	struct i2c_gpio_context *context = dev->driver_data;
 	const struct i2c_gpio_config *config = dev->config_info;
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int err;
 
 	context->scl_gpio = device_get_binding(config->scl_gpio_name);
diff --git a/drivers/i2c/i2c_handlers.c b/drivers/i2c/i2c_handlers.c
index 8d2cbbc512..ee161387ef 100644
--- a/drivers/i2c/i2c_handlers.c
+++ b/drivers/i2c/i2c_handlers.c
@@ -8,20 +8,20 @@
 #include <string.h>
 #include <syscall_handler.h>
 
-static inline int z_vrfy_i2c_configure(struct device *dev, u32_t dev_config)
+static inline int z_vrfy_i2c_configure(struct device *dev, uint32_t dev_config)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_I2C(dev, configure));
 	return z_impl_i2c_configure((struct device *)dev, dev_config);
 }
 #include <syscalls/i2c_configure_mrsh.c>
 
-static u32_t copy_msgs_and_transfer(struct device *dev,
+static uint32_t copy_msgs_and_transfer(struct device *dev,
 				    const struct i2c_msg *msgs,
-				    u8_t num_msgs,
-				    u16_t addr)
+				    uint8_t num_msgs,
+				    uint16_t addr)
 {
 	struct i2c_msg copy[num_msgs];
-	u8_t i;
+	uint8_t i;
 
 	/* Use a local copy to avoid switcheroo attacks. */
 	memcpy(copy, msgs, num_msgs * sizeof(*msgs));
@@ -38,8 +38,8 @@ static u32_t copy_msgs_and_transfer(struct device *dev,
 }
 
 static inline int z_vrfy_i2c_transfer(struct device *dev,
-				     struct i2c_msg *msgs, u8_t num_msgs,
-				     u16_t addr)
+				     struct i2c_msg *msgs, uint8_t num_msgs,
+				     uint16_t addr)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
 
@@ -56,7 +56,7 @@ static inline int z_vrfy_i2c_transfer(struct device *dev,
 
 	return copy_msgs_and_transfer((struct device *)dev,
 				      (struct i2c_msg *)msgs,
-				      (u8_t)num_msgs, (u16_t)addr);
+				      (uint8_t)num_msgs, (uint16_t)addr);
 }
 #include <syscalls/i2c_transfer_mrsh.c>
 
diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c
index 1e90d15f4c..08ce0ca3d3 100644
--- a/drivers/i2c/i2c_imx.c
+++ b/drivers/i2c/i2c_imx.c
@@ -27,18 +27,18 @@ LOG_MODULE_REGISTER(i2c_imx);
 struct i2c_imx_config {
 	I2C_Type *base;
 	void (*irq_config_func)(struct device *dev);
-	u32_t bitrate;
+	uint32_t bitrate;
 };
 
 struct i2c_master_transfer {
-	const u8_t     *txBuff;
-	volatile u8_t  *rxBuff;
-	volatile u32_t	cmdSize;
-	volatile u32_t	txSize;
-	volatile u32_t	rxSize;
+	const uint8_t     *txBuff;
+	volatile uint8_t  *rxBuff;
+	volatile uint32_t	cmdSize;
+	volatile uint32_t	txSize;
+	volatile uint32_t	rxSize;
 	volatile bool	isBusy;
-	volatile u32_t	currentDir;
-	volatile u32_t	currentMode;
+	volatile uint32_t	currentDir;
+	volatile uint32_t	currentMode;
 	volatile bool	ack;
 };
 
@@ -47,7 +47,7 @@ struct i2c_imx_data {
 	struct k_sem device_sync_sem;
 };
 
-static bool i2c_imx_write(struct device *dev, u8_t *txBuffer, u8_t txSize)
+static bool i2c_imx_write(struct device *dev, uint8_t *txBuffer, uint8_t txSize)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
@@ -80,7 +80,7 @@ static bool i2c_imx_write(struct device *dev, u8_t *txBuffer, u8_t txSize)
 	return transfer->ack;
 }
 
-static void i2c_imx_read(struct device *dev, u8_t *rxBuffer, u8_t rxSize)
+static void i2c_imx_read(struct device *dev, uint8_t *rxBuffer, uint8_t rxSize)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
@@ -119,12 +119,12 @@ static void i2c_imx_read(struct device *dev, u8_t *rxBuffer, u8_t rxSize)
 
 }
 
-static int i2c_imx_configure(struct device *dev, u32_t dev_config_raw)
+static int i2c_imx_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
 	struct i2c_master_transfer *transfer = &data->transfer;
-	u32_t baudrate;
+	uint32_t baudrate;
 
 	if (!(I2C_MODE_MASTER & dev_config_raw)) {
 		return -EINVAL;
@@ -173,22 +173,22 @@ static int i2c_imx_configure(struct device *dev, u32_t dev_config_raw)
 	return 0;
 }
 
-static int i2c_imx_send_addr(struct device *dev, u16_t addr, u8_t flags)
+static int i2c_imx_send_addr(struct device *dev, uint16_t addr, uint8_t flags)
 {
-	u8_t byte0 = addr << 1;
+	uint8_t byte0 = addr << 1;
 
 	byte0 |= (flags & I2C_MSG_RW_MASK) == I2C_MSG_READ;
 	return i2c_imx_write(dev, &byte0, 1);
 }
 
 static int i2c_imx_transfer(struct device *dev, struct i2c_msg *msgs,
-		u8_t num_msgs, u16_t addr)
+		uint8_t num_msgs, uint16_t addr)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
 	struct i2c_master_transfer *transfer = &data->transfer;
-	u8_t *buf, *buf_end;
-	u16_t timeout = UINT16_MAX;
+	uint8_t *buf, *buf_end;
+	uint16_t timeout = UINT16_MAX;
 	int result = -EIO;
 
 	if (!num_msgs) {
@@ -336,7 +336,7 @@ static int i2c_imx_init(struct device *dev)
 {
 	const struct i2c_imx_config *config = DEV_CFG(dev);
 	struct i2c_imx_data *data = DEV_DATA(dev);
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int error;
 
 	k_sem_init(&data->device_sync_sem, 0, UINT_MAX);
diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c
index 6a854481a7..16eb7d5fac 100644
--- a/drivers/i2c/i2c_litex.c
+++ b/drivers/i2c/i2c_litex.c
@@ -21,8 +21,8 @@
 #define HIGH_STATE_ON_I2C_LINES    0x7
 
 struct i2c_litex_cfg {
-	volatile u32_t *w_reg;
-	volatile const u32_t *r_reg;
+	volatile uint32_t *w_reg;
+	volatile const uint32_t *r_reg;
 };
 
 #define GET_I2C_CFG(dev)						     \
@@ -31,9 +31,9 @@ struct i2c_litex_cfg {
 #define GET_I2C_BITBANG(dev)						     \
 	((struct i2c_bitbang *) dev->driver_data)
 
-static inline void set_bit(volatile u32_t *reg, u32_t bit, u32_t val)
+static inline void set_bit(volatile uint32_t *reg, uint32_t bit, uint32_t val)
 {
-	u32_t mask = BIT(bit);
+	uint32_t mask = BIT(bit);
 
 	if (val) {
 		*reg |= mask;
@@ -42,9 +42,9 @@ static inline void set_bit(volatile u32_t *reg, u32_t bit, u32_t val)
 	}
 }
 
-static inline int get_bit(volatile const u32_t *reg, u32_t bit)
+static inline int get_bit(volatile const uint32_t *reg, uint32_t bit)
 {
-	u32_t mask = BIT(bit);
+	uint32_t mask = BIT(bit);
 
 	return !!((*reg) & mask);
 }
@@ -92,7 +92,7 @@ static int i2c_litex_init(struct device *dev)
 	return 0;
 }
 
-static int i2c_litex_configure(struct device *dev, u32_t dev_config)
+static int i2c_litex_configure(struct device *dev, uint32_t dev_config)
 {
 	struct i2c_bitbang *bitbang = GET_I2C_BITBANG(dev);
 
@@ -100,7 +100,7 @@ static int i2c_litex_configure(struct device *dev, u32_t dev_config)
 }
 
 static int i2c_litex_transfer(struct device *dev,  struct i2c_msg *msgs,
-		       u8_t num_msgs, u16_t addr)
+		       uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_bitbang *bitbang = GET_I2C_BITBANG(dev);
 
@@ -119,9 +119,9 @@ static const struct i2c_driver_api i2c_litex_driver_api = {
 #define I2C_LITEX_INIT(n)						       \
 	static const struct i2c_litex_cfg i2c_litex_cfg_##n = {		       \
 		.w_reg =						       \
-		 (volatile u32_t *) DT_INST_REG_ADDR_BY_NAME(n, write),\
+		 (volatile uint32_t *) DT_INST_REG_ADDR_BY_NAME(n, write),\
 		.r_reg =						       \
-		 (volatile u32_t *) DT_INST_REG_ADDR_BY_NAME(n, read), \
+		 (volatile uint32_t *) DT_INST_REG_ADDR_BY_NAME(n, read), \
 	};								       \
 									       \
 	static struct i2c_bitbang i2c_bitbang_##n;			       \
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 432ac6db03..68500afb65 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -20,12 +20,12 @@ LOG_MODULE_REGISTER(i2c_ll_stm32);
 
 #include "i2c-priv.h"
 
-int i2c_stm32_runtime_configure(struct device *dev, u32_t config)
+int i2c_stm32_runtime_configure(struct device *dev, uint32_t config)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t clock = 0U;
+	uint32_t clock = 0U;
 	int ret;
 
 #if defined(CONFIG_SOC_SERIES_STM32F3X) || defined(CONFIG_SOC_SERIES_STM32F0X)
@@ -61,7 +61,7 @@ int i2c_stm32_runtime_configure(struct device *dev, u32_t config)
 #define OPERATION(msg) (((struct i2c_msg *) msg)->flags & I2C_MSG_RW_MASK)
 
 static int i2c_stm32_transfer(struct device *dev, struct i2c_msg *msg,
-			      u8_t num_msgs, u16_t slave)
+			      uint8_t num_msgs, uint16_t slave)
 {
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	struct i2c_msg *current, *next;
@@ -78,7 +78,7 @@ static int i2c_stm32_transfer(struct device *dev, struct i2c_msg *msg,
 	 */
 	current->flags |= I2C_MSG_RESTART;
 
-	for (u8_t i = 1; i <= num_msgs; i++) {
+	for (uint8_t i = 1; i <= num_msgs; i++) {
 
 		if (i < num_msgs) {
 			next = current + 1;
@@ -117,16 +117,16 @@ static int i2c_stm32_transfer(struct device *dev, struct i2c_msg *msg,
 	current = msg;
 
 	while (num_msgs > 0) {
-		u8_t *next_msg_flags = NULL;
+		uint8_t *next_msg_flags = NULL;
 
 		if (num_msgs > 1) {
 			next = current + 1;
 			next_msg_flags = &(next->flags);
 		}
 		do {
-			u32_t temp_len = current->len;
-			u8_t tmp_msg_flags = current->flags & ~I2C_MSG_RESTART;
-			u8_t tmp_next_msg_flags = next_msg_flags ?
+			uint32_t temp_len = current->len;
+			uint8_t tmp_msg_flags = current->flags & ~I2C_MSG_RESTART;
+			uint8_t tmp_next_msg_flags = next_msg_flags ?
 							*next_msg_flags : 0;
 
 			if (current->len > 255) {
@@ -178,7 +178,7 @@ static int i2c_stm32_init(struct device *dev)
 {
 	struct device *clock = device_get_binding(STM32_CLOCK_CONTROL_NAME);
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int ret;
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 #ifdef CONFIG_I2C_STM32_INTERRUPT
@@ -207,7 +207,7 @@ static int i2c_stm32_init(struct device *dev)
 	 * I2C2 on STM32F0 uses APB1 clock as I2C clock source
 	 */
 
-	switch ((u32_t)cfg->i2c) {
+	switch ((uint32_t)cfg->i2c) {
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(i2c1), okay)
 	case DT_REG_ADDR(DT_NODELABEL(i2c1)):
 		LL_RCC_SetI2CClockSource(LL_RCC_I2C1_CLKSOURCE_SYSCLK);
diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h
index 7aabf6975b..7d8d7e3760 100644
--- a/drivers/i2c/i2c_ll_stm32.h
+++ b/drivers/i2c/i2c_ll_stm32.h
@@ -17,7 +17,7 @@ struct i2c_stm32_config {
 #endif
 	struct stm32_pclken pclken;
 	I2C_TypeDef *i2c;
-	u32_t bitrate;
+	uint32_t bitrate;
 };
 
 struct i2c_stm32_data {
@@ -25,9 +25,9 @@ struct i2c_stm32_data {
 	struct k_sem device_sync_sem;
 #endif
 	struct k_sem bus_mutex;
-	u32_t dev_config;
+	uint32_t dev_config;
 #ifdef CONFIG_I2C_STM32_V1
-	u16_t slave_address;
+	uint16_t slave_address;
 #endif
 	struct {
 #ifdef CONFIG_I2C_STM32_V1
@@ -40,7 +40,7 @@ struct i2c_stm32_data {
 		unsigned int is_err;
 		struct i2c_msg *msg;
 		unsigned int len;
-		u8_t *buf;
+		uint8_t *buf;
 	} current;
 #ifdef CONFIG_I2C_SLAVE
 	bool master_active;
@@ -49,12 +49,12 @@ struct i2c_stm32_data {
 #endif
 };
 
-s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, u8_t *flg,
-			  u16_t sadr);
-s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, u8_t *flg,
-			 u16_t sadr);
-s32_t stm32_i2c_configure_timing(struct device *dev, u32_t clk);
-int i2c_stm32_runtime_configure(struct device *dev, u32_t config);
+int32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg, uint8_t *flg,
+			  uint16_t sadr);
+int32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg, uint8_t *flg,
+			 uint16_t sadr);
+int32_t stm32_i2c_configure_timing(struct device *dev, uint32_t clk);
+int i2c_stm32_runtime_configure(struct device *dev, uint32_t config);
 
 void stm32_i2c_event_isr(void *arg);
 void stm32_i2c_error_isr(void *arg);
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index 2fd07c2679..d1c9ece0f7 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -78,8 +78,8 @@ static void stm32_i2c_master_finish(struct device *dev)
 }
 
 static inline void msg_init(struct device *dev, struct i2c_msg *msg,
-			    u8_t *next_msg_flags, u16_t slave,
-			    u32_t transfer)
+			    uint8_t *next_msg_flags, uint16_t slave,
+			    uint32_t transfer)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
@@ -114,7 +114,7 @@ static inline void msg_init(struct device *dev, struct i2c_msg *msg,
 	}
 }
 
-static s32_t msg_end(struct device *dev, u8_t *next_msg_flags, const char *funcname)
+static int32_t msg_end(struct device *dev, uint8_t *next_msg_flags, const char *funcname)
 {
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 
@@ -166,12 +166,12 @@ static inline void handle_sb(struct device *dev)
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
 
-	u16_t saddr = data->slave_address;
-	u8_t slave;
+	uint16_t saddr = data->slave_address;
+	uint8_t slave;
 
 	if (I2C_ADDR_10_BITS & data->dev_config) {
 		slave = (((saddr & 0x0300) >> 7) & 0xFF);
-		u8_t header = slave | HEADER;
+		uint8_t header = slave | HEADER;
 
 		if (data->current.is_restart == 0U) {
 			data->current.is_restart = 1U;
@@ -324,7 +324,7 @@ static inline void handle_btf(struct device *dev)
 	if (data->current.is_write) {
 		handle_txe(dev);
 	} else {
-		u32_t counter = 0U;
+		uint32_t counter = 0U;
 
 		switch (data->current.len) {
 		case 2:
@@ -367,14 +367,14 @@ static void stm32_i2c_slave_event(struct device *dev)
 		data->slave_cfg->callbacks;
 
 	if (LL_I2C_IsActiveFlag_TXE(i2c) && LL_I2C_IsActiveFlag_BTF(i2c)) {
-		u8_t val;
+		uint8_t val;
 		slave_cb->read_processed(data->slave_cfg, &val);
 		LL_I2C_TransmitData8(i2c, val);
 		return;
 	}
 
 	if (LL_I2C_IsActiveFlag_RXNE(i2c)) {
-		u8_t val = LL_I2C_ReceiveData8(i2c);
+		uint8_t val = LL_I2C_ReceiveData8(i2c);
 		if (slave_cb->write_received(data->slave_cfg, val)) {
 			LL_I2C_AcknowledgeNextData(i2c, LL_I2C_NACK);
 		}
@@ -393,12 +393,12 @@ static void stm32_i2c_slave_event(struct device *dev)
 	}
 
 	if (LL_I2C_IsActiveFlag_ADDR(i2c)) {
-		u32_t dir = LL_I2C_GetTransferDirection(i2c);
+		uint32_t dir = LL_I2C_GetTransferDirection(i2c);
 		if (dir == LL_I2C_DIRECTION_READ) {
 			slave_cb->write_requested(data->slave_cfg);
 			LL_I2C_EnableIT_RX(i2c);
 		} else {
-			u8_t val;
+			uint8_t val;
 			slave_cb->read_requested(data->slave_cfg, &val);
 			LL_I2C_TransmitData8(i2c, val);
 			LL_I2C_EnableIT_TX(i2c);
@@ -415,7 +415,7 @@ int i2c_stm32_slave_register(struct device *dev,
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int ret;
 
 	if (!config) {
@@ -552,8 +552,8 @@ end:
 	stm32_i2c_master_mode_end(dev);
 }
 
-s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
-			  u8_t *next_msg_flags, u16_t saddr)
+int32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
+			  uint8_t *next_msg_flags, uint16_t saddr)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
@@ -569,8 +569,8 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 	return msg_end(dev, next_msg_flags, __func__);
 }
 
-s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
-			 u8_t *next_msg_flags, u16_t saddr)
+int32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
+			 uint8_t *next_msg_flags, uint16_t saddr)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
@@ -627,7 +627,7 @@ error:
 	return -EIO;
 }
 
-static int stm32_i2c_wait_timeout(u16_t *timeout)
+static int stm32_i2c_wait_timeout(uint16_t *timeout)
 {
 	if (*timeout == 0) {
 		return 1;
@@ -638,15 +638,15 @@ static int stm32_i2c_wait_timeout(u16_t *timeout)
 	}
 }
 
-s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
-			  u8_t *next_msg_flags, u16_t saddr)
+int32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
+			  uint8_t *next_msg_flags, uint16_t saddr)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t len = msg->len;
-	u16_t timeout;
-	u8_t *buf = msg->buf;
+	uint32_t len = msg->len;
+	uint16_t timeout;
+	uint8_t *buf = msg->buf;
 
 	msg_init(dev, msg, next_msg_flags, saddr, I2C_REQUEST_WRITE);
 
@@ -661,8 +661,8 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 		}
 
 		if (I2C_ADDR_10_BITS & data->dev_config) {
-			u8_t slave = (((saddr & 0x0300) >> 7) & 0xFF);
-			u8_t header = slave | HEADER;
+			uint8_t slave = (((saddr & 0x0300) >> 7) & 0xFF);
+			uint8_t header = slave | HEADER;
 
 			LL_I2C_TransmitData8(i2c, header);
 			timeout = STM32_I2C_TIMEOUT_USEC;
@@ -677,7 +677,7 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 			slave = data->slave_address & 0xFF;
 			LL_I2C_TransmitData8(i2c, slave);
 		} else {
-			u8_t slave = (saddr << 1) & 0xFF;
+			uint8_t slave = (saddr << 1) & 0xFF;
 
 			LL_I2C_TransmitData8(i2c, slave | I2C_REQUEST_WRITE);
 		}
@@ -730,15 +730,15 @@ end:
 	return msg_end(dev, next_msg_flags, __func__);
 }
 
-s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
-			 u8_t *next_msg_flags, u16_t saddr)
+int32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
+			 uint8_t *next_msg_flags, uint16_t saddr)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t len = msg->len;
-	u16_t timeout;
-	u8_t *buf = msg->buf;
+	uint32_t len = msg->len;
+	uint16_t timeout;
+	uint8_t *buf = msg->buf;
 
 	msg_init(dev, msg, next_msg_flags, saddr, I2C_REQUEST_READ);
 
@@ -753,8 +753,8 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 		}
 
 		if (I2C_ADDR_10_BITS & data->dev_config) {
-			u8_t slave = (((saddr & 0x0300) >> 7) & 0xFF);
-			u8_t header = slave | HEADER;
+			uint8_t slave = (((saddr & 0x0300) >> 7) & 0xFF);
+			uint8_t header = slave | HEADER;
 
 			LL_I2C_TransmitData8(i2c, header);
 			timeout = STM32_I2C_TIMEOUT_USEC;
@@ -791,7 +791,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 			header |= I2C_REQUEST_READ;
 			LL_I2C_TransmitData8(i2c, header);
 		} else {
-			u8_t slave = ((saddr) << 1) & 0xFF;
+			uint8_t slave = ((saddr) << 1) & 0xFF;
 
 			LL_I2C_TransmitData8(i2c, slave | I2C_REQUEST_READ);
 		}
@@ -856,7 +856,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 				LL_I2C_GenerateStopCondition(i2c);
 			}
 
-			for (u32_t counter = 2; counter > 0; counter--) {
+			for (uint32_t counter = 2; counter > 0; counter--) {
 				len--;
 				*buf = LL_I2C_ReceiveData8(i2c);
 				buf++;
@@ -887,7 +887,7 @@ end:
 }
 #endif
 
-s32_t stm32_i2c_configure_timing(struct device *dev, u32_t clock)
+int32_t stm32_i2c_configure_timing(struct device *dev, uint32_t clock)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index f3496f4313..1b3ee69f94 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(i2c_ll_stm32_v2);
 #include "i2c-priv.h"
 
 static inline void msg_init(struct device *dev, struct i2c_msg *msg,
-			    u8_t *next_msg_flags, u16_t slave,
+			    uint8_t *next_msg_flags, uint16_t slave,
 			    uint32_t transfer)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
@@ -118,7 +118,7 @@ static void stm32_i2c_slave_event(struct device *dev)
 		data->slave_cfg->callbacks;
 
 	if (LL_I2C_IsActiveFlag_TXIS(i2c)) {
-		u8_t val;
+		uint8_t val;
 
 		slave_cb->read_processed(data->slave_cfg, &val);
 		LL_I2C_TransmitData8(i2c, val);
@@ -126,7 +126,7 @@ static void stm32_i2c_slave_event(struct device *dev)
 	}
 
 	if (LL_I2C_IsActiveFlag_RXNE(i2c)) {
-		u8_t val = LL_I2C_ReceiveData8(i2c);
+		uint8_t val = LL_I2C_ReceiveData8(i2c);
 
 		if (slave_cb->write_received(data->slave_cfg, val)) {
 			LL_I2C_AcknowledgeNextData(i2c, LL_I2C_NACK);
@@ -153,7 +153,7 @@ static void stm32_i2c_slave_event(struct device *dev)
 	}
 
 	if (LL_I2C_IsActiveFlag_ADDR(i2c)) {
-		u32_t dir;
+		uint32_t dir;
 
 		LL_I2C_ClearFlag_ADDR(i2c);
 
@@ -162,7 +162,7 @@ static void stm32_i2c_slave_event(struct device *dev)
 			slave_cb->write_requested(data->slave_cfg);
 			LL_I2C_EnableIT_RX(i2c);
 		} else {
-			u8_t val;
+			uint8_t val;
 
 			slave_cb->read_requested(data->slave_cfg, &val);
 			LL_I2C_TransmitData8(i2c, val);
@@ -180,7 +180,7 @@ int i2c_stm32_slave_register(struct device *dev,
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int ret;
 
 	if (!config) {
@@ -377,7 +377,7 @@ void stm32_i2c_error_isr(void *arg)
 #endif
 
 int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
-			u8_t *next_msg_flags, uint16_t slave)
+			uint8_t *next_msg_flags, uint16_t slave)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
@@ -425,7 +425,7 @@ error:
 }
 
 int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
-		       u8_t *next_msg_flags, uint16_t slave)
+		       uint8_t *next_msg_flags, uint16_t slave)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
@@ -536,12 +536,12 @@ static inline int msg_done(struct device *dev, unsigned int current_msg_flags)
 }
 
 int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
-			u8_t *next_msg_flags, uint16_t slave)
+			uint8_t *next_msg_flags, uint16_t slave)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
 	unsigned int len = 0U;
-	u8_t *buf = msg->buf;
+	uint8_t *buf = msg->buf;
 
 	msg_init(dev, msg, next_msg_flags, slave, LL_I2C_REQUEST_WRITE);
 
@@ -566,12 +566,12 @@ int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 }
 
 int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
-		       u8_t *next_msg_flags, uint16_t slave)
+		       uint8_t *next_msg_flags, uint16_t slave)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
 	unsigned int len = 0U;
-	u8_t *buf = msg->buf;
+	uint8_t *buf = msg->buf;
 
 	msg_init(dev, msg, next_msg_flags, slave, LL_I2C_REQUEST_READ);
 
@@ -592,15 +592,15 @@ int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 }
 #endif
 
-int stm32_i2c_configure_timing(struct device *dev, u32_t clock)
+int stm32_i2c_configure_timing(struct device *dev, uint32_t clock)
 {
 	const struct i2c_stm32_config *cfg = DEV_CFG(dev);
 	struct i2c_stm32_data *data = DEV_DATA(dev);
 	I2C_TypeDef *i2c = cfg->i2c;
-	u32_t i2c_hold_time_min, i2c_setup_time_min;
-	u32_t i2c_h_min_time, i2c_l_min_time;
-	u32_t presc = 1U;
-	u32_t timing = 0U;
+	uint32_t i2c_hold_time_min, i2c_setup_time_min;
+	uint32_t i2c_h_min_time, i2c_l_min_time;
+	uint32_t presc = 1U;
+	uint32_t timing = 0U;
 
 	switch (I2C_SPEED_GET(data->dev_config)) {
 	case I2C_SPEED_STANDARD:
@@ -621,12 +621,12 @@ int stm32_i2c_configure_timing(struct device *dev, u32_t clock)
 
 	/* Calculate period until prescaler matches */
 	do {
-		u32_t t_presc = clock / presc;
-		u32_t ns_presc = NSEC_PER_SEC / t_presc;
-		u32_t sclh = i2c_h_min_time / ns_presc;
-		u32_t scll = i2c_l_min_time / ns_presc;
-		u32_t sdadel = i2c_hold_time_min / ns_presc;
-		u32_t scldel = i2c_setup_time_min / ns_presc;
+		uint32_t t_presc = clock / presc;
+		uint32_t ns_presc = NSEC_PER_SEC / t_presc;
+		uint32_t sclh = i2c_h_min_time / ns_presc;
+		uint32_t scll = i2c_l_min_time / ns_presc;
+		uint32_t sdadel = i2c_hold_time_min / ns_presc;
+		uint32_t scldel = i2c_setup_time_min / ns_presc;
 
 		if ((sclh - 1) > 255 ||  (scll - 1) > 255) {
 			++presc;
diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c
index e866696283..9ba77e51ab 100644
--- a/drivers/i2c/i2c_mchp_xec.c
+++ b/drivers/i2c/i2c_mchp_xec.c
@@ -23,20 +23,20 @@
 #define MAX_CLK_STRETCHING  5
 
 struct xec_speed_cfg {
-	u32_t bus_clk;
-	u32_t data_timing;
-	u32_t start_hold_time;
-	u32_t config;
-	u32_t timeout_scale;
+	uint32_t bus_clk;
+	uint32_t data_timing;
+	uint32_t start_hold_time;
+	uint32_t config;
+	uint32_t timeout_scale;
 };
 
 struct i2c_xec_config {
-	u32_t port_sel;
-	u32_t base_addr;
+	uint32_t port_sel;
+	uint32_t base_addr;
 };
 
 struct i2c_xec_data {
-	u32_t pending_stop;
+	uint32_t pending_stop;
 };
 
 /* Recommended programming values based on 16MHz
@@ -86,7 +86,7 @@ static int xec_spin_yield(int *counter)
 	return 0;
 }
 
-static void recover_from_error(u32_t ba)
+static void recover_from_error(uint32_t ba)
 {
 	MCHP_I2C_SMB_CTRL_WO(ba) = MCHP_I2C_SMB_CTRL_PIN |
 				   MCHP_I2C_SMB_CTRL_ESO |
@@ -94,7 +94,7 @@ static void recover_from_error(u32_t ba)
 				   MCHP_I2C_SMB_CTRL_ACK;
 }
 
-static int wait_bus_free(u32_t ba)
+static int wait_bus_free(uint32_t ba)
 {
 	int ret;
 	int counter = 0;
@@ -110,7 +110,7 @@ static int wait_bus_free(u32_t ba)
 	return 0;
 }
 
-static int wait_completion(u32_t ba)
+static int wait_completion(uint32_t ba)
 {
 	int ret;
 	int counter = 0;
@@ -140,21 +140,21 @@ static int wait_completion(u32_t ba)
 	return 0;
 }
 
-static bool check_lines(u32_t ba)
+static bool check_lines(uint32_t ba)
 {
 	return ((!(MCHP_I2C_SMB_BB_CTRL(ba) & MCHP_I2C_SMB_BB_CLKI_RO)) ||
 		(!(MCHP_I2C_SMB_BB_CTRL(ba) & MCHP_I2C_SMB_BB_DATI_RO)));
 }
 
-static int i2c_xec_configure(struct device *dev, u32_t dev_config_raw)
+static int i2c_xec_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	const struct i2c_xec_config *config =
 		(const struct i2c_xec_config *const) (dev->config_info);
-	u32_t ba = config->base_addr;
-	u8_t port_sel = config->port_sel;
-	u32_t speed_id;
-	u32_t cfg, bb_ctrl;
-	u8_t ctrl;
+	uint32_t ba = config->base_addr;
+	uint8_t port_sel = config->port_sel;
+	uint32_t speed_id;
+	uint32_t cfg, bb_ctrl;
+	uint8_t ctrl;
 
 	if (!(dev_config_raw & I2C_MODE_MASTER)) {
 		return -ENOTSUP;
@@ -226,13 +226,13 @@ static int i2c_xec_configure(struct device *dev, u32_t dev_config_raw)
 }
 
 static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg,
-			      u16_t addr)
+			      uint16_t addr)
 {
 	const struct i2c_xec_config *config =
 		(const struct i2c_xec_config *const) (dev->config_info);
 	struct i2c_xec_data *data =
 		(struct i2c_xec_data *const) (dev->driver_data);
-	u32_t ba = config->base_addr;
+	uint32_t ba = config->base_addr;
 	int ret;
 
 	if (data->pending_stop == 0) {
@@ -289,14 +289,14 @@ static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg,
 }
 
 static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg,
-			     u16_t addr)
+			     uint16_t addr)
 {
 	const struct i2c_xec_config *config =
 		(const struct i2c_xec_config *const) (dev->config_info);
 	struct i2c_xec_data *data =
 		(struct i2c_xec_data *const) (dev->driver_data);
-	u32_t ba = config->base_addr;
-	u8_t byte, ctrl;
+	uint32_t ba = config->base_addr;
+	uint8_t byte, ctrl;
 	int ret;
 
 	if (!(msg.flags & I2C_MSG_RESTART)) {
@@ -366,7 +366,7 @@ static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg,
 }
 
 static int i2c_xec_transfer(struct device *dev, struct i2c_msg *msgs,
-				u8_t num_msgs, u16_t addr)
+				uint8_t num_msgs, uint16_t addr)
 {
 	int ret = 0;
 
diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c
index 8231a51221..8b825a37bc 100644
--- a/drivers/i2c/i2c_mcux.c
+++ b/drivers/i2c/i2c_mcux.c
@@ -29,7 +29,7 @@ struct i2c_mcux_config {
 	I2C_Type *base;
 	clock_name_t clock_source;
 	void (*irq_config_func)(struct device *dev);
-	u32_t bitrate;
+	uint32_t bitrate;
 };
 
 struct i2c_mcux_data {
@@ -38,12 +38,12 @@ struct i2c_mcux_data {
 	status_t callback_status;
 };
 
-static int i2c_mcux_configure(struct device *dev, u32_t dev_config_raw)
+static int i2c_mcux_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	const struct i2c_mcux_config *config = DEV_CFG(dev);
-	u32_t clock_freq;
-	u32_t baudrate;
+	uint32_t clock_freq;
+	uint32_t baudrate;
 
 	if (!(I2C_MODE_MASTER & dev_config_raw)) {
 		return -EINVAL;
@@ -86,9 +86,9 @@ static void i2c_mcux_master_transfer_callback(I2C_Type *base,
 	k_sem_give(&data->device_sync_sem);
 }
 
-static u32_t i2c_mcux_convert_flags(int msg_flags)
+static uint32_t i2c_mcux_convert_flags(int msg_flags)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	if (!(msg_flags & I2C_MSG_STOP)) {
 		flags |= kI2C_TransferNoStopFlag;
@@ -102,7 +102,7 @@ static u32_t i2c_mcux_convert_flags(int msg_flags)
 }
 
 static int i2c_mcux_transfer(struct device *dev, struct i2c_msg *msgs,
-		u8_t num_msgs, u16_t addr)
+		uint8_t num_msgs, uint16_t addr)
 {
 	I2C_Type *base = DEV_BASE(dev);
 	struct i2c_mcux_data *data = DEV_DATA(dev);
@@ -174,7 +174,7 @@ static int i2c_mcux_init(struct device *dev)
 	I2C_Type *base = DEV_BASE(dev);
 	const struct i2c_mcux_config *config = DEV_CFG(dev);
 	struct i2c_mcux_data *data = DEV_DATA(dev);
-	u32_t clock_freq, bitrate_cfg;
+	uint32_t clock_freq, bitrate_cfg;
 	i2c_master_config_t master_config;
 	int error;
 
diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c
index c14d3a2f29..291c9b71f0 100644
--- a/drivers/i2c/i2c_mcux_flexcomm.c
+++ b/drivers/i2c/i2c_mcux_flexcomm.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(mcux_flexcomm);
 struct mcux_flexcomm_config {
 	I2C_Type *base;
 	void (*irq_config_func)(struct device *dev);
-	u32_t bitrate;
+	uint32_t bitrate;
 };
 
 struct mcux_flexcomm_data {
@@ -29,12 +29,12 @@ struct mcux_flexcomm_data {
 	status_t callback_status;
 };
 
-static int mcux_flexcomm_configure(struct device *dev, u32_t dev_config_raw)
+static int mcux_flexcomm_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
 	I2C_Type *base = config->base;
-	u32_t clock_freq;
-	u32_t baudrate;
+	uint32_t clock_freq;
+	uint32_t baudrate;
 
 	if (!(I2C_MODE_MASTER & dev_config_raw)) {
 		return -EINVAL;
@@ -78,9 +78,9 @@ static void mcux_flexcomm_master_transfer_callback(I2C_Type *base,
 	k_sem_give(&data->device_sync_sem);
 }
 
-static u32_t mcux_flexcomm_convert_flags(int msg_flags)
+static uint32_t mcux_flexcomm_convert_flags(int msg_flags)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	if (!(msg_flags & I2C_MSG_STOP)) {
 		flags |= kI2C_TransferNoStopFlag;
@@ -94,7 +94,7 @@ static u32_t mcux_flexcomm_convert_flags(int msg_flags)
 }
 
 static int mcux_flexcomm_transfer(struct device *dev, struct i2c_msg *msgs,
-		u8_t num_msgs, u16_t addr)
+		uint8_t num_msgs, uint16_t addr)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
 	struct mcux_flexcomm_data *data = dev->driver_data;
@@ -169,7 +169,7 @@ static int mcux_flexcomm_init(struct device *dev)
 	const struct mcux_flexcomm_config *config = dev->config_info;
 	struct mcux_flexcomm_data *data = dev->driver_data;
 	I2C_Type *base = config->base;
-	u32_t clock_freq, bitrate_cfg;
+	uint32_t clock_freq, bitrate_cfg;
 	i2c_master_config_t master_config;
 	int error;
 
diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c
index 5019bf4d77..db1110e302 100644
--- a/drivers/i2c/i2c_mcux_lpi2c.c
+++ b/drivers/i2c/i2c_mcux_lpi2c.c
@@ -22,8 +22,8 @@ struct mcux_lpi2c_config {
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
 	void (*irq_config_func)(struct device *dev);
-	u32_t bitrate;
-	u32_t bus_idle_timeout_ns;
+	uint32_t bitrate;
+	uint32_t bus_idle_timeout_ns;
 };
 
 struct mcux_lpi2c_data {
@@ -32,13 +32,13 @@ struct mcux_lpi2c_data {
 	status_t callback_status;
 };
 
-static int mcux_lpi2c_configure(struct device *dev, u32_t dev_config_raw)
+static int mcux_lpi2c_configure(struct device *dev, uint32_t dev_config_raw)
 {
 	const struct mcux_lpi2c_config *config = dev->config_info;
 	LPI2C_Type *base = config->base;
 	struct device *clock_dev;
-	u32_t clock_freq;
-	u32_t baudrate;
+	uint32_t clock_freq;
+	uint32_t baudrate;
 
 	if (!(I2C_MODE_MASTER & dev_config_raw)) {
 		return -EINVAL;
@@ -90,9 +90,9 @@ static void mcux_lpi2c_master_transfer_callback(LPI2C_Type *base,
 	k_sem_give(&data->device_sync_sem);
 }
 
-static u32_t mcux_lpi2c_convert_flags(int msg_flags)
+static uint32_t mcux_lpi2c_convert_flags(int msg_flags)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	if (!(msg_flags & I2C_MSG_STOP)) {
 		flags |= kLPI2C_TransferNoStopFlag;
@@ -106,7 +106,7 @@ static u32_t mcux_lpi2c_convert_flags(int msg_flags)
 }
 
 static int mcux_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs,
-		u8_t num_msgs, u16_t addr)
+		uint8_t num_msgs, uint16_t addr)
 {
 	const struct mcux_lpi2c_config *config = dev->config_info;
 	struct mcux_lpi2c_data *data = dev->driver_data;
@@ -182,7 +182,7 @@ static int mcux_lpi2c_init(struct device *dev)
 	struct mcux_lpi2c_data *data = dev->driver_data;
 	LPI2C_Type *base = config->base;
 	struct device *clock_dev;
-	u32_t clock_freq, bitrate_cfg;
+	uint32_t clock_freq, bitrate_cfg;
 	lpi2c_master_config_t master_config;
 	int error;
 
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 39c47b5faa..49cb6c11d6 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -28,10 +28,10 @@ struct i2c_nios2_config {
 	struct k_sem		sem_lock;
 };
 
-static int i2c_nios2_configure(struct device *dev, u32_t dev_config)
+static int i2c_nios2_configure(struct device *dev, uint32_t dev_config)
 {
 	struct i2c_nios2_config *config = DEV_CFG(dev);
-	s32_t rc = 0;
+	int32_t rc = 0;
 
 	k_sem_take(&config->sem_lock, K_FOREVER);
 	if (!(I2C_MODE_MASTER & dev_config)) {
@@ -60,12 +60,12 @@ i2c_cfg_err:
 }
 
 static int i2c_nios2_transfer(struct device *dev, struct i2c_msg *msgs,
-			      u8_t num_msgs, u16_t addr)
+			      uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_nios2_config *config = DEV_CFG(dev);
 	ALT_AVALON_I2C_STATUS_CODE status;
-	u32_t restart, stop;
-	s32_t i, timeout, rc = 0;
+	uint32_t restart, stop;
+	int32_t i, timeout, rc = 0;
 
 	k_sem_take(&config->sem_lock, K_FOREVER);
 	/* register the optional interrupt callback */
diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c
index 2f5e6f922d..71859442fa 100644
--- a/drivers/i2c/i2c_nrfx_twi.c
+++ b/drivers/i2c/i2c_nrfx_twi.c
@@ -16,9 +16,9 @@ struct i2c_nrfx_twi_data {
 	struct k_sem transfer_sync;
 	struct k_sem completion_sync;
 	volatile nrfx_err_t res;
-	u32_t dev_config;
+	uint32_t dev_config;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -39,7 +39,7 @@ const struct i2c_nrfx_twi_config *get_dev_config(struct device *dev)
 }
 
 static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs,
-				 u8_t num_msgs, u16_t addr)
+				 uint8_t num_msgs, uint16_t addr)
 {
 	int ret = 0;
 
@@ -59,7 +59,7 @@ static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs,
 			.type		= (msgs[i].flags & I2C_MSG_READ) ?
 					  NRFX_TWI_XFER_RX : NRFX_TWI_XFER_TX
 		};
-		u32_t xfer_flags = 0;
+		uint32_t xfer_flags = 0;
 		nrfx_err_t res;
 
 		/* In case the STOP condition is not supposed to appear after
@@ -141,7 +141,7 @@ static void event_handler(nrfx_twi_evt_t const *p_event, void *p_context)
 	k_sem_give(&dev_data->completion_sync);
 }
 
-static int i2c_nrfx_twi_configure(struct device *dev, u32_t dev_config)
+static int i2c_nrfx_twi_configure(struct device *dev, uint32_t dev_config)
 {
 	nrfx_twi_t const *inst = &(get_dev_config(dev)->twi);
 
@@ -188,14 +188,14 @@ static int init_twi(struct device *dev)
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static int twi_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int twi_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
-	u32_t pm_current_state = get_dev_data(dev)->pm_state;
+	uint32_t pm_current_state = get_dev_data(dev)->pm_state;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != pm_current_state) {
 			switch (new_state) {
@@ -225,7 +225,7 @@ static int twi_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = get_dev_data(dev)->pm_state;
+		*((uint32_t *)context) = get_dev_data(dev)->pm_state;
 	}
 
 	if (cb) {
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 2bd94d7399..3fdd36834e 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -18,7 +18,7 @@ struct i2c_nrfx_twim_data {
 	volatile nrfx_err_t res;
 	uint32_t dev_config;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -39,7 +39,7 @@ const struct i2c_nrfx_twim_config *get_dev_config(struct device *dev)
 }
 
 static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs,
-				  u8_t num_msgs, u16_t addr)
+				  uint8_t num_msgs, uint16_t addr)
 {
 	int ret = 0;
 
@@ -112,7 +112,7 @@ static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
 	k_sem_give(&dev_data->completion_sync);
 }
 
-static int i2c_nrfx_twim_configure(struct device *dev, u32_t dev_config)
+static int i2c_nrfx_twim_configure(struct device *dev, uint32_t dev_config)
 {
 	nrfx_twim_t const *inst = &(get_dev_config(dev)->twim);
 
@@ -161,14 +161,14 @@ static int init_twim(struct device *dev)
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static int twim_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int twim_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
-	u32_t pm_current_state = get_dev_data(dev)->pm_state;
+	uint32_t pm_current_state = get_dev_data(dev)->pm_state;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != pm_current_state) {
 			switch (new_state) {
@@ -199,7 +199,7 @@ static int twim_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = get_dev_data(dev)->pm_state;
+		*((uint32_t *)context) = get_dev_data(dev)->pm_state;
 	}
 
 	if (cb) {
diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
index 2a483eeac2..12efe557b7 100644
--- a/drivers/i2c/i2c_rv32m1_lpi2c.c
+++ b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -23,8 +23,8 @@ struct rv32m1_lpi2c_config {
 	char *clock_controller;
 	clock_control_subsys_t clock_subsys;
 	clock_ip_name_t clock_ip_name;
-	u32_t clock_ip_src;
-	u32_t bitrate;
+	uint32_t clock_ip_src;
+	uint32_t bitrate;
 	void (*irq_config_func)(struct device *dev);
 };
 
@@ -35,12 +35,12 @@ struct rv32m1_lpi2c_data {
 	status_t completion_status;
 };
 
-static int rv32m1_lpi2c_configure(struct device *dev, u32_t dev_config)
+static int rv32m1_lpi2c_configure(struct device *dev, uint32_t dev_config)
 {
 	const struct rv32m1_lpi2c_config *config = dev->config_info;
 	struct device *clk;
-	u32_t baudrate;
-	u32_t clk_freq;
+	uint32_t baudrate;
+	uint32_t clk_freq;
 	int err;
 
 	if (!(I2C_MODE_MASTER & dev_config)) {
@@ -111,9 +111,9 @@ static void rv32m1_lpi2c_master_transfer_callback(LPI2C_Type *base,
 	k_sem_give(&data->completion_sync);
 }
 
-static u32_t rv32m1_lpi2c_convert_flags(int msg_flags)
+static uint32_t rv32m1_lpi2c_convert_flags(int msg_flags)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	if (!(msg_flags & I2C_MSG_STOP)) {
 		flags |= kLPI2C_TransferNoStopFlag;
@@ -127,7 +127,7 @@ static u32_t rv32m1_lpi2c_convert_flags(int msg_flags)
 }
 
 static int rv32m1_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs,
-				 u8_t num_msgs, u16_t addr)
+				 uint8_t num_msgs, uint16_t addr)
 {
 	const struct rv32m1_lpi2c_config *config = dev->config_info;
 	struct rv32m1_lpi2c_data *data = dev->driver_data;
@@ -214,7 +214,7 @@ static int rv32m1_lpi2c_init(struct device *dev)
 	struct rv32m1_lpi2c_data *data = dev->driver_data;
 	lpi2c_master_config_t master_config;
 	struct device *clk;
-	u32_t clk_freq, dev_cfg;
+	uint32_t clk_freq, dev_cfg;
 	int err;
 
 	CLOCK_SetIpSrc(config->clock_ip_name, config->clock_ip_src);
diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c
index 88956eef0b..f52c781046 100644
--- a/drivers/i2c/i2c_sam0.c
+++ b/drivers/i2c/i2c_sam0.c
@@ -24,29 +24,29 @@ LOG_MODULE_REGISTER(i2c_sam0, CONFIG_I2C_LOG_LEVEL);
 
 struct i2c_sam0_dev_config {
 	SercomI2cm *regs;
-	u32_t bitrate;
+	uint32_t bitrate;
 #ifdef MCLK
 	volatile uint32_t *mclk;
-	u32_t mclk_mask;
-	u16_t gclk_core_id;
+	uint32_t mclk_mask;
+	uint16_t gclk_core_id;
 #else
-	u32_t pm_apbcmask;
-	u16_t gclk_clkctrl_id;
+	uint32_t pm_apbcmask;
+	uint16_t gclk_clkctrl_id;
 #endif
 	void (*irq_config_func)(struct device *dev);
 
 #ifdef CONFIG_I2C_SAM0_DMA_DRIVEN
 	char *dma_dev;
-	u8_t write_dma_request;
-	u8_t read_dma_request;
-	u8_t dma_channel;
+	uint8_t write_dma_request;
+	uint8_t read_dma_request;
+	uint8_t dma_channel;
 #endif
 };
 
 struct i2c_sam0_msg {
-	u8_t *buffer;
-	u32_t size;
-	u32_t status;
+	uint8_t *buffer;
+	uint32_t size;
+	uint32_t status;
 };
 
 struct i2c_sam0_dev_data {
@@ -134,7 +134,7 @@ static void i2c_sam0_isr(void *arg)
 	SercomI2cm *i2c = cfg->regs;
 
 	/* Get present interrupts and clear them */
-	u32_t status = i2c->INTFLAG.reg;
+	uint32_t status = i2c->INTFLAG.reg;
 
 	i2c->INTFLAG.reg = status;
 
@@ -181,7 +181,7 @@ static void i2c_sam0_isr(void *arg)
 
 #ifdef CONFIG_I2C_SAM0_DMA_DRIVEN
 
-static void i2c_sam0_dma_write_done(void *arg, u32_t id, int error_code)
+static void i2c_sam0_dma_write_done(void *arg, uint32_t id, int error_code)
 {
 	struct device *dev = arg;
 	struct i2c_sam0_dev_data *data = DEV_DATA(dev);
@@ -253,8 +253,8 @@ static bool i2c_sam0_dma_write_start(struct device *dev)
 	dma_cfg.dma_slot = cfg->write_dma_request;
 
 	dma_blk.block_size = data->msg.size;
-	dma_blk.source_address = (u32_t)data->msg.buffer;
-	dma_blk.dest_address = (u32_t)(&(i2c->DATA.reg));
+	dma_blk.source_address = (uint32_t)data->msg.buffer;
+	dma_blk.dest_address = (uint32_t)(&(i2c->DATA.reg));
 	dma_blk.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 	retval = dma_config(data->dma, cfg->dma_channel, &dma_cfg);
@@ -274,7 +274,7 @@ static bool i2c_sam0_dma_write_start(struct device *dev)
 	return true;
 }
 
-static void i2c_sam0_dma_read_done(void *arg, u32_t id, int error_code)
+static void i2c_sam0_dma_read_done(void *arg, uint32_t id, int error_code)
 {
 	struct device *dev = arg;
 	struct i2c_sam0_dev_data *data = DEV_DATA(dev);
@@ -348,8 +348,8 @@ static bool i2c_sam0_dma_read_start(struct device *dev)
 	dma_cfg.dma_slot = cfg->read_dma_request;
 
 	dma_blk.block_size = data->msg.size - 1;
-	dma_blk.dest_address = (u32_t)data->msg.buffer;
-	dma_blk.source_address = (u32_t)(&(i2c->DATA.reg));
+	dma_blk.dest_address = (uint32_t)data->msg.buffer;
+	dma_blk.source_address = (uint32_t)(&(i2c->DATA.reg));
 	dma_blk.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 	retval = dma_config(data->dma, cfg->dma_channel, &dma_cfg);
@@ -372,12 +372,12 @@ static bool i2c_sam0_dma_read_start(struct device *dev)
 #endif
 
 static int i2c_sam0_transfer(struct device *dev, struct i2c_msg *msgs,
-			     u8_t num_msgs, u16_t addr)
+			     uint8_t num_msgs, uint16_t addr)
 {
 	struct i2c_sam0_dev_data *data = DEV_DATA(dev);
 	const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev);
 	SercomI2cm *i2c = cfg->regs;
-	u32_t addr_reg;
+	uint32_t addr_reg;
 
 	if (!num_msgs) {
 		return 0;
@@ -503,15 +503,15 @@ static int i2c_sam0_transfer(struct device *dev, struct i2c_msg *msgs,
 	return 0;
 }
 
-static int i2c_sam0_set_apply_bitrate(struct device *dev, u32_t config)
+static int i2c_sam0_set_apply_bitrate(struct device *dev, uint32_t config)
 {
 	const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev);
 	SercomI2cm *i2c = cfg->regs;
-	u32_t baud;
-	u32_t baud_low;
-	u32_t baud_high;
+	uint32_t baud;
+	uint32_t baud_low;
+	uint32_t baud_high;
 
-	u32_t CTRLA = i2c->CTRLA.reg;
+	uint32_t CTRLA = i2c->CTRLA.reg;
 
 #ifdef SERCOM_I2CM_CTRLA_SPEED_Msk
 	CTRLA &= ~SERCOM_I2CM_CTRLA_SPEED_Msk;
@@ -637,7 +637,7 @@ static int i2c_sam0_set_apply_bitrate(struct device *dev, u32_t config)
 	return 0;
 }
 
-static int i2c_sam0_configure(struct device *dev, u32_t config)
+static int i2c_sam0_configure(struct device *dev, uint32_t config)
 {
 	const struct i2c_sam0_dev_config *const cfg = DEV_CFG(dev);
 	SercomI2cm *i2c = cfg->regs;
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index 3ae1522f7d..1d23f79f25 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -40,24 +40,24 @@ LOG_MODULE_REGISTER(i2c_sam_twi);
 struct i2c_sam_twi_dev_cfg {
 	Twi *regs;
 	void (*irq_config)(void);
-	u32_t bitrate;
+	uint32_t bitrate;
 	const struct soc_gpio_pin *pin_list;
-	u8_t pin_list_size;
-	u8_t periph_id;
-	u8_t irq_id;
+	uint8_t pin_list_size;
+	uint8_t periph_id;
+	uint8_t irq_id;
 };
 
 struct twi_msg {
 	/* Buffer containing data to read or write */
-	u8_t *buf;
+	uint8_t *buf;
 	/* Length of the buffer */
-	u32_t len;
+	uint32_t len;
 	/* Index of the next byte to be read/written from/to the buffer */
-	u32_t idx;
+	uint32_t idx;
 	/* Value of TWI_SR at the end of the message */
-	u32_t twi_sr;
+	uint32_t twi_sr;
 	/* Transfer flags as defined in the i2c.h file */
-	u8_t flags;
+	uint8_t flags;
 };
 
 /* Device run time data */
@@ -72,10 +72,10 @@ struct i2c_sam_twi_dev_data {
 #define DEV_DATA(dev) \
 	((struct i2c_sam_twi_dev_data *const)(dev)->driver_data)
 
-static int i2c_clk_set(Twi *const twi, u32_t speed)
+static int i2c_clk_set(Twi *const twi, uint32_t speed)
 {
-	u32_t ck_div = 0U;
-	u32_t cl_div;
+	uint32_t ck_div = 0U;
+	uint32_t cl_div;
 	bool div_completed = false;
 
 	/*  From the datasheet "TWI Clock Waveform Generator Register"
@@ -104,11 +104,11 @@ static int i2c_clk_set(Twi *const twi, u32_t speed)
 	return 0;
 }
 
-static int i2c_sam_twi_configure(struct device *dev, u32_t config)
+static int i2c_sam_twi_configure(struct device *dev, uint32_t config)
 {
 	const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	Twi *const twi = dev_cfg->regs;
-	u32_t bitrate;
+	uint32_t bitrate;
 	int ret;
 
 	if (!(config & I2C_MODE_MASTER)) {
@@ -150,7 +150,7 @@ static int i2c_sam_twi_configure(struct device *dev, u32_t config)
 	return 0;
 }
 
-static void write_msg_start(Twi *const twi, struct twi_msg *msg, u8_t daddr)
+static void write_msg_start(Twi *const twi, struct twi_msg *msg, uint8_t daddr)
 {
 	/* Set slave address and number of internal address bytes. */
 	twi->TWI_MMR = TWI_MMR_DADR(daddr);
@@ -162,9 +162,9 @@ static void write_msg_start(Twi *const twi, struct twi_msg *msg, u8_t daddr)
 	twi->TWI_IER = TWI_IER_TXRDY | TWI_IER_TXCOMP | TWI_IER_NACK;
 }
 
-static void read_msg_start(Twi *const twi, struct twi_msg *msg, u8_t daddr)
+static void read_msg_start(Twi *const twi, struct twi_msg *msg, uint8_t daddr)
 {
-	u32_t twi_cr_stop;
+	uint32_t twi_cr_stop;
 
 	/* Set slave address and number of internal address bytes */
 	twi->TWI_MMR = TWI_MMR_MREAD | TWI_MMR_DADR(daddr);
@@ -179,7 +179,7 @@ static void read_msg_start(Twi *const twi, struct twi_msg *msg, u8_t daddr)
 }
 
 static int i2c_sam_twi_transfer(struct device *dev, struct i2c_msg *msgs,
-				u8_t num_msgs, u16_t addr)
+				uint8_t num_msgs, uint16_t addr)
 {
 	const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev);
@@ -241,7 +241,7 @@ static void i2c_sam_twi_isr(void *arg)
 	struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev);
 	Twi *const twi = dev_cfg->regs;
 	struct twi_msg *msg = &dev_data->msg;
-	u32_t isr_status;
+	uint32_t isr_status;
 
 	/* Retrieve interrupt status */
 	isr_status = twi->TWI_SR & twi->TWI_IMR;
@@ -299,7 +299,7 @@ static int i2c_sam_twi_initialize(struct device *dev)
 	const struct i2c_sam_twi_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twi_dev_data *const dev_data = DEV_DATA(dev);
 	Twi *const twi = dev_cfg->regs;
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int ret;
 
 	/* Configure interrupts */
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index bfcfeb83c1..2c05413141 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -40,24 +40,24 @@ LOG_MODULE_REGISTER(i2c_sam_twihs);
 struct i2c_sam_twihs_dev_cfg {
 	Twihs *regs;
 	void (*irq_config)(void);
-	u32_t bitrate;
+	uint32_t bitrate;
 	const struct soc_gpio_pin *pin_list;
-	u8_t pin_list_size;
-	u8_t periph_id;
-	u8_t irq_id;
+	uint8_t pin_list_size;
+	uint8_t periph_id;
+	uint8_t irq_id;
 };
 
 struct twihs_msg {
 	/* Buffer containing data to read or write */
-	u8_t *buf;
+	uint8_t *buf;
 	/* Length of the buffer */
-	u32_t len;
+	uint32_t len;
 	/* Index of the next byte to be read/written from/to the buffer */
-	u32_t idx;
+	uint32_t idx;
 	/* Value of TWIHS_SR at the end of the message */
-	u32_t twihs_sr;
+	uint32_t twihs_sr;
 	/* Transfer flags as defined in the i2c.h file */
-	u8_t flags;
+	uint8_t flags;
 };
 
 /* Device run time data */
@@ -72,10 +72,10 @@ struct i2c_sam_twihs_dev_data {
 #define DEV_DATA(dev) \
 	((struct i2c_sam_twihs_dev_data *const)(dev)->driver_data)
 
-static int i2c_clk_set(Twihs *const twihs, u32_t speed)
+static int i2c_clk_set(Twihs *const twihs, uint32_t speed)
 {
-	u32_t ck_div = 0U;
-	u32_t cl_div;
+	uint32_t ck_div = 0U;
+	uint32_t cl_div;
 	bool div_completed = false;
 
 	/*  From the datasheet "TWIHS Clock Waveform Generator Register"
@@ -104,11 +104,11 @@ static int i2c_clk_set(Twihs *const twihs, u32_t speed)
 	return 0;
 }
 
-static int i2c_sam_twihs_configure(struct device *dev, u32_t config)
+static int i2c_sam_twihs_configure(struct device *dev, uint32_t config)
 {
 	const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	Twihs *const twihs = dev_cfg->regs;
-	u32_t bitrate;
+	uint32_t bitrate;
 	int ret;
 
 	if (!(config & I2C_MODE_MASTER)) {
@@ -151,7 +151,7 @@ static int i2c_sam_twihs_configure(struct device *dev, u32_t config)
 }
 
 static void write_msg_start(Twihs *const twihs, struct twihs_msg *msg,
-			    u8_t daddr)
+			    uint8_t daddr)
 {
 	/* Set slave address. */
 	twihs->TWIHS_MMR = TWIHS_MMR_DADR(daddr);
@@ -164,9 +164,9 @@ static void write_msg_start(Twihs *const twihs, struct twihs_msg *msg,
 }
 
 static void read_msg_start(Twihs *const twihs, struct twihs_msg *msg,
-			   u8_t daddr)
+			   uint8_t daddr)
 {
-	u32_t twihs_cr_stop;
+	uint32_t twihs_cr_stop;
 
 	/* Set slave address and number of internal address bytes */
 	twihs->TWIHS_MMR = TWIHS_MMR_MREAD | TWIHS_MMR_DADR(daddr);
@@ -181,7 +181,7 @@ static void read_msg_start(Twihs *const twihs, struct twihs_msg *msg,
 }
 
 static int i2c_sam_twihs_transfer(struct device *dev, struct i2c_msg *msgs,
-			      u8_t num_msgs, u16_t addr)
+			      uint8_t num_msgs, uint16_t addr)
 {
 	const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev);
@@ -228,7 +228,7 @@ static void i2c_sam_twihs_isr(void *arg)
 	struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev);
 	Twihs *const twihs = dev_cfg->regs;
 	struct twihs_msg *msg = &dev_data->msg;
-	u32_t isr_status;
+	uint32_t isr_status;
 
 	/* Retrieve interrupt status */
 	isr_status = twihs->TWIHS_SR & twihs->TWIHS_IMR;
@@ -286,7 +286,7 @@ static int i2c_sam_twihs_initialize(struct device *dev)
 	const struct i2c_sam_twihs_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2c_sam_twihs_dev_data *const dev_data = DEV_DATA(dev);
 	Twihs *const twihs = dev_cfg->regs;
-	u32_t bitrate_cfg;
+	uint32_t bitrate_cfg;
 	int ret;
 
 	/* Configure interrupts */
diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c
index 446a0c2552..65f1a221d1 100644
--- a/drivers/i2c/i2c_sbcon.c
+++ b/drivers/i2c/i2c_sbcon.c
@@ -22,10 +22,10 @@
 /* SBCon hardware registers layout */
 struct sbcon {
 	union {
-		volatile u32_t SB_CONTROLS; /* Write to set pins high */
-		volatile u32_t SB_CONTROL;  /* Read for state of pins */
+		volatile uint32_t SB_CONTROLS; /* Write to set pins high */
+		volatile uint32_t SB_CONTROL;  /* Read for state of pins */
 	};
-	volatile u32_t SB_CONTROLC;	/* Write to set pins low */
+	volatile uint32_t SB_CONTROLC;	/* Write to set pins low */
 };
 
 /* Bits values for SCL and SDA lines in struct sbcon registers */
@@ -77,7 +77,7 @@ static const struct i2c_bitbang_io io_fns = {
 	.get_sda = &i2c_sbcon_get_sda,
 };
 
-static int i2c_sbcon_configure(struct device *dev, u32_t dev_config)
+static int i2c_sbcon_configure(struct device *dev, uint32_t dev_config)
 {
 	struct i2c_sbcon_context *context = dev->driver_data;
 
@@ -85,7 +85,7 @@ static int i2c_sbcon_configure(struct device *dev, u32_t dev_config)
 }
 
 static int i2c_sbcon_transfer(struct device *dev, struct i2c_msg *msgs,
-				u8_t num_msgs, u16_t slave_address)
+				uint8_t num_msgs, uint16_t slave_address)
 {
 	struct i2c_sbcon_context *context = dev->driver_data;
 
diff --git a/drivers/i2c/i2c_shell.c b/drivers/i2c/i2c_shell.c
index b3fd0fc244..67c79f406f 100644
--- a/drivers/i2c/i2c_shell.c
+++ b/drivers/i2c/i2c_shell.c
@@ -26,7 +26,7 @@ static int cmd_i2c_scan(const struct shell *shell,
 			size_t argc, char **argv)
 {
 	struct device *dev;
-	u8_t cnt = 0, first = 0x04, last = 0x77;
+	uint8_t cnt = 0, first = 0x04, last = 0x77;
 
 	dev = device_get_binding(argv[1]);
 
@@ -38,16 +38,16 @@ static int cmd_i2c_scan(const struct shell *shell,
 
 	shell_print(shell,
 		    "     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f");
-	for (u8_t i = 0; i <= last; i += 16) {
+	for (uint8_t i = 0; i <= last; i += 16) {
 		shell_fprintf(shell, SHELL_NORMAL, "%02x: ", i);
-		for (u8_t j = 0; j < 16; j++) {
+		for (uint8_t j = 0; j < 16; j++) {
 			if (i + j < first || i + j > last) {
 				shell_fprintf(shell, SHELL_NORMAL, "   ");
 				continue;
 			}
 
 			struct i2c_msg msgs[1];
-			u8_t dst;
+			uint8_t dst;
 
 			/* Send the address to read from */
 			msgs[0].buf = &dst;
@@ -94,7 +94,7 @@ static int cmd_i2c_recover(const struct shell *shell,
 /* i2c write <device> <dev_addr> [<byte1>, ...] */
 static int cmd_i2c_write(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t buf[MAX_I2C_BYTES];
+	uint8_t buf[MAX_I2C_BYTES];
 	struct device *dev;
 	int num_bytes;
 	int reg_addr;
@@ -161,7 +161,7 @@ static int cmd_i2c_read_byte(const struct shell *shell,
 	struct device *dev;
 	int reg_addr;
 	int dev_addr;
-	u8_t out;
+	uint8_t out;
 
 	dev = device_get_binding(argv[1]);
 	if (!dev) {
@@ -186,7 +186,7 @@ static int cmd_i2c_read_byte(const struct shell *shell,
 /* i2c read <device> <dev_addr> [<numbytes>] */
 static int cmd_i2c_read(const struct shell *shell, size_t argc, char **argv)
 {
-	u8_t buf[MAX_I2C_BYTES];
+	uint8_t buf[MAX_I2C_BYTES];
 	struct device *dev;
 	int num_bytes;
 	int reg_addr;
diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c
index b7c9c4d01b..2d394232d2 100644
--- a/drivers/i2c/i2c_sifive.c
+++ b/drivers/i2c/i2c_sifive.c
@@ -60,9 +60,9 @@ LOG_MODULE_REGISTER(i2c_sifive);
 /* Structure declarations */
 
 struct i2c_sifive_cfg {
-	u32_t base;
-	u32_t f_sys;
-	u32_t f_bus;
+	uint32_t base;
+	uint32_t f_sys;
+	uint32_t f_bus;
 };
 
 /* Helper functions */
@@ -75,11 +75,11 @@ static inline bool i2c_sifive_busy(struct device *dev)
 }
 
 static int i2c_sifive_send_addr(struct device *dev,
-				u16_t addr,
-				u16_t rw_flag)
+				uint16_t addr,
+				uint16_t rw_flag)
 {
 	const struct i2c_sifive_cfg *config = dev->config_info;
-	u8_t command = 0U;
+	uint8_t command = 0U;
 
 	/* Wait for a previous transfer to complete */
 	while (i2c_sifive_busy(dev)) {
@@ -107,11 +107,11 @@ static int i2c_sifive_send_addr(struct device *dev,
 
 static int i2c_sifive_write_msg(struct device *dev,
 				struct i2c_msg *msg,
-				u16_t addr)
+				uint16_t addr)
 {
 	const struct i2c_sifive_cfg *config = dev->config_info;
 	int rc = 0;
-	u8_t command = 0U;
+	uint8_t command = 0U;
 
 	rc = i2c_sifive_send_addr(dev, addr, SF_TX_WRITE);
 	if (rc != 0) {
@@ -119,7 +119,7 @@ static int i2c_sifive_write_msg(struct device *dev,
 		return rc;
 	}
 
-	for (u32_t i = 0; i < msg->len; i++) {
+	for (uint32_t i = 0; i < msg->len; i++) {
 		/* Wait for a previous transfer */
 		while (i2c_sifive_busy(dev)) {
 		}
@@ -156,10 +156,10 @@ static int i2c_sifive_write_msg(struct device *dev,
 
 static int i2c_sifive_read_msg(struct device *dev,
 			       struct i2c_msg *msg,
-			       u16_t addr)
+			       uint16_t addr)
 {
 	const struct i2c_sifive_cfg *config = dev->config_info;
-	u8_t command = 0U;
+	uint8_t command = 0U;
 
 	i2c_sifive_send_addr(dev, addr, SF_TX_READ);
 
@@ -197,11 +197,11 @@ static int i2c_sifive_read_msg(struct device *dev,
 
 /* API Functions */
 
-static int i2c_sifive_configure(struct device *dev, u32_t dev_config)
+static int i2c_sifive_configure(struct device *dev, uint32_t dev_config)
 {
 	const struct i2c_sifive_cfg *config = NULL;
-	u32_t i2c_speed = 0U;
-	u16_t prescale = 0U;
+	uint32_t i2c_speed = 0U;
+	uint16_t prescale = 0U;
 
 	/* Check for NULL pointers */
 	if (dev == NULL) {
@@ -237,8 +237,8 @@ static int i2c_sifive_configure(struct device *dev, u32_t dev_config)
 	prescale = (config->f_sys / (i2c_speed * 5U)) - 1;
 
 	/* Configure peripheral with calculated prescale */
-	sys_write8((u8_t) (0xFF & prescale), I2C_REG(config, REG_PRESCALE_LOW));
-	sys_write8((u8_t) (0xFF & (prescale >> 8)),
+	sys_write8((uint8_t) (0xFF & prescale), I2C_REG(config, REG_PRESCALE_LOW));
+	sys_write8((uint8_t) (0xFF & (prescale >> 8)),
 		   I2C_REG(config, REG_PRESCALE_HIGH));
 
 	/* Support I2C Master mode only */
@@ -264,8 +264,8 @@ static int i2c_sifive_configure(struct device *dev, u32_t dev_config)
 
 static int i2c_sifive_transfer(struct device *dev,
 			       struct i2c_msg *msgs,
-			       u8_t num_msgs,
-			       u16_t addr)
+			       uint8_t num_msgs,
+			       uint16_t addr)
 {
 	int rc = 0;
 
@@ -301,7 +301,7 @@ static int i2c_sifive_transfer(struct device *dev,
 static int i2c_sifive_init(struct device *dev)
 {
 	const struct i2c_sifive_cfg *config = dev->config_info;
-	u32_t dev_config = 0U;
+	uint32_t dev_config = 0U;
 	int rc = 0;
 
 	dev_config = (I2C_MODE_MASTER | i2c_map_dt_bitrate(config->f_bus));
diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c
index 3727888b70..9ce1054cd1 100644
--- a/drivers/i2c/slave/eeprom_slave.c
+++ b/drivers/i2c/slave/eeprom_slave.c
@@ -20,17 +20,17 @@ LOG_MODULE_REGISTER(i2c_slave);
 struct i2c_eeprom_slave_data {
 	struct device *i2c_controller;
 	struct i2c_slave_config config;
-	u32_t buffer_size;
-	u8_t *buffer;
-	u32_t buffer_idx;
+	uint32_t buffer_size;
+	uint8_t *buffer;
+	uint32_t buffer_idx;
 	bool first_write;
 };
 
 struct i2c_eeprom_slave_config {
 	char *controller_dev_name;
-	u8_t address;
-	u32_t buffer_size;
-	u8_t *buffer;
+	uint8_t address;
+	uint32_t buffer_size;
+	uint8_t *buffer;
 };
 
 /* convenience defines */
@@ -40,7 +40,7 @@ struct i2c_eeprom_slave_config {
 #define DEV_DATA(dev)							\
 	((struct i2c_eeprom_slave_data * const)(dev)->driver_data)
 
-int eeprom_slave_program(struct device *dev, u8_t *eeprom_data,
+int eeprom_slave_program(struct device *dev, uint8_t *eeprom_data,
 			 unsigned int length)
 {
 	struct i2c_eeprom_slave_data *data = dev->driver_data;
@@ -54,7 +54,7 @@ int eeprom_slave_program(struct device *dev, u8_t *eeprom_data,
 	return 0;
 }
 
-int eeprom_slave_read(struct device *dev, u8_t *eeprom_data,
+int eeprom_slave_read(struct device *dev, uint8_t *eeprom_data,
 		      unsigned int offset)
 {
 	struct i2c_eeprom_slave_data *data = dev->driver_data;
@@ -82,7 +82,7 @@ static int eeprom_slave_write_requested(struct i2c_slave_config *config)
 }
 
 static int eeprom_slave_read_requested(struct i2c_slave_config *config,
-				       u8_t *val)
+				       uint8_t *val)
 {
 	struct i2c_eeprom_slave_data *data = CONTAINER_OF(config,
 						struct i2c_eeprom_slave_data,
@@ -98,7 +98,7 @@ static int eeprom_slave_read_requested(struct i2c_slave_config *config,
 }
 
 static int eeprom_slave_write_received(struct i2c_slave_config *config,
-				       u8_t val)
+				       uint8_t val)
 {
 	struct i2c_eeprom_slave_data *data = CONTAINER_OF(config,
 						struct i2c_eeprom_slave_data,
@@ -124,7 +124,7 @@ static int eeprom_slave_write_received(struct i2c_slave_config *config,
 }
 
 static int eeprom_slave_read_processed(struct i2c_slave_config *config,
-				       u8_t *val)
+				       uint8_t *val)
 {
 	struct i2c_eeprom_slave_data *data = CONTAINER_OF(config,
 						struct i2c_eeprom_slave_data,
@@ -209,7 +209,7 @@ static int i2c_eeprom_slave_init(struct device *dev)
 	static struct i2c_eeprom_slave_data				\
 		i2c_eeprom_slave_##inst##_dev_data;			\
 									\
-	static u8_t							\
+	static uint8_t							\
 	i2c_eeprom_slave_##inst##_buffer[(DT_INST_PROP(inst, size))];	\
 									\
 	static const struct i2c_eeprom_slave_config			\
diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c
index 3fbdd8d88e..46af6fa9d1 100644
--- a/drivers/i2s/i2s_cavs.c
+++ b/drivers/i2s/i2s_cavs.c
@@ -131,8 +131,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
  *      out_queue and presented to application.
  */
 struct stream {
-	s32_t state;
-	u32_t dma_channel;
+	int32_t state;
+	uint32_t dma_channel;
 	struct dma_config dma_cfg;
 	struct dma_block_config dma_block;
 	struct k_msgq in_queue;
@@ -144,7 +144,7 @@ struct stream {
 struct i2s_cavs_config {
 	struct i2s_cavs_ssp *regs;
 	struct i2s_cavs_mn_div *mn_regs;
-	u32_t irq_id;
+	uint32_t irq_id;
 	void (*irq_connect)(void);
 };
 
@@ -166,7 +166,7 @@ I2S_DEVICE_OBJECT_DECLARE(1);
 I2S_DEVICE_OBJECT_DECLARE(2);
 I2S_DEVICE_OBJECT_DECLARE(3);
 
-static void i2s_dma_tx_callback(void *, u32_t, int);
+static void i2s_dma_tx_callback(void *, uint32_t, int);
 static void i2s_tx_stream_disable(struct i2s_cavs_dev_data *,
 		volatile struct i2s_cavs_ssp *const, struct device *);
 static void i2s_rx_stream_disable(struct i2s_cavs_dev_data *,
@@ -186,7 +186,7 @@ static inline void i2s_purge_stream_buffers(struct stream *strm,
 }
 
 /* This function is executed in the interrupt context */
-static void i2s_dma_tx_callback(void *arg, u32_t channel,
+static void i2s_dma_tx_callback(void *arg, uint32_t channel,
 		int status)
 {
 	struct device *dev = (struct device *)arg;
@@ -215,7 +215,7 @@ static void i2s_dma_tx_callback(void *arg, u32_t channel,
 		if (ret == 0) {
 			/* reload the DMA */
 			dma_reload(dev_data->dev_dma, strm->dma_channel,
-					(u32_t)buffer, (u32_t)&ssp->ssd,
+					(uint32_t)buffer, (uint32_t)&ssp->ssd,
 					dev_data->cfg.block_size);
 			dma_start(dev_data->dev_dma, strm->dma_channel);
 			ssp->ssc1 |= SSCR1_TSRE;
@@ -242,7 +242,7 @@ static void i2s_dma_tx_callback(void *arg, u32_t channel,
 	}
 }
 
-static void i2s_dma_rx_callback(void *arg, u32_t channel, int status)
+static void i2s_dma_rx_callback(void *arg, uint32_t channel, int status)
 {
 	struct device *dev = (struct device *)arg;
 	const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev);
@@ -287,7 +287,7 @@ static void i2s_dma_rx_callback(void *arg, u32_t channel, int status)
 
 			/* reload the DMA */
 			dma_reload(dev_data->dev_dma, strm->dma_channel,
-					(u32_t)&ssp->ssd, (u32_t)buffer,
+					(uint32_t)&ssp->ssd, (uint32_t)buffer,
 					dev_data->cfg.block_size);
 			dma_start(dev_data->dev_dma, strm->dma_channel);
 			ssp->ssc1 |= SSCR1_RSRE;
@@ -308,26 +308,26 @@ static int i2s_cavs_configure(struct device *dev, enum i2s_dir dir,
 	volatile struct i2s_cavs_ssp *const ssp = dev_cfg->regs;
 	volatile struct i2s_cavs_mn_div *const mn_div = dev_cfg->mn_regs;
 	struct dma_block_config *dma_block;
-	u8_t num_words = i2s_cfg->channels;
-	u8_t word_size_bits = i2s_cfg->word_size;
-	u8_t word_size_bytes;
-	u32_t bit_clk_freq, mclk;
+	uint8_t num_words = i2s_cfg->channels;
+	uint8_t word_size_bits = i2s_cfg->word_size;
+	uint8_t word_size_bytes;
+	uint32_t bit_clk_freq, mclk;
 	int ret;
 
-	u32_t ssc0;
-	u32_t ssc1;
-	u32_t ssc2;
-	u32_t ssc3;
-	u32_t sspsp;
-	u32_t sspsp2;
-	u32_t sstsa;
-	u32_t ssrsa;
-	u32_t ssto;
-	u32_t ssioc = 0U;
-	u32_t mdiv;
-	u32_t i2s_m = 0U;
-	u32_t i2s_n = 0U;
-	u32_t frame_len = 0U;
+	uint32_t ssc0;
+	uint32_t ssc1;
+	uint32_t ssc2;
+	uint32_t ssc3;
+	uint32_t sspsp;
+	uint32_t sspsp2;
+	uint32_t sstsa;
+	uint32_t ssrsa;
+	uint32_t ssto;
+	uint32_t ssioc = 0U;
+	uint32_t mdiv;
+	uint32_t i2s_m = 0U;
+	uint32_t i2s_n = 0U;
+	uint32_t frame_len = 0U;
 	bool inverted_frame = false;
 
 	if ((dev_data->tx.state != I2S_STATE_NOT_READY) &&
@@ -529,8 +529,8 @@ static int i2s_cavs_configure(struct device *dev, enum i2s_dir dir,
 
 	dma_block = dev_data->tx.dma_cfg.head_block;
 	dma_block->block_size = i2s_cfg->block_size;
-	dma_block->source_address = (u32_t)NULL;
-	dma_block->dest_address = (u32_t)&ssp->ssd;
+	dma_block->source_address = (uint32_t)NULL;
+	dma_block->dest_address = (uint32_t)&ssp->ssd;
 
 	ret = dma_config(dev_data->dev_dma, dev_data->tx.dma_channel,
 			&dev_data->tx.dma_cfg);
@@ -541,8 +541,8 @@ static int i2s_cavs_configure(struct device *dev, enum i2s_dir dir,
 
 	dma_block = dev_data->rx.dma_cfg.head_block;
 	dma_block->block_size = i2s_cfg->block_size;
-	dma_block->source_address = (u32_t)&ssp->ssd;
-	dma_block->dest_address = (u32_t)NULL;
+	dma_block->source_address = (uint32_t)&ssp->ssd;
+	dma_block->dest_address = (uint32_t)NULL;
 
 	ret = dma_config(dev_data->dev_dma, dev_data->rx.dma_channel,
 			&dev_data->rx.dma_cfg);
@@ -579,8 +579,8 @@ static int i2s_tx_stream_start(struct i2s_cavs_dev_data *dev_data,
 		return ret;
 	}
 
-	ret = dma_reload(dev_dma, strm->dma_channel, (u32_t)buffer,
-			(u32_t)&ssp->ssd, dev_data->cfg.block_size);
+	ret = dma_reload(dev_dma, strm->dma_channel, (uint32_t)buffer,
+			(uint32_t)&ssp->ssd, dev_data->cfg.block_size);
 	if (ret != 0) {
 		LOG_ERR("dma_reload failed (%d)", ret);
 		return ret;
@@ -626,8 +626,8 @@ static int i2s_rx_stream_start(struct i2s_cavs_dev_data *dev_data,
 
 	SOC_DCACHE_INVALIDATE(buffer, dev_data->cfg.block_size);
 
-	ret = dma_reload(dev_dma, strm->dma_channel, (u32_t)&ssp->ssd,
-			(u32_t)buffer, dev_data->cfg.block_size);
+	ret = dma_reload(dev_dma, strm->dma_channel, (uint32_t)&ssp->ssd,
+			(uint32_t)buffer, dev_data->cfg.block_size);
 	if (ret != 0) {
 		LOG_ERR("dma_reload failed (%d)", ret);
 		return ret;
@@ -685,7 +685,7 @@ static void i2s_rx_stream_disable(struct i2s_cavs_dev_data *dev_data,
 			      struct device *dev_dma)
 {
 	struct stream *strm = &dev_data->rx;
-	u32_t data;
+	uint32_t data;
 
 	/* Disable DMA service request handshake logic. Handshake is
 	 * not required now since DMA is not in operation.
@@ -821,7 +821,7 @@ static void i2s_cavs_isr(void *arg)
 	const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev);
 	volatile struct i2s_cavs_ssp *const ssp = dev_cfg->regs;
 	struct i2s_cavs_dev_data *const dev_data = DEV_DATA(dev);
-	u32_t status;
+	uint32_t status;
 
 	/* clear interrupts */
 	status = ssp->sss;
diff --git a/drivers/i2s/i2s_cavs.h b/drivers/i2s/i2s_cavs.h
index e56cd0b27d..2a234955c3 100644
--- a/drivers/i2s/i2s_cavs.h
+++ b/drivers/i2s/i2s_cavs.h
@@ -20,22 +20,22 @@ extern "C" {
 #endif
 
 struct i2s_cavs_ssp {
-	u32_t ssc0;		/* 0x00 - Control0 */
-	u32_t ssc1;		/* 0x04 - Control1 */
-	u32_t sss;		/* 0x08 - Status */
-	u32_t ssit;		/* 0x0C - Interrupt Test */
-	u32_t ssd;		/* 0x10 - Data */
-	u32_t reserved0[5];
-	u32_t ssto;		/* 0x28 - Time Out */
-	u32_t sspsp;		/* 0x2C - Programmable Serial Protocol */
-	u32_t sstsa;		/* 0x30 - TX Time Slot Active */
-	u32_t ssrsa;		/* 0x34 - RX Time Slot Active */
-	u32_t sstss;		/* 0x38 - Time Slot Status */
-	u32_t reserved1;
-	u32_t ssc2;		/* 0x40 - Command / Status 2 */
-	u32_t sspsp2;		/* 0x44 - Programmable Serial Protocol 2 */
-	u32_t ssc3;		/* 0x48 - Command / Status 3 */
-	u32_t ssioc;		/* 0x4C - IO Control */
+	uint32_t ssc0;		/* 0x00 - Control0 */
+	uint32_t ssc1;		/* 0x04 - Control1 */
+	uint32_t sss;		/* 0x08 - Status */
+	uint32_t ssit;		/* 0x0C - Interrupt Test */
+	uint32_t ssd;		/* 0x10 - Data */
+	uint32_t reserved0[5];
+	uint32_t ssto;		/* 0x28 - Time Out */
+	uint32_t sspsp;		/* 0x2C - Programmable Serial Protocol */
+	uint32_t sstsa;		/* 0x30 - TX Time Slot Active */
+	uint32_t ssrsa;		/* 0x34 - RX Time Slot Active */
+	uint32_t sstss;		/* 0x38 - Time Slot Status */
+	uint32_t reserved1;
+	uint32_t ssc2;		/* 0x40 - Command / Status 2 */
+	uint32_t sspsp2;		/* 0x44 - Programmable Serial Protocol 2 */
+	uint32_t ssc3;		/* 0x48 - Command / Status 3 */
+	uint32_t ssioc;		/* 0x4C - IO Control */
 };
 
 /* SSCR0 bits */
@@ -132,8 +132,8 @@ struct i2s_cavs_ssp {
 #define SSIOC_SCOE		(1 << 5)
 
 struct i2s_cavs_mn_div {
-	u32_t mval;		/* 0x00 - M value */
-	u32_t nval;		/* 0x04 - N value */
+	uint32_t mval;		/* 0x00 - M value */
+	uint32_t nval;		/* 0x04 - N value */
 };
 
 /* MVAL & NVAL bits */
diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c
index 83ba81c266..65262ee108 100644
--- a/drivers/i2s/i2s_ll_stm32.c
+++ b/drivers/i2s/i2s_ll_stm32.c
@@ -24,9 +24,9 @@ LOG_MODULE_REGISTER(i2s_ll_stm32);
  */
 #if 0
 #define DCACHE_INVALIDATE(addr, size) \
-	SCB_InvalidateDCache_by_Addr((u32_t *)addr, size)
+	SCB_InvalidateDCache_by_Addr((uint32_t *)addr, size)
 #define DCACHE_CLEAN(addr, size) \
-	SCB_CleanDCache_by_Addr((u32_t *)addr, size)
+	SCB_CleanDCache_by_Addr((uint32_t *)addr, size)
 #else
 #define DCACHE_INVALIDATE(addr, size) {; }
 #define DCACHE_CLEAN(addr, size) {; }
@@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(i2s_ll_stm32);
 
 #define MODULO_INC(val, max) { val = (++val < max) ? val : 0; }
 
-static unsigned int div_round_closest(u32_t dividend, u32_t divisor)
+static unsigned int div_round_closest(uint32_t dividend, uint32_t divisor)
 {
 	return (dividend + (divisor / 2U)) / divisor;
 }
@@ -68,7 +68,7 @@ static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size)
  */
 static int queue_put(struct ring_buf *rb, void *mem_block, size_t size)
 {
-	u16_t head_next;
+	uint16_t head_next;
 	unsigned int key;
 
 	key = irq_lock();
@@ -111,18 +111,18 @@ static int i2s_stm32_enable_clock(struct device *dev)
 
 #ifdef CONFIG_I2S_STM32_USE_PLLI2S_ENABLE
 #define PLLI2S_MAX_MS_TIME	1 /* PLLI2S lock time is 300us max */
-static u16_t plli2s_ms_count;
+static uint16_t plli2s_ms_count;
 
 #define z_pllr(v) LL_RCC_PLLI2SR_DIV_ ## v
 #define pllr(v) z_pllr(v)
 #endif
 
-static int i2s_stm32_set_clock(struct device *dev, u32_t bit_clk_freq)
+static int i2s_stm32_set_clock(struct device *dev, uint32_t bit_clk_freq)
 {
 	const struct i2s_stm32_cfg *cfg = DEV_CFG(dev);
-	u32_t pll_src = LL_RCC_PLL_GetMainSource();
+	uint32_t pll_src = LL_RCC_PLL_GetMainSource();
 	int freq_in;
-	u8_t i2s_div, i2s_odd;
+	uint8_t i2s_div, i2s_odd;
 
 	freq_in = (pll_src == LL_RCC_PLLSOURCE_HSI) ?
 		   HSI_VALUE : CONFIG_CLOCK_STM32_HSE_CLOCK;
@@ -183,7 +183,7 @@ static int i2s_stm32_configure(struct device *dev, enum i2s_dir dir,
 	const struct i2s_stm32_cfg *const cfg = DEV_CFG(dev);
 	struct i2s_stm32_data *const dev_data = DEV_DATA(dev);
 	struct stream *stream;
-	u32_t bit_clk_freq;
+	uint32_t bit_clk_freq;
 	int ret;
 
 	if (dir == I2S_DIR_RX) {
@@ -433,13 +433,13 @@ static const struct i2s_driver_api i2s_stm32_driver_api = {
 static struct device *active_dma_rx_channel[STM32_DMA_NUM_CHANNELS];
 static struct device *active_dma_tx_channel[STM32_DMA_NUM_CHANNELS];
 
-static int reload_dma(struct device *dev_dma, u32_t channel,
+static int reload_dma(struct device *dev_dma, uint32_t channel,
 		      struct dma_config *dcfg, void *src, void *dst,
-		      u32_t blk_size)
+		      uint32_t blk_size)
 {
 	int ret;
 
-	ret = dma_reload(dev_dma, channel, (u32_t)src, (u32_t)dst, blk_size);
+	ret = dma_reload(dev_dma, channel, (uint32_t)src, (uint32_t)dst, blk_size);
 	if (ret < 0) {
 		return ret;
 	}
@@ -449,19 +449,19 @@ static int reload_dma(struct device *dev_dma, u32_t channel,
 	return ret;
 }
 
-static int start_dma(struct device *dev_dma, u32_t channel,
+static int start_dma(struct device *dev_dma, uint32_t channel,
 		     struct dma_config *dcfg, void *src,
 		     bool src_addr_increment, void *dst,
-		     bool dst_addr_increment, u8_t fifo_threshold,
-		     u32_t blk_size)
+		     bool dst_addr_increment, uint8_t fifo_threshold,
+		     uint32_t blk_size)
 {
 	struct dma_block_config blk_cfg;
 	int ret;
 
 	memset(&blk_cfg, 0, sizeof(blk_cfg));
 	blk_cfg.block_size = blk_size;
-	blk_cfg.source_address = (u32_t)src;
-	blk_cfg.dest_address = (u32_t)dst;
+	blk_cfg.source_address = (uint32_t)src;
+	blk_cfg.dest_address = (uint32_t)dst;
 	if (src_addr_increment) {
 		blk_cfg.source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
 	} else {
@@ -486,13 +486,13 @@ static int start_dma(struct device *dev_dma, u32_t channel,
 	return ret;
 }
 
-static struct device *get_dev_from_rx_dma_channel(u32_t dma_channel);
-static struct device *get_dev_from_tx_dma_channel(u32_t dma_channel);
+static struct device *get_dev_from_rx_dma_channel(uint32_t dma_channel);
+static struct device *get_dev_from_tx_dma_channel(uint32_t dma_channel);
 static void rx_stream_disable(struct stream *stream, struct device *dev);
 static void tx_stream_disable(struct stream *stream, struct device *dev);
 
 /* This function is executed in the interrupt context */
-static void dma_rx_callback(void *arg, u32_t channel, int status)
+static void dma_rx_callback(void *arg, uint32_t channel, int status)
 {
 	struct device *dev = get_dev_from_rx_dma_channel(channel);
 	const struct i2s_stm32_cfg *cfg = DEV_CFG(dev);
@@ -558,7 +558,7 @@ rx_disable:
 	rx_stream_disable(stream, dev);
 }
 
-static void dma_tx_callback(void *arg, u32_t channel, int status)
+static void dma_tx_callback(void *arg, uint32_t channel, int status)
 {
 	struct device *dev = get_dev_from_tx_dma_channel(channel);
 	const struct i2s_stm32_cfg *cfg = DEV_CFG(dev);
@@ -623,8 +623,8 @@ tx_disable:
 	tx_stream_disable(stream, dev);
 }
 
-static u32_t i2s_stm32_irq_count;
-static u32_t i2s_stm32_irq_ovr_count;
+static uint32_t i2s_stm32_irq_count;
+static uint32_t i2s_stm32_irq_ovr_count;
 
 static void i2s_stm32_isr(void *arg)
 {
@@ -839,12 +839,12 @@ static void tx_queue_drop(struct stream *stream)
 	}
 }
 
-static struct device *get_dev_from_rx_dma_channel(u32_t dma_channel)
+static struct device *get_dev_from_rx_dma_channel(uint32_t dma_channel)
 {
 	return active_dma_rx_channel[dma_channel];
 }
 
-static struct device *get_dev_from_tx_dma_channel(u32_t dma_channel)
+static struct device *get_dev_from_tx_dma_channel(uint32_t dma_channel)
 {
 	return active_dma_tx_channel[dma_channel];
 }
diff --git a/drivers/i2s/i2s_ll_stm32.h b/drivers/i2s/i2s_ll_stm32.h
index 40b18ac171..4b1141df1c 100644
--- a/drivers/i2s/i2s_ll_stm32.h
+++ b/drivers/i2s/i2s_ll_stm32.h
@@ -62,30 +62,30 @@ struct queue_item {
 /* Minimal ring buffer implementation */
 struct ring_buf {
 	struct queue_item *buf;
-	u16_t len;
-	u16_t head;
-	u16_t tail;
+	uint16_t len;
+	uint16_t head;
+	uint16_t tail;
 };
 
 /* Device constant configuration parameters */
 struct i2s_stm32_cfg {
 	SPI_TypeDef *i2s;
 	struct stm32_pclken pclken;
-	u32_t i2s_clk_sel;
+	uint32_t i2s_clk_sel;
 	void (*irq_config)(struct device *dev);
 };
 
 struct stream {
-	s32_t state;
+	int32_t state;
 	struct k_sem sem;
 
 	const char *dma_name;
-	u32_t dma_channel;
+	uint32_t dma_channel;
 	struct dma_config dma_cfg;
-	u8_t priority;
+	uint8_t priority;
 	bool src_addr_increment;
 	bool dst_addr_increment;
-	u8_t fifo_threshold;
+	uint8_t fifo_threshold;
 
 	struct i2s_config cfg;
 	struct ring_buf mem_block_queue;
diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c
index 8cf1876c2e..8677245688 100644
--- a/drivers/i2s/i2s_sam_ssc.c
+++ b/drivers/i2s/i2s_sam_ssc.c
@@ -36,9 +36,9 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #if __DCACHE_PRESENT == 1
 #define DCACHE_INVALIDATE(addr, size) \
-	SCB_InvalidateDCache_by_Addr((u32_t *)addr, size)
+	SCB_InvalidateDCache_by_Addr((uint32_t *)addr, size)
 #define DCACHE_CLEAN(addr, size) \
-	SCB_CleanDCache_by_Addr((u32_t *)addr, size)
+	SCB_CleanDCache_by_Addr((uint32_t *)addr, size)
 #else
 #define DCACHE_INVALIDATE(addr, size) {; }
 #define DCACHE_CLEAN(addr, size) {; }
@@ -57,9 +57,9 @@ struct queue_item {
 /* Minimal ring buffer implementation */
 struct ring_buf {
 	struct queue_item *buf;
-	u16_t len;
-	u16_t head;
-	u16_t tail;
+	uint16_t len;
+	uint16_t head;
+	uint16_t tail;
 };
 
 /* Device constant configuration parameters */
@@ -67,15 +67,15 @@ struct i2s_sam_dev_cfg {
 	Ssc *regs;
 	void (*irq_config)(void);
 	const struct soc_gpio_pin *pin_list;
-	u8_t pin_list_size;
-	u8_t periph_id;
-	u8_t irq_id;
+	uint8_t pin_list_size;
+	uint8_t periph_id;
+	uint8_t irq_id;
 };
 
 struct stream {
-	s32_t state;
+	int32_t state;
 	struct k_sem sem;
-	u32_t dma_channel;
+	uint32_t dma_channel;
 	struct dma_config dma_cfg;
 	struct i2s_config cfg;
 	struct ring_buf mem_block_queue;
@@ -103,9 +103,9 @@ struct i2s_sam_dev_data {
 
 #define MODULO_INC(val, max) { val = (++val < max) ? val : 0; }
 
-static struct device *get_dev_from_dma_channel(u32_t dma_channel);
-static void dma_rx_callback(void *, u32_t, int);
-static void dma_tx_callback(void *, u32_t, int);
+static struct device *get_dev_from_dma_channel(uint32_t dma_channel);
+static void dma_rx_callback(void *, uint32_t, int);
+static void dma_tx_callback(void *, uint32_t, int);
 static void rx_stream_disable(struct stream *, Ssc *const, struct device *);
 static void tx_stream_disable(struct stream *, Ssc *const, struct device *);
 
@@ -138,7 +138,7 @@ static int queue_get(struct ring_buf *rb, void **mem_block, size_t *size)
  */
 static int queue_put(struct ring_buf *rb, void *mem_block, size_t size)
 {
-	u16_t head_next;
+	uint16_t head_next;
 	unsigned int key;
 
 	key = irq_lock();
@@ -161,17 +161,17 @@ static int queue_put(struct ring_buf *rb, void *mem_block, size_t size)
 	return 0;
 }
 
-static int start_dma(struct device *dev_dma, u32_t channel,
+static int start_dma(struct device *dev_dma, uint32_t channel,
 		     struct dma_config *cfg, void *src, void *dst,
-		     u32_t blk_size)
+		     uint32_t blk_size)
 {
 	struct dma_block_config blk_cfg;
 	int ret;
 
 	(void)memset(&blk_cfg, 0, sizeof(blk_cfg));
 	blk_cfg.block_size = blk_size;
-	blk_cfg.source_address = (u32_t)src;
-	blk_cfg.dest_address = (u32_t)dst;
+	blk_cfg.source_address = (uint32_t)src;
+	blk_cfg.dest_address = (uint32_t)dst;
 
 	cfg->head_block = &blk_cfg;
 
@@ -186,7 +186,7 @@ static int start_dma(struct device *dev_dma, u32_t channel,
 }
 
 /* This function is executed in the interrupt context */
-static void dma_rx_callback(void *callback_arg, u32_t channel, int status)
+static void dma_rx_callback(void *callback_arg, uint32_t channel, int status)
 {
 	struct device *dev = get_dev_from_dma_channel(channel);
 	const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev);
@@ -245,7 +245,7 @@ rx_disable:
 }
 
 /* This function is executed in the interrupt context */
-static void dma_tx_callback(void *callback_arg, u32_t channel, int status)
+static void dma_tx_callback(void *callback_arg, uint32_t channel, int status)
 {
 	struct device *dev = get_dev_from_dma_channel(channel);
 	const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev);
@@ -310,11 +310,11 @@ static int set_rx_data_format(const struct i2s_sam_dev_cfg *const dev_cfg,
 	Ssc *const ssc = dev_cfg->regs;
 	const bool pin_rk_en = IS_ENABLED(CONFIG_I2S_SAM_SSC_0_PIN_RK_EN);
 	const bool pin_rf_en = IS_ENABLED(CONFIG_I2S_SAM_SSC_0_PIN_RF_EN);
-	u8_t word_size_bits = i2s_cfg->word_size;
-	u8_t num_words = i2s_cfg->channels;
-	u8_t fslen = 0U;
-	u32_t ssc_rcmr = 0U;
-	u32_t ssc_rfmr = 0U;
+	uint8_t word_size_bits = i2s_cfg->word_size;
+	uint8_t num_words = i2s_cfg->channels;
+	uint8_t fslen = 0U;
+	uint32_t ssc_rcmr = 0U;
+	uint32_t ssc_rfmr = 0U;
 	bool frame_clk_master = !(i2s_cfg->options & I2S_OPT_FRAME_CLK_SLAVE);
 
 	switch (i2s_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
@@ -401,11 +401,11 @@ static int set_tx_data_format(const struct i2s_sam_dev_cfg *const dev_cfg,
 			      struct i2s_config *i2s_cfg)
 {
 	Ssc *const ssc = dev_cfg->regs;
-	u8_t word_size_bits = i2s_cfg->word_size;
-	u8_t num_words = i2s_cfg->channels;
-	u8_t fslen = 0U;
-	u32_t ssc_tcmr = 0U;
-	u32_t ssc_tfmr = 0U;
+	uint8_t word_size_bits = i2s_cfg->word_size;
+	uint8_t num_words = i2s_cfg->channels;
+	uint8_t fslen = 0U;
+	uint32_t ssc_tcmr = 0U;
+	uint32_t ssc_tfmr = 0U;
 
 	switch (i2s_cfg->format & I2S_FMT_DATA_FORMAT_MASK) {
 
@@ -483,19 +483,19 @@ static int set_tx_data_format(const struct i2s_sam_dev_cfg *const dev_cfg,
 }
 
 /* Calculate number of bytes required to store a word of bit_size length */
-static u8_t get_word_size_bytes(u8_t bit_size)
+static uint8_t get_word_size_bytes(uint8_t bit_size)
 {
-	u8_t byte_size_min = (bit_size + 7) / 8U;
-	u8_t byte_size;
+	uint8_t byte_size_min = (bit_size + 7) / 8U;
+	uint8_t byte_size;
 
 	byte_size = (byte_size_min == 3U) ? 4 : byte_size_min;
 
 	return byte_size;
 }
 
-static int bit_clock_set(Ssc *const ssc, u32_t bit_clk_freq)
+static int bit_clock_set(Ssc *const ssc, uint32_t bit_clk_freq)
 {
-	u32_t clk_div = SOC_ATMEL_SAM_MCK_FREQ_HZ / bit_clk_freq / 2U;
+	uint32_t clk_div = SOC_ATMEL_SAM_MCK_FREQ_HZ / bit_clk_freq / 2U;
 
 	if (clk_div == 0U || clk_div >= (1 << 12)) {
 		LOG_ERR("Invalid bit clock frequency");
@@ -534,10 +534,10 @@ static int i2s_sam_configure(struct device *dev, enum i2s_dir dir,
 	const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev);
 	Ssc *const ssc = dev_cfg->regs;
-	u8_t num_words = i2s_cfg->channels;
-	u8_t word_size_bits = i2s_cfg->word_size;
-	u8_t word_size_bytes;
-	u32_t bit_clk_freq;
+	uint8_t num_words = i2s_cfg->channels;
+	uint8_t word_size_bits = i2s_cfg->word_size;
+	uint8_t word_size_bytes;
+	uint32_t bit_clk_freq;
 	struct stream *stream;
 	int ret;
 
@@ -887,7 +887,7 @@ static void i2s_sam_isr(void *arg)
 	const struct i2s_sam_dev_cfg *const dev_cfg = DEV_CFG(dev);
 	struct i2s_sam_dev_data *const dev_data = DEV_DATA(dev);
 	Ssc *const ssc = dev_cfg->regs;
-	u32_t isr_status;
+	uint32_t isr_status;
 
 	/* Retrieve interrupt status */
 	isr_status = ssc->SSC_SR & ssc->SSC_IMR;
@@ -957,7 +957,7 @@ static const struct i2s_driver_api i2s_sam_driver_api = {
 
 static struct device DEVICE_NAME_GET(i2s0_sam);
 
-static struct device *get_dev_from_dma_channel(u32_t dma_channel)
+static struct device *get_dev_from_dma_channel(uint32_t dma_channel)
 {
 	return &DEVICE_NAME_GET(i2s0_sam);
 }
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
index 7c88abfdba..bc4bd8c501 100644
--- a/drivers/ieee802154/ieee802154_cc1200.c
+++ b/drivers/ieee802154/ieee802154_cc1200.c
@@ -53,7 +53,7 @@ static struct spi_cs_control cs_ctrl;
 /***********************
  * Debugging functions *
  **********************/
-static void cc1200_print_status(u8_t status)
+static void cc1200_print_status(uint8_t status)
 {
 	if (status == CC1200_STATUS_IDLE) {
 		LOG_DBG("Idling");
@@ -78,10 +78,10 @@ static void cc1200_print_status(u8_t status)
  * Generic functions *
  ********************/
 
-bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, u8_t addr,
+bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, uint8_t addr,
 			void *data, size_t length, bool extended, bool burst)
 {
-	u8_t cmd_buf[2];
+	uint8_t cmd_buf[2];
 	const struct spi_buf buf[2] = {
 		{
 			.buf = cmd_buf,
@@ -134,12 +134,12 @@ bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, u8_t addr,
 	return (spi_write(ctx->spi, &ctx->spi_cfg, &tx) == 0);
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
 
 #if defined(CONFIG_IEEE802154_CC1200_RANDOM_MAC)
-	u32_t *ptr = (u32_t *)(cc1200->mac_addr + 4);
+	uint32_t *ptr = (uint32_t *)(cc1200->mac_addr + 4);
 
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
 
@@ -159,9 +159,9 @@ static inline u8_t *get_mac(struct device *dev)
 	return cc1200->mac_addr;
 }
 
-static u8_t get_status(struct cc1200_context *ctx)
+static uint8_t get_status(struct cc1200_context *ctx)
 {
-	u8_t val;
+	uint8_t val;
 
 	if (z_cc1200_access_reg(ctx, true, CC1200_INS_SNOP,
 				&val, 1, false, false)) {
@@ -178,7 +178,7 @@ static u8_t get_status(struct cc1200_context *ctx)
  *****************/
 
 static inline void gpio0_int_handler(struct device *port,
-				     struct gpio_callback *cb, u32_t pins)
+				     struct gpio_callback *cb, uint32_t pins)
 {
 	struct cc1200_context *cc1200 =
 		CONTAINER_OF(cb, struct cc1200_context, rx_tx_cb);
@@ -223,19 +223,19 @@ static void setup_gpio_callback(struct device *dev)
  * RF functions *
  ***************/
 
-static u8_t get_lo_divider(struct cc1200_context *ctx)
+static uint8_t get_lo_divider(struct cc1200_context *ctx)
 {
 	/* See Table 34  */
 	return FSD_BANDSELECT(read_reg_fs_cfg(ctx)) << 1;
 }
 
-static bool write_reg_freq(struct cc1200_context *ctx, u32_t freq)
+static bool write_reg_freq(struct cc1200_context *ctx, uint32_t freq)
 {
-	u8_t freq_data[3];
+	uint8_t freq_data[3];
 
-	freq_data[0] = (u8_t)((freq & 0x00FF0000) >> 16);
-	freq_data[1] = (u8_t)((freq & 0x0000FF00) >> 8);
-	freq_data[2] = (u8_t)(freq & 0x000000FF);
+	freq_data[0] = (uint8_t)((freq & 0x00FF0000) >> 16);
+	freq_data[1] = (uint8_t)((freq & 0x0000FF00) >> 8);
+	freq_data[2] = (uint8_t)(freq & 0x000000FF);
 
 	return z_cc1200_access_reg(ctx, false, CC1200_REG_FREQ2,
 				  freq_data, 3, true, true);
@@ -271,22 +271,22 @@ static bool write_reg_freq(struct cc1200_context *ctx, u32_t freq)
  * User does not need to pass anything extra besides the nominal settings: no
  * pre-computed part or else.
  */
-static u32_t rf_evaluate_freq_setting(struct cc1200_context *ctx, u32_t chan)
+static uint32_t rf_evaluate_freq_setting(struct cc1200_context *ctx, uint32_t chan)
 {
-	u32_t xtal = CONFIG_IEEE802154_CC1200_XOSC;
-	u32_t mult_10 = 100000U;
-	u32_t factor = 1U;
-	u32_t freq = 0U;
-	u32_t rf, lo_div;
+	uint32_t xtal = CONFIG_IEEE802154_CC1200_XOSC;
+	uint32_t mult_10 = 100000U;
+	uint32_t factor = 1U;
+	uint32_t freq = 0U;
+	uint32_t rf, lo_div;
 
 	rf = ctx->rf_settings->chan_center_freq0 +
-		((chan * (u32_t)ctx->rf_settings->channel_spacing) / 10U);
+		((chan * (uint32_t)ctx->rf_settings->channel_spacing) / 10U);
 	lo_div = get_lo_divider(ctx);
 
 	LOG_DBG("Calculating freq for %u KHz RF (%u)", rf, lo_div);
 
 	while (rf > 0) {
-		u32_t hz, freq_tmp, rst;
+		uint32_t hz, freq_tmp, rst;
 
 		if (rf < 1000) {
 			hz = rf;
@@ -331,7 +331,7 @@ rf_install_settings(struct device *dev,
 				 (void *)rf_settings->registers,
 				 CC1200_RF_NON_EXT_SPACE_REGS, false, true) ||
 	    !z_cc1200_access_reg(cc1200, false, CC1200_REG_IF_MIX_CFG,
-				 (u8_t *)rf_settings->registers
+				 (uint8_t *)rf_settings->registers
 				 + CC1200_RF_NON_EXT_SPACE_REGS,
 				 CC1200_RF_EXT_SPACE_REGS, true, true) ||
 	    !write_reg_pkt_len(cc1200, 0xFF)) {
@@ -392,9 +392,9 @@ static inline bool read_rxfifo(struct cc1200_context *ctx,
 				  data, length, false, true);
 }
 
-static inline u8_t get_packet_length(struct cc1200_context *ctx)
+static inline uint8_t get_packet_length(struct cc1200_context *ctx)
 {
-	u8_t len;
+	uint8_t len;
 
 	if (z_cc1200_access_reg(ctx, true, CC1200_REG_RXFIFO,
 				&len, 1, false, true)) {
@@ -405,7 +405,7 @@ static inline u8_t get_packet_length(struct cc1200_context *ctx)
 }
 
 static inline bool verify_rxfifo_validity(struct cc1200_context *ctx,
-					  u8_t pkt_len)
+					  uint8_t pkt_len)
 {
 	/* packet should be at least 3 bytes as a ACK */
 	if (pkt_len < 3 ||
@@ -417,7 +417,7 @@ static inline bool verify_rxfifo_validity(struct cc1200_context *ctx,
 }
 
 static inline bool read_rxfifo_content(struct cc1200_context *ctx,
-				       struct net_buf *buf, u8_t len)
+				       struct net_buf *buf, uint8_t len)
 {
 
 	if (!read_rxfifo(ctx, buf->data, len) ||
@@ -432,7 +432,7 @@ static inline bool read_rxfifo_content(struct cc1200_context *ctx,
 
 static inline bool verify_crc(struct cc1200_context *ctx, struct net_pkt *pkt)
 {
-	u8_t fcs[2];
+	uint8_t fcs[2];
 
 	if (!read_rxfifo(ctx, fcs, 2)) {
 		return false;
@@ -452,7 +452,7 @@ static void cc1200_rx(struct device *dev)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
 	struct net_pkt *pkt;
-	u8_t pkt_len;
+	uint8_t pkt_len;
 
 	while (1) {
 		pkt = NULL;
@@ -528,7 +528,7 @@ static int cc1200_cca(struct device *dev)
 	struct cc1200_context *cc1200 = dev->driver_data;
 
 	if (atomic_get(&cc1200->rx) == 0) {
-		u8_t status = read_reg_rssi0(cc1200);
+		uint8_t status = read_reg_rssi0(cc1200);
 
 		if (!(status & CARRIER_SENSE) &&
 		    (status & CARRIER_SENSE_VALID)) {
@@ -541,7 +541,7 @@ static int cc1200_cca(struct device *dev)
 	return -EBUSY;
 }
 
-static int cc1200_set_channel(struct device *dev, u16_t channel)
+static int cc1200_set_channel(struct device *dev, uint16_t channel)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
 
@@ -554,7 +554,7 @@ static int cc1200_set_channel(struct device *dev, u16_t channel)
 	 */
 
 	if (atomic_get(&cc1200->rx) == 0) {
-		u32_t freq = rf_evaluate_freq_setting(cc1200, channel);
+		uint32_t freq = rf_evaluate_freq_setting(cc1200, channel);
 
 		if (!write_reg_freq(cc1200, freq) ||
 		    rf_calibrate(cc1200)) {
@@ -566,10 +566,10 @@ static int cc1200_set_channel(struct device *dev, u16_t channel)
 	return 0;
 }
 
-static int cc1200_set_txpower(struct device *dev, s16_t dbm)
+static int cc1200_set_txpower(struct device *dev, int16_t dbm)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
-	u8_t pa_power_ramp;
+	uint8_t pa_power_ramp;
 
 	LOG_DBG("%d dbm", dbm);
 
@@ -581,7 +581,7 @@ static int cc1200_set_txpower(struct device *dev, s16_t dbm)
 	}
 
 	pa_power_ramp = read_reg_pa_cfg1(cc1200) & ~PA_POWER_RAMP_MASK;
-	pa_power_ramp |= ((u8_t) dbm) & PA_POWER_RAMP_MASK;
+	pa_power_ramp |= ((uint8_t) dbm) & PA_POWER_RAMP_MASK;
 
 	if (!write_reg_pa_cfg1(cc1200, pa_power_ramp)) {
 		LOG_ERR("Could not proceed");
@@ -597,8 +597,8 @@ static int cc1200_tx(struct device *dev,
 		     struct net_buf *frag)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
-	u8_t *frame = frag->data;
-	u8_t len = frag->len;
+	uint8_t *frame = frag->data;
+	uint8_t len = frag->len;
 	bool status = false;
 
 	if (mode != IEEE802154_TX_MODE_DIRECT) {
@@ -698,7 +698,7 @@ static int cc1200_stop(struct device *dev)
 	return 0;
 }
 
-static u16_t cc1200_get_channel_count(struct device *dev)
+static uint16_t cc1200_get_channel_count(struct device *dev)
 {
 	struct cc1200_context *cc1200 = dev->driver_data;
 
@@ -828,7 +828,7 @@ static void cc1200_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct cc1200_context *cc1200 = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	LOG_DBG("");
 
diff --git a/drivers/ieee802154/ieee802154_cc1200.h b/drivers/ieee802154/ieee802154_cc1200.h
index 70271f9396..e2ad5e1da3 100644
--- a/drivers/ieee802154/ieee802154_cc1200.h
+++ b/drivers/ieee802154/ieee802154_cc1200.h
@@ -31,7 +31,7 @@ enum cc1200_gpio_index {
 
 struct cc1200_gpio_configuration {
 	struct device *dev;
-	u32_t pin;
+	uint32_t pin;
 };
 
 /* Runtime context structure
@@ -45,7 +45,7 @@ struct cc1200_context {
 	struct gpio_callback rx_tx_cb;
 	struct device *spi;
 	struct spi_config spi_cfg;
-	u8_t mac_addr[8];
+	uint8_t mac_addr[8];
 	/************RF************/
 	const struct cc1200_rf_registers_set *rf_settings;
 	/************TX************/
@@ -66,13 +66,13 @@ struct cc1200_context {
  ***************************
  */
 
-bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, u8_t addr,
+bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, uint8_t addr,
 			void *data, size_t length, bool extended, bool burst);
 
-static inline u8_t cc1200_read_single_reg(struct cc1200_context *ctx,
-					   u8_t addr, bool extended)
+static inline uint8_t cc1200_read_single_reg(struct cc1200_context *ctx,
+					   uint8_t addr, bool extended)
 {
-	u8_t val;
+	uint8_t val;
 
 	if (z_cc1200_access_reg(ctx, true, addr, &val, 1, extended, false)) {
 		return val;
@@ -82,25 +82,25 @@ static inline u8_t cc1200_read_single_reg(struct cc1200_context *ctx,
 }
 
 static inline bool cc1200_write_single_reg(struct cc1200_context *ctx,
-					    u8_t addr, u8_t val, bool extended)
+					    uint8_t addr, uint8_t val, bool extended)
 {
 	return z_cc1200_access_reg(ctx, false, addr, &val, 1, extended, false);
 }
 
-static inline bool cc1200_instruct(struct cc1200_context *ctx, u8_t addr)
+static inline bool cc1200_instruct(struct cc1200_context *ctx, uint8_t addr)
 {
 	return z_cc1200_access_reg(ctx, false, addr, NULL, 0, false, false);
 }
 
 #define DEFINE_REG_READ(__reg_name, __reg_addr, __ext)			\
-	static inline u8_t read_reg_##__reg_name(struct cc1200_context *ctx) \
+	static inline uint8_t read_reg_##__reg_name(struct cc1200_context *ctx) \
 	{								\
 		return cc1200_read_single_reg(ctx, __reg_addr, __ext);	\
 	}
 
 #define DEFINE_REG_WRITE(__reg_name, __reg_addr, __ext)			\
 	static inline bool write_reg_##__reg_name(struct cc1200_context *ctx, \
-						  u8_t val)		\
+						  uint8_t val)		\
 	{								\
 		return cc1200_write_single_reg(ctx, __reg_addr,	\
 						val, __ext);		\
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
index 6f8bf275d9..7eea64c178 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(ieee802154_cc13xx_cc26xx);
 DEVICE_DECLARE(ieee802154_cc13xx_cc26xx);
 
 /* Overrides from SmartRF Studio 7 2.13.0 */
-static u32_t overrides[] = {
+static uint32_t overrides[] = {
 	/* DC/DC regulator: In Tx, use DCDCCTL5[3:0]=0x3 (DITHER_EN=0 and IPEAK=3). */
 	0x00F388D3,
 	/* Rx: Set LNA bias current offset to +15 to saturate trim to max (default: 0) */
@@ -62,9 +62,9 @@ ieee802154_cc13xx_cc26xx_get_capabilities(struct device *dev)
 static int ieee802154_cc13xx_cc26xx_cca(struct device *dev)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
-	u32_t status;
+	uint32_t status;
 
-	status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_ieee_cca_req);
+	status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_ieee_cca_req);
 	if (status != CMDSTA_Done) {
 		LOG_ERR("Failed to request CCA (0x%x)", status);
 		return -EIO;
@@ -83,10 +83,10 @@ static int ieee802154_cc13xx_cc26xx_cca(struct device *dev)
 }
 
 static int ieee802154_cc13xx_cc26xx_set_channel(struct device *dev,
-						u16_t channel)
+						uint16_t channel)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
-	u32_t status;
+	uint32_t status;
 
 	/* TODO Support sub-GHz for CC13xx */
 	if (channel < 11 || channel > 26) {
@@ -97,7 +97,7 @@ static int ieee802154_cc13xx_cc26xx_set_channel(struct device *dev,
 	RFCDoorbellSendTo(CMDR_DIR_CMD(CMD_ABORT));
 
 	/* Set all RX entries to empty */
-	status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_clear_rx);
+	status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_clear_rx);
 	if (status != CMDSTA_Done) {
 		LOG_ERR("Failed to clear RX queue (0x%x)", status);
 		return -EIO;
@@ -106,7 +106,7 @@ static int ieee802154_cc13xx_cc26xx_set_channel(struct device *dev,
 	/* Run BG receive process on requested channel */
 	drv_data->cmd_ieee_rx.status = IDLE;
 	drv_data->cmd_ieee_rx.channel = channel;
-	status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_ieee_rx);
+	status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_ieee_rx);
 	if (status != CMDSTA_Done) {
 		LOG_ERR("Failed to submit RX command (0x%x)", status);
 		return -EIO;
@@ -127,7 +127,7 @@ ieee802154_cc13xx_cc26xx_filter(struct device *dev, bool set,
 	}
 
 	if (type == IEEE802154_FILTER_TYPE_IEEE_ADDR) {
-		memcpy((u8_t *)&drv_data->cmd_ieee_rx.localExtAddr,
+		memcpy((uint8_t *)&drv_data->cmd_ieee_rx.localExtAddr,
 		       filter->ieee_addr,
 		       sizeof(drv_data->cmd_ieee_rx.localExtAddr));
 	} else if (type == IEEE802154_FILTER_TYPE_SHORT_ADDR) {
@@ -141,10 +141,10 @@ ieee802154_cc13xx_cc26xx_filter(struct device *dev, bool set,
 	return 0;
 }
 
-static int ieee802154_cc13xx_cc26xx_set_txpower(struct device *dev, s16_t dbm)
+static int ieee802154_cc13xx_cc26xx_set_txpower(struct device *dev, int16_t dbm)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
-	u32_t status;
+	uint32_t status;
 
 	/* Values from SmartRF Studio 7 2.13.0 */
 	switch (dbm) {
@@ -182,7 +182,7 @@ static int ieee802154_cc13xx_cc26xx_set_txpower(struct device *dev, s16_t dbm)
 		return -EINVAL;
 	}
 
-	status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_set_tx_power);
+	status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_set_tx_power);
 	if (status != CMDSTA_Done) {
 		LOG_DBG("Failed to set TX power (0x%x)", status);
 		return -EIO;
@@ -200,7 +200,7 @@ static int ieee802154_cc13xx_cc26xx_tx(struct device *dev,
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
 	bool ack = ieee802154_is_ar_flag_set(frag);
 	int retry = CONFIG_NET_L2_IEEE802154_RADIO_TX_RETRIES;
-	u32_t status;
+	uint32_t status;
 
 	if (mode != IEEE802154_TX_MODE_CSMA_CA) {
 		NET_ERR("TX mode %d not supported", mode);
@@ -224,7 +224,7 @@ static int ieee802154_cc13xx_cc26xx_tx(struct device *dev,
 	__ASSERT_NO_MSG(k_sem_count_get(&drv_data->fg_done) == 0);
 
 	do {
-		status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_ieee_csma);
+		status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_ieee_csma);
 		if (status != CMDSTA_Done) {
 			LOG_ERR("Failed to submit TX command (0x%x)", status);
 			return -EIO;
@@ -258,7 +258,7 @@ static int ieee802154_cc13xx_cc26xx_tx(struct device *dev,
 	return -EIO;
 }
 
-static inline u8_t ieee802154_cc13xx_cc26xx_convert_rssi(s8_t rssi)
+static inline uint8_t ieee802154_cc13xx_cc26xx_convert_rssi(int8_t rssi)
 {
 	if (rssi > CC13XX_CC26XX_RECEIVER_SENSITIVITY +
 			   CC13XX_CC26XX_RSSI_DYNAMIC_RANGE) {
@@ -276,9 +276,9 @@ static void ieee802154_cc13xx_cc26xx_rx_done(struct device *dev)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
 	struct net_pkt *pkt;
-	u8_t len, seq, corr;
-	s8_t rssi;
-	u8_t *sdu;
+	uint8_t len, seq, corr;
+	int8_t rssi;
+	uint8_t *sdu;
 
 	for (int i = 0; i < CC13XX_CC26XX_NUM_RX_BUF; i++) {
 		if (drv_data->rx_entry[i].status == DATA_ENTRY_FINISHED) {
@@ -366,7 +366,7 @@ ieee802154_cc13xx_cc26xx_configure(struct device *dev,
 static void ieee802154_cc13xx_cc26xx_cpe0_isr(void *arg)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(arg);
-	u32_t flags;
+	uint32_t flags;
 
 	flags = RFCCpeIntGetAndClear(IRQ_RX_ENTRY_DONE |
 				     IRQ_LAST_FG_COMMAND_DONE);
@@ -382,7 +382,7 @@ static void ieee802154_cc13xx_cc26xx_cpe0_isr(void *arg)
 
 static void ieee802154_cc13xx_cc26xx_cpe1_isr(void *arg)
 {
-	u32_t flags;
+	uint32_t flags;
 
 	ARG_UNUSED(arg);
 
@@ -400,13 +400,13 @@ static void ieee802154_cc13xx_cc26xx_cpe1_isr(void *arg)
 static void ieee802154_cc13xx_cc26xx_data_init(struct device *dev)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
-	u8_t *mac;
+	uint8_t *mac;
 
 	if (sys_read32(CCFG_BASE + CCFG_O_IEEE_MAC_0) != 0xFFFFFFFF &&
 	    sys_read32(CCFG_BASE + CCFG_O_IEEE_MAC_1) != 0xFFFFFFFF) {
-		mac = (u8_t *)(CCFG_BASE + CCFG_O_IEEE_MAC_0);
+		mac = (uint8_t *)(CCFG_BASE + CCFG_O_IEEE_MAC_0);
 	} else {
-		mac = (u8_t *)(FCFG1_BASE + FCFG1_O_MAC_15_4_0);
+		mac = (uint8_t *)(FCFG1_BASE + FCFG1_O_MAC_15_4_0);
 	}
 
 	memcpy(&drv_data->mac, mac, sizeof(drv_data->mac));
@@ -415,19 +415,19 @@ static void ieee802154_cc13xx_cc26xx_data_init(struct device *dev)
 	memset(&drv_data->rx_entry[0], 0, sizeof(drv_data->rx_entry[0]));
 	memset(&drv_data->rx_entry[1], 0, sizeof(drv_data->rx_entry[1]));
 
-	drv_data->rx_entry[0].pNextEntry = (u8_t *)&drv_data->rx_entry[1];
+	drv_data->rx_entry[0].pNextEntry = (uint8_t *)&drv_data->rx_entry[1];
 	drv_data->rx_entry[0].config.type = DATA_ENTRY_TYPE_PTR;
 	drv_data->rx_entry[0].config.lenSz = 1;
 	drv_data->rx_entry[0].length = sizeof(drv_data->rx_data[0]);
 	drv_data->rx_entry[0].pData = drv_data->rx_data[0];
 
-	drv_data->rx_entry[1].pNextEntry = (u8_t *)&drv_data->rx_entry[0];
+	drv_data->rx_entry[1].pNextEntry = (uint8_t *)&drv_data->rx_entry[0];
 	drv_data->rx_entry[1].config.type = DATA_ENTRY_TYPE_PTR;
 	drv_data->rx_entry[1].config.lenSz = 1;
 	drv_data->rx_entry[1].length = sizeof(drv_data->rx_data[1]);
 	drv_data->rx_entry[1].pData = drv_data->rx_data[1];
 
-	drv_data->rx_queue.pCurrEntry = (u8_t *)&drv_data->rx_entry[0];
+	drv_data->rx_queue.pCurrEntry = (uint8_t *)&drv_data->rx_entry[0];
 	drv_data->rx_queue.pLastEntry = NULL;
 
 	k_sem_init(&drv_data->fg_done, 0, UINT_MAX);
@@ -470,7 +470,7 @@ static int ieee802154_cc13xx_cc26xx_init(struct device *dev)
 {
 	struct ieee802154_cc13xx_cc26xx_data *drv_data = get_dev_data(dev);
 	bool set_osc_hf;
-	u32_t key, status;
+	uint32_t key, status;
 	HwiP_Params params;
 
 	/* Apply RF patches */
@@ -558,7 +558,7 @@ static int ieee802154_cc13xx_cc26xx_init(struct device *dev)
 	}
 
 	/* Setup radio */
-	status = RFCDoorbellSendTo((u32_t)&drv_data->cmd_radio_setup);
+	status = RFCDoorbellSendTo((uint32_t)&drv_data->cmd_radio_setup);
 	if (status != CMDSTA_Done) {
 		LOG_DBG("Failed to submit setup radio command (0x%x)", status);
 		return -EIO;
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
index 77bb50bc41..62b9fc5807 100644
--- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
+++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.h
@@ -61,7 +61,7 @@
 struct ieee802154_cc13xx_cc26xx_data {
 	struct net_if *iface;
 
-	u8_t mac[8];
+	uint8_t mac[8];
 
 	struct k_sem fg_done;
 	struct k_sem rx_done;
@@ -72,7 +72,7 @@ struct ieee802154_cc13xx_cc26xx_data {
 
 	dataQueue_t rx_queue;
 	rfc_dataEntryPointer_t rx_entry[CC13XX_CC26XX_RX_BUF_SIZE];
-	u8_t rx_data[CC13XX_CC26XX_NUM_RX_BUF]
+	uint8_t rx_data[CC13XX_CC26XX_NUM_RX_BUF]
 		    [CC13XX_CC26XX_RX_BUF_SIZE] __aligned(4);
 
 	volatile rfc_CMD_IEEE_CCA_REQ_t cmd_ieee_cca_req;
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index 449f536408..f375dd6a51 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -86,7 +86,7 @@ static inline void cc2520_print_gpio_config(struct device *dev)
 
 static inline void cc2520_print_exceptions(struct cc2520_context *cc2520)
 {
-	u8_t flag = read_reg_excflag0(cc2520);
+	uint8_t flag = read_reg_excflag0(cc2520);
 
 	LOG_DBG("EXCFLAG0:");
 
@@ -161,7 +161,7 @@ static inline void cc2520_print_exceptions(struct cc2520_context *cc2520)
 
 static inline void cc2520_print_errors(struct cc2520_context *cc2520)
 {
-	u8_t flag = read_reg_excflag2(cc2520);
+	uint8_t flag = read_reg_excflag2(cc2520);
 
 	LOG_DBG("EXCFLAG2:");
 
@@ -205,10 +205,10 @@ static inline void cc2520_print_errors(struct cc2520_context *cc2520)
  ********************/
 #define z_usleep(usec) k_busy_wait(usec)
 
-bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
-		    u16_t addr, void *data, size_t length)
+bool z_cc2520_access(struct cc2520_context *ctx, bool read, uint8_t ins,
+		    uint16_t addr, void *data, size_t length)
 {
-	u8_t cmd_buf[2];
+	uint8_t cmd_buf[2];
 	struct spi_buf buf[2] = {
 		{
 			.buf = cmd_buf,
@@ -229,10 +229,10 @@ bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
 
 	if (ins == CC2520_INS_MEMRD || ins == CC2520_INS_MEMWR) {
 		buf[0].len = 2;
-		cmd_buf[0] |= (u8_t)(addr >> 8);
-		cmd_buf[1] = (u8_t)(addr & 0xff);
+		cmd_buf[0] |= (uint8_t)(addr >> 8);
+		cmd_buf[1] = (uint8_t)(addr & 0xff);
 	} else if (ins == CC2520_INS_REGRD || ins == CC2520_INS_REGWR) {
-		cmd_buf[0] |= (u8_t)(addr & 0xff);
+		cmd_buf[0] |= (uint8_t)(addr & 0xff);
 	}
 
 	if (read) {
@@ -251,9 +251,9 @@ bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
 	return (spi_write(ctx->spi, &ctx->spi_cfg, &tx) == 0);
 }
 
-static inline u8_t cc2520_status(struct cc2520_context *ctx)
+static inline uint8_t cc2520_status(struct cc2520_context *ctx)
 {
-	u8_t status;
+	uint8_t status;
 
 	if (z_cc2520_access(ctx, true, CC2520_INS_SNOP, 0, &status, 1)) {
 		return status;
@@ -264,8 +264,8 @@ static inline u8_t cc2520_status(struct cc2520_context *ctx)
 
 static bool verify_osc_stabilization(struct cc2520_context *cc2520)
 {
-	u8_t timeout = 100U;
-	u8_t status;
+	uint8_t timeout = 100U;
+	uint8_t status;
 
 	do {
 		status = cc2520_status(cc2520);
@@ -277,12 +277,12 @@ static bool verify_osc_stabilization(struct cc2520_context *cc2520)
 }
 
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
 #if defined(CONFIG_IEEE802154_CC2520_RANDOM_MAC)
-	u32_t *ptr = (u32_t *)(cc2520->mac_addr + 4);
+	uint32_t *ptr = (uint32_t *)(cc2520->mac_addr + 4);
 
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
 
@@ -302,7 +302,7 @@ static inline u8_t *get_mac(struct device *dev)
 	return cc2520->mac_addr;
 }
 
-static int cc2520_set_pan_id(struct device *dev, u16_t pan_id)
+static int cc2520_set_pan_id(struct device *dev, uint16_t pan_id)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -310,7 +310,7 @@ static int cc2520_set_pan_id(struct device *dev, u16_t pan_id)
 
 	pan_id = sys_le16_to_cpu(pan_id);
 
-	if (!write_mem_pan_id(cc2520, (u8_t *) &pan_id)) {
+	if (!write_mem_pan_id(cc2520, (uint8_t *) &pan_id)) {
 		LOG_ERR("Failed");
 		return -EIO;
 	}
@@ -318,7 +318,7 @@ static int cc2520_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int cc2520_set_short_addr(struct device *dev, u16_t short_addr)
+static int cc2520_set_short_addr(struct device *dev, uint16_t short_addr)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -326,7 +326,7 @@ static int cc2520_set_short_addr(struct device *dev, u16_t short_addr)
 
 	short_addr = sys_le16_to_cpu(short_addr);
 
-	if (!write_mem_short_addr(cc2520, (u8_t *) &short_addr)) {
+	if (!write_mem_short_addr(cc2520, (uint8_t *) &short_addr)) {
 		LOG_ERR("Failed");
 		return -EIO;
 	}
@@ -334,7 +334,7 @@ static int cc2520_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int cc2520_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int cc2520_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -353,7 +353,7 @@ static int cc2520_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
 /******************
  * GPIO functions *
  *****************/
-static inline void set_reset(struct device *dev, u32_t value)
+static inline void set_reset(struct device *dev, uint32_t value)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -361,7 +361,7 @@ static inline void set_reset(struct device *dev, u32_t value)
 			 cc2520->gpios[CC2520_GPIO_IDX_RESET].pin, value);
 }
 
-static inline void set_vreg_en(struct device *dev, u32_t value)
+static inline void set_vreg_en(struct device *dev, uint32_t value)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -369,9 +369,9 @@ static inline void set_vreg_en(struct device *dev, u32_t value)
 			 cc2520->gpios[CC2520_GPIO_IDX_VREG_EN].pin, value);
 }
 
-static inline u32_t get_fifo(struct cc2520_context *cc2520)
+static inline uint32_t get_fifo(struct cc2520_context *cc2520)
 {
-	u32_t pin_value;
+	uint32_t pin_value;
 
 	pin_value = gpio_pin_get_raw(cc2520->gpios[CC2520_GPIO_IDX_FIFO].dev,
 				     cc2520->gpios[CC2520_GPIO_IDX_FIFO].pin);
@@ -379,9 +379,9 @@ static inline u32_t get_fifo(struct cc2520_context *cc2520)
 	return pin_value;
 }
 
-static inline u32_t get_fifop(struct cc2520_context *cc2520)
+static inline uint32_t get_fifop(struct cc2520_context *cc2520)
 {
-	u32_t pin_value;
+	uint32_t pin_value;
 
 	pin_value = gpio_pin_get_raw(cc2520->gpios[CC2520_GPIO_IDX_FIFOP].dev,
 				     cc2520->gpios[CC2520_GPIO_IDX_FIFOP].pin);
@@ -389,9 +389,9 @@ static inline u32_t get_fifop(struct cc2520_context *cc2520)
 	return pin_value;
 }
 
-static inline u32_t get_cca(struct cc2520_context *cc2520)
+static inline uint32_t get_cca(struct cc2520_context *cc2520)
 {
-	u32_t pin_value;
+	uint32_t pin_value;
 
 	pin_value = gpio_pin_get_raw(cc2520->gpios[CC2520_GPIO_IDX_CCA].dev,
 				     cc2520->gpios[CC2520_GPIO_IDX_CCA].pin);
@@ -400,7 +400,7 @@ static inline u32_t get_cca(struct cc2520_context *cc2520)
 }
 
 static inline void sfd_int_handler(struct device *port,
-				   struct gpio_callback *cb, u32_t pins)
+				   struct gpio_callback *cb, uint32_t pins)
 {
 	struct cc2520_context *cc2520 =
 		CONTAINER_OF(cb, struct cc2520_context, sfd_cb);
@@ -412,7 +412,7 @@ static inline void sfd_int_handler(struct device *port,
 }
 
 static inline void fifop_int_handler(struct device *port,
-				     struct gpio_callback *cb, u32_t pins)
+				     struct gpio_callback *cb, uint32_t pins)
 {
 	struct cc2520_context *cc2520 =
 		CONTAINER_OF(cb, struct cc2520_context, fifop_cb);
@@ -466,21 +466,21 @@ static inline void setup_gpio_callbacks(struct device *dev)
 /****************
  * TX functions *
  ***************/
-static inline bool write_txfifo_length(struct cc2520_context *ctx, u8_t len)
+static inline bool write_txfifo_length(struct cc2520_context *ctx, uint8_t len)
 {
-	u8_t length = len + CC2520_FCS_LENGTH;
+	uint8_t length = len + CC2520_FCS_LENGTH;
 
 	return z_cc2520_access(ctx, false, CC2520_INS_TXBUF, 0, &length, 1);
 }
 
 static inline bool write_txfifo_content(struct cc2520_context *ctx,
-					u8_t *frame, u8_t len)
+					uint8_t *frame, uint8_t len)
 {
 	return z_cc2520_access(ctx, false, CC2520_INS_TXBUF, 0, frame, len);
 }
 
 static inline bool verify_txfifo_status(struct cc2520_context *cc2520,
-					u8_t len)
+					uint8_t len)
 {
 	if (read_reg_txfifocnt(cc2520) < len ||
 	    (read_reg_excflag0(cc2520) & EXCFLAG0_TX_UNDERFLOW)) {
@@ -492,8 +492,8 @@ static inline bool verify_txfifo_status(struct cc2520_context *cc2520,
 
 static inline bool verify_tx_done(struct cc2520_context *cc2520)
 {
-	u8_t timeout = 10U;
-	u8_t status;
+	uint8_t timeout = 10U;
+	uint8_t status;
 
 	do {
 		z_usleep(1);
@@ -521,9 +521,9 @@ static inline void flush_rxfifo(struct cc2520_context *cc2520)
 	write_reg_excflag0(cc2520, EXCFLAG0_RESET_RX_FLAGS);
 }
 
-static inline u8_t read_rxfifo_length(struct cc2520_context *ctx)
+static inline uint8_t read_rxfifo_length(struct cc2520_context *ctx)
 {
-	u8_t len;
+	uint8_t len;
 
 
 	if (z_cc2520_access(ctx, true, CC2520_INS_RXBUF, 0, &len, 1)) {
@@ -534,7 +534,7 @@ static inline u8_t read_rxfifo_length(struct cc2520_context *ctx)
 }
 
 static inline bool read_rxfifo_content(struct cc2520_context *ctx,
-				       struct net_buf *buf, u8_t len)
+				       struct net_buf *buf, uint8_t len)
 {
 	if (!z_cc2520_access(ctx, true, CC2520_INS_RXBUF, 0, buf->data, len)) {
 		return false;
@@ -550,9 +550,9 @@ static inline bool read_rxfifo_content(struct cc2520_context *ctx,
 	return true;
 }
 
-static inline void insert_radio_noise_details(struct net_pkt *pkt, u8_t *buf)
+static inline void insert_radio_noise_details(struct net_pkt *pkt, uint8_t *buf)
 {
-	u8_t lqi;
+	uint8_t lqi;
 
 	net_pkt_set_ieee802154_rssi(pkt, buf[0]);
 
@@ -580,7 +580,7 @@ static inline void insert_radio_noise_details(struct net_pkt *pkt, u8_t *buf)
 
 static inline bool verify_crc(struct cc2520_context *ctx, struct net_pkt *pkt)
 {
-	u8_t fcs[2];
+	uint8_t fcs[2];
 
 	if (!z_cc2520_access(ctx, true, CC2520_INS_RXBUF, 0, &fcs, 2)) {
 		return false;
@@ -596,7 +596,7 @@ static inline bool verify_crc(struct cc2520_context *ctx, struct net_pkt *pkt)
 }
 
 static inline bool verify_rxfifo_validity(struct cc2520_context *ctx,
-					  u8_t pkt_len)
+					  uint8_t pkt_len)
 {
 	if (pkt_len < 2 || read_reg_rxfifocnt(ctx) != pkt_len) {
 		return false;
@@ -610,7 +610,7 @@ static void cc2520_rx(int arg)
 	struct device *dev = INT_TO_POINTER(arg);
 	struct cc2520_context *cc2520 = dev->driver_data;
 	struct net_pkt *pkt;
-	u8_t pkt_len;
+	uint8_t pkt_len;
 
 	while (1) {
 		pkt = NULL;
@@ -699,7 +699,7 @@ static int cc2520_cca(struct device *dev)
 	return 0;
 }
 
-static int cc2520_set_channel(struct device *dev, u16_t channel)
+static int cc2520_set_channel(struct device *dev, uint16_t channel)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
 
@@ -742,10 +742,10 @@ static int cc2520_filter(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int cc2520_set_txpower(struct device *dev, s16_t dbm)
+static int cc2520_set_txpower(struct device *dev, int16_t dbm)
 {
 	struct cc2520_context *cc2520 = dev->driver_data;
-	u8_t pwr;
+	uint8_t pwr;
 
 	LOG_DBG("%d", dbm);
 
@@ -797,10 +797,10 @@ static int cc2520_tx(struct device *dev,
 		     struct net_pkt *pkt,
 		     struct net_buf *frag)
 {
-	u8_t *frame = frag->data;
-	u8_t len = frag->len;
+	uint8_t *frame = frag->data;
+	uint8_t len = frag->len;
 	struct cc2520_context *cc2520 = dev->driver_data;
-	u8_t retry = 2U;
+	uint8_t retry = 2U;
 	bool status;
 
 	if (mode != IEEE802154_TX_MODE_DIRECT) {
@@ -1123,7 +1123,7 @@ static void cc2520_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct cc2520_context *cc2520 = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 
@@ -1164,15 +1164,15 @@ NET_DEVICE_INIT(cc2520, CONFIG_IEEE802154_CC2520_DRV_NAME,
 
 #ifdef CONFIG_IEEE802154_CC2520_CRYPTO
 
-static inline bool cc2520_read_ram(struct cc2520_context *ctx, u16_t addr,
-				    u8_t *data_buf, u8_t len)
+static inline bool cc2520_read_ram(struct cc2520_context *ctx, uint16_t addr,
+				    uint8_t *data_buf, uint8_t len)
 {
 	return z_cc2520_access(ctx, true, CC2520_INS_MEMRD,
 			      addr, data_buf, len);
 }
 
-static inline bool cc2520_write_ram(struct cc2520_context *ctx, u16_t addr,
-				     u8_t *data_buf, u8_t len)
+static inline bool cc2520_write_ram(struct cc2520_context *ctx, uint16_t addr,
+				     uint8_t *data_buf, uint8_t len)
 {
 	return z_cc2520_access(ctx, false, CC2520_INS_MEMWR,
 			      addr, data_buf, len);
@@ -1180,15 +1180,15 @@ static inline bool cc2520_write_ram(struct cc2520_context *ctx, u16_t addr,
 
 static inline bool instruct_uccm_ccm(struct cc2520_context *cc2520,
 				     bool uccm,
-				     u8_t key_addr,
-				     u8_t auth_crypt,
-				     u8_t nonce_addr,
-				     u16_t input_addr,
-				     u16_t output_addr,
-				     u8_t in_len,
-				     u8_t m)
+				     uint8_t key_addr,
+				     uint8_t auth_crypt,
+				     uint8_t nonce_addr,
+				     uint16_t input_addr,
+				     uint16_t output_addr,
+				     uint8_t in_len,
+				     uint8_t m)
 {
-	u8_t cmd[9];
+	uint8_t cmd[9];
 	const struct spi_buf buf[1] = {
 		{
 			.buf = cmd,
@@ -1211,10 +1211,10 @@ static inline bool instruct_uccm_ccm(struct cc2520_context *cc2520,
 	cmd[1] = key_addr;
 	cmd[2] = (auth_crypt & 0x7f);
 	cmd[3] = nonce_addr;
-	cmd[4] = (u8_t)(((input_addr & 0x0f00) >> 4) |
+	cmd[4] = (uint8_t)(((input_addr & 0x0f00) >> 4) |
 			   ((output_addr & 0x0f00) >> 8));
-	cmd[5] = (u8_t)(input_addr & 0x00ff);
-	cmd[6] = (u8_t)(output_addr & 0x00ff);
+	cmd[5] = (uint8_t)(input_addr & 0x00ff);
+	cmd[6] = (uint8_t)(output_addr & 0x00ff);
 	cmd[7] = (in_len & 0x7f);
 	cmd[8] = (m & 0x03);
 
@@ -1232,15 +1232,15 @@ static inline bool instruct_uccm_ccm(struct cc2520_context *cc2520,
 	return true;
 }
 
-static inline void generate_nonce(u8_t *ccm_nonce, u8_t *nonce,
-				  struct cipher_aead_pkt *apkt, u8_t m)
+static inline void generate_nonce(uint8_t *ccm_nonce, uint8_t *nonce,
+				  struct cipher_aead_pkt *apkt, uint8_t m)
 {
 	nonce[0] = 0 | (apkt->ad_len ? 0x40 : 0) | (m << 3) | 1;
 
 	memcpy(&nonce[1], ccm_nonce, 13);
 
-	nonce[14] = (u8_t)(apkt->pkt->in_len >> 8);
-	nonce[15] = (u8_t)(apkt->pkt->in_len);
+	nonce[14] = (uint8_t)(apkt->pkt->in_len >> 8);
+	nonce[15] = (uint8_t)(apkt->pkt->in_len);
 
 	/* See section 26.8.1 */
 	sys_mem_swap(nonce, 16);
@@ -1248,13 +1248,13 @@ static inline void generate_nonce(u8_t *ccm_nonce, u8_t *nonce,
 
 static int insert_crypto_parameters(struct cipher_ctx *ctx,
 				    struct cipher_aead_pkt *apkt,
-				    u8_t *ccm_nonce, u8_t *auth_crypt)
+				    uint8_t *ccm_nonce, uint8_t *auth_crypt)
 {
 	struct cc2520_context *cc2520 = ctx->device->driver_data;
-	u8_t data[128];
-	u8_t *in_buf;
-	u8_t in_len;
-	u8_t m = 0U;
+	uint8_t data[128];
+	uint8_t *in_buf;
+	uint8_t in_len;
+	uint8_t m = 0U;
 
 	if (!apkt->pkt->out_buf || !apkt->pkt->out_buf_max) {
 		LOG_ERR("Out buffer needs to be set");
@@ -1339,10 +1339,10 @@ static int insert_crypto_parameters(struct cipher_ctx *ctx,
 
 static int cc2520_crypto_ccm(struct cipher_ctx *ctx,
 			      struct cipher_aead_pkt *apkt,
-			      u8_t *ccm_nonce)
+			      uint8_t *ccm_nonce)
 {
 	struct cc2520_context *cc2520 = ctx->device->driver_data;
-	u8_t auth_crypt;
+	uint8_t auth_crypt;
 	int m;
 
 	if (!apkt || !apkt->pkt) {
@@ -1384,10 +1384,10 @@ static int cc2520_crypto_ccm(struct cipher_ctx *ctx,
 
 static int cc2520_crypto_uccm(struct cipher_ctx *ctx,
 			       struct cipher_aead_pkt *apkt,
-			       u8_t *ccm_nonce)
+			       uint8_t *ccm_nonce)
 {
 	struct cc2520_context *cc2520 = ctx->device->driver_data;
-	u8_t auth_crypt;
+	uint8_t auth_crypt;
 	int m;
 
 	if (!apkt || !apkt->pkt) {
diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h
index dd3d3eaf2f..903f691b7a 100644
--- a/drivers/ieee802154/ieee802154_cc2520.h
+++ b/drivers/ieee802154/ieee802154_cc2520.h
@@ -26,7 +26,7 @@ enum cc2520_gpio_index {
 
 struct cc2520_gpio_configuration {
 	struct device *dev;
-	u32_t pin;
+	uint32_t pin;
 };
 
 /* Runtime context structure
@@ -40,7 +40,7 @@ struct cc2520_context {
 	struct gpio_callback fifop_cb;
 	struct device *spi;
 	struct spi_config spi_cfg;
-	u8_t mac_addr[8];
+	uint8_t mac_addr[8];
 	/************TX************/
 	struct k_sem tx_sync;
 	atomic_t tx;
@@ -62,13 +62,13 @@ struct cc2520_context {
  ***************************
  */
 
-bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
-		    u16_t addr, void *data, size_t length);
+bool z_cc2520_access(struct cc2520_context *ctx, bool read, uint8_t ins,
+		    uint16_t addr, void *data, size_t length);
 
 #define DEFINE_SREG_READ(__reg_name, __reg_addr)			\
-	static inline u8_t read_reg_##__reg_name(struct cc2520_context *ctx) \
+	static inline uint8_t read_reg_##__reg_name(struct cc2520_context *ctx) \
 	{								\
-		u8_t val;						\
+		uint8_t val;						\
 									\
 		if (z_cc2520_access(ctx, true, CC2520_INS_MEMRD,		\
 				   __reg_addr, &val, 1)) {		\
@@ -80,16 +80,16 @@ bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
 
 #define DEFINE_SREG_WRITE(__reg_name, __reg_addr)			\
 	static inline bool write_reg_##__reg_name(struct cc2520_context *ctx, \
-						  u8_t val)		\
+						  uint8_t val)		\
 	{								\
 		return z_cc2520_access(ctx, false, CC2520_INS_MEMWR,	\
 				      __reg_addr, &val, 1);		\
 	}
 
 #define DEFINE_FREG_READ(__reg_name, __reg_addr)			\
-	static inline u8_t read_reg_##__reg_name(struct cc2520_context *ctx) \
+	static inline uint8_t read_reg_##__reg_name(struct cc2520_context *ctx) \
 	{								\
-		u8_t val;						\
+		uint8_t val;						\
 									\
 		if (z_cc2520_access(ctx, true, CC2520_INS_REGRD,		\
 				   __reg_addr, &val, 1)) {		\
@@ -101,7 +101,7 @@ bool z_cc2520_access(struct cc2520_context *ctx, bool read, u8_t ins,
 
 #define DEFINE_FREG_WRITE(__reg_name, __reg_addr)			\
 	static inline bool write_reg_##__reg_name(struct cc2520_context *ctx, \
-						  u8_t val)		\
+						  uint8_t val)		\
 	{								\
 		return z_cc2520_access(ctx, false, CC2520_INS_REGWR,	\
 				      __reg_addr, &val, 1);		\
@@ -152,7 +152,7 @@ DEFINE_SREG_WRITE(extclock, CC2520_SREG_EXTCLOCK)
 
 #define DEFINE_MEM_WRITE(__mem_name, __addr, __sz)			\
 	static inline bool write_mem_##__mem_name(struct cc2520_context *ctx, \
-						  u8_t *buf)		\
+						  uint8_t *buf)		\
 	{								\
 		return z_cc2520_access(ctx, false, CC2520_INS_MEMWR,	\
 				      __addr, buf, __sz);		\
@@ -168,15 +168,15 @@ DEFINE_MEM_WRITE(ext_addr, CC2520_MEM_EXT_ADDR, 8)
  */
 
 static inline bool cc2520_command_strobe(struct cc2520_context *ctx,
-					  u8_t instruction)
+					  uint8_t instruction)
 {
 	return z_cc2520_access(ctx, false, instruction, 0, NULL, 0);
 }
 
 static inline bool cc2520_command_strobe_snop(struct cc2520_context *ctx,
-					       u8_t instruction)
+					       uint8_t instruction)
 {
-	u8_t snop[1] = { CC2520_INS_SNOP };
+	uint8_t snop[1] = { CC2520_INS_SNOP };
 
 	return z_cc2520_access(ctx, false, instruction, 0, snop, 1);
 }
diff --git a/drivers/ieee802154/ieee802154_cc2520_regs.h b/drivers/ieee802154/ieee802154_cc2520_regs.h
index bd269582ad..e0ea464e5d 100644
--- a/drivers/ieee802154/ieee802154_cc2520_regs.h
+++ b/drivers/ieee802154/ieee802154_cc2520_regs.h
@@ -111,12 +111,12 @@
 #define EXCFLAG0_RX_UNDERFLOW			BIT(5)
 #define EXCFLAG0_RX_OVERFLOW			BIT(6)
 #define EXCFLAG0_RXENABLE_ZERO			BIT(7)
-#define EXCFLAG0_RESET_TX_FLAGS			((u8_t) \
+#define EXCFLAG0_RESET_TX_FLAGS			((uint8_t) \
 						 ~(EXCFLAG0_TX_FRM_DONE | \
 						   EXCFLAG0_TX_ACK_DONE | \
 						   EXCFLAG0_TX_UNDERFLOW | \
 						   EXCFLAG0_TX_OVERFLOW))
-#define EXCFLAG0_RESET_RX_FLAGS			((u8_t) \
+#define EXCFLAG0_RESET_RX_FLAGS			((uint8_t) \
 						 ~(EXCFLAG0_RX_UNDERFLOW | \
 						   EXCFLAG0_RX_OVERFLOW | \
 						   EXCFLAG0_RXENABLE_ZERO))
@@ -130,7 +130,7 @@
 #define EXCFLAG1_SFD				BIT(5)
 #define EXCFLAG1_DPU_DONE_L			BIT(6)
 #define EXCFLAG1_DPU_DONE_H			BIT(7)
-#define EXCFLAG1_RESET_RX_FLAGS			((u8_t) \
+#define EXCFLAG1_RESET_RX_FLAGS			((uint8_t) \
 						 ~(EXCFLAG1_RX_FRM_DONE | \
 						   EXCFLAG1_RX_FRM_ACCEPTED | \
 						   EXCFLAG1_FIFOP))
diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c
index 019f19e7b4..35084b0849 100644
--- a/drivers/ieee802154/ieee802154_dw1000.c
+++ b/drivers/ieee802154/ieee802154_dw1000.c
@@ -70,19 +70,19 @@ static K_THREAD_STACK_DEFINE(dwt_work_queue_stack,
 			     DWT_WORK_QUEUE_STACK_SIZE);
 
 struct dwt_phy_config {
-	u8_t channel;	/* Channel 1, 2, 3, 4, 5, 7 */
-	u8_t dr;	/* Data rate DWT_BR_110K, DWT_BR_850K, DWT_BR_6M8 */
-	u8_t prf;	/* PRF DWT_PRF_16M or DWT_PRF_64M */
+	uint8_t channel;	/* Channel 1, 2, 3, 4, 5, 7 */
+	uint8_t dr;	/* Data rate DWT_BR_110K, DWT_BR_850K, DWT_BR_6M8 */
+	uint8_t prf;	/* PRF DWT_PRF_16M or DWT_PRF_64M */
 
-	u8_t rx_pac_l;		/* DWT_PAC8..DWT_PAC64 */
-	u8_t rx_shr_code;	/* RX SHR preamble code */
-	u8_t rx_ns_sfd;		/* non-standard SFD */
-	u16_t rx_sfd_to;	/* SFD timeout value (in symbols)
+	uint8_t rx_pac_l;		/* DWT_PAC8..DWT_PAC64 */
+	uint8_t rx_shr_code;	/* RX SHR preamble code */
+	uint8_t rx_ns_sfd;		/* non-standard SFD */
+	uint16_t rx_sfd_to;	/* SFD timeout value (in symbols)
 				 * (tx_shr_nsync + 1 + SFD_length - rx_pac_l)
 				 */
 
-	u8_t tx_shr_code;	/* TX SHR preamble code */
-	u32_t tx_shr_nsync;	/* PLEN index, e.g. DWT_PLEN_64 */
+	uint8_t tx_shr_code;	/* TX SHR preamble code */
+	uint32_t tx_shr_nsync;	/* PLEN index, e.g. DWT_PLEN_64 */
 
 	float t_shr;
 	float t_phr;
@@ -91,16 +91,16 @@ struct dwt_phy_config {
 
 struct dwt_hi_cfg {
 	const char *irq_port;
-	u8_t irq_pin;
+	uint8_t irq_pin;
 	gpio_dt_flags_t irq_flags;
 	const char *rst_port;
-	u8_t rst_pin;
+	uint8_t rst_pin;
 	gpio_dt_flags_t rst_flags;
 	const char *spi_port;
-	u8_t spi_cs_pin;
+	uint8_t spi_cs_pin;
 	const char *spi_cs_port;
-	u32_t spi_freq;
-	u8_t spi_slave;
+	uint32_t spi_freq;
+	uint8_t spi_slave;
 };
 
 #define DWT_STATE_TX		0
@@ -124,8 +124,8 @@ struct dwt_context {
 	struct dwt_phy_config rf_cfg;
 	atomic_t state;
 	bool cca_busy;
-	u16_t sleep_mode;
-	u8_t mac_addr[8];
+	uint16_t sleep_mode;
+	uint8_t mac_addr[8];
 };
 
 static const struct dwt_hi_cfg dw1000_0_config = {
@@ -164,21 +164,21 @@ static struct dwt_context dwt_0_context = {
 
 /* This structer is used to read all additional RX frame info at one push */
 struct dwt_rx_info_regs {
-	u8_t rx_fqual[DWT_RX_FQUAL_LEN];
-	u8_t rx_ttcki[DWT_RX_TTCKI_LEN];
-	u8_t rx_ttcko[DWT_RX_TTCKO_LEN];
+	uint8_t rx_fqual[DWT_RX_FQUAL_LEN];
+	uint8_t rx_ttcki[DWT_RX_TTCKI_LEN];
+	uint8_t rx_ttcko[DWT_RX_TTCKO_LEN];
 	/* RX_TIME without RX_RAWST */
-	u8_t rx_time[DWT_RX_TIME_FP_RAWST_OFFSET];
+	uint8_t rx_time[DWT_RX_TIME_FP_RAWST_OFFSET];
 } _packed;
 
 static int dwt_configure_rf_phy(struct dwt_context *ctx);
 
 static int dwt_spi_read(struct dwt_context *ctx,
-			u16_t hdr_len, const u8_t *hdr_buf,
-			u32_t data_len, u8_t *data)
+			uint16_t hdr_len, const uint8_t *hdr_buf,
+			uint32_t data_len, uint8_t *data)
 {
 	const struct spi_buf tx_buf = {
-		.buf = (u8_t *)hdr_buf,
+		.buf = (uint8_t *)hdr_buf,
 		.len = hdr_len
 	};
 	const struct spi_buf_set tx = {
@@ -191,7 +191,7 @@ static int dwt_spi_read(struct dwt_context *ctx,
 			.len = hdr_len,
 		},
 		{
-			.buf = (u8_t *)data,
+			.buf = (uint8_t *)data,
 			.len = data_len,
 		},
 	};
@@ -201,34 +201,34 @@ static int dwt_spi_read(struct dwt_context *ctx,
 	};
 
 	LOG_DBG("spi read, header length %u, data length %u",
-		(u16_t)hdr_len, (u32_t)data_len);
-	LOG_HEXDUMP_DBG(hdr_buf, (u16_t)hdr_len, "rd: header");
+		(uint16_t)hdr_len, (uint32_t)data_len);
+	LOG_HEXDUMP_DBG(hdr_buf, (uint16_t)hdr_len, "rd: header");
 
 	if (spi_transceive(ctx->spi, ctx->spi_cfg, &tx, &rx)) {
 		LOG_ERR("SPI transfer failed");
 		return -EIO;
 	}
 
-	LOG_HEXDUMP_DBG(data, (u32_t)data_len, "rd: data");
+	LOG_HEXDUMP_DBG(data, (uint32_t)data_len, "rd: data");
 
 	return 0;
 }
 
 
 static int dwt_spi_write(struct dwt_context *ctx,
-			 u16_t hdr_len, const u8_t *hdr_buf,
-			 u32_t data_len, const u8_t *data)
+			 uint16_t hdr_len, const uint8_t *hdr_buf,
+			 uint32_t data_len, const uint8_t *data)
 {
 	struct spi_buf buf[2] = {
-		{.buf = (u8_t *)hdr_buf, .len = hdr_len},
-		{.buf = (u8_t *)data, .len = data_len}
+		{.buf = (uint8_t *)hdr_buf, .len = hdr_len},
+		{.buf = (uint8_t *)data, .len = data_len}
 	};
 	struct spi_buf_set buf_set = {.buffers = buf, .count = 2};
 
 	LOG_DBG("spi write, header length %u, data length %u",
-		(u16_t)hdr_len, (u32_t)data_len);
-	LOG_HEXDUMP_DBG(hdr_buf, (u16_t)hdr_len, "wr: header");
-	LOG_HEXDUMP_DBG(data, (u32_t)data_len, "wr: data");
+		(uint16_t)hdr_len, (uint32_t)data_len);
+	LOG_HEXDUMP_DBG(hdr_buf, (uint16_t)hdr_len, "wr: header");
+	LOG_HEXDUMP_DBG(data, (uint32_t)data_len, "wr: data");
 
 	if (spi_write(ctx->spi, ctx->spi_cfg, &buf_set)) {
 		LOG_ERR("SPI read failed");
@@ -240,10 +240,10 @@ static int dwt_spi_write(struct dwt_context *ctx,
 
 /* See 2.2.1.2 Transaction formats of the SPI interface */
 static int dwt_spi_transfer(struct dwt_context *ctx,
-			    u8_t reg, u16_t offset,
-			    size_t buf_len, u8_t *buf, bool write)
+			    uint8_t reg, uint16_t offset,
+			    size_t buf_len, uint8_t *buf, bool write)
 {
-	u8_t hdr[DWT_SPI_TRANS_MAX_HDR_LEN] = {0};
+	uint8_t hdr[DWT_SPI_TRANS_MAX_HDR_LEN] = {0};
 	size_t hdr_len = 0;
 
 	hdr[0] = reg & DWT_SPI_TRANS_REG_MAX_RANGE;
@@ -251,12 +251,12 @@ static int dwt_spi_transfer(struct dwt_context *ctx,
 
 	if (offset != 0) {
 		hdr[0] |= DWT_SPI_TRANS_SUB_ADDR;
-		hdr[1] = (u8_t)offset & DWT_SPI_TRANS_SHORT_MAX_OFFSET;
+		hdr[1] = (uint8_t)offset & DWT_SPI_TRANS_SHORT_MAX_OFFSET;
 		hdr_len += 1;
 
 		if (offset > DWT_SPI_TRANS_SHORT_MAX_OFFSET) {
 			hdr[1] |= DWT_SPI_TRANS_EXTEND_ADDR;
-			hdr[2] =  (u8_t)(offset >> 7);
+			hdr[2] =  (uint8_t)(offset >> 7);
 			hdr_len += 1;
 		}
 
@@ -271,41 +271,41 @@ static int dwt_spi_transfer(struct dwt_context *ctx,
 }
 
 static int dwt_register_read(struct dwt_context *ctx,
-			     u8_t reg, u16_t offset, size_t buf_len, u8_t *buf)
+			     uint8_t reg, uint16_t offset, size_t buf_len, uint8_t *buf)
 {
 	return dwt_spi_transfer(ctx, reg, offset, buf_len, buf, false);
 }
 
 static int dwt_register_write(struct dwt_context *ctx,
-			      u8_t reg, u16_t offset, size_t buf_len, u8_t *buf)
+			      uint8_t reg, uint16_t offset, size_t buf_len, uint8_t *buf)
 {
 	return dwt_spi_transfer(ctx, reg, offset, buf_len, buf, true);
 }
 
-static inline u32_t dwt_reg_read_u32(struct dwt_context *ctx,
-				     u8_t reg, u16_t offset)
+static inline uint32_t dwt_reg_read_u32(struct dwt_context *ctx,
+				     uint8_t reg, uint16_t offset)
 {
-	u8_t buf[sizeof(u32_t)];
+	uint8_t buf[sizeof(uint32_t)];
 
 	dwt_spi_transfer(ctx, reg, offset, sizeof(buf), buf, false);
 
 	return sys_get_le32(buf);
 }
 
-static inline u16_t dwt_reg_read_u16(struct dwt_context *ctx,
-				     u8_t reg, u16_t offset)
+static inline uint16_t dwt_reg_read_u16(struct dwt_context *ctx,
+				     uint8_t reg, uint16_t offset)
 {
-	u8_t buf[sizeof(u16_t)];
+	uint8_t buf[sizeof(uint16_t)];
 
 	dwt_spi_transfer(ctx, reg, offset, sizeof(buf), buf, false);
 
 	return sys_get_le16(buf);
 }
 
-static inline u8_t dwt_reg_read_u8(struct dwt_context *ctx,
-				   u8_t reg, u16_t offset)
+static inline uint8_t dwt_reg_read_u8(struct dwt_context *ctx,
+				   uint8_t reg, uint16_t offset)
 {
-	u8_t buf;
+	uint8_t buf;
 
 	dwt_spi_transfer(ctx, reg, offset, sizeof(buf), &buf, false);
 
@@ -313,27 +313,27 @@ static inline u8_t dwt_reg_read_u8(struct dwt_context *ctx,
 }
 
 static inline void dwt_reg_write_u32(struct dwt_context *ctx,
-				     u8_t reg, u16_t offset, u32_t val)
+				     uint8_t reg, uint16_t offset, uint32_t val)
 {
-	u8_t buf[sizeof(u32_t)];
+	uint8_t buf[sizeof(uint32_t)];
 
 	sys_put_le32(val, buf);
 	dwt_spi_transfer(ctx, reg, offset, sizeof(buf), buf, true);
 }
 
 static inline void dwt_reg_write_u16(struct dwt_context *ctx,
-				     u8_t reg, u16_t offset, u16_t val)
+				     uint8_t reg, uint16_t offset, uint16_t val)
 {
-	u8_t buf[sizeof(u16_t)];
+	uint8_t buf[sizeof(uint16_t)];
 
 	sys_put_le16(val, buf);
 	dwt_spi_transfer(ctx, reg, offset, sizeof(buf), buf, true);
 }
 
 static inline void dwt_reg_write_u8(struct dwt_context *ctx,
-				    u8_t reg, u16_t offset, u8_t val)
+				    uint8_t reg, uint16_t offset, uint8_t val)
 {
-	dwt_spi_transfer(ctx, reg, offset, sizeof(u8_t), &val, true);
+	dwt_spi_transfer(ctx, reg, offset, sizeof(uint8_t), &val, true);
 }
 
 static ALWAYS_INLINE void dwt_setup_int(struct dwt_context *ctx,
@@ -379,10 +379,10 @@ static void dwt_disable_txrx(struct dwt_context *ctx)
 }
 
 /* timeout time in units of 1.026 microseconds */
-static int dwt_enable_rx(struct dwt_context *ctx, u16_t timeout)
+static int dwt_enable_rx(struct dwt_context *ctx, uint16_t timeout)
 {
-	u32_t sys_cfg;
-	u16_t sys_ctrl = DWT_SYS_CTRL_RXENAB;
+	uint32_t sys_cfg;
+	uint16_t sys_ctrl = DWT_SYS_CTRL_RXENAB;
 
 	sys_cfg = dwt_reg_read_u32(ctx, DWT_SYS_CFG_ID, 0);
 
@@ -410,20 +410,20 @@ static inline void dwt_irq_handle_rx_cca(struct dwt_context *ctx)
 			  DWT_SYS_STATUS_ALL_RX_GOOD);
 }
 
-static inline void dwt_irq_handle_rx(struct dwt_context *ctx, u32_t sys_stat)
+static inline void dwt_irq_handle_rx(struct dwt_context *ctx, uint32_t sys_stat)
 {
 	struct net_pkt *pkt = NULL;
 	struct dwt_rx_info_regs rx_inf_reg;
 	float a_const;
-	u32_t rx_finfo;
-	u32_t ttcki;
-	u32_t rx_pacc;
-	u32_t cir_pwr;
-	u32_t flags_to_clear;
-	s32_t ttcko;
-	u16_t pkt_len;
-	u8_t *fctrl;
-	s8_t rx_level = INT8_MIN;
+	uint32_t rx_finfo;
+	uint32_t ttcki;
+	uint32_t rx_pacc;
+	uint32_t cir_pwr;
+	uint32_t flags_to_clear;
+	int32_t ttcko;
+	uint16_t pkt_len;
+	uint8_t *fctrl;
+	int8_t rx_level = INT8_MIN;
 
 	LOG_DBG("RX OK event, SYS_STATUS 0x%08x", sys_stat);
 	flags_to_clear = sys_stat & DWT_SYS_STATUS_ALL_RX_GOOD;
@@ -446,7 +446,7 @@ static inline void dwt_irq_handle_rx(struct dwt_context *ctx, u32_t sys_stat)
 
 	dwt_register_read(ctx, DWT_RX_BUFFER_ID, 0, pkt_len, pkt->buffer->data);
 	dwt_register_read(ctx, DWT_RX_FQUAL_ID, 0, sizeof(rx_inf_reg),
-			  (u8_t *)&rx_inf_reg);
+			  (uint8_t *)&rx_inf_reg);
 	net_buf_add(pkt->buffer, pkt_len);
 	fctrl = pkt->buffer->data;
 
@@ -468,9 +468,9 @@ static inline void dwt_irq_handle_rx(struct dwt_context *ctx, u32_t sys_stat)
 	LOG_DBG("ttcko %d ttcki: 0x%08x", ttcko, ttcki);
 
 	if (IS_ENABLED(CONFIG_NET_PKT_TIMESTAMP)) {
-		u8_t ts_buf[sizeof(u64_t)] = {0};
+		uint8_t ts_buf[sizeof(uint64_t)] = {0};
 		struct net_ptp_time timestamp;
-		u64_t ts_fsec;
+		uint64_t ts_fsec;
 
 		memcpy(ts_buf, rx_inf_reg.rx_time, DWT_RX_TIME_RX_STAMP_LEN);
 		ts_fsec = sys_get_le64(ts_buf) * DWT_TS_TIME_UNITS_FS;
@@ -515,7 +515,7 @@ static inline void dwt_irq_handle_rx(struct dwt_context *ctx, u32_t sys_stat)
 
 	/* LQI not implemented */
 	LOG_DBG("Caught a packet (%u) (RSSI: %d)",
-		pkt_len, (s8_t)net_pkt_ieee802154_rssi(pkt));
+		pkt_len, (int8_t)net_pkt_ieee802154_rssi(pkt));
 	LOG_HEXDUMP_DBG(pkt->buffer->data, pkt_len, "RX buffer:");
 
 	if (net_recv_data(ctx->iface, pkt) == NET_OK) {
@@ -542,7 +542,7 @@ rx_out_enable_rx:
 	}
 }
 
-static void dwt_irq_handle_tx(struct dwt_context *ctx, u32_t sys_stat)
+static void dwt_irq_handle_tx(struct dwt_context *ctx, uint32_t sys_stat)
 {
 	/* Clear TX event bits */
 	dwt_reg_write_u32(ctx, DWT_SYS_STATUS_ID, 0,
@@ -552,7 +552,7 @@ static void dwt_irq_handle_tx(struct dwt_context *ctx, u32_t sys_stat)
 	k_sem_give(&ctx->phy_sem);
 }
 
-static void dwt_irq_handle_rxto(struct dwt_context *ctx, u32_t sys_stat)
+static void dwt_irq_handle_rxto(struct dwt_context *ctx, uint32_t sys_stat)
 {
 	/* Clear RX timeout event bits */
 	dwt_reg_write_u32(ctx, DWT_SYS_STATUS_ID, 0,
@@ -570,7 +570,7 @@ static void dwt_irq_handle_rxto(struct dwt_context *ctx, u32_t sys_stat)
 	}
 }
 
-static void dwt_irq_handle_error(struct dwt_context *ctx, u32_t sys_stat)
+static void dwt_irq_handle_error(struct dwt_context *ctx, uint32_t sys_stat)
 {
 	/* Clear RX error event bits */
 	dwt_reg_write_u32(ctx, DWT_SYS_STATUS_ID, 0, DWT_SYS_STATUS_ALL_RX_ERR);
@@ -595,7 +595,7 @@ static void dwt_irq_work_handler(struct k_work *item)
 {
 	struct dwt_context *ctx = CONTAINER_OF(item, struct dwt_context,
 					       irq_cb_work);
-	u32_t sys_stat;
+	uint32_t sys_stat;
 
 	k_sem_take(&ctx->dev_lock, K_FOREVER);
 
@@ -625,7 +625,7 @@ static void dwt_irq_work_handler(struct k_work *item)
 }
 
 static void dwt_gpio_callback(struct device *dev,
-			      struct gpio_callback *cb, u32_t pins)
+			      struct gpio_callback *cb, uint32_t pins)
 {
 	struct dwt_context *ctx = CONTAINER_OF(cb, struct dwt_context, gpio_cb);
 
@@ -640,7 +640,7 @@ static enum ieee802154_hw_caps dwt_get_capabilities(struct device *dev)
 		IEEE802154_HW_FILTER;
 }
 
-static u32_t dwt_get_pkt_duration_ns(struct dwt_context *ctx, u8_t psdu_len)
+static uint32_t dwt_get_pkt_duration_ns(struct dwt_context *ctx, uint8_t psdu_len)
 {
 	struct dwt_phy_config *rf_cfg = &ctx->rf_cfg;
 	float t_psdu = rf_cfg->t_dsym * psdu_len * 8;
@@ -651,7 +651,7 @@ static u32_t dwt_get_pkt_duration_ns(struct dwt_context *ctx, u8_t psdu_len)
 static int dwt_cca(struct device *dev)
 {
 	struct dwt_context *ctx = dev->driver_data;
-	u32_t cca_dur = (dwt_get_pkt_duration_ns(ctx, 127) +
+	uint32_t cca_dur = (dwt_get_pkt_duration_ns(ctx, 127) +
 			 dwt_get_pkt_duration_ns(ctx, 5)) /
 			 UWB_PHY_TDSYM_PHR_6M8;
 
@@ -681,7 +681,7 @@ static int dwt_cca(struct device *dev)
 	return ctx->cca_busy ? -EBUSY : 0;
 }
 
-static int dwt_ed(struct device *dev, u16_t duration,
+static int dwt_ed(struct device *dev, uint16_t duration,
 		  energy_scan_done_cb_t done_cb)
 {
 	/* TODO: see description Sub-Register 0x23:02 – AGC_CTRL1 */
@@ -689,7 +689,7 @@ static int dwt_ed(struct device *dev, u16_t duration,
 	return -ENOTSUP;
 }
 
-static int dwt_set_channel(struct device *dev, u16_t channel)
+static int dwt_set_channel(struct device *dev, uint16_t channel)
 {
 	struct dwt_context *ctx = dev->driver_data;
 	struct dwt_phy_config *rf_cfg = &ctx->rf_cfg;
@@ -711,7 +711,7 @@ static int dwt_set_channel(struct device *dev, u16_t channel)
 	return 0;
 }
 
-static int dwt_set_pan_id(struct device *dev, u16_t pan_id)
+static int dwt_set_pan_id(struct device *dev, uint16_t pan_id)
 {
 	struct dwt_context *ctx = dev->driver_data;
 
@@ -724,7 +724,7 @@ static int dwt_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int dwt_set_short_addr(struct device *dev, u16_t short_addr)
+static int dwt_set_short_addr(struct device *dev, uint16_t short_addr)
 {
 	struct dwt_context *ctx = dev->driver_data;
 
@@ -738,7 +738,7 @@ static int dwt_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int dwt_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int dwt_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
 	struct dwt_context *ctx = dev->driver_data;
 
@@ -748,7 +748,7 @@ static int dwt_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
 
 	k_sem_take(&ctx->dev_lock, K_FOREVER);
 	dwt_register_write(ctx, DWT_EUI_64_ID, DWT_EUI_64_OFFSET,
-			   DWT_EUI_64_LEN, (u8_t *)ieee_addr);
+			   DWT_EUI_64_LEN, (uint8_t *)ieee_addr);
 	k_sem_give(&ctx->dev_lock);
 
 	return 0;
@@ -774,7 +774,7 @@ static int dwt_filter(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int dwt_set_power(struct device *dev, s16_t dbm)
+static int dwt_set_power(struct device *dev, int16_t dbm)
 {
 	struct dwt_context *ctx = dev->driver_data;
 
@@ -788,11 +788,11 @@ static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode,
 {
 	struct dwt_context *ctx = dev->driver_data;
 	size_t len = frag->len;
-	u32_t tx_time = 0;
+	uint32_t tx_time = 0;
 	struct net_ptp_time *txts;
-	u64_t tmp_fs;
-	u32_t tx_fctrl;
-	u8_t sys_ctrl = DWT_SYS_CTRL_TXSTRT;
+	uint64_t tmp_fs;
+	uint32_t tx_fctrl;
+	uint8_t sys_ctrl = DWT_SYS_CTRL_TXSTRT;
 
 	if (atomic_test_and_set_bit(&ctx->state, DWT_STATE_TX)) {
 		LOG_ERR("Transceiver busy");
@@ -855,7 +855,7 @@ static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode,
 	dwt_reg_write_u8(ctx, DWT_SYS_CTRL_ID, DWT_SYS_CTRL_OFFSET, sys_ctrl);
 
 	if (sys_ctrl & DWT_SYS_CTRL_TXDLYS) {
-		u32_t sys_stat = dwt_reg_read_u32(ctx, DWT_SYS_STATUS_ID, 0);
+		uint32_t sys_stat = dwt_reg_read_u32(ctx, DWT_SYS_STATUS_ID, 0);
 
 		if (sys_stat & DWT_SYS_STATUS_HPDWARN) {
 			LOG_WRN("Half Period Delay Warning");
@@ -867,7 +867,7 @@ static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode,
 	k_sem_take(&ctx->phy_sem, K_FOREVER);
 
 	if (IS_ENABLED(CONFIG_NET_PKT_TIMESTAMP)) {
-		u8_t ts_buf[sizeof(u64_t)] = {0};
+		uint8_t ts_buf[sizeof(uint64_t)] = {0};
 		struct net_ptp_time timestamp;
 
 		k_sem_take(&ctx->dev_lock, K_FOREVER);
@@ -875,7 +875,7 @@ static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode,
 				  DWT_TX_TIME_TX_STAMP_OFFSET,
 				  DWT_TX_TIME_TX_STAMP_LEN,
 				  ts_buf);
-		LOG_DBG("ts  hi32 %x", (u32_t)(sys_get_le64(ts_buf) >> 8));
+		LOG_DBG("ts  hi32 %x", (uint32_t)(sys_get_le64(ts_buf) >> 8));
 		LOG_DBG("sys hi32 %x",
 			dwt_reg_read_u32(ctx, DWT_SYS_TIME_ID, 1));
 		k_sem_give(&ctx->dev_lock);
@@ -904,13 +904,13 @@ error:
 }
 
 static void dwt_set_frame_filter(struct dwt_context *ctx,
-				 bool ff_enable, u8_t ff_type)
+				 bool ff_enable, uint8_t ff_type)
 {
-	u32_t sys_cfg_ff = ff_enable ? DWT_SYS_CFG_FFE : 0;
+	uint32_t sys_cfg_ff = ff_enable ? DWT_SYS_CFG_FFE : 0;
 
 	sys_cfg_ff |= ff_type & DWT_SYS_CFG_FF_ALL_EN;
 
-	dwt_reg_write_u8(ctx, DWT_SYS_CFG_ID, 0, (u8_t)sys_cfg_ff);
+	dwt_reg_write_u8(ctx, DWT_SYS_CFG_ID, 0, (uint8_t)sys_cfg_ff);
 }
 
 static int dwt_configure(struct device *dev, enum ieee802154_config_type type,
@@ -979,7 +979,7 @@ static int dwt_hw_reset(struct device *dev)
  * SPI speed in INIT state or for wake-up sequence,
  * see 2.3.2 Overview of main operational states
  */
-static void dwt_set_spi_slow(struct dwt_context *ctx, const u32_t freq)
+static void dwt_set_spi_slow(struct dwt_context *ctx, const uint32_t freq)
 {
 	ctx->spi_cfg_slow.frequency = freq;
 	ctx->spi_cfg = &ctx->spi_cfg_slow;
@@ -994,9 +994,9 @@ static void dwt_set_spi_fast(struct dwt_context *ctx)
 static void dwt_set_rx_mode(struct dwt_context *ctx)
 {
 	struct dwt_phy_config *rf_cfg = &ctx->rf_cfg;
-	u32_t pmsc_ctrl0;
-	u32_t t_on_us;
-	u8_t rx_sniff[2];
+	uint32_t pmsc_ctrl0;
+	uint32_t t_on_us;
+	uint8_t rx_sniff[2];
 
 	/* SNIFF Mode ON time in units of PAC */
 	rx_sniff[0] = CONFIG_IEEE802154_DW1000_SNIFF_ONT &
@@ -1019,7 +1019,7 @@ static void dwt_set_rx_mode(struct dwt_context *ctx)
 static int dwt_start(struct device *dev)
 {
 	struct dwt_context *ctx = dev->driver_data;
-	u8_t cswakeup_buf[32] = {0};
+	uint8_t cswakeup_buf[32] = {0};
 
 	k_sem_take(&ctx->dev_lock, K_FOREVER);
 
@@ -1085,7 +1085,7 @@ static int dwt_stop(struct device *dev)
 
 static inline void dwt_set_sysclks_xti(struct dwt_context *ctx, bool ldeload)
 {
-	u16_t clks = BIT(9) | DWT_PMSC_CTRL0_SYSCLKS_19M;
+	uint16_t clks = BIT(9) | DWT_PMSC_CTRL0_SYSCLKS_19M;
 
 	/*
 	 * See Table 4: Register accesses required to load LDE microcode,
@@ -1101,14 +1101,14 @@ static inline void dwt_set_sysclks_xti(struct dwt_context *ctx, bool ldeload)
 
 static inline void dwt_set_sysclks_auto(struct dwt_context *ctx)
 {
-	u8_t sclks = DWT_PMSC_CTRL0_SYSCLKS_AUTO |
+	uint8_t sclks = DWT_PMSC_CTRL0_SYSCLKS_AUTO |
 		     DWT_PMSC_CTRL0_RXCLKS_AUTO |
 		     DWT_PMSC_CTRL0_TXCLKS_AUTO;
 
 	dwt_reg_write_u8(ctx, DWT_PMSC_ID, DWT_PMSC_CTRL0_OFFSET, sclks);
 }
 
-static u32_t dwt_otpmem_read(struct dwt_context *ctx, u16_t otp_addr)
+static uint32_t dwt_otpmem_read(struct dwt_context *ctx, uint16_t otp_addr)
 {
 	dwt_reg_write_u16(ctx, DWT_OTP_IF_ID, DWT_OTP_ADDR, otp_addr);
 
@@ -1123,8 +1123,8 @@ static u32_t dwt_otpmem_read(struct dwt_context *ctx, u16_t otp_addr)
 
 static int dwt_initialise_dev(struct dwt_context *ctx)
 {
-	u32_t otp_val = 0;
-	u8_t xtal_trim;
+	uint32_t otp_val = 0;
+	uint8_t xtal_trim;
 
 	dwt_set_sysclks_xti(ctx, false);
 	ctx->sleep_mode = 0;
@@ -1167,7 +1167,7 @@ static int dwt_initialise_dev(struct dwt_context *ctx)
 	otp_val = dwt_otpmem_read(ctx, DWT_OTP_XTRIM_ADDR);
 	xtal_trim = otp_val & DWT_FS_XTALT_MASK;
 	LOG_INF("OTP Revision 0x%02x, XTAL Trim 0x%02x",
-		(u8_t)(otp_val >> 8), xtal_trim);
+		(uint8_t)(otp_val >> 8), xtal_trim);
 
 	LOG_DBG("CHIP ID 0x%08x", dwt_otpmem_read(ctx, DWT_OTP_PARTID_ADDR));
 	LOG_DBG("LOT ID 0x%08x", dwt_otpmem_read(ctx, DWT_OTP_LOTID_ADDR));
@@ -1235,25 +1235,25 @@ static int dwt_initialise_dev(struct dwt_context *ctx)
 static int dwt_configure_rf_phy(struct dwt_context *ctx)
 {
 	struct dwt_phy_config *rf_cfg = &ctx->rf_cfg;
-	u8_t chan = rf_cfg->channel;
-	u8_t prf_idx = rf_cfg->prf;
-	u32_t chan_ctrl = 0;
-	u8_t rxctrlh;
-	u8_t pll_tune;
-	u8_t tune4h;
-	u8_t pgdelay;
-	u16_t lde_repc;
-	u16_t agc_tune1;
-	u16_t sfdto;
-	u16_t tune1a;
-	u16_t tune0b;
-	u16_t tune1b;
-	u32_t txctrl;
-	u32_t pll_cfg;
-	u32_t tune2;
-	u32_t sys_cfg;
-	u32_t tx_fctrl;
-	u32_t power;
+	uint8_t chan = rf_cfg->channel;
+	uint8_t prf_idx = rf_cfg->prf;
+	uint32_t chan_ctrl = 0;
+	uint8_t rxctrlh;
+	uint8_t pll_tune;
+	uint8_t tune4h;
+	uint8_t pgdelay;
+	uint16_t lde_repc;
+	uint16_t agc_tune1;
+	uint16_t sfdto;
+	uint16_t tune1a;
+	uint16_t tune0b;
+	uint16_t tune1b;
+	uint32_t txctrl;
+	uint32_t pll_cfg;
+	uint32_t tune2;
+	uint32_t sys_cfg;
+	uint32_t tx_fctrl;
+	uint32_t power;
 
 	if ((chan < 1) || (chan > 7) || (chan == 6)) {
 		LOG_ERR("Channel not supported %u", chan);
@@ -1461,7 +1461,7 @@ static int dwt_configure_rf_phy(struct dwt_context *ctx)
 	 * SHR: synchronisation header (SYNC + SFD)
 	 * PHR: PHY header
 	 */
-	u16_t nsync = BIT(rf_cfg->tx_shr_nsync + 6);
+	uint16_t nsync = BIT(rf_cfg->tx_shr_nsync + 6);
 
 	if (rf_cfg->prf == DWT_PRF_64M) {
 		rf_cfg->t_shr = UWB_PHY_TPSYM_PRF64 *
@@ -1616,13 +1616,13 @@ static int dw1000_init(struct device *dev)
 	return 0;
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct dwt_context *dw1000 = dev->driver_data;
-	u32_t *ptr = (u32_t *)(dw1000->mac_addr);
+	uint32_t *ptr = (uint32_t *)(dw1000->mac_addr);
 
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
-	ptr = (u32_t *)(dw1000->mac_addr + 4);
+	ptr = (uint32_t *)(dw1000->mac_addr + 4);
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
 
 	dw1000->mac_addr[0] = (dw1000->mac_addr[0] & ~0x01) | 0x02;
@@ -1634,7 +1634,7 @@ static void dwt_iface_api_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct dwt_context *dw1000 = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 
diff --git a/drivers/ieee802154/ieee802154_dw1000_regs.h b/drivers/ieee802154/ieee802154_dw1000_regs.h
index b4a8b2910b..c201c1462f 100644
--- a/drivers/ieee802154/ieee802154_dw1000_regs.h
+++ b/drivers/ieee802154/ieee802154_dw1000_regs.h
@@ -1873,10 +1873,10 @@
  * Map the channel number to the index in the configuration arrays below.
  *                  Channel: na  1  2  3  4  5 na  7
  */
-const u8_t dwt_ch_to_cfg[] = {0, 0, 1, 2, 3, 4, 0, 5};
+const uint8_t dwt_ch_to_cfg[] = {0, 0, 1, 2, 3, 4, 0, 5};
 
 /* Defaults from Table 38: Sub-Register 0x28:0C– RF_TXCTRL values */
-const u32_t dwt_txctrl_defs[] = {
+const uint32_t dwt_txctrl_defs[] = {
 	DWT_RF_TXCTRL_CH1,
 	DWT_RF_TXCTRL_CH2,
 	DWT_RF_TXCTRL_CH3,
@@ -1886,7 +1886,7 @@ const u32_t dwt_txctrl_defs[] = {
 };
 
 /* Defaults from Table 43: Sub-Register 0x2B:07 – FS_PLLCFG values */
-const u32_t dwt_pllcfg_defs[] = {
+const uint32_t dwt_pllcfg_defs[] = {
 	DWT_FS_PLLCFG_CH1,
 	DWT_FS_PLLCFG_CH2,
 	DWT_FS_PLLCFG_CH3,
@@ -1896,7 +1896,7 @@ const u32_t dwt_pllcfg_defs[] = {
 };
 
 /* Defaults from Table 44: Sub-Register 0x2B:0B – FS_PLLTUNE values */
-const u8_t dwt_plltune_defs[] = {
+const uint8_t dwt_plltune_defs[] = {
 	DWT_FS_PLLTUNE_CH1,
 	DWT_FS_PLLTUNE_CH2,
 	DWT_FS_PLLTUNE_CH3,
@@ -1906,7 +1906,7 @@ const u8_t dwt_plltune_defs[] = {
 };
 
 /* Defaults from Table 37: Sub-Register 0x28:0B– RF_RXCTRLH values */
-const u8_t dwt_rxctrlh_defs[] = {
+const uint8_t dwt_rxctrlh_defs[] = {
 	DWT_RF_RXCTRLH_NBW,
 	DWT_RF_RXCTRLH_NBW,
 	DWT_RF_RXCTRLH_NBW,
@@ -1916,7 +1916,7 @@ const u8_t dwt_rxctrlh_defs[] = {
 };
 
 /* Defaults from Table 40: Sub-Register 0x2A:0B – TC_PGDELAY */
-const u8_t dwt_pgdelay_defs[] = {
+const uint8_t dwt_pgdelay_defs[] = {
 	DWT_TC_PGDELAY_CH1,
 	DWT_TC_PGDELAY_CH2,
 	DWT_TC_PGDELAY_CH3,
@@ -1930,7 +1930,7 @@ const u8_t dwt_pgdelay_defs[] = {
  *     0x1E – Transmit Power Control for Smart Transmit Power Control
  *     Transmit Power Control values for 16 MHz, with DIS_STXP = 0
  */
-const u32_t dwt_txpwr_stxp0_16[] = {
+const uint32_t dwt_txpwr_stxp0_16[] = {
 	0x15355575,
 	0x15355575,
 	0x0F2F4F6F,
@@ -1944,7 +1944,7 @@ const u32_t dwt_txpwr_stxp0_16[] = {
  *     0x1E – Transmit Power Control for Smart Transmit Power Control
  *     Transmit Power Control values for 64 MHz, with DIS_STXP = 0
  */
-const u32_t dwt_txpwr_stxp0_64[] = {
+const uint32_t dwt_txpwr_stxp0_64[] = {
 	 0x07274767,
 	 0x07274767,
 	 0x2B4B6B8B,
@@ -1958,7 +1958,7 @@ const u32_t dwt_txpwr_stxp0_64[] = {
  *     0x1E – Transmit Power Control for Manual Transmit Power Control
  *     Transmit Power Control values for 16 MHz, with DIS_STXP = 1
  */
-const u32_t dwt_txpwr_stxp1_16[] = {
+const uint32_t dwt_txpwr_stxp1_16[] = {
 	0x75757575,
 	0x75757575,
 	0x6F6F6F6F,
@@ -1972,7 +1972,7 @@ const u32_t dwt_txpwr_stxp1_16[] = {
  *     0x1E – Transmit Power Control for Manual Transmit Power Control
  *     Transmit Power Control values for 64 MHz, with DIS_STXP = 1
  */
-const u32_t dwt_txpwr_stxp1_64[] = {
+const uint32_t dwt_txpwr_stxp1_64[] = {
 	0x67676767,
 	0x67676767,
 	0x8B8B8B8B,
@@ -1988,7 +1988,7 @@ enum dwt_pulse_repetition_frequency {
 };
 
 /* Defaults from Table 24: Sub-Register 0x23:04 – AGC_TUNE1 values */
-const u16_t dwt_agc_tune1_defs[] = {
+const uint16_t dwt_agc_tune1_defs[] = {
 	DWT_AGC_TUNE1_16M,
 	DWT_AGC_TUNE1_64M
 };
@@ -2001,14 +2001,14 @@ enum dwt_baud_rate {
 };
 
 /* Decawave non-standard SFD lengths */
-const u8_t dwt_ns_sfdlen[] = {
+const uint8_t dwt_ns_sfdlen[] = {
 	DWT_DW_NS_SFD_LEN_110K,
 	DWT_DW_NS_SFD_LEN_850K,
 	DWT_DW_NS_SFD_LEN_6M8
 };
 
 /* Defaults from Table 30: Sub-Register 0x27:02 – DRX_TUNE0b values */
-const u16_t dwt_tune0b_defs[DWT_NUMOF_BRS][2] = {
+const uint16_t dwt_tune0b_defs[DWT_NUMOF_BRS][2] = {
 	{
 		DWT_DRX_TUNE0b_110K_STD,
 		DWT_DRX_TUNE0b_110K_NSTD
@@ -2024,7 +2024,7 @@ const u16_t dwt_tune0b_defs[DWT_NUMOF_BRS][2] = {
 };
 
 /* Defaults from Table 31: Sub-Register 0x27:04 – DRX_TUNE1a values */
-const u16_t dwt_tune1a_defs[] = {
+const uint16_t dwt_tune1a_defs[] = {
 	DWT_DRX_TUNE1a_PRF16,
 	DWT_DRX_TUNE1a_PRF64
 };
@@ -2038,7 +2038,7 @@ enum dwt_acquisition_chunk_size {
 };
 
 /* Defaults from Table 33: Sub-Register 0x27:08 – DRX_TUNE2 values */
-const u32_t dwt_tune2_defs[DWT_NUMOF_PRFS][DWT_NUMOF_PACS] = {
+const uint32_t dwt_tune2_defs[DWT_NUMOF_PRFS][DWT_NUMOF_PACS] = {
 	{
 		DWT_DRX_TUNE2_PRF16_PAC8,
 		DWT_DRX_TUNE2_PRF16_PAC16,
@@ -2059,7 +2059,7 @@ const u32_t dwt_tune2_defs[DWT_NUMOF_PRFS][DWT_NUMOF_PACS] = {
  *
  * For 110 kbps the values have to be divided by 8.
  */
-const u16_t dwt_lde_repc_defs[] = {
+const uint16_t dwt_lde_repc_defs[] = {
 	0,
 	DWT_LDE_REPC_PCODE_1,
 	DWT_LDE_REPC_PCODE_2,
@@ -2104,7 +2104,7 @@ enum dwt_plen_idx {
  * From Table 16: Preamble length selection
  *       BIT(19) | BIT(18) | BIT(21) | BIT(20)
  */
-const u32_t dwt_plen_cfg[] = {
+const uint32_t dwt_plen_cfg[] = {
 	(0       | BIT(18) | 0       | 0),
 	(0       | BIT(18) | 0       | BIT(20)),
 	(0       | BIT(18) | BIT(21) | 0),
diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c
index 6e39fe337c..4e86f22c64 100644
--- a/drivers/ieee802154/ieee802154_kw41z.c
+++ b/drivers/ieee802154/ieee802154_kw41z.c
@@ -47,11 +47,11 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define KW41_DBG_TRACE_SIZE 30
 
 struct kw41_dbg_trace {
-	u8_t	type;
-	u32_t	time;
-	u32_t	irqsts;
-	u32_t	phy_ctrl;
-	u32_t	seq_state;
+	uint8_t	type;
+	uint32_t	time;
+	uint32_t	irqsts;
+	uint32_t	phy_ctrl;
+	uint32_t	seq_state;
 };
 
 struct kw41_dbg_trace kw41_dbg[KW41_DBG_TRACE_SIZE];
@@ -122,7 +122,7 @@ enum {
 };
 
 /* Lookup table for PA_PWR register */
-static const u8_t pa_pwr_lt[] = {
+static const uint8_t pa_pwr_lt[] = {
 	1,                   /* -31.1 dBm: -31 */
 	2, 2, 2, 2, 2, 2, 2, /* -25.0 dBm: -30, -29, -28, -27, -26, -25 */
 	4, 4, 4, 4, 4,       /* -19.0 dBm: -24, -23, -22, -21, -20, -19 */
@@ -148,32 +148,32 @@ static const u8_t pa_pwr_lt[] = {
 
 struct kw41z_context {
 	struct net_if *iface;
-	u8_t mac_addr[8];
+	uint8_t mac_addr[8];
 
 	struct k_sem seq_sync;
 	atomic_t seq_retval;
 
-	u32_t rx_warmup_time;
-	u32_t tx_warmup_time;
+	uint32_t rx_warmup_time;
+	uint32_t tx_warmup_time;
 
 	bool frame_pending; /* FP bit state from the most recent ACK frame. */
 };
 
 static struct kw41z_context kw41z_context_data;
 
-static inline u8_t kw41z_get_instant_state(void)
+static inline uint8_t kw41z_get_instant_state(void)
 {
 	return (ZLL->SEQ_STATE & ZLL_SEQ_STATE_SEQ_STATE_MASK) >>
 	       ZLL_SEQ_STATE_SEQ_STATE_SHIFT;
 }
 
-static inline u8_t kw41z_get_seq_state(void)
+static inline uint8_t kw41z_get_seq_state(void)
 {
 	return (ZLL->PHY_CTRL & ZLL_PHY_CTRL_XCVSEQ_MASK) >>
 	       ZLL_PHY_CTRL_XCVSEQ_SHIFT;
 }
 
-static inline void kw41z_set_seq_state(u8_t state)
+static inline void kw41z_set_seq_state(uint8_t state)
 {
 #if CONFIG_SOC_MKW40Z4
 	/*
@@ -191,7 +191,7 @@ static inline void kw41z_set_seq_state(u8_t state)
 
 static inline void kw41z_wait_for_idle(void)
 {
-	u8_t state = kw41z_get_instant_state();
+	uint8_t state = kw41z_get_instant_state();
 
 	while (state != KW41Z_STATE_IDLE) {
 		state = kw41z_get_instant_state();
@@ -248,7 +248,7 @@ static void kw41z_phy_abort(void)
 
 static void kw41z_isr_timeout_cleanup(void)
 {
-	u32_t irqsts;
+	uint32_t irqsts;
 
 	/*
 	 * Set the PHY sequencer back to IDLE and disable TMR3 comparator
@@ -276,7 +276,7 @@ static void kw41z_isr_timeout_cleanup(void)
 
 static void kw41z_isr_seq_cleanup(void)
 {
-	u32_t irqsts;
+	uint32_t irqsts;
 
 	/* Set the PHY sequencer back to IDLE */
 	ZLL->PHY_CTRL &= ~ZLL_PHY_CTRL_XCVSEQ_MASK;
@@ -315,9 +315,9 @@ static inline void kw41z_disable_seq_irq(void)
  * Set the T3CMP timer comparator. The 'timeout' value is an offset from
  * now.
  */
-static void kw41z_tmr3_set_timeout(u32_t timeout)
+static void kw41z_tmr3_set_timeout(uint32_t timeout)
 {
-	u32_t irqsts;
+	uint32_t irqsts;
 
 	/* Add in the current time so that we can get the comparator to
 	 * match appropriately to our offset time.
@@ -339,7 +339,7 @@ static void kw41z_tmr3_set_timeout(u32_t timeout)
 
 static void kw41z_tmr3_disable(void)
 {
-	u32_t irqsts;
+	uint32_t irqsts;
 
 	/*
 	 * disable TMR3 compare and disable autosequence stop by TC3
@@ -383,7 +383,7 @@ static int kw41z_cca(struct device *dev)
 	return kw41z->seq_retval;
 }
 
-static int kw41z_set_channel(struct device *dev, u16_t channel)
+static int kw41z_set_channel(struct device *dev, uint16_t channel)
 {
 	if (channel < 11 || channel > 26) {
 		return -EINVAL;
@@ -393,7 +393,7 @@ static int kw41z_set_channel(struct device *dev, u16_t channel)
 	return 0;
 }
 
-static int kw41z_set_pan_id(struct device *dev, u16_t pan_id)
+static int kw41z_set_pan_id(struct device *dev, uint16_t pan_id)
 {
 	ZLL->MACSHORTADDRS0 = (ZLL->MACSHORTADDRS0 &
 			       ~ZLL_MACSHORTADDRS0_MACPANID0_MASK) |
@@ -401,7 +401,7 @@ static int kw41z_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int kw41z_set_short_addr(struct device *dev, u16_t short_addr)
+static int kw41z_set_short_addr(struct device *dev, uint16_t short_addr)
 {
 	ZLL->MACSHORTADDRS0 = (ZLL->MACSHORTADDRS0 &
 			       ~ZLL_MACSHORTADDRS0_MACSHORTADDRS0_MASK) |
@@ -409,9 +409,9 @@ static int kw41z_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int kw41z_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int kw41z_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
-	u32_t val;
+	uint32_t val;
 
 	memcpy(&val, ieee_addr, sizeof(val));
 	ZLL->MACLONGADDRS0_LSB = val;
@@ -444,7 +444,7 @@ static int kw41z_filter(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int kw41z_set_txpower(struct device *dev, s16_t dbm)
+static int kw41z_set_txpower(struct device *dev, int16_t dbm)
 {
 	if (dbm < KW41Z_OUTPUT_POWER_MIN) {
 		LOG_INF("TX-power %d dBm below min of %d dBm, using %d dBm",
@@ -485,7 +485,7 @@ static int kw41z_stop(struct device *dev)
 	return 0;
 }
 
-static u8_t kw41z_convert_lqi(u8_t hw_lqi)
+static uint8_t kw41z_convert_lqi(uint8_t hw_lqi)
 {
 	if (hw_lqi >= 220U) {
 		return 255;
@@ -494,11 +494,11 @@ static u8_t kw41z_convert_lqi(u8_t hw_lqi)
 	}
 }
 
-static inline void kw41z_rx(struct kw41z_context *kw41z, u8_t len)
+static inline void kw41z_rx(struct kw41z_context *kw41z, uint8_t len)
 {
 	struct net_pkt *pkt = NULL;
 	struct net_buf *buf = NULL;
-	u8_t pkt_len, hw_lqi;
+	uint8_t pkt_len, hw_lqi;
 	int rslt;
 
 	LOG_DBG("ENTRY: len: %d", len);
@@ -523,7 +523,7 @@ static inline void kw41z_rx(struct kw41z_context *kw41z, u8_t len)
 
 #if CONFIG_SOC_MKW41Z4
 	/* PKT_BUFFER_RX needs to be accessed aligned to 16 bits */
-	for (u16_t reg_val = 0, i = 0; i < pkt_len; i++) {
+	for (uint16_t reg_val = 0, i = 0; i < pkt_len; i++) {
 		if (i % 2 == 0U) {
 			reg_val = ZLL->PKT_BUFFER_RX[i/2U];
 			buf->data[i] = reg_val & 0xFF;
@@ -533,7 +533,7 @@ static inline void kw41z_rx(struct kw41z_context *kw41z, u8_t len)
 	}
 #else /* CONFIG_SOC_MKW40Z4 */
 	/* PKT_BUFFER needs to be accessed aligned to 32 bits */
-	for (u32_t reg_val = 0, i = 0; i < pkt_len; i++) {
+	for (uint32_t reg_val = 0, i = 0; i < pkt_len; i++) {
 		switch (i % 4) {
 		case 0:
 			reg_val = ZLL->PKT_BUFFER[i/4U];
@@ -575,10 +575,10 @@ out:
 #define ACK_FRAME_TYPE (2 << 0)
 #define ACK_FRAME_PENDING_BIT (1 << 4)
 
-static void handle_ack(struct kw41z_context *kw41z, u8_t seq_number)
+static void handle_ack(struct kw41z_context *kw41z, uint8_t seq_number)
 {
 	struct net_pkt *ack_pkt;
-	u8_t ack_psdu[ACK_FRAME_LEN];
+	uint8_t ack_psdu[ACK_FRAME_LEN];
 
 	ack_pkt = net_pkt_alloc_with_buffer(kw41z->iface, ACK_FRAME_LEN,
 					    AF_UNSPEC, 0, K_NO_WAIT);
@@ -616,9 +616,9 @@ static int kw41z_tx(struct device *dev, enum ieee802154_tx_mode mode,
 		    struct net_pkt *pkt, struct net_buf *frag)
 {
 	struct kw41z_context *kw41z = dev->driver_data;
-	u8_t payload_len = frag->len;
-	u32_t tx_timeout;
-	u8_t xcvseq;
+	uint8_t payload_len = frag->len;
+	uint32_t tx_timeout;
+	uint8_t xcvseq;
 	int key;
 
 	if (mode != IEEE802154_TX_MODE_DIRECT) {
@@ -648,12 +648,12 @@ static int kw41z_tx(struct device *dev, enum ieee802154_tx_mode mode,
 	kw41z_disable_seq_irq();
 
 #if CONFIG_SOC_MKW41Z4
-	((u8_t *)ZLL->PKT_BUFFER_TX)[0] = payload_len + KW41Z_FCS_LENGTH;
-	memcpy(((u8_t *)ZLL->PKT_BUFFER_TX) + 1,
+	((uint8_t *)ZLL->PKT_BUFFER_TX)[0] = payload_len + KW41Z_FCS_LENGTH;
+	memcpy(((uint8_t *)ZLL->PKT_BUFFER_TX) + 1,
 		(void *)frag->data, payload_len);
 #else /* CONFIG_SOC_MKW40Z4 */
-	((u8_t *)ZLL->PKT_BUFFER)[0] = payload_len + KW41Z_FCS_LENGTH;
-	memcpy(((u8_t *)ZLL->PKT_BUFFER) + 1,
+	((uint8_t *)ZLL->PKT_BUFFER)[0] = payload_len + KW41Z_FCS_LENGTH;
+	memcpy(((uint8_t *)ZLL->PKT_BUFFER) + 1,
 		(void *)frag->data, payload_len);
 #endif
 
@@ -711,16 +711,16 @@ static int kw41z_tx(struct device *dev, enum ieee802154_tx_mode mode,
 
 static void kw41z_isr(int unused)
 {
-	u32_t irqsts = ZLL->IRQSTS;
-	u8_t state = kw41z_get_seq_state();
-	u8_t restart_rx = 1U;
-	u32_t rx_len;
+	uint32_t irqsts = ZLL->IRQSTS;
+	uint8_t state = kw41z_get_seq_state();
+	uint8_t restart_rx = 1U;
+	uint32_t rx_len;
 
 	/*
 	 * Variable is used in debug output to capture the state of the
 	 * sequencer at interrupt.
 	 */
-	u32_t seq_state = ZLL->SEQ_STATE;
+	uint32_t seq_state = ZLL->SEQ_STATE;
 
 	LOG_DBG("ENTRY: irqsts: 0x%08X, PHY_CTRL: 0x%08X, "
 		"SEQ_STATE: 0x%08X, SEQ_CTRL: 0x%08X, TMR: %d, state: %d",
@@ -924,7 +924,7 @@ static void kw41z_isr(int unused)
 	}
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct kw41z_context *kw41z = dev->driver_data;
 
@@ -939,10 +939,10 @@ static inline u8_t *get_mac(struct device *dev)
 	 *       and how to allow for a OUI portion?
 	 */
 
-	u32_t *ptr = (u32_t *)(kw41z->mac_addr);
+	uint32_t *ptr = (uint32_t *)(kw41z->mac_addr);
 
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
-	ptr = (u32_t *)(kw41z->mac_addr + 4);
+	ptr = (uint32_t *)(kw41z->mac_addr + 4);
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
 
 	/*
@@ -1064,7 +1064,7 @@ static void kw41z_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct kw41z_context *kw41z = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 #if defined(CONFIG_KW41_DBG_TRACE)
 	kw41_dbg_idx = 0;
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
index adc7a46ba5..c1a9834317 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.c
+++ b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -113,7 +113,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define MCR20A_OUTPUT_POWER_MIN	(-35)
 
 /* Lookup table for the Power Control register */
-static const u8_t pow_lt[44] = {
+static const uint8_t pow_lt[44] = {
 	3, 4, 5, 6,
 	6, 7, 7, 8,
 	8, 9, 9, 10,
@@ -135,14 +135,14 @@ static const u8_t pow_lt[44] = {
  * F = ((PLL_INT0 + 64) + (PLL_FRAC0/65536))32MHz
  *
  */
-static const u8_t pll_int_lt[16] = {
+static const uint8_t pll_int_lt[16] = {
 	11, 11, 11, 11,
 	11, 11, 12, 12,
 	12, 12, 12, 12,
 	13, 13, 13, 13
 };
 
-static const u16_t pll_frac_lt[16] = {
+static const uint16_t pll_frac_lt[16] = {
 	10240, 20480, 30720, 40960,
 	51200, 61440, 6144, 16384,
 	26624, 36864, 47104, 57344,
@@ -152,15 +152,15 @@ static const u16_t pll_frac_lt[16] = {
 #define z_usleep(usec) k_busy_wait(usec)
 
 /* Read direct (dreg is true) or indirect register (dreg is false) */
-u8_t z_mcr20a_read_reg(struct mcr20a_context *dev, bool dreg, u8_t addr)
+uint8_t z_mcr20a_read_reg(struct mcr20a_context *dev, bool dreg, uint8_t addr)
 {
-	u8_t cmd_buf[3] = {
+	uint8_t cmd_buf[3] = {
 		dreg ? (MCR20A_REG_READ | addr) :
 		(MCR20A_IAR_INDEX | MCR20A_REG_WRITE),
 		dreg ? 0 : (addr | MCR20A_REG_READ),
 		0
 	};
-	u8_t len = dreg ? 2 : 3;
+	uint8_t len = dreg ? 2 : 3;
 	const struct spi_buf buf = {
 		.buf = cmd_buf,
 		.len = len
@@ -184,10 +184,10 @@ u8_t z_mcr20a_read_reg(struct mcr20a_context *dev, bool dreg, u8_t addr)
 }
 
 /* Write direct (dreg is true) or indirect register (dreg is false) */
-bool z_mcr20a_write_reg(struct mcr20a_context *dev, bool dreg, u8_t addr,
-		       u8_t value)
+bool z_mcr20a_write_reg(struct mcr20a_context *dev, bool dreg, uint8_t addr,
+		       uint8_t value)
 {
-	u8_t cmd_buf[3] = {
+	uint8_t cmd_buf[3] = {
 		dreg ? (MCR20A_REG_WRITE | addr) :
 		(MCR20A_IAR_INDEX | MCR20A_REG_WRITE),
 		dreg ? value : (addr | MCR20A_REG_WRITE),
@@ -206,10 +206,10 @@ bool z_mcr20a_write_reg(struct mcr20a_context *dev, bool dreg, u8_t addr,
 }
 
 /* Write multiple bytes to direct or indirect register */
-bool z_mcr20a_write_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
-			 u8_t *data_buf, u8_t len)
+bool z_mcr20a_write_burst(struct mcr20a_context *dev, bool dreg, uint16_t addr,
+			 uint8_t *data_buf, uint8_t len)
 {
-	u8_t cmd_buf[2] = {
+	uint8_t cmd_buf[2] = {
 		dreg ? MCR20A_REG_WRITE | addr :
 		MCR20A_IAR_INDEX | MCR20A_REG_WRITE,
 		dreg ? 0 : addr | MCR20A_REG_WRITE
@@ -233,10 +233,10 @@ bool z_mcr20a_write_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
 }
 
 /* Read multiple bytes from direct or indirect register */
-bool z_mcr20a_read_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
-			u8_t *data_buf, u8_t len)
+bool z_mcr20a_read_burst(struct mcr20a_context *dev, bool dreg, uint16_t addr,
+			uint8_t *data_buf, uint8_t len)
 {
-	u8_t cmd_buf[2] = {
+	uint8_t cmd_buf[2] = {
 		dreg ? MCR20A_REG_READ | addr :
 		MCR20A_IAR_INDEX | MCR20A_REG_WRITE,
 		dreg ? 0 : addr | MCR20A_REG_READ
@@ -266,7 +266,7 @@ bool z_mcr20a_read_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
 /* Mask (msk is true) or unmask all interrupts from asserting IRQ_B */
 static bool mcr20a_mask_irqb(struct mcr20a_context *dev, bool msk)
 {
-	u8_t ctrl4 = read_reg_phy_ctrl4(dev);
+	uint8_t ctrl4 = read_reg_phy_ctrl4(dev);
 
 	if (msk) {
 		ctrl4 |= MCR20A_PHY_CTRL4_TRCV_MSK;
@@ -279,14 +279,14 @@ static bool mcr20a_mask_irqb(struct mcr20a_context *dev, bool msk)
 
 /** Set an timeout value for the given compare register */
 static int mcr20a_timer_set(struct mcr20a_context *mcr20a,
-			    u8_t cmp_reg,
-			    u32_t timeout)
+			    uint8_t cmp_reg,
+			    uint32_t timeout)
 {
-	u32_t now = 0U;
-	u32_t next;
+	uint32_t now = 0U;
+	uint32_t next;
 	bool retval;
 
-	if (!read_burst_event_timer(mcr20a, (u8_t *)&now)) {
+	if (!read_burst_event_timer(mcr20a, (uint8_t *)&now)) {
 		goto error;
 	}
 
@@ -297,16 +297,16 @@ static int mcr20a_timer_set(struct mcr20a_context *mcr20a,
 
 	switch (cmp_reg) {
 	case 1:
-		retval = write_burst_t1cmp(mcr20a, (u8_t *)&next);
+		retval = write_burst_t1cmp(mcr20a, (uint8_t *)&next);
 		break;
 	case 2:
-		retval = write_burst_t2cmp(mcr20a, (u8_t *)&next);
+		retval = write_burst_t2cmp(mcr20a, (uint8_t *)&next);
 		break;
 	case 3:
-		retval = write_burst_t3cmp(mcr20a, (u8_t *)&next);
+		retval = write_burst_t3cmp(mcr20a, (uint8_t *)&next);
 		break;
 	case 4:
-		retval = write_burst_t4cmp(mcr20a, (u8_t *)&next);
+		retval = write_burst_t4cmp(mcr20a, (uint8_t *)&next);
 		break;
 	default:
 		goto error;
@@ -323,11 +323,11 @@ error:
 	return -EIO;
 }
 
-static int mcr20a_timer_init(struct device *dev, u8_t tb)
+static int mcr20a_timer_init(struct device *dev, uint8_t tb)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t buf[3] = {0, 0, 0};
-	u8_t ctrl4;
+	uint8_t buf[3] = {0, 0, 0};
+	uint8_t ctrl4;
 
 	if (!write_reg_tmr_prescale(mcr20a,
 				    set_bits_tmr_prescale(tb))) {
@@ -354,10 +354,10 @@ error:
 
 /* Set Timer Comparator 4 */
 static int mcr20a_t4cmp_set(struct mcr20a_context *mcr20a,
-			    u32_t timeout)
+			    uint32_t timeout)
 {
-	u8_t irqsts3;
-	u8_t ctrl3;
+	uint8_t irqsts3;
+	uint8_t ctrl3;
 
 	if (mcr20a_timer_set(mcr20a, 4, timeout)) {
 		goto error;
@@ -387,8 +387,8 @@ error:
 /* Clear Timer Comparator 4 */
 static int mcr20a_t4cmp_clear(struct mcr20a_context *mcr20a)
 {
-	u8_t irqsts3;
-	u8_t ctrl3;
+	uint8_t irqsts3;
+	uint8_t ctrl3;
 
 	ctrl3 = read_reg_phy_ctrl3(mcr20a);
 	ctrl3 &= ~MCR20A_PHY_CTRL3_TMR4CMP_EN;
@@ -411,8 +411,8 @@ error:
 
 static inline void xcvseq_wait_until_idle(struct mcr20a_context *mcr20a)
 {
-	u8_t state;
-	u8_t retries = MCR20A_GET_SEQ_STATE_RETRIES;
+	uint8_t state;
+	uint8_t retries = MCR20A_GET_SEQ_STATE_RETRIES;
 
 	do {
 		state = read_reg_seq_state(mcr20a);
@@ -427,7 +427,7 @@ static inline void xcvseq_wait_until_idle(struct mcr20a_context *mcr20a)
 static inline int mcr20a_abort_sequence(struct mcr20a_context *mcr20a,
 					bool force)
 {
-	u8_t ctrl1;
+	uint8_t ctrl1;
 
 	ctrl1 = read_reg_phy_ctrl1(mcr20a);
 	LOG_DBG("CTRL1 0x%02x", ctrl1);
@@ -457,9 +457,9 @@ static inline int mcr20a_abort_sequence(struct mcr20a_context *mcr20a,
 
 /* Initiate a (new) Transceiver Sequence */
 static inline int mcr20a_set_sequence(struct mcr20a_context *mcr20a,
-				      u8_t seq)
+				      uint8_t seq)
 {
-	u8_t ctrl1 = 0U;
+	uint8_t ctrl1 = 0U;
 
 	seq = set_bits_phy_ctrl1_xcvseq(seq);
 	ctrl1 = read_reg_phy_ctrl1(mcr20a);
@@ -480,7 +480,7 @@ static inline int mcr20a_set_sequence(struct mcr20a_context *mcr20a,
 	return 0;
 }
 
-static inline u32_t mcr20a_get_rssi(u32_t lqi)
+static inline uint32_t mcr20a_get_rssi(uint32_t lqi)
 {
 	/* Get rssi (Received Signal Strength Indicator, unit is dBm)
 	 * from lqi (Link Quality Indicator) value.
@@ -493,19 +493,19 @@ static inline u32_t mcr20a_get_rssi(u32_t lqi)
 	 * -RF * 65536 = (LQI / 2.84 - 295.4 / 2.84) * 65536
 	 * RF * 65536 = (295.4 * 65536 / 2.84) - (LQI * 65536 / 2.84)
 	 */
-	u32_t a = (u32_t)(295.4 * 65536 / 2.84);
-	u32_t b = (u32_t)(65536 / 2.84);
+	uint32_t a = (uint32_t)(295.4 * 65536 / 2.84);
+	uint32_t b = (uint32_t)(65536 / 2.84);
 
 	return (a - (b * lqi)) >> 16;
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u32_t *ptr = (u32_t *)(mcr20a->mac_addr);
+	uint32_t *ptr = (uint32_t *)(mcr20a->mac_addr);
 
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
-	ptr = (u32_t *)(mcr20a->mac_addr + 4);
+	ptr = (uint32_t *)(mcr20a->mac_addr + 4);
 	UNALIGNED_PUT(sys_rand32_get(), ptr);
 
 	mcr20a->mac_addr[0] = (mcr20a->mac_addr[0] & ~0x01) | 0x02;
@@ -514,9 +514,9 @@ static inline u8_t *get_mac(struct device *dev)
 }
 
 static inline bool read_rxfifo_content(struct mcr20a_context *dev,
-				       struct net_buf *buf, u8_t len)
+				       struct net_buf *buf, uint8_t len)
 {
-	u8_t cmd = MCR20A_BUF_READ;
+	uint8_t cmd = MCR20A_BUF_READ;
 	struct spi_buf bufs[2] = {
 		{
 			.buf = &cmd,
@@ -545,10 +545,10 @@ static inline bool read_rxfifo_content(struct mcr20a_context *dev,
 	return true;
 }
 
-static inline void mcr20a_rx(struct mcr20a_context *mcr20a, u8_t len)
+static inline void mcr20a_rx(struct mcr20a_context *mcr20a, uint8_t len)
 {
 	struct net_pkt *pkt = NULL;
-	u8_t pkt_len;
+	uint8_t pkt_len;
 
 	pkt_len = len - MCR20A_FCS_LENGTH;
 
@@ -597,10 +597,10 @@ out:
  * when a sequence has been completed.
  */
 static inline bool irqsts1_event(struct mcr20a_context *mcr20a,
-				  u8_t *dregs)
+				  uint8_t *dregs)
 {
-	u8_t seq = dregs[MCR20A_PHY_CTRL1] & MCR20A_PHY_CTRL1_XCVSEQ_MASK;
-	u8_t new_seq = MCR20A_XCVSEQ_RECEIVE;
+	uint8_t seq = dregs[MCR20A_PHY_CTRL1] & MCR20A_PHY_CTRL1_XCVSEQ_MASK;
+	uint8_t new_seq = MCR20A_XCVSEQ_RECEIVE;
 	bool retval = false;
 
 	switch (seq) {
@@ -684,7 +684,7 @@ static inline bool irqsts1_event(struct mcr20a_context *mcr20a,
  * usually the TR.
  */
 static inline bool irqsts3_event(struct mcr20a_context *mcr20a,
-				  u8_t *dregs)
+				  uint8_t *dregs)
 {
 	bool retval = false;
 
@@ -714,9 +714,9 @@ static void mcr20a_thread_main(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t dregs[MCR20A_PHY_CTRL4 + 1];
+	uint8_t dregs[MCR20A_PHY_CTRL4 + 1];
 	bool set_new_seq;
-	u8_t ctrl1 = 0U;
+	uint8_t ctrl1 = 0U;
 
 	while (true) {
 		k_sem_take(&mcr20a->isr_sem, K_FOREVER);
@@ -786,7 +786,7 @@ unmask_irqb:
 }
 
 static inline void irqb_int_handler(struct device *port,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct mcr20a_context *mcr20a = CONTAINER_OF(cb,
 						     struct mcr20a_context,
@@ -814,10 +814,10 @@ static inline void setup_gpio_callbacks(struct mcr20a_context *mcr20a)
 	gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb);
 }
 
-static int mcr20a_set_cca_mode(struct device *dev, u8_t mode)
+static int mcr20a_set_cca_mode(struct device *dev, uint8_t mode)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t ctrl4;
+	uint8_t ctrl4;
 
 	ctrl4 = read_reg_phy_ctrl4(mcr20a);
 	ctrl4 &= ~MCR20A_PHY_CTRL4_CCATYPE_MASK;
@@ -888,11 +888,11 @@ error:
 	return -EIO;
 }
 
-static int mcr20a_set_channel(struct device *dev, u16_t channel)
+static int mcr20a_set_channel(struct device *dev, uint16_t channel)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t buf[3];
-	u8_t ctrl1;
+	uint8_t buf[3];
+	uint8_t ctrl1;
 	int retval = -EIO;
 
 	if (channel < 11 || channel > 26) {
@@ -917,8 +917,8 @@ static int mcr20a_set_channel(struct device *dev, u16_t channel)
 	LOG_DBG("%u", channel);
 	channel -= 11U;
 	buf[0] = set_bits_pll_int0_val(pll_int_lt[channel]);
-	buf[1] = (u8_t)pll_frac_lt[channel];
-	buf[2] = (u8_t)(pll_frac_lt[channel] >> 8);
+	buf[1] = (uint8_t)pll_frac_lt[channel];
+	buf[2] = (uint8_t)(pll_frac_lt[channel] >> 8);
 
 	if (!write_burst_pll_int0(mcr20a, buf)) {
 		LOG_ERR("Failed to set PLL");
@@ -943,14 +943,14 @@ out:
 	return retval;
 }
 
-static int mcr20a_set_pan_id(struct device *dev, u16_t pan_id)
+static int mcr20a_set_pan_id(struct device *dev, uint16_t pan_id)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
 
 	pan_id = sys_le16_to_cpu(pan_id);
 	k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER);
 
-	if (!write_burst_pan_id(mcr20a, (u8_t *) &pan_id)) {
+	if (!write_burst_pan_id(mcr20a, (uint8_t *) &pan_id)) {
 		LOG_ERR("Failed");
 		k_mutex_unlock(&mcr20a->phy_mutex);
 		return -EIO;
@@ -962,14 +962,14 @@ static int mcr20a_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int mcr20a_set_short_addr(struct device *dev, u16_t short_addr)
+static int mcr20a_set_short_addr(struct device *dev, uint16_t short_addr)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
 
 	short_addr = sys_le16_to_cpu(short_addr);
 	k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER);
 
-	if (!write_burst_short_addr(mcr20a, (u8_t *) &short_addr)) {
+	if (!write_burst_short_addr(mcr20a, (uint8_t *) &short_addr)) {
 		LOG_ERR("Failed");
 		k_mutex_unlock(&mcr20a->phy_mutex);
 		return -EIO;
@@ -981,7 +981,7 @@ static int mcr20a_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int mcr20a_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int mcr20a_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
 
@@ -1023,10 +1023,10 @@ static int mcr20a_filter(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int mcr20a_set_txpower(struct device *dev, s16_t dbm)
+static int mcr20a_set_txpower(struct device *dev, int16_t dbm)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t pwr;
+	uint8_t pwr;
 
 	k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER);
 	LOG_DBG("%d", dbm);
@@ -1055,7 +1055,7 @@ static inline bool write_txfifo_content(struct mcr20a_context *dev,
 					struct net_buf *frag)
 {
 	size_t payload_len = frag->len;
-	u8_t cmd_buf[2] = {
+	uint8_t cmd_buf[2] = {
 		MCR20A_BUF_WRITE,
 		payload_len + MCR20A_FCS_LENGTH
 	};
@@ -1088,7 +1088,7 @@ static int mcr20a_tx(struct device *dev,
 		     struct net_buf *frag)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t seq = ieee802154_is_ar_flag_set(frag) ? MCR20A_XCVSEQ_TX_RX :
+	uint8_t seq = ieee802154_is_ar_flag_set(frag) ? MCR20A_XCVSEQ_TX_RX :
 						     MCR20A_XCVSEQ_TX;
 	int retval;
 
@@ -1148,8 +1148,8 @@ error:
 static int mcr20a_start(struct device *dev)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t timeout = 6U;
-	u8_t status;
+	uint8_t timeout = 6U;
+	uint8_t status;
 
 	k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER);
 	enable_irqb_interrupt(mcr20a, false);
@@ -1206,7 +1206,7 @@ error:
 static int mcr20a_stop(struct device *dev)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t power_mode;
+	uint8_t power_mode;
 
 	k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER);
 
@@ -1249,7 +1249,7 @@ static int mcr20a_update_overwrites(struct mcr20a_context *dev)
 		goto error;
 	}
 
-	for (u8_t i = 0;
+	for (uint8_t i = 0;
 	     i < sizeof(overwrites_indirect) / sizeof(overwrites_t);
 	     i++) {
 
@@ -1270,9 +1270,9 @@ error:
 static int power_on_and_setup(struct device *dev)
 {
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t timeout = 6U;
+	uint8_t timeout = 6U;
 	int pin;
-	u8_t tmp = 0U;
+	uint8_t tmp = 0U;
 
 	if (!PART_OF_KW2XD_SIP) {
 		gpio_pin_set(mcr20a->reset_gpio,
@@ -1448,7 +1448,7 @@ static void mcr20a_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct mcr20a_context *mcr20a = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 
diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h
index 69e5b2ac82..d3a8f95145 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.h
+++ b/drivers/ieee802154/ieee802154_mcr20a.h
@@ -28,7 +28,7 @@ struct mcr20a_context {
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	struct spi_cs_control cs_ctrl;
 #endif
-	u8_t mac_addr[8];
+	uint8_t mac_addr[8];
 	struct k_mutex phy_mutex;
 	struct k_sem isr_sem;
 	/*********TX + CCA*********/
@@ -42,23 +42,23 @@ struct mcr20a_context {
 
 #include "ieee802154_mcr20a_regs.h"
 
-u8_t z_mcr20a_read_reg(struct mcr20a_context *dev, bool dreg, u8_t addr);
-bool z_mcr20a_write_reg(struct mcr20a_context *dev, bool dreg, u8_t addr,
-		       u8_t value);
-bool z_mcr20a_write_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
-			 u8_t *data_buf, u8_t len);
-bool z_mcr20a_read_burst(struct mcr20a_context *dev, bool dreg, u16_t addr,
-			u8_t *data_buf, u8_t len);
+uint8_t z_mcr20a_read_reg(struct mcr20a_context *dev, bool dreg, uint8_t addr);
+bool z_mcr20a_write_reg(struct mcr20a_context *dev, bool dreg, uint8_t addr,
+		       uint8_t value);
+bool z_mcr20a_write_burst(struct mcr20a_context *dev, bool dreg, uint16_t addr,
+			 uint8_t *data_buf, uint8_t len);
+bool z_mcr20a_read_burst(struct mcr20a_context *dev, bool dreg, uint16_t addr,
+			uint8_t *data_buf, uint8_t len);
 
 #define DEFINE_REG_READ(__reg_name, __reg_addr, __dreg)			\
-	static inline u8_t read_reg_##__reg_name(struct mcr20a_context *dev) \
+	static inline uint8_t read_reg_##__reg_name(struct mcr20a_context *dev) \
 	{								\
 		return z_mcr20a_read_reg(dev, __dreg, __reg_addr);	\
 	}
 
 #define DEFINE_REG_WRITE(__reg_name, __reg_addr, __dreg)		\
 	static inline bool write_reg_##__reg_name(struct mcr20a_context *dev, \
-						  u8_t value)		\
+						  uint8_t value)		\
 	{								\
 		return z_mcr20a_write_reg(dev, __dreg, __reg_addr, value); \
 	}
@@ -135,7 +135,7 @@ DEFINE_IREG_WRITE(rx_byte_count, MCR20A_RX_BYTE_COUNT)
 DEFINE_IREG_WRITE(rx_wtr_mark, MCR20A_RX_WTR_MARK)
 
 #define DEFINE_BITS_SET(__reg_name, __reg_addr, __nibble)		\
-	static inline u8_t set_bits_##__reg_name(u8_t value)	\
+	static inline uint8_t set_bits_##__reg_name(uint8_t value)	\
 	{								\
 		value = (value << __reg_addr##__nibble##_SHIFT) &	\
 			 __reg_addr##__nibble##_MASK;			\
@@ -151,14 +151,14 @@ DEFINE_BITS_SET(clk_out_div, MCR20A_CLK_OUT, _DIV)
 
 #define DEFINE_BURST_WRITE(__reg_addr, __addr, __sz, __dreg)		\
 	static inline bool write_burst_##__reg_addr(			\
-		struct mcr20a_context *dev, u8_t *buf)			\
+		struct mcr20a_context *dev, uint8_t *buf)			\
 	{								\
 		return z_mcr20a_write_burst(dev, __dreg, __addr, buf, __sz); \
 	}
 
 #define DEFINE_BURST_READ(__reg_addr, __addr, __sz, __dreg)		    \
 	static inline bool read_burst_##__reg_addr(struct mcr20a_context *dev, \
-						   u8_t *buf)		\
+						   uint8_t *buf)		\
 	{								    \
 		return z_mcr20a_read_burst(dev, __dreg, __addr, buf, __sz);  \
 	}
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
index c2569b1a1f..4731c2eff4 100644
--- a/drivers/ieee802154/ieee802154_nrf5.c
+++ b/drivers/ieee802154/ieee802154_nrf5.c
@@ -60,9 +60,9 @@ static struct nrf5_802154_data nrf5_data;
 #define NRF5_802154_CFG(dev) \
 	((const struct nrf5_802154_config * const)(dev)->config_info)
 
-static void nrf5_get_eui64(u8_t *mac)
+static void nrf5_get_eui64(uint8_t *mac)
 {
-	memcpy(mac, (const u32_t *)&NRF_FICR->DEVICEID, 8);
+	memcpy(mac, (const uint32_t *)&NRF_FICR->DEVICEID, 8);
 }
 
 static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
@@ -71,7 +71,7 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
 	struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev);
 	struct net_pkt *pkt;
 	struct nrf5_802154_rx_frame *rx_frame;
-	u8_t pkt_len;
+	uint8_t pkt_len;
 
 	ARG_UNUSED(arg2);
 	ARG_UNUSED(arg3);
@@ -181,7 +181,7 @@ static int nrf5_cca(struct device *dev)
 	return nrf5_radio->channel_free ? 0 : -EBUSY;
 }
 
-static int nrf5_set_channel(struct device *dev, u16_t channel)
+static int nrf5_set_channel(struct device *dev, uint16_t channel)
 {
 	ARG_UNUSED(dev);
 
@@ -197,7 +197,7 @@ static int nrf5_set_channel(struct device *dev, u16_t channel)
 }
 
 static int nrf5_energy_scan_start(struct device *dev,
-				  u16_t duration,
+				  uint16_t duration,
 				  energy_scan_done_cb_t done_cb)
 {
 	int err = 0;
@@ -218,9 +218,9 @@ static int nrf5_energy_scan_start(struct device *dev,
 	return err;
 }
 
-static int nrf5_set_pan_id(struct device *dev, u16_t pan_id)
+static int nrf5_set_pan_id(struct device *dev, uint16_t pan_id)
 {
-	u8_t pan_id_le[2];
+	uint8_t pan_id_le[2];
 
 	ARG_UNUSED(dev);
 
@@ -232,9 +232,9 @@ static int nrf5_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int nrf5_set_short_addr(struct device *dev, u16_t short_addr)
+static int nrf5_set_short_addr(struct device *dev, uint16_t short_addr)
 {
-	u8_t short_addr_le[2];
+	uint8_t short_addr_le[2];
 
 	ARG_UNUSED(dev);
 
@@ -246,7 +246,7 @@ static int nrf5_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int nrf5_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int nrf5_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
 	ARG_UNUSED(dev);
 
@@ -280,7 +280,7 @@ static int nrf5_filter(struct device *dev, bool set,
 	return -ENOTSUP;
 }
 
-static int nrf5_set_txpower(struct device *dev, s16_t dbm)
+static int nrf5_set_txpower(struct device *dev, int16_t dbm)
 {
 	ARG_UNUSED(dev);
 
@@ -293,7 +293,7 @@ static int nrf5_set_txpower(struct device *dev, s16_t dbm)
 
 static int handle_ack(struct nrf5_802154_data *nrf5_radio)
 {
-	u8_t ack_len = nrf5_radio->ack_frame.psdu[0] - NRF5_FCS_LENGTH;
+	uint8_t ack_len = nrf5_radio->ack_frame.psdu[0] - NRF5_FCS_LENGTH;
 	struct net_pkt *ack_pkt;
 	int err = 0;
 
@@ -352,8 +352,8 @@ static int nrf5_tx(struct device *dev,
 		   struct net_buf *frag)
 {
 	struct nrf5_802154_data *nrf5_radio = NRF5_802154_DATA(dev);
-	u8_t payload_len = frag->len;
-	u8_t *payload = frag->data;
+	uint8_t payload_len = frag->len;
+	uint8_t *payload = frag->data;
 	bool ret = true;
 
 	LOG_DBG("%p (%u)", payload, payload_len);
@@ -567,7 +567,7 @@ static int nrf5_configure(struct device *dev, enum ieee802154_config_type type,
 void nrf_802154_received_timestamp_raw(uint8_t *data, int8_t power, uint8_t lqi,
 				       uint32_t time)
 {
-	for (u32_t i = 0; i < ARRAY_SIZE(nrf5_data.rx_frames); i++) {
+	for (uint32_t i = 0; i < ARRAY_SIZE(nrf5_data.rx_frames); i++) {
 		if (nrf5_data.rx_frames[i].psdu != NULL) {
 			continue;
 		}
@@ -649,7 +649,7 @@ void nrf_802154_cca_failed(nrf_802154_cca_error_t error)
 void nrf_802154_energy_detected(uint8_t result)
 {
 	if (nrf5_data.energy_scan_done != NULL) {
-		s16_t dbm;
+		int16_t dbm;
 		energy_scan_done_cb_t callback = nrf5_data.energy_scan_done;
 
 		nrf5_data.energy_scan_done = NULL;
diff --git a/drivers/ieee802154/ieee802154_nrf5.h b/drivers/ieee802154/ieee802154_nrf5.h
index eaa1eab736..dd7f56d50a 100644
--- a/drivers/ieee802154/ieee802154_nrf5.h
+++ b/drivers/ieee802154/ieee802154_nrf5.h
@@ -16,10 +16,10 @@
 
 struct nrf5_802154_rx_frame {
 	void *fifo_reserved; /* 1st word reserved for use by fifo. */
-	u8_t *psdu; /* Pointer to a received frame. */
-	u32_t time; /* RX timestamp. */
-	u8_t lqi; /* Last received frame LQI value. */
-	s8_t rssi; /* Last received frame RSSI value. */
+	uint8_t *psdu; /* Pointer to a received frame. */
+	uint32_t time; /* RX timestamp. */
+	uint8_t lqi; /* Last received frame LQI value. */
+	int8_t rssi; /* Last received frame RSSI value. */
 	bool ack_fpb; /* FPB value in ACK sent for the received frame. */
 };
 
@@ -28,7 +28,7 @@ struct nrf5_802154_data {
 	struct net_if *iface;
 
 	/* 802.15.4 HW address. */
-	u8_t mac[8];
+	uint8_t mac[8];
 
 	/* RX thread stack. */
 	K_THREAD_STACK_MEMBER(rx_stack, CONFIG_IEEE802154_NRF5_RX_STACK_SIZE);
@@ -61,10 +61,10 @@ struct nrf5_802154_data {
 	/* TX buffer. First byte is PHR (length), remaining bytes are
 	 * MPDU data.
 	 */
-	u8_t tx_psdu[NRF5_PHR_LENGTH + NRF5_PSDU_LENGTH + NRF5_FCS_LENGTH];
+	uint8_t tx_psdu[NRF5_PHR_LENGTH + NRF5_PSDU_LENGTH + NRF5_FCS_LENGTH];
 
 	/* TX result, updated in radio transmit callbacks. */
-	u8_t tx_result;
+	uint8_t tx_result;
 
 	/* A buffer for the received ACK frame. psdu pointer be NULL if no
 	 * ACK was requested/received.
diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c
index ba51d8351a..f7e2f8145b 100644
--- a/drivers/ieee802154/ieee802154_rf2xx.c
+++ b/drivers/ieee802154/ieee802154_rf2xx.c
@@ -52,7 +52,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define RF2XX_ACK_FRAME_PENDING_BIT       (1 << 4)
 #define RF2XX_FRAME_CTRL_ACK_REQUEST_BIT  (1 << 5)
 
-static u8_t rf2xx_ack_psdu[RF2XX_ACK_FRAME_LEN] = { 0 };
+static uint8_t rf2xx_ack_psdu[RF2XX_ACK_FRAME_LEN] = { 0 };
 static struct net_buf rf2xx_ack_frame = {
 	.data  = rf2xx_ack_psdu,
 	.size  = RF2XX_ACK_FRAME_LEN,
@@ -70,7 +70,7 @@ static struct net_pkt rf2xx_ack_pkt = {
 /* Radio Transceiver ISR */
 static inline void trx_isr_handler(struct device *port,
 				   struct gpio_callback *cb,
-				   u32_t pins)
+				   uint32_t pins)
 {
 	struct rf2xx_context *ctx = CONTAINER_OF(cb,
 						 struct rf2xx_context,
@@ -101,7 +101,7 @@ static void rf2xx_trx_set_state(struct device *dev,
 
 static void rf2xx_trx_set_tx_state(struct device *dev)
 {
-	u8_t status;
+	uint8_t status;
 
 	/**
 	 * Ensures that RX automatically ACK will be sent when requested.
@@ -138,10 +138,10 @@ static void rf2xx_trx_rx(struct device *dev)
 {
 	struct rf2xx_context *ctx = dev->driver_data;
 	struct net_pkt *pkt = NULL;
-	u8_t rx_buf[RX2XX_MAX_FRAME_SIZE];
-	u8_t pkt_len;
-	u8_t frame_len;
-	u8_t trac;
+	uint8_t rx_buf[RX2XX_MAX_FRAME_SIZE];
+	uint8_t pkt_len;
+	uint8_t frame_len;
+	uint8_t trac;
 
 	/*
 	 * The rf2xx frame buffer can have length > 128 bytes. The
@@ -248,7 +248,7 @@ static void rf2xx_process_tx_frame(struct device *dev)
 
 static void rf2xx_process_trx_end(struct device *dev)
 {
-	u8_t trx_status = (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) &
+	uint8_t trx_status = (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) &
 			   RF2XX_TRX_PHY_STATUS_MASK);
 
 	if (trx_status == RF2XX_TRX_PHY_STATUS_TX_ARET_ON) {
@@ -262,7 +262,7 @@ static void rf2xx_thread_main(void *arg)
 {
 	struct device *dev = INT_TO_POINTER(arg);
 	struct rf2xx_context *ctx = dev->driver_data;
-	u8_t isr_status;
+	uint8_t isr_status;
 
 	while (true) {
 		k_sem_take(&ctx->trx_isr_lock, K_FOREVER);
@@ -305,15 +305,15 @@ static void rf2xx_thread_main(void *arg)
 	}
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	const struct rf2xx_config *conf = dev->config_info;
 	struct rf2xx_context *ctx = dev->driver_data;
-	u32_t *ptr = (u32_t *)(ctx->mac_addr);
+	uint32_t *ptr = (uint32_t *)(ctx->mac_addr);
 
 	if (!conf->has_mac) {
 		UNALIGNED_PUT(sys_rand32_get(), ptr);
-		ptr = (u32_t *)(ctx->mac_addr + 4);
+		ptr = (uint32_t *)(ctx->mac_addr + 4);
 		UNALIGNED_PUT(sys_rand32_get(), ptr);
 	}
 
@@ -346,9 +346,9 @@ static int rf2xx_cca(struct device *dev)
 	return 0;
 }
 
-static int rf2xx_set_channel(struct device *dev, u16_t channel)
+static int rf2xx_set_channel(struct device *dev, uint16_t channel)
 {
-	u8_t reg;
+	uint8_t reg;
 
 	if (channel < 11 || channel > 26) {
 		LOG_ERR("Unsupported channel %u", channel);
@@ -361,9 +361,9 @@ static int rf2xx_set_channel(struct device *dev, u16_t channel)
 	return 0;
 }
 
-static int rf2xx_set_txpower(struct device *dev, s16_t dbm)
+static int rf2xx_set_txpower(struct device *dev, int16_t dbm)
 {
-	u8_t reg;
+	uint8_t reg;
 
 	ARG_UNUSED(dbm);
 
@@ -377,21 +377,21 @@ static int rf2xx_set_txpower(struct device *dev, s16_t dbm)
 }
 
 static int rf2xx_set_ieee_addr(struct device *dev, bool set,
-			       const u8_t *ieee_addr)
+			       const uint8_t *ieee_addr)
 {
-	const u8_t *ptr_to_reg = ieee_addr;
+	const uint8_t *ptr_to_reg = ieee_addr;
 
 	LOG_DBG("IEEE address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
 		ieee_addr[7], ieee_addr[6], ieee_addr[5], ieee_addr[4],
 		ieee_addr[3], ieee_addr[2], ieee_addr[1], ieee_addr[0]);
 
 	if (set) {
-		for (u8_t i = 0; i < 8; i++, ptr_to_reg++) {
+		for (uint8_t i = 0; i < 8; i++, ptr_to_reg++) {
 			rf2xx_iface_reg_write(dev, (RF2XX_IEEE_ADDR_0_REG + i),
 					      *ptr_to_reg);
 		}
 	} else {
-		for (u8_t i = 0; i < 8; i++) {
+		for (uint8_t i = 0; i < 8; i++) {
 			rf2xx_iface_reg_write(dev, (RF2XX_IEEE_ADDR_0_REG + i),
 					      0);
 		}
@@ -400,9 +400,9 @@ static int rf2xx_set_ieee_addr(struct device *dev, bool set,
 	return 0;
 }
 static int rf2xx_set_short_addr(struct device *dev, bool set,
-				u16_t short_addr)
+				uint16_t short_addr)
 {
-	u8_t short_addr_le[2] = { 0xFF, 0xFF };
+	uint8_t short_addr_le[2] = { 0xFF, 0xFF };
 
 	if (set) {
 		sys_put_le16(short_addr, short_addr_le);
@@ -418,9 +418,9 @@ static int rf2xx_set_short_addr(struct device *dev, bool set,
 
 	return 0;
 }
-static int rf2xx_set_pan_id(struct device *dev, bool set, u16_t pan_id)
+static int rf2xx_set_pan_id(struct device *dev, bool set, uint16_t pan_id)
 {
-	u8_t pan_id_le[2] = { 0xFF, 0xFF };
+	uint8_t pan_id_le[2] = { 0xFF, 0xFF };
 
 	if (set) {
 		sys_put_le16(pan_id, pan_id_le);
@@ -573,7 +573,7 @@ static int power_on_and_setup(struct device *dev)
 {
 	const struct rf2xx_config *conf = dev->config_info;
 	struct rf2xx_context *ctx = dev->driver_data;
-	u8_t config;
+	uint8_t config;
 
 	rf2xx_iface_phy_rst(dev);
 
@@ -786,7 +786,7 @@ static void rf2xx_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct rf2xx_context *ctx = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 
diff --git a/drivers/ieee802154/ieee802154_rf2xx.h b/drivers/ieee802154/ieee802154_rf2xx.h
index 78d1f8534f..b6f339f664 100644
--- a/drivers/ieee802154/ieee802154_rf2xx.h
+++ b/drivers/ieee802154/ieee802154_rf2xx.h
@@ -76,14 +76,14 @@ enum rf2xx_trx_model_t {
 
 struct rf2xx_dt_gpio_t {
 	const char *devname;
-	u32_t pin;
-	u32_t flags;
+	uint32_t pin;
+	uint32_t flags;
 };
 
 struct rf2xx_dt_spi_t {
 	const char *devname;
-	u32_t freq;
-	u32_t addr;
+	uint32_t freq;
+	uint32_t addr;
 	struct rf2xx_dt_gpio_t cs;
 };
 
@@ -96,8 +96,8 @@ struct rf2xx_config {
 
 	struct rf2xx_dt_spi_t spi;
 
-	u8_t inst;
-	u8_t has_mac;
+	uint8_t inst;
+	uint8_t has_mac;
 };
 
 struct rf2xx_context {
@@ -124,12 +124,12 @@ struct rf2xx_context {
 	enum rf2xx_trx_model_t trx_model;
 	enum rf2xx_trx_state_trac_t trx_trac;
 
-	u8_t mac_addr[8];
-	u8_t pkt_lqi;
-	u8_t pkt_ed;
-	s8_t trx_rssi_base;
-	u8_t trx_version;
-	u8_t rx_phr;
+	uint8_t mac_addr[8];
+	uint8_t pkt_lqi;
+	uint8_t pkt_ed;
+	int8_t trx_rssi_base;
+	uint8_t trx_version;
+	uint8_t rx_phr;
 };
 
 #endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_RF2XX_H_ */
diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.c b/drivers/ieee802154/ieee802154_rf2xx_iface.c
index 4c9969f0ac..8261674257 100644
--- a/drivers/ieee802154/ieee802154_rf2xx_iface.c
+++ b/drivers/ieee802154/ieee802154_rf2xx_iface.c
@@ -52,12 +52,12 @@ void rf2xx_iface_phy_tx_start(struct device *dev)
 	gpio_pin_set(ctx->slptr_gpio, conf->slptr.pin, 0);
 }
 
-u8_t rf2xx_iface_reg_read(struct device *dev,
-			  u8_t addr)
+uint8_t rf2xx_iface_reg_read(struct device *dev,
+			  uint8_t addr)
 {
 	const struct rf2xx_context *ctx = dev->driver_data;
-	u8_t status;
-	u8_t regval = 0;
+	uint8_t status;
+	uint8_t regval = 0;
 
 	addr |= RF2XX_RF_CMD_REG_R;
 
@@ -96,11 +96,11 @@ u8_t rf2xx_iface_reg_read(struct device *dev,
 }
 
 void rf2xx_iface_reg_write(struct device *dev,
-			   u8_t addr,
-			   u8_t data)
+			   uint8_t addr,
+			   uint8_t data)
 {
 	const struct rf2xx_context *ctx = dev->driver_data;
-	u8_t status;
+	uint8_t status;
 
 	addr |= RF2XX_RF_CMD_REG_W;
 
@@ -136,12 +136,12 @@ void rf2xx_iface_reg_write(struct device *dev,
 		(addr & ~(RF2XX_RF_CMD_REG_W)), status, data);
 }
 
-u8_t rf2xx_iface_bit_read(struct device *dev,
-			  u8_t addr,
-			  u8_t mask,
-			  u8_t pos)
+uint8_t rf2xx_iface_bit_read(struct device *dev,
+			  uint8_t addr,
+			  uint8_t mask,
+			  uint8_t pos)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	ret = rf2xx_iface_reg_read(dev, addr);
 	ret &= mask;
@@ -151,12 +151,12 @@ u8_t rf2xx_iface_bit_read(struct device *dev,
 }
 
 void rf2xx_iface_bit_write(struct device *dev,
-			   u8_t reg_addr,
-			   u8_t mask,
-			   u8_t pos,
-			   u8_t new_value)
+			   uint8_t reg_addr,
+			   uint8_t mask,
+			   uint8_t pos,
+			   uint8_t new_value)
 {
-	u8_t current_reg_value;
+	uint8_t current_reg_value;
 
 	current_reg_value = rf2xx_iface_reg_read(dev, reg_addr);
 	current_reg_value &= ~mask;
@@ -167,11 +167,11 @@ void rf2xx_iface_bit_write(struct device *dev,
 }
 
 void rf2xx_iface_frame_read(struct device *dev,
-			    u8_t *data,
-			    u8_t length)
+			    uint8_t *data,
+			    uint8_t length)
 {
 	const struct rf2xx_context *ctx = dev->driver_data;
-	u8_t cmd = RF2XX_RF_CMD_FRAME_R;
+	uint8_t cmd = RF2XX_RF_CMD_FRAME_R;
 
 	const struct spi_buf tx_buf = {
 		.buf = &cmd,
@@ -199,13 +199,13 @@ void rf2xx_iface_frame_read(struct device *dev,
 }
 
 void rf2xx_iface_frame_write(struct device *dev,
-			     u8_t *data,
-			     u8_t length)
+			     uint8_t *data,
+			     uint8_t length)
 {
 	const struct rf2xx_context *ctx = dev->driver_data;
-	u8_t cmd = RF2XX_RF_CMD_FRAME_W;
-	u8_t status;
-	u8_t phr;
+	uint8_t cmd = RF2XX_RF_CMD_FRAME_W;
+	uint8_t status;
+	uint8_t phr;
 
 	/* Sanity check */
 	if (length > 125) {
@@ -250,13 +250,13 @@ void rf2xx_iface_frame_write(struct device *dev,
 }
 
 void rf2xx_iface_sram_read(struct device *dev,
-			    u8_t address,
-			    u8_t *data,
-			    u8_t length)
+			    uint8_t address,
+			    uint8_t *data,
+			    uint8_t length)
 {
 	const struct rf2xx_context *ctx = dev->driver_data;
-	u8_t cmd = RF2XX_RF_CMD_SRAM_R;
-	u8_t status[2];
+	uint8_t cmd = RF2XX_RF_CMD_SRAM_R;
+	uint8_t status[2];
 
 	const struct spi_buf tx_buf[2] = {
 		{
diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.h b/drivers/ieee802154/ieee802154_rf2xx_iface.h
index 17e6a76062..dfd3a6e855 100644
--- a/drivers/ieee802154/ieee802154_rf2xx_iface.h
+++ b/drivers/ieee802154/ieee802154_rf2xx_iface.h
@@ -34,8 +34,8 @@ void rf2xx_iface_phy_tx_start(struct device *dev);
  *
  * @return value of the register read
  */
-u8_t rf2xx_iface_reg_read(struct device *dev,
-			  u8_t addr);
+uint8_t rf2xx_iface_reg_read(struct device *dev,
+			  uint8_t addr);
 
 /**
  * @brief Writes data into a transceiver register
@@ -48,8 +48,8 @@ u8_t rf2xx_iface_reg_read(struct device *dev,
  *
  */
 void rf2xx_iface_reg_write(struct device *dev,
-			   u8_t addr,
-			   u8_t data);
+			   uint8_t addr,
+			   uint8_t data);
 
 /**
  * @brief Subregister read
@@ -61,10 +61,10 @@ void rf2xx_iface_reg_write(struct device *dev,
  *
  * @return  value of the read bit(s)
  */
-u8_t rf2xx_iface_bit_read(struct device *dev,
-			  u8_t addr,
-			  u8_t mask,
-			  u8_t pos);
+uint8_t rf2xx_iface_bit_read(struct device *dev,
+			  uint8_t addr,
+			  uint8_t mask,
+			  uint8_t pos);
 
 /**
  * @brief Subregister write
@@ -76,10 +76,10 @@ u8_t rf2xx_iface_bit_read(struct device *dev,
  * @param[out]  new_value Data, which is muxed into the register
  */
 void rf2xx_iface_bit_write(struct device *dev,
-			   u8_t reg_addr,
-			   u8_t mask,
-			   u8_t pos,
-			   u8_t new_value);
+			   uint8_t reg_addr,
+			   uint8_t mask,
+			   uint8_t pos,
+			   uint8_t new_value);
 
 /**
  * @brief Reads frame buffer of the transceiver
@@ -91,8 +91,8 @@ void rf2xx_iface_bit_write(struct device *dev,
  * @param[in]   length  Number of bytes to be read from the frame
  */
 void rf2xx_iface_frame_read(struct device *dev,
-			    u8_t *data,
-			    u8_t length);
+			    uint8_t *data,
+			    uint8_t length);
 
 /**
  * @brief Writes data into frame buffer of the transceiver
@@ -104,8 +104,8 @@ void rf2xx_iface_frame_read(struct device *dev,
  * @param[in] length Number of bytes to be written into frame buffer
  */
 void rf2xx_iface_frame_write(struct device *dev,
-			     u8_t *data,
-			     u8_t length);
+			     uint8_t *data,
+			     uint8_t length);
 
 /**
  * @brief Reads sram data from the transceiver
@@ -118,8 +118,8 @@ void rf2xx_iface_frame_write(struct device *dev,
  * @param[in]   length  Number of bytes to be read from the sram space
  */
 void rf2xx_iface_sram_read(struct device *dev,
-			    u8_t address,
-			    u8_t *data,
-			    u8_t length);
+			    uint8_t address,
+			    uint8_t *data,
+			    uint8_t length);
 
 #endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_RF2XX_IFACE_H_ */
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
index 14da9e13db..a8d06de9ed 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.c
+++ b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -41,16 +41,16 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 /* Broadcast Short Address */
 #define BROADCAST_ADDRESS    ((uint8_t [SHORT_ADDRESS_SIZE]) {0xff, 0xff})
 
-static u8_t dev_pan_id[PAN_ID_SIZE];             /* Device Pan Id */
-static u8_t dev_short_addr[SHORT_ADDRESS_SIZE];  /* Device Short Address */
-static u8_t dev_ext_addr[EXTENDED_ADDRESS_SIZE]; /* Device Extended Address */
+static uint8_t dev_pan_id[PAN_ID_SIZE];             /* Device Pan Id */
+static uint8_t dev_short_addr[SHORT_ADDRESS_SIZE];  /* Device Short Address */
+static uint8_t dev_ext_addr[EXTENDED_ADDRESS_SIZE]; /* Device Extended Address */
 
 /** Singleton device used in uart pipe callback */
 static struct device *upipe_dev;
 
 #if defined(CONFIG_IEEE802154_UPIPE_HW_FILTER)
 
-static bool received_dest_addr_matched(u8_t *rx_buffer)
+static bool received_dest_addr_matched(uint8_t *rx_buffer)
 {
 	struct upipe_context *upipe = upipe_dev->driver_data;
 
@@ -98,7 +98,7 @@ static bool received_dest_addr_matched(u8_t *rx_buffer)
 
 #endif
 
-static u8_t *upipe_rx(u8_t *buf, size_t *off)
+static uint8_t *upipe_rx(uint8_t *buf, size_t *off)
 {
 	struct net_pkt *pkt = NULL;
 	struct upipe_context *upipe;
@@ -194,7 +194,7 @@ static int upipe_cca(struct device *dev)
 	return 0;
 }
 
-static int upipe_set_channel(struct device *dev, u16_t channel)
+static int upipe_set_channel(struct device *dev, uint16_t channel)
 {
 	ARG_UNUSED(dev);
 	ARG_UNUSED(channel);
@@ -202,9 +202,9 @@ static int upipe_set_channel(struct device *dev, u16_t channel)
 	return 0;
 }
 
-static int upipe_set_pan_id(struct device *dev, u16_t pan_id)
+static int upipe_set_pan_id(struct device *dev, uint16_t pan_id)
 {
-	u8_t pan_id_le[2];
+	uint8_t pan_id_le[2];
 
 	ARG_UNUSED(dev);
 
@@ -214,9 +214,9 @@ static int upipe_set_pan_id(struct device *dev, u16_t pan_id)
 	return 0;
 }
 
-static int upipe_set_short_addr(struct device *dev, u16_t short_addr)
+static int upipe_set_short_addr(struct device *dev, uint16_t short_addr)
 {
-	u8_t short_addr_le[2];
+	uint8_t short_addr_le[2];
 
 	ARG_UNUSED(dev);
 
@@ -226,7 +226,7 @@ static int upipe_set_short_addr(struct device *dev, u16_t short_addr)
 	return 0;
 }
 
-static int upipe_set_ieee_addr(struct device *dev, const u8_t *ieee_addr)
+static int upipe_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr)
 {
 	ARG_UNUSED(dev);
 
@@ -257,7 +257,7 @@ static int upipe_filter(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int upipe_set_txpower(struct device *dev, s16_t dbm)
+static int upipe_set_txpower(struct device *dev, int16_t dbm)
 {
 	ARG_UNUSED(dev);
 	ARG_UNUSED(dbm);
@@ -271,9 +271,9 @@ static int upipe_tx(struct device *dev,
 		    struct net_buf *frag)
 {
 	struct upipe_context *upipe = dev->driver_data;
-	u8_t *pkt_buf = frag->data;
-	u8_t len = frag->len;
-	u8_t i, data;
+	uint8_t *pkt_buf = frag->data;
+	uint8_t len = frag->len;
+	uint8_t i, data;
 
 	if (mode != IEEE802154_TX_MODE_DIRECT) {
 		NET_ERR("TX mode %d not supported", mode);
@@ -338,7 +338,7 @@ static int upipe_init(struct device *dev)
 	return 0;
 }
 
-static inline u8_t *get_mac(struct device *dev)
+static inline uint8_t *get_mac(struct device *dev)
 {
 	struct upipe_context *upipe = dev->driver_data;
 
@@ -349,7 +349,7 @@ static inline u8_t *get_mac(struct device *dev)
 
 #if defined(CONFIG_IEEE802154_UPIPE_RANDOM_MAC)
 	UNALIGNED_PUT(sys_cpu_to_be32(sys_rand32_get()),
-		      (u32_t *) ((u8_t *)upipe->mac_addr+4));
+		      (uint32_t *) ((uint8_t *)upipe->mac_addr+4));
 #else
 	upipe->mac_addr[4] = CONFIG_IEEE802154_UPIPE_MAC4;
 	upipe->mac_addr[5] = CONFIG_IEEE802154_UPIPE_MAC5;
@@ -364,7 +364,7 @@ static void upipe_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct upipe_context *upipe = dev->driver_data;
-	u8_t *mac = get_mac(dev);
+	uint8_t *mac = get_mac(dev);
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.h b/drivers/ieee802154/ieee802154_uart_pipe.h
index be9b7932d8..491cdcf2b0 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.h
+++ b/drivers/ieee802154/ieee802154_uart_pipe.h
@@ -13,14 +13,14 @@
 
 struct upipe_context {
 	struct net_if *iface;
-	u8_t mac_addr[8];
+	uint8_t mac_addr[8];
 	bool stopped;
 	/** RX specific attributes */
-	u8_t uart_pipe_buf[1];
+	uint8_t uart_pipe_buf[1];
 	bool rx;
-	u8_t rx_len;
-	u8_t rx_off;
-	u8_t rx_buf[127];
+	uint8_t rx_len;
+	uint8_t rx_off;
+	uint8_t rx_buf[127];
 };
 
 #endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_UART_PIPE_H_ */
diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
index 1086c4dda7..ab7fb1790e 100644
--- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
@@ -33,10 +33,10 @@ extern void *_VectorTable;
 #define _ARC_V2_IRQ_VECT_BASE _ARC_V2_IRQ_VECT_BASE_S
 #endif
 
-static u32_t _arc_v2_irq_unit_device_power_state = DEVICE_PM_ACTIVE_STATE;
+static uint32_t _arc_v2_irq_unit_device_power_state = DEVICE_PM_ACTIVE_STATE;
 struct arc_v2_irq_unit_ctx {
-	u32_t irq_ctrl; /* Interrupt Context Saving Control Register. */
-	u32_t irq_vect_base; /* Interrupt Vector Base. */
+	uint32_t irq_ctrl; /* Interrupt Context Saving Control Register. */
+	uint32_t irq_vect_base; /* Interrupt Vector Base. */
 
 	/*
 	 * IRQ configuration:
@@ -44,7 +44,7 @@ struct arc_v2_irq_unit_ctx {
 	 * - IRQ Trigger:BIT(1)
 	 * - IRQ Enable:BIT(0)
 	 */
-	u8_t irq_config[CONFIG_NUM_IRQS - 16];
+	uint8_t irq_config[CONFIG_NUM_IRQS - 16];
 };
 static struct arc_v2_irq_unit_ctx ctx;
 #endif
@@ -100,7 +100,7 @@ static int arc_v2_irq_unit_init(struct device *unused)
  */
 static int arc_v2_irq_unit_suspend(struct device *dev)
 {
-	u8_t irq;
+	uint8_t irq;
 
 	ARG_UNUSED(dev);
 
@@ -136,7 +136,7 @@ static int arc_v2_irq_unit_suspend(struct device *dev)
  */
 static int arc_v2_irq_unit_resume(struct device *dev)
 {
-	u8_t irq;
+	uint8_t irq;
 
 	ARG_UNUSED(dev);
 
@@ -193,19 +193,19 @@ static int arc_v2_irq_unit_get_state(struct device *dev)
  * @return operation result
  */
 static int arc_v2_irq_unit_device_ctrl(struct device *device,
-		u32_t ctrl_command, void *context, device_pm_cb cb, void *arg)
+		uint32_t ctrl_command, void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 	unsigned int key = arch_irq_lock();
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		if (*((u32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
 			ret = arc_v2_irq_unit_suspend(device);
-		} else if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = arc_v2_irq_unit_resume(device);
 		}
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = arc_v2_irq_unit_get_state(device);
+		*((uint32_t *)context) = arc_v2_irq_unit_get_state(device);
 	}
 
 	arch_irq_unlock(key);
diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c
index e03d97baa2..3df1f8f64f 100644
--- a/drivers/interrupt_controller/intc_cavs.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -33,10 +33,10 @@ struct cavs_registers *get_base_address(struct cavs_ictl_runtime *context)
 #endif
 }
 
-static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(u32_t intr_status,
-						       u32_t isr_base_offset)
+static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(uint32_t intr_status,
+						       uint32_t isr_base_offset)
 {
-	u32_t intr_bitpos, intr_offset;
+	uint32_t intr_bitpos, intr_offset;
 
 	/* Dispatch lower level ISRs depending upon the bit set */
 	while (intr_status) {
diff --git a/drivers/interrupt_controller/intc_cavs.h b/drivers/interrupt_controller/intc_cavs.h
index f6916de9b3..3f8e628050 100644
--- a/drivers/interrupt_controller/intc_cavs.h
+++ b/drivers/interrupt_controller/intc_cavs.h
@@ -16,20 +16,20 @@ extern "C" {
 typedef void (*cavs_ictl_config_irq_t)(struct device *port);
 
 struct cavs_ictl_config {
-	u32_t irq_num;
-	u32_t isr_table_offset;
+	uint32_t irq_num;
+	uint32_t isr_table_offset;
 	cavs_ictl_config_irq_t config_func;
 };
 
 struct cavs_ictl_runtime {
-	u32_t base_addr;
+	uint32_t base_addr;
 };
 
 struct cavs_registers {
-	u32_t disable_il;	/* il_msd - offset 0x00 */
-	u32_t enable_il;	/* il_mcd - offset 0x04 */
-	u32_t disable_state_il;	/* il_md  - offset 0x08 */
-	u32_t status_il;	/* il_sd  - offset 0x0C */
+	uint32_t disable_il;	/* il_msd - offset 0x00 */
+	uint32_t enable_il;	/* il_mcd - offset 0x04 */
+	uint32_t disable_state_il;	/* il_md  - offset 0x08 */
+	uint32_t status_il;	/* il_sd  - offset 0x0C */
 };
 
 #ifdef __cplusplus
diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c
index 240e06c03a..217892ee60 100644
--- a/drivers/interrupt_controller/intc_dw.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -18,10 +18,10 @@
 #include "intc_dw.h"
 #include <soc.h>
 
-static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(u32_t intr_status,
-						      u32_t isr_base_offset)
+static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(uint32_t intr_status,
+						      uint32_t isr_base_offset)
 {
-	u32_t intr_bitpos, intr_offset;
+	uint32_t intr_bitpos, intr_offset;
 
 	/* Dispatch lower level ISRs depending upon the bit set */
 	while (intr_status) {
diff --git a/drivers/interrupt_controller/intc_dw.h b/drivers/interrupt_controller/intc_dw.h
index c21fe24bf0..70c4bb12f0 100644
--- a/drivers/interrupt_controller/intc_dw.h
+++ b/drivers/interrupt_controller/intc_dw.h
@@ -16,71 +16,71 @@ extern "C" {
 typedef void (*dw_ictl_config_irq_t)(struct device *dev);
 
 struct dw_ictl_config {
-	u32_t base_addr;
-	u32_t numirqs;
-	u32_t isr_table_offset;
+	uint32_t base_addr;
+	uint32_t numirqs;
+	uint32_t isr_table_offset;
 	dw_ictl_config_irq_t config_func;
 };
 
 struct dw_ictl_registers {
-	u32_t irq_inten_l;		/* offset 00 */
-	u32_t irq_inten_h;		/* offset 04 */
-	u32_t irq_intmask_l;		/* offset 08 */
-	u32_t irq_intmask_h;		/* offset 0C */
-	u32_t irq_intforce_l;		/* offset 10 */
-	u32_t irq_intforce_h;		/* offset 14 */
-	u32_t irq_rawstatus_l;		/* offset 18 */
-	u32_t irq_rawstatus_h;		/* offset 1c */
-	u32_t irq_status_l;		/* offset 20 */
-	u32_t irq_status_h;		/* offset 24 */
-	u32_t irq_maskstatus_l;		/* offset 28 */
-	u32_t irq_maskstatus_h;		/* offset 2c */
-	u32_t irq_finalstatus_l;	/* offset 30 */
-	u32_t irq_finalstatus_h;	/* offset 34 */
-	u32_t irq_vector;		/* offset 38 */
-	u32_t Reserved1;		/* offset 3c */
-	u32_t irq_vector_0;		/* offset 40 */
-	u32_t Reserved2;		/* offset 44 */
-	u32_t irq_vector_1;		/* offset 48 */
-	u32_t Reserved3;		/* offset 4c */
-	u32_t irq_vector_2;		/* offset 50 */
-	u32_t Reserved4;		/* offset 54 */
-	u32_t irq_vector_3;		/* offset 58 */
-	u32_t Reserved5;		/* offset 5c */
-	u32_t irq_vector_4;		/* offset 60 */
-	u32_t Reserved6;		/* offset 64 */
-	u32_t irq_vector_5;		/* offset 68 */
-	u32_t Reserved7;		/* offset 6c */
-	u32_t irq_vector_6;		/* offset 70 */
-	u32_t Reserved8;		/* offset 74 */
-	u32_t irq_vector_7;		/* offset 78 */
-	u32_t Reserved9;		/* offset 7c */
-	u32_t irq_vector_8;		/* offset 80 */
-	u32_t Reserved10;		/* offset 84 */
-	u32_t irq_vector_9;		/* offset 88 */
-	u32_t Reserved11;		/* offset 8c */
-	u32_t irq_vector_10;		/* offset 90 */
-	u32_t Reserved12;		/* offset 94 */
-	u32_t irq_vector_11;		/* offset 98 */
-	u32_t Reserved13;		/* offset 9c */
-	u32_t irq_vector_12;		/* offset a0 */
-	u32_t Reserved14;		/* offset a4 */
-	u32_t irq_vector_13;		/* offset a8 */
-	u32_t Reserved15;		/* offset ac */
-	u32_t irq_vector_14;		/* offset b0 */
-	u32_t Reserved16;		/* offset b4 */
-	u32_t irq_vector_15;		/* offset b8 */
-	u32_t Reserved17;		/* offset bc */
-	u32_t fiq_inten;		/* offset c0 */
-	u32_t fiq_intmask;		/* offset c4 */
-	u32_t fiq_intforce;		/* offset c8 */
-	u32_t fiq_rawstatus;		/* offset cc */
-	u32_t fiq_status;		/* offset d0 */
-	u32_t fiq_finalstatus;		/* offset d4 */
-	u32_t irq_plevel;		/* offset d8 */
-	u32_t Reserved18;		/* offset dc */
-	u32_t APB_ICTL_COMP_VERSION;	/* offset e0 */
-	u32_t Reserved19;		/* offset e4 */
+	uint32_t irq_inten_l;		/* offset 00 */
+	uint32_t irq_inten_h;		/* offset 04 */
+	uint32_t irq_intmask_l;		/* offset 08 */
+	uint32_t irq_intmask_h;		/* offset 0C */
+	uint32_t irq_intforce_l;		/* offset 10 */
+	uint32_t irq_intforce_h;		/* offset 14 */
+	uint32_t irq_rawstatus_l;		/* offset 18 */
+	uint32_t irq_rawstatus_h;		/* offset 1c */
+	uint32_t irq_status_l;		/* offset 20 */
+	uint32_t irq_status_h;		/* offset 24 */
+	uint32_t irq_maskstatus_l;		/* offset 28 */
+	uint32_t irq_maskstatus_h;		/* offset 2c */
+	uint32_t irq_finalstatus_l;	/* offset 30 */
+	uint32_t irq_finalstatus_h;	/* offset 34 */
+	uint32_t irq_vector;		/* offset 38 */
+	uint32_t Reserved1;		/* offset 3c */
+	uint32_t irq_vector_0;		/* offset 40 */
+	uint32_t Reserved2;		/* offset 44 */
+	uint32_t irq_vector_1;		/* offset 48 */
+	uint32_t Reserved3;		/* offset 4c */
+	uint32_t irq_vector_2;		/* offset 50 */
+	uint32_t Reserved4;		/* offset 54 */
+	uint32_t irq_vector_3;		/* offset 58 */
+	uint32_t Reserved5;		/* offset 5c */
+	uint32_t irq_vector_4;		/* offset 60 */
+	uint32_t Reserved6;		/* offset 64 */
+	uint32_t irq_vector_5;		/* offset 68 */
+	uint32_t Reserved7;		/* offset 6c */
+	uint32_t irq_vector_6;		/* offset 70 */
+	uint32_t Reserved8;		/* offset 74 */
+	uint32_t irq_vector_7;		/* offset 78 */
+	uint32_t Reserved9;		/* offset 7c */
+	uint32_t irq_vector_8;		/* offset 80 */
+	uint32_t Reserved10;		/* offset 84 */
+	uint32_t irq_vector_9;		/* offset 88 */
+	uint32_t Reserved11;		/* offset 8c */
+	uint32_t irq_vector_10;		/* offset 90 */
+	uint32_t Reserved12;		/* offset 94 */
+	uint32_t irq_vector_11;		/* offset 98 */
+	uint32_t Reserved13;		/* offset 9c */
+	uint32_t irq_vector_12;		/* offset a0 */
+	uint32_t Reserved14;		/* offset a4 */
+	uint32_t irq_vector_13;		/* offset a8 */
+	uint32_t Reserved15;		/* offset ac */
+	uint32_t irq_vector_14;		/* offset b0 */
+	uint32_t Reserved16;		/* offset b4 */
+	uint32_t irq_vector_15;		/* offset b8 */
+	uint32_t Reserved17;		/* offset bc */
+	uint32_t fiq_inten;		/* offset c0 */
+	uint32_t fiq_intmask;		/* offset c4 */
+	uint32_t fiq_intforce;		/* offset c8 */
+	uint32_t fiq_rawstatus;		/* offset cc */
+	uint32_t fiq_status;		/* offset d0 */
+	uint32_t fiq_finalstatus;		/* offset d4 */
+	uint32_t irq_plevel;		/* offset d8 */
+	uint32_t Reserved18;		/* offset dc */
+	uint32_t APB_ICTL_COMP_VERSION;	/* offset e0 */
+	uint32_t Reserved19;		/* offset e4 */
 };
 
 #ifdef __cplusplus
diff --git a/drivers/interrupt_controller/intc_gic.c b/drivers/interrupt_controller/intc_gic.c
index 18e4355d3c..4bb12fa67e 100644
--- a/drivers/interrupt_controller/intc_gic.c
+++ b/drivers/interrupt_controller/intc_gic.c
@@ -48,10 +48,10 @@ bool arm_gic_irq_is_enabled(unsigned int irq)
 }
 
 void arm_gic_irq_set_priority(
-	unsigned int irq, unsigned int prio, u32_t flags)
+	unsigned int irq, unsigned int prio, uint32_t flags)
 {
 	int int_grp, int_off;
-	u32_t val;
+	uint32_t val;
 
 	/* Set priority */
 	sys_write8(prio & 0xff, GICD_IPRIORITYRn + irq);
@@ -144,7 +144,7 @@ static void gic_dist_init(void)
 static void gic_cpu_init(void)
 {
 	int i;
-	u32_t val;
+	uint32_t val;
 
 	/*
 	 * Deal with the banked PPI and SGI interrupts - disable all
diff --git a/drivers/interrupt_controller/intc_gicv3.c b/drivers/interrupt_controller/intc_gicv3.c
index 415f65ee14..a563ab09b4 100644
--- a/drivers/interrupt_controller/intc_gicv3.c
+++ b/drivers/interrupt_controller/intc_gicv3.c
@@ -18,9 +18,9 @@ mem_addr_t gic_rdists[GIC_NUM_CPU_IF];
  * Wait for register write pending
  * TODO: add timed wait
  */
-static int gic_wait_rwp(u32_t intid)
+static int gic_wait_rwp(uint32_t intid)
 {
-	u32_t rwp_mask;
+	uint32_t rwp_mask;
 	mem_addr_t base;
 
 	if (intid < GIC_SPI_INT_BASE) {
@@ -38,12 +38,12 @@ static int gic_wait_rwp(u32_t intid)
 }
 
 void arm_gic_irq_set_priority(unsigned int intid,
-			      unsigned int prio, u32_t flags)
+			      unsigned int prio, uint32_t flags)
 {
-	u32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	u32_t idx = intid / GIC_NUM_INTR_PER_REG;
-	u32_t shift;
-	u32_t val;
+	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
+	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t shift;
+	uint32_t val;
 	mem_addr_t base = GET_DIST_BASE(intid);
 
 	/* Disable the interrupt */
@@ -67,16 +67,16 @@ void arm_gic_irq_set_priority(unsigned int intid,
 
 void arm_gic_irq_enable(unsigned int intid)
 {
-	u32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	u32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
+	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
 
 	sys_write32(mask, ISENABLER(GET_DIST_BASE(intid), idx));
 }
 
 void arm_gic_irq_disable(unsigned int intid)
 {
-	u32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	u32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
+	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
 
 	sys_write32(mask, ICENABLER(GET_DIST_BASE(intid), idx));
 	/* poll to ensure write is complete */
@@ -85,9 +85,9 @@ void arm_gic_irq_disable(unsigned int intid)
 
 bool arm_gic_irq_is_enabled(unsigned int intid)
 {
-	u32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
-	u32_t idx = intid / GIC_NUM_INTR_PER_REG;
-	u32_t val;
+	uint32_t mask = BIT(intid & (GIC_NUM_INTR_PER_REG - 1));
+	uint32_t idx = intid / GIC_NUM_INTR_PER_REG;
+	uint32_t val;
 
 	val = sys_read32(ISENABLER(GET_DIST_BASE(intid), idx));
 
@@ -131,8 +131,8 @@ static void gicv3_rdist_enable(mem_addr_t rdist)
  */
 static void gicv3_cpuif_init(void)
 {
-	u32_t icc_sre;
-	u32_t intid;
+	uint32_t icc_sre;
+	uint32_t intid;
 
 	mem_addr_t base = gic_rdists[GET_CPUID] + GICR_SGI_BASE_OFF;
 
diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c
index 2e0e21389e..b4844cc8e3 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -92,17 +92,17 @@
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 #include <power/power.h>
-u32_t ioapic_suspend_buf[SUSPEND_BITS_REQD / 32] = {0};
-static u32_t ioapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
+uint32_t ioapic_suspend_buf[SUSPEND_BITS_REQD / 32] = {0};
+static uint32_t ioapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
 #endif
 
-static u32_t __IoApicGet(s32_t offset);
-static void __IoApicSet(s32_t offset, u32_t value);
-static void ioApicRedSetHi(unsigned int irq, u32_t upper32);
-static void ioApicRedSetLo(unsigned int irq, u32_t lower32);
-static u32_t ioApicRedGetLo(unsigned int irq);
-static void IoApicRedUpdateLo(unsigned int irq, u32_t value,
-					u32_t mask);
+static uint32_t __IoApicGet(int32_t offset);
+static void __IoApicSet(int32_t offset, uint32_t value);
+static void ioApicRedSetHi(unsigned int irq, uint32_t upper32);
+static void ioApicRedSetLo(unsigned int irq, uint32_t lower32);
+static uint32_t ioApicRedGetLo(unsigned int irq);
+static void IoApicRedUpdateLo(unsigned int irq, uint32_t value,
+					uint32_t mask);
 
 /*
  * The functions irq_enable() and irq_disable() are implemented in the
@@ -122,8 +122,8 @@ int ioapic_init(struct device *unused)
 {
 	ARG_UNUSED(unused);
 #ifdef CONFIG_IOAPIC_MASK_RTE
-	s32_t ix;	/* redirection table index */
-	u32_t rteValue; /* value to copy into redirection table entry */
+	int32_t ix;	/* redirection table index */
+	uint32_t rteValue; /* value to copy into redirection table entry */
 
 	/*
 	 * The platform must set the Kconfig option IOAPIC_NUM_RTES to indicate
@@ -176,7 +176,7 @@ void z_ioapic_irq_disable(unsigned int irq)
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 
-void store_flags(unsigned int irq, u32_t flags)
+void store_flags(unsigned int irq, uint32_t flags)
 {
 	/* Currently only the following four flags are modified */
 	if (flags & IOAPIC_LOW) {
@@ -204,9 +204,9 @@ void store_flags(unsigned int irq, u32_t flags)
 	}
 }
 
-u32_t restore_flags(unsigned int irq)
+uint32_t restore_flags(unsigned int irq)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	if (sys_bitfield_test_bit((mem_addr_t) ioapic_suspend_buf,
 		BIT_POS_FOR_IRQ_OPTION(irq, IOAPIC_BITFIELD_HI_LO))) {
@@ -235,7 +235,7 @@ u32_t restore_flags(unsigned int irq)
 int ioapic_suspend(struct device *port)
 {
 	int irq;
-	u32_t rte_lo;
+	uint32_t rte_lo;
 
 	ARG_UNUSED(port);
 	(void)memset(ioapic_suspend_buf, 0, (SUSPEND_BITS_REQD >> 3));
@@ -257,8 +257,8 @@ int ioapic_suspend(struct device *port)
 int ioapic_resume_from_suspend(struct device *port)
 {
 	int irq;
-	u32_t flags;
-	u32_t rteValue;
+	uint32_t flags;
+	uint32_t rteValue;
 
 	ARG_UNUSED(port);
 
@@ -288,19 +288,19 @@ int ioapic_resume_from_suspend(struct device *port)
 * Implements the driver control management functionality
 * the *context may include IN data or/and OUT data
 */
-static int ioapic_device_ctrl(struct device *device, u32_t ctrl_command,
+static int ioapic_device_ctrl(struct device *device, uint32_t ctrl_command,
 			      void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		if (*((u32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
 			ret = ioapic_suspend(device);
-		} else if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = ioapic_resume_from_suspend(device);
 		}
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = ioapic_device_power_state;
+		*((uint32_t *)context) = ioapic_device_power_state;
 	}
 
 	if (cb) {
@@ -324,9 +324,9 @@ static int ioapic_device_ctrl(struct device *device, u32_t ctrl_command,
  *
  * @return N/A
  */
-void z_ioapic_irq_set(unsigned int irq, unsigned int vector, u32_t flags)
+void z_ioapic_irq_set(unsigned int irq, unsigned int vector, uint32_t flags)
 {
-	u32_t rteValue;   /* value to copy into redirection table entry */
+	uint32_t rteValue;   /* value to copy into redirection table entry */
 
 	/* the delivery mode is determined by the flags passed from drivers */
 	rteValue = IOAPIC_INT_MASK | IOAPIC_LOGICAL |
@@ -360,17 +360,17 @@ void z_ioapic_int_vec_set(unsigned int irq, unsigned int vector)
  *
  * @return register value
  */
-static u32_t __IoApicGet(s32_t offset)
+static uint32_t __IoApicGet(int32_t offset)
 {
-	u32_t value; /* value */
+	uint32_t value; /* value */
 	unsigned int key;	/* interrupt lock level */
 
 	/* lock interrupts to ensure indirect addressing works "atomically" */
 
 	key = irq_lock();
 
-	*((volatile u32_t *) (IOAPIC_REG + IOAPIC_IND)) = (char)offset;
-	value = *((volatile u32_t *)(IOAPIC_REG + IOAPIC_DATA));
+	*((volatile uint32_t *) (IOAPIC_REG + IOAPIC_IND)) = (char)offset;
+	value = *((volatile uint32_t *)(IOAPIC_REG + IOAPIC_DATA));
 
 	irq_unlock(key);
 
@@ -387,7 +387,7 @@ static u32_t __IoApicGet(s32_t offset)
  * @param value Value to set the register
  * @return N/A
  */
-static void __IoApicSet(s32_t offset, u32_t value)
+static void __IoApicSet(int32_t offset, uint32_t value)
 {
 	unsigned int key; /* interrupt lock level */
 
@@ -395,8 +395,8 @@ static void __IoApicSet(s32_t offset, u32_t value)
 
 	key = irq_lock();
 
-	*(volatile u32_t *)(IOAPIC_REG + IOAPIC_IND) = (char)offset;
-	*((volatile u32_t *)(IOAPIC_REG + IOAPIC_DATA)) = value;
+	*(volatile uint32_t *)(IOAPIC_REG + IOAPIC_IND) = (char)offset;
+	*((volatile uint32_t *)(IOAPIC_REG + IOAPIC_DATA)) = value;
 
 	irq_unlock(key);
 }
@@ -410,9 +410,9 @@ static void __IoApicSet(s32_t offset, u32_t value)
  * @param irq INTIN number
  * @return 32 low-order bits
  */
-static u32_t ioApicRedGetLo(unsigned int irq)
+static uint32_t ioApicRedGetLo(unsigned int irq)
 {
-	s32_t offset = IOAPIC_REDTBL + (irq << 1); /* register offset */
+	int32_t offset = IOAPIC_REDTBL + (irq << 1); /* register offset */
 
 	return __IoApicGet(offset);
 }
@@ -427,9 +427,9 @@ static u32_t ioApicRedGetLo(unsigned int irq)
  * @param lower32 Value to be written
  * @return N/A
  */
-static void ioApicRedSetLo(unsigned int irq, u32_t lower32)
+static void ioApicRedSetLo(unsigned int irq, uint32_t lower32)
 {
-	s32_t offset = IOAPIC_REDTBL + (irq << 1); /* register offset */
+	int32_t offset = IOAPIC_REDTBL + (irq << 1); /* register offset */
 
 	__IoApicSet(offset, lower32);
 }
@@ -444,9 +444,9 @@ static void ioApicRedSetLo(unsigned int irq, u32_t lower32)
  * @param upper32 Value to be written
  * @return N/A
  */
-static void ioApicRedSetHi(unsigned int irq, u32_t upper32)
+static void ioApicRedSetHi(unsigned int irq, uint32_t upper32)
 {
-	s32_t offset = IOAPIC_REDTBL + (irq << 1) + 1; /* register offset */
+	int32_t offset = IOAPIC_REDTBL + (irq << 1) + 1; /* register offset */
 
 	__IoApicSet(offset, upper32);
 }
@@ -464,8 +464,8 @@ static void ioApicRedSetHi(unsigned int irq, u32_t upper32)
  * @return N/A
  */
 static void IoApicRedUpdateLo(unsigned int irq,
-				u32_t value,
-				u32_t mask)
+				uint32_t value,
+				uint32_t mask)
 {
 	ioApicRedSetLo(irq, (ioApicRedGetLo(irq) & ~mask) | (value & mask));
 }
diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c
index 32c43d0aa2..d62257f952 100644
--- a/drivers/interrupt_controller/intc_loapic.c
+++ b/drivers/interrupt_controller/intc_loapic.c
@@ -61,8 +61,8 @@
 #define LOPIC_SUSPEND_BITS_REQD (ROUND_UP((LOAPIC_IRQ_COUNT * LOPIC_SSPND_BITS_PER_IRQ), 32))
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 #include <power/power.h>
-u32_t loapic_suspend_buf[LOPIC_SUSPEND_BITS_REQD / 32] = {0};
-static u32_t loapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
+uint32_t loapic_suspend_buf[LOPIC_SUSPEND_BITS_REQD / 32] = {0};
+static uint32_t loapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
 #endif
 
 /**
@@ -73,7 +73,7 @@ static u32_t loapic_device_power_state = DEVICE_PM_ACTIVE_STATE;
 
 void z_loapic_enable(unsigned char cpu_number)
 {
-	s32_t loApicMaxLvt; /* local APIC Max LVT */
+	int32_t loApicMaxLvt; /* local APIC Max LVT */
 
 #ifndef CONFIG_X2APIC
 	/*
@@ -106,7 +106,7 @@ void z_loapic_enable(unsigned char cpu_number)
 	 * we don't check CPUID to see if x2APIC is supported.
 	 */
 
-	u64_t msr = z_x86_msr_read(X86_APIC_BASE_MSR);
+	uint64_t msr = z_x86_msr_read(X86_APIC_BASE_MSR);
 	msr |= X86_APIC_BASE_MSR_X2APIC;
 	z_x86_msr_write(X86_APIC_BASE_MSR, msr);
 #endif
@@ -322,7 +322,7 @@ int z_irq_controller_isr_vector_get(void)
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 static int loapic_suspend(struct device *port)
 {
-	volatile u32_t lvt; /* local vector table entry value */
+	volatile uint32_t lvt; /* local vector table entry value */
 	int loapic_irq;
 
 	ARG_UNUSED(port);
@@ -381,19 +381,19 @@ int loapic_resume(struct device *port)
 * Implements the driver control management functionality
 * the *context may include IN data or/and OUT data
 */
-static int loapic_device_ctrl(struct device *port, u32_t ctrl_command,
+static int loapic_device_ctrl(struct device *port, uint32_t ctrl_command,
 			      void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		if (*((u32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
 			ret = loapic_suspend(port);
-		} else if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = loapic_resume(port);
 		}
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = loapic_device_power_state;
+		*((uint32_t *)context) = loapic_device_power_state;
 	}
 
 	if (cb) {
diff --git a/drivers/interrupt_controller/intc_plic.c b/drivers/interrupt_controller/intc_plic.c
index bf5f59abd6..e930f2ef07 100644
--- a/drivers/interrupt_controller/intc_plic.c
+++ b/drivers/interrupt_controller/intc_plic.c
@@ -28,8 +28,8 @@
 #define PLIC_EN_SIZE     ((PLIC_IRQS >> 5) + 1)
 
 struct plic_regs_t {
-	u32_t threshold_prio;
-	u32_t claim_complete;
+	uint32_t threshold_prio;
+	uint32_t claim_complete;
 };
 
 static int save_irq;
@@ -46,10 +46,10 @@ static int save_irq;
  *
  * @return N/A
  */
-void riscv_plic_irq_enable(u32_t irq)
+void riscv_plic_irq_enable(uint32_t irq)
 {
-	u32_t key;
-	volatile u32_t *en = (volatile u32_t *)PLIC_IRQ_EN;
+	uint32_t key;
+	volatile uint32_t *en = (volatile uint32_t *)PLIC_IRQ_EN;
 
 	key = irq_lock();
 	en += (irq >> 5);
@@ -69,10 +69,10 @@ void riscv_plic_irq_enable(u32_t irq)
  *
  * @return N/A
  */
-void riscv_plic_irq_disable(u32_t irq)
+void riscv_plic_irq_disable(uint32_t irq)
 {
-	u32_t key;
-	volatile u32_t *en = (volatile u32_t *)PLIC_IRQ_EN;
+	uint32_t key;
+	volatile uint32_t *en = (volatile uint32_t *)PLIC_IRQ_EN;
 
 	key = irq_lock();
 	en += (irq >> 5);
@@ -89,9 +89,9 @@ void riscv_plic_irq_disable(u32_t irq)
  *
  * @return 1 or 0
  */
-int riscv_plic_irq_is_enabled(u32_t irq)
+int riscv_plic_irq_is_enabled(uint32_t irq)
 {
-	volatile u32_t *en = (volatile u32_t *)PLIC_IRQ_EN;
+	volatile uint32_t *en = (volatile uint32_t *)PLIC_IRQ_EN;
 
 	en += (irq >> 5);
 	return !!(*en & (1 << (irq & 31)));
@@ -108,9 +108,9 @@ int riscv_plic_irq_is_enabled(u32_t irq)
  *
  * @return N/A
  */
-void riscv_plic_set_priority(u32_t irq, u32_t priority)
+void riscv_plic_set_priority(uint32_t irq, uint32_t priority)
 {
-	volatile u32_t *prio = (volatile u32_t *)PLIC_PRIO;
+	volatile uint32_t *prio = (volatile uint32_t *)PLIC_PRIO;
 
 	if (priority > PLIC_MAX_PRIO)
 		priority = PLIC_MAX_PRIO;
@@ -139,7 +139,7 @@ static void plic_irq_handler(void *arg)
 	volatile struct plic_regs_t *regs =
 	    (volatile struct plic_regs_t *) PLIC_REG;
 
-	u32_t irq;
+	uint32_t irq;
 	struct _isr_table_entry *ite;
 
 	/* Get the IRQ number generating the interrupt */
@@ -182,8 +182,8 @@ static int plic_init(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	volatile u32_t *en = (volatile u32_t *)PLIC_IRQ_EN;
-	volatile u32_t *prio = (volatile u32_t *)PLIC_PRIO;
+	volatile uint32_t *en = (volatile uint32_t *)PLIC_IRQ_EN;
+	volatile uint32_t *prio = (volatile uint32_t *)PLIC_PRIO;
 	volatile struct plic_regs_t *regs =
 	    (volatile struct plic_regs_t *)PLIC_REG;
 	int i;
diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
index 23c0fcd809..3acd5d1ecc 100644
--- a/drivers/interrupt_controller/intc_rv32m1_intmux.c
+++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c
@@ -56,25 +56,25 @@ DEVICE_DECLARE(intmux);
  * <irq_nextlevel.h> API
  */
 
-static void rv32m1_intmux_irq_enable(struct device *dev, u32_t irq)
+static void rv32m1_intmux_irq_enable(struct device *dev, uint32_t irq)
 {
 	INTMUX_Type *regs = DEV_REGS(dev);
-	u32_t channel = rv32m1_intmux_channel(irq);
-	u32_t line = rv32m1_intmux_line(irq);
+	uint32_t channel = rv32m1_intmux_channel(irq);
+	uint32_t line = rv32m1_intmux_line(irq);
 
 	regs->CHANNEL[channel].CHn_IER_31_0 |= BIT(line);
 }
 
-static void rv32m1_intmux_irq_disable(struct device *dev, u32_t irq)
+static void rv32m1_intmux_irq_disable(struct device *dev, uint32_t irq)
 {
 	INTMUX_Type *regs = DEV_REGS(dev);
-	u32_t channel = rv32m1_intmux_channel(irq);
-	u32_t line = rv32m1_intmux_line(irq);
+	uint32_t channel = rv32m1_intmux_channel(irq);
+	uint32_t line = rv32m1_intmux_line(irq);
 
 	regs->CHANNEL[channel].CHn_IER_31_0 &= ~BIT(line);
 }
 
-static u32_t rv32m1_intmux_get_state(struct device *dev)
+static uint32_t rv32m1_intmux_get_state(struct device *dev)
 {
 	INTMUX_Type *regs = DEV_REGS(dev);
 	size_t i;
@@ -91,8 +91,8 @@ static u32_t rv32m1_intmux_get_state(struct device *dev)
 static int rv32m1_intmux_get_line_state(struct device *dev, unsigned int irq)
 {
 	INTMUX_Type *regs = DEV_REGS(dev);
-	u32_t channel = rv32m1_intmux_channel(irq);
-	u32_t line = rv32m1_intmux_line(irq);
+	uint32_t channel = rv32m1_intmux_channel(irq);
+	uint32_t line = rv32m1_intmux_line(irq);
 
 	if ((regs->CHANNEL[channel].CHn_IER_31_0 & BIT(line)) != 0) {
 		return 1;
@@ -112,8 +112,8 @@ static void rv32m1_intmux_isr(void *arg)
 {
 	struct device *dev = DEVICE_GET(intmux);
 	INTMUX_Type *regs = DEV_REGS(dev);
-	u32_t channel = POINTER_TO_UINT(arg);
-	u32_t line = (regs->CHANNEL[channel].CHn_VEC >> 2);
+	uint32_t channel = POINTER_TO_UINT(arg);
+	uint32_t line = (regs->CHANNEL[channel].CHn_VEC >> 2);
 	struct _isr_table_entry *isr_base = DEV_CFG(dev)->isr_base;
 	struct _isr_table_entry *entry;
 
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index 204441787c..1ceb3f09fc 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -12,9 +12,9 @@
 #include "intc_sam0_eic_priv.h"
 
 struct sam0_eic_line_assignment {
-	u8_t pin : 5;
-	u8_t port : 2;
-	u8_t enabled : 1;
+	uint8_t pin : 5;
+	uint8_t port : 2;
+	uint8_t enabled : 1;
 };
 
 struct sam0_eic_port_data {
@@ -57,8 +57,8 @@ static void sam0_eic_isr(void *arg)
 {
 	struct device *dev = (struct device *)arg;
 	struct sam0_eic_data *const dev_data = DEV_DATA(dev);
-	u16_t bits = EIC->INTFLAG.reg;
-	u32_t line_index;
+	uint16_t bits = EIC->INTFLAG.reg;
+	uint32_t line_index;
 
 	/* Acknowledge all interrupts */
 	EIC->INTFLAG.reg = bits;
@@ -106,12 +106,12 @@ int sam0_eic_acquire(int port, int pin, enum sam0_eic_trigger trigger,
 	struct sam0_eic_data *dev_data = dev->driver_data;
 	struct sam0_eic_port_data *port_data;
 	struct sam0_eic_line_assignment *line_assignment;
-	u32_t mask;
+	uint32_t mask;
 	int line_index;
 	int config_index;
 	int config_shift;
 	int key;
-	u32_t config;
+	uint32_t config;
 
 	line_index = sam0_eic_map_to_line(port, pin);
 	if (line_index < 0) {
@@ -213,7 +213,7 @@ int sam0_eic_release(int port, int pin)
 {
 	struct device *dev = DEVICE_GET(sam0_eic);
 	struct sam0_eic_data *dev_data = dev->driver_data;
-	u32_t mask;
+	uint32_t mask;
 	int line_index;
 	int config_index;
 	int config_shift;
@@ -260,7 +260,7 @@ done:
 
 int sam0_eic_enable_interrupt(int port, int pin)
 {
-	u32_t mask;
+	uint32_t mask;
 	int line_index;
 
 	line_index = sam0_eic_map_to_line(port, pin);
@@ -281,7 +281,7 @@ int sam0_eic_enable_interrupt(int port, int pin)
 
 int sam0_eic_disable_interrupt(int port, int pin)
 {
-	u32_t mask;
+	uint32_t mask;
 	int line_index;
 
 	line_index = sam0_eic_map_to_line(port, pin);
@@ -300,13 +300,13 @@ int sam0_eic_disable_interrupt(int port, int pin)
 	return 0;
 }
 
-u32_t sam0_eic_interrupt_pending(int port)
+uint32_t sam0_eic_interrupt_pending(int port)
 {
 	struct device *dev = DEVICE_GET(sam0_eic);
 	struct sam0_eic_data *dev_data = dev->driver_data;
 	struct sam0_eic_line_assignment *line_assignment;
-	u32_t set = EIC->INTFLAG.reg;
-	u32_t mask = 0;
+	uint32_t set = EIC->INTFLAG.reg;
+	uint32_t mask = 0;
 
 	for (int line_index = 0; line_index < EIC_EXTINT_NUM; line_index++) {
 		line_assignment = &dev_data->lines[line_index];
diff --git a/drivers/interrupt_controller/intc_sam0_eic_priv.h b/drivers/interrupt_controller/intc_sam0_eic_priv.h
index 514f61854a..ef4af14442 100644
--- a/drivers/interrupt_controller/intc_sam0_eic_priv.h
+++ b/drivers/interrupt_controller/intc_sam0_eic_priv.h
@@ -25,7 +25,7 @@
  * some of them might be undefined for a port and we can't test for another
  * macro definition inside a macro.
  */
-static const u8_t sam0_eic_channels[PORT_GROUPS][32] = {
+static const uint8_t sam0_eic_channels[PORT_GROUPS][32] = {
 #if PORT_GROUPS >= 1
 {
 #ifdef PIN_PA00A_EIC_EXTINT_NUM
@@ -689,7 +689,7 @@ static const u8_t sam0_eic_channels[PORT_GROUPS][32] = {
 
 static inline int sam0_eic_map_to_line(int port, int pin)
 {
-	u8_t ch = sam0_eic_channels[port][pin];
+	uint8_t ch = sam0_eic_channels[port][pin];
 
 	if (ch == 0xFF) {
 		return -ENOTSUP;
diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c
index 87c1b99d6b..2789a265e2 100644
--- a/drivers/interrupt_controller/intc_shared_irq.c
+++ b/drivers/interrupt_controller/intc_shared_irq.c
@@ -29,7 +29,7 @@ static int isr_register(struct device *dev, isr_t isr_func,
 {
 	struct shared_irq_runtime *clients = dev->driver_data;
 	const struct shared_irq_config *config = dev->config_info;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < config->client_count; i++) {
 		if (!clients->client[i].isr_dev) {
@@ -50,7 +50,7 @@ static inline int enable(struct device *dev, struct device *isr_dev)
 {
 	struct shared_irq_runtime *clients = dev->driver_data;
 	const struct shared_irq_config *config = dev->config_info;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < config->client_count; i++) {
 		if (clients->client[i].isr_dev == isr_dev) {
@@ -64,7 +64,7 @@ static inline int enable(struct device *dev, struct device *isr_dev)
 
 static int last_enabled_isr(struct shared_irq_runtime *clients, int count)
 {
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < count; i++) {
 		if (clients->client[i].enabled) {
@@ -82,7 +82,7 @@ static inline int disable(struct device *dev, struct device *isr_dev)
 {
 	struct shared_irq_runtime *clients = dev->driver_data;
 	const struct shared_irq_config *config = dev->config_info;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < config->client_count; i++) {
 		if (clients->client[i].isr_dev == isr_dev) {
@@ -100,7 +100,7 @@ void shared_irq_isr(struct device *dev)
 {
 	struct shared_irq_runtime *clients = dev->driver_data;
 	const struct shared_irq_config *config = dev->config_info;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < config->client_count; i++) {
 		if (clients->client[i].isr_dev) {
diff --git a/drivers/interrupt_controller/intc_swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c
index 60c3e5747e..87f51db155 100644
--- a/drivers/interrupt_controller/intc_swerv_pic.c
+++ b/drivers/interrupt_controller/intc_swerv_pic.c
@@ -42,19 +42,19 @@
 
 static int save_irq;
 
-static u32_t swerv_pic_read(u32_t reg)
+static uint32_t swerv_pic_read(uint32_t reg)
 {
-	return *(volatile u32_t *)(DT_INST_REG_ADDR(0) + reg);
+	return *(volatile uint32_t *)(DT_INST_REG_ADDR(0) + reg);
 }
 
-static void swerv_pic_write(u32_t reg, u32_t val)
+static void swerv_pic_write(uint32_t reg, uint32_t val)
 {
-	*(volatile u32_t *)(DT_INST_REG_ADDR(0) + reg) = val;
+	*(volatile uint32_t *)(DT_INST_REG_ADDR(0) + reg) = val;
 }
 
-void swerv_pic_irq_enable(u32_t irq)
+void swerv_pic_irq_enable(uint32_t irq)
 {
-	u32_t key;
+	uint32_t key;
 
 	if ((irq >= SWERV_PIC_MAX_ID) || (irq < RISCV_MAX_GENERIC_IRQ)) {
 		return;
@@ -65,9 +65,9 @@ void swerv_pic_irq_enable(u32_t irq)
 	irq_unlock(key);
 }
 
-void swerv_pic_irq_disable(u32_t irq)
+void swerv_pic_irq_disable(uint32_t irq)
 {
-	u32_t key;
+	uint32_t key;
 
 	if ((irq >= SWERV_PIC_MAX_ID) || (irq < RISCV_MAX_GENERIC_IRQ)) {
 		return;
@@ -78,7 +78,7 @@ void swerv_pic_irq_disable(u32_t irq)
 	irq_unlock(key);
 }
 
-int swerv_pic_irq_is_enabled(u32_t irq)
+int swerv_pic_irq_is_enabled(uint32_t irq)
 {
 	if ((irq >= SWERV_PIC_MAX_ID) || (irq < RISCV_MAX_GENERIC_IRQ)) {
 		return -1;
@@ -88,9 +88,9 @@ int swerv_pic_irq_is_enabled(u32_t irq)
 	  & 0x1;
 }
 
-void swerv_pic_set_priority(u32_t irq, u32_t priority)
+void swerv_pic_set_priority(uint32_t irq, uint32_t priority)
 {
-	u32_t key;
+	uint32_t key;
 
 	if (irq <= RISCV_MAX_GENERIC_IRQ) {
 		return;
@@ -116,8 +116,8 @@ int swerv_pic_get_irq(void)
 
 static void swerv_pic_irq_handler(void *arg)
 {
-	u32_t tmp;
-	u32_t irq;
+	uint32_t tmp;
+	uint32_t irq;
 	struct _isr_table_entry *ite;
 
 	/* trigger the capture of the interrupt source ID */
@@ -189,7 +189,7 @@ static int swerv_pic_init(struct device *dev)
 
 void arch_irq_enable(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 	if (irq > RISCV_MAX_GENERIC_IRQ) {
 		swerv_pic_irq_enable(irq);
@@ -207,7 +207,7 @@ void arch_irq_enable(unsigned int irq)
 
 void arch_irq_disable(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 	if (irq > RISCV_MAX_GENERIC_IRQ) {
 		swerv_pic_irq_disable(irq);
@@ -225,7 +225,7 @@ void arch_irq_disable(unsigned int irq)
 
 int arch_irq_is_enabled(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 	if (irq > RISCV_MAX_GENERIC_IRQ)
 		return swerv_pic_irq_is_enabled(irq);
diff --git a/drivers/interrupt_controller/intc_system_apic.c b/drivers/interrupt_controller/intc_system_apic.c
index e9e477b7e2..7c3d833c09 100644
--- a/drivers/interrupt_controller/intc_system_apic.c
+++ b/drivers/interrupt_controller/intc_system_apic.c
@@ -44,7 +44,7 @@
  *
  */
 void z_irq_controller_irq_config(unsigned int vector, unsigned int irq,
-				 u32_t flags)
+				 uint32_t flags)
 {
 	__ASSERT(irq <= HARDWARE_IRQ_LIMIT, "invalid irq line");
 
diff --git a/drivers/interrupt_controller/intc_vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c
index 93b24ee799..898c538aab 100644
--- a/drivers/interrupt_controller/intc_vexriscv_litex.c
+++ b/drivers/interrupt_controller/intc_vexriscv_litex.c
@@ -22,28 +22,28 @@
 
 #define ETH0_IRQ		DT_IRQN(DT_INST(0, litex_eth0))
 
-static inline void vexriscv_litex_irq_setmask(u32_t mask)
+static inline void vexriscv_litex_irq_setmask(uint32_t mask)
 {
 	__asm__ volatile ("csrw %0, %1" :: "i"(IRQ_MASK), "r"(mask));
 }
 
-static inline u32_t vexriscv_litex_irq_getmask(void)
+static inline uint32_t vexriscv_litex_irq_getmask(void)
 {
-	u32_t mask;
+	uint32_t mask;
 
 	__asm__ volatile ("csrr %0, %1" : "=r"(mask) : "i"(IRQ_MASK));
 	return mask;
 }
 
-static inline u32_t vexriscv_litex_irq_pending(void)
+static inline uint32_t vexriscv_litex_irq_pending(void)
 {
-	u32_t pending;
+	uint32_t pending;
 
 	__asm__ volatile ("csrr %0, %1" : "=r"(pending) : "i"(IRQ_PENDING));
 	return pending;
 }
 
-static inline void vexriscv_litex_irq_setie(u32_t ie)
+static inline void vexriscv_litex_irq_setie(uint32_t ie)
 {
 	if (ie) {
 		__asm__ volatile ("csrrs x0, mstatus, %0"
@@ -57,7 +57,7 @@ static inline void vexriscv_litex_irq_setie(u32_t ie)
 static void vexriscv_litex_irq_handler(void *device)
 {
 	struct _isr_table_entry *ite;
-	u32_t pending, mask, irqs;
+	uint32_t pending, mask, irqs;
 
 	pending = vexriscv_litex_irq_pending();
 	mask = vexriscv_litex_irq_getmask();
diff --git a/drivers/ipm/ipm_cavs_idc.c b/drivers/ipm/ipm_cavs_idc.c
index ef86c135d2..1d6e11deb3 100644
--- a/drivers/ipm/ipm_cavs_idc.c
+++ b/drivers/ipm/ipm_cavs_idc.c
@@ -33,10 +33,10 @@ static void cavs_idc_isr(struct device *dev)
 {
 	struct cavs_idc_data *drv_data = dev->driver_data;
 
-	u32_t i, id;
+	uint32_t i, id;
 	void *ext;
-	u32_t idctfc;
-	u32_t curr_cpu_id = arch_curr_cpu()->id;
+	uint32_t idctfc;
+	uint32_t curr_cpu_id = arch_curr_cpu()->id;
 #ifdef CONFIG_SCHED_IPI_SUPPORTED
 	bool do_sched_ipi = false;
 #endif
@@ -84,12 +84,12 @@ static void cavs_idc_isr(struct device *dev)
 #endif
 }
 
-static int cavs_idc_send(struct device *dev, int wait, u32_t id,
+static int cavs_idc_send(struct device *dev, int wait, uint32_t id,
 			 const void *data, int size)
 {
-	u32_t curr_cpu_id = arch_curr_cpu()->id;
-	u32_t ext = POINTER_TO_UINT(data);
-	u32_t reg;
+	uint32_t curr_cpu_id = arch_curr_cpu()->id;
+	uint32_t ext = POINTER_TO_UINT(data);
+	uint32_t reg;
 	bool busy;
 	int i;
 
@@ -149,7 +149,7 @@ static int cavs_idc_max_data_size_get(struct device *dev)
 	return 0;
 }
 
-static u32_t cavs_idc_max_id_val_get(struct device *dev)
+static uint32_t cavs_idc_max_id_val_get(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
@@ -168,7 +168,7 @@ static void cavs_idc_register_callback(struct device *dev, ipm_callback_t cb,
 static int cavs_idc_set_enabled(struct device *dev, int enable)
 {
 	int i, j;
-	u32_t mask;
+	uint32_t mask;
 
 #ifdef CONFIG_SCHED_IPI_SUPPORTED
 	/* With scheduler IPI, IDC must always be enabled. */
diff --git a/drivers/ipm/ipm_cavs_idc_priv.h b/drivers/ipm/ipm_cavs_idc_priv.h
index 056be82753..fefa4a0109 100644
--- a/drivers/ipm/ipm_cavs_idc_priv.h
+++ b/drivers/ipm/ipm_cavs_idc_priv.h
@@ -33,12 +33,12 @@
 #define REG_IDCCTL_IDCIDIE(x)	(0x100 << (x))
 #define REG_IDCCTL_IDCTBIE(x)	(0x1 << (x))
 
-static inline u32_t idc_read(u32_t reg, u32_t core_id)
+static inline uint32_t idc_read(uint32_t reg, uint32_t core_id)
 {
 	return sys_read32(IDC_REG_BASE(core_id) + reg);
 }
 
-static inline void idc_write(u32_t reg, u32_t core_id, u32_t val)
+static inline void idc_write(uint32_t reg, uint32_t core_id, uint32_t val)
 {
 	sys_write32(val, IDC_REG_BASE(core_id) + reg);
 }
diff --git a/drivers/ipm/ipm_handlers.c b/drivers/ipm/ipm_handlers.c
index 3ce27ce079..1261356e9b 100644
--- a/drivers/ipm/ipm_handlers.c
+++ b/drivers/ipm/ipm_handlers.c
@@ -7,7 +7,7 @@
 #include <syscall_handler.h>
 #include <drivers/ipm.h>
 
-static inline int z_vrfy_ipm_send(struct device *dev, int wait, u32_t id,
+static inline int z_vrfy_ipm_send(struct device *dev, int wait, uint32_t id,
 			   const void *data, int size)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, send));
@@ -24,7 +24,7 @@ static inline int z_vrfy_ipm_max_data_size_get(struct device *dev)
 }
 #include <syscalls/ipm_max_data_size_get_mrsh.c>
 
-static inline u32_t z_vrfy_ipm_max_id_val_get(struct device *dev)
+static inline uint32_t z_vrfy_ipm_max_id_val_get(struct device *dev)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_IPM(dev, max_id_val_get));
 	return z_impl_ipm_max_id_val_get((struct device *)dev);
diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c
index ed50f552d0..6badc54493 100644
--- a/drivers/ipm/ipm_imx.c
+++ b/drivers/ipm/ipm_imx.c
@@ -37,10 +37,10 @@ static void imx_mu_isr(void *arg)
 	const struct imx_mu_config *config = dev->config_info;
 	MU_Type *base = MU(config);
 	struct imx_mu_data *data = dev->driver_data;
-	u32_t data32[IMX_IPM_DATA_REGS];
-	u32_t status_reg;
-	s32_t id;
-	s32_t i;
+	uint32_t data32[IMX_IPM_DATA_REGS];
+	uint32_t status_reg;
+	int32_t id;
+	int32_t i;
 	bool all_registers_full;
 
 	status_reg = base->SR >>= MU_SR_RFn_SHIFT;
@@ -70,7 +70,7 @@ static void imx_mu_isr(void *arg)
 
 				if (data->callback) {
 					data->callback(data->callback_ctx,
-						       (u32_t)id,
+						       (uint32_t)id,
 						       &data32[0]);
 				}
 			}
@@ -87,12 +87,12 @@ static void imx_mu_isr(void *arg)
 #endif
 }
 
-static int imx_mu_ipm_send(struct device *dev, int wait, u32_t id,
+static int imx_mu_ipm_send(struct device *dev, int wait, uint32_t id,
 			   const void *data, int size)
 {
 	const struct imx_mu_config *config = dev->config_info;
 	MU_Type *base = MU(config);
-	u32_t data32[IMX_IPM_DATA_REGS];
+	uint32_t data32[IMX_IPM_DATA_REGS];
 	mu_status_t status;
 	int i;
 
@@ -131,7 +131,7 @@ static int imx_mu_ipm_max_data_size_get(struct device *dev)
 	return CONFIG_IPM_IMX_MAX_DATA_SIZE;
 }
 
-static u32_t imx_mu_ipm_max_id_val_get(struct device *dev)
+static uint32_t imx_mu_ipm_max_id_val_get(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c
index a3e5d13b4d..c2df1737e7 100644
--- a/drivers/ipm/ipm_mcux.c
+++ b/drivers/ipm/ipm_mcux.c
@@ -43,7 +43,7 @@ static void mcux_mailbox_isr(void *arg)
 
 	cpu_id = MAILBOX_ID_THIS_CPU;
 
-	volatile u32_t value = MAILBOX_GetValue(config->base, cpu_id);
+	volatile uint32_t value = MAILBOX_GetValue(config->base, cpu_id);
 
 	__ASSERT(value, "spurious MAILBOX interrupt");
 
@@ -64,13 +64,13 @@ static void mcux_mailbox_isr(void *arg)
 }
 
 
-static int mcux_mailbox_ipm_send(struct device *d, int wait, u32_t id,
+static int mcux_mailbox_ipm_send(struct device *d, int wait, uint32_t id,
 			const void *data, int size)
 {
 	const struct mcux_mailbox_config *config = d->config_info;
 	MAILBOX_Type *base = config->base;
-	u32_t data32[MCUX_IPM_DATA_REGS]; /* Until we change API
-					   * to u32_t array
+	uint32_t data32[MCUX_IPM_DATA_REGS]; /* Until we change API
+					   * to uint32_t array
 					   */
 	unsigned int flags;
 	int i;
@@ -81,7 +81,7 @@ static int mcux_mailbox_ipm_send(struct device *d, int wait, u32_t id,
 		return -EINVAL;
 	}
 
-	if (size > MCUX_IPM_DATA_REGS * sizeof(u32_t)) {
+	if (size > MCUX_IPM_DATA_REGS * sizeof(uint32_t)) {
 		return -EMSGSIZE;
 	}
 
@@ -104,11 +104,11 @@ static int mcux_mailbox_ipm_max_data_size_get(struct device *d)
 {
 	ARG_UNUSED(d);
 	/* Only a single 32-bit register available */
-	return MCUX_IPM_DATA_REGS*sizeof(u32_t);
+	return MCUX_IPM_DATA_REGS*sizeof(uint32_t);
 }
 
 
-static u32_t mcux_mailbox_ipm_max_id_val_get(struct device *d)
+static uint32_t mcux_mailbox_ipm_max_id_val_get(struct device *d)
 {
 	ARG_UNUSED(d);
 	/* Only a single instance of MAILBOX available for this platform */
diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c
index 31621a8e7f..82f47498eb 100644
--- a/drivers/ipm/ipm_mhu.c
+++ b/drivers/ipm/ipm_mhu.c
@@ -20,21 +20,21 @@
 
 static enum ipm_mhu_cpu_id_t ipm_mhu_get_cpu_id(const struct device *d)
 {
-	volatile u32_t *p_mhu_dev_base;
-	volatile u32_t *p_cpu_id;
+	volatile uint32_t *p_mhu_dev_base;
+	volatile uint32_t *p_cpu_id;
 
-	p_mhu_dev_base = (volatile u32_t *)IPM_MHU_REGS(d);
+	p_mhu_dev_base = (volatile uint32_t *)IPM_MHU_REGS(d);
 
-	p_cpu_id = (volatile u32_t *)(((u32_t)p_mhu_dev_base &
+	p_cpu_id = (volatile uint32_t *)(((uint32_t)p_mhu_dev_base &
 						SSE_200_DEVICE_BASE_REG_MSK) +
 						SSE_200_CPU_ID_UNIT_OFFSET);
 
 	return (enum ipm_mhu_cpu_id_t)*p_cpu_id;
 }
 
-static u32_t ipm_mhu_get_status(const struct device *d,
+static uint32_t ipm_mhu_get_status(const struct device *d,
 						enum ipm_mhu_cpu_id_t cpu_id,
-						u32_t *status)
+						uint32_t *status)
 {
 	struct ipm_mhu_reg_map_t *p_mhu_dev;
 
@@ -57,12 +57,12 @@ static u32_t ipm_mhu_get_status(const struct device *d,
 	return IPM_MHU_ERR_NONE;
 }
 
-static int ipm_mhu_send(struct device *d, int wait, u32_t cpu_id,
+static int ipm_mhu_send(struct device *d, int wait, uint32_t cpu_id,
 			  const void *data, int size)
 {
 	ARG_UNUSED(wait);
 	ARG_UNUSED(data);
-	const u32_t set_val = 0x01;
+	const uint32_t set_val = 0x01;
 
 	struct ipm_mhu_reg_map_t *p_mhu_dev;
 
@@ -91,7 +91,7 @@ static int ipm_mhu_send(struct device *d, int wait, u32_t cpu_id,
 
 static void ipm_mhu_clear_val(const struct device *d,
 						enum ipm_mhu_cpu_id_t cpu_id,
-						u32_t clear_val)
+						uint32_t clear_val)
 {
 	struct ipm_mhu_reg_map_t *p_mhu_dev;
 
@@ -108,7 +108,7 @@ static void ipm_mhu_clear_val(const struct device *d,
 	}
 }
 
-static u32_t ipm_mhu_max_id_val_get(struct device *d)
+static uint32_t ipm_mhu_max_id_val_get(struct device *d)
 {
 	ARG_UNUSED(d);
 
@@ -129,7 +129,7 @@ static void ipm_mhu_isr(void *arg)
 	struct device *d = arg;
 	struct ipm_mhu_data *driver_data = DEV_DATA(d);
 	enum ipm_mhu_cpu_id_t cpu_id;
-	u32_t ipm_mhu_status;
+	uint32_t ipm_mhu_status;
 
 	cpu_id = ipm_mhu_get_cpu_id(d);
 
@@ -177,7 +177,7 @@ static const struct ipm_driver_api ipm_mhu_driver_api = {
 static void ipm_mhu_irq_config_func_0(struct device *d);
 
 static const struct ipm_mhu_device_config ipm_mhu_cfg_0 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(0),
+	.base = (uint8_t *)DT_INST_REG_ADDR(0),
 	.irq_config_func = ipm_mhu_irq_config_func_0,
 };
 
@@ -208,7 +208,7 @@ static void ipm_mhu_irq_config_func_0(struct device *d)
 static void ipm_mhu_irq_config_func_1(struct device *d);
 
 static const struct ipm_mhu_device_config ipm_mhu_cfg_1 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(1),
+	.base = (uint8_t *)DT_INST_REG_ADDR(1),
 	.irq_config_func = ipm_mhu_irq_config_func_1,
 };
 
diff --git a/drivers/ipm/ipm_mhu.h b/drivers/ipm/ipm_mhu.h
index d4d8c51b55..5ff67f3d7f 100644
--- a/drivers/ipm/ipm_mhu.h
+++ b/drivers/ipm/ipm_mhu.h
@@ -23,25 +23,25 @@ extern "C" {
 /* SSE 200 MHU register map structure */
 struct ipm_mhu_reg_map_t {
 	/* (R/ ) CPU 0 Interrupt Status Register */
-	volatile u32_t cpu0intr_stat;
-	volatile u32_t cpu0intr_set;  /* ( /W) CPU 0 Interrupt Set Register */
-	volatile u32_t cpu0intr_clr;  /* ( /W) CPU 0 Interrupt Clear Register */
-	volatile u32_t reserved0;
+	volatile uint32_t cpu0intr_stat;
+	volatile uint32_t cpu0intr_set;  /* ( /W) CPU 0 Interrupt Set Register */
+	volatile uint32_t cpu0intr_clr;  /* ( /W) CPU 0 Interrupt Clear Register */
+	volatile uint32_t reserved0;
 	/* (R/ ) CPU 1 Interrupt Status Register */
-	volatile u32_t cpu1intr_stat;
-	volatile u32_t cpu1intr_set;  /* ( /W) CPU 1 Interrupt Set Register */
-	volatile u32_t cpu1intr_clr;  /* ( /W) CPU 1 Interrupt Clear Register */
-	volatile u32_t reserved1[1004];
-	volatile u32_t pidr4;         /* ( /W) Peripheral ID 4 */
-	volatile u32_t reserved2[3];
-	volatile u32_t pidr0;         /* ( /W) Peripheral ID 0 */
-	volatile u32_t pidr1;         /* ( /W) Peripheral ID 1 */
-	volatile u32_t pidr2;         /* ( /W) Peripheral ID 2 */
-	volatile u32_t pidr3;         /* ( /W) Peripheral ID 3 */
-	volatile u32_t cidr0;         /* ( /W) Component ID 0 */
-	volatile u32_t cidr1;         /* ( /W) Component ID 1 */
-	volatile u32_t cidr2;         /* ( /W) Component ID 2 */
-	volatile u32_t cidr3;         /* ( /W) Component ID 3 */
+	volatile uint32_t cpu1intr_stat;
+	volatile uint32_t cpu1intr_set;  /* ( /W) CPU 1 Interrupt Set Register */
+	volatile uint32_t cpu1intr_clr;  /* ( /W) CPU 1 Interrupt Clear Register */
+	volatile uint32_t reserved1[1004];
+	volatile uint32_t pidr4;         /* ( /W) Peripheral ID 4 */
+	volatile uint32_t reserved2[3];
+	volatile uint32_t pidr0;         /* ( /W) Peripheral ID 0 */
+	volatile uint32_t pidr1;         /* ( /W) Peripheral ID 1 */
+	volatile uint32_t pidr2;         /* ( /W) Peripheral ID 2 */
+	volatile uint32_t pidr3;         /* ( /W) Peripheral ID 3 */
+	volatile uint32_t cidr0;         /* ( /W) Component ID 0 */
+	volatile uint32_t cidr1;         /* ( /W) Component ID 1 */
+	volatile uint32_t cidr2;         /* ( /W) Component ID 2 */
+	volatile uint32_t cidr3;         /* ( /W) Component ID 3 */
 };
 
 /* MHU enumeration types */
@@ -58,7 +58,7 @@ enum ipm_mhu_cpu_id_t {
 };
 
 struct ipm_mhu_device_config {
-	u8_t *base;
+	uint8_t *base;
 	void (*irq_config_func)(struct device *d);
 };
 
diff --git a/drivers/ipm/ipm_nrfx_ipc.c b/drivers/ipm/ipm_nrfx_ipc.c
index c896c9085f..9a976b8f1f 100644
--- a/drivers/ipm/ipm_nrfx_ipc.c
+++ b/drivers/ipm/ipm_nrfx_ipc.c
@@ -23,15 +23,15 @@ struct ipm_nrf_data {
 static struct ipm_nrf_data nrfx_ipm_data;
 
 static void gipm_init(void);
-static void gipm_send(u32_t id);
+static void gipm_send(uint32_t id);
 
 #if IS_ENABLED(CONFIG_IPM_NRF_SINGLE_INSTANCE)
 
-static void nrfx_ipc_handler(u32_t event_mask, void *p_context)
+static void nrfx_ipc_handler(uint32_t event_mask, void *p_context)
 {
 	if (nrfx_ipm_data.callback) {
 		while (event_mask) {
-			u8_t event_idx = __CLZ(__RBIT(event_mask));
+			uint8_t event_idx = __CLZ(__RBIT(event_mask));
 
 			__ASSERT(event_idx < NRFX_IPC_ID_MAX_VALUE,
 				 "Illegal event_idx: %d", event_idx);
@@ -43,7 +43,7 @@ static void nrfx_ipc_handler(u32_t event_mask, void *p_context)
 	}
 }
 
-static int ipm_nrf_send(struct device *dev, int wait, u32_t id,
+static int ipm_nrf_send(struct device *dev, int wait, uint32_t id,
 			const void *data, int size)
 {
 	if (id > NRFX_IPC_ID_MAX_VALUE) {
@@ -65,7 +65,7 @@ static int ipm_nrf_max_data_size_get(struct device *dev)
 	return 0;
 }
 
-static u32_t ipm_nrf_max_id_val_get(struct device *dev)
+static uint32_t ipm_nrf_max_id_val_get(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
@@ -123,10 +123,10 @@ struct vipm_nrf_data {
 
 static struct vipm_nrf_data nrfx_vipm_data;
 
-static void vipm_dispatcher(u32_t event_mask, void *p_context)
+static void vipm_dispatcher(uint32_t event_mask, void *p_context)
 {
 	while (event_mask) {
-		u8_t event_idx = __CLZ(__RBIT(event_mask));
+		uint8_t event_idx = __CLZ(__RBIT(event_mask));
 
 		__ASSERT(event_idx < NRFX_IPC_ID_MAX_VALUE,
 			 "Illegal event_idx: %d", event_idx);
@@ -145,7 +145,7 @@ static int vipm_nrf_max_data_size_get(struct device *dev)
 	return ipm_max_data_size_get(dev);
 }
 
-static u32_t vipm_nrf_max_id_val_get(struct device *dev)
+static uint32_t vipm_nrf_max_id_val_get(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
@@ -163,7 +163,7 @@ static int vipm_nrf_init(struct device *dev)
 
 #define VIPM_DEVICE_1(_idx)						\
 static int vipm_nrf_##_idx##_send(struct device *dev, int wait,		\
-				  u32_t id, const void *data, int size)	\
+				  uint32_t id, const void *data, int size)	\
 {									\
 	if (!IS_ENABLED(CONFIG_IPM_MSG_CH_##_idx##_TX)) {		\
 		LOG_ERR("IPM_" #_idx " is RX message channel");		\
@@ -251,7 +251,7 @@ static void gipm_init(void)
 	nrfx_ipc_config_load(&ipc_cfg);
 }
 
-static void gipm_send(u32_t id)
+static void gipm_send(uint32_t id)
 {
 	nrfx_ipc_signal(id);
 }
diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c
index b931c9ee85..9a78a73b23 100644
--- a/drivers/ipm/ipm_stm32_ipcc.c
+++ b/drivers/ipm/ipm_stm32_ipcc.c
@@ -94,7 +94,7 @@ struct stm32_ipcc_mailbox_config {
 };
 
 struct stm32_ipcc_mbx_data {
-	u32_t num_ch;
+	uint32_t num_ch;
 	ipm_callback_t callback;
 	void *callback_ctx;
 };
@@ -107,7 +107,7 @@ static void stm32_ipcc_mailbox_rx_isr(void *arg)
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
 	unsigned int value = 0;
-	u32_t mask, i;
+	uint32_t mask, i;
 
 	mask = (~IPCC_ReadReg(cfg->ipcc, MR)) & IPCC_ALL_MR_RXO_CH_MASK;
 	mask &= IPCC_ReadOtherInstReg_SR(cfg->ipcc) & IPCC_ALL_SR_CH_MASK;
@@ -135,7 +135,7 @@ static void stm32_ipcc_mailbox_tx_isr(void *arg)
 	struct device *dev = arg;
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
-	u32_t mask, i;
+	uint32_t mask, i;
 
 	mask = (~IPCC_ReadReg(cfg->ipcc, MR)) & IPCC_ALL_MR_TXF_CH_MASK;
 	mask = mask >> IPCC_C1MR_CH1FM_Pos;
@@ -152,7 +152,7 @@ static void stm32_ipcc_mailbox_tx_isr(void *arg)
 	}
 }
 
-static int stm32_ipcc_mailbox_ipm_send(struct device *dev, int wait, u32_t id,
+static int stm32_ipcc_mailbox_ipm_send(struct device *dev, int wait, uint32_t id,
 				       const void *buff, int size)
 {
 	struct stm32_ipcc_mbx_data *data = dev->driver_data;
@@ -194,7 +194,7 @@ static int stm32_ipcc_mailbox_ipm_max_data_size_get(struct device *dev)
 	return 0;
 }
 
-static u32_t stm32_ipcc_mailbox_ipm_max_id_val_get(struct device *d)
+static uint32_t stm32_ipcc_mailbox_ipm_max_id_val_get(struct device *d)
 {
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(d);
 
@@ -215,7 +215,7 @@ static int stm32_ipcc_mailbox_ipm_set_enabled(struct device *dev, int enable)
 {
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
-	u32_t i;
+	uint32_t i;
 
 	/* For now: nothing to be done */
 	LOG_DBG("%s %s mailbox\r\n", __func__, enable ? "enable" : "disable");
@@ -244,7 +244,7 @@ static int stm32_ipcc_mailbox_init(struct device *dev)
 	struct stm32_ipcc_mbx_data *data = DEV_DATA(dev);
 	const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev);
 	struct device *clk;
-	u32_t i;
+	uint32_t i;
 
 	clk = device_get_binding(STM32_CLOCK_CONTROL_NAME);
 	__ASSERT_NO_MSG(clk);
diff --git a/drivers/kscan/kscan_ft5336.c b/drivers/kscan/kscan_ft5336.c
index 4b9b2893f0..d26f479070 100644
--- a/drivers/kscan/kscan_ft5336.c
+++ b/drivers/kscan/kscan_ft5336.c
@@ -25,11 +25,11 @@ enum ft5336_event {
 
 struct ft5336_config {
 	char *i2c_name;
-	u8_t i2c_address;
+	uint8_t i2c_address;
 #ifdef CONFIG_KSCAN_FT5336_INTERRUPT
 	char *int_gpio_controller;
-	u8_t int_gpio_pin;
-	u8_t int_gpio_flags;
+	uint8_t int_gpio_pin;
+	uint8_t int_gpio_flags;
 	char *label;
 #endif
 };
@@ -51,9 +51,9 @@ static int ft5336_read(struct device *dev)
 {
 	const struct ft5336_config *config = dev->config_info;
 	struct ft5336_data *data = dev->driver_data;
-	u8_t buffer[FT5406_DATA_SIZE];
-	u8_t event;
-	u16_t row, column;
+	uint8_t buffer[FT5406_DATA_SIZE];
+	uint8_t event;
+	uint16_t row, column;
 	bool pressed;
 
 	if (i2c_burst_read(data->i2c, config->i2c_address, 1, buffer,
@@ -100,7 +100,7 @@ static void ft5336_work_handler(struct k_work *work)
 
 #ifdef CONFIG_KSCAN_FT5336_INTERRUPT
 static void ft5336_isr_handler(struct device *dev, struct gpio_callback *cb,
-		    u32_t pins)
+		    uint32_t pins)
 {
 	const struct ft5336_config *config = dev->config_info;
 	struct ft5336_data *drv_data =
diff --git a/drivers/kscan/kscan_mchp_xec.c b/drivers/kscan/kscan_mchp_xec.c
index 68c9698bc5..ac421b0ef3 100644
--- a/drivers/kscan/kscan_mchp_xec.c
+++ b/drivers/kscan/kscan_mchp_xec.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(kscan_mchp_xec);
 
 /* Poll period/debouncing rely onthe 32KHz clock with 30 usec clock cycles */
 #define CLOCK_32K_HW_CYCLES_TO_US(X) \
-	(u32_t)((((u64_t)(X) * 1000000U) / sys_clock_hw_cycles_per_sec()))
+	(uint32_t)((((uint64_t)(X) * 1000000U) / sys_clock_hw_cycles_per_sec()))
 /* Milliseconds in microseconds */
 #define MSEC_PER_MS 1000U
 /* Number of tracked scan times */
@@ -35,21 +35,21 @@ LOG_MODULE_REGISTER(kscan_mchp_xec);
 
 struct kscan_xec_data {
 	/* variables in usec units */
-	u32_t deb_time_press;
-	u32_t deb_time_rel;
-	s64_t poll_timeout;
-	u32_t poll_period;
-	u8_t matrix_stable_state[MAX_MATRIX_KEY_COLS];
-	u8_t matrix_unstable_state[MAX_MATRIX_KEY_COLS];
-	u8_t matrix_previous_state[MAX_MATRIX_KEY_COLS];
+	uint32_t deb_time_press;
+	uint32_t deb_time_rel;
+	int64_t poll_timeout;
+	uint32_t poll_period;
+	uint8_t matrix_stable_state[MAX_MATRIX_KEY_COLS];
+	uint8_t matrix_unstable_state[MAX_MATRIX_KEY_COLS];
+	uint8_t matrix_previous_state[MAX_MATRIX_KEY_COLS];
 	/* Index in to the scan_clock_cycle to indicate start of debouncing */
-	u8_t scan_cycle_idx[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS];
+	uint8_t scan_cycle_idx[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS];
 	/* Track previous "elapsed clock cycles" per matrix scan. This
 	 * is used to calculate the debouncing time for every key
 	 */
-	u8_t scan_clk_cycle[SCAN_OCURRENCES];
+	uint8_t scan_clk_cycle[SCAN_OCURRENCES];
 	struct k_sem poll_lock;
-	u8_t scan_cycles_idx;
+	uint8_t scan_cycles_idx;
 	kscan_callback_t callback;
 	struct k_thread thread;
 	atomic_t enable_scan;
@@ -78,7 +78,7 @@ static void drive_keyboard_column(int data)
 	}
 }
 
-static u8_t read_keyboard_row(void)
+static uint8_t read_keyboard_row(void)
 {
 	/* In this implementation a 1 means key pressed */
 	return ~(base->KSI_IN & 0xFF);
@@ -113,7 +113,7 @@ static bool is_matrix_ghosting(const uint8_t *state)
 			 * now we or the colums using z&(z-1) which is
 			 * non-zero only if z has more than one bit set.
 			 */
-			u8_t common_row_bits = state[c] & state[c_n];
+			uint8_t common_row_bits = state[c] & state[c_n];
 
 			if (common_row_bits & (common_row_bits - 1))
 				return true;
@@ -123,10 +123,10 @@ static bool is_matrix_ghosting(const uint8_t *state)
 	return false;
 }
 
-static bool read_keyboard_matrix(u8_t *new_state)
+static bool read_keyboard_matrix(uint8_t *new_state)
 {
-	u8_t row;
-	u8_t key_event = 0U;
+	uint8_t row;
+	uint8_t key_event = 0U;
 
 	for (int col = 0; col < MAX_MATRIX_KEY_COLS; col++) {
 		drive_keyboard_column(col);
@@ -155,9 +155,9 @@ static void scan_matrix_xec_isr(void *arg)
 
 static bool check_key_events(void *dev)
 {
-	u8_t matrix_new_state[MAX_MATRIX_KEY_COLS] = {0U};
+	uint8_t matrix_new_state[MAX_MATRIX_KEY_COLS] = {0U};
 	bool key_pressed = false;
-	u32_t cycles_now  = k_cycle_get_32();
+	uint32_t cycles_now  = k_cycle_get_32();
 
 	if (++kbd_data.scan_cycles_idx >= SCAN_OCURRENCES)
 		kbd_data.scan_cycles_idx = 0U;
@@ -172,8 +172,8 @@ static bool check_key_events(void *dev)
 		return false;
 	}
 
-	u8_t row_changed = 0U;
-	u8_t deb_col;
+	uint8_t row_changed = 0U;
+	uint8_t deb_col;
 
 	/* The intent of this loop is to gather information related to key
 	 * changes.
@@ -207,15 +207,15 @@ static bool check_key_events(void *dev)
 
 		/* Debouncing for each row key occurs here */
 		for (int r = 0; r < MAX_MATRIX_KEY_ROWS; r++) {
-			u8_t mask = BIT(r);
-			u8_t row_bit = matrix_new_state[c] & mask;
+			uint8_t mask = BIT(r);
+			uint8_t row_bit = matrix_new_state[c] & mask;
 
 			/* Continue if we already debounce a key */
 			if (!(deb_col & mask))
 				continue;
 
 			/* Convert the clock cycle differences to usec */
-			u32_t debt = CLOCK_32K_HW_CYCLES_TO_US(cycles_now -
+			uint32_t debt = CLOCK_32K_HW_CYCLES_TO_US(cycles_now -
 			kbd_data.scan_clk_cycle[kbd_data.scan_cycle_idx[c][r]]);
 
 			/* Does the key requires more time to be debounced? */
@@ -250,11 +250,11 @@ static bool check_key_events(void *dev)
 	return key_pressed;
 }
 
-static bool poll_expired(u32_t start_cycles, s64_t *timeout)
+static bool poll_expired(uint32_t start_cycles, int64_t *timeout)
 {
-	u32_t stop_cycles;
-	u32_t cycles_spent;
-	u32_t microsecs_spent;
+	uint32_t stop_cycles;
+	uint32_t cycles_spent;
+	uint32_t microsecs_spent;
 
 	stop_cycles = k_cycle_get_32();
 	cycles_spent =  stop_cycles - start_cycles;
@@ -269,10 +269,10 @@ static bool poll_expired(u32_t start_cycles, s64_t *timeout)
 
 void polling_task(void *dev, void *dummy2, void *dummy3)
 {
-	u32_t current_cycles;
-	u32_t cycles_diff;
-	u32_t wait_period;
-	s64_t local_poll_timeout = kbd_data.poll_timeout;
+	uint32_t current_cycles;
+	uint32_t cycles_diff;
+	uint32_t wait_period;
+	int64_t local_poll_timeout = kbd_data.poll_timeout;
 
 	while (true) {
 		base->KSI_STS = MCHP_KSCAN_KSO_SEL_REG_MASK;
@@ -284,10 +284,10 @@ void polling_task(void *dev, void *dummy2, void *dummy3)
 		drive_keyboard_column(KEYBOARD_COLUMN_DRIVE_ALL);
 		k_sem_take(&kbd_data.poll_lock, K_FOREVER);
 
-		u32_t start_poll_cycles = k_cycle_get_32();
+		uint32_t start_poll_cycles = k_cycle_get_32();
 
 		while (atomic_get(&kbd_data.enable_scan) == 1U) {
-			u32_t start_period_cycles = k_cycle_get_32();
+			uint32_t start_period_cycles = k_cycle_get_32();
 
 			if (check_key_events(dev)) {
 				local_poll_timeout = kbd_data.poll_timeout;
@@ -386,11 +386,11 @@ static int kscan_xec_init(struct device *dev)
 	base->KSI_IEN = MCHP_KSCAN_KSI_IEN_REG_MASK;
 
 	/* Time figures are transformed from msec to usec */
-	kbd_data.deb_time_press = (u32_t)
+	kbd_data.deb_time_press = (uint32_t)
 		(CONFIG_KSCAN_XEC_DEBOUNCE_DOWN * MSEC_PER_MS);
-	kbd_data.deb_time_rel = (u32_t)
+	kbd_data.deb_time_rel = (uint32_t)
 		(CONFIG_KSCAN_XEC_DEBOUNCE_UP * MSEC_PER_MS);
-	kbd_data.poll_period = (u32_t)
+	kbd_data.poll_period = (uint32_t)
 		(CONFIG_KSCAN_XEC_POLL_PERIOD * MSEC_PER_MS);
 	kbd_data.poll_timeout = 100 * MSEC_PER_MS;
 
diff --git a/drivers/kscan/kscan_sdl.c b/drivers/kscan/kscan_sdl.c
index fe87a48c4d..3a639840e4 100644
--- a/drivers/kscan/kscan_sdl.c
+++ b/drivers/kscan/kscan_sdl.c
@@ -20,8 +20,8 @@ static int sdl_filter(void *arg, SDL_Event *event)
 {
 	struct device *dev = arg;
 	struct sdl_data *data = dev->driver_data;
-	u32_t row = 0;
-	u32_t column = 0;
+	uint32_t row = 0;
+	uint32_t column = 0;
 	bool pressed = 0;
 
 	switch (event->type) {
diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
index 12888533ab..4c11121d70 100644
--- a/drivers/led/ht16k33.c
+++ b/drivers/led/ht16k33.c
@@ -66,11 +66,11 @@ LOG_MODULE_REGISTER(ht16k33);
 
 struct ht16k33_cfg {
 	char *i2c_dev_name;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 	bool irq_enabled;
 #ifdef CONFIG_HT16K33_KEYSCAN
 	char *irq_dev_name;
-	u32_t irq_pin;
+	uint32_t irq_pin;
 	int irq_flags;
 #endif /* CONFIG_HT16K33_KEYSCAN */
 };
@@ -79,7 +79,7 @@ struct ht16k33_data {
 	struct device *i2c;
 	struct led_data dev_data;
 	 /* Shadow buffer for the display data RAM */
-	u8_t buffer[HT16K33_DISP_DATA_SIZE];
+	uint8_t buffer[HT16K33_DISP_DATA_SIZE];
 #ifdef CONFIG_HT16K33_KEYSCAN
 	struct k_mutex lock;
 	struct device *children[HT16K33_KEYSCAN_ROWS];
@@ -87,15 +87,15 @@ struct ht16k33_data {
 	struct k_thread irq_thread;
 	struct k_sem irq_sem;
 	struct k_timer timer;
-	u16_t key_state[HT16K33_KEYSCAN_ROWS];
+	uint16_t key_state[HT16K33_KEYSCAN_ROWS];
 
 	K_THREAD_STACK_MEMBER(irq_thread_stack,
 			      CONFIG_HT16K33_KEYSCAN_IRQ_THREAD_STACK_SIZE);
 #endif /* CONFIG_HT16K33_KEYSCAN */
 };
 
-static int ht16k33_led_blink(struct device *dev, u32_t led,
-			     u32_t delay_on, u32_t delay_off)
+static int ht16k33_led_blink(struct device *dev, uint32_t led,
+			     uint32_t delay_on, uint32_t delay_off)
 {
 	/* The HT16K33 blinks all LEDs at the same frequency */
 	ARG_UNUSED(led);
@@ -103,8 +103,8 @@ static int ht16k33_led_blink(struct device *dev, u32_t led,
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u32_t period;
-	u8_t cmd;
+	uint32_t period;
+	uint8_t cmd;
 
 	period = delay_on + delay_off;
 	if (period < dev_data->min_period || period > dev_data->max_period) {
@@ -130,16 +130,16 @@ static int ht16k33_led_blink(struct device *dev, u32_t led,
 	return 0;
 }
 
-static int ht16k33_led_set_brightness(struct device *dev, u32_t led,
-				      u8_t value)
+static int ht16k33_led_set_brightness(struct device *dev, uint32_t led,
+				      uint8_t value)
 {
 	ARG_UNUSED(led);
 
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t dim;
-	u8_t cmd;
+	uint8_t dim;
+	uint8_t cmd;
 
 	if (value < dev_data->min_brightness ||
 	    value > dev_data->max_brightness) {
@@ -157,13 +157,13 @@ static int ht16k33_led_set_brightness(struct device *dev, u32_t led,
 	return 0;
 }
 
-static int ht16k33_led_set_state(struct device *dev, u32_t led, bool on)
+static int ht16k33_led_set_state(struct device *dev, uint32_t led, bool on)
 {
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
-	u8_t cmd[2];
-	u8_t addr;
-	u8_t bit;
+	uint8_t cmd[2];
+	uint8_t addr;
+	uint8_t bit;
 
 	if (led >= HT16K33_DISP_SEGMENTS) {
 		return -EINVAL;
@@ -193,23 +193,23 @@ static int ht16k33_led_set_state(struct device *dev, u32_t led, bool on)
 	return 0;
 }
 
-static int ht16k33_led_on(struct device *dev, u32_t led)
+static int ht16k33_led_on(struct device *dev, uint32_t led)
 {
 	return ht16k33_led_set_state(dev, led, true);
 }
 
-static int ht16k33_led_off(struct device *dev, u32_t led)
+static int ht16k33_led_off(struct device *dev, uint32_t led)
 {
 	return ht16k33_led_set_state(dev, led, false);
 }
 
 #ifdef CONFIG_HT16K33_KEYSCAN
-u32_t ht16k33_get_pending_int(struct device *dev)
+uint32_t ht16k33_get_pending_int(struct device *dev)
 {
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
-	u8_t cmd;
-	u8_t flag;
+	uint8_t cmd;
+	uint8_t flag;
 	int err;
 
 	cmd = HT16K33_CMD_INT_FLAG_ADDR;
@@ -227,10 +227,10 @@ static bool ht16k33_process_keyscan_data(struct device *dev)
 {
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
-	u8_t keys[HT16K33_KEYSCAN_DATA_SIZE];
+	uint8_t keys[HT16K33_KEYSCAN_DATA_SIZE];
 	bool pressed = false;
-	u16_t row;
-	u16_t new;
+	uint16_t row;
+	uint16_t new;
 	int err;
 	int i;
 
@@ -278,7 +278,7 @@ static void ht16k33_irq_thread(struct device *dev)
 }
 
 static void ht16k33_irq_callback(struct device *gpiob,
-				 struct gpio_callback *cb, u32_t pins)
+				 struct gpio_callback *cb, uint32_t pins)
 {
 	struct ht16k33_data *data;
 
@@ -299,7 +299,7 @@ static void ht16k33_timer_callback(struct k_timer *timer)
 
 int ht16k33_register_keyscan_device(struct device *parent,
 					   struct device *child,
-					   u8_t keyscan_idx)
+					   uint8_t keyscan_idx)
 {
 	struct ht16k33_data *data = parent->driver_data;
 
@@ -324,7 +324,7 @@ static int ht16k33_init(struct device *dev)
 	const struct ht16k33_cfg *config = dev->config_info;
 	struct ht16k33_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t cmd[1 + HT16K33_DISP_DATA_SIZE]; /* 1 byte command + data */
+	uint8_t cmd[1 + HT16K33_DISP_DATA_SIZE]; /* 1 byte command + data */
 	int err;
 
 	data->i2c = device_get_binding(config->i2c_dev_name);
@@ -383,7 +383,7 @@ static int ht16k33_init(struct device *dev)
 	/* Configure interrupt */
 	if (config->irq_enabled) {
 		struct device *irq_dev;
-		u8_t keys[HT16K33_KEYSCAN_DATA_SIZE];
+		uint8_t keys[HT16K33_KEYSCAN_DATA_SIZE];
 
 		irq_dev = device_get_binding(config->irq_dev_name);
 		if (!irq_dev) {
diff --git a/drivers/led/led_context.h b/drivers/led/led_context.h
index 77800ab47d..601d1c766a 100644
--- a/drivers/led/led_context.h
+++ b/drivers/led/led_context.h
@@ -22,13 +22,13 @@ extern "C" {
 
 struct led_data {
 	/* Minimum acceptable LED blinking time period (in ms) */
-	u32_t min_period;
+	uint32_t min_period;
 	/* Maximum acceptable LED blinking time period (in ms) */
-	u32_t max_period;
+	uint32_t max_period;
 	/* Minimum acceptable LED brightness value */
-	u16_t min_brightness;
+	uint16_t min_brightness;
 	/* Maximum acceptable LED brightness value */
-	u16_t max_brightness;
+	uint16_t max_brightness;
 };
 
 #ifdef __cplusplus
diff --git a/drivers/led/led_handlers.c b/drivers/led/led_handlers.c
index 0b98e5df12..7c7e01a811 100644
--- a/drivers/led/led_handlers.c
+++ b/drivers/led/led_handlers.c
@@ -7,8 +7,8 @@
 #include <syscall_handler.h>
 #include <drivers/led.h>
 
-static inline int z_vrfy_led_blink(struct device *dev, u32_t led,
-			    u32_t delay_on, u32_t delay_off)
+static inline int z_vrfy_led_blink(struct device *dev, uint32_t led,
+			    uint32_t delay_on, uint32_t delay_off)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, blink));
 	return z_impl_led_blink((struct device *)dev, led, delay_on,
@@ -16,22 +16,22 @@ static inline int z_vrfy_led_blink(struct device *dev, u32_t led,
 }
 #include <syscalls/led_blink_mrsh.c>
 
-static inline int z_vrfy_led_set_brightness(struct device *dev, u32_t led,
-				     u8_t value)
+static inline int z_vrfy_led_set_brightness(struct device *dev, uint32_t led,
+				     uint8_t value)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, set_brightness));
 	return z_impl_led_set_brightness((struct device *)dev, led, value);
 }
 #include <syscalls/led_set_brightness_mrsh.c>
 
-static inline int z_vrfy_led_on(struct device *dev, u32_t led)
+static inline int z_vrfy_led_on(struct device *dev, uint32_t led)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, on));
 	return z_impl_led_on((struct device *)dev, led);
 }
 #include <syscalls/led_on_mrsh.c>
 
-static inline int z_vrfy_led_off(struct device *dev, u32_t led)
+static inline int z_vrfy_led_off(struct device *dev, uint32_t led)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_LED(dev, off));
 	return z_impl_led_off((struct device *)dev, led);
diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c
index c7999a2cbd..05a05b51d2 100644
--- a/drivers/led/lp3943.c
+++ b/drivers/led/lp3943.c
@@ -56,7 +56,7 @@ struct lp3943_data {
 	struct led_data dev_data;
 };
 
-static int lp3943_get_led_reg(u32_t *led, u8_t *reg)
+static int lp3943_get_led_reg(uint32_t *led, uint8_t *reg)
 {
 	switch (*led) {
 	case 0:
@@ -98,10 +98,10 @@ static int lp3943_get_led_reg(u32_t *led, u8_t *reg)
 	return 0;
 }
 
-static int lp3943_set_dim_states(struct lp3943_data *data, u32_t led, u8_t mode)
+static int lp3943_set_dim_states(struct lp3943_data *data, uint32_t led, uint8_t mode)
 {
 	int ret;
-	u8_t reg;
+	uint8_t reg;
 
 	ret = lp3943_get_led_reg(&led, &reg);
 	if (ret) {
@@ -120,14 +120,14 @@ static int lp3943_set_dim_states(struct lp3943_data *data, u32_t led, u8_t mode)
 	return 0;
 }
 
-static int lp3943_led_blink(struct device *dev, u32_t led,
-			    u32_t delay_on, u32_t delay_off)
+static int lp3943_led_blink(struct device *dev, uint32_t led,
+			    uint32_t delay_on, uint32_t delay_off)
 {
 	struct lp3943_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
 	int ret;
-	u16_t period;
-	u8_t reg, val, mode;
+	uint16_t period;
+	uint8_t reg, val, mode;
 
 	period = delay_on + delay_off;
 
@@ -163,13 +163,13 @@ static int lp3943_led_blink(struct device *dev, u32_t led,
 	return 0;
 }
 
-static int lp3943_led_set_brightness(struct device *dev, u32_t led,
-				     u8_t value)
+static int lp3943_led_set_brightness(struct device *dev, uint32_t led,
+				     uint8_t value)
 {
 	struct lp3943_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
 	int ret;
-	u8_t reg, val, mode;
+	uint8_t reg, val, mode;
 
 	if (value < dev_data->min_brightness ||
 			value > dev_data->max_brightness) {
@@ -204,11 +204,11 @@ static int lp3943_led_set_brightness(struct device *dev, u32_t led,
 	return 0;
 }
 
-static inline int lp3943_led_on(struct device *dev, u32_t led)
+static inline int lp3943_led_on(struct device *dev, uint32_t led)
 {
 	struct lp3943_data *data = dev->driver_data;
 	int ret;
-	u8_t reg, mode;
+	uint8_t reg, mode;
 
 	ret = lp3943_get_led_reg(&led, &reg);
 	if (ret) {
@@ -228,11 +228,11 @@ static inline int lp3943_led_on(struct device *dev, u32_t led)
 	return 0;
 }
 
-static inline int lp3943_led_off(struct device *dev, u32_t led)
+static inline int lp3943_led_off(struct device *dev, uint32_t led)
 {
 	struct lp3943_data *data = dev->driver_data;
 	int ret;
-	u8_t reg;
+	uint8_t reg;
 
 	ret = lp3943_get_led_reg(&led, &reg);
 	if (ret) {
diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c
index 32711188fc..83b4336309 100644
--- a/drivers/led/lp5562.c
+++ b/drivers/led/lp5562.c
@@ -172,7 +172,7 @@ struct lp5562_data {
  * @retval 0       On success.
  * @retval -EINVAL If an invalid channel is given.
  */
-static int lp5562_get_pwm_reg(enum lp5562_led_channels channel, u8_t *reg)
+static int lp5562_get_pwm_reg(enum lp5562_led_channels channel, uint8_t *reg)
 {
 	switch (channel) {
 	case LP5562_CHANNEL_W:
@@ -205,7 +205,7 @@ static int lp5562_get_pwm_reg(enum lp5562_led_channels channel, u8_t *reg)
  * @retval -EINVAL If a source is given that is not a valid engine.
  */
 static int lp5562_get_engine_ram_base_addr(enum lp5562_led_sources engine,
-					   u8_t *base_addr)
+					   uint8_t *base_addr)
 {
 	switch (engine) {
 	case LP5562_SOURCE_ENGINE_1:
@@ -237,7 +237,7 @@ static int lp5562_get_engine_ram_base_addr(enum lp5562_led_sources engine,
  * @retval -EINVAL If a source is given that is not a valid engine.
  */
 static int lp5562_get_engine_reg_shift(enum lp5562_led_sources engine,
-				       u8_t *shift)
+				       uint8_t *shift)
 {
 	switch (engine) {
 	case LP5562_SOURCE_ENGINE_1:
@@ -268,8 +268,8 @@ static int lp5562_get_engine_reg_shift(enum lp5562_led_sources engine,
  * @param prescale  Pointer to the prescale value.
  * @param step_time Pointer to the step_time value.
  */
-static void lp5562_ms_to_prescale_and_step(struct led_data *data, u32_t ms,
-					   u8_t *prescale, u8_t *step_time)
+static void lp5562_ms_to_prescale_and_step(struct led_data *data, uint32_t ms,
+					   uint8_t *prescale, uint8_t *step_time)
 {
 	/*
 	 * One step with the prescaler set to 0 takes 0.49ms. The max value for
@@ -335,7 +335,7 @@ static int lp5562_get_led_source(struct device *dev,
 				 enum lp5562_led_sources *source)
 {
 	struct lp5562_data *data = dev->driver_data;
-	u8_t led_map;
+	uint8_t led_map;
 
 	if (i2c_reg_read_byte(data->i2c, DT_INST_REG_ADDR(0),
 			      LP5562_LED_MAP, &led_map)) {
@@ -362,7 +362,7 @@ static bool lp5562_is_engine_executing(struct device *dev,
 				       enum lp5562_led_sources engine)
 {
 	struct lp5562_data *data = dev->driver_data;
-	u8_t enabled, shift;
+	uint8_t enabled, shift;
 	int ret;
 
 	ret = lp5562_get_engine_reg_shift(engine, &shift);
@@ -425,10 +425,10 @@ static int lp5562_get_available_engine(struct device *dev,
  */
 static int lp5562_set_engine_reg(struct device *dev,
 				 enum lp5562_led_sources engine,
-				 u8_t reg, u8_t val)
+				 uint8_t reg, uint8_t val)
 {
 	struct lp5562_data *data = dev->driver_data;
-	u8_t shift;
+	uint8_t shift;
 	int ret;
 
 	ret = lp5562_get_engine_reg_shift(engine, &shift);
@@ -546,12 +546,12 @@ static inline int lp5562_stop_program_exec(struct device *dev,
  */
 static int lp5562_program_command(struct device *dev,
 				  enum lp5562_led_sources engine,
-				  u8_t command_index,
-				  u8_t command_msb,
-				  u8_t command_lsb)
+				  uint8_t command_index,
+				  uint8_t command_msb,
+				  uint8_t command_lsb)
 {
 	struct lp5562_data *data = dev->driver_data;
-	u8_t prog_base_addr;
+	uint8_t prog_base_addr;
 	int ret;
 
 	if (command_index >= LP5562_PROG_MAX_COMMANDS) {
@@ -595,12 +595,12 @@ static int lp5562_program_command(struct device *dev,
  */
 static int lp5562_program_set_brightness(struct device *dev,
 					 enum lp5562_led_sources engine,
-					 u8_t command_index,
-					 u8_t brightness)
+					 uint8_t command_index,
+					 uint8_t brightness)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t val;
+	uint8_t val;
 
 	if ((brightness < dev_data->min_brightness) ||
 			(brightness > dev_data->max_brightness)) {
@@ -632,14 +632,14 @@ static int lp5562_program_set_brightness(struct device *dev,
  */
 static int lp5562_program_ramp(struct device *dev,
 			       enum lp5562_led_sources engine,
-			       u8_t command_index,
-			       u32_t time_per_step,
-			       u8_t step_count,
+			       uint8_t command_index,
+			       uint32_t time_per_step,
+			       uint8_t step_count,
 			       enum lp5562_engine_fade_dirs fade_dir)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t prescale, step_time;
+	uint8_t prescale, step_time;
 
 	if ((time_per_step < dev_data->min_period) ||
 			(time_per_step > dev_data->max_period)) {
@@ -668,8 +668,8 @@ static int lp5562_program_ramp(struct device *dev,
  */
 static inline int lp5562_program_wait(struct device *dev,
 				      enum lp5562_led_sources engine,
-				      u8_t command_index,
-				      u32_t time)
+				      uint8_t command_index,
+				      uint32_t time)
 {
 	/*
 	 * A wait command is a ramp with the step_count set to 0. The fading
@@ -695,7 +695,7 @@ static inline int lp5562_program_wait(struct device *dev,
  */
 static inline int lp5562_program_go_to_start(struct device *dev,
 					     enum lp5562_led_sources engine,
-					     u8_t command_index)
+					     uint8_t command_index)
 {
 	return lp5562_program_command(dev, engine, command_index, 0x00, 0x00);
 }
@@ -725,7 +725,7 @@ static inline int lp5562_program_go_to_start(struct device *dev,
  */
 static int lp5562_update_blinking_brightness(struct device *dev,
 					     enum lp5562_led_sources engine,
-					     u8_t brightness_on)
+					     uint8_t brightness_on)
 {
 	int ret;
 
@@ -754,14 +754,14 @@ static int lp5562_update_blinking_brightness(struct device *dev,
 	return 0;
 }
 
-static int lp5562_led_blink(struct device *dev, u32_t led,
-			    u32_t delay_on, u32_t delay_off)
+static int lp5562_led_blink(struct device *dev, uint32_t led,
+			    uint32_t delay_on, uint32_t delay_off)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
 	int ret;
 	enum lp5562_led_sources engine;
-	u8_t command_index = 0U;
+	uint8_t command_index = 0U;
 
 	ret = lp5562_get_available_engine(dev, &engine);
 	if (ret) {
@@ -815,12 +815,12 @@ static int lp5562_led_blink(struct device *dev, u32_t led,
 	return 0;
 }
 
-static int lp5562_led_set_brightness(struct device *dev, u32_t led, u8_t value)
+static int lp5562_led_set_brightness(struct device *dev, uint32_t led, uint8_t value)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
 	int ret;
-	u8_t val, reg;
+	uint8_t val, reg;
 	enum lp5562_led_sources current_source;
 
 	if ((value < dev_data->min_brightness) ||
@@ -865,7 +865,7 @@ static int lp5562_led_set_brightness(struct device *dev, u32_t led, u8_t value)
 	return 0;
 }
 
-static inline int lp5562_led_on(struct device *dev, u32_t led)
+static inline int lp5562_led_on(struct device *dev, uint32_t led)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
@@ -873,7 +873,7 @@ static inline int lp5562_led_on(struct device *dev, u32_t led)
 	return lp5562_led_set_brightness(dev, led, dev_data->max_brightness);
 }
 
-static inline int lp5562_led_off(struct device *dev, u32_t led)
+static inline int lp5562_led_off(struct device *dev, uint32_t led)
 {
 	struct lp5562_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c
index cebab142e2..201aa5c717 100644
--- a/drivers/led/pca9633.c
+++ b/drivers/led/pca9633.c
@@ -46,13 +46,13 @@ struct pca9633_data {
 	struct led_data dev_data;
 };
 
-static int pca9633_led_blink(struct device *dev, u32_t led,
-			     u32_t delay_on, u32_t delay_off)
+static int pca9633_led_blink(struct device *dev, uint32_t led,
+			     uint32_t delay_on, uint32_t delay_off)
 {
 	struct pca9633_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t gdc, gfrq;
-	u32_t period;
+	uint8_t gdc, gfrq;
+	uint32_t period;
 
 	period = delay_on + delay_off;
 
@@ -109,12 +109,12 @@ static int pca9633_led_blink(struct device *dev, u32_t led,
 	return 0;
 }
 
-static int pca9633_led_set_brightness(struct device *dev, u32_t led,
-				      u8_t value)
+static int pca9633_led_set_brightness(struct device *dev, uint32_t led,
+				      uint8_t value)
 {
 	struct pca9633_data *data = dev->driver_data;
 	struct led_data *dev_data = &data->dev_data;
-	u8_t val;
+	uint8_t val;
 
 	if (value < dev_data->min_brightness ||
 	    value > dev_data->max_brightness) {
@@ -142,7 +142,7 @@ static int pca9633_led_set_brightness(struct device *dev, u32_t led,
 	return 0;
 }
 
-static inline int pca9633_led_on(struct device *dev, u32_t led)
+static inline int pca9633_led_on(struct device *dev, uint32_t led)
 {
 	struct pca9633_data *data = dev->driver_data;
 
@@ -158,7 +158,7 @@ static inline int pca9633_led_on(struct device *dev, u32_t led)
 	return 0;
 }
 
-static inline int pca9633_led_off(struct device *dev, u32_t led)
+static inline int pca9633_led_off(struct device *dev, uint32_t led)
 {
 	struct pca9633_data *data = dev->driver_data;
 
diff --git a/drivers/led_strip/apa102.c b/drivers/led_strip/apa102.c
index 54b91a8c71..85a2312aa1 100644
--- a/drivers/led_strip/apa102.c
+++ b/drivers/led_strip/apa102.c
@@ -18,12 +18,12 @@ struct apa102_data {
 static int apa102_update(struct device *dev, void *buf, size_t size)
 {
 	struct apa102_data *data = dev->driver_data;
-	static const u8_t zeros[] = {0, 0, 0, 0};
-	static const u8_t ones[] = {0xFF, 0xFF, 0xFF, 0xFF};
+	static const uint8_t zeros[] = {0, 0, 0, 0};
+	static const uint8_t ones[] = {0xFF, 0xFF, 0xFF, 0xFF};
 	const struct spi_buf tx_bufs[] = {
 		{
 			/* Start frame: at least 32 zeros */
-			.buf = (u8_t *)zeros,
+			.buf = (uint8_t *)zeros,
 			.len = sizeof(zeros),
 		},
 		{
@@ -36,7 +36,7 @@ static int apa102_update(struct device *dev, void *buf, size_t size)
 			 * remaining bits to the LEDs at the end of
 			 * the strip.
 			 */
-			.buf = (u8_t *)ones,
+			.buf = (uint8_t *)ones,
 			.len = sizeof(ones),
 		},
 	};
@@ -51,16 +51,16 @@ static int apa102_update(struct device *dev, void *buf, size_t size)
 static int apa102_update_rgb(struct device *dev, struct led_rgb *pixels,
 			     size_t count)
 {
-	u8_t *p = (u8_t *)pixels;
+	uint8_t *p = (uint8_t *)pixels;
 	size_t i;
 	/* SOF (3 bits) followed by the 0 to 31 global dimming level */
-	u8_t prefix = 0xE0 | 31;
+	uint8_t prefix = 0xE0 | 31;
 
 	/* Rewrite to the on-wire format */
 	for (i = 0; i < count; i++) {
-		u8_t r = pixels[i].r;
-		u8_t g = pixels[i].g;
-		u8_t b = pixels[i].b;
+		uint8_t r = pixels[i].r;
+		uint8_t g = pixels[i].g;
+		uint8_t b = pixels[i].b;
 
 		*p++ = prefix;
 		*p++ = b;
@@ -72,7 +72,7 @@ static int apa102_update_rgb(struct device *dev, struct led_rgb *pixels,
 	return apa102_update(dev, pixels, sizeof(struct led_rgb) * count);
 }
 
-static int apa102_update_channels(struct device *dev, u8_t *channels,
+static int apa102_update_channels(struct device *dev, uint8_t *channels,
 				  size_t num_channels)
 {
 	/* Not implemented */
diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c
index dfe5d30c4d..74e97f9afc 100644
--- a/drivers/led_strip/lpd880x.c
+++ b/drivers/led_strip/lpd880x.c
@@ -48,9 +48,9 @@ static int lpd880x_update(struct device *dev, void *data, size_t size)
 	 * a zero byte propagates through at most 32 LED driver ICs.
 	 * The LPD8803 is the worst case, at 3 output channels per IC.
 	 */
-	u8_t reset_size = ceiling_fraction(ceiling_fraction(size, 3), 32);
-	u8_t reset_buf[reset_size];
-	u8_t last = 0x00;
+	uint8_t reset_size = ceiling_fraction(ceiling_fraction(size, 3), 32);
+	uint8_t reset_buf[reset_size];
+	uint8_t last = 0x00;
 	const struct spi_buf bufs[3] = {
 		{
 			/* Prepares the strip to shift in new data values. */
@@ -89,8 +89,8 @@ static int lpd880x_strip_update_rgb(struct device *dev,
 				    struct led_rgb *pixels,
 				    size_t num_pixels)
 {
-	u8_t *px = (u8_t *)pixels;
-	u8_t r, g, b;
+	uint8_t *px = (uint8_t *)pixels;
+	uint8_t r, g, b;
 	size_t i;
 
 	/*
@@ -114,7 +114,7 @@ static int lpd880x_strip_update_rgb(struct device *dev,
 	return lpd880x_update(dev, pixels, 3 * num_pixels);
 }
 
-static int lpd880x_strip_update_channels(struct device *dev, u8_t *channels,
+static int lpd880x_strip_update_channels(struct device *dev, uint8_t *channels,
 					 size_t num_channels)
 {
 	size_t i;
diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c
index 059e2fd7d4..016ad232c9 100644
--- a/drivers/led_strip/ws2812_gpio.c
+++ b/drivers/led_strip/ws2812_gpio.c
@@ -28,7 +28,7 @@ struct ws2812_gpio_data {
 };
 
 struct ws2812_gpio_cfg {
-	u8_t pin;
+	uint8_t pin;
 	bool has_white;
 };
 
@@ -99,10 +99,10 @@ static const struct ws2812_gpio_cfg *dev_cfg(struct device *dev)
 			[r] "l" (base),		\
 			[p] "l" (pin)); } while (0)
 
-static int send_buf(struct device *dev, u8_t *buf, size_t len)
+static int send_buf(struct device *dev, uint8_t *buf, size_t len)
 {
-	volatile u32_t *base = (u32_t *)&NRF_GPIO->OUTSET;
-	const u32_t val = BIT(dev_cfg(dev)->pin);
+	volatile uint32_t *base = (uint32_t *)&NRF_GPIO->OUTSET;
+	const uint32_t val = BIT(dev_cfg(dev)->pin);
 	struct device *clk = dev_data(dev)->clk;
 	unsigned int key;
 	int rc;
@@ -115,8 +115,8 @@ static int send_buf(struct device *dev, u8_t *buf, size_t len)
 	key = irq_lock();
 
 	while (len--) {
-		u32_t b = *buf++;
-		s32_t i;
+		uint32_t b = *buf++;
+		int32_t i;
 
 		/*
 		 * Generate signal out of the bits, MSbit first.
@@ -150,14 +150,14 @@ static int ws2812_gpio_update_rgb(struct device *dev, struct led_rgb *pixels,
 {
 	const struct ws2812_gpio_cfg *config = dev->config_info;
 	const bool has_white = config->has_white;
-	u8_t *ptr = (u8_t *)pixels;
+	uint8_t *ptr = (uint8_t *)pixels;
 	size_t i;
 
 	/* Convert from RGB to on-wire format (GRB or GRBW) */
 	for (i = 0; i < num_pixels; i++) {
-		u8_t r = pixels[i].r;
-		u8_t g = pixels[i].g;
-		u8_t b = pixels[i].b;
+		uint8_t r = pixels[i].r;
+		uint8_t g = pixels[i].g;
+		uint8_t b = pixels[i].b;
 
 		*ptr++ = g;
 		*ptr++ = r;
@@ -167,10 +167,10 @@ static int ws2812_gpio_update_rgb(struct device *dev, struct led_rgb *pixels,
 		}
 	}
 
-	return send_buf(dev, (u8_t *)pixels, num_pixels * (has_white ? 4 : 3));
+	return send_buf(dev, (uint8_t *)pixels, num_pixels * (has_white ? 4 : 3));
 }
 
-static int ws2812_gpio_update_channels(struct device *dev, u8_t *channels,
+static int ws2812_gpio_update_channels(struct device *dev, uint8_t *channels,
 				       size_t num_channels)
 {
 	LOG_ERR("update_channels not implemented");
diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c
index 99b6989621..e31943c9dd 100644
--- a/drivers/led_strip/ws2812_spi.c
+++ b/drivers/led_strip/ws2812_spi.c
@@ -50,10 +50,10 @@ struct ws2812_spi_data {
 
 struct ws2812_spi_cfg {
 	struct spi_config spi_cfg;
-	u8_t *px_buf;
+	uint8_t *px_buf;
 	size_t px_buf_size;
-	u8_t one_frame;
-	u8_t zero_frame;
+	uint8_t one_frame;
+	uint8_t zero_frame;
 	bool has_white;
 };
 
@@ -72,8 +72,8 @@ static const struct ws2812_spi_cfg *dev_cfg(struct device *dev)
  * of SPI frames, MSbit first, where a one bit becomes SPI frame
  * one_frame, and zero bit becomes zero_frame.
  */
-static inline void ws2812_spi_ser(u8_t buf[8], u8_t color,
-				  const u8_t one_frame, const u8_t zero_frame)
+static inline void ws2812_spi_ser(uint8_t buf[8], uint8_t color,
+				  const uint8_t one_frame, const uint8_t zero_frame)
 {
 	int i;
 
@@ -113,7 +113,7 @@ static int ws2812_strip_update_rgb(struct device *dev, struct led_rgb *pixels,
 				   size_t num_pixels)
 {
 	const struct ws2812_spi_cfg *cfg = dev_cfg(dev);
-	const u8_t one = cfg->one_frame, zero = cfg->zero_frame;
+	const uint8_t one = cfg->one_frame, zero = cfg->zero_frame;
 	struct spi_buf buf = {
 		.buf = cfg->px_buf,
 		.len = cfg->px_buf_size,
@@ -122,7 +122,7 @@ static int ws2812_strip_update_rgb(struct device *dev, struct led_rgb *pixels,
 		.buffers = &buf,
 		.count = 1
 	};
-	u8_t *px_buf = cfg->px_buf;
+	uint8_t *px_buf = cfg->px_buf;
 	size_t i;
 	int rc;
 
@@ -156,7 +156,7 @@ static int ws2812_strip_update_rgb(struct device *dev, struct led_rgb *pixels,
 	return rc;
 }
 
-static int ws2812_strip_update_channels(struct device *dev, u8_t *channels,
+static int ws2812_strip_update_channels(struct device *dev, uint8_t *channels,
 					size_t num_channels)
 {
 	LOG_ERR("update_channels not implemented");
@@ -191,7 +191,7 @@ static const struct led_strip_driver_api ws2812_spi_api = {
 									\
 	static struct ws2812_spi_data ws2812_spi_##idx##_data;		\
 									\
-	static u8_t ws2812_spi_##idx##_px_buf[WS2812_SPI_BUFSZ(idx)];	\
+	static uint8_t ws2812_spi_##idx##_px_buf[WS2812_SPI_BUFSZ(idx)];	\
 									\
 	static const struct ws2812_spi_cfg ws2812_spi_##idx##_cfg = {	\
 		.spi_cfg = {						\
diff --git a/drivers/lora/shell.c b/drivers/lora/shell.c
index 3c81712928..ace0290e5f 100644
--- a/drivers/lora/shell.c
+++ b/drivers/lora/shell.c
@@ -68,7 +68,7 @@ static int parse_long_range(long *out, const struct shell *shell,
 	return 0;
 }
 
-static int parse_freq(u32_t *out, const struct shell *shell, const char *arg)
+static int parse_freq(uint32_t *out, const struct shell *shell, const char *arg)
 {
 	char *eptr;
 	long long llval;
@@ -85,7 +85,7 @@ static int parse_freq(u32_t *out, const struct shell *shell, const char *arg)
 		return -EINVAL;
 	}
 
-	*out = (u32_t)llval;
+	*out = (uint32_t)llval;
 	return 0;
 }
 
@@ -255,8 +255,8 @@ static int cmd_lora_recv(const struct shell *shell, size_t argc, char **argv)
 	struct device *dev;
 	long timeout = 0;
 	int ret;
-	s16_t rssi;
-	s8_t snr;
+	int16_t rssi;
+	int8_t snr;
 
 	modem_config.tx = false;
 	dev = get_configured_modem(shell);
@@ -288,7 +288,7 @@ static int cmd_lora_test_cw(const struct shell *shell,
 {
 	struct device *dev;
 	int ret;
-	u32_t freq;
+	uint32_t freq;
 	long power, duration;
 
 	dev = get_modem(shell);
@@ -304,7 +304,7 @@ static int cmd_lora_test_cw(const struct shell *shell,
 		return -EINVAL;
 	}
 
-	ret = lora_test_cw(dev, (u32_t)freq, (s8_t)power, (u16_t)duration);
+	ret = lora_test_cw(dev, (uint32_t)freq, (int8_t)power, (uint16_t)duration);
 	if (ret < 0) {
 		shell_error(shell, "LoRa test CW failed: %i", ret);
 		return ret;
diff --git a/drivers/lora/sx1276.c b/drivers/lora/sx1276.c
index 134549564d..45fa1d1907 100644
--- a/drivers/lora/sx1276.c
+++ b/drivers/lora/sx1276.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(sx1276);
 #define SX1276_REG_PA_DAC			0x4d
 #define SX1276_REG_VERSION			0x42
 
-static u32_t saved_time;
+static uint32_t saved_time;
 extern DioIrqHandler *DioIrq[];
 
 struct sx1276_dio {
@@ -60,10 +60,10 @@ struct sx1276_data {
 	struct k_sem data_sem;
 	struct k_timer timer;
 	RadioEvents_t sx1276_event;
-	u8_t *rx_buf;
-	u8_t rx_len;
-	s8_t snr;
-	s16_t rssi;
+	uint8_t *rx_buf;
+	uint8_t rx_len;
+	int8_t snr;
+	int16_t rssi;
 } dev_data;
 
 bool SX1276CheckRfFrequency(uint32_t frequency)
@@ -77,12 +77,12 @@ void SX1276SetAntSwLowPower(bool status)
 	/* TODO */
 }
 
-void SX1276SetBoardTcxo(u8_t state)
+void SX1276SetBoardTcxo(uint8_t state)
 {
 	/* TODO */
 }
 
-void SX1276SetAntSw(u8_t opMode)
+void SX1276SetAntSw(uint8_t opMode)
 {
 	/* TODO */
 }
@@ -109,17 +109,17 @@ void BoardCriticalSectionEnd(uint32_t *mask)
 	irq_unlock(*mask);
 }
 
-u32_t RtcGetTimerValue(void)
+uint32_t RtcGetTimerValue(void)
 {
 	return k_uptime_get_32();
 }
 
-u32_t RtcGetTimerElapsedTime(void)
+uint32_t RtcGetTimerElapsedTime(void)
 {
 	return (k_uptime_get_32() - saved_time);
 }
 
-u32_t RtcGetMinimumTimeout(void)
+uint32_t RtcGetMinimumTimeout(void)
 {
 	return 1;
 }
@@ -136,12 +136,12 @@ static void timer_callback(struct k_timer *_timer)
 	TimerIrqHandler();
 }
 
-void RtcSetAlarm(u32_t timeout)
+void RtcSetAlarm(uint32_t timeout)
 {
 	k_timer_start(&dev_data.timer, K_MSEC(timeout), K_NO_WAIT);
 }
 
-u32_t RtcSetTimerContext(void)
+uint32_t RtcSetTimerContext(void)
 {
 	saved_time = k_uptime_get_32();
 
@@ -149,22 +149,22 @@ u32_t RtcSetTimerContext(void)
 }
 
 /* For us, 1 tick = 1 milli second. So no need to do any conversion here */
-u32_t RtcGetTimerContext(void)
+uint32_t RtcGetTimerContext(void)
 {
 	return saved_time;
 }
 
-void DelayMsMcu(u32_t ms)
+void DelayMsMcu(uint32_t ms)
 {
 	k_sleep(K_MSEC(ms));
 }
 
-u32_t RtcMs2Tick(uint32_t milliseconds)
+uint32_t RtcMs2Tick(uint32_t milliseconds)
 {
 	return milliseconds;
 }
 
-u32_t RtcTick2Ms(uint32_t tick)
+uint32_t RtcTick2Ms(uint32_t tick)
 {
 	return tick;
 }
@@ -177,7 +177,7 @@ static void sx1276_dio_work_handle(struct k_work *work)
 }
 
 static void sx1276_irq_callback(struct device *dev,
-				struct gpio_callback *cb, u32_t pins)
+				struct gpio_callback *cb, uint32_t pins)
 {
 	unsigned int i, pin;
 
@@ -230,7 +230,7 @@ void SX1276IoIrqInit(DioIrqHandler **irqHandlers)
 
 }
 
-static int sx1276_transceive(u8_t reg, bool write, void *data, size_t length)
+static int sx1276_transceive(uint8_t reg, bool write, void *data, size_t length)
 {
 	const struct spi_buf buf[2] = {
 		{
@@ -260,17 +260,17 @@ static int sx1276_transceive(u8_t reg, bool write, void *data, size_t length)
 	return spi_write(dev_data.spi, &dev_data.spi_cfg, &tx);
 }
 
-int sx1276_read(u8_t reg_addr, u8_t *data, u8_t len)
+int sx1276_read(uint8_t reg_addr, uint8_t *data, uint8_t len)
 {
 	return sx1276_transceive(reg_addr, false, data, len);
 }
 
-int sx1276_write(u8_t reg_addr, u8_t *data, u8_t len)
+int sx1276_write(uint8_t reg_addr, uint8_t *data, uint8_t len)
 {
 	return sx1276_transceive(reg_addr | BIT(7), true, data, len);
 }
 
-void SX1276WriteBuffer(u16_t addr, u8_t *buffer, u8_t size)
+void SX1276WriteBuffer(uint16_t addr, uint8_t *buffer, uint8_t size)
 {
 	int ret;
 
@@ -280,7 +280,7 @@ void SX1276WriteBuffer(u16_t addr, u8_t *buffer, u8_t size)
 	}
 }
 
-void SX1276ReadBuffer(u16_t addr, u8_t *buffer, u8_t size)
+void SX1276ReadBuffer(uint16_t addr, uint8_t *buffer, uint8_t size)
 {
 	int ret;
 
@@ -293,8 +293,8 @@ void SX1276ReadBuffer(u16_t addr, u8_t *buffer, u8_t size)
 void SX1276SetRfTxPower(int8_t power)
 {
 	int ret;
-	u8_t pa_config = 0;
-	u8_t pa_dac = 0;
+	uint8_t pa_config = 0;
+	uint8_t pa_dac = 0;
 
 	ret = sx1276_read(SX1276_REG_PA_CONFIG, &pa_config, 1);
 	if (ret < 0) {
@@ -362,7 +362,7 @@ void SX1276SetRfTxPower(int8_t power)
 	}
 }
 
-static int sx1276_lora_send(struct device *dev, u8_t *data, u32_t data_len)
+static int sx1276_lora_send(struct device *dev, uint8_t *data, uint32_t data_len)
 {
 	Radio.SetMaxPayloadLength(MODEM_LORA, data_len);
 
@@ -376,7 +376,7 @@ static void sx1276_tx_done(void)
 	Radio.Sleep();
 }
 
-static void sx1276_rx_done(u8_t *payload, u16_t size, int16_t rssi, int8_t snr)
+static void sx1276_rx_done(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 {
 	Radio.Sleep();
 
@@ -388,8 +388,8 @@ static void sx1276_rx_done(u8_t *payload, u16_t size, int16_t rssi, int8_t snr)
 	k_sem_give(&dev_data.data_sem);
 }
 
-static int sx1276_lora_recv(struct device *dev, u8_t *data, u8_t size,
-			    k_timeout_t timeout, s16_t *rssi, s8_t *snr)
+static int sx1276_lora_recv(struct device *dev, uint8_t *data, uint8_t size,
+			    k_timeout_t timeout, int16_t *rssi, int8_t *snr)
 {
 	int ret;
 
@@ -446,8 +446,8 @@ static int sx1276_lora_config(struct device *dev,
 	return 0;
 }
 
-static int sx1276_lora_test_cw(struct device *dev, u32_t frequency,
-			       s8_t tx_power, u16_t duration)
+static int sx1276_lora_test_cw(struct device *dev, uint32_t frequency,
+			       int8_t tx_power, uint16_t duration)
 {
 	Radio.SetTxContinuousWave(frequency, tx_power, duration);
 	return 0;
@@ -482,7 +482,7 @@ static int sx1276_lora_init(struct device *dev)
 {
 	static struct spi_cs_control spi_cs;
 	int ret;
-	u8_t regval;
+	uint8_t regval;
 
 	dev_data.spi = device_get_binding(DT_INST_BUS_LABEL(0));
 	if (!dev_data.spi) {
diff --git a/drivers/modem/gsm_ppp.c b/drivers/modem/gsm_ppp.c
index 8a79e3cc0e..922d44e5d3 100644
--- a/drivers/modem/gsm_ppp.c
+++ b/drivers/modem/gsm_ppp.c
@@ -44,8 +44,8 @@ static struct gsm_modem {
 	struct modem_context context;
 
 	struct modem_cmd_handler_data cmd_handler_data;
-	u8_t cmd_read_buf[GSM_CMD_READ_BUF];
-	u8_t cmd_match_buf[GSM_CMD_READ_BUF];
+	uint8_t cmd_read_buf[GSM_CMD_READ_BUF];
+	uint8_t cmd_match_buf[GSM_CMD_READ_BUF];
 	struct k_sem sem_response;
 
 	struct modem_iface_uart_data gsm_data;
@@ -53,7 +53,7 @@ static struct gsm_modem {
 	char gsm_isr_buf[PPP_MRU];
 	char gsm_rx_rb_buf[PPP_MRU * 3];
 
-	u8_t *ppp_recv_buf;
+	uint8_t *ppp_recv_buf;
 	size_t ppp_recv_buf_len;
 
 	enum setup_state state;
diff --git a/drivers/modem/modem_cmd_handler.c b/drivers/modem/modem_cmd_handler.c
index dc350d92f8..d30a621a00 100644
--- a/drivers/modem/modem_cmd_handler.c
+++ b/drivers/modem/modem_cmd_handler.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(modem_cmd_handler, CONFIG_MODEM_LOG_LEVEL);
  * Parsing Functions
  */
 
-static bool is_crlf(u8_t c)
+static bool is_crlf(uint8_t c)
 {
 	if (c == '\n' || c == '\r') {
 		return true;
@@ -44,11 +44,11 @@ static void skipcrlf(struct modem_cmd_handler_data *data)
 	}
 }
 
-static u16_t findcrlf(struct modem_cmd_handler_data *data,
-		      struct net_buf **frag, u16_t *offset)
+static uint16_t findcrlf(struct modem_cmd_handler_data *data,
+		      struct net_buf **frag, uint16_t *offset)
 {
 	struct net_buf *buf = data->rx_buf;
-	u16_t len = 0U, pos = 0U;
+	uint16_t len = 0U, pos = 0U;
 
 	while (buf && !is_crlf(*(buf->data + pos))) {
 		if (pos + 1 >= buf->len) {
@@ -107,7 +107,7 @@ static inline struct net_buf *read_rx_allocator(k_timeout_t timeout,
 /* return scanned length for params */
 static int parse_params(struct modem_cmd_handler_data *data,  size_t match_len,
 			struct modem_cmd *cmd,
-			u8_t **argv, size_t argv_len, u16_t *argc)
+			uint8_t **argv, size_t argv_len, uint16_t *argc)
 {
 	int i, count = 0;
 	size_t begin, end;
@@ -173,8 +173,8 @@ static int process_cmd(struct modem_cmd *cmd, size_t match_len,
 			struct modem_cmd_handler_data *data)
 {
 	int parsed_len = 0, ret = 0;
-	u8_t *argv[CONFIG_MODEM_CMD_HANDLER_MAX_PARAM_COUNT];
-	u16_t argc = 0U;
+	uint8_t *argv[CONFIG_MODEM_CMD_HANDLER_MAX_PARAM_COUNT];
+	uint16_t argc = 0U;
 
 	/* reset params */
 	memset(argv, 0, sizeof(argv[0]) * ARRAY_SIZE(argv));
@@ -264,7 +264,7 @@ static void cmd_handler_process(struct modem_cmd_handler *cmd_handler,
 	struct net_buf *frag = NULL;
 	size_t match_len, rx_len, bytes_read = 0;
 	int ret;
-	u16_t offset, len;
+	uint16_t offset, len;
 
 	if (!cmd_handler || !cmd_handler->cmd_handler_data ||
 	    !iface || !iface->read) {
@@ -440,7 +440,7 @@ static int _modem_cmd_send(struct modem_iface *iface,
 			   struct modem_cmd_handler *handler,
 			   struct modem_cmd *handler_cmds,
 			   size_t handler_cmds_len,
-			   const u8_t *buf, struct k_sem *sem,
+			   const uint8_t *buf, struct k_sem *sem,
 			   k_timeout_t timeout, bool no_tx_lock)
 {
 	struct modem_cmd_handler_data *data;
@@ -511,7 +511,7 @@ int modem_cmd_send_nolock(struct modem_iface *iface,
 			  struct modem_cmd_handler *handler,
 			  struct modem_cmd *handler_cmds,
 			  size_t handler_cmds_len,
-			  const u8_t *buf, struct k_sem *sem,
+			  const uint8_t *buf, struct k_sem *sem,
 			  k_timeout_t timeout)
 {
 	return _modem_cmd_send(iface, handler, handler_cmds, handler_cmds_len,
@@ -521,7 +521,7 @@ int modem_cmd_send_nolock(struct modem_iface *iface,
 int modem_cmd_send(struct modem_iface *iface,
 		   struct modem_cmd_handler *handler,
 		   struct modem_cmd *handler_cmds, size_t handler_cmds_len,
-		   const u8_t *buf, struct k_sem *sem, k_timeout_t timeout)
+		   const uint8_t *buf, struct k_sem *sem, k_timeout_t timeout)
 {
 	return _modem_cmd_send(iface, handler, handler_cmds, handler_cmds_len,
 			       buf, sem, timeout, false);
diff --git a/drivers/modem/modem_cmd_handler.h b/drivers/modem/modem_cmd_handler.h
index 8e102bd49d..8787f2401b 100644
--- a/drivers/modem/modem_cmd_handler.h
+++ b/drivers/modem/modem_cmd_handler.h
@@ -22,12 +22,12 @@ extern "C" {
 #endif
 
 #define MODEM_CMD_DEFINE(name_) \
-static int name_(struct modem_cmd_handler_data *data, u16_t len, \
-		 u8_t **argv, u16_t argc)
+static int name_(struct modem_cmd_handler_data *data, uint16_t len, \
+		 uint8_t **argv, uint16_t argc)
 
 #define MODEM_CMD(cmd_, func_cb_, acount_, adelim_) { \
 	.cmd = cmd_, \
-	.cmd_len = (u16_t)sizeof(cmd_)-1, \
+	.cmd_len = (uint16_t)sizeof(cmd_)-1, \
 	.func = func_cb_, \
 	.arg_count = acount_, \
 	.delim = adelim_, \
@@ -38,7 +38,7 @@ static int name_(struct modem_cmd_handler_data *data, u16_t len, \
 
 #define MODEM_CMD_DIRECT(cmd_, func_cb_) { \
 	.cmd = cmd_, \
-	.cmd_len = (u16_t)sizeof(cmd_)-1, \
+	.cmd_len = (uint16_t)sizeof(cmd_)-1, \
 	.func = func_cb_, \
 	.arg_count = 0, \
 	.delim = "", \
@@ -53,12 +53,12 @@ static int name_(struct modem_cmd_handler_data *data, u16_t len, \
 struct modem_cmd_handler_data;
 
 struct modem_cmd {
-	int (*func)(struct modem_cmd_handler_data *data, u16_t len,
-		    u8_t **argv, u16_t argc);
+	int (*func)(struct modem_cmd_handler_data *data, uint16_t len,
+		    uint8_t **argv, uint16_t argc);
 	const char *cmd;
 	const char *delim;
-	u16_t cmd_len;
-	u16_t arg_count;
+	uint16_t cmd_len;
+	uint16_t arg_count;
 	bool direct;
 };
 
@@ -153,7 +153,7 @@ int modem_cmd_send_nolock(struct modem_iface *iface,
 			  struct modem_cmd_handler *handler,
 			  struct modem_cmd *handler_cmds,
 			  size_t handler_cmds_len,
-			  const u8_t *buf, struct k_sem *sem,
+			  const uint8_t *buf, struct k_sem *sem,
 			  k_timeout_t timeout);
 
 /**
@@ -170,7 +170,7 @@ int modem_cmd_send_nolock(struct modem_iface *iface,
 int modem_cmd_send(struct modem_iface *iface,
 		   struct modem_cmd_handler *handler,
 		   struct modem_cmd *handler_cmds, size_t handler_cmds_len,
-		   const u8_t *buf, struct k_sem *sem, k_timeout_t timeout);
+		   const uint8_t *buf, struct k_sem *sem, k_timeout_t timeout);
 
 /**
  * @brief  send a series of AT commands
diff --git a/drivers/modem/modem_context.c b/drivers/modem/modem_context.c
index 7705ffbd14..5ec3b09b2f 100644
--- a/drivers/modem/modem_context.c
+++ b/drivers/modem/modem_context.c
@@ -39,7 +39,7 @@ char *modem_context_sprint_ip_addr(const struct sockaddr *addr)
 	return buf;
 }
 
-int modem_context_get_addr_port(const struct sockaddr *addr, u16_t *port)
+int modem_context_get_addr_port(const struct sockaddr *addr, uint16_t *port)
 {
 	if (!addr || !port) {
 		return -EINVAL;
diff --git a/drivers/modem/modem_context.h b/drivers/modem/modem_context.h
index 9fc845c0d1..f2d7551894 100644
--- a/drivers/modem/modem_context.h
+++ b/drivers/modem/modem_context.h
@@ -33,9 +33,9 @@ extern "C" {
 struct modem_iface {
 	struct device *dev;
 
-	int (*read)(struct modem_iface *iface, u8_t *buf, size_t size,
+	int (*read)(struct modem_iface *iface, uint8_t *buf, size_t size,
 		    size_t *bytes_read);
-	int (*write)(struct modem_iface *iface, const u8_t *buf, size_t size);
+	int (*write)(struct modem_iface *iface, const uint8_t *buf, size_t size);
 
 	/* implementation data */
 	void *iface_data;
@@ -95,7 +95,7 @@ char *modem_context_sprint_ip_addr(const struct sockaddr *addr);
  *
  * @retval 0 if ok, < 0 if error.
  */
-int modem_context_get_addr_port(const struct sockaddr *addr, u16_t *port);
+int modem_context_get_addr_port(const struct sockaddr *addr, uint16_t *port);
 
 /**
  * @brief  Gets modem context by id.
@@ -127,9 +127,9 @@ struct modem_context *modem_context_from_iface_dev(struct device *dev);
 int modem_context_register(struct modem_context *ctx);
 
 /* pin config functions */
-int modem_pin_read(struct modem_context *ctx, u32_t pin);
-int modem_pin_write(struct modem_context *ctx, u32_t pin, u32_t value);
-int modem_pin_config(struct modem_context *ctx, u32_t pin, bool enable);
+int modem_pin_read(struct modem_context *ctx, uint32_t pin);
+int modem_pin_write(struct modem_context *ctx, uint32_t pin, uint32_t value);
+int modem_pin_config(struct modem_context *ctx, uint32_t pin, bool enable);
 int modem_pin_init(struct modem_context *ctx);
 
 #ifdef __cplusplus
diff --git a/drivers/modem/modem_iface_uart.c b/drivers/modem/modem_iface_uart.c
index 8b57cb3f30..ba27311574 100644
--- a/drivers/modem/modem_iface_uart.c
+++ b/drivers/modem/modem_iface_uart.c
@@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(modem_iface_uart, CONFIG_MODEM_LOG_LEVEL);
  */
 static void modem_iface_uart_flush(struct modem_iface *iface)
 {
-	u8_t c;
+	uint8_t c;
 
 	while (uart_fifo_read(iface->dev, &c, 1) > 0) {
 		continue;
@@ -84,7 +84,7 @@ static void modem_iface_uart_isr(struct device *uart_dev)
 }
 
 static int modem_iface_uart_read(struct modem_iface *iface,
-				 u8_t *buf, size_t size, size_t *bytes_read)
+				 uint8_t *buf, size_t size, size_t *bytes_read)
 {
 	struct modem_iface_uart_data *data;
 
@@ -104,7 +104,7 @@ static int modem_iface_uart_read(struct modem_iface *iface,
 }
 
 static int modem_iface_uart_write(struct modem_iface *iface,
-				  const u8_t *buf, size_t size)
+				  const uint8_t *buf, size_t size)
 {
 	if (!iface || !iface->iface_data) {
 		return -EINVAL;
diff --git a/drivers/modem/modem_pin.c b/drivers/modem/modem_pin.c
index 4a273308be..be6a2e84a9 100644
--- a/drivers/modem/modem_pin.c
+++ b/drivers/modem/modem_pin.c
@@ -16,7 +16,7 @@
 
 #include "modem_context.h"
 
-int modem_pin_read(struct modem_context *ctx, u32_t pin)
+int modem_pin_read(struct modem_context *ctx, uint32_t pin)
 {
 	if (pin >= ctx->pins_len) {
 		return -ENODEV;
@@ -26,7 +26,7 @@ int modem_pin_read(struct modem_context *ctx, u32_t pin)
 				ctx->pins[pin].pin);
 }
 
-int modem_pin_write(struct modem_context *ctx, u32_t pin, u32_t value)
+int modem_pin_write(struct modem_context *ctx, uint32_t pin, uint32_t value)
 {
 	if (pin >= ctx->pins_len) {
 		return -ENODEV;
@@ -36,7 +36,7 @@ int modem_pin_write(struct modem_context *ctx, u32_t pin, u32_t value)
 				ctx->pins[pin].pin, value);
 }
 
-int modem_pin_config(struct modem_context *ctx, u32_t pin, bool enable)
+int modem_pin_config(struct modem_context *ctx, uint32_t pin, bool enable)
 {
 	if (pin >= ctx->pins_len) {
 		return -ENODEV;
diff --git a/drivers/modem/modem_receiver.c b/drivers/modem/modem_receiver.c
index d779956612..cae2f02efb 100644
--- a/drivers/modem/modem_receiver.c
+++ b/drivers/modem/modem_receiver.c
@@ -81,7 +81,7 @@ static int mdm_receiver_get(struct mdm_receiver_context *ctx)
  */
 static void mdm_receiver_flush(struct mdm_receiver_context *ctx)
 {
-	u8_t c;
+	uint8_t c;
 
 	__ASSERT(ctx, "invalid ctx");
 	__ASSERT(ctx->uart_dev, "invalid ctx device");
@@ -105,7 +105,7 @@ static void mdm_receiver_isr(struct device *uart_dev)
 {
 	struct mdm_receiver_context *ctx;
 	int rx, ret;
-	static u8_t read_buf[MAX_READ_SIZE];
+	static uint8_t read_buf[MAX_READ_SIZE];
 
 	/* lookup the device */
 	ctx = context_from_dev(uart_dev);
@@ -160,7 +160,7 @@ struct mdm_receiver_context *mdm_receiver_context_from_id(int id)
 }
 
 int mdm_receiver_recv(struct mdm_receiver_context *ctx,
-		      u8_t *buf, size_t size, size_t *bytes_read)
+		      uint8_t *buf, size_t size, size_t *bytes_read)
 {
 	if (!ctx) {
 		return -EINVAL;
@@ -176,7 +176,7 @@ int mdm_receiver_recv(struct mdm_receiver_context *ctx,
 }
 
 int mdm_receiver_send(struct mdm_receiver_context *ctx,
-		      const u8_t *buf, size_t size)
+		      const uint8_t *buf, size_t size)
 {
 	if (!ctx) {
 		return -EINVAL;
@@ -214,7 +214,7 @@ int mdm_receiver_wake(struct mdm_receiver_context *ctx)
 
 int mdm_receiver_register(struct mdm_receiver_context *ctx,
 			  const char *uart_dev_name,
-			  u8_t *buf, size_t size)
+			  uint8_t *buf, size_t size)
 {
 	int ret;
 
diff --git a/drivers/modem/modem_receiver.h b/drivers/modem/modem_receiver.h
index 2820b568a8..39859f7dc2 100644
--- a/drivers/modem/modem_receiver.h
+++ b/drivers/modem/modem_receiver.h
@@ -56,7 +56,7 @@ struct mdm_receiver_context *mdm_receiver_context_from_id(int id);
  * @retval 0 if ok, < 0 if error.
  */
 int mdm_receiver_recv(struct mdm_receiver_context *ctx,
-		      u8_t *buf, size_t size, size_t *bytes_read);
+		      uint8_t *buf, size_t size, size_t *bytes_read);
 
 /**
  * @brief  Sends the data over specified receiver context.
@@ -68,7 +68,7 @@ int mdm_receiver_recv(struct mdm_receiver_context *ctx,
  * @retval 0 if ok, < 0 if error.
  */
 int mdm_receiver_send(struct mdm_receiver_context *ctx,
-		      const u8_t *buf, size_t size);
+		      const uint8_t *buf, size_t size);
 
 /**
  * @brief  Registers receiver context.
@@ -84,7 +84,7 @@ int mdm_receiver_send(struct mdm_receiver_context *ctx,
  */
 int mdm_receiver_register(struct mdm_receiver_context *ctx,
 			  const char *uart_dev_name,
-			  u8_t *buf, size_t size);
+			  uint8_t *buf, size_t size);
 
 int mdm_receiver_sleep(struct mdm_receiver_context *ctx);
 
diff --git a/drivers/modem/modem_socket.c b/drivers/modem/modem_socket.c
index 6e836b76f6..64bf49cef7 100644
--- a/drivers/modem/modem_socket.c
+++ b/drivers/modem/modem_socket.c
@@ -19,10 +19,10 @@
  * Packet Size Support Functions
  */
 
-u16_t modem_socket_next_packet_size(struct modem_socket_config *cfg,
+uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg,
 				    struct modem_socket *sock)
 {
-	u16_t total = 0U;
+	uint16_t total = 0U;
 
 	k_sem_take(&cfg->sem_lock, K_FOREVER);
 
@@ -37,10 +37,10 @@ exit:
 	return total;
 }
 
-static u16_t modem_socket_packet_get_total(struct modem_socket *sock)
+static uint16_t modem_socket_packet_get_total(struct modem_socket *sock)
 {
 	int i;
-	u16_t total = 0U;
+	uint16_t total = 0U;
 
 	if (!sock || !sock->packet_count) {
 		return 0U;
@@ -74,7 +74,7 @@ static int modem_socket_packet_drop_first(struct modem_socket *sock)
 int modem_socket_packet_size_update(struct modem_socket_config *cfg,
 				    struct modem_socket *sock, int new_total)
 {
-	u16_t old_total = 0U;
+	uint16_t old_total = 0U;
 
 	if (!sock) {
 		return -EINVAL;
@@ -261,7 +261,7 @@ int modem_socket_poll(struct modem_socket_config *cfg,
 {
 	struct modem_socket *sock;
 	int ret, i;
-	u8_t found_count = 0;
+	uint8_t found_count = 0;
 
 	if (!cfg) {
 		return -EINVAL;
diff --git a/drivers/modem/modem_socket.h b/drivers/modem/modem_socket.h
index 0efa38378f..de36b571ff 100644
--- a/drivers/modem/modem_socket.h
+++ b/drivers/modem/modem_socket.h
@@ -33,8 +33,8 @@ __net_socket struct modem_socket {
 	int sock_fd;
 
 	/** packet data */
-	u16_t packet_sizes[CONFIG_MODEM_SOCKET_PACKET_COUNT];
-	u16_t packet_count;
+	uint16_t packet_sizes[CONFIG_MODEM_SOCKET_PACKET_COUNT];
+	uint16_t packet_count;
 
 	/** data ready semaphore */
 	struct k_sem sem_data_ready;
@@ -61,7 +61,7 @@ struct modem_socket_config {
 };
 
 /* return size of the first packet */
-u16_t modem_socket_next_packet_size(struct modem_socket_config *cfg,
+uint16_t modem_socket_next_packet_size(struct modem_socket_config *cfg,
 				    struct modem_socket *sock);
 int modem_socket_packet_size_update(struct modem_socket_config *cfg,
 				    struct modem_socket *sock, int new_total);
diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
index 34c545d53f..70c4b8330f 100644
--- a/drivers/modem/ublox-sara-r4.c
+++ b/drivers/modem/ublox-sara-r4.c
@@ -121,23 +121,23 @@ struct socket_read_data {
 	char *recv_buf;
 	size_t recv_buf_len;
 	struct sockaddr *recv_addr;
-	u16_t recv_read_len;
+	uint16_t recv_read_len;
 };
 
 /* driver data */
 struct modem_data {
 	struct net_if *net_iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
 	/* modem interface */
 	struct modem_iface_uart_data iface_data;
-	u8_t iface_isr_buf[MDM_RECV_BUF_SIZE];
-	u8_t iface_rb_buf[MDM_MAX_DATA_LENGTH];
+	uint8_t iface_isr_buf[MDM_RECV_BUF_SIZE];
+	uint8_t iface_rb_buf[MDM_MAX_DATA_LENGTH];
 
 	/* modem cmds */
 	struct modem_cmd_handler_data cmd_handler_data;
-	u8_t cmd_read_buf[MDM_RECV_BUF_SIZE];
-	u8_t cmd_match_buf[MDM_RECV_BUF_SIZE + 1];
+	uint8_t cmd_read_buf[MDM_RECV_BUF_SIZE];
+	uint8_t cmd_match_buf[MDM_RECV_BUF_SIZE + 1];
 
 	/* socket data */
 	struct modem_socket_config socket_config;
@@ -304,7 +304,7 @@ static ssize_t send_socket_data(struct modem_socket *sock,
 {
 	int ret;
 	char send_buf[sizeof("AT+USO**=#,!###.###.###.###!,#####,####\r\n")];
-	u16_t dst_port = 0U;
+	uint16_t dst_port = 0U;
 
 	if (!sock) {
 		return -EINVAL;
@@ -577,7 +577,7 @@ MODEM_CMD_DEFINE(on_cmd_sockwrite)
 /* Common code for +USOR[D|F]: "<data>" */
 static int on_cmd_sockread_common(int socket_id,
 				  struct modem_cmd_handler_data *data,
-				  int socket_data_length, u16_t len)
+				  int socket_data_length, uint16_t len)
 {
 	struct modem_socket *sock = NULL;
 	struct socket_read_data *sock_data;
@@ -631,7 +631,7 @@ static int on_cmd_sockread_common(int socket_id,
 	}
 
 	ret = net_buf_linearize(sock_data->recv_buf, sock_data->recv_buf_len,
-				data->rx_buf, 0, (u16_t)socket_data_length);
+				data->rx_buf, 0, (uint16_t)socket_data_length);
 	data->rx_buf = net_buf_skip(data->rx_buf, ret);
 	sock_data->recv_read_len = ret;
 	if (ret != socket_data_length) {
@@ -1149,7 +1149,7 @@ static int create_socket(struct modem_socket *sock, const struct sockaddr *addr)
 	int ret;
 	struct modem_cmd cmd = MODEM_CMD("+USOCR: ", on_cmd_sockcreate, 1U, "");
 	char buf[sizeof("AT+USOCR=#,#####\r")];
-	u16_t local_port = 0U, proto = 6U;
+	uint16_t local_port = 0U, proto = 6U;
 
 	if (addr) {
 		if (addr->sa_family == AF_INET6) {
@@ -1254,7 +1254,7 @@ static int offload_connect(void *obj, const struct sockaddr *addr,
 	struct modem_socket *sock = (struct modem_socket *)obj;
 	int ret;
 	char buf[sizeof("AT+USOCO=#,!###.###.###.###!,#####,#\r")];
-	u16_t dst_port = 0U;
+	uint16_t dst_port = 0U;
 
 	if (!addr) {
 		errno = EINVAL;
@@ -1564,7 +1564,7 @@ static int offload_getaddrinfo(const char *node, const char *service,
 			       struct addrinfo **res)
 {
 	struct modem_cmd cmd = MODEM_CMD("+UDNSRN: ", on_cmd_dns, 1U, ",");
-	u32_t port = 0U;
+	uint32_t port = 0U;
 	int ret;
 	/* DNS command + 128 bytes for domain name parameter */
 	char sendbuf[sizeof("AT+UDNSRN=#,'[]'\r") + 128];
@@ -1653,9 +1653,9 @@ static struct net_offload modem_net_offload = {
 };
 
 #define HASH_MULTIPLIER		37
-static u32_t hash32(char *str, int len)
+static uint32_t hash32(char *str, int len)
 {
-	u32_t h = 0;
+	uint32_t h = 0;
 	int i;
 
 	for (i = 0; i < len; ++i) {
@@ -1665,10 +1665,10 @@ static u32_t hash32(char *str, int len)
 	return h;
 }
 
-static inline u8_t *modem_get_mac(struct device *dev)
+static inline uint8_t *modem_get_mac(struct device *dev)
 {
 	struct modem_data *data = dev->driver_data;
-	u32_t hash_value;
+	uint32_t hash_value;
 
 	data->mac_addr[0] = 0x00;
 	data->mac_addr[1] = 0x10;
@@ -1676,7 +1676,7 @@ static inline u8_t *modem_get_mac(struct device *dev)
 	/* use IMEI for mac_addr */
 	hash_value = hash32(mdata.mdm_imei, strlen(mdata.mdm_imei));
 
-	UNALIGNED_PUT(hash_value, (u32_t *)(data->mac_addr + 2));
+	UNALIGNED_PUT(hash_value, (uint32_t *)(data->mac_addr + 2));
 
 	return data->mac_addr;
 }
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index 84130eab6d..55101e7f48 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -131,7 +131,7 @@ static const struct mdm_control_pinconfig pinconfig[] = {
 
 #define CMD_HANDLER(cmd_, cb_) { \
 	.cmd = cmd_, \
-	.cmd_len = (u16_t)sizeof(cmd_)-1, \
+	.cmd_len = (uint16_t)sizeof(cmd_)-1, \
 	.func = on_cmd_ ## cb_ \
 }
 
@@ -145,7 +145,7 @@ static const struct mdm_control_pinconfig pinconfig[] = {
 NET_BUF_POOL_DEFINE(mdm_recv_pool, MDM_RECV_MAX_BUF, MDM_RECV_BUF_SIZE,
 		    0, NULL);
 
-static u8_t mdm_recv_buf[MDM_MAX_DATA_LENGTH];
+static uint8_t mdm_recv_buf[MDM_MAX_DATA_LENGTH];
 
 /* RX thread structures */
 K_THREAD_STACK_DEFINE(wncm14a2a_rx_stack,
@@ -179,7 +179,7 @@ struct wncm14a2a_socket {
 
 struct wncm14a2a_iface_ctx {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
 	/* GPIO PORT devices */
 	struct device *gpio_port_dev[MAX_MDM_CONTROL_PINS];
@@ -211,8 +211,8 @@ struct wncm14a2a_iface_ctx {
 
 struct cmd_handler {
 	const char *cmd;
-	u16_t cmd_len;
-	void (*func)(struct net_buf **buf, u16_t len);
+	uint16_t cmd_len;
+	void (*func)(struct net_buf **buf, uint16_t len);
 };
 
 static struct wncm14a2a_iface_ctx ictx;
@@ -221,11 +221,11 @@ static void wncm14a2a_read_rx(struct net_buf **buf);
 
 /*** Verbose Debugging Functions ***/
 #if defined(ENABLE_VERBOSE_MODEM_RECV_HEXDUMP)
-static inline void hexdump(const u8_t *packet, size_t length)
+static inline void hexdump(const uint8_t *packet, size_t length)
 {
 	char output[sizeof("xxxxyyyy xxxxyyyy")];
 	int n = 0, k = 0;
-	u8_t byte;
+	uint8_t byte;
 
 	while (length--) {
 		if (n % 16 == 0) {
@@ -344,7 +344,7 @@ char *wncm14a2a_sprint_ip_addr(const struct sockaddr *addr)
 
 /* Send an AT command with a series of response handlers */
 static int send_at_cmd(struct wncm14a2a_socket *sock,
-			const u8_t *data, int timeout)
+			const uint8_t *data, int timeout)
 {
 	int ret;
 
@@ -414,7 +414,7 @@ static int send_data(struct wncm14a2a_socket *sock, struct net_pkt *pkt)
 
 /*** NET_BUF HELPERS ***/
 
-static bool is_crlf(u8_t c)
+static bool is_crlf(uint8_t c)
 {
 	if (c == '\n' || c == '\r') {
 		return true;
@@ -434,10 +434,10 @@ static void net_buf_skipcrlf(struct net_buf **buf)
 	}
 }
 
-static u16_t net_buf_findcrlf(struct net_buf *buf, struct net_buf **frag,
-			      u16_t *offset)
+static uint16_t net_buf_findcrlf(struct net_buf *buf, struct net_buf **frag,
+			      uint16_t *offset)
 {
-	u16_t len = 0U, pos = 0U;
+	uint16_t len = 0U, pos = 0U;
 
 	while (buf && !is_crlf(*(buf->data + pos))) {
 		if (pos + 1 >= buf->len) {
@@ -470,7 +470,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
 			     struct wncm14a2a_socket *sock)
 {
 	int hdr_len = 0;
-	u16_t src_port = 0U, dst_port = 0U;
+	uint16_t src_port = 0U, dst_port = 0U;
 
 #if defined(CONFIG_NET_IPV6)
 	if (net_pkt_family(pkt) == AF_INET6) {
@@ -546,7 +546,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
 /*** MODEM RESPONSE HANDLERS ***/
 
 /* Last Socket ID Handler */
-static void on_cmd_atcmdecho(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdecho(struct net_buf **buf, uint16_t len)
 {
 	char value[2];
 	/* make sure only a single digit is picked up for socket_id */
@@ -555,13 +555,13 @@ static void on_cmd_atcmdecho(struct net_buf **buf, u16_t len)
 }
 
 /* Echo Handler for commands without related sockets */
-static void on_cmd_atcmdecho_nosock(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdecho_nosock(struct net_buf **buf, uint16_t len)
 {
 	/* clear last_socket_id */
 	ictx.last_socket_id = 0;
 }
 
-static void on_cmd_atcmdinfo_manufacturer(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdinfo_manufacturer(struct net_buf **buf, uint16_t len)
 {
 	size_t out_len;
 
@@ -572,7 +572,7 @@ static void on_cmd_atcmdinfo_manufacturer(struct net_buf **buf, u16_t len)
 	LOG_INF("Manufacturer: %s", ictx.mdm_manufacturer);
 }
 
-static void on_cmd_atcmdinfo_model(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdinfo_model(struct net_buf **buf, uint16_t len)
 {
 	size_t out_len;
 
@@ -583,7 +583,7 @@ static void on_cmd_atcmdinfo_model(struct net_buf **buf, u16_t len)
 	LOG_INF("Model: %s", ictx.mdm_model);
 }
 
-static void on_cmd_atcmdinfo_revision(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdinfo_revision(struct net_buf **buf, uint16_t len)
 {
 	size_t out_len;
 
@@ -594,10 +594,10 @@ static void on_cmd_atcmdinfo_revision(struct net_buf **buf, u16_t len)
 	LOG_INF("Revision: %s", ictx.mdm_revision);
 }
 
-static void on_cmd_atcmdecho_nosock_imei(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdecho_nosock_imei(struct net_buf **buf, uint16_t len)
 {
 	struct net_buf *frag = NULL;
-	u16_t offset;
+	uint16_t offset;
 	size_t out_len;
 
 	/* make sure IMEI data is received */
@@ -629,7 +629,7 @@ static void on_cmd_atcmdecho_nosock_imei(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: %MEAS: RSSI:Reported= -68, Ant0= -63, Ant1= -251 */
-static void on_cmd_atcmdinfo_rssi(struct net_buf **buf, u16_t len)
+static void on_cmd_atcmdinfo_rssi(struct net_buf **buf, uint16_t len)
 {
 	int start = 0, i = 0;
 	size_t value_size;
@@ -670,7 +670,7 @@ static void on_cmd_atcmdinfo_rssi(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: OK */
-static void on_cmd_sockok(struct net_buf **buf, u16_t len)
+static void on_cmd_sockok(struct net_buf **buf, uint16_t len)
 {
 	struct wncm14a2a_socket *sock = NULL;
 
@@ -684,7 +684,7 @@ static void on_cmd_sockok(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: ERROR */
-static void on_cmd_sockerror(struct net_buf **buf, u16_t len)
+static void on_cmd_sockerror(struct net_buf **buf, uint16_t len)
 {
 	struct wncm14a2a_socket *sock = NULL;
 
@@ -698,7 +698,7 @@ static void on_cmd_sockerror(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: @EXTERR:<exterror_id> */
-static void on_cmd_sockexterror(struct net_buf **buf, u16_t len)
+static void on_cmd_sockexterror(struct net_buf **buf, uint16_t len)
 {
 	char value[8];
 	size_t out_len;
@@ -718,7 +718,7 @@ static void on_cmd_sockexterror(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: @SOCKDIAL:<status> */
-static void on_cmd_sockdial(struct net_buf **buf, u16_t len)
+static void on_cmd_sockdial(struct net_buf **buf, uint16_t len)
 {
 	char value[8];
 	size_t out_len;
@@ -730,7 +730,7 @@ static void on_cmd_sockdial(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: @SOCKCREAT:<socket_id> */
-static void on_cmd_sockcreat(struct net_buf **buf, u16_t len)
+static void on_cmd_sockcreat(struct net_buf **buf, uint16_t len)
 {
 	char value[2];
 	struct wncm14a2a_socket *sock = NULL;
@@ -746,7 +746,7 @@ static void on_cmd_sockcreat(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: @SOCKWRITE:<actual_length> */
-static void on_cmd_sockwrite(struct net_buf **buf, u16_t len)
+static void on_cmd_sockwrite(struct net_buf **buf, uint16_t len)
 {
 	char value[8];
 	size_t out_len;
@@ -786,10 +786,10 @@ static void sockreadrecv_cb_work(struct k_work *work)
 }
 
 /* Handler: @SOCKREAD:<actual_length>,"<hex encoded binary>" */
-static void on_cmd_sockread(struct net_buf **buf, u16_t len)
+static void on_cmd_sockread(struct net_buf **buf, uint16_t len)
 {
 	struct wncm14a2a_socket *sock = NULL;
-	u8_t c = 0U;
+	uint8_t c = 0U;
 	int i, actual_length, hdr_len = 0;
 	size_t value_size;
 	char value[10];
@@ -904,7 +904,7 @@ static void on_cmd_sockread(struct net_buf **buf, u16_t len)
 }
 
 /* Handler: @SOCKDATAIND: <socket_id>,<session_status>,<left_bytes> */
-static void on_cmd_sockdataind(struct net_buf **buf, u16_t len)
+static void on_cmd_sockdataind(struct net_buf **buf, uint16_t len)
 {
 	int socket_id, session_status, left_bytes;
 	size_t out_len;
@@ -966,7 +966,7 @@ static void on_cmd_sockdataind(struct net_buf **buf, u16_t len)
 	}
 }
 
-static void on_cmd_socknotifyev(struct net_buf **buf, u16_t len)
+static void on_cmd_socknotifyev(struct net_buf **buf, uint16_t len)
 {
 	char value[40];
 	size_t out_len;
@@ -1026,10 +1026,10 @@ static void on_cmd_socknotifyev(struct net_buf **buf, u16_t len)
 	}
 }
 
-static int net_buf_ncmp(struct net_buf *buf, const u8_t *s2, size_t n)
+static int net_buf_ncmp(struct net_buf *buf, const uint8_t *s2, size_t n)
 {
 	struct net_buf *frag = buf;
-	u16_t offset = 0U;
+	uint16_t offset = 0U;
 
 	while ((n > 0) && (*(frag->data + offset) == *s2) && (*s2 != '\0')) {
 		if (offset == frag->len) {
@@ -1057,10 +1057,10 @@ static inline struct net_buf *read_rx_allocator(k_timeout_t timeout,
 
 static void wncm14a2a_read_rx(struct net_buf **buf)
 {
-	u8_t uart_buffer[MDM_RECV_BUF_SIZE];
+	uint8_t uart_buffer[MDM_RECV_BUF_SIZE];
 	size_t bytes_read = 0;
 	int ret;
-	u16_t rx_len;
+	uint16_t rx_len;
 
 	/* read all of the data from mdm_receiver */
 	while (true) {
@@ -1102,7 +1102,7 @@ static void wncm14a2a_rx(void)
 	struct net_buf *rx_buf = NULL;
 	struct net_buf *frag = NULL;
 	int i;
-	u16_t offset, len;
+	uint16_t offset, len;
 
 	static const struct cmd_handler handlers[] = {
 		/* NON-SOCKET COMMAND ECHOES to clear last_socket_id */
@@ -1592,11 +1592,11 @@ static int offload_connect(struct net_context *context,
 			   const struct sockaddr *addr,
 			   socklen_t addrlen,
 			   net_context_connect_cb_t cb,
-			   s32_t timeout,
+			   int32_t timeout,
 			   void *user_data)
 {
 	int ret, dst_port = -1;
-	s32_t timeout_sec = -1; /* if not changed, this will be min timeout */
+	int32_t timeout_sec = -1; /* if not changed, this will be min timeout */
 	char buf[sizeof("AT@SOCKCONN=#,###.###.###.###,#####,#####\r")];
 	struct wncm14a2a_socket *sock;
 
@@ -1670,7 +1670,7 @@ static int offload_connect(struct net_context *context,
 
 static int offload_accept(struct net_context *context,
 			  net_tcp_accept_cb_t cb,
-			  s32_t timeout,
+			  int32_t timeout,
 			  void *user_data)
 {
 	/* NOT IMPLEMENTED */
@@ -1681,7 +1681,7 @@ static int offload_sendto(struct net_pkt *pkt,
 			  const struct sockaddr *dst_addr,
 			  socklen_t addrlen,
 			  net_context_send_cb_t cb,
-			  s32_t timeout,
+			  int32_t timeout,
 			  void *user_data)
 {
 	struct net_context *context = net_pkt_context(pkt);
@@ -1714,7 +1714,7 @@ static int offload_sendto(struct net_pkt *pkt,
 
 static int offload_send(struct net_pkt *pkt,
 			net_context_send_cb_t cb,
-			s32_t timeout,
+			int32_t timeout,
 			void *user_data)
 {
 	struct net_context *context = net_pkt_context(pkt);
@@ -1741,7 +1741,7 @@ static int offload_send(struct net_pkt *pkt,
 
 static int offload_recv(struct net_context *context,
 			net_context_recv_cb_t cb,
-			s32_t timeout,
+			int32_t timeout,
 			void *user_data)
 {
 	struct wncm14a2a_socket *sock;
@@ -1817,7 +1817,7 @@ static struct net_offload offload_funcs = {
 	.put = offload_put,
 };
 
-static inline u8_t *wncm14a2a_get_mac(struct device *dev)
+static inline uint8_t *wncm14a2a_get_mac(struct device *dev)
 {
 	struct wncm14a2a_iface_ctx *ctx = dev->driver_data;
 
@@ -1825,7 +1825,7 @@ static inline u8_t *wncm14a2a_get_mac(struct device *dev)
 	ctx->mac_addr[1] = 0x10;
 
 	UNALIGNED_PUT(sys_cpu_to_be32(sys_rand32_get()),
-		      (u32_t *)(ctx->mac_addr + 2));
+		      (uint32_t *)(ctx->mac_addr + 2));
 
 	return ctx->mac_addr;
 }
diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c
index 308d853833..03771b00de 100644
--- a/drivers/net/ppp.c
+++ b/drivers/net/ppp.c
@@ -59,12 +59,12 @@ struct ppp_driver_context {
 	size_t available;
 
 	/* ppp data is read into this buf */
-	u8_t buf[UART_BUF_LEN];
+	uint8_t buf[UART_BUF_LEN];
 
 	/* ppp buf use when sending data */
-	u8_t send_buf[UART_BUF_LEN];
+	uint8_t send_buf[UART_BUF_LEN];
 
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct net_linkaddr ll_addr;
 
 	/* Flag that tells whether this instance is initialized or not */
@@ -72,7 +72,7 @@ struct ppp_driver_context {
 
 	/* Incoming data is routed via ring buffer */
 	struct ring_buf rx_ringbuf;
-	u8_t rx_buf[CONFIG_NET_PPP_RINGBUF_SIZE];
+	uint8_t rx_buf[CONFIG_NET_PPP_RINGBUF_SIZE];
 
 	/* ISR function callback worker */
 	struct k_work cb_work;
@@ -85,16 +85,16 @@ struct ppp_driver_context {
 
 #if defined(CONFIG_PPP_CLIENT_CLIENTSERVER)
 	/* correctly received CLIENT bytes */
-	u8_t client_index;
+	uint8_t client_index;
 #endif
 
-	u8_t init_done : 1;
-	u8_t next_escaped : 1;
+	uint8_t init_done : 1;
+	uint8_t next_escaped : 1;
 };
 
 static struct ppp_driver_context ppp_driver_context_data;
 
-static int ppp_save_byte(struct ppp_driver_context *ppp, u8_t byte)
+static int ppp_save_byte(struct ppp_driver_context *ppp, uint8_t byte)
 {
 	int ret;
 
@@ -194,7 +194,7 @@ static void ppp_change_state(struct ppp_driver_context *ctx,
 static int ppp_send_flush(struct ppp_driver_context *ppp, int off)
 {
 	if (!IS_ENABLED(CONFIG_NET_TEST)) {
-		u8_t *buf = ppp->send_buf;
+		uint8_t *buf = ppp->send_buf;
 
 		while (off--) {
 			uart_poll_out(ppp->dev, *buf++);
@@ -205,7 +205,7 @@ static int ppp_send_flush(struct ppp_driver_context *ppp, int off)
 }
 
 static int ppp_send_bytes(struct ppp_driver_context *ppp,
-			  const u8_t *data, int len, int off)
+			  const uint8_t *data, int len, int off)
 {
 	int i;
 
@@ -225,7 +225,7 @@ static int ppp_send_bytes(struct ppp_driver_context *ppp,
 #define CLIENT "CLIENT"
 #define CLIENTSERVER "CLIENTSERVER"
 
-static void ppp_handle_client(struct ppp_driver_context *ppp, u8_t byte)
+static void ppp_handle_client(struct ppp_driver_context *ppp, uint8_t byte)
 {
 	static const char *client = CLIENT;
 	static const char *clientserver = CLIENTSERVER;
@@ -254,7 +254,7 @@ static void ppp_handle_client(struct ppp_driver_context *ppp, u8_t byte)
 }
 #endif
 
-static int ppp_input_byte(struct ppp_driver_context *ppp, u8_t byte)
+static int ppp_input_byte(struct ppp_driver_context *ppp, uint8_t byte)
 {
 	int ret = -EAGAIN;
 
@@ -349,7 +349,7 @@ static int ppp_input_byte(struct ppp_driver_context *ppp, u8_t byte)
 static bool ppp_check_fcs(struct ppp_driver_context *ppp)
 {
 	struct net_buf *buf;
-	u16_t crc;
+	uint16_t crc;
 
 	buf = ppp->pkt->buffer;
 	if (!buf) {
@@ -393,7 +393,7 @@ static void ppp_process_msg(struct ppp_driver_context *ppp)
 		 * FCS fields (16-bit) as the PPP L2 layer does not need
 		 * those bytes.
 		 */
-		u16_t addr_and_ctrl = net_buf_pull_be16(ppp->pkt->buffer);
+		uint16_t addr_and_ctrl = net_buf_pull_be16(ppp->pkt->buffer);
 
 		/* Currently we do not support compressed Address and Control
 		 * fields so they must always be present.
@@ -424,7 +424,7 @@ static void ppp_process_msg(struct ppp_driver_context *ppp)
 }
 
 #if defined(CONFIG_NET_TEST)
-static u8_t *ppp_recv_cb(u8_t *buf, size_t *off)
+static uint8_t *ppp_recv_cb(uint8_t *buf, size_t *off)
 {
 	struct ppp_driver_context *ppp =
 		CONTAINER_OF(buf, struct ppp_driver_context, buf);
@@ -458,7 +458,7 @@ static u8_t *ppp_recv_cb(u8_t *buf, size_t *off)
 	return buf;
 }
 
-void ppp_driver_feed_data(u8_t *data, int data_len)
+void ppp_driver_feed_data(uint8_t *data, int data_len)
 {
 	struct ppp_driver_context *ppp = &ppp_driver_context_data;
 	size_t recv_off = 0;
@@ -492,11 +492,11 @@ void ppp_driver_feed_data(u8_t *data, int data_len)
 }
 #endif
 
-static bool calc_fcs(struct net_pkt *pkt, u16_t *fcs, u16_t protocol)
+static bool calc_fcs(struct net_pkt *pkt, uint16_t *fcs, uint16_t protocol)
 {
 	struct net_buf *buf;
-	u16_t crc;
-	u16_t c;
+	uint16_t crc;
+	uint16_t c;
 
 	buf = pkt->buffer;
 	if (!buf) {
@@ -506,10 +506,10 @@ static bool calc_fcs(struct net_pkt *pkt, u16_t *fcs, u16_t protocol)
 	/* HDLC Address and Control fields */
 	c = sys_cpu_to_be16(0xff << 8 | 0x03);
 
-	crc = crc16_ccitt(0xffff, (const u8_t *)&c, sizeof(c));
+	crc = crc16_ccitt(0xffff, (const uint8_t *)&c, sizeof(c));
 
 	if (protocol > 0) {
-		crc = crc16_ccitt(crc, (const u8_t *)&protocol,
+		crc = crc16_ccitt(crc, (const uint8_t *)&protocol,
 				  sizeof(protocol));
 	}
 
@@ -524,7 +524,7 @@ static bool calc_fcs(struct net_pkt *pkt, u16_t *fcs, u16_t protocol)
 	return true;
 }
 
-static u16_t ppp_escape_byte(u8_t byte, int *offset)
+static uint16_t ppp_escape_byte(uint8_t byte, int *offset)
 {
 	if (byte == 0x7e || byte == 0x7d || byte < 0x20) {
 		*offset = 0;
@@ -539,11 +539,11 @@ static int ppp_send(struct device *dev, struct net_pkt *pkt)
 {
 	struct ppp_driver_context *ppp = dev->driver_data;
 	struct net_buf *buf = pkt->buffer;
-	u16_t protocol = 0;
+	uint16_t protocol = 0;
 	int send_off = 0;
-	u32_t sync_addr_ctrl;
-	u16_t fcs, escaped;
-	u8_t byte;
+	uint32_t sync_addr_ctrl;
+	uint16_t fcs, escaped;
+	uint8_t byte;
 	int i, offset;
 
 #if defined(CONFIG_NET_TEST)
@@ -577,17 +577,17 @@ static int ppp_send(struct device *dev, struct net_pkt *pkt)
 	/* Sync, Address & Control fields */
 	sync_addr_ctrl = sys_cpu_to_be32(0x7e << 24 | 0xff << 16 |
 					 0x7d << 8 | 0x23);
-	send_off = ppp_send_bytes(ppp, (const u8_t *)&sync_addr_ctrl,
+	send_off = ppp_send_bytes(ppp, (const uint8_t *)&sync_addr_ctrl,
 				  sizeof(sync_addr_ctrl), send_off);
 
 	if (protocol > 0) {
 		escaped = htons(ppp_escape_byte(protocol, &offset));
-		send_off = ppp_send_bytes(ppp, (u8_t *)&escaped + offset,
+		send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
 					  offset ? 1 : 2,
 					  send_off);
 
 		escaped = htons(ppp_escape_byte(protocol >> 8, &offset));
-		send_off = ppp_send_bytes(ppp, (u8_t *)&escaped + offset,
+		send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
 					  offset ? 1 : 2,
 					  send_off);
 	}
@@ -605,7 +605,7 @@ static int ppp_send(struct device *dev, struct net_pkt *pkt)
 			/* Escape illegal bytes */
 			escaped = htons(ppp_escape_byte(buf->data[i], &offset));
 			send_off = ppp_send_bytes(ppp,
-						  (u8_t *)&escaped + offset,
+						  (uint8_t *)&escaped + offset,
 						  offset ? 1 : 2,
 						  send_off);
 		}
@@ -614,12 +614,12 @@ static int ppp_send(struct device *dev, struct net_pkt *pkt)
 	}
 
 	escaped = htons(ppp_escape_byte(fcs, &offset));
-	send_off = ppp_send_bytes(ppp, (u8_t *)&escaped + offset,
+	send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
 				  offset ? 1 : 2,
 				  send_off);
 
 	escaped = htons(ppp_escape_byte(fcs >> 8, &offset));
-	send_off = ppp_send_bytes(ppp, (u8_t *)&escaped + offset,
+	send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
 				  offset ? 1 : 2,
 				  send_off);
 
@@ -636,7 +636,7 @@ static void ppp_isr_cb_work(struct k_work *work)
 {
 	struct ppp_driver_context *ppp =
 		CONTAINER_OF(work, struct ppp_driver_context, cb_work);
-	u8_t *data;
+	uint8_t *data;
 	size_t len, tmp;
 	int ret;
 
@@ -766,7 +766,7 @@ static struct net_stats_ppp *ppp_get_stats(struct device *dev)
 #if !defined(CONFIG_NET_TEST)
 static void ppp_uart_flush(struct device *dev)
 {
-	u8_t c;
+	uint8_t c;
 
 	while (uart_fifo_read(dev, &c, 1) > 0) {
 		continue;
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 81051b6876..7510a6943d 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -49,27 +49,27 @@ struct slip_context {
 	bool first;		/* SLIP received it's byte or not after
 				 * driver initialization or SLIP_END byte.
 				 */
-	u8_t buf[1];		/* SLIP data is read into this buf */
+	uint8_t buf[1];		/* SLIP data is read into this buf */
 	struct net_pkt *rx;	/* and then placed into this net_pkt */
 	struct net_buf *last;	/* Pointer to last buffer in the list */
-	u8_t *ptr;		/* Where in net_pkt to add data */
+	uint8_t *ptr;		/* Where in net_pkt to add data */
 	struct net_if *iface;
-	u8_t state;
+	uint8_t state;
 
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct net_linkaddr ll_addr;
 
 #if defined(CONFIG_SLIP_STATISTICS)
 #define SLIP_STATS(statement)
 #else
-	u16_t garbage;
+	uint16_t garbage;
 #define SLIP_STATS(statement) statement
 #endif
 };
 
 static inline void slip_writeb(unsigned char c)
 {
-	u8_t buf[1] = { c };
+	uint8_t buf[1] = { c };
 
 	uart_pipe_send(&buf[0], 1);
 }
@@ -108,9 +108,9 @@ static void slip_writeb_esc(unsigned char c)
 static int slip_send(struct device *dev, struct net_pkt *pkt)
 {
 	struct net_buf *buf;
-	u8_t *ptr;
-	u16_t i;
-	u8_t c;
+	uint8_t *ptr;
+	uint16_t i;
+	uint8_t c;
 
 	ARG_UNUSED(dev);
 
@@ -153,7 +153,7 @@ static struct net_pkt *slip_poll_handler(struct slip_context *slip)
 }
 
 static inline struct net_if *get_iface(struct slip_context *context,
-				       u16_t vlan_tag)
+				       uint16_t vlan_tag)
 {
 #if defined(CONFIG_NET_VLAN)
 	struct net_if *iface;
@@ -173,7 +173,7 @@ static inline struct net_if *get_iface(struct slip_context *context,
 
 static void process_msg(struct slip_context *slip)
 {
-	u16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
+	uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 	struct net_pkt *pkt;
 
 	pkt = slip_poll_handler(slip);
@@ -316,7 +316,7 @@ static inline int slip_input_byte(struct slip_context *slip,
 	return 0;
 }
 
-static u8_t *recv_cb(u8_t *buf, size_t *off)
+static uint8_t *recv_cb(uint8_t *buf, size_t *off)
 {
 	struct slip_context *slip =
 		CONTAINER_OF(buf, struct slip_context, buf);
diff --git a/drivers/neural_net/intel_gna.c b/drivers/neural_net/intel_gna.c
index 6c0f8b6d12..24ee642265 100644
--- a/drivers/neural_net/intel_gna.c
+++ b/drivers/neural_net/intel_gna.c
@@ -122,11 +122,11 @@ static void gna_work_handler(struct k_work *work)
 static int intel_gna_setup_page_table(void *physical, size_t size,
 		void *virtual)
 {
-	u32_t page;
-	u32_t dir_index;
-	u32_t table_index;
-	u32_t virt_addr = (u32_t)virtual;
-	u32_t phys_addr = (u32_t)physical;
+	uint32_t page;
+	uint32_t dir_index;
+	uint32_t table_index;
+	uint32_t virt_addr = (uint32_t)virtual;
+	uint32_t phys_addr = (uint32_t)physical;
 
 	LOG_DBG("physical %p size %u virtual %p", physical, size, virtual);
 
@@ -143,7 +143,7 @@ static int intel_gna_setup_page_table(void *physical, size_t size,
 	if (dir_index >= GNA_NUM_PG_TABLES_NEEDED) {
 		LOG_ERR("virtual addr %p is in page dir %u (max %u)",
 				virtual, dir_index,
-				(u32_t)GNA_NUM_PG_TABLES_NEEDED);
+				(uint32_t)GNA_NUM_PG_TABLES_NEEDED);
 		return -EINVAL;
 	}
 
@@ -168,7 +168,7 @@ static int intel_gna_setup_page_table(void *physical, size_t size,
 static int intel_gna_initialize(struct device *dev)
 {
 	struct intel_gna_data *const gna = DEV_DATA(dev);
-	u32_t page_dir_entry;
+	uint32_t page_dir_entry;
 
 	k_msgq_init(&gna->request_queue, (char *)gna->requests,
 			sizeof(struct intel_gna_pending_req),
@@ -186,7 +186,7 @@ static int intel_gna_initialize(struct device *dev)
 	/* initialize the configuration descriptor's page directory table */
 	for (int page = 0; page < GNA_CONFIG_DESC_PG_DIR_SIZE; page++) {
 		page_dir_entry = (page < GNA_NUM_PG_TABLES_NEEDED) ?
-			GNA_PG_DIR_ENTRY(&gna_page_table[page]) : (u32_t)-1;
+			GNA_PG_DIR_ENTRY(&gna_page_table[page]) : (uint32_t)-1;
 		gna_config_desc.pagedir[page] = page_dir_entry;
 		LOG_DBG("%s: page %u pagetable %08x",
 			DEV_NAME(dev), page, gna_config_desc.pagedir[page]);
@@ -204,7 +204,7 @@ static int intel_gna_initialize(struct device *dev)
 	LOG_INF("%s: max addressable memory %u MB",
 			DEV_NAME(dev), GNA_ADDRESSABLE_MEM_SIZE >> 20);
 	LOG_INF("%s: %u page table(s) at %p and %u bytes",
-			DEV_NAME(dev), (u32_t)GNA_NUM_PG_TABLES_NEEDED,
+			DEV_NAME(dev), (uint32_t)GNA_NUM_PG_TABLES_NEEDED,
 			gna_page_table, sizeof(gna_page_table));
 	LOG_INF("%s: configuration descriptor at %p",
 			DEV_NAME(dev), &gna_config_desc);
@@ -268,7 +268,7 @@ static int intel_gna_configure(struct device *dev, struct gna_config *cfg)
 
 	LOG_INF("Device %s (version %u.%u) configured with power mode %u",
 			DEV_NAME(dev), regs->gnaversion >> 1,
-			(u32_t)(regs->gnaversion & BIT(0)),
+			(uint32_t)(regs->gnaversion & BIT(0)),
 			CONFIG_INTEL_GNA_POWER_MODE);
 
 	gna->state = GNA_STATE_IDLE;
@@ -281,7 +281,7 @@ static int intel_gna_register_model(struct device *dev,
 	struct intel_gna_data *const gna = DEV_DATA(dev);
 	struct intel_gna_model *gna_model;
 	struct gna_model_header *header;
-	u32_t ro_size, rw_size;
+	uint32_t ro_size, rw_size;
 	void *virtual_base;
 	void *ro_region;
 
@@ -302,8 +302,8 @@ static int intel_gna_register_model(struct device *dev,
 	}
 
 	/* check for 64B alignment */
-	if (((u32_t)model->rw_region & BIT_MASK(6)) ||
-			((u32_t)model->ro_region & BIT_MASK(6))) {
+	if (((uint32_t)model->rw_region & BIT_MASK(6)) ||
+			((uint32_t)model->ro_region & BIT_MASK(6))) {
 		LOG_ERR("rw_region / ro_region not aligned to 64B");
 		return -EINVAL;
 	}
@@ -339,7 +339,7 @@ static int intel_gna_register_model(struct device *dev,
 	}
 
 	if (model->ro_region == NULL) {
-		ro_region = (void *)((u32_t)model->rw_region + rw_size);
+		ro_region = (void *)((uint32_t)model->rw_region + rw_size);
 	} else {
 		ro_region = model->ro_region;
 	}
@@ -351,7 +351,7 @@ static int intel_gna_register_model(struct device *dev,
 
 	/* setup page table entries for RO region */
 	intel_gna_setup_page_table(ro_region, ro_size,
-			(void *)((u32_t)virtual_base + rw_size));
+			(void *)((uint32_t)virtual_base + rw_size));
 
 	SOC_DCACHE_FLUSH(ro_region, ro_size);
 	SOC_DCACHE_FLUSH(gna_page_table, sizeof(gna_page_table));
@@ -359,20 +359,20 @@ static int intel_gna_register_model(struct device *dev,
 	/* copy the model pointers */
 	gna_model->model = *model;
 	gna_model->vabase = virtual_base;
-	gna_model->input = (void *)((u32_t)model->rw_region +
-			*(u32_t *)((u32_t)model->rw_region +
+	gna_model->input = (void *)((uint32_t)model->rw_region +
+			*(uint32_t *)((uint32_t)model->rw_region +
 				header->input_ptr_offset));
-	gna_model->output = (void *)((u32_t)model->rw_region +
-			*(u32_t *)((u32_t)model->rw_region +
+	gna_model->output = (void *)((uint32_t)model->rw_region +
+			*(uint32_t *)((uint32_t)model->rw_region +
 				header->output_ptr_offset));
 	gna_model->registered = true;
 
 	LOG_INF("model->rw_region: %p", model->rw_region);
 	LOG_INF("input offset: %u",
-		*(u32_t *)((u32_t)model->rw_region + header->input_ptr_offset));
+		*(uint32_t *)((uint32_t)model->rw_region + header->input_ptr_offset));
 	LOG_INF("gna_model->input: %p", gna_model->input);
 	LOG_INF("output offset: %u",
-		*(u32_t *)((u32_t)model->rw_region +
+		*(uint32_t *)((uint32_t)model->rw_region +
 			header->output_ptr_offset));
 	LOG_INF("gna_model->output: %p", gna_model->output);
 	LOG_DBG("returning model handle: %p", gna_model);
@@ -463,8 +463,8 @@ static int intel_gna_infer(struct device *dev, struct gna_inference_req *req,
 	SOC_DCACHE_FLUSH(handle->input, input_size);
 
 	/* assign layer descriptor base address to configuration descriptor */
-	gna_config_desc.labase = (u32_t)handle->vabase;
-	gna_config_desc.lacnt = (u16_t)header->layer_count;
+	gna_config_desc.labase = (uint32_t)handle->vabase;
+	gna_config_desc.lacnt = (uint16_t)header->layer_count;
 	SOC_DCACHE_FLUSH(&gna_config_desc, sizeof(gna_config_desc));
 
 	gna->state = GNA_STATE_ACTIVE;
diff --git a/drivers/neural_net/intel_gna.h b/drivers/neural_net/intel_gna.h
index 95735703e0..05c18fa3c3 100644
--- a/drivers/neural_net/intel_gna.h
+++ b/drivers/neural_net/intel_gna.h
@@ -85,68 +85,68 @@ extern "C" {
 #error GNA_NUM_PG_TABLES_NEEDED exceeds GNA_CONFIG_DESC_PG_DIR_SIZE
 #endif
 
-#define GNA_GET_BITS(val, b_hi, b_lo)	((((u32_t)(val)) << (31 - (b_hi))) >> \
+#define GNA_GET_BITS(val, b_hi, b_lo)	((((uint32_t)(val)) << (31 - (b_hi))) >> \
 		(31 - (b_hi) + (b_lo)))
 
 #define GNA_VA_PG_DIR(virt_addr)	GNA_GET_BITS(virt_addr, 27, 22)
 #define GNA_VA_PG_TABLE(virt_addr)	GNA_GET_BITS(virt_addr, 21, 12)
 
-#define GNA_PHYS_ADDR_TO_PAGE(addr)	((u32_t)(addr) >> \
+#define GNA_PHYS_ADDR_TO_PAGE(addr)	((uint32_t)(addr) >> \
 		GNA_PG_SIZE_IN_BITSHIFT)
 #define GNA_PG_DIR_ENTRY(phys_addr)	GNA_PHYS_ADDR_TO_PAGE(phys_addr)
-#define GNA_PG_BASE(addr)		((u32_t)(addr) & \
+#define GNA_PG_BASE(addr)		((uint32_t)(addr) & \
 		~BIT_MASK(GNA_PG_SIZE_IN_BITSHIFT))
-#define GNA_PG_OFFSET(addr)		((u32_t)(addr) & \
+#define GNA_PG_OFFSET(addr)		((uint32_t)(addr) & \
 		BIT_MASK(GNA_PG_SIZE_IN_BITSHIFT))
 #define GNA_PG_TABLE_ENTRY(phys_addr)	GNA_PHYS_ADDR_TO_PAGE(phys_addr)
 
 struct intel_gna_regs {
-	u32_t	gnasts;
-	u32_t	gnactrl;
-	u32_t	gnamctl;
-	u32_t	gnaptc;
-	u32_t	gnasc;
-	u32_t	gnaisi;
-	u32_t	gnais_low;
-	u32_t	gnais_high;
-	u32_t	gnabp_low;
-	u32_t	gnabp_high;
-	u32_t	reserved1[2];
-	u32_t	gnadesbase;
-	u32_t	gnaibuffs;
-	u32_t	reserved2[2];
-	u32_t	ovrcfgctl;
-	u32_t	reserved3[3];
-	u32_t	gnaversion;
+	uint32_t	gnasts;
+	uint32_t	gnactrl;
+	uint32_t	gnamctl;
+	uint32_t	gnaptc;
+	uint32_t	gnasc;
+	uint32_t	gnaisi;
+	uint32_t	gnais_low;
+	uint32_t	gnais_high;
+	uint32_t	gnabp_low;
+	uint32_t	gnabp_high;
+	uint32_t	reserved1[2];
+	uint32_t	gnadesbase;
+	uint32_t	gnaibuffs;
+	uint32_t	reserved2[2];
+	uint32_t	ovrcfgctl;
+	uint32_t	reserved3[3];
+	uint32_t	gnaversion;
 };
 
 struct intel_gna_config_desc {
-	u32_t	reserved1[64];
-	u32_t	labase;		/* layer array base */
-	u16_t	lacnt;		/* layer array count */
-	u16_t	reserved2;
-	u32_t	reserved3[62];
-	u32_t	vamaxaddr;	/* virtual address max address */
-	u32_t	reserved4[3];
+	uint32_t	reserved1[64];
+	uint32_t	labase;		/* layer array base */
+	uint16_t	lacnt;		/* layer array count */
+	uint16_t	reserved2;
+	uint32_t	reserved3[62];
+	uint32_t	vamaxaddr;	/* virtual address max address */
+	uint32_t	reserved4[3];
 	/* page directory entries */
-	u32_t	pagedir[GNA_CONFIG_DESC_PG_DIR_SIZE];
+	uint32_t	pagedir[GNA_CONFIG_DESC_PG_DIR_SIZE];
 } __packed;
 
 struct intel_gna_page_table {
-	u32_t	entry[GNA_NUM_PG_TABLE_ENTRIES];
+	uint32_t	entry[GNA_NUM_PG_TABLE_ENTRIES];
 } __aligned(GNA_PG_SIZE_IN_BYTES);
 
 struct intel_gna_layer_desc {
-	u32_t	gna_words[8];
-	u32_t	inarrayptr;
-	u32_t	outarrayactptr;
-	u32_t	outarraysumptr;
-	u32_t	outfbarrayactptr;
-	u32_t	wtfltarrayptr;
-	u32_t	constarrayptr;
-	u32_t	actoutputslistptr;
-	u32_t	actfuncsectdefptr;
-	u32_t	reserved[16];
+	uint32_t	gna_words[8];
+	uint32_t	inarrayptr;
+	uint32_t	outarrayactptr;
+	uint32_t	outarraysumptr;
+	uint32_t	outfbarrayactptr;
+	uint32_t	wtfltarrayptr;
+	uint32_t	constarrayptr;
+	uint32_t	actoutputslistptr;
+	uint32_t	actfuncsectdefptr;
+	uint32_t	reserved[16];
 } __packed __aligned(GNA_LAYER_DESC_ALIGN);
 
 struct intel_gna_config {
diff --git a/drivers/pcie/msi.c b/drivers/pcie/msi.c
index 5bc0868558..4b45c357e9 100644
--- a/drivers/pcie/msi.c
+++ b/drivers/pcie/msi.c
@@ -10,10 +10,10 @@
 
 /* functions documented in include/drivers/pcie/msi.h */
 
-u32_t pcie_get_cap(pcie_bdf_t bdf, u32_t cap_id)
+uint32_t pcie_get_cap(pcie_bdf_t bdf, uint32_t cap_id)
 {
-	u32_t reg = 0U;
-	u32_t data;
+	uint32_t reg = 0U;
+	uint32_t data;
 
 	data = pcie_conf_read(bdf, PCIE_CONF_CMDSTAT);
 	if (data & PCIE_CONF_CMDSTAT_CAPS) {
@@ -37,10 +37,10 @@ u32_t pcie_get_cap(pcie_bdf_t bdf, u32_t cap_id)
 bool pcie_set_msi(pcie_bdf_t bdf, unsigned int irq)
 {
 	bool success = false; /* keepin' the MISRA peeps employed */
-	u32_t base;
-	u32_t mcr;
-	u32_t map;
-	u32_t mdr;
+	uint32_t base;
+	uint32_t mcr;
+	uint32_t map;
+	uint32_t mdr;
 
 	map = pcie_msi_map(irq);
 	mdr = pcie_msi_mdr(irq);
diff --git a/drivers/pcie/pcie.c b/drivers/pcie/pcie.c
index 408acb08f2..4269316594 100644
--- a/drivers/pcie/pcie.c
+++ b/drivers/pcie/pcie.c
@@ -16,7 +16,7 @@
 
 bool pcie_probe(pcie_bdf_t bdf, pcie_id_t id)
 {
-	u32_t data;
+	uint32_t data;
 
 	data = pcie_conf_read(bdf, PCIE_CONF_ID);
 
@@ -31,9 +31,9 @@ bool pcie_probe(pcie_bdf_t bdf, pcie_id_t id)
 	return (id == data);
 }
 
-void pcie_set_cmd(pcie_bdf_t bdf, u32_t bits, bool on)
+void pcie_set_cmd(pcie_bdf_t bdf, uint32_t bits, bool on)
 {
-	u32_t cmdstat;
+	uint32_t cmdstat;
 
 	cmdstat = pcie_conf_read(bdf, PCIE_CONF_CMDSTAT);
 
@@ -46,10 +46,10 @@ void pcie_set_cmd(pcie_bdf_t bdf, u32_t bits, bool on)
 	pcie_conf_write(bdf, PCIE_CONF_CMDSTAT, cmdstat);
 }
 
-static u32_t pcie_get_bar(pcie_bdf_t bdf, unsigned int index, bool io)
+static uint32_t pcie_get_bar(pcie_bdf_t bdf, unsigned int index, bool io)
 {
 	int bar;
-	u32_t data;
+	uint32_t data;
 
 	for (bar = PCIE_CONF_BAR0; bar <= PCIE_CONF_BAR5; ++bar) {
 		data = pcie_conf_read(bdf, bar);
@@ -74,19 +74,19 @@ static u32_t pcie_get_bar(pcie_bdf_t bdf, unsigned int index, bool io)
 	return PCIE_CONF_BAR_NONE;
 }
 
-u32_t pcie_get_mbar(pcie_bdf_t bdf, unsigned int index)
+uint32_t pcie_get_mbar(pcie_bdf_t bdf, unsigned int index)
 {
 	return pcie_get_bar(bdf, index, false);
 }
 
 unsigned int pcie_wired_irq(pcie_bdf_t bdf)
 {
-	u32_t data = pcie_conf_read(bdf, PCIE_CONF_INTR);
+	uint32_t data = pcie_conf_read(bdf, PCIE_CONF_INTR);
 
 	return PCIE_CONF_INTR_IRQ(data);
 }
 
-u32_t pcie_get_iobar(pcie_bdf_t bdf, unsigned int index)
+uint32_t pcie_get_iobar(pcie_bdf_t bdf, unsigned int index)
 {
 	return pcie_get_bar(bdf, index, true);
 }
diff --git a/drivers/pcie/shell.c b/drivers/pcie/shell.c
index 8d4eb4dc37..1ba3cc92cd 100644
--- a/drivers/pcie/shell.c
+++ b/drivers/pcie/shell.c
@@ -18,8 +18,8 @@
 static void show_msi(const struct shell *shell, pcie_bdf_t bdf)
 {
 #ifdef CONFIG_PCIE_MSI
-	u32_t msi;
-	u32_t data;
+	uint32_t msi;
+	uint32_t data;
 
 	msi = pcie_get_cap(bdf, PCIE_MSI_CAP_ID);
 
@@ -40,7 +40,7 @@ static void show_msi(const struct shell *shell, pcie_bdf_t bdf)
 
 static void show_bars(const struct shell *shell, pcie_bdf_t bdf)
 {
-	u32_t data;
+	uint32_t data;
 	int bar;
 
 	for (bar = PCIE_CONF_BAR0; bar <= PCIE_CONF_BAR5; ++bar) {
@@ -63,7 +63,7 @@ static void show_bars(const struct shell *shell, pcie_bdf_t bdf)
 
 static void show(const struct shell *shell, pcie_bdf_t bdf)
 {
-	u32_t data;
+	uint32_t data;
 	unsigned int irq;
 
 	data = pcie_conf_read(bdf, PCIE_CONF_ID);
diff --git a/drivers/peci/peci_handlers.c b/drivers/peci/peci_handlers.c
index f4e38ae585..062d6070da 100644
--- a/drivers/peci/peci_handlers.c
+++ b/drivers/peci/peci_handlers.c
@@ -8,7 +8,7 @@
 #include <syscall_handler.h>
 
 
-static inline int z_vrfy_peci_config(struct device *dev, u32_t bitrate)
+static inline int z_vrfy_peci_config(struct device *dev, uint32_t bitrate)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_PECI(dev, config));
 
diff --git a/drivers/peci/peci_mchp_xec.c b/drivers/peci/peci_mchp_xec.c
index e700dae129..53e07ecb7e 100644
--- a/drivers/peci/peci_mchp_xec.c
+++ b/drivers/peci/peci_mchp_xec.c
@@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(peci_mchp_xec, CONFIG_PECI_LOG_LEVEL);
 
 struct peci_xec_config {
 	PECI_Type *base;
-	u8_t irq_num;
+	uint8_t irq_num;
 };
 
 struct peci_xec_data {
@@ -48,7 +48,7 @@ static const struct peci_xec_config peci_xec_config = {
 
 static int check_bus_idle(PECI_Type *base)
 {
-	u8_t delay_cnt = PECI_IDLE_TIMEOUT;
+	uint8_t delay_cnt = PECI_IDLE_TIMEOUT;
 
 	/* Wait until PECI bus becomes idle.
 	 * Note that when IDLE bit in the status register changes, HW do not
@@ -66,12 +66,12 @@ static int check_bus_idle(PECI_Type *base)
 	return 0;
 }
 
-static int peci_xec_configure(struct device *dev, u32_t bitrate)
+static int peci_xec_configure(struct device *dev, uint32_t bitrate)
 {
 	ARG_UNUSED(dev);
 
 	PECI_Type *base = peci_xec_config.base;
-	u16_t value;
+	uint16_t value;
 
 	/* Power down PECI interface */
 	base->CONTROL = MCHP_PECI_CTRL_PD;
@@ -129,7 +129,7 @@ static int peci_xec_write(struct device *dev, struct peci_msg *msg)
 	int ret;
 
 #ifndef CONFIG_PECI_INTERRUPT_DRIVEN
-	u8_t wait_timeout;
+	uint8_t wait_timeout;
 #endif
 	struct peci_buf *tx_buf = &msg->tx_buffer;
 	struct peci_buf *rx_buf = &msg->rx_buffer;
@@ -194,8 +194,8 @@ static int peci_xec_read(struct device *dev, struct peci_msg *msg)
 	ARG_UNUSED(dev);
 	int i;
 	int ret;
-	u8_t tx_fcs;
-	u8_t bytes_rcvd;
+	uint8_t tx_fcs;
+	uint8_t bytes_rcvd;
 	struct peci_buf *rx_buf = &msg->rx_buffer;
 	PECI_Type *base = peci_xec_config.base;
 
@@ -244,7 +244,7 @@ static int peci_xec_transfer(struct device *dev, struct peci_msg *msg)
 	ARG_UNUSED(dev);
 	int ret;
 	PECI_Type *base = peci_xec_config.base;
-	u8_t err_val = base->ERROR;
+	uint8_t err_val = base->ERROR;
 
 	ret = peci_xec_write(dev, msg);
 	if (ret) {
diff --git a/drivers/pinmux/pinmux.h b/drivers/pinmux/pinmux.h
index f0f79f59fd..59c19a580a 100644
--- a/drivers/pinmux/pinmux.h
+++ b/drivers/pinmux/pinmux.h
@@ -16,12 +16,12 @@ extern "C" {
 #endif
 
 struct pin_config {
-	u8_t pin_num;
-	u32_t mode;
+	uint8_t pin_num;
+	uint32_t mode;
 };
 
 struct pinmux_config {
-	u32_t	base_address;
+	uint32_t	base_address;
 };
 
 #ifdef __cplusplus
diff --git a/drivers/pinmux/pinmux_cc13xx_cc26xx.c b/drivers/pinmux/pinmux_cc13xx_cc26xx.c
index 6098c84950..0e0e5a6414 100644
--- a/drivers/pinmux/pinmux_cc13xx_cc26xx.c
+++ b/drivers/pinmux/pinmux_cc13xx_cc26xx.c
@@ -11,7 +11,7 @@
 
 #include <driverlib/ioc.h>
 
-static int pinmux_cc13xx_cc26xx_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_cc13xx_cc26xx_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	ARG_UNUSED(dev);
 
@@ -23,7 +23,7 @@ static int pinmux_cc13xx_cc26xx_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_cc13xx_cc26xx_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_cc13xx_cc26xx_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	ARG_UNUSED(dev);
 
@@ -34,7 +34,7 @@ static int pinmux_cc13xx_cc26xx_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_cc13xx_cc26xx_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_cc13xx_cc26xx_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	ARG_UNUSED(dev);
 
@@ -52,7 +52,7 @@ static int pinmux_cc13xx_cc26xx_pullup(struct device *dev, u32_t pin, u8_t func)
 	return -EINVAL;
 }
 
-static int pinmux_cc13xx_cc26xx_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_cc13xx_cc26xx_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	ARG_UNUSED(dev);
 
diff --git a/drivers/pinmux/pinmux_esp32.c b/drivers/pinmux/pinmux_esp32.c
index 4387592445..18b83ddc51 100644
--- a/drivers/pinmux/pinmux_esp32.c
+++ b/drivers/pinmux/pinmux_esp32.c
@@ -28,7 +28,7 @@
  *       is "internally" depends on it.
  */
 #define PIN(id)   ((PERIPHS_IO_MUX_ ## id ## _U) - (DR_REG_IO_MUX_BASE))
-static const u8_t pin_mux_off[] = {
+static const uint8_t pin_mux_off[] = {
 	PIN(GPIO0),    PIN(U0TXD),    PIN(GPIO2),    PIN(U0RXD),
 	PIN(GPIO4),    PIN(GPIO5),    PIN(SD_CLK),   PIN(SD_DATA0),
 	PIN(SD_DATA1), PIN(SD_DATA2), PIN(SD_DATA3), PIN(SD_CMD),
@@ -42,9 +42,9 @@ static const u8_t pin_mux_off[] = {
 };
 #undef PIN
 
-static u32_t *reg_for_pin(u32_t pin)
+static uint32_t *reg_for_pin(uint32_t pin)
 {
-	u8_t off;
+	uint8_t off;
 
 	if (pin >= ARRAY_SIZE(pin_mux_off)) {
 		return NULL;
@@ -55,13 +55,13 @@ static u32_t *reg_for_pin(u32_t pin)
 		return NULL;
 	}
 
-	return (u32_t *)(DT_INST_REG_ADDR(0) + off);
+	return (uint32_t *)(DT_INST_REG_ADDR(0) + off);
 }
 
-static int set_reg(u32_t pin, u32_t clr_mask, u32_t set_mask)
+static int set_reg(uint32_t pin, uint32_t clr_mask, uint32_t set_mask)
 {
-	volatile u32_t *reg = reg_for_pin(pin);
-	u32_t v;
+	volatile uint32_t *reg = reg_for_pin(pin);
+	uint32_t v;
 
 	if (!reg) {
 		return -EINVAL;
@@ -75,7 +75,7 @@ static int set_reg(u32_t pin, u32_t clr_mask, u32_t set_mask)
 	return 0;
 }
 
-static int pinmux_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	ARG_UNUSED(dev);
 
@@ -91,9 +91,9 @@ static int pinmux_set(struct device *dev, u32_t pin, u32_t func)
 	return set_reg(pin, MCU_SEL_M, func<<MCU_SEL_S | 2<<FUN_DRV_S);
 }
 
-static int pinmux_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
-	volatile u32_t *reg = reg_for_pin(pin);
+	volatile uint32_t *reg = reg_for_pin(pin);
 
 	if (!reg) {
 		return -EINVAL;
@@ -105,7 +105,7 @@ static int pinmux_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	switch (func) {
 	case PINMUX_PULLUP_DISABLE:
@@ -119,14 +119,14 @@ static int pinmux_pullup(struct device *dev, u32_t pin, u8_t func)
 }
 
 #define CFG(id)   ((GPIO_ ## id ## _REG) & 0xff)
-static int pinmux_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_input(struct device *dev, uint32_t pin, uint8_t func)
 {
-	static const u8_t offs[2][3] = {
+	static const uint8_t offs[2][3] = {
 		{ CFG(ENABLE1_W1TC), CFG(ENABLE1_W1TS), 32 },
 		{ CFG(ENABLE_W1TC), CFG(ENABLE_W1TS), 0 },
 	};
-	const u8_t *line = offs[pin < 32];
-	volatile u32_t *reg;
+	const uint8_t *line = offs[pin < 32];
+	volatile uint32_t *reg;
 	int r;
 
 	/* Since PINMUX_INPUT_ENABLED == 1 and PINMUX_OUTPUT_ENABLED == 0,
@@ -136,13 +136,13 @@ static int pinmux_input(struct device *dev, u32_t pin, u8_t func)
 	 */
 	r = set_reg(pin, 0, FUN_IE);
 	if (func == PINMUX_INPUT_ENABLED) {
-		reg = (u32_t *)(DR_REG_GPIO_BASE + line[0]);
+		reg = (uint32_t *)(DR_REG_GPIO_BASE + line[0]);
 	} else if (func == PINMUX_OUTPUT_ENABLED) {
 		if (pin >= 34U && pin <= 39U) {
 			/* These pins are input only */
 			return -EINVAL;
 		}
-		reg = (u32_t *)(DR_REG_GPIO_BASE + line[1]);
+		reg = (uint32_t *)(DR_REG_GPIO_BASE + line[1]);
 	} else {
 		return -EINVAL;
 	}
@@ -167,7 +167,7 @@ static struct pinmux_driver_api api_funcs = {
 
 static int pinmux_initialize(struct device *device)
 {
-	u32_t pin;
+	uint32_t pin;
 
 	for (pin = 0U; pin < ARRAY_SIZE(pin_mux_off); pin++) {
 		pinmux_set(NULL, pin, 0);
diff --git a/drivers/pinmux/pinmux_hsdk.c b/drivers/pinmux/pinmux_hsdk.c
index 3d04a91d7f..42fd5d771d 100644
--- a/drivers/pinmux/pinmux_hsdk.c
+++ b/drivers/pinmux/pinmux_hsdk.c
@@ -9,14 +9,14 @@
 #include <drivers/pinmux.h>
 #include <soc.h>
 
-#define creg_gpio_mux_reg	(*(volatile u32_t *)CREG_GPIO_MUX_BASE_ADDR)
+#define creg_gpio_mux_reg	(*(volatile uint32_t *)CREG_GPIO_MUX_BASE_ADDR)
 
 void _arc_sync(void)
 {
 	__asm__ volatile("sync");
 }
 
-static int pinmux_hsdk_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_hsdk_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 
 	if (func >= HSDK_PINMUX_FUNS || pin >= HSDK_PINMUX_SELS)
@@ -30,7 +30,7 @@ static int pinmux_hsdk_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_hsdk_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_hsdk_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 
 	if (pin >= HSDK_PINMUX_SELS || func == NULL)
@@ -41,12 +41,12 @@ static int pinmux_hsdk_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_hsdk_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_hsdk_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_hsdk_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_hsdk_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/pinmux_intel_s1000.c b/drivers/pinmux/pinmux_intel_s1000.c
index c03dc73062..3396f6a8d2 100644
--- a/drivers/pinmux/pinmux_intel_s1000.c
+++ b/drivers/pinmux/pinmux_intel_s1000.c
@@ -10,16 +10,16 @@
 #include <drivers/pinmux.h>
 #include <iomux.h>
 
-static volatile u32_t *iomux_ctrl_regs = (volatile u32_t *)DT_INST_REG_ADDR(0);
+static volatile uint32_t *iomux_ctrl_regs = (volatile uint32_t *)DT_INST_REG_ADDR(0);
 
 #define PINMUX_CTRL_REG_COUNT (DT_INST_REG_SIZE(0) / 4)
 
-static int pinmux_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_set(struct device *dev, uint32_t pin, uint32_t func)
 {
-	u32_t lsb, msb;
-	u32_t index;
-	u32_t value;
-	u32_t mask;
+	uint32_t lsb, msb;
+	uint32_t index;
+	uint32_t value;
+	uint32_t mask;
 
 	/* retrieve control register index */
 	index = IOMUX_INDEX(pin);
@@ -43,11 +43,11 @@ static int pinmux_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
-	u32_t lsb, msb;
-	u32_t index;
-	u32_t mask;
+	uint32_t lsb, msb;
+	uint32_t index;
+	uint32_t mask;
 
 	/* retrieve control register index */
 	index = IOMUX_INDEX(pin);
@@ -71,12 +71,12 @@ static int pinmux_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOSYS;
 }
 
-static int pinmux_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOSYS;
 }
diff --git a/drivers/pinmux/pinmux_mchp_xec.c b/drivers/pinmux/pinmux_mchp_xec.c
index 7b9fe7e690..129549a47a 100644
--- a/drivers/pinmux/pinmux_mchp_xec.c
+++ b/drivers/pinmux/pinmux_mchp_xec.c
@@ -9,7 +9,7 @@
 #include <drivers/pinmux.h>
 #include <soc.h>
 
-static const u32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = {
+static const uint32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = {
 	(MCHP_GPIO_PORT_A_BITMAP),
 	(MCHP_GPIO_PORT_B_BITMAP),
 	(MCHP_GPIO_PORT_C_BITMAP),
@@ -19,16 +19,16 @@ static const u32_t valid_ctrl_masks[NUM_MCHP_GPIO_PORTS] = {
 };
 
 struct pinmux_xec_config {
-	__IO u32_t *pcr1_base;
-	u32_t port_num;
+	__IO uint32_t *pcr1_base;
+	uint32_t port_num;
 };
 
-static int pinmux_xec_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_xec_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_xec_config *config = dev->config_info;
-	__IO u32_t *current_pcr1;
-	u32_t pcr1 = 0;
-	u32_t mask = 0;
+	__IO uint32_t *current_pcr1;
+	uint32_t pcr1 = 0;
+	uint32_t mask = 0;
 
 	/* Validate pin number in terms of current port */
 	if ((valid_ctrl_masks[config->port_num] & BIT(pin)) == 0) {
@@ -76,10 +76,10 @@ static int pinmux_xec_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_xec_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_xec_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_xec_config *config = dev->config_info;
-	__IO u32_t *current_pcr1;
+	__IO uint32_t *current_pcr1;
 
 	/* Validate pin number in terms of current port */
 	if ((valid_ctrl_masks[config->port_num] & BIT(pin)) == 0) {
@@ -94,12 +94,12 @@ static int pinmux_xec_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_xec_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_xec_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_xec_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_xec_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
@@ -121,7 +121,7 @@ static const struct pinmux_driver_api pinmux_xec_driver_api = {
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_000_036), okay)
 static const struct pinmux_xec_config pinmux_xec_port000_036_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_000_036),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_000_036),
 	.port_num = MCHP_GPIO_000_036,
 };
 
@@ -135,7 +135,7 @@ DEVICE_AND_API_INIT(pinmux_xec_port000_036,
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_040_076), okay)
 static const struct pinmux_xec_config pinmux_xec_port040_076_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_040_076),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_040_076),
 	.port_num = MCHP_GPIO_040_076,
 };
 
@@ -149,7 +149,7 @@ DEVICE_AND_API_INIT(pinmux_xec_port040_076,
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_100_136), okay)
 static const struct pinmux_xec_config pinmux_xec_port100_136_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_100_136),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_100_136),
 	.port_num = MCHP_GPIO_100_136,
 };
 
@@ -163,7 +163,7 @@ DEVICE_AND_API_INIT(pinmux_xec_port100_136,
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_140_176), okay)
 static const struct pinmux_xec_config pinmux_xec_port140_176_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_140_176),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_140_176),
 	.port_num = MCHP_GPIO_140_176,
 };
 
@@ -177,7 +177,7 @@ DEVICE_AND_API_INIT(pinmux_xec_port140_176,
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_200_236), okay)
 static const struct pinmux_xec_config pinmux_xec_port200_236_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_200_236),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_200_236),
 	.port_num = MCHP_GPIO_200_236,
 };
 
@@ -191,7 +191,7 @@ DEVICE_AND_API_INIT(pinmux_xec_port200_236,
 
 #if DT_NODE_HAS_STATUS(DT_NODELABEL(pinmux_240_276), okay)
 static const struct pinmux_xec_config pinmux_xec_port240_276_config = {
-	.pcr1_base = (u32_t *) PINMUX_ADDR(pinmux_240_276),
+	.pcr1_base = (uint32_t *) PINMUX_ADDR(pinmux_240_276),
 	.port_num = MCHP_GPIO_240_276,
 };
 
diff --git a/drivers/pinmux/pinmux_mcux.c b/drivers/pinmux/pinmux_mcux.c
index 2f53962390..a231ca4ce8 100644
--- a/drivers/pinmux/pinmux_mcux.c
+++ b/drivers/pinmux/pinmux_mcux.c
@@ -15,7 +15,7 @@ struct pinmux_mcux_config {
 	PORT_Type *base;
 };
 
-static int pinmux_mcux_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_mcux_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_mcux_config *config = dev->config_info;
 	PORT_Type *base = config->base;
@@ -25,7 +25,7 @@ static int pinmux_mcux_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_mcux_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_mcux_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_mcux_config *config = dev->config_info;
 	PORT_Type *base = config->base;
@@ -35,12 +35,12 @@ static int pinmux_mcux_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_mcux_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_mcux_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_mcux_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_mcux_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/pinmux_mcux_lpc.c b/drivers/pinmux/pinmux_mcux_lpc.c
index ae5d451747..12599f56bb 100644
--- a/drivers/pinmux/pinmux_mcux_lpc.c
+++ b/drivers/pinmux/pinmux_mcux_lpc.c
@@ -19,37 +19,37 @@
 struct pinmux_mcux_lpc_config {
 	clock_ip_name_t clock_ip_name;
 	IOCON_Type *base;
-	u32_t port_no;
+	uint32_t port_no;
 };
 
-static int pinmux_mcux_lpc_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_mcux_lpc_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_mcux_lpc_config *config = dev->config_info;
 	IOCON_Type *base = config->base;
-	u32_t port = config->port_no;
+	uint32_t port = config->port_no;
 
 	base->PIO[port][pin] = func;
 
 	return 0;
 }
 
-static int pinmux_mcux_lpc_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_mcux_lpc_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_mcux_lpc_config *config = dev->config_info;
 	IOCON_Type *base = config->base;
-	u32_t port = config->port_no;
+	uint32_t port = config->port_no;
 
 	*func = base->PIO[port][pin];
 
 	return 0;
 }
 
-static int pinmux_mcux_lpc_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_mcux_lpc_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_mcux_lpc_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_mcux_lpc_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c
index 6215d52367..37bbee0cbf 100644
--- a/drivers/pinmux/pinmux_rv32m1.c
+++ b/drivers/pinmux/pinmux_rv32m1.c
@@ -19,7 +19,7 @@ struct pinmux_rv32m1_config {
 	PORT_Type *base;
 };
 
-static int pinmux_rv32m1_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_rv32m1_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_rv32m1_config *config = dev->config_info;
 	PORT_Type *base = config->base;
@@ -29,7 +29,7 @@ static int pinmux_rv32m1_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_rv32m1_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_rv32m1_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_rv32m1_config *config = dev->config_info;
 	PORT_Type *base = config->base;
@@ -39,12 +39,12 @@ static int pinmux_rv32m1_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_rv32m1_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_rv32m1_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_rv32m1_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_rv32m1_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/pinmux_sam0.c b/drivers/pinmux/pinmux_sam0.c
index 86a959eb32..5407c45346 100644
--- a/drivers/pinmux/pinmux_sam0.c
+++ b/drivers/pinmux/pinmux_sam0.c
@@ -11,7 +11,7 @@ struct pinmux_sam0_config {
 	PortGroup *regs;
 };
 
-static int pinmux_sam0_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_sam0_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_sam0_config *cfg = dev->config_info;
 	bool odd_pin = pin & 1;
@@ -31,7 +31,7 @@ static int pinmux_sam0_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_sam0_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_sam0_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_sam0_config *cfg = dev->config_info;
 	bool odd_pin = pin & 1;
@@ -46,12 +46,12 @@ static int pinmux_sam0_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_sam0_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_sam0_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_sam0_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_sam0_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/pinmux_sifive.c b/drivers/pinmux/pinmux_sifive.c
index 0db4e860ee..03f9c00624 100644
--- a/drivers/pinmux/pinmux_sifive.c
+++ b/drivers/pinmux/pinmux_sifive.c
@@ -18,8 +18,8 @@ struct pinmux_sifive_config {
 };
 
 struct pinmux_sifive_regs_t {
-	u32_t iof_en;
-	u32_t iof_sel;
+	uint32_t iof_en;
+	uint32_t iof_sel;
 };
 
 #define DEV_CFG(dev)					\
@@ -29,7 +29,7 @@ struct pinmux_sifive_regs_t {
 #define DEV_PINMUX(dev)						\
 	((struct pinmux_sifive_regs_t *)(DEV_CFG(dev))->base)
 
-static int pinmux_sifive_set(struct device *dev, u32_t pin, u32_t func)
+static int pinmux_sifive_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	volatile struct pinmux_sifive_regs_t *pinmux = DEV_PINMUX(dev);
 
@@ -48,7 +48,7 @@ static int pinmux_sifive_set(struct device *dev, u32_t pin, u32_t func)
 	return 0;
 }
 
-static int pinmux_sifive_get(struct device *dev, u32_t pin, u32_t *func)
+static int pinmux_sifive_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	volatile struct pinmux_sifive_regs_t *pinmux = DEV_PINMUX(dev);
 
@@ -62,12 +62,12 @@ static int pinmux_sifive_get(struct device *dev, u32_t pin, u32_t *func)
 	return 0;
 }
 
-static int pinmux_sifive_pullup(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_sifive_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
 
-static int pinmux_sifive_input(struct device *dev, u32_t pin, u8_t func)
+static int pinmux_sifive_input(struct device *dev, uint32_t pin, uint8_t func)
 {
 	return -ENOTSUP;
 }
diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c
index fbe63fd697..01fd87ffd1 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.c
+++ b/drivers/pinmux/stm32/pinmux_stm32.c
@@ -30,7 +30,7 @@
 /* base address for where GPIO registers start */
 #define GPIO_PORTS_BASE       (GPIOA_BASE)
 
-static const u32_t ports_enable[STM32_PORTS_MAX] = {
+static const uint32_t ports_enable[STM32_PORTS_MAX] = {
 	STM32_PERIPH_GPIOA,
 	STM32_PERIPH_GPIOB,
 	STM32_PERIPH_GPIOC,
@@ -84,7 +84,7 @@ static const u32_t ports_enable[STM32_PORTS_MAX] = {
  *
  * @return 0 on success, error otherwise
  */
-static int enable_port(u32_t port, struct device *clk)
+static int enable_port(uint32_t port, struct device *clk)
 {
 	/* enable port clock */
 	if (!clk) {
@@ -106,13 +106,13 @@ static int enable_port(u32_t port, struct device *clk)
 static int stm32_pin_configure(int pin, int func, int altf)
 {
 	/* determine IO port registers location */
-	u32_t offset = STM32_PORT(pin) * GPIO_REG_SIZE;
-	u8_t *port_base = (u8_t *)(GPIO_PORTS_BASE + offset);
+	uint32_t offset = STM32_PORT(pin) * GPIO_REG_SIZE;
+	uint8_t *port_base = (uint8_t *)(GPIO_PORTS_BASE + offset);
 
 	/* not much here, on STM32F10x the alternate function is
 	 * controller by setting up GPIO pins in specific mode.
 	 */
-	return gpio_stm32_configure((u32_t *)port_base,
+	return gpio_stm32_configure((uint32_t *)port_base,
 				    STM32_PIN(pin), func, altf);
 }
 
@@ -125,7 +125,7 @@ static int stm32_pin_configure(int pin, int func, int altf)
  *
  * @return 0 on success, error otherwise
  */
-int z_pinmux_stm32_set(u32_t pin, u32_t func,
+int z_pinmux_stm32_set(uint32_t pin, uint32_t func,
 				struct device *clk)
 {
 	/* make sure to enable port clock first */
diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/stm32/pinmux_stm32.h
index fd5c4da6dc..fa5cebcfcb 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.h
+++ b/drivers/pinmux/stm32/pinmux_stm32.h
@@ -32,7 +32,7 @@ typedef int stm32_pin_func_t;
  * in @funcs array
  */
 struct stm32_pinmux_conf {
-	u32_t pin;                      /* pin ID */
+	uint32_t pin;                      /* pin ID */
 	const stm32_pin_func_t *funcs;  /* functions array, indexed with
 					 * (stm32_pin_alt_func - 1)
 					 */
@@ -77,7 +77,7 @@ clock_control_subsys_t stm32_get_port_clock(int port);
  * @param clk clock control device, for enabling/disabling clock gate
  * for the port
  */
-int z_pinmux_stm32_set(u32_t pin, u32_t func,
+int z_pinmux_stm32_set(uint32_t pin, uint32_t func,
 		      struct device *clk);
 
 /**
diff --git a/drivers/ps2/ps2_handlers.c b/drivers/ps2/ps2_handlers.c
index b5218ea0ec..4375273460 100644
--- a/drivers/ps2/ps2_handlers.c
+++ b/drivers/ps2/ps2_handlers.c
@@ -24,8 +24,8 @@ Z_SYSCALL_HANDLER(ps2_write, dev, value)
 Z_SYSCALL_HANDLER(ps2_read, dev, value)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_PS2(dev, read));
-	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(value, sizeof(u8_t)));
-	return z_impl_ps2_read((struct device *)dev, (u32_t *)value);
+	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(value, sizeof(uint8_t)));
+	return z_impl_ps2_read((struct device *)dev, (uint32_t *)value);
 }
 
 Z_SYSCALL_HANDLER(ps2_enable_callback)
diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c
index d4f92fdf6a..8517e36bc3 100644
--- a/drivers/ps2/ps2_mchp_xec.c
+++ b/drivers/ps2/ps2_mchp_xec.c
@@ -20,9 +20,9 @@ LOG_MODULE_REGISTER(ps2_mchp_xec);
 
 struct ps2_xec_config {
 	PS2_Type *base;
-	u8_t girq_id;
-	u8_t girq_bit;
-	u8_t isr_nvic;
+	uint8_t girq_id;
+	uint8_t girq_bit;
+	uint8_t isr_nvic;
 };
 
 struct ps2_xec_data {
@@ -36,7 +36,7 @@ static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr)
 	struct ps2_xec_data *data = dev->driver_data;
 	PS2_Type *base = config->base;
 
-	u8_t  __attribute__((unused)) dummy;
+	uint8_t  __attribute__((unused)) dummy;
 
 	if (!callback_isr) {
 		return -EINVAL;
@@ -67,14 +67,14 @@ static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr)
 }
 
 
-static int ps2_xec_write(struct device *dev, u8_t value)
+static int ps2_xec_write(struct device *dev, uint8_t value)
 {
 	const struct ps2_xec_config *config = dev->config_info;
 	struct ps2_xec_data *data = dev->driver_data;
 	PS2_Type *base = config->base;
 	int i = 0;
 
-	u8_t  __attribute__((unused)) dummy;
+	uint8_t  __attribute__((unused)) dummy;
 
 	if (k_sem_take(&data->tx_lock, K_NO_WAIT)) {
 		return -EACCES;
@@ -154,7 +154,7 @@ static void ps2_xec_isr(void *arg)
 	const struct ps2_xec_config *config = dev->config_info;
 	struct ps2_xec_data *data = dev->driver_data;
 	PS2_Type *base = config->base;
-	u32_t status;
+	uint32_t status;
 
 	MCHP_GIRQ_SRC(config->girq_id) = BIT(config->girq_bit);
 
diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c
index 901d878bb6..b60f4fa933 100644
--- a/drivers/pwm/pwm_dw.c
+++ b/drivers/pwm/pwm_dw.c
@@ -56,10 +56,10 @@
 
 struct pwm_dw_config {
 	/** Base address of registers */
-	u32_t	addr;
+	uint32_t	addr;
 
 	/** Number of ports */
-	u32_t	num_ports;
+	uint32_t	num_ports;
 };
 
 /**
@@ -70,7 +70,7 @@ struct pwm_dw_config {
  *
  * @return The base address of that particular timer
  */
-static inline int pwm_dw_timer_base_addr(struct device *dev, u32_t timer)
+static inline int pwm_dw_timer_base_addr(struct device *dev, uint32_t timer)
 {
 	const struct pwm_dw_config * const cfg =
 	    (const struct pwm_dw_config *)dev->config_info;
@@ -86,7 +86,7 @@ static inline int pwm_dw_timer_base_addr(struct device *dev, u32_t timer)
  *
  * @return The load count 2 address of that particular timer
  */
-static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, u32_t timer)
+static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, uint32_t timer)
 {
 	const struct pwm_dw_config * const cfg =
 	    (const struct pwm_dw_config *)dev->config_info;
@@ -95,10 +95,10 @@ static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, u32_t timer)
 }
 
 
-static int __set_one_port(struct device *dev, u32_t pwm,
-			  u32_t on, u32_t off)
+static int __set_one_port(struct device *dev, uint32_t pwm,
+			  uint32_t on, uint32_t off)
 {
-	u32_t reg_addr;
+	uint32_t reg_addr;
 
 	reg_addr = pwm_dw_timer_base_addr(dev, pwm);
 
@@ -140,13 +140,13 @@ static int __set_one_port(struct device *dev, u32_t pwm,
  * @return 0
  */
 static int pwm_dw_pin_set_cycles(struct device *dev,
-				 u32_t pwm, u32_t period_cycles,
-				 u32_t pulse_cycles, pwm_flags_t flags)
+				 uint32_t pwm, uint32_t period_cycles,
+				 uint32_t pulse_cycles, pwm_flags_t flags)
 {
 	const struct pwm_dw_config * const cfg =
 	    (const struct pwm_dw_config *)dev->config_info;
 	int i;
-	u32_t on, off;
+	uint32_t on, off;
 
 	/* make sure the PWM port exists */
 	if (pwm >= cfg->num_ports) {
diff --git a/drivers/pwm/pwm_handlers.c b/drivers/pwm/pwm_handlers.c
index 55498a6509..609e8150b8 100644
--- a/drivers/pwm/pwm_handlers.c
+++ b/drivers/pwm/pwm_handlers.c
@@ -7,8 +7,8 @@
 #include <syscall_handler.h>
 #include <drivers/pwm.h>
 
-static inline int z_vrfy_pwm_pin_set_cycles(struct device *dev, u32_t pwm,
-					    u32_t period, u32_t pulse,
+static inline int z_vrfy_pwm_pin_set_cycles(struct device *dev, uint32_t pwm,
+					    uint32_t period, uint32_t pulse,
 					    pwm_flags_t flags)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_PWM(dev, pin_set));
@@ -17,12 +17,12 @@ static inline int z_vrfy_pwm_pin_set_cycles(struct device *dev, u32_t pwm,
 }
 #include <syscalls/pwm_pin_set_cycles_mrsh.c>
 
-static inline int z_vrfy_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					       u64_t *cycles)
+static inline int z_vrfy_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					       uint64_t *cycles)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_PWM(dev, get_cycles_per_sec));
-	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(cycles, sizeof(u64_t)));
+	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(cycles, sizeof(uint64_t)));
 	return z_impl_pwm_get_cycles_per_sec((struct device *)dev,
-					    pwm, (u64_t *)cycles);
+					    pwm, (uint64_t *)cycles);
 }
 #include <syscalls/pwm_get_cycles_per_sec_mrsh.c>
diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c
index bdd4e07bc2..18bdeaf9e0 100644
--- a/drivers/pwm/pwm_imx.c
+++ b/drivers/pwm/pwm_imx.c
@@ -27,11 +27,11 @@ LOG_MODULE_REGISTER(pwm_imx);
 
 struct imx_pwm_config {
 	PWM_Type *base;
-	u16_t prescaler;
+	uint16_t prescaler;
 };
 
 struct imx_pwm_data {
-	u32_t period_cycles;
+	uint32_t period_cycles;
 };
 
 
@@ -40,8 +40,8 @@ static bool imx_pwm_is_enabled(PWM_Type *base)
 	return PWM_PWMCR_REG(base) & PWM_PWMCR_EN_MASK;
 }
 
-static int imx_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				       u64_t *cycles)
+static int imx_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				       uint64_t *cycles)
 {
 	PWM_Type *base = DEV_BASE(dev);
 	const struct imx_pwm_config *config = DEV_CFG(dev);
@@ -51,8 +51,8 @@ static int imx_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
-			   u32_t period_cycles, u32_t pulse_cycles,
+static int imx_pwm_pin_set(struct device *dev, uint32_t pwm,
+			   uint32_t period_cycles, uint32_t pulse_cycles,
 			   pwm_flags_t flags)
 {
 	PWM_Type *base = DEV_BASE(dev);
@@ -61,7 +61,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
 	unsigned int period_ms;
 	bool enabled = imx_pwm_is_enabled(base);
 	int wait_count = 0, fifoav;
-	u32_t cr, sr;
+	uint32_t cr, sr;
 
 
 	if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) {
diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c
index 2070f256b5..2bcfac5c72 100644
--- a/drivers/pwm/pwm_led_esp32.c
+++ b/drivers/pwm/pwm_led_esp32.c
@@ -44,23 +44,23 @@ enum {
 
 struct pwm_led_esp32_timer {
 	int freq;
-	u8_t bit_num;
+	uint8_t bit_num;
 } __attribute__ ((__packed__));
 
 struct pwm_led_esp32_channel {
-	u8_t timer : 2;
-	u8_t gpio : 6;
+	uint8_t timer : 2;
+	uint8_t gpio : 6;
 };
 
 union pwm_led_esp32_duty {
 	struct {
-		u32_t start: 1;
-		u32_t direction: 1;
-		u32_t num: 3;
-		u32_t cycle: 3;
-		u32_t scale: 3;
+		uint32_t start: 1;
+		uint32_t direction: 1;
+		uint32_t num: 3;
+		uint32_t cycle: 3;
+		uint32_t scale: 3;
 	};
-	u32_t val;
+	uint32_t val;
 };
 
 struct pwm_led_esp32_config {
@@ -80,12 +80,12 @@ struct pwm_led_esp32_config {
 /* TODO: Remove these functions after this PR:
  * https://github.com/zephyrproject-rtos/zephyr/pull/5113
  */
-static inline void set_mask32(u32_t v, u32_t mem_addr)
+static inline void set_mask32(uint32_t v, uint32_t mem_addr)
 {
 	sys_write32(sys_read32(mem_addr) | v, mem_addr);
 }
 
-static inline void clear_mask32(u32_t v, u32_t mem_addr)
+static inline void clear_mask32(uint32_t v, uint32_t mem_addr)
 {
 	sys_write32(sys_read32(mem_addr) & ~v, mem_addr);
 }
@@ -108,10 +108,10 @@ static const char *esp32_get_gpio_for_pin(int pin)
 }
 /* end Remove after PR 5113 */
 
-static u8_t pwm_led_esp32_get_gpio_config(u8_t pin,
+static uint8_t pwm_led_esp32_get_gpio_config(uint8_t pin,
 		const struct pwm_led_esp32_channel *ch_cfg)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < 16; i++) {
 		if (ch_cfg[i].gpio == pin) {
@@ -123,7 +123,7 @@ static u8_t pwm_led_esp32_get_gpio_config(u8_t pin,
 
 static void pwm_led_esp32_low_speed_update(int speed_mode, int channel)
 {
-	u32_t reg_addr;
+	uint32_t reg_addr;
 
 	if (speed_mode == PWM_LED_ESP32_LOW_SPEED) {
 		reg_addr = PWM_ESP32_LSCH_CONF0(channel);
@@ -133,8 +133,8 @@ static void pwm_led_esp32_low_speed_update(int speed_mode, int channel)
 
 static void pwm_led_esp32_update_duty(int speed_mode, int channel)
 {
-	u32_t conf0_addr;
-	u32_t conf1_addr;
+	uint32_t conf0_addr;
+	uint32_t conf1_addr;
 
 	if (speed_mode == PWM_LED_ESP32_HIGH_SPEED) {
 		conf0_addr = PWM_ESP32_HSCH_CONF0(channel);
@@ -155,10 +155,10 @@ static void pwm_led_esp32_duty_config(int speed_mode,
 				      int duty_val,
 				      union pwm_led_esp32_duty duty)
 {
-	volatile u32_t hpoint_addr;
-	volatile u32_t duty_addr;
-	volatile u32_t conf1_addr;
-	volatile u32_t conf1_val;
+	volatile uint32_t hpoint_addr;
+	volatile uint32_t duty_addr;
+	volatile uint32_t conf1_addr;
+	volatile uint32_t conf1_val;
 
 	if (speed_mode == PWM_LED_ESP32_HIGH_SPEED) {
 		hpoint_addr = PWM_ESP32_HSCH_HPOINT(channel);
@@ -194,7 +194,7 @@ static void pwm_led_esp32_bind_channel_timer(int speed_mode,
 					     int channel,
 					     int timer)
 {
-	volatile u32_t timer_addr;
+	volatile uint32_t timer_addr;
 
 	if (speed_mode == PWM_LED_ESP32_HIGH_SPEED) {
 		timer_addr = PWM_ESP32_HSCH_CONF0(channel);
@@ -215,7 +215,7 @@ static int pwm_led_esp32_channel_set(int pin, bool speed_mode, int channel,
 	const char *device_name;
 	struct device *gpio;
 	int ret;
-	u32_t sig_out_idx;
+	uint32_t sig_out_idx;
 
 	/* Set duty cycle */
 	pwm_led_esp32_duty_set(speed_mode, channel, duty);
@@ -253,10 +253,10 @@ static int pwm_led_esp32_channel_set(int pin, bool speed_mode, int channel,
 static int pwm_led_esp32_timer_set(int speed_mode, int timer,
 				   int bit_num, int frequency)
 {
-	u32_t timer_addr;
-	u64_t div_num;
+	uint32_t timer_addr;
+	uint64_t div_num;
 	int tick_sel = PWM_LED_ESP32_APB_CLK_FREQ;
-	u32_t precision = (0x1 << bit_num);
+	uint32_t precision = (0x1 << bit_num);
 
 	assert(frequency > 0);
 
@@ -264,7 +264,7 @@ static int pwm_led_esp32_timer_set(int speed_mode, int timer,
 	 * Manual chapter 13.2.2 Timers.
 	 * div_num is a fixed point value (Q10.8).
 	 */
-	div_num = ((u64_t) APB_CLK_FREQ << 8) / frequency / precision;
+	div_num = ((uint64_t) APB_CLK_FREQ << 8) / frequency / precision;
 
 	if (div_num < 0x100) {
 		/* Since Q10.8 is a fixed point value, then div_num < 0x100
@@ -277,7 +277,7 @@ static int pwm_led_esp32_timer_set(int speed_mode, int timer,
 		/* Since Q10.8 is a fixed point value, then div_num > 0x3FFFF
 		 * means divisor is too high. We can try to use the REF_TICK.
 		 */
-		div_num = ((u64_t) 1000000 << 8) / frequency / precision;
+		div_num = ((uint64_t) 1000000 << 8) / frequency / precision;
 		if (div_num < 0x100 || div_num > 0x3FFFF) {
 			return -EINVAL;
 		}
@@ -312,8 +312,8 @@ static int pwm_led_esp32_timer_set(int speed_mode, int timer,
 
 /* period_cycles is not used, set frequency on menuconfig instead. */
 static int pwm_led_esp32_pin_set_cycles(struct device *dev,
-					u32_t pwm, u32_t period_cycles,
-					u32_t pulse_cycles, pwm_flags_t flags)
+					uint32_t pwm, uint32_t period_cycles,
+					uint32_t pulse_cycles, pwm_flags_t flags)
 {
 	int speed_mode;
 	int channel;
@@ -365,8 +365,8 @@ static int pwm_led_esp32_pin_set_cycles(struct device *dev,
 	return ret;
 }
 
-static int pwm_led_esp32_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					    u64_t *cycles)
+static int pwm_led_esp32_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					    uint64_t *cycles)
 {
 	const struct pwm_led_esp32_config *config;
 	int channel;
diff --git a/drivers/pwm/pwm_litex.c b/drivers/pwm/pwm_litex.c
index a6ab4c9cee..6b359b04a8 100644
--- a/drivers/pwm/pwm_litex.c
+++ b/drivers/pwm/pwm_litex.c
@@ -17,25 +17,25 @@
 #define NUMBER_OF_CHANNELS        1
 
 struct pwm_litex_cfg {
-	u32_t reg_en_size;
-	u32_t reg_width_size;
-	u32_t reg_period_size;
-	volatile u32_t *reg_en;
-	volatile u32_t *reg_width;
-	volatile u32_t *reg_period;
+	uint32_t reg_en_size;
+	uint32_t reg_width_size;
+	uint32_t reg_period_size;
+	volatile uint32_t *reg_en;
+	volatile uint32_t *reg_width;
+	volatile uint32_t *reg_period;
 };
 
 #define GET_PWM_CFG(dev)				       \
 	((const struct pwm_litex_cfg *) dev->config_info)
 
-static void litex_set_reg(volatile u32_t *reg, u32_t reg_size, u32_t val)
+static void litex_set_reg(volatile uint32_t *reg, uint32_t reg_size, uint32_t val)
 {
-	u32_t shifted_data;
-	volatile u32_t *reg_addr;
+	uint32_t shifted_data;
+	volatile uint32_t *reg_addr;
 
 	for (int i = 0; i < reg_size; ++i) {
 		shifted_data = val >> ((reg_size - i - 1) * 8);
-		reg_addr = ((volatile u32_t *) reg) + i;
+		reg_addr = ((volatile uint32_t *) reg) + i;
 		*(reg_addr) = shifted_data;
 	}
 }
@@ -48,8 +48,8 @@ int pwm_litex_init(struct device *dev)
 	return 0;
 }
 
-int pwm_litex_pin_set(struct device *dev, u32_t pwm, u32_t period_cycles,
-		      u32_t pulse_cycles, pwm_flags_t flags)
+int pwm_litex_pin_set(struct device *dev, uint32_t pwm, uint32_t period_cycles,
+		      uint32_t pulse_cycles, pwm_flags_t flags)
 {
 	const struct pwm_litex_cfg *cfg = GET_PWM_CFG(dev);
 
@@ -65,7 +65,7 @@ int pwm_litex_pin_set(struct device *dev, u32_t pwm, u32_t period_cycles,
 	return 0;
 }
 
-int pwm_litex_get_cycles_per_sec(struct device *dev, u32_t pwm, u64_t *cycles)
+int pwm_litex_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles)
 {
 	if (pwm >= NUMBER_OF_CHANNELS) {
 		return -EINVAL;
@@ -90,15 +90,15 @@ static const struct pwm_driver_api pwm_litex_driver_api = {
 #define PWM_LITEX_INIT(n)						       \
 	static const struct pwm_litex_cfg pwm_litex_cfg_##n = {		       \
 		.reg_en =						       \
-		  (volatile u32_t *)                                           \
+		  (volatile uint32_t *)                                           \
 			DT_INST_REG_ADDR_BY_NAME(n, enable),           \
 		.reg_en_size = DT_INST_REG_SIZE_BY_NAME(n, enable) / 4,        \
 		.reg_width =						       \
-		  (volatile u32_t *)                                           \
+		  (volatile uint32_t *)                                           \
 			DT_INST_REG_ADDR_BY_NAME(n, width),            \
 		.reg_width_size = DT_INST_REG_SIZE_BY_NAME(n, width) / 4,      \
 		.reg_period  =						       \
-		  (volatile u32_t *)                                           \
+		  (volatile uint32_t *)                                           \
 			DT_INST_REG_ADDR_BY_NAME(n, period),           \
 		.reg_period_size = DT_INST_REG_SIZE_BY_NAME(n, period) / 4,    \
 	};								       \
diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c
index 2172c14247..7cf831c10a 100644
--- a/drivers/pwm/pwm_mchp_xec.c
+++ b/drivers/pwm/pwm_mchp_xec.c
@@ -43,7 +43,7 @@ LOG_MODULE_REGISTER(pwm_mchp_xec, CONFIG_PWM_LOG_LEVEL);
 #define XEC_PWM_FREQ_LIMIT	1 /* 0.1hz * XEC_PWM_FREQ_PF */
 
 struct pwm_xec_config {
-	u32_t base_address;
+	uint32_t base_address;
 };
 
 #define PWM_XEC_REG_BASE(_dev)				\
@@ -56,14 +56,14 @@ struct pwm_xec_config {
 	  _dev->config_info))
 
 struct xec_params {
-	u32_t on;
-	u32_t off;
-	u8_t div;
+	uint32_t on;
+	uint32_t off;
+	uint8_t div;
 };
 
 #define NUM_DIV_ELEMS		16
 
-u32_t max_freq_high_on_div[NUM_DIV_ELEMS] = {
+uint32_t max_freq_high_on_div[NUM_DIV_ELEMS] = {
 	48000000,
 	24000000,
 	16000000,
@@ -82,7 +82,7 @@ u32_t max_freq_high_on_div[NUM_DIV_ELEMS] = {
 	3000000
 };
 
-u32_t max_freq_low_on_div[NUM_DIV_ELEMS] = {
+uint32_t max_freq_low_on_div[NUM_DIV_ELEMS] = {
 	100000,
 	50000,
 	33333,
@@ -101,14 +101,14 @@ u32_t max_freq_low_on_div[NUM_DIV_ELEMS] = {
 	6250
 };
 
-static u32_t xec_compute_frequency(u32_t clk, u32_t on, u32_t off)
+static uint32_t xec_compute_frequency(uint32_t clk, uint32_t on, uint32_t off)
 {
 	return ((clk * XEC_PWM_FREQ_PF)/((on + 1) + (off + 1)));
 }
 
-static u16_t xec_select_div(u32_t freq, u32_t max_freq[16])
+static uint16_t xec_select_div(uint32_t freq, uint32_t max_freq[16])
 {
-	u8_t i;
+	uint8_t i;
 
 	if (freq >= max_freq[3]) {
 		return 0;
@@ -125,10 +125,10 @@ static u16_t xec_select_div(u32_t freq, u32_t max_freq[16])
 	return i;
 }
 
-static void xec_compute_on_off(u32_t freq, u32_t dc, u32_t clk,
-			       u32_t *on, u32_t *off)
+static void xec_compute_on_off(uint32_t freq, uint32_t dc, uint32_t clk,
+			       uint32_t *on, uint32_t *off)
 {
-	u64_t on_off;
+	uint64_t on_off;
 
 	on_off = (clk * 10) / freq;
 
@@ -136,22 +136,22 @@ static void xec_compute_on_off(u32_t freq, u32_t dc, u32_t clk,
 	*off = on_off - *on - 2;
 }
 
-static u32_t xec_compute_dc(u32_t on, u32_t off)
+static uint32_t xec_compute_dc(uint32_t on, uint32_t off)
 {
 	int dc = (on + 1) + (off + 1);
 
-	/* Make calculation in u64_t since XEC_PWM_DC_PF is large */
-	dc = (((u64_t)(on + 1) * XEC_PWM_DC_PF) / dc);
+	/* Make calculation in uint64_t since XEC_PWM_DC_PF is large */
+	dc = (((uint64_t)(on + 1) * XEC_PWM_DC_PF) / dc);
 
-	return (u32_t)dc;
+	return (uint32_t)dc;
 }
 
-static u16_t xec_compare_div_on_off(u32_t target_freq, u32_t dc,
-				    u32_t max_freq[16],
-				    u8_t div_a, u8_t div_b,
-				    u32_t *on_a, u32_t *off_a)
+static uint16_t xec_compare_div_on_off(uint32_t target_freq, uint32_t dc,
+				    uint32_t max_freq[16],
+				    uint8_t div_a, uint8_t div_b,
+				    uint32_t *on_a, uint32_t *off_a)
 {
-	u32_t freq_a, freq_b, on_b, off_b;
+	uint32_t freq_a, freq_b, on_b, off_b;
 
 	xec_compute_on_off(target_freq, dc, max_freq[div_a],
 			   on_a, off_a);
@@ -179,12 +179,12 @@ static u16_t xec_compare_div_on_off(u32_t target_freq, u32_t dc,
 	return div_a;
 }
 
-static u8_t xec_select_best_div_on_off(u32_t target_freq, u32_t dc,
-					u32_t max_freq[16],
-					u32_t *on, u32_t *off)
+static uint8_t xec_select_best_div_on_off(uint32_t target_freq, uint32_t dc,
+					uint32_t max_freq[16],
+					uint32_t *on, uint32_t *off)
 {
 	int div_comp;
-	u8_t div;
+	uint8_t div;
 
 	div = xec_select_div(target_freq, max_freq);
 
@@ -196,13 +196,13 @@ static u8_t xec_select_best_div_on_off(u32_t target_freq, u32_t dc,
 	return div;
 }
 
-static struct xec_params *xec_compare_params(u32_t target_freq,
+static struct xec_params *xec_compare_params(uint32_t target_freq,
 					     struct xec_params *hc_params,
 					     struct xec_params *lc_params)
 {
 	struct xec_params *params;
-	u32_t freq_h = 0;
-	u32_t freq_l = 0;
+	uint32_t freq_h = 0;
+	uint32_t freq_l = 0;
 
 	if (hc_params->div < NUM_DIV_ELEMS) {
 		freq_h = xec_compute_frequency(
@@ -234,15 +234,15 @@ static struct xec_params *xec_compare_params(u32_t target_freq,
 }
 
 static void xec_compute_and_set_parameters(struct device *dev,
-					   u32_t target_freq,
-					   u32_t on, u32_t off)
+					   uint32_t target_freq,
+					   uint32_t on, uint32_t off)
 {
 	PWM_Type *pwm_regs = PWM_XEC_REG_BASE(dev);
 	bool compute_high, compute_low;
 	struct xec_params hc_params;
 	struct xec_params lc_params;
 	struct xec_params *params;
-	u32_t dc, reg;
+	uint32_t dc, reg;
 
 	dc = xec_compute_dc(on, off);
 
@@ -306,13 +306,13 @@ done:
 	pwm_regs->CONFIG = reg;
 }
 
-static int pwm_xec_pin_set(struct device *dev, u32_t pwm,
-			   u32_t period_cycles, u32_t pulse_cycles,
+static int pwm_xec_pin_set(struct device *dev, uint32_t pwm,
+			   uint32_t period_cycles, uint32_t pulse_cycles,
 			   pwm_flags_t flags)
 {
 	PWM_Type *pwm_regs = PWM_XEC_REG_BASE(dev);
-	u32_t target_freq;
-	u32_t on, off;
+	uint32_t target_freq;
+	uint32_t on, off;
 
 	if (pwm > 0) {
 		return -EIO;
@@ -351,8 +351,8 @@ static int pwm_xec_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int pwm_xec_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				      u64_t *cycles)
+static int pwm_xec_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				      uint64_t *cycles)
 {
 	ARG_UNUSED(dev);
 
diff --git a/drivers/pwm/pwm_mcux.c b/drivers/pwm/pwm_mcux.c
index ea85892aa4..fd288ce5d4 100644
--- a/drivers/pwm/pwm_mcux.c
+++ b/drivers/pwm/pwm_mcux.c
@@ -31,13 +31,13 @@ struct pwm_mcux_data {
 	pwm_signal_param_t channel[CHANNEL_COUNT];
 };
 
-static int mcux_pwm_pin_set(struct device *dev, u32_t pwm,
-			    u32_t period_cycles, u32_t pulse_cycles,
+static int mcux_pwm_pin_set(struct device *dev, uint32_t pwm,
+			    uint32_t period_cycles, uint32_t pulse_cycles,
 			    pwm_flags_t flags)
 {
 	const struct pwm_mcux_config *config = dev->config_info;
 	struct pwm_mcux_data *data = dev->driver_data;
-	u8_t duty_cycle;
+	uint8_t duty_cycle;
 
 	if (pwm >= CHANNEL_COUNT) {
 		LOG_ERR("Invalid channel");
@@ -108,8 +108,8 @@ static int mcux_pwm_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int mcux_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				       u64_t *cycles)
+static int mcux_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				       uint64_t *cycles)
 {
 	const struct pwm_mcux_config *config = dev->config_info;
 
diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c
index c2b20600ad..e4456c6e3b 100644
--- a/drivers/pwm/pwm_mcux_ftm.c
+++ b/drivers/pwm/pwm_mcux_ftm.c
@@ -25,18 +25,18 @@ struct mcux_ftm_config {
 	clock_control_subsys_t clock_subsys;
 	ftm_clock_source_t ftm_clock_source;
 	ftm_clock_prescale_t prescale;
-	u8_t channel_count;
+	uint8_t channel_count;
 	ftm_pwm_mode_t mode;
 };
 
 struct mcux_ftm_data {
-	u32_t clock_freq;
-	u32_t period_cycles;
+	uint32_t clock_freq;
+	uint32_t period_cycles;
 	ftm_chnl_pwm_config_param_t channel[MAX_CHANNELS];
 };
 
-static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
-			    u32_t period_cycles, u32_t pulse_cycles,
+static int mcux_ftm_pin_set(struct device *dev, uint32_t pwm,
+			    uint32_t period_cycles, uint32_t pulse_cycles,
 			    pwm_flags_t flags)
 {
 	const struct mcux_ftm_config *config = dev->config_info;
@@ -95,8 +95,8 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int mcux_ftm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				       u64_t *cycles)
+static int mcux_ftm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				       uint64_t *cycles)
 {
 	const struct mcux_ftm_config *config = dev->config_info;
 	struct mcux_ftm_data *data = dev->driver_data;
diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c
index 99495bd5ea..6bcf7c0445 100644
--- a/drivers/pwm/pwm_mcux_tpm.c
+++ b/drivers/pwm/pwm_mcux_tpm.c
@@ -29,23 +29,23 @@ struct mcux_tpm_config {
 	clock_control_subsys_t clock_subsys;
 	tpm_clock_source_t tpm_clock_source;
 	tpm_clock_prescale_t prescale;
-	u8_t channel_count;
+	uint8_t channel_count;
 	tpm_pwm_mode_t mode;
 };
 
 struct mcux_tpm_data {
-	u32_t clock_freq;
-	u32_t period_cycles;
+	uint32_t clock_freq;
+	uint32_t period_cycles;
 	tpm_chnl_pwm_signal_param_t channel[MAX_CHANNELS];
 };
 
-static int mcux_tpm_pin_set(struct device *dev, u32_t pwm,
-			      u32_t period_cycles, u32_t pulse_cycles,
+static int mcux_tpm_pin_set(struct device *dev, uint32_t pwm,
+			      uint32_t period_cycles, uint32_t pulse_cycles,
 			      pwm_flags_t flags)
 {
 	const struct mcux_tpm_config *config = dev->config_info;
 	struct mcux_tpm_data *data = dev->driver_data;
-	u8_t duty_cycle;
+	uint8_t duty_cycle;
 
 	if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) {
 		LOG_ERR("Invalid combination: period_cycles=%d, "
@@ -71,7 +71,7 @@ static int mcux_tpm_pin_set(struct device *dev, u32_t pwm,
 		pulse_cycles, period_cycles, duty_cycle, flags);
 
 	if (period_cycles != data->period_cycles) {
-		u32_t pwm_freq;
+		uint32_t pwm_freq;
 		status_t status;
 
 		if (data->period_cycles != 0) {
@@ -116,8 +116,8 @@ static int mcux_tpm_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int mcux_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					 u64_t *cycles)
+static int mcux_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					 uint64_t *cycles)
 {
 	const struct mcux_tpm_config *config = dev->config_info;
 	struct mcux_tpm_data *data = dev->driver_data;
diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c
index bc64e21a9c..b9700f64b5 100644
--- a/drivers/pwm/pwm_nrf5_sw.c
+++ b/drivers/pwm/pwm_nrf5_sw.c
@@ -26,27 +26,27 @@ LOG_MODULE_REGISTER(pwm_nrf5_sw);
 
 struct pwm_config {
 	NRF_TIMER_Type *timer;
-	u8_t gpiote_base;
-	u8_t ppi_base;
-	u8_t map_size;
-	u8_t prescaler;
+	uint8_t gpiote_base;
+	uint8_t ppi_base;
+	uint8_t map_size;
+	uint8_t prescaler;
 };
 
 struct chan_map {
-	u32_t pwm;
-	u32_t pulse_cycles;
+	uint32_t pwm;
+	uint32_t pulse_cycles;
 };
 
 struct pwm_data {
-	u32_t period_cycles;
+	uint32_t period_cycles;
 	struct chan_map map[PWM_0_MAP_SIZE];
 };
 
-static u32_t pwm_period_check(struct pwm_data *data, u8_t map_size,
-				 u32_t pwm, u32_t period_cycles,
-				 u32_t pulse_cycles)
+static uint32_t pwm_period_check(struct pwm_data *data, uint8_t map_size,
+				 uint32_t pwm, uint32_t period_cycles,
+				 uint32_t pulse_cycles)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* allow 0% and 100% duty cycle, as it does not use PWM. */
 	if ((pulse_cycles == 0U) || (pulse_cycles == period_cycles)) {
@@ -65,10 +65,10 @@ static u32_t pwm_period_check(struct pwm_data *data, u8_t map_size,
 	return 0;
 }
 
-static u8_t pwm_channel_map(struct pwm_data *data, u8_t map_size,
-			       u32_t pwm)
+static uint8_t pwm_channel_map(struct pwm_data *data, uint8_t map_size,
+			       uint32_t pwm)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* find pin, if already present */
 	for (i = 0U; i < map_size; i++) {
@@ -88,17 +88,17 @@ static u8_t pwm_channel_map(struct pwm_data *data, u8_t map_size,
 	return i;
 }
 
-static int pwm_nrf5_sw_pin_set(struct device *dev, u32_t pwm,
-			       u32_t period_cycles, u32_t pulse_cycles,
+static int pwm_nrf5_sw_pin_set(struct device *dev, uint32_t pwm,
+			       uint32_t period_cycles, uint32_t pulse_cycles,
 			       pwm_flags_t flags)
 {
 	const struct pwm_config *config;
 	NRF_TIMER_Type *timer;
 	struct pwm_data *data;
-	u8_t ppi_index;
-	u8_t channel;
-	u16_t div;
-	u32_t ret;
+	uint8_t ppi_index;
+	uint8_t channel;
+	uint16_t div;
+	uint32_t ret;
 
 	config = (const struct pwm_config *)dev->config_info;
 	timer = config->timer;
@@ -172,14 +172,14 @@ static int pwm_nrf5_sw_pin_set(struct device *dev, u32_t pwm,
 							    (pwm << 8);
 
 	/* setup PPI */
-	NRF_PPI->CH[ppi_index].EEP = (u32_t)
+	NRF_PPI->CH[ppi_index].EEP = (uint32_t)
 				     &(timer->EVENTS_COMPARE[channel]);
-	NRF_PPI->CH[ppi_index].TEP = (u32_t)
+	NRF_PPI->CH[ppi_index].TEP = (uint32_t)
 				     &(NRF_GPIOTE->TASKS_OUT[channel]);
-	NRF_PPI->CH[ppi_index + 1].EEP = (u32_t)
+	NRF_PPI->CH[ppi_index + 1].EEP = (uint32_t)
 					 &(timer->EVENTS_COMPARE[
 							 config->map_size]);
-	NRF_PPI->CH[ppi_index + 1].TEP = (u32_t)
+	NRF_PPI->CH[ppi_index + 1].TEP = (uint32_t)
 					 &(NRF_GPIOTE->TASKS_OUT[channel]);
 	NRF_PPI->CHENSET = BIT(ppi_index) | BIT(ppi_index + 1);
 
@@ -213,8 +213,8 @@ pin_set_pwm_off:
 	return 0;
 }
 
-static int pwm_nrf5_sw_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					  u64_t *cycles)
+static int pwm_nrf5_sw_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					  uint64_t *cycles)
 {
 	const struct pwm_config *config;
 
diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index dc402b8de8..868625af14 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -25,21 +25,21 @@ struct pwm_nrfx_config {
 };
 
 struct pwm_nrfx_data {
-	u32_t period_cycles;
-	u16_t current[NRF_PWM_CHANNEL_COUNT];
-	u16_t countertop;
-	u8_t  prescaler;
+	uint32_t period_cycles;
+	uint16_t current[NRF_PWM_CHANNEL_COUNT];
+	uint16_t countertop;
+	uint8_t  prescaler;
 };
 
 
 static int pwm_period_check_and_set(const struct pwm_nrfx_config *config,
 				    struct pwm_nrfx_data *data,
-				    u32_t channel,
-				    u32_t period_cycles)
+				    uint32_t channel,
+				    uint32_t period_cycles)
 {
-	u8_t i;
-	u8_t prescaler;
-	u32_t countertop;
+	uint8_t i;
+	uint8_t prescaler;
+	uint32_t countertop;
 
 	/* If any other channel (other than the one being configured) is set up
 	 * with a non-zero pulse cycle, the period that is currently set cannot
@@ -47,7 +47,7 @@ static int pwm_period_check_and_set(const struct pwm_nrfx_config *config,
 	 */
 	for (i = 0; i < NRF_PWM_CHANNEL_COUNT; ++i) {
 		if (i != channel) {
-			u16_t channel_pulse_cycle =
+			uint16_t channel_pulse_cycle =
 				data->current[i]
 				& PWM_NRFX_CH_PULSE_CYCLES_MASK;
 			if (channel_pulse_cycle > 0) {
@@ -66,7 +66,7 @@ static int pwm_period_check_and_set(const struct pwm_nrfx_config *config,
 		if (countertop <= PWM_COUNTERTOP_COUNTERTOP_Msk) {
 			data->period_cycles = period_cycles;
 			data->prescaler     = prescaler;
-			data->countertop    = (u16_t)countertop;
+			data->countertop    = (uint16_t)countertop;
 
 			nrf_pwm_configure(config->pwm.p_registers,
 					  data->prescaler,
@@ -83,9 +83,9 @@ static int pwm_period_check_and_set(const struct pwm_nrfx_config *config,
 	return -EINVAL;
 }
 
-static u8_t pwm_channel_map(const uint8_t *output_pins, u32_t pwm)
+static uint8_t pwm_channel_map(const uint8_t *output_pins, uint32_t pwm)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* Find pin, return channel number */
 	for (i = 0U; i < NRF_PWM_CHANNEL_COUNT; i++) {
@@ -99,19 +99,19 @@ static u8_t pwm_channel_map(const uint8_t *output_pins, u32_t pwm)
 	return NRF_PWM_CHANNEL_COUNT;
 }
 
-static bool pwm_channel_is_active(u8_t channel,
+static bool pwm_channel_is_active(uint8_t channel,
 				  const struct pwm_nrfx_data *data)
 {
-	u16_t pulse_cycle =
+	uint16_t pulse_cycle =
 		data->current[channel] & PWM_NRFX_CH_PULSE_CYCLES_MASK;
 
 	return (pulse_cycle > 0 && pulse_cycle < data->countertop);
 }
 
-static bool any_other_channel_is_active(u8_t channel,
+static bool any_other_channel_is_active(uint8_t channel,
 					const struct pwm_nrfx_data *data)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0; i < NRF_PWM_CHANNEL_COUNT; ++i) {
 		if (i != channel && pwm_channel_is_active(i, data)) {
@@ -122,8 +122,8 @@ static bool any_other_channel_is_active(u8_t channel,
 	return false;
 }
 
-static int pwm_nrfx_pin_set(struct device *dev, u32_t pwm,
-			    u32_t period_cycles, u32_t pulse_cycles,
+static int pwm_nrfx_pin_set(struct device *dev, uint32_t pwm,
+			    uint32_t period_cycles, uint32_t pulse_cycles,
 			    pwm_flags_t flags)
 {
 	/* We assume here that period_cycles will always be 16MHz
@@ -133,7 +133,7 @@ static int pwm_nrfx_pin_set(struct device *dev, u32_t pwm,
 	 */
 	const struct pwm_nrfx_config *config = dev->config_info;
 	struct pwm_nrfx_data *data = dev->driver_data;
-	u8_t channel;
+	uint8_t channel;
 	bool was_stopped;
 
 	if (flags) {
@@ -248,8 +248,8 @@ static int pwm_nrfx_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int pwm_nrfx_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				       u64_t *cycles)
+static int pwm_nrfx_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				       uint64_t *cycles)
 {
 	/* TODO: Since this function might be removed, we will always return
 	 * 16MHz from this function and handle the conversion with prescaler,
@@ -290,8 +290,8 @@ static void pwm_nrfx_uninit(struct device *dev)
 	nrfx_pwm_uninit(&config->pwm);
 }
 
-static int pwm_nrfx_set_power_state(u32_t new_state,
-				    u32_t current_state,
+static int pwm_nrfx_set_power_state(uint32_t new_state,
+				    uint32_t current_state,
 				    struct device *dev)
 {
 	int err = 0;
@@ -316,14 +316,14 @@ static int pwm_nrfx_set_power_state(u32_t new_state,
 }
 
 static int pwm_nrfx_pm_control(struct device *dev,
-			       u32_t ctrl_command,
+			       uint32_t ctrl_command,
 			       void *context,
-			       u32_t *current_state)
+			       uint32_t *current_state)
 {
 	int err = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != (*current_state)) {
 			err = pwm_nrfx_set_power_state(new_state,
@@ -335,7 +335,7 @@ static int pwm_nrfx_pm_control(struct device *dev,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = (*current_state);
+		*((uint32_t *)context) = (*current_state);
 	}
 
 	return err;
@@ -343,12 +343,12 @@ static int pwm_nrfx_pm_control(struct device *dev,
 
 #define PWM_NRFX_PM_CONTROL(idx)					\
 	static int pwm_##idx##_nrfx_pm_control(struct device *dev,	\
-					       u32_t ctrl_command,	\
+					       uint32_t ctrl_command,	\
 					       void *context,		\
 					       device_pm_cb cb,		\
 					       void *arg)		\
 	{								\
-		static u32_t current_state = DEVICE_PM_ACTIVE_STATE;	\
+		static uint32_t current_state = DEVICE_PM_ACTIVE_STATE;	\
 		int ret = 0;                                            \
 		ret = pwm_nrfx_pm_control(dev, ctrl_command, context,	\
 					   &current_state);		\
diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c
index ac1ec89333..5f75fe7787 100644
--- a/drivers/pwm/pwm_pca9685.c
+++ b/drivers/pwm/pwm_pca9685.c
@@ -60,8 +60,8 @@ static inline int has_i2c_master(struct device *dev)
  * period_count is always taken as 4095. To control the on period send
  * value to pulse_count
  */
-static int pwm_pca9685_pin_set_cycles(struct device *dev, u32_t pwm,
-				      u32_t period_count, u32_t pulse_count,
+static int pwm_pca9685_pin_set_cycles(struct device *dev, uint32_t pwm,
+				      uint32_t period_count, uint32_t pulse_count,
 				      pwm_flags_t flags)
 {
 	const struct pwm_pca9685_config * const config =
@@ -69,8 +69,8 @@ static int pwm_pca9685_pin_set_cycles(struct device *dev, u32_t pwm,
 	struct pwm_pca9685_drv_data * const drv_data =
 		(struct pwm_pca9685_drv_data * const)dev->driver_data;
 	struct device * const i2c_master = drv_data->i2c_master;
-	u16_t i2c_addr = config->i2c_slave_addr;
-	u8_t buf[] = { 0, 0, 0, 0, 0};
+	uint16_t i2c_addr = config->i2c_slave_addr;
+	uint8_t buf[] = { 0, 0, 0, 0, 0};
 
 	ARG_UNUSED(period_count);
 	if (!has_i2c_master(dev)) {
@@ -132,7 +132,7 @@ int pwm_pca9685_init(struct device *dev)
 	struct pwm_pca9685_drv_data * const drv_data =
 		(struct pwm_pca9685_drv_data * const)dev->driver_data;
 	struct device *i2c_master;
-	u8_t buf[] = {0, 0};
+	uint8_t buf[] = {0, 0};
 	int ret;
 
 	/* Find out the device struct of the I2C master */
diff --git a/drivers/pwm/pwm_pca9685.h b/drivers/pwm/pwm_pca9685.h
index d3eb15ec0b..354009dc10 100644
--- a/drivers/pwm/pwm_pca9685.h
+++ b/drivers/pwm/pwm_pca9685.h
@@ -32,8 +32,8 @@ struct pwm_pca9685_config {
 	const char * const i2c_master_dev_name;
 
 	/** The slave address of the chip */
-	u16_t i2c_slave_addr;
-	u8_t stride[2];
+	uint16_t i2c_slave_addr;
+	uint8_t stride[2];
 };
 
 /** Runtime driver data */
diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c
index 2cdf26a346..8acce49287 100644
--- a/drivers/pwm/pwm_rv32m1_tpm.c
+++ b/drivers/pwm/pwm_rv32m1_tpm.c
@@ -28,23 +28,23 @@ struct rv32m1_tpm_config {
 	clock_control_subsys_t clock_subsys;
 	tpm_clock_source_t tpm_clock_source;
 	tpm_clock_prescale_t prescale;
-	u8_t channel_count;
+	uint8_t channel_count;
 	tpm_pwm_mode_t mode;
 };
 
 struct rv32m1_tpm_data {
-	u32_t clock_freq;
-	u32_t period_cycles;
+	uint32_t clock_freq;
+	uint32_t period_cycles;
 	tpm_chnl_pwm_signal_param_t channel[MAX_CHANNELS];
 };
 
-static int rv32m1_tpm_pin_set(struct device *dev, u32_t pwm,
-			      u32_t period_cycles, u32_t pulse_cycles,
+static int rv32m1_tpm_pin_set(struct device *dev, uint32_t pwm,
+			      uint32_t period_cycles, uint32_t pulse_cycles,
 			      pwm_flags_t flags)
 {
 	const struct rv32m1_tpm_config *config = dev->config_info;
 	struct rv32m1_tpm_data *data = dev->driver_data;
-	u8_t duty_cycle;
+	uint8_t duty_cycle;
 
 	if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) {
 		LOG_ERR("Invalid combination: period_cycles=%d, "
@@ -70,7 +70,7 @@ static int rv32m1_tpm_pin_set(struct device *dev, u32_t pwm,
 		pulse_cycles, period_cycles, duty_cycle, flags);
 
 	if (period_cycles != data->period_cycles) {
-		u32_t pwm_freq;
+		uint32_t pwm_freq;
 		status_t status;
 
 		if (data->period_cycles != 0) {
@@ -115,8 +115,8 @@ static int rv32m1_tpm_pin_set(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					 u64_t *cycles)
+static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					 uint64_t *cycles)
 {
 	const struct rv32m1_tpm_config *config = dev->config_info;
 	struct rv32m1_tpm_data *data = dev->driver_data;
diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c
index 0ef7233a74..e2286395d0 100644
--- a/drivers/pwm/pwm_sam.c
+++ b/drivers/pwm/pwm_sam.c
@@ -17,19 +17,19 @@ LOG_MODULE_REGISTER(pwm_sam);
 
 struct sam_pwm_config {
 	Pwm *regs;
-	u32_t id;
-	u8_t prescaler;
-	u8_t divider;
+	uint32_t id;
+	uint8_t prescaler;
+	uint8_t divider;
 };
 
 #define DEV_CFG(dev) \
 	((const struct sam_pwm_config * const)(dev)->config_info)
 
-static int sam_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				      u64_t *cycles)
+static int sam_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				      uint64_t *cycles)
 {
-	u8_t prescaler = DEV_CFG(dev)->prescaler;
-	u8_t divider = DEV_CFG(dev)->divider;
+	uint8_t prescaler = DEV_CFG(dev)->prescaler;
+	uint8_t divider = DEV_CFG(dev)->divider;
 
 	*cycles = SOC_ATMEL_SAM_MCK_FREQ_HZ /
 		  ((1 << prescaler) * divider);
@@ -37,8 +37,8 @@ static int sam_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
 	return 0;
 }
 
-static int sam_pwm_pin_set(struct device *dev, u32_t ch,
-			   u32_t period_cycles, u32_t pulse_cycles,
+static int sam_pwm_pin_set(struct device *dev, uint32_t ch,
+			   uint32_t period_cycles, uint32_t pulse_cycles,
 			   pwm_flags_t flags)
 {
 	Pwm *const pwm = DEV_CFG(dev)->regs;
@@ -78,9 +78,9 @@ static int sam_pwm_pin_set(struct device *dev, u32_t ch,
 static int sam_pwm_init(struct device *dev)
 {
 	Pwm *const pwm = DEV_CFG(dev)->regs;
-	u32_t id = DEV_CFG(dev)->id;
-	u8_t prescaler = DEV_CFG(dev)->prescaler;
-	u8_t divider = DEV_CFG(dev)->divider;
+	uint32_t id = DEV_CFG(dev)->id;
+	uint8_t prescaler = DEV_CFG(dev)->prescaler;
+	uint8_t divider = DEV_CFG(dev)->divider;
 
 	/* FIXME: way to validate prescaler & divider */
 
diff --git a/drivers/pwm/pwm_shell.c b/drivers/pwm/pwm_shell.c
index 6e6313cc18..8e05306b5e 100644
--- a/drivers/pwm/pwm_shell.c
+++ b/drivers/pwm/pwm_shell.c
@@ -14,11 +14,11 @@
 #include <stdlib.h>
 
 struct args_index {
-	u8_t device;
-	u8_t pwm;
-	u8_t period;
-	u8_t pulse;
-	u8_t flags;
+	uint8_t device;
+	uint8_t pwm;
+	uint8_t period;
+	uint8_t pulse;
+	uint8_t flags;
 };
 
 static const struct args_index args_indx = {
@@ -33,9 +33,9 @@ static int cmd_cycles(const struct shell *shell, size_t argc, char **argv)
 {
 	pwm_flags_t flags = 0;
 	struct device *dev;
-	u32_t period;
-	u32_t pulse;
-	u32_t pwm;
+	uint32_t period;
+	uint32_t pulse;
+	uint32_t pwm;
 	int err;
 
 	dev = device_get_binding(argv[args_indx.device]);
@@ -66,9 +66,9 @@ static int cmd_usec(const struct shell *shell, size_t argc, char **argv)
 {
 	pwm_flags_t flags = 0;
 	struct device *dev;
-	u32_t period;
-	u32_t pulse;
-	u32_t pwm;
+	uint32_t period;
+	uint32_t pulse;
+	uint32_t pwm;
 	int err;
 
 	dev = device_get_binding(argv[args_indx.device]);
@@ -98,9 +98,9 @@ static int cmd_nsec(const struct shell *shell, size_t argc, char **argv)
 {
 	pwm_flags_t flags = 0;
 	struct device *dev;
-	u32_t period;
-	u32_t pulse;
-	u32_t pwm;
+	uint32_t period;
+	uint32_t pulse;
+	uint32_t pwm;
 	int err;
 
 	dev = device_get_binding(argv[args_indx.device]);
diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c
index 0139afd6e7..d454ad6214 100644
--- a/drivers/pwm/pwm_sifive.c
+++ b/drivers/pwm/pwm_sifive.c
@@ -49,16 +49,16 @@ LOG_MODULE_REGISTER(pwm_sifive, CONFIG_PWM_LOG_LEVEL);
 struct pwm_sifive_data {};
 
 struct pwm_sifive_cfg {
-	u32_t base;
-	u32_t f_sys;
-	u32_t cmpwidth;
+	uint32_t base;
+	uint32_t f_sys;
+	uint32_t cmpwidth;
 };
 
 /* Helper Functions */
 
-static inline void sys_set_mask(mem_addr_t addr, u32_t mask, u32_t value)
+static inline void sys_set_mask(mem_addr_t addr, uint32_t mask, uint32_t value)
 {
-	u32_t temp = sys_read32(addr);
+	uint32_t temp = sys_read32(addr);
 
 	temp &= ~(mask);
 	temp |= value;
@@ -96,15 +96,15 @@ static int pwm_sifive_init(struct device *dev)
 }
 
 static int pwm_sifive_pin_set(struct device *dev,
-			      u32_t pwm,
-			      u32_t period_cycles,
-			      u32_t pulse_cycles,
+			      uint32_t pwm,
+			      uint32_t period_cycles,
+			      uint32_t pulse_cycles,
 			      pwm_flags_t flags)
 {
 	const struct pwm_sifive_cfg *config = NULL;
-	u32_t count_max = 0U;
-	u32_t max_cmp_val = 0U;
-	u32_t pwmscale = 0U;
+	uint32_t count_max = 0U;
+	uint32_t max_cmp_val = 0U;
+	uint32_t pwmscale = 0U;
 
 	if (dev == NULL) {
 		LOG_ERR("The device instance pointer was NULL\n");
@@ -189,8 +189,8 @@ static int pwm_sifive_pin_set(struct device *dev,
 }
 
 static int pwm_sifive_get_cycles_per_sec(struct device *dev,
-					 u32_t pwm,
-					 u64_t *cycles)
+					 uint32_t pwm,
+					 uint64_t *cycles)
 {
 	const struct pwm_sifive_cfg *config;
 
diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c
index c6f1ccc87d..b568fda6b7 100644
--- a/drivers/pwm/pwm_stm32.c
+++ b/drivers/pwm/pwm_stm32.c
@@ -31,11 +31,11 @@ LOG_MODULE_REGISTER(pwm_stm32);
 
 #define CHANNEL_LENGTH 4
 
-static u32_t __get_tim_clk(u32_t bus_clk,
+static uint32_t __get_tim_clk(uint32_t bus_clk,
 			      clock_control_subsys_t *sub_system)
 {
 	struct stm32_pclken *pclken = (struct stm32_pclken *)(sub_system);
-	u32_t tim_clk, apb_psc;
+	uint32_t tim_clk, apb_psc;
 
 #if defined(CONFIG_SOC_SERIES_STM32H7X)
 	if (pclken->bus == STM32_CLOCK_BUS_APB1) {
@@ -107,14 +107,14 @@ static u32_t __get_tim_clk(u32_t bus_clk,
  *
  * return 0, or negative errno code
  */
-static int pwm_stm32_pin_set(struct device *dev, u32_t pwm,
-			     u32_t period_cycles, u32_t pulse_cycles,
+static int pwm_stm32_pin_set(struct device *dev, uint32_t pwm,
+			     uint32_t period_cycles, uint32_t pulse_cycles,
 			     pwm_flags_t flags)
 {
 	struct pwm_stm32_data *data = DEV_DATA(dev);
 	TIM_HandleTypeDef *TimerHandle = &data->hpwm;
 	TIM_OC_InitTypeDef sConfig;
-	u32_t channel;
+	uint32_t channel;
 	bool counter_32b;
 
 	if (period_cycles == 0U || pulse_cycles > period_cycles) {
@@ -194,12 +194,12 @@ static int pwm_stm32_pin_set(struct device *dev, u32_t pwm,
  *
  * return 0, or negative errno code
  */
-static int pwm_stm32_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					u64_t *cycles)
+static int pwm_stm32_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					uint64_t *cycles)
 {
 	const struct pwm_stm32_config *cfg = DEV_CFG(dev);
 	struct pwm_stm32_data *data = DEV_DATA(dev);
-	u32_t bus_clk, tim_clk;
+	uint32_t bus_clk, tim_clk;
 
 	if (cycles == NULL) {
 		return -EINVAL;
@@ -215,7 +215,7 @@ static int pwm_stm32_get_cycles_per_sec(struct device *dev, u32_t pwm,
 	tim_clk = __get_tim_clk(bus_clk,
 			(clock_control_subsys_t *)&cfg->pclken);
 
-	*cycles = (u64_t)(tim_clk / (data->pwm_prescaler + 1));
+	*cycles = (uint64_t)(tim_clk / (data->pwm_prescaler + 1));
 
 	return 0;
 }
diff --git a/drivers/pwm/pwm_stm32.h b/drivers/pwm/pwm_stm32.h
index 7d66685a80..2cccfb48dd 100644
--- a/drivers/pwm/pwm_stm32.h
+++ b/drivers/pwm/pwm_stm32.h
@@ -17,7 +17,7 @@ extern "C" {
 
 /** Configuration data */
 struct pwm_stm32_config {
-	u32_t pwm_base;
+	uint32_t pwm_base;
 	/* clock subsystem driving this peripheral */
 	struct stm32_pclken pclken;
 };
@@ -30,7 +30,7 @@ struct pwm_stm32_data {
 	 * Value used to divide the TIM clock.
 	 * Min = 0x0000U, Max = 0xFFFFU
 	 */
-	u32_t pwm_prescaler;
+	uint32_t pwm_prescaler;
 	/* clock device */
 	struct device *clock;
 };
diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c
index cd8644ef12..92530482d6 100644
--- a/drivers/sensor/adt7420/adt7420.c
+++ b/drivers/sensor/adt7420/adt7420.c
@@ -19,13 +19,13 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(ADT7420, CONFIG_SENSOR_LOG_LEVEL);
 
-static int adt7420_temp_reg_read(struct device *dev, u8_t reg, s16_t *val)
+static int adt7420_temp_reg_read(struct device *dev, uint8_t reg, int16_t *val)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
 	const struct adt7420_dev_config *cfg = dev->config_info;
 
 	if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr,
-			   reg, (u8_t *) val, 2) < 0) {
+			   reg, (uint8_t *) val, 2) < 0) {
 		return -EIO;
 	}
 
@@ -34,11 +34,11 @@ static int adt7420_temp_reg_read(struct device *dev, u8_t reg, s16_t *val)
 	return 0;
 }
 
-static int adt7420_temp_reg_write(struct device *dev, u8_t reg, s16_t val)
+static int adt7420_temp_reg_write(struct device *dev, uint8_t reg, int16_t val)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
 	const struct adt7420_dev_config *cfg = dev->config_info;
-	u8_t buf[3] = {reg, val >> 8, val & 0xFF};
+	uint8_t buf[3] = {reg, val >> 8, val & 0xFF};
 
 	return i2c_write(drv_data->i2c, buf, sizeof(buf), cfg->i2c_addr);
 }
@@ -50,9 +50,9 @@ static int adt7420_attr_set(struct device *dev,
 {
 	struct adt7420_data *drv_data = dev->driver_data;
 	const struct adt7420_dev_config *cfg = dev->config_info;
-	u8_t val8, reg = 0U;
-	u16_t rate;
-	s64_t value;
+	uint8_t val8, reg = 0U;
+	uint16_t rate;
+	int64_t value;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -94,7 +94,7 @@ static int adt7420_attr_set(struct device *dev,
 			return -EINVAL;
 		}
 
-		value = (s64_t)val->val1 * 1000000 + val->val2;
+		value = (int64_t)val->val1 * 1000000 + val->val2;
 		value = (value / ADT7420_TEMP_SCALE) << 1;
 
 		if (adt7420_temp_reg_write(dev, reg, value) < 0) {
@@ -113,7 +113,7 @@ static int adt7420_attr_set(struct device *dev,
 static int adt7420_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
-	s16_t value;
+	int16_t value;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
 			chan == SENSOR_CHAN_AMBIENT_TEMP);
@@ -132,13 +132,13 @@ static int adt7420_channel_get(struct device *dev,
 		struct sensor_value *val)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
-	s32_t value;
+	int32_t value;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
 	}
 
-	value = (s32_t)drv_data->sample * ADT7420_TEMP_SCALE;
+	value = (int32_t)drv_data->sample * ADT7420_TEMP_SCALE;
 	val->val1 = value / 1000000;
 	val->val2 = value % 1000000;
 
@@ -158,7 +158,7 @@ static int adt7420_probe(struct device *dev)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
 	const struct adt7420_dev_config *cfg = dev->config_info;
-	u8_t value;
+	uint8_t value;
 	int ret;
 
 	ret = i2c_reg_read_byte(drv_data->i2c, cfg->i2c_addr,
diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h
index d0624abd67..9e1c8863f8 100644
--- a/drivers/sensor/adt7420/adt7420.h
+++ b/drivers/sensor/adt7420/adt7420.h
@@ -60,7 +60,7 @@
 
 struct adt7420_data {
 	struct device *i2c;
-	s16_t sample;
+	int16_t sample;
 #ifdef CONFIG_ADT7420_TRIGGER
 	struct device *gpio;
 	struct gpio_callback gpio_cb;
@@ -83,7 +83,7 @@ struct adt7420_data {
 
 struct adt7420_dev_config {
 	const char *i2c_port;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #ifdef CONFIG_ADT7420_TRIGGER
 	gpio_pin_t int_pin;
 	gpio_flags_t int_flags;
diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c
index 0a769498f5..6ee977b615 100644
--- a/drivers/sensor/adt7420/adt7420_trigger.c
+++ b/drivers/sensor/adt7420/adt7420_trigger.c
@@ -45,7 +45,7 @@ static void process_int(struct device *dev)
 {
 	struct adt7420_data *drv_data = dev->driver_data;
 	const struct adt7420_dev_config *cfg = dev->config_info;
-	u8_t status;
+	uint8_t status;
 
 	/* Clear the status */
 	if (i2c_reg_read_byte(drv_data->i2c, cfg->i2c_addr,
@@ -68,7 +68,7 @@ static void process_int(struct device *dev)
 }
 
 static void adt7420_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct adt7420_data *drv_data =
 		CONTAINER_OF(cb, struct adt7420_data, gpio_cb);
diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c
index 0a660f80f9..99289f02dd 100644
--- a/drivers/sensor/adxl345/adxl345.c
+++ b/drivers/sensor/adxl345/adxl345.c
@@ -21,8 +21,8 @@ static int adxl345_read_sample(struct device *dev,
 			       struct adxl345_sample *sample)
 {
 	struct adxl345_dev_data *data = dev->driver_data;
-	s16_t raw_x, raw_y, raw_z;
-	u8_t axis_data[6];
+	int16_t raw_x, raw_y, raw_z;
+	uint8_t axis_data[6];
 
 	int rc = i2c_burst_read(data->i2c_master,
 				data->i2c_addr,
@@ -46,7 +46,7 @@ static int adxl345_read_sample(struct device *dev,
 	return 0;
 }
 
-static void adxl345_accel_convert(struct sensor_value *val, s16_t sample)
+static void adxl345_accel_convert(struct sensor_value *val, int16_t sample)
 {
 	if (sample & BIT(9)) {
 		sample |= ADXL345_COMPLEMENT;
@@ -60,7 +60,7 @@ static int adxl345_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct adxl345_dev_data *data = dev->driver_data;
 	struct adxl345_sample sample;
-	u8_t samples_count;
+	uint8_t samples_count;
 	int rc;
 
 	data->sample_number = 0;
@@ -73,7 +73,7 @@ static int adxl345_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	__ASSERT_NO_MSG(samples_count <= ARRAY_SIZE(data->bufx));
 
-	for (u8_t s = 0; s < samples_count; s++) {
+	for (uint8_t s = 0; s < samples_count; s++) {
 		rc = adxl345_read_sample(dev, &sample);
 		if (rc < 0) {
 			LOG_ERR("Failed to fetch sample rc=%d\n", rc);
@@ -133,7 +133,7 @@ static int adxl345_init(struct device *dev)
 	int rc;
 	struct adxl345_dev_data *data = dev->driver_data;
 	const struct adxl345_dev_config *cfg = dev->config_info;
-	u8_t dev_id;
+	uint8_t dev_id;
 
 	data->sample_number = 0;
 	data->i2c_master = device_get_binding(cfg->i2c_master_name);
diff --git a/drivers/sensor/adxl345/adxl345.h b/drivers/sensor/adxl345/adxl345.h
index d0dda23168..a8df5906fd 100644
--- a/drivers/sensor/adxl345/adxl345.h
+++ b/drivers/sensor/adxl345/adxl345.h
@@ -38,22 +38,22 @@
 struct adxl345_dev_data {
 	unsigned int sample_number;
 	struct device *i2c_master;
-	u8_t i2c_addr;
+	uint8_t i2c_addr;
 
-	s16_t bufx[ADXL345_MAX_FIFO_SIZE];
-	s16_t bufy[ADXL345_MAX_FIFO_SIZE];
-	s16_t bufz[ADXL345_MAX_FIFO_SIZE];
+	int16_t bufx[ADXL345_MAX_FIFO_SIZE];
+	int16_t bufy[ADXL345_MAX_FIFO_SIZE];
+	int16_t bufz[ADXL345_MAX_FIFO_SIZE];
 };
 
 struct adxl345_sample {
-	s16_t x;
-	s16_t y;
-	s16_t z;
+	int16_t x;
+	int16_t y;
+	int16_t z;
 };
 
 struct adxl345_dev_config {
 	const char *i2c_master_name;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_ADX345_ADX345_H_ */
diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c
index 6b52008e30..43383d2048 100644
--- a/drivers/sensor/adxl362/adxl362.c
+++ b/drivers/sensor/adxl362/adxl362.c
@@ -24,10 +24,10 @@ LOG_MODULE_REGISTER(ADXL362, CONFIG_SENSOR_LOG_LEVEL);
 
 static struct adxl362_data adxl362_data;
 
-static int adxl362_reg_access(struct adxl362_data *ctx, u8_t cmd,
-			      u8_t reg_addr, void *data, size_t length)
+static int adxl362_reg_access(struct adxl362_data *ctx, uint8_t cmd,
+			      uint8_t reg_addr, void *data, size_t length)
 {
-	u8_t access[2] = { cmd, reg_addr };
+	uint8_t access[2] = { cmd, reg_addr };
 	const struct spi_buf buf[2] = {
 		{
 			.buf = access,
@@ -58,8 +58,8 @@ static int adxl362_reg_access(struct adxl362_data *ctx, u8_t cmd,
 	return spi_write(ctx->spi, &ctx->spi_cfg, &tx);
 }
 
-static inline int adxl362_set_reg(struct device *dev, u16_t register_value,
-				  u8_t register_address, u8_t count)
+static inline int adxl362_set_reg(struct device *dev, uint16_t register_value,
+				  uint8_t register_address, uint8_t count)
 {
 	struct adxl362_data *adxl362_data = dev->driver_data;
 
@@ -70,11 +70,11 @@ static inline int adxl362_set_reg(struct device *dev, u16_t register_value,
 				  count);
 }
 
-int adxl362_reg_write_mask(struct device *dev, u8_t register_address,
-			   u8_t mask, u8_t data)
+int adxl362_reg_write_mask(struct device *dev, uint8_t register_address,
+			   uint8_t mask, uint8_t data)
 {
 	int ret;
-	u8_t tmp;
+	uint8_t tmp;
 	struct adxl362_data *adxl362_data = dev->driver_data;
 
 	ret = adxl362_reg_access(adxl362_data,
@@ -97,8 +97,8 @@ int adxl362_reg_write_mask(struct device *dev, u8_t register_address,
 				  1);
 }
 
-static inline int adxl362_get_reg(struct device *dev, u8_t *read_buf,
-				  u8_t register_address, u8_t count)
+static inline int adxl362_get_reg(struct device *dev, uint8_t *read_buf,
+				  uint8_t register_address, uint8_t count)
 {
 	struct adxl362_data *adxl362_data = dev->driver_data;
 
@@ -110,8 +110,8 @@ static inline int adxl362_get_reg(struct device *dev, u8_t *read_buf,
 
 #if defined(CONFIG_ADXL362_TRIGGER)
 static int adxl362_interrupt_config(struct device *dev,
-				 u8_t int1,
-				 u8_t int2)
+				 uint8_t int1,
+				 uint8_t int2)
 {
 	int ret;
 	struct adxl362_data *adxl362_data = dev->driver_data;
@@ -133,14 +133,14 @@ static int adxl362_interrupt_config(struct device *dev,
 					1);
 }
 
-int adxl362_get_status(struct device *dev, u8_t *status)
+int adxl362_get_status(struct device *dev, uint8_t *status)
 {
 	return adxl362_get_reg(dev, status, ADXL362_REG_STATUS, 1);
 }
 
 int adxl362_clear_data_ready(struct device *dev)
 {
-	u8_t buf;
+	uint8_t buf;
 	/* Reading any data register clears the data ready interrupt */
 	return adxl362_get_reg(dev, &buf, ADXL362_REG_XDATA, 1);
 }
@@ -152,10 +152,10 @@ static int adxl362_software_reset(struct device *dev)
 			       ADXL362_REG_SOFT_RESET, 1);
 }
 
-static int adxl362_set_power_mode(struct device *dev, u8_t mode)
+static int adxl362_set_power_mode(struct device *dev, uint8_t mode)
 {
-	u8_t old_power_ctl;
-	u8_t new_power_ctl;
+	uint8_t old_power_ctl;
+	uint8_t new_power_ctl;
 	int ret;
 
 	ret = adxl362_get_reg(dev, &old_power_ctl, ADXL362_REG_POWER_CTL, 1);
@@ -174,12 +174,12 @@ static int adxl362_set_power_mode(struct device *dev, u8_t mode)
  * Output data rate map with allowed frequencies:
  * freq = freq_int + freq_milli / 1000
  *
- * Since we don't need a finer frequency resolution than milliHz, use u16_t
+ * Since we don't need a finer frequency resolution than milliHz, use uint16_t
  * to save some flash.
  */
 static const struct {
-	u16_t freq_int;
-	u16_t freq_milli; /* User should convert to uHz before setting the
+	uint16_t freq_int;
+	uint16_t freq_milli; /* User should convert to uHz before setting the
 			      * SENSOR_ATTR_SAMPLING_FREQUENCY attribute.
 			      */
 } adxl362_odr_map[] = {
@@ -191,7 +191,7 @@ static const struct {
 	{ 400, 0 },
 };
 
-static int adxl362_freq_to_odr_val(u16_t freq_int, u16_t freq_milli)
+static int adxl362_freq_to_odr_val(uint16_t freq_int, uint16_t freq_milli)
 {
 	size_t i;
 
@@ -212,15 +212,15 @@ static int adxl362_freq_to_odr_val(u16_t freq_int, u16_t freq_milli)
 }
 
 static const struct adxl362_range {
-	u16_t range;
-	u8_t reg_val;
+	uint16_t range;
+	uint8_t reg_val;
 } adxl362_acc_range_map[] = {
 	{2,	ADXL362_RANGE_2G},
 	{4,	ADXL362_RANGE_4G},
 	{8,	ADXL362_RANGE_8G},
 };
 
-static s32_t adxl362_range_to_reg_val(u16_t range)
+static int32_t adxl362_range_to_reg_val(uint16_t range)
 {
 	int i;
 
@@ -233,11 +233,11 @@ static s32_t adxl362_range_to_reg_val(u16_t range)
 	return -EINVAL;
 }
 
-static int adxl362_set_range(struct device *dev, u8_t range)
+static int adxl362_set_range(struct device *dev, uint8_t range)
 {
 	struct adxl362_data *adxl362_data = dev->driver_data;
-	u8_t old_filter_ctl;
-	u8_t new_filter_ctl;
+	uint8_t old_filter_ctl;
+	uint8_t new_filter_ctl;
 	int ret;
 
 	ret = adxl362_get_reg(dev, &old_filter_ctl, ADXL362_REG_FILTER_CTL, 1);
@@ -256,10 +256,10 @@ static int adxl362_set_range(struct device *dev, u8_t range)
 	return 0;
 }
 
-static int adxl362_set_output_rate(struct device *dev, u8_t out_rate)
+static int adxl362_set_output_rate(struct device *dev, uint8_t out_rate)
 {
-	u8_t old_filter_ctl;
-	u8_t new_filter_ctl;
+	uint8_t old_filter_ctl;
+	uint8_t new_filter_ctl;
 
 	adxl362_get_reg(dev, &old_filter_ctl, ADXL362_REG_FILTER_CTL, 1);
 	new_filter_ctl = old_filter_ctl & ~ADXL362_FILTER_CTL_ODR(0x7);
@@ -318,8 +318,8 @@ static int adxl362_attr_set_thresh(struct device *dev, enum sensor_channel chan,
 			    enum sensor_attribute attr,
 			    const struct sensor_value *val)
 {
-	u8_t reg;
-	u16_t threshold = val->val1;
+	uint8_t reg;
+	uint16_t threshold = val->val1;
 	size_t ret;
 
 	if (chan != SENSOR_CHAN_ACCEL_X &&
@@ -370,10 +370,10 @@ static int adxl362_attr_set(struct device *dev, enum sensor_channel chan,
 	return 0;
 }
 
-static int adxl362_fifo_setup(struct device *dev, u8_t mode,
-			      u16_t water_mark_lvl, u8_t en_temp_read)
+static int adxl362_fifo_setup(struct device *dev, uint8_t mode,
+			      uint16_t water_mark_lvl, uint8_t en_temp_read)
 {
-	u8_t write_val;
+	uint8_t write_val;
 	int ret;
 
 	write_val = ADXL362_FIFO_CTL_FIFO_MODE(mode) |
@@ -393,12 +393,12 @@ static int adxl362_fifo_setup(struct device *dev, u8_t mode,
 }
 
 static int adxl362_setup_activity_detection(struct device *dev,
-					    u8_t ref_or_abs,
-					    u16_t threshold,
-					    u8_t time)
+					    uint8_t ref_or_abs,
+					    uint16_t threshold,
+					    uint8_t time)
 {
-	u8_t old_act_inact_reg;
-	u8_t new_act_inact_reg;
+	uint8_t old_act_inact_reg;
+	uint8_t new_act_inact_reg;
 	int ret;
 
 	/**
@@ -451,12 +451,12 @@ static int adxl362_setup_activity_detection(struct device *dev,
 }
 
 static int adxl362_setup_inactivity_detection(struct device *dev,
-					      u8_t ref_or_abs,
-					      u16_t threshold,
-					      u16_t time)
+					      uint8_t ref_or_abs,
+					      uint16_t threshold,
+					      uint16_t time)
 {
-	u8_t old_act_inact_reg;
-	u8_t new_act_inact_reg;
+	uint8_t old_act_inact_reg;
+	uint8_t new_act_inact_reg;
 	int ret;
 
 	/* Configure motion threshold and inactivity timer. */
@@ -493,10 +493,10 @@ static int adxl362_setup_inactivity_detection(struct device *dev,
 	return 0;
 }
 
-int adxl362_set_interrupt_mode(struct device *dev, u8_t mode)
+int adxl362_set_interrupt_mode(struct device *dev, uint8_t mode)
 {
-	u8_t old_act_inact_reg;
-	u8_t new_act_inact_reg;
+	uint8_t old_act_inact_reg;
+	uint8_t new_act_inact_reg;
 	int ret;
 
 	LOG_DBG("Mode: %d", mode);
@@ -533,12 +533,12 @@ int adxl362_set_interrupt_mode(struct device *dev, u8_t mode)
 static int adxl362_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct adxl362_data *data = dev->driver_data;
-	s16_t buf[4];
+	int16_t buf[4];
 	int ret;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
-	ret = adxl362_get_reg(dev, (u8_t *)buf, ADXL362_REG_XDATA_L,
+	ret = adxl362_get_reg(dev, (uint8_t *)buf, ADXL362_REG_XDATA_L,
 			      sizeof(buf));
 	if (ret) {
 		return ret;
@@ -723,7 +723,7 @@ static int adxl362_init(struct device *dev)
 {
 	const struct adxl362_config *config = dev->config_info;
 	struct adxl362_data *data = dev->driver_data;
-	u8_t value;
+	uint8_t value;
 	int err;
 
 	data->spi = device_get_binding(config->spi_name);
diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h
index 06dd9a4514..e07e885c67 100644
--- a/drivers/sensor/adxl362/adxl362.h
+++ b/drivers/sensor/adxl362/adxl362.h
@@ -172,8 +172,8 @@
 
 struct adxl362_config {
 	char *spi_name;
-	u32_t spi_max_frequency;
-	u16_t spi_slave;
+	uint32_t spi_max_frequency;
+	uint16_t spi_slave;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
 	gpio_pin_t cs_gpio;
@@ -182,8 +182,8 @@ struct adxl362_config {
 	const char *gpio_port;
 	gpio_pin_t int_gpio;
 	gpio_dt_flags_t int_flags;
-	u8_t int1_config;
-	u8_t int2_config;
+	uint8_t int1_config;
+	uint8_t int2_config;
 #endif
 };
 
@@ -193,11 +193,11 @@ struct adxl362_data {
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	struct spi_cs_control adxl362_cs_ctrl;
 #endif
-	s16_t acc_x;
-	s16_t acc_y;
-	s16_t acc_z;
-	s16_t temp;
-	u8_t selected_range;
+	int16_t acc_x;
+	int16_t acc_y;
+	int16_t acc_z;
+	int16_t temp;
+	uint8_t selected_range;
 
 #if defined(CONFIG_ADXL362_TRIGGER)
 	struct device *gpio;
@@ -246,9 +246,9 @@ struct adxl362_data {
 
 #ifdef CONFIG_ADXL362_TRIGGER
 int adxl362_reg_write_mask(struct device *dev,
-			   u8_t reg_addr, u8_t mask, u8_t data);
+			   uint8_t reg_addr, uint8_t mask, uint8_t data);
 
-int adxl362_get_status(struct device *dev, u8_t *status);
+int adxl362_get_status(struct device *dev, uint8_t *status);
 
 int adxl362_interrupt_activity_enable(struct device *dev);
 
@@ -258,7 +258,7 @@ int adxl362_trigger_set(struct device *dev,
 
 int adxl362_init_interrupt(struct device *dev);
 
-int adxl362_set_interrupt_mode(struct device *dev, u8_t mode);
+int adxl362_set_interrupt_mode(struct device *dev, uint8_t mode);
 
 int adxl362_clear_data_ready(struct device *dev);
 #endif /* CONFIG_ADT7420_TRIGGER */
diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c
index 0b920ac487..d453066de2 100644
--- a/drivers/sensor/adxl362/adxl362_trigger.c
+++ b/drivers/sensor/adxl362/adxl362_trigger.c
@@ -21,7 +21,7 @@ static void adxl362_thread_cb(void *arg)
 {
 	struct device *dev = arg;
 	struct adxl362_data *drv_data = dev->driver_data;
-	u8_t status_buf;
+	uint8_t status_buf;
 
 	/* Clears activity and inactivity interrupt */
 	if (adxl362_get_status(dev, &status_buf)) {
@@ -45,7 +45,7 @@ static void adxl362_thread_cb(void *arg)
 }
 
 static void adxl362_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct adxl362_data *drv_data =
 		CONTAINER_OF(cb, struct adxl362_data, gpio_cb);
@@ -85,7 +85,7 @@ int adxl362_trigger_set(struct device *dev,
 			sensor_trigger_handler_t handler)
 {
 	struct adxl362_data *drv_data = dev->driver_data;
-	u8_t int_mask, int_en, status_buf;
+	uint8_t int_mask, int_en, status_buf;
 
 	switch (trig->type) {
 	case SENSOR_TRIG_THRESHOLD:
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index ce51075b28..5b9b69e91b 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -22,7 +22,7 @@
 
 LOG_MODULE_REGISTER(ADXL372, CONFIG_SENSOR_LOG_LEVEL);
 
-static int adxl372_bus_access(struct device *dev, u8_t reg,
+static int adxl372_bus_access(struct device *dev, uint8_t reg,
 			      void *data, size_t length)
 {
 	struct adxl372_data *adxl372_data = dev->driver_data;
@@ -63,7 +63,7 @@ static int adxl372_bus_access(struct device *dev, u8_t reg,
 	if (reg & ADXL372_READ) {
 		return i2c_burst_read(adxl372_data->bus, cfg->i2c_addr,
 				      ADXL372_TO_I2C_REG(reg),
-				      (u8_t *) data, length);
+				      (uint8_t *) data, length);
 	} else {
 		if (length != 1) {
 			return -EINVAL;
@@ -71,7 +71,7 @@ static int adxl372_bus_access(struct device *dev, u8_t reg,
 
 		return i2c_reg_write_byte(adxl372_data->bus, cfg->i2c_addr,
 					  ADXL372_TO_I2C_REG(reg),
-					  *(u8_t *)data);
+					  *(uint8_t *)data);
 	}
 
 #endif
@@ -85,8 +85,8 @@ static int adxl372_bus_access(struct device *dev, u8_t reg,
  * @return 0 in case of success, negative error code otherwise.
  */
 static int adxl372_reg_read(struct device *dev,
-			     u8_t reg_addr,
-			     u8_t *reg_data)
+			     uint8_t reg_addr,
+			     uint8_t *reg_data)
 {
 	return adxl372_bus_access(dev, ADXL372_REG_READ(reg_addr), reg_data, 1);
 }
@@ -101,9 +101,9 @@ static int adxl372_reg_read(struct device *dev,
  * @return 0 in case of success, negative error code otherwise.
  */
 static int adxl372_reg_read_multiple(struct device *dev,
-				      u8_t reg_addr,
-				      u8_t *reg_data,
-				      u16_t count)
+				      uint8_t reg_addr,
+				      uint8_t *reg_data,
+				      uint16_t count)
 {
 	return adxl372_bus_access(dev, ADXL372_REG_READ(reg_addr),
 				  reg_data, count);
@@ -117,8 +117,8 @@ static int adxl372_reg_read_multiple(struct device *dev,
  * @return 0 in case of success, negative error code otherwise.
  */
 static int adxl372_reg_write(struct device *dev,
-			      u8_t reg_addr,
-			      u8_t reg_data)
+			      uint8_t reg_addr,
+			      uint8_t reg_data)
 {
 	LOG_DBG("[0x%X] = 0x%X", reg_addr, reg_data);
 
@@ -135,12 +135,12 @@ static int adxl372_reg_write(struct device *dev,
  * @return 0 in case of success, negative error code otherwise.
  */
 int adxl372_reg_write_mask(struct device *dev,
-			       u8_t reg_addr,
-			       u32_t mask,
-			       u8_t data)
+			       uint8_t reg_addr,
+			       uint32_t mask,
+			       uint8_t data)
 {
 	int ret;
-	u8_t tmp;
+	uint8_t tmp;
 
 	ret = adxl372_reg_read(dev, reg_addr, &tmp);
 	if (ret) {
@@ -160,11 +160,11 @@ int adxl372_reg_write_mask(struct device *dev,
  * @param act - The activity config structure.
  * @return 0 in case of success, negative error code otherwise.
  */
-static int adxl372_set_activity_threshold(struct device *dev, u8_t axis_reg_h,
+static int adxl372_set_activity_threshold(struct device *dev, uint8_t axis_reg_h,
 				   const struct adxl372_activity_threshold *act)
 {
 	int ret;
-	u8_t val;
+	uint8_t val;
 
 	ret = adxl372_reg_write(dev, axis_reg_h++, act->thresh >> 3);
 	if (ret) {
@@ -192,7 +192,7 @@ static int adxl372_set_activity_threshold(struct device *dev, u8_t axis_reg_h,
  * @return 0 in case of success, negative error code otherwise.
  */
 static int adxl372_set_activity_threshold_xyz(struct device *dev,
-				u8_t axis_reg_h,
+				uint8_t axis_reg_h,
 				const struct adxl372_activity_threshold *act)
 {
 	int i, ret;
@@ -255,7 +255,7 @@ static int adxl372_set_autosleep(struct device *dev, bool enable)
 static int adxl372_set_bandwidth(struct device *dev, enum adxl372_bandwidth bw)
 {
 	int ret;
-	u8_t mask;
+	uint8_t mask;
 
 	if (bw == ADXL372_BW_LPF_DISABLED) {
 		mask = ADXL372_POWER_CTL_LPF_DIS_MSK;
@@ -289,7 +289,7 @@ static int adxl372_set_hpf_corner(struct device *dev, enum adxl372_hpf_corner c)
 {
 
 	int ret;
-	u8_t mask;
+	uint8_t mask;
 
 	if (c == ADXL372_HPF_DISABLED) {
 		mask = ADXL372_POWER_CTL_HPF_DIS_MSK;
@@ -386,7 +386,7 @@ static int adxl372_set_wakeup_rate(struct device *dev,
  * @param time - The value set in this register.
  * @return 0 in case of success, negative error code otherwise.
  */
-static int adxl372_set_activity_time(struct device *dev, u8_t time)
+static int adxl372_set_activity_time(struct device *dev, uint8_t time)
 {
 	return adxl372_reg_write(dev, ADXL372_TIME_ACT, time);
 }
@@ -398,7 +398,7 @@ static int adxl372_set_activity_time(struct device *dev, u8_t time)
  *		 (eight LSBs) and the TIME_INACT_H register (eight MSBs).
  * @return 0 in case of success, negative error code otherwise.
  */
-static int adxl372_set_inactivity_time(struct device *dev, u16_t time)
+static int adxl372_set_inactivity_time(struct device *dev, uint16_t time)
 {
 	int ret;
 
@@ -434,8 +434,8 @@ static int adxl372_set_filter_settle(struct device *dev,
  * @return 0 in case of success, negative error code otherwise.
  */
 static int adxl372_interrupt_config(struct device *dev,
-				 u8_t int1,
-				 u8_t int2)
+				 uint8_t int1,
+				 uint8_t int2)
 {
 	int ret;
 
@@ -458,11 +458,11 @@ static int adxl372_interrupt_config(struct device *dev,
  * @return 0 in case of success, negative error code otherwise.
  */
 int adxl372_get_status(struct device *dev,
-			   u8_t *status1,
-			   u8_t *status2,
-			   u16_t *fifo_entries)
+			   uint8_t *status1,
+			   uint8_t *status2,
+			   uint16_t *fifo_entries)
 {
-	u8_t buf[4], length = 1U;
+	uint8_t buf[4], length = 1U;
 	int ret;
 
 	if (status2) {
@@ -534,10 +534,10 @@ static int adxl372_reset(struct device *dev)
 static int adxl372_configure_fifo(struct device *dev,
 			       enum adxl372_fifo_mode mode,
 			       enum adxl372_fifo_format format,
-			       u16_t fifo_samples)
+			       uint16_t fifo_samples)
 {
 	struct adxl372_data *data = dev->driver_data;
-	u8_t fifo_config;
+	uint8_t fifo_config;
 	int ret;
 
 	if (fifo_samples > 512) {
@@ -584,8 +584,8 @@ static int adxl372_configure_fifo(struct device *dev,
 static int adxl372_get_accel_data(struct device *dev, bool maxpeak,
 			   struct adxl372_xyz_accel_data *accel_data)
 {
-	u8_t buf[6];
-	u8_t status1;
+	uint8_t buf[6];
+	uint8_t status1;
 	int ret;
 
 	if (!IS_ENABLED(CONFIG_ADXL372_TRIGGER)) {
@@ -639,9 +639,9 @@ static int adxl372_attr_set_thresh(struct device *dev, enum sensor_channel chan,
 {
 	const struct adxl372_dev_config *cfg = dev->config_info;
 	struct adxl372_activity_threshold threshold;
-	s32_t value;
-	s64_t micro_ms2 = val->val1 * 1000000LL + val->val2;
-	u8_t reg;
+	int32_t value;
+	int64_t micro_ms2 = val->val1 * 1000000LL + val->val2;
+	uint8_t reg;
 
 	value = abs((micro_ms2 * 10) / SENSOR_G);
 
@@ -698,13 +698,13 @@ static int adxl372_sample_fetch(struct device *dev, enum sensor_channel chan)
 				      &data->sample);
 }
 
-static void adxl372_accel_convert(struct sensor_value *val, s16_t value)
+static void adxl372_accel_convert(struct sensor_value *val, int16_t value)
 {
 	/*
 	 * Sensor resolution is 100mg/LSB, 12-bit value needs to be right
 	 * shifted by 4 or divided by 16. Overall this results in a scale of 160
 	 */
-	s32_t micro_ms2 = value * (SENSOR_G / (16 * 1000 / 100));
+	int32_t micro_ms2 = value * (SENSOR_G / (16 * 1000 / 100));
 
 	val->val1 = micro_ms2 / 1000000;
 	val->val2 = micro_ms2 % 1000000;
@@ -751,7 +751,7 @@ static const struct sensor_driver_api adxl372_api_funcs = {
 static int adxl372_probe(struct device *dev)
 {
 	const struct adxl372_dev_config *cfg = dev->config_info;
-	u8_t dev_id, part_id;
+	uint8_t dev_id, part_id;
 	int ret;
 
 	ret = adxl372_reg_read(dev, ADXL372_DEVID, &dev_id);
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index e99c368b27..32b7736a8a 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -263,19 +263,19 @@ enum adxl372_fifo_mode {
 struct adxl372_fifo_config {
 	enum adxl372_fifo_mode fifo_mode;
 	enum adxl372_fifo_format fifo_format;
-	u16_t fifo_samples;
+	uint16_t fifo_samples;
 };
 
 struct adxl372_activity_threshold {
-	u16_t thresh;
+	uint16_t thresh;
 	bool referenced;
 	bool enable;
 };
 
 struct adxl372_xyz_accel_data {
-	s16_t x;
-	s16_t y;
-	s16_t z;
+	int16_t x;
+	int16_t y;
+	int16_t z;
 };
 
 struct adxl372_data {
@@ -312,12 +312,12 @@ struct adxl372_data {
 struct adxl372_dev_config {
 #ifdef CONFIG_ADXL372_I2C
 	const char *i2c_port;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #endif
 #ifdef CONFIG_ADXL372_SPI
 	const char *spi_port;
-	u16_t spi_slave;
-	u32_t spi_max_frequency;
+	uint16_t spi_slave;
+	uint32_t spi_max_frequency;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
 	gpio_pin_t cs_gpio;
@@ -347,18 +347,18 @@ struct adxl372_dev_config {
 	enum adxl372_filter_settle filter_settle;
 	enum adxl372_op_mode op_mode;
 
-	u16_t inactivity_time;
-	u8_t activity_time;
-	u8_t int1_config;
-	u8_t int2_config;
+	uint16_t inactivity_time;
+	uint8_t activity_time;
+	uint8_t int1_config;
+	uint8_t int2_config;
 };
 
 #ifdef CONFIG_ADXL372_TRIGGER
 int adxl372_get_status(struct device *dev,
-		       u8_t *status1, u8_t *status2, u16_t *fifo_entries);
+		       uint8_t *status1, uint8_t *status2, uint16_t *fifo_entries);
 
 int adxl372_reg_write_mask(struct device *dev,
-			   u8_t reg_addr, u32_t mask, u8_t data);
+			   uint8_t reg_addr, uint32_t mask, uint8_t data);
 
 int adxl372_trigger_set(struct device *dev,
 			const struct sensor_trigger *trig,
diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c
index bba4f063a9..1b22132a9f 100644
--- a/drivers/sensor/adxl372/adxl372_trigger.c
+++ b/drivers/sensor/adxl372/adxl372_trigger.c
@@ -21,7 +21,7 @@ static void adxl372_thread_cb(void *arg)
 	struct device *dev = arg;
 	struct adxl372_data *drv_data = dev->driver_data;
 	const struct adxl372_dev_config *cfg = dev->config_info;
-	u8_t status1, status2;
+	uint8_t status1, status2;
 
 	/* Clear the status */
 	if (adxl372_get_status(dev, &status1, &status2, NULL) < 0) {
@@ -52,7 +52,7 @@ static void adxl372_thread_cb(void *arg)
 }
 
 static void adxl372_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct adxl372_data *drv_data =
 		CONTAINER_OF(cb, struct adxl372_data, gpio_cb);
@@ -98,7 +98,7 @@ int adxl372_trigger_set(struct device *dev,
 {
 	struct adxl372_data *drv_data = dev->driver_data;
 	const struct adxl372_dev_config *cfg = dev->config_info;
-	u8_t int_mask, int_en, status1, status2;
+	uint8_t int_mask, int_en, status1, status2;
 	int ret;
 
 	gpio_pin_interrupt_configure(drv_data->gpio, cfg->int_gpio,
diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c
index 59341c9284..90d37e2262 100644
--- a/drivers/sensor/ak8975/ak8975.c
+++ b/drivers/sensor/ak8975/ak8975.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(AK8975, CONFIG_SENSOR_LOG_LEVEL);
 static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct ak8975_data *drv_data = dev->driver_data;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -49,13 +49,13 @@ static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan)
 	return 0;
 }
 
-static void ak8975_convert(struct sensor_value *val, s16_t sample,
-			   u8_t adjustment)
+static void ak8975_convert(struct sensor_value *val, int16_t sample,
+			   uint8_t adjustment)
 {
-	s32_t conv_val;
+	int32_t conv_val;
 
 	conv_val = sample * AK8975_MICRO_GAUSS_PER_BIT *
-		   ((u16_t)adjustment + 128) / 256;
+		   ((uint16_t)adjustment + 128) / 256;
 	val->val1 = conv_val / 1000000;
 	val->val2 = conv_val % 1000000;
 }
@@ -93,7 +93,7 @@ static const struct sensor_driver_api ak8975_driver_api = {
 
 static int ak8975_read_adjustment_data(struct ak8975_data *drv_data)
 {
-	u8_t buf[3];
+	uint8_t buf[3];
 
 	if (i2c_reg_write_byte(drv_data->i2c,
 			       DT_INST_REG_ADDR(0),
@@ -119,7 +119,7 @@ static int ak8975_read_adjustment_data(struct ak8975_data *drv_data)
 int ak8975_init(struct device *dev)
 {
 	struct ak8975_data *drv_data = dev->driver_data;
-	u8_t id;
+	uint8_t id;
 
 	drv_data->i2c =
 		device_get_binding(DT_INST_BUS_LABEL(0));
diff --git a/drivers/sensor/ak8975/ak8975.h b/drivers/sensor/ak8975/ak8975.h
index 93f3c5e4d0..0549457448 100644
--- a/drivers/sensor/ak8975/ak8975.h
+++ b/drivers/sensor/ak8975/ak8975.h
@@ -42,13 +42,13 @@
 struct ak8975_data {
 	struct device *i2c;
 
-	s16_t x_sample;
-	s16_t y_sample;
-	s16_t z_sample;
+	int16_t x_sample;
+	int16_t y_sample;
+	int16_t z_sample;
 
-	u8_t x_adj;
-	u8_t y_adj;
-	u8_t z_adj;
+	uint8_t x_adj;
+	uint8_t y_adj;
+	uint8_t z_adj;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_ */
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index 0a8d6b9a28..2e3b74511f 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/drivers/sensor/amg88xx/amg88xx.c
@@ -30,7 +30,7 @@ static int amg88xx_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	if (i2c_burst_read(drv_data->i2c, config->i2c_address,
 			   AMG88XX_OUTPUT_BASE,
-			   (u8_t *)drv_data->sample,
+			   (uint8_t *)drv_data->sample,
 			   sizeof(drv_data->sample))) {
 		return -EIO;
 	}
@@ -54,9 +54,9 @@ static int amg88xx_channel_get(struct device *dev,
 		if (drv_data->sample[idx] & (1 << 11)) {
 			drv_data->sample[idx] |= 0xF000;
 		}
-		val[idx].val1 = (((s32_t)drv_data->sample[idx]) *
+		val[idx].val1 = (((int32_t)drv_data->sample[idx]) *
 				  AMG88XX_TREG_LSB_SCALING) / 1000000;
-		val[idx].val2 = (((s32_t)drv_data->sample[idx]) *
+		val[idx].val2 = (((int32_t)drv_data->sample[idx]) *
 				  AMG88XX_TREG_LSB_SCALING) % 1000000;
 	}
 
@@ -67,7 +67,7 @@ static int amg88xx_init_device(struct device *dev)
 {
 	struct amg88xx_data *drv_data = dev->driver_data;
 	const struct amg88xx_config *config = dev->config_info;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (i2c_reg_read_byte(drv_data->i2c, config->i2c_address,
 			      AMG88XX_PCLT, &tmp)) {
diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h
index 6c5bf4a360..b8c32c8d3a 100644
--- a/drivers/sensor/amg88xx/amg88xx.h
+++ b/drivers/sensor/amg88xx/amg88xx.h
@@ -70,19 +70,19 @@ struct amg88xx_config {
 	char *i2c_name;
 #ifdef CONFIG_AMG88XX_TRIGGER
 	char *gpio_name;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 #endif
-	u8_t i2c_address;
+	uint8_t i2c_address;
 };
 
 struct amg88xx_data {
 	struct device *i2c;
-	s16_t sample[64];
+	int16_t sample[64];
 
 #ifdef CONFIG_AMG88XX_TRIGGER
 	struct device *gpio;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	struct gpio_callback gpio_cb;
 
 	sensor_trigger_handler_t drdy_handler;
diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c
index a477750ade..62c1148f7c 100644
--- a/drivers/sensor/amg88xx/amg88xx_trigger.c
+++ b/drivers/sensor/amg88xx/amg88xx_trigger.c
@@ -37,10 +37,10 @@ int amg88xx_attr_set(struct device *dev,
 {
 	struct amg88xx_data *drv_data = dev->driver_data;
 	const struct amg88xx_config *config = dev->config_info;
-	s16_t int_level = (val->val1 * 1000000 + val->val2) /
+	int16_t int_level = (val->val1 * 1000000 + val->val2) /
 			  AMG88XX_TREG_LSB_SCALING;
-	u8_t intl_reg;
-	u8_t inth_reg;
+	uint8_t intl_reg;
+	uint8_t inth_reg;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -59,13 +59,13 @@ int amg88xx_attr_set(struct device *dev,
 	}
 
 	if (i2c_reg_write_byte(drv_data->i2c, config->i2c_address,
-			       intl_reg, (u8_t)int_level)) {
+			       intl_reg, (uint8_t)int_level)) {
 		LOG_DBG("Failed to set INTxL attribute!");
 		return -EIO;
 	}
 
 	if (i2c_reg_write_byte(drv_data->i2c, config->i2c_address,
-			       inth_reg, (u8_t)(int_level >> 8))) {
+			       inth_reg, (uint8_t)(int_level >> 8))) {
 		LOG_DBG("Failed to set INTxH attribute!");
 		return -EIO;
 	}
@@ -74,7 +74,7 @@ int amg88xx_attr_set(struct device *dev,
 }
 
 static void amg88xx_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct amg88xx_data *drv_data =
 		CONTAINER_OF(cb, struct amg88xx_data, gpio_cb);
@@ -93,7 +93,7 @@ static void amg88xx_thread_cb(void *arg)
 	struct device *dev = arg;
 	struct amg88xx_data *drv_data = dev->driver_data;
 	const struct amg88xx_config *config = dev->config_info;
-	u8_t status;
+	uint8_t status;
 
 	if (i2c_reg_read_byte(drv_data->i2c, config->i2c_address,
 			      AMG88XX_STAT, &status) < 0) {
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c
index d6f1acbe6f..6fa9f602e6 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.c
+++ b/drivers/sensor/ams_iAQcore/iAQcore.c
@@ -28,7 +28,7 @@ static int iaqcore_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
-	msg.buf = (u8_t *)&buf;
+	msg.buf = (uint8_t *)&buf;
 	msg.len = sizeof(struct iaq_registers);
 	msg.flags = I2C_MSG_READ | I2C_MSG_STOP;
 
diff --git a/drivers/sensor/ams_iAQcore/iAQcore.h b/drivers/sensor/ams_iAQcore/iAQcore.h
index ae6a6b9a68..d1fec308c8 100644
--- a/drivers/sensor/ams_iAQcore/iAQcore.h
+++ b/drivers/sensor/ams_iAQcore/iAQcore.h
@@ -11,18 +11,18 @@
 #include <sys/util.h>
 
 struct iaq_registers {
-	u16_t co2_pred;
-	u8_t  status;
-	s32_t resistance;
-	u16_t voc;
+	uint16_t co2_pred;
+	uint8_t  status;
+	int32_t resistance;
+	uint16_t voc;
 } __packed;
 
 struct iaq_core_data {
 	struct device *i2c;
-	u16_t co2;
-	u16_t voc;
-	u8_t status;
-	s32_t resistance;
+	uint16_t co2;
+	uint16_t voc;
+	uint8_t status;
+	int32_t resistance;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_AMS_IAQCORE_IAQCORE_H_ */
diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c
index 9dea11a998..f8ff4cecb0 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/drivers/sensor/apds9960/apds9960.c
@@ -37,7 +37,7 @@ static void apds9960_handle_cb(struct apds9960_data *drv_data)
 }
 
 static void apds9960_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct apds9960_data *drv_data =
 		CONTAINER_OF(cb, struct apds9960_data, gpio_cb);
@@ -49,7 +49,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	const struct apds9960_config *config = dev->config_info;
 	struct apds9960_data *data = dev->driver_data;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (chan != SENSOR_CHAN_ALL) {
 		LOG_ERR("Unsupported sensor channel");
@@ -89,7 +89,7 @@ static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan)
 	if (tmp & APDS9960_STATUS_AINT) {
 		if (i2c_burst_read(data->i2c, config->i2c_address,
 				   APDS9960_CDATAL_REG,
-				   (u8_t *)&data->sample_crgb,
+				   (uint8_t *)&data->sample_crgb,
 				   sizeof(data->sample_crgb))) {
 			return -EIO;
 		}
@@ -225,7 +225,7 @@ static int apds9960_ambient_setup(struct device *dev)
 {
 	const struct apds9960_config *config = dev->config_info;
 	struct apds9960_data *data = dev->driver_data;
-	u16_t th;
+	uint16_t th;
 
 	/* ADC value */
 	if (i2c_reg_write_byte(data->i2c, config->i2c_address,
@@ -246,7 +246,7 @@ static int apds9960_ambient_setup(struct device *dev)
 	th = sys_cpu_to_le16(APDS9960_DEFAULT_AILT);
 	if (i2c_burst_write(data->i2c, config->i2c_address,
 			    APDS9960_INT_AILTL_REG,
-			    (u8_t *)&th, sizeof(th))) {
+			    (uint8_t *)&th, sizeof(th))) {
 		LOG_ERR("ALS low threshold not set");
 		return -EIO;
 	}
@@ -254,7 +254,7 @@ static int apds9960_ambient_setup(struct device *dev)
 	th = sys_cpu_to_le16(APDS9960_DEFAULT_AIHT);
 	if (i2c_burst_write(data->i2c, config->i2c_address,
 			    APDS9960_INT_AIHTL_REG,
-			    (u8_t *)&th, sizeof(th))) {
+			    (uint8_t *)&th, sizeof(th))) {
 		LOG_ERR("ALS low threshold not set");
 		return -EIO;
 	}
@@ -275,7 +275,7 @@ static int apds9960_sensor_setup(struct device *dev)
 {
 	const struct apds9960_config *config = dev->config_info;
 	struct apds9960_data *data = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_address,
 			      APDS9960_ID_REG, &chip_id)) {
@@ -407,7 +407,7 @@ static int apds9960_init_interrupt(struct device *dev)
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static int apds9960_device_ctrl(struct device *dev, u32_t ctrl_command,
+static int apds9960_device_ctrl(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	const struct apds9960_config *config = dev->config_info;
@@ -415,7 +415,7 @@ static int apds9960_device_ctrl(struct device *dev, u32_t ctrl_command,
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t device_pm_state = *(u32_t *)context;
+		uint32_t device_pm_state = *(uint32_t *)context;
 
 		if (device_pm_state == DEVICE_PM_ACTIVE_STATE) {
 			if (i2c_reg_update_byte(data->i2c, config->i2c_address,
@@ -440,7 +440,7 @@ static int apds9960_device_ctrl(struct device *dev, u32_t ctrl_command,
 		}
 
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = DEVICE_PM_ACTIVE_STATE;
+		*((uint32_t *)context) = DEVICE_PM_ACTIVE_STATE;
 	}
 
 	if (cb) {
diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h
index cc920495d7..e25421d70d 100644
--- a/drivers/sensor/apds9960/apds9960.h
+++ b/drivers/sensor/apds9960/apds9960.h
@@ -215,13 +215,13 @@
 struct apds9960_config {
 	char *i2c_name;
 	char *gpio_name;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	unsigned int gpio_flags;
-	u8_t i2c_address;
-	u8_t pgain;
-	u8_t again;
-	u8_t ppcount;
-	u8_t pled_boost;
+	uint8_t i2c_address;
+	uint8_t pgain;
+	uint8_t again;
+	uint8_t ppcount;
+	uint8_t pled_boost;
 };
 
 struct apds9960_data {
@@ -230,9 +230,9 @@ struct apds9960_data {
 	struct gpio_callback gpio_cb;
 	struct k_work work;
 	struct device *dev;
-	u16_t sample_crgb[4];
-	u8_t pdata;
-	u8_t gpio_pin;
+	uint16_t sample_crgb[4];
+	uint8_t pdata;
+	uint8_t gpio_pin;
 
 #ifdef CONFIG_APDS9960_TRIGGER
 	sensor_trigger_handler_t p_th_handler;
diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c
index 00d6bc37a7..0433690197 100644
--- a/drivers/sensor/apds9960/apds9960_trigger.c
+++ b/drivers/sensor/apds9960/apds9960_trigger.c
@@ -44,7 +44,7 @@ int apds9960_attr_set(struct device *dev,
 			if (i2c_reg_write_byte(data->i2c,
 					       config->i2c_address,
 					       APDS9960_PIHT_REG,
-					       (u8_t)val->val1)) {
+					       (uint8_t)val->val1)) {
 				return -EIO;
 			}
 
@@ -54,7 +54,7 @@ int apds9960_attr_set(struct device *dev,
 			if (i2c_reg_write_byte(data->i2c,
 					       config->i2c_address,
 					       APDS9960_PILT_REG,
-					       (u8_t)val->val1)) {
+					       (uint8_t)val->val1)) {
 				return -EIO;
 			}
 
diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c
index 0122c1e4f3..f661f259b4 100644
--- a/drivers/sensor/bma280/bma280.c
+++ b/drivers/sensor/bma280/bma280.c
@@ -19,8 +19,8 @@ LOG_MODULE_REGISTER(BMA280, CONFIG_SENSOR_LOG_LEVEL);
 static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct bma280_data *drv_data = dev->driver_data;
-	u8_t buf[6];
-	u8_t lsb;
+	uint8_t buf[6];
+	uint8_t lsb;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -35,17 +35,17 @@ static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan)
 	}
 
 	lsb = (buf[0] & BMA280_ACCEL_LSB_MASK) >> BMA280_ACCEL_LSB_SHIFT;
-	drv_data->x_sample = (((s8_t)buf[1]) << BMA280_ACCEL_LSB_BITS) | lsb;
+	drv_data->x_sample = (((int8_t)buf[1]) << BMA280_ACCEL_LSB_BITS) | lsb;
 
 	lsb = (buf[2] & BMA280_ACCEL_LSB_MASK) >> BMA280_ACCEL_LSB_SHIFT;
-	drv_data->y_sample = (((s8_t)buf[3]) << BMA280_ACCEL_LSB_BITS) | lsb;
+	drv_data->y_sample = (((int8_t)buf[3]) << BMA280_ACCEL_LSB_BITS) | lsb;
 
 	lsb = (buf[4] & BMA280_ACCEL_LSB_MASK) >> BMA280_ACCEL_LSB_SHIFT;
-	drv_data->z_sample = (((s8_t)buf[5]) << BMA280_ACCEL_LSB_BITS) | lsb;
+	drv_data->z_sample = (((int8_t)buf[5]) << BMA280_ACCEL_LSB_BITS) | lsb;
 
 	if (i2c_reg_read_byte(drv_data->i2c, BMA280_I2C_ADDRESS,
 			      BMA280_REG_TEMP,
-			      (u8_t *)&drv_data->temp_sample) < 0) {
+			      (uint8_t *)&drv_data->temp_sample) < 0) {
 		LOG_DBG("Could not read temperature data");
 		return -EIO;
 	}
@@ -54,7 +54,7 @@ static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan)
 }
 
 static void bma280_channel_accel_convert(struct sensor_value *val,
-					s64_t raw_val)
+					int64_t raw_val)
 {
 	/*
 	 * accel_val = (sample * BMA280_PMU_FULL_RAGE) /
@@ -116,7 +116,7 @@ static const struct sensor_driver_api bma280_driver_api = {
 int bma280_init(struct device *dev)
 {
 	struct bma280_data *drv_data = dev->driver_data;
-	u8_t id = 0U;
+	uint8_t id = 0U;
 
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
 	if (drv_data->i2c == NULL) {
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index 7711b409c3..a6016da1dd 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -115,10 +115,10 @@
 
 struct bma280_data {
 	struct device *i2c;
-	s16_t x_sample;
-	s16_t y_sample;
-	s16_t z_sample;
-	s8_t temp_sample;
+	int16_t x_sample;
+	int16_t y_sample;
+	int16_t z_sample;
+	int8_t temp_sample;
 
 #ifdef CONFIG_BMA280_TRIGGER
 	struct device *dev;
diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c
index b114c2891e..bea3f4d0c5 100644
--- a/drivers/sensor/bma280/bma280_trigger.c
+++ b/drivers/sensor/bma280/bma280_trigger.c
@@ -35,7 +35,7 @@ int bma280_attr_set(struct device *dev,
 		    const struct sensor_value *val)
 {
 	struct bma280_data *drv_data = dev->driver_data;
-	u64_t slope_th;
+	uint64_t slope_th;
 
 	if (chan != SENSOR_CHAN_ACCEL_XYZ) {
 		return -ENOTSUP;
@@ -43,10 +43,10 @@ int bma280_attr_set(struct device *dev,
 
 	if (attr == SENSOR_ATTR_SLOPE_TH) {
 		/* slope_th = (val * 10^6 * 2^10) / BMA280_PMU_FULL_RAGE */
-		slope_th = (u64_t)val->val1 * 1000000U + (u64_t)val->val2;
+		slope_th = (uint64_t)val->val1 * 1000000U + (uint64_t)val->val2;
 		slope_th = (slope_th * (1 << 10)) / BMA280_PMU_FULL_RANGE;
 		if (i2c_reg_write_byte(drv_data->i2c, BMA280_I2C_ADDRESS,
-				       BMA280_REG_SLOPE_TH, (u8_t)slope_th)
+				       BMA280_REG_SLOPE_TH, (uint8_t)slope_th)
 				       < 0) {
 			LOG_DBG("Could not set slope threshold");
 			return -EIO;
@@ -68,7 +68,7 @@ int bma280_attr_set(struct device *dev,
 }
 
 static void bma280_gpio_callback(struct device *dev,
-				 struct gpio_callback *cb, u32_t pins)
+				 struct gpio_callback *cb, uint32_t pins)
 {
 	struct bma280_data *drv_data =
 		CONTAINER_OF(cb, struct bma280_data, gpio_cb);
@@ -88,7 +88,7 @@ static void bma280_thread_cb(void *arg)
 {
 	struct device *dev = arg;
 	struct bma280_data *drv_data = dev->driver_data;
-	u8_t status = 0U;
+	uint8_t status = 0U;
 	int err = 0;
 
 	/* check for data ready */
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index 372a71e98a..72bf552321 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(BMC150_MAGN, CONFIG_SENSOR_LOG_LEVEL);
 
 static const struct {
 	int freq;
-	u8_t reg_val;
+	uint8_t reg_val;
 } bmc150_magn_samp_freq_table[] = { {2, 0x01},
 				    {6, 0x02},
 				    {8, 0x03},
@@ -38,9 +38,9 @@ static const struct {
 				    {30, 0x07} };
 
 static const struct bmc150_magn_preset {
-	u8_t rep_xy;
-	u8_t rep_z;
-	u8_t odr;
+	uint8_t rep_xy;
+	uint8_t rep_z;
+	uint8_t odr;
 } bmc150_magn_presets_table[] = {
 	[LOW_POWER_PRESET] = {3, 3, 10},
 	[REGULAR_PRESET] = {9, 15, 10},
@@ -88,11 +88,11 @@ static int bmc150_magn_set_power_mode(struct device *dev,
 	return -ENOTSUP;
 }
 
-static int bmc150_magn_set_odr(struct device *dev, u8_t val)
+static int bmc150_magn_set_odr(struct device *dev, uint8_t val)
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(bmc150_magn_samp_freq_table); ++i) {
 		if (val <= bmc150_magn_samp_freq_table[i].freq) {
@@ -114,7 +114,7 @@ static int bmc150_magn_read_rep_xy(struct device *dev)
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      BMC150_MAGN_REG_REP_XY, &reg_val) < 0) {
@@ -130,7 +130,7 @@ static int bmc150_magn_read_rep_z(struct device *dev)
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      BMC150_MAGN_REG_REP_Z, &reg_val) < 0) {
@@ -176,7 +176,7 @@ static int bmc150_magn_read_odr(struct device *dev)
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t i, odr_val, reg_val;
+	uint8_t i, odr_val, reg_val;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      BMC150_MAGN_REG_OPMODE_ODR, &reg_val) < 0) {
@@ -238,11 +238,11 @@ static int bmc150_magn_write_rep_z(struct device *dev, int val)
  * Datasheet part 4.3.4, provided by Bosch here:
  * https://github.com/BoschSensortec/BMM050_driver
  */
-static s32_t bmc150_magn_compensate_xy(struct bmc150_magn_trim_regs *tregs,
-					s16_t xy, u16_t rhall, bool is_x)
+static int32_t bmc150_magn_compensate_xy(struct bmc150_magn_trim_regs *tregs,
+					int16_t xy, uint16_t rhall, bool is_x)
 {
-	s8_t txy1, txy2;
-	s16_t val;
+	int8_t txy1, txy2;
+	int16_t val;
 
 	if (xy == BMC150_MAGN_XY_OVERFLOW_VAL) {
 		return INT32_MIN;
@@ -260,30 +260,30 @@ static s32_t bmc150_magn_compensate_xy(struct bmc150_magn_trim_regs *tregs,
 		txy2 = tregs->y2;
 	}
 
-	val = ((s16_t)(((u16_t)((((s32_t)tregs->xyz1) << 14) / rhall)) -
-	      ((u16_t)0x4000)));
-	val = ((s16_t)((((s32_t)xy) * ((((((((s32_t)tregs->xy2) *
-	      ((((s32_t)val) * ((s32_t)val)) >> 7)) + (((s32_t)val) *
-	      ((s32_t)(((s16_t)tregs->xy1) << 7)))) >> 9) +
-	      ((s32_t)0x100000)) * ((s32_t)(((s16_t)txy2) +
-	      ((s16_t)0xA0)))) >> 12)) >> 13)) + (((s16_t)txy1) << 3);
+	val = ((int16_t)(((uint16_t)((((int32_t)tregs->xyz1) << 14) / rhall)) -
+	      ((uint16_t)0x4000)));
+	val = ((int16_t)((((int32_t)xy) * ((((((((int32_t)tregs->xy2) *
+	      ((((int32_t)val) * ((int32_t)val)) >> 7)) + (((int32_t)val) *
+	      ((int32_t)(((int16_t)tregs->xy1) << 7)))) >> 9) +
+	      ((int32_t)0x100000)) * ((int32_t)(((int16_t)txy2) +
+	      ((int16_t)0xA0)))) >> 12)) >> 13)) + (((int16_t)txy1) << 3);
 
-	return (s32_t)val;
+	return (int32_t)val;
 }
 
-static s32_t bmc150_magn_compensate_z(struct bmc150_magn_trim_regs *tregs,
-					s16_t z, u16_t rhall)
+static int32_t bmc150_magn_compensate_z(struct bmc150_magn_trim_regs *tregs,
+					int16_t z, uint16_t rhall)
 {
-	s32_t val;
+	int32_t val;
 
 	if (z == BMC150_MAGN_Z_OVERFLOW_VAL) {
 		return INT32_MIN;
 	}
 
-	val = (((((s32_t)(z - tregs->z4)) << 15) - ((((s32_t)tregs->z3) *
-	      ((s32_t)(((s16_t)rhall) - ((s16_t)tregs->xyz1)))) >> 2)) /
-	      (tregs->z2 + ((s16_t)(((((s32_t)tregs->z1) *
-	      ((((s16_t)rhall) << 1))) + (1 << 15)) >> 16))));
+	val = (((((int32_t)(z - tregs->z4)) << 15) - ((((int32_t)tregs->z3) *
+	      ((int32_t)(((int16_t)rhall) - ((int16_t)tregs->xyz1)))) >> 2)) /
+	      (tregs->z2 + ((int16_t)(((((int32_t)tregs->z1) *
+	      ((((int16_t)rhall) << 1))) + (1 << 15)) >> 16))));
 
 	return val;
 }
@@ -293,25 +293,25 @@ static int bmc150_magn_sample_fetch(struct device *dev,
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u16_t values[BMC150_MAGN_AXIS_XYZR_MAX];
-	s16_t raw_x, raw_y, raw_z;
-	u16_t rhall;
+	uint16_t values[BMC150_MAGN_AXIS_XYZR_MAX];
+	int16_t raw_x, raw_y, raw_z;
+	uint16_t rhall;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
 			chan == SENSOR_CHAN_MAGN_XYZ);
 
 	if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr,
-			   BMC150_MAGN_REG_X_L, (u8_t *)values,
+			   BMC150_MAGN_REG_X_L, (uint8_t *)values,
 			   sizeof(values)) < 0) {
 		LOG_ERR("failed to read sample");
 		return -EIO;
 	}
 
-	raw_x = (s16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_X]) >>
+	raw_x = (int16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_X]) >>
 		BMC150_MAGN_SHIFT_XY_L;
-	raw_y = (s16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_Y]) >>
+	raw_y = (int16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_Y]) >>
 		BMC150_MAGN_SHIFT_XY_L;
-	raw_z = (s16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_Z]) >>
+	raw_z = (int16_t)sys_le16_to_cpu(values[BMC150_MAGN_AXIS_Z]) >>
 		BMC150_MAGN_SHIFT_Z_L;
 	rhall = sys_le16_to_cpu(values[BMC150_MAGN_RHALL]) >>
 		BMC150_MAGN_SHIFT_RHALL_L;
@@ -329,7 +329,7 @@ static void bmc150_magn_convert(struct sensor_value *val, int raw_val)
 {
 	/* val = raw_val / 1600 */
 	val->val1 = raw_val / 1600;
-	val->val2 = ((s32_t)raw_val * (1000000 / 1600)) % 1000000;
+	val->val2 = ((int32_t)raw_val * (1000000 / 1600)) % 1000000;
 }
 
 static int bmc150_magn_channel_get(struct device *dev,
@@ -453,7 +453,7 @@ static int bmc150_magn_attr_set(struct device *dev,
 			return -ENOTSUP;
 		}
 
-		if (bmc150_magn_set_odr(dev, (u8_t)(val->val1)) < 0) {
+		if (bmc150_magn_set_odr(dev, (uint8_t)(val->val1)) < 0) {
 			return -EIO;
 		}
 		break;
@@ -486,7 +486,7 @@ static int bmc150_magn_init_chip(struct device *dev)
 {
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 	struct bmc150_magn_preset preset;
 
 	bmc150_magn_set_power_mode(dev, BMC150_MAGN_POWER_MODE_NORMAL, 0);
@@ -540,7 +540,7 @@ static int bmc150_magn_init_chip(struct device *dev)
 	}
 
 	if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr,
-			   BMC150_MAGN_REG_TRIM_START, (u8_t *)&data->tregs,
+			   BMC150_MAGN_REG_TRIM_START, (uint8_t *)&data->tregs,
 			   sizeof(data->tregs)) < 0) {
 		LOG_ERR("failed to read trim regs");
 		goto err_poweroff;
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h
index 49c5be0194..c82709a1fa 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.h
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.h
@@ -91,25 +91,25 @@ struct bmc150_magn_config {
 	gpio_pin_t gpio_drdy_int_pin;
 	gpio_dt_flags_t gpio_drdy_int_flags;
 #endif
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 	char *i2c_master_dev_name;
 };
 
 struct bmc150_magn_trim_regs {
-	s8_t x1;
-	s8_t y1;
-	u16_t reserved1;
-	u8_t reserved2;
-	s16_t z4;
-	s8_t x2;
-	s8_t y2;
-	u16_t reserved3;
-	s16_t z2;
-	u16_t z1;
-	u16_t xyz1;
-	s16_t z3;
-	s8_t xy2;
-	u8_t xy1;
+	int8_t x1;
+	int8_t y1;
+	uint16_t reserved1;
+	uint8_t reserved2;
+	int16_t z4;
+	int8_t x2;
+	int8_t y2;
+	uint16_t reserved3;
+	int16_t z2;
+	uint16_t z1;
+	uint16_t xyz1;
+	int16_t z3;
+	int8_t xy2;
+	uint8_t xy1;
 } __packed;
 
 struct bmc150_magn_data {
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
index ed6014b4c2..8c7c512095 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
@@ -37,7 +37,7 @@ int bmc150_magn_trigger_set(struct device *dev,
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config * const config =
 					dev->config_info;
-	u8_t state;
+	uint8_t state;
 
 #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY)
 	if (trig->type == SENSOR_TRIG_DATA_READY) {
@@ -70,7 +70,7 @@ int bmc150_magn_trigger_set(struct device *dev,
 
 static void bmc150_magn_gpio_drdy_callback(struct device *dev,
 					   struct gpio_callback *cb,
-					   u32_t pins)
+					   uint32_t pins)
 {
 	struct bmc150_magn_data *data =
 		CONTAINER_OF(cb, struct bmc150_magn_data, gpio_cb);
@@ -87,7 +87,7 @@ static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3)
 	struct device *dev = (struct device *) arg1;
 	struct bmc150_magn_data *data = dev->driver_data;
 	const struct bmc150_magn_config *config = dev->config_info;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	while (1) {
 		k_sem_take(&data->sem, K_FOREVER);
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index 6bcab39b16..46a597634f 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -48,34 +48,34 @@ struct bme280_data {
 #endif
 
 	/* Compensation parameters. */
-	u16_t dig_t1;
-	s16_t dig_t2;
-	s16_t dig_t3;
-	u16_t dig_p1;
-	s16_t dig_p2;
-	s16_t dig_p3;
-	s16_t dig_p4;
-	s16_t dig_p5;
-	s16_t dig_p6;
-	s16_t dig_p7;
-	s16_t dig_p8;
-	s16_t dig_p9;
-	u8_t dig_h1;
-	s16_t dig_h2;
-	u8_t dig_h3;
-	s16_t dig_h4;
-	s16_t dig_h5;
-	s8_t dig_h6;
+	uint16_t dig_t1;
+	int16_t dig_t2;
+	int16_t dig_t3;
+	uint16_t dig_p1;
+	int16_t dig_p2;
+	int16_t dig_p3;
+	int16_t dig_p4;
+	int16_t dig_p5;
+	int16_t dig_p6;
+	int16_t dig_p7;
+	int16_t dig_p8;
+	int16_t dig_p9;
+	uint8_t dig_h1;
+	int16_t dig_h2;
+	uint8_t dig_h3;
+	int16_t dig_h4;
+	int16_t dig_h5;
+	int8_t dig_h6;
 
 	/* Compensated values. */
-	s32_t comp_temp;
-	u32_t comp_press;
-	u32_t comp_humidity;
+	int32_t comp_temp;
+	uint32_t comp_press;
+	uint32_t comp_humidity;
 
 	/* Carryover between temperature and pressure/humidity compensation. */
-	s32_t t_fine;
+	int32_t t_fine;
 
-	u8_t chip_id;
+	uint8_t chip_id;
 };
 
 struct bme280_spi_cfg {
@@ -88,7 +88,7 @@ union bme280_bus_config {
 	const struct bme280_spi_cfg *spi_cfg;
 #endif
 #if BME280_BUS_I2C
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #endif
 };
 
@@ -100,10 +100,10 @@ struct bme280_config {
 
 typedef int (*bme280_reg_read_fn)(struct device *bus,
 				  const union bme280_bus_config *bus_config,
-				  u8_t start, u8_t *buf, int size);
+				  uint8_t start, uint8_t *buf, int size);
 typedef int (*bme280_reg_write_fn)(struct device *bus,
 				   const union bme280_bus_config *bus_config,
-				   u8_t reg, u8_t val);
+				   uint8_t reg, uint8_t val);
 
 struct bme280_reg_io {
 	bme280_reg_read_fn read;
@@ -139,9 +139,9 @@ to_spi_config(const union bme280_bus_config *bus_config)
 
 static int bme280_reg_read_spi(struct device *bus,
 			       const union bme280_bus_config *bus_config,
-			       u8_t start, u8_t *buf, int size)
+			       uint8_t start, uint8_t *buf, int size)
 {
-	u8_t addr;
+	uint8_t addr;
 	const struct spi_buf tx_buf = {
 		.buf = &addr,
 		.len = 1
@@ -180,9 +180,9 @@ static int bme280_reg_read_spi(struct device *bus,
 
 static int bme280_reg_write_spi(struct device *bus,
 				const union bme280_bus_config *bus_config,
-				u8_t reg, u8_t val)
+				uint8_t reg, uint8_t val)
 {
-	u8_t cmd[2] = { reg & 0x7F, val };
+	uint8_t cmd[2] = { reg & 0x7F, val };
 	const struct spi_buf tx_buf = {
 		.buf = cmd,
 		.len = 2
@@ -210,7 +210,7 @@ static const struct bme280_reg_io bme280_reg_io_spi = {
 #if BME280_BUS_I2C
 static int bme280_reg_read_i2c(struct device *bus,
 			       const union bme280_bus_config *bus_config,
-			       u8_t start, u8_t *buf, int size)
+			       uint8_t start, uint8_t *buf, int size)
 {
 	return i2c_burst_read(bus, bus_config->i2c_addr,
 			      start, buf, size);
@@ -218,7 +218,7 @@ static int bme280_reg_read_i2c(struct device *bus,
 
 static int bme280_reg_write_i2c(struct device *bus,
 				const union bme280_bus_config *bus_config,
-				u8_t reg, u8_t val)
+				uint8_t reg, uint8_t val)
 {
 	return i2c_reg_write_byte(bus, bus_config->i2c_addr,
 				  reg, val);
@@ -231,13 +231,13 @@ static const struct bme280_reg_io bme280_reg_io_i2c = {
 #endif /* BME280_BUS_I2C */
 
 static inline int bme280_reg_read(struct device *dev,
-				  u8_t start, u8_t *buf, int size)
+				  uint8_t start, uint8_t *buf, int size)
 {
 	return to_config(dev)->reg_io->read(to_bus(dev), to_bus_config(dev),
 					    start, buf, size);
 }
 
-static inline int bme280_reg_write(struct device *dev, u8_t reg, u8_t val)
+static inline int bme280_reg_write(struct device *dev, uint8_t reg, uint8_t val)
 {
 	return to_config(dev)->reg_io->write(to_bus(dev), to_bus_config(dev),
 					     reg, val);
@@ -247,31 +247,31 @@ static inline int bme280_reg_write(struct device *dev, u8_t reg, u8_t val)
  * Compensation code taken from BME280 datasheet, Section 4.2.3
  * "Compensation formula".
  */
-static void bme280_compensate_temp(struct bme280_data *data, s32_t adc_temp)
+static void bme280_compensate_temp(struct bme280_data *data, int32_t adc_temp)
 {
-	s32_t var1, var2;
+	int32_t var1, var2;
 
-	var1 = (((adc_temp >> 3) - ((s32_t)data->dig_t1 << 1)) *
-		((s32_t)data->dig_t2)) >> 11;
-	var2 = (((((adc_temp >> 4) - ((s32_t)data->dig_t1)) *
-		  ((adc_temp >> 4) - ((s32_t)data->dig_t1))) >> 12) *
-		((s32_t)data->dig_t3)) >> 14;
+	var1 = (((adc_temp >> 3) - ((int32_t)data->dig_t1 << 1)) *
+		((int32_t)data->dig_t2)) >> 11;
+	var2 = (((((adc_temp >> 4) - ((int32_t)data->dig_t1)) *
+		  ((adc_temp >> 4) - ((int32_t)data->dig_t1))) >> 12) *
+		((int32_t)data->dig_t3)) >> 14;
 
 	data->t_fine = var1 + var2;
 	data->comp_temp = (data->t_fine * 5 + 128) >> 8;
 }
 
-static void bme280_compensate_press(struct bme280_data *data, s32_t adc_press)
+static void bme280_compensate_press(struct bme280_data *data, int32_t adc_press)
 {
-	s64_t var1, var2, p;
+	int64_t var1, var2, p;
 
-	var1 = ((s64_t)data->t_fine) - 128000;
-	var2 = var1 * var1 * (s64_t)data->dig_p6;
-	var2 = var2 + ((var1 * (s64_t)data->dig_p5) << 17);
-	var2 = var2 + (((s64_t)data->dig_p4) << 35);
-	var1 = ((var1 * var1 * (s64_t)data->dig_p3) >> 8) +
-		((var1 * (s64_t)data->dig_p2) << 12);
-	var1 = (((((s64_t)1) << 47) + var1)) * ((s64_t)data->dig_p1) >> 33;
+	var1 = ((int64_t)data->t_fine) - 128000;
+	var2 = var1 * var1 * (int64_t)data->dig_p6;
+	var2 = var2 + ((var1 * (int64_t)data->dig_p5) << 17);
+	var2 = var2 + (((int64_t)data->dig_p4) << 35);
+	var1 = ((var1 * var1 * (int64_t)data->dig_p3) >> 8) +
+		((var1 * (int64_t)data->dig_p2) << 12);
+	var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)data->dig_p1) >> 33;
 
 	/* Avoid exception caused by division by zero. */
 	if (var1 == 0) {
@@ -281,36 +281,36 @@ static void bme280_compensate_press(struct bme280_data *data, s32_t adc_press)
 
 	p = 1048576 - adc_press;
 	p = (((p << 31) - var2) * 3125) / var1;
-	var1 = (((s64_t)data->dig_p9) * (p >> 13) * (p >> 13)) >> 25;
-	var2 = (((s64_t)data->dig_p8) * p) >> 19;
-	p = ((p + var1 + var2) >> 8) + (((s64_t)data->dig_p7) << 4);
+	var1 = (((int64_t)data->dig_p9) * (p >> 13) * (p >> 13)) >> 25;
+	var2 = (((int64_t)data->dig_p8) * p) >> 19;
+	p = ((p + var1 + var2) >> 8) + (((int64_t)data->dig_p7) << 4);
 
-	data->comp_press = (u32_t)p;
+	data->comp_press = (uint32_t)p;
 }
 
 static void bme280_compensate_humidity(struct bme280_data *data,
-				       s32_t adc_humidity)
+				       int32_t adc_humidity)
 {
-	s32_t h;
+	int32_t h;
 
-	h = (data->t_fine - ((s32_t)76800));
-	h = ((((adc_humidity << 14) - (((s32_t)data->dig_h4) << 20) -
-		(((s32_t)data->dig_h5) * h)) + ((s32_t)16384)) >> 15) *
-		(((((((h * ((s32_t)data->dig_h6)) >> 10) * (((h *
-		((s32_t)data->dig_h3)) >> 11) + ((s32_t)32768))) >> 10) +
-		((s32_t)2097152)) * ((s32_t)data->dig_h2) + 8192) >> 14);
+	h = (data->t_fine - ((int32_t)76800));
+	h = ((((adc_humidity << 14) - (((int32_t)data->dig_h4) << 20) -
+		(((int32_t)data->dig_h5) * h)) + ((int32_t)16384)) >> 15) *
+		(((((((h * ((int32_t)data->dig_h6)) >> 10) * (((h *
+		((int32_t)data->dig_h3)) >> 11) + ((int32_t)32768))) >> 10) +
+		((int32_t)2097152)) * ((int32_t)data->dig_h2) + 8192) >> 14);
 	h = (h - (((((h >> 15) * (h >> 15)) >> 7) *
-		((s32_t)data->dig_h1)) >> 4));
+		((int32_t)data->dig_h1)) >> 4));
 	h = (h > 419430400 ? 419430400 : h);
 
-	data->comp_humidity = (u32_t)(h >> 12);
+	data->comp_humidity = (uint32_t)(h >> 12);
 }
 
 static int bme280_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct bme280_data *data = to_data(dev);
-	u8_t buf[8];
-	s32_t adc_press, adc_temp, adc_humidity;
+	uint8_t buf[8];
+	int32_t adc_press, adc_temp, adc_humidity;
 	int size = 6;
 	int ret;
 
@@ -402,12 +402,12 @@ static const struct sensor_driver_api bme280_api_funcs = {
 static int bme280_read_compensation(struct device *dev)
 {
 	struct bme280_data *data = to_data(dev);
-	u16_t buf[12];
-	u8_t hbuf[7];
+	uint16_t buf[12];
+	uint8_t hbuf[7];
 	int err = 0;
 
 	err = bme280_reg_read(dev, BME280_REG_COMP_START,
-			      (u8_t *)buf, sizeof(buf));
+			      (uint8_t *)buf, sizeof(buf));
 
 	if (err < 0) {
 		LOG_DBG("COMP_START read failed: %d", err);
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index c52ec92fba..dc0996176c 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/drivers/sensor/bme680/bme680.c
@@ -24,7 +24,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(bme680, CONFIG_SENSOR_LOG_LEVEL);
 
-static int bme680_reg_read(struct bme680_data *data, u8_t start, u8_t *buf,
+static int bme680_reg_read(struct bme680_data *data, uint8_t start, uint8_t *buf,
 			   int size)
 {
 	return i2c_burst_read(data->i2c_master, data->i2c_slave_addr, start,
@@ -32,86 +32,86 @@ static int bme680_reg_read(struct bme680_data *data, u8_t start, u8_t *buf,
 	return 0;
 }
 
-static int bme680_reg_write(struct bme680_data *data, u8_t reg, u8_t val)
+static int bme680_reg_write(struct bme680_data *data, uint8_t reg, uint8_t val)
 {
 	return i2c_reg_write_byte(data->i2c_master, data->i2c_slave_addr,
 				  reg, val);
 	return 0;
 }
 
-static void bme680_calc_temp(struct bme680_data *data, u32_t adc_temp)
+static void bme680_calc_temp(struct bme680_data *data, uint32_t adc_temp)
 {
-	s64_t var1, var2, var3;
+	int64_t var1, var2, var3;
 
-	var1 = ((s32_t)adc_temp >> 3) - ((s32_t)data->par_t1 << 1);
-	var2 = (var1 * (s32_t)data->par_t2) >> 11;
+	var1 = ((int32_t)adc_temp >> 3) - ((int32_t)data->par_t1 << 1);
+	var2 = (var1 * (int32_t)data->par_t2) >> 11;
 	var3 = ((var1 >> 1) * (var1 >> 1)) >> 12;
-	var3 = ((var3) * ((s32_t)data->par_t3 << 4)) >> 14;
+	var3 = ((var3) * ((int32_t)data->par_t3 << 4)) >> 14;
 	data->t_fine = var2 + var3;
 	data->calc_temp = ((data->t_fine * 5) + 128) >> 8;
 }
 
-static void bme680_calc_press(struct bme680_data *data, u32_t adc_press)
+static void bme680_calc_press(struct bme680_data *data, uint32_t adc_press)
 {
-	s32_t var1, var2, var3, calc_press;
+	int32_t var1, var2, var3, calc_press;
 
-	var1 = (((s32_t)data->t_fine) >> 1) - 64000;
+	var1 = (((int32_t)data->t_fine) >> 1) - 64000;
 	var2 = ((((var1 >> 2) * (var1 >> 2)) >> 11) *
-		(s32_t)data->par_p6) >> 2;
-	var2 = var2 + ((var1 * (s32_t)data->par_p5) << 1);
-	var2 = (var2 >> 2) + ((s32_t)data->par_p4 << 16);
+		(int32_t)data->par_p6) >> 2;
+	var2 = var2 + ((var1 * (int32_t)data->par_p5) << 1);
+	var2 = (var2 >> 2) + ((int32_t)data->par_p4 << 16);
 	var1 = (((((var1 >> 2) * (var1 >> 2)) >> 13) *
-		 ((s32_t)data->par_p3 << 5)) >> 3)
-	       + (((s32_t)data->par_p2 * var1) >> 1);
+		 ((int32_t)data->par_p3 << 5)) >> 3)
+	       + (((int32_t)data->par_p2 * var1) >> 1);
 	var1 = var1 >> 18;
-	var1 = ((32768 + var1) * (s32_t)data->par_p1) >> 15;
+	var1 = ((32768 + var1) * (int32_t)data->par_p1) >> 15;
 	calc_press = 1048576 - adc_press;
-	calc_press = (calc_press - (var2 >> 12)) * ((u32_t)3125);
+	calc_press = (calc_press - (var2 >> 12)) * ((uint32_t)3125);
 	/* This max value is used to provide precedence to multiplication or
 	 * division in the pressure calculation equation to achieve least
 	 * loss of precision and avoiding overflows.
 	 * i.e Comparing value, signed int 32bit (1 << 30)
 	 */
-	if (calc_press >= (s32_t)0x40000000) {
+	if (calc_press >= (int32_t)0x40000000) {
 		calc_press = ((calc_press / var1) << 1);
 	} else {
 		calc_press = ((calc_press << 1) / var1);
 	}
-	var1 = ((s32_t)data->par_p9 *
-		(s32_t)(((calc_press >> 3)
+	var1 = ((int32_t)data->par_p9 *
+		(int32_t)(((calc_press >> 3)
 			 * (calc_press >> 3)) >> 13)) >> 12;
-	var2 = ((s32_t)(calc_press >> 2) * (s32_t)data->par_p8) >> 13;
-	var3 = ((s32_t)(calc_press >> 8) * (s32_t)(calc_press >> 8)
-		* (s32_t)(calc_press >> 8)
-		* (s32_t)data->par_p10) >> 17;
+	var2 = ((int32_t)(calc_press >> 2) * (int32_t)data->par_p8) >> 13;
+	var3 = ((int32_t)(calc_press >> 8) * (int32_t)(calc_press >> 8)
+		* (int32_t)(calc_press >> 8)
+		* (int32_t)data->par_p10) >> 17;
 
 	data->calc_press = calc_press
 			   + ((var1 + var2 + var3
-			       + ((s32_t)data->par_p7 << 7)) >> 4);
+			       + ((int32_t)data->par_p7 << 7)) >> 4);
 }
 
-static void bme680_calc_humidity(struct bme680_data *data, u16_t adc_humidity)
+static void bme680_calc_humidity(struct bme680_data *data, uint16_t adc_humidity)
 {
-	s32_t var1, var2_1, var2_2, var2, var3, var4, var5, var6;
-	s32_t temp_scaled, calc_hum;
+	int32_t var1, var2_1, var2_2, var2, var3, var4, var5, var6;
+	int32_t temp_scaled, calc_hum;
 
-	temp_scaled = (((s32_t)data->t_fine * 5) + 128) >> 8;
-	var1 = (s32_t)(adc_humidity - ((s32_t)((s32_t)data->par_h1 * 16))) -
-	       (((temp_scaled * (s32_t)data->par_h3)
-		 / ((s32_t)100)) >> 1);
-	var2_1 = (s32_t)data->par_h2;
-	var2_2 = ((temp_scaled * (s32_t)data->par_h4) / (s32_t)100)
-		 + (((temp_scaled * ((temp_scaled * (s32_t)data->par_h5)
-				     / ((s32_t)100))) >> 6) / ((s32_t)100))
-		 +  (s32_t)(1 << 14);
+	temp_scaled = (((int32_t)data->t_fine * 5) + 128) >> 8;
+	var1 = (int32_t)(adc_humidity - ((int32_t)((int32_t)data->par_h1 * 16))) -
+	       (((temp_scaled * (int32_t)data->par_h3)
+		 / ((int32_t)100)) >> 1);
+	var2_1 = (int32_t)data->par_h2;
+	var2_2 = ((temp_scaled * (int32_t)data->par_h4) / (int32_t)100)
+		 + (((temp_scaled * ((temp_scaled * (int32_t)data->par_h5)
+				     / ((int32_t)100))) >> 6) / ((int32_t)100))
+		 +  (int32_t)(1 << 14);
 	var2 = (var2_1 * var2_2) >> 10;
 	var3 = var1 * var2;
-	var4 = (s32_t)data->par_h6 << 7;
-	var4 = ((var4) + ((temp_scaled * (s32_t)data->par_h7) /
-			  ((s32_t)100))) >> 4;
+	var4 = (int32_t)data->par_h6 << 7;
+	var4 = ((var4) + ((temp_scaled * (int32_t)data->par_h7) /
+			  ((int32_t)100))) >> 4;
 	var5 = ((var3 >> 14) * (var3 >> 14)) >> 10;
 	var6 = (var4 * var5) >> 1;
-	calc_hum = (((var3 + var6) >> 10) * ((s32_t)1000)) >> 12;
+	calc_hum = (((var3 + var6) >> 10) * ((int32_t)1000)) >> 12;
 
 	if (calc_hum > 100000) { /* Cap at 100%rH */
 		calc_hum = 100000;
@@ -122,37 +122,37 @@ static void bme680_calc_humidity(struct bme680_data *data, u16_t adc_humidity)
 	data->calc_humidity = calc_hum;
 }
 
-static void bme680_calc_gas_resistance(struct bme680_data *data, u8_t gas_range,
-				       u16_t adc_gas_res)
+static void bme680_calc_gas_resistance(struct bme680_data *data, uint8_t gas_range,
+				       uint16_t adc_gas_res)
 {
-	s64_t var1, var3;
-	u64_t var2;
+	int64_t var1, var3;
+	uint64_t var2;
 
-	static const u32_t look_up1[16] = { 2147483647, 2147483647, 2147483647,
+	static const uint32_t look_up1[16] = { 2147483647, 2147483647, 2147483647,
 			       2147483647, 2147483647, 2126008810, 2147483647,
 			       2130303777, 2147483647, 2147483647, 2143188679,
 			       2136746228, 2147483647, 2126008810, 2147483647,
 			       2147483647 };
 
-	static const u32_t look_up2[16] = { 4096000000, 2048000000, 1024000000,
+	static const uint32_t look_up2[16] = { 4096000000, 2048000000, 1024000000,
 			       512000000, 255744255, 127110228, 64000000,
 			       32258064, 16016016, 8000000, 4000000, 2000000,
 			       1000000, 500000, 250000, 125000 };
 
-	var1 = (s64_t)((1340 + (5 * (s64_t)data->range_sw_err)) *
-		       ((s64_t)look_up1[gas_range])) >> 16;
-	var2 = (((s64_t)((s64_t)adc_gas_res << 15) - (s64_t)(16777216)) + var1);
-	var3 = (((s64_t)look_up2[gas_range] * (s64_t)var1) >> 9);
-	data->calc_gas_resistance = (u32_t)((var3 + ((s64_t)var2 >> 1))
-					    / (s64_t)var2);
+	var1 = (int64_t)((1340 + (5 * (int64_t)data->range_sw_err)) *
+		       ((int64_t)look_up1[gas_range])) >> 16;
+	var2 = (((int64_t)((int64_t)adc_gas_res << 15) - (int64_t)(16777216)) + var1);
+	var3 = (((int64_t)look_up2[gas_range] * (int64_t)var1) >> 9);
+	data->calc_gas_resistance = (uint32_t)((var3 + ((int64_t)var2 >> 1))
+					    / (int64_t)var2);
 }
 
-static u8_t bme680_calc_res_heat(struct bme680_data *data, u16_t heatr_temp)
+static uint8_t bme680_calc_res_heat(struct bme680_data *data, uint16_t heatr_temp)
 {
-	u8_t heatr_res;
-	s32_t var1, var2, var3, var4, var5;
-	s32_t heatr_res_x100;
-	s32_t amb_temp = 25;    /* Assume ambient temperature to be 25 deg C */
+	uint8_t heatr_res;
+	int32_t var1, var2, var3, var4, var5;
+	int32_t heatr_res_x100;
+	int32_t amb_temp = 25;    /* Assume ambient temperature to be 25 deg C */
 
 	if (heatr_temp > 400) { /* Cap temperature */
 		heatr_temp = 400;
@@ -171,9 +171,9 @@ static u8_t bme680_calc_res_heat(struct bme680_data *data, u16_t heatr_temp)
 	return heatr_res;
 }
 
-static u8_t bme680_calc_gas_wait(u16_t dur)
+static uint8_t bme680_calc_gas_wait(uint16_t dur)
 {
-	u8_t factor = 0, durval;
+	uint8_t factor = 0, durval;
 
 	if (dur >= 0xfc0) {
 		durval = 0xff; /* Max duration*/
@@ -191,10 +191,10 @@ static u8_t bme680_calc_gas_wait(u16_t dur)
 static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct bme680_data *data = dev->driver_data;
-	u8_t buff[BME680_LEN_FIELD] = { 0 };
-	u8_t gas_range;
-	u32_t adc_temp, adc_press;
-	u16_t adc_hum, adc_gas_res;
+	uint8_t buff[BME680_LEN_FIELD] = { 0 };
+	uint8_t gas_range;
+	uint32_t adc_temp, adc_press;
+	uint16_t adc_hum, adc_gas_res;
 	int size = BME680_LEN_FIELD;
 	int ret;
 
@@ -208,12 +208,12 @@ static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan)
 	data->new_data = buff[0] & BME680_MSK_NEW_DATA;
 	data->heatr_stab = buff[14] & BME680_MSK_HEATR_STAB;
 
-	adc_press = (u32_t)(((u32_t)buff[2] << 12) | ((u32_t)buff[3] << 4)
-			    | ((u32_t)buff[4] >> 4));
-	adc_temp = (u32_t)(((u32_t)buff[5] << 12) | ((u32_t)buff[6] << 4)
-			   | ((u32_t)buff[7] >> 4));
-	adc_hum = (u16_t)(((u32_t)buff[8] << 8) | (u32_t)buff[9]);
-	adc_gas_res = (u16_t)((u32_t)buff[13] << 2 | (((u32_t)buff[14]) >> 6));
+	adc_press = (uint32_t)(((uint32_t)buff[2] << 12) | ((uint32_t)buff[3] << 4)
+			    | ((uint32_t)buff[4] >> 4));
+	adc_temp = (uint32_t)(((uint32_t)buff[5] << 12) | ((uint32_t)buff[6] << 4)
+			   | ((uint32_t)buff[7] >> 4));
+	adc_hum = (uint16_t)(((uint32_t)buff[8] << 8) | (uint32_t)buff[9]);
+	adc_gas_res = (uint16_t)((uint32_t)buff[13] << 2 | (((uint32_t)buff[14]) >> 6));
 	gas_range = buff[14] & BME680_MSK_GAS_RANGE;
 
 	if (data->new_data) {
@@ -280,7 +280,7 @@ static int bme680_channel_get(struct device *dev, enum sensor_channel chan,
 
 static int bme680_read_compensation(struct bme680_data *data)
 {
-	u8_t buff[BME680_LEN_COEFF_ALL];
+	uint8_t buff[BME680_LEN_COEFF_ALL];
 	int err = 0;
 
 	err = bme680_reg_read(data, BME680_REG_COEFF1, buff, BME680_LEN_COEFF1);
@@ -302,39 +302,39 @@ static int bme680_read_compensation(struct bme680_data *data)
 	}
 
 	/* Temperature related coefficients */
-	data->par_t1 = (u16_t)(BME680_CONCAT_BYTES(buff[32], buff[31]));
-	data->par_t2 = (s16_t)(BME680_CONCAT_BYTES(buff[1], buff[0]));
-	data->par_t3 = (u8_t)(buff[2]);
+	data->par_t1 = (uint16_t)(BME680_CONCAT_BYTES(buff[32], buff[31]));
+	data->par_t2 = (int16_t)(BME680_CONCAT_BYTES(buff[1], buff[0]));
+	data->par_t3 = (uint8_t)(buff[2]);
 
 	/* Pressure related coefficients */
-	data->par_p1 = (u16_t)(BME680_CONCAT_BYTES(buff[5], buff[4]));
-	data->par_p2 = (s16_t)(BME680_CONCAT_BYTES(buff[7], buff[6]));
-	data->par_p3 = (s8_t)buff[8];
-	data->par_p4 = (s16_t)(BME680_CONCAT_BYTES(buff[11], buff[10]));
-	data->par_p5 = (s16_t)(BME680_CONCAT_BYTES(buff[13], buff[12]));
-	data->par_p6 = (s8_t)(buff[15]);
-	data->par_p7 = (s8_t)(buff[14]);
-	data->par_p8 = (s16_t)(BME680_CONCAT_BYTES(buff[19], buff[18]));
-	data->par_p9 = (s16_t)(BME680_CONCAT_BYTES(buff[21], buff[20]));
-	data->par_p10 = (u8_t)(buff[22]);
+	data->par_p1 = (uint16_t)(BME680_CONCAT_BYTES(buff[5], buff[4]));
+	data->par_p2 = (int16_t)(BME680_CONCAT_BYTES(buff[7], buff[6]));
+	data->par_p3 = (int8_t)buff[8];
+	data->par_p4 = (int16_t)(BME680_CONCAT_BYTES(buff[11], buff[10]));
+	data->par_p5 = (int16_t)(BME680_CONCAT_BYTES(buff[13], buff[12]));
+	data->par_p6 = (int8_t)(buff[15]);
+	data->par_p7 = (int8_t)(buff[14]);
+	data->par_p8 = (int16_t)(BME680_CONCAT_BYTES(buff[19], buff[18]));
+	data->par_p9 = (int16_t)(BME680_CONCAT_BYTES(buff[21], buff[20]));
+	data->par_p10 = (uint8_t)(buff[22]);
 
 	/* Humidity related coefficients */
-	data->par_h1 = (u16_t)(((u16_t)buff[25] << 4) | (buff[24] & 0x0f));
-	data->par_h2 = (u16_t)(((u16_t)buff[23] << 4) | ((buff[24]) >> 4));
-	data->par_h3 = (s8_t)buff[26];
-	data->par_h4 = (s8_t)buff[27];
-	data->par_h5 = (s8_t)buff[28];
-	data->par_h6 = (u8_t)buff[29];
-	data->par_h7 = (s8_t)buff[30];
+	data->par_h1 = (uint16_t)(((uint16_t)buff[25] << 4) | (buff[24] & 0x0f));
+	data->par_h2 = (uint16_t)(((uint16_t)buff[23] << 4) | ((buff[24]) >> 4));
+	data->par_h3 = (int8_t)buff[26];
+	data->par_h4 = (int8_t)buff[27];
+	data->par_h5 = (int8_t)buff[28];
+	data->par_h6 = (uint8_t)buff[29];
+	data->par_h7 = (int8_t)buff[30];
 
 	/* Gas heater related coefficients */
-	data->par_gh1 = (s8_t)buff[35];
-	data->par_gh2 = (s16_t)(BME680_CONCAT_BYTES(buff[34], buff[33]));
-	data->par_gh3 = (s8_t)buff[36];
+	data->par_gh1 = (int8_t)buff[35];
+	data->par_gh2 = (int16_t)(BME680_CONCAT_BYTES(buff[34], buff[33]));
+	data->par_gh3 = (int8_t)buff[36];
 
-	data->res_heat_val = (s8_t)buff[37];
+	data->res_heat_val = (int8_t)buff[37];
 	data->res_heat_range = ((buff[39] & BME680_MSK_RH_RANGE) >> 4);
-	data->range_sw_err = ((s8_t)(buff[41] & BME680_MSK_RANGE_SW_ERR)) / 16;
+	data->range_sw_err = ((int8_t)(buff[41] & BME680_MSK_RANGE_SW_ERR)) / 16;
 
 	return 0;
 }
diff --git a/drivers/sensor/bme680/bme680.h b/drivers/sensor/bme680/bme680.h
index 7292845f9a..056514dd57 100644
--- a/drivers/sensor/bme680/bme680.h
+++ b/drivers/sensor/bme680/bme680.h
@@ -117,54 +117,54 @@
 #define BME680_CONFIG_VAL               BME680_FILTER
 #define BME680_CTRL_GAS_1_VAL   0x10
 
-#define BME680_CONCAT_BYTES(msb, lsb) (((u16_t)msb << 8) | (u16_t)lsb)
+#define BME680_CONCAT_BYTES(msb, lsb) (((uint16_t)msb << 8) | (uint16_t)lsb)
 
 struct bme680_data {
 	struct device *i2c_master;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 
 	/* Compensation parameters. */
-	u16_t par_h1;
-	u16_t par_h2;
-	s8_t par_h3;
-	s8_t par_h4;
-	s8_t par_h5;
-	u8_t par_h6;
-	s8_t par_h7;
-	s8_t par_gh1;
-	s16_t par_gh2;
-	s8_t par_gh3;
-	u16_t par_t1;
-	s16_t par_t2;
-	s8_t par_t3;
-	u16_t par_p1;
-	s16_t par_p2;
-	s8_t par_p3;
-	s16_t par_p4;
-	s16_t par_p5;
-	s8_t par_p6;
-	s8_t par_p7;
-	s16_t par_p8;
-	s16_t par_p9;
-	u8_t par_p10;
-	u8_t res_heat_range;
-	s8_t res_heat_val;
-	s8_t range_sw_err;
+	uint16_t par_h1;
+	uint16_t par_h2;
+	int8_t par_h3;
+	int8_t par_h4;
+	int8_t par_h5;
+	uint8_t par_h6;
+	int8_t par_h7;
+	int8_t par_gh1;
+	int16_t par_gh2;
+	int8_t par_gh3;
+	uint16_t par_t1;
+	int16_t par_t2;
+	int8_t par_t3;
+	uint16_t par_p1;
+	int16_t par_p2;
+	int8_t par_p3;
+	int16_t par_p4;
+	int16_t par_p5;
+	int8_t par_p6;
+	int8_t par_p7;
+	int16_t par_p8;
+	int16_t par_p9;
+	uint8_t par_p10;
+	uint8_t res_heat_range;
+	int8_t res_heat_val;
+	int8_t range_sw_err;
 
 	/* Calculated sensor values. */
-	s32_t calc_temp;
-	u32_t calc_press;
-	u32_t calc_humidity;
-	u32_t calc_gas_resistance;
+	int32_t calc_temp;
+	uint32_t calc_press;
+	uint32_t calc_humidity;
+	uint32_t calc_gas_resistance;
 
 	/* Additional information */
-	u8_t new_data;
-	u8_t heatr_stab;
+	uint8_t new_data;
+	uint8_t heatr_stab;
 
 	/* Carryover between temperature and pressure/humidity compensation. */
-	s32_t t_fine;
+	int32_t t_fine;
 
-	u8_t chip_id;
+	uint8_t chip_id;
 };
 
 #endif /* __SENSOR_BME680_H__ */
diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c
index a085c96f05..258f938aab 100644
--- a/drivers/sensor/bmg160/bmg160.c
+++ b/drivers/sensor/bmg160/bmg160.c
@@ -26,15 +26,15 @@ static inline int bmg160_bus_config(struct device *dev)
 {
 	const struct bmg160_device_config *dev_cfg = dev->config_info;
 	struct bmg160_device_data *bmg160 = dev->driver_data;
-	u32_t i2c_cfg;
+	uint32_t i2c_cfg;
 
 	i2c_cfg = I2C_MODE_MASTER | I2C_SPEED_SET(dev_cfg->i2c_speed);
 
 	return i2c_configure(bmg160->i2c, i2c_cfg);
 }
 
-int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data,
-		u8_t len)
+int bmg160_read(struct device *dev, uint8_t reg_addr, uint8_t *data,
+		uint8_t len)
 {
 	const struct bmg160_device_config *dev_cfg = dev->config_info;
 	struct bmg160_device_data *bmg160 = dev->driver_data;
@@ -54,13 +54,13 @@ int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data,
 	return ret;
 }
 
-int bmg160_read_byte(struct device *dev, u8_t reg_addr, u8_t *byte)
+int bmg160_read_byte(struct device *dev, uint8_t reg_addr, uint8_t *byte)
 {
 	return bmg160_read(dev, reg_addr, byte, 1);
 }
 
-static int bmg160_write(struct device *dev, u8_t reg_addr, u8_t *data,
-			u8_t len)
+static int bmg160_write(struct device *dev, uint8_t reg_addr, uint8_t *data,
+			uint8_t len)
 {
 	const struct bmg160_device_config *dev_cfg = dev->config_info;
 	struct bmg160_device_data *bmg160 = dev->driver_data;
@@ -80,13 +80,13 @@ static int bmg160_write(struct device *dev, u8_t reg_addr, u8_t *data,
 	return ret;
 }
 
-int bmg160_write_byte(struct device *dev, u8_t reg_addr, u8_t byte)
+int bmg160_write_byte(struct device *dev, uint8_t reg_addr, uint8_t byte)
 {
 	return bmg160_write(dev, reg_addr, &byte, 1);
 }
 
-int bmg160_update_byte(struct device *dev, u8_t reg_addr, u8_t mask,
-		       u8_t value)
+int bmg160_update_byte(struct device *dev, uint8_t reg_addr, uint8_t mask,
+		       uint8_t value)
 {
 	const struct bmg160_device_config *dev_cfg = dev->config_info;
 	struct bmg160_device_data *bmg160 = dev->driver_data;
@@ -107,15 +107,15 @@ int bmg160_update_byte(struct device *dev, u8_t reg_addr, u8_t mask,
 }
 
 /* Allowed range values, in degrees/sec. */
-static const s16_t bmg160_gyro_range_map[] = {2000, 1000, 500, 250, 125};
+static const int16_t bmg160_gyro_range_map[] = {2000, 1000, 500, 250, 125};
 #define BMG160_GYRO_RANGE_MAP_SIZE	ARRAY_SIZE(bmg160_gyro_range_map)
 
 /* Allowed sampling frequencies, in Hz */
-static const s16_t bmg160_sampling_freq_map[] = {2000, 1000, 400, 200, 100};
+static const int16_t bmg160_sampling_freq_map[] = {2000, 1000, 400, 200, 100};
 #define BMG160_SAMPLING_FREQ_MAP_SIZE	ARRAY_SIZE(bmg160_sampling_freq_map)
 
-static int bmg160_is_val_valid(s16_t val, const s16_t *val_map,
-			       u16_t map_size)
+static int bmg160_is_val_valid(int16_t val, const int16_t *val_map,
+			       uint16_t map_size)
 {
 	int i;
 
@@ -134,7 +134,7 @@ static int bmg160_attr_set(struct device *dev, enum sensor_channel chan,
 {
 	struct bmg160_device_data *bmg160 = dev->driver_data;
 	int idx;
-	u16_t range_dps;
+	uint16_t range_dps;
 
 	if (chan != SENSOR_CHAN_GYRO_XYZ) {
 		return -ENOTSUP;
@@ -192,12 +192,12 @@ static int bmg160_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct bmg160_device_data *bmg160 = dev->driver_data;
 	union {
-		u8_t raw[7];
+		uint8_t raw[7];
 		struct {
-			u16_t x_axis;
-			u16_t y_axis;
-			u16_t z_axis;
-			u8_t temp;
+			uint16_t x_axis;
+			uint16_t y_axis;
+			uint16_t z_axis;
+			uint8_t temp;
 		};
 	} buf __aligned(2);
 
@@ -215,14 +215,14 @@ static int bmg160_sample_fetch(struct device *dev, enum sensor_channel chan)
 }
 
 static void bmg160_to_fixed_point(struct bmg160_device_data *bmg160,
-				  enum sensor_channel chan, s16_t raw,
+				  enum sensor_channel chan, int16_t raw,
 				  struct sensor_value *val)
 {
 	if (chan == SENSOR_CHAN_DIE_TEMP) {
 		val->val1 = 23 + (raw / 2);
 		val->val2 = (raw % 2) * 500000;
 	} else {
-		s32_t converted_val = raw * bmg160->scale;
+		int32_t converted_val = raw * bmg160->scale;
 
 		val->val1 = converted_val / 1000000;
 		val->val2 = converted_val % 1000000;
@@ -233,7 +233,7 @@ static int bmg160_channel_get(struct device *dev, enum sensor_channel chan,
 			      struct sensor_value *val)
 {
 	struct bmg160_device_data *bmg160 = dev->driver_data;
-	s16_t raw_val;
+	int16_t raw_val;
 	int i;
 
 	switch (chan) {
@@ -275,8 +275,8 @@ int bmg160_init(struct device *dev)
 {
 	const struct bmg160_device_config *cfg = dev->config_info;
 	struct bmg160_device_data *bmg160 = dev->driver_data;
-	u8_t chip_id = 0U;
-	u16_t range_dps;
+	uint8_t chip_id = 0U;
+	uint16_t range_dps;
 
 	bmg160->i2c = device_get_binding((char *)cfg->i2c_port);
 	if (!bmg160->i2c) {
diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h
index 916c246468..32d9948cb1 100644
--- a/drivers/sensor/bmg160/bmg160.h
+++ b/drivers/sensor/bmg160/bmg160.h
@@ -179,8 +179,8 @@
 
 struct bmg160_device_config {
 	const char *i2c_port;
-	u16_t i2c_addr;
-	u8_t i2c_speed;
+	uint16_t i2c_addr;
+	uint8_t i2c_speed;
 #ifdef CONFIG_BMG160_TRIGGER
 	gpio_pin_t int_pin;
 	gpio_dt_flags_t int_flags;
@@ -206,23 +206,23 @@ struct bmg160_device_data {
 	sensor_trigger_handler_t anymotion_handler;
 	sensor_trigger_handler_t drdy_handler;
 #endif
-	s16_t raw_gyro_xyz[3];
-	u16_t scale;
-	u8_t range_idx;
+	int16_t raw_gyro_xyz[3];
+	uint16_t scale;
+	uint8_t range_idx;
 
-	s8_t raw_temp;
+	int8_t raw_temp;
 };
 
 int bmg160_trigger_init(struct device *dev);
 int bmg160_trigger_set(struct device *dev,
 		       const struct sensor_trigger *trig,
 		       sensor_trigger_handler_t handler);
-int bmg160_read(struct device *dev, u8_t reg_addr, u8_t *data,
-		u8_t len);
-int bmg160_read_byte(struct device *dev, u8_t reg_addr, u8_t *byte);
-int bmg160_update_byte(struct device *dev, u8_t reg_addr, u8_t mask,
-		       u8_t value);
-int bmg160_write_byte(struct device *dev, u8_t reg_addr, u8_t data);
+int bmg160_read(struct device *dev, uint8_t reg_addr, uint8_t *data,
+		uint8_t len);
+int bmg160_read_byte(struct device *dev, uint8_t reg_addr, uint8_t *byte);
+int bmg160_update_byte(struct device *dev, uint8_t reg_addr, uint8_t mask,
+		       uint8_t value);
+int bmg160_write_byte(struct device *dev, uint8_t reg_addr, uint8_t data);
 int bmg160_slope_config(struct device *dev, enum sensor_attribute attr,
 			const struct sensor_value *val);
 
diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c
index 5e0c9cd712..2094aca1da 100644
--- a/drivers/sensor/bmg160/bmg160_trigger.c
+++ b/drivers/sensor/bmg160/bmg160_trigger.c
@@ -33,7 +33,7 @@ static inline void setup_int(struct device *dev,
 }
 
 static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb,
-				 u32_t pin)
+				 uint32_t pin)
 {
 	struct bmg160_device_data *bmg160 =
 		CONTAINER_OF(cb, struct bmg160_device_data, gpio_cb);
@@ -52,7 +52,7 @@ static int bmg160_anymotion_set(struct device *dev,
 				sensor_trigger_handler_t handler)
 {
 	struct bmg160_device_data *bmg160 = dev->driver_data;
-	u8_t anymotion_en = 0U;
+	uint8_t anymotion_en = 0U;
 
 	if (handler) {
 		anymotion_en = BMG160_ANY_EN_X |
@@ -91,8 +91,8 @@ int bmg160_slope_config(struct device *dev, enum sensor_attribute attr,
 	struct bmg160_device_data *bmg160 = dev->driver_data;
 
 	if (attr == SENSOR_ATTR_SLOPE_TH) {
-		u16_t any_th_dps, range_dps;
-		u8_t any_th_reg_val;
+		uint16_t any_th_dps, range_dps;
+		uint8_t any_th_reg_val;
 
 		any_th_dps = sensor_rad_to_degrees(val);
 		range_dps = BMG160_SCALE_TO_RANGE(bmg160->scale);
@@ -166,7 +166,7 @@ static int bmg160_handle_dataready_int(struct device *dev)
 static void bmg160_handle_int(void *arg)
 {
 	struct device *dev = (struct device *)arg;
-	u8_t status_int[4];
+	uint8_t status_int[4];
 
 	if (bmg160_read(dev, BMG160_REG_INT_STATUS0, status_int, 4) < 0) {
 		return;
diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c
index 97df68b7ff..8d52213f9a 100644
--- a/drivers/sensor/bmi160/bmi160.c
+++ b/drivers/sensor/bmi160/bmi160.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(BMI160, CONFIG_SENSOR_LOG_LEVEL);
 
 struct bmi160_device_data bmi160_data;
 
-static int bmi160_transceive(struct device *dev, u8_t reg,
+static int bmi160_transceive(struct device *dev, uint8_t reg,
 			     bool write, void *data, size_t length)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
@@ -53,17 +53,17 @@ static int bmi160_transceive(struct device *dev, u8_t reg,
 
 	return spi_write(bmi160->spi, &bmi160->spi_cfg, &tx);
 }
-int bmi160_read(struct device *dev, u8_t reg_addr, u8_t *data, u8_t len)
+int bmi160_read(struct device *dev, uint8_t reg_addr, uint8_t *data, uint8_t len)
 {
 	return bmi160_transceive(dev, reg_addr | BIT(7), false, data, len);
 }
 
-int bmi160_byte_read(struct device *dev, u8_t reg_addr, u8_t *byte)
+int bmi160_byte_read(struct device *dev, uint8_t reg_addr, uint8_t *byte)
 {
 	return bmi160_transceive(dev, reg_addr | BIT(7), false, byte, 1);
 }
 
-static int bmi160_word_read(struct device *dev, u8_t reg_addr, u16_t *word)
+static int bmi160_word_read(struct device *dev, uint8_t reg_addr, uint16_t *word)
 {
 	if (bmi160_transceive(dev, reg_addr | BIT(7), false, word, 2) != 0) {
 		return -EIO;
@@ -74,25 +74,25 @@ static int bmi160_word_read(struct device *dev, u8_t reg_addr, u16_t *word)
 	return 0;
 }
 
-int bmi160_byte_write(struct device *dev, u8_t reg_addr, u8_t byte)
+int bmi160_byte_write(struct device *dev, uint8_t reg_addr, uint8_t byte)
 {
 	return bmi160_transceive(dev, reg_addr & 0x7F, true, &byte, 1);
 }
 
-int bmi160_word_write(struct device *dev, u8_t reg_addr, u16_t word)
+int bmi160_word_write(struct device *dev, uint8_t reg_addr, uint16_t word)
 {
-	u8_t tx_word[2] = {
-		(u8_t)(word & 0xff),
-		(u8_t)(word >> 8)
+	uint8_t tx_word[2] = {
+		(uint8_t)(word & 0xff),
+		(uint8_t)(word >> 8)
 	};
 
 	return bmi160_transceive(dev, reg_addr & 0x7F, true, tx_word, 2);
 }
 
-int bmi160_reg_field_update(struct device *dev, u8_t reg_addr,
-			    u8_t pos, u8_t mask, u8_t val)
+int bmi160_reg_field_update(struct device *dev, uint8_t reg_addr,
+			    uint8_t pos, uint8_t mask, uint8_t val)
 {
-	u8_t old_val;
+	uint8_t old_val;
 
 	if (bmi160_byte_read(dev, reg_addr, &old_val) < 0) {
 		return -EIO;
@@ -105,8 +105,8 @@ int bmi160_reg_field_update(struct device *dev, u8_t reg_addr,
 static int bmi160_pmu_set(struct device *dev, union bmi160_pmu_status *pmu_sts)
 {
 	struct {
-		u8_t cmd;
-		u16_t delay_us; /* values taken from page 82 */
+		uint8_t cmd;
+		uint16_t delay_us; /* values taken from page 82 */
 	} cmds[] = {
 		{BMI160_CMD_PMU_MAG | pmu_sts->mag, 350},
 		{BMI160_CMD_PMU_ACC | pmu_sts->acc, 3200},
@@ -158,12 +158,12 @@ static int bmi160_pmu_set(struct device *dev, union bmi160_pmu_status *pmu_sts)
  * Output data rate map with allowed frequencies:
  * freq = freq_int + freq_milli / 1000
  *
- * Since we don't need a finer frequency resolution than milliHz, use u16_t
+ * Since we don't need a finer frequency resolution than milliHz, use uint16_t
  * to save some flash.
  */
 struct {
-	u16_t freq_int;
-	u16_t freq_milli; /* User should convert to uHz before setting the
+	uint16_t freq_int;
+	uint16_t freq_milli; /* User should convert to uHz before setting the
 			      * SENSOR_ATTR_SAMPLING_FREQUENCY attribute.
 			      */
 } bmi160_odr_map[] = {
@@ -172,7 +172,7 @@ struct {
 	{400,  0  }, {800,   0  }, {1600,  0  }, {3200, 0  },
 };
 
-static int bmi160_freq_to_odr_val(u16_t freq_int, u16_t freq_milli)
+static int bmi160_freq_to_odr_val(uint16_t freq_int, uint16_t freq_milli)
 {
 	size_t i;
 
@@ -194,8 +194,8 @@ static int bmi160_freq_to_odr_val(u16_t freq_int, u16_t freq_milli)
 #endif
 
 #if defined(CONFIG_BMI160_ACCEL_ODR_RUNTIME)
-static int bmi160_acc_odr_set(struct device *dev, u16_t freq_int,
-			      u16_t freq_milli)
+static int bmi160_acc_odr_set(struct device *dev, uint16_t freq_int,
+			      uint16_t freq_milli)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
 	int odr = bmi160_freq_to_odr_val(freq_int, freq_milli);
@@ -215,7 +215,7 @@ static int bmi160_acc_odr_set(struct device *dev, u16_t freq_int,
 	return bmi160_reg_field_update(dev, BMI160_REG_ACC_CONF,
 				       BMI160_ACC_CONF_ODR_POS,
 				       BMI160_ACC_CONF_ODR_MASK,
-				       (u8_t) odr);
+				       (uint8_t) odr);
 }
 #endif
 
@@ -238,9 +238,9 @@ static const struct bmi160_range bmi160_gyr_range_map[] = {
 
 #if defined(CONFIG_BMI160_ACCEL_RANGE_RUNTIME) ||\
 	defined(CONFIG_BMI160_GYRO_RANGE_RUNTIME)
-static s32_t bmi160_range_to_reg_val(u16_t range,
+static int32_t bmi160_range_to_reg_val(uint16_t range,
 				       const struct bmi160_range *range_map,
-				       u16_t range_map_size)
+				       uint16_t range_map_size)
 {
 	int i;
 
@@ -254,9 +254,9 @@ static s32_t bmi160_range_to_reg_val(u16_t range,
 }
 #endif
 
-static s32_t bmi160_reg_val_to_range(u8_t reg_val,
+static int32_t bmi160_reg_val_to_range(uint8_t reg_val,
 				       const struct bmi160_range *range_map,
-				       u16_t range_map_size)
+				       uint16_t range_map_size)
 {
 	int i;
 
@@ -269,19 +269,19 @@ static s32_t bmi160_reg_val_to_range(u8_t reg_val,
 	return -EINVAL;
 }
 
-s32_t bmi160_acc_reg_val_to_range(u8_t reg_val)
+int32_t bmi160_acc_reg_val_to_range(uint8_t reg_val)
 {
 	return bmi160_reg_val_to_range(reg_val, bmi160_acc_range_map,
 				       BMI160_ACC_RANGE_MAP_SIZE);
 }
 
-s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val)
+int32_t bmi160_gyr_reg_val_to_range(uint8_t reg_val)
 {
 	return bmi160_reg_val_to_range(reg_val, bmi160_gyr_range_map,
 				       BMI160_GYR_RANGE_MAP_SIZE);
 }
 
-static int bmi160_do_calibration(struct device *dev, u8_t foc_conf)
+static int bmi160_do_calibration(struct device *dev, uint8_t foc_conf)
 {
 	if (bmi160_byte_write(dev, BMI160_REG_FOC_CONF, foc_conf) < 0) {
 		return -EIO;
@@ -297,10 +297,10 @@ static int bmi160_do_calibration(struct device *dev, u8_t foc_conf)
 }
 
 #if defined(CONFIG_BMI160_ACCEL_RANGE_RUNTIME)
-static int bmi160_acc_range_set(struct device *dev, s32_t range)
+static int bmi160_acc_range_set(struct device *dev, int32_t range)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	s32_t reg_val = bmi160_range_to_reg_val(range,
+	int32_t reg_val = bmi160_range_to_reg_val(range,
 						  bmi160_acc_range_map,
 						  BMI160_ACC_RANGE_MAP_SIZE);
 
@@ -327,14 +327,14 @@ static int bmi160_acc_range_set(struct device *dev, s32_t range)
 static int bmi160_acc_ofs_set(struct device *dev, enum sensor_channel chan,
 			      const struct sensor_value *ofs)
 {
-	u8_t reg_addr[] = {
+	uint8_t reg_addr[] = {
 		BMI160_REG_OFFSET_ACC_X,
 		BMI160_REG_OFFSET_ACC_Y,
 		BMI160_REG_OFFSET_ACC_Z
 	};
 	int i;
-	s32_t ofs_u;
-	s8_t reg_val;
+	int32_t ofs_u;
+	int8_t reg_val;
 
 	/* we need the offsets for all axis */
 	if (chan != SENSOR_CHAN_ACCEL_XYZ) {
@@ -361,13 +361,13 @@ static int  bmi160_acc_calibrate(struct device *dev, enum sensor_channel chan,
 				 const struct sensor_value *xyz_calib_value)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	u8_t foc_pos[] = {
+	uint8_t foc_pos[] = {
 		BMI160_FOC_ACC_X_POS,
 		BMI160_FOC_ACC_Y_POS,
 		BMI160_FOC_ACC_Z_POS,
 	};
 	int i;
-	u8_t reg_val = 0U;
+	uint8_t reg_val = 0U;
 
 	/* Calibration has to be done in normal mode. */
 	if (bmi160->pmu_sts.acc != BMI160_PMU_NORMAL) {
@@ -382,8 +382,8 @@ static int  bmi160_acc_calibrate(struct device *dev, enum sensor_channel chan,
 	}
 
 	for (i = 0; i < 3; i++, xyz_calib_value++) {
-		s32_t accel_g;
-		u8_t accel_val;
+		int32_t accel_g;
+		uint8_t accel_val;
 
 		accel_g = sensor_ms2_to_g(xyz_calib_value);
 		if (accel_g == 0) {
@@ -440,8 +440,8 @@ static int bmi160_acc_config(struct device *dev, enum sensor_channel chan,
 #endif /* !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND) */
 
 #if defined(CONFIG_BMI160_GYRO_ODR_RUNTIME)
-static int bmi160_gyr_odr_set(struct device *dev, u16_t freq_int,
-			      u16_t freq_milli)
+static int bmi160_gyr_odr_set(struct device *dev, uint16_t freq_int,
+			      uint16_t freq_milli)
 {
 	int odr = bmi160_freq_to_odr_val(freq_int, freq_milli);
 
@@ -456,15 +456,15 @@ static int bmi160_gyr_odr_set(struct device *dev, u16_t freq_int,
 	return bmi160_reg_field_update(dev, BMI160_REG_GYR_CONF,
 				       BMI160_GYR_CONF_ODR_POS,
 				       BMI160_GYR_CONF_ODR_MASK,
-				       (u8_t) odr);
+				       (uint8_t) odr);
 }
 #endif
 
 #if defined(CONFIG_BMI160_GYRO_RANGE_RUNTIME)
-static int bmi160_gyr_range_set(struct device *dev, u16_t range)
+static int bmi160_gyr_range_set(struct device *dev, uint16_t range)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	s32_t reg_val = bmi160_range_to_reg_val(range,
+	int32_t reg_val = bmi160_range_to_reg_val(range,
 						bmi160_gyr_range_map,
 						BMI160_GYR_RANGE_MAP_SIZE);
 
@@ -492,16 +492,16 @@ static int bmi160_gyr_ofs_set(struct device *dev, enum sensor_channel chan,
 			      const struct sensor_value *ofs)
 {
 	struct {
-		u8_t lsb_addr;
-		u8_t msb_pos;
+		uint8_t lsb_addr;
+		uint8_t msb_pos;
 	} ofs_desc[] = {
 		{BMI160_REG_OFFSET_GYR_X, BMI160_GYR_MSB_OFS_X_POS},
 		{BMI160_REG_OFFSET_GYR_Y, BMI160_GYR_MSB_OFS_Y_POS},
 		{BMI160_REG_OFFSET_GYR_Z, BMI160_GYR_MSB_OFS_Z_POS},
 	};
 	int i;
-	s32_t ofs_u;
-	s16_t val;
+	int32_t ofs_u;
+	int16_t val;
 
 	/* we need the offsets for all axis */
 	if (chan != SENSOR_CHAN_GYRO_XYZ) {
@@ -648,8 +648,8 @@ static int bmi160_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	/* convert samples to cpu endianness */
 	for (i = 0; i < BMI160_SAMPLE_SIZE; i += 2) {
-		u16_t *sample =
-			(u16_t *) &bmi160->sample.raw[i];
+		uint16_t *sample =
+			(uint16_t *) &bmi160->sample.raw[i];
 
 		*sample = sys_le16_to_cpu(*sample);
 	}
@@ -657,10 +657,10 @@ static int bmi160_sample_fetch(struct device *dev, enum sensor_channel chan)
 	return 0;
 }
 
-static void bmi160_to_fixed_point(s16_t raw_val, u16_t scale,
+static void bmi160_to_fixed_point(int16_t raw_val, uint16_t scale,
 				  struct sensor_value *val)
 {
-	s32_t converted_val;
+	int32_t converted_val;
 
 	/*
 	 * maximum converted value we can get is: max(raw_val) * max(scale)
@@ -674,12 +674,12 @@ static void bmi160_to_fixed_point(s16_t raw_val, u16_t scale,
 }
 
 static void bmi160_channel_convert(enum sensor_channel chan,
-				   u16_t scale,
-				   u16_t *raw_xyz,
+				   uint16_t scale,
+				   uint16_t *raw_xyz,
 				   struct sensor_value *val)
 {
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 
 	switch (chan) {
 	case SENSOR_CHAN_ACCEL_X:
@@ -730,8 +730,8 @@ static inline void bmi160_acc_channel_get(struct device *dev,
 
 static int bmi160_temp_channel_get(struct device *dev, struct sensor_value *val)
 {
-	u16_t temp_raw = 0U;
-	s32_t temp_micro = 0;
+	uint16_t temp_raw = 0U;
+	int32_t temp_micro = 0;
 	struct bmi160_device_data *bmi160 = dev->driver_data;
 
 	if (bmi160->pmu_sts.raw == 0U) {
@@ -794,8 +794,8 @@ static const struct sensor_driver_api bmi160_api = {
 int bmi160_init(struct device *dev)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	u8_t val = 0U;
-	s32_t acc_range, gyr_range;
+	uint8_t val = 0U;
+	int32_t acc_range, gyr_range;
 
 	bmi160->spi = device_get_binding(DT_INST_BUS_LABEL(0));
 	if (!bmi160->spi) {
diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h
index ac11e7bcff..c7e79c2711 100644
--- a/drivers/sensor/bmi160/bmi160.h
+++ b/drivers/sensor/bmi160/bmi160.h
@@ -379,8 +379,8 @@ enum bmi160_odr {
 /* end of default settings */
 
 struct bmi160_range {
-	u16_t range;
-	u8_t reg_val;
+	uint16_t range;
+	uint8_t reg_val;
 };
 
 struct bmi160_device_config {
@@ -392,39 +392,39 @@ struct bmi160_device_config {
 };
 
 union bmi160_pmu_status {
-	u8_t raw;
+	uint8_t raw;
 	struct {
-		u8_t mag : 2;
-		u8_t gyr : 2;
-		u8_t acc : 2;
-		u8_t res : 2;
+		uint8_t mag : 2;
+		uint8_t gyr : 2;
+		uint8_t acc : 2;
+		uint8_t res : 2;
 	};
 };
 
 #if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND) && \
 		!defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
-#	define BMI160_SAMPLE_SIZE		(6 * sizeof(u16_t))
+#	define BMI160_SAMPLE_SIZE		(6 * sizeof(uint16_t))
 #else
-#	define BMI160_SAMPLE_SIZE		(3 * sizeof(u16_t))
+#	define BMI160_SAMPLE_SIZE		(3 * sizeof(uint16_t))
 #endif
 
 #define BMI160_BUF_SIZE			(BMI160_SAMPLE_SIZE)
 union bmi160_sample {
-	u8_t raw[BMI160_BUF_SIZE];
+	uint8_t raw[BMI160_BUF_SIZE];
 	struct {
-		u8_t dummy_byte;
+		uint8_t dummy_byte;
 #if !defined(CONFIG_BMI160_GYRO_PMU_SUSPEND)
-		u16_t gyr[3];
+		uint16_t gyr[3];
 #endif
 #if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
-		u16_t acc[3];
+		uint16_t acc[3];
 #endif
 	} __packed;
 };
 
 struct bmi160_scale {
-	u16_t acc; /* micro m/s^2/lsb */
-	u16_t gyr; /* micro radians/s/lsb */
+	uint16_t acc; /* micro m/s^2/lsb */
+	uint16_t gyr; /* micro radians/s/lsb */
 };
 
 struct bmi160_device_data {
@@ -458,15 +458,15 @@ struct bmi160_device_data {
 #endif /* CONFIG_BMI160_TRIGGER */
 };
 
-int bmi160_read(struct device *dev, u8_t reg_addr,
-		u8_t *data, u8_t len);
-int bmi160_byte_read(struct device *dev, u8_t reg_addr, u8_t *byte);
-int bmi160_byte_write(struct device *dev, u8_t reg_addr, u8_t byte);
-int bmi160_word_write(struct device *dev, u8_t reg_addr, u16_t word);
-int bmi160_reg_field_update(struct device *dev, u8_t reg_addr,
-			    u8_t pos, u8_t mask, u8_t val);
-static inline int bmi160_reg_update(struct device *dev, u8_t reg_addr,
-				    u8_t mask, u8_t val)
+int bmi160_read(struct device *dev, uint8_t reg_addr,
+		uint8_t *data, uint8_t len);
+int bmi160_byte_read(struct device *dev, uint8_t reg_addr, uint8_t *byte);
+int bmi160_byte_write(struct device *dev, uint8_t reg_addr, uint8_t byte);
+int bmi160_word_write(struct device *dev, uint8_t reg_addr, uint16_t word);
+int bmi160_reg_field_update(struct device *dev, uint8_t reg_addr,
+			    uint8_t pos, uint8_t mask, uint8_t val);
+static inline int bmi160_reg_update(struct device *dev, uint8_t reg_addr,
+				    uint8_t mask, uint8_t val)
 {
 	return bmi160_reg_field_update(dev, reg_addr, 0, mask, val);
 }
@@ -476,7 +476,7 @@ int bmi160_trigger_set(struct device *dev,
 		       sensor_trigger_handler_t handler);
 int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr,
 			    const struct sensor_value *val);
-s32_t bmi160_acc_reg_val_to_range(u8_t reg_val);
-s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val);
+int32_t bmi160_acc_reg_val_to_range(uint8_t reg_val);
+int32_t bmi160_gyr_reg_val_to_range(uint8_t reg_val);
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_ */
diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c
index d7bb19c3d8..e35d3ffbef 100644
--- a/drivers/sensor/bmi160/bmi160_trigger.c
+++ b/drivers/sensor/bmi160/bmi160_trigger.c
@@ -27,7 +27,7 @@ static void bmi160_handle_anymotion(struct device *dev)
 	}
 }
 
-static void bmi160_handle_drdy(struct device *dev, u8_t status)
+static void bmi160_handle_drdy(struct device *dev, uint8_t status)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
 	struct sensor_trigger drdy_trigger = {
@@ -54,11 +54,11 @@ static void bmi160_handle_interrupts(void *arg)
 	struct device *dev = (struct device *)arg;
 
 	union {
-		u8_t raw[6];
+		uint8_t raw[6];
 		struct {
-			u8_t dummy; /* spi related dummy byte */
-			u8_t status;
-			u8_t int_status[4];
+			uint8_t dummy; /* spi related dummy byte */
+			uint8_t status;
+			uint8_t int_status[4];
 		};
 	} buf;
 
@@ -110,7 +110,7 @@ static void bmi160_work_handler(struct k_work *work)
 extern struct bmi160_device_data bmi160_data;
 
 static void bmi160_gpio_callback(struct device *port,
-				 struct gpio_callback *cb, u32_t pin)
+				 struct gpio_callback *cb, uint32_t pin)
 {
 	struct bmi160_device_data *bmi160 =
 		CONTAINER_OF(cb, struct bmi160_device_data, gpio_cb);
@@ -130,7 +130,7 @@ static int bmi160_trigger_drdy_set(struct device *dev,
 				   sensor_trigger_handler_t handler)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	u8_t drdy_en = 0U;
+	uint8_t drdy_en = 0U;
 
 #if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND)
 	if (chan == SENSOR_CHAN_ACCEL_XYZ) {
@@ -165,7 +165,7 @@ static int bmi160_trigger_anym_set(struct device *dev,
 				   sensor_trigger_handler_t handler)
 {
 	struct bmi160_device_data *bmi160 = dev->driver_data;
-	u8_t anym_en = 0U;
+	uint8_t anym_en = 0U;
 
 	bmi160->handler_anymotion = handler;
 
@@ -199,8 +199,8 @@ static int bmi160_trigger_set_acc(struct device *dev,
 int bmi160_acc_slope_config(struct device *dev, enum sensor_attribute attr,
 			    const struct sensor_value *val)
 {
-	u8_t acc_range_g, reg_val;
-	u32_t slope_th_ums2;
+	uint8_t acc_range_g, reg_val;
+	uint32_t slope_th_ums2;
 
 	if (attr == SENSOR_ATTR_SLOPE_TH) {
 		if (bmi160_byte_read(dev, BMI160_REG_ACC_RANGE, &reg_val) < 0) {
diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c
index 760573b984..c38b282dfe 100644
--- a/drivers/sensor/bmm150/bmm150.c
+++ b/drivers/sensor/bmm150/bmm150.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(BMM150, CONFIG_SENSOR_LOG_LEVEL);
 
 static const struct {
 	int freq;
-	u8_t reg_val;
+	uint8_t reg_val;
 } bmm150_samp_freq_table[] = { { 2, 0x01 },
 			       { 6, 0x02 },
 			       { 8, 0x03 },
@@ -26,9 +26,9 @@ static const struct {
 			       { 30, 0x07 } };
 
 static const struct bmm150_preset {
-	u8_t rep_xy;
-	u8_t rep_z;
-	u8_t odr;
+	uint8_t rep_xy;
+	uint8_t rep_z;
+	uint8_t odr;
 } bmm150_presets_table[] = {
 	[BMM150_LOW_POWER_PRESET] = { 3, 3, 10 },
 	[BMM150_REGULAR_PRESET] = { 9, 15, 10 },
@@ -77,11 +77,11 @@ static int bmm150_set_power_mode(struct device *dev,
 
 }
 
-static int bmm150_set_odr(struct device *dev, u8_t val)
+static int bmm150_set_odr(struct device *dev, uint8_t val)
 {
 	struct bmm150_data *data = dev->driver_data;
 	const struct bmm150_config *config = dev->config_info;
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(bmm150_samp_freq_table); ++i) {
 		if (val <= bmm150_samp_freq_table[i].freq) {
@@ -102,14 +102,14 @@ static int bmm150_read_rep_xy(struct device *dev)
 {
 	struct bmm150_data *data = dev->driver->data;
 	const struct bmm150_config *config = dev->config_info;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr,
 			      BMM150_REG_REP_XY, &reg_val) < 0) {
 		return -EIO;
 	}
 
-	data->rep_xy = BMM150_REGVAL_TO_REPXY((u8_t)(reg_val));
+	data->rep_xy = BMM150_REGVAL_TO_REPXY((uint8_t)(reg_val));
 
 	return 0;
 }
@@ -118,7 +118,7 @@ static int bmm150_read_rep_z(struct device *dev)
 {
 	struct bmm150_data *data = dev->driver_data;
 	const struct bmm150_config *config = dev->config_info;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr,
 			      BMM150_REG_REP_Z, &reg_val) < 0) {
@@ -165,7 +165,7 @@ static int bmm150_read_odr(struct device *dev)
 {
 	struct bmm150_data *data = dev->driver_data;
 	const struct bmm150_config *config = dev->config_info;
-	u8_t i, odr_val, reg_val;
+	uint8_t i, odr_val, reg_val;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr,
 			      BMM150_REG_OPMODE_ODR, &reg_val) < 0) {
@@ -224,13 +224,13 @@ static int bmm150_write_rep_z(struct device *dev, int val)
 #endif
 
 /* Reference Datasheet 4.3.2 */
-static s32_t bmm150_compensate_xy(struct bmm150_trim_regs *tregs,
-				  s16_t xy, uint16_t rhall, bool is_x)
+static int32_t bmm150_compensate_xy(struct bmm150_trim_regs *tregs,
+				  int16_t xy, uint16_t rhall, bool is_x)
 {
-	s8_t txy1, txy2;
-	s16_t val;
-	u16_t prevalue;
-	s32_t temp1, temp2, temp3;
+	int8_t txy1, txy2;
+	int16_t val;
+	uint16_t prevalue;
+	int32_t temp1, temp2, temp3;
 
 	if (xy == BMM150_XY_OVERFLOW_VAL) {
 		return INT32_MIN;
@@ -248,40 +248,40 @@ static s32_t bmm150_compensate_xy(struct bmm150_trim_regs *tregs,
 		txy2 = tregs->y2;
 	}
 
-	prevalue = (u16_t)((((s32_t)tregs->xyz1) << 14) / rhall);
+	prevalue = (uint16_t)((((int32_t)tregs->xyz1) << 14) / rhall);
 
-	val = (s16_t)((prevalue) - ((u16_t)0x4000));
+	val = (int16_t)((prevalue) - ((uint16_t)0x4000));
 
-	temp1 = (((s32_t)tregs->xy2) * ((((s32_t)val) * ((s32_t)val)) >> 7));
+	temp1 = (((int32_t)tregs->xy2) * ((((int32_t)val) * ((int32_t)val)) >> 7));
 
-	temp2 = ((s32_t)val) * ((s32_t)(((s16_t)tregs->xy1) << 7));
+	temp2 = ((int32_t)val) * ((int32_t)(((int16_t)tregs->xy1) << 7));
 
 	temp3 = (((((temp1 + temp2) >> 9) +
-		((s32_t)0x100000)) * ((s32_t)(((s16_t)txy2) +
-		((s16_t)0xA0)))) >> 12);
+		((int32_t)0x100000)) * ((int32_t)(((int16_t)txy2) +
+		((int16_t)0xA0)))) >> 12);
 
-	val = ((s16_t)((((s32_t)xy) * temp3) >> 13)) + (((s16_t)txy1) << 3);
+	val = ((int16_t)((((int32_t)xy) * temp3) >> 13)) + (((int16_t)txy1) << 3);
 
 	return (int32_t)val;
 }
 
-static s32_t bmm150_compensate_z(struct bmm150_trim_regs *tregs,
-				 s16_t z, u16_t rhall)
+static int32_t bmm150_compensate_z(struct bmm150_trim_regs *tregs,
+				 int16_t z, uint16_t rhall)
 {
-	s32_t val, temp1, temp2;
-	s16_t temp3;
+	int32_t val, temp1, temp2;
+	int16_t temp3;
 
 	if (z == BMM150_Z_OVERFLOW_VAL) {
 		return INT32_MIN;
 	}
 
-	temp1 = (((s32_t)(z - tregs->z4)) << 15);
+	temp1 = (((int32_t)(z - tregs->z4)) << 15);
 
-	temp2 = ((((s32_t)tregs->z3) *
-		((s32_t)(((s16_t)rhall) - ((s16_t)tregs->xyz1)))) >> 2);
+	temp2 = ((((int32_t)tregs->z3) *
+		((int32_t)(((int16_t)rhall) - ((int16_t)tregs->xyz1)))) >> 2);
 
-	temp3 = ((s16_t)(((((s32_t)tregs->z1) *
-		((((s16_t)rhall) << 1))) + (1 << 15)) >> 16));
+	temp3 = ((int16_t)(((((int32_t)tregs->z1) *
+		((((int16_t)rhall) << 1))) + (1 << 15)) >> 16));
 
 	val = ((temp1 - temp2) / (tregs->z2 + temp3));
 
@@ -293,25 +293,25 @@ static int bmm150_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	struct bmm150_data *drv_data = dev->driver_data;
 	const struct bmm150_config *config = dev->config_info;
-	u16_t values[BMM150_AXIS_XYZR_MAX];
-	s16_t raw_x, raw_y, raw_z;
-	u16_t rhall;
+	uint16_t values[BMM150_AXIS_XYZR_MAX];
+	int16_t raw_x, raw_y, raw_z;
+	uint16_t rhall;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
 			chan == SENSOR_CHAN_MAGN_XYZ);
 
 	if (i2c_burst_read(drv_data->i2c, config->i2c_slave_addr,
-			   BMM150_REG_X_L, (u8_t *)values,
+			   BMM150_REG_X_L, (uint8_t *)values,
 			   sizeof(values)) < 0) {
 		LOG_ERR("failed to read sample");
 		return -EIO;
 	}
 
-	raw_x = (s16_t)sys_le16_to_cpu(values[BMM150_AXIS_X]) >>
+	raw_x = (int16_t)sys_le16_to_cpu(values[BMM150_AXIS_X]) >>
 		BMM150_SHIFT_XY_L;
-	raw_y = (s16_t)sys_le16_to_cpu(values[BMM150_AXIS_Y]) >>
+	raw_y = (int16_t)sys_le16_to_cpu(values[BMM150_AXIS_Y]) >>
 		BMM150_SHIFT_XY_L;
-	raw_z = (s16_t)sys_le16_to_cpu(values[BMM150_AXIS_Z]) >>
+	raw_z = (int16_t)sys_le16_to_cpu(values[BMM150_AXIS_Z]) >>
 		BMM150_SHIFT_Z_L;
 
 	rhall = sys_le16_to_cpu(values[BMM150_RHALL]) >>
@@ -335,7 +335,7 @@ static void bmm150_convert(struct sensor_value *val, int raw_val)
 {
 	/* val = raw_val / 1600 */
 	val->val1 = raw_val / 1600;
-	val->val2 = ((s32_t)raw_val * (1000000 / 1600)) % 1000000;
+	val->val2 = ((int32_t)raw_val * (1000000 / 1600)) % 1000000;
 }
 
 static int bmm150_channel_get(struct device *dev,
@@ -460,7 +460,7 @@ static int bmm150_attr_set(struct device *dev,
 			return -ENOTSUP;
 		}
 
-		if (bmm150_set_odr(dev, (u8_t)(val->val1)) < 0) {
+		if (bmm150_set_odr(dev, (uint8_t)(val->val1)) < 0) {
 			return -EIO;
 		}
 		break;
@@ -490,7 +490,7 @@ static int bmm150_init_chip(struct device *dev)
 {
 	struct bmm150_data *data = dev->driver_data;
 	const struct bmm150_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 	struct bmm150_preset preset;
 
 	if (bmm150_set_power_mode(dev, BMM150_POWER_MODE_NORMAL, 0) < 0) {
@@ -550,7 +550,7 @@ static int bmm150_init_chip(struct device *dev)
 	}
 
 	if (i2c_burst_read(data->i2c, config->i2c_slave_addr,
-			   BMM150_REG_TRIM_START, (u8_t *)&data->tregs,
+			   BMM150_REG_TRIM_START, (uint8_t *)&data->tregs,
 			   sizeof(data->tregs)) < 0) {
 		LOG_ERR("failed to read trim regs");
 		goto err_poweroff;
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index 9849696661..3a5f414bd7 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/drivers/sensor/bmm150/bmm150.h
@@ -97,24 +97,24 @@
 
 struct bmm150_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 struct bmm150_trim_regs {
-	s8_t x1;
-	s8_t y1;
-	u16_t reserved1;
-	u8_t reserved2;
-	s16_t z4;
-	s8_t x2;
-	s8_t y2;
-	u16_t reserved3;
-	s16_t z2;
-	u16_t z1;
-	u16_t xyz1;
-	s16_t z3;
-	s8_t xy2;
-	u8_t xy1;
+	int8_t x1;
+	int8_t y1;
+	uint16_t reserved1;
+	uint8_t reserved2;
+	int16_t z4;
+	int8_t x2;
+	int8_t y2;
+	uint16_t reserved3;
+	int16_t z2;
+	uint16_t z1;
+	uint16_t xyz1;
+	int16_t z3;
+	int8_t xy2;
+	uint8_t xy1;
 } __packed;
 
 struct bmm150_data {
diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c
index 851f83683a..c4c7058c37 100644
--- a/drivers/sensor/bq274xx/bq274xx.c
+++ b/drivers/sensor/bq274xx/bq274xx.c
@@ -17,10 +17,10 @@
 
 #define BQ274XX_SUBCLASS_DELAY 5 /* subclass 64 & 82 needs 5ms delay */
 
-static int bq274xx_command_reg_read(struct bq274xx_data *bq274xx, u8_t reg_addr,
-				    s16_t *val)
+static int bq274xx_command_reg_read(struct bq274xx_data *bq274xx, uint8_t reg_addr,
+				    int16_t *val)
 {
-	u8_t i2c_data[2];
+	uint8_t i2c_data[2];
 	int status;
 
 	status = i2c_burst_read(bq274xx->i2c, DT_INST_REG_ADDR(0), reg_addr,
@@ -36,13 +36,13 @@ static int bq274xx_command_reg_read(struct bq274xx_data *bq274xx, u8_t reg_addr,
 }
 
 static int bq274xx_control_reg_write(struct bq274xx_data *bq274xx,
-				     u16_t subcommand)
+				     uint16_t subcommand)
 {
-	u8_t i2c_data, reg_addr;
+	uint8_t i2c_data, reg_addr;
 	int status = 0;
 
 	reg_addr = BQ274XX_COMMAND_CONTROL_LOW;
-	i2c_data = (u8_t)((subcommand)&0x00FF);
+	i2c_data = (uint8_t)((subcommand)&0x00FF);
 
 	status = i2c_reg_write_byte(bq274xx->i2c, DT_INST_REG_ADDR(0), reg_addr,
 				    i2c_data);
@@ -54,7 +54,7 @@ static int bq274xx_control_reg_write(struct bq274xx_data *bq274xx,
 	k_msleep(BQ274XX_SUBCLASS_DELAY);
 
 	reg_addr = BQ274XX_COMMAND_CONTROL_HIGH;
-	i2c_data = (u8_t)((subcommand >> 8) & 0x00FF);
+	i2c_data = (uint8_t)((subcommand >> 8) & 0x00FF);
 
 	status = i2c_reg_write_byte(bq274xx->i2c, DT_INST_REG_ADDR(0), reg_addr,
 				    i2c_data);
@@ -66,10 +66,10 @@ static int bq274xx_control_reg_write(struct bq274xx_data *bq274xx,
 	return 0;
 }
 
-static int bq274xx_command_reg_write(struct bq274xx_data *bq274xx, u8_t command,
-				     u8_t data)
+static int bq274xx_command_reg_write(struct bq274xx_data *bq274xx, uint8_t command,
+				     uint8_t data)
 {
-	u8_t i2c_data, reg_addr;
+	uint8_t i2c_data, reg_addr;
 	int status = 0;
 
 	reg_addr = command;
@@ -85,10 +85,10 @@ static int bq274xx_command_reg_write(struct bq274xx_data *bq274xx, u8_t command,
 	return 0;
 }
 
-static int bq274xx_read_data_block(struct bq274xx_data *bq274xx, u8_t offset,
-				   u8_t *data, u8_t bytes)
+static int bq274xx_read_data_block(struct bq274xx_data *bq274xx, uint8_t offset,
+				   uint8_t *data, uint8_t bytes)
 {
-	u8_t i2c_data;
+	uint8_t i2c_data;
 	int status = 0;
 
 	i2c_data = BQ274XX_EXTENDED_BLOCKDATA_START + offset;
@@ -105,7 +105,7 @@ static int bq274xx_read_data_block(struct bq274xx_data *bq274xx, u8_t offset,
 	return 0;
 }
 
-static int bq274xx_get_device_type(struct bq274xx_data *bq274xx, u16_t *val)
+static int bq274xx_get_device_type(struct bq274xx_data *bq274xx, uint16_t *val)
 {
 	int status;
 
@@ -162,8 +162,8 @@ static int bq274xx_channel_get(struct device *dev, enum sensor_channel chan,
 	case SENSOR_CHAN_GAUGE_TEMP:
 		int_temp = (bq274xx->internal_temperature * 0.1);
 		int_temp = int_temp - 273.15;
-		val->val1 = (s32_t)int_temp;
-		val->val2 = (int_temp - (s32_t)int_temp) * 1000000;
+		val->val1 = (int32_t)int_temp;
+		val->val2 = (int_temp - (int32_t)int_temp) * 1000000;
 		break;
 
 	case SENSOR_CHAN_GAUGE_STATE_OF_CHARGE:
@@ -353,16 +353,16 @@ static int bq274xx_gauge_init(struct device *dev)
 	struct bq274xx_data *bq274xx = dev->driver_data;
 	const struct bq274xx_config *const config = dev->config_info;
 	int status = 0;
-	u8_t tmp_checksum = 0, checksum_old = 0, checksum_new = 0;
-	u16_t flags = 0, designenergy_mwh = 0, taperrate = 0, id;
-	u8_t designcap_msb, designcap_lsb, designenergy_msb, designenergy_lsb,
+	uint8_t tmp_checksum = 0, checksum_old = 0, checksum_new = 0;
+	uint16_t flags = 0, designenergy_mwh = 0, taperrate = 0, id;
+	uint8_t designcap_msb, designcap_lsb, designenergy_msb, designenergy_lsb,
 		terminatevolt_msb, terminatevolt_lsb, taperrate_msb,
 		taperrate_lsb;
-	u8_t block[32];
+	uint8_t block[32];
 
-	designenergy_mwh = (u16_t)3.7 * config->design_capacity;
+	designenergy_mwh = (uint16_t)3.7 * config->design_capacity;
 	taperrate =
-		(u16_t)config->design_capacity / (0.1 * config->taper_current);
+		(uint16_t)config->design_capacity / (0.1 * config->taper_current);
 
 	bq274xx->i2c = device_get_binding(config->bus_name);
 	if (bq274xx == NULL) {
@@ -441,7 +441,7 @@ static int bq274xx_gauge_init(struct device *dev)
 		return -EIO;
 	}
 
-	for (u8_t i = 0; i < 32; i++) {
+	for (uint8_t i = 0; i < 32; i++) {
 		block[i] = 0;
 	}
 
@@ -452,7 +452,7 @@ static int bq274xx_gauge_init(struct device *dev)
 	}
 
 	tmp_checksum = 0;
-	for (u8_t i = 0; i < 32; i++) {
+	for (uint8_t i = 0; i < 32; i++) {
 		tmp_checksum += block[i];
 	}
 	tmp_checksum = 255 - tmp_checksum;
@@ -540,7 +540,7 @@ static int bq274xx_gauge_init(struct device *dev)
 		return -EIO;
 	}
 
-	for (u8_t i = 0; i < 32; i++) {
+	for (uint8_t i = 0; i < 32; i++) {
 		block[i] = 0;
 	}
 
@@ -551,7 +551,7 @@ static int bq274xx_gauge_init(struct device *dev)
 	}
 
 	checksum_new = 0;
-	for (u8_t i = 0; i < 32; i++) {
+	for (uint8_t i = 0; i < 32; i++) {
 		checksum_new += block[i];
 	}
 	checksum_new = 255 - checksum_new;
diff --git a/drivers/sensor/bq274xx/bq274xx.h b/drivers/sensor/bq274xx/bq274xx.h
index 60b4cb2368..014264840f 100644
--- a/drivers/sensor/bq274xx/bq274xx.h
+++ b/drivers/sensor/bq274xx/bq274xx.h
@@ -80,26 +80,26 @@ LOG_MODULE_REGISTER(bq274xx, CONFIG_SENSOR_LOG_LEVEL);
 
 struct bq274xx_data {
 	struct device *i2c;
-	u16_t voltage;
-	s16_t avg_current;
-	s16_t stdby_current;
-	s16_t max_load_current;
-	s16_t avg_power;
-	u16_t state_of_charge;
-	s16_t state_of_health;
-	u16_t internal_temperature;
-	u16_t full_charge_capacity;
-	u16_t remaining_charge_capacity;
-	u16_t nom_avail_capacity;
-	u16_t full_avail_capacity;
+	uint16_t voltage;
+	int16_t avg_current;
+	int16_t stdby_current;
+	int16_t max_load_current;
+	int16_t avg_power;
+	uint16_t state_of_charge;
+	int16_t state_of_health;
+	uint16_t internal_temperature;
+	uint16_t full_charge_capacity;
+	uint16_t remaining_charge_capacity;
+	uint16_t nom_avail_capacity;
+	uint16_t full_avail_capacity;
 };
 
 struct bq274xx_config {
 	char *bus_name;
-	u16_t design_voltage;
-	u16_t design_capacity;
-	u16_t taper_current;
-	u16_t terminate_voltage;
+	uint16_t design_voltage;
+	uint16_t design_capacity;
+	uint16_t taper_current;
+	uint16_t terminate_voltage;
 };
 
 #endif
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index 7ec0c5594e..c2aed6058a 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/drivers/sensor/ccs811/ccs811.c
@@ -44,7 +44,7 @@ static void set_wake(struct ccs811_data *drv_data, bool enable)
  */
 static int fetch_status(struct device *i2c)
 {
-	u8_t status;
+	uint8_t status;
 	int rv;
 
 	if (i2c_reg_read_byte(i2c, DT_INST_REG_ADDR(0),
@@ -55,7 +55,7 @@ static int fetch_status(struct device *i2c)
 
 	rv = status;
 	if (status & CCS811_STATUS_ERROR) {
-		u8_t error_id;
+		uint8_t error_id;
 
 		if (i2c_reg_read_byte(i2c, DT_INST_REG_ADDR(0),
 				      CCS811_REG_ERROR_ID, &error_id) < 0) {
@@ -69,7 +69,7 @@ static int fetch_status(struct device *i2c)
 	return rv;
 }
 
-static inline u8_t error_from_status(int status)
+static inline uint8_t error_from_status(int status)
 {
 	return status >> 8;
 }
@@ -85,7 +85,7 @@ int ccs811_configver_fetch(struct device *dev,
 			   struct ccs811_configver_type *ptr)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
-	u8_t cmd;
+	uint8_t cmd;
 	int rc;
 
 	if (!ptr) {
@@ -101,7 +101,7 @@ int ccs811_configver_fetch(struct device *dev,
 		cmd = CCS811_REG_FW_BOOT_VERSION;
 		rc = i2c_write_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 				    &cmd, sizeof(cmd),
-				    (u8_t *)&ptr->fw_boot_version,
+				    (uint8_t *)&ptr->fw_boot_version,
 				    sizeof(ptr->fw_boot_version));
 		ptr->fw_boot_version = sys_be16_to_cpu(ptr->fw_boot_version);
 	}
@@ -110,7 +110,7 @@ int ccs811_configver_fetch(struct device *dev,
 		cmd = CCS811_REG_FW_APP_VERSION;
 		rc = i2c_write_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 				    &cmd, sizeof(cmd),
-				    (u8_t *)&ptr->fw_app_version,
+				    (uint8_t *)&ptr->fw_app_version,
 				    sizeof(ptr->fw_app_version));
 		ptr->fw_app_version = sys_be16_to_cpu(ptr->fw_app_version);
 	}
@@ -128,16 +128,16 @@ int ccs811_configver_fetch(struct device *dev,
 
 int ccs811_baseline_fetch(struct device *dev)
 {
-	const u8_t cmd = CCS811_REG_BASELINE;
+	const uint8_t cmd = CCS811_REG_BASELINE;
 	struct ccs811_data *drv_data = dev->driver_data;
 	int rc;
-	u16_t baseline;
+	uint16_t baseline;
 
 	set_wake(drv_data, true);
 
 	rc = i2c_write_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 			    &cmd, sizeof(cmd),
-			    (u8_t *)&baseline, sizeof(baseline));
+			    (uint8_t *)&baseline, sizeof(baseline));
 	set_wake(drv_data, false);
 	if (rc <= 0) {
 		rc = baseline;
@@ -147,10 +147,10 @@ int ccs811_baseline_fetch(struct device *dev)
 }
 
 int ccs811_baseline_update(struct device *dev,
-			   u16_t baseline)
+			   uint16_t baseline)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
-	u8_t buf[1 + sizeof(baseline)];
+	uint8_t buf[1 + sizeof(baseline)];
 	int rc;
 
 	buf[0] = CCS811_REG_BASELINE;
@@ -167,7 +167,7 @@ int ccs811_envdata_update(struct device *dev,
 {
 	struct ccs811_data *drv_data = dev->driver_data;
 	int rc;
-	u8_t buf[5] = { CCS811_REG_ENV_DATA };
+	uint8_t buf[5] = { CCS811_REG_ENV_DATA };
 
 	/*
 	 * Environment data are represented in a broken whole/fraction
@@ -233,15 +233,15 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
 	struct ccs811_result_type *rp = &drv_data->result;
-	const u8_t cmd = CCS811_REG_ALG_RESULT_DATA;
+	const uint8_t cmd = CCS811_REG_ALG_RESULT_DATA;
 	int rc;
-	u16_t buf[4] = { 0 };
+	uint16_t buf[4] = { 0 };
 	unsigned int status;
 
 	set_wake(drv_data, true);
 	rc = i2c_write_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 			    &cmd, sizeof(cmd),
-			    (u8_t *)buf, sizeof(buf));
+			    (uint8_t *)buf, sizeof(buf));
 	set_wake(drv_data, false);
 	if (rc < 0) {
 		return -EIO;
@@ -272,7 +272,7 @@ static int ccs811_channel_get(struct device *dev,
 {
 	struct ccs811_data *drv_data = dev->driver_data;
 	const struct ccs811_result_type *rp = &drv_data->result;
-	u32_t uval;
+	uint32_t uval;
 
 	switch (chan) {
 	case SENSOR_CHAN_CO2:
@@ -324,7 +324,7 @@ static const struct sensor_driver_api ccs811_driver_api = {
 
 static int switch_to_app_mode(struct device *i2c)
 {
-	u8_t buf;
+	uint8_t buf;
 	int status;
 
 	LOG_DBG("Switching to Application mode...");
@@ -373,12 +373,12 @@ static int switch_to_app_mode(struct device *i2c)
 #ifdef CONFIG_CCS811_TRIGGER
 
 int ccs811_mutate_meas_mode(struct device *dev,
-			    u8_t set,
-			    u8_t clear)
+			    uint8_t set,
+			    uint8_t clear)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
 	int rc = 0;
-	u8_t mode = set | (drv_data->mode & ~clear);
+	uint8_t mode = set | (drv_data->mode & ~clear);
 
 	/*
 	 * Changing drive mode of a running system has preconditions.
@@ -412,7 +412,7 @@ int ccs811_mutate_meas_mode(struct device *dev,
 int ccs811_set_thresholds(struct device *dev)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
-	const u8_t buf[5] = {
+	const uint8_t buf[5] = {
 		CCS811_REG_THRESHOLDS,
 		drv_data->co2_l2m >> 8,
 		drv_data->co2_l2m,
@@ -434,9 +434,9 @@ static int ccs811_init(struct device *dev)
 	struct ccs811_data *drv_data = dev->driver_data;
 	int ret = 0;
 	int status;
-	u16_t fw_ver;
-	u8_t cmd;
-	u8_t hw_id;
+	uint16_t fw_ver;
+	uint8_t cmd;
+	uint8_t hw_id;
 
 	*drv_data = (struct ccs811_data){ 0 };
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
@@ -499,7 +499,7 @@ static int ccs811_init(struct device *dev)
 	gpio_pin_set(drv_data->reset_gpio, RESET_PIN, 0);
 #else
 	{
-		static u8_t const reset_seq[] = {
+		static uint8_t const reset_seq[] = {
 			0xFF, 0x11, 0xE5, 0x72, 0x8A,
 		};
 
@@ -547,7 +547,7 @@ static int ccs811_init(struct device *dev)
 	drv_data->app_fw_ver = fw_ver >> 8U;
 
 	/* Configure measurement mode */
-	u8_t meas_mode = CCS811_MODE_IDLE;
+	uint8_t meas_mode = CCS811_MODE_IDLE;
 #ifdef CONFIG_CCS811_DRIVE_MODE_1
 	meas_mode = CCS811_MODE_IAQ_1SEC;
 #elif defined(CONFIG_CCS811_DRIVE_MODE_2)
diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h
index 8619a12eb9..ad2c259c4e 100644
--- a/drivers/sensor/ccs811/ccs811.h
+++ b/drivers/sensor/ccs811/ccs811.h
@@ -68,8 +68,8 @@ struct ccs811_data {
 #elif defined(CONFIG_CCS811_TRIGGER_GLOBAL_THREAD)
 	struct k_work work;
 #endif
-	u16_t co2_l2m;
-	u16_t co2_m2h;
+	uint16_t co2_l2m;
+	uint16_t co2_m2h;
 #endif /* CONFIG_CCS811_TRIGGER */
 #endif
 #if DT_INST_NODE_HAS_PROP(0, reset_gpios)
@@ -79,15 +79,15 @@ struct ccs811_data {
 	struct device *wake_gpio;
 #endif
 	struct ccs811_result_type result;
-	u8_t mode;
-	u8_t app_fw_ver;
+	uint8_t mode;
+	uint8_t app_fw_ver;
 };
 
 #ifdef CONFIG_CCS811_TRIGGER
 
 int ccs811_mutate_meas_mode(struct device *dev,
-			    u8_t set,
-			    u8_t clear);
+			    uint8_t set,
+			    uint8_t clear);
 
 int ccs811_set_thresholds(struct device *dev);
 
diff --git a/drivers/sensor/ccs811/ccs811_trigger.c b/drivers/sensor/ccs811/ccs811_trigger.c
index 8d0afddcb0..ba5d49a83a 100644
--- a/drivers/sensor/ccs811/ccs811_trigger.c
+++ b/drivers/sensor/ccs811/ccs811_trigger.c
@@ -84,7 +84,7 @@ static void process_irq(struct device *dev)
 
 static void gpio_callback(struct device *dev,
 			  struct gpio_callback *cb,
-			  u32_t pins)
+			  uint32_t pins)
 {
 	struct ccs811_data *data =
 		CONTAINER_OF(cb, struct ccs811_data, gpio_cb);
@@ -123,7 +123,7 @@ int ccs811_trigger_set(struct device *dev,
 		       sensor_trigger_handler_t handler)
 {
 	struct ccs811_data *drv_data = dev->driver_data;
-	u8_t drdy_thresh = CCS811_MODE_THRESH | CCS811_MODE_DATARDY;
+	uint8_t drdy_thresh = CCS811_MODE_THRESH | CCS811_MODE_DATARDY;
 	int rc;
 
 	LOG_DBG("CCS811 trigger set");
diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c
index f5e2fdcbec..4e1b17043c 100644
--- a/drivers/sensor/dht/dht.c
+++ b/drivers/sensor/dht/dht.c
@@ -28,18 +28,18 @@ LOG_MODULE_REGISTER(DHT, CONFIG_SENSOR_LOG_LEVEL);
  * @return duration in usec of signal being measured,
  *         -1 if duration exceeds DHT_SIGNAL_MAX_WAIT_DURATION
  */
-static s8_t dht_measure_signal_duration(struct device *dev,
+static int8_t dht_measure_signal_duration(struct device *dev,
 					bool active)
 {
 	struct dht_data *drv_data = dev->driver_data;
 	const struct dht_config *cfg = dev->config_info;
-	u32_t elapsed_cycles;
-	u32_t max_wait_cycles = (u32_t)(
-		(u64_t)DHT_SIGNAL_MAX_WAIT_DURATION *
-		(u64_t)sys_clock_hw_cycles_per_sec() /
-		(u64_t)USEC_PER_SEC
+	uint32_t elapsed_cycles;
+	uint32_t max_wait_cycles = (uint32_t)(
+		(uint64_t)DHT_SIGNAL_MAX_WAIT_DURATION *
+		(uint64_t)sys_clock_hw_cycles_per_sec() /
+		(uint64_t)USEC_PER_SEC
 	);
-	u32_t start_cycles = k_cycle_get_32();
+	uint32_t start_cycles = k_cycle_get_32();
 	int rc;
 
 	do {
@@ -52,9 +52,9 @@ static s8_t dht_measure_signal_duration(struct device *dev,
 		}
 	} while ((bool)rc == active);
 
-	return (u64_t)elapsed_cycles *
-	       (u64_t)USEC_PER_SEC /
-	       (u64_t)sys_clock_hw_cycles_per_sec();
+	return (uint64_t)elapsed_cycles *
+	       (uint64_t)USEC_PER_SEC /
+	       (uint64_t)sys_clock_hw_cycles_per_sec();
 }
 
 static int dht_sample_fetch(struct device *dev, enum sensor_channel chan)
@@ -62,9 +62,9 @@ static int dht_sample_fetch(struct device *dev, enum sensor_channel chan)
 	struct dht_data *drv_data = dev->driver_data;
 	const struct dht_config *cfg = dev->config_info;
 	int ret = 0;
-	s8_t signal_duration[DHT_DATA_BITS_NUM];
-	s8_t max_duration, min_duration, avg_duration;
-	u8_t buf[5];
+	int8_t signal_duration[DHT_DATA_BITS_NUM];
+	int8_t max_duration, min_duration, avg_duration;
+	uint8_t buf[5];
 	unsigned int i, j;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
@@ -131,7 +131,7 @@ static int dht_sample_fetch(struct device *dev, enum sensor_channel chan)
 			max_duration = signal_duration[i];
 		}
 	}
-	avg_duration = ((s16_t)min_duration + (s16_t)max_duration) / 2;
+	avg_duration = ((int16_t)min_duration + (int16_t)max_duration) / 2;
 
 	/* store bits in buf */
 	j = 0U;
@@ -179,7 +179,7 @@ static int dht_channel_get(struct device *dev,
 		 * use both integral and decimal data bytes; resulted
 		 * 16bit data has a resolution of 0.1 units
 		 */
-		s16_t raw_val, sign;
+		int16_t raw_val, sign;
 
 		if (chan == SENSOR_CHAN_HUMIDITY) {
 			raw_val = (drv_data->sample[0] << 8)
diff --git a/drivers/sensor/dht/dht.h b/drivers/sensor/dht/dht.h
index 4d14dccfe4..7064afbef5 100644
--- a/drivers/sensor/dht/dht.h
+++ b/drivers/sensor/dht/dht.h
@@ -15,7 +15,7 @@
 
 struct dht_data {
 	struct device *gpio;
-	u8_t sample[4];
+	uint8_t sample[4];
 };
 
 struct dht_config {
diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c
index 65c6d3a344..4a587d0bed 100644
--- a/drivers/sensor/dps310/dps310.c
+++ b/drivers/sensor/dps310/dps310.c
@@ -206,94 +206,94 @@ enum {
 #define POW_2_19_MINUS_1	BIT_MASK(19)
 
 /* Needed because the values are referenced by pointer. */
-static const u8_t REG_ADDR_MEAS_CFG = IFX_DPS310_REG_ADDR_MEAS_CFG;
-static const u8_t REG_ADDR_CALIB_COEFF_0 = IFX_DPS310_REG_ADDR_COEF_0;
-static const u8_t REG_ADDR_TMP_B2 = IFX_DPS310_REG_ADDR_TMP_B2;
-static const u8_t REG_ADDR_PSR_B2 = IFX_DPS310_REG_ADDR_PSR_B2;
-static const u8_t REG_ADDR_COEF_SRCE = IFX_DPS310_REG_ADDR_COEF_SRCE;
+static const uint8_t REG_ADDR_MEAS_CFG = IFX_DPS310_REG_ADDR_MEAS_CFG;
+static const uint8_t REG_ADDR_CALIB_COEFF_0 = IFX_DPS310_REG_ADDR_COEF_0;
+static const uint8_t REG_ADDR_TMP_B2 = IFX_DPS310_REG_ADDR_TMP_B2;
+static const uint8_t REG_ADDR_PSR_B2 = IFX_DPS310_REG_ADDR_PSR_B2;
+static const uint8_t REG_ADDR_COEF_SRCE = IFX_DPS310_REG_ADDR_COEF_SRCE;
 
 /* calibration coefficients */
 struct dps310_cal_coeff {
 	/* Pressure Sensor Calibration Coefficients */
-	s32_t c00; /* 20bit */
-	s32_t c10; /* 20bit */
-	s16_t c01; /* 16bit */
-	s16_t c11; /* 16bit */
-	s16_t c20; /* 16bit */
-	s16_t c21; /* 16bit */
-	s16_t c30; /* 16bit */
+	int32_t c00; /* 20bit */
+	int32_t c10; /* 20bit */
+	int16_t c01; /* 16bit */
+	int16_t c11; /* 16bit */
+	int16_t c20; /* 16bit */
+	int16_t c21; /* 16bit */
+	int16_t c30; /* 16bit */
 	/* Temperature Sensor Calibration Coefficients */
-	s16_t c0; /* 12bit */
-	s16_t c1; /* 12bit */
+	int16_t c0; /* 12bit */
+	int16_t c1; /* 12bit */
 };
 
 struct dps310_data {
 	struct device *i2c_master;
 	struct dps310_cal_coeff comp;
 	/* Temperature Values */
-	s32_t tmp_val1;
-	s32_t tmp_val2;
+	int32_t tmp_val1;
+	int32_t tmp_val2;
 	/* Last raw temperature value for temperature compensation */
-	s32_t raw_tmp;
+	int32_t raw_tmp;
 	/* Pressure Values */
-	s32_t psr_val1;
-	s32_t psr_val2;
+	int32_t psr_val1;
+	int32_t psr_val2;
 };
 
 struct dps310_cfg {
 	char *i2c_bus_name;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 };
 
 /*
  * Convert the bytes from calibration memory to calibration coefficients
  * structure
  */
-static void dps310_calib_coeff_creation(const u8_t raw_coef[18],
+static void dps310_calib_coeff_creation(const uint8_t raw_coef[18],
 					struct dps310_cal_coeff *comp)
 {
 	/* Temperature sensor compensation values */
-	comp->c0 = (((u16_t)raw_coef[0]) << 4) + (raw_coef[1] >> 4);
+	comp->c0 = (((uint16_t)raw_coef[0]) << 4) + (raw_coef[1] >> 4);
 	/* coefficient is 2nd compliment */
 	if (comp->c0 > POW_2_11_MINUS_1) {
 		comp->c0 = comp->c0 - POW_2_12;
 	}
 
-	comp->c1 = (((u16_t)(raw_coef[1] & 0x0F)) << 8) + raw_coef[2];
+	comp->c1 = (((uint16_t)(raw_coef[1] & 0x0F)) << 8) + raw_coef[2];
 	/* coefficient is 2nd compliment */
 	if (comp->c1 > POW_2_11_MINUS_1) {
 		comp->c1 = comp->c1 - POW_2_12;
 	}
 
 	/* Pressure sensor compensation values */
-	comp->c00 = (((u32_t)raw_coef[3]) << 12) + (((u16_t)raw_coef[4]) << 4) +
+	comp->c00 = (((uint32_t)raw_coef[3]) << 12) + (((uint16_t)raw_coef[4]) << 4) +
 		    (raw_coef[5] >> 4);
 	/* coefficient is 2nd compliment */
 	if (comp->c00 > POW_2_19_MINUS_1) {
 		comp->c00 = comp->c00 - POW_2_20;
 	}
 
-	comp->c10 = (((u32_t)(raw_coef[5] & 0x0F)) << 16) +
-		    (((u16_t)raw_coef[6]) << 8) + raw_coef[7];
+	comp->c10 = (((uint32_t)(raw_coef[5] & 0x0F)) << 16) +
+		    (((uint16_t)raw_coef[6]) << 8) + raw_coef[7];
 	/* coefficient is 2nd compliment */
 	if (comp->c10 > POW_2_19_MINUS_1) {
 		comp->c10 = comp->c10 - POW_2_20;
 	}
 
-	comp->c01 = (s16_t) sys_get_be16(&raw_coef[8]);
-	comp->c11 = (s16_t) sys_get_be16(&raw_coef[10]);
-	comp->c20 = (s16_t) sys_get_be16(&raw_coef[12]);
-	comp->c21 = (s16_t) sys_get_be16(&raw_coef[14]);
-	comp->c30 = (s16_t) sys_get_be16(&raw_coef[16]);
+	comp->c01 = (int16_t) sys_get_be16(&raw_coef[8]);
+	comp->c11 = (int16_t) sys_get_be16(&raw_coef[10]);
+	comp->c20 = (int16_t) sys_get_be16(&raw_coef[12]);
+	comp->c21 = (int16_t) sys_get_be16(&raw_coef[14]);
+	comp->c30 = (int16_t) sys_get_be16(&raw_coef[16]);
 }
 
 /* Poll one or multiple bits given by ready_mask in reg_addr */
 static bool poll_rdy(struct dps310_data *data, const struct dps310_cfg *config,
-		     u8_t reg_addr, u8_t ready_mask)
+		     uint8_t reg_addr, uint8_t ready_mask)
 {
 	/* Try only a finite number of times */
 	for (int i = 0; i < POLL_TRIES; i++) {
-		u8_t reg = 0;
+		uint8_t reg = 0;
 		int res = i2c_reg_read_byte(data->i2c_master, config->i2c_addr,
 					 reg_addr, &reg);
 		if (res < 0) {
@@ -318,7 +318,7 @@ static bool dps310_trigger_temperature(struct dps310_data *data,
 				       const struct dps310_cfg *config)
 {
 	/* command to start temperature measurement */
-	static const u8_t tmp_meas_cmd[] = {
+	static const uint8_t tmp_meas_cmd[] = {
 		IFX_DPS310_REG_ADDR_MEAS_CFG,
 		IFX_DPS310_MODE_COMMAND_TEMPERATURE
 	};
@@ -348,7 +348,7 @@ static bool dps310_trigger_pressure(struct dps310_data *data,
 				    const struct dps310_cfg *config)
 {
 	/* command to start pressure measurement */
-	static const u8_t psr_meas_cmd[] = {
+	static const uint8_t psr_meas_cmd[] = {
 		IFX_DPS310_REG_ADDR_MEAS_CFG,
 		IFX_DPS310_MODE_COMMAND_PRESSURE
 	};
@@ -382,7 +382,7 @@ static void dps310_hw_bug_fix(struct dps310_data *data,
 			      const struct dps310_cfg *config)
 {
 	/* setup the necessary 5 sequences to fix the hw bug */
-	static const u8_t hw_bug_fix_sequence[HW_BUG_FIX_SEQUENCE_LEN][2] = {
+	static const uint8_t hw_bug_fix_sequence[HW_BUG_FIX_SEQUENCE_LEN][2] = {
 		/*
 		 * First write valid signature on 0x0e and 0x0f
 		 * to unlock address 0x62
@@ -412,19 +412,19 @@ static void dps310_hw_bug_fix(struct dps310_data *data,
  * The formula is based on the Chapter 4.9.2 in the datasheet and was
  * modified to need only integer arithmetic.
  */
-static void dps310_scale_temperature(s32_t tmp_raw, struct dps310_data *data)
+static void dps310_scale_temperature(int32_t tmp_raw, struct dps310_data *data)
 {
 	const struct dps310_cal_coeff *comp = &data->comp;
 
 	/* first term, rescaled to micro °C */
-	s32_t tmp_p0 = (1000000 / 2) * comp->c0;
+	int32_t tmp_p0 = (1000000 / 2) * comp->c0;
 
 	/* second term, rescaled to mirco °C */
-	s32_t tmp_p1 =
-		(((s64_t)1000000) * comp->c1 * tmp_raw) / IFX_DPS310_SF_TMP;
+	int32_t tmp_p1 =
+		(((int64_t)1000000) * comp->c1 * tmp_raw) / IFX_DPS310_SF_TMP;
 
 	/* calculate the temperature corresponding to the datasheet */
-	s32_t tmp_final = tmp_p0 + tmp_p1; /* value is in micro °C */
+	int32_t tmp_final = tmp_p0 + tmp_p1; /* value is in micro °C */
 
 	/* store calculated value */
 	data->tmp_val1 = tmp_final / 1000000;
@@ -435,7 +435,7 @@ static void dps310_scale_temperature(s32_t tmp_raw, struct dps310_data *data)
  * Scale and temperature compensate the raw pressure measurement value to
  * Kilopascal. The formula is based on the Chapter 4.9.1 in the datasheet.
  */
-static void dps310_scale_pressure(s32_t tmp_raw, s32_t psr_raw,
+static void dps310_scale_pressure(int32_t tmp_raw, int32_t psr_raw,
 				  struct dps310_data *data)
 {
 	const struct dps310_cal_coeff *comp = &data->comp;
@@ -458,11 +458,11 @@ static void dps310_scale_pressure(s32_t tmp_raw, s32_t psr_raw,
 	data->psr_val2 = (psr_final - data->psr_val1) * 1000000;
 }
 
-/* Convert the raw sensor data to s32_t */
-static s32_t raw_to_int24(const u8_t raw[3])
+/* Convert the raw sensor data to int32_t */
+static int32_t raw_to_int24(const uint8_t raw[3])
 {
 	/* convert from twos complement */
-	s32_t res = (s32_t) sys_get_be24(raw);
+	int32_t res = (int32_t) sys_get_be24(raw);
 
 	if (res > POW_2_23_MINUS_1) {
 		res -= POW_2_24;
@@ -484,7 +484,7 @@ static bool dps310_measure_tmp_psr(struct dps310_data *data,
 	}
 
 	/* memory for pressure and temperature raw values */
-	u8_t value_raw[6];
+	uint8_t value_raw[6];
 
 	/* read pressure and temperature raw values in one continuous read */
 	int res = i2c_write_read(data->i2c_master, config->i2c_addr,
@@ -496,7 +496,7 @@ static bool dps310_measure_tmp_psr(struct dps310_data *data,
 	}
 
 	/* convert raw data to int */
-	s32_t psr_raw = raw_to_int24(&value_raw[0]);
+	int32_t psr_raw = raw_to_int24(&value_raw[0]);
 
 	data->raw_tmp = raw_to_int24(&value_raw[3]);
 
@@ -520,7 +520,7 @@ static bool dps310_measure_psr(struct dps310_data *data,
 	}
 
 	/* memory for pressure raw value */
-	u8_t value_raw[3];
+	uint8_t value_raw[3];
 
 	/* read pressure raw values in one continuous read */
 	int res = i2c_write_read(data->i2c_master, config->i2c_addr,
@@ -532,7 +532,7 @@ static bool dps310_measure_psr(struct dps310_data *data,
 	}
 
 	/* convert raw data to int */
-	s32_t psr_raw = raw_to_int24(&value_raw[0]);
+	int32_t psr_raw = raw_to_int24(&value_raw[0]);
 
 	dps310_scale_pressure(data->raw_tmp, psr_raw, data);
 
@@ -549,7 +549,7 @@ static bool dps310_measure_tmp(struct dps310_data *data,
 	}
 
 	/* memory for temperature raw value */
-	u8_t value_raw[3];
+	uint8_t value_raw[3];
 
 	/* read temperature raw values in one continuous read */
 	int res = i2c_write_read(data->i2c_master, config->i2c_addr,
@@ -580,7 +580,7 @@ static int dps310_init(struct device *dev)
 		return -EINVAL;
 	}
 
-	u8_t product_id = 0;
+	uint8_t product_id = 0;
 	int res = i2c_reg_read_byte(data->i2c_master, config->i2c_addr,
 				 IFX_DPS310_REG_ADDR_PRODUCT_ID, &product_id);
 
@@ -606,7 +606,7 @@ static int dps310_init(struct device *dev)
 	}
 
 	/* read calibration coefficients */
-	u8_t raw_coef[18] = { 0 };
+	uint8_t raw_coef[18] = { 0 };
 
 	res = i2c_write_read(data->i2c_master, config->i2c_addr,
 			     &REG_ADDR_CALIB_COEFF_0, 1, &raw_coef, 18);
@@ -622,7 +622,7 @@ static int dps310_init(struct device *dev)
 	 * check which temperature sensor was used for calibration and use it
 	 * for measurements.
 	 */
-	u8_t tmp_coef_srce = 0;
+	uint8_t tmp_coef_srce = 0;
 
 	res = i2c_write_read(data->i2c_master, config->i2c_addr,
 			     &REG_ADDR_COEF_SRCE, 1, &tmp_coef_srce, 18);
@@ -638,7 +638,7 @@ static int dps310_init(struct device *dev)
 	tmp_coef_srce |= IFX_DPS310_TMP_CFG;
 
 	/* set complete configuration in one write */
-	const u8_t config_seq[] = {
+	const uint8_t config_seq[] = {
 		IFX_DPS310_REG_ADDR_PRS_CFG,	/* start register address */
 		IFX_DPS310_PSR_CFG,		/* PSR_CFG */
 		tmp_coef_srce,			/* TMP_CFG */
diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c
index 0539bf8a3f..5e6d887afb 100644
--- a/drivers/sensor/ens210/ens210.c
+++ b/drivers/sensor/ens210/ens210.c
@@ -19,11 +19,11 @@
 LOG_MODULE_REGISTER(ENS210, CONFIG_SENSOR_LOG_LEVEL);
 
 #ifdef CONFIG_ENS210_CRC_CHECK
-static u32_t ens210_crc7(u32_t bitstream)
+static uint32_t ens210_crc7(uint32_t bitstream)
 {
-	u32_t polynomial = (ENS210_CRC7_POLY << (ENS210_CRC7_DATA_WIDTH - 1));
-	u32_t bit = ENS210_CRC7_DATA_MSB << ENS210_CRC7_WIDTH;
-	u32_t val = (bitstream << ENS210_CRC7_WIDTH) | ENS210_CRC7_IVEC;
+	uint32_t polynomial = (ENS210_CRC7_POLY << (ENS210_CRC7_DATA_WIDTH - 1));
+	uint32_t bit = ENS210_CRC7_DATA_MSB << ENS210_CRC7_WIDTH;
+	uint32_t val = (bitstream << ENS210_CRC7_WIDTH) | ENS210_CRC7_IVEC;
 
 	while (bit & (ENS210_CRC7_DATA_MASK << ENS210_CRC7_WIDTH)) {
 		if (bit & val) {
@@ -42,7 +42,7 @@ static u32_t ens210_crc7(u32_t bitstream)
 		|| defined(CONFIG_ENS210_HUMIDITY_SINGLE)
 static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan)
 {
-	u8_t buf;
+	uint8_t buf;
 	int ret;
 	const struct ens210_sens_start sense_start = {
 		.t_start = ENS210_T_START && (chan == SENSOR_CHAN_ALL
@@ -54,11 +54,11 @@ static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan)
 	/* Start measuring */
 	ret = i2c_reg_write_byte(i2c_dev,
 			DT_INST_REG_ADDR(0),
-			ENS210_REG_SENS_START, *(u8_t *)&sense_start);
+			ENS210_REG_SENS_START, *(uint8_t *)&sense_start);
 
 	if (ret < 0) {
 		LOG_ERR("Failed to set SENS_START to 0x%x",
-				*(u8_t *)&sense_start);
+				*(uint8_t *)&sense_start);
 		return -EIO;
 	}
 
@@ -72,7 +72,7 @@ static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan)
 		if (ret < 0) {
 			LOG_ERR("Failed to read SENS_STAT");
 		}
-	} while (buf & *(u8_t *)&sense_start);
+	} while (buf & *(uint8_t *)&sense_start);
 
 	return ret;
 }
@@ -85,7 +85,7 @@ static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan)
 	int ret, cnt;
 
 #ifdef CONFIG_ENS210_CRC_CHECK
-	u32_t temp_valid, humidity_valid;
+	uint32_t temp_valid, humidity_valid;
 #endif /* CONFIG_ENS210_CRC_CHECK */
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL
@@ -103,7 +103,7 @@ static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	for (cnt = 0; cnt <= CONFIG_ENS210_MAX_READ_RETRIES; cnt++) {
 		ret =  i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
-				ENS210_REG_T_VAL, (u8_t *)&data, sizeof(data));
+				ENS210_REG_T_VAL, (uint8_t *)&data, sizeof(data));
 		if (ret < 0) {
 			LOG_ERR("Failed to read data");
 			continue;
@@ -162,8 +162,8 @@ static int ens210_channel_get(struct device *dev,
 			      struct sensor_value *val)
 {
 	struct ens210_data *drv_data = dev->driver_data;
-	s32_t temp_frac;
-	s32_t humidity_frac;
+	int32_t temp_frac;
+	int32_t humidity_frac;
 
 	switch (chan) {
 	case SENSOR_CHAN_AMBIENT_TEMP:
@@ -197,14 +197,14 @@ static int ens210_sys_reset(struct device *i2c_dev)
 	int ret;
 
 	ret = i2c_reg_write_byte(i2c_dev, DT_INST_REG_ADDR(0),
-				 ENS210_REG_SYS_CTRL, *(u8_t *)&sys_ctrl);
+				 ENS210_REG_SYS_CTRL, *(uint8_t *)&sys_ctrl);
 	if (ret < 0) {
-		LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(u8_t *)&sys_ctrl);
+		LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(uint8_t *)&sys_ctrl);
 	}
 	return ret;
 }
 
-static int ens210_sys_enable(struct device *i2c_dev, u8_t low_power)
+static int ens210_sys_enable(struct device *i2c_dev, uint8_t low_power)
 {
 	const struct ens210_sys_ctrl sys_ctrl = {
 			.low_power = low_power,
@@ -213,9 +213,9 @@ static int ens210_sys_enable(struct device *i2c_dev, u8_t low_power)
 	int ret;
 
 	ret = i2c_reg_write_byte(i2c_dev, DT_INST_REG_ADDR(0),
-				 ENS210_REG_SYS_CTRL, *(u8_t *)&sys_ctrl);
+				 ENS210_REG_SYS_CTRL, *(uint8_t *)&sys_ctrl);
 	if (ret < 0) {
-		LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(u8_t *)&sys_ctrl);
+		LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(uint8_t *)&sys_ctrl);
 	}
 	return ret;
 }
@@ -229,7 +229,7 @@ static int ens210_wait_boot(struct device *i2c_dev)
 	for (cnt = 0; cnt <= CONFIG_ENS210_MAX_STAT_RETRIES; cnt++) {
 		ret =  i2c_reg_read_byte(i2c_dev, DT_INST_REG_ADDR(0),
 					 ENS210_REG_SYS_STAT,
-					 (u8_t *)&sys_stat);
+					 (uint8_t *)&sys_stat);
 
 		if (ret < 0) {
 			k_sleep(K_MSEC(1));
@@ -280,7 +280,7 @@ static int ens210_init(struct device *dev)
 #endif
 
 	int ret;
-	u16_t part_id;
+	uint16_t part_id;
 
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
 	if (drv_data->i2c == NULL) {
@@ -299,7 +299,7 @@ static int ens210_init(struct device *dev)
 	 * and active
 	 */
 	ret =  i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
-			      ENS210_REG_PART_ID, (u8_t *)&part_id,
+			      ENS210_REG_PART_ID, (uint8_t *)&part_id,
 			      sizeof(part_id));
 	if (ret < 0) {
 		LOG_ERR("Failed to read Part ID register");
@@ -319,10 +319,10 @@ static int ens210_init(struct device *dev)
 
 	/* Set measurement mode*/
 	ret = i2c_reg_write_byte(drv_data->i2c, DT_INST_REG_ADDR(0),
-				 ENS210_REG_SENS_RUN, *(u8_t *)&sense_run);
+				 ENS210_REG_SENS_RUN, *(uint8_t *)&sense_run);
 	if (ret < 0) {
 		LOG_ERR("Failed to set SENS_RUN to 0x%x",
-			    *(u8_t *)&sense_run);
+			    *(uint8_t *)&sense_run);
 		return -EIO;
 	}
 
@@ -330,10 +330,10 @@ static int ens210_init(struct device *dev)
 	|| defined(CONFIG_ENS210_HUMIDITY_CONTINUOUS)
 	/* Start measuring */
 	ret = i2c_reg_write_byte(drv_data->i2c, DT_INST_REG_ADDR(0),
-				 ENS210_REG_SENS_START, *(u8_t *)&sense_start);
+				 ENS210_REG_SENS_START, *(uint8_t *)&sense_start);
 	if (ret < 0) {
 		LOG_ERR("Failed to set SENS_START to 0x%x",
-			    *(u8_t *)&sense_start);
+			    *(uint8_t *)&sense_start);
 		return -EIO;
 	}
 #endif
diff --git a/drivers/sensor/ens210/ens210.h b/drivers/sensor/ens210/ens210.h
index 188e5475c1..2eabe458b6 100644
--- a/drivers/sensor/ens210/ens210.h
+++ b/drivers/sensor/ens210/ens210.h
@@ -60,44 +60,44 @@
 #define ENS210_CRC7_DATA_MSB   (1UL << (ENS210_CRC7_DATA_WIDTH - 1))
 
 struct ens210_value_data {
-	u16_t val;
-	u8_t  valid : 1;
-	u8_t  crc7  : 7;
+	uint16_t val;
+	uint8_t  valid : 1;
+	uint8_t  crc7  : 7;
 } __packed;
 
 struct ens210_sys_ctrl {
-	u8_t  low_power : 1;
-	u8_t  reserved  : 6;
-	u8_t  reset     : 1;
+	uint8_t  low_power : 1;
+	uint8_t  reserved  : 6;
+	uint8_t  reset     : 1;
 } __packed;
 
 struct ens210_sys_stat {
-	u8_t  sys_active : 1;
-	u8_t  reserved   : 7;
+	uint8_t  sys_active : 1;
+	uint8_t  reserved   : 7;
 } __packed;
 
 struct ens210_sens_run {
-	u8_t  t_run    : 1;
-	u8_t  h_run    : 1;
-	u8_t  reserved : 6;
+	uint8_t  t_run    : 1;
+	uint8_t  h_run    : 1;
+	uint8_t  reserved : 6;
 } __packed;
 
 struct ens210_sens_start {
-	u8_t  t_start  : 1;
-	u8_t  h_start  : 1;
-	u8_t  reserved : 6;
+	uint8_t  t_start  : 1;
+	uint8_t  h_start  : 1;
+	uint8_t  reserved : 6;
 } __packed;
 
 struct ens210_sens_stop {
-	u8_t  t_stop  : 1;
-	u8_t  h_stop  : 1;
-	u8_t  reserved : 6;
+	uint8_t  t_stop  : 1;
+	uint8_t  h_stop  : 1;
+	uint8_t  reserved : 6;
 } __packed;
 
 struct ens210_sens_stat {
-	u8_t  t_stat  : 1;
-	u8_t  h_stat  : 1;
-	u8_t  reserved : 6;
+	uint8_t  t_stat  : 1;
+	uint8_t  h_stat  : 1;
+	uint8_t  reserved : 6;
 } __packed;
 
 struct ens210_data {
diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c
index 2a555ec789..ae095e7bc1 100644
--- a/drivers/sensor/fxas21002/fxas21002.c
+++ b/drivers/sensor/fxas21002/fxas21002.c
@@ -14,7 +14,7 @@
 LOG_MODULE_REGISTER(FXAS21002, CONFIG_SENSOR_LOG_LEVEL);
 
 /* Sample period in microseconds, indexed by output data rate encoding (DR) */
-static const u32_t sample_period[] = {
+static const uint32_t sample_period[] = {
 	1250, 2500, 5000, 10000, 20000, 40000, 80000, 80000
 };
 
@@ -22,8 +22,8 @@ static int fxas21002_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
-	u8_t buffer[FXAS21002_MAX_NUM_BYTES];
-	s16_t *raw;
+	uint8_t buffer[FXAS21002_MAX_NUM_BYTES];
+	int16_t *raw;
 	int ret = 0;
 	int i;
 
@@ -58,10 +58,10 @@ exit:
 	return ret;
 }
 
-static void fxas21002_convert(struct sensor_value *val, s16_t raw,
+static void fxas21002_convert(struct sensor_value *val, int16_t raw,
 			      enum fxas21002_range range)
 {
-	s32_t micro_rad;
+	int32_t micro_rad;
 
 	/* Convert units to micro radians per second.*/
 	micro_rad = (raw * 62500) >> range;
@@ -77,7 +77,7 @@ static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan,
 	struct fxas21002_data *data = dev->driver_data;
 	int start_channel;
 	int num_channels;
-	s16_t *raw;
+	int16_t *raw;
 	int ret;
 	int i;
 
@@ -134,7 +134,7 @@ int fxas21002_get_power(struct device *dev, enum fxas21002_power *power)
 {
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
-	u8_t val = *power;
+	uint8_t val = *power;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_address,
 			      FXAS21002_REG_CTRLREG1,
@@ -159,11 +159,11 @@ int fxas21002_set_power(struct device *dev, enum fxas21002_power power)
 				   power);
 }
 
-u32_t fxas21002_get_transition_time(enum fxas21002_power start,
+uint32_t fxas21002_get_transition_time(enum fxas21002_power start,
 				       enum fxas21002_power end,
-				       u8_t dr)
+				       uint8_t dr)
 {
-	u32_t transition_time;
+	uint32_t transition_time;
 
 	/* If not transitioning to active mode, then don't need to wait */
 	if (end != FXAS21002_POWER_ACTIVE) {
@@ -188,9 +188,9 @@ static int fxas21002_init(struct device *dev)
 {
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
-	u32_t transition_time;
-	u8_t whoami;
-	u8_t ctrlreg1;
+	uint32_t transition_time;
+	uint8_t whoami;
+	uint8_t ctrlreg1;
 
 	/* Get the I2C device */
 	data->i2c = device_get_binding(config->i2c_name);
diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h
index d0a3477d10..b3ff63fd48 100644
--- a/drivers/sensor/fxas21002/fxas21002.h
+++ b/drivers/sensor/fxas21002/fxas21002.h
@@ -60,13 +60,13 @@ struct fxas21002_config {
 	char *i2c_name;
 #ifdef CONFIG_FXAS21002_TRIGGER
 	char *gpio_name;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 #endif
-	u8_t i2c_address;
-	u8_t whoami;
+	uint8_t i2c_address;
+	uint8_t whoami;
 	enum fxas21002_range range;
-	u8_t dr;
+	uint8_t dr;
 };
 
 struct fxas21002_data {
@@ -74,7 +74,7 @@ struct fxas21002_data {
 	struct k_sem sem;
 #ifdef CONFIG_FXAS21002_TRIGGER
 	struct device *gpio;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	struct gpio_callback gpio_cb;
 	sensor_trigger_handler_t drdy_handler;
 #endif
@@ -87,15 +87,15 @@ struct fxas21002_data {
 	struct k_work work;
 	struct device *dev;
 #endif
-	s16_t raw[FXAS21002_MAX_NUM_CHANNELS];
+	int16_t raw[FXAS21002_MAX_NUM_CHANNELS];
 };
 
 int fxas21002_get_power(struct device *dev, enum fxas21002_power *power);
 int fxas21002_set_power(struct device *dev, enum fxas21002_power power);
 
-u32_t fxas21002_get_transition_time(enum fxas21002_power start,
+uint32_t fxas21002_get_transition_time(enum fxas21002_power start,
 				       enum fxas21002_power end,
-				       u8_t dr);
+				       uint8_t dr);
 
 #if CONFIG_FXAS21002_TRIGGER
 int fxas21002_trigger_init(struct device *dev);
diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c
index a6ac746e1f..9e7ddaa81d 100644
--- a/drivers/sensor/fxas21002/fxas21002_trigger.c
+++ b/drivers/sensor/fxas21002/fxas21002_trigger.c
@@ -12,7 +12,7 @@ LOG_MODULE_DECLARE(FXAS21002, CONFIG_SENSOR_LOG_LEVEL);
 
 static void fxas21002_gpio_callback(struct device *dev,
 				   struct gpio_callback *cb,
-				   u32_t pin_mask)
+				   uint32_t pin_mask)
 {
 	struct fxas21002_data *data =
 		CONTAINER_OF(cb, struct fxas21002_data, gpio_cb);
@@ -52,7 +52,7 @@ static void fxas21002_handle_int(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
-	u8_t int_source;
+	uint8_t int_source;
 
 	k_sem_take(&data->sem, K_FOREVER);
 
@@ -106,8 +106,8 @@ int fxas21002_trigger_set(struct device *dev,
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
 	enum fxas21002_power power = FXAS21002_POWER_STANDBY;
-	u32_t transition_time;
-	u8_t mask;
+	uint32_t transition_time;
+	uint8_t mask;
 	int ret = 0;
 
 	k_sem_take(&data->sem, K_FOREVER);
@@ -173,7 +173,7 @@ int fxas21002_trigger_init(struct device *dev)
 {
 	const struct fxas21002_config *config = dev->config_info;
 	struct fxas21002_data *data = dev->driver_data;
-	u8_t ctrl_reg2;
+	uint8_t ctrl_reg2;
 
 #if defined(CONFIG_FXAS21002_TRIGGER_OWN_THREAD)
 	k_sem_init(&data->trig_sem, 0, UINT_MAX);
diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c
index 7b1fff8f17..40aebb63eb 100644
--- a/drivers/sensor/fxos8700/fxos8700.c
+++ b/drivers/sensor/fxos8700/fxos8700.c
@@ -19,7 +19,7 @@ int fxos8700_set_odr(struct device *dev, const struct sensor_value *val)
 {
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	s32_t dr = val->val1;
+	int32_t dr = val->val1;
 
 #ifdef CONFIG_FXOS8700_MODE_HYBRID
 	/* ODR is halved in hybrid mode */
@@ -64,11 +64,11 @@ int fxos8700_set_odr(struct device *dev, const struct sensor_value *val)
 	}
 #endif
 
-	LOG_DBG("Set ODR to 0x%x", (u8_t)dr);
+	LOG_DBG("Set ODR to 0x%x", (uint8_t)dr);
 
 	return i2c_reg_update_byte(data->i2c, config->i2c_address,
 				   FXOS8700_REG_CTRLREG1,
-				   FXOS8700_CTRLREG1_DR_MASK, (u8_t)dr);
+				   FXOS8700_CTRLREG1_DR_MASK, (uint8_t)dr);
 }
 
 static int fxos8700_set_mt_ths(struct device *dev,
@@ -77,19 +77,19 @@ static int fxos8700_set_mt_ths(struct device *dev,
 #ifdef CONFIG_FXOS8700_MOTION
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	u64_t micro_ms2 = abs(val->val1 * 1000000LL + val->val2);
-	u64_t ths = micro_ms2 / FXOS8700_FF_MT_THS_SCALE;
+	uint64_t micro_ms2 = abs(val->val1 * 1000000LL + val->val2);
+	uint64_t ths = micro_ms2 / FXOS8700_FF_MT_THS_SCALE;
 
 	if (ths > FXOS8700_FF_MT_THS_MASK) {
 		LOG_ERR("Threshold value is out of range");
 		return -EINVAL;
 	}
 
-	LOG_DBG("Set FF_MT_THS to %d", (u8_t)ths);
+	LOG_DBG("Set FF_MT_THS to %d", (uint8_t)ths);
 
 	return i2c_reg_update_byte(data->i2c, config->i2c_address,
 				   FXOS8700_REG_FF_MT_THS,
-				   FXOS8700_FF_MT_THS_MASK, (u8_t)ths);
+				   FXOS8700_FF_MT_THS_MASK, (uint8_t)ths);
 #else
 	return -ENOTSUP;
 #endif
@@ -119,9 +119,9 @@ static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	u8_t buffer[FXOS8700_MAX_NUM_BYTES];
-	u8_t num_bytes;
-	s16_t *raw;
+	uint8_t buffer[FXOS8700_MAX_NUM_BYTES];
+	uint8_t num_bytes;
+	int16_t *raw;
 	int ret = 0;
 	int i;
 
@@ -176,11 +176,11 @@ exit:
 	return ret;
 }
 
-static void fxos8700_accel_convert(struct sensor_value *val, s16_t raw,
+static void fxos8700_accel_convert(struct sensor_value *val, int16_t raw,
 				   enum fxos8700_range range)
 {
-	u8_t frac_bits;
-	s64_t micro_ms2;
+	uint8_t frac_bits;
+	int64_t micro_ms2;
 
 	/* The range encoding is convenient to compute the number of fractional
 	 * bits:
@@ -196,16 +196,16 @@ static void fxos8700_accel_convert(struct sensor_value *val, s16_t raw,
 	micro_ms2 = (raw * SENSOR_G) >> frac_bits;
 
 	/* The maximum possible value is 8g, which in units of micro m/s^2
-	 * always fits into 32-bits. Cast down to s32_t so we can use a
+	 * always fits into 32-bits. Cast down to int32_t so we can use a
 	 * faster divide.
 	 */
-	val->val1 = (s32_t) micro_ms2 / 1000000;
-	val->val2 = (s32_t) micro_ms2 % 1000000;
+	val->val1 = (int32_t) micro_ms2 / 1000000;
+	val->val2 = (int32_t) micro_ms2 % 1000000;
 }
 
-static void fxos8700_magn_convert(struct sensor_value *val, s16_t raw)
+static void fxos8700_magn_convert(struct sensor_value *val, int16_t raw)
 {
-	s32_t micro_g;
+	int32_t micro_g;
 
 	/* Convert units to micro Gauss. Raw magnetic data always has a
 	 * resolution of 0.1 uT/LSB, which is equivalent to 0.001 G/LSB.
@@ -217,9 +217,9 @@ static void fxos8700_magn_convert(struct sensor_value *val, s16_t raw)
 }
 
 #ifdef CONFIG_FXOS8700_TEMP
-static void fxos8700_temp_convert(struct sensor_value *val, s8_t raw)
+static void fxos8700_temp_convert(struct sensor_value *val, int8_t raw)
 {
-	s32_t micro_c;
+	int32_t micro_c;
 
 	/* Convert units to micro Celsius. Raw temperature data always has a
 	 * resolution of 0.96 deg C/LSB.
@@ -238,7 +238,7 @@ static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan,
 	struct fxos8700_data *data = dev->driver_data;
 	int start_channel;
 	int num_channels;
-	s16_t *raw;
+	int16_t *raw;
 	int ret;
 	int i;
 
@@ -343,7 +343,7 @@ int fxos8700_get_power(struct device *dev, enum fxos8700_power *power)
 {
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	u8_t val = *power;
+	uint8_t val = *power;
 
 	if (i2c_reg_read_byte(data->i2c, config->i2c_address,
 			      FXOS8700_REG_CTRLREG1,
diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h
index 45a3734fc3..0e3b764af9 100644
--- a/drivers/sensor/fxos8700/fxos8700.h
+++ b/drivers/sensor/fxos8700/fxos8700.h
@@ -123,25 +123,25 @@ struct fxos8700_config {
 	char *i2c_name;
 #ifdef CONFIG_FXOS8700_TRIGGER
 	char *gpio_name;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	gpio_dt_flags_t gpio_flags;
 #endif
-	u8_t i2c_address;
+	uint8_t i2c_address;
 	char *reset_name;
-	u8_t reset_pin;
+	uint8_t reset_pin;
 	gpio_dt_flags_t reset_flags;
 	enum fxos8700_mode mode;
 	enum fxos8700_power_mode power_mode;
 	enum fxos8700_range range;
-	u8_t start_addr;
-	u8_t start_channel;
-	u8_t num_channels;
+	uint8_t start_addr;
+	uint8_t start_channel;
+	uint8_t num_channels;
 #ifdef CONFIG_FXOS8700_PULSE
-	u8_t pulse_cfg;
-	u8_t pulse_ths[3];
-	u8_t pulse_tmlt;
-	u8_t pulse_ltcy;
-	u8_t pulse_wind;
+	uint8_t pulse_cfg;
+	uint8_t pulse_ths[3];
+	uint8_t pulse_tmlt;
+	uint8_t pulse_ltcy;
+	uint8_t pulse_wind;
 #endif
 };
 
@@ -150,7 +150,7 @@ struct fxos8700_data {
 	struct k_sem sem;
 #ifdef CONFIG_FXOS8700_TRIGGER
 	struct device *gpio;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	struct gpio_callback gpio_cb;
 	sensor_trigger_handler_t drdy_handler;
 #endif
@@ -170,11 +170,11 @@ struct fxos8700_data {
 	struct k_work work;
 	struct device *dev;
 #endif
-	s16_t raw[FXOS8700_MAX_NUM_CHANNELS];
+	int16_t raw[FXOS8700_MAX_NUM_CHANNELS];
 #ifdef CONFIG_FXOS8700_TEMP
-	s8_t temp;
+	int8_t temp;
 #endif
-	u8_t whoami;
+	uint8_t whoami;
 };
 
 int fxos8700_get_power(struct device *dev, enum fxos8700_power *power);
diff --git a/drivers/sensor/fxos8700/fxos8700_trigger.c b/drivers/sensor/fxos8700/fxos8700_trigger.c
index faebf969bc..b8305f604f 100644
--- a/drivers/sensor/fxos8700/fxos8700_trigger.c
+++ b/drivers/sensor/fxos8700/fxos8700_trigger.c
@@ -12,7 +12,7 @@ LOG_MODULE_DECLARE(FXOS8700, CONFIG_SENSOR_LOG_LEVEL);
 
 static void fxos8700_gpio_callback(struct device *dev,
 				   struct gpio_callback *cb,
-				   u32_t pin_mask)
+				   uint32_t pin_mask)
 {
 	struct fxos8700_data *data =
 		CONTAINER_OF(cb, struct fxos8700_data, gpio_cb);
@@ -53,7 +53,7 @@ static int fxos8700_handle_pulse_int(struct device *dev)
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
 	sensor_trigger_handler_t handler = NULL;
-	u8_t pulse_source;
+	uint8_t pulse_source;
 
 	struct sensor_trigger pulse_trig = {
 		.chan = SENSOR_CHAN_ALL,
@@ -91,7 +91,7 @@ static int fxos8700_handle_motion_int(struct device *dev)
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
 	sensor_trigger_handler_t handler = data->motion_handler;
-	u8_t motion_source;
+	uint8_t motion_source;
 
 	struct sensor_trigger motion_trig = {
 		.chan = SENSOR_CHAN_ALL,
@@ -121,7 +121,7 @@ static void fxos8700_handle_int(void *arg)
 	struct device *dev = (struct device *)arg;
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	u8_t int_source;
+	uint8_t int_source;
 
 	k_sem_take(&data->sem, K_FOREVER);
 
@@ -185,7 +185,7 @@ int fxos8700_trigger_set(struct device *dev,
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
 	enum fxos8700_power power = FXOS8700_POWER_STANDBY;
-	u8_t mask;
+	uint8_t mask;
 	int ret = 0;
 
 	k_sem_take(&data->sem, K_FOREVER);
@@ -335,7 +335,7 @@ int fxos8700_trigger_init(struct device *dev)
 {
 	const struct fxos8700_config *config = dev->config_info;
 	struct fxos8700_data *data = dev->driver_data;
-	u8_t ctrl_reg5;
+	uint8_t ctrl_reg5;
 
 #if defined(CONFIG_FXOS8700_TRIGGER_OWN_THREAD)
 	k_sem_init(&data->trig_sem, 0, UINT_MAX);
diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c
index 62aa95b358..0fd5b12f9e 100644
--- a/drivers/sensor/grove/light_sensor.c
+++ b/drivers/sensor/grove/light_sensor.c
@@ -30,12 +30,12 @@ LOG_MODULE_REGISTER(grove_light, CONFIG_SENSOR_LOG_LEVEL);
 struct gls_data {
 	struct device *adc;
 	struct adc_channel_cfg ch_cfg;
-	u16_t raw;
+	uint16_t raw;
 };
 
 struct gls_config {
 	const char *adc_label;
-	u8_t adc_channel;
+	uint8_t adc_channel;
 };
 
 static struct adc_sequence_options options = {
@@ -59,7 +59,7 @@ static int gls_channel_get(struct device *dev,
 			   struct sensor_value *val)
 {
 	struct gls_data *drv_data = dev->driver_data;
-	u16_t analog_val = drv_data->raw;
+	uint16_t analog_val = drv_data->raw;
 	double ldr_val, dval;
 
 	/*
@@ -70,8 +70,8 @@ static int gls_channel_get(struct device *dev,
 	ldr_val = (BIT(GROVE_RESOLUTION) - 1.0 - analog_val) * 10.0 / analog_val;
 	dval = 10000.0 / pow(ldr_val * 15.0, 4.0/3.0);
 
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 
 	return 0;
 }
diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c
index fd2d6ff91e..398f8378cb 100644
--- a/drivers/sensor/grove/temperature_sensor.c
+++ b/drivers/sensor/grove/temperature_sensor.c
@@ -29,13 +29,13 @@ LOG_MODULE_REGISTER(grove_temp, CONFIG_SENSOR_LOG_LEVEL);
 struct gts_data {
 	struct device *adc;
 	struct adc_channel_cfg ch_cfg;
-	u16_t raw;
+	uint16_t raw;
 };
 
 struct gts_config {
 	const char *adc_label;
-	s16_t b_const;
-	u8_t adc_channel;
+	int16_t b_const;
+	uint8_t adc_channel;
 };
 
 static struct adc_sequence_options options = {
@@ -73,8 +73,8 @@ static int gts_channel_get(struct device *dev,
 		     / cfg->b_const
 		     + (1 / 298.15)))
 		- 273.15;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 
 	return 0;
 }
diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c
index 286a8eb6bd..8d5fd8f6cb 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.c
+++ b/drivers/sensor/hmc5883l/hmc5883l.c
@@ -18,12 +18,12 @@
 
 LOG_MODULE_REGISTER(HMC5883L, CONFIG_SENSOR_LOG_LEVEL);
 
-static void hmc5883l_convert(struct sensor_value *val, s16_t raw_val,
-			     u16_t divider)
+static void hmc5883l_convert(struct sensor_value *val, int16_t raw_val,
+			     uint16_t divider)
 {
 	/* val = raw_val / divider */
 	val->val1 = raw_val / divider;
-	val->val2 = (((s64_t)raw_val % divider) * 1000000L) / divider;
+	val->val2 = (((int64_t)raw_val % divider) * 1000000L) / divider;
 }
 
 static int hmc5883l_channel_get(struct device *dev,
@@ -56,14 +56,14 @@ static int hmc5883l_channel_get(struct device *dev,
 static int hmc5883l_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct hmc5883l_data *drv_data = dev->driver_data;
-	s16_t buf[3];
+	int16_t buf[3];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
 	/* fetch magnetometer sample */
 	if (i2c_burst_read(drv_data->i2c,
 			   DT_INST_REG_ADDR(0),
-			   HMC5883L_REG_DATA_START, (u8_t *)buf, 6) < 0) {
+			   HMC5883L_REG_DATA_START, (uint8_t *)buf, 6) < 0) {
 		LOG_ERR("Failed to fetch megnetometer sample.");
 		return -EIO;
 	}
@@ -86,7 +86,7 @@ static const struct sensor_driver_api hmc5883l_driver_api = {
 int hmc5883l_init(struct device *dev)
 {
 	struct hmc5883l_data *drv_data = dev->driver_data;
-	u8_t chip_cfg[3], id[3], idx;
+	uint8_t chip_cfg[3], id[3], idx;
 
 	drv_data->i2c = device_get_binding(
 		DT_INST_BUS_LABEL(0));
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index f1735cf757..2462396819 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -36,16 +36,16 @@ static const char *const hmc5883l_fs_strings[] = {
 	"0.88", "1.3", "1.9", "2.5", "4", "4.7", "5.6", "8.1"
 };
 
-static const u16_t hmc5883l_gain[] = {
+static const uint16_t hmc5883l_gain[] = {
 	1370, 1090, 820, 660, 440, 390, 330, 230
 };
 
 struct hmc5883l_data {
 	struct device *i2c;
-	s16_t x_sample;
-	s16_t y_sample;
-	s16_t z_sample;
-	u8_t gain_idx;
+	int16_t x_sample;
+	int16_t y_sample;
+	int16_t z_sample;
+	uint8_t gain_idx;
 
 #ifdef CONFIG_HMC5883L_TRIGGER
 	struct device *gpio;
diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
index 3a24db6ed5..3090fc9eaa 100644
--- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c
+++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c
@@ -44,7 +44,7 @@ int hmc5883l_trigger_set(struct device *dev,
 }
 
 static void hmc5883l_gpio_callback(struct device *dev,
-				   struct gpio_callback *cb, u32_t pins)
+				   struct gpio_callback *cb, uint32_t pins)
 {
 	struct hmc5883l_data *drv_data =
 		CONTAINER_OF(cb, struct hmc5883l_data, gpio_cb);
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
index 85cbe8670e..cf64e95292 100644
--- a/drivers/sensor/hp206c/hp206c.c
+++ b/drivers/sensor/hp206c/hp206c.c
@@ -25,15 +25,15 @@ LOG_MODULE_REGISTER(HP206C, CONFIG_SENSOR_LOG_LEVEL);
 static inline int hp206c_bus_config(struct device *dev)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
-	u32_t i2c_cfg;
+	uint32_t i2c_cfg;
 
 	i2c_cfg = I2C_MODE_MASTER | I2C_SPEED_SET(I2C_SPEED_STANDARD);
 
 	return i2c_configure(hp206c->i2c, i2c_cfg);
 }
 
-static int hp206c_read(struct device *dev, u8_t cmd, u8_t *data,
-		       u8_t len)
+static int hp206c_read(struct device *dev, uint8_t cmd, uint8_t *data,
+		       uint8_t len)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
 
@@ -47,16 +47,16 @@ static int hp206c_read(struct device *dev, u8_t cmd, u8_t *data,
 	return 0;
 }
 
-static int hp206c_read_reg(struct device *dev, u8_t reg_addr,
-			   u8_t *reg_val)
+static int hp206c_read_reg(struct device *dev, uint8_t reg_addr,
+			   uint8_t *reg_val)
 {
-	u8_t cmd = HP206C_CMD_READ_REG | (reg_addr & HP206C_REG_ADDR_MASK);
+	uint8_t cmd = HP206C_CMD_READ_REG | (reg_addr & HP206C_REG_ADDR_MASK);
 
 	return hp206c_read(dev, cmd, reg_val, 1);
 }
 
-static int hp206c_write(struct device *dev, u8_t cmd, u8_t *data,
-			u8_t len)
+static int hp206c_write(struct device *dev, uint8_t cmd, uint8_t *data,
+			uint8_t len)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
 
@@ -70,15 +70,15 @@ static int hp206c_write(struct device *dev, u8_t cmd, u8_t *data,
 	return 0;
 }
 
-static int hp206c_write_reg(struct device *dev, u8_t reg_addr,
-			    u8_t reg_val)
+static int hp206c_write_reg(struct device *dev, uint8_t reg_addr,
+			    uint8_t reg_val)
 {
-	u8_t cmd = HP206C_CMD_WRITE_REG | (reg_addr & HP206C_REG_ADDR_MASK);
+	uint8_t cmd = HP206C_CMD_WRITE_REG | (reg_addr & HP206C_REG_ADDR_MASK);
 
 	return hp206c_write(dev, cmd, &reg_val, 1);
 }
 
-static int hp206c_cmd_send(struct device *dev, u8_t cmd)
+static int hp206c_cmd_send(struct device *dev, uint8_t cmd)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
 
@@ -94,7 +94,7 @@ static int hp206c_cmd_send(struct device *dev, u8_t cmd)
  * conversion wait time which looks like a good compromise provided the highest
  * precision computation takes 131.1ms.
  */
-static u8_t hp206c_adc_time_ms[] = {
+static uint8_t hp206c_adc_time_ms[] = {
 /*	conversion time(ms),   OSR  */
 	132,		    /* 4096 */
 	66,		    /* 2048 */
@@ -104,10 +104,10 @@ static u8_t hp206c_adc_time_ms[] = {
 	5,		    /* 128  */
 };
 
-static int hp206c_osr_set(struct device *dev, u16_t osr)
+static int hp206c_osr_set(struct device *dev, uint16_t osr)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
-	u8_t i;
+	uint8_t i;
 
 	/* the following code translates OSR values to an index */
 	for (i = 0U; i < 6 && BIT(12 - i) != osr; i++) {
@@ -122,9 +122,9 @@ static int hp206c_osr_set(struct device *dev, u16_t osr)
 	return 0;
 }
 
-static int hp206c_altitude_offs_set(struct device *dev, s16_t offs)
+static int hp206c_altitude_offs_set(struct device *dev, int16_t offs)
 {
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	reg_val = offs & 0xff;
 
@@ -163,10 +163,10 @@ static int hp206c_attr_set(struct device *dev, enum sensor_channel chan,
 	return -ENOTSUP;
 }
 
-static int hp206c_wait_dev_ready(struct device *dev, u32_t timeout_ms)
+static int hp206c_wait_dev_ready(struct device *dev, uint32_t timeout_ms)
 {
 	struct hp206c_device_data *hp206c = dev->driver_data;
-	u8_t int_src;
+	uint8_t int_src;
 
 	k_timer_start(&hp206c->tmr, K_MSEC(timeout_ms), K_NO_WAIT);
 	k_timer_status_sync(&hp206c->tmr);
@@ -193,9 +193,9 @@ static int hp206c_adc_acquire(struct device *dev, enum sensor_channel chan)
 	return hp206c_wait_dev_ready(dev, hp206c_adc_time_ms[hp206c->osr]);
 }
 
-static s32_t hp206c_buf_convert(u8_t *buf, bool signed_val)
+static int32_t hp206c_buf_convert(uint8_t *buf, bool signed_val)
 {
-	s32_t tmp = 0;
+	int32_t tmp = 0;
 
 	if (signed_val && (buf[0] & 0x08)) {
 		tmp |= (0xff << 24) | (0xf0 << 16);
@@ -207,10 +207,10 @@ static s32_t hp206c_buf_convert(u8_t *buf, bool signed_val)
 }
 
 static int hp206c_val_get(struct device *dev,
-			  u8_t cmd, struct sensor_value *val)
+			  uint8_t cmd, struct sensor_value *val)
 {
-	u8_t buf[3];
-	s32_t temp = 0;
+	uint8_t buf[3];
+	int32_t temp = 0;
 
 	if (hp206c_read(dev, cmd, buf, 3) < 0) {
 		return -EIO;
diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h
index 76502bee0e..62096b8889 100644
--- a/drivers/sensor/hp206c/hp206c.h
+++ b/drivers/sensor/hp206c/hp206c.h
@@ -78,7 +78,7 @@ struct hp206c_device_data {
 #error "driver needs millisecond tick granularity"
 #endif
 	struct k_timer tmr;
-	u8_t osr;
+	uint8_t osr;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_ */
diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c
index 85cca41f0b..ecc647d271 100644
--- a/drivers/sensor/hts221/hts221.c
+++ b/drivers/sensor/hts221/hts221.c
@@ -27,14 +27,14 @@ static int hts221_channel_get(struct device *dev,
 			      struct sensor_value *val)
 {
 	struct hts221_data *data = dev->driver_data;
-	s32_t conv_val;
+	int32_t conv_val;
 
 	/*
 	 * see "Interpreting humidity and temperature readings" document
 	 * for more details
 	 */
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
-		conv_val = (s32_t)(data->t1_degc_x8 - data->t0_degc_x8) *
+		conv_val = (int32_t)(data->t1_degc_x8 - data->t0_degc_x8) *
 			   (data->t_sample - data->t0_out) /
 			   (data->t1_out - data->t0_out) +
 			   data->t0_degc_x8;
@@ -43,7 +43,7 @@ static int hts221_channel_get(struct device *dev,
 		val->val1 = conv_val / 8;
 		val->val2 = (conv_val % 8) * (1000000 / 8);
 	} else if (chan == SENSOR_CHAN_HUMIDITY) {
-		conv_val = (s32_t)(data->h1_rh_x2 - data->h0_rh_x2) *
+		conv_val = (int32_t)(data->h1_rh_x2 - data->h0_rh_x2) *
 			   (data->rh_sample - data->h0_t0_out) /
 			   (data->h1_t0_out - data->h0_t0_out) +
 			   data->h0_rh_x2;
@@ -62,7 +62,7 @@ static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct hts221_data *data = dev->driver_data;
 	const struct hts221_config *cfg = dev->config_info;
-	u8_t buf[4];
+	uint8_t buf[4];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -83,7 +83,7 @@ static int hts221_read_conversion_data(struct device *dev)
 {
 	struct hts221_data *data = dev->driver_data;
 	const struct hts221_config *cfg = dev->config_info;
-	u8_t buf[16];
+	uint8_t buf[16];
 
 	if (i2c_burst_read(data->i2c, cfg->i2c_addr,
 			   HTS221_REG_CONVERSION_START |
@@ -116,7 +116,7 @@ int hts221_init(struct device *dev)
 {
 	const struct hts221_config *cfg = dev->config_info;
 	struct hts221_data *data = dev->driver_data;
-	u8_t id, idx;
+	uint8_t id, idx;
 
 	data->i2c = device_get_binding(cfg->i2c_bus);
 	if (data->i2c == NULL) {
diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h
index 4537fefdd9..cff1625e8b 100644
--- a/drivers/sensor/hts221/hts221.h
+++ b/drivers/sensor/hts221/hts221.h
@@ -30,17 +30,17 @@
 
 struct hts221_data {
 	struct device *i2c;
-	s16_t rh_sample;
-	s16_t t_sample;
+	int16_t rh_sample;
+	int16_t t_sample;
 
-	u8_t h0_rh_x2;
-	u8_t h1_rh_x2;
-	u16_t t0_degc_x8;
-	u16_t t1_degc_x8;
-	s16_t h0_t0_out;
-	s16_t h1_t0_out;
-	s16_t t0_out;
-	s16_t t1_out;
+	uint8_t h0_rh_x2;
+	uint8_t h1_rh_x2;
+	uint16_t t0_degc_x8;
+	uint16_t t1_degc_x8;
+	int16_t h0_t0_out;
+	int16_t h1_t0_out;
+	int16_t t0_out;
+	int16_t t1_out;
 
 #ifdef CONFIG_HTS221_TRIGGER
 	struct device *dev;
@@ -63,7 +63,7 @@ struct hts221_data {
 
 struct hts221_config {
 	const char *i2c_bus;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #ifdef CONFIG_HTS221_TRIGGER
 	gpio_pin_t drdy_pin;
 	gpio_flags_t drdy_flags;
diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c
index 1be25bb666..1e050d04f2 100644
--- a/drivers/sensor/hts221/hts221_trigger.c
+++ b/drivers/sensor/hts221/hts221_trigger.c
@@ -84,7 +84,7 @@ int hts221_trigger_set(struct device *dev,
 }
 
 static void hts221_drdy_callback(struct device *dev,
-				 struct gpio_callback *cb, u32_t pins)
+				 struct gpio_callback *cb, uint32_t pins)
 {
 	struct hts221_data *data =
 		CONTAINER_OF(cb, struct hts221_data, drdy_cb);
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c
index 04b96d8ae7..a6a5153bab 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc.c
@@ -31,13 +31,13 @@ LOG_MODULE_REGISTER(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL);
  * @dev: Pointer to instance of struct device (I2C or SPI)
  * @range: Full scale range (2, 4, 8 and 16 G)
  */
-static int iis2dlpc_set_range(struct device *dev, u16_t range)
+static int iis2dlpc_set_range(struct device *dev, uint16_t range)
 {
 	int err;
 	struct iis2dlpc_data *iis2dlpc = dev->driver_data;
 	const struct iis2dlpc_device_config *cfg = dev->config_info;
-	u8_t shift_gain = 0U;
-	u8_t fs = IIS2DLPC_FS_TO_REG(range);
+	uint8_t shift_gain = 0U;
+	uint8_t fs = IIS2DLPC_FS_TO_REG(range);
 
 	err = iis2dlpc_full_scale_set(iis2dlpc->ctx, fs);
 
@@ -60,10 +60,10 @@ static int iis2dlpc_set_range(struct device *dev, u16_t range)
  * @dev: Pointer to instance of struct device (I2C or SPI)
  * @odr: Output data rate
  */
-static int iis2dlpc_set_odr(struct device *dev, u16_t odr)
+static int iis2dlpc_set_odr(struct device *dev, uint16_t odr)
 {
 	struct iis2dlpc_data *iis2dlpc = dev->driver_data;
-	u8_t val;
+	uint8_t val;
 
 	/* check if power off */
 	if (odr == 0U) {
@@ -83,11 +83,11 @@ static int iis2dlpc_set_odr(struct device *dev, u16_t odr)
 static inline void iis2dlpc_convert(struct sensor_value *val, int raw_val,
 				    float gain)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Gain is in ug/LSB */
 	/* Convert to m/s^2 */
-	dval = ((s64_t)raw_val * gain * SENSOR_G) / 1000000LL;
+	dval = ((int64_t)raw_val * gain * SENSOR_G) / 1000000LL;
 	val->val1 = dval / 1000000LL;
 	val->val2 = dval % 1000000LL;
 }
@@ -97,7 +97,7 @@ static inline void iis2dlpc_channel_get_acc(struct device *dev,
 					     struct sensor_value *val)
 {
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 	struct iis2dlpc_data *iis2dlpc = dev->driver_data;
 	struct sensor_value *pval = val;
 
@@ -179,7 +179,7 @@ static int iis2dlpc_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct iis2dlpc_data *iis2dlpc = dev->driver_data;
 	const struct iis2dlpc_device_config *cfg = dev->config_info;
-	u8_t shift;
+	uint8_t shift;
 	union axis3bit16_t buf;
 
 	/* fetch raw data sample */
@@ -236,7 +236,7 @@ static int iis2dlpc_init_interface(struct device *dev)
 static int iis2dlpc_set_power_mode(struct iis2dlpc_data *iis2dlpc,
 				    iis2dlpc_mode_t pm)
 {
-	u8_t regval = IIS2DLPC_CONT_LOW_PWR_12bit;
+	uint8_t regval = IIS2DLPC_CONT_LOW_PWR_12bit;
 
 	switch (pm) {
 	case IIS2DLPC_CONT_LOW_PWR_2:
@@ -257,7 +257,7 @@ static int iis2dlpc_init(struct device *dev)
 {
 	struct iis2dlpc_data *iis2dlpc = dev->driver_data;
 	const struct iis2dlpc_device_config *cfg = dev->config_info;
-	u8_t wai;
+	uint8_t wai;
 
 	if (iis2dlpc_init_interface(dev)) {
 		return -EINVAL;
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.h b/drivers/sensor/iis2dlpc/iis2dlpc.h
index 4809b2023f..14f0ecc39a 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc.h
+++ b/drivers/sensor/iis2dlpc/iis2dlpc.h
@@ -18,8 +18,8 @@
 #include "iis2dlpc_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 #if defined(CONFIG_IIS2DLPC_ODR_1_6)
@@ -91,15 +91,15 @@ struct iis2dlpc_device_config {
 	iis2dlpc_mode_t pm;
 #ifdef CONFIG_IIS2DLPC_TRIGGER
 	const char *int_gpio_port;
-	u8_t int_gpio_pin;
-	u8_t int_gpio_flags;
-	u8_t int_pin;
+	uint8_t int_gpio_pin;
+	uint8_t int_gpio_flags;
+	uint8_t int_pin;
 #ifdef CONFIG_IIS2DLPC_PULSE
-	u8_t pulse_trigger;
-	u8_t pulse_ths[3];
-	u8_t pulse_shock;
-	u8_t pulse_ltncy;
-	u8_t pulse_quiet;
+	uint8_t pulse_trigger;
+	uint8_t pulse_ths[3];
+	uint8_t pulse_shock;
+	uint8_t pulse_ltncy;
+	uint8_t pulse_quiet;
 #endif /* CONFIG_IIS2DLPC_PULSE */
 #endif /* CONFIG_IIS2DLPC_TRIGGER */
 };
@@ -107,15 +107,15 @@ struct iis2dlpc_device_config {
 /* sensor data */
 struct iis2dlpc_data {
 	struct device *bus;
-	s16_t acc[3];
+	int16_t acc[3];
 
 	 /* save sensitivity */
-	u16_t gain;
+	uint16_t gain;
 
 	stmdev_ctx_t *ctx;
 #ifdef CONFIG_IIS2DLPC_TRIGGER
 	struct device *gpio;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	struct gpio_callback gpio_cb;
 	sensor_trigger_handler_t drdy_handler;
 #ifdef CONFIG_IIS2DLPC_PULSE
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c
index be8fef659d..7af3ec0031 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c
@@ -18,19 +18,19 @@
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 
-static u16_t iis2dlpc_i2c_slave_addr = DT_INST_REG_ADDR(0);
+static uint16_t iis2dlpc_i2c_slave_addr = DT_INST_REG_ADDR(0);
 
 LOG_MODULE_DECLARE(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL);
 
-static int iis2dlpc_i2c_read(struct iis2dlpc_data *data, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int iis2dlpc_i2c_read(struct iis2dlpc_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	return i2c_burst_read(data->bus, iis2dlpc_i2c_slave_addr,
 			      reg_addr, value, len);
 }
 
-static int iis2dlpc_i2c_write(struct iis2dlpc_data *data, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int iis2dlpc_i2c_write(struct iis2dlpc_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	return i2c_burst_write(data->bus, iis2dlpc_i2c_slave_addr,
 			       reg_addr, value, len);
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c
index f6888eba6f..b24b4b8e4e 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c
@@ -29,11 +29,11 @@ static struct spi_config iis2dlpc_spi_conf = {
 	.cs        = NULL,
 };
 
-static int iis2dlpc_spi_read(struct iis2dlpc_data *ctx, u8_t reg,
-			    u8_t *data, u16_t len)
+static int iis2dlpc_spi_read(struct iis2dlpc_data *ctx, uint8_t reg,
+			    uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &iis2dlpc_spi_conf;
-	u8_t buffer_tx[2] = { reg | IIS2DLPC_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg | IIS2DLPC_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -64,11 +64,11 @@ static int iis2dlpc_spi_read(struct iis2dlpc_data *ctx, u8_t reg,
 	return 0;
 }
 
-static int iis2dlpc_spi_write(struct iis2dlpc_data *ctx, u8_t reg,
-			     u8_t *data, u16_t len)
+static int iis2dlpc_spi_write(struct iis2dlpc_data *ctx, uint8_t reg,
+			     uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &iis2dlpc_spi_conf;
-	u8_t buffer_tx[1] = { reg & ~IIS2DLPC_SPI_READ };
+	uint8_t buffer_tx[1] = { reg & ~IIS2DLPC_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
index be8384d0cc..728b679409 100644
--- a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
+++ b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c
@@ -187,7 +187,7 @@ static void iis2dlpc_handle_interrupt(void *arg)
 }
 
 static void iis2dlpc_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct iis2dlpc_data *iis2dlpc =
 		CONTAINER_OF(cb, struct iis2dlpc_data, gpio_cb);
diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c
index b561518cd0..205dc736bd 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.c
+++ b/drivers/sensor/iis2mdc/iis2mdc.c
@@ -57,7 +57,7 @@ static int iis2mdc_set_hard_iron(struct device *dev, enum sensor_channel chan,
 				   const struct sensor_value *val)
 {
 	struct iis2mdc_data *iis2mdc = dev->driver_data;
-	u8_t i;
+	uint8_t i;
 	union axis3bit16_t offset;
 
 	for (i = 0U; i < 3; i++) {
@@ -72,9 +72,9 @@ static void iis2mdc_channel_get_mag(struct device *dev,
 				      enum sensor_channel chan,
 				      struct sensor_value *val)
 {
-	s32_t cval;
+	int32_t cval;
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 	struct iis2mdc_data *iis2mdc = dev->driver_data;
 	struct sensor_value *pval = val;
 
@@ -193,7 +193,7 @@ static int iis2mdc_sample_fetch_temp(struct device *dev)
 {
 	struct iis2mdc_data *iis2mdc = dev->driver_data;
 	union axis1bit16_t raw_temp;
-	s32_t temp;
+	int32_t temp;
 
 	/* fetch raw temperature sample */
 	if (iis2mdc_temperature_raw_get(iis2mdc->ctx, raw_temp.u8bit) < 0) {
@@ -289,7 +289,7 @@ static const struct iis2mdc_config iis2mdc_dev_config = {
 static int iis2mdc_init(struct device *dev)
 {
 	struct iis2mdc_data *iis2mdc = dev->driver_data;
-	u8_t wai;
+	uint8_t wai;
 
 	if (iis2mdc_init_interface(dev)) {
 		return -EINVAL;
diff --git a/drivers/sensor/iis2mdc/iis2mdc.h b/drivers/sensor/iis2mdc/iis2mdc.h
index 048a1281fb..0515c49acc 100644
--- a/drivers/sensor/iis2mdc/iis2mdc.h
+++ b/drivers/sensor/iis2mdc/iis2mdc.h
@@ -18,13 +18,13 @@
 #include "iis2mdc_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 struct iis2mdc_config {
@@ -36,12 +36,12 @@ struct iis2mdc_config {
 	gpio_dt_flags_t drdy_flags;
 #endif  /* CONFIG_IIS2MDC_TRIGGER */
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 };
@@ -49,9 +49,9 @@ struct iis2mdc_config {
 /* Sensor data */
 struct iis2mdc_data {
 	struct device *bus;
-	u16_t i2c_addr;
-	s16_t mag[3];
-	s32_t temp_sample;
+	uint16_t i2c_addr;
+	int16_t mag[3];
+	int32_t temp_sample;
 
 	stmdev_ctx_t *ctx;
 
diff --git a/drivers/sensor/iis2mdc/iis2mdc_i2c.c b/drivers/sensor/iis2mdc/iis2mdc_i2c.c
index b922a86147..fb99e2240c 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_i2c.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_i2c.c
@@ -21,8 +21,8 @@
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 LOG_MODULE_DECLARE(IIS2MDC);
 
-static int iis2mdc_i2c_read(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int iis2mdc_i2c_read(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	struct iis2mdc_data *data = dev->driver_data;
 	const struct iis2mdc_config *cfg = dev->config_info;
@@ -31,8 +31,8 @@ static int iis2mdc_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int iis2mdc_i2c_write(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int iis2mdc_i2c_write(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	struct iis2mdc_data *data = dev->driver_data;
 	const struct iis2mdc_config *cfg = dev->config_info;
diff --git a/drivers/sensor/iis2mdc/iis2mdc_spi.c b/drivers/sensor/iis2mdc/iis2mdc_spi.c
index 25a08ba2fd..9372aee4d4 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_spi.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_spi.c
@@ -21,13 +21,13 @@
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 LOG_MODULE_DECLARE(IIS2MDC);
 
-static int iis2mdc_spi_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int iis2mdc_spi_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct iis2mdc_data *data = dev->driver_data;
 	const struct iis2mdc_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | IIS2MDC_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | IIS2MDC_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -63,13 +63,13 @@ static int iis2mdc_spi_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int iis2mdc_spi_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int iis2mdc_spi_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct iis2mdc_data *data = dev->driver_data;
 	const struct iis2mdc_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~IIS2MDC_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~IIS2MDC_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/iis2mdc/iis2mdc_trigger.c b/drivers/sensor/iis2mdc/iis2mdc_trigger.c
index 9281978be8..bc5e13dd26 100644
--- a/drivers/sensor/iis2mdc/iis2mdc_trigger.c
+++ b/drivers/sensor/iis2mdc/iis2mdc_trigger.c
@@ -69,7 +69,7 @@ static void iis2mdc_handle_interrupt(void *arg)
 }
 
 static void iis2mdc_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct iis2mdc_data *iis2mdc =
 		CONTAINER_OF(cb, struct iis2mdc_data, gpio_cb);
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c
index 62d77b47ff..4a46c6a7e9 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.c
@@ -38,9 +38,9 @@ static int iis3dhhc_sample_fetch(struct device *dev,
 }
 
 static inline void iis3dhhc_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
-	s64_t micro_ms2;
+	int64_t micro_ms2;
 
 	/* Convert to m/s^2 */
 	micro_ms2 = ((iis3dhhc_from_lsb_to_mg(raw_val) * SENSOR_G) / 1000LL);
@@ -53,7 +53,7 @@ static inline void iis3dhhc_channel_get_acc(struct device *dev,
 					     struct sensor_value *val)
 {
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 	struct iis3dhhc_data *iis3dhhc = dev->driver_data;
 	struct sensor_value *pval = val;
 
@@ -153,7 +153,7 @@ static const struct sensor_driver_api iis3dhhc_api_funcs = {
 static int iis3dhhc_init_chip(struct device *dev)
 {
 	struct iis3dhhc_data *data = dev->driver_data;
-	u8_t chip_id, rst;
+	uint8_t chip_id, rst;
 
 	if (iis3dhhc_device_id_get(data->ctx, &chip_id) < 0) {
 		LOG_DBG("Failed reading chip id");
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.h b/drivers/sensor/iis3dhhc/iis3dhhc.h
index baebf90fb2..05646e4ff2 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc.h
+++ b/drivers/sensor/iis3dhhc/iis3dhhc.h
@@ -20,8 +20,8 @@
 #include "iis3dhhc_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 struct iis3dhhc_config {
@@ -29,21 +29,21 @@ struct iis3dhhc_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_IIS3DHHC_TRIGGER
 	const char *int_port;
-	u8_t int_pin;
-	u8_t int_flags;
+	uint8_t int_pin;
+	uint8_t int_flags;
 #endif
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif
 #endif
 };
 
 struct iis3dhhc_data {
 	struct device *bus;
-	s16_t acc[3];
+	int16_t acc[3];
 
 	stmdev_ctx_t *ctx;
 
@@ -53,7 +53,7 @@ struct iis3dhhc_data {
 
 #ifdef CONFIG_IIS3DHHC_TRIGGER
 	struct device *gpio;
-	u32_t pin;
+	uint32_t pin;
 	struct gpio_callback gpio_cb;
 
 	sensor_trigger_handler_t handler_drdy;
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
index 8a50a94459..8cc02f2cfc 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c
@@ -28,11 +28,11 @@ static struct spi_config iis3dhhc_spi_conf = {
 	.cs        = NULL,
 };
 
-static int iis3dhhc_spi_read(struct iis3dhhc_data *ctx, u8_t reg,
-			    u8_t *data, u16_t len)
+static int iis3dhhc_spi_read(struct iis3dhhc_data *ctx, uint8_t reg,
+			    uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &iis3dhhc_spi_conf;
-	u8_t buffer_tx[2] = { reg | IIS3DHHC_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg | IIS3DHHC_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -63,11 +63,11 @@ static int iis3dhhc_spi_read(struct iis3dhhc_data *ctx, u8_t reg,
 	return 0;
 }
 
-static int iis3dhhc_spi_write(struct iis3dhhc_data *ctx, u8_t reg,
-			     u8_t *data, u16_t len)
+static int iis3dhhc_spi_write(struct iis3dhhc_data *ctx, uint8_t reg,
+			     uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &iis3dhhc_spi_conf;
-	u8_t buffer_tx[1] = { reg & ~IIS3DHHC_SPI_READ };
+	uint8_t buffer_tx[1] = { reg & ~IIS3DHHC_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
index 2d556fed1e..1fffaddd3b 100644
--- a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
+++ b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c
@@ -80,7 +80,7 @@ static void iis3dhhc_handle_interrupt(void *arg)
 }
 
 static void iis3dhhc_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct iis3dhhc_data *iis3dhhc =
 		CONTAINER_OF(cb, struct iis3dhhc_data, gpio_cb);
diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c
index ce900928a7..38334b223e 100644
--- a/drivers/sensor/isl29035/isl29035.c
+++ b/drivers/sensor/isl29035/isl29035.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(ISL29035, CONFIG_SENSOR_LOG_LEVEL);
 static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct isl29035_driver_data *drv_data = dev->driver_data;
-	u8_t msb, lsb;
+	uint8_t msb, lsb;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -46,11 +46,11 @@ static int isl29035_channel_get(struct device *dev,
 				struct sensor_value *val)
 {
 	struct isl29035_driver_data *drv_data = dev->driver_data;
-	u64_t tmp;
+	uint64_t tmp;
 
 #if CONFIG_ISL29035_MODE_ALS
 	/* val = sample_val * lux_range / (2 ^ adc_data_bits) */
-	tmp = (u64_t)drv_data->data_sample * ISL29035_LUX_RANGE;
+	tmp = (uint64_t)drv_data->data_sample * ISL29035_LUX_RANGE;
 	val->val1 = tmp >> ISL29035_ADC_DATA_BITS;
 	tmp = (tmp & ISL29035_ADC_DATA_MASK) * 1000000U;
 	val->val2 = tmp >> ISL29035_ADC_DATA_BITS;
diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h
index d66fb2c5e0..ce116f4357 100644
--- a/drivers/sensor/isl29035/isl29035.h
+++ b/drivers/sensor/isl29035/isl29035.h
@@ -112,7 +112,7 @@
 
 struct isl29035_driver_data {
 	struct device *i2c;
-	u16_t data_sample;
+	uint16_t data_sample;
 
 #if CONFIG_ISL29035_TRIGGER
 	struct device *gpio;
diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c
index 2fd41f071c..7743d4b7f9 100644
--- a/drivers/sensor/isl29035/isl29035_trigger.c
+++ b/drivers/sensor/isl29035/isl29035_trigger.c
@@ -41,13 +41,13 @@ static inline void handle_int(struct isl29035_driver_data *drv_data)
 #endif
 }
 
-static u16_t isl29035_lux_processed_to_raw(struct sensor_value const *val)
+static uint16_t isl29035_lux_processed_to_raw(struct sensor_value const *val)
 {
-	u64_t raw_val;
+	uint64_t raw_val;
 
 	/* raw_val = val * (2 ^ adc_data_bits) / lux_range */
-	raw_val = (((u64_t)val->val1) << ISL29035_ADC_DATA_BITS) +
-		  (((u64_t)val->val2) << ISL29035_ADC_DATA_BITS) / 1000000U;
+	raw_val = (((uint64_t)val->val1) << ISL29035_ADC_DATA_BITS) +
+		  (((uint64_t)val->val2) << ISL29035_ADC_DATA_BITS) / 1000000U;
 
 	return raw_val / ISL29035_LUX_RANGE;
 }
@@ -58,8 +58,8 @@ int isl29035_attr_set(struct device *dev,
 		      const struct sensor_value *val)
 {
 	struct isl29035_driver_data *drv_data = dev->driver_data;
-	u8_t lsb_reg, msb_reg;
-	u16_t raw_val;
+	uint8_t lsb_reg, msb_reg;
+	uint16_t raw_val;
 
 	if (attr == SENSOR_ATTR_UPPER_THRESH) {
 		lsb_reg = ISL29035_INT_HT_LSB_REG;
@@ -85,7 +85,7 @@ int isl29035_attr_set(struct device *dev,
 }
 
 static void isl29035_gpio_callback(struct device *dev,
-				   struct gpio_callback *cb, u32_t pins)
+				   struct gpio_callback *cb, uint32_t pins)
 {
 	struct isl29035_driver_data *drv_data =
 		CONTAINER_OF(cb, struct isl29035_driver_data, gpio_cb);
@@ -98,7 +98,7 @@ static void isl29035_gpio_callback(struct device *dev,
 static void isl29035_thread_cb(struct device *dev)
 {
 	struct isl29035_driver_data *drv_data = dev->driver_data;
-	u8_t val;
+	uint8_t val;
 
 	/* clear interrupt */
 	if (i2c_reg_read_byte(drv_data->i2c, ISL29035_I2C_ADDRESS,
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c
index 543551686b..731fb91617 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.c
@@ -23,11 +23,11 @@
 
 LOG_MODULE_REGISTER(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL);
 
-static const u16_t ism330dhcx_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
+static const uint16_t ism330dhcx_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
 					1660, 3330, 6660};
 
 #if defined(ISM330DHCX_ACCEL_ODR_RUNTIME) || defined(ISM330DHCX_GYRO_ODR_RUNTIME)
-static int ism330dhcx_freq_to_odr_val(u16_t freq)
+static int ism330dhcx_freq_to_odr_val(uint16_t freq)
 {
 	size_t i;
 
@@ -41,7 +41,7 @@ static int ism330dhcx_freq_to_odr_val(u16_t freq)
 }
 #endif
 
-static int ism330dhcx_odr_to_freq_val(u16_t odr)
+static int ism330dhcx_odr_to_freq_val(uint16_t odr)
 {
 	/* for valid index, return value from map */
 	if (odr < ARRAY_SIZE(ism330dhcx_odr_map)) {
@@ -53,10 +53,10 @@ static int ism330dhcx_odr_to_freq_val(u16_t odr)
 }
 
 #ifdef ISM330DHCX_ACCEL_FS_RUNTIME
-static const u16_t ism330dhcx_accel_fs_map[] = {2, 16, 4, 8};
-static const u16_t ism330dhcx_accel_fs_sens[] = {1, 8, 2, 4};
+static const uint16_t ism330dhcx_accel_fs_map[] = {2, 16, 4, 8};
+static const uint16_t ism330dhcx_accel_fs_sens[] = {1, 8, 2, 4};
 
-static int ism330dhcx_accel_range_to_fs_val(s32_t range)
+static int ism330dhcx_accel_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -71,10 +71,10 @@ static int ism330dhcx_accel_range_to_fs_val(s32_t range)
 #endif
 
 #ifdef ISM330DHCX_GYRO_FS_RUNTIME
-static const u16_t ism330dhcx_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
-static const u16_t ism330dhcx_gyro_fs_sens[] = {2, 4, 8, 16, 1};
+static const uint16_t ism330dhcx_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
+static const uint16_t ism330dhcx_gyro_fs_sens[] = {2, 4, 8, 16, 1};
 
-static int ism330dhcx_gyro_range_to_fs_val(s32_t range)
+static int ism330dhcx_gyro_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -102,7 +102,7 @@ static inline int ism330dhcx_reboot(struct device *dev)
 	return 0;
 }
 
-static int ism330dhcx_accel_set_fs_raw(struct device *dev, u8_t fs)
+static int ism330dhcx_accel_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 
@@ -115,7 +115,7 @@ static int ism330dhcx_accel_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int ism330dhcx_accel_set_odr_raw(struct device *dev, u8_t odr)
+static int ism330dhcx_accel_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 
@@ -128,7 +128,7 @@ static int ism330dhcx_accel_set_odr_raw(struct device *dev, u8_t odr)
 	return 0;
 }
 
-static int ism330dhcx_gyro_set_fs_raw(struct device *dev, u8_t fs)
+static int ism330dhcx_gyro_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 
@@ -139,7 +139,7 @@ static int ism330dhcx_gyro_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int ism330dhcx_gyro_set_odr_raw(struct device *dev, u8_t odr)
+static int ism330dhcx_gyro_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 
@@ -151,7 +151,7 @@ static int ism330dhcx_gyro_set_odr_raw(struct device *dev, u8_t odr)
 }
 
 #ifdef ISM330DHCX_ACCEL_ODR_RUNTIME
-static int ism330dhcx_accel_odr_set(struct device *dev, u16_t freq)
+static int ism330dhcx_accel_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -170,7 +170,7 @@ static int ism330dhcx_accel_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef ISM330DHCX_ACCEL_FS_RUNTIME
-static int ism330dhcx_accel_range_set(struct device *dev, s32_t range)
+static int ism330dhcx_accel_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct ism330dhcx_data *data = dev->driver_data;
@@ -212,7 +212,7 @@ static int ism330dhcx_accel_config(struct device *dev, enum sensor_channel chan,
 }
 
 #ifdef ISM330DHCX_GYRO_ODR_RUNTIME
-static int ism330dhcx_gyro_odr_set(struct device *dev, u16_t freq)
+static int ism330dhcx_gyro_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -231,7 +231,7 @@ static int ism330dhcx_gyro_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef ISM330DHCX_GYRO_FS_RUNTIME
-static int ism330dhcx_gyro_range_set(struct device *dev, s32_t range)
+static int ism330dhcx_gyro_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct ism330dhcx_data *data = dev->driver_data;
@@ -393,24 +393,24 @@ static int ism330dhcx_sample_fetch(struct device *dev, enum sensor_channel chan)
 }
 
 static inline void ism330dhcx_accel_convert(struct sensor_value *val, int raw_val,
-					    u32_t sensitivity)
+					    uint32_t sensitivity)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Sensitivity is exposed in ug/LSB */
 	/* Convert to m/s^2 */
-	dval = (s64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
-	val->val1 = (s32_t)(dval / 1000000);
-	val->val2 = (s32_t)(dval % 1000000);
+	dval = (int64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
+	val->val1 = (int32_t)(dval / 1000000);
+	val->val2 = (int32_t)(dval % 1000000);
 
 }
 
 static inline int ism330dhcx_accel_get_channel(enum sensor_channel chan,
 					       struct sensor_value *val,
 					       struct ism330dhcx_data *data,
-					       u32_t sensitivity)
+					       uint32_t sensitivity)
 {
-	u8_t i;
+	uint8_t i;
 
 	switch (chan) {
 	case SENSOR_CHAN_ACCEL_X:
@@ -442,23 +442,23 @@ static int ism330dhcx_accel_channel_get(enum sensor_channel chan,
 }
 
 static inline void ism330dhcx_gyro_convert(struct sensor_value *val, int raw_val,
-					   u32_t sensitivity)
+					   uint32_t sensitivity)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Sensitivity is exposed in udps/LSB */
 	/* Convert to rad/s */
-	dval = (s64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
-	val->val1 = (s32_t)(dval / 1000000);
-	val->val2 = (s32_t)(dval % 1000000);
+	dval = (int64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
+	val->val1 = (int32_t)(dval / 1000000);
+	val->val2 = (int32_t)(dval % 1000000);
 }
 
 static inline int ism330dhcx_gyro_get_channel(enum sensor_channel chan,
 					      struct sensor_value *val,
 					      struct ism330dhcx_data *data,
-					      u32_t sensitivity)
+					      uint32_t sensitivity)
 {
-	u8_t i;
+	uint8_t i;
 
 	switch (chan) {
 	case SENSOR_CHAN_GYRO_X:
@@ -502,21 +502,21 @@ static void ism330dhcx_gyro_channel_get_temp(struct sensor_value *val,
 
 #if defined(CONFIG_ISM330DHCX_SENSORHUB)
 static inline void ism330dhcx_magn_convert(struct sensor_value *val, int raw_val,
-					   u16_t sensitivity)
+					   uint16_t sensitivity)
 {
 	double dval;
 
 	/* Sensitivity is exposed in mgauss/LSB */
 	dval = (double)(raw_val * sensitivity);
-	val->val1 = (s32_t)dval / 1000000;
-	val->val2 = (s32_t)dval % 1000000;
+	val->val1 = (int32_t)dval / 1000000;
+	val->val2 = (int32_t)dval % 1000000;
 }
 
 static inline int ism330dhcx_magn_get_channel(enum sensor_channel chan,
 					      struct sensor_value *val,
 					      struct ism330dhcx_data *data)
 {
-	s16_t sample[3];
+	int16_t sample[3];
 	int idx;
 
 	idx = ism330dhcx_shub_get_idx(SENSOR_CHAN_MAGN_XYZ);
@@ -526,11 +526,11 @@ static inline int ism330dhcx_magn_get_channel(enum sensor_channel chan,
 	}
 
 
-	sample[0] = (s16_t)(data->ext_data[idx][0] |
+	sample[0] = (int16_t)(data->ext_data[idx][0] |
 			    (data->ext_data[idx][1] << 8));
-	sample[1] = (s16_t)(data->ext_data[idx][2] |
+	sample[1] = (int16_t)(data->ext_data[idx][2] |
 			    (data->ext_data[idx][3] << 8));
-	sample[2] = (s16_t)(data->ext_data[idx][4] |
+	sample[2] = (int16_t)(data->ext_data[idx][4] |
 			    (data->ext_data[idx][5] << 8));
 
 	switch (chan) {
@@ -559,7 +559,7 @@ static inline void ism330dhcx_hum_convert(struct sensor_value *val,
 					  struct ism330dhcx_data *data)
 {
 	float rh;
-	s16_t raw_val;
+	int16_t raw_val;
 	struct hts221_data *ht = &data->hts221;
 	int idx;
 
@@ -569,7 +569,7 @@ static inline void ism330dhcx_hum_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = ((s16_t)(data->ext_data[idx][0] |
+	raw_val = ((int16_t)(data->ext_data[idx][0] |
 			   (data->ext_data[idx][1] << 8)));
 
 	/* find relative humidty by linear interpolation */
@@ -584,7 +584,7 @@ static inline void ism330dhcx_hum_convert(struct sensor_value *val,
 static inline void ism330dhcx_press_convert(struct sensor_value *val,
 					    struct ism330dhcx_data *data)
 {
-	s32_t raw_val;
+	int32_t raw_val;
 	int idx;
 
 	idx = ism330dhcx_shub_get_idx(SENSOR_CHAN_PRESS);
@@ -593,7 +593,7 @@ static inline void ism330dhcx_press_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = (s32_t)(data->ext_data[idx][0] |
+	raw_val = (int32_t)(data->ext_data[idx][0] |
 			  (data->ext_data[idx][1] << 8) |
 			  (data->ext_data[idx][2] << 16));
 
@@ -601,13 +601,13 @@ static inline void ism330dhcx_press_convert(struct sensor_value *val,
 	/* Convert raw_val to val in kPa */
 	val->val1 = (raw_val >> 12) / 10;
 	val->val2 = (raw_val >> 12) % 10 * 100000 +
-		(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
+		(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
 }
 
 static inline void ism330dhcx_temp_convert(struct sensor_value *val,
 					   struct ism330dhcx_data *data)
 {
-	s16_t raw_val;
+	int16_t raw_val;
 	int idx;
 
 	idx = ism330dhcx_shub_get_idx(SENSOR_CHAN_PRESS);
@@ -616,12 +616,12 @@ static inline void ism330dhcx_temp_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = (s16_t)(data->ext_data[idx][3] |
+	raw_val = (int16_t)(data->ext_data[idx][3] |
 			  (data->ext_data[idx][4] << 8));
 
 	/* Temperature sensitivity is 100 LSB/deg C */
 	val->val1 = raw_val / 100;
-	val->val2 = (s32_t)raw_val % 100 * (10000);
+	val->val2 = (int32_t)raw_val % 100 * (10000);
 }
 #endif
 
@@ -688,7 +688,7 @@ static const struct sensor_driver_api ism330dhcx_api_funcs = {
 static int ism330dhcx_init_chip(struct device *dev)
 {
 	struct ism330dhcx_data *ism330dhcx = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (ism330dhcx_device_id_get(ism330dhcx->ctx, &chip_id) < 0) {
 		LOG_DBG("Failed reading chip id");
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.h b/drivers/sensor/ism330dhcx/ism330dhcx.h
index eccccd6044..bfeafcac7f 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx.h
+++ b/drivers/sensor/ism330dhcx/ism330dhcx.h
@@ -19,13 +19,13 @@
 #include "ism330dhcx_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 #define ISM330DHCX_EN_BIT					0x01
@@ -96,25 +96,25 @@ struct ism330dhcx_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_ISM330DHCX_TRIGGER
 	const char *int_gpio_port;
-	u8_t int_gpio_pin;
-	u8_t int_gpio_flags;
-	u8_t int_pin;
+	uint8_t int_gpio_pin;
+	uint8_t int_gpio_flags;
+	uint8_t int_pin;
 #endif /* CONFIG_ISM330DHCX_TRIGGER */
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 };
 
 union samples {
-	u8_t raw[6];
+	uint8_t raw[6];
 	struct {
-		s16_t axis[3];
+		int16_t axis[3];
 	};
 } __aligned(2);
 
@@ -122,38 +122,38 @@ union samples {
 struct ism330dhcx_data;
 
 struct ism330dhcx_tf {
-	int (*read_data)(struct ism330dhcx_data *data, u8_t reg_addr,
-			 u8_t *value, u8_t len);
-	int (*write_data)(struct ism330dhcx_data *data, u8_t reg_addr,
-			  u8_t *value, u8_t len);
-	int (*read_reg)(struct ism330dhcx_data *data, u8_t reg_addr,
-			u8_t *value);
-	int (*write_reg)(struct ism330dhcx_data *data, u8_t reg_addr,
-			u8_t value);
-	int (*update_reg)(struct ism330dhcx_data *data, u8_t reg_addr,
-			  u8_t mask, u8_t value);
+	int (*read_data)(struct ism330dhcx_data *data, uint8_t reg_addr,
+			 uint8_t *value, uint8_t len);
+	int (*write_data)(struct ism330dhcx_data *data, uint8_t reg_addr,
+			  uint8_t *value, uint8_t len);
+	int (*read_reg)(struct ism330dhcx_data *data, uint8_t reg_addr,
+			uint8_t *value);
+	int (*write_reg)(struct ism330dhcx_data *data, uint8_t reg_addr,
+			uint8_t value);
+	int (*update_reg)(struct ism330dhcx_data *data, uint8_t reg_addr,
+			  uint8_t mask, uint8_t value);
 };
 
 #define ISM330DHCX_SHUB_MAX_NUM_SLVS			2
 
 struct ism330dhcx_data {
 	struct device *bus;
-	s16_t acc[3];
-	u32_t acc_gain;
-	s16_t gyro[3];
-	u32_t gyro_gain;
+	int16_t acc[3];
+	uint32_t acc_gain;
+	int16_t gyro[3];
+	uint32_t gyro_gain;
 #if defined(CONFIG_ISM330DHCX_ENABLE_TEMP)
 	int temp_sample;
 #endif
 #if defined(CONFIG_ISM330DHCX_SENSORHUB)
-	u8_t ext_data[2][6];
-	u16_t magn_gain;
+	uint8_t ext_data[2][6];
+	uint16_t magn_gain;
 
 	struct hts221_data {
-		s16_t x0;
-		s16_t x1;
-		s16_t y0;
-		s16_t y1;
+		int16_t x0;
+		int16_t x1;
+		int16_t y0;
+		int16_t y1;
 	} hts221;
 #endif /* CONFIG_ISM330DHCX_SENSORHUB */
 
@@ -165,10 +165,10 @@ struct ism330dhcx_data {
 	stmdev_ctx_t ctx_spi;
 	#endif
 
-	u16_t accel_freq;
-	u8_t accel_fs;
-	u16_t gyro_freq;
-	u8_t gyro_fs;
+	uint16_t accel_freq;
+	uint8_t accel_fs;
+	uint16_t gyro_freq;
+	uint8_t gyro_fs;
 
 #ifdef CONFIG_ISM330DHCX_TRIGGER
 	struct device *gpio;
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
index 513c45c2f4..50afd4cb25 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c
@@ -20,8 +20,8 @@
 
 LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL);
 
-static int ism330dhcx_i2c_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int ism330dhcx_i2c_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 	const struct ism330dhcx_config *cfg = dev->config_info;
@@ -30,8 +30,8 @@ static int ism330dhcx_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int ism330dhcx_i2c_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int ism330dhcx_i2c_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 	const struct ism330dhcx_config *cfg = dev->config_info;
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
index a35e15ddc3..1d3f83ea81 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c
@@ -46,16 +46,16 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL);
 #define ISM330DHCX_SHUB_SLVX_WRITE				0x0
 #define ISM330DHCX_SHUB_SLVX_READ				0x1
 
-static u8_t num_ext_dev;
-static u8_t shub_ext[ISM330DHCX_SHUB_MAX_NUM_SLVS];
+static uint8_t num_ext_dev;
+static uint8_t shub_ext[ISM330DHCX_SHUB_MAX_NUM_SLVS];
 
 static int ism330dhcx_shub_write_slave_reg(struct ism330dhcx_data *data,
-					u8_t slv_addr, u8_t slv_reg,
-					u8_t *value, u16_t len);
+					uint8_t slv_addr, uint8_t slv_reg,
+					uint8_t *value, uint16_t len);
 static int ism330dhcx_shub_read_slave_reg(struct ism330dhcx_data *data,
-				       u8_t slv_addr, u8_t slv_reg,
-				       u8_t *value, u16_t len);
-static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, u8_t enable);
+				       uint8_t slv_addr, uint8_t slv_reg,
+				       uint8_t *value, uint16_t len);
+static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, uint8_t enable);
 
 /*
  * LIS2MDL magn device specific part
@@ -73,9 +73,9 @@ static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, u8_t enable);
 #define LIS2MDL_OFF_CANC		0x02
 #define LIS2MDL_SENSITIVITY		1500
 
-static int ism330dhcx_lis2mdl_init(struct ism330dhcx_data *data, u8_t i2c_addr)
+static int ism330dhcx_lis2mdl_init(struct ism330dhcx_data *data, uint8_t i2c_addr)
 {
-	u8_t mag_cfg[2];
+	uint8_t mag_cfg[2];
 
 	data->magn_gain = LIS2MDL_SENSITIVITY;
 
@@ -95,12 +95,12 @@ static int ism330dhcx_lis2mdl_init(struct ism330dhcx_data *data, u8_t i2c_addr)
 	return 0;
 }
 
-static const u16_t lis2mdl_map[] = {10, 20, 50, 100};
+static const uint16_t lis2mdl_map[] = {10, 20, 50, 100};
 
 static int ism330dhcx_lis2mdl_odr_set(struct ism330dhcx_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(lis2mdl_map); odr++) {
 		if (freq == lis2mdl_map[odr]) {
@@ -121,7 +121,7 @@ static int ism330dhcx_lis2mdl_odr_set(struct ism330dhcx_data *data,
 	return 0;
 }
 
-static int ism330dhcx_lis2mdl_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
+static int ism330dhcx_lis2mdl_conf(struct ism330dhcx_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -153,9 +153,9 @@ static int ism330dhcx_lis2mdl_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
 #define HTS221_REG_CONV_START		0x30
 
 static int lsmdso_hts221_read_conv_data(struct ism330dhcx_data *data,
-					u8_t i2c_addr)
+					uint8_t i2c_addr)
 {
-	u8_t buf[16], i;
+	uint8_t buf[16], i;
 	struct hts221_data *ht = &data->hts221;
 
 	for (i = 0; i < sizeof(buf); i += 7) {
@@ -178,9 +178,9 @@ static int lsmdso_hts221_read_conv_data(struct ism330dhcx_data *data,
 	return 0;
 }
 
-static int ism330dhcx_hts221_init(struct ism330dhcx_data *data, u8_t i2c_addr)
+static int ism330dhcx_hts221_init(struct ism330dhcx_data *data, uint8_t i2c_addr)
 {
-	u8_t hum_cfg;
+	uint8_t hum_cfg;
 
 	/* configure ODR and BDU */
 	hum_cfg = HTS221_ODR_1HZ | HTS221_BDU | HTS221_PD;
@@ -190,12 +190,12 @@ static int ism330dhcx_hts221_init(struct ism330dhcx_data *data, u8_t i2c_addr)
 	return lsmdso_hts221_read_conv_data(data, i2c_addr);
 }
 
-static const u16_t hts221_map[] = {0, 1, 7, 12};
+static const uint16_t hts221_map[] = {0, 1, 7, 12};
 
 static int ism330dhcx_hts221_odr_set(struct ism330dhcx_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(hts221_map); odr++) {
 		if (freq == hts221_map[odr]) {
@@ -216,7 +216,7 @@ static int ism330dhcx_hts221_odr_set(struct ism330dhcx_data *data,
 	return 0;
 }
 
-static int ism330dhcx_hts221_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
+static int ism330dhcx_hts221_conf(struct ism330dhcx_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -246,9 +246,9 @@ static int ism330dhcx_hts221_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
 #define LPS22HB_LPF_EN			0x08
 #define LPS22HB_BDU_EN			0x02
 
-static int ism330dhcx_lps22hb_init(struct ism330dhcx_data *data, u8_t i2c_addr)
+static int ism330dhcx_lps22hb_init(struct ism330dhcx_data *data, uint8_t i2c_addr)
 {
-	u8_t baro_cfg[2];
+	uint8_t baro_cfg[2];
 
 	/* sw reset device */
 	baro_cfg[0] = LPS22HB_SW_RESET;
@@ -280,9 +280,9 @@ static int ism330dhcx_lps22hb_init(struct ism330dhcx_data *data, u8_t i2c_addr)
 #define LPS22HH_LPF_EN			0x08
 #define LPS22HH_BDU_EN			0x02
 
-static int ism330dhcx_lps22hh_init(struct ism330dhcx_data *data, u8_t i2c_addr)
+static int ism330dhcx_lps22hh_init(struct ism330dhcx_data *data, uint8_t i2c_addr)
 {
-	u8_t baro_cfg[2];
+	uint8_t baro_cfg[2];
 
 	/* sw reset device */
 	baro_cfg[0] = LPS22HH_SW_RESET;
@@ -303,12 +303,12 @@ static int ism330dhcx_lps22hh_init(struct ism330dhcx_data *data, u8_t i2c_addr)
 	return 0;
 }
 
-static const u16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
+static const uint16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
 
 static int ism330dhcx_lps22hh_odr_set(struct ism330dhcx_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(lps22hh_map); odr++) {
 		if (freq == lps22hh_map[odr]) {
@@ -329,7 +329,7 @@ static int ism330dhcx_lps22hh_odr_set(struct ism330dhcx_data *data,
 	return 0;
 }
 
-static int ism330dhcx_lps22hh_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
+static int ism330dhcx_lps22hh_conf(struct ism330dhcx_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -349,15 +349,15 @@ static int ism330dhcx_lps22hh_conf(struct ism330dhcx_data *data, u8_t i2c_addr,
 /* List of supported external sensors */
 static struct ism330dhcx_shub_slist {
 	enum sensor_channel type;
-	u8_t i2c_addr[2];
-	u8_t ext_i2c_addr;
-	u8_t wai_addr;
-	u8_t wai_val;
-	u8_t out_data_addr;
-	u8_t out_data_len;
-	u8_t sh_out_reg;
-	int (*dev_init)(struct ism330dhcx_data *data, u8_t i2c_addr);
-	int (*dev_conf)(struct ism330dhcx_data *data, u8_t i2c_addr,
+	uint8_t i2c_addr[2];
+	uint8_t ext_i2c_addr;
+	uint8_t wai_addr;
+	uint8_t wai_val;
+	uint8_t out_data_addr;
+	uint8_t out_data_len;
+	uint8_t sh_out_reg;
+	int (*dev_init)(struct ism330dhcx_data *data, uint8_t i2c_addr);
+	int (*dev_conf)(struct ism330dhcx_data *data, uint8_t i2c_addr,
 			enum sensor_channel chan, enum sensor_attribute attr,
 			const struct sensor_value *val);
 } ism330dhcx_shub_slist[] = {
@@ -439,8 +439,8 @@ static inline void ism330dhcx_shub_embedded_en(struct ism330dhcx_data *data, boo
 }
 
 static int ism330dhcx_shub_read_embedded_regs(struct ism330dhcx_data *data,
-					      u8_t reg_addr,
-					      u8_t *value, int len)
+					      uint8_t reg_addr,
+					      uint8_t *value, int len)
 {
 	ism330dhcx_shub_embedded_en(data, true);
 
@@ -456,8 +456,8 @@ static int ism330dhcx_shub_read_embedded_regs(struct ism330dhcx_data *data,
 }
 
 static int ism330dhcx_shub_write_embedded_regs(struct ism330dhcx_data *data,
-					       u8_t reg_addr,
-					       u8_t *value, u8_t len)
+					       uint8_t reg_addr,
+					       uint8_t *value, uint8_t len)
 {
 	ism330dhcx_shub_embedded_en(data, true);
 
@@ -472,11 +472,11 @@ static int ism330dhcx_shub_write_embedded_regs(struct ism330dhcx_data *data,
 	return 0;
 }
 
-static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, u8_t enable)
+static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, uint8_t enable)
 {
 	/* Enable Accel @26hz */
 	if (!data->accel_freq) {
-		u8_t odr = (enable) ? 2 : 0;
+		uint8_t odr = (enable) ? 2 : 0;
 
 		if (ism330dhcx_xl_data_rate_set(data->ctx, odr) < 0) {
 			LOG_DBG("shub: failed to set XL sampling rate");
@@ -498,7 +498,7 @@ static void ism330dhcx_shub_enable(struct ism330dhcx_data *data, u8_t enable)
 /* must be called with master on */
 static int ism330dhcx_shub_check_slv0_nack(struct ism330dhcx_data *data)
 {
-	u8_t status;
+	uint8_t status;
 
 	if (ism330dhcx_shub_read_embedded_regs(data, ISM330DHCX_SHUB_STATUS_MASTER,
 					       &status, 1) < 0) {
@@ -518,10 +518,10 @@ static int ism330dhcx_shub_check_slv0_nack(struct ism330dhcx_data *data)
  * use SLV0 for generic read to slave device
  */
 static int ism330dhcx_shub_read_slave_reg(struct ism330dhcx_data *data,
-					  u8_t slv_addr, u8_t slv_reg,
-					  u8_t *value, u16_t len)
+					  uint8_t slv_addr, uint8_t slv_reg,
+					  uint8_t *value, uint16_t len)
 {
-	u8_t slave[3];
+	uint8_t slave[3];
 
 	slave[0] = (slv_addr << 1) | ISM330DHCX_SHUB_SLVX_READ;
 	slave[1] = slv_reg;
@@ -560,11 +560,11 @@ static int ism330dhcx_shub_read_slave_reg(struct ism330dhcx_data *data,
  * use SLV0 to configure slave device
  */
 static int ism330dhcx_shub_write_slave_reg(struct ism330dhcx_data *data,
-					   u8_t slv_addr, u8_t slv_reg,
-					   u8_t *value, u16_t len)
+					   uint8_t slv_addr, uint8_t slv_reg,
+					   uint8_t *value, uint16_t len)
 {
-	u8_t slv_cfg[3];
-	u8_t cnt = 0U;
+	uint8_t slv_cfg[3];
+	uint8_t cnt = 0U;
 
 	while (cnt < len) {
 		slv_cfg[0] = (slv_addr << 1) & ~ISM330DHCX_SHUB_SLVX_READ;
@@ -622,7 +622,7 @@ static int ism330dhcx_shub_write_slave_reg(struct ism330dhcx_data *data,
  */
 static int ism330dhcx_shub_set_data_channel(struct ism330dhcx_data *data)
 {
-	u8_t n, i, slv_cfg[6];
+	uint8_t n, i, slv_cfg[6];
 	struct ism330dhcx_shub_slist *sp;
 
 	/* Set data channel for slave devices */
@@ -667,7 +667,7 @@ static int ism330dhcx_shub_set_data_channel(struct ism330dhcx_data *data)
 
 int ism330dhcx_shub_get_idx(enum sensor_channel type)
 {
-	u8_t n;
+	uint8_t n;
 	struct ism330dhcx_shub_slist *sp;
 
 	for (n = 0; n < num_ext_dev; n++) {
@@ -682,7 +682,7 @@ int ism330dhcx_shub_get_idx(enum sensor_channel type)
 
 int ism330dhcx_shub_fetch_external_devs(struct device *dev)
 {
-	u8_t n;
+	uint8_t n;
 	struct ism330dhcx_data *data = dev->driver_data;
 	struct ism330dhcx_shub_slist *sp;
 
@@ -711,7 +711,7 @@ int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan,
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 	struct ism330dhcx_shub_slist *sp = NULL;
-	u8_t n;
+	uint8_t n;
 
 	for (n = 0; n < num_ext_dev; n++) {
 		sp = &ism330dhcx_shub_slist[shub_ext[n]];
@@ -736,8 +736,8 @@ int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan,
 int ism330dhcx_shub_init(struct device *dev)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
-	u8_t i, n = 0, regn;
-	u8_t chip_id;
+	uint8_t i, n = 0, regn;
+	uint8_t chip_id;
 	struct ism330dhcx_shub_slist *sp;
 
 	for (n = 0; n < ARRAY_SIZE(ism330dhcx_shub_slist); n++) {
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
index adb0be6bfb..519c5e8555 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c
@@ -20,13 +20,13 @@
 
 LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL);
 
-static int ism330dhcx_spi_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int ism330dhcx_spi_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 	const struct ism330dhcx_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | ISM330DHCX_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | ISM330DHCX_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -62,13 +62,13 @@ static int ism330dhcx_spi_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int ism330dhcx_spi_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int ism330dhcx_spi_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct ism330dhcx_data *data = dev->driver_data;
 	const struct ism330dhcx_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~ISM330DHCX_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~ISM330DHCX_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
index eef266d201..65f9bd2042 100644
--- a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
+++ b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c
@@ -205,7 +205,7 @@ static void ism330dhcx_handle_interrupt(void *arg)
 }
 
 static void ism330dhcx_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct ism330dhcx_data *ism330dhcx =
 		CONTAINER_OF(cb, struct ism330dhcx_data, gpio_cb);
diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c
index 2215c7461b..1f007cbb8c 100644
--- a/drivers/sensor/lis2dh/lis2dh.c
+++ b/drivers/sensor/lis2dh/lis2dh.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
  * Use values for low-power mode in DS "Mechanical (Sensor) characteristics",
  * multiplied by 100.
  */
-static const u32_t lis2dh_reg_val_to_scale[] = {
+static const uint32_t lis2dh_reg_val_to_scale[] = {
 #if DT_NODE_HAS_STATUS(DT_INST(0, st_lsm303agr_accel), okay)
 	ACCEL_SCALE(1563),
 	ACCEL_SCALE(3126),
@@ -36,10 +36,10 @@ static const u32_t lis2dh_reg_val_to_scale[] = {
 #endif
 };
 
-static void lis2dh_convert(s16_t raw_val, u32_t scale,
+static void lis2dh_convert(int16_t raw_val, uint32_t scale,
 			   struct sensor_value *val)
 {
-	s32_t converted_val;
+	int32_t converted_val;
 
 	/*
 	 * maximum converted value we can get is: max(raw_val) * max(scale)
@@ -106,9 +106,9 @@ static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan)
 		return status;
 	}
 
-	for (i = 0; i < (3 * sizeof(s16_t)); i += sizeof(s16_t)) {
-		s16_t *sample =
-			(s16_t *)&lis2dh->sample.raw[1 + i];
+	for (i = 0; i < (3 * sizeof(int16_t)); i += sizeof(int16_t)) {
+		int16_t *sample =
+			(int16_t *)&lis2dh->sample.raw[1 + i];
 
 		*sample = sys_le16_to_cpu(*sample);
 	}
@@ -122,10 +122,10 @@ static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 #ifdef CONFIG_LIS2DH_ODR_RUNTIME
 /* 1620 & 5376 are low power only */
-static const u16_t lis2dh_odr_map[] = {0, 1, 10, 25, 50, 100, 200, 400, 1620,
+static const uint16_t lis2dh_odr_map[] = {0, 1, 10, 25, 50, 100, 200, 400, 1620,
 				       1344, 5376};
 
-static int lis2dh_freq_to_odr_val(u16_t freq)
+static int lis2dh_freq_to_odr_val(uint16_t freq)
 {
 	size_t i;
 
@@ -143,11 +143,11 @@ static int lis2dh_freq_to_odr_val(u16_t freq)
 	return -EINVAL;
 }
 
-static int lis2dh_acc_odr_set(struct device *dev, u16_t freq)
+static int lis2dh_acc_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 	int status;
-	u8_t value;
+	uint8_t value;
 	struct lis2dh_data *data = dev->driver_data;
 
 	odr = lis2dh_freq_to_odr_val(freq);
@@ -182,7 +182,7 @@ static int lis2dh_acc_odr_set(struct device *dev, u16_t freq)
 #define LIS2DH_RANGE_IDX_TO_VALUE(idx)		(1 << ((idx) + 1))
 #define LIS2DH_NUM_RANGES			4
 
-static int lis2dh_range_to_reg_val(u16_t range)
+static int lis2dh_range_to_reg_val(uint16_t range)
 {
 	int i;
 
@@ -195,7 +195,7 @@ static int lis2dh_range_to_reg_val(u16_t range)
 	return -EINVAL;
 }
 
-static int lis2dh_acc_range_set(struct device *dev, s32_t range)
+static int lis2dh_acc_range_set(struct device *dev, int32_t range)
 {
 	struct lis2dh_data *lis2dh = dev->driver_data;
 	int fs;
@@ -271,8 +271,8 @@ int lis2dh_init(struct device *dev)
 	struct lis2dh_data *lis2dh = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
 	int status;
-	u8_t id;
-	u8_t raw[6];
+	uint8_t id;
+	uint8_t raw[6];
 
 	lis2dh->bus = device_get_binding(cfg->bus_name);
 	if (!lis2dh->bus) {
@@ -338,7 +338,7 @@ int lis2dh_init(struct device *dev)
 
 	LOG_INF("bus=%s fs=%d, odr=0x%x lp_en=0x%x scale=%d",
 		    LIS2DH_BUS_DEV_NAME, 1 << (LIS2DH_FS_IDX + 1),
-		    LIS2DH_ODR_IDX, (u8_t)LIS2DH_LP_EN_BIT, lis2dh->scale);
+		    LIS2DH_ODR_IDX, (uint8_t)LIS2DH_LP_EN_BIT, lis2dh->scale);
 
 	/* enable accel measurements and set power mode and data rate */
 	return lis2dh->hw_tf->write_reg(dev, LIS2DH_REG_CTRL1,
diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
index 79498d16fb..eba1521e57 100644
--- a/drivers/sensor/lis2dh/lis2dh.h
+++ b/drivers/sensor/lis2dh/lis2dh.h
@@ -190,10 +190,10 @@
 #endif
 
 union lis2dh_sample {
-	u8_t raw[LIS2DH_BUF_SZ];
+	uint8_t raw[LIS2DH_BUF_SZ];
 	struct {
-		u8_t status;
-		s16_t xyz[3];
+		uint8_t status;
+		int16_t xyz[3];
 	} __packed;
 };
 
@@ -201,28 +201,28 @@ struct lis2dh_config {
 	char *bus_name;
 	int (*bus_init)(struct device *dev);
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 
 };
 
 struct lis2dh_transfer_function {
-	int (*read_data)(struct device *dev, u8_t reg_addr,
-			 u8_t *value, u8_t len);
-	int (*write_data)(struct device *dev, u8_t reg_addr,
-			  u8_t *value, u8_t len);
-	int (*read_reg)(struct device *dev, u8_t reg_addr,
-			u8_t *value);
-	int (*write_reg)(struct device *dev, u8_t reg_addr,
-			u8_t value);
-	int (*update_reg)(struct device *dev, u8_t reg_addr,
-			  u8_t mask, u8_t value);
+	int (*read_data)(struct device *dev, uint8_t reg_addr,
+			 uint8_t *value, uint8_t len);
+	int (*write_data)(struct device *dev, uint8_t reg_addr,
+			  uint8_t *value, uint8_t len);
+	int (*read_reg)(struct device *dev, uint8_t reg_addr,
+			uint8_t *value);
+	int (*write_reg)(struct device *dev, uint8_t reg_addr,
+			uint8_t value);
+	int (*update_reg)(struct device *dev, uint8_t reg_addr,
+			  uint8_t mask, uint8_t value);
 };
 
 struct lis2dh_data {
@@ -231,7 +231,7 @@ struct lis2dh_data {
 
 	union lis2dh_sample sample;
 	/* current scaling factor, in micro m/s^2 / lsb */
-	u32_t scale;
+	uint32_t scale;
 
 #ifdef CONFIG_LIS2DH_TRIGGER
 	struct device *gpio_int1;
@@ -260,7 +260,7 @@ struct lis2dh_data {
 };
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
-int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd,
+int lis2dh_spi_access(struct lis2dh_data *ctx, uint8_t cmd,
 		      void *data, size_t length);
 #endif
 
diff --git a/drivers/sensor/lis2dh/lis2dh_i2c.c b/drivers/sensor/lis2dh/lis2dh_i2c.c
index b544e5d660..efcaed4a74 100644
--- a/drivers/sensor/lis2dh/lis2dh_i2c.c
+++ b/drivers/sensor/lis2dh/lis2dh_i2c.c
@@ -20,8 +20,8 @@
 
 LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lis2dh_i2c_read_data(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lis2dh_i2c_read_data(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
@@ -31,8 +31,8 @@ static int lis2dh_i2c_read_data(struct device *dev, u8_t reg_addr,
 			      value, len);
 }
 
-static int lis2dh_i2c_write_data(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lis2dh_i2c_write_data(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
@@ -42,8 +42,8 @@ static int lis2dh_i2c_write_data(struct device *dev, u8_t reg_addr,
 			       value, len);
 }
 
-static int lis2dh_i2c_read_reg(struct device *dev, u8_t reg_addr,
-				u8_t *value)
+static int lis2dh_i2c_read_reg(struct device *dev, uint8_t reg_addr,
+				uint8_t *value)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
@@ -53,8 +53,8 @@ static int lis2dh_i2c_read_reg(struct device *dev, u8_t reg_addr,
 				 reg_addr, value);
 }
 
-static int lis2dh_i2c_write_reg(struct device *dev, u8_t reg_addr,
-				u8_t value)
+static int lis2dh_i2c_write_reg(struct device *dev, uint8_t reg_addr,
+				uint8_t value)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
@@ -64,8 +64,8 @@ static int lis2dh_i2c_write_reg(struct device *dev, u8_t reg_addr,
 				  reg_addr, value);
 }
 
-static int lis2dh_i2c_update_reg(struct device *dev, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lis2dh_i2c_update_reg(struct device *dev, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
diff --git a/drivers/sensor/lis2dh/lis2dh_spi.c b/drivers/sensor/lis2dh/lis2dh_spi.c
index 52bc906e66..640dec3724 100644
--- a/drivers/sensor/lis2dh/lis2dh_spi.c
+++ b/drivers/sensor/lis2dh/lis2dh_spi.c
@@ -18,13 +18,13 @@
 
 LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lis2dh_raw_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lis2dh_raw_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LIS2DH_SPI_READ_BIT, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LIS2DH_SPI_READ_BIT, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -64,13 +64,13 @@ static int lis2dh_raw_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int lis2dh_raw_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lis2dh_raw_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct lis2dh_data *data = dev->driver_data;
 	const struct lis2dh_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LIS2DH_SPI_READ_BIT };
+	uint8_t buffer_tx[1] = { reg_addr & ~LIS2DH_SPI_READ_BIT };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
@@ -102,36 +102,36 @@ static int lis2dh_raw_write(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int lis2dh_spi_read_data(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lis2dh_spi_read_data(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	return lis2dh_raw_read(dev, reg_addr, value, len);
 }
 
-static int lis2dh_spi_write_data(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lis2dh_spi_write_data(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	return lis2dh_raw_write(dev, reg_addr, value, len);
 }
 
-static int lis2dh_spi_read_reg(struct device *dev, u8_t reg_addr,
-				u8_t *value)
+static int lis2dh_spi_read_reg(struct device *dev, uint8_t reg_addr,
+				uint8_t *value)
 {
 	return lis2dh_raw_read(dev, reg_addr, value, 1);
 }
 
-static int lis2dh_spi_write_reg(struct device *dev, u8_t reg_addr,
-				u8_t value)
+static int lis2dh_spi_write_reg(struct device *dev, uint8_t reg_addr,
+				uint8_t value)
 {
-	u8_t tmp_val = value;
+	uint8_t tmp_val = value;
 
 	return lis2dh_raw_write(dev, reg_addr, &tmp_val, 1);
 }
 
-static int lis2dh_spi_update_reg(struct device *dev, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lis2dh_spi_update_reg(struct device *dev, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
-	u8_t tmp_val;
+	uint8_t tmp_val;
 
 	lis2dh_raw_read(dev, reg_addr, &tmp_val, 1);
 	tmp_val = (tmp_val & ~mask) | (value & mask);
diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c
index b18a7c359f..646478559b 100644
--- a/drivers/sensor/lis2dh/lis2dh_trigger.c
+++ b/drivers/sensor/lis2dh/lis2dh_trigger.c
@@ -67,8 +67,8 @@ static int lis2dh_trigger_drdy_set(struct device *dev, enum sensor_channel chan,
 static int lis2dh_start_trigger_int1(struct device *dev)
 {
 	int status;
-	u8_t raw[LIS2DH_BUF_SZ];
-	u8_t ctrl1 = 0U;
+	uint8_t raw[LIS2DH_BUF_SZ];
+	uint8_t ctrl1 = 0U;
 	struct lis2dh_data *lis2dh = dev->driver_data;
 
 	/* power down temporarily to align interrupt & data output sampling */
@@ -126,7 +126,7 @@ static int lis2dh_trigger_anym_set(struct device *dev,
 {
 	struct lis2dh_data *lis2dh = dev->driver_data;
 	int status;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	setup_int2(dev, false);
 
@@ -190,8 +190,8 @@ int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr,
 	int status;
 
 	if (attr == SENSOR_ATTR_SLOPE_TH) {
-		u8_t range_g, reg_val;
-		u32_t slope_th_ums2;
+		uint8_t range_g, reg_val;
+		uint32_t slope_th_ums2;
 
 		status = lis2dh->hw_tf->read_reg(dev, LIS2DH_REG_CTRL4,
 						 &reg_val);
@@ -237,7 +237,7 @@ int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr,
 }
 
 static void lis2dh_gpio_int1_callback(struct device *dev,
-				      struct gpio_callback *cb, u32_t pins)
+				      struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis2dh_data *lis2dh =
 		CONTAINER_OF(cb, struct lis2dh_data, gpio_int1_cb);
@@ -255,7 +255,7 @@ static void lis2dh_gpio_int1_callback(struct device *dev,
 
 #if DT_INST_PROP_HAS_IDX(0, irq_gpios, 1)
 static void lis2dh_gpio_int2_callback(struct device *dev,
-				      struct gpio_callback *cb, u32_t pins)
+				      struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis2dh_data *lis2dh =
 		CONTAINER_OF(cb, struct lis2dh_data, gpio_int2_cb);
@@ -321,7 +321,7 @@ static void lis2dh_thread_cb(void *arg)
 			.type = SENSOR_TRIG_DELTA,
 			.chan = lis2dh->chan_drdy,
 		};
-		u8_t reg_val;
+		uint8_t reg_val;
 
 		/* clear interrupt 2 to de-assert int2 line */
 		status = lis2dh->hw_tf->read_reg(dev, LIS2DH_REG_INT2_SRC,
@@ -374,7 +374,7 @@ int lis2dh_init_interrupt(struct device *dev)
 	struct lis2dh_data *lis2dh = dev->driver_data;
 	int status;
 #if DT_INST_PROP_HAS_IDX(0, irq_gpios, 1)
-	u8_t raw[2];
+	uint8_t raw[2];
 #endif
 
 	/* setup data ready gpio interrupt */
diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c
index 0255c454df..b1a7cd110f 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.c
+++ b/drivers/sensor/lis2ds12/lis2ds12.c
@@ -42,9 +42,9 @@ static struct lis2ds12_config lis2ds12_config = {
 };
 
 #if defined(LIS2DS12_ODR_RUNTIME)
-static const u16_t lis2ds12_hr_odr_map[] = {0, 12, 25, 50, 100, 200, 400, 800};
+static const uint16_t lis2ds12_hr_odr_map[] = {0, 12, 25, 50, 100, 200, 400, 800};
 
-static int lis2ds12_freq_to_odr_val(u16_t freq)
+static int lis2ds12_freq_to_odr_val(uint16_t freq)
 {
 	size_t i;
 
@@ -57,7 +57,7 @@ static int lis2ds12_freq_to_odr_val(u16_t freq)
 	return -EINVAL;
 }
 
-static int lis2ds12_accel_odr_set(struct device *dev, u16_t freq)
+static int lis2ds12_accel_odr_set(struct device *dev, uint16_t freq)
 {
 	struct lis2ds12_data *data = dev->driver_data;
 	int odr;
@@ -80,10 +80,10 @@ static int lis2ds12_accel_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef LIS2DS12_FS_RUNTIME
-static const u16_t lis2ds12_accel_fs_map[] = {2, 16, 4, 8};
-static const u16_t lis2ds12_accel_fs_sens[] = {1, 8, 2, 4};
+static const uint16_t lis2ds12_accel_fs_map[] = {2, 16, 4, 8};
+static const uint16_t lis2ds12_accel_fs_sens[] = {1, 8, 2, 4};
 
-static int lis2ds12_accel_range_to_fs_val(s32_t range)
+static int lis2ds12_accel_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -96,7 +96,7 @@ static int lis2ds12_accel_range_to_fs_val(s32_t range)
 	return -EINVAL;
 }
 
-static int lis2ds12_accel_range_set(struct device *dev, s32_t range)
+static int lis2ds12_accel_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct lis2ds12_data *data = dev->driver_data;
@@ -158,7 +158,7 @@ static int lis2ds12_attr_set(struct device *dev, enum sensor_channel chan,
 static int lis2ds12_sample_fetch_accel(struct device *dev)
 {
 	struct lis2ds12_data *data = dev->driver_data;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (data->hw_tf->read_data(data, LIS2DS12_REG_OUTX_L,
 				   buf, sizeof(buf)) < 0) {
@@ -166,9 +166,9 @@ static int lis2ds12_sample_fetch_accel(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_x = (s16_t)((u16_t)(buf[0]) | ((u16_t)(buf[1]) << 8));
-	data->sample_y = (s16_t)((u16_t)(buf[2]) | ((u16_t)(buf[3]) << 8));
-	data->sample_z = (s16_t)((u16_t)(buf[4]) | ((u16_t)(buf[5]) << 8));
+	data->sample_x = (int16_t)((uint16_t)(buf[0]) | ((uint16_t)(buf[1]) << 8));
+	data->sample_y = (int16_t)((uint16_t)(buf[2]) | ((uint16_t)(buf[3]) << 8));
+	data->sample_z = (int16_t)((uint16_t)(buf[4]) | ((uint16_t)(buf[5]) << 8));
 
 	return 0;
 }
@@ -200,11 +200,11 @@ static int lis2ds12_sample_fetch(struct device *dev, enum sensor_channel chan)
 static inline void lis2ds12_convert(struct sensor_value *val, int raw_val,
 				    float gain)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Gain is in mg/LSB */
 	/* Convert to m/s^2 */
-	dval = ((s64_t)raw_val * gain * SENSOR_G) / 1000;
+	dval = ((int64_t)raw_val * gain * SENSOR_G) / 1000;
 	val->val1 = dval / 1000000LL;
 	val->val2 = dval % 1000000LL;
 }
@@ -258,7 +258,7 @@ static int lis2ds12_init(struct device *dev)
 {
 	const struct lis2ds12_config * const config = dev->config_info;
 	struct lis2ds12_data *data = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	data->comm_master = device_get_binding(config->comm_master_dev_name);
 	if (!data->comm_master) {
diff --git a/drivers/sensor/lis2ds12/lis2ds12.h b/drivers/sensor/lis2ds12/lis2ds12.h
index 8b5de66e2e..8c93ffbc77 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.h
+++ b/drivers/sensor/lis2ds12/lis2ds12.h
@@ -94,16 +94,16 @@ struct lis2ds12_config {
 struct lis2ds12_data;
 
 struct lis2ds12_transfer_function {
-	int (*read_data)(struct lis2ds12_data *data, u8_t reg_addr,
-			 u8_t *value, u8_t len);
-	int (*write_data)(struct lis2ds12_data *data, u8_t reg_addr,
-			  u8_t *value, u8_t len);
-	int (*read_reg)(struct lis2ds12_data *data, u8_t reg_addr,
-			u8_t *value);
-	int (*write_reg)(struct lis2ds12_data *data, u8_t reg_addr,
-			u8_t value);
-	int (*update_reg)(struct lis2ds12_data *data, u8_t reg_addr,
-			  u8_t mask, u8_t value);
+	int (*read_data)(struct lis2ds12_data *data, uint8_t reg_addr,
+			 uint8_t *value, uint8_t len);
+	int (*write_data)(struct lis2ds12_data *data, uint8_t reg_addr,
+			  uint8_t *value, uint8_t len);
+	int (*read_reg)(struct lis2ds12_data *data, uint8_t reg_addr,
+			uint8_t *value);
+	int (*write_reg)(struct lis2ds12_data *data, uint8_t reg_addr,
+			uint8_t value);
+	int (*update_reg)(struct lis2ds12_data *data, uint8_t reg_addr,
+			  uint8_t mask, uint8_t value);
 };
 
 struct lis2ds12_data {
diff --git a/drivers/sensor/lis2ds12/lis2ds12_i2c.c b/drivers/sensor/lis2ds12/lis2ds12_i2c.c
index 8da349c366..c295d7e80f 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_i2c.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_i2c.c
@@ -18,40 +18,40 @@
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 
-static u16_t lis2ds12_i2c_slave_addr = DT_INST_REG_ADDR(0);
+static uint16_t lis2ds12_i2c_slave_addr = DT_INST_REG_ADDR(0);
 
 LOG_MODULE_DECLARE(LIS2DS12, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lis2ds12_i2c_read_data(struct lis2ds12_data *data, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lis2ds12_i2c_read_data(struct lis2ds12_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	return i2c_burst_read(data->comm_master, lis2ds12_i2c_slave_addr,
 			      reg_addr, value, len);
 }
 
-static int lis2ds12_i2c_write_data(struct lis2ds12_data *data, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lis2ds12_i2c_write_data(struct lis2ds12_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	return i2c_burst_write(data->comm_master, lis2ds12_i2c_slave_addr,
 			       reg_addr, value, len);
 }
 
-static int lis2ds12_i2c_read_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				u8_t *value)
+static int lis2ds12_i2c_read_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				uint8_t *value)
 {
 	return i2c_reg_read_byte(data->comm_master, lis2ds12_i2c_slave_addr,
 				 reg_addr, value);
 }
 
-static int lis2ds12_i2c_write_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				u8_t value)
+static int lis2ds12_i2c_write_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				uint8_t value)
 {
 	return i2c_reg_write_byte(data->comm_master, lis2ds12_i2c_slave_addr,
 				 reg_addr, value);
 }
 
-static int lis2ds12_i2c_update_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lis2ds12_i2c_update_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
 	return i2c_reg_update_byte(data->comm_master, lis2ds12_i2c_slave_addr,
 				   reg_addr, mask, value);
diff --git a/drivers/sensor/lis2ds12/lis2ds12_spi.c b/drivers/sensor/lis2ds12/lis2ds12_spi.c
index 48d162752b..fad1fa7ef2 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_spi.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_spi.c
@@ -34,11 +34,11 @@ static struct spi_config lis2ds12_spi_conf = {
 	.cs        = NULL,
 };
 
-static int lis2ds12_raw_read(struct lis2ds12_data *data, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lis2ds12_raw_read(struct lis2ds12_data *data, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct spi_config *spi_cfg = &lis2ds12_spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LIS2DS12_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LIS2DS12_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -74,11 +74,11 @@ static int lis2ds12_raw_read(struct lis2ds12_data *data, u8_t reg_addr,
 	return 0;
 }
 
-static int lis2ds12_raw_write(struct lis2ds12_data *data, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lis2ds12_raw_write(struct lis2ds12_data *data, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct spi_config *spi_cfg = &lis2ds12_spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LIS2DS12_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~LIS2DS12_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
@@ -106,36 +106,36 @@ static int lis2ds12_raw_write(struct lis2ds12_data *data, u8_t reg_addr,
 	return 0;
 }
 
-static int lis2ds12_spi_read_data(struct lis2ds12_data *data, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lis2ds12_spi_read_data(struct lis2ds12_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	return lis2ds12_raw_read(data, reg_addr, value, len);
 }
 
-static int lis2ds12_spi_write_data(struct lis2ds12_data *data, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lis2ds12_spi_write_data(struct lis2ds12_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	return lis2ds12_raw_write(data, reg_addr, value, len);
 }
 
-static int lis2ds12_spi_read_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				u8_t *value)
+static int lis2ds12_spi_read_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				uint8_t *value)
 {
 	return lis2ds12_raw_read(data, reg_addr, value, 1);
 }
 
-static int lis2ds12_spi_write_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				u8_t value)
+static int lis2ds12_spi_write_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				uint8_t value)
 {
-	u8_t tmp_val = value;
+	uint8_t tmp_val = value;
 
 	return lis2ds12_raw_write(data, reg_addr, &tmp_val, 1);
 }
 
-static int lis2ds12_spi_update_reg(struct lis2ds12_data *data, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lis2ds12_spi_update_reg(struct lis2ds12_data *data, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
-	u8_t tmp_val;
+	uint8_t tmp_val;
 
 	lis2ds12_raw_read(data, reg_addr, &tmp_val, 1);
 	tmp_val = (tmp_val & ~mask) | (value & mask);
diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
index 622e19fadc..003ebb1336 100644
--- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c
+++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c
@@ -20,7 +20,7 @@
 LOG_MODULE_DECLARE(LIS2DS12, CONFIG_SENSOR_LOG_LEVEL);
 
 static void lis2ds12_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis2ds12_data *data =
 		CONTAINER_OF(cb, struct lis2ds12_data, gpio_cb);
@@ -52,7 +52,7 @@ static void lis2ds12_handle_int(void *arg)
 	struct device *dev = arg;
 	struct lis2ds12_data *data = dev->driver_data;
 	const struct lis2ds12_config *cfg = dev->config_info;
-	u8_t status;
+	uint8_t status;
 
 	if (data->hw_tf->read_reg(data, LIS2DS12_REG_STATUS, &status) < 0) {
 		LOG_ERR("status reading error");
@@ -166,7 +166,7 @@ int lis2ds12_trigger_set(struct device *dev,
 {
 	struct lis2ds12_data *data = dev->driver_data;
 	const struct lis2ds12_config *cfg = dev->config_info;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	__ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY);
 
diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c
index 75c71207e5..37b3546949 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.c
+++ b/drivers/sensor/lis2dw12/lis2dw12.c
@@ -31,13 +31,13 @@ LOG_MODULE_REGISTER(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL);
  * @dev: Pointer to instance of struct device (I2C or SPI)
  * @range: Full scale range (2, 4, 8 and 16 G)
  */
-static int lis2dw12_set_range(struct device *dev, u16_t range)
+static int lis2dw12_set_range(struct device *dev, uint16_t range)
 {
 	int err;
 	struct lis2dw12_data *lis2dw12 = dev->driver_data;
 	const struct lis2dw12_device_config *cfg = dev->config_info;
-	u8_t shift_gain = 0U;
-	u8_t fs = LIS2DW12_FS_TO_REG(range);
+	uint8_t shift_gain = 0U;
+	uint8_t fs = LIS2DW12_FS_TO_REG(range);
 
 	err = lis2dw12_full_scale_set(lis2dw12->ctx, fs);
 
@@ -60,10 +60,10 @@ static int lis2dw12_set_range(struct device *dev, u16_t range)
  * @dev: Pointer to instance of struct device (I2C or SPI)
  * @odr: Output data rate
  */
-static int lis2dw12_set_odr(struct device *dev, u16_t odr)
+static int lis2dw12_set_odr(struct device *dev, uint16_t odr)
 {
 	struct lis2dw12_data *lis2dw12 = dev->driver_data;
-	u8_t val;
+	uint8_t val;
 
 	/* check if power off */
 	if (odr == 0U) {
@@ -83,11 +83,11 @@ static int lis2dw12_set_odr(struct device *dev, u16_t odr)
 static inline void lis2dw12_convert(struct sensor_value *val, int raw_val,
 				    float gain)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Gain is in ug/LSB */
 	/* Convert to m/s^2 */
-	dval = ((s64_t)raw_val * gain * SENSOR_G) / 1000000LL;
+	dval = ((int64_t)raw_val * gain * SENSOR_G) / 1000000LL;
 	val->val1 = dval / 1000000LL;
 	val->val2 = dval % 1000000LL;
 }
@@ -97,7 +97,7 @@ static inline void lis2dw12_channel_get_acc(struct device *dev,
 					     struct sensor_value *val)
 {
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 	struct lis2dw12_data *lis2dw12 = dev->driver_data;
 	struct sensor_value *pval = val;
 
@@ -179,7 +179,7 @@ static int lis2dw12_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct lis2dw12_data *lis2dw12 = dev->driver_data;
 	const struct lis2dw12_device_config *cfg = dev->config_info;
-	u8_t shift;
+	uint8_t shift;
 	union axis3bit16_t buf;
 
 	/* fetch raw data sample */
@@ -236,7 +236,7 @@ static int lis2dw12_init_interface(struct device *dev)
 static int lis2dw12_set_power_mode(struct lis2dw12_data *lis2dw12,
 				    lis2dw12_mode_t pm)
 {
-	u8_t regval = LIS2DW12_CONT_LOW_PWR_12bit;
+	uint8_t regval = LIS2DW12_CONT_LOW_PWR_12bit;
 
 	switch (pm) {
 	case LIS2DW12_CONT_LOW_PWR_2:
@@ -257,7 +257,7 @@ static int lis2dw12_init(struct device *dev)
 {
 	struct lis2dw12_data *lis2dw12 = dev->driver_data;
 	const struct lis2dw12_device_config *cfg = dev->config_info;
-	u8_t wai;
+	uint8_t wai;
 
 	if (lis2dw12_init_interface(dev)) {
 		return -EINVAL;
diff --git a/drivers/sensor/lis2dw12/lis2dw12.h b/drivers/sensor/lis2dw12/lis2dw12.h
index b4f4c16eee..b77aa78da2 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.h
+++ b/drivers/sensor/lis2dw12/lis2dw12.h
@@ -18,8 +18,8 @@
 #include "lis2dw12_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 #if defined(CONFIG_LIS2DW12_ODR_1_6)
@@ -91,15 +91,15 @@ struct lis2dw12_device_config {
 	lis2dw12_mode_t pm;
 #ifdef CONFIG_LIS2DW12_TRIGGER
 	const char *int_gpio_port;
-	u8_t int_gpio_pin;
-	u8_t int_gpio_flags;
-	u8_t int_pin;
+	uint8_t int_gpio_pin;
+	uint8_t int_gpio_flags;
+	uint8_t int_pin;
 #ifdef CONFIG_LIS2DW12_PULSE
-	u8_t pulse_trigger;
-	u8_t pulse_ths[3];
-	u8_t pulse_shock;
-	u8_t pulse_ltncy;
-	u8_t pulse_quiet;
+	uint8_t pulse_trigger;
+	uint8_t pulse_ths[3];
+	uint8_t pulse_shock;
+	uint8_t pulse_ltncy;
+	uint8_t pulse_quiet;
 #endif /* CONFIG_LIS2DW12_PULSE */
 #endif /* CONFIG_LIS2DW12_TRIGGER */
 };
@@ -110,15 +110,15 @@ struct lis2dw12_data;
 /* sensor data */
 struct lis2dw12_data {
 	struct device *bus;
-	s16_t acc[3];
+	int16_t acc[3];
 
 	 /* save sensitivity */
-	u16_t gain;
+	uint16_t gain;
 
 	stmdev_ctx_t *ctx;
 #ifdef CONFIG_LIS2DW12_TRIGGER
 	struct device *gpio;
-	u8_t gpio_pin;
+	uint8_t gpio_pin;
 	struct gpio_callback gpio_cb;
 	sensor_trigger_handler_t drdy_handler;
 #ifdef CONFIG_LIS2DW12_PULSE
diff --git a/drivers/sensor/lis2dw12/lis2dw12_i2c.c b/drivers/sensor/lis2dw12/lis2dw12_i2c.c
index d7e9c297a4..568f1b4b90 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_i2c.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_i2c.c
@@ -18,19 +18,19 @@
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 
-static u16_t lis2dw12_i2c_slave_addr = DT_INST_REG_ADDR(0);
+static uint16_t lis2dw12_i2c_slave_addr = DT_INST_REG_ADDR(0);
 
 LOG_MODULE_DECLARE(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lis2dw12_i2c_read(struct lis2dw12_data *data, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int lis2dw12_i2c_read(struct lis2dw12_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	return i2c_burst_read(data->bus, lis2dw12_i2c_slave_addr,
 			      reg_addr, value, len);
 }
 
-static int lis2dw12_i2c_write(struct lis2dw12_data *data, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int lis2dw12_i2c_write(struct lis2dw12_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	return i2c_burst_write(data->bus, lis2dw12_i2c_slave_addr,
 			       reg_addr, value, len);
diff --git a/drivers/sensor/lis2dw12/lis2dw12_spi.c b/drivers/sensor/lis2dw12/lis2dw12_spi.c
index 69881a1f09..04ed8d2088 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_spi.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_spi.c
@@ -29,11 +29,11 @@ static struct spi_config lis2dw12_spi_conf = {
 	.cs        = NULL,
 };
 
-static int lis2dw12_spi_read(struct lis2dw12_data *ctx, u8_t reg,
-			    u8_t *data, u16_t len)
+static int lis2dw12_spi_read(struct lis2dw12_data *ctx, uint8_t reg,
+			    uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &lis2dw12_spi_conf;
-	u8_t buffer_tx[2] = { reg | LIS2DW12_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg | LIS2DW12_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -64,11 +64,11 @@ static int lis2dw12_spi_read(struct lis2dw12_data *ctx, u8_t reg,
 	return 0;
 }
 
-static int lis2dw12_spi_write(struct lis2dw12_data *ctx, u8_t reg,
-			     u8_t *data, u16_t len)
+static int lis2dw12_spi_write(struct lis2dw12_data *ctx, uint8_t reg,
+			     uint8_t *data, uint16_t len)
 {
 	struct spi_config *spi_cfg = &lis2dw12_spi_conf;
-	u8_t buffer_tx[1] = { reg & ~LIS2DW12_SPI_READ };
+	uint8_t buffer_tx[1] = { reg & ~LIS2DW12_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
index 46817f2ebb..64709adc1c 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
@@ -190,7 +190,7 @@ static void lis2dw12_handle_interrupt(void *arg)
 }
 
 static void lis2dw12_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis2dw12_data *lis2dw12 =
 		CONTAINER_OF(cb, struct lis2dw12_data, gpio_cb);
diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c
index 5d9fe5ed5d..79b35d4052 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.c
+++ b/drivers/sensor/lis2mdl/lis2mdl.c
@@ -57,7 +57,7 @@ static int lis2mdl_set_hard_iron(struct device *dev, enum sensor_channel chan,
 				   const struct sensor_value *val)
 {
 	struct lis2mdl_data *lis2mdl = dev->driver_data;
-	u8_t i;
+	uint8_t i;
 	union axis3bit16_t offset;
 
 	for (i = 0U; i < 3; i++) {
@@ -72,9 +72,9 @@ static void lis2mdl_channel_get_mag(struct device *dev,
 				      enum sensor_channel chan,
 				      struct sensor_value *val)
 {
-	s32_t cval;
+	int32_t cval;
 	int i;
-	u8_t ofs_start, ofs_stop;
+	uint8_t ofs_start, ofs_stop;
 	struct lis2mdl_data *lis2mdl = dev->driver_data;
 	struct sensor_value *pval = val;
 
@@ -193,7 +193,7 @@ static int lis2mdl_sample_fetch_temp(struct device *dev)
 {
 	struct lis2mdl_data *lis2mdl = dev->driver_data;
 	union axis1bit16_t raw_temp;
-	s32_t temp;
+	int32_t temp;
 
 	/* fetch raw temperature sample */
 	if (lis2mdl_temperature_raw_get(lis2mdl->ctx, raw_temp.u8bit) < 0) {
@@ -289,7 +289,7 @@ static const struct lis2mdl_config lis2mdl_dev_config = {
 static int lis2mdl_init(struct device *dev)
 {
 	struct lis2mdl_data *lis2mdl = dev->driver_data;
-	u8_t wai;
+	uint8_t wai;
 
 	if (lis2mdl_init_interface(dev)) {
 		return -EINVAL;
diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h
index 66d11fed2e..0973a2c468 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.h
+++ b/drivers/sensor/lis2mdl/lis2mdl.h
@@ -18,13 +18,13 @@
 #include "lis2mdl_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 struct lis2mdl_config {
@@ -32,16 +32,16 @@ struct lis2mdl_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_LIS2MDL_TRIGGER
 	char *gpio_name;
-	u32_t gpio_pin;
-	u8_t gpio_flags;
+	uint32_t gpio_pin;
+	uint8_t gpio_flags;
 #endif  /* CONFIG_LIS2MDL_TRIGGER */
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(spi) */
 };
@@ -49,9 +49,9 @@ struct lis2mdl_config {
 /* Sensor data */
 struct lis2mdl_data {
 	struct device *bus;
-	u16_t i2c_addr;
-	s16_t mag[3];
-	s32_t temp_sample;
+	uint16_t i2c_addr;
+	int16_t mag[3];
+	int32_t temp_sample;
 
 	stmdev_ctx_t *ctx;
 
diff --git a/drivers/sensor/lis2mdl/lis2mdl_i2c.c b/drivers/sensor/lis2mdl/lis2mdl_i2c.c
index fd54954053..2353e58489 100644
--- a/drivers/sensor/lis2mdl/lis2mdl_i2c.c
+++ b/drivers/sensor/lis2mdl/lis2mdl_i2c.c
@@ -21,8 +21,8 @@
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 LOG_MODULE_DECLARE(LIS2MDL);
 
-static int lis2mdl_i2c_read(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int lis2mdl_i2c_read(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	struct lis2mdl_data *data = dev->driver_data;
 	const struct lis2mdl_config *cfg = dev->config_info;
@@ -31,8 +31,8 @@ static int lis2mdl_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int lis2mdl_i2c_write(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int lis2mdl_i2c_write(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	struct lis2mdl_data *data = dev->driver_data;
 	const struct lis2mdl_config *cfg = dev->config_info;
diff --git a/drivers/sensor/lis2mdl/lis2mdl_spi.c b/drivers/sensor/lis2mdl/lis2mdl_spi.c
index 8fc4268a7d..4bc3c28d58 100644
--- a/drivers/sensor/lis2mdl/lis2mdl_spi.c
+++ b/drivers/sensor/lis2mdl/lis2mdl_spi.c
@@ -21,13 +21,13 @@
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 LOG_MODULE_DECLARE(LIS2MDL);
 
-static int lis2mdl_spi_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lis2mdl_spi_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct lis2mdl_data *data = dev->driver_data;
 	const struct lis2mdl_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LIS2MDL_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LIS2MDL_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -63,13 +63,13 @@ static int lis2mdl_spi_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int lis2mdl_spi_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lis2mdl_spi_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct lis2mdl_data *data = dev->driver_data;
 	const struct lis2mdl_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LIS2MDL_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~LIS2MDL_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
index a2c8187fa2..4159f839c2 100644
--- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c
+++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
@@ -69,7 +69,7 @@ static void lis2mdl_handle_interrupt(void *arg)
 }
 
 static void lis2mdl_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis2mdl_data *lis2mdl =
 		CONTAINER_OF(cb, struct lis2mdl_data, gpio_cb);
diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c
index 3b28859b08..7c76226976 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.c
+++ b/drivers/sensor/lis3mdl/lis3mdl.c
@@ -18,12 +18,12 @@
 
 LOG_MODULE_REGISTER(LIS3MDL, CONFIG_SENSOR_LOG_LEVEL);
 
-static void lis3mdl_convert(struct sensor_value *val, s16_t raw_val,
-			    u16_t divider)
+static void lis3mdl_convert(struct sensor_value *val, int16_t raw_val,
+			    uint16_t divider)
 {
 	/* val = raw_val / divider */
 	val->val1 = raw_val / divider;
-	val->val2 = (((s64_t)raw_val % divider) * 1000000L) / divider;
+	val->val2 = (((int64_t)raw_val % divider) * 1000000L) / divider;
 }
 
 static int lis3mdl_channel_get(struct device *dev,
@@ -61,13 +61,13 @@ static int lis3mdl_channel_get(struct device *dev,
 int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct lis3mdl_data *drv_data = dev->driver_data;
-	s16_t buf[4];
+	int16_t buf[4];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
 	/* fetch magnetometer sample */
 	if (i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
-			   LIS3MDL_REG_SAMPLE_START, (u8_t *)buf, 8) < 0) {
+			   LIS3MDL_REG_SAMPLE_START, (uint8_t *)buf, 8) < 0) {
 		LOG_DBG("Failed to fetch megnetometer sample.");
 		return -EIO;
 	}
@@ -79,7 +79,7 @@ int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan)
 	 */
 	if (i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 			   LIS3MDL_REG_SAMPLE_START + 6,
-			   (u8_t *)(buf + 3), 2) < 0) {
+			   (uint8_t *)(buf + 3), 2) < 0) {
 		LOG_DBG("Failed to fetch temperature sample.");
 		return -EIO;
 	}
@@ -103,8 +103,8 @@ static const struct sensor_driver_api lis3mdl_driver_api = {
 int lis3mdl_init(struct device *dev)
 {
 	struct lis3mdl_data *drv_data = dev->driver_data;
-	u8_t chip_cfg[6];
-	u8_t id, idx;
+	uint8_t chip_cfg[6];
+	uint8_t id, idx;
 
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
 
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index d3818fc306..4f0e50100d 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -91,7 +91,7 @@ static const char * const lis3mdl_odr_strings[] = {
 	"40", "80", "155", "300", "560", "1000"
 };
 
-static const u8_t lis3mdl_odr_bits[] = {
+static const uint8_t lis3mdl_odr_bits[] = {
 	LIS3MDL_ODR_BITS(0, 0, 0), /* 0.625 Hz */
 	LIS3MDL_ODR_BITS(0, 1, 0), /* 1.25 Hz */
 	LIS3MDL_ODR_BITS(0, 2, 0), /* 2.5 Hz */
@@ -106,16 +106,16 @@ static const u8_t lis3mdl_odr_bits[] = {
 	LIS3MDL_ODR_BITS(0, 0, 1)  /* 1000 Hz */
 };
 
-static const u16_t lis3mdl_magn_gain[] = {
+static const uint16_t lis3mdl_magn_gain[] = {
 	6842, 3421, 2281, 1711
 };
 
 struct lis3mdl_data {
 	struct device *i2c;
-	s16_t x_sample;
-	s16_t y_sample;
-	s16_t z_sample;
-	s16_t temp_sample;
+	int16_t x_sample;
+	int16_t y_sample;
+	int16_t z_sample;
+	int16_t temp_sample;
 
 #ifdef CONFIG_LIS3MDL_TRIGGER
 	struct device *gpio;
diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
index ba53b30f19..d872f55cbe 100644
--- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c
+++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c
@@ -22,14 +22,14 @@ int lis3mdl_trigger_set(struct device *dev,
 			sensor_trigger_handler_t handler)
 {
 	struct lis3mdl_data *drv_data = dev->driver_data;
-	s16_t buf[3];
+	int16_t buf[3];
 	int ret;
 
 	__ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY);
 
 	/* dummy read: re-trigger interrupt */
 	ret = i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
-			     LIS3MDL_REG_SAMPLE_START, (u8_t *)buf, 6);
+			     LIS3MDL_REG_SAMPLE_START, (uint8_t *)buf, 6);
 	if (ret != 0) {
 		return ret;
 	}
@@ -53,7 +53,7 @@ int lis3mdl_trigger_set(struct device *dev,
 }
 
 static void lis3mdl_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct lis3mdl_data *drv_data =
 		CONTAINER_OF(cb, struct lis3mdl_data, gpio_cb);
diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c
index 09c88bdf56..189856611e 100644
--- a/drivers/sensor/lps22hb/lps22hb.c
+++ b/drivers/sensor/lps22hb/lps22hb.c
@@ -20,7 +20,7 @@
 
 LOG_MODULE_REGISTER(LPS22HB, CONFIG_SENSOR_LOG_LEVEL);
 
-static inline int lps22hb_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lps22hb_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lps22hb_data *data = dev->driver_data;
 	const struct lps22hb_config *config = dev->config_info;
@@ -36,7 +36,7 @@ static int lps22hb_sample_fetch(struct device *dev,
 {
 	struct lps22hb_data *data = dev->driver_data;
 	const struct lps22hb_config *config = dev->config_info;
-	u8_t out[5];
+	uint8_t out[5];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -46,31 +46,31 @@ static int lps22hb_sample_fetch(struct device *dev,
 		return -EIO;
 	}
 
-	data->sample_press = (s32_t)((u32_t)(out[0]) |
-				     ((u32_t)(out[1]) << 8) |
-				     ((u32_t)(out[2]) << 16));
-	data->sample_temp = (s16_t)((u16_t)(out[3]) |
-				    ((u16_t)(out[4]) << 8));
+	data->sample_press = (int32_t)((uint32_t)(out[0]) |
+				     ((uint32_t)(out[1]) << 8) |
+				     ((uint32_t)(out[2]) << 16));
+	data->sample_temp = (int16_t)((uint16_t)(out[3]) |
+				    ((uint16_t)(out[4]) << 8));
 
 	return 0;
 }
 
 static inline void lps22hb_press_convert(struct sensor_value *val,
-					 s32_t raw_val)
+					 int32_t raw_val)
 {
 	/* Pressure sensitivity is 4096 LSB/hPa */
 	/* Convert raw_val to val in kPa */
 	val->val1 = (raw_val >> 12) / 10;
 	val->val2 = (raw_val >> 12) % 10 * 100000 +
-		(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
+		(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
 }
 
 static inline void lps22hb_temp_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
 	/* Temperature sensitivity is 100 LSB/deg C */
 	val->val1 = raw_val / 100;
-	val->val2 = ((s32_t)raw_val % 100) * 10000;
+	val->val2 = ((int32_t)raw_val % 100) * 10000;
 }
 
 static int lps22hb_channel_get(struct device *dev,
@@ -99,7 +99,7 @@ static int lps22hb_init_chip(struct device *dev)
 {
 	struct lps22hb_data *data = dev->driver_data;
 	const struct lps22hb_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      LPS22HB_REG_WHO_AM_I, &chip_id) < 0) {
diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h
index 8b8e52a0c5..3118ee318a 100644
--- a/drivers/sensor/lps22hb/lps22hb.h
+++ b/drivers/sensor/lps22hb/lps22hb.h
@@ -155,13 +155,13 @@
 
 struct lps22hb_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 struct lps22hb_data {
 	struct device *i2c_master;
-	s32_t sample_press;
-	s16_t sample_temp;
+	int32_t sample_press;
+	int16_t sample_temp;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_ */
diff --git a/drivers/sensor/lps22hh/lps22hh.c b/drivers/sensor/lps22hh/lps22hh.c
index 6c0484f407..27c9b9c556 100644
--- a/drivers/sensor/lps22hh/lps22hh.c
+++ b/drivers/sensor/lps22hh/lps22hh.c
@@ -22,7 +22,7 @@
 
 LOG_MODULE_REGISTER(LPS22HH, CONFIG_SENSOR_LOG_LEVEL);
 
-static inline int lps22hh_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lps22hh_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lps22hh_data *data = dev->driver_data;
 
@@ -54,21 +54,21 @@ static int lps22hh_sample_fetch(struct device *dev,
 }
 
 static inline void lps22hh_press_convert(struct sensor_value *val,
-					 s32_t raw_val)
+					 int32_t raw_val)
 {
 	/* Pressure sensitivity is 4096 LSB/hPa */
 	/* Convert raw_val to val in kPa */
 	val->val1 = (raw_val >> 12) / 10;
 	val->val2 = (raw_val >> 12) % 10 * 100000 +
-		(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
+		(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
 }
 
 static inline void lps22hh_temp_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
 	/* Temperature sensitivity is 100 LSB/deg C */
 	val->val1 = raw_val / 100;
-	val->val2 = ((s32_t)raw_val % 100) * 10000;
+	val->val2 = ((int32_t)raw_val % 100) * 10000;
 }
 
 static int lps22hh_channel_get(struct device *dev,
@@ -88,9 +88,9 @@ static int lps22hh_channel_get(struct device *dev,
 	return 0;
 }
 
-static const u16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
+static const uint16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
 
-static int lps22hh_odr_set(struct device *dev, u16_t freq)
+static int lps22hh_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -145,7 +145,7 @@ static const struct sensor_driver_api lps22hh_api_funcs = {
 static int lps22hh_init_chip(struct device *dev)
 {
 	struct lps22hh_data *data = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lps22hh_device_id_get(data->ctx, &chip_id) < 0) {
 		LOG_DBG("Failed reading chip id");
diff --git a/drivers/sensor/lps22hh/lps22hh.h b/drivers/sensor/lps22hh/lps22hh.h
index 89817a57b4..e86db3e3b7 100644
--- a/drivers/sensor/lps22hh/lps22hh.h
+++ b/drivers/sensor/lps22hh/lps22hh.h
@@ -21,13 +21,13 @@
 #include "lps22hh_reg.h"
 
 union axis1bit32_t {
-	s32_t i32bit;
-	u8_t u8bit[4];
+	int32_t i32bit;
+	uint8_t u8bit[4];
 };
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 struct lps22hh_config {
@@ -35,24 +35,24 @@ struct lps22hh_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_LPS22HH_TRIGGER
 	const char *drdy_port;
-	u8_t drdy_pin;
-	u8_t drdy_flags;
+	uint8_t drdy_pin;
+	uint8_t drdy_flags;
 #endif
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif
 #endif
 };
 
 struct lps22hh_data {
 	struct device *bus;
-	s32_t sample_press;
-	s16_t sample_temp;
+	int32_t sample_press;
+	int16_t sample_temp;
 
 	stmdev_ctx_t *ctx;
 
@@ -64,7 +64,7 @@ struct lps22hh_data {
 
 #ifdef CONFIG_LPS22HH_TRIGGER
 	struct device *gpio;
-	u32_t pin;
+	uint32_t pin;
 	struct gpio_callback gpio_cb;
 
 	struct sensor_trigger data_ready_trigger;
diff --git a/drivers/sensor/lps22hh/lps22hh_i2c.c b/drivers/sensor/lps22hh/lps22hh_i2c.c
index 893a08026b..ef9104673b 100644
--- a/drivers/sensor/lps22hh/lps22hh_i2c.c
+++ b/drivers/sensor/lps22hh/lps22hh_i2c.c
@@ -20,8 +20,8 @@
 
 LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lps22hh_i2c_read(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int lps22hh_i2c_read(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	struct lps22hh_data *data = dev->driver_data;
 	const struct lps22hh_config *cfg = dev->config_info;
@@ -30,8 +30,8 @@ static int lps22hh_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int lps22hh_i2c_write(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int lps22hh_i2c_write(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	struct lps22hh_data *data = dev->driver_data;
 	const struct lps22hh_config *cfg = dev->config_info;
diff --git a/drivers/sensor/lps22hh/lps22hh_spi.c b/drivers/sensor/lps22hh/lps22hh_spi.c
index 5b60173a92..37ab4d0e3a 100644
--- a/drivers/sensor/lps22hh/lps22hh_spi.c
+++ b/drivers/sensor/lps22hh/lps22hh_spi.c
@@ -21,13 +21,13 @@
 
 LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lps22hh_spi_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lps22hh_spi_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct lps22hh_data *data = dev->driver_data;
 	const struct lps22hh_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LPS22HH_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LPS22HH_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -63,13 +63,13 @@ static int lps22hh_spi_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int lps22hh_spi_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lps22hh_spi_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct lps22hh_data *data = dev->driver_data;
 	const struct lps22hh_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LPS22HH_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~LPS22HH_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c
index 9cc845ccff..fb3ce88662 100644
--- a/drivers/sensor/lps22hh/lps22hh_trigger.c
+++ b/drivers/sensor/lps22hh/lps22hh_trigger.c
@@ -85,7 +85,7 @@ static void lps22hh_handle_interrupt(void *arg)
 }
 
 static void lps22hh_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	const struct lps22hh_config *cfg = dev->config_info;
 	struct lps22hh_data *lps22hh =
diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c
index 64bafbc69b..fe8a03af2e 100644
--- a/drivers/sensor/lps25hb/lps25hb.c
+++ b/drivers/sensor/lps25hb/lps25hb.c
@@ -20,7 +20,7 @@
 
 LOG_MODULE_REGISTER(LPS25HB, CONFIG_SENSOR_LOG_LEVEL);
 
-static inline int lps25hb_power_ctrl(struct device *dev, u8_t value)
+static inline int lps25hb_power_ctrl(struct device *dev, uint8_t value)
 {
 	struct lps25hb_data *data = dev->driver_data;
 	const struct lps25hb_config *config = dev->config_info;
@@ -31,7 +31,7 @@ static inline int lps25hb_power_ctrl(struct device *dev, u8_t value)
 				   value << LPS25HB_SHIFT_CTRL_REG1_PD);
 }
 
-static inline int lps25hb_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lps25hb_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lps25hb_data *data = dev->driver_data;
 	const struct lps25hb_config *config = dev->config_info;
@@ -47,7 +47,7 @@ static int lps25hb_sample_fetch(struct device *dev,
 {
 	struct lps25hb_data *data = dev->driver_data;
 	const struct lps25hb_config *config = dev->config_info;
-	u8_t out[5];
+	uint8_t out[5];
 	int offset;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
@@ -61,30 +61,30 @@ static int lps25hb_sample_fetch(struct device *dev,
 		}
 	}
 
-	data->sample_press = (s32_t)((u32_t)(out[0]) |
-					((u32_t)(out[1]) << 8) |
-					((u32_t)(out[2]) << 16));
-	data->sample_temp = (s16_t)((u16_t)(out[3]) |
-					((u16_t)(out[4]) << 8));
+	data->sample_press = (int32_t)((uint32_t)(out[0]) |
+					((uint32_t)(out[1]) << 8) |
+					((uint32_t)(out[2]) << 16));
+	data->sample_temp = (int16_t)((uint16_t)(out[3]) |
+					((uint16_t)(out[4]) << 8));
 
 	return 0;
 }
 
 static inline void lps25hb_press_convert(struct sensor_value *val,
-					 s32_t raw_val)
+					 int32_t raw_val)
 {
 	/* val = raw_val / 40960 */
 	val->val1 = raw_val / 40960;
-	val->val2 = ((s32_t)raw_val * 1000000 / 40960) % 1000000;
+	val->val2 = ((int32_t)raw_val * 1000000 / 40960) % 1000000;
 }
 
 static inline void lps25hb_temp_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
-	s32_t uval;
+	int32_t uval;
 
 	/* val = raw_val / 480 + 42.5 */
-	uval = (s32_t)raw_val * 1000000 / 480 + 42500000;
+	uval = (int32_t)raw_val * 1000000 / 480 + 42500000;
 	val->val1 = (raw_val * 10 / 480 + 425) / 10;
 	val->val2 = uval % 1000000;
 }
@@ -115,7 +115,7 @@ static int lps25hb_init_chip(struct device *dev)
 {
 	struct lps25hb_data *data = dev->driver_data;
 	const struct lps25hb_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	lps25hb_power_ctrl(dev, 0);
 	k_busy_wait(USEC_PER_MSEC * 50U);
diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h
index ec91a110d0..997d6d427f 100644
--- a/drivers/sensor/lps25hb/lps25hb.h
+++ b/drivers/sensor/lps25hb/lps25hb.h
@@ -148,14 +148,14 @@
 
 struct lps25hb_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 struct lps25hb_data {
 	struct device *i2c_master;
 
-	s32_t sample_press;
-	s16_t sample_temp;
+	int32_t sample_press;
+	int16_t sample_temp;
 };
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_ */
diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
index 0d84089e67..e9afb8138c 100644
--- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
+++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c
@@ -20,8 +20,8 @@ static int lsm303dlhc_sample_fetch(struct device *dev,
 {
 	const struct lsm303dlhc_magn_config *config = dev->config_info;
 	struct lsm303dlhc_magn_data *drv_data = dev->driver_data;
-	u8_t magn_buf[6];
-	u8_t status;
+	uint8_t magn_buf[6];
+	uint8_t status;
 
 	/* Check data ready flag */
 	if (i2c_reg_read_byte(drv_data->i2c,
@@ -53,7 +53,7 @@ static int lsm303dlhc_sample_fetch(struct device *dev,
 }
 
 static void lsm303dlhc_convert(struct sensor_value *val,
-			       s64_t raw_val)
+			       int64_t raw_val)
 {
 	val->val1 = raw_val / LSM303DLHC_MAGN_LSB_GAUSS;
 	val->val2 = (1000000 * raw_val / LSM303DLHC_MAGN_LSB_GAUSS) % 1000000;
diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h
index 2686fb0971..7da1495cba 100644
--- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h
+++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.h
@@ -67,13 +67,13 @@
 struct lsm303dlhc_magn_data {
 	struct device *i2c;
 
-	s16_t magn_x;
-	s16_t magn_y;
-	s16_t magn_z;
+	int16_t magn_x;
+	int16_t magn_y;
+	int16_t magn_z;
 };
 
 struct lsm303dlhc_magn_config {
 	char *i2c_name;
-	u8_t i2c_address;
+	uint8_t i2c_address;
 };
 #endif /* _SENSOR_LSM303DLHC_MAGN_ */
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c
index 7d18b87faf..f6924b9a8f 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.c
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.c
@@ -44,7 +44,7 @@ static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en,
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG5_XL_XEN_XL) |
+	uint8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG5_XL_XEN_XL) |
 			(y_en << LSM6DS0_SHIFT_CTRL_REG5_XL_YEN_XL) |
 			(z_en << LSM6DS0_SHIFT_CTRL_REG5_XL_ZEN_XL);
 
@@ -56,7 +56,7 @@ static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en,
 				   state);
 }
 
-static int lsm6ds0_accel_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6ds0_accel_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
@@ -71,7 +71,7 @@ static int lsm6ds0_accel_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6ds0_accel_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6ds0_accel_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
@@ -91,7 +91,7 @@ static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en,
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG4_XEN_G) |
+	uint8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG4_XEN_G) |
 			(y_en << LSM6DS0_SHIFT_CTRL_REG4_YEN_G) |
 			(z_en << LSM6DS0_SHIFT_CTRL_REG4_ZEN_G);
 
@@ -103,7 +103,7 @@ static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en,
 				   state);
 }
 
-static int lsm6ds0_gyro_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
@@ -118,7 +118,7 @@ static int lsm6ds0_gyro_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6ds0_gyro_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
@@ -137,7 +137,7 @@ static int lsm6ds0_sample_fetch_accel(struct device *dev)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr,
 			   LSM6DS0_REG_OUT_X_L_XL, buf, sizeof(buf)) < 0) {
@@ -146,16 +146,16 @@ static int lsm6ds0_sample_fetch_accel(struct device *dev)
 	}
 
 #if defined(CONFIG_LSM6DS0_ACCEL_ENABLE_X_AXIS)
-	data->accel_sample_x = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
+	data->accel_sample_x = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
 #endif
 #if defined(CONFIG_LSM6DS0_ACCEL_ENABLE_Y_AXIS)
-	data->accel_sample_y = (s16_t)((u16_t)(buf[2]) |
-				((u16_t)(buf[3]) << 8));
+	data->accel_sample_y = (int16_t)((uint16_t)(buf[2]) |
+				((uint16_t)(buf[3]) << 8));
 #endif
 #if defined(CONFIG_LSM6DS0_ACCEL_ENABLE_Z_AXIS)
-	data->accel_sample_z = (s16_t)((u16_t)(buf[4]) |
-				((u16_t)(buf[5]) << 8));
+	data->accel_sample_z = (int16_t)((uint16_t)(buf[4]) |
+				((uint16_t)(buf[5]) << 8));
 #endif
 
 	return 0;
@@ -165,7 +165,7 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr,
 			   LSM6DS0_REG_OUT_X_L_G, buf, sizeof(buf)) < 0) {
@@ -174,16 +174,16 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev)
 	}
 
 #if defined(CONFIG_LSM6DS0_GYRO_ENABLE_X_AXIS)
-	data->gyro_sample_x = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
+	data->gyro_sample_x = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
 #endif
 #if defined(CONFIG_LSM6DS0_GYRO_ENABLE_Y_AXIS)
-	data->gyro_sample_y = (s16_t)((u16_t)(buf[2]) |
-				((u16_t)(buf[3]) << 8));
+	data->gyro_sample_y = (int16_t)((uint16_t)(buf[2]) |
+				((uint16_t)(buf[3]) << 8));
 #endif
 #if defined(CONFIG_LSM6DS0_GYRO_ENABLE_Z_AXIS)
-	data->gyro_sample_z = (s16_t)((u16_t)(buf[4]) |
-				((u16_t)(buf[5]) << 8));
+	data->gyro_sample_z = (int16_t)((uint16_t)(buf[4]) |
+				((uint16_t)(buf[5]) << 8));
 #endif
 
 	return 0;
@@ -194,7 +194,7 @@ static int lsm6ds0_sample_fetch_temp(struct device *dev)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t buf[2];
+	uint8_t buf[2];
 
 	if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr,
 			   LSM6DS0_REG_OUT_TEMP_L, buf, sizeof(buf)) < 0) {
@@ -202,8 +202,8 @@ static int lsm6ds0_sample_fetch_temp(struct device *dev)
 		return -EIO;
 	}
 
-	data->temp_sample = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
+	data->temp_sample = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
 
 	return 0;
 }
@@ -250,8 +250,8 @@ static inline void lsm6ds0_accel_convert(struct sensor_value *val, int raw_val,
 	double dval;
 
 	dval = (double)(raw_val) * scale / 32767.0;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 }
 
 static inline int lsm6ds0_accel_get_channel(enum sensor_channel chan,
@@ -307,8 +307,8 @@ static inline void lsm6ds0_gyro_convert(struct sensor_value *val, int raw_val,
 	double dval;
 
 	dval = (double)(raw_val) * numerator / 1000.0 * SENSOR_DEG2RAD_DOUBLE;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 }
 
 static inline int lsm6ds0_gyro_get_channel(enum sensor_channel chan,
@@ -408,7 +408,7 @@ static int lsm6ds0_init_chip(struct device *dev)
 {
 	struct lsm6ds0_data *data = dev->driver_data;
 	const struct lsm6ds0_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lsm6ds0_reboot(dev) < 0) {
 		LOG_DBG("failed to reboot device");
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h
index 6d451300da..7bbb1a351a 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.h
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.h
@@ -461,7 +461,7 @@
 
 struct lsm6ds0_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 struct lsm6ds0_data {
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c
index cc112a7e8a..f3b2b81718 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.c
@@ -23,11 +23,11 @@
 
 LOG_MODULE_REGISTER(LSM6DSL, CONFIG_SENSOR_LOG_LEVEL);
 
-static const u16_t lsm6dsl_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
+static const uint16_t lsm6dsl_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
 					1660, 3330, 6660};
 
 #if defined(LSM6DSL_ACCEL_ODR_RUNTIME) || defined(LSM6DSL_GYRO_ODR_RUNTIME)
-static int lsm6dsl_freq_to_odr_val(u16_t freq)
+static int lsm6dsl_freq_to_odr_val(uint16_t freq)
 {
 	size_t i;
 
@@ -41,7 +41,7 @@ static int lsm6dsl_freq_to_odr_val(u16_t freq)
 }
 #endif
 
-static int lsm6dsl_odr_to_freq_val(u16_t odr)
+static int lsm6dsl_odr_to_freq_val(uint16_t odr)
 {
 	/* for valid index, return value from map */
 	if (odr < ARRAY_SIZE(lsm6dsl_odr_map)) {
@@ -53,10 +53,10 @@ static int lsm6dsl_odr_to_freq_val(u16_t odr)
 }
 
 #ifdef LSM6DSL_ACCEL_FS_RUNTIME
-static const u16_t lsm6dsl_accel_fs_map[] = {2, 16, 4, 8};
-static const u16_t lsm6dsl_accel_fs_sens[] = {1, 8, 2, 4};
+static const uint16_t lsm6dsl_accel_fs_map[] = {2, 16, 4, 8};
+static const uint16_t lsm6dsl_accel_fs_sens[] = {1, 8, 2, 4};
 
-static int lsm6dsl_accel_range_to_fs_val(s32_t range)
+static int lsm6dsl_accel_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -71,10 +71,10 @@ static int lsm6dsl_accel_range_to_fs_val(s32_t range)
 #endif
 
 #ifdef LSM6DSL_GYRO_FS_RUNTIME
-static const u16_t lsm6dsl_gyro_fs_map[] = {245, 500, 1000, 2000, 125};
-static const u16_t lsm6dsl_gyro_fs_sens[] = {2, 4, 8, 16, 1};
+static const uint16_t lsm6dsl_gyro_fs_map[] = {245, 500, 1000, 2000, 125};
+static const uint16_t lsm6dsl_gyro_fs_sens[] = {2, 4, 8, 16, 1};
 
-static int lsm6dsl_gyro_range_to_fs_val(s32_t range)
+static int lsm6dsl_gyro_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -104,7 +104,7 @@ static inline int lsm6dsl_reboot(struct device *dev)
 	return 0;
 }
 
-static int lsm6dsl_accel_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6dsl_accel_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
 
@@ -120,7 +120,7 @@ static int lsm6dsl_accel_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6dsl_accel_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6dsl_accel_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
 
@@ -136,7 +136,7 @@ static int lsm6dsl_accel_set_odr_raw(struct device *dev, u8_t odr)
 	return 0;
 }
 
-static int lsm6dsl_gyro_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6dsl_gyro_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
 
@@ -159,7 +159,7 @@ static int lsm6dsl_gyro_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6dsl_gyro_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6dsl_gyro_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
 
@@ -174,7 +174,7 @@ static int lsm6dsl_gyro_set_odr_raw(struct device *dev, u8_t odr)
 }
 
 #ifdef LSM6DSL_ACCEL_ODR_RUNTIME
-static int lsm6dsl_accel_odr_set(struct device *dev, u16_t freq)
+static int lsm6dsl_accel_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -193,7 +193,7 @@ static int lsm6dsl_accel_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef LSM6DSL_ACCEL_FS_RUNTIME
-static int lsm6dsl_accel_range_set(struct device *dev, s32_t range)
+static int lsm6dsl_accel_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct lsm6dsl_data *data = dev->driver_data;
@@ -236,7 +236,7 @@ static int lsm6dsl_accel_config(struct device *dev, enum sensor_channel chan,
 }
 
 #ifdef LSM6DSL_GYRO_ODR_RUNTIME
-static int lsm6dsl_gyro_odr_set(struct device *dev, u16_t freq)
+static int lsm6dsl_gyro_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -255,7 +255,7 @@ static int lsm6dsl_gyro_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef LSM6DSL_GYRO_FS_RUNTIME
-static int lsm6dsl_gyro_range_set(struct device *dev, s32_t range)
+static int lsm6dsl_gyro_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct lsm6dsl_data *data = dev->driver_data;
@@ -317,7 +317,7 @@ static int lsm6dsl_attr_set(struct device *dev, enum sensor_channel chan,
 static int lsm6dsl_sample_fetch_accel(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_XL,
 				   buf, sizeof(buf)) < 0) {
@@ -325,12 +325,12 @@ static int lsm6dsl_sample_fetch_accel(struct device *dev)
 		return -EIO;
 	}
 
-	data->accel_sample_x = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
-	data->accel_sample_y = (s16_t)((u16_t)(buf[2]) |
-				((u16_t)(buf[3]) << 8));
-	data->accel_sample_z = (s16_t)((u16_t)(buf[4]) |
-				((u16_t)(buf[5]) << 8));
+	data->accel_sample_x = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
+	data->accel_sample_y = (int16_t)((uint16_t)(buf[2]) |
+				((uint16_t)(buf[3]) << 8));
+	data->accel_sample_z = (int16_t)((uint16_t)(buf[4]) |
+				((uint16_t)(buf[5]) << 8));
 
 	return 0;
 }
@@ -338,7 +338,7 @@ static int lsm6dsl_sample_fetch_accel(struct device *dev)
 static int lsm6dsl_sample_fetch_gyro(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_G,
 				   buf, sizeof(buf)) < 0) {
@@ -346,12 +346,12 @@ static int lsm6dsl_sample_fetch_gyro(struct device *dev)
 		return -EIO;
 	}
 
-	data->gyro_sample_x = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
-	data->gyro_sample_y = (s16_t)((u16_t)(buf[2]) |
-				((u16_t)(buf[3]) << 8));
-	data->gyro_sample_z = (s16_t)((u16_t)(buf[4]) |
-				((u16_t)(buf[5]) << 8));
+	data->gyro_sample_x = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
+	data->gyro_sample_y = (int16_t)((uint16_t)(buf[2]) |
+				((uint16_t)(buf[3]) << 8));
+	data->gyro_sample_z = (int16_t)((uint16_t)(buf[4]) |
+				((uint16_t)(buf[5]) << 8));
 
 	return 0;
 }
@@ -360,7 +360,7 @@ static int lsm6dsl_sample_fetch_gyro(struct device *dev)
 static int lsm6dsl_sample_fetch_temp(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t buf[2];
+	uint8_t buf[2];
 
 	if (data->hw_tf->read_data(data, LSM6DSL_REG_OUT_TEMP_L,
 				   buf, sizeof(buf)) < 0) {
@@ -368,8 +368,8 @@ static int lsm6dsl_sample_fetch_temp(struct device *dev)
 		return -EIO;
 	}
 
-	data->temp_sample = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
+	data->temp_sample = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
 
 	return 0;
 }
@@ -379,19 +379,19 @@ static int lsm6dsl_sample_fetch_temp(struct device *dev)
 static int lsm6dsl_sample_fetch_magn(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t buf[6];
+	uint8_t buf[6];
 
 	if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) {
 		LOG_DBG("failed to read ext mag sample");
 		return -EIO;
 	}
 
-	data->magn_sample_x = (s16_t)((u16_t)(buf[0]) |
-				((u16_t)(buf[1]) << 8));
-	data->magn_sample_y = (s16_t)((u16_t)(buf[2]) |
-				((u16_t)(buf[3]) << 8));
-	data->magn_sample_z = (s16_t)((u16_t)(buf[4]) |
-				((u16_t)(buf[5]) << 8));
+	data->magn_sample_x = (int16_t)((uint16_t)(buf[0]) |
+				((uint16_t)(buf[1]) << 8));
+	data->magn_sample_y = (int16_t)((uint16_t)(buf[2]) |
+				((uint16_t)(buf[3]) << 8));
+	data->magn_sample_z = (int16_t)((uint16_t)(buf[4]) |
+				((uint16_t)(buf[5]) << 8));
 
 	return 0;
 }
@@ -400,18 +400,18 @@ static int lsm6dsl_sample_fetch_magn(struct device *dev)
 static int lsm6dsl_sample_fetch_press(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t buf[5];
+	uint8_t buf[5];
 
 	if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) {
 		LOG_DBG("failed to read ext press sample");
 		return -EIO;
 	}
 
-	data->sample_press = (s32_t)((u32_t)(buf[0]) |
-				     ((u32_t)(buf[1]) << 8) |
-				     ((u32_t)(buf[2]) << 16));
-	data->sample_temp = (s16_t)((u16_t)(buf[3]) |
-				     ((u16_t)(buf[4]) << 8));
+	data->sample_press = (int32_t)((uint32_t)(buf[0]) |
+				     ((uint32_t)(buf[1]) << 8) |
+				     ((uint32_t)(buf[2]) << 16));
+	data->sample_temp = (int16_t)((uint16_t)(buf[3]) |
+				     ((uint16_t)(buf[4]) << 8));
 
 	return 0;
 }
@@ -470,8 +470,8 @@ static inline void lsm6dsl_accel_convert(struct sensor_value *val, int raw_val,
 	/* Sensitivity is exposed in mg/LSB */
 	/* Convert to m/s^2 */
 	dval = (double)(raw_val) * sensitivity * SENSOR_G_DOUBLE / 1000;
-	val->val1 = (s32_t)dval;
-	val->val2 = (((s32_t)(dval * 1000)) % 1000) * 1000;
+	val->val1 = (int32_t)dval;
+	val->val2 = (((int32_t)(dval * 1000)) % 1000) * 1000;
 
 }
 
@@ -520,8 +520,8 @@ static inline void lsm6dsl_gyro_convert(struct sensor_value *val, int raw_val,
 	/* Sensitivity is exposed in mdps/LSB */
 	/* Convert to rad/s */
 	dval = (double)(raw_val * sensitivity * SENSOR_DEG2RAD_DOUBLE / 1000);
-	val->val1 = (s32_t)dval;
-	val->val2 = (((s32_t)(dval * 1000)) % 1000) * 1000;
+	val->val1 = (int32_t)dval;
+	val->val2 = (((int32_t)(dval * 1000)) % 1000) * 1000;
 }
 
 static inline int lsm6dsl_gyro_get_channel(enum sensor_channel chan,
@@ -577,8 +577,8 @@ static inline void lsm6dsl_magn_convert(struct sensor_value *val, int raw_val,
 
 	/* Sensitivity is exposed in mgauss/LSB */
 	dval = (double)(raw_val * sensitivity);
-	val->val1 = (s32_t)dval / 1000000;
-	val->val2 = (s32_t)dval % 1000000;
+	val->val1 = (int32_t)dval / 1000000;
+	val->val2 = (int32_t)dval % 1000000;
 }
 
 static inline int lsm6dsl_magn_get_channel(enum sensor_channel chan,
@@ -629,21 +629,21 @@ static int lsm6dsl_magn_channel_get(enum sensor_channel chan,
 
 #if defined(CONFIG_LSM6DSL_EXT0_LPS22HB)
 static inline void lps22hb_press_convert(struct sensor_value *val,
-					 s32_t raw_val)
+					 int32_t raw_val)
 {
 	/* Pressure sensitivity is 4096 LSB/hPa */
 	/* Convert raw_val to val in kPa */
 	val->val1 = (raw_val >> 12) / 10;
 	val->val2 = (raw_val >> 12) % 10 * 100000 +
-		(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
+		(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
 }
 
 static inline void lps22hb_temp_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
 	/* Temperature sensitivity is 100 LSB/deg C */
 	val->val1 = raw_val / 100;
-	val->val2 = (s32_t)raw_val % 100 * (10000);
+	val->val2 = (int32_t)raw_val % 100 * (10000);
 }
 #endif
 
@@ -707,7 +707,7 @@ static const struct sensor_driver_api lsm6dsl_api_funcs = {
 static int lsm6dsl_init_chip(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lsm6dsl_reboot(dev) < 0) {
 		LOG_DBG("failed to reboot device");
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h
index a40d1764e0..9bac6a8921 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.h
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.h
@@ -610,14 +610,14 @@ struct lsm6dsl_config {
 struct lsm6dsl_data;
 
 struct lsm6dsl_transfer_function {
-	int (*read_data)(struct lsm6dsl_data *data, u8_t reg_addr,
-			 u8_t *value, u8_t len);
-	int (*write_data)(struct lsm6dsl_data *data, u8_t reg_addr,
-			  u8_t *value, u8_t len);
-	int (*read_reg)(struct lsm6dsl_data *data, u8_t reg_addr,
-			u8_t *value);
-	int (*update_reg)(struct lsm6dsl_data *data, u8_t reg_addr,
-			  u8_t mask, u8_t value);
+	int (*read_data)(struct lsm6dsl_data *data, uint8_t reg_addr,
+			 uint8_t *value, uint8_t len);
+	int (*write_data)(struct lsm6dsl_data *data, uint8_t reg_addr,
+			  uint8_t *value, uint8_t len);
+	int (*read_reg)(struct lsm6dsl_data *data, uint8_t reg_addr,
+			uint8_t *value);
+	int (*update_reg)(struct lsm6dsl_data *data, uint8_t reg_addr,
+			  uint8_t mask, uint8_t value);
 };
 
 struct lsm6dsl_data {
@@ -644,10 +644,10 @@ struct lsm6dsl_data {
 	int sample_temp;
 #endif
 	const struct lsm6dsl_transfer_function *hw_tf;
-	u16_t accel_freq;
-	u8_t accel_fs;
-	u16_t gyro_freq;
-	u8_t gyro_fs;
+	uint16_t accel_freq;
+	uint8_t accel_fs;
+	uint16_t gyro_freq;
+	uint8_t gyro_fs;
 
 #ifdef CONFIG_LSM6DSL_TRIGGER
 	struct device *gpio;
@@ -672,7 +672,7 @@ int lsm6dsl_spi_init(struct device *dev);
 int lsm6dsl_i2c_init(struct device *dev);
 #if defined(CONFIG_LSM6DSL_SENSORHUB)
 int lsm6dsl_shub_init_external_chip(struct device *dev);
-int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len);
+int lsm6dsl_shub_read_external_chip(struct device *dev, uint8_t *buf, uint8_t len);
 #endif
 
 #ifdef CONFIG_LSM6DSL_TRIGGER
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
index a3e049c848..e32f81a459 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
@@ -17,33 +17,33 @@
 
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
 
-static u16_t lsm6dsl_i2c_slave_addr = DT_INST_REG_ADDR(0);
+static uint16_t lsm6dsl_i2c_slave_addr = DT_INST_REG_ADDR(0);
 
 LOG_MODULE_DECLARE(LSM6DSL, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lsm6dsl_i2c_read_data(struct lsm6dsl_data *data, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lsm6dsl_i2c_read_data(struct lsm6dsl_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	return i2c_burst_read(data->comm_master, lsm6dsl_i2c_slave_addr,
 			      reg_addr, value, len);
 }
 
-static int lsm6dsl_i2c_write_data(struct lsm6dsl_data *data, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lsm6dsl_i2c_write_data(struct lsm6dsl_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	return i2c_burst_write(data->comm_master, lsm6dsl_i2c_slave_addr,
 			       reg_addr, value, len);
 }
 
-static int lsm6dsl_i2c_read_reg(struct lsm6dsl_data *data, u8_t reg_addr,
-				u8_t *value)
+static int lsm6dsl_i2c_read_reg(struct lsm6dsl_data *data, uint8_t reg_addr,
+				uint8_t *value)
 {
 	return i2c_reg_read_byte(data->comm_master, lsm6dsl_i2c_slave_addr,
 				 reg_addr, value);
 }
 
-static int lsm6dsl_i2c_update_reg(struct lsm6dsl_data *data, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lsm6dsl_i2c_update_reg(struct lsm6dsl_data *data, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
 	return i2c_reg_update_byte(data->comm_master, lsm6dsl_i2c_slave_addr,
 				   reg_addr, mask, value);
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
index a753c65eab..977beda11e 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c
@@ -35,8 +35,8 @@ LOG_MODULE_DECLARE(LSM6DSL, CONFIG_SENSOR_LOG_LEVEL);
 #define LSM6DSL_EMBEDDED_SLV0_WRITE_IDLE 0x07
 
 static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data,
-					u8_t slv_addr, u8_t slv_reg,
-					u8_t *value, u16_t len);
+					uint8_t slv_addr, uint8_t slv_reg,
+					uint8_t *value, uint16_t len);
 
 /*
  * LIS2MDL magn device specific part
@@ -53,9 +53,9 @@ static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data,
 #define LIS2MDL_OFF_CANC          0x02
 #define LIS2MDL_SENSITIVITY       1500
 
-static int lsm6dsl_lis2mdl_init(struct lsm6dsl_data *data, u8_t i2c_addr)
+static int lsm6dsl_lis2mdl_init(struct lsm6dsl_data *data, uint8_t i2c_addr)
 {
-	u8_t mag_cfg[2];
+	uint8_t mag_cfg[2];
 
 	data->magn_sensitivity = LIS2MDL_SENSITIVITY;
 
@@ -89,9 +89,9 @@ static int lsm6dsl_lis2mdl_init(struct lsm6dsl_data *data, u8_t i2c_addr)
 #define LPS22HB_LPF_EN            0x08
 #define LPS22HB_BDU_EN            0x02
 
-static int lsm6dsl_lps22hb_init(struct lsm6dsl_data *data, u8_t i2c_addr)
+static int lsm6dsl_lps22hb_init(struct lsm6dsl_data *data, uint8_t i2c_addr)
 {
-	u8_t baro_cfg[2];
+	uint8_t baro_cfg[2];
 
 	/* sw reset device */
 	baro_cfg[0] = LPS22HB_SW_RESET;
@@ -111,12 +111,12 @@ static int lsm6dsl_lps22hb_init(struct lsm6dsl_data *data, u8_t i2c_addr)
 
 /* List of supported external sensors */
 static struct lsm6dsl_shub_sens_list {
-	u8_t i2c_addr[2];
-	u8_t wai_addr;
-	u8_t wai_val;
-	u8_t out_data_addr;
-	u8_t out_data_len;
-	int (*dev_init)(struct lsm6dsl_data *data, u8_t i2c_addr);
+	uint8_t i2c_addr[2];
+	uint8_t wai_addr;
+	uint8_t wai_val;
+	uint8_t out_data_addr;
+	uint8_t out_data_len;
+	int (*dev_init)(struct lsm6dsl_data *data, uint8_t i2c_addr);
 } lsm6dsl_shub_sens_list[] = {
 #ifdef CONFIG_LSM6DSL_EXT0_LIS2MDL
 	{
@@ -143,11 +143,11 @@ static struct lsm6dsl_shub_sens_list {
 #endif  /* CONFIG_LSM6DSL_EXT0_LPS22HB */
 };
 
-static u8_t ext_i2c_addr;
+static uint8_t ext_i2c_addr;
 
 static inline void lsm6dsl_shub_wait_completed(struct lsm6dsl_data *data)
 {
-	u16_t freq;
+	uint16_t freq;
 
 	freq = (data->accel_freq == 0U) ? 26 : data->accel_freq;
 	k_msleep((2000U / freq) + 1);
@@ -155,7 +155,7 @@ static inline void lsm6dsl_shub_wait_completed(struct lsm6dsl_data *data)
 
 static inline void lsm6dsl_shub_embedded_en(struct lsm6dsl_data *data, bool on)
 {
-	u8_t func_en = (on) ? 0x1 : 0x0;
+	uint8_t func_en = (on) ? 0x1 : 0x0;
 
 	data->hw_tf->update_reg(data, LSM6DSL_REG_FUNC_CFG_ACCESS,
 				LSM6DSL_MASK_FUNC_CFG_EN,
@@ -166,7 +166,7 @@ static inline void lsm6dsl_shub_embedded_en(struct lsm6dsl_data *data, bool on)
 
 #ifdef LSM6DSL_DEBUG
 static int lsm6dsl_read_embedded_reg(struct lsm6dsl_data *data,
-				     u8_t reg_addr, u8_t *value, int len)
+				     uint8_t reg_addr, uint8_t *value, int len)
 {
 	lsm6dsl_shub_embedded_en(data, true);
 
@@ -183,8 +183,8 @@ static int lsm6dsl_read_embedded_reg(struct lsm6dsl_data *data,
 #endif
 
 static int lsm6dsl_shub_write_embedded_regs(struct lsm6dsl_data *data,
-					    u8_t reg_addr,
-					    u8_t *value, u8_t len)
+					    uint8_t reg_addr,
+					    uint8_t *value, uint8_t len)
 {
 	lsm6dsl_shub_embedded_en(data, true);
 
@@ -245,10 +245,10 @@ static void lsm6dsl_shub_disable(struct lsm6dsl_data *data)
  * use SLV0 for generic read to slave device
  */
 static int lsm6dsl_shub_read_slave_reg(struct lsm6dsl_data *data,
-				       u8_t slv_addr, u8_t slv_reg,
-				       u8_t *value, u16_t len)
+				       uint8_t slv_addr, uint8_t slv_reg,
+				       uint8_t *value, uint16_t len)
 {
-	u8_t slave[3];
+	uint8_t slave[3];
 
 	slave[0] = (slv_addr << 1) | LSM6DSL_EMBEDDED_SLVX_READ;
 	slave[1] = slv_reg;
@@ -273,11 +273,11 @@ static int lsm6dsl_shub_read_slave_reg(struct lsm6dsl_data *data,
  * use SLV0 to configure slave device
  */
 static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data,
-					u8_t slv_addr, u8_t slv_reg,
-					u8_t *value, u16_t len)
+					uint8_t slv_addr, uint8_t slv_reg,
+					uint8_t *value, uint16_t len)
 {
-	u8_t slv_cfg[3];
-	u8_t cnt = 0U;
+	uint8_t slv_cfg[3];
+	uint8_t cnt = 0U;
 
 	while (cnt < len) {
 		slv_cfg[0] = (slv_addr << 1) & ~LSM6DSL_EMBEDDED_SLVX_READ;
@@ -329,8 +329,8 @@ static int lsm6dsl_shub_write_slave_reg(struct lsm6dsl_data *data,
  */
 static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data)
 {
-	u8_t slv_cfg[3];
-	u8_t slv_i2c_addr = lsm6dsl_shub_sens_list[0].i2c_addr[ext_i2c_addr];
+	uint8_t slv_cfg[3];
+	uint8_t slv_i2c_addr = lsm6dsl_shub_sens_list[0].i2c_addr[ext_i2c_addr];
 
 	/* SLV0 is used for generic write */
 	slv_cfg[0] = LSM6DSL_EMBEDDED_SLV0_WRITE_IDLE;
@@ -361,7 +361,7 @@ static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data)
 	return 0;
 }
 
-int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len)
+int lsm6dsl_shub_read_external_chip(struct device *dev, uint8_t *buf, uint8_t len)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
 
@@ -373,10 +373,10 @@ int lsm6dsl_shub_read_external_chip(struct device *dev, u8_t *buf, u8_t len)
 int lsm6dsl_shub_init_external_chip(struct device *dev)
 {
 	struct lsm6dsl_data *data = dev->driver_data;
-	u8_t i;
-	u8_t chip_id = 0U;
-	u8_t slv_i2c_addr;
-	u8_t slv_wai_addr = lsm6dsl_shub_sens_list[0].wai_addr;
+	uint8_t i;
+	uint8_t chip_id = 0U;
+	uint8_t slv_i2c_addr;
+	uint8_t slv_wai_addr = lsm6dsl_shub_sens_list[0].wai_addr;
 
 	/*
 	 * The external sensor may have different I2C address.
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
index de19f8474e..ceff7102c2 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
@@ -34,11 +34,11 @@ static struct spi_config lsm6dsl_spi_conf = {
 	.cs        = SPI_CS,
 };
 
-static int lsm6dsl_raw_read(struct lsm6dsl_data *data, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lsm6dsl_raw_read(struct lsm6dsl_data *data, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct spi_config *spi_cfg = &lsm6dsl_spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LSM6DSL_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LSM6DSL_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -74,11 +74,11 @@ static int lsm6dsl_raw_read(struct lsm6dsl_data *data, u8_t reg_addr,
 	return 0;
 }
 
-static int lsm6dsl_raw_write(struct lsm6dsl_data *data, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lsm6dsl_raw_write(struct lsm6dsl_data *data, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct spi_config *spi_cfg = &lsm6dsl_spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LSM6DSL_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~LSM6DSL_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
@@ -106,28 +106,28 @@ static int lsm6dsl_raw_write(struct lsm6dsl_data *data, u8_t reg_addr,
 	return 0;
 }
 
-static int lsm6dsl_spi_read_data(struct lsm6dsl_data *data, u8_t reg_addr,
-				 u8_t *value, u8_t len)
+static int lsm6dsl_spi_read_data(struct lsm6dsl_data *data, uint8_t reg_addr,
+				 uint8_t *value, uint8_t len)
 {
 	return lsm6dsl_raw_read(data, reg_addr, value, len);
 }
 
-static int lsm6dsl_spi_write_data(struct lsm6dsl_data *data, u8_t reg_addr,
-				  u8_t *value, u8_t len)
+static int lsm6dsl_spi_write_data(struct lsm6dsl_data *data, uint8_t reg_addr,
+				  uint8_t *value, uint8_t len)
 {
 	return lsm6dsl_raw_write(data, reg_addr, value, len);
 }
 
-static int lsm6dsl_spi_read_reg(struct lsm6dsl_data *data, u8_t reg_addr,
-				u8_t *value)
+static int lsm6dsl_spi_read_reg(struct lsm6dsl_data *data, uint8_t reg_addr,
+				uint8_t *value)
 {
 	return lsm6dsl_raw_read(data, reg_addr, value, 1);
 }
 
-static int lsm6dsl_spi_update_reg(struct lsm6dsl_data *data, u8_t reg_addr,
-				  u8_t mask, u8_t value)
+static int lsm6dsl_spi_update_reg(struct lsm6dsl_data *data, uint8_t reg_addr,
+				  uint8_t mask, uint8_t value)
 {
-	u8_t tmp_val;
+	uint8_t tmp_val;
 
 	lsm6dsl_raw_read(data, reg_addr, &tmp_val, 1);
 	tmp_val = (tmp_val & ~mask) | (value & mask);
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
index 70c46eaa1d..3f1f190479 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
@@ -66,7 +66,7 @@ int lsm6dsl_trigger_set(struct device *dev,
 }
 
 static void lsm6dsl_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct lsm6dsl_data *drv_data =
 		CONTAINER_OF(cb, struct lsm6dsl_data, gpio_cb);
diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c
index 7d2d4dc76c..305ba1c619 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.c
+++ b/drivers/sensor/lsm6dso/lsm6dso.c
@@ -23,11 +23,11 @@
 
 LOG_MODULE_REGISTER(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
 
-static const u16_t lsm6dso_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
+static const uint16_t lsm6dso_odr_map[] = {0, 12, 26, 52, 104, 208, 416, 833,
 					1660, 3330, 6660};
 
 #if defined(LSM6DSO_ACCEL_ODR_RUNTIME) || defined(LSM6DSO_GYRO_ODR_RUNTIME)
-static int lsm6dso_freq_to_odr_val(u16_t freq)
+static int lsm6dso_freq_to_odr_val(uint16_t freq)
 {
 	size_t i;
 
@@ -41,7 +41,7 @@ static int lsm6dso_freq_to_odr_val(u16_t freq)
 }
 #endif
 
-static int lsm6dso_odr_to_freq_val(u16_t odr)
+static int lsm6dso_odr_to_freq_val(uint16_t odr)
 {
 	/* for valid index, return value from map */
 	if (odr < ARRAY_SIZE(lsm6dso_odr_map)) {
@@ -53,10 +53,10 @@ static int lsm6dso_odr_to_freq_val(u16_t odr)
 }
 
 #ifdef LSM6DSO_ACCEL_FS_RUNTIME
-static const u16_t lsm6dso_accel_fs_map[] = {2, 16, 4, 8};
-static const u16_t lsm6dso_accel_fs_sens[] = {1, 8, 2, 4};
+static const uint16_t lsm6dso_accel_fs_map[] = {2, 16, 4, 8};
+static const uint16_t lsm6dso_accel_fs_sens[] = {1, 8, 2, 4};
 
-static int lsm6dso_accel_range_to_fs_val(s32_t range)
+static int lsm6dso_accel_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -71,10 +71,10 @@ static int lsm6dso_accel_range_to_fs_val(s32_t range)
 #endif
 
 #ifdef LSM6DSO_GYRO_FS_RUNTIME
-static const u16_t lsm6dso_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
-static const u16_t lsm6dso_gyro_fs_sens[] = {2, 4, 8, 16, 1};
+static const uint16_t lsm6dso_gyro_fs_map[] = {250, 500, 1000, 2000, 125};
+static const uint16_t lsm6dso_gyro_fs_sens[] = {2, 4, 8, 16, 1};
 
-static int lsm6dso_gyro_range_to_fs_val(s32_t range)
+static int lsm6dso_gyro_range_to_fs_val(int32_t range)
 {
 	size_t i;
 
@@ -102,7 +102,7 @@ static inline int lsm6dso_reboot(struct device *dev)
 	return 0;
 }
 
-static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6dso_accel_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 
@@ -115,7 +115,7 @@ static int lsm6dso_accel_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6dso_accel_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 
@@ -128,7 +128,7 @@ static int lsm6dso_accel_set_odr_raw(struct device *dev, u8_t odr)
 	return 0;
 }
 
-static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm6dso_gyro_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 
@@ -139,7 +139,7 @@ static int lsm6dso_gyro_set_fs_raw(struct device *dev, u8_t fs)
 	return 0;
 }
 
-static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr)
+static int lsm6dso_gyro_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 
@@ -151,7 +151,7 @@ static int lsm6dso_gyro_set_odr_raw(struct device *dev, u8_t odr)
 }
 
 #ifdef LSM6DSO_ACCEL_ODR_RUNTIME
-static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq)
+static int lsm6dso_accel_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -170,7 +170,7 @@ static int lsm6dso_accel_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef LSM6DSO_ACCEL_FS_RUNTIME
-static int lsm6dso_accel_range_set(struct device *dev, s32_t range)
+static int lsm6dso_accel_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct lsm6dso_data *data = dev->driver_data;
@@ -212,7 +212,7 @@ static int lsm6dso_accel_config(struct device *dev, enum sensor_channel chan,
 }
 
 #ifdef LSM6DSO_GYRO_ODR_RUNTIME
-static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq)
+static int lsm6dso_gyro_odr_set(struct device *dev, uint16_t freq)
 {
 	int odr;
 
@@ -231,7 +231,7 @@ static int lsm6dso_gyro_odr_set(struct device *dev, u16_t freq)
 #endif
 
 #ifdef LSM6DSO_GYRO_FS_RUNTIME
-static int lsm6dso_gyro_range_set(struct device *dev, s32_t range)
+static int lsm6dso_gyro_range_set(struct device *dev, int32_t range)
 {
 	int fs;
 	struct lsm6dso_data *data = dev->driver_data;
@@ -393,24 +393,24 @@ static int lsm6dso_sample_fetch(struct device *dev, enum sensor_channel chan)
 }
 
 static inline void lsm6dso_accel_convert(struct sensor_value *val, int raw_val,
-					 u32_t sensitivity)
+					 uint32_t sensitivity)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Sensitivity is exposed in ug/LSB */
 	/* Convert to m/s^2 */
-	dval = (s64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
-	val->val1 = (s32_t)(dval / 1000000);
-	val->val2 = (s32_t)(dval % 1000000);
+	dval = (int64_t)(raw_val) * sensitivity * SENSOR_G_DOUBLE;
+	val->val1 = (int32_t)(dval / 1000000);
+	val->val2 = (int32_t)(dval % 1000000);
 
 }
 
 static inline int lsm6dso_accel_get_channel(enum sensor_channel chan,
 					    struct sensor_value *val,
 					    struct lsm6dso_data *data,
-					    u32_t sensitivity)
+					    uint32_t sensitivity)
 {
-	u8_t i;
+	uint8_t i;
 
 	switch (chan) {
 	case SENSOR_CHAN_ACCEL_X:
@@ -442,23 +442,23 @@ static int lsm6dso_accel_channel_get(enum sensor_channel chan,
 }
 
 static inline void lsm6dso_gyro_convert(struct sensor_value *val, int raw_val,
-					u32_t sensitivity)
+					uint32_t sensitivity)
 {
-	s64_t dval;
+	int64_t dval;
 
 	/* Sensitivity is exposed in udps/LSB */
 	/* Convert to rad/s */
-	dval = (s64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
-	val->val1 = (s32_t)(dval / 1000000);
-	val->val2 = (s32_t)(dval % 1000000);
+	dval = (int64_t)(raw_val) * sensitivity * SENSOR_DEG2RAD_DOUBLE;
+	val->val1 = (int32_t)(dval / 1000000);
+	val->val2 = (int32_t)(dval % 1000000);
 }
 
 static inline int lsm6dso_gyro_get_channel(enum sensor_channel chan,
 					   struct sensor_value *val,
 					   struct lsm6dso_data *data,
-					   u32_t sensitivity)
+					   uint32_t sensitivity)
 {
-	u8_t i;
+	uint8_t i;
 
 	switch (chan) {
 	case SENSOR_CHAN_GYRO_X:
@@ -502,21 +502,21 @@ static void lsm6dso_gyro_channel_get_temp(struct sensor_value *val,
 
 #if defined(CONFIG_LSM6DSO_SENSORHUB)
 static inline void lsm6dso_magn_convert(struct sensor_value *val, int raw_val,
-					u16_t sensitivity)
+					uint16_t sensitivity)
 {
 	double dval;
 
 	/* Sensitivity is exposed in mgauss/LSB */
 	dval = (double)(raw_val * sensitivity);
-	val->val1 = (s32_t)dval / 1000000;
-	val->val2 = (s32_t)dval % 1000000;
+	val->val1 = (int32_t)dval / 1000000;
+	val->val2 = (int32_t)dval % 1000000;
 }
 
 static inline int lsm6dso_magn_get_channel(enum sensor_channel chan,
 					   struct sensor_value *val,
 					   struct lsm6dso_data *data)
 {
-	s16_t sample[3];
+	int16_t sample[3];
 	int idx;
 
 	idx = lsm6dso_shub_get_idx(SENSOR_CHAN_MAGN_XYZ);
@@ -526,11 +526,11 @@ static inline int lsm6dso_magn_get_channel(enum sensor_channel chan,
 	}
 
 
-	sample[0] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][0] |
+	sample[0] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][0] |
 				    (data->ext_data[idx][1] << 8)));
-	sample[1] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][2] |
+	sample[1] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][2] |
 				    (data->ext_data[idx][3] << 8)));
-	sample[2] = sys_le16_to_cpu((s16_t)(data->ext_data[idx][4] |
+	sample[2] = sys_le16_to_cpu((int16_t)(data->ext_data[idx][4] |
 				    (data->ext_data[idx][5] << 8)));
 
 	switch (chan) {
@@ -559,7 +559,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
 				       struct lsm6dso_data *data)
 {
 	float rh;
-	s16_t raw_val;
+	int16_t raw_val;
 	struct hts221_data *ht = &data->hts221;
 	int idx;
 
@@ -569,7 +569,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = sys_le16_to_cpu((s16_t)(data->ext_data[idx][0] |
+	raw_val = sys_le16_to_cpu((int16_t)(data->ext_data[idx][0] |
 					  (data->ext_data[idx][1] << 8)));
 
 	/* find relative humidty by linear interpolation */
@@ -584,7 +584,7 @@ static inline void lsm6dso_hum_convert(struct sensor_value *val,
 static inline void lsm6dso_press_convert(struct sensor_value *val,
 					 struct lsm6dso_data *data)
 {
-	s32_t raw_val;
+	int32_t raw_val;
 	int idx;
 
 	idx = lsm6dso_shub_get_idx(SENSOR_CHAN_PRESS);
@@ -593,7 +593,7 @@ static inline void lsm6dso_press_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = sys_le32_to_cpu((s32_t)(data->ext_data[idx][0] |
+	raw_val = sys_le32_to_cpu((int32_t)(data->ext_data[idx][0] |
 					  (data->ext_data[idx][1] << 8) |
 					  (data->ext_data[idx][2] << 16)));
 
@@ -601,13 +601,13 @@ static inline void lsm6dso_press_convert(struct sensor_value *val,
 	/* Convert raw_val to val in kPa */
 	val->val1 = (raw_val >> 12) / 10;
 	val->val2 = (raw_val >> 12) % 10 * 100000 +
-		(((s32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
+		(((int32_t)((raw_val) & 0x0FFF) * 100000L) >> 12);
 }
 
 static inline void lsm6dso_temp_convert(struct sensor_value *val,
 					struct lsm6dso_data *data)
 {
-	s16_t raw_val;
+	int16_t raw_val;
 	int idx;
 
 	idx = lsm6dso_shub_get_idx(SENSOR_CHAN_PRESS);
@@ -616,12 +616,12 @@ static inline void lsm6dso_temp_convert(struct sensor_value *val,
 		return;
 	}
 
-	raw_val = sys_le16_to_cpu((s16_t)(data->ext_data[idx][3] |
+	raw_val = sys_le16_to_cpu((int16_t)(data->ext_data[idx][3] |
 					  (data->ext_data[idx][4] << 8)));
 
 	/* Temperature sensitivity is 100 LSB/deg C */
 	val->val1 = raw_val / 100;
-	val->val2 = (s32_t)raw_val % 100 * (10000);
+	val->val2 = (int32_t)raw_val % 100 * (10000);
 }
 #endif
 
@@ -688,7 +688,7 @@ static const struct sensor_driver_api lsm6dso_api_funcs = {
 static int lsm6dso_init_chip(struct device *dev)
 {
 	struct lsm6dso_data *lsm6dso = dev->driver_data;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lsm6dso_device_id_get(lsm6dso->ctx, &chip_id) < 0) {
 		LOG_DBG("Failed reading chip id");
diff --git a/drivers/sensor/lsm6dso/lsm6dso.h b/drivers/sensor/lsm6dso/lsm6dso.h
index ab85399c6c..315332681b 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.h
+++ b/drivers/sensor/lsm6dso/lsm6dso.h
@@ -19,13 +19,13 @@
 #include "lsm6dso_reg.h"
 
 union axis3bit16_t {
-	s16_t i16bit[3];
-	u8_t u8bit[6];
+	int16_t i16bit[3];
+	uint8_t u8bit[6];
 };
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 #define LSM6DSO_EN_BIT					0x01
@@ -96,25 +96,25 @@ struct lsm6dso_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_LSM6DSO_TRIGGER
 	const char *int_gpio_port;
-	u8_t int_gpio_pin;
-	u8_t int_gpio_flags;
-	u8_t int_pin;
+	uint8_t int_gpio_pin;
+	uint8_t int_gpio_flags;
+	uint8_t int_pin;
 #endif /* CONFIG_LSM6DSO_TRIGGER */
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #elif DT_ANY_INST_ON_BUS_STATUS_OKAY(spi)
 	struct spi_config spi_conf;
 #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
 	const char *gpio_cs_port;
-	u8_t cs_gpio;
+	uint8_t cs_gpio;
 #endif /* DT_INST_SPI_DEV_HAS_CS_GPIOS(0) */
 #endif /* DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c) */
 };
 
 union samples {
-	u8_t raw[6];
+	uint8_t raw[6];
 	struct {
-		s16_t axis[3];
+		int16_t axis[3];
 	};
 } __aligned(2);
 
@@ -122,38 +122,38 @@ union samples {
 struct lsm6dso_data;
 
 struct lsm6dso_tf {
-	int (*read_data)(struct lsm6dso_data *data, u8_t reg_addr,
-			 u8_t *value, u8_t len);
-	int (*write_data)(struct lsm6dso_data *data, u8_t reg_addr,
-			  u8_t *value, u8_t len);
-	int (*read_reg)(struct lsm6dso_data *data, u8_t reg_addr,
-			u8_t *value);
-	int (*write_reg)(struct lsm6dso_data *data, u8_t reg_addr,
-			u8_t value);
-	int (*update_reg)(struct lsm6dso_data *data, u8_t reg_addr,
-			  u8_t mask, u8_t value);
+	int (*read_data)(struct lsm6dso_data *data, uint8_t reg_addr,
+			 uint8_t *value, uint8_t len);
+	int (*write_data)(struct lsm6dso_data *data, uint8_t reg_addr,
+			  uint8_t *value, uint8_t len);
+	int (*read_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
+			uint8_t *value);
+	int (*write_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
+			uint8_t value);
+	int (*update_reg)(struct lsm6dso_data *data, uint8_t reg_addr,
+			  uint8_t mask, uint8_t value);
 };
 
 #define LSM6DSO_SHUB_MAX_NUM_SLVS			2
 
 struct lsm6dso_data {
 	struct device *bus;
-	s16_t acc[3];
-	u32_t acc_gain;
-	s16_t gyro[3];
-	u32_t gyro_gain;
+	int16_t acc[3];
+	uint32_t acc_gain;
+	int16_t gyro[3];
+	uint32_t gyro_gain;
 #if defined(CONFIG_LSM6DSO_ENABLE_TEMP)
 	int temp_sample;
 #endif
 #if defined(CONFIG_LSM6DSO_SENSORHUB)
-	u8_t ext_data[2][6];
-	u16_t magn_gain;
+	uint8_t ext_data[2][6];
+	uint16_t magn_gain;
 
 	struct hts221_data {
-		s16_t x0;
-		s16_t x1;
-		s16_t y0;
-		s16_t y1;
+		int16_t x0;
+		int16_t x1;
+		int16_t y0;
+		int16_t y1;
 	} hts221;
 #endif /* CONFIG_LSM6DSO_SENSORHUB */
 
@@ -165,10 +165,10 @@ struct lsm6dso_data {
 	stmdev_ctx_t ctx_spi;
 	#endif
 
-	u16_t accel_freq;
-	u8_t accel_fs;
-	u16_t gyro_freq;
-	u8_t gyro_fs;
+	uint16_t accel_freq;
+	uint8_t accel_fs;
+	uint16_t gyro_freq;
+	uint8_t gyro_fs;
 
 #ifdef CONFIG_LSM6DSO_TRIGGER
 	struct device *gpio;
diff --git a/drivers/sensor/lsm6dso/lsm6dso_i2c.c b/drivers/sensor/lsm6dso/lsm6dso_i2c.c
index 82a6ba33f5..3807b71da4 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_i2c.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_i2c.c
@@ -20,8 +20,8 @@
 
 LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lsm6dso_i2c_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 	const struct lsm6dso_config *cfg = dev->config_info;
@@ -30,8 +30,8 @@ static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int lsm6dso_i2c_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lsm6dso_i2c_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 	const struct lsm6dso_config *cfg = dev->config_info;
diff --git a/drivers/sensor/lsm6dso/lsm6dso_shub.c b/drivers/sensor/lsm6dso/lsm6dso_shub.c
index 744d2b33ab..ca5b2d3fe4 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_shub.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_shub.c
@@ -46,16 +46,16 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
 #define LSM6DSO_SHUB_SLVX_WRITE				0x0
 #define LSM6DSO_SHUB_SLVX_READ				0x1
 
-static u8_t num_ext_dev;
-static u8_t shub_ext[LSM6DSO_SHUB_MAX_NUM_SLVS];
+static uint8_t num_ext_dev;
+static uint8_t shub_ext[LSM6DSO_SHUB_MAX_NUM_SLVS];
 
 static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
-					u8_t slv_addr, u8_t slv_reg,
-					u8_t *value, u16_t len);
+					uint8_t slv_addr, uint8_t slv_reg,
+					uint8_t *value, uint16_t len);
 static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
-				       u8_t slv_addr, u8_t slv_reg,
-				       u8_t *value, u16_t len);
-static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable);
+				       uint8_t slv_addr, uint8_t slv_reg,
+				       uint8_t *value, uint16_t len);
+static void lsm6dso_shub_enable(struct lsm6dso_data *data, uint8_t enable);
 
 /*
  * LIS2MDL magn device specific part
@@ -73,9 +73,9 @@ static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable);
 #define LIS2MDL_OFF_CANC		0x02
 #define LIS2MDL_SENSITIVITY		1500
 
-static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, u8_t i2c_addr)
+static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, uint8_t i2c_addr)
 {
-	u8_t mag_cfg[2];
+	uint8_t mag_cfg[2];
 
 	data->magn_gain = LIS2MDL_SENSITIVITY;
 
@@ -95,12 +95,12 @@ static int lsm6dso_lis2mdl_init(struct lsm6dso_data *data, u8_t i2c_addr)
 	return 0;
 }
 
-static const u16_t lis2mdl_map[] = {10, 20, 50, 100};
+static const uint16_t lis2mdl_map[] = {10, 20, 50, 100};
 
 static int lsm6dso_lis2mdl_odr_set(struct lsm6dso_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(lis2mdl_map); odr++) {
 		if (freq == lis2mdl_map[odr]) {
@@ -121,7 +121,7 @@ static int lsm6dso_lis2mdl_odr_set(struct lsm6dso_data *data,
 	return 0;
 }
 
-static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, u8_t i2c_addr,
+static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -153,9 +153,9 @@ static int lsm6dso_lis2mdl_conf(struct lsm6dso_data *data, u8_t i2c_addr,
 #define HTS221_REG_CONV_START		0x30
 
 static int lsmdso_hts221_read_conv_data(struct lsm6dso_data *data,
-					u8_t i2c_addr)
+					uint8_t i2c_addr)
 {
-	u8_t buf[16], i;
+	uint8_t buf[16], i;
 	struct hts221_data *ht = &data->hts221;
 
 	for (i = 0; i < sizeof(buf); i += 7) {
@@ -178,9 +178,9 @@ static int lsmdso_hts221_read_conv_data(struct lsm6dso_data *data,
 	return 0;
 }
 
-static int lsm6dso_hts221_init(struct lsm6dso_data *data, u8_t i2c_addr)
+static int lsm6dso_hts221_init(struct lsm6dso_data *data, uint8_t i2c_addr)
 {
-	u8_t hum_cfg;
+	uint8_t hum_cfg;
 
 	/* configure ODR and BDU */
 	hum_cfg = HTS221_ODR_1HZ | HTS221_BDU | HTS221_PD;
@@ -190,12 +190,12 @@ static int lsm6dso_hts221_init(struct lsm6dso_data *data, u8_t i2c_addr)
 	return lsmdso_hts221_read_conv_data(data, i2c_addr);
 }
 
-static const u16_t hts221_map[] = {0, 1, 7, 12};
+static const uint16_t hts221_map[] = {0, 1, 7, 12};
 
 static int lsm6dso_hts221_odr_set(struct lsm6dso_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(hts221_map); odr++) {
 		if (freq == hts221_map[odr]) {
@@ -216,7 +216,7 @@ static int lsm6dso_hts221_odr_set(struct lsm6dso_data *data,
 	return 0;
 }
 
-static int lsm6dso_hts221_conf(struct lsm6dso_data *data, u8_t i2c_addr,
+static int lsm6dso_hts221_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -246,9 +246,9 @@ static int lsm6dso_hts221_conf(struct lsm6dso_data *data, u8_t i2c_addr,
 #define LPS22HB_LPF_EN			0x08
 #define LPS22HB_BDU_EN			0x02
 
-static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, u8_t i2c_addr)
+static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, uint8_t i2c_addr)
 {
-	u8_t baro_cfg[2];
+	uint8_t baro_cfg[2];
 
 	/* sw reset device */
 	baro_cfg[0] = LPS22HB_SW_RESET;
@@ -280,9 +280,9 @@ static int lsm6dso_lps22hb_init(struct lsm6dso_data *data, u8_t i2c_addr)
 #define LPS22HH_LPF_EN			0x08
 #define LPS22HH_BDU_EN			0x02
 
-static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, u8_t i2c_addr)
+static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, uint8_t i2c_addr)
 {
-	u8_t baro_cfg[2];
+	uint8_t baro_cfg[2];
 
 	/* sw reset device */
 	baro_cfg[0] = LPS22HH_SW_RESET;
@@ -303,12 +303,12 @@ static int lsm6dso_lps22hh_init(struct lsm6dso_data *data, u8_t i2c_addr)
 	return 0;
 }
 
-static const u16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
+static const uint16_t lps22hh_map[] = {0, 1, 10, 25, 50, 75, 100, 200};
 
 static int lsm6dso_lps22hh_odr_set(struct lsm6dso_data *data,
-				   u8_t i2c_addr, u16_t freq)
+				   uint8_t i2c_addr, uint16_t freq)
 {
-	u8_t odr, cfg;
+	uint8_t odr, cfg;
 
 	for (odr = 0; odr < ARRAY_SIZE(lps22hh_map); odr++) {
 		if (freq == lps22hh_map[odr]) {
@@ -329,7 +329,7 @@ static int lsm6dso_lps22hh_odr_set(struct lsm6dso_data *data,
 	return 0;
 }
 
-static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, u8_t i2c_addr,
+static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, uint8_t i2c_addr,
 				enum sensor_channel chan,
 				enum sensor_attribute attr,
 				const struct sensor_value *val)
@@ -349,15 +349,15 @@ static int lsm6dso_lps22hh_conf(struct lsm6dso_data *data, u8_t i2c_addr,
 /* List of supported external sensors */
 static struct lsm6dso_shub_slist {
 	enum sensor_channel type;
-	u8_t i2c_addr[2];
-	u8_t ext_i2c_addr;
-	u8_t wai_addr;
-	u8_t wai_val;
-	u8_t out_data_addr;
-	u8_t out_data_len;
-	u8_t sh_out_reg;
-	int (*dev_init)(struct lsm6dso_data *data, u8_t i2c_addr);
-	int (*dev_conf)(struct lsm6dso_data *data, u8_t i2c_addr,
+	uint8_t i2c_addr[2];
+	uint8_t ext_i2c_addr;
+	uint8_t wai_addr;
+	uint8_t wai_val;
+	uint8_t out_data_addr;
+	uint8_t out_data_len;
+	uint8_t sh_out_reg;
+	int (*dev_init)(struct lsm6dso_data *data, uint8_t i2c_addr);
+	int (*dev_conf)(struct lsm6dso_data *data, uint8_t i2c_addr,
 			enum sensor_channel chan, enum sensor_attribute attr,
 			const struct sensor_value *val);
 } lsm6dso_shub_slist[] = {
@@ -419,7 +419,7 @@ static struct lsm6dso_shub_slist {
 
 static inline void lsm6dso_shub_wait_completed(struct lsm6dso_data *data)
 {
-	u16_t freq;
+	uint16_t freq;
 
 	freq = (data->accel_freq == 0) ? 26 : data->accel_freq;
 	k_msleep((2000U / freq) + 1);
@@ -437,8 +437,8 @@ static inline void lsm6dso_shub_embedded_en(struct lsm6dso_data *data, bool on)
 }
 
 static int lsm6dso_shub_read_embedded_regs(struct lsm6dso_data *data,
-					   u8_t reg_addr,
-					   u8_t *value, int len)
+					   uint8_t reg_addr,
+					   uint8_t *value, int len)
 {
 	lsm6dso_shub_embedded_en(data, true);
 
@@ -454,8 +454,8 @@ static int lsm6dso_shub_read_embedded_regs(struct lsm6dso_data *data,
 }
 
 static int lsm6dso_shub_write_embedded_regs(struct lsm6dso_data *data,
-					    u8_t reg_addr,
-					    u8_t *value, u8_t len)
+					    uint8_t reg_addr,
+					    uint8_t *value, uint8_t len)
 {
 	lsm6dso_shub_embedded_en(data, true);
 
@@ -470,11 +470,11 @@ static int lsm6dso_shub_write_embedded_regs(struct lsm6dso_data *data,
 	return 0;
 }
 
-static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable)
+static void lsm6dso_shub_enable(struct lsm6dso_data *data, uint8_t enable)
 {
 	/* Enable Accel @26hz */
 	if (!data->accel_freq) {
-		u8_t odr = (enable) ? 2 : 0;
+		uint8_t odr = (enable) ? 2 : 0;
 
 		if (lsm6dso_xl_data_rate_set(data->ctx, odr) < 0) {
 			LOG_DBG("shub: failed to set XL sampling rate");
@@ -496,7 +496,7 @@ static void lsm6dso_shub_enable(struct lsm6dso_data *data, u8_t enable)
 /* must be called with master on */
 static int lsm6dso_shub_check_slv0_nack(struct lsm6dso_data *data)
 {
-	u8_t status;
+	uint8_t status;
 
 	if (lsm6dso_shub_read_embedded_regs(data, LSM6DSO_SHUB_STATUS_MASTER,
 					     &status, 1) < 0) {
@@ -516,10 +516,10 @@ static int lsm6dso_shub_check_slv0_nack(struct lsm6dso_data *data)
  * use SLV0 for generic read to slave device
  */
 static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
-				       u8_t slv_addr, u8_t slv_reg,
-				       u8_t *value, u16_t len)
+				       uint8_t slv_addr, uint8_t slv_reg,
+				       uint8_t *value, uint16_t len)
 {
-	u8_t slave[3];
+	uint8_t slave[3];
 
 	slave[0] = (slv_addr << 1) | LSM6DSO_SHUB_SLVX_READ;
 	slave[1] = slv_reg;
@@ -557,11 +557,11 @@ static int lsm6dso_shub_read_slave_reg(struct lsm6dso_data *data,
  * use SLV0 to configure slave device
  */
 static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
-					u8_t slv_addr, u8_t slv_reg,
-					u8_t *value, u16_t len)
+					uint8_t slv_addr, uint8_t slv_reg,
+					uint8_t *value, uint16_t len)
 {
-	u8_t slv_cfg[3];
-	u8_t cnt = 0U;
+	uint8_t slv_cfg[3];
+	uint8_t cnt = 0U;
 
 	while (cnt < len) {
 		slv_cfg[0] = (slv_addr << 1) & ~LSM6DSO_SHUB_SLVX_READ;
@@ -619,7 +619,7 @@ static int lsm6dso_shub_write_slave_reg(struct lsm6dso_data *data,
  */
 static int lsm6dso_shub_set_data_channel(struct lsm6dso_data *data)
 {
-	u8_t n, i, slv_cfg[6];
+	uint8_t n, i, slv_cfg[6];
 	struct lsm6dso_shub_slist *sp;
 
 	/* Set data channel for slave devices */
@@ -664,7 +664,7 @@ static int lsm6dso_shub_set_data_channel(struct lsm6dso_data *data)
 
 int lsm6dso_shub_get_idx(enum sensor_channel type)
 {
-	u8_t n;
+	uint8_t n;
 	struct lsm6dso_shub_slist *sp;
 
 	for (n = 0; n < num_ext_dev; n++) {
@@ -679,7 +679,7 @@ int lsm6dso_shub_get_idx(enum sensor_channel type)
 
 int lsm6dso_shub_fetch_external_devs(struct device *dev)
 {
-	u8_t n;
+	uint8_t n;
 	struct lsm6dso_data *data = dev->driver_data;
 	struct lsm6dso_shub_slist *sp;
 
@@ -707,7 +707,7 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan,
 {
 	struct lsm6dso_data *data = dev->driver_data;
 	struct lsm6dso_shub_slist *sp = NULL;
-	u8_t n;
+	uint8_t n;
 
 	for (n = 0; n < num_ext_dev; n++) {
 		sp = &lsm6dso_shub_slist[shub_ext[n]];
@@ -732,8 +732,8 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan,
 int lsm6dso_shub_init(struct device *dev)
 {
 	struct lsm6dso_data *data = dev->driver_data;
-	u8_t i, n = 0, regn;
-	u8_t chip_id;
+	uint8_t i, n = 0, regn;
+	uint8_t chip_id;
 	struct lsm6dso_shub_slist *sp;
 
 	for (n = 0; n < ARRAY_SIZE(lsm6dso_shub_slist); n++) {
diff --git a/drivers/sensor/lsm6dso/lsm6dso_spi.c b/drivers/sensor/lsm6dso/lsm6dso_spi.c
index 4eb09f1fa4..c8fe785576 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_spi.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_spi.c
@@ -20,13 +20,13 @@
 
 LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
 
-static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr,
-			    u8_t *value, u8_t len)
+static int lsm6dso_spi_read(struct device *dev, uint8_t reg_addr,
+			    uint8_t *value, uint8_t len)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 	const struct lsm6dso_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 };
+	uint8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 };
 	const struct spi_buf tx_buf = {
 			.buf = buffer_tx,
 			.len = 2,
@@ -62,13 +62,13 @@ static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr,
 	return 0;
 }
 
-static int lsm6dso_spi_write(struct device *dev, u8_t reg_addr,
-			     u8_t *value, u8_t len)
+static int lsm6dso_spi_write(struct device *dev, uint8_t reg_addr,
+			     uint8_t *value, uint8_t len)
 {
 	struct lsm6dso_data *data = dev->driver_data;
 	const struct lsm6dso_config *cfg = dev->config_info;
 	const struct spi_config *spi_cfg = &cfg->spi_conf;
-	u8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ };
+	uint8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ };
 	const struct spi_buf tx_buf[2] = {
 		{
 			.buf = buffer_tx,
diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
index 32d7ddb4dd..5ebd05e2ba 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
@@ -205,7 +205,7 @@ static void lsm6dso_handle_interrupt(void *arg)
 }
 
 static void lsm6dso_gpio_callback(struct device *dev,
-				    struct gpio_callback *cb, u32_t pins)
+				    struct gpio_callback *cb, uint32_t pins)
 {
 	struct lsm6dso_data *lsm6dso =
 		CONTAINER_OF(cb, struct lsm6dso_data, gpio_cb);
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
index 28beb6a90a..7a39c96349 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
@@ -27,7 +27,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power,
 {
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config *config = dev->config_info;
-	u8_t state = (power << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_PD) |
+	uint8_t state = (power << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_PD) |
 			(x_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_XEN) |
 			(y_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_YEN) |
 			(z_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_ZEN);
@@ -41,7 +41,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power,
 				   state);
 }
 
-static int lsm9ds0_gyro_set_fs_raw(struct device *dev, u8_t fs)
+static int lsm9ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config *config = dev->config_info;
@@ -63,7 +63,7 @@ static int lsm9ds0_gyro_set_fs_raw(struct device *dev, u8_t fs)
 #if defined(CONFIG_LSM9DS0_GYRO_FULLSCALE_RUNTIME)
 static const struct {
 	int fs;
-	u8_t reg_val;
+	uint8_t reg_val;
 } lsm9ds0_gyro_fs_table[] = { {245, 0},
 			      {500, 1},
 			      {2000, 2} };
@@ -82,7 +82,7 @@ static int lsm9ds0_gyro_set_fs(struct device *dev, int fs)
 }
 #endif
 
-static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config *config = dev->config_info;
@@ -96,7 +96,7 @@ static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, u8_t odr)
 #if defined(CONFIG_LSM9DS0_GYRO_SAMPLING_RATE_RUNTIME)
 static const struct {
 	int freq;
-	u8_t reg_val;
+	uint8_t reg_val;
 } lsm9ds0_gyro_samp_freq_table[] = { {95, 0},
 				     {190, 1},
 				     {380, 2},
@@ -123,7 +123,7 @@ static int lsm9ds0_gyro_sample_fetch(struct device *dev,
 {
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config *config = dev->config_info;
-	u8_t x_l, x_h, y_l, y_h, z_l, z_h;
+	uint8_t x_l, x_h, y_l, y_h, z_l, z_h;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
 			chan == SENSOR_CHAN_GYRO_XYZ);
@@ -144,9 +144,9 @@ static int lsm9ds0_gyro_sample_fetch(struct device *dev,
 		return -EIO;
 	}
 
-	data->sample_x = (s16_t)((u16_t)(x_l) | ((u16_t)(x_h) << 8));
-	data->sample_y = (s16_t)((u16_t)(y_l) | ((u16_t)(y_h) << 8));
-	data->sample_z = (s16_t)((u16_t)(z_l) | ((u16_t)(z_h) << 8));
+	data->sample_x = (int16_t)((uint16_t)(x_l) | ((uint16_t)(x_h) << 8));
+	data->sample_y = (int16_t)((uint16_t)(y_l) | ((uint16_t)(y_h) << 8));
+	data->sample_z = (int16_t)((uint16_t)(z_l) | ((uint16_t)(z_h) << 8));
 
 #if defined(CONFIG_LSM9DS0_GYRO_FULLSCALE_RUNTIME)
 	data->sample_fs = data->fs;
@@ -161,8 +161,8 @@ static inline void lsm9ds0_gyro_convert(struct sensor_value *val, int raw_val,
 	double dval;
 
 	dval = (double)(raw_val) * numerator / 1000.0 * DEG2RAD;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 }
 
 static inline int lsm9ds0_gyro_get_channel(enum sensor_channel chan,
@@ -263,7 +263,7 @@ static int lsm9ds0_gyro_init_chip(struct device *dev)
 {
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lsm9ds0_gyro_power_ctrl(dev, 0, 0, 0, 0) < 0) {
 		LOG_DBG("failed to power off device");
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
index 0f6452cdd5..84bbdc5014 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
@@ -211,7 +211,7 @@
 
 struct lsm9ds0_gyro_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 
 #if CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY
 	char *gpio_drdy_dev_name;
@@ -241,8 +241,8 @@ struct lsm9ds0_gyro_data {
 
 	int sample_x, sample_y, sample_z;
 #if defined(CONFIG_LSM9DS0_GYRO_FULLSCALE_RUNTIME)
-	u8_t sample_fs;
-	u8_t fs;
+	uint8_t sample_fs;
+	uint8_t fs;
 #endif
 };
 
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index 4a8409a5a4..f5b2aee00a 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
@@ -40,7 +40,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev,
 	struct lsm9ds0_gyro_data *data = dev->driver_data;
 	const struct lsm9ds0_gyro_config * const config =
 					 dev->config_info;
-	u8_t state;
+	uint8_t state;
 
 	if (trig->type == SENSOR_TRIG_DATA_READY) {
 		setup_drdy(dev, false);
@@ -71,7 +71,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev,
 }
 
 static void lsm9ds0_gyro_gpio_drdy_callback(struct device *dev,
-					    struct gpio_callback *cb, u32_t pins)
+					    struct gpio_callback *cb, uint32_t pins)
 {
 	struct lsm9ds0_gyro_data *data =
 		CONTAINER_OF(cb, struct lsm9ds0_gyro_data, gpio_cb);
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
index 088d5b2e85..2fea36fed8 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
@@ -42,7 +42,7 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev)
 }
 
 #if !defined(LSM9DS0_MFD_ACCEL_DISABLED)
-static inline int lsm9ds0_mfd_accel_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lsm9ds0_mfd_accel_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
@@ -72,7 +72,7 @@ static const struct {
 static int lsm9ds0_mfd_accel_set_odr(struct device *dev,
 				     const struct sensor_value *val)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(lsm9ds0_mfd_accel_odr_map); ++i) {
 		if (val->val1 < lsm9ds0_mfd_accel_odr_map[i].freq_int ||
@@ -86,7 +86,7 @@ static int lsm9ds0_mfd_accel_set_odr(struct device *dev,
 }
 #endif
 
-static inline int lsm9ds0_mfd_accel_set_fs_raw(struct device *dev, u8_t fs)
+static inline int lsm9ds0_mfd_accel_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
@@ -117,7 +117,7 @@ static const struct {
 
 static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(lsm9ds0_mfd_accel_fs_map); ++i) {
 		if (val <= lsm9ds0_mfd_accel_fs_map[i].fs) {
@@ -131,7 +131,7 @@ static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val)
 #endif
 
 #if !defined(LSM9DS0_MFD_MAGN_DISABLED)
-static inline int lsm9ds0_mfd_magn_set_odr_raw(struct device *dev, u8_t odr)
+static inline int lsm9ds0_mfd_magn_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
@@ -157,7 +157,7 @@ static const struct {
 static int lsm9ds0_mfd_magn_set_odr(struct device *dev,
 				    const struct sensor_value *val)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(lsm9ds0_mfd_accel_odr_map); ++i) {
 		if (val->val1 < lsm9ds0_mfd_accel_odr_map[i].freq_int ||
@@ -171,7 +171,7 @@ static int lsm9ds0_mfd_magn_set_odr(struct device *dev,
 }
 #endif
 
-static inline int lsm9ds0_mfd_magn_set_fs_raw(struct device *dev, u8_t fs)
+static inline int lsm9ds0_mfd_magn_set_fs_raw(struct device *dev, uint8_t fs)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
@@ -202,7 +202,7 @@ static const struct {
 static int lsm9ds0_mfd_magn_set_fs(struct device *dev,
 				   const struct sensor_value *val)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(lsm9ds0_mfd_magn_fs_map); ++i) {
 		if (val->val1 <= lsm9ds0_mfd_magn_fs_map[i].fs) {
@@ -220,7 +220,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
-	u8_t out_l, out_h;
+	uint8_t out_l, out_h;
 
 #if defined(CONFIG_LSM9DS0_MFD_ACCEL_ENABLE_X)
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
@@ -231,8 +231,8 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_accel_x = (s16_t)((u16_t)(out_l) |
-			       ((u16_t)(out_h) << 8));
+	data->sample_accel_x = (int16_t)((uint16_t)(out_l) |
+			       ((uint16_t)(out_h) << 8));
 #endif
 
 #if defined(CONFIG_LSM9DS0_MFD_ACCEL_ENABLE_Y)
@@ -244,8 +244,8 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_accel_y = (s16_t)((u16_t)(out_l) |
-			       ((u16_t)(out_h) << 8));
+	data->sample_accel_y = (int16_t)((uint16_t)(out_l) |
+			       ((uint16_t)(out_h) << 8));
 #endif
 
 #if defined(CONFIG_LSM9DS0_MFD_ACCEL_ENABLE_Z)
@@ -257,8 +257,8 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_accel_z = (s16_t)((u16_t)(out_l) |
-			       ((u16_t)(out_h) << 8));
+	data->sample_accel_z = (int16_t)((uint16_t)(out_l) |
+			       ((uint16_t)(out_h) << 8));
 #endif
 
 #if defined(CONFIG_LSM9DS0_MFD_ACCEL_FULL_SCALE_RUNTIME)
@@ -274,7 +274,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
-	u8_t out_l, out_h;
+	uint8_t out_l, out_h;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      LSM9DS0_MFD_REG_OUT_X_L_M, &out_l) < 0 ||
@@ -284,8 +284,8 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_magn_x = (s16_t)((u16_t)(out_l) |
-			      ((u16_t)(out_h) << 8));
+	data->sample_magn_x = (int16_t)((uint16_t)(out_l) |
+			      ((uint16_t)(out_h) << 8));
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      LSM9DS0_MFD_REG_OUT_Y_L_M, &out_l) < 0 ||
@@ -295,8 +295,8 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_magn_y = (s16_t)((u16_t)(out_l) |
-			      ((u16_t)(out_h) << 8));
+	data->sample_magn_y = (int16_t)((uint16_t)(out_l) |
+			      ((uint16_t)(out_h) << 8));
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      LSM9DS0_MFD_REG_OUT_Z_L_M, &out_l) < 0 ||
@@ -306,8 +306,8 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_magn_z = (s16_t)((u16_t)(out_l) |
-			      ((u16_t)(out_h) << 8));
+	data->sample_magn_z = (int16_t)((uint16_t)(out_l) |
+			      ((uint16_t)(out_h) << 8));
 
 #if defined(CONFIG_LSM9DS0_MFD_MAGN_FULL_SCALE_RUNTIME)
 	data->sample_magn_fs = data->magn_fs;
@@ -322,7 +322,7 @@ static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
-	u8_t out_l, out_h;
+	uint8_t out_l, out_h;
 
 	if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr,
 			      LSM9DS0_MFD_REG_OUT_TEMP_L_XM, &out_l) < 0 ||
@@ -332,8 +332,8 @@ static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev)
 		return -EIO;
 	}
 
-	data->sample_temp = (s16_t)((u16_t)(out_l) |
-			    ((u16_t)(out_h) << 8));
+	data->sample_temp = (int16_t)((uint16_t)(out_l) |
+			    ((uint16_t)(out_h) << 8));
 
 	return 0;
 }
@@ -395,8 +395,8 @@ static inline void lsm9ds0_mfd_convert_accel(struct sensor_value *val,
 	double dval;
 
 	dval = (double)(raw_val) * scale;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 }
 
 static inline int lsm9ds0_mfd_get_accel_channel(enum sensor_channel chan,
@@ -481,8 +481,8 @@ static inline void lsm9ds0_mfd_convert_magn(struct sensor_value *val,
 	double dval;
 
 	dval = (double)(raw_val) * scale;
-	val->val1 = (s32_t)dval;
-	val->val2 = ((s32_t)(dval * 1000000)) % 1000000;
+	val->val1 = (int32_t)dval;
+	val->val2 = ((int32_t)(dval * 1000000)) % 1000000;
 }
 
 static inline int lsm9ds0_mfd_get_magn_channel(enum sensor_channel chan,
@@ -669,7 +669,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev)
 {
 	struct lsm9ds0_mfd_data *data = dev->driver_data;
 	const struct lsm9ds0_mfd_config *config = dev->config_info;
-	u8_t chip_id;
+	uint8_t chip_id;
 
 	if (lsm9ds0_mfd_reboot_memory(dev) < 0) {
 		LOG_DBG("failed to reset device");
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
index 9155bf956d..e42bb5293a 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
@@ -524,7 +524,7 @@
 
 struct lsm9ds0_mfd_config {
 	char *i2c_master_dev_name;
-	u16_t i2c_slave_addr;
+	uint16_t i2c_slave_addr;
 };
 
 struct lsm9ds0_mfd_data {
@@ -544,13 +544,13 @@ struct lsm9ds0_mfd_data {
 
 #if defined(CONFIG_LSM9DS0_MFD_ACCEL_FULL_SCALE_RUNTIME)
 #if !defined(LSM9DS0_MFD_ACCEL_DISABLED)
-	u8_t accel_fs, sample_accel_fs;
+	uint8_t accel_fs, sample_accel_fs;
 #endif
 #endif
 
 #if defined(CONFIG_LSM9DS0_MFD_MAGN_FULL_SCALE_RUNTIME)
 #if !defined(LSM9DS0_MFD_MAGN_DISABLED)
-	u8_t magn_fs, sample_magn_fs;
+	uint8_t magn_fs, sample_magn_fs;
 #endif
 #endif
 };
diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c
index 138a551fb8..4d643a3a17 100644
--- a/drivers/sensor/max30101/max30101.c
+++ b/drivers/sensor/max30101/max30101.c
@@ -16,8 +16,8 @@ static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct max30101_data *data = dev->driver_data;
 	const struct max30101_config *config = dev->config_info;
-	u8_t buffer[MAX30101_MAX_BYTES_PER_SAMPLE];
-	u32_t fifo_data;
+	uint8_t buffer[MAX30101_MAX_BYTES_PER_SAMPLE];
+	uint32_t fifo_data;
 	int fifo_chan;
 	int num_bytes;
 	int i;
@@ -95,9 +95,9 @@ static int max30101_init(struct device *dev)
 {
 	const struct max30101_config *config = dev->config_info;
 	struct max30101_data *data = dev->driver_data;
-	u8_t part_id;
-	u8_t mode_cfg;
-	u32_t led_chan;
+	uint8_t part_id;
+	uint8_t mode_cfg;
+	uint32_t led_chan;
 	int fifo_chan;
 
 	/* Get the I2C device */
@@ -168,7 +168,7 @@ static int max30101_init(struct device *dev)
 	}
 
 #ifdef CONFIG_MAX30101_MULTI_LED_MODE
-	u8_t multi_led[2];
+	uint8_t multi_led[2];
 
 	/* Write the multi-LED mode control registers */
 	multi_led[0] = (config->slot[1] << 4) | (config->slot[0]);
diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h
index 641f8fc6b0..167c5d0083 100644
--- a/drivers/sensor/max30101/max30101.h
+++ b/drivers/sensor/max30101/max30101.h
@@ -87,17 +87,17 @@ enum max30101_pw {
 
 struct max30101_config {
 	const char *i2c_label;
-	u16_t i2c_addr;
-	u8_t fifo;
-	u8_t spo2;
-	u8_t led_pa[MAX30101_MAX_NUM_CHANNELS];
+	uint16_t i2c_addr;
+	uint8_t fifo;
+	uint8_t spo2;
+	uint8_t led_pa[MAX30101_MAX_NUM_CHANNELS];
 	enum max30101_mode mode;
 	enum max30101_slot slot[4];
 };
 
 struct max30101_data {
 	struct device *i2c;
-	u32_t raw[MAX30101_MAX_NUM_CHANNELS];
-	u8_t map[MAX30101_MAX_NUM_CHANNELS];
-	u8_t num_channels;
+	uint32_t raw[MAX30101_MAX_NUM_CHANNELS];
+	uint8_t map[MAX30101_MAX_NUM_CHANNELS];
+	uint8_t num_channels;
 };
diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c
index 7e48065f5c..fe72df3c1d 100644
--- a/drivers/sensor/max44009/max44009.c
+++ b/drivers/sensor/max44009/max44009.c
@@ -16,9 +16,9 @@
 
 LOG_MODULE_REGISTER(MAX44009, CONFIG_SENSOR_LOG_LEVEL);
 
-static int max44009_reg_read(struct max44009_data *drv_data, u8_t reg,
+static int max44009_reg_read(struct max44009_data *drv_data, uint8_t reg,
 
-			     u8_t *val, bool send_stop)
+			     uint8_t *val, bool send_stop)
 {
 	struct i2c_msg msgs[2] = {
 		{
@@ -44,20 +44,20 @@ static int max44009_reg_read(struct max44009_data *drv_data, u8_t reg,
 	return 0;
 }
 
-static int max44009_reg_write(struct max44009_data *drv_data, u8_t reg,
-			      u8_t val)
+static int max44009_reg_write(struct max44009_data *drv_data, uint8_t reg,
+			      uint8_t val)
 {
-	u8_t tx_buf[2] = {reg, val};
+	uint8_t tx_buf[2] = {reg, val};
 
 	return i2c_write(drv_data->i2c, tx_buf, sizeof(tx_buf),
 			 MAX44009_I2C_ADDRESS);
 }
 
-static int max44009_reg_update(struct max44009_data *drv_data, u8_t reg,
-			       u8_t mask, u8_t val)
+static int max44009_reg_update(struct max44009_data *drv_data, uint8_t reg,
+			       uint8_t mask, uint8_t val)
 {
-	u8_t old_val = 0U;
-	u8_t new_val = 0U;
+	uint8_t old_val = 0U;
+	uint8_t new_val = 0U;
 
 	if (max44009_reg_read(drv_data, reg, &old_val, true) != 0) {
 		return -EIO;
@@ -74,8 +74,8 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan,
 			     const struct sensor_value *val)
 {
 	struct max44009_data *drv_data = dev->driver_data;
-	u8_t value;
-	u32_t cr;
+	uint8_t value;
+	uint32_t cr;
 
 	if (chan != SENSOR_CHAN_LIGHT) {
 		return -ENOTSUP;
@@ -114,7 +114,7 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan,
 static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct max44009_data *drv_data = dev->driver_data;
-	u8_t val_h, val_l;
+	uint8_t val_h, val_l;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_LIGHT);
 
@@ -130,7 +130,7 @@ static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan)
 		return -EIO;
 	}
 
-	drv_data->sample = ((u16_t)val_h) << 8;
+	drv_data->sample = ((uint16_t)val_h) << 8;
 	drv_data->sample += val_l;
 
 	return 0;
@@ -140,7 +140,7 @@ static int max44009_channel_get(struct device *dev, enum sensor_channel chan,
 				struct sensor_value *val)
 {
 	struct max44009_data *drv_data = dev->driver_data;
-	u32_t uval;
+	uint32_t uval;
 
 	if (chan != SENSOR_CHAN_LIGHT) {
 		return -ENOTSUP;
diff --git a/drivers/sensor/max44009/max44009.h b/drivers/sensor/max44009/max44009.h
index ab5ae6701f..7ca03e0eb1 100644
--- a/drivers/sensor/max44009/max44009.h
+++ b/drivers/sensor/max44009/max44009.h
@@ -23,7 +23,7 @@
 
 struct max44009_data {
 	struct device *i2c;
-	u16_t sample;
+	uint16_t sample;
 };
 
 #endif /* _SENSOR_MAX44009_ */
diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
index d8b23bce4d..a1bf360cd0 100644
--- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
+++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c
@@ -15,11 +15,11 @@
 LOG_MODULE_REGISTER(tach_xec, CONFIG_SENSOR_LOG_LEVEL);
 
 struct tach_xec_config {
-	u32_t base_address;
+	uint32_t base_address;
 };
 
 struct tach_xec_data {
-	u16_t count;
+	uint16_t count;
 };
 
 #define FAN_STOPPED		0xFFFFU
@@ -48,7 +48,7 @@ int tach_xec_sample_fetch(struct device *dev, enum sensor_channel chan)
 
 	TACH_Type *tach = TACH_XEC_REG_BASE(dev);
 	struct tach_xec_data *data = TACH_XEC_DATA(dev);
-	u8_t poll_count = 0;
+	uint8_t poll_count = 0;
 
 	while (poll_count < PIN_STS_TIMEOUT) {
 		/* See whether internal counter is already latched */
diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c
index 132739242f..d13f7d9b5d 100644
--- a/drivers/sensor/mcp9808/mcp9808.c
+++ b/drivers/sensor/mcp9808/mcp9808.c
@@ -20,7 +20,7 @@
 
 LOG_MODULE_REGISTER(MCP9808, CONFIG_SENSOR_LOG_LEVEL);
 
-int mcp9808_reg_read(struct device *dev, u8_t reg, u16_t *val)
+int mcp9808_reg_read(struct device *dev, uint8_t reg, uint16_t *val)
 {
 	const struct mcp9808_data *data = dev->driver_data;
 	const struct mcp9808_config *cfg = dev->config_info;
diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h
index 5ee2791400..e4cca69e0e 100644
--- a/drivers/sensor/mcp9808/mcp9808.h
+++ b/drivers/sensor/mcp9808/mcp9808.h
@@ -50,7 +50,7 @@
  */
 #define MCP9808_TEMP_SCALE_CEL		16 /* signed */
 #define MCP9808_TEMP_SIGN_BIT		BIT(12)
-#define MCP9808_TEMP_ABS_MASK		((u16_t)(MCP9808_TEMP_SIGN_BIT - 1U))
+#define MCP9808_TEMP_ABS_MASK		((uint16_t)(MCP9808_TEMP_SIGN_BIT - 1U))
 #define MCP9808_TEMP_LWR_BIT		BIT(13)
 #define MCP9808_TEMP_UPR_BIT		BIT(14)
 #define MCP9808_TEMP_CRT_BIT		BIT(15)
@@ -58,7 +58,7 @@
 struct mcp9808_data {
 	struct device *i2c_master;
 
-	u16_t reg_val;
+	uint16_t reg_val;
 
 #ifdef CONFIG_MCP9808_TRIGGER
 	struct device *alert_gpio;
@@ -81,15 +81,15 @@ struct mcp9808_data {
 
 struct mcp9808_config {
 	const char *i2c_bus;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #ifdef CONFIG_MCP9808_TRIGGER
-	u8_t alert_pin;
-	u8_t alert_flags;
+	uint8_t alert_pin;
+	uint8_t alert_flags;
 	const char *alert_controller;
 #endif /* CONFIG_MCP9808_TRIGGER */
 };
 
-int mcp9808_reg_read(struct device *dev, u8_t reg, u16_t *val);
+int mcp9808_reg_read(struct device *dev, uint8_t reg, uint16_t *val);
 
 #ifdef CONFIG_MCP9808_TRIGGER
 int mcp9808_attr_set(struct device *dev, enum sensor_channel chan,
@@ -104,10 +104,10 @@ int mcp9808_setup_interrupt(struct device *dev);
 /* Encode a signed temperature in scaled Celsius to the format used in
  * register values.
  */
-static inline u16_t mcp9808_temp_reg_from_signed(int temp)
+static inline uint16_t mcp9808_temp_reg_from_signed(int temp)
 {
 	/* Get the 12-bit 2s complement value */
-	u16_t rv = temp & MCP9808_TEMP_ABS_MASK;
+	uint16_t rv = temp & MCP9808_TEMP_ABS_MASK;
 
 	if (temp < 0) {
 		rv |= MCP9808_TEMP_SIGN_BIT;
@@ -118,7 +118,7 @@ static inline u16_t mcp9808_temp_reg_from_signed(int temp)
 /* Decode a register temperature value to a signed temperature in
  * scaled Celsius.
  */
-static inline int mcp9808_temp_signed_from_reg(u16_t reg)
+static inline int mcp9808_temp_signed_from_reg(uint16_t reg)
 {
 	int rv = reg & MCP9808_TEMP_ABS_MASK;
 
diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c
index 2c9d8fa0cb..1e88dd6d6e 100644
--- a/drivers/sensor/mcp9808/mcp9808_trigger.c
+++ b/drivers/sensor/mcp9808/mcp9808_trigger.c
@@ -14,11 +14,11 @@
 
 LOG_MODULE_DECLARE(MCP9808, CONFIG_SENSOR_LOG_LEVEL);
 
-static int mcp9808_reg_write(struct device *dev, u8_t reg, u16_t val)
+static int mcp9808_reg_write(struct device *dev, uint8_t reg, uint16_t val)
 {
 	const struct mcp9808_data *data = dev->driver_data;
 	const struct mcp9808_config *cfg = dev->config_info;
-	u8_t buf[3] = {
+	uint8_t buf[3] = {
 		reg,
 		val >> 8,	/* big-endian register storage */
 		val & 0xFF,
@@ -31,7 +31,7 @@ int mcp9808_attr_set(struct device *dev, enum sensor_channel chan,
 		     enum sensor_attribute attr,
 		     const struct sensor_value *val)
 {
-	u8_t reg_addr;
+	uint8_t reg_addr;
 	int temp;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_AMBIENT_TEMP);
@@ -121,7 +121,7 @@ int mcp9808_trigger_set(struct device *dev,
 	return rv;
 }
 
-static void alert_cb(struct device *dev, struct gpio_callback *cb, u32_t pins)
+static void alert_cb(struct device *dev, struct gpio_callback *cb, uint32_t pins)
 {
 	struct mcp9808_data *data =
 		CONTAINER_OF(cb, struct mcp9808_data, alert_cb);
diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c
index 19db0bd10a..75e32f883b 100644
--- a/drivers/sensor/mpr/mpr.c
+++ b/drivers/sensor/mpr/mpr.c
@@ -39,8 +39,8 @@ static int mpr_read_reg(struct device *dev)
 	struct mpr_data *data = dev->driver_data;
 	const struct mpr_config *cfg = dev->config_info;
 
-	u8_t write_buf[] = { MPR_OUTPUT_MEASUREMENT_COMMAND, 0x00, 0x00 };
-	u8_t read_buf[4] = { 0x0 };
+	uint8_t write_buf[] = { MPR_OUTPUT_MEASUREMENT_COMMAND, 0x00, 0x00 };
+	uint8_t read_buf[4] = { 0x0 };
 
 	int rc = i2c_write(data->i2c_master, write_buf, sizeof(write_buf),
 			   cfg->i2c_addr);
@@ -49,7 +49,7 @@ static int mpr_read_reg(struct device *dev)
 		return rc;
 	}
 
-	u8_t retries = MPR_REG_READ_MAX_RETRIES;
+	uint8_t retries = MPR_REG_READ_MAX_RETRIES;
 
 	for (; retries > 0; retries--) {
 		k_sleep(K_MSEC(MPR_REG_READ_DATA_CONV_DELAY_MS));
@@ -88,7 +88,7 @@ static int mpr_read_reg(struct device *dev)
  *
  * returns pressure [kPa] * 10^6
  */
-static inline void mpr_convert_reg(const u32_t *reg, s64_t *value)
+static inline void mpr_convert_reg(const uint32_t *reg, int64_t *value)
 {
 	*value = (*reg - MPR_OUTPUT_MIN) * (MPR_P_MAX - MPR_P_MIN);
 	*value *= MPR_CONVERSION_FACTOR;
@@ -111,7 +111,7 @@ static int mpr_channel_get(struct device *dev,
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_PRESS);
 
-	s64_t value;
+	int64_t value;
 
 	mpr_convert_reg(&data->reg_val, &value);
 
diff --git a/drivers/sensor/mpr/mpr.h b/drivers/sensor/mpr/mpr.h
index 2567b0dcdb..9b4da876bf 100644
--- a/drivers/sensor/mpr/mpr.h
+++ b/drivers/sensor/mpr/mpr.h
@@ -30,14 +30,14 @@
 struct mpr_data {
 	struct device *i2c_master;
 
-	u32_t reg_val;
+	uint32_t reg_val;
 };
 
 struct mpr_config {
 	const char *i2c_bus;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 };
 
-int mpr_reg_read(struct device *dev, u8_t reg, u16_t *val);
+int mpr_reg_read(struct device *dev, uint8_t reg, uint16_t *val);
 
 #endif /* ZEPHYR_DRIVERS_SENSOR_MPR_H_ */
diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c
index 96e1875249..b3c77100ff 100644
--- a/drivers/sensor/mpu6050/mpu6050.c
+++ b/drivers/sensor/mpu6050/mpu6050.c
@@ -17,23 +17,23 @@
 LOG_MODULE_REGISTER(MPU6050, CONFIG_SENSOR_LOG_LEVEL);
 
 /* see "Accelerometer Measurements" section from register map description */
-static void mpu6050_convert_accel(struct sensor_value *val, s16_t raw_val,
-				  u16_t sensitivity_shift)
+static void mpu6050_convert_accel(struct sensor_value *val, int16_t raw_val,
+				  uint16_t sensitivity_shift)
 {
-	s64_t conv_val;
+	int64_t conv_val;
 
-	conv_val = ((s64_t)raw_val * SENSOR_G) >> sensitivity_shift;
+	conv_val = ((int64_t)raw_val * SENSOR_G) >> sensitivity_shift;
 	val->val1 = conv_val / 1000000;
 	val->val2 = conv_val % 1000000;
 }
 
 /* see "Gyroscope Measurements" section from register map description */
-static void mpu6050_convert_gyro(struct sensor_value *val, s16_t raw_val,
-				 u16_t sensitivity_x10)
+static void mpu6050_convert_gyro(struct sensor_value *val, int16_t raw_val,
+				 uint16_t sensitivity_x10)
 {
-	s64_t conv_val;
+	int64_t conv_val;
 
-	conv_val = ((s64_t)raw_val * SENSOR_PI * 10) /
+	conv_val = ((int64_t)raw_val * SENSOR_PI * 10) /
 		   (sensitivity_x10 * 180U);
 	val->val1 = conv_val / 1000000;
 	val->val2 = conv_val % 1000000;
@@ -41,10 +41,10 @@ static void mpu6050_convert_gyro(struct sensor_value *val, s16_t raw_val,
 
 /* see "Temperature Measurement" section from register map description */
 static inline void mpu6050_convert_temp(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
 	val->val1 = raw_val / 340 + 36;
-	val->val2 = ((s64_t)(raw_val % 340) * 1000000) / 340 + 530000;
+	val->val2 = ((int64_t)(raw_val % 340) * 1000000) / 340 + 530000;
 
 	if (val->val2 < 0) {
 		val->val1--;
@@ -113,10 +113,10 @@ static int mpu6050_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct mpu6050_data *drv_data = dev->driver_data;
 	const struct mpu6050_config *cfg = dev->config_info;
-	s16_t buf[7];
+	int16_t buf[7];
 
 	if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr,
-			   MPU6050_REG_DATA_START, (u8_t *)buf, 14) < 0) {
+			   MPU6050_REG_DATA_START, (uint8_t *)buf, 14) < 0) {
 		LOG_ERR("Failed to read data sample.");
 		return -EIO;
 	}
@@ -144,7 +144,7 @@ int mpu6050_init(struct device *dev)
 {
 	struct mpu6050_data *drv_data = dev->driver_data;
 	const struct mpu6050_config *cfg = dev->config_info;
-	u8_t id, i;
+	uint8_t id, i;
 
 	drv_data->i2c = device_get_binding(cfg->i2c_label);
 	if (drv_data->i2c == NULL) {
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index baa343cf57..b34bf3e299 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -30,24 +30,24 @@
 #define MPU6050_SLEEP_EN		BIT(6)
 
 /* measured in degrees/sec x10 to avoid floating point */
-static const u16_t mpu6050_gyro_sensitivity_x10[] = {
+static const uint16_t mpu6050_gyro_sensitivity_x10[] = {
 	1310, 655, 328, 164
 };
 
 struct mpu6050_data {
 	struct device *i2c;
 
-	s16_t accel_x;
-	s16_t accel_y;
-	s16_t accel_z;
-	u16_t accel_sensitivity_shift;
+	int16_t accel_x;
+	int16_t accel_y;
+	int16_t accel_z;
+	uint16_t accel_sensitivity_shift;
 
-	s16_t temp;
+	int16_t temp;
 
-	s16_t gyro_x;
-	s16_t gyro_y;
-	s16_t gyro_z;
-	u16_t gyro_sensitivity_x10;
+	int16_t gyro_x;
+	int16_t gyro_y;
+	int16_t gyro_z;
+	uint16_t gyro_sensitivity_x10;
 
 #ifdef CONFIG_MPU6050_TRIGGER
 	struct device *dev;
@@ -70,10 +70,10 @@ struct mpu6050_data {
 
 struct mpu6050_config {
 	const char *i2c_label;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 #ifdef CONFIG_MPU6050_TRIGGER
-	u8_t int_pin;
-	u8_t int_flags;
+	uint8_t int_pin;
+	uint8_t int_flags;
 	const char *int_label;
 #endif /* CONFIG_MPU6050_TRIGGER */
 };
diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c
index 13a70581ca..5f95b2b508 100644
--- a/drivers/sensor/mpu6050/mpu6050_trigger.c
+++ b/drivers/sensor/mpu6050/mpu6050_trigger.c
@@ -42,7 +42,7 @@ int mpu6050_trigger_set(struct device *dev,
 }
 
 static void mpu6050_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct mpu6050_data *drv_data =
 		CONTAINER_OF(cb, struct mpu6050_data, gpio_cb);
diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c
index 3b5f919196..926c549043 100644
--- a/drivers/sensor/ms5607/ms5607.c
+++ b/drivers/sensor/ms5607/ms5607.c
@@ -19,41 +19,41 @@
 LOG_MODULE_REGISTER(ms5607);
 
 static void ms5607_compensate(struct ms5607_data *data,
-			      const s32_t adc_temperature,
-			      const s32_t adc_pressure)
+			      const int32_t adc_temperature,
+			      const int32_t adc_pressure)
 {
-	s64_t dT;
-	s64_t OFF;
-	s64_t SENS;
-	s64_t temp_sq;
-	s64_t Ti;
-	s64_t OFFi;
-	s64_t SENSi;
+	int64_t dT;
+	int64_t OFF;
+	int64_t SENS;
+	int64_t temp_sq;
+	int64_t Ti;
+	int64_t OFFi;
+	int64_t SENSi;
 
 	/* first order compensation as per datasheet
 	 * (https://www.te.com/usa-en/product-CAT-BLPS0035.html) section
 	 * PRESSURE AND TEMPERATURE CALCULATION
 	 */
 
-	dT = adc_temperature - ((u32_t)(data->t_ref) << 8);
+	dT = adc_temperature - ((uint32_t)(data->t_ref) << 8);
 	data->temperature = 2000 + (dT * data->tempsens) / (1ll << 23);
-	OFF = ((s64_t)(data->off_t1) << 17) + (dT * data->tco) / (1ll << 6);
-	SENS = ((s64_t)(data->sens_t1) << 16) + (dT * data->tcs) / (1ll << 7);
+	OFF = ((int64_t)(data->off_t1) << 17) + (dT * data->tco) / (1ll << 6);
+	SENS = ((int64_t)(data->sens_t1) << 16) + (dT * data->tcs) / (1ll << 7);
 
 	/* Second order compensation as per datasheet
 	 * (https://www.te.com/usa-en/product-CAT-BLPS0035.html) section
 	 * SECOND ORDER TEMPERATURE COMPENSATION
 	 */
 
-	temp_sq = (s64_t)(data->temperature - 2000) *
-		  (s64_t)(data->temperature - 2000);
+	temp_sq = (int64_t)(data->temperature - 2000) *
+		  (int64_t)(data->temperature - 2000);
 	if (data->temperature < 2000) {
 		Ti = (dT * dT) / (1ll << 31);
 		OFFi = (61ll * temp_sq) / (1ll << 4);
 		SENSi = 2ll * temp_sq;
 		if (data->temperature < -1500) {
-			temp_sq = (s64_t)(data->temperature + 1500) *
-				  (s64_t)(data->temperature + 1500);
+			temp_sq = (int64_t)(data->temperature + 1500) *
+				  (int64_t)(data->temperature + 1500);
 			OFFi += 15ll * temp_sq;
 			SENSi += 8ll * temp_sq;
 		}
@@ -67,12 +67,12 @@ static void ms5607_compensate(struct ms5607_data *data,
 	SENS -= SENSi;
 
 	data->temperature -= Ti;
-	data->pressure = (SENS * (s64_t)adc_pressure / (1ll << 21) - OFF) /
+	data->pressure = (SENS * (int64_t)adc_pressure / (1ll << 21) - OFF) /
 			 (1ll << 15);
 }
 
-static int ms5607_read_prom(const struct ms5607_data *data, u8_t cmd,
-			    u16_t *val)
+static int ms5607_read_prom(const struct ms5607_data *data, uint8_t cmd,
+			    uint16_t *val)
 {
 	int err;
 
@@ -86,9 +86,9 @@ static int ms5607_read_prom(const struct ms5607_data *data, u8_t cmd,
 }
 
 static int ms5607_get_measurement(const struct ms5607_data *data,
-				  u32_t *val,
-				  u8_t cmd,
-				  u8_t delay)
+				  uint32_t *val,
+				  uint8_t cmd,
+				  uint8_t delay)
 {
 	int err;
 
@@ -113,7 +113,7 @@ static int ms5607_sample_fetch(struct device *dev, enum sensor_channel channel)
 {
 	struct ms5607_data *data = dev->driver_data;
 	int err;
-	u32_t adc_pressure, adc_temperature;
+	uint32_t adc_pressure, adc_temperature;
 
 	__ASSERT_NO_MSG(channel == SENSOR_CHAN_ALL);
 
@@ -163,7 +163,7 @@ static int ms5607_attr_set(struct device *dev, enum sensor_channel chan,
 			   const struct sensor_value *val)
 {
 	struct ms5607_data *data = dev->driver_data;
-	u8_t p_conv_cmd, t_conv_cmd, conv_delay;
+	uint8_t p_conv_cmd, t_conv_cmd, conv_delay;
 
 	if (attr != SENSOR_ATTR_OVERSAMPLING) {
 		return -ENOTSUP;
diff --git a/drivers/sensor/ms5607/ms5607.h b/drivers/sensor/ms5607/ms5607.h
index df829496c5..f73b1c3e0b 100644
--- a/drivers/sensor/ms5607/ms5607.h
+++ b/drivers/sensor/ms5607/ms5607.h
@@ -76,30 +76,30 @@ struct ms5607_data {
 	struct device *ms5607_device;
 	const struct ms5607_transfer_function *tf;
 	/* Calibration values */
-	u16_t sens_t1;
-	u16_t off_t1;
-	u16_t tcs;
-	u16_t tco;
-	u16_t t_ref;
-	u16_t tempsens;
+	uint16_t sens_t1;
+	uint16_t off_t1;
+	uint16_t tcs;
+	uint16_t tco;
+	uint16_t t_ref;
+	uint16_t tempsens;
 
 	/* Measured values */
-	s32_t pressure;
-	s32_t temperature;
+	int32_t pressure;
+	int32_t temperature;
 
 	/* conversion commands */
-	u8_t pressure_conv_cmd;
-	u8_t temperature_conv_cmd;
+	uint8_t pressure_conv_cmd;
+	uint8_t temperature_conv_cmd;
 
-	u8_t pressure_conv_delay;
-	u8_t temperature_conv_delay;
+	uint8_t pressure_conv_delay;
+	uint8_t temperature_conv_delay;
 };
 
 struct ms5607_transfer_function {
 	int (*reset)(const struct ms5607_data *data);
-	int (*read_prom)(const struct ms5607_data *data, u8_t cmd, u16_t *val);
-	int (*start_conversion)(const struct ms5607_data *data, u8_t cmd);
-	int (*read_adc)(const struct ms5607_data *data, u32_t *val);
+	int (*read_prom)(const struct ms5607_data *data, uint8_t cmd, uint16_t *val);
+	int (*start_conversion)(const struct ms5607_data *data, uint8_t cmd);
+	int (*read_adc)(const struct ms5607_data *data, uint32_t *val);
 };
 
 #endif /* __SENSOR_MS607_H__*/
diff --git a/drivers/sensor/ms5607/ms5607_spi.c b/drivers/sensor/ms5607/ms5607_spi.c
index 54588715b1..88ab231177 100644
--- a/drivers/sensor/ms5607/ms5607_spi.c
+++ b/drivers/sensor/ms5607/ms5607_spi.c
@@ -33,7 +33,7 @@ static struct spi_config ms5607_spi_conf = {
 	.cs = SPI_CS,
 };
 
-static int ms5607_spi_raw_cmd(const struct ms5607_data *data, u8_t cmd)
+static int ms5607_spi_raw_cmd(const struct ms5607_data *data, uint8_t cmd)
 {
 	const struct spi_buf buf = {
 		.buf = &cmd,
@@ -60,12 +60,12 @@ static int ms5607_spi_reset(const struct ms5607_data *data)
 	return 0;
 }
 
-static int ms5607_spi_read_prom(const struct ms5607_data *data, u8_t cmd,
-				u16_t *val)
+static int ms5607_spi_read_prom(const struct ms5607_data *data, uint8_t cmd,
+				uint16_t *val)
 {
 	int err;
 
-	u8_t tx[3] = { cmd, 0, 0 };
+	uint8_t tx[3] = { cmd, 0, 0 };
 	const struct spi_buf tx_buf = {
 		.buf = tx,
 		.len = 3,
@@ -73,10 +73,10 @@ static int ms5607_spi_read_prom(const struct ms5607_data *data, u8_t cmd,
 
 	union {
 		struct {
-			u8_t pad;
-			u16_t prom_value;
+			uint8_t pad;
+			uint16_t prom_value;
 		} __packed;
-		u8_t rx[3];
+		uint8_t rx[3];
 	} rx;
 
 
@@ -109,16 +109,16 @@ static int ms5607_spi_read_prom(const struct ms5607_data *data, u8_t cmd,
 }
 
 
-static int ms5607_spi_start_conversion(const struct ms5607_data *data, u8_t cmd)
+static int ms5607_spi_start_conversion(const struct ms5607_data *data, uint8_t cmd)
 {
 	return ms5607_spi_raw_cmd(data, cmd);
 }
 
-static int ms5607_spi_read_adc(const struct ms5607_data *data, u32_t *val)
+static int ms5607_spi_read_adc(const struct ms5607_data *data, uint32_t *val)
 {
 	int err;
 
-	u8_t tx[4] = { MS5607_CMD_CONV_READ_ADC, 0, 0, 0 };
+	uint8_t tx[4] = { MS5607_CMD_CONV_READ_ADC, 0, 0, 0 };
 	const struct spi_buf tx_buf = {
 		.buf = tx,
 		.len = 4,
@@ -126,9 +126,9 @@ static int ms5607_spi_read_adc(const struct ms5607_data *data, u32_t *val)
 
 	union {
 		struct {
-			u32_t adc_value;
+			uint32_t adc_value;
 		} __packed;
-		u8_t rx[4];
+		uint8_t rx[4];
 	} rx;
 
 	const struct spi_buf rx_buf = {
diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c
index 54b6684823..8145bfdd31 100644
--- a/drivers/sensor/ms5837/ms5837.c
+++ b/drivers/sensor/ms5837/ms5837.c
@@ -19,10 +19,10 @@
 LOG_MODULE_REGISTER(MS5837, CONFIG_SENSOR_LOG_LEVEL);
 
 static int ms5837_get_measurement(struct device *i2c_master,
-				  const u8_t i2c_address, u32_t *val,
-				  u8_t cmd, const u8_t delay)
+				  const uint8_t i2c_address, uint32_t *val,
+				  uint8_t cmd, const uint8_t delay)
 {
-	u8_t adc_read_cmd = MS5837_CMD_CONV_READ_ADC;
+	uint8_t adc_read_cmd = MS5837_CMD_CONV_READ_ADC;
 	int err;
 
 	*val = 0U;
@@ -35,7 +35,7 @@ static int ms5837_get_measurement(struct device *i2c_master,
 	k_msleep(delay);
 
 	err = i2c_burst_read(i2c_master, i2c_address, adc_read_cmd,
-			((u8_t *)val) + 1, 3);
+			((uint8_t *)val) + 1, 3);
 	if (err < 0) {
 		return err;
 	}
@@ -46,26 +46,26 @@ static int ms5837_get_measurement(struct device *i2c_master,
 }
 
 static void ms5837_compensate(struct ms5837_data *data,
-			      const s32_t adc_temperature,
-			      const s32_t adc_pressure)
+			      const int32_t adc_temperature,
+			      const int32_t adc_pressure)
 {
-	s64_t dT;
-	s64_t OFF;
-	s64_t SENS;
-	s64_t temp_sq;
-	s32_t Ti;
-	s32_t OFFi;
-	s32_t SENSi;
+	int64_t dT;
+	int64_t OFF;
+	int64_t SENS;
+	int64_t temp_sq;
+	int32_t Ti;
+	int32_t OFFi;
+	int32_t SENSi;
 
 	/* first order compensation as per datasheet
 	 * (https://www.te.com/usa-en/product-CAT-BLPS0017.html) section
 	 * PRESSURE AND TEMPERATURE CALCULATION
 	 */
 
-	dT = adc_temperature - ((u32_t)(data->t_ref) << 8);
+	dT = adc_temperature - ((uint32_t)(data->t_ref) << 8);
 	data->temperature = 2000 + (dT * data->tempsens) / (1ll << 23);
-	OFF = ((s64_t)(data->off_t1) << 16) + (dT * data->tco) / (1ll << 7);
-	SENS = ((s64_t)(data->sens_t1) << 15) + (dT * data->tcs) / (1ll << 8);
+	OFF = ((int64_t)(data->off_t1) << 16) + (dT * data->tco) / (1ll << 7);
+	SENS = ((int64_t)(data->sens_t1) << 15) + (dT * data->tcs) / (1ll << 8);
 
 	/* Second order compensation as per datasheet
 	 * (https://www.te.com/usa-en/product-CAT-BLPS0017.html) section
@@ -102,8 +102,8 @@ static int ms5837_sample_fetch(struct device *dev, enum sensor_channel channel)
 	struct ms5837_data *data = dev->driver_data;
 	const struct ms5837_config *cfg = dev->config_info;
 	int err;
-	u32_t adc_pressure;
-	u32_t adc_temperature;
+	uint32_t adc_pressure;
+	uint32_t adc_temperature;
 
 	__ASSERT_NO_MSG(channel == SENSOR_CHAN_ALL);
 
@@ -154,9 +154,9 @@ static int ms5837_attr_set(struct device *dev, enum sensor_channel chan,
 			   const struct sensor_value *val)
 {
 	struct ms5837_data *data = dev->driver_data;
-	u8_t p_conv_cmd;
-	u8_t t_conv_cmd;
-	u8_t conv_delay;
+	uint8_t p_conv_cmd;
+	uint8_t t_conv_cmd;
+	uint8_t conv_delay;
 
 	if (attr == SENSOR_ATTR_OVERSAMPLING) {
 
@@ -228,12 +228,12 @@ static const struct sensor_driver_api ms5837_api_funcs = {
 	.channel_get = ms5837_channel_get,
 };
 
-static int ms5837_read_prom(struct device *i2c_master, const u8_t i2c_address,
-		const u8_t cmd, u16_t *val)
+static int ms5837_read_prom(struct device *i2c_master, const uint8_t i2c_address,
+		const uint8_t cmd, uint16_t *val)
 {
 	int err;
 
-	err = i2c_burst_read(i2c_master, i2c_address, cmd, (u8_t *)val, 2);
+	err = i2c_burst_read(i2c_master, i2c_address, cmd, (uint8_t *)val, 2);
 	if (err < 0) {
 		return err;
 	}
@@ -248,7 +248,7 @@ static int ms5837_init(struct device *dev)
 	struct ms5837_data *data = dev->driver_data;
 	const struct ms5837_config *cfg = dev->config_info;
 	int err;
-	u8_t cmd;
+	uint8_t cmd;
 
 	data->pressure = 0;
 	data->temperature = 0;
diff --git a/drivers/sensor/ms5837/ms5837.h b/drivers/sensor/ms5837/ms5837.h
index b42881cfef..6febaa834f 100644
--- a/drivers/sensor/ms5837/ms5837.h
+++ b/drivers/sensor/ms5837/ms5837.h
@@ -49,30 +49,30 @@ struct ms5837_data {
 	struct device *i2c_master;
 
 	/* Calibration values */
-	u16_t sens_t1;
-	u16_t off_t1;
-	u16_t tcs;
-	u16_t tco;
-	u16_t t_ref;
-	u16_t tempsens;
+	uint16_t sens_t1;
+	uint16_t off_t1;
+	uint16_t tcs;
+	uint16_t tco;
+	uint16_t t_ref;
+	uint16_t tempsens;
 
 	/* Measured values */
-	s32_t pressure;
-	s32_t temperature;
+	int32_t pressure;
+	int32_t temperature;
 
 	/* Conversion commands */
-	u8_t presure_conv_cmd;
-	u8_t temperature_conv_cmd;
+	uint8_t presure_conv_cmd;
+	uint8_t temperature_conv_cmd;
 
 	/* Conversion delay in ms*/
-	u8_t presure_conv_delay;
-	u8_t temperature_conv_delay;
+	uint8_t presure_conv_delay;
+	uint8_t temperature_conv_delay;
 
 };
 
 struct ms5837_config {
 	const char *i2c_name;
-	u8_t i2c_address;
+	uint8_t i2c_address;
 };
 
 #endif /* __SENSOR_MS5837_H__ */
diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c
index b7adbc03b5..f27876302b 100644
--- a/drivers/sensor/nrf5/temp_nrf5.c
+++ b/drivers/sensor/nrf5/temp_nrf5.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL);
 
 struct temp_nrf5_data {
 	struct k_sem device_sync_sem;
-	s32_t sample;
+	int32_t sample;
 	struct device *clk_dev;
 };
 
@@ -73,7 +73,7 @@ static int temp_nrf5_channel_get(struct device *dev,
 				struct sensor_value *val)
 {
 	struct temp_nrf5_data *data = dev->driver_data;
-	s32_t uval;
+	int32_t uval;
 
 
 	if (chan != SENSOR_CHAN_DIE_TEMP) {
diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
index 01f0710b09..59f5b5b365 100644
--- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
+++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(temp_kinetis, CONFIG_SENSOR_LOG_LEVEL);
 
 /*
  * Driver assumptions:
- * - ADC samples are in u16_t format
+ * - ADC samples are in uint16_t format
  * - Both ADC channels (sensor and bandgap) are on the same ADC instance
  *
  * See NXP Application Note AN3031 for details on calculations.
@@ -26,8 +26,8 @@ LOG_MODULE_REGISTER(temp_kinetis, CONFIG_SENSOR_LOG_LEVEL);
 
 struct temp_kinetis_config {
 	const char *adc_dev_name;
-	u8_t sensor_adc_ch;
-	u8_t bandgap_adc_ch;
+	uint8_t sensor_adc_ch;
+	uint8_t bandgap_adc_ch;
 	int bandgap_mv;
 	int vtemp25_mv;
 	int slope_cold_uv;
@@ -37,7 +37,7 @@ struct temp_kinetis_config {
 
 struct temp_kinetis_data {
 	struct device *adc;
-	u16_t buffer[TEMP_KINETIS_ADC_SAMPLES];
+	uint16_t buffer[TEMP_KINETIS_ADC_SAMPLES];
 };
 
 static int temp_kinetis_sample_fetch(struct device *dev,
@@ -46,7 +46,7 @@ static int temp_kinetis_sample_fetch(struct device *dev,
 	const struct temp_kinetis_config *config = dev->config_info;
 	struct temp_kinetis_data *data = dev->driver_data;
 #ifdef CONFIG_TEMP_KINETIS_FILTER
-	u16_t previous[TEMP_KINETIS_ADC_SAMPLES];
+	uint16_t previous[TEMP_KINETIS_ADC_SAMPLES];
 	int i;
 #endif /* CONFIG_TEMP_KINETIS_FILTER */
 	int err;
@@ -90,12 +90,12 @@ static int temp_kinetis_channel_get(struct device *dev,
 {
 	const struct temp_kinetis_config *config = dev->config_info;
 	struct temp_kinetis_data *data = dev->driver_data;
-	u16_t adcr_vdd = BIT_MASK(config->adc_seq.resolution);
-	u16_t adcr_temp25;
-	s32_t temp_cc;
-	s32_t vdd_mv;
+	uint16_t adcr_vdd = BIT_MASK(config->adc_seq.resolution);
+	uint16_t adcr_temp25;
+	int32_t temp_cc;
+	int32_t vdd_mv;
 	int slope_uv;
-	u16_t adcr_100m;
+	uint16_t adcr_100m;
 
 	if (chan != SENSOR_CHAN_VOLTAGE && chan != SENSOR_CHAN_DIE_TEMP) {
 		return -ENOTSUP;
diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c
index c5d929ee54..f0f5d0a1af 100644
--- a/drivers/sensor/opt3001/opt3001.c
+++ b/drivers/sensor/opt3001/opt3001.c
@@ -16,40 +16,40 @@
 
 LOG_MODULE_REGISTER(opt3001, CONFIG_SENSOR_LOG_LEVEL);
 
-static int opt3001_reg_read(struct opt3001_data *drv_data, u8_t reg,
-			    u16_t *val)
+static int opt3001_reg_read(struct opt3001_data *drv_data, uint8_t reg,
+			    uint16_t *val)
 {
-	u8_t value[2];
+	uint8_t value[2];
 
 	if (i2c_burst_read(drv_data->i2c, DT_INST_REG_ADDR(0),
 		reg, value, 2) != 0) {
 		return -EIO;
 	}
 
-	*val = ((u16_t)value[0] << 8) + value[1];
+	*val = ((uint16_t)value[0] << 8) + value[1];
 
 	return 0;
 }
 
-static int opt3001_reg_write(struct opt3001_data *drv_data, u8_t reg,
-			     u16_t val)
+static int opt3001_reg_write(struct opt3001_data *drv_data, uint8_t reg,
+			     uint16_t val)
 {
-	u8_t new_value[2];
+	uint8_t new_value[2];
 
 	new_value[0] = val >> 8;
 	new_value[1] = val & 0xff;
 
-	u8_t tx_buf[3] = { reg, new_value[0], new_value[1] };
+	uint8_t tx_buf[3] = { reg, new_value[0], new_value[1] };
 
 	return i2c_write(drv_data->i2c, tx_buf, sizeof(tx_buf),
 			 DT_INST_REG_ADDR(0));
 }
 
-static int opt3001_reg_update(struct opt3001_data *drv_data, u8_t reg,
-			      u16_t mask, u16_t val)
+static int opt3001_reg_update(struct opt3001_data *drv_data, uint8_t reg,
+			      uint16_t mask, uint16_t val)
 {
-	u16_t old_val;
-	u16_t new_val;
+	uint16_t old_val;
+	uint16_t new_val;
 
 	if (opt3001_reg_read(drv_data, reg, &old_val) != 0) {
 		return -EIO;
@@ -64,7 +64,7 @@ static int opt3001_reg_update(struct opt3001_data *drv_data, u8_t reg,
 static int opt3001_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct opt3001_data *drv_data = dev->driver_data;
-	u16_t value;
+	uint16_t value;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_LIGHT);
 
@@ -83,7 +83,7 @@ static int opt3001_channel_get(struct device *dev, enum sensor_channel chan,
 			       struct sensor_value *val)
 {
 	struct opt3001_data *drv_data = dev->driver_data;
-	s32_t uval;
+	int32_t uval;
 
 	if (chan != SENSOR_CHAN_LIGHT) {
 		return -ENOTSUP;
@@ -113,7 +113,7 @@ static const struct sensor_driver_api opt3001_driver_api = {
 static int opt3001_chip_init(struct device *dev)
 {
 	struct opt3001_data *drv_data = dev->driver_data;
-	u16_t value;
+	uint16_t value;
 
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
 	if (drv_data->i2c == NULL) {
diff --git a/drivers/sensor/opt3001/opt3001.h b/drivers/sensor/opt3001/opt3001.h
index 69d67ca8ba..1ae22431c9 100644
--- a/drivers/sensor/opt3001/opt3001.h
+++ b/drivers/sensor/opt3001/opt3001.h
@@ -25,7 +25,7 @@
 
 struct opt3001_data {
 	struct device *i2c;
-	u16_t sample;
+	uint16_t sample;
 };
 
 #endif /* _SENSOR_OPT3001_ */
diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c
index db5ab63aad..a70426cbab 100644
--- a/drivers/sensor/pms7003/pms7003.c
+++ b/drivers/sensor/pms7003/pms7003.c
@@ -29,9 +29,9 @@ LOG_MODULE_REGISTER(PMS7003, CONFIG_SENSOR_LOG_LEVEL);
 
 struct pms7003_data {
 	struct device *uart_dev;
-	u16_t pm_1_0;
-	u16_t pm_2_5;
-	u16_t pm_10;
+	uint16_t pm_1_0;
+	uint16_t pm_2_5;
+	uint16_t pm_10;
 };
 
 /**
@@ -43,13 +43,13 @@ struct pms7003_data {
  * @param timeout the timeout in milliseconds
  * @return 0 if success; -ETIME if timeout
  */
-static int uart_wait_for(struct device *dev, u8_t *data, int len, int timeout)
+static int uart_wait_for(struct device *dev, uint8_t *data, int len, int timeout)
 {
 	int matched_size = 0;
-	s64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
+	int64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
 
 	while (1) {
-		u8_t c;
+		uint8_t c;
 
 		if (k_uptime_get() > timeout_time) {
 			return -ETIME;
@@ -80,13 +80,13 @@ static int uart_wait_for(struct device *dev, u8_t *data, int len, int timeout)
  * @param timeout the timeout in milliseconds
  * @return 0 if success; -ETIME if timeout
  */
-static int uart_read_bytes(struct device *dev, u8_t *data, int len, int timeout)
+static int uart_read_bytes(struct device *dev, uint8_t *data, int len, int timeout)
 {
 	int read_size = 0;
-	s64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
+	int64_t timeout_time = k_uptime_get() + K_MSEC(timeout);
 
 	while (1) {
-		u8_t c;
+		uint8_t c;
 
 		if (k_uptime_get() > timeout_time) {
 			return -ETIME;
@@ -111,8 +111,8 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan)
 	 * 00 4E 00 03 00 00 00 00 00 00 71 00 02 06
 	 */
 
-	u8_t pms7003_start_bytes[] = {0x42, 0x4d};
-	u8_t pms7003_receive_buffer[30];
+	uint8_t pms7003_start_bytes[] = {0x42, 0x4d};
+	uint8_t pms7003_receive_buffer[30];
 
 	if (uart_wait_for(drv_data->uart_dev, pms7003_start_bytes,
 			  sizeof(pms7003_start_bytes),
diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
index 1449cbe242..cfc4b8ba5e 100644
--- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
@@ -22,10 +22,10 @@ LOG_MODULE_REGISTER(qdec_nrfx, CONFIG_SENSOR_LOG_LEVEL);
 
 
 struct qdec_nrfx_data {
-	s32_t                    acc;
+	int32_t                    acc;
 	sensor_trigger_handler_t data_ready_handler;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t                    pm_state;
+	uint32_t                    pm_state;
 #endif
 };
 
@@ -77,8 +77,8 @@ static int qdec_nrfx_channel_get(struct device       *dev,
 {
 	struct qdec_nrfx_data *data = &qdec_nrfx_data;
 	unsigned int key;
-	s32_t acc;
-	const s32_t steps = DT_INST_PROP(0, steps);
+	int32_t acc;
+	const int32_t steps = DT_INST_PROP(0, steps);
 
 	ARG_UNUSED(dev);
 	LOG_DBG("");
@@ -220,7 +220,7 @@ static int qdec_nrfx_init(struct device *dev)
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 
 static int qdec_nrfx_pm_get_state(struct qdec_nrfx_data *data,
-				  u32_t                 *state)
+				  uint32_t                 *state)
 {
 	unsigned int key = irq_lock();
 	*state = data->pm_state;
@@ -230,9 +230,9 @@ static int qdec_nrfx_pm_get_state(struct qdec_nrfx_data *data,
 }
 
 static int qdec_nrfx_pm_set_state(struct qdec_nrfx_data *data,
-				  u32_t                  new_state)
+				  uint32_t                  new_state)
 {
-	u32_t old_state;
+	uint32_t old_state;
 	unsigned int key;
 
 	key = irq_lock();
@@ -268,7 +268,7 @@ static int qdec_nrfx_pm_set_state(struct qdec_nrfx_data *data,
 	return 0;
 }
 
-static int qdec_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int qdec_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	struct qdec_nrfx_data *data = &qdec_nrfx_data;
@@ -282,7 +282,7 @@ static int qdec_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		break;
 
 	case DEVICE_PM_SET_POWER_STATE:
-		err = qdec_nrfx_pm_set_state(data, *((u32_t *)context));
+		err = qdec_nrfx_pm_set_state(data, *((uint32_t *)context));
 		break;
 
 	default:
diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c
index 1bf7d5233b..10e8b280f3 100644
--- a/drivers/sensor/sht3xd/sht3xd.c
+++ b/drivers/sensor/sht3xd/sht3xd.c
@@ -18,12 +18,12 @@
 LOG_MODULE_REGISTER(SHT3XD, CONFIG_SENSOR_LOG_LEVEL);
 
 #ifdef CONFIG_SHT3XD_SINGLE_SHOT_MODE
-static const u16_t measure_cmd[3] = {
+static const uint16_t measure_cmd[3] = {
 	0x2400, 0x240B, 0x2416
 };
 #endif
 #ifdef CONFIG_SHT3XD_PERIODIC_MODE
-static const u16_t measure_cmd[5][3] = {
+static const uint16_t measure_cmd[5][3] = {
 	{ 0x202F, 0x2024, 0x2032 },
 	{ 0x212D, 0x2126, 0x2130 },
 	{ 0x222B, 0x2220, 0x2236 },
@@ -40,11 +40,11 @@ static const int measure_wait[3] = {
  * CRC algorithm parameters were taken from the
  * "Checksum Calculation" section of the datasheet.
  */
-static u8_t sht3xd_compute_crc(u16_t value)
+static uint8_t sht3xd_compute_crc(uint16_t value)
 {
-	u8_t buf[2] = { value >> 8, value & 0xFF };
-	u8_t crc = 0xFF;
-	u8_t polynom = 0x31;
+	uint8_t buf[2] = { value >> 8, value & 0xFF };
+	uint8_t crc = 0xFF;
+	uint8_t polynom = 0x31;
 	int i, j;
 
 	for (i = 0; i < 2; ++i) {
@@ -61,17 +61,17 @@ static u8_t sht3xd_compute_crc(u16_t value)
 	return crc;
 }
 
-int sht3xd_write_command(struct device *dev, u16_t cmd)
+int sht3xd_write_command(struct device *dev, uint16_t cmd)
 {
-	u8_t tx_buf[2] = { cmd >> 8, cmd & 0xFF };
+	uint8_t tx_buf[2] = { cmd >> 8, cmd & 0xFF };
 
 	return i2c_write(sht3xd_i2c_device(dev), tx_buf, sizeof(tx_buf),
 			 sht3xd_i2c_address(dev));
 }
 
-int sht3xd_write_reg(struct device *dev, u16_t cmd, u16_t val)
+int sht3xd_write_reg(struct device *dev, uint16_t cmd, uint16_t val)
 {
-	u8_t tx_buf[5];
+	uint8_t tx_buf[5];
 
 	tx_buf[0] = cmd >> 8;
 	tx_buf[1] = cmd & 0xFF;
@@ -87,9 +87,9 @@ static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct sht3xd_data *data = dev->driver_data;
 	struct device *i2c = sht3xd_i2c_device(dev);
-	u8_t address = sht3xd_i2c_address(dev);
-	u8_t rx_buf[6];
-	u16_t t_sample, rh_sample;
+	uint8_t address = sht3xd_i2c_address(dev);
+	uint8_t rx_buf[6];
+	uint16_t t_sample, rh_sample;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -109,7 +109,7 @@ static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan)
 	}
 #endif
 #ifdef CONFIG_SHT3XD_PERIODIC_MODE
-	u8_t tx_buf[2] = {
+	uint8_t tx_buf[2] = {
 		SHT3XD_CMD_FETCH >> 8,
 		SHT3XD_CMD_FETCH & 0xFF
 	};
@@ -144,7 +144,7 @@ static int sht3xd_channel_get(struct device *dev,
 			      struct sensor_value *val)
 {
 	const struct sht3xd_data *data = dev->driver_data;
-	u64_t tmp;
+	uint64_t tmp;
 
 	/*
 	 * See datasheet "Conversion of Signal Output" section
@@ -152,12 +152,12 @@ static int sht3xd_channel_get(struct device *dev,
 	 */
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
 		/* val = -45 + 175 * sample / (2^16 -1) */
-		tmp = (u64_t)data->t_sample * 175U;
-		val->val1 = (s32_t)(tmp / 0xFFFF) - 45;
+		tmp = (uint64_t)data->t_sample * 175U;
+		val->val1 = (int32_t)(tmp / 0xFFFF) - 45;
 		val->val2 = ((tmp % 0xFFFF) * 1000000U) / 0xFFFF;
 	} else if (chan == SENSOR_CHAN_HUMIDITY) {
 		/* val = 100 * sample / (2^16 -1) */
-		u32_t tmp2 = (u32_t)data->rh_sample * 100U;
+		uint32_t tmp2 = (uint32_t)data->rh_sample * 100U;
 		val->val1 = tmp2 / 0xFFFF;
 		/* x * 100000 / 65536 == x * 15625 / 1024 */
 		val->val2 = (tmp2 % 0xFFFF) * 15625U / 1024;
diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h
index 15860fbf7f..8b5b752703 100644
--- a/drivers/sensor/sht3xd/sht3xd.h
+++ b/drivers/sensor/sht3xd/sht3xd.h
@@ -49,10 +49,10 @@ struct sht3xd_config {
 	char *alert_gpio_name;
 #endif /* CONFIG_SHT3XD_TRIGGER */
 
-	u8_t base_address;
+	uint8_t base_address;
 #ifdef CONFIG_SHT3XD_TRIGGER
-	u8_t alert_pin;
-	u8_t alert_flags;
+	uint8_t alert_pin;
+	uint8_t alert_flags;
 #endif /* CONFIG_SHT3XD_TRIGGER */
 };
 
@@ -60,17 +60,17 @@ struct sht3xd_data {
 	struct device *dev;
 	struct device *bus;
 
-	u16_t t_sample;
-	u16_t rh_sample;
+	uint16_t t_sample;
+	uint16_t rh_sample;
 
 #ifdef CONFIG_SHT3XD_TRIGGER
 	struct device *alert_gpio;
 	struct gpio_callback alert_cb;
 
-	u16_t t_low;
-	u16_t t_high;
-	u16_t rh_low;
-	u16_t rh_high;
+	uint16_t t_low;
+	uint16_t t_high;
+	uint16_t rh_low;
+	uint16_t rh_high;
 
 	sensor_trigger_handler_t handler;
 	struct sensor_trigger trigger;
@@ -86,7 +86,7 @@ struct sht3xd_data {
 #endif /* CONFIG_SHT3XD_TRIGGER */
 };
 
-static inline u8_t sht3xd_i2c_address(struct device *dev)
+static inline uint8_t sht3xd_i2c_address(struct device *dev)
 {
 	const struct sht3xd_config *dcp = dev->config_info;
 
@@ -101,9 +101,9 @@ static inline struct device *sht3xd_i2c_device(struct device *dev)
 }
 
 #ifdef CONFIG_SHT3XD_TRIGGER
-int sht3xd_write_command(struct device *dev, u16_t cmd);
+int sht3xd_write_command(struct device *dev, uint16_t cmd);
 
-int sht3xd_write_reg(struct device *dev, u16_t cmd, u16_t val);
+int sht3xd_write_reg(struct device *dev, uint16_t cmd, uint16_t val);
 
 int sht3xd_attr_set(struct device *dev,
 		    enum sensor_channel chan,
diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c
index 8b3f63008b..ca8451cc7a 100644
--- a/drivers/sensor/sht3xd/sht3xd_trigger.c
+++ b/drivers/sensor/sht3xd/sht3xd_trigger.c
@@ -14,21 +14,21 @@
 #include <logging/log.h>
 LOG_MODULE_DECLARE(SHT3XD, CONFIG_SENSOR_LOG_LEVEL);
 
-static u16_t sht3xd_temp_processed_to_raw(const struct sensor_value *val)
+static uint16_t sht3xd_temp_processed_to_raw(const struct sensor_value *val)
 {
-	u64_t uval;
+	uint64_t uval;
 
 	/* ret = (val + 45) * (2^16 - 1) / 175 */
-	uval = (u64_t)(val->val1 + 45) * 1000000U + val->val2;
+	uval = (uint64_t)(val->val1 + 45) * 1000000U + val->val2;
 	return ((uval * 0xFFFF) / 175) / 1000000;
 }
 
 static int sht3xd_rh_processed_to_raw(const struct sensor_value *val)
 {
-	u64_t uval;
+	uint64_t uval;
 
 	/* ret = val * (2^16 -1) / 100 */
-	uval = (u64_t)val->val1 * 1000000U + val->val2;
+	uval = (uint64_t)val->val1 * 1000000U + val->val2;
 	return ((uval * 0xFFFF) / 100) / 1000000;
 }
 
@@ -38,7 +38,7 @@ int sht3xd_attr_set(struct device *dev,
 		    const struct sensor_value *val)
 {
 	struct sht3xd_data *data = dev->driver_data;
-	u16_t set_cmd, clear_cmd, reg_val, temp, rh;
+	uint16_t set_cmd, clear_cmd, reg_val, temp, rh;
 
 	if (attr == SENSOR_ATTR_LOWER_THRESH) {
 		if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
@@ -143,7 +143,7 @@ int sht3xd_trigger_set(struct device *dev,
 }
 
 static void sht3xd_gpio_callback(struct device *dev,
-				 struct gpio_callback *cb, u32_t pins)
+				 struct gpio_callback *cb, uint32_t pins)
 {
 	struct sht3xd_data *data =
 		CONTAINER_OF(cb, struct sht3xd_data, alert_cb);
diff --git a/drivers/sensor/si7006/si7006.c b/drivers/sensor/si7006/si7006.c
index f1bfbcad58..9be575ff0d 100644
--- a/drivers/sensor/si7006/si7006.c
+++ b/drivers/sensor/si7006/si7006.c
@@ -24,8 +24,8 @@ LOG_MODULE_REGISTER(si7006, CONFIG_SENSOR_LOG_LEVEL);
 
 struct si7006_data {
 	struct device *i2c_dev;
-	u16_t temperature;
-	u16_t humidity;
+	uint16_t temperature;
+	uint16_t humidity;
 };
 
 /**
@@ -37,7 +37,7 @@ static int si7006_get_humidity(struct device *i2c_dev,
 			       struct si7006_data *si_data)
 {
 	int retval;
-	u8_t hum[2];
+	uint8_t hum[2];
 
 	retval = i2c_burst_read(i2c_dev, DT_INST_REG_ADDR(0),
 		SI7006_MEAS_REL_HUMIDITY_MASTER_MODE, hum, sizeof(hum));
@@ -63,7 +63,7 @@ static int si7006_get_humidity(struct device *i2c_dev,
 static int si7006_get_old_temperature(struct device *i2c_dev,
 				      struct si7006_data *si_data)
 {
-	u8_t temp[2];
+	uint8_t temp[2];
 	int retval;
 
 	retval = i2c_burst_read(i2c_dev, DT_INST_REG_ADDR(0),
@@ -108,7 +108,7 @@ static int si7006_channel_get(struct device *dev, enum sensor_channel chan,
 
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
 
-		s32_t temp_ucelcius = (((17572 * (s32_t)si_data->temperature)
+		int32_t temp_ucelcius = (((17572 * (int32_t)si_data->temperature)
 					/ 65536) - 4685) * 10000;
 
 		val->val1 = temp_ucelcius / 1000000;
@@ -119,7 +119,7 @@ static int si7006_channel_get(struct device *dev, enum sensor_channel chan,
 		return 0;
 	} else if (chan == SENSOR_CHAN_HUMIDITY) {
 
-		s32_t relative_humidity = (((125 * (s32_t)si_data->humidity)
+		int32_t relative_humidity = (((125 * (int32_t)si_data->humidity)
 					    / 65536) - 6) * 1000000;
 
 		val->val1 = relative_humidity / 1000000;
diff --git a/drivers/sensor/si7060/si7060.c b/drivers/sensor/si7060/si7060.c
index 582cd2670b..ebf48e9805 100644
--- a/drivers/sensor/si7060/si7060.c
+++ b/drivers/sensor/si7060/si7060.c
@@ -19,11 +19,11 @@ LOG_MODULE_REGISTER(si7060, CONFIG_SENSOR_LOG_LEVEL);
 
 struct si7060_data {
 	struct device *i2c_dev;
-	u16_t temperature;
+	uint16_t temperature;
 };
 
-static int si7060_reg_read(struct si7060_data *drv_data, u8_t reg,
-			     u8_t *val)
+static int si7060_reg_read(struct si7060_data *drv_data, uint8_t reg,
+			     uint8_t *val)
 {
 	if (i2c_reg_read_byte(drv_data->i2c_dev,
 		DT_INST_REG_ADDR(0), reg, val)) {
@@ -33,8 +33,8 @@ static int si7060_reg_read(struct si7060_data *drv_data, u8_t reg,
 	return 0;
 }
 
-static int si7060_reg_write(struct si7060_data *drv_data, u8_t reg,
-			      u8_t val)
+static int si7060_reg_write(struct si7060_data *drv_data, uint8_t reg,
+			      uint8_t val)
 {
 	return i2c_reg_write_byte(drv_data->i2c_dev,
 		DT_INST_REG_ADDR(0), reg, val);
@@ -50,8 +50,8 @@ static int si7060_sample_fetch(struct device *dev, enum sensor_channel chan)
 	}
 
 	int retval;
-	u8_t dspsigm;
-	u8_t dspsigl;
+	uint8_t dspsigm;
+	uint8_t dspsigl;
 
 	retval = si7060_reg_read(drv_data, SI7060_REG_TEMP_HIGH,
 		&dspsigm);
@@ -74,7 +74,7 @@ static int si7060_channel_get(struct device *dev, enum sensor_channel chan,
 			      struct sensor_value *val)
 {
 	struct si7060_data *drv_data = dev->driver_data;
-	s32_t uval;
+	int32_t uval;
 
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
 		uval = ((55 * 160) + (drv_data->temperature - 16384)) >> 4;
@@ -97,7 +97,7 @@ static const struct sensor_driver_api si7060_api = {
 static int si7060_chip_init(struct device *dev)
 {
 	struct si7060_data *drv_data = dev->driver_data;
-	u8_t value;
+	uint8_t value;
 
 	drv_data->i2c_dev = device_get_binding(
 		DT_INST_BUS_LABEL(0));
diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c
index 19d34bf723..d2ef1101b3 100644
--- a/drivers/sensor/stts751/stts751.c
+++ b/drivers/sensor/stts751/stts751.c
@@ -22,7 +22,7 @@
 
 LOG_MODULE_REGISTER(STTS751, CONFIG_SENSOR_LOG_LEVEL);
 
-static inline int stts751_set_odr_raw(struct device *dev, u8_t odr)
+static inline int stts751_set_odr_raw(struct device *dev, uint8_t odr)
 {
 	struct stts751_data *data = dev->driver_data;
 
@@ -48,10 +48,10 @@ static int stts751_sample_fetch(struct device *dev,
 }
 
 static inline void stts751_temp_convert(struct sensor_value *val,
-					s16_t raw_val)
+					int16_t raw_val)
 {
 	val->val1 = raw_val / 256;
-	val->val2 = ((s32_t)raw_val % 256) * 10000;
+	val->val2 = ((int32_t)raw_val % 256) * 10000;
 }
 
 static int stts751_channel_get(struct device *dev,
@@ -70,8 +70,8 @@ static int stts751_channel_get(struct device *dev,
 }
 
 static const struct {
-	s32_t rate;
-	s32_t rate_dec;
+	int32_t rate;
+	int32_t rate_dec;
 } stts751_map[] = {
 			{0, 62500},
 			{0, 125000},
diff --git a/drivers/sensor/stts751/stts751.h b/drivers/sensor/stts751/stts751.h
index 0fae3c423c..9cc46ee19f 100644
--- a/drivers/sensor/stts751/stts751.h
+++ b/drivers/sensor/stts751/stts751.h
@@ -20,8 +20,8 @@
 #include "stts751_reg.h"
 
 union axis1bit16_t {
-	s16_t i16bit;
-	u8_t u8bit[2];
+	int16_t i16bit;
+	uint8_t u8bit[2];
 };
 
 struct stts751_config {
@@ -29,17 +29,17 @@ struct stts751_config {
 	int (*bus_init)(struct device *dev);
 #ifdef CONFIG_STTS751_TRIGGER
 	const char *event_port;
-	u8_t event_pin;
-	u8_t int_flags;
+	uint8_t event_pin;
+	uint8_t int_flags;
 #endif
 #if DT_ANY_INST_ON_BUS_STATUS_OKAY(i2c)
-	u16_t i2c_slv_addr;
+	uint16_t i2c_slv_addr;
 #endif
 };
 
 struct stts751_data {
 	struct device *bus;
-	s16_t sample_temp;
+	int16_t sample_temp;
 
 	stmdev_ctx_t *ctx;
 
@@ -49,7 +49,7 @@ struct stts751_data {
 
 #ifdef CONFIG_STTS751_TRIGGER
 	struct device *gpio;
-	u32_t pin;
+	uint32_t pin;
 	struct gpio_callback gpio_cb;
 
 	struct sensor_trigger data_ready_trigger;
diff --git a/drivers/sensor/stts751/stts751_i2c.c b/drivers/sensor/stts751/stts751_i2c.c
index c072426b0d..0d26f8637b 100644
--- a/drivers/sensor/stts751/stts751_i2c.c
+++ b/drivers/sensor/stts751/stts751_i2c.c
@@ -20,8 +20,8 @@
 
 LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL);
 
-static int stts751_i2c_read(struct device *dev, u8_t reg_addr,
-				 u8_t *value, u16_t len)
+static int stts751_i2c_read(struct device *dev, uint8_t reg_addr,
+				 uint8_t *value, uint16_t len)
 {
 	struct stts751_data *data = dev->driver_data;
 	const struct stts751_config *cfg = dev->config_info;
@@ -30,8 +30,8 @@ static int stts751_i2c_read(struct device *dev, u8_t reg_addr,
 			      reg_addr, value, len);
 }
 
-static int stts751_i2c_write(struct device *dev, u8_t reg_addr,
-				  u8_t *value, u16_t len)
+static int stts751_i2c_write(struct device *dev, uint8_t reg_addr,
+				  uint8_t *value, uint16_t len)
 {
 	struct stts751_data *data = dev->driver_data;
 	const struct stts751_config *cfg = dev->config_info;
diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c
index 64181ce1af..573138beb9 100644
--- a/drivers/sensor/stts751/stts751_trigger.c
+++ b/drivers/sensor/stts751/stts751_trigger.c
@@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL);
 static int stts751_enable_int(struct device *dev, int enable)
 {
 	struct stts751_data *stts751 = dev->driver_data;
-	u8_t en = (enable) ? 0 : 1;
+	uint8_t en = (enable) ? 0 : 1;
 
 	return stts751_pin_event_route_set(stts751->ctx, en);
 }
@@ -77,7 +77,7 @@ static void stts751_handle_interrupt(void *arg)
 }
 
 static void stts751_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	const struct stts751_config *cfg = dev->config_info;
 	struct stts751_data *stts751 =
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index ed2f941ee2..a8d7ec412f 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -22,7 +22,7 @@
 
 LOG_MODULE_REGISTER(SX9500, CONFIG_SENSOR_LOG_LEVEL);
 
-static u8_t sx9500_reg_defaults[] = {
+static uint8_t sx9500_reg_defaults[] = {
 	/*
 	 * First number is register address to write to.  The chip
 	 * auto-increments the address for subsequent values in a single
@@ -81,7 +81,7 @@ static const struct sensor_driver_api sx9500_api_funcs = {
 static int sx9500_init_chip(struct device *dev)
 {
 	struct sx9500_data *data = (struct sx9500_data *) dev->driver_data;
-	u8_t val;
+	uint8_t val;
 
 	if (i2c_write(data->i2c_master, sx9500_reg_defaults,
 		      sizeof(sx9500_reg_defaults), data->i2c_slave_addr)
diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h
index 9cf30a6e80..9bc279e95b 100644
--- a/drivers/sensor/sx9500/sx9500.h
+++ b/drivers/sensor/sx9500/sx9500.h
@@ -26,8 +26,8 @@
 
 struct sx9500_data {
 	struct device *i2c_master;
-	u16_t i2c_slave_addr;
-	u8_t prox_stat;
+	uint16_t i2c_slave_addr;
+	uint8_t prox_stat;
 
 	struct gpio_callback gpio_cb;
 
diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c
index af1207d3c4..647018cfb8 100644
--- a/drivers/sensor/sx9500/sx9500_trigger.c
+++ b/drivers/sensor/sx9500/sx9500_trigger.c
@@ -65,7 +65,7 @@ int sx9500_trigger_set(struct device *dev,
 #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD
 
 static void sx9500_gpio_cb(struct device *port,
-			   struct gpio_callback *cb, u32_t pins)
+			   struct gpio_callback *cb, uint32_t pins)
 {
 	struct sx9500_data *data =
 		CONTAINER_OF(cb, struct sx9500_data, gpio_cb);
@@ -79,7 +79,7 @@ static void sx9500_thread_main(int arg1, int unused)
 {
 	struct device *dev = INT_TO_POINTER(arg1);
 	struct sx9500_data *data = dev->driver_data;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	ARG_UNUSED(unused);
 
@@ -105,7 +105,7 @@ static void sx9500_thread_main(int arg1, int unused)
 #else /* CONFIG_SX9500_TRIGGER_GLOBAL_THREAD */
 
 static void sx9500_gpio_cb(struct device *port,
-			   struct gpio_callback *cb, u32_t pins)
+			   struct gpio_callback *cb, uint32_t pins)
 {
 	struct sx9500_data *data =
 		CONTAINER_OF(cb, struct sx9500_data, gpio_cb);
@@ -119,7 +119,7 @@ static void sx9500_gpio_thread_cb(void *arg)
 {
 	struct device *dev = arg;
 	struct sx9500_data *data = dev->driver_data;
-	u8_t reg_val;
+	uint8_t reg_val;
 
 	if (i2c_reg_read_byte(data->i2c_master, data->i2c_slave_addr,
 			      SX9500_REG_IRQ_SRC, &reg_val) < 0) {
diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c
index 3cdbe8e8b5..c129a9ee48 100644
--- a/drivers/sensor/th02/th02.c
+++ b/drivers/sensor/th02/th02.c
@@ -19,9 +19,9 @@
 
 LOG_MODULE_REGISTER(TH02, CONFIG_SENSOR_LOG_LEVEL);
 
-static u8_t read8(struct device *dev, u8_t d)
+static uint8_t read8(struct device *dev, uint8_t d)
 {
-	u8_t buf;
+	uint8_t buf;
 
 	if (i2c_reg_read_byte(dev, TH02_I2C_DEV_ID, d, &buf) < 0) {
 		LOG_ERR("Error reading register.");
@@ -32,7 +32,7 @@ static u8_t read8(struct device *dev, u8_t d)
 static int is_ready(struct device *dev)
 {
 
-	u8_t status;
+	uint8_t status;
 
 	if (i2c_reg_read_byte(dev, TH02_I2C_DEV_ID,
 			      TH02_REG_STATUS, &status) < 0) {
@@ -46,9 +46,9 @@ static int is_ready(struct device *dev)
 	}
 }
 
-static u16_t get_humi(struct device *dev)
+static uint16_t get_humi(struct device *dev)
 {
-	u16_t humidity = 0U;
+	uint16_t humidity = 0U;
 
 	if (i2c_reg_write_byte(dev, TH02_I2C_DEV_ID,
 			       TH02_REG_CONFIG, TH02_CMD_MEASURE_HUMI) < 0) {
@@ -65,9 +65,9 @@ static u16_t get_humi(struct device *dev)
 	return humidity;
 }
 
-u16_t get_temp(struct device *dev)
+uint16_t get_temp(struct device *dev)
 {
-	u16_t temperature = 0U;
+	uint16_t temperature = 0U;
 
 	if (i2c_reg_write_byte(dev, TH02_I2C_DEV_ID,
 			       TH02_REG_CONFIG, TH02_CMD_MEASURE_TEMP) < 0) {
diff --git a/drivers/sensor/th02/th02.h b/drivers/sensor/th02/th02.h
index 0825c38c0a..4d6aee5684 100644
--- a/drivers/sensor/th02/th02.h
+++ b/drivers/sensor/th02/th02.h
@@ -27,8 +27,8 @@
 
 struct th02_data {
 	struct device *i2c;
-	u16_t t_sample;
-	u16_t rh_sample;
+	uint16_t t_sample;
+	uint16_t rh_sample;
 };
 
 #endif /* _SENSOR_TH02_ */
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index 93f05c64d0..732af8eadb 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/drivers/sensor/ti_hdc/ti_hdc.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(TI_HDC, CONFIG_SENSOR_LOG_LEVEL);
 
 #if DT_INST_NODE_HAS_PROP(0, drdy_gpios)
 static void ti_hdc_gpio_callback(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct ti_hdc_data *drv_data =
 		CONTAINER_OF(cb, struct ti_hdc_data, gpio_cb);
@@ -38,7 +38,7 @@ static void ti_hdc_gpio_callback(struct device *dev,
 static int ti_hdc_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct ti_hdc_data *drv_data = dev->driver_data;
-	u8_t buf[4];
+	uint8_t buf[4];
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
@@ -79,7 +79,7 @@ static int ti_hdc_channel_get(struct device *dev,
 			      struct sensor_value *val)
 {
 	struct ti_hdc_data *drv_data = dev->driver_data;
-	u64_t tmp;
+	uint64_t tmp;
 
 	/*
 	 * See datasheet "Temperature Register" and "Humidity
@@ -88,12 +88,12 @@ static int ti_hdc_channel_get(struct device *dev,
 	 */
 	if (chan == SENSOR_CHAN_AMBIENT_TEMP) {
 		/* val = -40 + 165 * sample / 2^16 */
-		tmp = (u64_t)drv_data->t_sample * 165U;
-		val->val1 = (s32_t)(tmp >> 16) - 40;
+		tmp = (uint64_t)drv_data->t_sample * 165U;
+		val->val1 = (int32_t)(tmp >> 16) - 40;
 		val->val2 = ((tmp & 0xFFFF) * 1000000U) >> 16;
 	} else if (chan == SENSOR_CHAN_HUMIDITY) {
 		/* val = 100 * sample / 2^16 */
-		tmp = (u64_t)drv_data->rh_sample * 100U;
+		tmp = (uint64_t)drv_data->rh_sample * 100U;
 		val->val1 = tmp >> 16;
 		/* x * 1000000 / 65536 == x * 15625 / 1024 */
 		val->val2 = ((tmp & 0xFFFF) * 15625U) >> 10;
@@ -109,10 +109,10 @@ static const struct sensor_driver_api ti_hdc_driver_api = {
 	.channel_get = ti_hdc_channel_get,
 };
 
-static u16_t read16(struct device *dev, u8_t a, u8_t d)
+static uint16_t read16(struct device *dev, uint8_t a, uint8_t d)
 {
-	u8_t buf[2];
-	if (i2c_burst_read(dev, a, d, (u8_t *)buf, 2) < 0) {
+	uint8_t buf[2];
+	if (i2c_burst_read(dev, a, d, (uint8_t *)buf, 2) < 0) {
 		LOG_ERR("Error reading register.");
 	}
 	return (buf[0] << 8 | buf[1]);
@@ -121,7 +121,7 @@ static u16_t read16(struct device *dev, u8_t a, u8_t d)
 static int ti_hdc_init(struct device *dev)
 {
 	struct ti_hdc_data *drv_data = dev->driver_data;
-	u16_t tmp;
+	uint16_t tmp;
 
 	drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
 
diff --git a/drivers/sensor/ti_hdc/ti_hdc.h b/drivers/sensor/ti_hdc/ti_hdc.h
index dd1435bafa..49fcf04dd7 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.h
+++ b/drivers/sensor/ti_hdc/ti_hdc.h
@@ -23,8 +23,8 @@
 
 struct ti_hdc_data {
 	struct device *i2c;
-	u16_t t_sample;
-	u16_t rh_sample;
+	uint16_t t_sample;
+	uint16_t rh_sample;
 
 #if DT_INST_NODE_HAS_PROP(0, drdy_gpios)
 	struct device *gpio;
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index c7c7c9a743..7362905e4d 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/drivers/sensor/tmp007/tmp007.c
@@ -21,10 +21,10 @@
 LOG_MODULE_REGISTER(TMP007, CONFIG_SENSOR_LOG_LEVEL);
 
 int tmp007_reg_read(struct tmp007_data *drv_data,
-		u8_t reg, u16_t *val)
+		uint8_t reg, uint16_t *val)
 {
 	if (i2c_burst_read(drv_data->i2c, TMP007_I2C_ADDRESS,
-				reg, (u8_t *) val, 2) < 0) {
+				reg, (uint8_t *) val, 2) < 0) {
 		LOG_ERR("I2C read failed");
 		return -EIO;
 	}
@@ -34,19 +34,19 @@ int tmp007_reg_read(struct tmp007_data *drv_data,
 	return 0;
 }
 
-int tmp007_reg_write(struct tmp007_data *drv_data, u8_t reg, u16_t val)
+int tmp007_reg_write(struct tmp007_data *drv_data, uint8_t reg, uint16_t val)
 {
-	u8_t tx_buf[3] = {reg, val >> 8, val & 0xFF};
+	uint8_t tx_buf[3] = {reg, val >> 8, val & 0xFF};
 
 	return i2c_write(drv_data->i2c, tx_buf, sizeof(tx_buf),
 			 TMP007_I2C_ADDRESS);
 }
 
-int tmp007_reg_update(struct tmp007_data *drv_data, u8_t reg,
-		      u16_t mask, u16_t val)
+int tmp007_reg_update(struct tmp007_data *drv_data, uint8_t reg,
+		      uint16_t mask, uint16_t val)
 {
-	u16_t old_val = 0U;
-	u16_t new_val;
+	uint16_t old_val = 0U;
+	uint16_t new_val;
 
 	if (tmp007_reg_read(drv_data, reg, &old_val) < 0) {
 		return -EIO;
@@ -61,7 +61,7 @@ int tmp007_reg_update(struct tmp007_data *drv_data, u8_t reg,
 static int tmp007_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct tmp007_data *drv_data = dev->driver_data;
-	u16_t val;
+	uint16_t val;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP);
 
@@ -73,7 +73,7 @@ static int tmp007_sample_fetch(struct device *dev, enum sensor_channel chan)
 		return -EIO;
 	}
 
-	drv_data->sample = arithmetic_shift_right((s16_t)val, 2);
+	drv_data->sample = arithmetic_shift_right((int16_t)val, 2);
 
 	return 0;
 }
@@ -83,13 +83,13 @@ static int tmp007_channel_get(struct device *dev,
 			       struct sensor_value *val)
 {
 	struct tmp007_data *drv_data = dev->driver_data;
-	s32_t uval;
+	int32_t uval;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
 	}
 
-	uval = (s32_t)drv_data->sample * TMP007_TEMP_SCALE;
+	uval = (int32_t)drv_data->sample * TMP007_TEMP_SCALE;
 	val->val1 = uval / 1000000;
 	val->val2 = uval % 1000000;
 
diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h
index 82a3b4e96a..00289c2a03 100644
--- a/drivers/sensor/tmp007/tmp007.h
+++ b/drivers/sensor/tmp007/tmp007.h
@@ -35,7 +35,7 @@
 
 struct tmp007_data {
 	struct device *i2c;
-	s16_t sample;
+	int16_t sample;
 
 #ifdef CONFIG_TMP007_TRIGGER
 	struct device *gpio;
@@ -60,12 +60,12 @@ struct tmp007_data {
 };
 
 #ifdef CONFIG_TMP007_TRIGGER
-int tmp007_reg_read(struct tmp007_data *drv_data, u8_t reg, u16_t *val);
+int tmp007_reg_read(struct tmp007_data *drv_data, uint8_t reg, uint16_t *val);
 
-int tmp007_reg_write(struct tmp007_data *drv_data, u8_t reg, u16_t val);
+int tmp007_reg_write(struct tmp007_data *drv_data, uint8_t reg, uint16_t val);
 
-int tmp007_reg_update(struct tmp007_data *drv_data, u8_t reg,
-		      u16_t mask, u16_t val);
+int tmp007_reg_update(struct tmp007_data *drv_data, uint8_t reg,
+		      uint16_t mask, uint16_t val);
 
 int tmp007_attr_set(struct device *dev,
 		    enum sensor_channel chan,
diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c
index d59c533950..2d9f41cb26 100644
--- a/drivers/sensor/tmp007/tmp007_trigger.c
+++ b/drivers/sensor/tmp007/tmp007_trigger.c
@@ -37,8 +37,8 @@ int tmp007_attr_set(struct device *dev,
 		    const struct sensor_value *val)
 {
 	struct tmp007_data *drv_data = dev->driver_data;
-	s64_t value;
-	u8_t reg;
+	int64_t value;
+	uint8_t reg;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -52,7 +52,7 @@ int tmp007_attr_set(struct device *dev,
 		return -ENOTSUP;
 	}
 
-	value = (s64_t)val->val1 * 1000000 + val->val2;
+	value = (int64_t)val->val1 * 1000000 + val->val2;
 	value = (value / TMP007_TEMP_TH_SCALE) << 6;
 
 	if (tmp007_reg_write(drv_data, reg, value) < 0) {
@@ -64,7 +64,7 @@ int tmp007_attr_set(struct device *dev,
 }
 
 static void tmp007_gpio_callback(struct device *dev,
-				 struct gpio_callback *cb, u32_t pins)
+				 struct gpio_callback *cb, uint32_t pins)
 {
 	struct tmp007_data *drv_data =
 		CONTAINER_OF(cb, struct tmp007_data, gpio_cb);
@@ -82,7 +82,7 @@ static void tmp007_thread_cb(void *arg)
 {
 	struct device *dev = arg;
 	struct tmp007_data *drv_data = dev->driver_data;
-	u16_t status;
+	uint16_t status;
 
 	if (tmp007_reg_read(drv_data, TMP007_REG_STATUS, &status) < 0) {
 		return;
diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c
index 5f36634cc3..40ef5cdf2a 100644
--- a/drivers/sensor/tmp112/tmp112.c
+++ b/drivers/sensor/tmp112/tmp112.c
@@ -32,14 +32,14 @@ LOG_MODULE_REGISTER(TMP112, CONFIG_SENSOR_LOG_LEVEL);
 
 struct tmp112_data {
 	struct device *i2c;
-	s16_t sample;
+	int16_t sample;
 };
 
 static int tmp112_reg_read(struct tmp112_data *drv_data,
-			   u8_t reg, u16_t *val)
+			   uint8_t reg, uint16_t *val)
 {
 	if (i2c_burst_read(drv_data->i2c, TMP112_I2C_ADDRESS,
-			   reg, (u8_t *) val, 2) < 0) {
+			   reg, (uint8_t *) val, 2) < 0) {
 		return -EIO;
 	}
 
@@ -49,19 +49,19 @@ static int tmp112_reg_read(struct tmp112_data *drv_data,
 }
 
 static int tmp112_reg_write(struct tmp112_data *drv_data,
-			    u8_t reg, u16_t val)
+			    uint8_t reg, uint16_t val)
 {
-	u16_t val_be = sys_cpu_to_be16(val);
+	uint16_t val_be = sys_cpu_to_be16(val);
 
 	return i2c_burst_write(drv_data->i2c, TMP112_I2C_ADDRESS,
-			       reg, (u8_t *)&val_be, 2);
+			       reg, (uint8_t *)&val_be, 2);
 }
 
-static int tmp112_reg_update(struct tmp112_data *drv_data, u8_t reg,
-			     u16_t mask, u16_t val)
+static int tmp112_reg_update(struct tmp112_data *drv_data, uint8_t reg,
+			     uint16_t mask, uint16_t val)
 {
-	u16_t old_val = 0U;
-	u16_t new_val;
+	uint16_t old_val = 0U;
+	uint16_t new_val;
 
 	if (tmp112_reg_read(drv_data, reg, &old_val) < 0) {
 		return -EIO;
@@ -79,8 +79,8 @@ static int tmp112_attr_set(struct device *dev,
 			   const struct sensor_value *val)
 {
 	struct tmp112_data *drv_data = dev->driver_data;
-	s64_t value;
-	u16_t cr;
+	int64_t value;
+	uint16_t cr;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -152,7 +152,7 @@ static int tmp112_attr_set(struct device *dev,
 static int tmp112_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct tmp112_data *drv_data = dev->driver_data;
-	u16_t val;
+	uint16_t val;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP);
 
@@ -161,9 +161,9 @@ static int tmp112_sample_fetch(struct device *dev, enum sensor_channel chan)
 	}
 
 	if (val & TMP112_D0_BIT) {
-		drv_data->sample = arithmetic_shift_right((s16_t)val, 3);
+		drv_data->sample = arithmetic_shift_right((int16_t)val, 3);
 	} else {
-		drv_data->sample = arithmetic_shift_right((s16_t)val, 4);
+		drv_data->sample = arithmetic_shift_right((int16_t)val, 4);
 	}
 
 	return 0;
@@ -174,13 +174,13 @@ static int tmp112_channel_get(struct device *dev,
 		struct sensor_value *val)
 {
 	struct tmp112_data *drv_data = dev->driver_data;
-	s32_t uval;
+	int32_t uval;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
 	}
 
-	uval = (s32_t)drv_data->sample * TMP112_TEMP_SCALE;
+	uval = (int32_t)drv_data->sample * TMP112_TEMP_SCALE;
 	val->val1 = uval / 1000000;
 	val->val2 = uval % 1000000;
 
diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c
index a6849fcafe..0b0b45ccce 100644
--- a/drivers/sensor/tmp116/tmp116.c
+++ b/drivers/sensor/tmp116/tmp116.c
@@ -20,12 +20,12 @@
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 LOG_MODULE_REGISTER(TMP116);
 
-static int tmp116_reg_read(struct device *dev, u8_t reg, u16_t *val)
+static int tmp116_reg_read(struct device *dev, uint8_t reg, uint16_t *val)
 {
 	struct tmp116_data *drv_data = dev->driver_data;
 	const struct tmp116_dev_config *cfg = dev->config_info;
 
-	if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, reg, (u8_t *)val, 2)
+	if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, reg, (uint8_t *)val, 2)
 	    < 0) {
 		return -EIO;
 	}
@@ -45,7 +45,7 @@ static int tmp116_reg_read(struct device *dev, u8_t reg, u16_t *val)
  */
 static inline int tmp116_device_id_check(struct device *dev)
 {
-	u16_t value;
+	uint16_t value;
 
 	if (tmp116_reg_read(dev, TMP116_REG_DEVICE_ID, &value) != 0) {
 		LOG_ERR("%s: Failed to get Device ID register!",
@@ -65,7 +65,7 @@ static inline int tmp116_device_id_check(struct device *dev)
 static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan)
 {
 	struct tmp116_data *drv_data = dev->driver_data;
-	u16_t value;
+	uint16_t value;
 	int rc;
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL ||
@@ -83,7 +83,7 @@ static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan)
 	}
 
 	/* store measurements to the driver */
-	drv_data->sample = (s16_t)value;
+	drv_data->sample = (int16_t)value;
 
 	return 0;
 }
@@ -92,7 +92,7 @@ static int tmp116_channel_get(struct device *dev, enum sensor_channel chan,
 			      struct sensor_value *val)
 {
 	struct tmp116_data *drv_data = dev->driver_data;
-	s32_t tmp;
+	int32_t tmp;
 
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP) {
 		return -ENOTSUP;
@@ -102,7 +102,7 @@ static int tmp116_channel_get(struct device *dev, enum sensor_channel chan,
 	 * See datasheet "Temperature Results and Limits" section for more
 	 * details on processing sample data.
 	 */
-	tmp = ((s16_t)drv_data->sample * (s32_t)TMP116_RESOLUTION) / 10;
+	tmp = ((int16_t)drv_data->sample * (int32_t)TMP116_RESOLUTION) / 10;
 	val->val1 = tmp / 1000000; /* uCelsius */
 	val->val2 = tmp % 1000000;
 
diff --git a/drivers/sensor/tmp116/tmp116.h b/drivers/sensor/tmp116/tmp116.h
index da6acdc10e..5c7202b7e0 100644
--- a/drivers/sensor/tmp116/tmp116.h
+++ b/drivers/sensor/tmp116/tmp116.h
@@ -26,11 +26,11 @@
 
 struct tmp116_data {
 	struct device *i2c;
-	u16_t sample;
+	uint16_t sample;
 };
 
 struct tmp116_dev_config {
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 };
 
 #endif /*  ZEPHYR_DRIVERS_SENSOR_TMP116_TMP116_H_ */
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index 50c9e39fea..2c8cb79fa0 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/drivers/sensor/vl53l0x/vl53l0x.c
@@ -99,10 +99,10 @@ static int vl53l0x_setup_single_shot(struct device *dev)
 {
 	struct vl53l0x_data *drv_data = dev->driver_data;
 	int ret;
-	u8_t VhvSettings;
-	u8_t PhaseCal;
-	u32_t refSpadCount;
-	u8_t isApertureSpads;
+	uint8_t VhvSettings;
+	uint8_t PhaseCal;
+	uint32_t refSpadCount;
+	uint8_t isApertureSpads;
 
 	ret = VL53L0X_StaticInit(&drv_data->vl53l0x);
 	if (ret) {
@@ -199,7 +199,7 @@ static int vl53l0x_init(struct device *dev)
 {
 	struct vl53l0x_data *drv_data = dev->driver_data;
 	VL53L0X_Error ret;
-	u16_t vl53l0x_id = 0U;
+	uint16_t vl53l0x_id = 0U;
 	VL53L0X_DeviceInfo_t vl53l0x_dev_info;
 
 	LOG_DBG("enter in %s", __func__);
diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.c b/drivers/sensor/vl53l0x/vl53l0x_platform.c
index 0b004a1d26..ad57c35676 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_platform.c
+++ b/drivers/sensor/vl53l0x/vl53l0x_platform.c
@@ -174,7 +174,7 @@ VL53L0X_Error  VL53L0X_RdDWord(VL53L0X_DEV Dev, uint8_t index, uint32_t *data)
 {
 	VL53L0X_Error Status = VL53L0X_ERROR_NONE;
 	int32_t status_int;
-	u8_t buf[4];
+	uint8_t buf[4];
 
 	status_int = i2c_burst_read(Dev->i2c, Dev->I2cDevAddr, index, buf, 4);
 	if (status_int < 0) {
diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c
index 931e73c135..3eebcb24c5 100644
--- a/drivers/serial/leuart_gecko.c
+++ b/drivers/serial/leuart_gecko.c
@@ -28,17 +28,17 @@
 struct leuart_gecko_config {
 	LEUART_TypeDef *base;
 	CMU_Clock_TypeDef clock;
-	u32_t baud_rate;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
 	struct soc_gpio_pin pin_rx;
 	struct soc_gpio_pin pin_tx;
 #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
-	u8_t loc_rx;
-	u8_t loc_tx;
+	uint8_t loc_rx;
+	uint8_t loc_tx;
 #else
-	u8_t loc;
+	uint8_t loc;
 #endif
 };
 
@@ -52,7 +52,7 @@ struct leuart_gecko_data {
 static int leuart_gecko_poll_in(struct device *dev, unsigned char *c)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t flags = LEUART_StatusGet(base);
+	uint32_t flags = LEUART_StatusGet(base);
 
 	if (flags & LEUART_STATUS_RXDATAV) {
 		*c = LEUART_Rx(base);
@@ -75,7 +75,7 @@ static void leuart_gecko_poll_out(struct device *dev, unsigned char c)
 static int leuart_gecko_err_check(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t flags = LEUART_IntGet(base);
+	uint32_t flags = LEUART_IntGet(base);
 	int err = 0;
 
 	if (flags & LEUART_IF_RXOF) {
@@ -98,31 +98,31 @@ static int leuart_gecko_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int leuart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int leuart_gecko_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (base->STATUS & LEUART_STATUS_TXBL)) {
 
-		base->TXDATA = (u32_t)tx_data[num_tx++];
+		base->TXDATA = (uint32_t)tx_data[num_tx++];
 	}
 
 	return num_tx;
 }
 
-static int leuart_gecko_fifo_read(struct device *dev, u8_t *rx_data,
+static int leuart_gecko_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (base->STATUS & LEUART_STATUS_RXDATAV)) {
 
-		rx_data[num_rx++] = (u8_t)base->RXDATA;
+		rx_data[num_rx++] = (uint8_t)base->RXDATA;
 	}
 
 	return num_rx;
@@ -131,7 +131,7 @@ static int leuart_gecko_fifo_read(struct device *dev, u8_t *rx_data,
 static void leuart_gecko_irq_tx_enable(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC;
+	uint32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC;
 
 	LEUART_IntEnable(base, mask);
 }
@@ -139,7 +139,7 @@ static void leuart_gecko_irq_tx_enable(struct device *dev)
 static void leuart_gecko_irq_tx_disable(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC;
+	uint32_t mask = LEUART_IEN_TXBL | LEUART_IEN_TXC;
 
 	LEUART_IntDisable(base, mask);
 }
@@ -147,7 +147,7 @@ static void leuart_gecko_irq_tx_disable(struct device *dev)
 static int leuart_gecko_irq_tx_complete(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t flags = LEUART_IntGet(base);
+	uint32_t flags = LEUART_IntGet(base);
 
 	return (flags & LEUART_IF_TXC) != 0U;
 }
@@ -155,7 +155,7 @@ static int leuart_gecko_irq_tx_complete(struct device *dev)
 static int leuart_gecko_irq_tx_ready(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t flags = LEUART_IntGet(base);
+	uint32_t flags = LEUART_IntGet(base);
 
 	return (flags & LEUART_IF_TXBL) != 0U;
 }
@@ -163,7 +163,7 @@ static int leuart_gecko_irq_tx_ready(struct device *dev)
 static void leuart_gecko_irq_rx_enable(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t mask = LEUART_IEN_RXDATAV;
+	uint32_t mask = LEUART_IEN_RXDATAV;
 
 	LEUART_IntEnable(base, mask);
 }
@@ -171,7 +171,7 @@ static void leuart_gecko_irq_rx_enable(struct device *dev)
 static void leuart_gecko_irq_rx_disable(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t mask = LEUART_IEN_RXDATAV;
+	uint32_t mask = LEUART_IEN_RXDATAV;
 
 	LEUART_IntDisable(base, mask);
 }
@@ -179,7 +179,7 @@ static void leuart_gecko_irq_rx_disable(struct device *dev)
 static int leuart_gecko_irq_rx_full(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t flags = LEUART_IntGet(base);
+	uint32_t flags = LEUART_IntGet(base);
 
 	return (flags & LEUART_IF_RXDATAV) != 0U;
 }
@@ -187,7 +187,7 @@ static int leuart_gecko_irq_rx_full(struct device *dev)
 static int leuart_gecko_irq_rx_ready(struct device *dev)
 {
 	LEUART_TypeDef *base = DEV_BASE(dev);
-	u32_t mask = LEUART_IEN_RXDATAV;
+	uint32_t mask = LEUART_IEN_RXDATAV;
 
 	return (base->IEN & mask)
 		&& leuart_gecko_irq_rx_full(dev);
diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c
index fe35720c9a..31e77dd50f 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/drivers/serial/uart_cc13xx_cc26xx.c
@@ -36,7 +36,7 @@ struct uart_cc13xx_cc26xx_data {
 	bool rx_constrained;
 #endif
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -74,7 +74,7 @@ static void uart_cc13xx_cc26xx_poll_out(struct device *dev, unsigned char c)
 
 static int uart_cc13xx_cc26xx_err_check(struct device *dev)
 {
-	u32_t flags = UARTRxErrorGet(get_dev_conf(dev)->regs);
+	uint32_t flags = UARTRxErrorGet(get_dev_conf(dev)->regs);
 
 	int error = (flags & UART_RXERROR_FRAMING ? UART_ERROR_FRAMING : 0) |
 		    (flags & UART_RXERROR_PARITY ? UART_ERROR_PARITY : 0) |
@@ -89,7 +89,7 @@ static int uart_cc13xx_cc26xx_err_check(struct device *dev)
 static int uart_cc13xx_cc26xx_configure(struct device *dev,
 					const struct uart_config *cfg)
 {
-	u32_t line_ctrl = 0;
+	uint32_t line_ctrl = 0;
 	bool flow_ctrl;
 
 	switch (cfg->parity) {
@@ -193,7 +193,7 @@ static int uart_cc13xx_cc26xx_config_get(struct device *dev,
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
-static int uart_cc13xx_cc26xx_fifo_fill(struct device *dev, const u8_t *buf,
+static int uart_cc13xx_cc26xx_fifo_fill(struct device *dev, const uint8_t *buf,
 					int len)
 {
 	int n = 0;
@@ -208,7 +208,7 @@ static int uart_cc13xx_cc26xx_fifo_fill(struct device *dev, const u8_t *buf,
 	return n;
 }
 
-static int uart_cc13xx_cc26xx_fifo_read(struct device *dev, u8_t *buf,
+static int uart_cc13xx_cc26xx_fifo_read(struct device *dev, uint8_t *buf,
 					const int len)
 {
 	int c, n;
@@ -323,7 +323,7 @@ static void uart_cc13xx_cc26xx_irq_err_disable(struct device *dev)
 
 static int uart_cc13xx_cc26xx_irq_is_pending(struct device *dev)
 {
-	u32_t status = UARTIntStatus(get_dev_conf(dev)->regs, true);
+	uint32_t status = UARTIntStatus(get_dev_conf(dev)->regs, true);
 
 	return status & (UART_INT_TX | UART_INT_RX) ? 1 : 0;
 }
@@ -368,7 +368,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
 {
 	struct device *dev = (struct device *)clientArg;
 	int ret = Power_NOTIFYDONE;
-	s16_t res_id;
+	int16_t res_id;
 
 	/* Reconfigure the hardware if returning from standby */
 	if (eventType == PowerCC26XX_AWAKE_STANDBY) {
@@ -397,7 +397,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 static int uart_cc13xx_cc26xx_set_power_state(struct device *dev,
-	u32_t new_state)
+	uint32_t new_state)
 {
 	int ret = 0;
 
@@ -441,13 +441,13 @@ static int uart_cc13xx_cc26xx_set_power_state(struct device *dev,
 	return ret;
 }
 
-static int uart_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
+static int uart_cc13xx_cc26xx_pm_control(struct device *dev, uint32_t ctrl_command,
 	void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != get_dev_data(dev)->pm_state) {
 			ret = uart_cc13xx_cc26xx_set_power_state(dev,
@@ -455,7 +455,7 @@ static int uart_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = get_dev_data(dev)->pm_state;
+		*((uint32_t *)context) = get_dev_data(dev)->pm_state;
 	}
 
 	if (cb) {
@@ -511,7 +511,7 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = {
 #else
 #define UART_CC13XX_CC26XX_POWER_UART(n)				\
 	do {								\
-		u32_t domain, periph;					\
+		uint32_t domain, periph;					\
 									\
 		/* Enable UART power domain */				\
 		if (DT_INST_REG_ADDR(n) == 0x40001000) {		\
diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c
index 4fca768404..9655c3790a 100644
--- a/drivers/serial/uart_cc32xx.c
+++ b/drivers/serial/uart_cc32xx.c
@@ -133,7 +133,7 @@ static int uart_cc32xx_err_check(struct device *dev)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
-static int uart_cc32xx_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_cc32xx_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				 int size)
 {
 	const struct uart_device_config *config = DEV_CFG(dev);
@@ -152,7 +152,7 @@ static int uart_cc32xx_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return (int)num_tx;
 }
 
-static int uart_cc32xx_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_cc32xx_fifo_read(struct device *dev, uint8_t *rx_data,
 				 const int size)
 {
 	const struct uart_device_config *config = DEV_CFG(dev);
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index dc297ffa7c..da51517982 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -23,19 +23,19 @@
 /* UART registers struct */
 struct uart_cmsdk_apb {
 	/* offset: 0x000 (r/w) data register    */
-	volatile u32_t  data;
+	volatile uint32_t  data;
 	/* offset: 0x004 (r/w) status register  */
-	volatile u32_t  state;
+	volatile uint32_t  state;
 	/* offset: 0x008 (r/w) control register */
-	volatile u32_t  ctrl;
+	volatile uint32_t  ctrl;
 	union {
 		/* offset: 0x00c (r/ ) interrupt status register */
-		volatile u32_t  intstatus;
+		volatile uint32_t  intstatus;
 		/* offset: 0x00c ( /w) interrupt clear register  */
-		volatile u32_t  intclear;
+		volatile uint32_t  intclear;
 	};
 	/* offset: 0x010 (r/w) baudrate divider register */
-	volatile u32_t  bauddiv;
+	volatile uint32_t  bauddiv;
 };
 
 /* UART Bits */
@@ -62,7 +62,7 @@ struct uart_cmsdk_apb {
 
 /* Device data structure */
 struct uart_cmsdk_apb_dev_data {
-	u32_t baud_rate;	/* Baud rate */
+	uint32_t baud_rate;	/* Baud rate */
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t irq_cb;
 	void *irq_cb_data;
@@ -199,7 +199,7 @@ static void uart_cmsdk_apb_poll_out(struct device *dev,
 	}
 
 	/* Send a character */
-	uart->data = (u32_t)c;
+	uart->data = (uint32_t)c;
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -213,7 +213,7 @@ static void uart_cmsdk_apb_poll_out(struct device *dev,
  * @return the number of characters that have been read
  */
 static int uart_cmsdk_apb_fifo_fill(struct device *dev,
-				    const u8_t *tx_data, int len)
+				    const uint8_t *tx_data, int len)
 {
 	volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev);
 
@@ -236,7 +236,7 @@ static int uart_cmsdk_apb_fifo_fill(struct device *dev,
  * @return the number of characters that have been read
  */
 static int uart_cmsdk_apb_fifo_read(struct device *dev,
-				    u8_t *rx_data, const int size)
+				    uint8_t *rx_data, const int size)
 {
 	volatile struct uart_cmsdk_apb *uart = UART_STRUCT(dev);
 
@@ -465,7 +465,7 @@ static void uart_cmsdk_apb_irq_config_func_0(struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cmsdk_apb_dev_cfg_0 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(0),
+	.base = (uint8_t *)DT_INST_REG_ADDR(0),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(0, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_0,
@@ -530,7 +530,7 @@ static void uart_cmsdk_apb_irq_config_func_1(struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cmsdk_apb_dev_cfg_1 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(1),
+	.base = (uint8_t *)DT_INST_REG_ADDR(1),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(1, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_1,
@@ -595,7 +595,7 @@ static void uart_cmsdk_apb_irq_config_func_2(struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cmsdk_apb_dev_cfg_2 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(2),
+	.base = (uint8_t *)DT_INST_REG_ADDR(2),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(2, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_2,
@@ -660,7 +660,7 @@ static void uart_cmsdk_apb_irq_config_func_3(struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cmsdk_apb_dev_cfg_3 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(3),
+	.base = (uint8_t *)DT_INST_REG_ADDR(3),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(3, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_3,
@@ -725,7 +725,7 @@ static void uart_cmsdk_apb_irq_config_func_4(struct device *dev);
 #endif
 
 static const struct uart_device_config uart_cmsdk_apb_dev_cfg_4 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(4),
+	.base = (uint8_t *)DT_INST_REG_ADDR(4),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(4, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = uart_cmsdk_apb_irq_config_func_4,
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
index 08822b0d31..e01fb99816 100644
--- a/drivers/serial/uart_esp32.c
+++ b/drivers/serial/uart_esp32.c
@@ -25,38 +25,38 @@
  * ESP32 UARTx register map structure
  */
 struct uart_esp32_regs_t {
-	u32_t fifo;
-	u32_t int_raw;
-	u32_t int_st;
-	u32_t int_ena;
-	u32_t int_clr;
-	u32_t clk_div;
-	u32_t auto_baud;
-	u32_t status;
-	u32_t conf0;
-	u32_t conf1;
-	u32_t lowpulse;
-	u32_t highpulse;
-	u32_t rxd_cnt;
-	u32_t flow_conf;
-	u32_t sleep_conf;
-	u32_t swfc_conf;
-	u32_t idle_conf;
-	u32_t rs485_conf;
-	u32_t at_cmd_precnt;
-	u32_t at_cmd_postcnt;
-	u32_t at_cmd_gaptout;
-	u32_t at_cmd_char;
-	u32_t mem_conf;
-	u32_t mem_tx_status;
-	u32_t mem_rx_status;
-	u32_t mem_cnt_status;
-	u32_t pospulse;
-	u32_t negpulse;
-	u32_t reserved_0;
-	u32_t reserved_1;
-	u32_t date;
-	u32_t id;
+	uint32_t fifo;
+	uint32_t int_raw;
+	uint32_t int_st;
+	uint32_t int_ena;
+	uint32_t int_clr;
+	uint32_t clk_div;
+	uint32_t auto_baud;
+	uint32_t status;
+	uint32_t conf0;
+	uint32_t conf1;
+	uint32_t lowpulse;
+	uint32_t highpulse;
+	uint32_t rxd_cnt;
+	uint32_t flow_conf;
+	uint32_t sleep_conf;
+	uint32_t swfc_conf;
+	uint32_t idle_conf;
+	uint32_t rs485_conf;
+	uint32_t at_cmd_precnt;
+	uint32_t at_cmd_postcnt;
+	uint32_t at_cmd_gaptout;
+	uint32_t at_cmd_char;
+	uint32_t mem_conf;
+	uint32_t mem_tx_status;
+	uint32_t mem_rx_status;
+	uint32_t mem_cnt_status;
+	uint32_t pospulse;
+	uint32_t negpulse;
+	uint32_t reserved_0;
+	uint32_t reserved_1;
+	uint32_t date;
+	uint32_t id;
 };
 
 struct uart_esp32_config {
@@ -147,12 +147,12 @@ static void uart_esp32_poll_out(struct device *dev,
 	}
 
 	/* Send a character */
-	DEV_BASE(dev)->fifo = (u32_t)c;
+	DEV_BASE(dev)->fifo = (uint32_t)c;
 }
 
 static int uart_esp32_err_check(struct device *dev)
 {
-	u32_t err = UART_GET_PARITY_ERR(DEV_BASE(dev)->int_st)
+	uint32_t err = UART_GET_PARITY_ERR(DEV_BASE(dev)->int_st)
 		    | UART_GET_FRAME_ERR(DEV_BASE(dev)->int_st);
 
 	return err;
@@ -185,8 +185,8 @@ static int uart_esp32_config_get(struct device *dev, struct uart_config *cfg)
 
 static int uart_esp32_set_baudrate(struct device *dev, int baudrate)
 {
-	u32_t sys_clk_freq = DEV_CFG(dev)->dev_conf.sys_clk_freq;
-	u32_t clk_div = (((sys_clk_freq) << 4) / baudrate);
+	uint32_t sys_clk_freq = DEV_CFG(dev)->dev_conf.sys_clk_freq;
+	uint32_t clk_div = (((sys_clk_freq) << 4) / baudrate);
 
 	while (UART_TXFIFO_COUNT(DEV_BASE(dev)->status)) {
 		; /* Wait */
@@ -232,8 +232,8 @@ static int uart_esp32_configure_pins(struct device *dev)
 static int uart_esp32_configure(struct device *dev,
 				const struct uart_config *cfg)
 {
-	u32_t conf0 = UART_TICK_REF_ALWAYS_ON;
-	u32_t conf1 = (UART_RX_FIFO_THRESH << UART_RXFIFO_FULL_THRHD_S)
+	uint32_t conf0 = UART_TICK_REF_ALWAYS_ON;
+	uint32_t conf1 = (UART_RX_FIFO_THRESH << UART_RXFIFO_FULL_THRHD_S)
 		      | (UART_TX_FIFO_THRESH << UART_TXFIFO_EMPTY_THRHD_S);
 
 	uart_esp32_configure_pins(dev);
@@ -317,22 +317,22 @@ static int uart_esp32_init(struct device *dev)
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
 static int uart_esp32_fifo_fill(struct device *dev,
-				const u8_t *tx_data, int len)
+				const uint8_t *tx_data, int len)
 {
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       UART_TXFIFO_COUNT(DEV_BASE(dev)->status) < UART_FIFO_LIMIT) {
-		DEV_BASE(dev)->fifo = (u32_t)tx_data[num_tx++];
+		DEV_BASE(dev)->fifo = (uint32_t)tx_data[num_tx++];
 	}
 
 	return num_tx;
 }
 
 static int uart_esp32_fifo_read(struct device *dev,
-				u8_t *rx_data, const int len)
+				uint8_t *rx_data, const int len)
 {
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (UART_RXFIFO_COUNT(DEV_BASE(dev)->status) != 0)) {
@@ -482,7 +482,7 @@ ESP32_UART_IRQ_HANDLER_DECL(idx);					       \
 static const struct uart_esp32_config uart_esp32_cfg_port_##idx = {	       \
 	.dev_conf = {							       \
 		.base =							       \
-		    (u8_t *)DT_INST_REG_ADDR(idx), \
+		    (uint8_t *)DT_INST_REG_ADDR(idx), \
 		.sys_clk_freq =						       \
 			DT_PROP(DT_INST(0, cadence_tensilica_xtensa_lx6), clock_frequency),\
 		ESP32_UART_IRQ_HANDLER_FUNC(idx)			       \
diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c
index 1dd8e8949b..f850f6a01e 100644
--- a/drivers/serial/uart_gecko.c
+++ b/drivers/serial/uart_gecko.c
@@ -21,17 +21,17 @@
 struct uart_gecko_config {
 	USART_TypeDef *base;
 	CMU_Clock_TypeDef clock;
-	u32_t baud_rate;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
 	struct soc_gpio_pin pin_rx;
 	struct soc_gpio_pin pin_tx;
 #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
-	u8_t loc_rx;
-	u8_t loc_tx;
+	uint8_t loc_rx;
+	uint8_t loc_tx;
 #else
-	u8_t loc;
+	uint8_t loc;
 #endif
 };
 
@@ -45,7 +45,7 @@ struct uart_gecko_data {
 static int uart_gecko_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t flags = USART_StatusGet(config->base);
+	uint32_t flags = USART_StatusGet(config->base);
 
 	if (flags & USART_STATUS_RXDATAV) {
 		*c = USART_Rx(config->base);
@@ -65,7 +65,7 @@ static void uart_gecko_poll_out(struct device *dev, unsigned char c)
 static int uart_gecko_err_check(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t flags = USART_IntGet(config->base);
+	uint32_t flags = USART_IntGet(config->base);
 	int err = 0;
 
 	if (flags & USART_IF_RXOF) {
@@ -88,31 +88,31 @@ static int uart_gecko_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int uart_gecko_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_gecko_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (config->base->STATUS & USART_STATUS_TXBL)) {
 
-		config->base->TXDATA = (u32_t)tx_data[num_tx++];
+		config->base->TXDATA = (uint32_t)tx_data[num_tx++];
 	}
 
 	return num_tx;
 }
 
-static int uart_gecko_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_gecko_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (config->base->STATUS & USART_STATUS_RXDATAV)) {
 
-		rx_data[num_rx++] = (u8_t)config->base->RXDATA;
+		rx_data[num_rx++] = (uint8_t)config->base->RXDATA;
 	}
 
 	return num_rx;
@@ -121,7 +121,7 @@ static int uart_gecko_fifo_read(struct device *dev, u8_t *rx_data,
 static void uart_gecko_irq_tx_enable(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t mask = USART_IEN_TXBL | USART_IEN_TXC;
+	uint32_t mask = USART_IEN_TXBL | USART_IEN_TXC;
 
 	USART_IntEnable(config->base, mask);
 }
@@ -129,7 +129,7 @@ static void uart_gecko_irq_tx_enable(struct device *dev)
 static void uart_gecko_irq_tx_disable(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t mask = USART_IEN_TXBL | USART_IEN_TXC;
+	uint32_t mask = USART_IEN_TXBL | USART_IEN_TXC;
 
 	USART_IntDisable(config->base, mask);
 }
@@ -137,7 +137,7 @@ static void uart_gecko_irq_tx_disable(struct device *dev)
 static int uart_gecko_irq_tx_complete(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t flags = USART_IntGet(config->base);
+	uint32_t flags = USART_IntGet(config->base);
 
 	USART_IntClear(config->base, USART_IF_TXC);
 
@@ -147,7 +147,7 @@ static int uart_gecko_irq_tx_complete(struct device *dev)
 static int uart_gecko_irq_tx_ready(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t flags = USART_IntGet(config->base);
+	uint32_t flags = USART_IntGet(config->base);
 
 	return (flags & USART_IF_TXBL) != 0U;
 }
@@ -155,7 +155,7 @@ static int uart_gecko_irq_tx_ready(struct device *dev)
 static void uart_gecko_irq_rx_enable(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t mask = USART_IEN_RXDATAV;
+	uint32_t mask = USART_IEN_RXDATAV;
 
 	USART_IntEnable(config->base, mask);
 }
@@ -163,7 +163,7 @@ static void uart_gecko_irq_rx_enable(struct device *dev)
 static void uart_gecko_irq_rx_disable(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t mask = USART_IEN_RXDATAV;
+	uint32_t mask = USART_IEN_RXDATAV;
 
 	USART_IntDisable(config->base, mask);
 }
@@ -171,7 +171,7 @@ static void uart_gecko_irq_rx_disable(struct device *dev)
 static int uart_gecko_irq_rx_full(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t flags = USART_IntGet(config->base);
+	uint32_t flags = USART_IntGet(config->base);
 
 	return (flags & USART_IF_RXDATAV) != 0U;
 }
@@ -179,7 +179,7 @@ static int uart_gecko_irq_rx_full(struct device *dev)
 static int uart_gecko_irq_rx_ready(struct device *dev)
 {
 	const struct uart_gecko_config *config = dev->config_info;
-	u32_t mask = USART_IEN_RXDATAV;
+	uint32_t mask = USART_IEN_RXDATAV;
 
 	return (config->base->IEN & mask)
 		&& uart_gecko_irq_rx_full(dev);
diff --git a/drivers/serial/uart_handlers.c b/drivers/serial/uart_handlers.c
index 6c100dd4a7..b8d0c8d374 100644
--- a/drivers/serial/uart_handlers.c
+++ b/drivers/serial/uart_handlers.c
@@ -68,8 +68,8 @@ static inline int z_vrfy_uart_configure(struct device *dev,
  * rx_buf_rsp() excluded as it's designed to be called from ISR callbacks
  */
 
-static inline int z_vrfy_uart_tx(struct device *dev, const u8_t *buf,
-				 size_t len, s32_t timeout)
+static inline int z_vrfy_uart_tx(struct device *dev, const uint8_t *buf,
+				 size_t len, int32_t timeout)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, tx));
 	Z_OOPS(Z_SYSCALL_MEMORY_READ(buf, len));
@@ -80,8 +80,8 @@ static inline int z_vrfy_uart_tx(struct device *dev, const u8_t *buf,
 UART_SIMPLE(tx_abort);
 #include <syscalls/uart_tx_abort_mrsh.c>
 
-static inline int z_vrfy_uart_rx_enable(struct device *dev, u8_t *buf,
-					size_t len, s32_t timeout)
+static inline int z_vrfy_uart_rx_enable(struct device *dev, uint8_t *buf,
+					size_t len, int32_t timeout)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, rx_enable));
 	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(buf, len));
@@ -114,7 +114,7 @@ UART_SIMPLE(irq_update)
 
 #ifdef CONFIG_UART_LINE_CTRL
 static inline int z_vrfy_uart_line_ctrl_set(struct device *dev,
-					    u32_t ctrl, u32_t val)
+					    uint32_t ctrl, uint32_t val)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, line_ctrl_set));
 	return z_impl_uart_line_ctrl_set((struct device *)dev, ctrl, val);
@@ -122,18 +122,18 @@ static inline int z_vrfy_uart_line_ctrl_set(struct device *dev,
 #include <syscalls/uart_line_ctrl_set_mrsh.c>
 
 static inline int z_vrfy_uart_line_ctrl_get(struct device *dev,
-					    u32_t ctrl, u32_t *val)
+					    uint32_t ctrl, uint32_t *val)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, line_ctrl_get));
-	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(val, sizeof(u32_t)));
+	Z_OOPS(Z_SYSCALL_MEMORY_WRITE(val, sizeof(uint32_t)));
 	return z_impl_uart_line_ctrl_get((struct device *)dev, ctrl,
-					(u32_t *)val);
+					(uint32_t *)val);
 }
 #include <syscalls/uart_line_ctrl_get_mrsh.c>
 #endif /* CONFIG_UART_LINE_CTRL */
 
 #ifdef CONFIG_UART_DRV_CMD
-static inline int z_vrfy_uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p)
+static inline int z_vrfy_uart_drv_cmd(struct device *dev, uint32_t cmd, uint32_t p)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_UART(dev, drv_cmd));
 	return z_impl_uart_drv_cmd((struct device *)dev, cmd, p);
diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c
index 7263565b21..bf56e96182 100644
--- a/drivers/serial/uart_imx.c
+++ b/drivers/serial/uart_imx.c
@@ -28,8 +28,8 @@
 
 struct imx_uart_config {
 	UART_Type *base;
-	u32_t baud_rate;
-	u8_t modem_mode;
+	uint32_t baud_rate;
+	uint8_t modem_mode;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -121,7 +121,7 @@ static int uart_imx_poll_in(struct device *dev, unsigned char *c)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
-static int uart_imx_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_imx_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				  int size)
 {
 	UART_Type *uart = UART_STRUCT(dev);
@@ -137,7 +137,7 @@ static int uart_imx_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return (int)num_tx;
 }
 
-static int uart_imx_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_imx_fifo_read(struct device *dev, uint8_t *rx_data,
 				  const int size)
 {
 	UART_Type *uart = UART_STRUCT(dev);
diff --git a/drivers/serial/uart_liteuart.c b/drivers/serial/uart_liteuart.c
index d20d8ea33f..ef3462d748 100644
--- a/drivers/serial/uart_liteuart.c
+++ b/drivers/serial/uart_liteuart.c
@@ -30,9 +30,9 @@ typedef void (*irq_cfg_func_t)(void);
 #endif
 
 struct uart_liteuart_device_config {
-	u32_t port;
-	u32_t sys_clk_freq;
-	u32_t baud_rate;
+	uint32_t port;
+	uint32_t sys_clk_freq;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	irq_cfg_func_t cfg_func;
 #endif
@@ -95,7 +95,7 @@ static int uart_liteuart_poll_in(struct device *dev, unsigned char *c)
  */
 static void uart_liteuart_irq_tx_enable(struct device *dev)
 {
-	u8_t enable = sys_read8(UART_EV_ENABLE);
+	uint8_t enable = sys_read8(UART_EV_ENABLE);
 
 	sys_write8(enable | UART_EV_TX, UART_EV_ENABLE);
 }
@@ -109,7 +109,7 @@ static void uart_liteuart_irq_tx_enable(struct device *dev)
  */
 static void uart_liteuart_irq_tx_disable(struct device *dev)
 {
-	u8_t enable = sys_read8(UART_EV_ENABLE);
+	uint8_t enable = sys_read8(UART_EV_ENABLE);
 
 	sys_write8(enable & ~(UART_EV_TX), UART_EV_ENABLE);
 }
@@ -123,7 +123,7 @@ static void uart_liteuart_irq_tx_disable(struct device *dev)
  */
 static void uart_liteuart_irq_rx_enable(struct device *dev)
 {
-	u8_t enable = sys_read8(UART_EV_ENABLE);
+	uint8_t enable = sys_read8(UART_EV_ENABLE);
 
 	sys_write8(enable | UART_EV_RX, UART_EV_ENABLE);
 }
@@ -137,7 +137,7 @@ static void uart_liteuart_irq_rx_enable(struct device *dev)
  */
 static void uart_liteuart_irq_rx_disable(struct device *dev)
 {
-	u8_t enable = sys_read8(UART_EV_ENABLE);
+	uint8_t enable = sys_read8(UART_EV_ENABLE);
 
 	sys_write8(enable & ~(UART_EV_RX), UART_EV_ENABLE);
 }
@@ -151,7 +151,7 @@ static void uart_liteuart_irq_rx_disable(struct device *dev)
  */
 static int uart_liteuart_irq_tx_ready(struct device *dev)
 {
-	u8_t val = sys_read8(UART_TXFULL);
+	uint8_t val = sys_read8(UART_TXFULL);
 
 	return !val;
 }
@@ -165,7 +165,7 @@ static int uart_liteuart_irq_tx_ready(struct device *dev)
  */
 static int uart_liteuart_irq_rx_ready(struct device *dev)
 {
-	u8_t pending;
+	uint8_t pending;
 
 	pending = sys_read8(UART_EV_PENDING);
 
@@ -186,7 +186,7 @@ static int uart_liteuart_irq_rx_ready(struct device *dev)
  * @return Number of bytes sent
  */
 static int uart_liteuart_fifo_fill(struct device *dev,
-		const u8_t *tx_data, int size)
+		const uint8_t *tx_data, int size)
 {
 	int i;
 
@@ -207,7 +207,7 @@ static int uart_liteuart_fifo_fill(struct device *dev,
  * @return Number of bytes read
  */
 static int uart_liteuart_fifo_read(struct device *dev,
-		u8_t *rx_data, const int size)
+		uint8_t *rx_data, const int size)
 {
 	int i;
 
@@ -237,7 +237,7 @@ static void uart_liteuart_irq_err(struct device *dev)
  */
 static int uart_liteuart_irq_is_pending(struct device *dev)
 {
-	u8_t pending;
+	uint8_t pending;
 
 	pending = sys_read8(UART_EV_PENDING);
 
diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c
index a02258538b..703fc0db68 100644
--- a/drivers/serial/uart_mcux.c
+++ b/drivers/serial/uart_mcux.c
@@ -17,8 +17,8 @@ struct uart_mcux_config {
 	UART_Type *base;
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
-	u32_t baud_rate;
-	u8_t hw_flow_control;
+	uint32_t baud_rate;
+	uint8_t hw_flow_control;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -34,7 +34,7 @@ struct uart_mcux_data {
 static int uart_mcux_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t flags = UART_GetStatusFlags(config->base);
+	uint32_t flags = UART_GetStatusFlags(config->base);
 	int ret = -1;
 
 	if (flags & kUART_RxDataRegFullFlag) {
@@ -58,7 +58,7 @@ static void uart_mcux_poll_out(struct device *dev, unsigned char c)
 static int uart_mcux_err_check(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t flags = UART_GetStatusFlags(config->base);
+	uint32_t flags = UART_GetStatusFlags(config->base);
 	int err = 0;
 
 	if (flags & kUART_RxOverrunFlag) {
@@ -81,11 +81,11 @@ static int uart_mcux_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int uart_mcux_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_mcux_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (UART_GetStatusFlags(config->base) & kUART_TxDataRegEmptyFlag)) {
@@ -96,11 +96,11 @@ static int uart_mcux_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int uart_mcux_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_mcux_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (UART_GetStatusFlags(config->base) & kUART_RxDataRegFullFlag)) {
@@ -114,7 +114,7 @@ static int uart_mcux_fifo_read(struct device *dev, u8_t *rx_data,
 static void uart_mcux_irq_tx_enable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kUART_TxDataRegEmptyInterruptEnable;
 
 	UART_EnableInterrupts(config->base, mask);
 }
@@ -122,7 +122,7 @@ static void uart_mcux_irq_tx_enable(struct device *dev)
 static void uart_mcux_irq_tx_disable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kUART_TxDataRegEmptyInterruptEnable;
 
 	UART_DisableInterrupts(config->base, mask);
 }
@@ -130,7 +130,7 @@ static void uart_mcux_irq_tx_disable(struct device *dev)
 static int uart_mcux_irq_tx_complete(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t flags = UART_GetStatusFlags(config->base);
+	uint32_t flags = UART_GetStatusFlags(config->base);
 
 	return (flags & kUART_TxDataRegEmptyFlag) != 0U;
 }
@@ -138,7 +138,7 @@ static int uart_mcux_irq_tx_complete(struct device *dev)
 static int uart_mcux_irq_tx_ready(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kUART_TxDataRegEmptyInterruptEnable;
 
 	return (UART_GetEnabledInterrupts(config->base) & mask)
 		&& uart_mcux_irq_tx_complete(dev);
@@ -147,7 +147,7 @@ static int uart_mcux_irq_tx_ready(struct device *dev)
 static void uart_mcux_irq_rx_enable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kUART_RxDataRegFullInterruptEnable;
 
 	UART_EnableInterrupts(config->base, mask);
 }
@@ -155,7 +155,7 @@ static void uart_mcux_irq_rx_enable(struct device *dev)
 static void uart_mcux_irq_rx_disable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kUART_RxDataRegFullInterruptEnable;
 
 	UART_DisableInterrupts(config->base, mask);
 }
@@ -163,7 +163,7 @@ static void uart_mcux_irq_rx_disable(struct device *dev)
 static int uart_mcux_irq_rx_full(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t flags = UART_GetStatusFlags(config->base);
+	uint32_t flags = UART_GetStatusFlags(config->base);
 
 	return (flags & kUART_RxDataRegFullFlag) != 0U;
 }
@@ -171,7 +171,7 @@ static int uart_mcux_irq_rx_full(struct device *dev)
 static int uart_mcux_irq_rx_ready(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kUART_RxDataRegFullInterruptEnable;
 
 	return (UART_GetEnabledInterrupts(config->base) & mask)
 		&& uart_mcux_irq_rx_full(dev);
@@ -180,7 +180,7 @@ static int uart_mcux_irq_rx_ready(struct device *dev)
 static void uart_mcux_irq_err_enable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kUART_NoiseErrorInterruptEnable |
 			kUART_FramingErrorInterruptEnable |
 			kUART_ParityErrorInterruptEnable;
 
@@ -190,7 +190,7 @@ static void uart_mcux_irq_err_enable(struct device *dev)
 static void uart_mcux_irq_err_disable(struct device *dev)
 {
 	const struct uart_mcux_config *config = dev->config_info;
-	u32_t mask = kUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kUART_NoiseErrorInterruptEnable |
 			kUART_FramingErrorInterruptEnable |
 			kUART_ParityErrorInterruptEnable;
 
@@ -233,7 +233,7 @@ static int uart_mcux_init(struct device *dev)
 	const struct uart_mcux_config *config = dev->config_info;
 	uart_config_t uart_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	clock_dev = device_get_binding(config->clock_name);
 	if (clock_dev == NULL) {
diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c
index d625786e71..88a92ba4fa 100644
--- a/drivers/serial/uart_mcux_flexcomm.c
+++ b/drivers/serial/uart_mcux_flexcomm.c
@@ -24,8 +24,8 @@
 
 struct mcux_flexcomm_config {
 	USART_Type *base;
-	u32_t clock_source;
-	u32_t baud_rate;
+	uint32_t clock_source;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -41,7 +41,7 @@ struct mcux_flexcomm_data {
 static int mcux_flexcomm_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t flags = USART_GetStatusFlags(config->base);
+	uint32_t flags = USART_GetStatusFlags(config->base);
 	int ret = -1;
 
 	if (flags & kUSART_RxFifoFullFlag) {
@@ -67,7 +67,7 @@ static void mcux_flexcomm_poll_out(struct device *dev,
 static int mcux_flexcomm_err_check(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t flags = USART_GetStatusFlags(config->base);
+	uint32_t flags = USART_GetStatusFlags(config->base);
 	int err = 0;
 
 	if (flags & kStatus_USART_RxRingBufferOverrun) {
@@ -91,11 +91,11 @@ static int mcux_flexcomm_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int mcux_flexcomm_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int mcux_flexcomm_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (USART_GetStatusFlags(config->base)
@@ -107,11 +107,11 @@ static int mcux_flexcomm_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int mcux_flexcomm_fifo_read(struct device *dev, u8_t *rx_data,
+static int mcux_flexcomm_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (USART_GetStatusFlags(config->base)
@@ -126,7 +126,7 @@ static int mcux_flexcomm_fifo_read(struct device *dev, u8_t *rx_data,
 static void mcux_flexcomm_irq_tx_enable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_TxLevelInterruptEnable;
+	uint32_t mask = kUSART_TxLevelInterruptEnable;
 
 	USART_EnableInterrupts(config->base, mask);
 }
@@ -134,7 +134,7 @@ static void mcux_flexcomm_irq_tx_enable(struct device *dev)
 static void mcux_flexcomm_irq_tx_disable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_TxLevelInterruptEnable;
+	uint32_t mask = kUSART_TxLevelInterruptEnable;
 
 	USART_DisableInterrupts(config->base, mask);
 }
@@ -142,7 +142,7 @@ static void mcux_flexcomm_irq_tx_disable(struct device *dev)
 static int mcux_flexcomm_irq_tx_complete(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t flags = USART_GetStatusFlags(config->base);
+	uint32_t flags = USART_GetStatusFlags(config->base);
 
 	return (flags & kUSART_TxFifoEmptyFlag) != 0U;
 }
@@ -150,7 +150,7 @@ static int mcux_flexcomm_irq_tx_complete(struct device *dev)
 static int mcux_flexcomm_irq_tx_ready(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_TxLevelInterruptEnable;
+	uint32_t mask = kUSART_TxLevelInterruptEnable;
 
 	return (USART_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_flexcomm_irq_tx_complete(dev);
@@ -159,7 +159,7 @@ static int mcux_flexcomm_irq_tx_ready(struct device *dev)
 static void mcux_flexcomm_irq_rx_enable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_RxLevelInterruptEnable;
+	uint32_t mask = kUSART_RxLevelInterruptEnable;
 
 	USART_EnableInterrupts(config->base, mask);
 }
@@ -167,7 +167,7 @@ static void mcux_flexcomm_irq_rx_enable(struct device *dev)
 static void mcux_flexcomm_irq_rx_disable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_RxLevelInterruptEnable;
+	uint32_t mask = kUSART_RxLevelInterruptEnable;
 
 	USART_DisableInterrupts(config->base, mask);
 }
@@ -175,7 +175,7 @@ static void mcux_flexcomm_irq_rx_disable(struct device *dev)
 static int mcux_flexcomm_irq_rx_full(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t flags = USART_GetStatusFlags(config->base);
+	uint32_t flags = USART_GetStatusFlags(config->base);
 
 	return (flags & kUSART_RxFifoNotEmptyFlag) != 0U;
 }
@@ -183,7 +183,7 @@ static int mcux_flexcomm_irq_rx_full(struct device *dev)
 static int mcux_flexcomm_irq_rx_ready(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kUSART_RxLevelInterruptEnable;
+	uint32_t mask = kUSART_RxLevelInterruptEnable;
 
 	return (USART_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_flexcomm_irq_rx_full(dev);
@@ -192,7 +192,7 @@ static int mcux_flexcomm_irq_rx_ready(struct device *dev)
 static void mcux_flexcomm_irq_err_enable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kStatus_USART_NoiseError |
+	uint32_t mask = kStatus_USART_NoiseError |
 			kStatus_USART_FramingError |
 			kStatus_USART_ParityError;
 
@@ -202,7 +202,7 @@ static void mcux_flexcomm_irq_err_enable(struct device *dev)
 static void mcux_flexcomm_irq_err_disable(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
-	u32_t mask = kStatus_USART_NoiseError |
+	uint32_t mask = kStatus_USART_NoiseError |
 			kStatus_USART_FramingError |
 			kStatus_USART_ParityError;
 
@@ -246,7 +246,7 @@ static int mcux_flexcomm_init(struct device *dev)
 {
 	const struct mcux_flexcomm_config *config = dev->config_info;
 	usart_config_t usart_config;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	clock_freq = CLOCK_GetFlexCommClkFreq(config->clock_source);
 
diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c
index ca73e8c583..7e8d1fef10 100644
--- a/drivers/serial/uart_mcux_lpsci.c
+++ b/drivers/serial/uart_mcux_lpsci.c
@@ -17,7 +17,7 @@ struct mcux_lpsci_config {
 	UART0_Type *base;
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
-	u32_t baud_rate;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -33,7 +33,7 @@ struct mcux_lpsci_data {
 static int mcux_lpsci_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t flags = LPSCI_GetStatusFlags(config->base);
+	uint32_t flags = LPSCI_GetStatusFlags(config->base);
 	int ret = -1;
 
 	if (flags & kLPSCI_RxDataRegFullFlag) {
@@ -58,7 +58,7 @@ static void mcux_lpsci_poll_out(struct device *dev, unsigned char c)
 static int mcux_lpsci_err_check(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t flags = LPSCI_GetStatusFlags(config->base);
+	uint32_t flags = LPSCI_GetStatusFlags(config->base);
 	int err = 0;
 
 	if (flags & kLPSCI_RxOverrunFlag) {
@@ -81,11 +81,11 @@ static int mcux_lpsci_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int mcux_lpsci_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int mcux_lpsci_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				int len)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (LPSCI_GetStatusFlags(config->base)
@@ -97,11 +97,11 @@ static int mcux_lpsci_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int mcux_lpsci_fifo_read(struct device *dev, u8_t *rx_data,
+static int mcux_lpsci_fifo_read(struct device *dev, uint8_t *rx_data,
 				const int len)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (LPSCI_GetStatusFlags(config->base)
@@ -116,7 +116,7 @@ static int mcux_lpsci_fifo_read(struct device *dev, u8_t *rx_data,
 static void mcux_lpsci_irq_tx_enable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
 
 	LPSCI_EnableInterrupts(config->base, mask);
 }
@@ -124,7 +124,7 @@ static void mcux_lpsci_irq_tx_enable(struct device *dev)
 static void mcux_lpsci_irq_tx_disable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
 
 	LPSCI_DisableInterrupts(config->base, mask);
 }
@@ -132,7 +132,7 @@ static void mcux_lpsci_irq_tx_disable(struct device *dev)
 static int mcux_lpsci_irq_tx_complete(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t flags = LPSCI_GetStatusFlags(config->base);
+	uint32_t flags = LPSCI_GetStatusFlags(config->base);
 
 	return (flags & kLPSCI_TxDataRegEmptyFlag) != 0U;
 }
@@ -140,7 +140,7 @@ static int mcux_lpsci_irq_tx_complete(struct device *dev)
 static int mcux_lpsci_irq_tx_ready(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable;
 
 	return (LPSCI_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_lpsci_irq_tx_complete(dev);
@@ -149,7 +149,7 @@ static int mcux_lpsci_irq_tx_ready(struct device *dev)
 static void mcux_lpsci_irq_rx_enable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
 
 	LPSCI_EnableInterrupts(config->base, mask);
 }
@@ -157,7 +157,7 @@ static void mcux_lpsci_irq_rx_enable(struct device *dev)
 static void mcux_lpsci_irq_rx_disable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
 
 	LPSCI_DisableInterrupts(config->base, mask);
 }
@@ -165,7 +165,7 @@ static void mcux_lpsci_irq_rx_disable(struct device *dev)
 static int mcux_lpsci_irq_rx_full(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t flags = LPSCI_GetStatusFlags(config->base);
+	uint32_t flags = LPSCI_GetStatusFlags(config->base);
 
 	return (flags & kLPSCI_RxDataRegFullFlag) != 0U;
 }
@@ -173,7 +173,7 @@ static int mcux_lpsci_irq_rx_full(struct device *dev)
 static int mcux_lpsci_irq_rx_ready(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable;
 
 	return (LPSCI_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_lpsci_irq_rx_full(dev);
@@ -182,7 +182,7 @@ static int mcux_lpsci_irq_rx_ready(struct device *dev)
 static void mcux_lpsci_irq_err_enable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPSCI_NoiseErrorInterruptEnable |
 			kLPSCI_FramingErrorInterruptEnable |
 			kLPSCI_ParityErrorInterruptEnable;
 
@@ -192,7 +192,7 @@ static void mcux_lpsci_irq_err_enable(struct device *dev)
 static void mcux_lpsci_irq_err_disable(struct device *dev)
 {
 	const struct mcux_lpsci_config *config = dev->config_info;
-	u32_t mask = kLPSCI_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPSCI_NoiseErrorInterruptEnable |
 			kLPSCI_FramingErrorInterruptEnable |
 			kLPSCI_ParityErrorInterruptEnable;
 
@@ -236,7 +236,7 @@ static int mcux_lpsci_init(struct device *dev)
 	const struct mcux_lpsci_config *config = dev->config_info;
 	lpsci_config_t uart_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	clock_dev = device_get_binding(config->clock_name);
 	if (clock_dev == NULL) {
diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c
index ecebaaadf0..fd6bafb87a 100644
--- a/drivers/serial/uart_mcux_lpuart.c
+++ b/drivers/serial/uart_mcux_lpuart.c
@@ -17,7 +17,7 @@ struct mcux_lpuart_config {
 	LPUART_Type *base;
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
-	u32_t baud_rate;
+	uint32_t baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -33,7 +33,7 @@ struct mcux_lpuart_data {
 static int mcux_lpuart_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 	int ret = -1;
 
 	if (flags & kLPUART_RxDataRegFullFlag) {
@@ -58,7 +58,7 @@ static void mcux_lpuart_poll_out(struct device *dev, unsigned char c)
 static int mcux_lpuart_err_check(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 	int err = 0;
 
 	if (flags & kLPUART_RxOverrunFlag) {
@@ -81,11 +81,11 @@ static int mcux_lpuart_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int mcux_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int mcux_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (LPUART_GetStatusFlags(config->base)
@@ -97,11 +97,11 @@ static int mcux_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int mcux_lpuart_fifo_read(struct device *dev, u8_t *rx_data,
+static int mcux_lpuart_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (LPUART_GetStatusFlags(config->base)
@@ -116,7 +116,7 @@ static int mcux_lpuart_fifo_read(struct device *dev, u8_t *rx_data,
 static void mcux_lpuart_irq_tx_enable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	LPUART_EnableInterrupts(config->base, mask);
 }
@@ -124,7 +124,7 @@ static void mcux_lpuart_irq_tx_enable(struct device *dev)
 static void mcux_lpuart_irq_tx_disable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	LPUART_DisableInterrupts(config->base, mask);
 }
@@ -132,7 +132,7 @@ static void mcux_lpuart_irq_tx_disable(struct device *dev)
 static int mcux_lpuart_irq_tx_complete(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 
 	return (flags & kLPUART_TxDataRegEmptyFlag) != 0U;
 }
@@ -140,7 +140,7 @@ static int mcux_lpuart_irq_tx_complete(struct device *dev)
 static int mcux_lpuart_irq_tx_ready(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	return (LPUART_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_lpuart_irq_tx_complete(dev);
@@ -149,7 +149,7 @@ static int mcux_lpuart_irq_tx_ready(struct device *dev)
 static void mcux_lpuart_irq_rx_enable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	LPUART_EnableInterrupts(config->base, mask);
 }
@@ -157,7 +157,7 @@ static void mcux_lpuart_irq_rx_enable(struct device *dev)
 static void mcux_lpuart_irq_rx_disable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	LPUART_DisableInterrupts(config->base, mask);
 }
@@ -165,7 +165,7 @@ static void mcux_lpuart_irq_rx_disable(struct device *dev)
 static int mcux_lpuart_irq_rx_full(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 
 	return (flags & kLPUART_RxDataRegFullFlag) != 0U;
 }
@@ -173,7 +173,7 @@ static int mcux_lpuart_irq_rx_full(struct device *dev)
 static int mcux_lpuart_irq_rx_ready(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	return (LPUART_GetEnabledInterrupts(config->base) & mask)
 		&& mcux_lpuart_irq_rx_full(dev);
@@ -182,7 +182,7 @@ static int mcux_lpuart_irq_rx_ready(struct device *dev)
 static void mcux_lpuart_irq_err_enable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPUART_NoiseErrorInterruptEnable |
 			kLPUART_FramingErrorInterruptEnable |
 			kLPUART_ParityErrorInterruptEnable;
 
@@ -192,7 +192,7 @@ static void mcux_lpuart_irq_err_enable(struct device *dev)
 static void mcux_lpuart_irq_err_disable(struct device *dev)
 {
 	const struct mcux_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPUART_NoiseErrorInterruptEnable |
 			kLPUART_FramingErrorInterruptEnable |
 			kLPUART_ParityErrorInterruptEnable;
 
@@ -236,7 +236,7 @@ static int mcux_lpuart_init(struct device *dev)
 	const struct mcux_lpuart_config *config = dev->config_info;
 	lpuart_config_t uart_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	clock_dev = device_get_binding(config->clock_name);
 	if (clock_dev == NULL) {
diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c
index 75bf125271..212f0e6fdf 100644
--- a/drivers/serial/uart_miv.c
+++ b/drivers/serial/uart_miv.c
@@ -102,9 +102,9 @@
 #define UART_OVERFLOW_ERROR  0x02
 #define UART_FRAMING_ERROR   0x04
 
-#define BAUDVALUE_LSB ((u16_t)(0x00FF))
-#define BAUDVALUE_MSB ((u16_t)(0xFF00))
-#define BAUDVALUE_SHIFT ((u8_t)(5))
+#define BAUDVALUE_LSB ((uint16_t)(0x00FF))
+#define BAUDVALUE_MSB ((uint16_t)(0xFF00))
+#define BAUDVALUE_SHIFT ((uint8_t)(5))
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static struct k_thread rx_thread;
@@ -112,15 +112,15 @@ static K_THREAD_STACK_DEFINE(rx_stack, 512);
 #endif
 
 struct uart_miv_regs_t {
-	u8_t tx;
-	u8_t reserved0[3];
-	u8_t rx;
-	u8_t reserved1[3];
-	u8_t ctrlreg1;
-	u8_t reserved2[3];
-	u8_t ctrlreg2;
-	u8_t reserved3[3];
-	u8_t status;
+	uint8_t tx;
+	uint8_t reserved0[3];
+	uint8_t rx;
+	uint8_t reserved1[3];
+	uint8_t ctrlreg1;
+	uint8_t reserved2[3];
+	uint8_t ctrlreg2;
+	uint8_t reserved3[3];
+	uint8_t status;
 };
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -128,10 +128,10 @@ typedef void (*irq_cfg_func_t)(struct device *dev);
 #endif
 
 struct uart_miv_device_config {
-	u32_t       uart_addr;
-	u32_t       sys_clk_freq;
-	u32_t       line_config;
-	u32_t       baud_rate;
+	uint32_t       uart_addr;
+	uint32_t       sys_clk_freq;
+	uint32_t       line_config;
+	uint32_t       baud_rate;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	irq_cfg_func_t cfg_func;
 #endif
@@ -178,7 +178,7 @@ static int uart_miv_poll_in(struct device *dev, unsigned char *c)
 static int uart_miv_err_check(struct device *dev)
 {
 	volatile struct uart_miv_regs_t *uart = DEV_UART(dev);
-	u32_t flags = uart->status;
+	uint32_t flags = uart->status;
 	int err = 0;
 
 	if (flags & STATUS_PARITYERR_MASK) {
@@ -200,7 +200,7 @@ static int uart_miv_err_check(struct device *dev)
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
 static int uart_miv_fifo_fill(struct device *dev,
-			      const u8_t *tx_data,
+			      const uint8_t *tx_data,
 			      int size)
 {
 	volatile struct uart_miv_regs_t *uart = DEV_UART(dev);
@@ -214,7 +214,7 @@ static int uart_miv_fifo_fill(struct device *dev,
 }
 
 static int uart_miv_fifo_read(struct device *dev,
-			      u8_t *rx_data,
+			      uint8_t *rx_data,
 			      const int size)
 {
 	volatile struct uart_miv_regs_t *uart = DEV_UART(dev);
@@ -318,7 +318,7 @@ void uart_miv_rx_thread(void *arg1, void *arg2, void *arg3)
 	/* Make it go to sleep for a period no longer than
 	 * time to receive next character.
 	 */
-	u32_t delay = 1000000 / cfg->baud_rate;
+	uint32_t delay = 1000000 / cfg->baud_rate;
 
 	while (1) {
 		if (uart->status & STATUS_RXFULL_MASK) {
@@ -345,12 +345,12 @@ static int uart_miv_init(struct device *dev)
 	const struct uart_miv_device_config *const cfg = DEV_CFG(dev);
 	volatile struct uart_miv_regs_t *uart = DEV_UART(dev);
 	/* Calculate divider value to set baudrate */
-	u16_t baud_value = (cfg->sys_clk_freq / (cfg->baud_rate * 16U)) - 1;
+	uint16_t baud_value = (cfg->sys_clk_freq / (cfg->baud_rate * 16U)) - 1;
 
 	/* Set baud rate */
-	uart->ctrlreg1 = (u8_t)(baud_value & BAUDVALUE_LSB);
-	uart->ctrlreg2 = (u8_t)(cfg->line_config) |
-			 (u8_t)((baud_value & BAUDVALUE_MSB) >> BAUDVALUE_SHIFT);
+	uart->ctrlreg1 = (uint8_t)(baud_value & BAUDVALUE_LSB);
+	uart->ctrlreg2 = (uint8_t)(cfg->line_config) |
+			 (uint8_t)((baud_value & BAUDVALUE_MSB) >> BAUDVALUE_SHIFT);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	/* Setup thread polling for data */
diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c
index 3ba424172e..f67535af77 100644
--- a/drivers/serial/uart_msp432p4xx.c
+++ b/drivers/serial/uart_msp432p4xx.c
@@ -52,8 +52,8 @@ static struct uart_msp432p4xx_dev_data_t uart_msp432p4xx_dev_data_0 = {
 
 static int baudrate_set(eUSCI_UART_Config *config, uint32_t baudrate)
 {
-	u16_t prescalar;
-	u8_t first_mod_reg, second_mod_reg;
+	uint16_t prescalar;
+	uint8_t first_mod_reg, second_mod_reg;
 
 	switch (baudrate) {
 	case 1200:
@@ -175,7 +175,7 @@ static void uart_msp432p4xx_poll_out(struct device *dev,
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static int uart_msp432p4xx_fifo_fill(struct device *dev,
-						const u8_t *tx_data, int size)
+						const uint8_t *tx_data, int size)
 {
 	const struct uart_device_config *config = DEV_CFG(dev);
 	unsigned int num_tx = 0U;
@@ -194,7 +194,7 @@ static int uart_msp432p4xx_fifo_fill(struct device *dev,
 	return (int)num_tx;
 }
 
-static int uart_msp432p4xx_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_msp432p4xx_fifo_read(struct device *dev, uint8_t *rx_data,
 							const int size)
 {
 	const struct uart_device_config *config = DEV_CFG(dev);
diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c
index 3a79ed58f2..a74a1fd87b 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -71,22 +71,22 @@ static struct {
 	uart_callback_t callback;
 	void *user_data;
 
-	u8_t *rx_buffer;
-	u8_t *rx_secondary_buffer;
+	uint8_t *rx_buffer;
+	uint8_t *rx_secondary_buffer;
 	size_t rx_buffer_length;
 	size_t rx_secondary_buffer_length;
 	volatile size_t rx_counter;
 	volatile size_t rx_offset;
-	s32_t rx_timeout;
+	int32_t rx_timeout;
 	struct k_delayed_work rx_timeout_work;
 	bool rx_enabled;
 
 	bool tx_abort;
-	const u8_t *volatile tx_buffer;
+	const uint8_t *volatile tx_buffer;
 	size_t tx_buffer_length;
 	volatile size_t tx_counter;
 #if HW_FLOW_CONTROL
-	s32_t tx_timeout;
+	int32_t tx_timeout;
 	struct k_delayed_work tx_timeout_work;
 #endif
 } uart0_cb;
@@ -102,7 +102,7 @@ static void *irq_cb_data; /**< Callback function arg */
  * sent, and we want to use it as an indication if the transmitter is ready
  * to accept a new byte.
  */
-static volatile u8_t uart_sw_event_txdrdy;
+static volatile uint8_t uart_sw_event_txdrdy;
 
 #endif /* CONFIG_UART_0_INTERRUPT_DRIVEN */
 
@@ -136,7 +136,7 @@ static void event_txdrdy_clear(void)
  * @return N/A
  */
 
-static int baudrate_set(struct device *dev, u32_t baudrate)
+static int baudrate_set(struct device *dev, uint32_t baudrate)
 {
 	nrf_uart_baudrate_t nrf_baudrate; /* calculated baudrate divisor */
 
@@ -270,7 +270,7 @@ static void uart_nrfx_poll_out(struct device *dev, unsigned char c)
 #endif
 
 	if (!k_is_in_isr()) {
-		u8_t safety_cnt = 100;
+		uint8_t safety_cnt = 100;
 
 		while (atomic_cas((atomic_t *) lock,
 				  (atomic_val_t) 0,
@@ -293,7 +293,7 @@ static void uart_nrfx_poll_out(struct device *dev, unsigned char c)
 	nrf_uart_task_trigger(uart0_addr, NRF_UART_TASK_STARTTX);
 
 	/* Send the provided character. */
-	nrf_uart_txd_set(uart0_addr, (u8_t)c);
+	nrf_uart_txd_set(uart0_addr, (uint8_t)c);
 
 	/* Wait until the transmitter is ready, i.e. the character is sent. */
 	int res;
@@ -413,8 +413,8 @@ static int uart_nrfx_callback_set(struct device *dev, uart_callback_t callback,
 	return 0;
 }
 
-static int uart_nrfx_tx(struct device *dev, const u8_t *buf, size_t len,
-			s32_t timeout)
+static int uart_nrfx_tx(struct device *dev, const uint8_t *buf, size_t len,
+			int32_t timeout)
 {
 	if (atomic_cas((atomic_t *) &uart0_cb.tx_buffer_length,
 		       (atomic_val_t) 0,
@@ -430,7 +430,7 @@ static int uart_nrfx_tx(struct device *dev, const u8_t *buf, size_t len,
 	nrf_uart_task_trigger(uart0_addr, NRF_UART_TASK_STARTTX);
 	nrf_uart_int_enable(uart0_addr, NRF_UART_INT_MASK_TXDRDY);
 
-	u8_t txd = uart0_cb.tx_buffer[uart0_cb.tx_counter];
+	uint8_t txd = uart0_cb.tx_buffer[uart0_cb.tx_counter];
 
 	nrf_uart_txd_set(uart0_addr, txd);
 
@@ -463,8 +463,8 @@ static int uart_nrfx_tx_abort(struct device *dev)
 	return 0;
 }
 
-static int uart_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len,
-			       s32_t timeout)
+static int uart_nrfx_rx_enable(struct device *dev, uint8_t *buf, size_t len,
+			       int32_t timeout)
 {
 	if (!RX_PIN_USED) {
 		__ASSERT(false, "TX only UART instance");
@@ -493,7 +493,7 @@ static int uart_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len,
 	return 0;
 }
 
-static int uart_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len)
+static int uart_nrfx_rx_buf_rsp(struct device *dev, uint8_t *buf, size_t len)
 {
 	if (!uart0_cb.rx_enabled) {
 		return -EACCES;
@@ -629,7 +629,7 @@ static void tx_isr(void)
 #endif
 		nrf_uart_event_clear(uart0_addr, NRF_UART_EVENT_TXDRDY);
 
-		u8_t txd = uart0_cb.tx_buffer[uart0_cb.tx_counter];
+		uint8_t txd = uart0_cb.tx_buffer[uart0_cb.tx_counter];
 
 		nrf_uart_txd_set(uart0_addr, txd);
 	} else {
@@ -762,10 +762,10 @@ static void tx_timeout(struct k_work *work)
 
 /** Interrupt driven FIFO fill function */
 static int uart_nrfx_fifo_fill(struct device *dev,
-			       const u8_t *tx_data,
+			       const uint8_t *tx_data,
 			       int len)
 {
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       event_txdrdy_check()) {
@@ -774,7 +774,7 @@ static int uart_nrfx_fifo_fill(struct device *dev,
 		event_txdrdy_clear();
 
 		/* Send a character */
-		nrf_uart_txd_set(uart0_addr, (u8_t)tx_data[num_tx++]);
+		nrf_uart_txd_set(uart0_addr, (uint8_t)tx_data[num_tx++]);
 	}
 
 	return (int)num_tx;
@@ -782,10 +782,10 @@ static int uart_nrfx_fifo_fill(struct device *dev,
 
 /** Interrupt driven FIFO read function */
 static int uart_nrfx_fifo_read(struct device *dev,
-			       u8_t *rx_data,
+			       uint8_t *rx_data,
 			       const int size)
 {
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((size - num_rx > 0) &&
 	       nrf_uart_event_check(uart0_addr, NRF_UART_EVENT_RXDRDY)) {
@@ -793,7 +793,7 @@ static int uart_nrfx_fifo_read(struct device *dev,
 		nrf_uart_event_clear(uart0_addr, NRF_UART_EVENT_RXDRDY);
 
 		/* Receive a character */
-		rx_data[num_rx++] = (u8_t)nrf_uart_rxd_get(uart0_addr);
+		rx_data[num_rx++] = (uint8_t)nrf_uart_rxd_get(uart0_addr);
 	}
 
 	return num_rx;
@@ -802,7 +802,7 @@ static int uart_nrfx_fifo_read(struct device *dev,
 /** Interrupt driven transfer enabling function */
 static void uart_nrfx_irq_tx_enable(struct device *dev)
 {
-	u32_t key;
+	uint32_t key;
 
 	/* Indicate that this device started a transaction that should not be
 	 * interrupted by putting the SoC into the deep sleep mode.
@@ -1057,10 +1057,10 @@ static void uart_nrfx_pins_enable(struct device *dev, bool enable)
 		return;
 	}
 
-	u32_t tx_pin = nrf_uart_tx_pin_get(uart0_addr);
-	u32_t rx_pin = nrf_uart_rx_pin_get(uart0_addr);
-	u32_t cts_pin = nrf_uart_cts_pin_get(uart0_addr);
-	u32_t rts_pin = nrf_uart_rts_pin_get(uart0_addr);
+	uint32_t tx_pin = nrf_uart_tx_pin_get(uart0_addr);
+	uint32_t rx_pin = nrf_uart_rx_pin_get(uart0_addr);
+	uint32_t cts_pin = nrf_uart_cts_pin_get(uart0_addr);
+	uint32_t rts_pin = nrf_uart_rts_pin_get(uart0_addr);
 
 	if (enable) {
 		nrf_gpio_pin_write(tx_pin, 1);
@@ -1087,7 +1087,7 @@ static void uart_nrfx_pins_enable(struct device *dev, bool enable)
 	}
 }
 
-static void uart_nrfx_set_power_state(struct device *dev, u32_t new_state)
+static void uart_nrfx_set_power_state(struct device *dev, uint32_t new_state)
 {
 	if (new_state == DEVICE_PM_ACTIVE_STATE) {
 		uart_nrfx_pins_enable(dev, true);
@@ -1105,13 +1105,13 @@ static void uart_nrfx_set_power_state(struct device *dev, u32_t new_state)
 	}
 }
 
-static int uart_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int uart_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
-	static u32_t current_state = DEVICE_PM_ACTIVE_STATE;
+	static uint32_t current_state = DEVICE_PM_ACTIVE_STATE;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != current_state) {
 			uart_nrfx_set_power_state(dev, new_state);
@@ -1119,7 +1119,7 @@ static int uart_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = current_state;
+		*((uint32_t *)context) = current_state;
 	}
 
 	if (cb) {
diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c
index 1ec8465ddb..bf7234d4a2 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(uart_nrfx_uarte, LOG_LEVEL_ERR);
 #define gppi_channel_enable nrfx_ppi_channel_enable
 #elif defined(CONFIG_HAS_HW_NRF_DPPIC)
 #include <nrfx_dppi.h>
-#define gppi_channel_t u8_t
+#define gppi_channel_t uint8_t
 #define gppi_channel_alloc nrfx_dppi_channel_alloc
 #define gppi_channel_enable nrfx_dppi_channel_enable
 #else
@@ -61,24 +61,24 @@ struct uarte_async_cb {
 	 * is bigger than 0 and tx_buf is NULL, then there is ongoing
 	 * transmission by uart_poll_out
 	 */
-	const u8_t *volatile tx_buf;
+	const uint8_t *volatile tx_buf;
 	size_t tx_size;
 	struct k_timer tx_timeout_timer;
 
-	u8_t *rx_buf;
+	uint8_t *rx_buf;
 	size_t rx_buf_len;
 	size_t rx_offset;
-	u8_t *rx_next_buf;
+	uint8_t *rx_next_buf;
 	size_t rx_next_buf_len;
-	u32_t rx_total_byte_cnt; /* Total number of bytes received */
-	u32_t rx_total_user_byte_cnt; /* Total number of bytes passed to user */
-	s32_t rx_timeout; /* Timeout set by user */
-	s32_t rx_timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
-	s32_t rx_timeout_left; /* Current time left until user callback */
+	uint32_t rx_total_byte_cnt; /* Total number of bytes received */
+	uint32_t rx_total_user_byte_cnt; /* Total number of bytes passed to user */
+	int32_t rx_timeout; /* Timeout set by user */
+	int32_t rx_timeout_slab; /* rx_timeout divided by RX_TIMEOUT_DIV */
+	int32_t rx_timeout_left; /* Current time left until user callback */
 	struct k_timer rx_timeout_timer;
 	union {
 		gppi_channel_t ppi;
-		u32_t cnt;
+		uint32_t cnt;
 	} rx_cnt;
 
 	bool rx_enabled;
@@ -92,8 +92,8 @@ struct uarte_async_cb {
 struct uarte_nrfx_int_driven {
 	uart_irq_callback_user_data_t cb; /**< Callback function pointer */
 	void *cb_data; /**< Callback function arg */
-	u8_t *tx_buffer;
-	u16_t tx_buff_size;
+	uint8_t *tx_buffer;
+	uint16_t tx_buff_size;
 	volatile bool disable_tx_irq;
 };
 #endif
@@ -109,9 +109,9 @@ struct uarte_nrfx_data {
 #endif
 	atomic_val_t poll_out_lock;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
-	u8_t rx_data;
+	uint8_t rx_data;
 };
 
 /**
@@ -127,10 +127,10 @@ struct uarte_nrfx_config {
 };
 
 struct uarte_init_config {
-	u32_t  pseltxd; /* PSEL.TXD register value */
-	u32_t  pselrxd; /* PSEL.RXD register value */
-	u32_t  pselcts; /* PSEL.CTS register value */
-	u32_t  pselrts; /* PSEL.RTS register value */
+	uint32_t  pseltxd; /* PSEL.TXD register value */
+	uint32_t  pselrxd; /* PSEL.RXD register value */
+	uint32_t  pselcts; /* PSEL.CTS register value */
+	uint32_t  pselrts; /* PSEL.RTS register value */
 };
 
 static inline struct uarte_nrfx_data *get_dev_data(struct device *dev)
@@ -200,7 +200,7 @@ static void uarte_nrfx_isr_int(void *arg)
  *
  * @return 0 on success or error code
  */
-static int baudrate_set(struct device *dev, u32_t baudrate)
+static int baudrate_set(struct device *dev, uint32_t baudrate)
 {
 	nrf_uarte_baudrate_t nrf_baudrate; /* calculated baudrate divisor */
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -470,8 +470,8 @@ static int uarte_nrfx_init(struct device *dev)
 	return 0;
 }
 
-static int uarte_nrfx_tx(struct device *dev, const u8_t *buf, size_t len,
-			 s32_t timeout)
+static int uarte_nrfx_tx(struct device *dev, const uint8_t *buf, size_t len,
+			 int32_t timeout)
 {
 	struct uarte_nrfx_data *data = get_dev_data(dev);
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -517,8 +517,8 @@ static int uarte_nrfx_tx_abort(struct device *dev)
 	return 0;
 }
 
-static int uarte_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len,
-				s32_t timeout)
+static int uarte_nrfx_rx_enable(struct device *dev, uint8_t *buf, size_t len,
+				int32_t timeout)
 {
 	struct uarte_nrfx_data *data = get_dev_data(dev);
 	const struct uarte_nrfx_config *cfg = get_dev_config(dev);
@@ -557,7 +557,7 @@ static int uarte_nrfx_rx_enable(struct device *dev, u8_t *buf, size_t len,
 	return 0;
 }
 
-static int uarte_nrfx_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len)
+static int uarte_nrfx_rx_buf_rsp(struct device *dev, uint8_t *buf, size_t len)
 {
 	struct uarte_nrfx_data *data = get_dev_data(dev);
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -633,7 +633,7 @@ static void rx_timeout(struct k_timer *timer)
 	struct device *dev = k_timer_user_data_get(timer);
 	struct uarte_nrfx_data *data = get_dev_data(dev);
 	const struct uarte_nrfx_config *cfg = get_dev_config(dev);
-	u32_t read;
+	uint32_t read;
 
 	if (data->async->is_in_irq) {
 		return;
@@ -661,7 +661,7 @@ static void rx_timeout(struct k_timer *timer)
 	 * Note though that 'len' is a count of data bytes received, but not
 	 * necessarily the amount available in the current buffer
 	 */
-	s32_t len = data->async->rx_total_byte_cnt
+	int32_t len = data->async->rx_total_byte_cnt
 		    - data->async->rx_total_user_byte_cnt;
 
 	/* Check for current buffer being full.
@@ -718,7 +718,7 @@ static void rx_timeout(struct k_timer *timer)
 static void error_isr(struct device *dev)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	u32_t err = nrf_uarte_errorsrc_get_and_clear(uarte);
+	uint32_t err = nrf_uarte_errorsrc_get_and_clear(uarte);
 	struct uart_event evt = {
 		.type = UART_RX_STOPPED,
 		.data.rx_stop.reason = UARTE_ERROR_FROM_MASK(err),
@@ -860,7 +860,7 @@ static void rxto_isr(struct device *dev)
 	}
 
 	/* Flushing RX fifo requires buffer bigger than 4 bytes to empty fifo */
-	static u8_t flush_buf[5];
+	static uint8_t flush_buf[5];
 
 	nrf_uarte_rx_buffer_set(get_uarte_instance(dev), flush_buf, 5);
 	/* Final part of handling RXTO event is in ENDRX interrupt handler.
@@ -1021,7 +1021,7 @@ static void uarte_nrfx_poll_out(struct device *dev, unsigned char c)
 		lock = &data->poll_out_lock;
 
 	if (!k_is_in_isr()) {
-		u8_t safety_cnt = 100;
+		uint8_t safety_cnt = 100;
 
 		while (atomic_cas((atomic_t *) lock,
 				(atomic_val_t) 0,
@@ -1062,7 +1062,7 @@ static void uarte_nrfx_poll_out(struct device *dev, unsigned char c)
 #ifdef UARTE_INTERRUPT_DRIVEN
 /** Interrupt driven FIFO fill function */
 static int uarte_nrfx_fifo_fill(struct device *dev,
-				const u8_t *tx_data,
+				const uint8_t *tx_data,
 				int len)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -1092,7 +1092,7 @@ static int uarte_nrfx_fifo_fill(struct device *dev,
 
 /** Interrupt driven FIFO read function */
 static int uarte_nrfx_fifo_read(struct device *dev,
-				u8_t *rx_data,
+				uint8_t *rx_data,
 				const int size)
 {
 	int num_rx = 0;
@@ -1104,7 +1104,7 @@ static int uarte_nrfx_fifo_read(struct device *dev,
 		nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDRX);
 
 		/* Receive a character */
-		rx_data[num_rx++] = (u8_t)data->rx_data;
+		rx_data[num_rx++] = (uint8_t)data->rx_data;
 
 		nrf_uarte_task_trigger(uarte, NRF_UARTE_TASK_STARTRX);
 	}
@@ -1251,7 +1251,7 @@ static const struct uart_driver_api uart_nrfx_uarte_driver_api = {
 
 static int uarte_instance_init(struct device *dev,
 			       const struct uarte_init_config *config,
-			       u8_t interrupts_active)
+			       uint8_t interrupts_active)
 {
 	int err;
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@@ -1329,10 +1329,10 @@ static void uarte_nrfx_pins_enable(struct device *dev, bool enable)
 	}
 
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
-	u32_t tx_pin = nrf_uarte_tx_pin_get(uarte);
-	u32_t rx_pin = nrf_uarte_rx_pin_get(uarte);
-	u32_t cts_pin = nrf_uarte_cts_pin_get(uarte);
-	u32_t rts_pin = nrf_uarte_rts_pin_get(uarte);
+	uint32_t tx_pin = nrf_uarte_tx_pin_get(uarte);
+	uint32_t rx_pin = nrf_uarte_rx_pin_get(uarte);
+	uint32_t cts_pin = nrf_uarte_cts_pin_get(uarte);
+	uint32_t rts_pin = nrf_uarte_rts_pin_get(uarte);
 
 	if (enable) {
 		nrf_gpio_pin_write(tx_pin, 1);
@@ -1359,7 +1359,7 @@ static void uarte_nrfx_pins_enable(struct device *dev, bool enable)
 	}
 }
 
-static void uarte_nrfx_set_power_state(struct device *dev, u32_t new_state)
+static void uarte_nrfx_set_power_state(struct device *dev, uint32_t new_state)
 {
 	NRF_UARTE_Type *uarte = get_uarte_instance(dev);
 	struct uarte_nrfx_data *data = get_dev_data(dev);
@@ -1418,13 +1418,13 @@ static void uarte_nrfx_set_power_state(struct device *dev, u32_t new_state)
 	}
 }
 
-static int uarte_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int uarte_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				 void *context, device_pm_cb cb, void *arg)
 {
 	struct uarte_nrfx_data *data = get_dev_data(dev);
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != data->pm_state) {
 			uarte_nrfx_set_power_state(dev, new_state);
@@ -1432,7 +1432,7 @@ static int uarte_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = data->pm_state;
+		*((uint32_t *)context) = data->pm_state;
 	}
 
 	if (cb) {
@@ -1530,7 +1530,7 @@ static int uarte_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 
 #define UARTE_INT_DRIVEN(idx)						       \
 	IF_ENABLED(CONFIG_UART_##idx##_INTERRUPT_DRIVEN,	       \
-		(static u8_t uarte##idx##_tx_buffer[\
+		(static uint8_t uarte##idx##_tx_buffer[\
 			MIN(CONFIG_UART_##idx##_NRF_TX_BUFFER_SIZE,	       \
 			    BIT_MASK(UARTE##idx##_EASYDMA_MAXCNT_SIZE))];      \
 		 static struct uarte_nrfx_int_driven			       \
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index e5a40e13bd..7fc4f42e38 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -259,7 +259,7 @@ struct uart_ns16550_device_config {
 	struct uart_device_config devconf;
 
 #ifdef UART_NS16550_PCP_ENABLED
-	u32_t pcp;
+	uint32_t pcp;
 #endif
 
 #ifdef UART_NS16550_PCIE_ENABLED
@@ -278,19 +278,19 @@ struct uart_ns16550_dev_data_t {
 	struct k_spinlock lock;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-	u8_t iir_cache;	/**< cache of IIR since it clears when read */
+	uint8_t iir_cache;	/**< cache of IIR since it clears when read */
 	uart_irq_callback_user_data_t cb;  /**< Callback function pointer */
 	void *cb_data;	/**< Callback function arg */
 #endif
 
 #ifdef UART_NS16550_DLF_ENABLED
-	u8_t dlf;		/**< DLF value */
+	uint8_t dlf;		/**< DLF value */
 #endif
 };
 
 static const struct uart_driver_api uart_ns16550_driver_api;
 
-static inline u32_t get_port(struct device *dev)
+static inline uint32_t get_port(struct device *dev)
 {
 #ifdef UART_NS16550_PCIE_ENABLED
 	if (DEV_CFG(dev)->pcie) {
@@ -301,17 +301,17 @@ static inline u32_t get_port(struct device *dev)
 	return DEV_CFG(dev)->devconf.port;
 }
 
-static void set_baud_rate(struct device *dev, u32_t baud_rate)
+static void set_baud_rate(struct device *dev, uint32_t baud_rate)
 {
 	const struct uart_ns16550_device_config * const dev_cfg = DEV_CFG(dev);
 	struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev);
-	u32_t divisor; /* baud rate divisor */
-	u8_t lcr_cache;
+	uint32_t divisor; /* baud rate divisor */
+	uint8_t lcr_cache;
 
 	if ((baud_rate != 0U) && (dev_cfg->devconf.sys_clk_freq != 0U)) {
 		/*
 		 * calculate baud rate divisor. a variant of
-		 * (u32_t)(dev_cfg->sys_clk_freq / (16.0 * baud_rate) + 0.5)
+		 * (uint32_t)(dev_cfg->sys_clk_freq / (16.0 * baud_rate) + 0.5)
 		 */
 		divisor = ((dev_cfg->devconf.sys_clk_freq + (baud_rate << 3))
 					/ baud_rate) >> 4;
@@ -335,7 +335,7 @@ static int uart_ns16550_configure(struct device *dev,
 	struct uart_ns16550_dev_data_t * const dev_data = DEV_DATA(dev);
 	const struct uart_ns16550_device_config * const dev_cfg = DEV_CFG(dev);
 
-	u8_t mdc = 0U;
+	uint8_t mdc = 0U;
 
 	/* temp for return value if error occurs in this locked region */
 	int ret = 0;
@@ -366,7 +366,7 @@ static int uart_ns16550_configure(struct device *dev,
 #endif
 
 #ifdef UART_NS16550_PCP_ENABLED
-	u32_t pcp = dev_cfg->pcp;
+	uint32_t pcp = dev_cfg->pcp;
 
 	if (pcp) {
 		pcp |= PCP_EN;
@@ -591,7 +591,7 @@ static int uart_ns16550_err_check(struct device *dev)
  *
  * @return Number of bytes sent
  */
-static int uart_ns16550_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_ns16550_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				  int size)
 {
 	int i;
@@ -615,7 +615,7 @@ static int uart_ns16550_fifo_fill(struct device *dev, const u8_t *tx_data,
  *
  * @return Number of bytes read
  */
-static int uart_ns16550_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_ns16550_fifo_read(struct device *dev, uint8_t *rx_data,
 				  const int size)
 {
 	int i;
@@ -872,9 +872,9 @@ static void uart_ns16550_isr(void *arg)
  * @return 0 if successful, failed otherwise
  */
 static int uart_ns16550_line_ctrl_set(struct device *dev,
-				      u32_t ctrl, u32_t val)
+				      uint32_t ctrl, uint32_t val)
 {
-	u32_t mdc, chg;
+	uint32_t mdc, chg;
 	k_spinlock_key_t key;
 
 	switch (ctrl) {
@@ -919,7 +919,7 @@ static int uart_ns16550_line_ctrl_set(struct device *dev,
  *
  * @return 0 if successful, failed otherwise
  */
-static int uart_ns16550_drv_cmd(struct device *dev, u32_t cmd, u32_t p)
+static int uart_ns16550_drv_cmd(struct device *dev, uint32_t cmd, uint32_t p)
 {
 #ifdef UART_NS16550_DLF_ENABLED
 	if (cmd == CMD_SET_DLF) {
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index 5d559d6500..1bfc1f0cea 100644
--- a/drivers/serial/uart_nsim.c
+++ b/drivers/serial/uart_nsim.c
@@ -52,8 +52,8 @@
 	((const struct uart_device_config * const)(dev)->config_info)
 
 
-#define UART_REG_SET(u, r, v) ((*(u8_t *)(u + r)) = v)
-#define UART_REG_GET(u, r)    (*(u8_t *)(u + r))
+#define UART_REG_SET(u, r, v) ((*(uint8_t *)(u + r)) = v)
+#define UART_REG_GET(u, r)    (*(uint8_t *)(u + r))
 
 #define UART_REG_OR(u, r, v)  UART_REG_SET(u, r, UART_REG_GET(u, r) | (v))
 #define UART_REG_CLR(u, r, v) UART_REG_SET(u, r, UART_REG_GET(u, r) & ~(v))
@@ -89,7 +89,7 @@ static int uart_nsim_init(struct device *dev)
  */
 static void uart_nsim_poll_out(struct device *dev, unsigned char c)
 {
-	u32_t regs = DEV_CFG(dev)->regs;
+	uint32_t regs = DEV_CFG(dev)->regs;
 	/* wait for transmitter to ready to accept a character */
 
 	while (!(UART_GET_STATUS(regs) & TXEMPTY)) {
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 8fdb9bbb83..e5d9907967 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -17,30 +17,30 @@
  * UART PL011 register map structure
  */
 struct pl011_regs {
-	u32_t dr;			/* data register */
+	uint32_t dr;			/* data register */
 	union {
-		u32_t rsr;
-		u32_t ecr;
+		uint32_t rsr;
+		uint32_t ecr;
 	};
-	u32_t reserved_0[4];
-	u32_t fr;			/* flags register */
-	u32_t reserved_1;
-	u32_t ilpr;
-	u32_t ibrd;
-	u32_t fbrd;
-	u32_t lcr_h;
-	u32_t cr;
-	u32_t ifls;
-	u32_t imsc;
-	u32_t ris;
-	u32_t mis;
-	u32_t icr;
-	u32_t dmacr;
+	uint32_t reserved_0[4];
+	uint32_t fr;			/* flags register */
+	uint32_t reserved_1;
+	uint32_t ilpr;
+	uint32_t ibrd;
+	uint32_t fbrd;
+	uint32_t lcr_h;
+	uint32_t cr;
+	uint32_t ifls;
+	uint32_t imsc;
+	uint32_t ris;
+	uint32_t mis;
+	uint32_t icr;
+	uint32_t dmacr;
 };
 
 /* Device data structure */
 struct pl011_data {
-	u32_t baud_rate;	/* Baud rate */
+	uint32_t baud_rate;	/* Baud rate */
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t irq_cb;
 	void *irq_cb_data;
@@ -168,10 +168,10 @@ static void pl011_disable_fifo(struct device *dev)
 }
 
 static int pl011_set_baudrate(struct device *dev,
-			      u32_t clk, u32_t baudrate)
+			      uint32_t clk, uint32_t baudrate)
 {
 	/* Avoiding float calculations, bauddiv is left shifted by 6 */
-	u64_t bauddiv = (((u64_t)clk) << PL011_FBRD_WIDTH)
+	uint64_t bauddiv = (((uint64_t)clk) << PL011_FBRD_WIDTH)
 				/ (baudrate * 16U);
 
 	/* Valid bauddiv value
@@ -229,14 +229,14 @@ static void pl011_poll_out(struct device *dev,
 	}
 
 	/* Send a character */
-	PL011_REGS(dev)->dr = (u32_t)c;
+	PL011_REGS(dev)->dr = (uint32_t)c;
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static int pl011_fifo_fill(struct device *dev,
-				    const u8_t *tx_data, int len)
+				    const uint8_t *tx_data, int len)
 {
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while (!(PL011_REGS(dev)->fr & PL011_FR_TXFF) &&
 	       (len - num_tx > 0)) {
@@ -246,9 +246,9 @@ static int pl011_fifo_fill(struct device *dev,
 }
 
 static int pl011_fifo_read(struct device *dev,
-				    u8_t *rx_data, const int len)
+				    uint8_t *rx_data, const int len)
 {
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       !(PL011_REGS(dev)->fr & PL011_FR_RXFE)) {
@@ -354,7 +354,7 @@ static const struct uart_driver_api pl011_driver_api = {
 static int pl011_init(struct device *dev)
 {
 	int ret;
-	u32_t lcrh;
+	uint32_t lcrh;
 
 	/* disable the uart */
 	pl011_disable(dev);
@@ -415,7 +415,7 @@ static void pl011_irq_config_func_0(struct device *dev);
 #endif
 
 static struct uart_device_config pl011_cfg_port_0 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(0),
+	.base = (uint8_t *)DT_INST_REG_ADDR(0),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(0, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = pl011_irq_config_func_0,
@@ -478,7 +478,7 @@ static void pl011_irq_config_func_1(struct device *dev);
 #endif
 
 static struct uart_device_config pl011_cfg_port_1 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(1),
+	.base = (uint8_t *)DT_INST_REG_ADDR(1),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(1, clocks, clock_frequency),
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	.irq_config_func = pl011_irq_config_func_1,
diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c
index ddbe0e7ce9..a9a5dd3178 100644
--- a/drivers/serial/uart_psoc6.c
+++ b/drivers/serial/uart_psoc6.c
@@ -45,8 +45,8 @@
 struct cypress_psoc6_config {
 	CySCB_Type *base;
 	GPIO_PRT_Type *port;
-	u32_t rx_num;
-	u32_t tx_num;
+	uint32_t rx_num;
+	uint32_t tx_num;
 	en_hsiom_sel_t rx_val;
 	en_hsiom_sel_t tx_val;
 	en_clk_dst_t scb_clock;
@@ -126,7 +126,7 @@ static int uart_psoc6_init(struct device *dev)
 static int uart_psoc6_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct cypress_psoc6_config *config = dev->config_info;
-	u32_t rec;
+	uint32_t rec;
 
 	rec = Cy_SCB_UART_Get(config->base);
 	*c = (unsigned char)(rec & 0xff);
diff --git a/drivers/serial/uart_rtt.c b/drivers/serial/uart_rtt.c
index 5e319adaf3..62c84aa6dc 100644
--- a/drivers/serial/uart_rtt.c
+++ b/drivers/serial/uart_rtt.c
@@ -12,7 +12,7 @@ struct uart_rtt_config {
 	size_t up_size;
 	void *down_buffer;
 	size_t down_size;
-	u8_t channel;
+	uint8_t channel;
 };
 
 static inline const struct uart_rtt_config *get_dev_config(struct device *dev)
@@ -87,9 +87,9 @@ DEVICE_AND_API_INIT(uart_rtt0, "RTT_0", uart_rtt_init, NULL, NULL,
 #endif
 
 #define UART_RTT_CHANNEL(n)                                                    \
-	static u8_t                                                            \
+	static uint8_t                                                            \
 		uart_rtt##n##_tx_buffer[CONFIG_UART_RTT_##n##_TX_BUFFER_SIZE]; \
-	static u8_t                                                            \
+	static uint8_t                                                            \
 		uart_rtt##n##_rx_buffer[CONFIG_UART_RTT_##n##_RX_BUFFER_SIZE]; \
 									       \
 	static const char uart_rtt##n##_name[] = "RTT_" #n "\0";               \
diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
index e69497af4f..ebdc79ce6a 100644
--- a/drivers/serial/uart_rv32m1_lpuart.c
+++ b/drivers/serial/uart_rv32m1_lpuart.c
@@ -19,9 +19,9 @@ struct rv32m1_lpuart_config {
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
 	clock_ip_name_t clock_ip_name;
-	u32_t clock_ip_src;
-	u32_t baud_rate;
-	u8_t hw_flow_control;
+	uint32_t clock_ip_src;
+	uint32_t baud_rate;
+	uint8_t hw_flow_control;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	void (*irq_config_func)(struct device *dev);
 #endif
@@ -37,7 +37,7 @@ struct rv32m1_lpuart_data {
 static int rv32m1_lpuart_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 	int ret = -1;
 
 	if (flags & kLPUART_RxDataRegFullFlag) {
@@ -62,7 +62,7 @@ static void rv32m1_lpuart_poll_out(struct device *dev, unsigned char c)
 static int rv32m1_lpuart_err_check(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 	int err = 0;
 
 	if (flags & kLPUART_RxOverrunFlag) {
@@ -85,11 +85,11 @@ static int rv32m1_lpuart_err_check(struct device *dev)
 }
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
-static int rv32m1_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int rv32m1_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data,
 			       int len)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) &&
 	       (LPUART_GetStatusFlags(config->base)
@@ -101,11 +101,11 @@ static int rv32m1_lpuart_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int rv32m1_lpuart_fifo_read(struct device *dev, u8_t *rx_data,
+static int rv32m1_lpuart_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int len)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((len - num_rx > 0) &&
 	       (LPUART_GetStatusFlags(config->base)
@@ -120,7 +120,7 @@ static int rv32m1_lpuart_fifo_read(struct device *dev, u8_t *rx_data,
 static void rv32m1_lpuart_irq_tx_enable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	LPUART_EnableInterrupts(config->base, mask);
 }
@@ -128,7 +128,7 @@ static void rv32m1_lpuart_irq_tx_enable(struct device *dev)
 static void rv32m1_lpuart_irq_tx_disable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	LPUART_DisableInterrupts(config->base, mask);
 }
@@ -136,7 +136,7 @@ static void rv32m1_lpuart_irq_tx_disable(struct device *dev)
 static int rv32m1_lpuart_irq_tx_complete(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 
 	return (flags & kLPUART_TxDataRegEmptyFlag) != 0U;
 }
@@ -144,7 +144,7 @@ static int rv32m1_lpuart_irq_tx_complete(struct device *dev)
 static int rv32m1_lpuart_irq_tx_ready(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
+	uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable;
 
 	return (LPUART_GetEnabledInterrupts(config->base) & mask)
 		&& rv32m1_lpuart_irq_tx_complete(dev);
@@ -153,7 +153,7 @@ static int rv32m1_lpuart_irq_tx_ready(struct device *dev)
 static void rv32m1_lpuart_irq_rx_enable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	LPUART_EnableInterrupts(config->base, mask);
 }
@@ -161,7 +161,7 @@ static void rv32m1_lpuart_irq_rx_enable(struct device *dev)
 static void rv32m1_lpuart_irq_rx_disable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	LPUART_DisableInterrupts(config->base, mask);
 }
@@ -169,7 +169,7 @@ static void rv32m1_lpuart_irq_rx_disable(struct device *dev)
 static int rv32m1_lpuart_irq_rx_full(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t flags = LPUART_GetStatusFlags(config->base);
+	uint32_t flags = LPUART_GetStatusFlags(config->base);
 
 	return (flags & kLPUART_RxDataRegFullFlag) != 0U;
 }
@@ -177,7 +177,7 @@ static int rv32m1_lpuart_irq_rx_full(struct device *dev)
 static int rv32m1_lpuart_irq_rx_ready(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_RxDataRegFullInterruptEnable;
+	uint32_t mask = kLPUART_RxDataRegFullInterruptEnable;
 
 	return (LPUART_GetEnabledInterrupts(config->base) & mask)
 		&& rv32m1_lpuart_irq_rx_full(dev);
@@ -186,7 +186,7 @@ static int rv32m1_lpuart_irq_rx_ready(struct device *dev)
 static void rv32m1_lpuart_irq_err_enable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPUART_NoiseErrorInterruptEnable |
 			kLPUART_FramingErrorInterruptEnable |
 			kLPUART_ParityErrorInterruptEnable;
 
@@ -196,7 +196,7 @@ static void rv32m1_lpuart_irq_err_enable(struct device *dev)
 static void rv32m1_lpuart_irq_err_disable(struct device *dev)
 {
 	const struct rv32m1_lpuart_config *config = dev->config_info;
-	u32_t mask = kLPUART_NoiseErrorInterruptEnable |
+	uint32_t mask = kLPUART_NoiseErrorInterruptEnable |
 			kLPUART_FramingErrorInterruptEnable |
 			kLPUART_ParityErrorInterruptEnable;
 
@@ -240,7 +240,7 @@ static int rv32m1_lpuart_init(struct device *dev)
 	const struct rv32m1_lpuart_config *config = dev->config_info;
 	lpuart_config_t uart_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	/* set clock source */
 	/* TODO: Don't change if another core has configured */
diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c
index 937041e667..9aff779929 100644
--- a/drivers/serial/uart_sam.c
+++ b/drivers/serial/uart_sam.c
@@ -24,7 +24,7 @@
 /* Device constant configuration parameters */
 struct uart_sam_dev_cfg {
 	Uart *regs;
-	u32_t periph_id;
+	uint32_t periph_id;
 	struct soc_gpio_pin pin_rx;
 	struct soc_gpio_pin pin_tx;
 
@@ -35,7 +35,7 @@ struct uart_sam_dev_cfg {
 
 /* Device run time data */
 struct uart_sam_dev_data {
-	u32_t baud_rate;
+	uint32_t baud_rate;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t irq_cb;	/* Interrupt Callback */
@@ -49,8 +49,8 @@ struct uart_sam_dev_data {
 	((struct uart_sam_dev_data *const)(dev)->driver_data)
 
 
-static int baudrate_set(Uart *const uart, u32_t baudrate,
-			u32_t mck_freq_hz);
+static int baudrate_set(Uart *const uart, uint32_t baudrate,
+			uint32_t mck_freq_hz);
 
 
 static int uart_sam_init(struct device *dev)
@@ -120,7 +120,7 @@ static void uart_sam_poll_out(struct device *dev, unsigned char c)
 	}
 
 	/* send a character */
-	uart->UART_THR = (u32_t)c;
+	uart->UART_THR = (uint32_t)c;
 }
 
 static int uart_sam_err_check(struct device *dev)
@@ -143,10 +143,10 @@ static int uart_sam_err_check(struct device *dev)
 	return errors;
 }
 
-static int baudrate_set(Uart *const uart, u32_t baudrate,
-			u32_t mck_freq_hz)
+static int baudrate_set(Uart *const uart, uint32_t baudrate,
+			uint32_t mck_freq_hz)
 {
-	u32_t divisor;
+	uint32_t divisor;
 
 	__ASSERT(baudrate,
 		 "baud rate has to be bigger than 0");
diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c
index d1aaf6bfc3..3477e4503b 100644
--- a/drivers/serial/uart_sam0.c
+++ b/drivers/serial/uart_sam0.c
@@ -22,25 +22,25 @@
 /* Device constant configuration parameters */
 struct uart_sam0_dev_cfg {
 	SercomUsart *regs;
-	u32_t baudrate;
-	u32_t pads;
+	uint32_t baudrate;
+	uint32_t pads;
 #ifdef MCLK
 	volatile uint32_t *mclk;
-	u32_t mclk_mask;
-	u16_t gclk_core_id;
+	uint32_t mclk_mask;
+	uint16_t gclk_core_id;
 #else
-	u32_t pm_apbcmask;
-	u16_t gclk_clkctrl_id;
+	uint32_t pm_apbcmask;
+	uint16_t gclk_clkctrl_id;
 #endif
 #if CONFIG_UART_INTERRUPT_DRIVEN || CONFIG_UART_ASYNC_API
 	void (*irq_config_func)(struct device *dev);
 #endif
 #if CONFIG_UART_ASYNC_API
 	char *dma_dev;
-	u8_t tx_dma_request;
-	u8_t tx_dma_channel;
-	u8_t rx_dma_request;
-	u8_t rx_dma_channel;
+	uint8_t tx_dma_request;
+	uint8_t tx_dma_channel;
+	uint8_t rx_dma_request;
+	uint8_t rx_dma_channel;
 #endif
 };
 
@@ -59,17 +59,17 @@ struct uart_sam0_dev_data {
 	void *async_cb_data;
 
 	struct k_delayed_work tx_timeout_work;
-	const u8_t *tx_buf;
+	const uint8_t *tx_buf;
 	size_t tx_len;
 
 	struct k_delayed_work rx_timeout_work;
 	size_t rx_timeout_time;
 	size_t rx_timeout_chunk;
-	u32_t rx_timeout_start;
-	u8_t *rx_buf;
+	uint32_t rx_timeout_start;
+	uint8_t *rx_buf;
 	size_t rx_len;
 	size_t rx_processed_len;
-	u8_t *rx_next_buf;
+	uint8_t *rx_next_buf;
 	size_t rx_next_len;
 	bool rx_waiting_for_irq;
 	bool rx_timeout_from_isr;
@@ -95,13 +95,13 @@ static void wait_synchronization(SercomUsart *const usart)
 #endif
 }
 
-static int uart_sam0_set_baudrate(SercomUsart *const usart, u32_t baudrate,
-				  u32_t clk_freq_hz)
+static int uart_sam0_set_baudrate(SercomUsart *const usart, uint32_t baudrate,
+				  uint32_t clk_freq_hz)
 {
-	u64_t tmp;
-	u16_t baud;
+	uint64_t tmp;
+	uint16_t baud;
 
-	tmp = (u64_t)baudrate << 20;
+	tmp = (uint64_t)baudrate << 20;
 	tmp = (tmp + (clk_freq_hz >> 1)) / clk_freq_hz;
 
 	/* Verify that the calculated result is within range */
@@ -109,7 +109,7 @@ static int uart_sam0_set_baudrate(SercomUsart *const usart, u32_t baudrate,
 		return -ERANGE;
 	}
 
-	baud = 65536 - (u16_t)tmp;
+	baud = 65536 - (uint16_t)tmp;
 	usart->BAUD.reg = baud;
 	wait_synchronization(usart);
 
@@ -119,7 +119,7 @@ static int uart_sam0_set_baudrate(SercomUsart *const usart, u32_t baudrate,
 
 #if CONFIG_UART_ASYNC_API
 
-static void uart_sam0_dma_tx_done(void *arg, u32_t id, int error_code)
+static void uart_sam0_dma_tx_done(void *arg, uint32_t id, int error_code)
 {
 	ARG_UNUSED(id);
 	ARG_UNUSED(error_code);
@@ -219,7 +219,7 @@ static void uart_sam0_notify_rx_processed(struct uart_sam0_dev_data *dev_data,
 	dev_data->async_cb(&evt, dev_data->async_cb_data);
 }
 
-static void uart_sam0_dma_rx_done(void *arg, u32_t id, int error_code)
+static void uart_sam0_dma_rx_done(void *arg, uint32_t id, int error_code)
 {
 	ARG_UNUSED(id);
 	ARG_UNUSED(error_code);
@@ -272,8 +272,8 @@ static void uart_sam0_dma_rx_done(void *arg, u32_t id, int error_code)
 	dev_data->rx_processed_len = 0U;
 
 	dma_reload(dev_data->dma, cfg->rx_dma_channel,
-		   (u32_t)(&(regs->DATA.reg)),
-		   (u32_t)dev_data->rx_buf, dev_data->rx_len);
+		   (uint32_t)(&(regs->DATA.reg)),
+		   (uint32_t)dev_data->rx_buf, dev_data->rx_len);
 
 	/*
 	 * If there should be a timeout, handle starting the DMA in the
@@ -328,7 +328,7 @@ static void uart_sam0_rx_timeout(struct k_work *work)
 		return;
 	}
 
-	u8_t *rx_dma_start = dev_data->rx_buf + dev_data->rx_len -
+	uint8_t *rx_dma_start = dev_data->rx_buf + dev_data->rx_len -
 			     st.pending_length;
 	size_t rx_processed = rx_dma_start - dev_data->rx_buf;
 
@@ -337,8 +337,8 @@ static void uart_sam0_rx_timeout(struct k_work *work)
 	 * empty buffer, so always restart the transfer.
 	 */
 	dma_reload(dev_data->dma, cfg->rx_dma_channel,
-		   (u32_t)(&(regs->DATA.reg)),
-		   (u32_t)rx_dma_start,
+		   (uint32_t)(&(regs->DATA.reg)),
+		   (uint32_t)rx_dma_start,
 		   dev_data->rx_len - rx_processed);
 
 	dev_data->rx_waiting_for_irq = true;
@@ -359,8 +359,8 @@ static void uart_sam0_rx_timeout(struct k_work *work)
 		return;
 	}
 
-	u32_t now = k_uptime_get_32();
-	u32_t elapsed = now - dev_data->rx_timeout_start;
+	uint32_t now = k_uptime_get_32();
+	uint32_t elapsed = now - dev_data->rx_timeout_start;
 
 	if (elapsed >= dev_data->rx_timeout_time) {
 		/*
@@ -372,7 +372,7 @@ static void uart_sam0_rx_timeout(struct k_work *work)
 		/*
 		 * Still have time left, so start another timeout.
 		 */
-		u32_t remaining = MIN(dev_data->rx_timeout_time - elapsed,
+		uint32_t remaining = MIN(dev_data->rx_timeout_time - elapsed,
 				      dev_data->rx_timeout_chunk);
 
 		k_delayed_work_submit(&dev_data->rx_timeout_work,
@@ -580,7 +580,7 @@ static int uart_sam0_init(struct device *dev)
 		dma_cfg.dma_slot = cfg->tx_dma_request;
 
 		dma_blk.block_size = 1;
-		dma_blk.dest_address = (u32_t)(&(usart->DATA.reg));
+		dma_blk.dest_address = (uint32_t)(&(usart->DATA.reg));
 		dma_blk.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 		retval = dma_config(dev_data->dma, cfg->tx_dma_channel,
@@ -608,7 +608,7 @@ static int uart_sam0_init(struct device *dev)
 		dma_cfg.dma_slot = cfg->rx_dma_request;
 
 		dma_blk.block_size = 1;
-		dma_blk.source_address = (u32_t)(&(usart->DATA.reg));
+		dma_blk.source_address = (uint32_t)(&(usart->DATA.reg));
 		dma_blk.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 		retval = dma_config(dev_data->dma, cfg->rx_dma_channel,
@@ -701,7 +701,7 @@ static void uart_sam0_isr(void *arg)
 
 #if CONFIG_UART_INTERRUPT_DRIVEN
 
-static int uart_sam0_fifo_fill(struct device *dev, const u8_t *tx_data, int len)
+static int uart_sam0_fifo_fill(struct device *dev, const uint8_t *tx_data, int len)
 {
 	SercomUsart *regs = DEV_CFG(dev)->regs;
 
@@ -755,13 +755,13 @@ static int uart_sam0_irq_rx_ready(struct device *dev)
 	return regs->INTFLAG.bit.RXC != 0;
 }
 
-static int uart_sam0_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_sam0_fifo_read(struct device *dev, uint8_t *rx_data,
 			       const int size)
 {
 	SercomUsart *const regs = DEV_CFG(dev)->regs;
 
 	if (regs->INTFLAG.bit.RXC) {
-		u8_t ch = regs->DATA.reg;
+		uint8_t ch = regs->DATA.reg;
 
 		if (size >= 1) {
 			*rx_data = ch;
@@ -806,8 +806,8 @@ static int uart_sam0_callback_set(struct device *dev, uart_callback_t callback,
 	return 0;
 }
 
-static int uart_sam0_tx(struct device *dev, const u8_t *buf, size_t len,
-			s32_t timeout)
+static int uart_sam0_tx(struct device *dev, const uint8_t *buf, size_t len,
+			int32_t timeout)
 {
 	struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev);
 	const struct uart_sam0_dev_cfg *const cfg = DEV_CFG(dev);
@@ -834,8 +834,8 @@ static int uart_sam0_tx(struct device *dev, const u8_t *buf, size_t len,
 
 	irq_unlock(key);
 
-	retval = dma_reload(dev_data->dma, cfg->tx_dma_channel, (u32_t)buf,
-			    (u32_t)(&(regs->DATA.reg)), len);
+	retval = dma_reload(dev_data->dma, cfg->tx_dma_channel, (uint32_t)buf,
+			    (uint32_t)(&(regs->DATA.reg)), len);
 	if (retval != 0U) {
 		return retval;
 	}
@@ -865,8 +865,8 @@ static int uart_sam0_tx_abort(struct device *dev)
 	return uart_sam0_tx_halt(dev_data);
 }
 
-static int uart_sam0_rx_enable(struct device *dev, u8_t *buf, size_t len,
-			       s32_t timeout)
+static int uart_sam0_rx_enable(struct device *dev, uint8_t *buf, size_t len,
+			       int32_t timeout)
 {
 	struct uart_sam0_dev_data *const dev_data = DEV_DATA(dev);
 	const struct uart_sam0_dev_cfg *const cfg = DEV_CFG(dev);
@@ -896,8 +896,8 @@ static int uart_sam0_rx_enable(struct device *dev, u8_t *buf, size_t len,
 	}
 
 	retval = dma_reload(dev_data->dma, cfg->rx_dma_channel,
-			    (u32_t)(&(regs->DATA.reg)),
-			    (u32_t)buf, len);
+			    (uint32_t)(&(regs->DATA.reg)),
+			    (uint32_t)buf, len);
 	if (retval != 0) {
 		return retval;
 	}
@@ -920,7 +920,7 @@ err:
 	return retval;
 }
 
-static int uart_sam0_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len)
+static int uart_sam0_rx_buf_rsp(struct device *dev, uint8_t *buf, size_t len)
 {
 	if (len > 0xFFFFU) {
 		return -EINVAL;
diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c
index ab95f4f34f..c29257c068 100644
--- a/drivers/serial/uart_sifive.c
+++ b/drivers/serial/uart_sifive.c
@@ -33,13 +33,13 @@
 #define CTRL_CNT(x)    (((x) & 0x07) << 16)
 
 struct uart_sifive_regs_t {
-	u32_t tx;
-	u32_t rx;
-	u32_t txctrl;
-	u32_t rxctrl;
-	u32_t ie;
-	u32_t ip;
-	u32_t div;
+	uint32_t tx;
+	uint32_t rx;
+	uint32_t txctrl;
+	uint32_t rxctrl;
+	uint32_t ie;
+	uint32_t ip;
+	uint32_t div;
 };
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -48,10 +48,10 @@ typedef void (*irq_cfg_func_t)(void);
 
 struct uart_sifive_device_config {
 	uintptr_t   port;
-	u32_t       sys_clk_freq;
-	u32_t       baud_rate;
-	u32_t       rxcnt_irq;
-	u32_t       txcnt_irq;
+	uint32_t       sys_clk_freq;
+	uint32_t       baud_rate;
+	uint32_t       rxcnt_irq;
+	uint32_t       txcnt_irq;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	irq_cfg_func_t cfg_func;
 #endif
@@ -103,7 +103,7 @@ static void uart_sifive_poll_out(struct device *dev,
 static int uart_sifive_poll_in(struct device *dev, unsigned char *c)
 {
 	volatile struct uart_sifive_regs_t *uart = DEV_UART(dev);
-	u32_t val = uart->rx;
+	uint32_t val = uart->rx;
 
 	if (val & RXDATA_EMPTY) {
 		return -1;
@@ -126,7 +126,7 @@ static int uart_sifive_poll_in(struct device *dev, unsigned char *c)
  * @return Number of bytes sent
  */
 static int uart_sifive_fifo_fill(struct device *dev,
-				const u8_t *tx_data,
+				const uint8_t *tx_data,
 				int size)
 {
 	volatile struct uart_sifive_regs_t *uart = DEV_UART(dev);
@@ -148,12 +148,12 @@ static int uart_sifive_fifo_fill(struct device *dev,
  * @return Number of bytes read
  */
 static int uart_sifive_fifo_read(struct device *dev,
-				u8_t *rx_data,
+				uint8_t *rx_data,
 				const int size)
 {
 	volatile struct uart_sifive_regs_t *uart = DEV_UART(dev);
 	int i;
-	u32_t val;
+	uint32_t val;
 
 	for (i = 0; i < size; i++) {
 		val = uart->rx;
@@ -161,7 +161,7 @@ static int uart_sifive_fifo_read(struct device *dev,
 		if (val & RXDATA_EMPTY)
 			break;
 
-		rx_data[i] = (u8_t)(val & RXDATA_MASK);
+		rx_data[i] = (uint8_t)(val & RXDATA_MASK);
 	}
 
 	return i;
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 5918144ffe..6b33543311 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -32,44 +32,44 @@
 
 /* Stellaris UART module */
 struct _uart {
-	u32_t dr;
+	uint32_t dr;
 	union {
-		u32_t _sr;
-		u32_t _cr;
+		uint32_t _sr;
+		uint32_t _cr;
 	} u1;
-	u8_t _res1[0x010];
-	u32_t fr;
-	u8_t _res2[0x04];
-	u32_t ilpr;
-	u32_t ibrd;
-	u32_t fbrd;
-	u32_t lcrh;
-	u32_t ctl;
-	u32_t ifls;
-	u32_t im;
-	u32_t ris;
-	u32_t mis;
-	u32_t icr;
-	u8_t _res3[0xf8c];
+	uint8_t _res1[0x010];
+	uint32_t fr;
+	uint8_t _res2[0x04];
+	uint32_t ilpr;
+	uint32_t ibrd;
+	uint32_t fbrd;
+	uint32_t lcrh;
+	uint32_t ctl;
+	uint32_t ifls;
+	uint32_t im;
+	uint32_t ris;
+	uint32_t mis;
+	uint32_t icr;
+	uint8_t _res3[0xf8c];
 
-	u32_t peripd_id4;
-	u32_t peripd_id5;
-	u32_t peripd_id6;
-	u32_t peripd_id7;
-	u32_t peripd_id0;
-	u32_t peripd_id1;
-	u32_t peripd_id2;
-	u32_t peripd_id3;
+	uint32_t peripd_id4;
+	uint32_t peripd_id5;
+	uint32_t peripd_id6;
+	uint32_t peripd_id7;
+	uint32_t peripd_id0;
+	uint32_t peripd_id1;
+	uint32_t peripd_id2;
+	uint32_t peripd_id3;
 
-	u32_t p_cell_id0;
-	u32_t p_cell_id1;
-	u32_t p_cell_id2;
-	u32_t p_cell_id3;
+	uint32_t p_cell_id0;
+	uint32_t p_cell_id1;
+	uint32_t p_cell_id2;
+	uint32_t p_cell_id3;
 };
 
 /* Device data structure */
 struct uart_stellaris_dev_data_t {
-	u32_t baud_rate;	/* Baud rate */
+	uint32_t baud_rate;	/* Baud rate */
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t cb;	/**< Callback function pointer */
@@ -87,34 +87,34 @@ struct uart_stellaris_dev_data_t {
 	((volatile struct _uart *)(DEV_CFG(dev))->base)
 
 /* registers */
-#define UARTDR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x000)))
-#define UARTSR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x004)))
-#define UARTCR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x004)))
-#define UARTFR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x018)))
-#define UARTILPR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x020)))
-#define UARTIBRD(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x024)))
-#define UARTFBRD(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x028)))
-#define UARTLCRH(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x02C)))
-#define UARTCTL(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x030)))
-#define UARTIFLS(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x034)))
-#define UARTIM(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x038)))
-#define UARTRIS(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x03C)))
-#define UARTMIS(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x040)))
-#define UARTICR(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0x044)))
+#define UARTDR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x000)))
+#define UARTSR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x004)))
+#define UARTCR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x004)))
+#define UARTFR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x018)))
+#define UARTILPR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x020)))
+#define UARTIBRD(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x024)))
+#define UARTFBRD(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x028)))
+#define UARTLCRH(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x02C)))
+#define UARTCTL(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x030)))
+#define UARTIFLS(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x034)))
+#define UARTIM(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x038)))
+#define UARTRIS(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x03C)))
+#define UARTMIS(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x040)))
+#define UARTICR(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0x044)))
 
 /* ID registers: UARTPID = UARTPeriphID, UARTPCID = UARTPCellId */
-#define UARTPID4(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFD0)))
-#define UARTPID5(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFD4)))
-#define UARTPID6(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFD8)))
-#define UARTPID7(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFDC)))
-#define UARTPID0(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFE0)))
-#define UARTPID1(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFE4)))
-#define UARTPID2(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFE8)))
-#define UARTPID3(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFEC)))
-#define UARTPCID0(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFF0)))
-#define UARTPCID1(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFF4)))
-#define UARTPCID2(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFF8)))
-#define UARTPCID3(dev) (*((volatile u32_t *)(DEV_CFG(dev)->base + 0xFFC)))
+#define UARTPID4(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFD0)))
+#define UARTPID5(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFD4)))
+#define UARTPID6(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFD8)))
+#define UARTPID7(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFDC)))
+#define UARTPID0(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFE0)))
+#define UARTPID1(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFE4)))
+#define UARTPID2(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFE8)))
+#define UARTPID3(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFEC)))
+#define UARTPCID0(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFF0)))
+#define UARTPCID1(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFF4)))
+#define UARTPCID2(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFF8)))
+#define UARTPCID3(dev) (*((volatile uint32_t *)(DEV_CFG(dev)->base + 0xFFC)))
 
 /* muxed UART registers */
 #define sr u1._sr /* Read: receive status */
@@ -160,10 +160,10 @@ static const struct uart_driver_api uart_stellaris_driver_api;
  * @return N/A
  */
 static void baudrate_set(struct device *dev,
-			 u32_t baudrate, u32_t sys_clk_freq_hz)
+			 uint32_t baudrate, uint32_t sys_clk_freq_hz)
 {
 	volatile struct _uart *uart = UART_STRUCT(dev);
-	u32_t brdi, brdf, div, rem;
+	uint32_t brdi, brdf, div, rem;
 
 	/* upon reset, the system clock uses the intenal OSC @ 12MHz */
 
@@ -183,8 +183,8 @@ static void baudrate_set(struct device *dev,
 	 * those registers are 32-bit, but the reserved bits should be
 	 * preserved
 	 */
-	uart->ibrd = (u16_t)(brdi & 0xffff); /* 16 bits */
-	uart->fbrd = (u8_t)(brdf & 0x3f);    /* 6 bits */
+	uart->ibrd = (uint16_t)(brdi & 0xffff); /* 16 bits */
+	uart->fbrd = (uint8_t)(brdf & 0x3f);    /* 6 bits */
 }
 
 /**
@@ -334,7 +334,7 @@ static void uart_stellaris_poll_out(struct device *dev,
 	}
 
 	/* send a character */
-	uart->dr = (u32_t)c;
+	uart->dr = (uint32_t)c;
 }
 
 #if CONFIG_UART_INTERRUPT_DRIVEN
@@ -348,14 +348,14 @@ static void uart_stellaris_poll_out(struct device *dev,
  *
  * @return Number of bytes sent
  */
-static int uart_stellaris_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_stellaris_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				    int len)
 {
 	volatile struct _uart *uart = UART_STRUCT(dev);
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((len - num_tx > 0) && ((uart->fr & UARTFR_TXFF) == 0U)) {
-		uart->dr = (u32_t)tx_data[num_tx++];
+		uart->dr = (uint32_t)tx_data[num_tx++];
 	}
 
 	return (int)num_tx;
@@ -370,14 +370,14 @@ static int uart_stellaris_fifo_fill(struct device *dev, const u8_t *tx_data,
  *
  * @return Number of bytes read
  */
-static int uart_stellaris_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_stellaris_fifo_read(struct device *dev, uint8_t *rx_data,
 				    const int size)
 {
 	volatile struct _uart *uart = UART_STRUCT(dev);
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((size - num_rx > 0) && ((uart->fr & UARTFR_RXFE) == 0U)) {
-		rx_data[num_rx++] = (u8_t)uart->dr;
+		rx_data[num_rx++] = (uint8_t)uart->dr;
 	}
 
 	return num_rx;
@@ -392,11 +392,11 @@ static int uart_stellaris_fifo_read(struct device *dev, u8_t *rx_data,
  */
 static void uart_stellaris_irq_tx_enable(struct device *dev)
 {
-	static u8_t first_time =
+	static uint8_t first_time =
 		1U;	   /* used to allow the first transmission */
-	u32_t saved_ctl;  /* saved UARTCTL (control) register */
-	u32_t saved_ibrd; /* saved UARTIBRD (integer baud rate) register */
-	u32_t saved_fbrd; /* saved UARTFBRD (fractional baud rate) register
+	uint32_t saved_ctl;  /* saved UARTCTL (control) register */
+	uint32_t saved_ibrd; /* saved UARTIBRD (integer baud rate) register */
+	uint32_t saved_fbrd; /* saved UARTFBRD (fractional baud rate) register
 				*/
 	volatile struct _uart *uart = UART_STRUCT(dev);
 
@@ -635,7 +635,7 @@ static void irq_config_func_0(struct device *port);
 #endif
 
 static const struct uart_device_config uart_stellaris_dev_cfg_0 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(0),
+	.base = (uint8_t *)DT_INST_REG_ADDR(0),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(0, clocks, clock_frequency),
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -673,7 +673,7 @@ static void irq_config_func_1(struct device *port);
 #endif
 
 static struct uart_device_config uart_stellaris_dev_cfg_1 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(1),
+	.base = (uint8_t *)DT_INST_REG_ADDR(1),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(1, clocks, clock_frequency),
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -711,7 +711,7 @@ static void irq_config_func_2(struct device *port);
 #endif
 
 static const struct uart_device_config uart_stellaris_dev_cfg_2 = {
-	.base = (u8_t *)DT_INST_REG_ADDR(2),
+	.base = (uint8_t *)DT_INST_REG_ADDR(2),
 	.sys_clk_freq = DT_INST_PROP_BY_PHANDLE(2, clocks, clock_frequency),
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 8e8dd28b9e..9888281d3c 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -42,13 +42,13 @@ LOG_MODULE_REGISTER(uart_stm32);
 
 #define TIMEOUT 1000
 
-static inline void uart_stm32_set_baudrate(struct device *dev, u32_t baud_rate)
+static inline void uart_stm32_set_baudrate(struct device *dev, uint32_t baud_rate)
 {
 	const struct uart_stm32_config *config = DEV_CFG(dev);
 	struct uart_stm32_data *data = DEV_DATA(dev);
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
-	u32_t clock_rate;
+	uint32_t clock_rate;
 
 	/* Get clock rate */
 	if (clock_control_get_rate(data->clock,
@@ -85,63 +85,63 @@ static inline void uart_stm32_set_baudrate(struct device *dev, u32_t baud_rate)
 #endif /* HAS_LPUART_1 */
 }
 
-static inline void uart_stm32_set_parity(struct device *dev, u32_t parity)
+static inline void uart_stm32_set_parity(struct device *dev, uint32_t parity)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	LL_USART_SetParity(UartInstance, parity);
 }
 
-static inline u32_t uart_stm32_get_parity(struct device *dev)
+static inline uint32_t uart_stm32_get_parity(struct device *dev)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	return LL_USART_GetParity(UartInstance);
 }
 
-static inline void uart_stm32_set_stopbits(struct device *dev, u32_t stopbits)
+static inline void uart_stm32_set_stopbits(struct device *dev, uint32_t stopbits)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	LL_USART_SetStopBitsLength(UartInstance, stopbits);
 }
 
-static inline u32_t uart_stm32_get_stopbits(struct device *dev)
+static inline uint32_t uart_stm32_get_stopbits(struct device *dev)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	return LL_USART_GetStopBitsLength(UartInstance);
 }
 
-static inline void uart_stm32_set_databits(struct device *dev, u32_t databits)
+static inline void uart_stm32_set_databits(struct device *dev, uint32_t databits)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	LL_USART_SetDataWidth(UartInstance, databits);
 }
 
-static inline u32_t uart_stm32_get_databits(struct device *dev)
+static inline uint32_t uart_stm32_get_databits(struct device *dev)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	return LL_USART_GetDataWidth(UartInstance);
 }
 
-static inline void uart_stm32_set_hwctrl(struct device *dev, u32_t hwctrl)
+static inline void uart_stm32_set_hwctrl(struct device *dev, uint32_t hwctrl)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	LL_USART_SetHWFlowCtrl(UartInstance, hwctrl);
 }
 
-static inline u32_t uart_stm32_get_hwctrl(struct device *dev)
+static inline uint32_t uart_stm32_get_hwctrl(struct device *dev)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
 
 	return LL_USART_GetHWFlowCtrl(UartInstance);
 }
 
-static inline u32_t uart_stm32_cfg2ll_parity(enum uart_config_parity parity)
+static inline uint32_t uart_stm32_cfg2ll_parity(enum uart_config_parity parity)
 {
 	switch (parity) {
 	case UART_CFG_PARITY_ODD:
@@ -154,7 +154,7 @@ static inline u32_t uart_stm32_cfg2ll_parity(enum uart_config_parity parity)
 	}
 }
 
-static inline enum uart_config_parity uart_stm32_ll2cfg_parity(u32_t parity)
+static inline enum uart_config_parity uart_stm32_ll2cfg_parity(uint32_t parity)
 {
 	switch (parity) {
 	case LL_USART_PARITY_ODD:
@@ -167,7 +167,7 @@ static inline enum uart_config_parity uart_stm32_ll2cfg_parity(u32_t parity)
 	}
 }
 
-static inline u32_t uart_stm32_cfg2ll_stopbits(enum uart_config_stop_bits sb)
+static inline uint32_t uart_stm32_cfg2ll_stopbits(enum uart_config_stop_bits sb)
 {
 	switch (sb) {
 /* Some MCU's don't support 0.5 stop bits */
@@ -188,7 +188,7 @@ static inline u32_t uart_stm32_cfg2ll_stopbits(enum uart_config_stop_bits sb)
 	}
 }
 
-static inline enum uart_config_stop_bits uart_stm32_ll2cfg_stopbits(u32_t sb)
+static inline enum uart_config_stop_bits uart_stm32_ll2cfg_stopbits(uint32_t sb)
 {
 	switch (sb) {
 /* Some MCU's don't support 0.5 stop bits */
@@ -209,7 +209,7 @@ static inline enum uart_config_stop_bits uart_stm32_ll2cfg_stopbits(u32_t sb)
 	}
 }
 
-static inline u32_t uart_stm32_cfg2ll_databits(enum uart_config_data_bits db)
+static inline uint32_t uart_stm32_cfg2ll_databits(enum uart_config_data_bits db)
 {
 	switch (db) {
 /* Some MCU's don't support 7B or 9B datawidth */
@@ -227,7 +227,7 @@ static inline u32_t uart_stm32_cfg2ll_databits(enum uart_config_data_bits db)
 	}
 }
 
-static inline enum uart_config_data_bits uart_stm32_ll2cfg_databits(u32_t db)
+static inline enum uart_config_data_bits uart_stm32_ll2cfg_databits(uint32_t db)
 {
 	switch (db) {
 /* Some MCU's don't support 7B or 9B datawidth */
@@ -252,7 +252,7 @@ static inline enum uart_config_data_bits uart_stm32_ll2cfg_databits(u32_t db)
  * @param  fc: Zephyr hardware flow control option.
  * @retval LL_USART_HWCONTROL_RTS_CTS, or LL_USART_HWCONTROL_NONE.
  */
-static inline u32_t uart_stm32_cfg2ll_hwctrl(enum uart_config_flow_control fc)
+static inline uint32_t uart_stm32_cfg2ll_hwctrl(enum uart_config_flow_control fc)
 {
 	if (fc == UART_CFG_FLOW_CTRL_RTS_CTS) {
 		return LL_USART_HWCONTROL_RTS_CTS;
@@ -268,7 +268,7 @@ static inline u32_t uart_stm32_cfg2ll_hwctrl(enum uart_config_flow_control fc)
  * @param  fc: LL hardware flow control definition.
  * @retval UART_CFG_FLOW_CTRL_RTS_CTS, or UART_CFG_FLOW_CTRL_NONE.
  */
-static inline enum uart_config_flow_control uart_stm32_ll2cfg_hwctrl(u32_t fc)
+static inline enum uart_config_flow_control uart_stm32_ll2cfg_hwctrl(uint32_t fc)
 {
 	if (fc == LL_USART_HWCONTROL_RTS_CTS) {
 		return UART_CFG_FLOW_CTRL_RTS_CTS;
@@ -282,10 +282,10 @@ static int uart_stm32_configure(struct device *dev,
 {
 	struct uart_stm32_data *data = DEV_DATA(dev);
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
-	const u32_t parity = uart_stm32_cfg2ll_parity(cfg->parity);
-	const u32_t stopbits = uart_stm32_cfg2ll_stopbits(cfg->stop_bits);
-	const u32_t databits = uart_stm32_cfg2ll_databits(cfg->data_bits);
-	const u32_t flowctrl = uart_stm32_cfg2ll_hwctrl(cfg->flow_ctrl);
+	const uint32_t parity = uart_stm32_cfg2ll_parity(cfg->parity);
+	const uint32_t stopbits = uart_stm32_cfg2ll_stopbits(cfg->stop_bits);
+	const uint32_t databits = uart_stm32_cfg2ll_databits(cfg->data_bits);
+	const uint32_t flowctrl = uart_stm32_cfg2ll_hwctrl(cfg->flow_ctrl);
 
 	/* Hardware doesn't support mark or space parity */
 	if ((UART_CFG_PARITY_MARK == cfg->parity) ||
@@ -407,13 +407,13 @@ static void uart_stm32_poll_out(struct device *dev,
 
 	LL_USART_ClearFlag_TC(UartInstance);
 
-	LL_USART_TransmitData8(UartInstance, (u8_t)c);
+	LL_USART_TransmitData8(UartInstance, (uint8_t)c);
 }
 
 static int uart_stm32_err_check(struct device *dev)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
-	u32_t err = 0U;
+	uint32_t err = 0U;
 
 	/* Check for errors, but don't clear them here.
 	 * Some SoC clear all error flags when at least
@@ -464,11 +464,11 @@ static inline void __uart_stm32_get_clock(struct device *dev)
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
-static int uart_stm32_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_stm32_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				  int size)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
-	u8_t num_tx = 0U;
+	uint8_t num_tx = 0U;
 
 	while ((size - num_tx > 0) &&
 	       LL_USART_IsActiveFlag_TXE(UartInstance)) {
@@ -481,11 +481,11 @@ static int uart_stm32_fifo_fill(struct device *dev, const u8_t *tx_data,
 	return num_tx;
 }
 
-static int uart_stm32_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_stm32_fifo_read(struct device *dev, uint8_t *rx_data,
 				  const int size)
 {
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
-	u8_t num_rx = 0U;
+	uint8_t num_rx = 0U;
 
 	while ((size - num_rx > 0) &&
 	       LL_USART_IsActiveFlag_RXNE(UartInstance)) {
@@ -660,8 +660,8 @@ static int uart_stm32_init(struct device *dev)
 	const struct uart_stm32_config *config = DEV_CFG(dev);
 	struct uart_stm32_data *data = DEV_DATA(dev);
 	USART_TypeDef *UartInstance = UART_STRUCT(dev);
-	u32_t ll_parity;
-	u32_t ll_datawidth;
+	uint32_t ll_parity;
+	uint32_t ll_datawidth;
 
 	__uart_stm32_get_clock(dev);
 	/* enable clock */
@@ -756,7 +756,7 @@ STM32_UART_IRQ_HANDLER_DECL(index);					\
 									\
 static const struct uart_stm32_config uart_stm32_cfg_##index = {	\
 	.uconf = {							\
-		.base = (u8_t *)DT_INST_REG_ADDR(index),\
+		.base = (uint8_t *)DT_INST_REG_ADDR(index),\
 		STM32_UART_IRQ_HANDLER_FUNC(index)			\
 	},								\
 	.pclken = { .bus = DT_INST_CLOCKS_CELL(index, bus),	\
diff --git a/drivers/serial/uart_stm32.h b/drivers/serial/uart_stm32.h
index f0d35125cd..7167070b12 100644
--- a/drivers/serial/uart_stm32.h
+++ b/drivers/serial/uart_stm32.h
@@ -26,7 +26,7 @@ struct uart_stm32_config {
 /* driver data */
 struct uart_stm32_data {
 	/* Baud rate */
-	u32_t baud_rate;
+	uint32_t baud_rate;
 	/* clock device */
 	struct device *clock;
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index 5ff1e693e6..4a1898e4bd 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -134,15 +134,15 @@
 /** Device configuration structure */
 struct uart_xlnx_ps_dev_config {
 	struct uart_device_config uconf;
-	u32_t baud_rate;
+	uint32_t baud_rate;
 };
 
 /** Device data structure */
 struct uart_xlnx_ps_dev_data_t {
-	u32_t parity;
-	u32_t stopbits;
-	u32_t databits;
-	u32_t flowctrl;
+	uint32_t parity;
+	uint32_t stopbits;
+	uint32_t databits;
+	uint32_t flowctrl;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t user_cb;
@@ -172,9 +172,9 @@ static const struct uart_driver_api uart_xlnx_ps_driver_api;
  *
  * @param reg_base Base address of the respective UART's register space.
  */
-static void xlnx_ps_disable_uart(u32_t reg_base)
+static void xlnx_ps_disable_uart(uint32_t reg_base)
 {
-	u32_t regval;
+	uint32_t regval;
 
 	regval = sys_read32(reg_base + XUARTPS_CR_OFFSET);
 	regval &= (~XUARTPS_CR_EN_DIS_MASK);
@@ -197,9 +197,9 @@ static void xlnx_ps_disable_uart(u32_t reg_base)
  *
  * @param reg_base Base address of the respective UART's register space.
  */
-static void xlnx_ps_enable_uart(u32_t reg_base)
+static void xlnx_ps_enable_uart(uint32_t reg_base)
 {
-	u32_t regval;
+	uint32_t regval;
 
 	regval = sys_read32(reg_base + XUARTPS_CR_OFFSET);
 	regval &= (~XUARTPS_CR_EN_DIS_MASK);
@@ -222,13 +222,13 @@ static void xlnx_ps_enable_uart(u32_t reg_base)
  * @param dev UART device struct
  * @param baud_rate The desired baud rate as a decimal value
  */
-static void set_baudrate(struct device *dev, u32_t baud_rate)
+static void set_baudrate(struct device *dev, uint32_t baud_rate)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t divisor, generator;
-	u32_t baud;
-	u32_t clk_freq;
-	u32_t reg_base;
+	uint32_t divisor, generator;
+	uint32_t baud;
+	uint32_t clk_freq;
+	uint32_t reg_base;
 
 	baud = dev_cfg->baud_rate;
 	clk_freq = dev_cfg->uconf.sys_clk_freq;
@@ -241,7 +241,7 @@ static void set_baudrate(struct device *dev, u32_t baud_rate)
 		}
 
 		for (divisor = 4; divisor < 255; divisor++) {
-			u32_t tmpbaud, bauderr;
+			uint32_t tmpbaud, bauderr;
 
 			generator = clk_freq / (baud * (divisor + 1));
 			if (generator < 2 || generator > 65535) {
@@ -284,8 +284,8 @@ static void set_baudrate(struct device *dev, u32_t baud_rate)
 static int uart_xlnx_ps_init(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_val;
-	u32_t reg_base;
+	uint32_t reg_val;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 
@@ -338,8 +338,8 @@ static int uart_xlnx_ps_init(struct device *dev)
 static int uart_xlnx_ps_poll_in(struct device *dev, unsigned char *c)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_val;
-	u32_t reg_base;
+	uint32_t reg_val;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
@@ -369,8 +369,8 @@ static int uart_xlnx_ps_poll_in(struct device *dev, unsigned char *c)
 static void uart_xlnx_ps_poll_out(struct device *dev, unsigned char c)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_val;
-	u32_t reg_base;
+	uint32_t reg_val;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	/* wait for transmitter to ready to accept a character */
@@ -378,7 +378,7 @@ static void uart_xlnx_ps_poll_out(struct device *dev, unsigned char c)
 		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
 	} while ((reg_val & XUARTPS_SR_TXEMPTY) == 0);
 
-	sys_write32((u32_t)(c & 0xFF), reg_base + XUARTPS_FIFO_OFFSET);
+	sys_write32((uint32_t)(c & 0xFF), reg_base + XUARTPS_FIFO_OFFSET);
 
 	do {
 		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
@@ -405,7 +405,7 @@ static void uart_xlnx_ps_poll_out(struct device *dev, unsigned char c)
  *         by the hardware.
  */
 static inline bool uart_xlnx_ps_cfg2ll_parity(
-	u32_t *mode_reg,
+	uint32_t *mode_reg,
 	enum uart_config_parity parity)
 {
 	/*
@@ -459,7 +459,7 @@ static inline bool uart_xlnx_ps_cfg2ll_parity(
  *         stop bit configuration being provided by the caller.
  */
 static inline bool uart_xlnx_ps_cfg2ll_stopbits(
-	u32_t *mode_reg,
+	uint32_t *mode_reg,
 	enum uart_config_stop_bits stopbits)
 {
 	/*
@@ -509,7 +509,7 @@ static inline bool uart_xlnx_ps_cfg2ll_stopbits(
  *         data bit configuration being provided by the caller.
  */
 static inline bool uart_xlnx_ps_cfg2ll_databits(
-	u32_t *mode_reg,
+	uint32_t *mode_reg,
 	enum uart_config_data_bits databits)
 {
 	/*
@@ -561,7 +561,7 @@ static inline bool uart_xlnx_ps_cfg2ll_databits(
  *         flow control configuration being provided by the caller.
  */
 static inline bool uart_xlnx_ps_cfg2ll_hwctrl(
-	u32_t *modemcr_reg,
+	uint32_t *modemcr_reg,
 	enum uart_config_flow_control hwctrl)
 {
 	/*
@@ -601,9 +601,9 @@ static int uart_xlnx_ps_configure(struct device *dev,
 	struct uart_xlnx_ps_dev_config *dev_cfg =
 	(struct uart_xlnx_ps_dev_config *)DEV_CFG(dev);
 
-	u32_t reg_base    = dev_cfg->uconf.regs;
-	u32_t mode_reg    = 0;
-	u32_t modemcr_reg = 0;
+	uint32_t reg_base    = dev_cfg->uconf.regs;
+	uint32_t mode_reg    = 0;
+	uint32_t modemcr_reg = 0;
 
 	/* Read the current mode register & modem control register values */
 	mode_reg    = sys_read32(reg_base + XUARTPS_MR_OFFSET);
@@ -655,7 +655,7 @@ static int uart_xlnx_ps_configure(struct device *dev,
  *         enum type.
  */
 static inline enum uart_config_parity uart_xlnx_ps_ll2cfg_parity(
-	u32_t mode_reg)
+	uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current parity configuration from the mode register's
@@ -697,7 +697,7 @@ static inline enum uart_config_parity uart_xlnx_ps_ll2cfg_parity(
  *         enum type.
  */
 static inline enum uart_config_stop_bits uart_xlnx_ps_ll2cfg_stopbits(
-	u32_t mode_reg)
+	uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current stop bit configuration from the mode register's
@@ -734,7 +734,7 @@ static inline enum uart_config_stop_bits uart_xlnx_ps_ll2cfg_stopbits(
  *         enum type.
  */
 static inline enum uart_config_data_bits uart_xlnx_ps_ll2cfg_databits(
-	u32_t mode_reg)
+	uint32_t mode_reg)
 {
 	/*
 	 * Obtain the current data bit configuration from the mode register's
@@ -770,7 +770,7 @@ static inline enum uart_config_data_bits uart_xlnx_ps_ll2cfg_databits(
  *         enum type.
  */
 static inline enum uart_config_flow_control uart_xlnx_ps_ll2cfg_hwctrl(
-	u32_t modemcr_reg)
+	uint32_t modemcr_reg)
 {
 	/*
 	 * Obtain the current flow control configuration from the modem
@@ -812,9 +812,9 @@ static int uart_xlnx_ps_config_get(struct device *dev,
 	 * Control register).
 	 */
 
-	u32_t reg_base    = dev_cfg->uconf.regs;
-	u32_t mode_reg    = sys_read32(reg_base + XUARTPS_MR_OFFSET);
-	u32_t modemcr_reg = sys_read32(reg_base + XUARTPS_MODEMCR_OFFSET);
+	uint32_t reg_base    = dev_cfg->uconf.regs;
+	uint32_t mode_reg    = sys_read32(reg_base + XUARTPS_MR_OFFSET);
+	uint32_t modemcr_reg = sys_read32(reg_base + XUARTPS_MODEMCR_OFFSET);
 
 	cfg->baudrate  = dev_cfg->baud_rate;
 	cfg->parity    = uart_xlnx_ps_ll2cfg_parity(mode_reg);
@@ -836,18 +836,18 @@ static int uart_xlnx_ps_config_get(struct device *dev,
  *
  * @return Number of bytes sent
  */
-static int uart_xlnx_ps_fifo_fill(struct device *dev, const u8_t *tx_data,
+static int uart_xlnx_ps_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				  int size)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_val;
-	u32_t reg_base;
+	uint32_t reg_val;
+	uint32_t reg_base;
 	int onum = 0;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
 	while (onum < size && (reg_val & XUARTPS_SR_TXFULL) == 0) {
-		sys_write32((u32_t)(tx_data[onum] & 0xFF),
+		sys_write32((uint32_t)(tx_data[onum] & 0xFF),
 				reg_base + XUARTPS_FIFO_OFFSET);
 		onum++;
 		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
@@ -865,19 +865,19 @@ static int uart_xlnx_ps_fifo_fill(struct device *dev, const u8_t *tx_data,
  *
  * @return Number of bytes read
  */
-static int uart_xlnx_ps_fifo_read(struct device *dev, u8_t *rx_data,
+static int uart_xlnx_ps_fifo_read(struct device *dev, uint8_t *rx_data,
 				  const int size)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_val;
-	u32_t reg_base;
+	uint32_t reg_val;
+	uint32_t reg_base;
 	int inum = 0;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
 
 	while (inum < size && (reg_val & XUARTPS_SR_RXEMPTY) == 0) {
-		rx_data[inum] = (u8_t)sys_read32(reg_base
+		rx_data[inum] = (uint8_t)sys_read32(reg_base
 				+ XUARTPS_FIFO_OFFSET);
 		inum++;
 		reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
@@ -896,7 +896,7 @@ static int uart_xlnx_ps_fifo_read(struct device *dev, u8_t *rx_data,
 static void uart_xlnx_ps_irq_tx_enable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(
@@ -914,7 +914,7 @@ static void uart_xlnx_ps_irq_tx_enable(struct device *dev)
 static void uart_xlnx_ps_irq_tx_disable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(
@@ -932,8 +932,8 @@ static void uart_xlnx_ps_irq_tx_disable(struct device *dev)
 static int uart_xlnx_ps_irq_tx_ready(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
-	u32_t reg_val;
+	uint32_t reg_base;
+	uint32_t reg_val;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_ISR_OFFSET);
@@ -957,8 +957,8 @@ static int uart_xlnx_ps_irq_tx_ready(struct device *dev)
 static int uart_xlnx_ps_irq_tx_complete(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
-	u32_t reg_val;
+	uint32_t reg_base;
+	uint32_t reg_val;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_SR_OFFSET);
@@ -979,7 +979,7 @@ static int uart_xlnx_ps_irq_tx_complete(struct device *dev)
 static void uart_xlnx_ps_irq_rx_enable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(XUARTPS_IXR_RTRIG, reg_base + XUARTPS_IER_OFFSET);
@@ -995,7 +995,7 @@ static void uart_xlnx_ps_irq_rx_enable(struct device *dev)
 static void uart_xlnx_ps_irq_rx_disable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(XUARTPS_IXR_RTRIG, reg_base + XUARTPS_IDR_OFFSET);
@@ -1011,8 +1011,8 @@ static void uart_xlnx_ps_irq_rx_disable(struct device *dev)
 static int uart_xlnx_ps_irq_rx_ready(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
-	u32_t reg_val;
+	uint32_t reg_base;
+	uint32_t reg_val;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_val = sys_read32(reg_base + XUARTPS_ISR_OFFSET);
@@ -1034,7 +1034,7 @@ static int uart_xlnx_ps_irq_rx_ready(struct device *dev)
 static void uart_xlnx_ps_irq_err_enable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(
@@ -1056,7 +1056,7 @@ static void uart_xlnx_ps_irq_err_enable(struct device *dev)
 static void uart_xlnx_ps_irq_err_disable(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
+	uint32_t reg_base;
 
 	reg_base = dev_cfg->uconf.regs;
 	sys_write32(
@@ -1078,9 +1078,9 @@ static void uart_xlnx_ps_irq_err_disable(struct device *dev)
 static int uart_xlnx_ps_irq_is_pending(struct device *dev)
 {
 	const struct uart_xlnx_ps_dev_config *dev_cfg = DEV_CFG(dev);
-	u32_t reg_base;
-	u32_t reg_imr;
-	u32_t reg_isr;
+	uint32_t reg_base;
+	uint32_t reg_imr;
+	uint32_t reg_isr;
 
 	reg_base = dev_cfg->uconf.regs;
 	reg_imr = sys_read32(reg_base + XUARTPS_IMR_OFFSET);
@@ -1198,7 +1198,7 @@ static struct uart_xlnx_ps_dev_data_t uart_xlnx_ps_dev_data_##port
 static struct uart_xlnx_ps_dev_config uart_xlnx_ps_dev_cfg_##port = { \
 	.uconf = { \
 		.regs = DT_INST_REG_ADDR(port), \
-		.base = (u8_t *)DT_INST_REG_ADDR(port), \
+		.base = (uint8_t *)DT_INST_REG_ADDR(port), \
 		.sys_clk_freq = DT_INST_PROP(port, clock_frequency), \
 		UART_XLNX_PS_IRQ_CONF_FUNC_SET(port) \
 	}, \
diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c
index ff66803c8c..acdd71da53 100644
--- a/drivers/serial/usart_sam.c
+++ b/drivers/serial/usart_sam.c
@@ -24,7 +24,7 @@
 /* Device constant configuration parameters */
 struct usart_sam_dev_cfg {
 	Usart *regs;
-	u32_t periph_id;
+	uint32_t periph_id;
 	struct soc_gpio_pin pin_rx;
 	struct soc_gpio_pin pin_tx;
 
@@ -35,7 +35,7 @@ struct usart_sam_dev_cfg {
 
 /* Device run time data */
 struct usart_sam_dev_data {
-	u32_t baud_rate;
+	uint32_t baud_rate;
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 	uart_irq_callback_user_data_t irq_cb;	/* Interrupt Callback */
@@ -49,8 +49,8 @@ struct usart_sam_dev_data {
 	((struct usart_sam_dev_data *const)(dev)->driver_data)
 
 
-static int baudrate_set(Usart *const usart, u32_t baudrate,
-			u32_t mck_freq_hz);
+static int baudrate_set(Usart *const usart, uint32_t baudrate,
+			uint32_t mck_freq_hz);
 
 
 static int usart_sam_init(struct device *dev)
@@ -121,7 +121,7 @@ static void usart_sam_poll_out(struct device *dev, unsigned char c)
 	}
 
 	/* send a character */
-	usart->US_THR = (u32_t)c;
+	usart->US_THR = (uint32_t)c;
 }
 
 static int usart_sam_err_check(struct device *dev)
@@ -144,10 +144,10 @@ static int usart_sam_err_check(struct device *dev)
 	return errors;
 }
 
-static int baudrate_set(Usart *const usart, u32_t baudrate,
-			u32_t mck_freq_hz)
+static int baudrate_set(Usart *const usart, uint32_t baudrate,
+			uint32_t mck_freq_hz)
 {
-	u32_t divisor;
+	uint32_t divisor;
 
 	__ASSERT(baudrate,
 		 "baud rate has to be bigger than 0");
diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c
index 08b0de75e9..dfdc518a73 100644
--- a/drivers/spi/spi_cc13xx_cc26xx.c
+++ b/drivers/spi/spi_cc13xx_cc26xx.c
@@ -23,17 +23,17 @@ LOG_MODULE_REGISTER(spi_cc13xx_cc26xx);
 #include "spi_context.h"
 
 struct spi_cc13xx_cc26xx_config {
-	u32_t base;
-	u32_t sck_pin;
-	u32_t mosi_pin;
-	u32_t miso_pin;
-	u32_t cs_pin;
+	uint32_t base;
+	uint32_t sck_pin;
+	uint32_t mosi_pin;
+	uint32_t miso_pin;
+	uint32_t cs_pin;
 };
 
 struct spi_cc13xx_cc26xx_data {
 	struct spi_context ctx;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -55,7 +55,7 @@ static int spi_cc13xx_cc26xx_configure(struct device *dev,
 {
 	const struct spi_cc13xx_cc26xx_config *cfg = get_dev_config(dev);
 	struct spi_context *ctx = &get_dev_data(dev)->ctx;
-	u32_t prot;
+	uint32_t prot;
 
 	if (spi_context_configured(ctx, config)) {
 		return 0;
@@ -143,7 +143,7 @@ static int spi_cc13xx_cc26xx_transceive(struct device *dev,
 {
 	const struct spi_cc13xx_cc26xx_config *cfg = get_dev_config(dev);
 	struct spi_context *ctx = &get_dev_data(dev)->ctx;
-	u32_t txd, rxd;
+	uint32_t txd, rxd;
 	int err;
 
 	spi_context_lock(ctx, false, NULL);
@@ -213,7 +213,7 @@ static int spi_cc13xx_cc26xx_release(struct device *dev,
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 static int spi_cc13xx_cc26xx_set_power_state(struct device *dev,
-	u32_t new_state)
+	uint32_t new_state)
 {
 	int ret = 0;
 
@@ -251,13 +251,13 @@ static int spi_cc13xx_cc26xx_set_power_state(struct device *dev,
 	return ret;
 }
 
-static int spi_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
+static int spi_cc13xx_cc26xx_pm_control(struct device *dev, uint32_t ctrl_command,
 	void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != get_dev_data(dev)->pm_state) {
 			ret = spi_cc13xx_cc26xx_set_power_state(dev,
@@ -265,7 +265,7 @@ static int spi_cc13xx_cc26xx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = get_dev_data(dev)->pm_state;
+		*((uint32_t *)context) = get_dev_data(dev)->pm_state;
 	}
 
 	if (cb) {
@@ -295,7 +295,7 @@ static const struct spi_driver_api spi_cc13xx_cc26xx_driver_api = {
 #else
 #define SPI_CC13XX_CC26XX_POWER_SPI(n)					  \
 	do {								  \
-		u32_t domain, periph;					  \
+		uint32_t domain, periph;				  \
 									  \
 		/* Enable UART power domain */				  \
 		if (DT_INST_REG_ADDR(n) == 0x40000000) {		  \
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index 17913e18df..c2e1bdf9e4 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -40,9 +40,9 @@ struct spi_context {
 	const struct spi_buf *current_rx;
 	size_t rx_count;
 
-	const u8_t *tx_buf;
+	const uint8_t *tx_buf;
 	size_t tx_len;
-	u8_t *rx_buf;
+	uint8_t *rx_buf;
 	size_t rx_len;
 
 #ifdef CONFIG_SPI_SLAVE
@@ -220,14 +220,14 @@ static inline
 void spi_context_buffers_setup(struct spi_context *ctx,
 			       const struct spi_buf_set *tx_bufs,
 			       const struct spi_buf_set *rx_bufs,
-			       u8_t dfs)
+			       uint8_t dfs)
 {
 	LOG_DBG("tx_bufs %p - rx_bufs %p - %u", tx_bufs, rx_bufs, dfs);
 
 	if (tx_bufs) {
 		ctx->current_tx = tx_bufs->buffers;
 		ctx->tx_count = tx_bufs->count;
-		ctx->tx_buf = (const u8_t *)ctx->current_tx->buf;
+		ctx->tx_buf = (const uint8_t *)ctx->current_tx->buf;
 		ctx->tx_len = ctx->current_tx->len / dfs;
 	} else {
 		ctx->current_tx = NULL;
@@ -239,7 +239,7 @@ void spi_context_buffers_setup(struct spi_context *ctx,
 	if (rx_bufs) {
 		ctx->current_rx = rx_bufs->buffers;
 		ctx->rx_count = rx_bufs->count;
-		ctx->rx_buf = (u8_t *)ctx->current_rx->buf;
+		ctx->rx_buf = (uint8_t *)ctx->current_rx->buf;
 		ctx->rx_len = ctx->current_rx->len / dfs;
 	} else {
 		ctx->current_rx = NULL;
@@ -262,7 +262,7 @@ void spi_context_buffers_setup(struct spi_context *ctx,
 }
 
 static ALWAYS_INLINE
-void spi_context_update_tx(struct spi_context *ctx, u8_t dfs, u32_t len)
+void spi_context_update_tx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
 {
 	if (!ctx->tx_len) {
 		return;
@@ -278,7 +278,7 @@ void spi_context_update_tx(struct spi_context *ctx, u8_t dfs, u32_t len)
 		ctx->tx_count--;
 		if (ctx->tx_count) {
 			ctx->current_tx++;
-			ctx->tx_buf = (const u8_t *)ctx->current_tx->buf;
+			ctx->tx_buf = (const uint8_t *)ctx->current_tx->buf;
 			ctx->tx_len = ctx->current_tx->len / dfs;
 		} else {
 			ctx->tx_buf = NULL;
@@ -303,7 +303,7 @@ bool spi_context_tx_buf_on(struct spi_context *ctx)
 }
 
 static ALWAYS_INLINE
-void spi_context_update_rx(struct spi_context *ctx, u8_t dfs, u32_t len)
+void spi_context_update_rx(struct spi_context *ctx, uint8_t dfs, uint32_t len)
 {
 #ifdef CONFIG_SPI_SLAVE
 	if (spi_context_is_slave(ctx)) {
@@ -326,7 +326,7 @@ void spi_context_update_rx(struct spi_context *ctx, u8_t dfs, u32_t len)
 		ctx->rx_count--;
 		if (ctx->rx_count) {
 			ctx->current_rx++;
-			ctx->rx_buf = (u8_t *)ctx->current_rx->buf;
+			ctx->rx_buf = (uint8_t *)ctx->current_rx->buf;
 			ctx->rx_len = ctx->current_rx->len / dfs;
 		} else {
 			ctx->rx_buf = NULL;
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 1b42b6c9c7..25a4c020eb 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(spi_dw);
 
 #if (CONFIG_SPI_LOG_LEVEL == 4)
 #define DBG_COUNTER_INIT()	\
-	u32_t __cnt = 0
+	uint32_t __cnt = 0
 #define DBG_COUNTER_INC()	\
 	(__cnt++)
 #define DBG_COUNTER_RESULT()	\
@@ -89,8 +89,8 @@ static void push_data(struct device *dev)
 {
 	const struct spi_dw_config *info = dev->config_info;
 	struct spi_dw_data *spi = dev->driver_data;
-	u32_t data = 0U;
-	u32_t f_tx;
+	uint32_t data = 0U;
+	uint32_t f_tx;
 
 	DBG_COUNTER_INIT();
 
@@ -108,16 +108,16 @@ static void push_data(struct device *dev)
 		if (spi_context_tx_buf_on(&spi->ctx)) {
 			switch (spi->dfs) {
 			case 1:
-				data = UNALIGNED_GET((u8_t *)
+				data = UNALIGNED_GET((uint8_t *)
 						     (spi->ctx.tx_buf));
 				break;
 			case 2:
-				data = UNALIGNED_GET((u16_t *)
+				data = UNALIGNED_GET((uint16_t *)
 						     (spi->ctx.tx_buf));
 				break;
 #ifndef CONFIG_ARC
 			case 4:
-				data = UNALIGNED_GET((u32_t *)
+				data = UNALIGNED_GET((uint32_t *)
 						     (spi->ctx.tx_buf));
 				break;
 #endif
@@ -162,21 +162,21 @@ static void pull_data(struct device *dev)
 	DBG_COUNTER_INIT();
 
 	while (read_rxflr(info->regs)) {
-		u32_t data = read_dr(info->regs);
+		uint32_t data = read_dr(info->regs);
 
 		DBG_COUNTER_INC();
 
 		if (spi_context_rx_buf_on(&spi->ctx)) {
 			switch (spi->dfs) {
 			case 1:
-				UNALIGNED_PUT(data, (u8_t *)spi->ctx.rx_buf);
+				UNALIGNED_PUT(data, (uint8_t *)spi->ctx.rx_buf);
 				break;
 			case 2:
-				UNALIGNED_PUT(data, (u16_t *)spi->ctx.rx_buf);
+				UNALIGNED_PUT(data, (uint16_t *)spi->ctx.rx_buf);
 				break;
 #ifndef CONFIG_ARC
 			case 4:
-				UNALIGNED_PUT(data, (u32_t *)spi->ctx.rx_buf);
+				UNALIGNED_PUT(data, (uint32_t *)spi->ctx.rx_buf);
 				break;
 #endif
 			}
@@ -199,7 +199,7 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 			    struct spi_dw_data *spi,
 			    const struct spi_config *config)
 {
-	u32_t ctrlr0 = 0U;
+	uint32_t ctrlr0 = 0U;
 
 	LOG_DBG("%p (prev %p)", config, spi->ctx.config);
 
@@ -292,9 +292,9 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 }
 
 static uint32_t spi_dw_compute_ndf(const struct spi_buf *rx_bufs,
-				   size_t rx_count, u8_t dfs)
+				   size_t rx_count, uint8_t dfs)
 {
-	u32_t len = 0U;
+	uint32_t len = 0U;
 
 	for (; rx_count; rx_bufs++, rx_count--) {
 		if (len > (UINT16_MAX - rx_bufs->len)) {
@@ -314,7 +314,7 @@ error:
 static void spi_dw_update_txftlr(const struct spi_dw_config *info,
 				 struct spi_dw_data *spi)
 {
-	u32_t reg_data = DW_SPI_TXFTLR_DFLT;
+	uint32_t reg_data = DW_SPI_TXFTLR_DFLT;
 
 	if (spi_dw_is_slave(spi)) {
 		if (!spi->ctx.tx_len) {
@@ -338,8 +338,8 @@ static int transceive(struct device *dev,
 {
 	const struct spi_dw_config *info = dev->config_info;
 	struct spi_dw_data *spi = dev->driver_data;
-	u32_t tmod = DW_SPI_CTRLR0_TMOD_TX_RX;
-	u32_t reg_data;
+	uint32_t tmod = DW_SPI_CTRLR0_TMOD_TX_RX;
+	uint32_t reg_data;
 	int ret;
 
 	spi_context_lock(&spi->ctx, asynchronous, signal);
@@ -479,7 +479,7 @@ static int spi_dw_release(struct device *dev, const struct spi_config *config)
 void spi_dw_isr(struct device *dev)
 {
 	const struct spi_dw_config *info = dev->config_info;
-	u32_t int_status;
+	uint32_t int_status;
 	int error;
 
 	int_status = read_isr(info->regs);
diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h
index 58244614fd..4954df18a1 100644
--- a/drivers/spi/spi_dw.h
+++ b/drivers/spi/spi_dw.h
@@ -22,14 +22,14 @@ typedef void (*spi_dw_config_t)(void);
 
 /* Private structures */
 struct spi_dw_config {
-	u32_t regs;
-	u32_t clock_frequency;
+	uint32_t regs;
+	uint32_t clock_frequency;
 #ifdef CONFIG_CLOCK_CONTROL
 	const char *clock_name;
 	void *clock_data;
 #endif /* CONFIG_CLOCK_CONTROL */
 	spi_dw_config_t config_func;
-	u8_t op_modes;
+	uint8_t op_modes;
 };
 
 struct spi_dw_data {
@@ -37,9 +37,9 @@ struct spi_dw_data {
 	struct device *clock;
 #endif /* CONFIG_CLOCK_CONTROL */
 	struct spi_context ctx;
-	u8_t dfs;	/* dfs in bytes: 1,2 or 4 */
-	u8_t fifo_diff;	/* cannot be bigger than FIFO depth */
-	u16_t _unused;
+	uint8_t dfs;	/* dfs in bytes: 1,2 or 4 */
+	uint8_t fifo_diff;	/* cannot be bigger than FIFO depth */
+	uint16_t _unused;
 };
 
 /* Helper macros */
@@ -62,30 +62,30 @@ struct spi_dw_data {
 #endif /* CONFIG_SPI_DW_ARC_AUX_REGS */
 
 #define DEFINE_MM_REG_READ(__reg, __off, __sz)				\
-	static inline u32_t read_##__reg(u32_t addr)			\
+	static inline uint32_t read_##__reg(uint32_t addr)			\
 	{								\
 		return Z_REG_READ(__sz)(addr + __off);			\
 	}
 #define DEFINE_MM_REG_WRITE(__reg, __off, __sz)				\
-	static inline void write_##__reg(u32_t data, u32_t addr)	\
+	static inline void write_##__reg(uint32_t data, uint32_t addr)	\
 	{								\
 		Z_REG_WRITE(__sz)(data, addr + __off);			\
 	}
 
 #define DEFINE_SET_BIT_OP(__reg_bit, __reg_off, __bit)			\
-	static inline void set_bit_##__reg_bit(u32_t addr)		\
+	static inline void set_bit_##__reg_bit(uint32_t addr)		\
 	{								\
 		Z_REG_SET_BIT(addr + __reg_off, __bit);			\
 	}
 
 #define DEFINE_CLEAR_BIT_OP(__reg_bit, __reg_off, __bit)		\
-	static inline void clear_bit_##__reg_bit(u32_t addr)		\
+	static inline void clear_bit_##__reg_bit(uint32_t addr)		\
 	{								\
 		Z_REG_CLEAR_BIT(addr + __reg_off, __bit);		\
 	}
 
 #define DEFINE_TEST_BIT_OP(__reg_bit, __reg_off, __bit)			\
-	static inline int test_bit_##__reg_bit(u32_t addr)		\
+	static inline int test_bit_##__reg_bit(uint32_t addr)		\
 	{								\
 		return Z_REG_TEST_BIT(addr + __reg_off, __bit);		\
 	}
diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c
index 80b301a881..5e376b0951 100644
--- a/drivers/spi/spi_gecko.c
+++ b/drivers/spi/spi_gecko.c
@@ -43,15 +43,15 @@ struct spi_gecko_config {
 	struct soc_gpio_pin pin_rx;
 	struct soc_gpio_pin pin_tx;
 	struct soc_gpio_pin pin_clk;
-	u8_t loc_rx;
-	u8_t loc_tx;
-	u8_t loc_clk;
+	uint8_t loc_rx;
+	uint8_t loc_tx;
+	uint8_t loc_clk;
 };
 
 
 /* Helper Functions */
 static int spi_config(struct device *dev, const struct spi_config *config,
-		      u16_t *control)
+		      uint16_t *control)
 {
 	const struct spi_gecko_config *gecko_config = dev->config_info;
 	struct spi_gecko_data *data = DEV_DATA(dev);
@@ -111,7 +111,7 @@ static int spi_config(struct device *dev, const struct spi_config *config,
 	return 0;
 }
 
-static void spi_gecko_send(USART_TypeDef *usart, u8_t frame)
+static void spi_gecko_send(USART_TypeDef *usart, uint8_t frame)
 {
 	/* Write frame to register */
 	USART_Tx(usart, frame);
@@ -121,10 +121,10 @@ static void spi_gecko_send(USART_TypeDef *usart, u8_t frame)
 	}
 }
 
-static u8_t spi_gecko_recv(USART_TypeDef *usart)
+static uint8_t spi_gecko_recv(USART_TypeDef *usart)
 {
 	/* Return data inside rx register */
-	return (u8_t)usart->RXDATA;
+	return (uint8_t)usart->RXDATA;
 }
 
 static bool spi_gecko_transfer_ongoing(struct spi_gecko_data *data)
@@ -132,12 +132,12 @@ static bool spi_gecko_transfer_ongoing(struct spi_gecko_data *data)
 	return spi_context_tx_on(&data->ctx) || spi_context_rx_on(&data->ctx);
 }
 
-static inline u8_t spi_gecko_next_tx(struct spi_gecko_data *data)
+static inline uint8_t spi_gecko_next_tx(struct spi_gecko_data *data)
 {
-	u8_t tx_frame = 0;
+	uint8_t tx_frame = 0;
 
 	if (spi_context_tx_buf_on(&data->ctx)) {
-		tx_frame = UNALIGNED_GET((u8_t *)(data->ctx.tx_buf));
+		tx_frame = UNALIGNED_GET((uint8_t *)(data->ctx.tx_buf));
 	}
 
 	return tx_frame;
@@ -146,8 +146,8 @@ static inline u8_t spi_gecko_next_tx(struct spi_gecko_data *data)
 static int spi_gecko_shift_frames(USART_TypeDef *usart,
 				  struct spi_gecko_data *data)
 {
-	u8_t tx_frame;
-	u8_t rx_frame;
+	uint8_t tx_frame;
+	uint8_t rx_frame;
 
 	tx_frame = spi_gecko_next_tx(data);
 	spi_gecko_send(usart, tx_frame);
@@ -156,7 +156,7 @@ static int spi_gecko_shift_frames(USART_TypeDef *usart,
 	rx_frame = spi_gecko_recv(usart);
 
 	if (spi_context_rx_buf_on(&data->ctx)) {
-		UNALIGNED_PUT(rx_frame, (u8_t *)data->ctx.rx_buf);
+		UNALIGNED_PUT(rx_frame, (uint8_t *)data->ctx.rx_buf);
 	}
 	spi_context_update_rx(&data->ctx, 1, 1);
 	return 0;
@@ -247,7 +247,7 @@ static int spi_gecko_transceive(struct device *dev,
 			  const struct spi_buf_set *tx_bufs,
 			  const struct spi_buf_set *rx_bufs)
 {
-	u16_t control = 0;
+	uint16_t control = 0;
 
 	spi_config(dev, config, &control);
 	spi_context_buffers_setup(&DEV_DATA(dev)->ctx, tx_bufs, rx_bufs, 1);
diff --git a/drivers/spi/spi_handlers.c b/drivers/spi/spi_handlers.c
index b64d429ee6..fa84146ab0 100644
--- a/drivers/spi/spi_handlers.c
+++ b/drivers/spi/spi_handlers.c
@@ -52,7 +52,7 @@ static struct spi_buf_set *copy_and_check(struct spi_buf_set *bufs,
  * count member has been verified and is a value that won't lead to stack
  * overflow.
  */
-static u32_t copy_bufs_and_transceive(struct device *dev,
+static uint32_t copy_bufs_and_transceive(struct device *dev,
 				      const struct spi_config *config,
 				      struct spi_buf_set *tx_bufs,
 				      struct spi_buf_set *rx_bufs)
diff --git a/drivers/spi/spi_litespi.c b/drivers/spi/spi_litespi.c
index b412be77e8..d812a501a4 100644
--- a/drivers/spi/spi_litespi.c
+++ b/drivers/spi/spi_litespi.c
@@ -13,16 +13,16 @@ LOG_MODULE_REGISTER(spi_litespi);
 #include <stdbool.h>
 
 /* Helper Functions */
-static int spi_config(const struct spi_config *config, u16_t *control)
+static int spi_config(const struct spi_config *config, uint16_t *control)
 {
-	u8_t cs = 0x00;
+	uint8_t cs = 0x00;
 
 	if (config->slave != 0) {
 		if (config->slave >= SPI_MAX_CS_SIZE) {
 			LOG_ERR("More slaves than supported");
 			return -ENOTSUP;
 		}
-		cs = (u8_t)(config->slave);
+		cs = (uint8_t)(config->slave);
 	}
 
 	if (SPI_WORD_SIZE_GET(config->operation) != 8) {
@@ -65,7 +65,7 @@ static int spi_config(const struct spi_config *config, u16_t *control)
 		litex_write8(SPI_ENABLE, SPI_LOOPBACK_REG);
 	}
 	/* Set word size */
-	*control = (u16_t) (SPI_WORD_SIZE_GET(config->operation)
+	*control = (uint16_t) (SPI_WORD_SIZE_GET(config->operation)
 			<< POSITION_WORD_SIZE);
 	/* Write configurations */
 	litex_write8(cs, SPI_CS_REG);
@@ -74,7 +74,7 @@ static int spi_config(const struct spi_config *config, u16_t *control)
 	return 0;
 }
 
-static void spi_litespi_send(struct device *dev, u8_t frame, u16_t control)
+static void spi_litespi_send(struct device *dev, uint8_t frame, uint16_t control)
 {
 	/* Write frame to register */
 	litex_write8(frame, SPI_MOSI_DATA_REG);
@@ -85,23 +85,23 @@ static void spi_litespi_send(struct device *dev, u8_t frame, u16_t control)
 		;
 }
 
-static u8_t spi_litespi_recv(void)
+static uint8_t spi_litespi_recv(void)
 {
     /* Return data inside MISO register */
 	return litex_read8(SPI_MISO_DATA_REG);
 }
 
 static void spi_litespi_xfer(struct device *dev,
-		const struct spi_config *config, u16_t control)
+		const struct spi_config *config, uint16_t control)
 {
 	struct spi_context *ctx = &SPI_DATA(dev)->ctx;
-	u32_t send_len = spi_context_longest_current_buf(ctx);
-	u8_t read_data;
+	uint32_t send_len = spi_context_longest_current_buf(ctx);
+	uint8_t read_data;
 
-	for (u32_t i = 0; i < send_len; i++) {
+	for (uint32_t i = 0; i < send_len; i++) {
 		/* Send a frame */
 		if (i < ctx->tx_len) {
-			spi_litespi_send(dev, (u8_t) (ctx->tx_buf)[i],
+			spi_litespi_send(dev, (uint8_t) (ctx->tx_buf)[i],
 					control);
 		} else {
 			/* Send dummy bytes */
@@ -128,7 +128,7 @@ static int spi_litespi_transceive(struct device *dev,
 			  const struct spi_buf_set *tx_bufs,
 			  const struct spi_buf_set *rx_bufs)
 {
-	u16_t control = 0;
+	uint16_t control = 0;
 
 	spi_config(config, &control);
 	spi_context_buffers_setup(&SPI_DATA(dev)->ctx, tx_bufs, rx_bufs, 1);
diff --git a/drivers/spi/spi_litespi.h b/drivers/spi/spi_litespi.h
index 7df38f4f89..8f9d4ea91f 100644
--- a/drivers/spi/spi_litespi.h
+++ b/drivers/spi/spi_litespi.h
@@ -36,8 +36,8 @@ struct spi_litespi_data {
 };
 
 struct spi_litespi_cfg {
-	u32_t base;
-	u32_t f_sys;
+	uint32_t base;
+	uint32_t f_sys;
 };
 
 #endif /* _SPI_LITESPI__H */
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index 3bfaddedee..58ff8a5626 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -54,10 +54,10 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
 
 #ifdef CONFIG_SPI_STM32_DMA
 /* dummy value used for transferring NOP when tx buf is null */
-u32_t nop_tx;
+uint32_t nop_tx;
 
 /* This function is executed in the interrupt context */
-static void dma_callback(void *arg, u32_t channel, int status)
+static void dma_callback(void *arg, uint32_t channel, int status)
 {
 	/* callback_arg directly holds the client data */
 	struct spi_stm32_data *data = arg;
@@ -84,7 +84,7 @@ static void dma_callback(void *arg, u32_t channel, int status)
 	}
 }
 
-static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf,
+static int spi_stm32_dma_tx_load(struct device *dev, const uint8_t *buf,
 				 size_t len)
 {
 	const struct spi_stm32_config *cfg = DEV_CFG(dev);
@@ -103,10 +103,10 @@ static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf,
 	if (buf == NULL) {
 		nop_tx = 0;
 		/* if tx buff is null, then sends NOP on the line. */
-		blk_cfg.source_address = (u32_t)&nop_tx;
+		blk_cfg.source_address = (uint32_t)&nop_tx;
 		blk_cfg.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 	} else {
-		blk_cfg.source_address = (u32_t)buf;
+		blk_cfg.source_address = (uint32_t)buf;
 		if (data->dma_tx.src_addr_increment) {
 			blk_cfg.source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
 		} else {
@@ -114,7 +114,7 @@ static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf,
 		}
 	}
 
-	blk_cfg.dest_address = (u32_t)LL_SPI_DMA_GetRegAddr(cfg->spi);
+	blk_cfg.dest_address = (uint32_t)LL_SPI_DMA_GetRegAddr(cfg->spi);
 	/* fifo mode NOT USED there */
 	if (data->dma_tx.dst_addr_increment) {
 		blk_cfg.dest_addr_adj = DMA_ADDR_ADJ_INCREMENT;
@@ -144,7 +144,7 @@ static int spi_stm32_dma_tx_load(struct device *dev, const u8_t *buf,
 	return dma_start(data->dev_dma_tx, data->dma_tx.channel);
 }
 
-static int spi_stm32_dma_rx_load(struct device *dev, u8_t *buf, size_t len)
+static int spi_stm32_dma_rx_load(struct device *dev, uint8_t *buf, size_t len)
 {
 	const struct spi_stm32_config *cfg = DEV_CFG(dev);
 	struct spi_stm32_data *data = DEV_DATA(dev);
@@ -159,8 +159,8 @@ static int spi_stm32_dma_rx_load(struct device *dev, u8_t *buf, size_t len)
 	blk_cfg.block_size = len;
 
 	/* rx direction has periph as source and mem as dest. */
-	blk_cfg.dest_address = (buf != NULL) ? (u32_t)buf : (u32_t)NULL;
-	blk_cfg.source_address = (u32_t)LL_SPI_DMA_GetRegAddr(cfg->spi);
+	blk_cfg.dest_address = (buf != NULL) ? (uint32_t)buf : (uint32_t)NULL;
+	blk_cfg.source_address = (uint32_t)LL_SPI_DMA_GetRegAddr(cfg->spi);
 	if (data->dma_rx.src_addr_increment) {
 		blk_cfg.source_addr_adj = DMA_ADDR_ADJ_INCREMENT;
 	} else {
@@ -243,11 +243,11 @@ static bool spi_stm32_transfer_ongoing(struct spi_stm32_data *data)
 
 static int spi_stm32_get_err(SPI_TypeDef *spi)
 {
-	u32_t sr = LL_SPI_ReadReg(spi, SR);
+	uint32_t sr = LL_SPI_ReadReg(spi, SR);
 
 	if (sr & SPI_STM32_ERR_MSK) {
 		LOG_ERR("%s: err=%d", __func__,
-			    sr & (u32_t)SPI_STM32_ERR_MSK);
+			    sr & (uint32_t)SPI_STM32_ERR_MSK);
 
 		/* OVR error must be explicitly cleared */
 		if (LL_SPI_IsActiveFlag_OVR(spi)) {
@@ -263,8 +263,8 @@ static int spi_stm32_get_err(SPI_TypeDef *spi)
 /* Shift a SPI frame as master. */
 static void spi_stm32_shift_m(SPI_TypeDef *spi, struct spi_stm32_data *data)
 {
-	u16_t tx_frame = SPI_STM32_TX_NOP;
-	u16_t rx_frame;
+	uint16_t tx_frame = SPI_STM32_TX_NOP;
+	uint16_t rx_frame;
 
 	while (!ll_func_tx_is_empty(spi)) {
 		/* NOP */
@@ -284,14 +284,14 @@ static void spi_stm32_shift_m(SPI_TypeDef *spi, struct spi_stm32_data *data)
 
 	if (SPI_WORD_SIZE_GET(data->ctx.config->operation) == 8) {
 		if (spi_context_tx_buf_on(&data->ctx)) {
-			tx_frame = UNALIGNED_GET((u8_t *)(data->ctx.tx_buf));
+			tx_frame = UNALIGNED_GET((uint8_t *)(data->ctx.tx_buf));
 		}
 		LL_SPI_TransmitData8(spi, tx_frame);
 		/* The update is ignored if TX is off. */
 		spi_context_update_tx(&data->ctx, 1, 1);
 	} else {
 		if (spi_context_tx_buf_on(&data->ctx)) {
-			tx_frame = UNALIGNED_GET((u16_t *)(data->ctx.tx_buf));
+			tx_frame = UNALIGNED_GET((uint16_t *)(data->ctx.tx_buf));
 		}
 		LL_SPI_TransmitData16(spi, tx_frame);
 		/* The update is ignored if TX is off. */
@@ -305,13 +305,13 @@ static void spi_stm32_shift_m(SPI_TypeDef *spi, struct spi_stm32_data *data)
 	if (SPI_WORD_SIZE_GET(data->ctx.config->operation) == 8) {
 		rx_frame = LL_SPI_ReceiveData8(spi);
 		if (spi_context_rx_buf_on(&data->ctx)) {
-			UNALIGNED_PUT(rx_frame, (u8_t *)data->ctx.rx_buf);
+			UNALIGNED_PUT(rx_frame, (uint8_t *)data->ctx.rx_buf);
 		}
 		spi_context_update_rx(&data->ctx, 1, 1);
 	} else {
 		rx_frame = LL_SPI_ReceiveData16(spi);
 		if (spi_context_rx_buf_on(&data->ctx)) {
-			UNALIGNED_PUT(rx_frame, (u16_t *)data->ctx.rx_buf);
+			UNALIGNED_PUT(rx_frame, (uint16_t *)data->ctx.rx_buf);
 		}
 		spi_context_update_rx(&data->ctx, 2, 1);
 	}
@@ -321,14 +321,14 @@ static void spi_stm32_shift_m(SPI_TypeDef *spi, struct spi_stm32_data *data)
 static void spi_stm32_shift_s(SPI_TypeDef *spi, struct spi_stm32_data *data)
 {
 	if (ll_func_tx_is_empty(spi) && spi_context_tx_on(&data->ctx)) {
-		u16_t tx_frame;
+		uint16_t tx_frame;
 
 		if (SPI_WORD_SIZE_GET(data->ctx.config->operation) == 8) {
-			tx_frame = UNALIGNED_GET((u8_t *)(data->ctx.tx_buf));
+			tx_frame = UNALIGNED_GET((uint8_t *)(data->ctx.tx_buf));
 			LL_SPI_TransmitData8(spi, tx_frame);
 			spi_context_update_tx(&data->ctx, 1, 1);
 		} else {
-			tx_frame = UNALIGNED_GET((u16_t *)(data->ctx.tx_buf));
+			tx_frame = UNALIGNED_GET((uint16_t *)(data->ctx.tx_buf));
 			LL_SPI_TransmitData16(spi, tx_frame);
 			spi_context_update_tx(&data->ctx, 2, 1);
 		}
@@ -338,15 +338,15 @@ static void spi_stm32_shift_s(SPI_TypeDef *spi, struct spi_stm32_data *data)
 
 	if (ll_func_rx_is_not_empty(spi) &&
 	    spi_context_rx_buf_on(&data->ctx)) {
-		u16_t rx_frame;
+		uint16_t rx_frame;
 
 		if (SPI_WORD_SIZE_GET(data->ctx.config->operation) == 8) {
 			rx_frame = LL_SPI_ReceiveData8(spi);
-			UNALIGNED_PUT(rx_frame, (u8_t *)data->ctx.rx_buf);
+			UNALIGNED_PUT(rx_frame, (uint8_t *)data->ctx.rx_buf);
 			spi_context_update_rx(&data->ctx, 1, 1);
 		} else {
 			rx_frame = LL_SPI_ReceiveData16(spi);
-			UNALIGNED_PUT(rx_frame, (u16_t *)data->ctx.rx_buf);
+			UNALIGNED_PUT(rx_frame, (uint16_t *)data->ctx.rx_buf);
 			spi_context_update_rx(&data->ctx, 2, 1);
 		}
 	}
@@ -360,7 +360,7 @@ static void spi_stm32_shift_s(SPI_TypeDef *spi, struct spi_stm32_data *data)
  */
 static int spi_stm32_shift_frames(SPI_TypeDef *spi, struct spi_stm32_data *data)
 {
-	u16_t operation = data->ctx.config->operation;
+	uint16_t operation = data->ctx.config->operation;
 
 	if (SPI_OP_MODE_GET(operation) == SPI_OP_MODE_MASTER) {
 		spi_stm32_shift_m(spi, data);
@@ -436,7 +436,7 @@ static int spi_stm32_configure(struct device *dev,
 {
 	const struct spi_stm32_config *cfg = DEV_CFG(dev);
 	struct spi_stm32_data *data = DEV_DATA(dev);
-	const u32_t scaler[] = {
+	const uint32_t scaler[] = {
 		LL_SPI_BAUDRATEPRESCALER_DIV2,
 		LL_SPI_BAUDRATEPRESCALER_DIV4,
 		LL_SPI_BAUDRATEPRESCALER_DIV8,
@@ -447,7 +447,7 @@ static int spi_stm32_configure(struct device *dev,
 		LL_SPI_BAUDRATEPRESCALER_DIV256
 	};
 	SPI_TypeDef *spi = cfg->spi;
-	u32_t clock;
+	uint32_t clock;
 	int br;
 
 	if (spi_context_configured(&data->ctx, config)) {
@@ -467,7 +467,7 @@ static int spi_stm32_configure(struct device *dev,
 	}
 
 	for (br = 1 ; br <= ARRAY_SIZE(scaler) ; ++br) {
-		u32_t clk = clock >> br;
+		uint32_t clk = clock >> br;
 
 		if (clk <= config->frequency) {
 			break;
@@ -687,7 +687,7 @@ static int transceive_dma(struct device *dev,
 	LL_SPI_Enable(spi);
 
 	/* store spi peripheral address */
-	u32_t periph_addr = data->dma_tx.dma_cfg.head_block->dest_address;
+	uint32_t periph_addr = data->dma_tx.dma_cfg.head_block->dest_address;
 
 	for (; ;) {
 		/* wait for SPI busy flag */
@@ -715,7 +715,7 @@ static int transceive_dma(struct device *dev,
 			/* and reload dma with a new source (memory) buffer */
 			dma_reload(data->dev_dma_tx,
 				data->dma_tx.channel,
-				(u32_t)data->ctx.tx_buf,
+				(uint32_t)data->ctx.tx_buf,
 				periph_addr,
 				data->ctx.tx_len);
 		}
@@ -733,7 +733,7 @@ static int transceive_dma(struct device *dev,
 			dma_reload(data->dev_dma_rx,
 				data->dma_rx.channel,
 				periph_addr,
-				(u32_t)data->ctx.rx_buf,
+				(uint32_t)data->ctx.rx_buf,
 				data->ctx.rx_len);
 		}
 		LL_SPI_EnableDMAReq_RX(spi);
diff --git a/drivers/spi/spi_ll_stm32.h b/drivers/spi/spi_ll_stm32.h
index 7806673d9c..0af17b4f1c 100644
--- a/drivers/spi/spi_ll_stm32.h
+++ b/drivers/spi/spi_ll_stm32.h
@@ -22,9 +22,9 @@ struct spi_stm32_config {
 #ifdef CONFIG_SPI_STM32_DMA
 struct stream {
 	const char *dma_name;
-	u32_t channel; /* stores the channel for dma or mux */
+	uint32_t channel; /* stores the channel for dma or mux */
 	struct dma_config dma_cfg;
-	u8_t priority;
+	uint8_t priority;
 	bool src_addr_increment;
 	bool dst_addr_increment;
 	bool transfer_complete;
@@ -43,7 +43,7 @@ struct spi_stm32_data {
 #endif
 };
 
-static inline u32_t ll_func_tx_is_empty(SPI_TypeDef *spi)
+static inline uint32_t ll_func_tx_is_empty(SPI_TypeDef *spi)
 {
 #ifdef CONFIG_SOC_SERIES_STM32MP1X
 	return LL_SPI_IsActiveFlag_TXP(spi);
@@ -52,7 +52,7 @@ static inline u32_t ll_func_tx_is_empty(SPI_TypeDef *spi)
 #endif
 }
 
-static inline u32_t ll_func_rx_is_not_empty(SPI_TypeDef *spi)
+static inline uint32_t ll_func_rx_is_not_empty(SPI_TypeDef *spi)
 {
 #ifdef CONFIG_SOC_SERIES_STM32MP1X
 	return LL_SPI_IsActiveFlag_RXP(spi);
@@ -123,7 +123,7 @@ static inline void ll_func_disable_int_errors(SPI_TypeDef *spi)
 #endif
 }
 
-static inline u32_t ll_func_spi_is_busy(SPI_TypeDef *spi)
+static inline uint32_t ll_func_spi_is_busy(SPI_TypeDef *spi)
 {
 #ifdef CONFIG_SOC_SERIES_STM32MP1X
 	return (!LL_SPI_IsActiveFlag_MODF(spi) &&
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
index eb1ee14a84..9b406dc07d 100644
--- a/drivers/spi/spi_mcux_dspi.c
+++ b/drivers/spi/spi_mcux_dspi.c
@@ -57,12 +57,12 @@ static int spi_mcux_transfer_next_packet(struct device *dev)
 		transfer.dataSize = ctx->rx_len;
 	} else if (ctx->rx_len == 0) {
 		/* tx only, nothing to rx */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = NULL;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len == ctx->rx_len) {
 		/* rx and tx are the same length */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len > ctx->rx_len) {
@@ -70,7 +70,7 @@ static int spi_mcux_transfer_next_packet(struct device *dev)
 		 * rx into a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->rx_len;
 		transfer.configFlags |= kDSPI_MasterActiveAfterTransfer;
@@ -79,7 +79,7 @@ static int spi_mcux_transfer_next_packet(struct device *dev)
 		 * tx from a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags |= kDSPI_MasterActiveAfterTransfer;
@@ -130,8 +130,8 @@ static int spi_mcux_configure(struct device *dev,
 	SPI_Type *base = config->base;
 	dspi_master_config_t master_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
-	u32_t word_size;
+	uint32_t clock_freq;
+	uint32_t word_size;
 
 	if (spi_context_configured(&data->ctx, spi_cfg)) {
 		/* This configuration is already in use */
diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c
index 923e26d50c..1d3ec15ffe 100644
--- a/drivers/spi/spi_mcux_flexcomm.c
+++ b/drivers/spi/spi_mcux_flexcomm.c
@@ -54,13 +54,13 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		transfer.configFlags = kSPI_FrameAssert;
 	} else if (ctx->rx_len == 0) {
 		/* tx only, nothing to rx */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = NULL;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags = kSPI_FrameAssert;
 	} else if (ctx->tx_len == ctx->rx_len) {
 		/* rx and tx are the same length */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags = kSPI_FrameAssert;
@@ -69,7 +69,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * rx into a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->rx_len;
 		transfer.configFlags = 0;
@@ -78,7 +78,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * tx from a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags = 0;
@@ -125,8 +125,8 @@ static int spi_mcux_configure(struct device *dev,
 	struct spi_mcux_data *data = dev->driver_data;
 	SPI_Type *base = config->base;
 	spi_master_config_t master_config;
-	u32_t clock_freq;
-	u32_t word_size;
+	uint32_t clock_freq;
+	uint32_t word_size;
 
 	if (spi_context_configured(&data->ctx, spi_cfg)) {
 		/* This configuration is already in use */
diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c
index e9f00c2fd5..b2525fe4c1 100644
--- a/drivers/spi/spi_mcux_lpspi.c
+++ b/drivers/spi/spi_mcux_lpspi.c
@@ -59,12 +59,12 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		transfer.dataSize = ctx->rx_len;
 	} else if (ctx->rx_len == 0) {
 		/* tx only, nothing to rx */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = NULL;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len == ctx->rx_len) {
 		/* rx and tx are the same length */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len > ctx->rx_len) {
@@ -72,7 +72,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * rx into a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->rx_len;
 		transfer.configFlags |= kLPSPI_MasterPcsContinuous;
@@ -81,7 +81,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * tx from a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags |= kLPSPI_MasterPcsContinuous;
@@ -130,8 +130,8 @@ static int spi_mcux_configure(struct device *dev,
 	LPSPI_Type *base = config->base;
 	lpspi_master_config_t master_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
-	u32_t word_size;
+	uint32_t clock_freq;
+	uint32_t word_size;
 
 	if (spi_context_configured(&data->ctx, spi_cfg)) {
 		/* This configuration is already in use */
diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c
index dce2a94b7d..174a3bcc3f 100644
--- a/drivers/spi/spi_nrfx_spi.c
+++ b/drivers/spi/spi_nrfx_spi.c
@@ -19,7 +19,7 @@ struct spi_nrfx_data {
 	size_t chunk_len;
 	bool   busy;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 };
 
@@ -38,7 +38,7 @@ static inline const struct spi_nrfx_config *get_dev_config(struct device *dev)
 	return dev->config_info;
 }
 
-static inline nrf_spi_frequency_t get_nrf_spi_frequency(u32_t frequency)
+static inline nrf_spi_frequency_t get_nrf_spi_frequency(uint32_t frequency)
 {
 	/* Get the highest supported frequency not exceeding the requested one.
 	 */
@@ -59,7 +59,7 @@ static inline nrf_spi_frequency_t get_nrf_spi_frequency(u32_t frequency)
 	}
 }
 
-static inline nrf_spi_mode_t get_nrf_spi_mode(u16_t operation)
+static inline nrf_spi_mode_t get_nrf_spi_mode(uint16_t operation)
 {
 	if (SPI_MODE_GET(operation) & SPI_MODE_CPOL) {
 		if (SPI_MODE_GET(operation) & SPI_MODE_CPHA) {
@@ -76,7 +76,7 @@ static inline nrf_spi_mode_t get_nrf_spi_mode(u16_t operation)
 	}
 }
 
-static inline nrf_spi_bit_order_t get_nrf_spi_bit_order(u16_t operation)
+static inline nrf_spi_bit_order_t get_nrf_spi_bit_order(uint16_t operation)
 {
 	if (operation & SPI_TRANSFER_LSB) {
 		return NRF_SPI_BIT_ORDER_LSB_FIRST;
@@ -281,7 +281,7 @@ static int init_spi(struct device *dev)
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static int spi_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int spi_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
@@ -289,7 +289,7 @@ static int spi_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 	const struct spi_nrfx_config *config = get_dev_config(dev);
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != data->pm_state) {
 			switch (new_state) {
@@ -316,7 +316,7 @@ static int spi_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = data->pm_state;
+		*((uint32_t *)context) = data->pm_state;
 	}
 
 	if (cb) {
diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index 5823153057..f51b225e0d 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -20,10 +20,10 @@ struct spi_nrfx_data {
 	size_t chunk_len;
 	bool   busy;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	u32_t pm_state;
+	uint32_t pm_state;
 #endif
 #if (CONFIG_SPI_NRFX_RAM_BUFFER_SIZE > 0)
-	u8_t   buffer[CONFIG_SPI_NRFX_RAM_BUFFER_SIZE];
+	uint8_t   buffer[CONFIG_SPI_NRFX_RAM_BUFFER_SIZE];
 #endif
 };
 
@@ -43,7 +43,7 @@ static inline const struct spi_nrfx_config *get_dev_config(struct device *dev)
 	return dev->config_info;
 }
 
-static inline nrf_spim_frequency_t get_nrf_spim_frequency(u32_t frequency)
+static inline nrf_spim_frequency_t get_nrf_spim_frequency(uint32_t frequency)
 {
 	/* Get the highest supported frequency not exceeding the requested one.
 	 */
@@ -73,7 +73,7 @@ static inline nrf_spim_frequency_t get_nrf_spim_frequency(u32_t frequency)
 	}
 }
 
-static inline nrf_spim_mode_t get_nrf_spim_mode(u16_t operation)
+static inline nrf_spim_mode_t get_nrf_spim_mode(uint16_t operation)
 {
 	if (SPI_MODE_GET(operation) & SPI_MODE_CPOL) {
 		if (SPI_MODE_GET(operation) & SPI_MODE_CPHA) {
@@ -90,7 +90,7 @@ static inline nrf_spim_mode_t get_nrf_spim_mode(u16_t operation)
 	}
 }
 
-static inline nrf_spim_bit_order_t get_nrf_spim_bit_order(u16_t operation)
+static inline nrf_spim_bit_order_t get_nrf_spim_bit_order(uint16_t operation)
 {
 	if (operation & SPI_TRANSFER_LSB) {
 		return NRF_SPIM_BIT_ORDER_LSB_FIRST;
@@ -161,7 +161,7 @@ static void transfer_next_chunk(struct device *dev)
 	if (chunk_len > 0) {
 		nrfx_spim_xfer_desc_t xfer;
 		nrfx_err_t result;
-		const u8_t *tx_buf = ctx->tx_buf;
+		const uint8_t *tx_buf = ctx->tx_buf;
 #if (CONFIG_SPI_NRFX_RAM_BUFFER_SIZE > 0)
 		if (spi_context_tx_buf_on(ctx) && !nrfx_is_in_ram(tx_buf)) {
 			if (chunk_len > sizeof(dev_data->buffer)) {
@@ -320,7 +320,7 @@ static int init_spim(struct device *dev)
 }
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static int spim_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
+static int spim_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
@@ -328,7 +328,7 @@ static int spim_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 	const struct spi_nrfx_config *config = get_dev_config(dev);
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		u32_t new_state = *((const u32_t *)context);
+		uint32_t new_state = *((const uint32_t *)context);
 
 		if (new_state != data->pm_state) {
 			switch (new_state) {
@@ -355,7 +355,7 @@ static int spim_nrfx_pm_control(struct device *dev, u32_t ctrl_command,
 		}
 	} else {
 		__ASSERT_NO_MSG(ctrl_command == DEVICE_PM_GET_POWER_STATE);
-		*((u32_t *)context) = data->pm_state;
+		*((uint32_t *)context) = data->pm_state;
 	}
 
 	if (cb) {
diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 78ed66f793..92e96dc952 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -33,7 +33,7 @@ static inline const struct spi_nrfx_config *get_dev_config(struct device *dev)
 	return dev->config_info;
 }
 
-static inline nrf_spis_mode_t get_nrf_spis_mode(u16_t operation)
+static inline nrf_spis_mode_t get_nrf_spis_mode(uint16_t operation)
 {
 	if (SPI_MODE_GET(operation) & SPI_MODE_CPOL) {
 		if (SPI_MODE_GET(operation) & SPI_MODE_CPHA) {
@@ -50,7 +50,7 @@ static inline nrf_spis_mode_t get_nrf_spis_mode(u16_t operation)
 	}
 }
 
-static inline nrf_spis_bit_order_t get_nrf_spis_bit_order(u16_t operation)
+static inline nrf_spis_bit_order_t get_nrf_spis_bit_order(uint16_t operation)
 {
 	if (operation & SPI_TRANSFER_LSB) {
 		return NRF_SPIS_BIT_ORDER_LSB_FIRST;
diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c
index 6a95f72025..b304eddc6b 100644
--- a/drivers/spi/spi_oc_simple.c
+++ b/drivers/spi/spi_oc_simple.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(spi_oc_simple);
 #include "spi_oc_simple.h"
 
 /* Bit 5:4 == ESPR, Bit 1:0 == SPR */
-u8_t DIVIDERS[] = { 0x00,       /*   2  */
+uint8_t DIVIDERS[] = { 0x00,       /*   2  */
 		    0x01,       /*   4  */
 		    0x10,       /*   8  */
 		    0x02,       /*  16  */
@@ -34,7 +34,7 @@ static int spi_oc_simple_configure(const struct spi_oc_simple_cfg *info,
 				struct spi_oc_simple_data *spi,
 				const struct spi_config *config)
 {
-	u8_t spcr = 0U;
+	uint8_t spcr = 0U;
 	int i;
 
 	if (spi_context_configured(&spi->ctx, config)) {
@@ -94,7 +94,7 @@ int spi_oc_simple_transceive(struct device *dev,
 	struct spi_oc_simple_data *spi = SPI_OC_SIMPLE_DATA(dev);
 	struct spi_context *ctx = &spi->ctx;
 
-	u8_t rx_byte;
+	uint8_t rx_byte;
 	size_t i;
 	size_t cur_xfer_len;
 	int rc;
diff --git a/drivers/spi/spi_oc_simple.h b/drivers/spi/spi_oc_simple.h
index 7c2d0a6ab5..8f382fae7d 100644
--- a/drivers/spi/spi_oc_simple.h
+++ b/drivers/spi/spi_oc_simple.h
@@ -24,8 +24,8 @@
 #define SPI_OC_SIMPLE_SPCR_CPHA BIT(2)
 
 struct spi_oc_simple_cfg {
-	u32_t base;
-	u32_t f_sys;
+	uint32_t base;
+	uint32_t f_sys;
 };
 
 struct spi_oc_simple_data {
diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c
index 91fa86b323..c70a865f99 100644
--- a/drivers/spi/spi_rv32m1_lpspi.c
+++ b/drivers/spi/spi_rv32m1_lpspi.c
@@ -27,7 +27,7 @@ struct spi_mcux_config {
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
 	clock_ip_name_t clock_ip_name;
-	u32_t clock_ip_src;
+	uint32_t clock_ip_src;
 	void (*irq_config_func)(struct device *dev);
 };
 
@@ -63,12 +63,12 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		transfer.dataSize = ctx->rx_len;
 	} else if (ctx->rx_len == 0) {
 		/* tx only, nothing to rx */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = NULL;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len == ctx->rx_len) {
 		/* rx and tx are the same length */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 	} else if (ctx->tx_len > ctx->rx_len) {
@@ -76,7 +76,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * rx into a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->rx_len;
 		transfer.configFlags |= kLPSPI_MasterPcsContinuous;
@@ -85,7 +85,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 		 * tx from a longer intermediate buffer. Leave chip select
 		 * active between transfers.
 		 */
-		transfer.txData = (u8_t *) ctx->tx_buf;
+		transfer.txData = (uint8_t *) ctx->tx_buf;
 		transfer.rxData = ctx->rx_buf;
 		transfer.dataSize = ctx->tx_len;
 		transfer.configFlags |= kLPSPI_MasterPcsContinuous;
@@ -133,8 +133,8 @@ static int spi_mcux_configure(struct device *dev,
 	LPSPI_Type *base = config->base;
 	lpspi_master_config_t master_config;
 	struct device *clock_dev;
-	u32_t clock_freq;
-	u32_t word_size;
+	uint32_t clock_freq;
+	uint32_t word_size;
 
 	if (spi_context_configured(&data->ctx, spi_cfg)) {
 		/* This configuration is already in use */
diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c
index a5d43378cd..69f4057e19 100644
--- a/drivers/spi/spi_sam.c
+++ b/drivers/spi/spi_sam.c
@@ -22,8 +22,8 @@ LOG_MODULE_REGISTER(spi_sam);
 /* Device constant configuration parameters */
 struct spi_sam_config {
 	Spi *regs;
-	u32_t periph_id;
-	u32_t num_pins;
+	uint32_t periph_id;
+	uint32_t num_pins;
 	struct soc_gpio_pin pins[];
 };
 
@@ -54,7 +54,7 @@ static int spi_sam_configure(struct device *dev,
 	const struct spi_sam_config *cfg = dev->config_info;
 	struct spi_sam_data *data = dev->driver_data;
 	Spi *regs = cfg->regs;
-	u32_t spi_mr = 0U, spi_csr = 0U;
+	uint32_t spi_mr = 0U, spi_csr = 0U;
 	int div;
 
 	if (spi_context_configured(&data->ctx, config)) {
@@ -115,11 +115,11 @@ static bool spi_sam_transfer_ongoing(struct spi_sam_data *data)
 
 static void spi_sam_shift_master(Spi *regs, struct spi_sam_data *data)
 {
-	u8_t tx;
-	u8_t rx;
+	uint8_t tx;
+	uint8_t rx;
 
 	if (spi_context_tx_buf_on(&data->ctx)) {
-		tx = *(u8_t *)(data->ctx.tx_buf);
+		tx = *(uint8_t *)(data->ctx.tx_buf);
 	} else {
 		tx = 0U;
 	}
@@ -133,7 +133,7 @@ static void spi_sam_shift_master(Spi *regs, struct spi_sam_data *data)
 	while ((regs->SPI_SR & SPI_SR_RDRF) == 0) {
 	}
 
-	rx = (u8_t)regs->SPI_RDR;
+	rx = (uint8_t)regs->SPI_RDR;
 
 	if (spi_context_rx_buf_on(&data->ctx)) {
 		*data->ctx.rx_buf = rx;
@@ -155,9 +155,9 @@ static void spi_sam_finish(Spi *regs)
 /* Fast path that transmits a buf */
 static void spi_sam_fast_tx(Spi *regs, const struct spi_buf *tx_buf)
 {
-	const u8_t *p = tx_buf->buf;
-	const u8_t *pend = (u8_t *)tx_buf->buf + tx_buf->len;
-	u8_t ch;
+	const uint8_t *p = tx_buf->buf;
+	const uint8_t *pend = (uint8_t *)tx_buf->buf + tx_buf->len;
+	uint8_t ch;
 
 	while (p != pend) {
 		ch = *p++;
@@ -174,7 +174,7 @@ static void spi_sam_fast_tx(Spi *regs, const struct spi_buf *tx_buf)
 /* Fast path that reads into a buf */
 static void spi_sam_fast_rx(Spi *regs, const struct spi_buf *rx_buf)
 {
-	u8_t *rx = rx_buf->buf;
+	uint8_t *rx = rx_buf->buf;
 	int len = rx_buf->len;
 
 	if (len <= 0) {
@@ -199,14 +199,14 @@ static void spi_sam_fast_rx(Spi *regs, const struct spi_buf *rx_buf)
 		while ((regs->SPI_SR & SPI_SR_RDRF) == 0) {
 		}
 
-		*rx++ = (u8_t)regs->SPI_RDR;
+		*rx++ = (uint8_t)regs->SPI_RDR;
 	}
 
 	/* Read the final incoming byte */
 	while ((regs->SPI_SR & SPI_SR_RDRF) == 0) {
 	}
 
-	*rx = (u8_t)regs->SPI_RDR;
+	*rx = (uint8_t)regs->SPI_RDR;
 
 	spi_sam_finish(regs);
 }
@@ -216,9 +216,9 @@ static void spi_sam_fast_txrx(Spi *regs,
 			      const struct spi_buf *tx_buf,
 			      const struct spi_buf *rx_buf)
 {
-	const u8_t *tx = tx_buf->buf;
-	const u8_t *txend = (u8_t *)tx_buf->buf + tx_buf->len;
-	u8_t *rx = rx_buf->buf;
+	const uint8_t *tx = tx_buf->buf;
+	const uint8_t *txend = (uint8_t *)tx_buf->buf + tx_buf->len;
+	uint8_t *rx = rx_buf->buf;
 	size_t len = rx_buf->len;
 
 	if (len == 0) {
@@ -254,14 +254,14 @@ static void spi_sam_fast_txrx(Spi *regs,
 		while ((regs->SPI_SR & SPI_SR_RDRF) == 0) {
 		}
 
-		*rx++ = (u8_t)regs->SPI_RDR;
+		*rx++ = (uint8_t)regs->SPI_RDR;
 	}
 
 	/* Read the final incoming byte */
 	while ((regs->SPI_SR & SPI_SR_RDRF) == 0) {
 	}
 
-	*rx = (u8_t)regs->SPI_RDR;
+	*rx = (uint8_t)regs->SPI_RDR;
 
 	spi_sam_finish(regs);
 }
diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c
index a851ace4c8..55b4079eae 100644
--- a/drivers/spi/spi_sam0.c
+++ b/drivers/spi/spi_sam0.c
@@ -23,21 +23,21 @@ LOG_MODULE_REGISTER(spi_sam0);
 /* Device constant configuration parameters */
 struct spi_sam0_config {
 	SercomSpi *regs;
-	u32_t pads;
+	uint32_t pads;
 #ifdef MCLK
-	volatile u32_t *mclk;
-	u32_t mclk_mask;
-	u16_t gclk_core_id;
+	volatile uint32_t *mclk;
+	uint32_t mclk_mask;
+	uint16_t gclk_core_id;
 #else
-	u32_t pm_apbcmask;
-	u16_t gclk_clkctrl_id;
+	uint32_t pm_apbcmask;
+	uint16_t gclk_clkctrl_id;
 #endif
 #ifdef CONFIG_SPI_ASYNC
 	char *dma_dev;
-	u8_t tx_dma_request;
-	u8_t tx_dma_channel;
-	u8_t rx_dma_request;
-	u8_t rx_dma_channel;
+	uint8_t tx_dma_request;
+	uint8_t tx_dma_channel;
+	uint8_t rx_dma_request;
+	uint8_t rx_dma_channel;
 #endif
 };
 
@@ -46,7 +46,7 @@ struct spi_sam0_data {
 	struct spi_context ctx;
 #ifdef CONFIG_SPI_ASYNC
 	struct device *dma;
-	u32_t dma_segment_len;
+	uint32_t dma_segment_len;
 #endif
 };
 
@@ -147,11 +147,11 @@ static bool spi_sam0_transfer_ongoing(struct spi_sam0_data *data)
 
 static void spi_sam0_shift_master(SercomSpi *regs, struct spi_sam0_data *data)
 {
-	u8_t tx;
-	u8_t rx;
+	uint8_t tx;
+	uint8_t rx;
 
 	if (spi_context_tx_buf_on(&data->ctx)) {
-		tx = *(u8_t *)(data->ctx.tx_buf);
+		tx = *(uint8_t *)(data->ctx.tx_buf);
 	} else {
 		tx = 0U;
 	}
@@ -187,9 +187,9 @@ static void spi_sam0_finish(SercomSpi *regs)
 /* Fast path that transmits a buf */
 static void spi_sam0_fast_tx(SercomSpi *regs, const struct spi_buf *tx_buf)
 {
-	const u8_t *p = tx_buf->buf;
-	const u8_t *pend = (u8_t *)tx_buf->buf + tx_buf->len;
-	u8_t ch;
+	const uint8_t *p = tx_buf->buf;
+	const uint8_t *pend = (uint8_t *)tx_buf->buf + tx_buf->len;
+	uint8_t ch;
 
 	while (p != pend) {
 		ch = *p++;
@@ -206,7 +206,7 @@ static void spi_sam0_fast_tx(SercomSpi *regs, const struct spi_buf *tx_buf)
 /* Fast path that reads into a buf */
 static void spi_sam0_fast_rx(SercomSpi *regs, const struct spi_buf *rx_buf)
 {
-	u8_t *rx = rx_buf->buf;
+	uint8_t *rx = rx_buf->buf;
 	int len = rx_buf->len;
 
 	if (len <= 0) {
@@ -245,9 +245,9 @@ static void spi_sam0_fast_txrx(SercomSpi *regs,
 			       const struct spi_buf *tx_buf,
 			       const struct spi_buf *rx_buf)
 {
-	const u8_t *tx = tx_buf->buf;
-	const u8_t *txend = (u8_t *)tx_buf->buf + tx_buf->len;
-	u8_t *rx = rx_buf->buf;
+	const uint8_t *tx = tx_buf->buf;
+	const uint8_t *txend = (uint8_t *)tx_buf->buf + tx_buf->len;
+	uint8_t *rx = rx_buf->buf;
 	size_t len = rx_buf->len;
 
 	if (len == 0) {
@@ -433,9 +433,9 @@ static int spi_sam0_transceive_sync(struct device *dev,
 
 #ifdef CONFIG_SPI_ASYNC
 
-static void spi_sam0_dma_rx_done(void *arg, u32_t id, int error_code);
+static void spi_sam0_dma_rx_done(void *arg, uint32_t id, int error_code);
 
-static int spi_sam0_dma_rx_load(struct device *dev, u8_t *buf,
+static int spi_sam0_dma_rx_load(struct device *dev, uint8_t *buf,
 				size_t len)
 {
 	const struct spi_sam0_config *cfg = dev->config_info;
@@ -457,15 +457,15 @@ static int spi_sam0_dma_rx_load(struct device *dev, u8_t *buf,
 	dma_blk.block_size = len;
 
 	if (buf != NULL) {
-		dma_blk.dest_address = (u32_t)buf;
+		dma_blk.dest_address = (uint32_t)buf;
 	} else {
-		static u8_t dummy;
+		static uint8_t dummy;
 
-		dma_blk.dest_address = (u32_t)&dummy;
+		dma_blk.dest_address = (uint32_t)&dummy;
 		dma_blk.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 	}
 
-	dma_blk.source_address = (u32_t)(&(regs->DATA.reg));
+	dma_blk.source_address = (uint32_t)(&(regs->DATA.reg));
 	dma_blk.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 	retval = dma_config(data->dma, cfg->rx_dma_channel,
@@ -477,7 +477,7 @@ static int spi_sam0_dma_rx_load(struct device *dev, u8_t *buf,
 	return dma_start(data->dma, cfg->rx_dma_channel);
 }
 
-static int spi_sam0_dma_tx_load(struct device *dev, const u8_t *buf,
+static int spi_sam0_dma_tx_load(struct device *dev, const uint8_t *buf,
 				size_t len)
 {
 	const struct spi_sam0_config *cfg = dev->config_info;
@@ -497,15 +497,15 @@ static int spi_sam0_dma_tx_load(struct device *dev, const u8_t *buf,
 	dma_blk.block_size = len;
 
 	if (buf != NULL) {
-		dma_blk.source_address = (u32_t)buf;
+		dma_blk.source_address = (uint32_t)buf;
 	} else {
-		static const u8_t dummy;
+		static const uint8_t dummy;
 
-		dma_blk.source_address = (u32_t)&dummy;
+		dma_blk.source_address = (uint32_t)&dummy;
 		dma_blk.source_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 	}
 
-	dma_blk.dest_address = (u32_t)(&(regs->DATA.reg));
+	dma_blk.dest_address = (uint32_t)(&(regs->DATA.reg));
 	dma_blk.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 
 	retval = dma_config(data->dma, cfg->tx_dma_channel,
@@ -521,7 +521,7 @@ static int spi_sam0_dma_tx_load(struct device *dev, const u8_t *buf,
 static bool spi_sam0_dma_advance_segment(struct device *dev)
 {
 	struct spi_sam0_data *data = dev->driver_data;
-	u32_t segment_len;
+	uint32_t segment_len;
 
 	/* Pick the shorter buffer of ones that have an actual length */
 	if (data->ctx.rx_len != 0) {
@@ -579,7 +579,7 @@ static int spi_sam0_dma_advance_buffers(struct device *dev)
 	return 0;
 }
 
-static void spi_sam0_dma_rx_done(void *arg, u32_t id, int error_code)
+static void spi_sam0_dma_rx_done(void *arg, uint32_t id, int error_code)
 {
 	struct device *dev = arg;
 	const struct spi_sam0_config *cfg = dev->config_info;
diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c
index 82372e79ad..dab46f469c 100644
--- a/drivers/spi/spi_sifive.c
+++ b/drivers/spi/spi_sifive.c
@@ -16,9 +16,9 @@ LOG_MODULE_REGISTER(spi_sifive);
 
 /* Helper Functions */
 
-static inline void sys_set_mask(mem_addr_t addr, u32_t mask, u32_t value)
+static inline void sys_set_mask(mem_addr_t addr, uint32_t mask, uint32_t value)
 {
-	u32_t temp = sys_read32(addr);
+	uint32_t temp = sys_read32(addr);
 
 	temp &= ~(mask);
 	temp |= value;
@@ -26,10 +26,10 @@ static inline void sys_set_mask(mem_addr_t addr, u32_t mask, u32_t value)
 	sys_write32(temp, addr);
 }
 
-int spi_config(struct device *dev, u32_t frequency, u16_t operation)
+int spi_config(struct device *dev, uint32_t frequency, uint16_t operation)
 {
-	u32_t div;
-	u32_t fmt_len;
+	uint32_t div;
+	uint32_t fmt_len;
 
 	if (SPI_OP_MODE_GET(operation) != SPI_OP_MODE_MASTER) {
 		return -ENOTSUP;
@@ -93,35 +93,35 @@ int spi_config(struct device *dev, u32_t frequency, u16_t operation)
 	return 0;
 }
 
-void spi_sifive_send(struct device *dev, u16_t frame)
+void spi_sifive_send(struct device *dev, uint16_t frame)
 {
 	while (sys_read32(SPI_REG(dev, REG_TXDATA)) & SF_TXDATA_FULL) {
 	}
 
-	sys_write32((u32_t) frame, SPI_REG(dev, REG_TXDATA));
+	sys_write32((uint32_t) frame, SPI_REG(dev, REG_TXDATA));
 }
 
-u16_t spi_sifive_recv(struct device *dev)
+uint16_t spi_sifive_recv(struct device *dev)
 {
-	u32_t val;
+	uint32_t val;
 
 	while ((val = sys_read32(SPI_REG(dev, REG_RXDATA))) & SF_RXDATA_EMPTY) {
 	}
 
-	return (u16_t) val;
+	return (uint16_t) val;
 }
 
 void spi_sifive_xfer(struct device *dev, const bool hw_cs_control)
 {
 	struct spi_context *ctx = &SPI_DATA(dev)->ctx;
 
-	u32_t send_len = spi_context_longest_current_buf(ctx);
+	uint32_t send_len = spi_context_longest_current_buf(ctx);
 
-	for (u32_t i = 0; i < send_len; i++) {
+	for (uint32_t i = 0; i < send_len; i++) {
 
 		/* Send a frame */
 		if (i < ctx->tx_len) {
-			spi_sifive_send(dev, (u16_t) (ctx->tx_buf)[i]);
+			spi_sifive_send(dev, (uint16_t) (ctx->tx_buf)[i]);
 		} else {
 			/* Send dummy bytes */
 			spi_sifive_send(dev, 0);
@@ -129,7 +129,7 @@ void spi_sifive_xfer(struct device *dev, const bool hw_cs_control)
 
 		/* Receive a frame */
 		if (i < ctx->rx_len) {
-			ctx->rx_buf[i] = (u8_t) spi_sifive_recv(dev);
+			ctx->rx_buf[i] = (uint8_t) spi_sifive_recv(dev);
 		} else {
 			/* Discard returned value */
 			spi_sifive_recv(dev);
diff --git a/drivers/spi/spi_sifive.h b/drivers/spi/spi_sifive.h
index ebc3bcb759..23305750b0 100644
--- a/drivers/spi/spi_sifive.h
+++ b/drivers/spi/spi_sifive.h
@@ -67,8 +67,8 @@ struct spi_sifive_data {
 };
 
 struct spi_sifive_cfg {
-	u32_t base;
-	u32_t f_sys;
+	uint32_t base;
+	uint32_t f_sys;
 };
 
 #endif /* _SPI_SIFIVE__H */
diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c
index a0f2213736..5472f0489f 100644
--- a/drivers/spi/spi_xec_qmspi.c
+++ b/drivers/spi/spi_xec_qmspi.c
@@ -18,14 +18,14 @@ LOG_MODULE_REGISTER(spi_xec, CONFIG_SPI_LOG_LEVEL);
 /* Device constant configuration parameters */
 struct spi_qmspi_config {
 	QMSPI_Type *regs;
-	u32_t cs_timing;
-	u8_t girq;
-	u8_t girq_pos;
-	u8_t girq_nvic_aggr;
-	u8_t girq_nvic_direct;
-	u8_t irq_pri;
-	u8_t chip_sel;
-	u8_t width;	/* 1(single), 2(dual), 4(quad) */
+	uint32_t cs_timing;
+	uint8_t girq;
+	uint8_t girq_pos;
+	uint8_t girq_nvic_aggr;
+	uint8_t girq_nvic_direct;
+	uint8_t irq_pri;
+	uint8_t chip_sel;
+	uint8_t width;	/* 1(single), 2(dual), 4(quad) */
 };
 
 /* Device run time data */
@@ -33,7 +33,7 @@ struct spi_qmspi_data {
 	struct spi_context ctx;
 };
 
-static inline u32_t descr_rd(QMSPI_Type *regs, u32_t did)
+static inline uint32_t descr_rd(QMSPI_Type *regs, uint32_t did)
 {
 	uintptr_t raddr = (uintptr_t)regs + MCHP_QMSPI_DESC0_OFS +
 			  ((did & MCHP_QMSPI_C_NEXT_DESCR_MASK0) << 2);
@@ -41,7 +41,7 @@ static inline u32_t descr_rd(QMSPI_Type *regs, u32_t did)
 	return REG32(raddr);
 }
 
-static inline void descr_wr(QMSPI_Type *regs, u32_t did, u32_t val)
+static inline void descr_wr(QMSPI_Type *regs, uint32_t did, uint32_t val)
 {
 	uintptr_t raddr = (uintptr_t)regs + MCHP_QMSPI_DESC0_OFS +
 			  ((did & MCHP_QMSPI_C_NEXT_DESCR_MASK0) << 2);
@@ -49,12 +49,12 @@ static inline void descr_wr(QMSPI_Type *regs, u32_t did, u32_t val)
 	REG32(raddr) = val;
 }
 
-static inline void txb_wr8(QMSPI_Type *regs, u8_t data8)
+static inline void txb_wr8(QMSPI_Type *regs, uint8_t data8)
 {
 	REG8(&regs->TX_FIFO) = data8;
 }
 
-static inline u8_t rxb_rd8(QMSPI_Type *regs)
+static inline uint8_t rxb_rd8(QMSPI_Type *regs)
 {
 	return REG8(&regs->RX_FIFO);
 }
@@ -65,9 +65,9 @@ static inline u8_t rxb_rd8(QMSPI_Type *regs)
  * mode register is defined as: 0=maximum divider of 256. Values 1 through
  * 255 divide 48MHz by that value.
  */
-static void qmspi_set_frequency(QMSPI_Type *regs, u32_t freq_hz)
+static void qmspi_set_frequency(QMSPI_Type *regs, uint32_t freq_hz)
 {
-	u32_t div, qmode;
+	uint32_t div, qmode;
 
 	if (freq_hz == 0) {
 		div = 0; /* max divider = 256 */
@@ -108,18 +108,18 @@ static void qmspi_set_frequency(QMSPI_Type *regs, u32_t freq_hz)
  *  Mode 3: CPOL=1 CHPA=1 (CHPA_MISO=0 and CHPA_MOSI=1)
  */
 
-const u8_t smode_tbl[4] = {
+const uint8_t smode_tbl[4] = {
 	0x00u, 0x06u, 0x01u, 0x07u
 };
 
-const u8_t smode48_tbl[4] = {
+const uint8_t smode48_tbl[4] = {
 	0x04u, 0x02u, 0x05u, 0x03u
 };
 
-static void qmspi_set_signalling_mode(QMSPI_Type *regs, u32_t smode)
+static void qmspi_set_signalling_mode(QMSPI_Type *regs, uint32_t smode)
 {
-	const u8_t *ptbl;
-	u32_t m;
+	const uint8_t *ptbl;
+	uint32_t m;
 
 	ptbl = smode_tbl;
 	if (((regs->MODE >> MCHP_QMSPI_M_FDIV_POS) &
@@ -127,7 +127,7 @@ static void qmspi_set_signalling_mode(QMSPI_Type *regs, u32_t smode)
 		ptbl = smode48_tbl;
 	}
 
-	m = (u32_t)ptbl[smode & 0x03];
+	m = (uint32_t)ptbl[smode & 0x03];
 	regs->MODE = (regs->MODE & ~(MCHP_QMSPI_M_SIG_MASK))
 		     | (m << MCHP_QMSPI_M_SIG_POS);
 }
@@ -136,9 +136,9 @@ static void qmspi_set_signalling_mode(QMSPI_Type *regs, u32_t smode)
  * QMSPI HW support single, dual, and quad.
  * Return QMSPI Control/Descriptor register encoded value.
  */
-static u32_t qmspi_config_get_lines(const struct spi_config *config)
+static uint32_t qmspi_config_get_lines(const struct spi_config *config)
 {
-	u32_t qlines;
+	uint32_t qlines;
 
 	switch (config->operation & SPI_LINES_MASK) {
 	case SPI_LINES_SINGLE:
@@ -171,7 +171,7 @@ static int qmspi_configure(struct device *dev,
 	const struct spi_qmspi_config *cfg = dev->config_info;
 	struct spi_qmspi_data *data = dev->driver_data;
 	QMSPI_Type *regs = cfg->regs;
-	u32_t smode;
+	uint32_t smode;
 
 	if (spi_context_configured(&data->ctx, config)) {
 		return 0;
@@ -237,9 +237,9 @@ static int qmspi_configure(struct device *dev,
  * Quad mode: 4 bits per clock  -> IFM fiels = 1xb. Max 0x1fff clocks
  * QMSPI unit size set to bits.
  */
-static int qmspi_tx_dummy_clocks(QMSPI_Type *regs, u32_t nclocks)
+static int qmspi_tx_dummy_clocks(QMSPI_Type *regs, uint32_t nclocks)
 {
-	u32_t descr, ifm, qstatus;
+	uint32_t descr, ifm, qstatus;
 
 	ifm = regs->CTRL & MCHP_QMSPI_C_IFM_MASK;
 	descr = ifm | MCHP_QMSPI_C_TX_DIS | MCHP_QMSPI_C_XFR_UNITS_BITS
@@ -272,9 +272,9 @@ static int qmspi_tx_dummy_clocks(QMSPI_Type *regs, u32_t nclocks)
 /*
  * Return unit size power of 2 given number of bytes to transfer.
  */
-static u32_t qlen_shift(u32_t len)
+static uint32_t qlen_shift(uint32_t len)
 {
-	u32_t ushift;
+	uint32_t ushift;
 
 	/* is len a multiple of 4 or 16? */
 	if ((len & 0x0F) == 0) {
@@ -294,7 +294,7 @@ static u32_t qlen_shift(u32_t len)
  * Input: power of 2 unit size 4, 2, or 0(default) corresponding
  * to 16, 4, or 1 byte units.
  */
-static u32_t get_qunits(u32_t qshift)
+static uint32_t get_qunits(uint32_t qshift)
 {
 	if (qshift == 4) {
 		return MCHP_QMSPI_C_XFR_UNITS_16;
@@ -318,7 +318,7 @@ static u32_t get_qunits(u32_t qshift)
 static int qmspi_descr_alloc(QMSPI_Type *regs, const struct spi_buf *txb,
 			     int didx, bool is_tx)
 {
-	u32_t descr, qshift, n, nu;
+	uint32_t descr, qshift, n, nu;
 	int dn;
 
 	if (didx >= MCHP_QMSPI_MAX_DESCR) {
@@ -373,9 +373,9 @@ static int qmspi_descr_alloc(QMSPI_Type *regs, const struct spi_buf *txb,
 static int qmspi_tx(QMSPI_Type *regs, const struct spi_buf *tx_buf,
 		    bool close)
 {
-	const u8_t *p = tx_buf->buf;
+	const uint8_t *p = tx_buf->buf;
 	size_t tlen = tx_buf->len;
-	u32_t descr;
+	uint32_t descr;
 	int didx;
 
 	if (tlen == 0) {
@@ -447,11 +447,11 @@ static int qmspi_tx(QMSPI_Type *regs, const struct spi_buf *tx_buf,
 static int qmspi_rx(QMSPI_Type *regs, const struct spi_buf *rx_buf,
 		    bool close)
 {
-	u8_t *p = rx_buf->buf;
+	uint8_t *p = rx_buf->buf;
 	size_t rlen = rx_buf->len;
-	u32_t descr;
+	uint32_t descr;
 	int didx;
-	u8_t data_byte;
+	uint8_t data_byte;
 
 	if (rlen == 0) {
 		return 0;
@@ -514,7 +514,7 @@ static int qmspi_transceive(struct device *dev,
 	const struct spi_buf *ptx;
 	const struct spi_buf *prx;
 	size_t nb;
-	u32_t descr, last_didx;
+	uint32_t descr, last_didx;
 	int err;
 
 	spi_context_lock(&data->ctx, false, NULL);
diff --git a/drivers/timer/altera_avalon_timer_hal.c b/drivers/timer/altera_avalon_timer_hal.c
index d8cd8a99bf..918acc9118 100644
--- a/drivers/timer/altera_avalon_timer_hal.c
+++ b/drivers/timer/altera_avalon_timer_hal.c
@@ -15,9 +15,9 @@
 
 #include "legacy_api.h"
 
-static u32_t accumulated_cycle_count;
+static uint32_t accumulated_cycle_count;
 
-static s32_t _sys_idle_elapsed_ticks = 1;
+static int32_t _sys_idle_elapsed_ticks = 1;
 
 static void timer_irq_handler(void *unused)
 {
@@ -59,7 +59,7 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	/* Per the Altera Embedded IP Peripherals guide, you cannot
 	 * use a timer instance for both the system clock and timestamps
diff --git a/drivers/timer/apic_timer.c b/drivers/timer/apic_timer.c
index f1866e05ec..a95670ddc2 100644
--- a/drivers/timer/apic_timer.c
+++ b/drivers/timer/apic_timer.c
@@ -49,7 +49,7 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
 
 /*
  * CYCLES_PER_TICK must always be at least '2', otherwise MAX_TICKS
- * will overflow s32_t, which is how 'ticks' are currently represented.
+ * will overflow int32_t, which is how 'ticks' are currently represented.
  */
 
 #define CYCLES_PER_TICK \
@@ -71,21 +71,21 @@ BUILD_ASSERT(CYCLES_PER_TICK >= 2, "APIC timer: bad CYCLES_PER_TICK");
  */
 
 static struct k_spinlock lock;
-static u64_t total_cycles;
-static u32_t cached_icr = CYCLES_PER_TICK;
+static uint64_t total_cycles;
+static uint32_t cached_icr = CYCLES_PER_TICK;
 
 #ifdef CONFIG_TICKLESS_KERNEL
 
-static u64_t last_announcement;	/* last time we called z_clock_announce() */
+static uint64_t last_announcement;	/* last time we called z_clock_announce() */
 
-void z_clock_set_timeout(s32_t n, bool idle)
+void z_clock_set_timeout(int32_t n, bool idle)
 {
 	ARG_UNUSED(idle);
 
-	u32_t ccr;
+	uint32_t ccr;
 	int   full_ticks;	/* number of complete ticks we'll wait */
-	u32_t full_cycles;	/* full_ticks represented as cycles */
-	u32_t partial_cycles;	/* number of cycles to first tick boundary */
+	uint32_t full_cycles;	/* full_ticks represented as cycles */
+	uint32_t partial_cycles;	/* number of cycles to first tick boundary */
 
 	if (n < 1) {
 		full_ticks = 0;
@@ -117,10 +117,10 @@ void z_clock_set_timeout(s32_t n, bool idle)
 	k_spin_unlock(&lock, key);
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
-	u32_t ccr;
-	u32_t ticks;
+	uint32_t ccr;
+	uint32_t ticks;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 	ccr = x86_read_loapic(LOAPIC_TIMER_CCR);
@@ -136,8 +136,8 @@ static void isr(void *arg)
 {
 	ARG_UNUSED(arg);
 
-	u32_t cycles;
-	s32_t ticks;
+	uint32_t cycles;
+	int32_t ticks;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
@@ -178,7 +178,7 @@ static void isr(void *arg)
 	z_clock_announce(1);
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	return 0U;
 }
@@ -187,10 +187,10 @@ u32_t z_clock_elapsed(void)
 
 #ifdef CONFIG_APIC_TIMER_TSC
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
-	u64_t tsc = z_tsc_read();
-	u32_t cycles;
+	uint64_t tsc = z_tsc_read();
+	uint32_t cycles;
 
 	cycles = (tsc * CONFIG_APIC_TIMER_TSC_M) / CONFIG_APIC_TIMER_TSC_N;
 	return cycles;
@@ -198,10 +198,10 @@ u32_t z_timer_cycle_get_32(void)
 
 #else
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
-	u32_t ret;
-	u32_t ccr;
+	uint32_t ret;
+	uint32_t ccr;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 	ccr = x86_read_loapic(LOAPIC_TIMER_CCR);
@@ -215,7 +215,7 @@ u32_t z_timer_cycle_get_32(void)
 
 int z_clock_driver_init(struct device *device)
 {
-	u32_t val;
+	uint32_t val;
 
 	val = x86_read_loapic(LOAPIC_TIMER_CONFIG);	/* set divider */
 	val &= ~DCR_DIVIDER_MASK;
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 21325280ef..aaac69db9a 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -58,11 +58,11 @@ static struct k_spinlock lock;
 
 
 #if SMP_TIMER_DRIVER
-volatile static u64_t last_time;
-volatile static u64_t start_time;
+volatile static uint64_t last_time;
+volatile static uint64_t start_time;
 
 #else
-static u32_t last_load;
+static uint32_t last_load;
 
 
 /*
@@ -75,13 +75,13 @@ static u32_t last_load;
  *
  * t = cycle_counter + elapsed();
  */
-static u32_t cycle_count;
+static uint32_t cycle_count;
 
 /*
  * This local variable holds the amount of elapsed HW cycles
  * that have been announced to the kernel.
  */
-static u32_t announced_cycles;
+static uint32_t announced_cycles;
 
 
 /*
@@ -93,7 +93,7 @@ static u32_t announced_cycles;
  * Each time cycle_count is updated with the value from overflow_cycles,
  * the overflow_cycles must be reset to zero.
  */
-static volatile u32_t overflow_cycles;
+static volatile uint32_t overflow_cycles;
 #endif
 
 /**
@@ -102,7 +102,7 @@ static volatile u32_t overflow_cycles;
  *
  * @return Current Timer0 count
  */
-static ALWAYS_INLINE u32_t timer0_count_register_get(void)
+static ALWAYS_INLINE uint32_t timer0_count_register_get(void)
 {
 	return z_arc_v2_aux_reg_read(_ARC_V2_TMR0_COUNT);
 }
@@ -113,7 +113,7 @@ static ALWAYS_INLINE u32_t timer0_count_register_get(void)
  *
  * @return N/A
  */
-static ALWAYS_INLINE void timer0_count_register_set(u32_t value)
+static ALWAYS_INLINE void timer0_count_register_set(uint32_t value)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_TMR0_COUNT, value);
 }
@@ -124,7 +124,7 @@ static ALWAYS_INLINE void timer0_count_register_set(u32_t value)
  *
  * @return N/A
  */
-static ALWAYS_INLINE u32_t timer0_control_register_get(void)
+static ALWAYS_INLINE uint32_t timer0_control_register_get(void)
 {
 	return z_arc_v2_aux_reg_read(_ARC_V2_TMR0_CONTROL);
 }
@@ -135,7 +135,7 @@ static ALWAYS_INLINE u32_t timer0_control_register_get(void)
  *
  * @return N/A
  */
-static ALWAYS_INLINE void timer0_control_register_set(u32_t value)
+static ALWAYS_INLINE void timer0_control_register_set(uint32_t value)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_TMR0_CONTROL, value);
 }
@@ -146,7 +146,7 @@ static ALWAYS_INLINE void timer0_control_register_set(u32_t value)
  *
  * @return N/A
  */
-static ALWAYS_INLINE u32_t timer0_limit_register_get(void)
+static ALWAYS_INLINE uint32_t timer0_limit_register_get(void)
 {
 	return z_arc_v2_aux_reg_read(_ARC_V2_TMR0_LIMIT);
 }
@@ -157,7 +157,7 @@ static ALWAYS_INLINE u32_t timer0_limit_register_get(void)
  *
  * @return N/A
  */
-static ALWAYS_INLINE void timer0_limit_register_set(u32_t count)
+static ALWAYS_INLINE void timer0_limit_register_set(uint32_t count)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_TMR0_LIMIT, count);
 }
@@ -180,9 +180,9 @@ static ALWAYS_INLINE void timer0_limit_register_set(u32_t count)
  *     - and until the current call of the function is completed.
  * - the function is invoked with interrupts disabled.
  */
-static u32_t elapsed(void)
+static uint32_t elapsed(void)
 {
-	u32_t val, ctrl;
+	uint32_t val, ctrl;
 
 	do {
 		val =  timer0_count_register_get();
@@ -222,10 +222,10 @@ static u32_t elapsed(void)
 static void timer_int_handler(void *unused)
 {
 	ARG_UNUSED(unused);
-	u32_t dticks;
+	uint32_t dticks;
 
 #if defined(CONFIG_SMP) && CONFIG_MP_NUM_CPUS > 1
-	u64_t curr_time;
+	uint64_t curr_time;
 	k_spinlock_key_t key;
 
 	/* clear the IP bit of the control register */
@@ -250,7 +250,7 @@ static void timer_int_handler(void *unused)
 	/* irq with higher priority may call z_clock_set_timeout
 	 * so need a lock here
 	 */
-	u32_t key;
+	uint32_t key;
 
 	key = arch_irq_lock();
 
@@ -314,7 +314,7 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	/* If the kernel allows us to miss tick announcements in idle,
 	 * then shut off the counter. (Note: we can assume if idle==true
@@ -334,8 +334,8 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 #if defined(CONFIG_TICKLESS_KERNEL)
-	u32_t delay;
-	u32_t key;
+	uint32_t delay;
+	uint32_t key;
 
 	ticks = MIN(MAX_TICKS, ticks);
 
@@ -366,10 +366,10 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 #if defined(CONFIG_TICKLESS_KERNEL)
-	u32_t delay;
-	u32_t unannounced;
+	uint32_t delay;
+	uint32_t unannounced;
 
-	ticks = MIN(MAX_TICKS, (u32_t)(MAX((s32_t)(ticks - 1), 0)));
+	ticks = MIN(MAX_TICKS, (uint32_t)(MAX((int32_t)(ticks - 1), 0)));
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
@@ -386,7 +386,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	/* normal case */
 	unannounced = cycle_count - announced_cycles;
 
-	if ((s32_t)unannounced < 0) {
+	if ((int32_t)unannounced < 0) {
 		/* We haven't announced for more than half the 32-bit
 		 * wrap duration, because new timeouts keep being set
 		 * before the existing one fires. Force an announce
@@ -417,13 +417,13 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!TICKLESS) {
 		return 0;
 	}
 
-	u32_t cyc;
+	uint32_t cyc;
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 #if SMP_TIMER_DRIVER
@@ -437,13 +437,13 @@ u32_t z_clock_elapsed(void)
 	return cyc / CYC_PER_TICK;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 #if SMP_TIMER_DRIVER
 	return z_arc_connect_gfrc_read() - start_time;
 #else
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = elapsed() + cycle_count;
+	uint32_t ret = elapsed() + cycle_count;
 
 	k_spin_unlock(&lock, key);
 	return ret;
diff --git a/drivers/timer/arm_arch_timer.c b/drivers/timer/arm_arch_timer.c
index 0ab23dad55..949fdd2c93 100644
--- a/drivers/timer/arm_arch_timer.c
+++ b/drivers/timer/arm_arch_timer.c
@@ -10,14 +10,14 @@
 #include <spinlock.h>
 #include <arch/cpu.h>
 
-#define CYC_PER_TICK	((u32_t)((u64_t)sys_clock_hw_cycles_per_sec() \
-			       / (u64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
+#define CYC_PER_TICK	((uint32_t)((uint64_t)sys_clock_hw_cycles_per_sec() \
+			       / (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
 
 #define MAX_TICKS	((0xffffffffu - CYC_PER_TICK) / CYC_PER_TICK)
 #define MIN_DELAY	(1000)
 
 static struct k_spinlock lock;
-static volatile u64_t last_cycle;
+static volatile uint64_t last_cycle;
 
 static void arm_arch_timer_compare_isr(void *arg)
 {
@@ -25,15 +25,15 @@ static void arm_arch_timer_compare_isr(void *arg)
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
-	u64_t curr_cycle = arm_arch_timer_count();
-	u32_t delta_ticks = (u32_t)((curr_cycle - last_cycle) / CYC_PER_TICK);
+	uint64_t curr_cycle = arm_arch_timer_count();
+	uint32_t delta_ticks = (uint32_t)((curr_cycle - last_cycle) / CYC_PER_TICK);
 
 	last_cycle += delta_ticks * CYC_PER_TICK;
 
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
-		u64_t next_cycle = last_cycle + CYC_PER_TICK;
+		uint64_t next_cycle = last_cycle + CYC_PER_TICK;
 
-		if ((s64_t)(next_cycle - curr_cycle) < MIN_DELAY) {
+		if ((int64_t)(next_cycle - curr_cycle) < MIN_DELAY) {
 			next_cycle += CYC_PER_TICK;
 		}
 		arm_arch_timer_set_compare(next_cycle);
@@ -57,7 +57,7 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
@@ -68,17 +68,17 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 	ticks = (ticks == K_TICKS_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u64_t curr_cycle = arm_arch_timer_count();
-	u32_t req_cycle = ticks * CYC_PER_TICK;
+	uint64_t curr_cycle = arm_arch_timer_count();
+	uint32_t req_cycle = ticks * CYC_PER_TICK;
 
 	/* Round up to next tick boundary */
-	req_cycle += (u32_t)(curr_cycle - last_cycle) + (CYC_PER_TICK - 1);
+	req_cycle += (uint32_t)(curr_cycle - last_cycle) + (CYC_PER_TICK - 1);
 	req_cycle = (req_cycle / CYC_PER_TICK) * CYC_PER_TICK;
 
-	if ((s32_t)(req_cycle + last_cycle - curr_cycle) < MIN_DELAY) {
+	if ((int32_t)(req_cycle + last_cycle - curr_cycle) < MIN_DELAY) {
 		req_cycle += CYC_PER_TICK;
 	}
 
@@ -88,21 +88,21 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = ((u32_t)arm_arch_timer_count() - (u32_t)last_cycle)
+	uint32_t ret = ((uint32_t)arm_arch_timer_count() - (uint32_t)last_cycle)
 		    / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
-	return (u32_t)arm_arch_timer_count();
+	return (uint32_t)arm_arch_timer_count();
 }
diff --git a/drivers/timer/cavs_timer.c b/drivers/timer/cavs_timer.c
index 1119ecf4d0..849d08fe45 100644
--- a/drivers/timer/cavs_timer.c
+++ b/drivers/timer/cavs_timer.c
@@ -29,12 +29,12 @@
 BUILD_ASSERT(MIN_DELAY < CYC_PER_TICK);
 
 static struct k_spinlock lock;
-static u64_t last_count;
+static uint64_t last_count;
 
 static volatile struct soc_dsp_shim_regs *shim_regs =
 	(volatile struct soc_dsp_shim_regs *)SOC_DSP_SHIM_REG_BASE;
 
-static void set_compare(u64_t time)
+static void set_compare(uint64_t time)
 {
 #if (TIMER == 0)
 	/* Set compare register */
@@ -50,12 +50,12 @@ static void set_compare(u64_t time)
 	shim_regs->dspwctcs |= DSP_WCT_CS_TA(TIMER);
 }
 
-static u64_t count(void)
+static uint64_t count(void)
 {
 	return shim_regs->walclk;
 }
 
-static u32_t count32(void)
+static uint32_t count32(void)
 {
 	return shim_regs->walclk32_lo;
 }
@@ -63,8 +63,8 @@ static u32_t count32(void)
 static void compare_isr(void *arg)
 {
 	ARG_UNUSED(arg);
-	u64_t curr;
-	u32_t dticks;
+	uint64_t curr;
+	uint32_t dticks;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
@@ -77,13 +77,13 @@ static void compare_isr(void *arg)
 	 * Since it has already been processed and
 	 * ticks announced, skip it.
 	 */
-	if ((count32() - (u32_t)last_count) < MIN_DELAY) {
+	if ((count32() - (uint32_t)last_count) < MIN_DELAY) {
 		k_spin_unlock(&lock, key);
 		return;
 	}
 #endif
 
-	dticks = (u32_t)((curr - last_count) / CYC_PER_TICK);
+	dticks = (uint32_t)((curr - last_count) / CYC_PER_TICK);
 
 	/* Clear the triggered bit */
 	shim_regs->dspwctcs |= DSP_WCT_CS_TT(TIMER);
@@ -91,9 +91,9 @@ static void compare_isr(void *arg)
 	last_count += dticks * CYC_PER_TICK;
 
 #ifndef CONFIG_TICKLESS_KERNEL
-	u64_t next = last_count + CYC_PER_TICK;
+	uint64_t next = last_count + CYC_PER_TICK;
 
-	if ((s64_t)(next - curr) < MIN_DELAY) {
+	if ((int64_t)(next - curr) < MIN_DELAY) {
 		next += CYC_PER_TICK;
 	}
 	set_compare(next);
@@ -106,7 +106,7 @@ static void compare_isr(void *arg)
 
 int z_clock_driver_init(struct device *device)
 {
-	u64_t curr = count();
+	uint64_t curr = count();
 
 	IRQ_CONNECT(TIMER_IRQ, 0, compare_isr, 0, 0);
 	set_compare(curr + CYC_PER_TICK);
@@ -115,21 +115,21 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #ifdef CONFIG_TICKLESS_KERNEL
 	ticks = ticks == K_TICKS_FOREVER ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u64_t curr = count();
-	u64_t next;
-	u32_t adj, cyc = ticks * CYC_PER_TICK;
+	uint64_t curr = count();
+	uint64_t next;
+	uint32_t adj, cyc = ticks * CYC_PER_TICK;
 
 	/* Round up to next tick boundary */
-	adj = (u32_t)(curr - last_count) + (CYC_PER_TICK - 1);
+	adj = (uint32_t)(curr - last_count) + (CYC_PER_TICK - 1);
 	if (cyc <= MAX_CYC - adj) {
 		cyc += adj;
 	} else {
@@ -138,7 +138,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	cyc = (cyc / CYC_PER_TICK) * CYC_PER_TICK;
 	next = last_count + cyc;
 
-	if (((u32_t)next - (u32_t)curr) < MIN_DELAY) {
+	if (((uint32_t)next - (uint32_t)curr) < MIN_DELAY) {
 		next += CYC_PER_TICK;
 	}
 
@@ -147,19 +147,19 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = (count32() - (u32_t)last_count) / CYC_PER_TICK;
+	uint32_t ret = (count32() - (uint32_t)last_count) / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return count32();
 }
diff --git a/drivers/timer/cc13x2_cc26x2_rtc_timer.c b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
index e542a05253..78dbe2517f 100644
--- a/drivers/timer/cc13x2_cc26x2_rtc_timer.c
+++ b/drivers/timer/cc13x2_cc26x2_rtc_timer.c
@@ -52,18 +52,18 @@
 #define COMPARE_MARGIN 6
 
 /* RTC count of the last announce call, rounded down to tick boundary. */
-static volatile u64_t rtc_last;
+static volatile uint64_t rtc_last;
 
 #ifdef CONFIG_TICKLESS_KERNEL
 static struct k_spinlock lock;
 #else
-static u64_t nextThreshold = RTC_COUNTS_PER_TICK;
+static uint64_t nextThreshold = RTC_COUNTS_PER_TICK;
 #endif /* CONFIG_TICKLESS_KERNEL */
 
 
-static void setThreshold(u32_t next)
+static void setThreshold(uint32_t next)
 {
-	u32_t now;
+	uint32_t now;
 	unsigned int key;
 
 	key = irq_lock();
@@ -73,10 +73,10 @@ static void setThreshold(u32_t next)
 
 	/* if next is too soon, set at least one RTC tick in future */
 	/* assume next never be more than half the maximum 32 bit count value */
-	if ((next - now) > (u32_t)0x80000000) {
+	if ((next - now) > (uint32_t)0x80000000) {
 		/* now is past next */
 		next = now + COMPARE_MARGIN;
-	} else if ((now + COMPARE_MARGIN - next) < (u32_t)0x80000000) {
+	} else if ((now + COMPARE_MARGIN - next) < (uint32_t)0x80000000) {
 		if (next < now + COMPARE_MARGIN) {
 			next = now + COMPARE_MARGIN;
 		}
@@ -91,10 +91,10 @@ static void setThreshold(u32_t next)
 void rtc_isr(void *arg)
 {
 #ifndef CONFIG_TICKLESS_KERNEL
-	u64_t newThreshold;
-	u32_t next;
+	uint64_t newThreshold;
+	uint32_t next;
 #else
-	u64_t ticks, currCount;
+	uint64_t ticks, currCount;
 #endif
 
 	ARG_UNUSED(arg);
@@ -103,7 +103,7 @@ void rtc_isr(void *arg)
 
 #ifdef CONFIG_TICKLESS_KERNEL
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	currCount = (u64_t)AONRTCCurrent64BitValueGet();
+	currCount = (uint64_t)AONRTCCurrent64BitValueGet();
 	ticks = (currCount - rtc_last) / RTC_COUNTS_PER_TICK;
 
 	rtc_last += ticks * RTC_COUNTS_PER_TICK;
@@ -116,7 +116,7 @@ void rtc_isr(void *arg)
 	/* calculate new 64-bit RTC count for next interrupt */
 	newThreshold = nextThreshold + RTC_COUNTS_PER_TICK;
 
-	next = (u32_t)((u64_t)newThreshold >> 16);
+	next = (uint32_t)((uint64_t)newThreshold >> 16);
 	setThreshold(next);
 
 	nextThreshold = newThreshold;
@@ -145,8 +145,8 @@ static void initDevice(void)
 
 static void startDevice(void)
 {
-	u32_t compare;
-	u64_t period;
+	uint32_t compare;
+	uint64_t period;
 	unsigned int key;
 
 	key = irq_lock();
@@ -201,20 +201,20 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #ifdef CONFIG_TICKLESS_KERNEL
 
 	ticks = (ticks == K_TICKS_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t) MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t) MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	/* Compute number of RTC cycles until the next timeout. */
-	u64_t count = AONRTCCurrent64BitValueGet();
-	u64_t timeout = ticks * RTC_COUNTS_PER_TICK +
+	uint64_t count = AONRTCCurrent64BitValueGet();
+	uint64_t timeout = ticks * RTC_COUNTS_PER_TICK +
 		(count - rtc_last);
 
 	/* Round to the nearest tick boundary. */
@@ -230,15 +230,15 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif /* CONFIG_TICKLESS_KERNEL */
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
-	u32_t ret = (AONRTCCurrent64BitValueGet() - rtc_last) /
+	uint32_t ret = (AONRTCCurrent64BitValueGet() - rtc_last) /
 		RTC_COUNTS_PER_TICK;
 
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return (AONRTCCurrent64BitValueGet() / RTC_COUNTS_PER_CYCLE)
 		& 0xFFFFFFFF;
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index c52467ada4..cdb3f1e2b3 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -31,7 +31,7 @@
 
 static struct k_spinlock lock;
 
-static u32_t last_load;
+static uint32_t last_load;
 
 /*
  * This local variable holds the amount of SysTick HW cycles elapsed
@@ -43,13 +43,13 @@ static u32_t last_load;
  *
  * t = cycle_counter + elapsed();
  */
-static u32_t cycle_count;
+static uint32_t cycle_count;
 
 /*
  * This local variable holds the amount of elapsed SysTick HW cycles
  * that have been announced to the kernel.
  */
-static u32_t announced_cycles;
+static uint32_t announced_cycles;
 
 /*
  * This local variable holds the amount of elapsed HW cycles due to
@@ -60,7 +60,7 @@ static u32_t announced_cycles;
  * Each time cycle_count is updated with the value from overflow_cyc,
  * the overflow_cyc must be reset to zero.
  */
-static volatile u32_t overflow_cyc;
+static volatile uint32_t overflow_cyc;
 
 /* This internal function calculates the amount of HW cycles that have
  * elapsed since the last time the absolute HW cycles counter has been
@@ -80,11 +80,11 @@ static volatile u32_t overflow_cyc;
  *     - and until the current call of the function is completed.
  * - the function is invoked with interrupts disabled.
  */
-static u32_t elapsed(void)
+static uint32_t elapsed(void)
 {
-	u32_t val1 = SysTick->VAL;	/* A */
-	u32_t ctrl = SysTick->CTRL;	/* B */
-	u32_t val2 = SysTick->VAL;	/* C */
+	uint32_t val1 = SysTick->VAL;	/* A */
+	uint32_t ctrl = SysTick->CTRL;	/* B */
+	uint32_t val2 = SysTick->VAL;	/* C */
 
 	/* SysTick behavior: The counter wraps at zero automatically,
 	 * setting the COUNTFLAG field of the CTRL register when it
@@ -116,7 +116,7 @@ static u32_t elapsed(void)
 void z_clock_isr(void *arg)
 {
 	ARG_UNUSED(arg);
-	u32_t dticks;
+	uint32_t dticks;
 
 	/* Update overflow_cyc and clear COUNTFLAG by invoking elapsed() */
 	elapsed();
@@ -162,7 +162,7 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	/* Fast CPUs and a 24 bit counter mean that even idle systems
 	 * need to wake up multiple times per second.  If the kernel
@@ -178,21 +178,21 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 #if defined(CONFIG_TICKLESS_KERNEL)
-	u32_t delay;
+	uint32_t delay;
 
 	ticks = (ticks == K_TICKS_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
-	u32_t pending = elapsed();
+	uint32_t pending = elapsed();
 
 	cycle_count += pending;
 	overflow_cyc = 0U;
 
-	u32_t unannounced = cycle_count - announced_cycles;
+	uint32_t unannounced = cycle_count - announced_cycles;
 
-	if ((s32_t)unannounced < 0) {
+	if ((int32_t)unannounced < 0) {
 		/* We haven't announced for more than half the 32-bit
 		 * wrap duration, because new timeouts keep being set
 		 * before the existing one fires.  Force an announce
@@ -223,23 +223,23 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!TICKLESS) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t cyc = elapsed() + cycle_count - announced_cycles;
+	uint32_t cyc = elapsed() + cycle_count - announced_cycles;
 
 	k_spin_unlock(&lock, key);
 	return cyc / CYC_PER_TICK;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = elapsed() + cycle_count;
+	uint32_t ret = elapsed() + cycle_count;
 
 	k_spin_unlock(&lock, key);
 	return ret;
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index 792aa49659..494c790386 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -10,7 +10,7 @@
 #include <spinlock.h>
 #include <irq.h>
 
-#define HPET_REG32(off) (*(volatile u32_t *)(long)			\
+#define HPET_REG32(off) (*(volatile uint32_t *)(long)			\
 		       (DT_INST_REG_ADDR(0) + (off)))
 
 #define CLK_PERIOD_REG        HPET_REG32(0x04) /* High dword of caps reg */
@@ -47,7 +47,7 @@ static void hpet_isr(void *arg)
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
-	u32_t now = MAIN_COUNTER_REG;
+	uint32_t now = MAIN_COUNTER_REG;
 
 	if (IS_ENABLED(CONFIG_SMP) &&
 	    IS_ENABLED(CONFIG_QEMU_TARGET)) {
@@ -56,20 +56,20 @@ static void hpet_isr(void *arg)
 		 * on the other CPU, despite the HPET being
 		 * theoretically a global device.
 		 */
-		s32_t diff = (s32_t)(now - last_count);
+		int32_t diff = (int32_t)(now - last_count);
 
 		if (last_count && diff < 0) {
 			now = last_count;
 		}
 	}
-	u32_t dticks = (now - last_count) / cyc_per_tick;
+	uint32_t dticks = (now - last_count) / cyc_per_tick;
 
 	last_count += dticks * cyc_per_tick;
 
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
-		u32_t next = last_count + cyc_per_tick;
+		uint32_t next = last_count + cyc_per_tick;
 
-		if ((s32_t)(next - now) < MIN_DELAY) {
+		if ((int32_t)(next - now) < MIN_DELAY) {
 			next += cyc_per_tick;
 		}
 		TIMER0_COMPARATOR_REG = next;
@@ -87,7 +87,7 @@ static void hpet_isr(void *arg)
 static void set_timer0_irq(unsigned int irq)
 {
 	/* 5-bit IRQ field starting at bit 9 */
-	u32_t val = (TIMER0_CONF_REG & ~(0x1f << 9)) | ((irq & 0x1f) << 9);
+	uint32_t val = (TIMER0_CONF_REG & ~(0x1f << 9)) | ((irq & 0x1f) << 9);
 
 	TIMER0_CONF_REG = val;
 }
@@ -95,7 +95,7 @@ static void set_timer0_irq(unsigned int irq)
 int z_clock_driver_init(struct device *device)
 {
 	extern int z_clock_hw_cycles_per_sec;
-	u32_t hz;
+	uint32_t hz;
 
 	IRQ_CONNECT(DT_INST_IRQN(0),
 		    DT_INST_IRQ(0, priority),
@@ -104,7 +104,7 @@ int z_clock_driver_init(struct device *device)
 	irq_enable(DT_INST_IRQN(0));
 
 	/* CLK_PERIOD_REG is in femtoseconds (1e-15 sec) */
-	hz = (u32_t)(1000000000000000ull / CLK_PERIOD_REG);
+	hz = (uint32_t)(1000000000000000ull / CLK_PERIOD_REG);
 	z_clock_hw_cycles_per_sec = hz;
 	cyc_per_tick = hz / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
 
@@ -135,7 +135,7 @@ void smp_timer_init(void)
 	 */
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
@@ -146,11 +146,11 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 	ticks = ticks == K_TICKS_FOREVER ? max_ticks : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)max_ticks), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)max_ticks), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t now = MAIN_COUNTER_REG, cyc, adj;
-	u32_t max_cyc = max_ticks * cyc_per_tick;
+	uint32_t now = MAIN_COUNTER_REG, cyc, adj;
+	uint32_t max_cyc = max_ticks * cyc_per_tick;
 
 	/* Round up to next tick boundary. */
 	cyc = ticks * cyc_per_tick;
@@ -172,20 +172,20 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = (MAIN_COUNTER_REG - last_count) / cyc_per_tick;
+	uint32_t ret = (MAIN_COUNTER_REG - last_count) / cyc_per_tick;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return MAIN_COUNTER_REG;
 }
diff --git a/drivers/timer/legacy_api.h b/drivers/timer/legacy_api.h
index 8f0c42acda..07ed001c01 100644
--- a/drivers/timer/legacy_api.h
+++ b/drivers/timer/legacy_api.h
@@ -15,20 +15,20 @@
  */
 
 #ifdef CONFIG_TICKLESS_IDLE
-void z_timer_idle_enter(s32_t ticks);
+void z_timer_idle_enter(int32_t ticks);
 void z_clock_idle_exit(void);
 #endif
 
 #ifdef CONFIG_TICKLESS_KERNEL
-void z_set_time(u32_t time);
-extern u32_t z_get_program_time(void);
-extern u32_t z_get_remaining_program_time(void);
-extern u32_t z_get_elapsed_program_time(void);
+void z_set_time(uint32_t time);
+extern uint32_t z_get_program_time(void);
+extern uint32_t z_get_remaining_program_time(void);
+extern uint32_t z_get_elapsed_program_time(void);
 #endif
 
-extern u64_t z_clock_uptime(void);
+extern uint64_t z_clock_uptime(void);
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
 	if (idle) {
@@ -44,18 +44,18 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
  * call.  Implement the new call in terms of the old one on legacy
  * drivers by keeping (yet another) uptime value locally.
  */
-static u32_t driver_uptime;
+static uint32_t driver_uptime;
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
-	return (u32_t)(z_clock_uptime() - driver_uptime);
+	return (uint32_t)(z_clock_uptime() - driver_uptime);
 #else
 	return 0;
 #endif
 }
 
-static void wrapped_announce(s32_t ticks)
+static void wrapped_announce(int32_t ticks)
 {
 	driver_uptime += ticks;
 	z_clock_announce(ticks);
@@ -65,7 +65,7 @@ static void wrapped_announce(s32_t ticks)
 
 #define _sys_clock_always_on (0)
 
-static inline void z_tick_set(s64_t val)
+static inline void z_tick_set(int64_t val)
 {
 	/* noop with current kernel code, use z_clock_announce() */
 	ARG_UNUSED(val);
diff --git a/drivers/timer/litex_timer.c b/drivers/timer/litex_timer.c
index 262fe5fb77..e540c1dccb 100644
--- a/drivers/timer/litex_timer.c
+++ b/drivers/timer/litex_timer.c
@@ -39,14 +39,14 @@ static void litex_timer_irq_handler(void *device)
 	irq_unlock(key);
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	static struct k_spinlock lock;
-	u32_t timer_total;
+	uint32_t timer_total;
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	litex_write8(UPDATE_TOTAL, TIMER_TOTAL_UPDATE);
-	timer_total = (u32_t)litex_read64(TIMER_TOTAL);
+	timer_total = (uint32_t)litex_read64(TIMER_TOTAL);
 
 	k_spin_unlock(&lock, key);
 
@@ -54,7 +54,7 @@ u32_t z_timer_cycle_get_32(void)
 }
 
 /* tickless kernel is not supported */
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	return 0;
 }
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index bd3a11dde6..a4000dc4ac 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -90,16 +90,16 @@
 	} while (0)
 #endif /* !CONFIG_TICKLESS_IDLE */
 
-static s32_t _sys_idle_elapsed_ticks = 1;
+static int32_t _sys_idle_elapsed_ticks = 1;
 
 /* computed counter 0 initial count value */
-static u32_t __noinit cycles_per_tick;
+static uint32_t __noinit cycles_per_tick;
 
 #if defined(CONFIG_TICKLESS_IDLE)
-static u32_t programmed_cycles;
-static u32_t programmed_full_ticks;
-static u32_t __noinit max_system_ticks;
-static u32_t __noinit cycles_per_max_ticks;
+static uint32_t programmed_cycles;
+static uint32_t programmed_full_ticks;
+static uint32_t __noinit max_system_ticks;
+static uint32_t __noinit cycles_per_max_ticks;
 #ifndef CONFIG_TICKLESS_KERNEL
 static bool timer_known_to_have_expired;
 static unsigned char timer_mode = TIMER_MODE_PERIODIC;
@@ -107,9 +107,9 @@ static unsigned char timer_mode = TIMER_MODE_PERIODIC;
 #endif /* CONFIG_TICKLESS_IDLE */
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-static u32_t loapic_timer_device_power_state;
-static u32_t reg_timer_save;
-static u32_t reg_timer_cfg_save;
+static uint32_t loapic_timer_device_power_state;
+static uint32_t reg_timer_save;
+static uint32_t reg_timer_cfg_save;
 #endif
 
 /**
@@ -137,7 +137,7 @@ static inline void periodic_mode_set(void)
  * @param count Count from which timer is to count down
  * @return N/A
  */
-static inline void initial_count_register_set(u32_t count)
+static inline void initial_count_register_set(uint32_t count)
 {
 	x86_write_loapic(LOAPIC_TIMER_ICR, count);
 }
@@ -169,7 +169,7 @@ static inline void one_shot_mode_set(void)
  *
  * @return N/A
  */
-static inline u32_t current_count_register_get(void)
+static inline uint32_t current_count_register_get(void)
 {
 	return x86_read_loapic(LOAPIC_TIMER_CCR);
 }
@@ -184,7 +184,7 @@ static inline u32_t current_count_register_get(void)
  *
  * @return N/A
  */
-static inline u32_t initial_count_register_get(void)
+static inline uint32_t initial_count_register_get(void)
 {
 	return x86_read_loapic(LOAPIC_TIMER_ICR);
 }
@@ -215,7 +215,7 @@ void timer_int_handler(void *unused /* parameter is not used */
 		return;
 	}
 
-	u32_t cycles = current_count_register_get();
+	uint32_t cycles = current_count_register_get();
 
 	if ((cycles > 0) && (cycles < programmed_cycles)) {
 		/* stale interrupt */
@@ -242,7 +242,7 @@ void timer_int_handler(void *unused /* parameter is not used */
 #ifdef CONFIG_TICKLESS_IDLE
 	if (timer_mode == TIMER_MODE_ONE_SHOT) {
 		if (!timer_known_to_have_expired) {
-			u32_t  cycles;
+			uint32_t  cycles;
 
 			/*
 			 * The timer fired unexpectedly. This is due
@@ -287,12 +287,12 @@ void timer_int_handler(void *unused /* parameter is not used */
 }
 
 #ifdef CONFIG_TICKLESS_KERNEL
-u32_t z_get_program_time(void)
+uint32_t z_get_program_time(void)
 {
 	return programmed_full_ticks;
 }
 
-u32_t z_get_remaining_program_time(void)
+uint32_t z_get_remaining_program_time(void)
 {
 	if (programmed_full_ticks == 0U) {
 		return 0;
@@ -301,7 +301,7 @@ u32_t z_get_remaining_program_time(void)
 	return current_count_register_get() / cycles_per_tick;
 }
 
-u32_t z_get_elapsed_program_time(void)
+uint32_t z_get_elapsed_program_time(void)
 {
 	if (programmed_full_ticks == 0U) {
 		return 0;
@@ -311,7 +311,7 @@ u32_t z_get_elapsed_program_time(void)
 	    (current_count_register_get() / cycles_per_tick);
 }
 
-void z_set_time(u32_t time)
+void z_set_time(uint32_t time)
 {
 	if (!time) {
 		programmed_full_ticks = 0U;
@@ -334,9 +334,9 @@ void z_enable_sys_clock(void)
 	}
 }
 
-u64_t z_clock_uptime(void)
+uint64_t z_clock_uptime(void)
 {
-	u64_t elapsed;
+	uint64_t elapsed;
 
 	elapsed = z_tick_get();
 	if (programmed_cycles) {
@@ -386,7 +386,7 @@ static void tickless_idle_init(void)
  *
  * @return N/A
  */
-void z_timer_idle_enter(s32_t ticks /* system ticks */
+void z_timer_idle_enter(int32_t ticks /* system ticks */
 				)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
@@ -401,7 +401,7 @@ void z_timer_idle_enter(s32_t ticks /* system ticks */
 		initial_count_register_set(0); /* 0 disables timer */
 	}
 #else
-	u32_t  cycles;
+	uint32_t  cycles;
 
 	/*
 	 * Although interrupts are disabled, the LOAPIC timer is still counting
@@ -459,8 +459,8 @@ void z_clock_idle_exit(void)
 		program_max_cycles();
 	}
 #else
-	u32_t remaining_cycles;
-	u32_t remaining_full_ticks;
+	uint32_t remaining_cycles;
+	uint32_t remaining_full_ticks;
 
 	/*
 	 * Interrupts are locked and idling has ceased. The cause of the cessation
@@ -637,19 +637,19 @@ static int sys_clock_resume(struct device *dev)
 * Implements the driver control management functionality
 * the *context may include IN data or/and OUT data
 */
-int z_clock_device_ctrl(struct device *port, u32_t ctrl_command,
+int z_clock_device_ctrl(struct device *port, uint32_t ctrl_command,
 			  void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	if (ctrl_command == DEVICE_PM_SET_POWER_STATE) {
-		if (*((u32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_SUSPEND_STATE) {
 			ret = sys_clock_suspend(port);
-		} else if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = sys_clock_resume(port);
 		}
 	} else if (ctrl_command == DEVICE_PM_GET_POWER_STATE) {
-		*((u32_t *)context) = loapic_timer_device_power_state;
+		*((uint32_t *)context) = loapic_timer_device_power_state;
 	}
 
 	if (cb) {
@@ -670,15 +670,15 @@ int z_clock_device_ctrl(struct device *port, u32_t ctrl_command,
  *
  * @return up counter of elapsed clock cycles
  */
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 #if CONFIG_TSC_CYCLES_PER_SEC != 0
-	u64_t tsc;
+	uint64_t tsc;
 
 	/* 64-bit math to avoid overflows */
-	tsc = z_tsc_read() * (u64_t)sys_clock_hw_cycles_per_sec() /
-		(u64_t) CONFIG_TSC_CYCLES_PER_SEC;
-	return (u32_t)tsc;
+	tsc = z_tsc_read() * (uint64_t)sys_clock_hw_cycles_per_sec() /
+		(uint64_t) CONFIG_TSC_CYCLES_PER_SEC;
+	return (uint32_t)tsc;
 #else
 	/* TSC runs same as the bus speed, nothing to do but return the TSC
 	 * value
diff --git a/drivers/timer/mchp_xec_rtos_timer.c b/drivers/timer/mchp_xec_rtos_timer.c
index 216550c640..6f0cead760 100644
--- a/drivers/timer/mchp_xec_rtos_timer.c
+++ b/drivers/timer/mchp_xec_rtos_timer.c
@@ -76,10 +76,10 @@ BUILD_ASSERT(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 32768,
  */
 
 static struct k_spinlock lock;
-static u32_t total_cycles;
-static u32_t cached_icr = CYCLES_PER_TICK;
+static uint32_t total_cycles;
+static uint32_t cached_icr = CYCLES_PER_TICK;
 
-static void timer_restart(u32_t countdown)
+static void timer_restart(uint32_t countdown)
 {
 	TIMER_REGS->CTRL = 0U;
 	TIMER_REGS->CTRL = MCHP_RTMR_CTRL_BLK_EN;
@@ -99,9 +99,9 @@ static void timer_restart(u32_t countdown)
  * is 0 and the START bit is set then the timer has been started and is in the
  * process of moving the preload register value into the count register.
  */
-static inline u32_t timer_count(void)
+static inline uint32_t timer_count(void)
 {
-	u32_t ccr = TIMER_REGS->CNT;
+	uint32_t ccr = TIMER_REGS->CNT;
 
 	if ((ccr == 0) && (TIMER_REGS->CTRL & MCHP_RTMR_CTRL_START)) {
 		ccr = cached_icr;
@@ -112,7 +112,7 @@ static inline u32_t timer_count(void)
 
 #ifdef CONFIG_TICKLESS_KERNEL
 
-static u32_t last_announcement;	/* last time we called z_clock_announce() */
+static uint32_t last_announcement;	/* last time we called z_clock_announce() */
 
 /*
  * Request a timeout n Zephyr ticks in the future from now.
@@ -126,14 +126,14 @@ static u32_t last_announcement;	/* last time we called z_clock_announce() */
  * Writing a new value to preload only takes effect once the count
  * register reaches 0.
  */
-void z_clock_set_timeout(s32_t n, bool idle)
+void z_clock_set_timeout(int32_t n, bool idle)
 {
 	ARG_UNUSED(idle);
 
-	u32_t ccr, temp;
+	uint32_t ccr, temp;
 	int   full_ticks;	/* number of complete ticks we'll wait */
-	u32_t full_cycles;	/* full_ticks represented as cycles */
-	u32_t partial_cycles;	/* number of cycles to first tick boundary */
+	uint32_t full_cycles;	/* full_ticks represented as cycles */
+	uint32_t partial_cycles;	/* number of cycles to first tick boundary */
 
 	if (idle && (n == K_TICKS_FOREVER)) {
 		/*
@@ -185,25 +185,25 @@ void z_clock_set_timeout(s32_t n, bool idle)
 
 /*
  * Return the number of Zephyr ticks elapsed from last call to
- * z_clock_announce in the ISR. The caller casts u32_t to s32_t.
+ * z_clock_announce in the ISR. The caller casts uint32_t to int32_t.
  * We must make sure bit[31] is 0 in the return value.
  */
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
-	u32_t ccr;
-	u32_t ticks;
-	s32_t elapsed;
+	uint32_t ccr;
+	uint32_t ticks;
+	int32_t elapsed;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	ccr = timer_count();
 
 	/* It may not look efficient but the compiler does a good job */
-	elapsed = (s32_t)total_cycles - (s32_t)last_announcement;
+	elapsed = (int32_t)total_cycles - (int32_t)last_announcement;
 	if (elapsed < 0) {
 		elapsed = -1 * elapsed;
 	}
-	ticks = (u32_t)elapsed;
+	ticks = (uint32_t)elapsed;
 	ticks += cached_icr - ccr;
 	ticks /= CYCLES_PER_TICK;
 	ticks &= TIMER_COUNT_MASK;
@@ -222,8 +222,8 @@ static void xec_rtos_timer_isr(void *arg)
 	read_timer_start_of_tick_handler();
 #endif
 
-	u32_t cycles;
-	s32_t ticks;
+	uint32_t cycles;
+	int32_t ticks;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
@@ -271,7 +271,7 @@ static void xec_rtos_timer_isr(void *arg)
 	/* Restart the timer as early as possible to minimize drift... */
 	timer_restart(cached_icr);
 
-	u32_t temp = total_cycles + CYCLES_PER_TICK;
+	uint32_t temp = total_cycles + CYCLES_PER_TICK;
 
 	total_cycles = temp & TIMER_COUNT_MASK;
 	k_spin_unlock(&lock, key);
@@ -279,7 +279,7 @@ static void xec_rtos_timer_isr(void *arg)
 	z_clock_announce(1);
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	return 0U;
 }
@@ -293,13 +293,13 @@ u32_t z_clock_elapsed(void)
  *    The kernel is casting return to (int) and using it uncasted in math
  *    expressions with int types. Expression result is stored in an int.
  * 2. If CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT is not defined then
- *    z_impl_k_busy_wait calls here. This code path uses the value as u32_t.
+ *    z_impl_k_busy_wait calls here. This code path uses the value as uint32_t.
  *
  */
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
-	u32_t ret;
-	u32_t ccr;
+	uint32_t ret;
+	uint32_t ccr;
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
@@ -348,7 +348,7 @@ int z_clock_driver_init(struct device *device)
 	irq_enable(RTMR_IRQn);
 
 #ifdef CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT
-	u32_t btmr_ctrl = B32TMR0_REGS->CTRL = (MCHP_BTMR_CTRL_ENABLE
+	uint32_t btmr_ctrl = B32TMR0_REGS->CTRL = (MCHP_BTMR_CTRL_ENABLE
 			  | MCHP_BTMR_CTRL_AUTO_RESTART
 			  | MCHP_BTMR_CTRL_COUNT_UP
 			  | (47UL << MCHP_BTMR_CTRL_PRESCALE_POS));
@@ -381,16 +381,16 @@ int z_clock_driver_init(struct device *device)
  * 32-bit basic timer 0 configured for 1MHz count up, auto-reload,
  * and no interrupt generation.
  */
-void arch_busy_wait(u32_t usec_to_wait)
+void arch_busy_wait(uint32_t usec_to_wait)
 {
 	if (usec_to_wait == 0) {
 		return;
 	}
 
-	u32_t start = B32TMR0_REGS->CNT;
+	uint32_t start = B32TMR0_REGS->CNT;
 
 	for (;;) {
-		u32_t curr = B32TMR0_REGS->CNT;
+		uint32_t curr = B32TMR0_REGS->CNT;
 
 		if ((curr - start) >= usec_to_wait) {
 			break;
diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_posix_timer.c
index 7a966968ea..68fe023f32 100644
--- a/drivers/timer/native_posix_timer.c
+++ b/drivers/timer/native_posix_timer.c
@@ -19,15 +19,15 @@
 #include "soc.h"
 #include <arch/posix/posix_trace.h>
 
-static u64_t tick_period; /* System tick period in microseconds */
+static uint64_t tick_period; /* System tick period in microseconds */
 /* Time (microseconds since boot) of the last timer tick interrupt */
-static u64_t last_tick_time;
+static uint64_t last_tick_time;
 
 /**
  * Return the current HW cycle counter
  * (number of microseconds since boot in 32bits)
  */
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return hwm_get_time();
 }
@@ -40,8 +40,8 @@ static void np_timer_isr(void *arg)
 {
 	ARG_UNUSED(arg);
 
-	u64_t now = hwm_get_time();
-	s32_t elapsed_ticks = (now - last_tick_time)/tick_period;
+	uint64_t now = hwm_get_time();
+	int32_t elapsed_ticks = (now - last_tick_time)/tick_period;
 
 	last_tick_time += elapsed_ticks*tick_period;
 	z_clock_announce(elapsed_ticks);
@@ -80,12 +80,12 @@ int z_clock_driver_init(struct device *device)
  * @param idle Hint to the driver that the system is about to enter
  *        the idle state immediately after setting the timeout
  */
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #if defined(CONFIG_TICKLESS_KERNEL)
-	u64_t silent_ticks;
+	uint64_t silent_ticks;
 
 	/* Note that we treat INT_MAX literally as anyhow the maximum amount of
 	 * ticks we can report with z_clock_announce() is INT_MAX
@@ -109,7 +109,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
  * this with appropriate locking, the driver needs only provide an
  * instantaneous answer.
  */
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	return (hwm_get_time() - last_tick_time)/tick_period;
 }
@@ -134,9 +134,9 @@ u32_t z_clock_elapsed(void)
  * (*1) In reality simulated time is simply not advanced just due to the "MCU"
  * running. Meaning, the SW running on the MCU is assumed to take 0 time.
  */
-void arch_busy_wait(u32_t usec_to_wait)
+void arch_busy_wait(uint32_t usec_to_wait)
 {
-	u64_t time_end = hwm_get_time() + usec_to_wait;
+	uint64_t time_end = hwm_get_time() + usec_to_wait;
 
 	while (hwm_get_time() < time_end) {
 		/*
diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index a4e0829619..3d408c9ce3 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -26,19 +26,19 @@
 
 static struct k_spinlock lock;
 
-static u32_t last_count;
+static uint32_t last_count;
 
-static u32_t counter_sub(u32_t a, u32_t b)
+static uint32_t counter_sub(uint32_t a, uint32_t b)
 {
 	return (a - b) & COUNTER_MAX;
 }
 
-static void set_comparator(u32_t cyc)
+static void set_comparator(uint32_t cyc)
 {
 	nrf_rtc_cc_set(RTC, 0, cyc & COUNTER_MAX);
 }
 
-static u32_t get_comparator(void)
+static uint32_t get_comparator(void)
 {
 	return nrf_rtc_cc_get(RTC, 0);
 }
@@ -63,7 +63,7 @@ static void int_enable(void)
 	nrf_rtc_int_enable(RTC, NRF_RTC_INT_COMPARE0_MASK);
 }
 
-static u32_t counter(void)
+static uint32_t counter(void)
 {
 	return nrf_rtc_counter_get(RTC);
 }
@@ -71,8 +71,8 @@ static u32_t counter(void)
 /* Function ensures that previous CC value will not set event */
 static void prevent_false_prev_evt(void)
 {
-	u32_t now = counter();
-	u32_t prev_val;
+	uint32_t now = counter();
+	uint32_t prev_val;
 
 	/* First take care of a risk of an event coming from CC being set to
 	 * next tick. Reconfigure CC to future (now tick is the furtherest
@@ -100,7 +100,7 @@ static void prevent_false_prev_evt(void)
  * counter progresses during that time it means that 1 tick elapsed and
  * interrupt is set pending.
  */
-static void handle_next_tick_case(u32_t t)
+static void handle_next_tick_case(uint32_t t)
 {
 	set_comparator(t + 2);
 	while (t != counter()) {
@@ -116,10 +116,10 @@ static void handle_next_tick_case(u32_t t)
  * less than MAX_TICKS from now. It detects late setting and also handles
  * +1 tick case.
  */
-static void set_absolute_ticks(u32_t abs_val)
+static void set_absolute_ticks(uint32_t abs_val)
 {
-	u32_t diff;
-	u32_t t = counter();
+	uint32_t diff;
+	uint32_t t = counter();
 
 	diff = counter_sub(abs_val, t);
 	if (diff == 1) {
@@ -147,7 +147,7 @@ static void set_absolute_ticks(u32_t abs_val)
 /* Sets relative ticks alarm from any context. Function is lockless. It only
  * blocks RTC interrupt.
  */
-static void set_protected_absolute_ticks(u32_t ticks)
+static void set_protected_absolute_ticks(uint32_t ticks)
 {
 	int_disable();
 
@@ -171,8 +171,8 @@ void rtc_nrf_isr(void *arg)
 	ARG_UNUSED(arg);
 	event_clear();
 
-	u32_t t = get_comparator();
-	u32_t dticks = counter_sub(t, last_count) / CYC_PER_TICK;
+	uint32_t t = get_comparator();
+	uint32_t dticks = counter_sub(t, last_count) / CYC_PER_TICK;
 
 	last_count += dticks * CYC_PER_TICK;
 
@@ -218,19 +218,19 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
-	u32_t cyc;
+	uint32_t cyc;
 
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return;
 	}
 
 	ticks = (ticks == K_TICKS_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
-	u32_t unannounced = counter_sub(counter(), last_count);
+	uint32_t unannounced = counter_sub(counter(), last_count);
 
 	/* If we haven't announced for more than half the 24-bit wrap
 	 * duration, then force an announce to avoid loss of a wrap
@@ -259,23 +259,23 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	set_protected_absolute_ticks(cyc);
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = counter_sub(counter(), last_count) / CYC_PER_TICK;
+	uint32_t ret = counter_sub(counter(), last_count) / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = counter_sub(counter(), last_count) + last_count;
+	uint32_t ret = counter_sub(counter(), last_count) + last_count;
 
 	k_spin_unlock(&lock, key);
 	return ret;
diff --git a/drivers/timer/riscv_machine_timer.c b/drivers/timer/riscv_machine_timer.c
index e263bee6d4..cd0f10e736 100644
--- a/drivers/timer/riscv_machine_timer.c
+++ b/drivers/timer/riscv_machine_timer.c
@@ -8,8 +8,8 @@
 #include <spinlock.h>
 #include <soc.h>
 
-#define CYC_PER_TICK ((u32_t)((u64_t)sys_clock_hw_cycles_per_sec()	\
-			      / (u64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
+#define CYC_PER_TICK ((uint32_t)((uint64_t)sys_clock_hw_cycles_per_sec()	\
+			      / (uint64_t)CONFIG_SYS_CLOCK_TICKS_PER_SEC))
 #define MAX_CYC 0xffffffffu
 #define MAX_TICKS ((MAX_CYC - CYC_PER_TICK) / CYC_PER_TICK)
 #define MIN_DELAY 1000
@@ -17,14 +17,14 @@
 #define TICKLESS IS_ENABLED(CONFIG_TICKLESS_KERNEL)
 
 static struct k_spinlock lock;
-static u64_t last_count;
+static uint64_t last_count;
 
-static void set_mtimecmp(u64_t time)
+static void set_mtimecmp(uint64_t time)
 {
 #ifdef CONFIG_64BIT
-	*(volatile u64_t *)RISCV_MTIMECMP_BASE = time;
+	*(volatile uint64_t *)RISCV_MTIMECMP_BASE = time;
 #else
-	volatile u32_t *r = (u32_t *)RISCV_MTIMECMP_BASE;
+	volatile uint32_t *r = (uint32_t *)RISCV_MTIMECMP_BASE;
 
 	/* Per spec, the RISC-V MTIME/MTIMECMP registers are 64 bit,
 	 * but are NOT internally latched for multiword transfers.  So
@@ -33,18 +33,18 @@ static void set_mtimecmp(u64_t time)
 	 * value first.
 	 */
 	r[1] = 0xffffffff;
-	r[0] = (u32_t)time;
-	r[1] = (u32_t)(time >> 32);
+	r[0] = (uint32_t)time;
+	r[1] = (uint32_t)(time >> 32);
 #endif
 }
 
-static u64_t mtime(void)
+static uint64_t mtime(void)
 {
 #ifdef CONFIG_64BIT
-	return *(volatile u64_t *)RISCV_MTIME_BASE;
+	return *(volatile uint64_t *)RISCV_MTIME_BASE;
 #else
-	volatile u32_t *r = (u32_t *)RISCV_MTIME_BASE;
-	u32_t lo, hi;
+	volatile uint32_t *r = (uint32_t *)RISCV_MTIME_BASE;
+	uint32_t lo, hi;
 
 	/* Likewise, must guard against rollover when reading */
 	do {
@@ -52,7 +52,7 @@ static u64_t mtime(void)
 		lo = r[0];
 	} while (r[1] != hi);
 
-	return (((u64_t)hi) << 32) | lo;
+	return (((uint64_t)hi) << 32) | lo;
 #endif
 }
 
@@ -61,15 +61,15 @@ static void timer_isr(void *arg)
 	ARG_UNUSED(arg);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u64_t now = mtime();
-	u32_t dticks = (u32_t)((now - last_count) / CYC_PER_TICK);
+	uint64_t now = mtime();
+	uint32_t dticks = (uint32_t)((now - last_count) / CYC_PER_TICK);
 
 	last_count += dticks * CYC_PER_TICK;
 
 	if (!TICKLESS) {
-		u64_t next = last_count + CYC_PER_TICK;
+		uint64_t next = last_count + CYC_PER_TICK;
 
-		if ((s64_t)(next - now) < MIN_DELAY) {
+		if ((int64_t)(next - now) < MIN_DELAY) {
 			next += CYC_PER_TICK;
 		}
 		set_mtimecmp(next);
@@ -88,7 +88,7 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
@@ -104,14 +104,14 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 
 	ticks = ticks == K_TICKS_FOREVER ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u64_t now = mtime();
-	u32_t adj, cyc = ticks * CYC_PER_TICK;
+	uint64_t now = mtime();
+	uint32_t adj, cyc = ticks * CYC_PER_TICK;
 
 	/* Round up to next tick boundary. */
-	adj = (u32_t)(now - last_count) + (CYC_PER_TICK - 1);
+	adj = (uint32_t)(now - last_count) + (CYC_PER_TICK - 1);
 	if (cyc <= MAX_CYC - adj) {
 		cyc += adj;
 	} else {
@@ -119,7 +119,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	}
 	cyc = (cyc / CYC_PER_TICK) * CYC_PER_TICK;
 
-	if ((s32_t)(cyc + last_count - now) < MIN_DELAY) {
+	if ((int32_t)(cyc + last_count - now) < MIN_DELAY) {
 		cyc += CYC_PER_TICK;
 	}
 
@@ -128,20 +128,20 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = ((u32_t)mtime() - (u32_t)last_count) / CYC_PER_TICK;
+	uint32_t ret = ((uint32_t)mtime() - (uint32_t)last_count) / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
-	return (u32_t)mtime();
+	return (uint32_t)mtime();
 }
diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
index 6d6a36b0be..18c712525c 100644
--- a/drivers/timer/rv32m1_lptmr_timer.c
+++ b/drivers/timer/rv32m1_lptmr_timer.c
@@ -42,7 +42,7 @@
 
 struct device;	       /* forward declaration; type is not used. */
 
-static volatile u32_t cycle_count;
+static volatile uint32_t cycle_count;
 
 static void lptmr_irq_handler(struct device *unused)
 {
@@ -55,7 +55,7 @@ static void lptmr_irq_handler(struct device *unused)
 
 int z_clock_driver_init(struct device *unused)
 {
-	u32_t csr, psr, sircdiv; /* LPTMR registers */
+	uint32_t csr, psr, sircdiv; /* LPTMR registers */
 
 	ARG_UNUSED(unused);
 	IRQ_CONNECT(DT_INST_IRQN(0),
@@ -131,7 +131,7 @@ int z_clock_driver_init(struct device *unused)
 	return 0;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return cycle_count + SYSTEM_TIMER_INSTANCE->CNR;
 }
@@ -139,7 +139,7 @@ u32_t z_timer_cycle_get_32(void)
 /*
  * Since we're not tickless, this is identically zero.
  */
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	return 0;
 }
diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c
index fa3280701b..c6d2654204 100644
--- a/drivers/timer/sam0_rtc_timer.c
+++ b/drivers/timer/sam0_rtc_timer.c
@@ -67,15 +67,15 @@ BUILD_ASSERT(CYCLES_PER_TICK > 1,
 #define GCLK_EVAL(n) GCLK_CLKCTRL_GEN_GCLK##n
 
 /* Tick/cycle count of the last announce call. */
-static volatile u32_t rtc_last;
+static volatile uint32_t rtc_last;
 
 #ifndef CONFIG_TICKLESS_KERNEL
 
 /* Current tick count. */
-static volatile u32_t rtc_counter;
+static volatile uint32_t rtc_counter;
 
 /* Tick value of the next timeout. */
-static volatile u32_t rtc_timeout;
+static volatile uint32_t rtc_timeout;
 
 #endif /* CONFIG_TICKLESS_KERNEL */
 
@@ -99,7 +99,7 @@ static inline void rtc_sync(void)
  * then - when bus synchronization completes - the COUNT register is read and
  * returned.
  */
-static u32_t rtc_count(void)
+static uint32_t rtc_count(void)
 {
 #ifdef RTC_READREQ_RREQ
 	RTC0->READREQ.reg = RTC_READREQ_RREQ;
@@ -143,17 +143,17 @@ static void rtc_isr(void *arg)
 	ARG_UNUSED(arg);
 
 	/* Read and clear the interrupt flag register. */
-	u16_t status = RTC0->INTFLAG.reg;
+	uint16_t status = RTC0->INTFLAG.reg;
 
 	RTC0->INTFLAG.reg = status;
 
 #ifdef CONFIG_TICKLESS_KERNEL
 
 	/* Read the current counter and announce the elapsed time in ticks. */
-	u32_t count = rtc_count();
+	uint32_t count = rtc_count();
 
 	if (count != rtc_last) {
-		u32_t ticks = (count - rtc_last) / CYCLES_PER_TICK;
+		uint32_t ticks = (count - rtc_last) / CYCLES_PER_TICK;
 
 		z_clock_announce(ticks);
 		rtc_last += ticks * CYCLES_PER_TICK;
@@ -200,9 +200,9 @@ int z_clock_driver_init(struct device *device)
 
 	/* Configure RTC with 32-bit mode, configured prescaler and MATCHCLR. */
 #ifdef RTC_MODE0_CTRL_MODE
-	u16_t ctrl = RTC_MODE0_CTRL_MODE(0) | RTC_MODE0_CTRL_PRESCALER(0);
+	uint16_t ctrl = RTC_MODE0_CTRL_MODE(0) | RTC_MODE0_CTRL_PRESCALER(0);
 #else
-	u16_t ctrl = RTC_MODE0_CTRLA_MODE(0) | RTC_MODE0_CTRLA_PRESCALER(0);
+	uint16_t ctrl = RTC_MODE0_CTRLA_MODE(0) | RTC_MODE0_CTRLA_PRESCALER(0);
 #endif
 
 #ifndef CONFIG_TICKLESS_KERNEL
@@ -248,18 +248,18 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #ifdef CONFIG_TICKLESS_KERNEL
 
 	ticks = (ticks == K_FOREVER) ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t) MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t) MAX_TICKS), 0);
 
 	/* Compute number of RTC cycles until the next timeout. */
-	u32_t count = rtc_count();
-	u32_t timeout = ticks * CYCLES_PER_TICK + count % CYCLES_PER_TICK;
+	uint32_t count = rtc_count();
+	uint32_t timeout = ticks * CYCLES_PER_TICK + count % CYCLES_PER_TICK;
 
 	/* Round to the nearest tick boundary. */
 	timeout = (timeout + CYCLES_PER_TICK - 1) / CYCLES_PER_TICK
@@ -297,7 +297,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif /* CONFIG_TICKLESS_KERNEL */
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
 	return (rtc_count() - rtc_last) / CYCLES_PER_TICK;
@@ -306,7 +306,7 @@ u32_t z_clock_elapsed(void)
 #endif
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	/* Just return the absolute value of RTC cycle counter. */
 	return rtc_count();
diff --git a/drivers/timer/stm32_lptim_timer.c b/drivers/timer/stm32_lptim_timer.c
index 56372996b2..17cb7735e7 100644
--- a/drivers/timer/stm32_lptim_timer.c
+++ b/drivers/timer/stm32_lptim_timer.c
@@ -36,7 +36,7 @@
 /* A 32bit value cannot exceed 0xFFFFFFFF/LPTIM_TIMEBASE counting cycles.
  * This is for example about of 65000 x 2000ms when clocked by LSI
  */
-static u32_t accumulated_lptim_cnt;
+static uint32_t accumulated_lptim_cnt;
 
 static struct k_spinlock lock;
 
@@ -57,14 +57,14 @@ static void lptim_irq_handler(struct device *unused)
 		 * used in the z_timer_cycle_get_32() function.
 		 * Reading the CNT register gives a reliable value
 		 */
-		u32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1) + 1;
+		uint32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1) + 1;
 
 		accumulated_lptim_cnt += autoreload;
 
 		k_spin_unlock(&lock, key);
 
 		/* announce the elapsed time in ms (count register is 16bit) */
-		u32_t dticks = (autoreload
+		uint32_t dticks = (autoreload
 				* CONFIG_SYS_CLOCK_TICKS_PER_SEC)
 				/ LPTIM_CLOCK;
 
@@ -166,10 +166,10 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	/* new LPTIM1 AutoReload value to set (aligned on Kernel ticks) */
-	u32_t next_arr = 0;
+	uint32_t next_arr = 0;
 
 	ARG_UNUSED(idle);
 
@@ -189,13 +189,13 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	 * treated identically: it simply indicates the kernel would like the
 	 * next tick announcement as soon as possible.
 	 */
-	ticks = MAX(MIN(ticks - 1, (s32_t)LPTIM_TIMEBASE), 1);
+	ticks = MAX(MIN(ticks - 1, (int32_t)LPTIM_TIMEBASE), 1);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
 	/* read current counter value (cannot exceed 16bit) */
 
-	volatile u32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
+	volatile uint32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
 
 	/* It should be noted that to read reliably the content
 	 * of the LPTIM_CNT register, two successive read accesses
@@ -206,7 +206,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 		lp_time = LL_LPTIM_GetCounter(LPTIM1);
 	}
 
-	u32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1);
+	uint32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1);
 
 	if (LL_LPTIM_IsActiveFlag_ARRM(LPTIM1)
 	    || ((autoreload - lp_time) < LPTIM_GUARD_VALUE)) {
@@ -225,7 +225,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 			/ LPTIM_CLOCK) + 1) * LPTIM_CLOCK
 			/ (CONFIG_SYS_CLOCK_TICKS_PER_SEC);
 	/* add count unit from the expected nb of Ticks */
-	next_arr = next_arr + ((u32_t)(ticks) * LPTIM_CLOCK)
+	next_arr = next_arr + ((uint32_t)(ticks) * LPTIM_CLOCK)
 			/ CONFIG_SYS_CLOCK_TICKS_PER_SEC - 1;
 
 	/* maximise to TIMEBASE */
@@ -251,7 +251,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	k_spin_unlock(&lock, key);
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
@@ -259,7 +259,7 @@ u32_t z_clock_elapsed(void)
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
-	volatile u32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
+	volatile uint32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
 
 	/* It should be noted that to read reliably the content
 	 * of the LPTIM_CNT register, two successive read accesses
@@ -283,18 +283,18 @@ u32_t z_clock_elapsed(void)
 	/* gives the value of LPTIM1 counter (ms)
 	 * since the previous 'announce'
 	 */
-	u64_t ret = (lp_time * CONFIG_SYS_CLOCK_TICKS_PER_SEC) / LPTIM_CLOCK;
+	uint64_t ret = (lp_time * CONFIG_SYS_CLOCK_TICKS_PER_SEC) / LPTIM_CLOCK;
 
-	return (u32_t)(ret);
+	return (uint32_t)(ret);
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	/* just gives the accumulated count in a number of hw cycles */
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
 
-	volatile u32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
+	volatile uint32_t lp_time = LL_LPTIM_GetCounter(LPTIM1);
 
 	/* It should be noted that to read reliably the content
 	 * of the LPTIM_CNT register, two successive read accesses
@@ -315,10 +315,10 @@ u32_t z_timer_cycle_get_32(void)
 	lp_time += accumulated_lptim_cnt;
 
 	/* convert lptim count in a nb of hw cycles with precision */
-	u64_t ret = lp_time * (sys_clock_hw_cycles_per_sec() / LPTIM_CLOCK);
+	uint64_t ret = lp_time * (sys_clock_hw_cycles_per_sec() / LPTIM_CLOCK);
 
 	k_spin_unlock(&lock, key);
 
 	/* convert in hw cycles (keeping 32bit value) */
-	return (u32_t)(ret);
+	return (uint32_t)(ret);
 }
diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c
index ffc1aa537a..63fd51affe 100644
--- a/drivers/timer/sys_clock_init.c
+++ b/drivers/timer/sys_clock_init.c
@@ -28,13 +28,13 @@ int __weak z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-int __weak z_clock_device_ctrl(struct device *device, u32_t ctrl_command,
+int __weak z_clock_device_ctrl(struct device *device, uint32_t ctrl_command,
 			       void *context, device_pm_cb cb, void *arg)
 {
 	return -ENOTSUP;
 }
 
-void __weak z_clock_set_timeout(s32_t ticks, bool idle)
+void __weak z_clock_set_timeout(int32_t ticks, bool idle)
 {
 }
 
diff --git a/drivers/timer/xlnx_psttc_timer.c b/drivers/timer/xlnx_psttc_timer.c
index ebb2e95cb4..068ee69fb8 100644
--- a/drivers/timer/xlnx_psttc_timer.c
+++ b/drivers/timer/xlnx_psttc_timer.c
@@ -43,18 +43,18 @@ BUILD_ASSERT((CYCLES_PER_SEC % TICKS_PER_SEC) == 0,
 	     "frequency");
 
 #ifdef CONFIG_TICKLESS_KERNEL
-static u32_t last_cycles;
+static uint32_t last_cycles;
 #endif
 
-static u32_t read_count(void)
+static uint32_t read_count(void)
 {
 	/* Read current counter value */
 	return sys_read32(TIMER_BASE_ADDR + XTTCPS_COUNT_VALUE_OFFSET);
 }
 
-static void update_match(u32_t cycles, u32_t match)
+static void update_match(uint32_t cycles, uint32_t match)
 {
-	u32_t delta = match - cycles;
+	uint32_t delta = match - cycles;
 
 	/* Ensure that the match value meets the minimum timing requirements */
 	if (delta < CYCLES_NEXT_MIN) {
@@ -67,8 +67,8 @@ static void update_match(u32_t cycles, u32_t match)
 
 static void ttc_isr(void *arg)
 {
-	u32_t cycles;
-	u32_t ticks;
+	uint32_t cycles;
+	uint32_t ticks;
 
 	ARG_UNUSED(arg);
 
@@ -98,7 +98,7 @@ static void ttc_isr(void *arg)
 
 int z_clock_driver_init(struct device *device)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 	/* Stop timer */
 	sys_write32(XTTCPS_CNT_CNTRL_DIS_MASK,
@@ -152,11 +152,11 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
-	u32_t cycles;
-	u32_t next_cycles;
+	uint32_t cycles;
+	uint32_t next_cycles;
 
 	/* Read counter value */
 	cycles = read_count();
@@ -165,7 +165,7 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 	if (ticks == K_TICKS_FOREVER) {
 		next_cycles = cycles + CYCLES_NEXT_MAX;
 	} else {
-		next_cycles = cycles + ((u32_t)ticks * CYCLES_PER_TICK);
+		next_cycles = cycles + ((uint32_t)ticks * CYCLES_PER_TICK);
 	}
 
 	/* Set match value for the next interrupt */
@@ -173,10 +173,10 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
-	u32_t cycles;
+	uint32_t cycles;
 
 	/* Read counter value */
 	cycles = read_count();
@@ -189,7 +189,7 @@ u32_t z_clock_elapsed(void)
 #endif
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	/* Return the current counter value */
 	return read_count();
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index c4e33c5367..41f52156ba 100644
--- a/drivers/timer/xtensa_sys_timer.c
+++ b/drivers/timer/xtensa_sys_timer.c
@@ -20,15 +20,15 @@
 static struct k_spinlock lock;
 static unsigned int last_count;
 
-static void set_ccompare(u32_t val)
+static void set_ccompare(uint32_t val)
 {
 	__asm__ volatile ("wsr.CCOMPARE" STRINGIFY(CONFIG_XTENSA_TIMER_ID) " %0"
 			  :: "r"(val));
 }
 
-static u32_t ccount(void)
+static uint32_t ccount(void)
 {
-	u32_t val;
+	uint32_t val;
 
 	__asm__ volatile ("rsr.CCOUNT %0" : "=r"(val));
 	return val;
@@ -39,15 +39,15 @@ static void ccompare_isr(void *arg)
 	ARG_UNUSED(arg);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t curr = ccount();
-	u32_t dticks = (curr - last_count) / CYC_PER_TICK;
+	uint32_t curr = ccount();
+	uint32_t dticks = (curr - last_count) / CYC_PER_TICK;
 
 	last_count += dticks * CYC_PER_TICK;
 
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
-		u32_t next = last_count + CYC_PER_TICK;
+		uint32_t next = last_count + CYC_PER_TICK;
 
-		if ((s32_t)(next - curr) < MIN_DELAY) {
+		if ((int32_t)(next - curr) < MIN_DELAY) {
 			next += CYC_PER_TICK;
 		}
 		set_ccompare(next);
@@ -65,16 +65,16 @@ int z_clock_driver_init(struct device *device)
 	return 0;
 }
 
-void z_clock_set_timeout(s32_t ticks, bool idle)
+void z_clock_set_timeout(int32_t ticks, bool idle)
 {
 	ARG_UNUSED(idle);
 
 #if defined(CONFIG_TICKLESS_KERNEL)
 	ticks = ticks == K_TICKS_FOREVER ? MAX_TICKS : ticks;
-	ticks = MAX(MIN(ticks - 1, (s32_t)MAX_TICKS), 0);
+	ticks = MAX(MIN(ticks - 1, (int32_t)MAX_TICKS), 0);
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t curr = ccount(), cyc, adj;
+	uint32_t curr = ccount(), cyc, adj;
 
 	/* Round up to next tick boundary */
 	cyc = ticks * CYC_PER_TICK;
@@ -96,20 +96,20 @@ void z_clock_set_timeout(s32_t ticks, bool idle)
 #endif
 }
 
-u32_t z_clock_elapsed(void)
+uint32_t z_clock_elapsed(void)
 {
 	if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
 		return 0;
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t ret = (ccount() - last_count) / CYC_PER_TICK;
+	uint32_t ret = (ccount() - last_count) / CYC_PER_TICK;
 
 	k_spin_unlock(&lock, key);
 	return ret;
 }
 
-u32_t z_timer_cycle_get_32(void)
+uint32_t z_timer_cycle_get_32(void)
 {
 	return ccount();
 }
diff --git a/drivers/usb/device/usb_dc_dw.c b/drivers/usb/device/usb_dc_dw.c
index 03f184f12d..8a7ec16731 100644
--- a/drivers/usb/device/usb_dc_dw.c
+++ b/drivers/usb/device/usb_dc_dw.c
@@ -41,12 +41,12 @@ LOG_MODULE_REGISTER(usb_dc_dw);
  * USB endpoint private structure.
  */
 struct usb_ep_ctrl_prv {
-	u8_t ep_ena;
-	u8_t fifo_num;
-	u32_t fifo_size;
-	u16_t mps;         /* Max ep pkt size */
+	uint8_t ep_ena;
+	uint8_t fifo_num;
+	uint32_t fifo_size;
+	uint16_t mps;         /* Max ep pkt size */
 	usb_dc_ep_callback cb;/* Endpoint callback function */
-	u32_t data_len;
+	uint32_t data_len;
 };
 
 /*
@@ -57,7 +57,7 @@ struct usb_dw_ctrl_prv {
 	struct usb_ep_ctrl_prv in_ep_ctrl[USB_DW_IN_EP_NUM];
 	struct usb_ep_ctrl_prv out_ep_ctrl[USB_DW_OUT_EP_NUM];
 	int n_tx_fifos;
-	u8_t attached;
+	uint8_t attached;
 };
 
 
@@ -65,7 +65,7 @@ static struct usb_dw_ctrl_prv usb_dw_ctrl;
 
 static void usb_dw_reg_dump(void)
 {
-	u8_t i;
+	uint8_t i;
 
 	LOG_DBG("USB registers:  GOTGCTL : 0x%x  GOTGINT : 0x%x  GAHBCFG : "
 		"0x%x", USB_DW->gotgctl, USB_DW->gotgint, USB_DW->gahbcfg);
@@ -95,9 +95,9 @@ static void usb_dw_reg_dump(void)
 	}
 }
 
-static u8_t usb_dw_ep_is_valid(u8_t ep)
+static uint8_t usb_dw_ep_is_valid(uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	/* Check if ep enabled */
 	if ((USB_DW_EP_ADDR2DIR(ep) == USB_EP_DIR_OUT) &&
@@ -111,9 +111,9 @@ static u8_t usb_dw_ep_is_valid(u8_t ep)
 	return 0;
 }
 
-static u8_t usb_dw_ep_is_enabled(u8_t ep)
+static uint8_t usb_dw_ep_is_enabled(uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	/* Check if ep enabled */
 	if ((USB_DW_EP_ADDR2DIR(ep) == USB_EP_DIR_OUT) &&
@@ -127,14 +127,14 @@ static u8_t usb_dw_ep_is_enabled(u8_t ep)
 	return 0;
 }
 
-static inline void usb_dw_udelay(u32_t us)
+static inline void usb_dw_udelay(uint32_t us)
 {
 	k_busy_wait(us);
 }
 
 static int usb_dw_reset(void)
 {
-	u32_t cnt = 0U;
+	uint32_t cnt = 0U;
 
 	/* Wait for AHB master idle state. */
 	while (!(USB_DW->grstctl & USB_DW_GRSTCTL_AHB_IDLE)) {
@@ -187,11 +187,11 @@ static int usb_dw_tx_fifo_avail(int ep)
 }
 
 /* Choose a FIFO number for an IN endpoint */
-static int usb_dw_set_fifo(u8_t ep)
+static int usb_dw_set_fifo(uint8_t ep)
 {
 	int ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	volatile u32_t *reg = &USB_DW->in_ep_reg[ep_idx].diepctl;
-	u32_t val;
+	volatile uint32_t *reg = &USB_DW->in_ep_reg[ep_idx].diepctl;
+	uint32_t val;
 	int fifo = 0;
 	int ded_fifo = !!(USB_DW->ghwcfg4 & USB_DW_HWCFG4_DEDFIFOMODE);
 
@@ -234,11 +234,11 @@ static int usb_dw_set_fifo(u8_t ep)
 	return 0;
 }
 
-static int usb_dw_ep_set(u8_t ep,
-			 u32_t ep_mps, enum usb_dc_ep_transfer_type ep_type)
+static int usb_dw_ep_set(uint8_t ep,
+			 uint32_t ep_mps, enum usb_dc_ep_transfer_type ep_type)
 {
-	volatile u32_t *p_depctl;
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	volatile uint32_t *p_depctl;
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	LOG_DBG("%s ep %x, mps %d, type %d", __func__, ep, ep_mps, ep_type);
 
@@ -320,10 +320,10 @@ static int usb_dw_ep_set(u8_t ep,
 	return 0;
 }
 
-static void usb_dw_prep_rx(const u8_t ep, u8_t setup)
+static void usb_dw_prep_rx(const uint8_t ep, uint8_t setup)
 {
 	enum usb_dw_out_ep_idx ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	u32_t ep_mps = usb_dw_ctrl.out_ep_ctrl[ep_idx].mps;
+	uint32_t ep_mps = usb_dw_ctrl.out_ep_ctrl[ep_idx].mps;
 
 	/* Set max RX size to EP mps so we get an interrupt
 	 * each time a packet is received
@@ -343,14 +343,14 @@ static void usb_dw_prep_rx(const u8_t ep, u8_t setup)
 	LOG_DBG("USB OUT EP%d armed", ep_idx);
 }
 
-static int usb_dw_tx(u8_t ep, const u8_t *const data,
-		u32_t data_len)
+static int usb_dw_tx(uint8_t ep, const uint8_t *const data,
+		uint32_t data_len)
 {
 	enum usb_dw_in_ep_idx ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	u32_t max_xfer_size, max_pkt_cnt, pkt_cnt, avail_space;
-	u32_t ep_mps = usb_dw_ctrl.in_ep_ctrl[ep_idx].mps;
+	uint32_t max_xfer_size, max_pkt_cnt, pkt_cnt, avail_space;
+	uint32_t ep_mps = usb_dw_ctrl.in_ep_ctrl[ep_idx].mps;
 	unsigned int key;
-	u32_t i;
+	uint32_t i;
 
 	/* Wait for FIFO space available */
 	do {
@@ -443,16 +443,16 @@ static int usb_dw_tx(u8_t ep, const u8_t *const data,
 	 * before accessing the register."
 	 */
 	for (i = 0U; i < data_len; i += 4U) {
-		u32_t val = data[i];
+		uint32_t val = data[i];
 
 		if (i + 1 < data_len) {
-			val |= ((u32_t)data[i+1]) << 8;
+			val |= ((uint32_t)data[i+1]) << 8;
 		}
 		if (i + 2 < data_len) {
-			val |= ((u32_t)data[i+2]) << 16;
+			val |= ((uint32_t)data[i+2]) << 16;
 		}
 		if (i + 3 < data_len) {
-			val |= ((u32_t)data[i+3]) << 24;
+			val |= ((uint32_t)data[i+3]) << 24;
 		}
 
 		USB_DW_EP_FIFO(ep_idx) = val;
@@ -467,7 +467,7 @@ static int usb_dw_tx(u8_t ep, const u8_t *const data,
 
 static int usb_dw_init(void)
 {
-	u8_t ep;
+	uint8_t ep;
 	int ret;
 
 	ret = usb_dw_reset();
@@ -531,7 +531,7 @@ static void usb_dw_handle_reset(void)
 
 static void usb_dw_handle_enum_done(void)
 {
-	u32_t speed;
+	uint32_t speed;
 
 	speed = (USB_DW->dsts & ~USB_DW_DSTS_ENUM_SPD_MASK) >>
 	    USB_DW_DSTS_ENUM_SPD_OFFSET;
@@ -548,9 +548,9 @@ static void usb_dw_handle_enum_done(void)
 /* USB ISR handler */
 static inline void usb_dw_int_rx_flvl_handler(void)
 {
-	u32_t grxstsp = USB_DW->grxstsp;
-	u32_t status, xfer_size;
-	u8_t ep_idx;
+	uint32_t grxstsp = USB_DW->grxstsp;
+	uint32_t status, xfer_size;
+	uint8_t ep_idx;
 	usb_dc_ep_callback ep_cb;
 
 	/* Packet in RX FIFO */
@@ -593,8 +593,8 @@ static inline void usb_dw_int_rx_flvl_handler(void)
 
 static inline void usb_dw_int_iep_handler(void)
 {
-	u32_t ep_int_status;
-	u8_t ep_idx;
+	uint32_t ep_int_status;
+	uint8_t ep_idx;
 	usb_dc_ep_callback ep_cb;
 
 	for (ep_idx = 0U; ep_idx < USB_DW_IN_EP_NUM; ep_idx++) {
@@ -626,8 +626,8 @@ static inline void usb_dw_int_iep_handler(void)
 
 static inline void usb_dw_int_oep_handler(void)
 {
-	u32_t ep_int_status;
-	u8_t ep_idx;
+	uint32_t ep_int_status;
+	uint8_t ep_idx;
 
 	for (ep_idx = 0U; ep_idx < USB_DW_OUT_EP_NUM; ep_idx++) {
 		if (USB_DW->daint & USB_DW_DAINT_OUT_EP_INT(ep_idx)) {
@@ -649,7 +649,7 @@ static inline void usb_dw_int_oep_handler(void)
 
 static void usb_dw_isr_handler(void *unused)
 {
-	u32_t int_status;
+	uint32_t int_status;
 
 	ARG_UNUSED(unused);
 
@@ -764,7 +764,7 @@ int usb_dc_reset(void)
 	return ret;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	if (addr > (USB_DW_DCFG_DEV_ADDR_MASK >> USB_DW_DCFG_DEV_ADDR_OFFSET)) {
 		return -EINVAL;
@@ -778,7 +778,7 @@ int usb_dc_set_address(const u8_t addr)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(cfg->ep_addr);
 
 	LOG_DBG("ep %x, mps %d, type %d", cfg->ep_addr, cfg->ep_mps,
 		cfg->ep_type);
@@ -810,7 +810,7 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const ep_cfg)
 {
-	u8_t ep;
+	uint8_t ep;
 
 	if (!ep_cfg) {
 		return -EINVAL;
@@ -828,9 +828,9 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const ep_cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -846,9 +846,9 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -869,10 +869,10 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	volatile u32_t *p_depctl;
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	volatile uint32_t *p_depctl;
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -900,9 +900,9 @@ int usb_dc_ep_halt(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -927,9 +927,9 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 	return 0;
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -961,9 +961,9 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -998,10 +998,10 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	u32_t cnt;
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint32_t cnt;
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -1030,8 +1030,8 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t * const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t * const ret_bytes)
 {
 	int ret;
 
@@ -1062,11 +1062,11 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
-	u32_t i, j, data_len, bytes_to_copy;
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint32_t i, j, data_len, bytes_to_copy;
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -1116,11 +1116,11 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 
 	/* Data in the FIFOs is always stored per 32-bit words */
 	for (i = 0U; i < (bytes_to_copy & ~0x3); i += 4U) {
-		*(u32_t *)(data + i) = USB_DW_EP_FIFO(ep_idx);
+		*(uint32_t *)(data + i) = USB_DW_EP_FIFO(ep_idx);
 	}
 	if (bytes_to_copy & 0x3) {
 		/* Not multiple of 4 */
-		u32_t last_dw = USB_DW_EP_FIFO(ep_idx);
+		uint32_t last_dw = USB_DW_EP_FIFO(ep_idx);
 
 		for (j = 0U; j < (bytes_to_copy & 0x3); j++) {
 			*(data + i + j) =
@@ -1138,9 +1138,9 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -1160,8 +1160,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		const u32_t max_data_len, u32_t * const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		const uint32_t max_data_len, uint32_t * const read_bytes)
 {
 	if (usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes) != 0) {
 		return -EINVAL;
@@ -1181,9 +1181,9 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
-	u8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
 	if (!usb_dw_ctrl.attached || !usb_dw_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -1204,7 +1204,7 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	usb_dw_ctrl.status_cb = cb;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
 	enum usb_dw_out_ep_idx ep_idx = USB_DW_EP_ADDR2IDX(ep);
 
diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c
index ec954e7e6e..e43ea4c8f8 100644
--- a/drivers/usb/device/usb_dc_kinetis.c
+++ b/drivers/usb/device/usb_dc_kinetis.c
@@ -49,26 +49,26 @@ LOG_MODULE_REGISTER(usb_dc_kinetis);
  */
 struct buf_descriptor {
 	union {
-		u32_t bd_fields;
+		uint32_t bd_fields;
 
 		struct {
-			u32_t reserved_1_0 : 2;
-			u32_t tok_pid : 4;
-			u32_t data01 : 1;
-			u32_t own : 1;
-			u32_t reserved_15_8 : 8;
-			u32_t bc : 16;
+			uint32_t reserved_1_0 : 2;
+			uint32_t tok_pid : 4;
+			uint32_t data01 : 1;
+			uint32_t own : 1;
+			uint32_t reserved_15_8 : 8;
+			uint32_t bc : 16;
 		} get __packed;
 
 		struct {
-			u32_t reserved_1_0 : 2;
-			u32_t bd_ctrl : 6;
-			u32_t reserved_15_8 : 8;
-			u32_t bc : 16;
+			uint32_t reserved_1_0 : 2;
+			uint32_t bd_ctrl : 6;
+			uint32_t reserved_15_8 : 8;
+			uint32_t bc : 16;
 		} set __packed;
 
 	} __packed;
-	u32_t   buf_addr;
+	uint32_t   buf_addr;
 } __packed;
 
 /*
@@ -87,17 +87,17 @@ K_MEM_POOL_DEFINE(ep_buf_pool, 16, 512, EP_BUF_NUMOF_BLOCKS, 4);
 
 struct usb_ep_ctrl_data {
 	struct ep_status {
-		u16_t in_enabled : 1;
-		u16_t out_enabled : 1;
-		u16_t in_data1 : 1;
-		u16_t out_data1 : 1;
-		u16_t in_odd : 1;
-		u16_t out_odd : 1;
-		u16_t in_stalled : 1;
-		u16_t out_stalled : 1;
+		uint16_t in_enabled : 1;
+		uint16_t out_enabled : 1;
+		uint16_t in_data1 : 1;
+		uint16_t out_data1 : 1;
+		uint16_t in_odd : 1;
+		uint16_t out_odd : 1;
+		uint16_t in_stalled : 1;
+		uint16_t out_stalled : 1;
 	} status;
-	u16_t mps_in;
-	u16_t mps_out;
+	uint16_t mps_in;
+	uint16_t mps_out;
 	struct k_mem_block mblock_in;
 	struct k_mem_block mblock_out;
 	usb_dc_ep_callback cb_in;
@@ -108,8 +108,8 @@ struct usb_ep_ctrl_data {
 
 struct usb_device_data {
 	usb_dc_status_callback status_cb;
-	u8_t address;
-	u32_t bd_active;
+	uint8_t address;
+	uint32_t bd_active;
 	struct usb_ep_ctrl_data ep_ctrl[NUM_OF_EP_MAX];
 	bool attached;
 
@@ -123,9 +123,9 @@ static struct usb_device_data dev_data;
 #define USB_DC_CB_TYPE_EP		1
 
 struct cb_msg {
-	u8_t ep;
-	u8_t type;
-	u32_t cb;
+	uint8_t ep;
+	uint8_t type;
+	uint32_t cb;
 };
 
 K_MSGQ_DEFINE(usb_dc_msgq, sizeof(struct cb_msg), 10, 4);
@@ -136,7 +136,7 @@ static void usb_kinetis_thread_main(void *arg1, void *unused1, void *unused2);
  * This function returns the BD element index based on
  * endpoint address and the odd bit.
  */
-static inline u8_t get_bdt_idx(u8_t ep, u8_t odd)
+static inline uint8_t get_bdt_idx(uint8_t ep, uint8_t odd)
 {
 	if (ep & USB_EP_DIR_IN) {
 		return ((((KINETIS_ADDR2IDX(ep)) * 4) + 2  + (odd & 1)));
@@ -161,9 +161,9 @@ static int kinetis_usb_init(void)
 		return -1;
 	}
 
-	USB0->BDTPAGE1 = (u8_t)(((u32_t)bdt) >> 8);
-	USB0->BDTPAGE2 = (u8_t)(((u32_t)bdt) >> 16);
-	USB0->BDTPAGE3 = (u8_t)(((u32_t)bdt) >> 24);
+	USB0->BDTPAGE1 = (uint8_t)(((uint32_t)bdt) >> 8);
+	USB0->BDTPAGE2 = (uint8_t)(((uint32_t)bdt) >> 16);
+	USB0->BDTPAGE3 = (uint8_t)(((uint32_t)bdt) >> 24);
 
 	/* clear interrupt flags */
 	USB0->ISTAT = 0xFF;
@@ -191,7 +191,7 @@ static int kinetis_usb_init(void)
 
 int usb_dc_reset(void)
 {
-	for (u8_t i = 0; i < 16; i++) {
+	for (uint8_t i = 0; i < 16; i++) {
 		USB0->ENDPOINT[i].ENDPT = 0;
 	}
 	(void)memset(bdt, 0, sizeof(bdt));
@@ -255,7 +255,7 @@ int usb_dc_detach(void)
 	return 0;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	LOG_DBG("");
 
@@ -276,7 +276,7 @@ int usb_dc_set_address(const u8_t addr)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("endpoint index/address out of range");
@@ -326,11 +326,11 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
 	struct usb_ep_ctrl_data *ep_ctrl;
 	struct k_mem_block *block;
-	u8_t idx_even;
-	u8_t idx_odd;
+	uint8_t idx_even;
+	uint8_t idx_odd;
 
 	if (usb_dc_ep_check_cap(cfg)) {
 		return -EINVAL;
@@ -370,10 +370,10 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 		return -ENOMEM;
 	}
 
-	bdt[idx_even].buf_addr = (u32_t)block->data;
-	LOG_INF("idx_even %x", (u32_t)block->data);
-	bdt[idx_odd].buf_addr = (u32_t)((u8_t *)block->data + cfg->ep_mps);
-	LOG_INF("idx_odd %x", (u32_t)((u8_t *)block->data + cfg->ep_mps));
+	bdt[idx_even].buf_addr = (uint32_t)block->data;
+	LOG_INF("idx_even %x", (uint32_t)block->data);
+	bdt[idx_odd].buf_addr = (uint32_t)((uint8_t *)block->data + cfg->ep_mps);
+	LOG_INF("idx_odd %x", (uint32_t)((uint8_t *)block->data + cfg->ep_mps));
 
 	if (cfg->ep_addr & USB_EP_DIR_IN) {
 		dev_data.ep_ctrl[ep_idx].mps_in = cfg->ep_mps;
@@ -417,10 +417,10 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t bd_idx;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t bd_idx;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -444,10 +444,10 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t bd_idx;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t bd_idx;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -480,9 +480,9 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -501,7 +501,7 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 		*stalled = dev_data.ep_ctrl[ep_idx].status.in_stalled;
 	}
 
-	u8_t bd_idx = get_bdt_idx(ep,
+	uint8_t bd_idx = get_bdt_idx(ep,
 			dev_data.ep_ctrl[ep_idx].status.in_odd);
 	LOG_WRN("active bd ctrl: %x", bdt[bd_idx].set.bd_ctrl);
 	bd_idx = get_bdt_idx(ep,
@@ -511,16 +511,16 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t idx_even;
-	u8_t idx_odd;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t idx_even;
+	uint8_t idx_odd;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -557,11 +557,11 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t idx_even;
-	u8_t idx_odd;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t idx_even;
+	uint8_t idx_odd;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -584,9 +584,9 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -598,14 +598,14 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t * const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t * const ret_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u32_t len_to_send = data_len;
-	u8_t odd;
-	u8_t bd_idx;
-	u8_t *bufp;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint32_t len_to_send = data_len;
+	uint8_t odd;
+	uint8_t bd_idx;
+	uint8_t *bufp;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -614,7 +614,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 
 	odd = dev_data.ep_ctrl[ep_idx].status.in_odd;
 	bd_idx = get_bdt_idx(ep, odd);
-	bufp = (u8_t *)bdt[bd_idx].buf_addr;
+	bufp = (uint8_t *)bdt[bd_idx].buf_addr;
 
 	if (EP_ADDR2DIR(ep) != USB_EP_DIR_IN) {
 		LOG_ERR("Wrong endpoint direction");
@@ -639,7 +639,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 
 	bdt[bd_idx].set.bc = len_to_send;
 
-	for (u32_t n = 0; n < len_to_send; n++) {
+	for (uint32_t n = 0; n < len_to_send; n++) {
 		bufp[n] = data[n];
 	}
 
@@ -664,13 +664,13 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u32_t data_len;
-	u8_t bd_idx;
-	u8_t *bufp;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint32_t data_len;
+	uint8_t bd_idx;
+	uint8_t *bufp;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -679,7 +679,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 
 	/* select the index of active endpoint buffer */
 	bd_idx = get_bdt_idx(ep, dev_data.ep_ctrl[ep_idx].status.out_odd);
-	bufp = (u8_t *)bdt[bd_idx].buf_addr;
+	bufp = (uint8_t *)bdt[bd_idx].buf_addr;
 
 	if (EP_ADDR2DIR(ep) != USB_EP_DIR_OUT) {
 		LOG_ERR("Wrong endpoint direction");
@@ -721,7 +721,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	}
 
 	if (data != NULL) {
-		for (u32_t i = 0; i < data_len; i++) {
+		for (uint32_t i = 0; i < data_len; i++) {
 			data[i] = bufp[i];
 		}
 	}
@@ -737,10 +737,10 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 }
 
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t bd_idx;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t bd_idx;
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -785,8 +785,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		   const u32_t max_data_len, u32_t *const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		   const uint32_t max_data_len, uint32_t *const read_bytes)
 {
 	int retval = usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes);
 
@@ -810,9 +810,9 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -840,9 +840,9 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	dev_data.status_cb = cb;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx > (NUM_OF_EP_MAX - 1)) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -858,7 +858,7 @@ int usb_dc_ep_mps(const u8_t ep)
 
 static inline void reenable_all_endpoints(void)
 {
-	for (u8_t ep_idx = 0; ep_idx < NUM_OF_EP_MAX; ep_idx++) {
+	for (uint8_t ep_idx = 0; ep_idx < NUM_OF_EP_MAX; ep_idx++) {
 		if (dev_data.ep_ctrl[ep_idx].status.out_enabled) {
 			usb_dc_ep_enable(ep_idx);
 		}
@@ -870,14 +870,14 @@ static inline void reenable_all_endpoints(void)
 
 static void usb_kinetis_isr_handler(void)
 {
-	u8_t istatus  = USB0->ISTAT;
-	u8_t status  = USB0->STAT;
+	uint8_t istatus  = USB0->ISTAT;
+	uint8_t status  = USB0->STAT;
 	struct cb_msg msg;
 
 
 	if (istatus & USB_ISTAT_USBRST_MASK) {
 		dev_data.address = 0U;
-		USB0->ADDR = (u8_t)0;
+		USB0->ADDR = (uint8_t)0;
 		/*
 		 * Device reset is not possible because the stack does not
 		 * configure the endpoints after the USB_DC_RESET event,
@@ -912,11 +912,11 @@ static void usb_kinetis_isr_handler(void)
 
 	if (istatus & USB_ISTAT_TOKDNE_MASK) {
 
-		u8_t ep_idx = status >> USB_STAT_ENDP_SHIFT;
-		u8_t ep = ((status << 4) & USB_EP_DIR_IN) | ep_idx;
-		u8_t odd = (status & USB_STAT_ODD_MASK) >> USB_STAT_ODD_SHIFT;
-		u8_t idx = get_bdt_idx(ep, odd);
-		u8_t token_pid = bdt[idx].get.tok_pid;
+		uint8_t ep_idx = status >> USB_STAT_ENDP_SHIFT;
+		uint8_t ep = ((status << 4) & USB_EP_DIR_IN) | ep_idx;
+		uint8_t odd = (status & USB_STAT_ODD_MASK) >> USB_STAT_ODD_SHIFT;
+		uint8_t idx = get_bdt_idx(ep, odd);
+		uint8_t token_pid = bdt[idx].get.tok_pid;
 
 		msg.ep = ep;
 		msg.type = USB_DC_CB_TYPE_EP;
@@ -993,7 +993,7 @@ static void usb_kinetis_thread_main(void *arg1, void *unused1, void *unused2)
 	ARG_UNUSED(unused1);
 	ARG_UNUSED(unused2);
 	struct cb_msg msg;
-	u8_t ep_idx;
+	uint8_t ep_idx;
 
 	while (true) {
 		k_msgq_get(&usb_dc_msgq, &msg, K_FOREVER);
diff --git a/drivers/usb/device/usb_dc_mcux_ehci.c b/drivers/usb/device/usb_dc_mcux_ehci.c
index 81329e9909..872fe92588 100644
--- a/drivers/usb/device/usb_dc_mcux_ehci.c
+++ b/drivers/usb/device/usb_dc_mcux_ehci.c
@@ -136,7 +136,7 @@ int usb_dc_detach(void)
 	return 0;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	LOG_DBG("");
 	dev_data.address = addr;
@@ -145,7 +145,7 @@ int usb_dc_set_address(const u8_t addr)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data *const cfg)
 {
-	u8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
 
 	if ((cfg->ep_type == USB_DC_EP_CONTROL) && ep_idx) {
 		LOG_ERR("invalid endpoint configuration");
@@ -174,7 +174,7 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data *const cfg)
 
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 {
-	u8_t ep_abs_idx =  EP_ABS_IDX(cfg->ep_addr);
+	uint8_t ep_abs_idx =  EP_ABS_IDX(cfg->ep_addr);
 	usb_device_endpoint_init_struct_t ep_init;
 	struct k_mem_block *block;
 	struct usb_ep_ctrl_data *eps = &dev_data.eps[ep_abs_idx];
@@ -229,10 +229,10 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
-	u8_t endpoint = ep;
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t endpoint = ep;
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
@@ -250,10 +250,10 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
-	u8_t endpoint = ep;
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t endpoint = ep;
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
@@ -272,7 +272,7 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	    (EP_ADDR2DIR(ep) == USB_EP_DIR_OUT)) {
 		status = dev_data.interface->deviceRecv(
 				dev_data.controllerHandle, ep,
-				(u8_t *)dev_data.eps[ep_abs_idx].block.data,
+				(uint8_t *)dev_data.eps[ep_abs_idx].block.data,
 				(uint32_t)dev_data.eps[ep_abs_idx].ep_mps);
 		if (kStatus_USB_Success != status) {
 			LOG_ERR("Failed to enable reception on 0x%02x", ep);
@@ -285,9 +285,9 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_device_endpoint_status_struct_t ep_status;
 	usb_status_t status;
 
@@ -310,19 +310,19 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 		return -EIO;
 	}
 
-	*stalled = (u8_t)ep_status.endpointStatus;
+	*stalled = (uint8_t)ep_status.endpointStatus;
 
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	/*
@@ -347,7 +347,7 @@ int usb_dc_ep_enable(const u8_t ep)
 	    (EP_ADDR2DIR(ep) == USB_EP_DIR_OUT)) {
 		status = dev_data.interface->deviceRecv(
 				dev_data.controllerHandle, ep,
-				(u8_t *)dev_data.eps[ep_abs_idx].block.data,
+				(uint8_t *)dev_data.eps[ep_abs_idx].block.data,
 				(uint32_t)dev_data.eps[ep_abs_idx].ep_mps);
 		if (kStatus_USB_Success != status) {
 			LOG_ERR("Failed to enable reception on 0x%02x", ep);
@@ -366,9 +366,9 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
@@ -388,9 +388,9 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -402,12 +402,12 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t *const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t *const ret_bytes)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
-	u8_t *buffer = (u8_t *)dev_data.eps[ep_abs_idx].block.data;
-	u32_t len_to_send;
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t *buffer = (uint8_t *)dev_data.eps[ep_abs_idx].block.data;
+	uint32_t len_to_send;
 	usb_status_t status;
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
@@ -421,7 +421,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 		len_to_send = data_len;
 	}
 
-	for (u32_t n = 0; n < len_to_send; n++) {
+	for (uint32_t n = 0; n < len_to_send; n++) {
 		buffer[n] = data[n];
 	}
 
@@ -443,7 +443,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 }
 
 static void update_control_stage(usb_device_callback_message_struct_t *cb_msg,
-				 u32_t data_len, u32_t max_data_len)
+				 uint32_t data_len, uint32_t max_data_len)
 {
 	struct usb_setup_packet *usbd_setup;
 
@@ -468,13 +468,13 @@ static void update_control_stage(usb_device_callback_message_struct_t *cb_msg,
 	}
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
-	u32_t data_len;
-	u8_t *bufp = NULL;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint32_t data_len;
+	uint8_t *bufp = NULL;
 
 	while (dev_data.eps[ep_abs_idx].ep_occupied) {
 		LOG_ERR("Endpoint is occupied by the controller");
@@ -521,7 +521,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	}
 
 	if (data != NULL) {
-		for (u32_t i = 0; i < data_len; i++) {
+		for (uint32_t i = 0; i < data_len; i++) {
 			data[i] = bufp[i];
 		}
 	}
@@ -538,9 +538,9 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
@@ -564,7 +564,7 @@ int usb_dc_ep_read_continue(u8_t ep)
 	}
 
 	status = dev_data.interface->deviceRecv(dev_data.controllerHandle, ep,
-			       (u8_t *)dev_data.eps[ep_abs_idx].block.data,
+			       (uint8_t *)dev_data.eps[ep_abs_idx].block.data,
 			       dev_data.eps[ep_abs_idx].ep_mps);
 	if (kStatus_USB_Success != status) {
 		LOG_ERR("Failed to enable reception on ep 0x%02x", ep);
@@ -576,8 +576,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		   const u32_t max_data_len, u32_t *const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		   const uint32_t max_data_len, uint32_t *const read_bytes)
 {
 	int retval = usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes);
 
@@ -596,9 +596,9 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
 	return usb_dc_ep_read_continue(ep);
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -618,9 +618,9 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	dev_data.status_callback = cb;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 
 	if (ep_abs_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("Wrong endpoint index/address");
@@ -633,7 +633,7 @@ int usb_dc_ep_mps(const u8_t ep)
 static void handle_bus_reset(void)
 {
 	usb_device_endpoint_init_struct_t ep_init;
-	u8_t ep_abs_idx = 0;
+	uint8_t ep_abs_idx = 0;
 	usb_status_t status;
 
 	dev_data.address = 0;
@@ -680,9 +680,9 @@ static void handle_bus_reset(void)
 
 static void handle_transfer_msg(usb_device_callback_message_struct_t *cb_msg)
 {
-	u8_t ep_status_code = 0;
-	u8_t ep = cb_msg->code;
-	u8_t ep_abs_idx = EP_ABS_IDX(ep);
+	uint8_t ep_status_code = 0;
+	uint8_t ep = cb_msg->code;
+	uint8_t ep_abs_idx = EP_ABS_IDX(ep);
 	usb_status_t status;
 
 	dev_data.eps[ep_abs_idx].ep_occupied = false;
@@ -739,7 +739,7 @@ static void handle_transfer_msg(usb_device_callback_message_struct_t *cb_msg)
 /* Notify the up layer the KHCI status changed. */
 void USB_DeviceNotificationTrigger(void *handle, void *msg)
 {
-	u8_t ep_abs_idx;
+	uint8_t ep_abs_idx;
 	usb_device_callback_message_struct_t *cb_msg =
 		(usb_device_callback_message_struct_t *)msg;
 
diff --git a/drivers/usb/device/usb_dc_native_posix.c b/drivers/usb/device/usb_dc_native_posix.c
index cee6255cc4..2dfa304990 100644
--- a/drivers/usb/device/usb_dc_native_posix.c
+++ b/drivers/usb/device/usb_dc_native_posix.c
@@ -53,12 +53,12 @@ static void thread_main(void *a, void *b, void *c)
  * USB endpoint private structure.
  */
 struct usb_ep_ctrl_prv {
-	u8_t ep_ena;
-	u16_t mps;
+	uint8_t ep_ena;
+	uint16_t mps;
 	usb_dc_ep_callback cb;
-	u32_t data_len;
-	u8_t buf[64];
-	u8_t buf_len;
+	uint32_t data_len;
+	uint8_t buf[64];
+	uint8_t buf_len;
 };
 
 /*
@@ -68,12 +68,12 @@ static struct usbip_ctrl_prv {
 	usb_dc_status_callback status_cb;
 	struct usb_ep_ctrl_prv in_ep_ctrl[USBIP_IN_EP_NUM];
 	struct usb_ep_ctrl_prv out_ep_ctrl[USBIP_OUT_EP_NUM];
-	u8_t attached;
+	uint8_t attached;
 } usbip_ctrl;
 
-static u8_t usbip_ep_is_valid(u8_t ep)
+static uint8_t usbip_ep_is_valid(uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	/* Check if ep is valid */
 	if ((USBIP_EP_ADDR2DIR(ep) == USB_EP_DIR_OUT) &&
@@ -87,9 +87,9 @@ static u8_t usbip_ep_is_valid(u8_t ep)
 	return 0;
 }
 
-static u8_t usbip_ep_is_enabled(u8_t ep)
+static uint8_t usbip_ep_is_enabled(uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x", ep);
 
@@ -147,7 +147,7 @@ int usb_dc_reset(void)
 	return 0;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	LOG_DBG("");
 
@@ -156,7 +156,7 @@ int usb_dc_set_address(const u8_t addr)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(cfg->ep_addr);
 
 	LOG_DBG("ep %x, mps %d, type %d", cfg->ep_addr, cfg->ep_mps,
 		cfg->ep_type);
@@ -188,9 +188,9 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u16_t ep_mps = cfg->ep_mps;
-	u8_t ep = cfg->ep_addr;
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint16_t ep_mps = cfg->ep_mps;
+	uint8_t ep = cfg->ep_addr;
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	if (usb_dc_ep_check_cap(cfg)) {
 		return -EINVAL;
@@ -210,7 +210,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
 	LOG_DBG("ep %x", ep);
 
@@ -225,9 +225,9 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x", ep);
 
@@ -244,9 +244,9 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x", ep);
 
@@ -263,7 +263,7 @@ int usb_dc_ep_halt(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
 	LOG_DBG("ep %x", ep);
 
@@ -279,9 +279,9 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 	return 0;
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x", ep);
 
@@ -300,7 +300,7 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
 	LOG_DBG("ep %x", ep);
 
@@ -312,7 +312,7 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
 	LOG_DBG("ep %x", ep);
 
@@ -329,8 +329,8 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t * const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t * const ret_bytes)
 {
 	LOG_DBG("ep %x len %u", ep, data_len);
 
@@ -359,7 +359,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 			return -EIO;
 		}
 	} else {
-		u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+		uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 		struct usb_ep_ctrl_prv *ctrl = &usbip_ctrl.in_ep_ctrl[ep_idx];
 
 		memcpy(ctrl->buf, data, data_len);
@@ -373,10 +373,10 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
-	u32_t bytes;
+	uint32_t bytes;
 
 	if (!usbip_ctrl.attached || !usbip_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -406,7 +406,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 		 * the available data in buffer
 		 */
 		if (read_bytes) {
-			u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+			uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 			*read_bytes = usbip_ctrl.out_ep_ctrl[ep_idx].data_len;
 		}
@@ -425,9 +425,9 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	if (!usbip_ctrl.attached || !usbip_ep_is_valid(ep)) {
 		LOG_ERR("Not attached / Invalid endpoint: EP 0x%x", ep);
@@ -448,8 +448,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		   const u32_t max_data_len, u32_t * const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		   const uint32_t max_data_len, uint32_t * const read_bytes)
 {
 	LOG_DBG("ep %x max_data_len %u", ep, max_data_len);
 
@@ -471,9 +471,9 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
 	return 0;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x callback %p", ep, cb);
 
@@ -496,9 +496,9 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	usbip_ctrl.status_cb = cb;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ep);
 
 	LOG_DBG("ep %x", ep);
 
@@ -516,7 +516,7 @@ int usb_dc_ep_mps(const u8_t ep)
 
 int handle_usb_control(struct usbip_header *hdr)
 {
-	u8_t ep_idx = USBIP_EP_ADDR2IDX(ntohl(hdr->common.ep));
+	uint8_t ep_idx = USBIP_EP_ADDR2IDX(ntohl(hdr->common.ep));
 	usb_dc_ep_callback ep_cb = usbip_ctrl.out_ep_ctrl[ep_idx].cb;
 
 	LOG_DBG("ep %x idx %u", ntohl(hdr->common.ep), ep_idx);
@@ -535,9 +535,9 @@ int handle_usb_control(struct usbip_header *hdr)
 
 int handle_usb_data(struct usbip_header *hdr)
 {
-	u8_t ep_idx = ntohl(hdr->common.ep);
+	uint8_t ep_idx = ntohl(hdr->common.ep);
 	usb_dc_ep_callback ep_cb;
-	u8_t ep;
+	uint8_t ep;
 
 	LOG_DBG("ep_idx %u", ep_idx);
 
@@ -556,8 +556,8 @@ int handle_usb_data(struct usbip_header *hdr)
 			return -EIO;
 		}
 	} else {
-		u8_t buf_len = usbip_ctrl.in_ep_ctrl[ep_idx].buf_len;
-		u8_t *buf = usbip_ctrl.in_ep_ctrl[ep_idx].buf;
+		uint8_t buf_len = usbip_ctrl.in_ep_ctrl[ep_idx].buf_len;
+		uint8_t *buf = usbip_ctrl.in_ep_ctrl[ep_idx].buf;
 
 		if (ep_idx >= USBIP_IN_EP_NUM) {
 			return -EINVAL;
diff --git a/drivers/usb/device/usb_dc_native_posix_adapt.c b/drivers/usb/device/usb_dc_native_posix_adapt.c
index 34a9d4f8ce..197ea15cbd 100644
--- a/drivers/usb/device/usb_dc_native_posix_adapt.c
+++ b/drivers/usb/device/usb_dc_native_posix_adapt.c
@@ -72,7 +72,7 @@ static void usbip_header_dump(struct usbip_header *hdr)
 #define usbip_header_dump(x)
 #endif
 
-void get_interface(u8_t *descriptors)
+void get_interface(uint8_t *descriptors)
 {
 	while (descriptors[0]) {
 		if (descriptors[1] == USB_INTERFACE_DESC) {
@@ -84,13 +84,13 @@ void get_interface(u8_t *descriptors)
 	}
 }
 
-static int send_interfaces(const u8_t *descriptors, int connfd)
+static int send_interfaces(const uint8_t *descriptors, int connfd)
 {
 	struct devlist_interface {
-		u8_t bInterfaceClass;
-		u8_t bInterfaceSubClass;
-		u8_t bInterfaceProtocol;
-		u8_t padding;	/* alignment */
+		uint8_t bInterfaceClass;
+		uint8_t bInterfaceSubClass;
+		uint8_t bInterfaceProtocol;
+		uint8_t padding;	/* alignment */
 	} __packed iface;
 
 	while (descriptors[0]) {
@@ -116,7 +116,7 @@ static int send_interfaces(const u8_t *descriptors, int connfd)
 	return 0;
 }
 
-static void fill_device(struct devlist_device *dev, const u8_t *desc)
+static void fill_device(struct devlist_device *dev, const uint8_t *desc)
 {
 	struct usb_device_descriptor *dev_dsc = (void *)desc;
 	struct usb_cfg_descriptor *cfg =
@@ -143,7 +143,7 @@ static void fill_device(struct devlist_device *dev, const u8_t *desc)
 	dev->bNumInterfaces = cfg->bNumInterfaces;
 }
 
-static int send_device(const u8_t *desc, int connfd)
+static int send_device(const uint8_t *desc, int connfd)
 {
 	struct devlist_device dev;
 
@@ -157,7 +157,7 @@ static int send_device(const u8_t *desc, int connfd)
 	return 0;
 }
 
-static int handle_device_list(const u8_t *desc, int connfd)
+static int handle_device_list(const uint8_t *desc, int connfd)
 {
 	struct op_common header = {
 		.version = htons(USBIP_VERSION),
@@ -173,7 +173,7 @@ static int handle_device_list(const u8_t *desc, int connfd)
 	}
 
 	/* Send number of devices */
-	u32_t ndev = htonl(1);
+	uint32_t ndev = htonl(1);
 
 	if (send(connfd, &ndev, sizeof(ndev), 0) != sizeof(ndev)) {
 		LOG_ERR("send() ndev failed: %s", strerror(errno));
@@ -211,7 +211,7 @@ static void handle_usbip_submit(int connfd, struct usbip_header *hdr)
 
 bool usbip_skip_setup(void)
 {
-	u64_t setup;
+	uint64_t setup;
 
 	LOG_DBG("Skip 8 bytes");
 
@@ -246,7 +246,7 @@ static void handle_usbip_unlink(int connfd, struct usbip_header *hdr)
 	/* TODO: unlink */
 }
 
-static int handle_import(const u8_t *desc, int connfd)
+static int handle_import(const uint8_t *desc, int connfd)
 {
 	struct op_common header = {
 		.version = htons(USBIP_VERSION),
@@ -279,7 +279,7 @@ void usbip_start(void)
 	struct sockaddr_in srv;
 	unsigned char attached;
 	int listenfd, connfd;
-	const u8_t *desc;
+	const uint8_t *desc;
 	int reuse = 1;
 
 	LOG_DBG("Starting");
@@ -288,7 +288,7 @@ void usbip_start(void)
 	 * Do not use usb_get_device_descriptor();
 	 * to prevent double string fixing
 	 */
-	desc = (const u8_t *)__usb_descriptor_start;
+	desc = (const uint8_t *)__usb_descriptor_start;
 	if (!desc) {
 		LOG_ERR("Descriptors are not set");
 		posix_exit(EXIT_FAILURE);
@@ -371,7 +371,7 @@ void usbip_start(void)
 					break;
 				}
 
-				LOG_HEXDUMP_DBG((u8_t *)&req, sizeof(req),
+				LOG_HEXDUMP_DBG((uint8_t *)&req, sizeof(req),
 						"Got request");
 
 				LOG_DBG("Code: 0x%x", ntohs(req.code));
@@ -406,7 +406,7 @@ void usbip_start(void)
 				}
 			}
 
-			LOG_HEXDUMP_DBG((u8_t *)hdr, read, "Got cmd");
+			LOG_HEXDUMP_DBG((uint8_t *)hdr, read, "Got cmd");
 
 			if (read != sizeof(*hdr)) {
 				LOG_ERR("recv wrong length: %d", read);
@@ -438,17 +438,17 @@ void usbip_start(void)
 	}
 }
 
-int usbip_recv(u8_t *buf, size_t len)
+int usbip_recv(uint8_t *buf, size_t len)
 {
 	return recv(connfd_global, buf, len, 0);
 }
 
-int usbip_send(u8_t ep, const u8_t *data, size_t len)
+int usbip_send(uint8_t ep, const uint8_t *data, size_t len)
 {
 	return send(connfd_global, data, len, 0);
 }
 
-bool usbip_send_common(u8_t ep, u32_t data_len)
+bool usbip_send_common(uint8_t ep, uint32_t data_len)
 {
 	struct usbip_submit_rsp rsp;
 
@@ -466,7 +466,7 @@ bool usbip_send_common(u8_t ep, u32_t data_len)
 
 	rsp.setup = htonl(0);
 
-	if (usbip_send(ep, (u8_t *)&rsp, sizeof(rsp)) == sizeof(rsp)) {
+	if (usbip_send(ep, (uint8_t *)&rsp, sizeof(rsp)) == sizeof(rsp)) {
 		return true;
 	}
 
diff --git a/drivers/usb/device/usb_dc_native_posix_adapt.h b/drivers/usb/device/usb_dc_native_posix_adapt.h
index 450f908e49..d99c47db57 100644
--- a/drivers/usb/device/usb_dc_native_posix_adapt.h
+++ b/drivers/usb/device/usb_dc_native_posix_adapt.h
@@ -5,29 +5,29 @@
  */
 
 struct op_common {
-	u16_t version;
-	u16_t code;
-	u32_t status;
+	uint16_t version;
+	uint16_t code;
+	uint32_t status;
 } __packed;
 
 struct devlist_device {
 	char path[256];
 	char busid[32];
 
-	u32_t busnum;
-	u32_t devnum;
-	u32_t speed;
+	uint32_t busnum;
+	uint32_t devnum;
+	uint32_t speed;
 
-	u16_t idVendor;
-	u16_t idProduct;
-	u16_t bcdDevice;
+	uint16_t idVendor;
+	uint16_t idProduct;
+	uint16_t bcdDevice;
 
-	u8_t bDeviceClass;
-	u8_t bDeviceSubClass;
-	u8_t bDeviceProtocol;
-	u8_t bConfigurationValue;
-	u8_t bNumConfigurations;
-	u8_t bNumInterfaces;
+	uint8_t bDeviceClass;
+	uint8_t bDeviceSubClass;
+	uint8_t bDeviceProtocol;
+	uint8_t bConfigurationValue;
+	uint8_t bNumConfigurations;
+	uint8_t bNumInterfaces;
 } __packed;
 
 #define OP_REQUEST		(0x80 << 8)
@@ -54,35 +54,35 @@ struct devlist_device {
 #define USBIP_DIR_IN		0x01
 
 struct usbip_header_common {
-	u32_t command;
-	u32_t seqnum;
-	u32_t devid;
-	u32_t direction;
-	u32_t ep;
+	uint32_t command;
+	uint32_t seqnum;
+	uint32_t devid;
+	uint32_t direction;
+	uint32_t ep;
 } __packed;
 
 struct usbip_submit {
-	u32_t transfer_flags;
-	s32_t transfer_buffer_length;
-	s32_t start_frame;
-	s32_t number_of_packets;
-	s32_t interval;
+	uint32_t transfer_flags;
+	int32_t transfer_buffer_length;
+	int32_t start_frame;
+	int32_t number_of_packets;
+	int32_t interval;
 } __packed;
 
 struct usbip_unlink {
-	u32_t seqnum;
+	uint32_t seqnum;
 } __packed;
 
 struct usbip_submit_rsp {
 	struct usbip_header_common common;
 
-	s32_t status;
-	s32_t actual_length;
-	s32_t start_frame;
-	s32_t number_of_packets;
-	s32_t error_count;
+	int32_t status;
+	int32_t actual_length;
+	int32_t start_frame;
+	int32_t number_of_packets;
+	int32_t error_count;
 
-	u64_t setup;
+	uint64_t setup;
 } __packed;
 
 struct usbip_header {
@@ -96,9 +96,9 @@ struct usbip_header {
 
 /* Function definitions */
 
-int usbip_recv(u8_t *buf, size_t len);
-bool usbip_send_common(u8_t ep, u32_t data_len);
-int usbip_send(u8_t ep, const u8_t *data, size_t len);
+int usbip_recv(uint8_t *buf, size_t len);
+bool usbip_send_common(uint8_t ep, uint32_t data_len);
+int usbip_send(uint8_t ep, const uint8_t *data, size_t len);
 
 void usbip_start(void);
 
diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c
index 4c83508fea..7956469631 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -78,9 +78,9 @@ enum usbd_event_type {
  */
 struct nrf_usbd_ep_cfg {
 	usb_dc_ep_callback cb;
-	u32_t max_sz;
+	uint32_t max_sz;
 	bool en;
-	u8_t addr;
+	uint8_t addr;
 	enum usb_dc_ep_transfer_type type;
 
 };
@@ -94,10 +94,10 @@ struct nrf_usbd_ep_cfg {
  * @param curr	 Pointer to the current offset in the endpoint buffer.
  */
 struct nrf_usbd_ep_buf {
-	u32_t len;
+	uint32_t len;
 	struct k_mem_block block;
-	u8_t *data;
-	u8_t *curr;
+	uint8_t *data;
+	uint8_t *curr;
 };
 
 /**
@@ -260,7 +260,7 @@ struct nrf_usbd_ctx {
 
 	struct nrf_usbd_ep_ctx ep_ctx[CFG_EP_CNT];
 
-	u16_t ctrl_read_len;
+	uint16_t ctrl_read_len;
 };
 
 
@@ -310,9 +310,9 @@ static inline uint8_t nrfx_addr_to_ep(nrfx_usbd_ep_t ep)
 	return (uint8_t)ep;
 }
 
-static inline bool ep_is_valid(const u8_t ep)
+static inline bool ep_is_valid(const uint8_t ep)
 {
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 
 	if (NRF_USBD_EPIN_CHECK(ep)) {
 		if (unlikely(ep_num == NRF_USBD_EPISO_FIRST)) {
@@ -339,10 +339,10 @@ static inline bool ep_is_valid(const u8_t ep)
 	return true;
 }
 
-static struct nrf_usbd_ep_ctx *endpoint_ctx(const u8_t ep)
+static struct nrf_usbd_ep_ctx *endpoint_ctx(const uint8_t ep)
 {
 	struct nrf_usbd_ctx *ctx;
-	u8_t ep_num;
+	uint8_t ep_num;
 
 	if (!ep_is_valid(ep)) {
 		return NULL;
@@ -370,12 +370,12 @@ static struct nrf_usbd_ep_ctx *endpoint_ctx(const u8_t ep)
 	return NULL;
 }
 
-static struct nrf_usbd_ep_ctx *in_endpoint_ctx(const u8_t ep)
+static struct nrf_usbd_ep_ctx *in_endpoint_ctx(const uint8_t ep)
 {
 	return endpoint_ctx(NRF_USBD_EPIN(ep));
 }
 
-static struct nrf_usbd_ep_ctx *out_endpoint_ctx(const u8_t ep)
+static struct nrf_usbd_ep_ctx *out_endpoint_ctx(const uint8_t ep)
 {
 	return endpoint_ctx(NRF_USBD_EPOUT(ep));
 }
@@ -658,7 +658,7 @@ static int eps_ctx_init(void)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 	int err;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < CFG_EPIN_CNT; i++) {
 		ep_ctx = in_endpoint_ctx(i);
@@ -732,7 +732,7 @@ static int eps_ctx_init(void)
 static void eps_ctx_uninit(void)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < CFG_EPIN_CNT; i++) {
 		ep_ctx = in_endpoint_ctx(i);
@@ -848,11 +848,11 @@ static inline void usbd_work_process_setup(struct nrf_usbd_ep_ctx *ep_ctx)
 	ep_ctx->buf.len = sizeof(struct usb_setup_packet);
 
 	LOG_DBG("SETUP: bR:0x%02x bmRT:0x%02x wV:0x%04x wI:0x%04x wL:%d",
-		(u32_t)usbd_setup->bRequest,
-		(u32_t)usbd_setup->bmRequestType,
-		(u32_t)usbd_setup->wValue,
-		(u32_t)usbd_setup->wIndex,
-		(u32_t)usbd_setup->wLength);
+		(uint32_t)usbd_setup->bRequest,
+		(uint32_t)usbd_setup->bmRequestType,
+		(uint32_t)usbd_setup->wValue,
+		(uint32_t)usbd_setup->wIndex,
+		(uint32_t)usbd_setup->wLength);
 
 	/* Inform the stack. */
 	ep_ctx->cfg.cb(ep_ctx->cfg.addr, USB_DC_EP_SETUP);
@@ -1050,7 +1050,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
 			}
 
 			LOG_DBG("write complete, ep 0x%02x",
-				(u32_t)p_event->data.eptransfer.ep);
+				(uint32_t)p_event->data.eptransfer.ep);
 
 			ep_ctx->write_in_progress = false;
 			ev->evt_type = USBD_EVT_EP;
@@ -1085,7 +1085,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
 			}
 
 			LOG_DBG("read request, ep 0x%02x",
-				(u32_t)p_event->data.eptransfer.ep);
+				(uint32_t)p_event->data.eptransfer.ep);
 
 			ep_ctx->read_pending = true;
 			ev->evt_type = USBD_EVT_EP;
@@ -1108,7 +1108,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
 				p_event->data.eptransfer.ep);
 
 			LOG_DBG("read complete, ep 0x%02x, len %d",
-				(u32_t)p_event->data.eptransfer.ep,
+				(uint32_t)p_event->data.eptransfer.ep,
 				ep_ctx->buf.len);
 
 			ev->evt_type = USBD_EVT_EP;
@@ -1241,7 +1241,7 @@ static inline void usbd_reinit(void)
 	err = nrfx_usbd_init(usbd_event_handler);
 
 	if (err != NRFX_SUCCESS) {
-		LOG_DBG("nRF USBD driver reinit failed. Code: %d", (u32_t)err);
+		LOG_DBG("nRF USBD driver reinit failed. Code: %d", (uint32_t)err);
 		__ASSERT_NO_MSG(0);
 	}
 }
@@ -1305,7 +1305,7 @@ static void usbd_work_handler(struct k_work *item)
 		case USBD_EVT_EP:
 			if (!ctx->attached) {
 				LOG_ERR("not attached, EP 0x%02x event dropped",
-					(u32_t)ev->evt.ep_evt.ep->cfg.addr);
+					(uint32_t)ev->evt.ep_evt.ep->cfg.addr);
 			}
 			usbd_work_process_ep_events(&ev->evt.ep_evt);
 			break;
@@ -1370,7 +1370,7 @@ int usb_dc_attach(void)
 	err = nrfx_usbd_init(usbd_event_handler);
 
 	if (err != NRFX_SUCCESS) {
-		LOG_DBG("nRF USBD driver init failed. Code: %d", (u32_t)err);
+		LOG_DBG("nRF USBD driver init failed. Code: %d", (uint32_t)err);
 		return -EIO;
 	}
 	nrf5_power_usb_power_int_enable(true);
@@ -1447,7 +1447,7 @@ int usb_dc_reset(void)
 	return 0;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	struct nrf_usbd_ctx *ctx;
 
@@ -1459,7 +1459,7 @@ int usb_dc_set_address(const u8_t addr)
 	 * Nothing to do here. The USBD HW already takes care of initiating
 	 * STATUS stage. Just double check the address for sanity.
 	 */
-	__ASSERT(addr == (u8_t)NRF_USBD->USBADDR, "USB Address incorrect!");
+	__ASSERT(addr == (uint8_t)NRF_USBD->USBADDR, "USB Address incorrect!");
 
 	ctx = get_usbd_ctx();
 
@@ -1471,7 +1471,7 @@ int usb_dc_set_address(const u8_t addr)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data *const ep_cfg)
 {
-	u8_t ep_idx = NRF_USBD_EP_NR_GET(ep_cfg->ep_addr);
+	uint8_t ep_idx = NRF_USBD_EP_NR_GET(ep_cfg->ep_addr);
 
 	LOG_DBG("ep 0x%02x, mps %d, type %d", ep_cfg->ep_addr, ep_cfg->ep_mps,
 		ep_cfg->ep_type);
@@ -1535,7 +1535,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const ep_cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1569,7 +1569,7 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
 
 	struct nrf_usbd_ep_ctx *ep_ctx;
@@ -1590,12 +1590,12 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1612,12 +1612,12 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 		return -EINVAL;
 	}
 
-	*stalled = (u8_t) nrfx_usbd_ep_stall_check(ep_addr_to_nrfx(ep));
+	*stalled = (uint8_t) nrfx_usbd_ep_stall_check(ep_addr_to_nrfx(ep));
 
 	return 0;
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1647,7 +1647,7 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1672,7 +1672,7 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1693,13 +1693,13 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t *const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t *const ret_bytes)
 {
 	LOG_DBG("ep_write: ep 0x%02x, len %d", ep, data_len);
 	struct nrf_usbd_ctx *ctx = get_usbd_ctx();
 	struct nrf_usbd_ep_ctx *ep_ctx;
-	u32_t bytes_to_copy;
+	uint32_t bytes_to_copy;
 	int result = 0;
 
 	if (!dev_attached() || !dev_ready()) {
@@ -1770,19 +1770,19 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 	if (err != NRFX_SUCCESS) {
 		ep_ctx->write_in_progress = false;
 		result = -EIO;
-		LOG_ERR("nRF USBD write error: %d", (u32_t)err);
+		LOG_ERR("nRF USBD write error: %d", (uint32_t)err);
 	}
 
 	k_mutex_unlock(&ctx->drv_lock);
 	return result;
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 	struct nrf_usbd_ctx *ctx = get_usbd_ctx();
-	u32_t bytes_to_copy;
+	uint32_t bytes_to_copy;
 
 	if (!dev_attached() || !dev_ready()) {
 		return -ENODEV;
@@ -1830,7 +1830,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 	struct nrf_usbd_ctx *ctx = get_usbd_ctx();
@@ -1878,8 +1878,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		   const u32_t max_data_len, u32_t *const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		   const uint32_t max_data_len, uint32_t *const read_bytes)
 {
 	LOG_DBG("ep_read: ep 0x%02x, maxlen %d", ep, max_data_len);
 	int ret;
@@ -1897,7 +1897,7 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
 	return ret;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
@@ -1920,7 +1920,7 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	get_usbd_ctx()->status_cb = cb;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
 	struct nrf_usbd_ep_ctx *ep_ctx;
 
diff --git a/drivers/usb/device/usb_dc_sam.c b/drivers/usb/device/usb_dc_sam.c
index c379da1a72..03f11467ac 100644
--- a/drivers/usb/device/usb_dc_sam.c
+++ b/drivers/usb/device/usb_dc_sam.c
@@ -55,10 +55,10 @@ LOG_MODULE_REGISTER(usb_dc_sam);
 #endif
 
 struct usb_device_ep_data {
-	u16_t mps;
+	uint16_t mps;
 	usb_dc_ep_callback cb_in;
 	usb_dc_ep_callback cb_out;
-	u8_t *fifo;
+	uint8_t *fifo;
 };
 
 struct usb_device_data {
@@ -109,19 +109,19 @@ static bool usb_dc_is_attached(void)
 }
 
 /* Check if an endpoint is configured */
-static bool usb_dc_ep_is_configured(u8_t ep_idx)
+static bool usb_dc_ep_is_configured(uint8_t ep_idx)
 {
 	return USBHS->USBHS_DEVEPTISR[ep_idx] & USBHS_DEVEPTISR_CFGOK;
 }
 
 /* Check if an endpoint is enabled */
-static bool usb_dc_ep_is_enabled(u8_t ep_idx)
+static bool usb_dc_ep_is_enabled(uint8_t ep_idx)
 {
 	return USBHS->USBHS_DEVEPT & BIT(USBHS_DEVEPT_EPEN0_Pos + ep_idx);
 }
 
 /* Reset and endpoint */
-static void usb_dc_ep_reset(u8_t ep_idx)
+static void usb_dc_ep_reset(uint8_t ep_idx)
 {
 	USBHS->USBHS_DEVEPT |= BIT(USBHS_DEVEPT_EPRST0_Pos + ep_idx);
 	USBHS->USBHS_DEVEPT &= ~BIT(USBHS_DEVEPT_EPRST0_Pos + ep_idx);
@@ -129,7 +129,7 @@ static void usb_dc_ep_reset(u8_t ep_idx)
 }
 
 /* Enable endpoint interrupts, depending of the type and direction */
-static void usb_dc_ep_enable_interrupts(u8_t ep_idx)
+static void usb_dc_ep_enable_interrupts(uint8_t ep_idx)
 {
 	if (ep_idx == 0U) {
 		/* Control endpoint: enable SETUP and OUT */
@@ -147,22 +147,22 @@ static void usb_dc_ep_enable_interrupts(u8_t ep_idx)
 }
 
 /* Reset the endpoint FIFO pointer to the beginning of the endpoint memory */
-static void usb_dc_ep_fifo_reset(u8_t ep_idx)
+static void usb_dc_ep_fifo_reset(uint8_t ep_idx)
 {
-	u8_t *p;
+	uint8_t *p;
 
-	p = (u8_t *)(USBHS_RAM_ADDR + 0x8000 * ep_idx);
+	p = (uint8_t *)(USBHS_RAM_ADDR + 0x8000 * ep_idx);
 	dev_data.ep_data[ep_idx].fifo = p;
 }
 
 /* Fetch a byte from the endpoint FIFO */
-static u8_t usb_dc_ep_fifo_get(u8_t ep_idx)
+static uint8_t usb_dc_ep_fifo_get(uint8_t ep_idx)
 {
 	return *(dev_data.ep_data[ep_idx].fifo++);
 }
 
 /* Put a byte from the endpoint FIFO */
-static void usb_dc_ep_fifo_put(u8_t ep_idx, u8_t data)
+static void usb_dc_ep_fifo_put(uint8_t ep_idx, uint8_t data)
 {
 	*(dev_data.ep_data[ep_idx].fifo++) = data;
 }
@@ -170,8 +170,8 @@ static void usb_dc_ep_fifo_put(u8_t ep_idx, u8_t data)
 /* Handle interrupts on a control endpoint */
 static void usb_dc_ep0_isr(void)
 {
-	u32_t sr = USBHS->USBHS_DEVEPTISR[0] & USBHS->USBHS_DEVEPTIMR[0];
-	u32_t dev_ctrl = USBHS->USBHS_DEVCTRL;
+	uint32_t sr = USBHS->USBHS_DEVEPTISR[0] & USBHS->USBHS_DEVEPTIMR[0];
+	uint32_t dev_ctrl = USBHS->USBHS_DEVCTRL;
 
 	if (sr & USBHS_DEVEPTISR_CTRL_RXSTPI) {
 		/* SETUP data received */
@@ -203,13 +203,13 @@ static void usb_dc_ep0_isr(void)
 }
 
 /* Handle interrupts on a non-control endpoint */
-static void usb_dc_ep_isr(u8_t ep_idx)
+static void usb_dc_ep_isr(uint8_t ep_idx)
 {
-	u32_t sr = USBHS->USBHS_DEVEPTISR[ep_idx] &
+	uint32_t sr = USBHS->USBHS_DEVEPTISR[ep_idx] &
 		   USBHS->USBHS_DEVEPTIMR[ep_idx];
 
 	if (sr & USBHS_DEVEPTISR_RXOUTI) {
-		u8_t ep = ep_idx | USB_EP_DIR_OUT;
+		uint8_t ep = ep_idx | USB_EP_DIR_OUT;
 
 		/* Acknowledge the interrupt */
 		USBHS->USBHS_DEVEPTICR[ep_idx] = USBHS_DEVEPTICR_RXOUTIC;
@@ -219,7 +219,7 @@ static void usb_dc_ep_isr(u8_t ep_idx)
 		dev_data.ep_data[ep_idx].cb_out(ep, USB_DC_EP_DATA_OUT);
 	}
 	if (sr & USBHS_DEVEPTISR_TXINI) {
-		u8_t ep = ep_idx | USB_EP_DIR_IN;
+		uint8_t ep = ep_idx | USB_EP_DIR_IN;
 
 		/* Acknowledge the interrupt */
 		USBHS->USBHS_DEVEPTICR[ep_idx] = USBHS_DEVEPTICR_TXINIC;
@@ -233,7 +233,7 @@ static void usb_dc_ep_isr(u8_t ep_idx)
 /* Top level interrupt handler */
 static void usb_dc_isr(void)
 {
-	u32_t sr = USBHS->USBHS_DEVISR & USBHS->USBHS_DEVIMR;
+	uint32_t sr = USBHS->USBHS_DEVISR & USBHS->USBHS_DEVIMR;
 
 	/* End of resume interrupt */
 	if (sr & USBHS_DEVISR_EORSM) {
@@ -302,7 +302,7 @@ static void usb_dc_isr(void)
 /* Attach USB for device connection */
 int usb_dc_attach(void)
 {
-	u32_t regval;
+	uint32_t regval;
 
 	/* Start the peripheral clock */
 	soc_pmc_peripheral_enable(DT_INST_PROP(0, peripheral_id));
@@ -395,7 +395,7 @@ int usb_dc_reset(void)
 }
 
 /* Set USB device address */
-int usb_dc_set_address(u8_t addr)
+int usb_dc_set_address(uint8_t addr)
 {
 	/*
 	 * Set the address but keep it disabled for now. It should be enabled
@@ -419,7 +419,7 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 /* Check endpoint capabilities */
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("endpoint index/address out of range");
@@ -455,10 +455,10 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 /* Configure endpoint */
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 {
-	u8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_ADDR2IDX(cfg->ep_addr);
 	bool ep_configured[NUM_OF_EP_MAX];
 	bool ep_enabled[NUM_OF_EP_MAX];
-	u32_t regval = 0U;
+	uint32_t regval = 0U;
 	int log2ceil_mps;
 
 	if (usb_dc_ep_check_cap(cfg) != 0) {
@@ -565,9 +565,9 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 }
 
 /* Set stall condition for the selected endpoint */
-int usb_dc_ep_set_stall(u8_t ep)
+int usb_dc_ep_set_stall(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -581,9 +581,9 @@ int usb_dc_ep_set_stall(u8_t ep)
 }
 
 /* Clear stall condition for the selected endpoint */
-int usb_dc_ep_clear_stall(u8_t ep)
+int usb_dc_ep_clear_stall(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -597,9 +597,9 @@ int usb_dc_ep_clear_stall(u8_t ep)
 }
 
 /* Check if the selected endpoint is stalled */
-int usb_dc_ep_is_stalled(u8_t ep, u8_t *stalled)
+int usb_dc_ep_is_stalled(uint8_t ep, uint8_t *stalled)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -618,15 +618,15 @@ int usb_dc_ep_is_stalled(u8_t ep, u8_t *stalled)
 }
 
 /* Halt the selected endpoint */
-int usb_dc_ep_halt(u8_t ep)
+int usb_dc_ep_halt(uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
 /* Enable the selected endpoint */
-int usb_dc_ep_enable(u8_t ep)
+int usb_dc_ep_enable(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -653,9 +653,9 @@ int usb_dc_ep_enable(u8_t ep)
 }
 
 /* Disable the selected endpoint */
-int usb_dc_ep_disable(u8_t ep)
+int usb_dc_ep_disable(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -674,9 +674,9 @@ int usb_dc_ep_disable(u8_t ep)
 }
 
 /* Flush the selected endpoint */
-int usb_dc_ep_flush(u8_t ep)
+int usb_dc_ep_flush(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -712,10 +712,10 @@ int usb_dc_ep_flush(u8_t ep)
 }
 
 /* Write data to the specified endpoint */
-int usb_dc_ep_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *ret_bytes)
+int usb_dc_ep_write(uint8_t ep, const uint8_t *data, uint32_t data_len, uint32_t *ret_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u32_t packet_len;
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint32_t packet_len;
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -770,9 +770,9 @@ int usb_dc_ep_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *ret_bytes)
 }
 
 /* Read data from the specified endpoint */
-int usb_dc_ep_read(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *read_bytes)
+int usb_dc_ep_read(uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_t *read_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 	int rc;
 
 	rc = usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes);
@@ -798,9 +798,9 @@ int usb_dc_ep_read(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *read_bytes)
 }
 
 /* Set callback function for the specified endpoint */
-int usb_dc_ep_set_callback(u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(uint8_t ep, const usb_dc_ep_callback cb)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -818,11 +818,11 @@ int usb_dc_ep_set_callback(u8_t ep, const usb_dc_ep_callback cb)
 }
 
 /* Read data from the specified endpoint */
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
-	u32_t data_len = (USBHS->USBHS_DEVEPTISR[ep_idx] &
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
+	uint32_t data_len = (USBHS->USBHS_DEVEPTISR[ep_idx] &
 			  USBHS_DEVEPTISR_BYCT_Msk) >> USBHS_DEVEPTISR_BYCT_Pos;
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
@@ -877,9 +877,9 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 }
 
 /* Continue reading data from the endpoint */
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
@@ -917,9 +917,9 @@ int usb_dc_ep_read_continue(u8_t ep)
 }
 
 /* Endpoint max packet size (mps) */
-int usb_dc_ep_mps(u8_t ep)
+int usb_dc_ep_mps(uint8_t ep)
 {
-	u8_t ep_idx = EP_ADDR2IDX(ep);
+	uint8_t ep_idx = EP_ADDR2IDX(ep);
 
 	if (ep_idx >= NUM_OF_EP_MAX) {
 		LOG_ERR("wrong endpoint index/address");
diff --git a/drivers/usb/device/usb_dc_sam0.c b/drivers/usb/device/usb_dc_sam0.c
index de519a7178..fd22f93caa 100644
--- a/drivers/usb/device/usb_dc_sam0.c
+++ b/drivers/usb/device/usb_dc_sam0.c
@@ -32,11 +32,11 @@ struct usb_sam0_data {
 	usb_dc_status_callback cb;
 	usb_dc_ep_callback ep_cb[2][USB_NUM_ENDPOINTS];
 
-	u8_t addr;
-	u32_t out_at;
+	uint8_t addr;
+	uint32_t out_at;
 
 	/* Memory used as a simple heap for the endpoint buffers */
-	u32_t ep_buf[USB_NUM_ENDPOINTS * 64 / 4];
+	uint32_t ep_buf[USB_NUM_ENDPOINTS * 64 / 4];
 	int brk;
 };
 
@@ -48,12 +48,12 @@ static struct usb_sam0_data *usb_sam0_get_data(void)
 }
 
 /* Handles interrupts on an endpoint */
-static void usb_sam0_ep_isr(u8_t ep)
+static void usb_sam0_ep_isr(uint8_t ep)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep];
-	u32_t intflag = endpoint->EPINTFLAG.reg;
+	uint32_t intflag = endpoint->EPINTFLAG.reg;
 
 	endpoint->EPINTFLAG.reg = intflag;
 
@@ -87,9 +87,9 @@ static void usb_sam0_isr(void)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u32_t intflag = regs->INTFLAG.reg;
-	u32_t epint = regs->EPINTSMRY.reg;
-	u8_t ep;
+	uint32_t intflag = regs->INTFLAG.reg;
+	uint32_t epint = regs->EPINTSMRY.reg;
+	uint8_t ep;
 
 	/* Acknowledge all interrupts */
 	regs->INTFLAG.reg = intflag;
@@ -130,9 +130,9 @@ static void usb_sam0_wait_syncbusy(void)
 static void usb_sam0_load_padcal(void)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u32_t pad_transn;
-	u32_t pad_transp;
-	u32_t pad_trim;
+	uint32_t pad_transn;
+	uint32_t pad_transp;
+	uint32_t pad_trim;
 
 #ifdef USB_FUSES_TRANSN_ADDR
 	pad_transn = *(uint32_t *)USB_FUSES_TRANSN_ADDR;
@@ -285,7 +285,7 @@ int usb_dc_reset(void)
 /* Queue a change in address.  This is processed later when the
  * current transfers are compelete.
  */
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 
@@ -303,7 +303,7 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = cfg->ep_addr & ~USB_EP_DIR_MASK;
+	uint8_t ep_idx = cfg->ep_addr & ~USB_EP_DIR_MASK;
 
 	if ((cfg->ep_type == USB_DC_EP_CONTROL) && ep_idx) {
 		LOG_ERR("invalid endpoint configuration");
@@ -322,8 +322,8 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = cfg->ep_addr & USB_EP_DIR_MASK;
-	u8_t ep = cfg->ep_addr & ~USB_EP_DIR_MASK;
+	uint8_t for_in = cfg->ep_addr & USB_EP_DIR_MASK;
+	uint8_t ep = cfg->ep_addr & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep];
 	UsbDeviceDescriptor *desc = &data->descriptors[ep];
 	int type;
@@ -391,16 +391,16 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const cfg)
 		endpoint->EPSTATUSCLR.bit.BK0RDY = 1;
 	}
 
-	data->brk += cfg->ep_mps / sizeof(u32_t);
+	data->brk += cfg->ep_mps / sizeof(uint32_t);
 
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -417,11 +417,11 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -438,11 +438,11 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *stalled)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -465,15 +465,15 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *stalled)
 }
 
 /* Halt the selected endpoint */
-int usb_dc_ep_halt(u8_t ep)
+int usb_dc_ep_halt(uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
 /* Flush the selected endpoint */
-int usb_dc_ep_flush(u8_t ep)
+int usb_dc_ep_flush(uint8_t ep)
 {
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
 		LOG_ERR("endpoint index/address out of range");
@@ -487,11 +487,11 @@ int usb_dc_ep_flush(u8_t ep)
 }
 
 /* Enable an endpoint and the endpoint interrupts */
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -513,10 +513,10 @@ int usb_dc_ep_enable(const u8_t ep)
 }
 
 /* Disable the selected endpoint */
-int usb_dc_ep_disable(u8_t ep)
+int usb_dc_ep_disable(uint8_t ep)
 {
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -532,14 +532,14 @@ int usb_dc_ep_disable(u8_t ep)
 }
 
 /* Write a single payload to the IN buffer on the endpoint */
-int usb_dc_ep_write(u8_t ep, const u8_t *buf, u32_t len, u32_t *ret_bytes)
+int usb_dc_ep_write(uint8_t ep, const uint8_t *buf, uint32_t len, uint32_t *ret_bytes)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 	UsbDeviceDescriptor *desc = &data->descriptors[ep_num];
-	u32_t addr = desc->DeviceDescBank[1].ADDR.reg;
+	uint32_t addr = desc->DeviceDescBank[1].ADDR.reg;
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
 		LOG_ERR("endpoint index/address out of range");
@@ -568,17 +568,17 @@ int usb_dc_ep_write(u8_t ep, const u8_t *buf, u32_t len, u32_t *ret_bytes)
 }
 
 /* Read data from an OUT endpoint */
-int usb_dc_ep_read_ex(u8_t ep, u8_t *buf, u32_t max_data_len,
-		      u32_t *read_bytes, bool wait)
+int usb_dc_ep_read_ex(uint8_t ep, uint8_t *buf, uint32_t max_data_len,
+		      uint32_t *read_bytes, bool wait)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 	UsbDeviceDescriptor *desc = &data->descriptors[ep_num];
-	u32_t addr = desc->DeviceDescBank[0].ADDR.reg;
-	u32_t bytes = desc->DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT;
-	u32_t take;
+	uint32_t addr = desc->DeviceDescBank[0].ADDR.reg;
+	uint32_t bytes = desc->DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT;
+	uint32_t take;
 	int remain;
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -608,7 +608,7 @@ int usb_dc_ep_read_ex(u8_t ep, u8_t *buf, u32_t max_data_len,
 
 	remain = bytes - data->out_at;
 	take = MIN(max_data_len, remain);
-	memcpy(buf, (u8_t *)addr + data->out_at, take);
+	memcpy(buf, (uint8_t *)addr + data->out_at, take);
 
 	if (read_bytes != NULL) {
 		*read_bytes = take;
@@ -626,22 +626,22 @@ int usb_dc_ep_read_ex(u8_t ep, u8_t *buf, u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_read(u8_t ep, u8_t *buf, u32_t max_data_len, u32_t *read_bytes)
+int usb_dc_ep_read(uint8_t ep, uint8_t *buf, uint32_t max_data_len, uint32_t *read_bytes)
 {
 	return usb_dc_ep_read_ex(ep, buf, max_data_len, read_bytes, false);
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *buf, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *buf, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
 	return usb_dc_ep_read_ex(ep, buf, max_data_len, read_bytes, true);
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep_num];
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
@@ -655,11 +655,11 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 
 	if (ep_num >= USB_NUM_ENDPOINTS) {
 		LOG_ERR("endpoint index/address out of range");
@@ -671,12 +671,12 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
 	return 0;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
 	struct usb_sam0_data *data = usb_sam0_get_data();
 	UsbDevice *regs = &REGS->DEVICE;
-	u8_t for_in = ep & USB_EP_DIR_MASK;
-	u8_t ep_num = ep & ~USB_EP_DIR_MASK;
+	uint8_t for_in = ep & USB_EP_DIR_MASK;
+	uint8_t ep_num = ep & ~USB_EP_DIR_MASK;
 	UsbDeviceDescriptor *desc = &data->descriptors[ep_num];
 	UsbDeviceEndpoint *endpoint = &regs->DeviceEndpoint[ep];
 	int size;
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index 5812b29663..d92e80f68b 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -166,13 +166,13 @@ LOG_MODULE_REGISTER(usb_dc_stm32);
 
 /* Endpoint state */
 struct usb_dc_stm32_ep_state {
-	u16_t ep_mps;		/** Endpoint max packet size */
-	u16_t ep_pma_buf_len;	/** Previously allocated buffer size */
-	u8_t ep_type;		/** Endpoint type (STM32 HAL enum) */
-	u8_t ep_stalled;	/** Endpoint stall flag */
+	uint16_t ep_mps;		/** Endpoint max packet size */
+	uint16_t ep_pma_buf_len;	/** Previously allocated buffer size */
+	uint8_t ep_type;		/** Endpoint type (STM32 HAL enum) */
+	uint8_t ep_stalled;	/** Endpoint stall flag */
 	usb_dc_ep_callback cb;	/** Endpoint callback function */
-	u32_t read_count;	/** Number of bytes in read buffer  */
-	u32_t read_offset;	/** Current offset in read buffer */
+	uint32_t read_count;	/** Number of bytes in read buffer  */
+	uint32_t read_offset;	/** Current offset in read buffer */
 	struct k_sem write_sem;	/** Write boolean semaphore */
 };
 
@@ -182,10 +182,10 @@ struct usb_dc_stm32_state {
 	usb_dc_status_callback status_cb; /* Status callback */
 	struct usb_dc_stm32_ep_state out_ep_state[USB_NUM_BIDIR_ENDPOINTS];
 	struct usb_dc_stm32_ep_state in_ep_state[USB_NUM_BIDIR_ENDPOINTS];
-	u8_t ep_buf[USB_NUM_BIDIR_ENDPOINTS][EP_MPS];
+	uint8_t ep_buf[USB_NUM_BIDIR_ENDPOINTS][EP_MPS];
 
 #ifdef USB
-	u32_t pma_offset;
+	uint32_t pma_offset;
 #endif /* USB */
 };
 
@@ -193,7 +193,7 @@ static struct usb_dc_stm32_state usb_dc_stm32_state;
 
 /* Internal functions */
 
-static struct usb_dc_stm32_ep_state *usb_dc_stm32_get_ep_state(u8_t ep)
+static struct usb_dc_stm32_ep_state *usb_dc_stm32_get_ep_state(uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state_base;
 
@@ -311,16 +311,16 @@ static int usb_dc_stm32_clock_enable(void)
 }
 
 #if defined(USB_OTG_FS) || defined(USB_OTG_HS)
-static u32_t usb_dc_stm32_get_maximum_speed(void)
+static uint32_t usb_dc_stm32_get_maximum_speed(void)
 {
 	/*
 	 * If max-speed is not passed via DT, set it to USB controller's
 	 * maximum hardware capability.
 	 */
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32_usbphyc) && DT_HAS_COMPAT_STATUS_OKAY(st_stm32_otghs)
-	u32_t speed = USB_OTG_SPEED_HIGH;
+	uint32_t speed = USB_OTG_SPEED_HIGH;
 #else
-	u32_t speed = USB_OTG_SPEED_FULL;
+	uint32_t speed = USB_OTG_SPEED_FULL;
 #endif
 
 #ifdef USB_MAXIMUM_SPEED
@@ -492,7 +492,7 @@ int usb_dc_attach(void)
 	return 0;
 }
 
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb)
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
@@ -514,7 +514,7 @@ void usb_dc_set_status_callback(const usb_dc_status_callback cb)
 	usb_dc_stm32_state.status_cb = cb;
 }
 
-int usb_dc_set_address(const u8_t addr)
+int usb_dc_set_address(const uint8_t addr)
 {
 	HAL_StatusTypeDef status;
 
@@ -530,7 +530,7 @@ int usb_dc_set_address(const u8_t addr)
 	return 0;
 }
 
-int usb_dc_ep_start_read(u8_t ep, u8_t *data, u32_t max_data_len)
+int usb_dc_ep_start_read(uint8_t ep, uint8_t *data, uint32_t max_data_len)
 {
 	HAL_StatusTypeDef status;
 
@@ -558,7 +558,7 @@ int usb_dc_ep_start_read(u8_t ep, u8_t *data, u32_t max_data_len)
 	return 0;
 }
 
-int usb_dc_ep_get_read_count(u8_t ep, u32_t *read_bytes)
+int usb_dc_ep_get_read_count(uint8_t ep, uint32_t *read_bytes)
 {
 	if (!EP_IS_OUT(ep) || !read_bytes) {
 		LOG_ERR("invalid ep 0x%02x", ep);
@@ -572,7 +572,7 @@ int usb_dc_ep_get_read_count(u8_t ep, u32_t *read_bytes)
 
 int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 {
-	u8_t ep_idx = EP_IDX(cfg->ep_addr);
+	uint8_t ep_idx = EP_IDX(cfg->ep_addr);
 
 	LOG_DBG("ep %x, mps %d, type %d", cfg->ep_addr, cfg->ep_mps,
 		cfg->ep_type);
@@ -592,7 +592,7 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data * const cfg)
 
 int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const ep_cfg)
 {
-	u8_t ep = ep_cfg->ep_addr;
+	uint8_t ep = ep_cfg->ep_addr;
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
 	LOG_DBG("ep 0x%02x, previous ep_mps %u, ep_mps %u, ep_type %u",
@@ -637,7 +637,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const ep_cfg)
 	return 0;
 }
 
-int usb_dc_ep_set_stall(const u8_t ep)
+int usb_dc_ep_set_stall(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 	HAL_StatusTypeDef status;
@@ -660,7 +660,7 @@ int usb_dc_ep_set_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_clear_stall(const u8_t ep)
+int usb_dc_ep_clear_stall(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 	HAL_StatusTypeDef status;
@@ -684,7 +684,7 @@ int usb_dc_ep_clear_stall(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
@@ -699,7 +699,7 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled)
 	return 0;
 }
 
-int usb_dc_ep_enable(const u8_t ep)
+int usb_dc_ep_enable(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 	HAL_StatusTypeDef status;
@@ -730,7 +730,7 @@ int usb_dc_ep_enable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_disable(const u8_t ep)
+int usb_dc_ep_disable(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 	HAL_StatusTypeDef status;
@@ -751,12 +751,12 @@ int usb_dc_ep_disable(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t * const ret_bytes)
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t * const ret_bytes)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 	HAL_StatusTypeDef status;
-	u32_t len = data_len;
+	uint32_t len = data_len;
 	int ret = 0;
 
 	LOG_DBG("ep 0x%02x, len %u", ep, data_len);
@@ -807,11 +807,11 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
 	return ret;
 }
 
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes)
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
-	u32_t read_count;
+	uint32_t read_count;
 
 	if (!ep_state) {
 		LOG_ERR("Invalid Endpoint %x", ep);
@@ -849,7 +849,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_read_continue(u8_t ep)
+int usb_dc_ep_read_continue(uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
@@ -869,8 +869,8 @@ int usb_dc_ep_read_continue(u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_read(const u8_t ep, u8_t *const data, const u32_t max_data_len,
-		   u32_t * const read_bytes)
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data, const uint32_t max_data_len,
+		   uint32_t * const read_bytes)
 {
 	if (usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes) != 0) {
 		return -EINVAL;
@@ -883,12 +883,12 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data, const u32_t max_data_len,
 	return 0;
 }
 
-int usb_dc_ep_halt(const u8_t ep)
+int usb_dc_ep_halt(const uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
-int usb_dc_ep_flush(const u8_t ep)
+int usb_dc_ep_flush(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
@@ -901,7 +901,7 @@ int usb_dc_ep_flush(const u8_t ep)
 	return 0;
 }
 
-int usb_dc_ep_mps(const u8_t ep)
+int usb_dc_ep_mps(const uint8_t ep)
 {
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
@@ -1024,10 +1024,10 @@ void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd)
 	}
 }
 
-void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, u8_t epnum)
+void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 {
-	u8_t ep_idx = EP_IDX(epnum);
-	u8_t ep = ep_idx | USB_EP_DIR_OUT;
+	uint8_t ep_idx = EP_IDX(epnum);
+	uint8_t ep = ep_idx | USB_EP_DIR_OUT;
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
 	LOG_DBG("epnum 0x%02x, rx_count %u", epnum,
@@ -1044,10 +1044,10 @@ void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, u8_t epnum)
 	}
 }
 
-void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, u8_t epnum)
+void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 {
-	u8_t ep_idx = EP_IDX(epnum);
-	u8_t ep = ep_idx | USB_EP_DIR_IN;
+	uint8_t ep_idx = EP_IDX(epnum);
+	uint8_t ep = ep_idx | USB_EP_DIR_IN;
 	struct usb_dc_stm32_ep_state *ep_state = usb_dc_stm32_get_ep_state(ep);
 
 	LOG_DBG("epnum 0x%02x", epnum);
diff --git a/drivers/usb/device/usb_dw_registers.h b/drivers/usb/device/usb_dw_registers.h
index 62d86efaf2..bc53a0464e 100644
--- a/drivers/usb/device/usb_dw_registers.h
+++ b/drivers/usb/device/usb_dw_registers.h
@@ -46,71 +46,71 @@ enum usb_dw_out_ep_idx {
 
 /* USB IN EP Register block type */
 struct usb_dw_in_ep_reg {
-	volatile u32_t diepctl;
-	u32_t reserved;
-	volatile u32_t diepint;
-	u32_t reserved1;
-	volatile u32_t dieptsiz;
-	volatile u32_t diepdma;
-	volatile u32_t dtxfsts;
-	u32_t reserved2;
+	volatile uint32_t diepctl;
+	uint32_t reserved;
+	volatile uint32_t diepint;
+	uint32_t reserved1;
+	volatile uint32_t dieptsiz;
+	volatile uint32_t diepdma;
+	volatile uint32_t dtxfsts;
+	uint32_t reserved2;
 };
 
 /* USB OUT EP Register block type */
 struct usb_dw_out_ep_reg {
-	volatile u32_t doepctl;
-	u32_t reserved;
-	volatile u32_t doepint;
-	u32_t reserved1;
-	volatile u32_t doeptsiz;
-	volatile u32_t doepdma;
-	u32_t reserved2;
-	u32_t reserved3;
+	volatile uint32_t doepctl;
+	uint32_t reserved;
+	volatile uint32_t doepint;
+	uint32_t reserved1;
+	volatile uint32_t doeptsiz;
+	volatile uint32_t doepdma;
+	uint32_t reserved2;
+	uint32_t reserved3;
 };
 
 /* USB Register block type */
 struct usb_dw_reg {
-	volatile u32_t gotgctl;
-	volatile u32_t gotgint;
-	volatile u32_t gahbcfg;
-	volatile u32_t gusbcfg;
-	volatile u32_t grstctl;
-	volatile u32_t gintsts;
-	volatile u32_t gintmsk;
-	volatile u32_t grxstsr;
-	volatile u32_t grxstsp;
-	volatile u32_t grxfsiz;
-	volatile u32_t gnptxfsiz;
-	u32_t reserved[5];
-	volatile u32_t gsnpsid;
-	volatile u32_t ghwcfg1;
-	volatile u32_t ghwcfg2;
-	volatile u32_t ghwcfg3;
-	volatile u32_t ghwcfg4;
-	volatile u32_t gdfifocfg;
-	u32_t reserved1[43];
-	volatile u32_t dieptxf1;
-	volatile u32_t dieptxf2;
-	volatile u32_t dieptxf3;
-	volatile u32_t dieptxf4;
-	volatile u32_t dieptxf5;
-	u32_t reserved2[442];
-	volatile u32_t dcfg;
-	volatile u32_t dctl;
-	volatile u32_t dsts;
-	u32_t reserved3;
-	volatile u32_t diepmsk;
-	volatile u32_t doepmsk;
-	volatile u32_t daint;
-	volatile u32_t daintmsk;
-	u32_t reserved4[2];
-	volatile u32_t dvbusdis;
-	volatile u32_t dvbuspulse;
-	volatile u32_t dthrctl;
-	volatile u32_t diepempmsk;
-	u32_t reserved5[50];
+	volatile uint32_t gotgctl;
+	volatile uint32_t gotgint;
+	volatile uint32_t gahbcfg;
+	volatile uint32_t gusbcfg;
+	volatile uint32_t grstctl;
+	volatile uint32_t gintsts;
+	volatile uint32_t gintmsk;
+	volatile uint32_t grxstsr;
+	volatile uint32_t grxstsp;
+	volatile uint32_t grxfsiz;
+	volatile uint32_t gnptxfsiz;
+	uint32_t reserved[5];
+	volatile uint32_t gsnpsid;
+	volatile uint32_t ghwcfg1;
+	volatile uint32_t ghwcfg2;
+	volatile uint32_t ghwcfg3;
+	volatile uint32_t ghwcfg4;
+	volatile uint32_t gdfifocfg;
+	uint32_t reserved1[43];
+	volatile uint32_t dieptxf1;
+	volatile uint32_t dieptxf2;
+	volatile uint32_t dieptxf3;
+	volatile uint32_t dieptxf4;
+	volatile uint32_t dieptxf5;
+	uint32_t reserved2[442];
+	volatile uint32_t dcfg;
+	volatile uint32_t dctl;
+	volatile uint32_t dsts;
+	uint32_t reserved3;
+	volatile uint32_t diepmsk;
+	volatile uint32_t doepmsk;
+	volatile uint32_t daint;
+	volatile uint32_t daintmsk;
+	uint32_t reserved4[2];
+	volatile uint32_t dvbusdis;
+	volatile uint32_t dvbuspulse;
+	volatile uint32_t dthrctl;
+	volatile uint32_t diepempmsk;
+	uint32_t reserved5[50];
 	struct usb_dw_in_ep_reg in_ep_reg[USB_DW_IN_EP_NUM];
-	u32_t reserved6[80];
+	uint32_t reserved6[80];
 	struct usb_dw_out_ep_reg out_ep_reg[USB_DW_OUT_EP_NUM];
 };
 
@@ -198,7 +198,7 @@ struct usb_dw_reg {
 #define USB_DW_PLL_TIMEOUT_US 100
 
 #define USB_DW_EP_FIFO(ep)						\
-	(*(u32_t *)(DT_INST_REG_ADDR(0) + 0x1000 * (ep + 1)))
+	(*(uint32_t *)(DT_INST_REG_ADDR(0) + 0x1000 * (ep + 1)))
 /* USB register block base address */
 #define USB_DW ((struct usb_dw_reg *)DT_INST_REG_ADDR(0))
 
diff --git a/drivers/video/mt9m114.c b/drivers/video/mt9m114.c
index 6dde84cf1e..f738c4bc74 100644
--- a/drivers/video/mt9m114.c
+++ b/drivers/video/mt9m114.c
@@ -51,13 +51,13 @@ LOG_MODULE_REGISTER(mt9m114);
 struct mt9m114_data {
 	struct device *i2c;
 	struct video_format fmt;
-	u8_t i2c_addr;
+	uint8_t i2c_addr;
 };
 
 struct mt9m114_reg {
-	u16_t addr;
-	u16_t value_size;
-	u32_t value;
+	uint16_t addr;
+	uint16_t value_size;
+	uint32_t value;
 };
 
 static struct mt9m114_reg mt9m114_vga_24mhz_pll[] = {
@@ -101,10 +101,10 @@ static struct mt9m114_reg mt9m114_vga_24mhz_pll[] = {
 	{ /* NULL terminated */ }
 };
 
-static inline int i2c_burst_read16(struct device *dev, u16_t dev_addr,
-				   u16_t start_addr, u8_t *buf, u32_t num_bytes)
+static inline int i2c_burst_read16(struct device *dev, uint16_t dev_addr,
+				   uint16_t start_addr, uint8_t *buf, uint32_t num_bytes)
 {
-	u8_t addr_buffer[2];
+	uint8_t addr_buffer[2];
 
 	addr_buffer[1] = start_addr & 0xFF;
 	addr_buffer[0] = start_addr >> 8;
@@ -112,11 +112,11 @@ static inline int i2c_burst_read16(struct device *dev, u16_t dev_addr,
 			      buf, num_bytes);
 }
 
-static inline int i2c_burst_write16(struct device *dev, u16_t dev_addr,
-				    u16_t start_addr, const u8_t *buf,
-				    u32_t num_bytes)
+static inline int i2c_burst_write16(struct device *dev, uint16_t dev_addr,
+				    uint16_t start_addr, const uint8_t *buf,
+				    uint32_t num_bytes)
 {
-	u8_t addr_buffer[2];
+	uint8_t addr_buffer[2];
 	struct i2c_msg msg[2];
 
 	addr_buffer[1] = start_addr & 0xFF;
@@ -125,24 +125,24 @@ static inline int i2c_burst_write16(struct device *dev, u16_t dev_addr,
 	msg[0].len = 2U;
 	msg[0].flags = I2C_MSG_WRITE;
 
-	msg[1].buf = (u8_t *)buf;
+	msg[1].buf = (uint8_t *)buf;
 	msg[1].len = num_bytes;
 	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
 
 	return i2c_transfer(dev, msg, 2, dev_addr);
 }
 
-static int mt9m114_write_reg(struct device *dev, u16_t reg_addr, u8_t reg_size,
+static int mt9m114_write_reg(struct device *dev, uint16_t reg_addr, uint8_t reg_size,
 			     void *value)
 {
 	struct mt9m114_data *drv_data = dev->driver_data;
 
 	switch (reg_size) {
 	case 2:
-		*(u16_t *)value = sys_cpu_to_be16(*(u16_t *)value);
+		*(uint16_t *)value = sys_cpu_to_be16(*(uint16_t *)value);
 		break;
 	case 4:
-		*(u16_t *)value = sys_cpu_to_be32(*(u16_t *)value);
+		*(uint16_t *)value = sys_cpu_to_be32(*(uint16_t *)value);
 		break;
 	case 1:
 		break;
@@ -154,7 +154,7 @@ static int mt9m114_write_reg(struct device *dev, u16_t reg_addr, u8_t reg_size,
 				 value, reg_size);
 }
 
-static int mt9m114_read_reg(struct device *dev, u16_t reg_addr, u8_t reg_size,
+static int mt9m114_read_reg(struct device *dev, uint16_t reg_addr, uint8_t reg_size,
 			    void *value)
 {
 	struct mt9m114_data *drv_data = dev->driver_data;
@@ -172,10 +172,10 @@ static int mt9m114_read_reg(struct device *dev, u16_t reg_addr, u8_t reg_size,
 
 	switch (reg_size) {
 	case 2:
-		*(u16_t *)value = sys_be16_to_cpu(*(u16_t *)value);
+		*(uint16_t *)value = sys_be16_to_cpu(*(uint16_t *)value);
 		break;
 	case 4:
-		*(u32_t *)value = sys_be32_to_cpu(*(u32_t *)value);
+		*(uint32_t *)value = sys_be32_to_cpu(*(uint32_t *)value);
 		break;
 	case 1:
 		break;
@@ -205,9 +205,9 @@ static int mt9m114_write_all(struct device *dev, struct mt9m114_reg *reg)
 	return 0;
 }
 
-static int mt9m114_set_state(struct device *dev, u8_t state)
+static int mt9m114_set_state(struct device *dev, uint8_t state)
 {
-	u16_t val;
+	uint16_t val;
 	int err;
 
 	/* Set next state. */
@@ -258,7 +258,7 @@ static int mt9m114_set_fmt(struct device *dev, enum video_endpoint_id ep,
 			   struct video_format *fmt)
 {
 	struct mt9m114_data *drv_data = dev->driver_data;
-	u16_t output_format;
+	uint16_t output_format;
 	int ret;
 
 	/* we only support one format for now (VGA RGB565) */
@@ -347,7 +347,7 @@ static const struct video_driver_api mt9m114_driver_api = {
 static int mt9m114_init(struct device *dev)
 {
 	struct video_format fmt;
-	u16_t val;
+	uint16_t val;
 	int ret;
 
 	/* no power control, wait for camera ready */
diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c
index e41a938ec1..8f639ee576 100644
--- a/drivers/video/video_mcux_csi.c
+++ b/drivers/video/video_mcux_csi.c
@@ -27,11 +27,11 @@ struct video_mcux_csi_data {
 	csi_handle_t csi_handle;
 	struct k_fifo fifo_in;
 	struct k_fifo fifo_out;
-	u32_t pixelformat;
+	uint32_t pixelformat;
 	struct k_poll_signal *signal;
 };
 
-static inline unsigned int video_pix_fmt_bpp(u32_t pixelformat)
+static inline unsigned int video_pix_fmt_bpp(uint32_t pixelformat)
 {
 	switch (pixelformat) {
 	case VIDEO_PIX_FMT_BGGR8:
@@ -54,7 +54,7 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle,
 	struct video_mcux_csi_data *data = dev->driver_data;
 	enum video_signal_result result = VIDEO_BUF_DONE;
 	struct video_buffer *vbuf, *vbuf_first = NULL;
-	u32_t buffer_addr;
+	uint32_t buffer_addr;
 
 	/* IRQ context */
 
@@ -71,7 +71,7 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle,
 
 	/* Get matching vbuf by addr */
 	while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT))) {
-		if ((u32_t)vbuf->buffer == buffer_addr) {
+		if ((uint32_t)vbuf->buffer == buffer_addr) {
 			break;
 		}
 
@@ -217,7 +217,7 @@ static int video_mcux_csi_flush(struct device *dev, enum video_endpoint_id ep,
 	const struct video_mcux_csi_config *config = dev->config_info;
 	struct video_mcux_csi_data *data = dev->driver_data;
 	struct video_buf *vbuf;
-	u32_t buffer_addr;
+	uint32_t buffer_addr;
 	status_t ret;
 
 	if (!cancel) {
@@ -261,7 +261,7 @@ static int video_mcux_csi_enqueue(struct device *dev, enum video_endpoint_id ep,
 	vbuf->bytesused = to_read;
 
 	ret = CSI_TransferSubmitEmptyBuffer(config->base, &data->csi_handle,
-					    (u32_t)vbuf->buffer);
+					    (uint32_t)vbuf->buffer);
 	if (ret != kStatus_Success) {
 		return -EIO;
 	}
diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c
index 5fbd3fa139..447505fa03 100644
--- a/drivers/video/video_sw_generator.c
+++ b/drivers/video/video_sw_generator.c
@@ -69,7 +69,7 @@ static int video_sw_generator_stream_stop(struct device *dev)
 }
 
 /* Black, Blue, Red, Purple, Green, Aqua, Yellow, White */
-u16_t rgb565_colorbar_value[] = { 0x0000, 0x001F, 0xF800, 0xF81F,
+uint16_t rgb565_colorbar_value[] = { 0x0000, 0x001F, 0xF800, 0xF81F,
 				  0x07E0, 0x07FF, 0xFFE0, 0xFFFF };
 
 static void __fill_buffer_colorbar(struct video_sw_generator_data *data,
@@ -82,7 +82,7 @@ static void __fill_buffer_colorbar(struct video_sw_generator_data *data,
 		for (w = 0; w < data->fmt.width; w++) {
 			int color_idx =  data->ctrl_vflip ? 7 - w / bw : w / bw;
 			if (data->fmt.pixelformat == VIDEO_PIX_FMT_RGB565) {
-				u16_t *pixel = (u16_t *)&vbuf->buffer[i];
+				uint16_t *pixel = (uint16_t *)&vbuf->buffer[i];
 				*pixel = rgb565_colorbar_value[color_idx];
 				i += 2;
 			}
diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c
index 0bbfd2ff89..a0e10633ee 100644
--- a/drivers/watchdog/wdt_cmsdk_apb.c
+++ b/drivers/watchdog/wdt_cmsdk_apb.c
@@ -18,25 +18,25 @@
 
 struct wdog_cmsdk_apb {
 	/* offset: 0x000 (r/w) watchdog load register */
-	volatile u32_t  load;
+	volatile uint32_t  load;
 	/* offset: 0x004 (r/ ) watchdog value register */
-	volatile u32_t  value;
+	volatile uint32_t  value;
 	/* offset: 0x008 (r/w) watchdog control register */
-	volatile u32_t  ctrl;
+	volatile uint32_t  ctrl;
 	/* offset: 0x00c ( /w) watchdog clear interrupt register */
-	volatile u32_t  intclr;
+	volatile uint32_t  intclr;
 	/* offset: 0x010 (r/ ) watchdog raw interrupt status register */
-	volatile u32_t  rawintstat;
+	volatile uint32_t  rawintstat;
 	/* offset: 0x014 (r/ ) watchdog interrupt status register */
-	volatile u32_t  maskintstat;
-	volatile u32_t  reserved0[762];
+	volatile uint32_t  maskintstat;
+	volatile uint32_t  reserved0[762];
 	/* offset: 0xc00 (r/w) watchdog lock register */
-	volatile u32_t  lock;
-	volatile u32_t  reserved1[191];
+	volatile uint32_t  lock;
+	volatile uint32_t  reserved1[191];
 	/* offset: 0xf00 (r/w) watchdog integration test control register */
-	volatile u32_t  itcr;
+	volatile uint32_t  itcr;
 	/* offset: 0xf04 ( /w) watchdog integration test output set register */
-	volatile u32_t  itop;
+	volatile uint32_t  itop;
 };
 
 #define CMSDK_APB_WDOG_LOAD		(0xFFFFFFFF << 0)
@@ -66,7 +66,7 @@ struct device *wdog_r;
 
 /* watchdog reload value in sec */
 static unsigned int reload_s = CMSDK_APB_WDOG_RELOAD;
-static u8_t flags;
+static uint8_t flags;
 
 static void (*user_cb)(struct device *dev, int channel_id);
 
@@ -79,7 +79,7 @@ static void wdog_cmsdk_apb_unlock(struct device *dev)
 	wdog->lock = CMSDK_APB_WDOG_UNLOCK_VALUE;
 }
 
-static int wdog_cmsdk_apb_setup(struct device *dev, u8_t options)
+static int wdog_cmsdk_apb_setup(struct device *dev, uint8_t options)
 {
 	volatile struct wdog_cmsdk_apb *wdog = WDOG_STRUCT;
 
diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c
index fc67b8f99a..77bfb4da5e 100644
--- a/drivers/watchdog/wdt_esp32.c
+++ b/drivers/watchdog/wdt_esp32.c
@@ -20,19 +20,19 @@
  * That's why the type name starts with `timer` not `wdt`
  */
 struct timer_esp32_irq_regs_t {
-	u32_t *timer_int_ena;
-	u32_t *timer_int_clr;
+	uint32_t *timer_int_ena;
+	uint32_t *timer_int_clr;
 };
 
 struct wdt_esp32_regs_t {
-	u32_t config0;
-	u32_t config1;
-	u32_t config2;
-	u32_t config3;
-	u32_t config4;
-	u32_t config5;
-	u32_t feed;
-	u32_t wprotect;
+	uint32_t config0;
+	uint32_t config1;
+	uint32_t config2;
+	uint32_t config3;
+	uint32_t config4;
+	uint32_t config5;
+	uint32_t feed;
+	uint32_t wprotect;
 };
 
 enum wdt_mode {
@@ -41,7 +41,7 @@ enum wdt_mode {
 };
 
 struct wdt_esp32_data {
-	u32_t timeout;
+	uint32_t timeout;
 	enum wdt_mode mode;
 	wdt_callback_t callback;
 };
@@ -96,7 +96,7 @@ static int wdt_esp32_disable(struct device *dev)
 	return 0;
 }
 
-static void adjust_timeout(struct device *dev, u32_t timeout)
+static void adjust_timeout(struct device *dev, uint32_t timeout)
 {
 	/* MWDT ticks every 12.5ns.  Set the prescaler to 40000, so the
 	 * counter for each watchdog stage is decremented every 0.5ms.
@@ -130,10 +130,10 @@ static void set_interrupt_enabled(struct device *dev, bool setting)
 	}
 }
 
-static int wdt_esp32_set_config(struct device *dev, u8_t options)
+static int wdt_esp32_set_config(struct device *dev, uint8_t options)
 {
 	struct wdt_esp32_data *data = DEV_DATA(dev);
-	u32_t v = DEV_BASE(dev)->config0;
+	uint32_t v = DEV_BASE(dev)->config0;
 
 	if (!data) {
 		return -EINVAL;
@@ -241,8 +241,8 @@ static const struct wdt_driver_api wdt_api = {
 	static struct wdt_esp32_config wdt_esp32_config##idx = {					   \
 		.base = (struct wdt_esp32_regs_t *) DT_INST_REG_ADDR(idx), \
 		.irq_regs = {										   \
-			.timer_int_ena = (u32_t *)TIMG_INT_ENA_TIMERS_REG(idx),				   \
-			.timer_int_clr = (u32_t *)TIMG_INT_CLR_TIMERS_REG(idx),				   \
+			.timer_int_ena = (uint32_t *)TIMG_INT_ENA_TIMERS_REG(idx),				   \
+			.timer_int_clr = (uint32_t *)TIMG_INT_CLR_TIMERS_REG(idx),				   \
 		},											   \
 		.irq = {										   \
 			.source =  ETS_TG##idx##_WDT_LEVEL_INTR_SOURCE,					   \
diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c
index 3266d6e6fe..249d0fbf10 100644
--- a/drivers/watchdog/wdt_gecko.c
+++ b/drivers/watchdog/wdt_gecko.c
@@ -38,7 +38,7 @@ struct wdt_gecko_data {
 #define DEV_CFG(dev) \
 	((const struct wdt_gecko_cfg *)(dev)->config_info)
 
-static u32_t wdt_gecko_get_timeout_from_persel(int perSel)
+static uint32_t wdt_gecko_get_timeout_from_persel(int perSel)
 {
 	return (8 << perSel) + 1;
 }
@@ -46,7 +46,7 @@ static u32_t wdt_gecko_get_timeout_from_persel(int perSel)
 /* Find the rounded up value of cycles for supplied timeout. When using ULFRCO
  * (default), 1 cycle is 1 ms +/- 12%.
  */
-static int wdt_gecko_get_persel_from_timeout(u32_t timeout)
+static int wdt_gecko_get_persel_from_timeout(uint32_t timeout)
 {
 	int idx;
 
@@ -59,10 +59,10 @@ static int wdt_gecko_get_persel_from_timeout(u32_t timeout)
 	return idx;
 }
 
-static int wdt_gecko_convert_window(u32_t window, u32_t period)
+static int wdt_gecko_convert_window(uint32_t window, uint32_t period)
 {
 	int idx = 0;
-	u32_t incr_val, comp_val;
+	uint32_t incr_val, comp_val;
 
 	incr_val = period / 8;
 	comp_val = 0; /* Initially 0, disable */
@@ -83,7 +83,7 @@ static int wdt_gecko_convert_window(u32_t window, u32_t period)
 	return idx;
 }
 
-static int wdt_gecko_setup(struct device *dev, u8_t options)
+static int wdt_gecko_setup(struct device *dev, uint8_t options)
 {
 	const struct wdt_gecko_cfg *config = DEV_CFG(dev);
 	struct wdt_gecko_data *data = DEV_DATA(dev);
@@ -138,7 +138,7 @@ static int wdt_gecko_install_timeout(struct device *dev,
 {
 	struct wdt_gecko_data *data = DEV_DATA(dev);
 	data->wdog_config = (WDOG_Init_TypeDef)WDOG_INIT_DEFAULT;
-	u32_t installed_timeout;
+	uint32_t installed_timeout;
 
 	if (data->timeout_installed) {
 		LOG_ERR("No more timeouts can be installed");
@@ -228,7 +228,7 @@ static void wdt_gecko_isr(void *arg)
 	const struct wdt_gecko_cfg *config = DEV_CFG(dev);
 	struct wdt_gecko_data *data = DEV_DATA(dev);
 	WDOG_TypeDef *wdog = config->base;
-	u32_t flags;
+	uint32_t flags;
 
 	/* Clear IRQ flags */
 	flags = WDOGn_IntGet(wdog);
diff --git a/drivers/watchdog/wdt_handlers.c b/drivers/watchdog/wdt_handlers.c
index d6a9a78e16..646235b6de 100644
--- a/drivers/watchdog/wdt_handlers.c
+++ b/drivers/watchdog/wdt_handlers.c
@@ -7,7 +7,7 @@
 #include <drivers/watchdog.h>
 #include <syscall_handler.h>
 
-static inline int z_vrfy_wdt_setup(struct device *dev, u8_t options)
+static inline int z_vrfy_wdt_setup(struct device *dev, uint8_t options)
 {
 	Z_OOPS(Z_SYSCALL_DRIVER_WDT(dev, setup));
 	return z_impl_wdt_setup(dev, options);
diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c
index fc91e53d4d..83685ec99b 100644
--- a/drivers/watchdog/wdt_iwdg_stm32.c
+++ b/drivers/watchdog/wdt_iwdg_stm32.c
@@ -39,16 +39,16 @@
  * @param prescaler Pointer to prescaler value.
  * @param reload Pointer to reload value.
  */
-static void iwdg_stm32_convert_timeout(u32_t timeout,
-				       u32_t *prescaler,
-				       u32_t *reload)
+static void iwdg_stm32_convert_timeout(uint32_t timeout,
+				       uint32_t *prescaler,
+				       uint32_t *reload)
 {
 
-	u16_t divider = 0U;
-	u8_t shift = 0U;
+	uint16_t divider = 0U;
+	uint8_t shift = 0U;
 
 	/* Convert timeout to seconds. */
-	u32_t m_timeout = (u64_t)timeout * LSI_VALUE / 1000000;
+	uint32_t m_timeout = (uint64_t)timeout * LSI_VALUE / 1000000;
 
 	do {
 		divider = 4 << shift;
@@ -60,10 +60,10 @@ static void iwdg_stm32_convert_timeout(u32_t timeout,
 	 * defines of LL_IWDG_PRESCALER_XX type.
 	 */
 	*prescaler = --shift;
-	*reload = (u32_t)(m_timeout / divider) - 1;
+	*reload = (uint32_t)(m_timeout / divider) - 1;
 }
 
-static int iwdg_stm32_setup(struct device *dev, u8_t options)
+static int iwdg_stm32_setup(struct device *dev, uint8_t options)
 {
 	IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev);
 
@@ -97,10 +97,10 @@ static int iwdg_stm32_install_timeout(struct device *dev,
 				      const struct wdt_timeout_cfg *config)
 {
 	IWDG_TypeDef *iwdg = IWDG_STM32_STRUCT(dev);
-	u32_t timeout = config->window.max * USEC_PER_MSEC;
-	u32_t prescaler = 0U;
-	u32_t reload = 0U;
-	u32_t tickstart;
+	uint32_t timeout = config->window.max * USEC_PER_MSEC;
+	uint32_t prescaler = 0U;
+	uint32_t reload = 0U;
+	uint32_t tickstart;
 
 	if (config->callback != NULL) {
 		return -ENOTSUP;
diff --git a/drivers/watchdog/wdt_mchp_xec.c b/drivers/watchdog/wdt_mchp_xec.c
index b0ad027ab5..f63ab264c5 100644
--- a/drivers/watchdog/wdt_mchp_xec.c
+++ b/drivers/watchdog/wdt_mchp_xec.c
@@ -28,7 +28,7 @@ struct wdt_xec_data {
 
 DEVICE_DECLARE(wdt_xec);
 
-static int wdt_xec_setup(struct device *dev, u8_t options)
+static int wdt_xec_setup(struct device *dev, uint8_t options)
 {
 	WDT_Type *wdt_regs = WDT_XEC_REG_BASE;
 	struct wdt_xec_data *data = dev->driver_data;
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index 259122b914..cd92526511 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -30,7 +30,7 @@ struct mcux_wdog_data {
 	bool timeout_valid;
 };
 
-static int mcux_wdog_setup(struct device *dev, u8_t options)
+static int mcux_wdog_setup(struct device *dev, uint8_t options)
 {
 	const struct mcux_wdog_config *config = dev->config_info;
 	struct mcux_wdog_data *data = dev->driver_data;
@@ -72,7 +72,7 @@ static int mcux_wdog_install_timeout(struct device *dev,
 	const struct mcux_wdog_config *config = dev->config_info;
 	struct mcux_wdog_data *data = dev->driver_data;
 	struct device *clock_dev;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 
 	if (data->timeout_valid) {
 		LOG_ERR("No more timeouts can be installed");
@@ -138,7 +138,7 @@ static void mcux_wdog_isr(void *arg)
 	const struct mcux_wdog_config *config = dev->config_info;
 	struct mcux_wdog_data *data = dev->driver_data;
 	WDOG_Type *base = config->base;
-	u32_t flags;
+	uint32_t flags;
 
 	flags = WDOG_GetStatusFlags(base);
 	WDOG_ClearStatusFlags(base, flags);
diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c
index 8a757fe3b5..a8114153b7 100644
--- a/drivers/watchdog/wdt_mcux_wdog32.c
+++ b/drivers/watchdog/wdt_mcux_wdog32.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(wdt_mcux_wdog32);
 struct mcux_wdog32_config {
 	WDOG_Type *base;
 #if DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, clocks), clock_frequency)
-	u32_t clock_frequency;
+	uint32_t clock_frequency;
 #else /* !DT_NODE_HAS_PROP(DT_INST_PHANDLE(0, clocks), clock_frequency) */
 	char *clock_name;
 	clock_control_subsys_t clock_subsys;
@@ -38,7 +38,7 @@ struct mcux_wdog32_data {
 	bool timeout_valid;
 };
 
-static int mcux_wdog32_setup(struct device *dev, u8_t options)
+static int mcux_wdog32_setup(struct device *dev, uint8_t options)
 {
 	const struct mcux_wdog32_config *config = dev->config_info;
 	struct mcux_wdog32_data *data = dev->driver_data;
@@ -75,14 +75,14 @@ static int mcux_wdog32_disable(struct device *dev)
 }
 
 #define MSEC_TO_WDOG32_TICKS(clock_freq, divider, msec) \
-	((u32_t)(clock_freq * msec / 1000U / divider))
+	((uint32_t)(clock_freq * msec / 1000U / divider))
 
 static int mcux_wdog32_install_timeout(struct device *dev,
 				       const struct wdt_timeout_cfg *cfg)
 {
 	const struct mcux_wdog32_config *config = dev->config_info;
 	struct mcux_wdog32_data *data = dev->driver_data;
-	u32_t clock_freq;
+	uint32_t clock_freq;
 	int div;
 
 	if (data->timeout_valid) {
@@ -159,7 +159,7 @@ static void mcux_wdog32_isr(void *arg)
 	const struct mcux_wdog32_config *config = dev->config_info;
 	struct mcux_wdog32_data *data = dev->driver_data;
 	WDOG_Type *base = config->base;
-	u32_t flags;
+	uint32_t flags;
 
 	flags = WDOG32_GetStatusFlags(base);
 	WDOG32_ClearStatusFlags(base, flags);
diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index ec102138aa..1f93e2fae5 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -13,8 +13,8 @@ LOG_MODULE_REGISTER(wdt_nrfx);
 
 struct wdt_nrfx_data {
 	wdt_callback_t m_callbacks[NRF_WDT_CHANNEL_NUMBER];
-	u32_t m_timeout;
-	u8_t m_allocated_channels;
+	uint32_t m_timeout;
+	uint8_t m_allocated_channels;
 };
 
 struct wdt_nrfx_config {
@@ -33,7 +33,7 @@ static inline const struct wdt_nrfx_config *get_dev_config(struct device *dev)
 }
 
 
-static int wdt_nrf_setup(struct device *dev, u8_t options)
+static int wdt_nrf_setup(struct device *dev, uint8_t options)
 {
 	nrf_wdt_behaviour_t behaviour;
 
diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c
index 446b6145cc..5bf908c847 100644
--- a/drivers/watchdog/wdt_sam.c
+++ b/drivers/watchdog/wdt_sam.c
@@ -38,7 +38,7 @@ static struct device DEVICE_NAME_GET(wdt_sam);
 
 struct wdt_sam_dev_data {
 	wdt_callback_t cb;
-	u32_t mode;
+	uint32_t mode;
 	bool timeout_valid;
 	bool mode_set;
 };
@@ -50,7 +50,7 @@ static struct wdt_sam_dev_data wdt_sam_data = { 0 };
 
 static void wdt_sam_isr(struct device *dev)
 {
-	u32_t wdt_sr;
+	uint32_t wdt_sr;
 	Wdt *const wdt = DEV_CFG(dev)->regs;
 	struct wdt_sam_dev_data *data = dev->driver_data;
 
@@ -67,9 +67,9 @@ static void wdt_sam_isr(struct device *dev)
  * @param timeout Timeout value in milliseconds.
  * @param slow clock on board in Hz.
  */
-int wdt_sam_convert_timeout(u32_t timeout, u32_t sclk)
+int wdt_sam_convert_timeout(uint32_t timeout, uint32_t sclk)
 {
-	u32_t max, min;
+	uint32_t max, min;
 
 	timeout = timeout * 1000U;
 	min =  (SAM_PRESCALAR * 1000000) / sclk;
@@ -106,7 +106,7 @@ static int wdt_sam_disable(struct device *dev)
 	return 0;
 }
 
-static int wdt_sam_setup(struct device *dev, u8_t options)
+static int wdt_sam_setup(struct device *dev, uint8_t options)
 {
 
 	Wdt *const wdt = DEV_CFG(dev)->regs;
@@ -142,7 +142,7 @@ static int wdt_sam_setup(struct device *dev, u8_t options)
 static int wdt_sam_install_timeout(struct device *dev,
 				   const struct wdt_timeout_cfg *cfg)
 {
-	u32_t wdt_mode = 0U;
+	uint32_t wdt_mode = 0U;
 	int timeout_value;
 
 	struct wdt_sam_dev_data *data = dev->driver_data;
@@ -162,7 +162,7 @@ static int wdt_sam_install_timeout(struct device *dev,
 	 * in the max field of the timeout config.
 	 */
 	timeout_value = wdt_sam_convert_timeout(cfg->window.max,
-						(u32_t) CHIP_FREQ_XTAL_32K);
+						(uint32_t) CHIP_FREQ_XTAL_32K);
 
 	if (timeout_value < 0) {
 		return -EINVAL;
diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c
index 94d7eb44ab..47bd266bc6 100644
--- a/drivers/watchdog/wdt_sam0.c
+++ b/drivers/watchdog/wdt_sam0.c
@@ -64,10 +64,10 @@ static inline bool wdt_sam0_is_enabled(void)
 #endif
 }
 
-static u32_t wdt_sam0_timeout_to_wdt_period(u32_t timeout_ms)
+static uint32_t wdt_sam0_timeout_to_wdt_period(uint32_t timeout_ms)
 {
-	u32_t next_pow2;
-	u32_t cycles;
+	uint32_t next_pow2;
+	uint32_t cycles;
 
 	/* Calculate number of clock cycles @ 1.024 kHz input clock */
 	cycles = (timeout_ms * 1024U) / 1000;
@@ -93,7 +93,7 @@ static void wdt_sam0_isr(struct device *dev)
 	}
 }
 
-static int wdt_sam0_setup(struct device *dev, u8_t options)
+static int wdt_sam0_setup(struct device *dev, uint8_t options)
 {
 	struct wdt_sam0_dev_data *data = dev->driver_data;
 
@@ -140,7 +140,7 @@ static int wdt_sam0_install_timeout(struct device *dev,
 				const struct wdt_timeout_cfg *cfg)
 {
 	struct wdt_sam0_dev_data *data = dev->driver_data;
-	u32_t window, per;
+	uint32_t window, per;
 
 	/* CONFIG is enable protected, error out if already enabled */
 	if (wdt_sam0_is_enabled()) {
diff --git a/drivers/watchdog/wdt_wwdg_stm32.c b/drivers/watchdog/wdt_wwdg_stm32.c
index e64a2a201c..df7778c716 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.c
+++ b/drivers/watchdog/wdt_wwdg_stm32.c
@@ -63,11 +63,11 @@ LOG_MODULE_REGISTER(wdt_wwdg_stm32);
 
 static void wwdg_stm32_irq_config(struct device *dev);
 
-static u32_t wwdg_stm32_get_pclk(struct device *dev)
+static uint32_t wwdg_stm32_get_pclk(struct device *dev)
 {
 	struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME);
 	const struct wwdg_stm32_config *cfg = WWDG_STM32_CFG(dev);
-	u32_t pclk_rate;
+	uint32_t pclk_rate;
 
 	__ASSERT_NO_MSG(clk);
 
@@ -88,10 +88,10 @@ static u32_t wwdg_stm32_get_pclk(struct device *dev)
  * @param counter The counter value.
  * @return The timeout calculated in microseconds.
  */
-static u32_t wwdg_stm32_get_timeout(struct device *dev, u32_t prescaler,
-				    u32_t counter)
+static uint32_t wwdg_stm32_get_timeout(struct device *dev, uint32_t prescaler,
+				    uint32_t counter)
 {
-	u32_t divider = WWDG_INTERNAL_DIVIDER * (1 << (prescaler >> 7));
+	uint32_t divider = WWDG_INTERNAL_DIVIDER * (1 << (prescaler >> 7));
 	float f_wwdg = (float)wwdg_stm32_get_pclk(dev) / divider;
 
 	return USEC_PER_SEC * (((counter & 0x3F) + 1) / f_wwdg);
@@ -105,13 +105,13 @@ static u32_t wwdg_stm32_get_timeout(struct device *dev, u32_t prescaler,
  * @param prescaler Pointer to prescaler value.
  * @param counter Pointer to counter value.
  */
-static void wwdg_stm32_convert_timeout(struct device *dev, u32_t timeout,
-				       u32_t *prescaler,
-				       u32_t *counter)
+static void wwdg_stm32_convert_timeout(struct device *dev, uint32_t timeout,
+				       uint32_t *prescaler,
+				       uint32_t *counter)
 {
-	u32_t clock_freq = wwdg_stm32_get_pclk(dev);
-	u8_t divider = 0U;
-	u8_t shift = 3U;
+	uint32_t clock_freq = wwdg_stm32_get_pclk(dev);
+	uint8_t divider = 0U;
+	uint8_t shift = 3U;
 
 	/* Convert timeout to seconds. */
 	float timeout_s = (float)timeout / USEC_PER_SEC;
@@ -123,7 +123,7 @@ static void wwdg_stm32_convert_timeout(struct device *dev, u32_t timeout,
 	for (divider = 8; divider >= 1; divider >>= 1) {
 		wwdg_freq = ((float)clock_freq) / WWDG_INTERNAL_DIVIDER / divider;
 		/* +1 to ceil the result, which may lose from truncation */
-		*counter = (u32_t)(timeout_s * wwdg_freq + 1) - 1;
+		*counter = (uint32_t)(timeout_s * wwdg_freq + 1) - 1;
 		*counter |= WWDG_RESET_LIMIT;
 		*prescaler = shift << 7;
 
@@ -135,7 +135,7 @@ static void wwdg_stm32_convert_timeout(struct device *dev, u32_t timeout,
 	}
 }
 
-static int wwdg_stm32_setup(struct device *dev, u8_t options)
+static int wwdg_stm32_setup(struct device *dev, uint8_t options)
 {
 	WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev);
 
@@ -175,10 +175,10 @@ static int wwdg_stm32_install_timeout(struct device *dev,
 {
 	struct wwdg_stm32_data *data = WWDG_STM32_DATA(dev);
 	WWDG_TypeDef *wwdg = WWDG_STM32_STRUCT(dev);
-	u32_t timeout = config->window.max * USEC_PER_MSEC;
-	u32_t calculated_timeout;
-	u32_t prescaler = 0U;
-	u32_t counter = 0U;
+	uint32_t timeout = config->window.max * USEC_PER_MSEC;
+	uint32_t calculated_timeout;
+	uint32_t prescaler = 0U;
+	uint32_t counter = 0U;
 
 	if (config->callback != NULL) {
 		data->callback = config->callback;
diff --git a/drivers/watchdog/wdt_wwdg_stm32.h b/drivers/watchdog/wdt_wwdg_stm32.h
index 4972d9eed4..9a1f1ad4e2 100644
--- a/drivers/watchdog/wdt_wwdg_stm32.h
+++ b/drivers/watchdog/wdt_wwdg_stm32.h
@@ -30,7 +30,7 @@ struct wwdg_stm32_config {
 /* driver data */
 struct wwdg_stm32_data {
 	/* WWDG reset counter */
-	u8_t counter;
+	uint8_t counter;
 
 	/* WWDG user defined callback on EWI */
 	wdt_callback_t callback;
diff --git a/drivers/wifi/esp/esp.c b/drivers/wifi/esp/esp.c
index c1d65d4fd5..bf6b474c0d 100644
--- a/drivers/wifi/esp/esp.c
+++ b/drivers/wifi/esp/esp.c
@@ -259,7 +259,7 @@ MODEM_CMD_DEFINE(on_cmd_connect)
 {
 	struct esp_socket *sock;
 	struct esp_data *dev;
-	u8_t link_id;
+	uint8_t link_id;
 
 	link_id = data->match_buf[0] - '0';
 
@@ -276,7 +276,7 @@ MODEM_CMD_DEFINE(on_cmd_closed)
 {
 	struct esp_socket *sock;
 	struct esp_data *dev;
-	u8_t link_id;
+	uint8_t link_id;
 
 	link_id = data->match_buf[0] - '0';
 
@@ -354,7 +354,7 @@ MODEM_CMD_DIRECT_DEFINE(on_cmd_ipd)
 	struct esp_socket *sock;
 	struct esp_data *dev;
 	struct net_pkt *pkt;
-	u8_t link_id;
+	uint8_t link_id;
 
 	dev = CONTAINER_OF(data, struct esp_data, cmd_handler_data);
 
diff --git a/drivers/wifi/esp/esp.h b/drivers/wifi/esp/esp.h
index 245185c16d..ee91b42aaf 100644
--- a/drivers/wifi/esp/esp.h
+++ b/drivers/wifi/esp/esp.h
@@ -79,9 +79,9 @@ enum esp_socket_flags {
 
 struct esp_socket {
 	/* internal */
-	u8_t idx;
-	u8_t link_id;
-	u8_t flags;
+	uint8_t idx;
+	uint8_t link_id;
+	uint8_t flags;
 
 	/* socket info */
 	sa_family_t family;
@@ -127,7 +127,7 @@ enum esp_data_flag {
 struct esp_data {
 	struct net_if *net_iface;
 
-	u8_t flags;
+	uint8_t flags;
 
 	char conn_cmd[CONN_CMD_MAX_LEN];
 
@@ -135,20 +135,20 @@ struct esp_data {
 	struct in_addr ip;
 	struct in_addr gw;
 	struct in_addr nm;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
 	/* modem context */
 	struct modem_context mctx;
 
 	/* modem interface */
 	struct modem_iface_uart_data iface_data;
-	u8_t iface_isr_buf[MDM_RECV_BUF_SIZE];
-	u8_t iface_rb_buf[MDM_RING_BUF_SIZE];
+	uint8_t iface_isr_buf[MDM_RECV_BUF_SIZE];
+	uint8_t iface_rb_buf[MDM_RING_BUF_SIZE];
 
 	/* modem cmds */
 	struct modem_cmd_handler_data cmd_handler_data;
-	u8_t cmd_read_buf[MDM_RECV_BUF_SIZE];
-	u8_t cmd_match_buf[MDM_RECV_BUF_SIZE];
+	uint8_t cmd_read_buf[MDM_RECV_BUF_SIZE];
+	uint8_t cmd_match_buf[MDM_RECV_BUF_SIZE];
 
 	/* socket data */
 	struct esp_socket sockets[ESP_MAX_SOCKETS];
@@ -176,7 +176,7 @@ struct net_pkt *esp_prepare_pkt(struct esp_data *dev, struct net_buf *src,
 struct esp_socket *esp_socket_get();
 int esp_socket_put(struct esp_socket *sock);
 struct esp_socket *esp_socket_from_link_id(struct esp_data *data,
-					   u8_t link_id);
+					   uint8_t link_id);
 void esp_socket_init(struct esp_data *data);
 
 static inline struct esp_data *esp_socket_to_dev(struct esp_socket *sock)
diff --git a/drivers/wifi/esp/esp_offload.c b/drivers/wifi/esp/esp_offload.c
index ce3ae2336c..d92fd700f4 100644
--- a/drivers/wifi/esp/esp_offload.c
+++ b/drivers/wifi/esp/esp_offload.c
@@ -121,7 +121,7 @@ static int esp_connect(struct net_context *context,
 		       const struct sockaddr *addr,
 		       socklen_t addrlen,
 		       net_context_connect_cb_t cb,
-		       s32_t timeout,
+		       int32_t timeout,
 		       void *user_data)
 {
 	struct esp_socket *sock;
@@ -164,7 +164,7 @@ static int esp_connect(struct net_context *context,
 }
 
 static int esp_accept(struct net_context *context,
-			     net_tcp_accept_cb_t cb, s32_t timeout,
+			     net_tcp_accept_cb_t cb, int32_t timeout,
 			     void *user_data)
 {
 	return -ENOTSUP;
@@ -325,7 +325,7 @@ static int esp_sendto(struct net_pkt *pkt,
 		      const struct sockaddr *dst_addr,
 		      socklen_t addrlen,
 		      net_context_send_cb_t cb,
-		      s32_t timeout,
+		      int32_t timeout,
 		      void *user_data)
 {
 	struct net_context *context;
@@ -406,7 +406,7 @@ static int esp_sendto(struct net_pkt *pkt,
 
 static int esp_send(struct net_pkt *pkt,
 		    net_context_send_cb_t cb,
-		    s32_t timeout,
+		    int32_t timeout,
 		    void *user_data)
 {
 	return esp_sendto(pkt, NULL, 0, cb, timeout, user_data);
@@ -565,7 +565,7 @@ static void esp_recv_work(struct k_work *work)
 
 static int esp_recv(struct net_context *context,
 		    net_context_recv_cb_t cb,
-		    s32_t timeout,
+		    int32_t timeout,
 		    void *user_data)
 {
 	struct esp_socket *sock;
diff --git a/drivers/wifi/esp/esp_socket.c b/drivers/wifi/esp/esp_socket.c
index b933bcf9b9..731ef882bb 100644
--- a/drivers/wifi/esp/esp_socket.c
+++ b/drivers/wifi/esp/esp_socket.c
@@ -40,7 +40,7 @@ int esp_socket_put(struct esp_socket *sock)
 }
 
 struct esp_socket *esp_socket_from_link_id(struct esp_data *data,
-					   u8_t link_id)
+					   uint8_t link_id)
 {
 	int i;
 
diff --git a/drivers/wifi/eswifi/eswifi.h b/drivers/wifi/eswifi/eswifi.h
index 0b3921c23e..7388cc7dc3 100644
--- a/drivers/wifi/eswifi/eswifi.h
+++ b/drivers/wifi/eswifi/eswifi.h
@@ -70,7 +70,7 @@ struct eswifi_dev {
 	struct eswifi_sta sta;
 	enum eswifi_request req;
 	enum eswifi_role role;
-	u8_t mac[6];
+	uint8_t mac[6];
 	char buf[MAX_DATA_SIZE];
 	struct k_mutex mutex;
 	atomic_val_t mutex_owner;
@@ -112,7 +112,7 @@ static inline void eswifi_unlock(struct eswifi_dev *eswifi)
 }
 
 int eswifi_at_cmd(struct eswifi_dev *eswifi, char *cmd);
-static inline int __select_socket(struct eswifi_dev *eswifi, u8_t idx)
+static inline int __select_socket(struct eswifi_dev *eswifi, uint8_t idx)
 {
 	snprintk(eswifi->buf, sizeof(eswifi->buf), "P0=%d\r", idx);
 	return eswifi_at_cmd(eswifi, eswifi->buf);
@@ -126,7 +126,7 @@ struct eswifi_dev *eswifi_socket_to_dev(struct eswifi_off_socket *socket)
 
 extern struct eswifi_bus_ops eswifi_bus_ops_spi;
 int eswifi_offload_init(struct eswifi_dev *eswifi);
-struct eswifi_dev *eswifi_by_iface_idx(u8_t iface);
+struct eswifi_dev *eswifi_by_iface_idx(uint8_t iface);
 int eswifi_at_cmd_rsp(struct eswifi_dev *eswifi, char *cmd, char **rsp);
 void eswifi_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len);
 void eswifi_offload_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len);
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
index 6fa138f11c..f0aca8dbbd 100644
--- a/drivers/wifi/eswifi/eswifi_core.c
+++ b/drivers/wifi/eswifi/eswifi_core.c
@@ -169,14 +169,14 @@ int eswifi_at_cmd(struct eswifi_dev *eswifi, char *cmd)
 	return eswifi_at_cmd_rsp(eswifi, cmd, NULL);
 }
 
-struct eswifi_dev *eswifi_by_iface_idx(u8_t iface)
+struct eswifi_dev *eswifi_by_iface_idx(uint8_t iface)
 {
 	/* only one instance */
 	LOG_DBG("%d", iface);
 	return &eswifi0;
 }
 
-static int __parse_ipv4_address(char *str, char *ssid, u8_t ip[4])
+static int __parse_ipv4_address(char *str, char *ssid, uint8_t ip[4])
 {
 	unsigned int byte = -1;
 
@@ -283,7 +283,7 @@ static int eswifi_connect(struct eswifi_dev *eswifi)
 
 	/* Any IP assigned ? (dhcp offload or manually) */
 	err = __parse_ipv4_address(rsp, eswifi->sta.ssid,
-				   (u8_t *)&addr.s4_addr);
+				   (uint8_t *)&addr.s4_addr);
 	if (err < 0) {
 		LOG_ERR("Unable to retrieve IP address");
 		goto error;
@@ -351,7 +351,7 @@ static void eswifi_request_work(struct k_work *item)
 	}
 }
 
-static int eswifi_get_mac_addr(struct eswifi_dev *eswifi, u8_t addr[6])
+static int eswifi_get_mac_addr(struct eswifi_dev *eswifi, uint8_t addr[6])
 {
 	char cmd[] = "Z5\r";
 	int ret, i, byte = 0;
@@ -378,7 +378,7 @@ static int eswifi_get_mac_addr(struct eswifi_dev *eswifi, u8_t addr[6])
 static void eswifi_iface_init(struct net_if *iface)
 {
 	struct eswifi_dev *eswifi = &eswifi0;
-	u8_t mac[6];
+	uint8_t mac[6];
 
 	LOG_DBG("");
 
diff --git a/drivers/wifi/eswifi/eswifi_offload.c b/drivers/wifi/eswifi/eswifi_offload.c
index 2bd952ddf7..fb4d5cdd1b 100644
--- a/drivers/wifi/eswifi/eswifi_offload.c
+++ b/drivers/wifi/eswifi/eswifi_offload.c
@@ -100,7 +100,7 @@ static int eswifi_off_connect(struct net_context *context,
 			      const struct sockaddr *addr,
 			      socklen_t addrlen,
 			      net_context_connect_cb_t cb,
-			      s32_t timeout,
+			      int32_t timeout,
 			      void *user_data)
 {
 	struct eswifi_off_socket *socket = context->offload_context;
@@ -150,7 +150,7 @@ static int eswifi_off_connect(struct net_context *context,
 }
 
 static int eswifi_off_accept(struct net_context *context,
-			     net_tcp_accept_cb_t cb, s32_t timeout,
+			     net_tcp_accept_cb_t cb, int32_t timeout,
 			     void *user_data)
 {
 	struct eswifi_off_socket *socket = context->offload_context;
@@ -248,7 +248,7 @@ static void eswifi_off_send_work(struct k_work *work)
 
 static int eswifi_off_send(struct net_pkt *pkt,
 			   net_context_send_cb_t cb,
-			   s32_t timeout,
+			   int32_t timeout,
 			   void *user_data)
 {
 	struct eswifi_off_socket *socket = pkt->context->offload_context;
@@ -297,7 +297,7 @@ static int eswifi_off_sendto(struct net_pkt *pkt,
 			     const struct sockaddr *dst_addr,
 			     socklen_t addrlen,
 			     net_context_send_cb_t cb,
-			     s32_t timeout,
+			     int32_t timeout,
 			     void *user_data)
 {
 	struct eswifi_off_socket *socket = pkt->context->offload_context;
@@ -351,7 +351,7 @@ static int eswifi_off_sendto(struct net_pkt *pkt,
 
 static int eswifi_off_recv(struct net_context *context,
 			   net_context_recv_cb_t cb,
-			   s32_t timeout,
+			   int32_t timeout,
 			   void *user_data)
 {
 	struct eswifi_off_socket *socket = context->offload_context;
@@ -447,8 +447,8 @@ void eswifi_offload_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len)
 	if (!strncmp(msg, msg_tcp_accept, sizeof(msg_tcp_accept) - 1)) {
 		struct eswifi_off_socket *socket = NULL;
 		struct in_addr *sin_addr;
-		u8_t ip[4];
-		u16_t port = 0;
+		uint8_t ip[4];
+		uint16_t port = 0;
 		char *str;
 		int i = 0;
 
diff --git a/drivers/wifi/eswifi/eswifi_offload.h b/drivers/wifi/eswifi/eswifi_offload.h
index d477d16764..380f58b2d5 100644
--- a/drivers/wifi/eswifi/eswifi_offload.h
+++ b/drivers/wifi/eswifi/eswifi_offload.h
@@ -27,7 +27,7 @@ enum eswifi_socket_state {
 };
 
 struct eswifi_off_socket {
-	u8_t index;
+	uint8_t index;
 	enum eswifi_transport_type type;
 	enum eswifi_socket_state state;
 	struct net_context *context;
@@ -46,7 +46,7 @@ struct eswifi_off_socket {
 	struct sockaddr peer_addr;
 	struct k_sem read_sem;
 	struct k_sem accept_sem;
-	u16_t port;
+	uint16_t port;
 	bool is_server;
 	int usage;
 	struct k_fifo fifo;
diff --git a/drivers/wifi/eswifi/eswifi_socket.c b/drivers/wifi/eswifi/eswifi_socket.c
index bb01fe9ce1..a4f1d4eeea 100644
--- a/drivers/wifi/eswifi/eswifi_socket.c
+++ b/drivers/wifi/eswifi/eswifi_socket.c
@@ -173,7 +173,7 @@ int __eswifi_off_start_client(struct eswifi_dev *eswifi,
 
 	/* Set Remote Port */
 	snprintk(eswifi->buf, sizeof(eswifi->buf), "P4=%d\r",
-		(u16_t)sys_be16_to_cpu(net_sin(addr)->sin_port));
+		(uint16_t)sys_be16_to_cpu(net_sin(addr)->sin_port));
 	err = eswifi_at_cmd(eswifi, eswifi->buf);
 	if (err < 0) {
 		LOG_ERR("Unable to set remote port");
diff --git a/drivers/wifi/simplelink/simplelink.c b/drivers/wifi/simplelink/simplelink.c
index 8c4b908119..064b6cfd8d 100644
--- a/drivers/wifi/simplelink/simplelink.c
+++ b/drivers/wifi/simplelink/simplelink.c
@@ -40,7 +40,7 @@ static struct simplelink_data simplelink_data;
 static K_SEM_DEFINE(ip_acquired, 0, 1);
 
 /* Handle connection events from the SimpleLink Event Handlers: */
-static void simplelink_wifi_cb(u32_t event, struct sl_connect_state *conn)
+static void simplelink_wifi_cb(uint32_t event, struct sl_connect_state *conn)
 {
 	int status;
 
@@ -101,7 +101,7 @@ static void simplelink_scan_work_handler(struct k_work *work)
 		    SL_ERROR_WLAN_GET_NETWORK_LIST_EAGAIN) &&
 		   (simplelink_data.scan_retries++ <
 		    CONFIG_WIFI_SIMPLELINK_MAX_SCAN_RETRIES)) {
-		s32_t delay;
+		int32_t delay;
 
 		/* Try again: */
 		simplelink_data.num_results_or_err = z_simplelink_start_scan();
@@ -138,7 +138,7 @@ static int simplelink_mgmt_scan(struct device *dev, scan_result_cb_t cb)
 	 * already returned, or indicate a retry is required:
 	 */
 	if ((err > 0) || (err == SL_ERROR_WLAN_GET_NETWORK_LIST_EAGAIN)) {
-		s32_t delay = (err > 0 ? 0 : SCAN_RETRY_DELAY);
+		int32_t delay = (err > 0 ? 0 : SCAN_RETRY_DELAY);
 
 		/* Store for later reference by delayed work handler: */
 		simplelink_data.cb = cb;
diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c
index 7599083edc..7ea087b95b 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.c
+++ b/drivers/wifi/simplelink/simplelink_sockets.c
@@ -372,7 +372,7 @@ static void translate_sl_to_z_addr(SlSockAddr_t *sl_addr,
 			z_sockaddr_in6->sin6_family = AF_INET6;
 			z_sockaddr_in6->sin6_port = sl_addr_in6->sin6_port;
 			z_sockaddr_in6->sin6_scope_id =
-				(u8_t)sl_addr_in6->sin6_scope_id;
+				(uint8_t)sl_addr_in6->sin6_scope_id;
 			memcpy(z_sockaddr_in6->sin6_addr.s6_addr,
 			       sl_addr_in6->sin6_addr._S6_un._S6_u32,
 			       sizeof(z_sockaddr_in6->sin6_addr.s6_addr));
@@ -723,7 +723,7 @@ static int simplelink_setsockopt(void *obj, int level, int optname,
 				 * verification and it is indeed
 				 * performed when the cert is set.
 				 */
-				if (*(u32_t *)optval != 2U) {
+				if (*(uint32_t *)optval != 2U) {
 					retval = slcb_SetErrno(ENOTSUP);
 					goto exit;
 				} else {
@@ -753,7 +753,7 @@ static int simplelink_setsockopt(void *obj, int level, int optname,
 				/* if user wishes to have TCP_NODELAY = FALSE,
 				 * we return EINVAL and fail in the cases below.
 				 */
-				if (*(u32_t *)optval) {
+				if (*(uint32_t *)optval) {
 					retval = 0;
 					goto exit;
 				}
@@ -946,7 +946,7 @@ static ssize_t simplelink_sendto(void *obj, const void *buf, size_t len,
 			goto exit;
 		}
 
-		retval = sl_SendTo(sd, buf, (u16_t)len, flags,
+		retval = sl_SendTo(sd, buf, (uint16_t)len, flags,
 				   sl_addr, sl_addrlen);
 	} else {
 		retval = (ssize_t)sl_Send(sd, buf, len, flags);
diff --git a/drivers/wifi/simplelink/simplelink_support.c b/drivers/wifi/simplelink/simplelink_support.c
index 52b7e18c9d..3d8a4964df 100644
--- a/drivers/wifi/simplelink/simplelink_support.c
+++ b/drivers/wifi/simplelink/simplelink_support.c
@@ -52,8 +52,8 @@ struct nwp_status {
 	simplelink_wifi_cb_t cb;
 
 	/* Status Variables */
-	u32_t status;	/* The state of the NWP */
-	u32_t role;	/* The device's role (STA, P2P or AP) */
+	uint32_t status;	/* The state of the NWP */
+	uint32_t role;	/* The device's role (STA, P2P or AP) */
 
 	/* Scan results table: */
 	SlWlanNetworkEntry_t net_entries[CONFIG_WIFI_SIMPLELINK_SCAN_COUNT];
@@ -66,17 +66,17 @@ struct sl_connect_state sl_conn;
 static struct nwp_status nwp;
 
 /* Configure the device to a default state, resetting previous parameters .*/
-static s32_t configure_simplelink(void)
+static int32_t configure_simplelink(void)
 {
-	s32_t retval = -1;
-	s32_t mode = -1;
+	int32_t retval = -1;
+	int32_t mode = -1;
 #if !defined(CONFIG_NET_IPV6)
-	u32_t if_bitmap = 0U;
+	uint32_t if_bitmap = 0U;
 #endif
 	SlWlanScanParamCommand_t scan_default = { 0 };
 	SlWlanRxFilterOperationCommandBuff_t rx_filterid_mask = { { 0 } };
-	u8_t config_opt;
-	u8_t power;
+	uint8_t config_opt;
+	uint8_t power;
 
 #if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR)
 	struct in_addr addr4;
@@ -189,7 +189,7 @@ static s32_t configure_simplelink(void)
 
 	retval = sl_WlanSet(SL_WLAN_CFG_GENERAL_PARAM_ID,
 			    SL_WLAN_GENERAL_PARAM_OPT_SCAN_PARAMS,
-			    sizeof(scan_default), (u8_t *)&scan_default);
+			    sizeof(scan_default), (uint8_t *)&scan_default);
 	ASSERT_ON_ERROR(retval, WLAN_ERROR);
 
 	/* Disable scans: In other words, use "one-shot" scanning */
@@ -201,7 +201,7 @@ static s32_t configure_simplelink(void)
 	power = 0U;
 	retval = sl_WlanSet(SL_WLAN_CFG_GENERAL_PARAM_ID,
 			    SL_WLAN_GENERAL_PARAM_OPT_STA_TX_POWER, 1,
-			    (u8_t *)&power);
+			    (uint8_t *)&power);
 	ASSERT_ON_ERROR(retval, WLAN_ERROR);
 
 	/* Set NWP Power policy to 'normal' */
@@ -218,7 +218,7 @@ static s32_t configure_simplelink(void)
 
 	retval = sl_WlanSet(SL_WLAN_RX_FILTERS_ID, SL_WLAN_RX_FILTER_REMOVE,
 			    sizeof(SlWlanRxFilterOperationCommandBuff_t),
-			    (u8_t *)&rx_filterid_mask);
+			    (uint8_t *)&rx_filterid_mask);
 	ASSERT_ON_ERROR(retval, WLAN_ERROR);
 
 	/* Set NWP role as STA */
@@ -363,7 +363,7 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *wlan_event)
 void SimpleLinkNetAppEventHandler(SlNetAppEvent_t *netapp_event)
 {
 	SlIpV4AcquiredAsync_t *event_data = NULL;
-	u32_t i;
+	uint32_t i;
 
 	if (!netapp_event) {
 		return;
@@ -531,7 +531,7 @@ void SimpleLinkNetAppRequestEventHandler(SlNetAppRequest_t *netapp_request,
 }
 
 /* Unused, but must be defined to link.	 */
-void SimpleLinkNetAppRequestMemFreeEventHandler(u8_t *buffer)
+void SimpleLinkNetAppRequestMemFreeEventHandler(uint8_t *buffer)
 {
 	ARG_UNUSED(buffer);
 }
@@ -570,7 +570,7 @@ void z_simplelink_get_scan_result(int index,
 
 int z_simplelink_start_scan(void)
 {
-	s32_t ret;
+	int32_t ret;
 
 	/* Clear the results buffer */
 	(void)memset(&nwp.net_entries, 0x0, sizeof(nwp.net_entries));
@@ -588,11 +588,11 @@ int z_simplelink_start_scan(void)
 
 void z_simplelink_get_mac(unsigned char *mac)
 {
-	u16_t mac_len = SL_MAC_ADDR_LEN;
-	u16_t config_opt = 0U;
+	uint16_t mac_len = SL_MAC_ADDR_LEN;
+	uint16_t config_opt = 0U;
 
 	sl_NetCfgGet(SL_NETCFG_MAC_ADDRESS_GET, &config_opt,
-		     &mac_len, (u8_t *)mac);
+		     &mac_len, (uint8_t *)mac);
 }
 
 int z_simplelink_connect(struct wifi_connect_req_params *params)
diff --git a/drivers/wifi/simplelink/simplelink_support.h b/drivers/wifi/simplelink/simplelink_support.h
index 0f93c4430c..350b900627 100644
--- a/drivers/wifi/simplelink/simplelink_support.h
+++ b/drivers/wifi/simplelink/simplelink_support.h
@@ -22,17 +22,17 @@ extern "C" {
 		(SL_WLAN_EVENT_MAX + SL_DEVICE_EVENT_DROPPED_NETAPP_IPACQUIRED)
 
 struct sl_connect_state {
-	u32_t gateway_ip;
-	u8_t ssid[SSID_LEN_MAX + 1];
-	u8_t bssid[BSSID_LEN_MAX];
-	u32_t ip_addr;
-	u32_t sta_ip;
-	u32_t ipv6_addr[4];
-	s16_t error;
+	uint32_t gateway_ip;
+	uint8_t ssid[SSID_LEN_MAX + 1];
+	uint8_t bssid[BSSID_LEN_MAX];
+	uint32_t ip_addr;
+	uint32_t sta_ip;
+	uint32_t ipv6_addr[4];
+	int16_t error;
 };
 
 /* Callback from SimpleLink Event Handlers: */
-typedef void (*simplelink_wifi_cb_t)(u32_t mgmt_event,
+typedef void (*simplelink_wifi_cb_t)(uint32_t mgmt_event,
 				     struct sl_connect_state *conn);
 
 extern int z_simplelink_start_scan(void);
diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c
index b854ffd1b8..af90cfac81 100644
--- a/drivers/wifi/winc1500/wifi_winc1500.c
+++ b/drivers/wifi/winc1500/wifi_winc1500.c
@@ -152,7 +152,7 @@ struct winc1500_data {
 	struct net_if *iface;
 	unsigned char mac[6];
 	scan_result_cb_t scan_cb;
-	u8_t scan_result;
+	uint8_t scan_result;
 	bool connecting;
 	bool connected;
 };
@@ -166,7 +166,7 @@ static void stack_stats(void)
 	log_stack_usage(&winc1500_thread_data);
 }
 
-static char *socket_error_string(s8_t err)
+static char *socket_error_string(int8_t err)
 {
 	switch (err) {
 	case SOCK_ERR_NO_ERROR:
@@ -225,7 +225,7 @@ static char *socket_error_string(s8_t err)
 	}
 }
 
-static char *wifi_cb_msg_2_str(u8_t message_type)
+static char *wifi_cb_msg_2_str(uint8_t message_type)
 {
 	switch (message_type) {
 	case M2M_WIFI_RESP_CURRENT_RSSI:
@@ -261,7 +261,7 @@ static char *wifi_cb_msg_2_str(u8_t message_type)
 	}
 }
 
-static char *socket_message_to_string(u8_t message)
+static char *socket_message_to_string(uint8_t message)
 {
 	switch (message) {
 	case SOCKET_MSG_BIND:
@@ -383,7 +383,7 @@ static int winc1500_connect(struct net_context *context,
 			    const struct sockaddr *addr,
 			    socklen_t addrlen,
 			    net_context_connect_cb_t cb,
-			    s32_t timeout,
+			    int32_t timeout,
 			    void *user_data)
 {
 	SOCKET socket = (int)context->offload_context;
@@ -414,7 +414,7 @@ static int winc1500_connect(struct net_context *context,
  */
 static int winc1500_accept(struct net_context *context,
 			   net_tcp_accept_cb_t cb,
-			   s32_t timeout,
+			   int32_t timeout,
 			   void *user_data)
 {
 	SOCKET socket = (int)context->offload_context;
@@ -447,7 +447,7 @@ static int winc1500_accept(struct net_context *context,
  */
 static int winc1500_send(struct net_pkt *pkt,
 			 net_context_send_cb_t cb,
-			 s32_t timeout,
+			 int32_t timeout,
 			 void *user_data)
 {
 	struct net_context *context = pkt->context;
@@ -490,7 +490,7 @@ static int winc1500_sendto(struct net_pkt *pkt,
 			   const struct sockaddr *dst_addr,
 			   socklen_t addrlen,
 			   net_context_send_cb_t cb,
-			   s32_t timeout,
+			   int32_t timeout,
 			   void *user_data)
 {
 	struct net_context *context = pkt->context;
@@ -558,7 +558,7 @@ static int prepare_pkt(struct socket_data *sock_data)
  */
 static int winc1500_recv(struct net_context *context,
 			 net_context_recv_cb_t cb,
-			 s32_t timeout,
+			 int32_t timeout,
 			 void *user_data)
 {
 	SOCKET socket = (int) context->offload_context;
@@ -641,9 +641,9 @@ static void handle_wifi_con_state_changed(void *pvMsg)
 
 static void handle_wifi_dhcp_conf(void *pvMsg)
 {
-	u8_t *pu8IPAddress = (u8_t *)pvMsg;
+	uint8_t *pu8IPAddress = (uint8_t *)pvMsg;
 	struct in_addr addr;
-	u8_t i;
+	uint8_t i;
 
 	/* Connected and got IP address*/
 	LOG_DBG("Wi-Fi connected, IP is %u.%u.%u.%u",
@@ -740,7 +740,7 @@ static void handle_scan_done(void *pvMsg)
 	}
 }
 
-static void winc1500_wifi_cb(u8_t message_type, void *pvMsg)
+static void winc1500_wifi_cb(uint8_t message_type, void *pvMsg)
 {
 	LOG_DBG("Msg Type %d %s",
 		message_type, wifi_cb_msg_2_str(message_type));
@@ -977,10 +977,10 @@ static int winc1500_mgmt_scan(struct device *dev, scan_result_cb_t cb)
 static int winc1500_mgmt_connect(struct device *dev,
 				 struct wifi_connect_req_params *params)
 {
-	u8_t ssid[M2M_MAX_SSID_LEN];
+	uint8_t ssid[M2M_MAX_SSID_LEN];
 	tuniM2MWifiAuth psk;
-	u8_t security;
-	u16_t channel;
+	uint8_t security;
+	uint16_t channel;
 	void *auth;
 
 	memcpy(ssid, params->ssid, params->ssid_length);
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
index f73a6f2e50..3fe1fd891c 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
@@ -24,7 +24,7 @@ static inline void chip_isr(struct device *port,
 	}
 }
 
-s8_t nm_bsp_init(void)
+int8_t nm_bsp_init(void)
 {
 	isr_function = NULL;
 
@@ -34,7 +34,7 @@ s8_t nm_bsp_init(void)
 	return 0;
 }
 
-s8_t nm_bsp_deinit(void)
+int8_t nm_bsp_deinit(void)
 {
 	/* TODO */
 	return 0;
@@ -74,7 +74,7 @@ void nm_bsp_register_isr(void (*isr_fun)(void))
 			  &winc1500.gpio_cb);
 }
 
-void nm_bsp_interrupt_ctrl(u8_t enable)
+void nm_bsp_interrupt_ctrl(uint8_t enable)
 {
 	gpio_pin_interrupt_configure(
 		winc1500.gpios[WINC1500_GPIO_IDX_IRQN].dev,
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
index 90968187a9..1ea15d7c7a 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
@@ -31,7 +31,7 @@ enum winc1500_gpio_index {
 
 struct winc1500_gpio_configuration {
 	struct device *dev;
-	u32_t pin;
+	uint32_t pin;
 };
 
 struct winc1500_device {
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
index 30721d9905..6f346a39ac 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
@@ -44,18 +44,18 @@ tstrNmBusCapabilities egstrNmBusCapabilities = {
 /** Number of times to try to send packet if failed. */
 #define I2C_TIMEOUT		100
 
-static s8_t nm_i2c_write(u8_t *b, u16_t sz)
+static int8_t nm_i2c_write(uint8_t *b, uint16_t sz)
 {
 	/* Not implemented */
 }
 
-static s8_t nm_i2c_read(u8_t *rb, u16_t sz)
+static int8_t nm_i2c_read(uint8_t *rb, uint16_t sz)
 {
 	/* Not implemented */
 }
 
-static s8_t nm_i2c_write_special(u8_t *wb1, u16_t sz1,
-				 u8_t *wb2, u16_t sz2)
+static int8_t nm_i2c_write_special(uint8_t *wb1, uint16_t sz1,
+				 uint8_t *wb2, uint16_t sz2)
 {
 	/* Not implemented */
 }
@@ -67,7 +67,7 @@ static s8_t nm_i2c_write_special(u8_t *wb1, u16_t sz1,
 struct spi_cs_control cs_ctrl;
 #endif
 
-static s8_t spi_rw(u8_t *mosi, u8_t *miso, u16_t size)
+static int8_t spi_rw(uint8_t *mosi, uint8_t *miso, uint16_t size)
 {
 	const struct spi_buf buf_tx = {
 		.buf = mosi,
@@ -127,7 +127,7 @@ struct winc1500_gpio_configuration *winc1500_configure_gpios(void)
 	return winc1500_gpios;
 }
 
-s8_t nm_bus_init(void *pvinit)
+int8_t nm_bus_init(void *pvinit)
 {
 	/* configure GPIOs */
 	winc1500.gpios = winc1500_configure_gpios();
@@ -174,7 +174,7 @@ s8_t nm_bus_init(void *pvinit)
 	return 0;
 }
 
-s8_t nm_bus_ioctl(u8_t cmd, void *parameter)
+int8_t nm_bus_ioctl(uint8_t cmd, void *parameter)
 {
 	sint8 ret = 0;
 
@@ -219,12 +219,12 @@ s8_t nm_bus_ioctl(u8_t cmd, void *parameter)
 	return ret;
 }
 
-s8_t nm_bus_deinit(void)
+int8_t nm_bus_deinit(void)
 {
 	return M2M_SUCCESS;
 }
 
-s8_t nm_bus_reinit(void *config)
+int8_t nm_bus_reinit(void *config)
 {
 	return 0;
 }
diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h
index 4fec8bdd31..e9c780453a 100644
--- a/include/arch/arc/arch.h
+++ b/include/arch/arc/arch.h
@@ -216,14 +216,14 @@ extern "C" {
 #if CONFIG_ARC_MPU_VER == 2
 #define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
 	BUILD_ASSERT(!(((size) & ((size) - 1))) && (size) >= STACK_ALIGN \
-		 && !((u32_t)(start) & ((size) - 1)), \
+		 && !((uint32_t)(start) & ((size) - 1)), \
 		"the size of the partition must be power of 2" \
 		" and greater than or equal to the mpu adddress alignment." \
 		"start address of the partition must align with size.")
 #elif CONFIG_ARC_MPU_VER == 3
 #define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
 	BUILD_ASSERT((size) % STACK_ALIGN == 0 && (size) >= STACK_ALIGN \
-		 && (u32_t)(start) % STACK_ALIGN == 0, \
+		 && (uint32_t)(start) % STACK_ALIGN == 0, \
 		"the size of the partition must align with 32" \
 		" and greater than or equal to 32." \
 		"start address of the partition must align with 32.")
@@ -232,7 +232,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 /* Typedef for the k_mem_partition attribute*/
-typedef u32_t k_mem_partition_attr_t;
+typedef uint32_t k_mem_partition_attr_t;
 
 static ALWAYS_INLINE void arch_nop(void)
 {
diff --git a/include/arch/arc/arch_inlines.h b/include/arch/arc/arch_inlines.h
index 68f85c7229..d9588a141e 100644
--- a/include/arch/arc/arch_inlines.h
+++ b/include/arch/arc/arch_inlines.h
@@ -19,7 +19,7 @@
 static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
 {
 #ifdef CONFIG_SMP
-	u32_t core;
+	uint32_t core;
 
 	core = z_arc_v2_core_id();
 
diff --git a/include/arch/arc/syscall.h b/include/arch/arc/syscall.h
index b9e449c16d..b4f863bd5c 100644
--- a/include/arch/arc/syscall.h
+++ b/include/arch/arc/syscall.h
@@ -43,13 +43,13 @@ static inline uintptr_t arch_syscall_invoke6(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5, uintptr_t arg6,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r5 __asm__("r5") = arg6;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r5 __asm__("r5") = arg6;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -68,12 +68,12 @@ static inline uintptr_t arch_syscall_invoke5(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -91,11 +91,11 @@ static inline uintptr_t arch_syscall_invoke4(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3, uintptr_t arg4,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -113,10 +113,10 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -132,9 +132,9 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -149,8 +149,8 @@ static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 
 static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1, uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -165,8 +165,8 @@ static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1, uintptr_t call_id)
 
 static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0");
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0");
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -181,7 +181,7 @@ static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 
 static inline bool arch_is_user_context(void)
 {
-	u32_t status;
+	uint32_t status;
 
 	compiler_barrier();
 
diff --git a/include/arch/arc/thread.h b/include/arch/arc/thread.h
index c2945cf6a3..af7ab03232 100644
--- a/include/arch/arc/thread.h
+++ b/include/arch/arc/thread.h
@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 struct _callee_saved {
-	u32_t sp; /* r28 */
+	uint32_t sp; /* r28 */
 };
 typedef struct _callee_saved _callee_saved_t;
 
@@ -48,16 +48,16 @@ struct _thread_arch {
 	/* High address of stack region, stack grows downward from this
 	 * location. Usesd for hardware stack checking
 	 */
-	u32_t k_stack_base;
-	u32_t k_stack_top;
+	uint32_t k_stack_base;
+	uint32_t k_stack_top;
 #ifdef CONFIG_USERSPACE
-	u32_t u_stack_base;
-	u32_t u_stack_top;
+	uint32_t u_stack_base;
+	uint32_t u_stack_top;
 #endif
 #endif
 
 #ifdef CONFIG_USERSPACE
-	u32_t priv_stack_start;
+	uint32_t priv_stack_start;
 #endif
 };
 
diff --git a/include/arch/arc/v2/arc_connect.h b/include/arch/arc/v2/arc_connect.h
index e248b4bbd9..e27f1a7fdf 100644
--- a/include/arch/arc/v2/arc_connect.h
+++ b/include/arch/arc/v2/arc_connect.h
@@ -114,12 +114,12 @@ struct arc_connect_cmd {
 	union {
 		struct {
 #ifdef CONFIG_BIG_ENDIAN
-			u32_t pad:8, param:16, cmd:8;
+			uint32_t pad:8, param:16, cmd:8;
 #else
-			u32_t cmd:8, param:16, pad:8;
+			uint32_t cmd:8, param:16, pad:8;
 #endif
 		};
-		u32_t val;
+		uint32_t val;
 	};
 };
 
@@ -127,20 +127,20 @@ struct arc_connect_bcr {
 	union {
 		struct {
 #ifdef CONFIG_BIG_ENDIAN
-			u32_t pad4:6, pw_dom:1, pad3:1,
+			uint32_t pad4:6, pw_dom:1, pad3:1,
 			idu:1, pad2:1, num_cores:6,
 			pad:1,  gfrc:1, dbg:1, pw:1,
 			msg:1, sem:1, ipi:1, slv:1,
 			ver:8;
 #else
-			u32_t ver:8,
+			uint32_t ver:8,
 			slv:1, ipi:1, sem:1, msg:1,
 			pw:1, dbg:1, gfrc:1, pad:1,
 			num_cores:6, pad2:1, idu:1,
 			pad3:1, pw_dom:1, pad4:6;
 #endif
 		};
-		u32_t val;
+		uint32_t val;
 	};
 };
 
@@ -148,16 +148,16 @@ struct arc_connect_idu_bcr {
 	union {
 		struct {
 #ifdef CONFIG_BIG_ENDIAN
-			u32_t pad:21, cirqnum:3, ver:8;
+			uint32_t pad:21, cirqnum:3, ver:8;
 #else
-			u32_t ver:8, cirqnum:3, pad:21;
+			uint32_t ver:8, cirqnum:3, pad:21;
 #endif
 		};
-		u32_t val;
+		uint32_t val;
 	};
 };
 
-static inline void z_arc_connect_cmd(u32_t cmd, u32_t param)
+static inline void z_arc_connect_cmd(uint32_t cmd, uint32_t param)
 {
 	struct arc_connect_cmd regval;
 
@@ -168,63 +168,63 @@ static inline void z_arc_connect_cmd(u32_t cmd, u32_t param)
 	z_arc_v2_aux_reg_write(_ARC_V2_CONNECT_CMD, regval.val);
 }
 
-static inline void z_arc_connect_cmd_data(u32_t cmd, u32_t param,
-				   u32_t data)
+static inline void z_arc_connect_cmd_data(uint32_t cmd, uint32_t param,
+				   uint32_t data)
 {
 	z_arc_v2_aux_reg_write(_ARC_V2_CONNECT_WDATA, data);
 	z_arc_connect_cmd(cmd, param);
 }
 
-static inline u32_t z_arc_connect_cmd_readback(void)
+static inline uint32_t z_arc_connect_cmd_readback(void)
 {
 	return z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_READBACK);
 }
 
 
 /* inter-core interrupt related functions */
-extern void z_arc_connect_ici_generate(u32_t core_id);
-extern void z_arc_connect_ici_ack(u32_t core_id);
-extern u32_t z_arc_connect_ici_read_status(u32_t core_id);
-extern u32_t z_arc_connect_ici_check_src(void);
+extern void z_arc_connect_ici_generate(uint32_t core_id);
+extern void z_arc_connect_ici_ack(uint32_t core_id);
+extern uint32_t z_arc_connect_ici_read_status(uint32_t core_id);
+extern uint32_t z_arc_connect_ici_check_src(void);
 extern void z_arc_connect_ici_clear(void);
 
 /* inter-core debug related functions */
-extern void z_arc_connect_debug_reset(u32_t core_mask);
-extern void z_arc_connect_debug_halt(u32_t core_mask);
-extern void z_arc_connect_debug_run(u32_t core_mask);
-extern void z_arc_connect_debug_mask_set(u32_t core_mask, u32_t mask);
-extern u32_t z_arc_connect_debug_mask_read(u32_t core_mask);
-extern void z_arc_connect_debug_select_set(u32_t core_mask);
-extern u32_t z_arc_connect_debug_select_read(void);
-extern u32_t z_arc_connect_debug_en_read(void);
-extern u32_t z_arc_connect_debug_cmd_read(void);
-extern u32_t z_arc_connect_debug_core_read(void);
+extern void z_arc_connect_debug_reset(uint32_t core_mask);
+extern void z_arc_connect_debug_halt(uint32_t core_mask);
+extern void z_arc_connect_debug_run(uint32_t core_mask);
+extern void z_arc_connect_debug_mask_set(uint32_t core_mask, uint32_t mask);
+extern uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask);
+extern void z_arc_connect_debug_select_set(uint32_t core_mask);
+extern uint32_t z_arc_connect_debug_select_read(void);
+extern uint32_t z_arc_connect_debug_en_read(void);
+extern uint32_t z_arc_connect_debug_cmd_read(void);
+extern uint32_t z_arc_connect_debug_core_read(void);
 
 /* global free-running counter(gfrc) related functions */
 extern void z_arc_connect_gfrc_clear(void);
-extern u64_t z_arc_connect_gfrc_read(void);
+extern uint64_t z_arc_connect_gfrc_read(void);
 extern void z_arc_connect_gfrc_enable(void);
 extern void z_arc_connect_gfrc_disable(void);
-extern void z_arc_connect_gfrc_core_set(u32_t core_mask);
-extern u32_t z_arc_connect_gfrc_halt_read(void);
-extern u32_t z_arc_connect_gfrc_core_read(void);
+extern void z_arc_connect_gfrc_core_set(uint32_t core_mask);
+extern uint32_t z_arc_connect_gfrc_halt_read(void);
+extern uint32_t z_arc_connect_gfrc_core_read(void);
 
 /* interrupt distribute unit related functions */
 extern void z_arc_connect_idu_enable(void);
 extern void z_arc_connect_idu_disable(void);
-extern u32_t z_arc_connect_idu_read_enable(void);
-extern void z_arc_connect_idu_set_mode(u32_t irq_num,
-	u16_t trigger_mode, u16_t distri_mode);
-extern u32_t z_arc_connect_idu_read_mode(u32_t irq_num);
-extern void z_arc_connect_idu_set_dest(u32_t irq_num, u32_t core_mask);
-extern u32_t z_arc_connect_idu_read_dest(u32_t irq_num);
-extern void z_arc_connect_idu_gen_cirq(u32_t irq_num);
-extern void z_arc_connect_idu_ack_cirq(u32_t irq_num);
-extern u32_t z_arc_connect_idu_check_status(u32_t irq_num);
-extern u32_t z_arc_connect_idu_check_source(u32_t irq_num);
-extern void z_arc_connect_idu_set_mask(u32_t irq_num, u32_t mask);
-extern u32_t z_arc_connect_idu_read_mask(u32_t irq_num);
-extern u32_t z_arc_connect_idu_check_first(u32_t irq_num);
+extern uint32_t z_arc_connect_idu_read_enable(void);
+extern void z_arc_connect_idu_set_mode(uint32_t irq_num,
+	uint16_t trigger_mode, uint16_t distri_mode);
+extern uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num);
+extern void z_arc_connect_idu_set_dest(uint32_t irq_num, uint32_t core_mask);
+extern uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num);
+extern void z_arc_connect_idu_gen_cirq(uint32_t irq_num);
+extern void z_arc_connect_idu_ack_cirq(uint32_t irq_num);
+extern uint32_t z_arc_connect_idu_check_status(uint32_t irq_num);
+extern uint32_t z_arc_connect_idu_check_source(uint32_t irq_num);
+extern void z_arc_connect_idu_set_mask(uint32_t irq_num, uint32_t mask);
+extern uint32_t z_arc_connect_idu_read_mask(uint32_t irq_num);
+extern uint32_t z_arc_connect_idu_check_first(uint32_t irq_num);
 
 #ifdef __cplusplus
 }
diff --git a/include/arch/arc/v2/arcv2_irq_unit.h b/include/arch/arc/v2/arcv2_irq_unit.h
index 2fa57af608..0322e0e77c 100644
--- a/include/arch/arc/v2/arcv2_irq_unit.h
+++ b/include/arch/arc/v2/arcv2_irq_unit.h
@@ -196,7 +196,7 @@ void z_arc_v2_irq_unit_sensitivity_set(int irq, int s)
 static ALWAYS_INLINE
 bool z_arc_v2_irq_unit_is_in_isr(void)
 {
-	u32_t act = z_arc_v2_aux_reg_read(_ARC_V2_AUX_IRQ_ACT);
+	uint32_t act = z_arc_v2_aux_reg_read(_ARC_V2_AUX_IRQ_ACT);
 
 	/* in exception ?*/
 	if (z_arc_v2_aux_reg_read(_ARC_V2_STATUS32) & _ARC_V2_STATUS32_AE) {
diff --git a/include/arch/arc/v2/asm_inline_gcc.h b/include/arch/arc/v2/asm_inline_gcc.h
index 99f8a004bc..2e4e4c8345 100644
--- a/include/arch/arc/v2/asm_inline_gcc.h
+++ b/include/arch/arc/v2/asm_inline_gcc.h
@@ -22,7 +22,7 @@ extern "C" {
 /**
  *  @brief read timestamp register (CPU frequency)
  */
-extern u64_t z_tsc_read(void);
+extern uint64_t z_tsc_read(void);
 
 #ifdef __cplusplus
 }
diff --git a/include/arch/arc/v2/aux_regs.h b/include/arch/arc/v2/aux_regs.h
index 3e1a0dfceb..a3eff8ca9d 100644
--- a/include/arch/arc/v2/aux_regs.h
+++ b/include/arch/arc/v2/aux_regs.h
@@ -163,8 +163,8 @@
 #if defined(__GNUC__)
 
 #include <zephyr/types.h>
-#define z_arc_v2_aux_reg_read(reg) __builtin_arc_lr((volatile u32_t)reg)
-#define z_arc_v2_aux_reg_write(reg, val) __builtin_arc_sr((unsigned int)val, (volatile u32_t)reg)
+#define z_arc_v2_aux_reg_read(reg) __builtin_arc_lr((volatile uint32_t)reg)
+#define z_arc_v2_aux_reg_write(reg, val) __builtin_arc_sr((unsigned int)val, (volatile uint32_t)reg)
 
 #else /* ! __GNUC__ */
 
diff --git a/include/arch/arc/v2/ffs.h b/include/arch/arc/v2/ffs.h
index 9b4d30a94d..1c1afeed7d 100644
--- a/include/arch/arc/v2/ffs.h
+++ b/include/arch/arc/v2/ffs.h
@@ -35,7 +35,7 @@ extern "C" {
  */
 
 #if defined(__GNUC__)
-static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
+static ALWAYS_INLINE unsigned int find_msb_set(uint32_t op)
 {
 	unsigned int bit;
 
@@ -64,7 +64,7 @@ static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
  */
 
 #if defined(__GNUC__)
-static ALWAYS_INLINE unsigned int find_lsb_set(u32_t op)
+static ALWAYS_INLINE unsigned int find_lsb_set(uint32_t op)
 {
 	unsigned int bit;
 
diff --git a/include/arch/arc/v2/irq.h b/include/arch/arc/v2/irq.h
index 174c36489e..d9c8c9acbf 100644
--- a/include/arch/arc/v2/irq.h
+++ b/include/arch/arc/v2/irq.h
@@ -38,7 +38,7 @@ extern int arch_irq_is_enabled(unsigned int irq);
 
 extern void _irq_exit(void);
 extern void z_irq_priority_set(unsigned int irq, unsigned int prio,
-			      u32_t flags);
+			      uint32_t flags);
 extern void _isr_wrapper(void);
 extern void z_irq_spurious(void *unused);
 
diff --git a/include/arch/arc/v2/misc.h b/include/arch/arc/v2/misc.h
index 9124a8d6f1..d610f097c5 100644
--- a/include/arch/arc/v2/misc.h
+++ b/include/arch/arc/v2/misc.h
@@ -21,9 +21,9 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 extern unsigned int z_arc_cpu_sleep_mode;
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/arc/v2/mpu/arc_core_mpu.h b/include/arch/arc/v2/mpu/arc_core_mpu.h
index 5f90625c32..ad36a22eb7 100644
--- a/include/arch/arc/v2/mpu/arc_core_mpu.h
+++ b/include/arch/arc/v2/mpu/arc_core_mpu.h
@@ -67,7 +67,7 @@ void arc_core_mpu_configure_thread(struct k_thread *thread);
  *
  * @param   region_attr region attribute of default region
  */
-void arc_core_mpu_default(u32_t region_attr);
+void arc_core_mpu_default(uint32_t region_attr);
 
 /**
  * @brief configure the MPU region
@@ -77,8 +77,8 @@ void arc_core_mpu_default(u32_t region_attr);
  * @param   size    size of region
  * @param   region_attr region attribute
  */
-int arc_core_mpu_region(u32_t index, u32_t base, u32_t size,
-			 u32_t region_attr);
+int arc_core_mpu_region(uint32_t index, uint32_t base, uint32_t size,
+			 uint32_t region_attr);
 
 #endif /* CONFIG_ARC_CORE_MPU */
 
@@ -86,7 +86,7 @@ int arc_core_mpu_region(u32_t index, u32_t base, u32_t size,
 void arc_core_mpu_configure_mem_domain(struct k_thread *thread);
 void arc_core_mpu_remove_mem_domain(struct k_mem_domain *mem_domain);
 void arc_core_mpu_remove_mem_partition(struct k_mem_domain *domain,
-			u32_t partition_id);
+			uint32_t partition_id);
 int arc_core_mpu_get_max_domain_partition_regions(void);
 int arc_core_mpu_buffer_validate(void *addr, size_t size, int write);
 
diff --git a/include/arch/arc/v2/mpu/arc_mpu.h b/include/arch/arc/v2/mpu/arc_mpu.h
index b2d34b0df9..0beda2914a 100644
--- a/include/arch/arc/v2/mpu/arc_mpu.h
+++ b/include/arch/arc/v2/mpu/arc_mpu.h
@@ -87,10 +87,10 @@ struct arc_mpu_region {
 	/* Region Name */
 	const char *name;
 	/* Region Base Address */
-	u32_t base;
-	u32_t size;
+	uint32_t base;
+	uint32_t size;
 	/* Region Attributes */
-	u32_t attr;
+	uint32_t attr;
 };
 
 #define MPU_REGION_ENTRY(_name, _base, _size, _attr) \
@@ -104,7 +104,7 @@ struct arc_mpu_region {
 /* MPU configuration data structure */
 struct arc_mpu_config {
 	/* Number of regions */
-	u32_t num_regions;
+	uint32_t num_regions;
 	/* Regions */
 	struct arc_mpu_region *mpu_regions;
 };
diff --git a/include/arch/arc/v2/secureshield/arc_secure.h b/include/arch/arc/v2/secureshield/arc_secure.h
index 764732632a..a706cad211 100644
--- a/include/arch/arc/v2/secureshield/arc_secure.h
+++ b/include/arch/arc/v2/secureshield/arc_secure.h
@@ -37,11 +37,11 @@ extern "C" {
 		(__asm__ volatile("sjli %[sjli_id]\n" :: [sjli_id] "i" (id)))
 
 #ifdef CONFIG_ARC_SECURE_FIRMWARE
-typedef u32_t (*_arc_s_call_handler_t)(u32_t arg1, u32_t arg2, u32_t arg3,
-				      u32_t arg4, u32_t arg5, u32_t arg6);
+typedef uint32_t (*_arc_s_call_handler_t)(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+				      uint32_t arg4, uint32_t arg5, uint32_t arg6);
 
 
-extern void arc_go_to_normal(u32_t addr);
+extern void arc_go_to_normal(uint32_t addr);
 extern void _arc_do_secure_call(void);
 extern const _arc_s_call_handler_t arc_s_call_table[ARC_S_CALL_LIMIT];
 
@@ -50,17 +50,17 @@ extern const _arc_s_call_handler_t arc_s_call_table[ARC_S_CALL_LIMIT];
 
 #ifdef CONFIG_ARC_NORMAL_FIRMWARE
 
-static inline u32_t _arc_s_call_invoke6(u32_t arg1, u32_t arg2, u32_t arg3,
-					  u32_t arg4, u32_t arg5, u32_t arg6,
-					  u32_t call_id)
+static inline uint32_t _arc_s_call_invoke6(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+					  uint32_t arg4, uint32_t arg5, uint32_t arg6,
+					  uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r5 __asm__("r5") = arg6;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r5 __asm__("r5") = arg6;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -74,15 +74,15 @@ static inline u32_t _arc_s_call_invoke6(u32_t arg1, u32_t arg2, u32_t arg3,
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke5(u32_t arg1, u32_t arg2, u32_t arg3,
-					  u32_t arg4, u32_t arg5, u32_t call_id)
+static inline uint32_t _arc_s_call_invoke5(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+					  uint32_t arg4, uint32_t arg5, uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -96,14 +96,14 @@ static inline u32_t _arc_s_call_invoke5(u32_t arg1, u32_t arg2, u32_t arg3,
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke4(u32_t arg1, u32_t arg2, u32_t arg3,
-					  u32_t arg4, u32_t call_id)
+static inline uint32_t _arc_s_call_invoke4(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+					  uint32_t arg4, uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -117,13 +117,13 @@ static inline u32_t _arc_s_call_invoke4(u32_t arg1, u32_t arg2, u32_t arg3,
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke3(u32_t arg1, u32_t arg2, u32_t arg3,
-					  u32_t call_id)
+static inline uint32_t _arc_s_call_invoke3(uint32_t arg1, uint32_t arg2, uint32_t arg3,
+					  uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -136,11 +136,11 @@ static inline u32_t _arc_s_call_invoke3(u32_t arg1, u32_t arg2, u32_t arg3,
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke2(u32_t arg1, u32_t arg2, u32_t call_id)
+static inline uint32_t _arc_s_call_invoke2(uint32_t arg1, uint32_t arg2, uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -153,10 +153,10 @@ static inline u32_t _arc_s_call_invoke2(u32_t arg1, u32_t arg2, u32_t call_id)
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke1(u32_t arg1, u32_t call_id)
+static inline uint32_t _arc_s_call_invoke1(uint32_t arg1, uint32_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -169,10 +169,10 @@ static inline u32_t _arc_s_call_invoke1(u32_t arg1, u32_t call_id)
 	return ret;
 }
 
-static inline u32_t _arc_s_call_invoke0(u32_t call_id)
+static inline uint32_t _arc_s_call_invoke0(uint32_t call_id)
 {
-	register u32_t ret __asm__("r0");
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0");
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	compiler_barrier();
 
@@ -187,7 +187,7 @@ static inline u32_t _arc_s_call_invoke0(u32_t call_id)
 
 static inline bool _arch_is_user_context(void)
 {
-	u32_t status;
+	uint32_t status;
 
 	compiler_barrier();
 
diff --git a/include/arch/arc/v2/sys_io.h b/include/arch/arc/v2/sys_io.h
index 1cf96259ee..8552eb2158 100644
--- a/include/arch/arc/v2/sys_io.h
+++ b/include/arch/arc/v2/sys_io.h
@@ -22,37 +22,37 @@ extern "C" {
 /* Implementation of sys_io.h's documented functions */
 
 static ALWAYS_INLINE
-	void sys_out8(u8_t data, io_port_t port)
+	void sys_out8(uint8_t data, io_port_t port)
 {
 	z_arc_v2_aux_reg_write(port, data);
 }
 
 static ALWAYS_INLINE
-	u8_t sys_in8(io_port_t port)
+	uint8_t sys_in8(io_port_t port)
 {
-	return (u8_t)(z_arc_v2_aux_reg_read(port) & 0x000000ff);
+	return (uint8_t)(z_arc_v2_aux_reg_read(port) & 0x000000ff);
 }
 
 static ALWAYS_INLINE
-	void sys_out16(u16_t data, io_port_t port)
+	void sys_out16(uint16_t data, io_port_t port)
 {
 	z_arc_v2_aux_reg_write(port, data);
 }
 
 static ALWAYS_INLINE
-	u16_t sys_in16(io_port_t port)
+	uint16_t sys_in16(io_port_t port)
 {
-	return (u16_t)(z_arc_v2_aux_reg_read(port) & 0x0000ffff);
+	return (uint16_t)(z_arc_v2_aux_reg_read(port) & 0x0000ffff);
 }
 
 static ALWAYS_INLINE
-	void sys_out32(u32_t data, io_port_t port)
+	void sys_out32(uint32_t data, io_port_t port)
 {
 	z_arc_v2_aux_reg_write(port, data);
 }
 
 static ALWAYS_INLINE
-	u32_t sys_in32(io_port_t port)
+	uint32_t sys_in32(io_port_t port)
 {
 	return z_arc_v2_aux_reg_read(port);
 }
@@ -60,7 +60,7 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	void sys_io_set_bit(io_port_t port, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("lr	%1, [%0]\n"
 			 "bset	%1, %1, %2\n"
@@ -74,7 +74,7 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	void sys_io_clear_bit(io_port_t port, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("lr	%1, [%0]\n"
 			 "bclr	%1, %1, %2\n"
@@ -88,9 +88,9 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	int sys_io_test_bit(io_port_t port, unsigned int bit)
 {
-	u32_t status = _ARC_V2_STATUS32;
-	u32_t reg = 0;
-	u32_t ret;
+	uint32_t status = _ARC_V2_STATUS32;
+	uint32_t reg = 0;
+	uint32_t ret;
 
 	__asm__ volatile("lr	%2, [%1]\n"
 			 "btst	%2, %3\n"
@@ -126,66 +126,66 @@ static ALWAYS_INLINE
 }
 
 static ALWAYS_INLINE
-	void sys_write8(u8_t data, mm_reg_t addr)
+	void sys_write8(uint8_t data, mm_reg_t addr)
 {
 	__asm__ volatile("stb%U1	%0, %1;\n\t"
 			 :
-			 : "r" (data), "m" (*(volatile u8_t *) addr)
+			 : "r" (data), "m" (*(volatile uint8_t *) addr)
 			 : "memory");
 }
 
 static ALWAYS_INLINE
-	u8_t sys_read8(mm_reg_t addr)
+	uint8_t sys_read8(mm_reg_t addr)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	__asm__ volatile("ldb%U1	%0, %1;\n\t"
 			 : "=r" (ret)
-			 : "m" (*(volatile u8_t *) addr)
+			 : "m" (*(volatile uint8_t *) addr)
 			 : "memory");
 
 	return ret;
 }
 
 static ALWAYS_INLINE
-	void sys_write16(u16_t data, mm_reg_t addr)
+	void sys_write16(uint16_t data, mm_reg_t addr)
 {
 	__asm__ volatile("sth%U1	%0, %1;\n\t"
 			 :
-			 : "r" (data), "m" (*(volatile u16_t *) addr)
+			 : "r" (data), "m" (*(volatile uint16_t *) addr)
 			 : "memory");
 }
 
 static ALWAYS_INLINE
-	u16_t sys_read16(mm_reg_t addr)
+	uint16_t sys_read16(mm_reg_t addr)
 {
-	u16_t ret;
+	uint16_t ret;
 
 	__asm__ volatile("ldh%U1	%0, %1;\n\t"
 			 : "=r" (ret)
-			 : "m" (*(volatile u16_t *) addr)
+			 : "m" (*(volatile uint16_t *) addr)
 			 : "memory");
 
 	return ret;
 }
 
 static ALWAYS_INLINE
-	void sys_write32(u32_t data, mm_reg_t addr)
+	void sys_write32(uint32_t data, mm_reg_t addr)
 {
 	__asm__ volatile("st%U1	%0, %1;\n\t"
 			 :
-			 : "r" (data), "m" (*(volatile u32_t *) addr)
+			 : "r" (data), "m" (*(volatile uint32_t *) addr)
 			 : "memory");
 }
 
 static ALWAYS_INLINE
-	u32_t sys_read32(mm_reg_t addr)
+	uint32_t sys_read32(mm_reg_t addr)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("ld%U1	%0, %1;\n\t"
 			 : "=r" (ret)
-			 : "m" (*(volatile u32_t *) addr)
+			 : "m" (*(volatile uint32_t *) addr)
 			 : "memory");
 
 	return ret;
@@ -194,12 +194,12 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("ld	%1, %0\n"
 			 "bset	%1, %1, %2\n"
 			 "st	%1, %0;\n\t"
-			 : "+m" (*(volatile u32_t *) addr)
+			 : "+m" (*(volatile uint32_t *) addr)
 			 : "r" (reg), "Mr" (bit)
 			 : "memory", "cc");
 }
@@ -207,12 +207,12 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("ld	%1, %0\n"
 			 "bclr	%1, %1, %2\n"
 			 "st	%1, %0;\n\t"
-			 : "+m" (*(volatile u32_t *) addr)
+			 : "+m" (*(volatile uint32_t *) addr)
 			 : "r" (reg), "Mr" (bit)
 			 : "memory", "cc");
 }
@@ -220,15 +220,15 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t status = _ARC_V2_STATUS32;
-	u32_t reg = 0;
-	u32_t ret;
+	uint32_t status = _ARC_V2_STATUS32;
+	uint32_t reg = 0;
+	uint32_t ret;
 
 	__asm__ volatile("ld	%2, %1\n"
 			 "btst	%2, %3\n"
 			 "lr	%0, [%4];\n\t"
 			 : "=r" (ret)
-			 : "m" (*(volatile u32_t *) addr),
+			 : "m" (*(volatile uint32_t *) addr),
 			   "r" (reg), "Mr" (bit), "i" (status)
 			 : "memory", "cc");
 
diff --git a/include/arch/arm/aarch32/arch.h b/include/arch/arm/aarch32/arch.h
index f4e99e3d1a..5fd5b0e49d 100644
--- a/include/arch/arm/aarch32/arch.h
+++ b/include/arch/arm/aarch32/arch.h
@@ -20,7 +20,7 @@
 #include <devicetree.h>
 
 /* ARM GPRs are often designated by two different names */
-#define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; }
+#define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
 
 #include <arch/arm/aarch32/thread.h>
 #include <arch/arm/aarch32/exc.h>
diff --git a/include/arch/arm/aarch32/cortex_a_r/sys_io.h b/include/arch/arm/aarch32/cortex_a_r/sys_io.h
index 771e82c5ff..ee3e765037 100644
--- a/include/arch/arm/aarch32/cortex_a_r/sys_io.h
+++ b/include/arch/arm/aarch32/cortex_a_r/sys_io.h
@@ -24,67 +24,67 @@ extern "C" {
 
 /* Memory mapped registers I/O functions */
 
-static ALWAYS_INLINE u8_t sys_read8(mem_addr_t addr)
+static ALWAYS_INLINE uint8_t sys_read8(mem_addr_t addr)
 {
-	u8_t val = *(volatile u8_t *)addr;
+	uint8_t val = *(volatile uint8_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write8(u8_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write8(uint8_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u8_t *)addr = data;
+	*(volatile uint8_t *)addr = data;
 }
 
-static ALWAYS_INLINE u16_t sys_read16(mem_addr_t addr)
+static ALWAYS_INLINE uint16_t sys_read16(mem_addr_t addr)
 {
-	u16_t val = *(volatile u16_t *)addr;
+	uint16_t val = *(volatile uint16_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write16(u16_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write16(uint16_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u16_t *)addr = data;
+	*(volatile uint16_t *)addr = data;
 }
 
-static ALWAYS_INLINE u32_t sys_read32(mem_addr_t addr)
+static ALWAYS_INLINE uint32_t sys_read32(mem_addr_t addr)
 {
-	u32_t val = *(volatile u32_t *)addr;
+	uint32_t val = *(volatile uint32_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write32(u32_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u32_t *)addr = data;
+	*(volatile uint32_t *)addr = data;
 }
 
 /* Memory bit manipulation functions */
 
 static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp | (1 << bit);
+	*(volatile uint32_t *)addr = temp | (1 << bit);
 }
 
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp & ~(1 << bit);
+	*(volatile uint32_t *)addr = temp & ~(1 << bit);
 }
 
 static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
 	return temp & (1 << bit);
 }
diff --git a/include/arch/arm/aarch32/cortex_m/cmsis.h b/include/arch/arm/aarch32/cortex_m/cmsis.h
index 1e6e251350..d93d79d4ed 100644
--- a/include/arch/arm/aarch32/cortex_m/cmsis.h
+++ b/include/arch/arm/aarch32/cortex_m/cmsis.h
@@ -39,9 +39,9 @@ extern "C" {
 #define CPACR_CP11_RESERVED     (2UL << CPACR_CP11_Pos)
 #define CPACR_CP11_FULL_ACCESS  (3UL << CPACR_CP11_Pos)
 
-#define SCB_UFSR  (*((__IOM u16_t *) &SCB->CFSR + 1))
-#define SCB_BFSR  (*((__IOM u8_t *) &SCB->CFSR + 1))
-#define SCB_MMFSR (*((__IOM u8_t *) &SCB->CFSR))
+#define SCB_UFSR  (*((__IOM uint16_t *) &SCB->CFSR + 1))
+#define SCB_BFSR  (*((__IOM uint8_t *) &SCB->CFSR + 1))
+#define SCB_MMFSR (*((__IOM uint8_t *) &SCB->CFSR))
 
 /* Fill in CMSIS required values for non-CMSIS compliant SoCs.
  * Use __NVIC_PRIO_BITS as it is required and simple to check, but
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
index 72b0f51ac7..1ddb52bf08 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
@@ -23,7 +23,7 @@
 /* Region definition data structure */
 struct arm_mpu_region {
 	/* Region Base Address */
-	u32_t base;
+	uint32_t base;
 	/* Region Name */
 	const char *name;
 	/* Region Attributes */
@@ -33,7 +33,7 @@ struct arm_mpu_region {
 /* MPU configuration data structure */
 struct arm_mpu_config {
 	/* Number of regions */
-	u32_t num_regions;
+	uint32_t num_regions;
 	/* Regions */
 	const struct arm_mpu_region *mpu_regions;
 };
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h
index ae7692ad35..4bcebed4e6 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h
@@ -133,14 +133,14 @@
 
 struct arm_mpu_region_attr {
 	/* Attributes belonging to RASR (including the encoded region size) */
-	u32_t rasr;
+	uint32_t rasr;
 };
 
 typedef struct arm_mpu_region_attr arm_mpu_region_attr_t;
 
 /* Typedef for the k_mem_partition attribute */
 typedef struct {
-	u32_t rasr_attr;
+	uint32_t rasr_attr;
 } k_mem_partition_attr_t;
 
 /* Read-Write access permission attributes */
@@ -267,7 +267,7 @@ typedef struct {
 #define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
 	BUILD_ASSERT(!(((size) & ((size) - 1))) && \
 		(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE && \
-		!((u32_t)(start) & ((size) - 1)), \
+		!((uint32_t)(start) & ((size) - 1)), \
 		"the size of the partition must be power of 2" \
 		" and greater than or equal to the minimum MPU region size." \
 		"start address of the partition must align with size.")
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h
index 1081e49f67..c4535699f0 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h
@@ -151,19 +151,19 @@
 
 struct arm_mpu_region_attr {
 	/* Attributes belonging to RBAR */
-	u8_t rbar: 5;
+	uint8_t rbar: 5;
 	/* MAIR index for attribute indirection */
-	u8_t mair_idx: 3;
+	uint8_t mair_idx: 3;
 	/* Region Limit Address value to be written to the RLAR register. */
-	u32_t r_limit;
+	uint32_t r_limit;
 };
 
 typedef struct arm_mpu_region_attr arm_mpu_region_attr_t;
 
 /* Typedef for the k_mem_partition attribute */
 typedef struct {
-	u16_t rbar;
-	u16_t mair_idx;
+	uint16_t rbar;
+	uint16_t mair_idx;
 } k_mem_partition_attr_t;
 
 /* Kernel macros for memory attribution
@@ -252,7 +252,7 @@ typedef struct {
 #endif /* _ASMLANGUAGE */
 
 #define _ARCH_MEM_PARTITION_ALIGN_CHECK(start, size) \
-	BUILD_ASSERT((size > 0) && ((u32_t)start % \
+	BUILD_ASSERT((size > 0) && ((uint32_t)start % \
 			CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0U) && \
 		((size) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0), \
 		" the start and size of the partition must align " \
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
index 0f18a7d756..b9baf723e5 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
@@ -131,14 +131,14 @@ DEBUGGER (Master 1) can't be disabled in Region 0. */
 
 struct nxp_mpu_region_attr {
 	/* NXP MPU region access permission attributes */
-	u32_t attr;
+	uint32_t attr;
 };
 
 typedef struct nxp_mpu_region_attr nxp_mpu_region_attr_t;
 
 /* Typedef for the k_mem_partition attribute*/
 typedef struct {
-	u32_t ap_attr;
+	uint32_t ap_attr;
 } k_mem_partition_attr_t;
 
 /* Kernel macros for memory attribution
@@ -220,9 +220,9 @@ typedef struct {
 /* Region definition data structure */
 struct nxp_mpu_region {
 	/* Region Base Address */
-	u32_t base;
+	uint32_t base;
 	/* Region End Address */
-	u32_t end;
+	uint32_t end;
 	/* Region Name */
 	const char *name;
 	/* Region Attributes */
@@ -240,11 +240,11 @@ struct nxp_mpu_region {
 /* MPU configuration data structure */
 struct nxp_mpu_config {
 	/* Number of regions */
-	u32_t num_regions;
+	uint32_t num_regions;
 	/* Regions */
 	const struct nxp_mpu_region *mpu_regions;
 	/* SRAM Region */
-	u32_t sram_region;
+	uint32_t sram_region;
 };
 
 /* Reference to the MPU configuration.
@@ -263,7 +263,7 @@ extern const struct nxp_mpu_config mpu_config;
 	BUILD_ASSERT((size) % \
 		CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0 && \
 		(size) >= CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE && \
-		(u32_t)(start) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0, \
+		(uint32_t)(start) % CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE == 0, \
 		"the size of the partition must align with minimum MPU \
 		 region size" \
 		" and greater than or equal to minimum MPU region size." \
diff --git a/include/arch/arm/aarch32/error.h b/include/arch/arm/aarch32/error.h
index 2c584cdf97..b12866ad55 100644
--- a/include/arch/arm/aarch32/error.h
+++ b/include/arch/arm/aarch32/error.h
@@ -33,7 +33,7 @@ extern "C" {
  * Force them unlocked as well.
  */
 #define ARCH_EXCEPT(reason_p) \
-register u32_t r0 __asm__("r0") = reason_p; \
+register uint32_t r0 __asm__("r0") = reason_p; \
 do { \
 	__asm__ volatile ( \
 		"cpsie i\n\t" \
diff --git a/include/arch/arm/aarch32/exc.h b/include/arch/arm/aarch32/exc.h
index 75050d17f1..2e74222bf9 100644
--- a/include/arch/arm/aarch32/exc.h
+++ b/include/arch/arm/aarch32/exc.h
@@ -82,12 +82,12 @@ struct __esf {
 		sys_define_gpr_with_alias(ip, r12);
 		sys_define_gpr_with_alias(lr, r14);
 		sys_define_gpr_with_alias(pc, r15);
-		u32_t xpsr;
+		uint32_t xpsr;
 	} basic;
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	float s[16];
-	u32_t fpscr;
-	u32_t undefined;
+	uint32_t fpscr;
+	uint32_t undefined;
 #endif
 };
 
diff --git a/include/arch/arm/aarch32/irq.h b/include/arch/arm/aarch32/irq.h
index 48fe69bac5..187aaef921 100644
--- a/include/arch/arm/aarch32/irq.h
+++ b/include/arch/arm/aarch32/irq.h
@@ -43,7 +43,7 @@ extern int arch_irq_is_enabled(unsigned int irq);
 
 /* internal routine documented in C file, needed by IRQ_CONNECT() macro */
 extern void z_arm_irq_priority_set(unsigned int irq, unsigned int prio,
-				   u32_t flags);
+				   uint32_t flags);
 
 #else
 
diff --git a/include/arch/arm/aarch32/misc.h b/include/arch/arm/aarch32/misc.h
index b7fac9662a..3f157b2cfb 100644
--- a/include/arch/arm/aarch32/misc.h
+++ b/include/arch/arm/aarch32/misc.h
@@ -19,9 +19,9 @@ extern "C" {
 #endif
 
 #ifndef _ASMLANGUAGE
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/arm/aarch32/syscall.h b/include/arch/arm/aarch32/syscall.h
index 4301990b79..0ef7355aa2 100644
--- a/include/arch/arm/aarch32/syscall.h
+++ b/include/arch/arm/aarch32/syscall.h
@@ -41,13 +41,13 @@ static inline uintptr_t arch_syscall_invoke6(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5, uintptr_t arg6,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r5 __asm__("r5") = arg6;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r5 __asm__("r5") = arg6;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -64,12 +64,12 @@ static inline uintptr_t arch_syscall_invoke5(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r4 __asm__("r4") = arg5;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r4 __asm__("r4") = arg5;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -85,11 +85,11 @@ static inline uintptr_t arch_syscall_invoke4(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3, uintptr_t arg4,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r3 __asm__("r3") = arg4;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r3 __asm__("r3") = arg4;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -105,10 +105,10 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r2 __asm__("r2") = arg3;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r2 __asm__("r2") = arg3;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -122,9 +122,9 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r1 __asm__("r1") = arg2;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r1 __asm__("r1") = arg2;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -138,8 +138,8 @@ static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1,
 					     uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0") = arg1;
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0") = arg1;
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -151,8 +151,8 @@ static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1,
 
 static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 {
-	register u32_t ret __asm__("r0");
-	register u32_t r6 __asm__("r6") = call_id;
+	register uint32_t ret __asm__("r0");
+	register uint32_t r6 __asm__("r6") = call_id;
 
 	__asm__ volatile("svc %[svid]\n"
 			 : "=r"(ret)
@@ -165,7 +165,7 @@ static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 
 static inline bool arch_is_user_context(void)
 {
-	u32_t value;
+	uint32_t value;
 
 	/* check for handler mode */
 	__asm__ volatile("mrs %0, IPSR\n\t" : "=r"(value));
diff --git a/include/arch/arm/aarch32/thread.h b/include/arch/arm/aarch32/thread.h
index 5e31ae85b3..f2e8037af9 100644
--- a/include/arch/arm/aarch32/thread.h
+++ b/include/arch/arm/aarch32/thread.h
@@ -23,15 +23,15 @@
 #include <zephyr/types.h>
 
 struct _callee_saved {
-	u32_t v1;  /* r4 */
-	u32_t v2;  /* r5 */
-	u32_t v3;  /* r6 */
-	u32_t v4;  /* r7 */
-	u32_t v5;  /* r8 */
-	u32_t v6;  /* r9 */
-	u32_t v7;  /* r10 */
-	u32_t v8;  /* r11 */
-	u32_t psp; /* r13 */
+	uint32_t v1;  /* r4 */
+	uint32_t v2;  /* r5 */
+	uint32_t v3;  /* r6 */
+	uint32_t v4;  /* r7 */
+	uint32_t v5;  /* r8 */
+	uint32_t v6;  /* r9 */
+	uint32_t v7;  /* r10 */
+	uint32_t v8;  /* r11 */
+	uint32_t psp; /* r13 */
 };
 
 typedef struct _callee_saved _callee_saved_t;
@@ -60,10 +60,10 @@ struct _preempt_float {
 struct _thread_arch {
 
 	/* interrupt locking key */
-	u32_t basepri;
+	uint32_t basepri;
 
 	/* r0 in stack frame cannot be written to reliably */
-	u32_t swap_return_value;
+	uint32_t swap_return_value;
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 	/*
@@ -75,9 +75,9 @@ struct _thread_arch {
 #endif
 
 #if defined(CONFIG_USERSPACE) || defined(CONFIG_FPU_SHARING)
-	u32_t mode;
+	uint32_t mode;
 #if defined(CONFIG_USERSPACE)
-	u32_t priv_stack_start;
+	uint32_t priv_stack_start;
 #endif
 #endif
 };
diff --git a/include/arch/arm/aarch64/arm_mmu.h b/include/arch/arm/aarch64/arm_mmu.h
index 04219579e4..f7024df450 100644
--- a/include/arch/arm/aarch64/arm_mmu.h
+++ b/include/arch/arm/aarch64/arm_mmu.h
@@ -117,11 +117,11 @@
 /* Region definition data structure */
 struct arm_mmu_region {
 	/* Region Base Physical Address */
-	u64_t base_pa;
+	uint64_t base_pa;
 	/* Region Base Virtual Address */
-	u64_t base_va;
+	uint64_t base_va;
 	/* Region size */
-	u64_t size;
+	uint64_t size;
 	/* Region Name */
 	const char *name;
 	/* Region Attributes */
@@ -131,7 +131,7 @@ struct arm_mmu_region {
 /* MMU configuration data structure */
 struct arm_mmu_config {
 	/* Number of regions */
-	u32_t num_regions;
+	uint32_t num_regions;
 	/* Regions */
 	const struct arm_mmu_region *mmu_regions;
 };
diff --git a/include/arch/arm/aarch64/cpu.h b/include/arch/arm/aarch64/cpu.h
index 297c3e36cd..5c6bdd521b 100644
--- a/include/arch/arm/aarch64/cpu.h
+++ b/include/arch/arm/aarch64/cpu.h
@@ -118,7 +118,7 @@
 #ifndef _ASMLANGUAGE
 /* Core sysreg macros */
 #define read_sysreg(reg) ({					\
-	u64_t val;						\
+	uint64_t val;						\
 	__asm__ volatile("mrs %0, " STRINGIFY(reg) : "=r" (val));\
 	val;							\
 })
diff --git a/include/arch/arm/aarch64/exc.h b/include/arch/arm/aarch64/exc.h
index dfc1100e4e..2e7c197872 100644
--- a/include/arch/arm/aarch64/exc.h
+++ b/include/arch/arm/aarch64/exc.h
@@ -26,9 +26,9 @@ extern "C" {
 
 struct __esf {
 	struct __basic_sf {
-		u64_t regs[20];
-		u64_t spsr;
-		u64_t elr;
+		uint64_t regs[20];
+		uint64_t spsr;
+		uint64_t elr;
 	} basic;
 };
 
diff --git a/include/arch/arm/aarch64/irq.h b/include/arch/arm/aarch64/irq.h
index 793ff0eb3a..e2da9969d0 100644
--- a/include/arch/arm/aarch64/irq.h
+++ b/include/arch/arm/aarch64/irq.h
@@ -41,7 +41,7 @@ extern int arch_irq_is_enabled(unsigned int irq);
 
 /* internal routine documented in C file, needed by IRQ_CONNECT() macro */
 extern void z_arm64_irq_priority_set(unsigned int irq, unsigned int prio,
-				     u32_t flags);
+				     uint32_t flags);
 
 #else
 
diff --git a/include/arch/arm/aarch64/misc.h b/include/arch/arm/aarch64/misc.h
index d244656aa9..61a3e4a2b4 100644
--- a/include/arch/arm/aarch64/misc.h
+++ b/include/arch/arm/aarch64/misc.h
@@ -20,9 +20,9 @@ extern "C" {
 #endif
 
 #ifndef _ASMLANGUAGE
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/arm/aarch64/sys_io.h b/include/arch/arm/aarch64/sys_io.h
index c430e38a8b..6392363795 100644
--- a/include/arch/arm/aarch64/sys_io.h
+++ b/include/arch/arm/aarch64/sys_io.h
@@ -23,67 +23,67 @@ extern "C" {
 
 /* Memory mapped registers I/O functions */
 
-static ALWAYS_INLINE u8_t sys_read8(mem_addr_t addr)
+static ALWAYS_INLINE uint8_t sys_read8(mem_addr_t addr)
 {
-	u8_t val = *(volatile u8_t *)addr;
+	uint8_t val = *(volatile uint8_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write8(u8_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write8(uint8_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u8_t *)addr = data;
+	*(volatile uint8_t *)addr = data;
 }
 
-static ALWAYS_INLINE u16_t sys_read16(mem_addr_t addr)
+static ALWAYS_INLINE uint16_t sys_read16(mem_addr_t addr)
 {
-	u16_t val = *(volatile u16_t *)addr;
+	uint16_t val = *(volatile uint16_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write16(u16_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write16(uint16_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u16_t *)addr = data;
+	*(volatile uint16_t *)addr = data;
 }
 
-static ALWAYS_INLINE u32_t sys_read32(mem_addr_t addr)
+static ALWAYS_INLINE uint32_t sys_read32(mem_addr_t addr)
 {
-	u32_t val = *(volatile u32_t *)addr;
+	uint32_t val = *(volatile uint32_t *)addr;
 
 	__DMB();
 	return val;
 }
 
-static ALWAYS_INLINE void sys_write32(u32_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
 {
 	__DMB();
-	*(volatile u32_t *)addr = data;
+	*(volatile uint32_t *)addr = data;
 }
 
 /* Memory bit manipulation functions */
 
 static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp | (1 << bit);
+	*(volatile uint32_t *)addr = temp | (1 << bit);
 }
 
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp & ~(1 << bit);
+	*(volatile uint32_t *)addr = temp & ~(1 << bit);
 }
 
 static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
 	return temp & (1 << bit);
 }
diff --git a/include/arch/arm/aarch64/thread.h b/include/arch/arm/aarch64/thread.h
index 08e31ffe39..e5e8fa48b5 100644
--- a/include/arch/arm/aarch64/thread.h
+++ b/include/arch/arm/aarch64/thread.h
@@ -23,25 +23,25 @@
 #include <zephyr/types.h>
 
 struct _callee_saved {
-	u64_t x19;
-	u64_t x20;
-	u64_t x21;
-	u64_t x22;
-	u64_t x23;
-	u64_t x24;
-	u64_t x25;
-	u64_t x26;
-	u64_t x27;
-	u64_t x28;
-	u64_t x29; /* FP */
-	u64_t x30; /* LR */
-	u64_t sp;
+	uint64_t x19;
+	uint64_t x20;
+	uint64_t x21;
+	uint64_t x22;
+	uint64_t x23;
+	uint64_t x24;
+	uint64_t x25;
+	uint64_t x26;
+	uint64_t x27;
+	uint64_t x28;
+	uint64_t x29; /* FP */
+	uint64_t x30; /* LR */
+	uint64_t sp;
 };
 
 typedef struct _callee_saved _callee_saved_t;
 
 struct _thread_arch {
-	u32_t swap_return_value;
+	uint32_t swap_return_value;
 };
 
 typedef struct _thread_arch _thread_arch_t;
diff --git a/include/arch/arm/aarch64/timer.h b/include/arch/arm/aarch64/timer.h
index 60fc73d342..12856b4eb6 100644
--- a/include/arch/arm/aarch64/timer.h
+++ b/include/arch/arm/aarch64/timer.h
@@ -23,7 +23,7 @@ extern "C" {
 #define CNTV_CTL_ENABLE		((1) << 0)
 
 
-static ALWAYS_INLINE void arm_arch_timer_set_compare(u64_t val)
+static ALWAYS_INLINE void arm_arch_timer_set_compare(uint64_t val)
 {
 	__asm__ volatile("msr cntv_cval_el0, %0\n\t"
 			 : : "r" (val) : "memory");
@@ -31,7 +31,7 @@ static ALWAYS_INLINE void arm_arch_timer_set_compare(u64_t val)
 
 static ALWAYS_INLINE void arm_arch_timer_enable(unsigned char enable)
 {
-	u32_t cntv_ctl;
+	uint32_t cntv_ctl;
 
 	__asm__ volatile("mrs %0, cntv_ctl_el0\n\t"
 			 : "=r" (cntv_ctl) :  : "memory");
@@ -45,9 +45,9 @@ static ALWAYS_INLINE void arm_arch_timer_enable(unsigned char enable)
 			 : : "r" (cntv_ctl) : "memory");
 }
 
-static ALWAYS_INLINE u64_t arm_arch_timer_count(void)
+static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
 {
-	u64_t cntvct_el0;
+	uint64_t cntvct_el0;
 
 	__asm__ volatile("mrs %0, cntvct_el0\n\t"
 			 : "=r" (cntvct_el0) : : "memory");
diff --git a/include/arch/common/ffs.h b/include/arch/common/ffs.h
index 627f0df7c5..be934c7069 100644
--- a/include/arch/common/ffs.h
+++ b/include/arch/common/ffs.h
@@ -28,7 +28,7 @@ extern "C" {
  * @return most significant bit set, 0 if @a op is 0
  */
 
-static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
+static ALWAYS_INLINE unsigned int find_msb_set(uint32_t op)
 {
 	if (op == 0) {
 		return 0;
@@ -50,7 +50,7 @@ static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
  * @return least significant bit set, 0 if @a op is 0
  */
 
-static ALWAYS_INLINE unsigned int find_lsb_set(u32_t op)
+static ALWAYS_INLINE unsigned int find_lsb_set(uint32_t op)
 {
 	return __builtin_ffs(op);
 }
diff --git a/include/arch/common/sys_io.h b/include/arch/common/sys_io.h
index ec87978771..4e1f20b528 100644
--- a/include/arch/common/sys_io.h
+++ b/include/arch/common/sys_io.h
@@ -22,55 +22,55 @@
 extern "C" {
 #endif
 
-static ALWAYS_INLINE u8_t sys_read8(mem_addr_t addr)
+static ALWAYS_INLINE uint8_t sys_read8(mem_addr_t addr)
 {
-	return *(volatile u8_t *)addr;
+	return *(volatile uint8_t *)addr;
 }
 
-static ALWAYS_INLINE void sys_write8(u8_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write8(uint8_t data, mem_addr_t addr)
 {
-	*(volatile u8_t *)addr = data;
+	*(volatile uint8_t *)addr = data;
 }
 
-static ALWAYS_INLINE u16_t sys_read16(mem_addr_t addr)
+static ALWAYS_INLINE uint16_t sys_read16(mem_addr_t addr)
 {
-	return *(volatile u16_t *)addr;
+	return *(volatile uint16_t *)addr;
 }
 
-static ALWAYS_INLINE void sys_write16(u16_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write16(uint16_t data, mem_addr_t addr)
 {
-	*(volatile u16_t *)addr = data;
+	*(volatile uint16_t *)addr = data;
 }
 
-static ALWAYS_INLINE u32_t sys_read32(mem_addr_t addr)
+static ALWAYS_INLINE uint32_t sys_read32(mem_addr_t addr)
 {
-	return *(volatile u32_t *)addr;
+	return *(volatile uint32_t *)addr;
 }
 
-static ALWAYS_INLINE void sys_write32(u32_t data, mem_addr_t addr)
+static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
 {
-	*(volatile u32_t *)addr = data;
+	*(volatile uint32_t *)addr = data;
 }
 
 /* Memory bit manipulation functions */
 
 static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp | (1 << bit);
+	*(volatile uint32_t *)addr = temp | (1 << bit);
 }
 
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
-	*(volatile u32_t *)addr = temp & ~(1 << bit);
+	*(volatile uint32_t *)addr = temp & ~(1 << bit);
 }
 
 static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 {
-	u32_t temp = *(volatile u32_t *)addr;
+	uint32_t temp = *(volatile uint32_t *)addr;
 
 	return temp & (1 << bit);
 }
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index 8e912b9938..76bf158208 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -101,24 +101,24 @@ void arch_irq_enable(unsigned int irq);
 void arch_irq_disable(unsigned int irq);
 
 struct __esf {
-	u32_t ra; /* return address r31 */
-	u32_t r1; /* at */
-	u32_t r2; /* return value */
-	u32_t r3; /* return value */
-	u32_t r4; /* register args */
-	u32_t r5; /* register args */
-	u32_t r6; /* register args */
-	u32_t r7; /* register args */
-	u32_t r8; /* Caller-saved general purpose */
-	u32_t r9; /* Caller-saved general purpose */
-	u32_t r10; /* Caller-saved general purpose */
-	u32_t r11; /* Caller-saved general purpose */
-	u32_t r12; /* Caller-saved general purpose */
-	u32_t r13; /* Caller-saved general purpose */
-	u32_t r14; /* Caller-saved general purpose */
-	u32_t r15; /* Caller-saved general purpose */
-	u32_t estatus;
-	u32_t instr; /* Instruction being executed when exc occurred */
+	uint32_t ra; /* return address r31 */
+	uint32_t r1; /* at */
+	uint32_t r2; /* return value */
+	uint32_t r3; /* return value */
+	uint32_t r4; /* register args */
+	uint32_t r5; /* register args */
+	uint32_t r6; /* register args */
+	uint32_t r7; /* register args */
+	uint32_t r8; /* Caller-saved general purpose */
+	uint32_t r9; /* Caller-saved general purpose */
+	uint32_t r10; /* Caller-saved general purpose */
+	uint32_t r11; /* Caller-saved general purpose */
+	uint32_t r12; /* Caller-saved general purpose */
+	uint32_t r13; /* Caller-saved general purpose */
+	uint32_t r14; /* Caller-saved general purpose */
+	uint32_t r15; /* Caller-saved general purpose */
+	uint32_t estatus;
+	uint32_t instr; /* Instruction being executed when exc occurred */
 };
 
 typedef struct __esf z_arch_esf_t;
@@ -170,9 +170,9 @@ enum nios2_exception_cause {
 	 BIT(NIOS2_EXCEPTION_ECC_DATA_ERR))
 
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/nios2/nios2.h b/include/arch/nios2/nios2.h
index 6c0aa76879..02eb89756b 100644
--- a/include/arch/nios2/nios2.h
+++ b/include/arch/nios2/nios2.h
@@ -60,22 +60,22 @@ extern "C"
  */
 
 /* ET (Exception Temporary) register */
-static inline u32_t _nios2_read_et(void)
+static inline uint32_t _nios2_read_et(void)
 {
-	u32_t et;
+	uint32_t et;
 
 	__asm__("mov %0, et" : "=r" (et));
 	return et;
 }
 
-static inline void _nios2_write_et(u32_t et)
+static inline void _nios2_write_et(uint32_t et)
 {
 	__asm__ volatile("mov et, %z0" : : "rM" (et));
 }
 
-static inline u32_t _nios2_read_sp(void)
+static inline uint32_t _nios2_read_sp(void)
 {
-	u32_t sp;
+	uint32_t sp;
 
 	__asm__("mov %0, sp" : "=r" (sp));
 	return sp;
@@ -102,12 +102,12 @@ static inline void _nios2_dcache_addr_flush(void *addr)
 	__asm__ volatile ("flushda (%0)" :: "r" (addr));
 }
 
-static inline void z_nios2_dcache_flush(u32_t offset)
+static inline void z_nios2_dcache_flush(uint32_t offset)
 {
 	__asm__ volatile ("flushd (%0)" :: "r" (offset));
 }
 
-static inline void z_nios2_icache_flush(u32_t offset)
+static inline void z_nios2_icache_flush(uint32_t offset)
 {
 	__asm__ volatile ("flushi %0" :: "r" (offset));
 }
@@ -145,7 +145,7 @@ enum nios2_creg {
  * we get errors "Control register number must be in range 0-31 for
  * __builtin_rdctl" with the following code:
  *
- * static inline u32_t z_nios2_creg_read(enum nios2_creg reg)
+ * static inline uint32_t z_nios2_creg_read(enum nios2_creg reg)
  * {
  *          return __builtin_rdctl(reg);
  * }
@@ -156,15 +156,15 @@ enum nios2_creg {
 #define z_nios2_creg_write(reg, val) __builtin_wrctl(reg, val)
 
 #define z_nios2_get_register_address(base, regnum) \
-	((void *)(((u8_t *)base) + ((regnum) * (SYSTEM_BUS_WIDTH / 8))))
+	((void *)(((uint8_t *)base) + ((regnum) * (SYSTEM_BUS_WIDTH / 8))))
 
-static inline void _nios2_reg_write(void *base, int regnum, u32_t data)
+static inline void _nios2_reg_write(void *base, int regnum, uint32_t data)
 {
 	sys_write32(data,
 		    (mm_reg_t)z_nios2_get_register_address(base, regnum));
 }
 
-static inline u32_t _nios2_reg_read(void *base, int regnum)
+static inline uint32_t _nios2_reg_read(void *base, int regnum)
 {
 	return sys_read32((mm_reg_t)z_nios2_get_register_address(base, regnum));
 }
diff --git a/include/arch/nios2/thread.h b/include/arch/nios2/thread.h
index be54b7d84f..34fdb7c713 100644
--- a/include/arch/nios2/thread.h
+++ b/include/arch/nios2/thread.h
@@ -24,31 +24,31 @@
 
 struct _callee_saved {
 	/* General purpose callee-saved registers */
-	u32_t r16;
-	u32_t r17;
-	u32_t r18;
-	u32_t r19;
-	u32_t r20;
-	u32_t r21;
-	u32_t r22;
-	u32_t r23;
+	uint32_t r16;
+	uint32_t r17;
+	uint32_t r18;
+	uint32_t r19;
+	uint32_t r20;
+	uint32_t r21;
+	uint32_t r22;
+	uint32_t r23;
 
 	 /* Normally used for the frame pointer but also a general purpose
 	  * register if frame pointers omitted
 	  */
-	u32_t r28;
+	uint32_t r28;
 
 	/* Return address */
-	u32_t ra;
+	uint32_t ra;
 
 	/* Stack pointer */
-	u32_t sp;
+	uint32_t sp;
 
 	/* IRQ status before irq_lock() and call to z_swap() */
-	u32_t key;
+	uint32_t key;
 
 	/* Return value of z_swap() */
-	u32_t retval;
+	uint32_t retval;
 };
 
 typedef struct _callee_saved _callee_saved_t;
diff --git a/include/arch/posix/arch.h b/include/arch/posix/arch.h
index 2d8f1f6d10..18cc8d70b4 100644
--- a/include/arch/posix/arch.h
+++ b/include/arch/posix/arch.h
@@ -39,14 +39,14 @@ extern "C" {
 #endif
 
 struct __esf {
-	u32_t dummy; /*maybe we will want to add something someday*/
+	uint32_t dummy; /*maybe we will want to add something someday*/
 };
 
 typedef struct __esf z_arch_esf_t;
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/posix/thread.h b/include/arch/posix/thread.h
index 8c9f83240d..76791ea785 100644
--- a/include/arch/posix/thread.h
+++ b/include/arch/posix/thread.h
@@ -29,10 +29,10 @@ extern "C" {
 
 struct _callee_saved {
 	/* IRQ status before irq_lock() and call to z_swap() */
-	u32_t key;
+	uint32_t key;
 
 	/* Return value of z_swap() */
-	u32_t retval;
+	uint32_t retval;
 
 	/* Thread status pointer */
 	void *thread_status;
diff --git a/include/arch/riscv/arch.h b/include/arch/riscv/arch.h
index a264d28d53..17284b430f 100644
--- a/include/arch/riscv/arch.h
+++ b/include/arch/riscv/arch.h
@@ -90,7 +90,7 @@ extern "C" {
  * SOC-specific function to get the IRQ number generating the interrupt.
  * __soc_get_irq returns a bitfield of pending IRQs.
  */
-extern u32_t __soc_get_irq(void);
+extern uint32_t __soc_get_irq(void);
 
 void arch_irq_enable(unsigned int irq);
 void arch_irq_disable(unsigned int irq);
@@ -160,9 +160,9 @@ static ALWAYS_INLINE void arch_nop(void)
 	__asm__ volatile("nop");
 }
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/riscv/exp.h b/include/arch/riscv/exp.h
index 74adc48f8a..4c0e80e3fc 100644
--- a/include/arch/riscv/exp.h
+++ b/include/arch/riscv/exp.h
@@ -43,9 +43,9 @@ struct soc_esf {
 
 #if !defined(RV_FP_TYPE) && defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 #ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION
-#define RV_FP_TYPE u64_t
+#define RV_FP_TYPE uint64_t
 #else
-#define RV_FP_TYPE u32_t
+#define RV_FP_TYPE uint32_t
 #endif
 #endif
 
diff --git a/include/arch/riscv/thread.h b/include/arch/riscv/thread.h
index 819dbde121..53639d7c68 100644
--- a/include/arch/riscv/thread.h
+++ b/include/arch/riscv/thread.h
@@ -24,9 +24,9 @@
 
 #if !defined(RV_FP_TYPE) && defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
 #ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION
-#define RV_FP_TYPE u64_t
+#define RV_FP_TYPE uint64_t
 #else
-#define RV_FP_TYPE u32_t
+#define RV_FP_TYPE uint32_t
 #endif
 #endif
 
@@ -51,7 +51,7 @@ struct _callee_saved {
 	ulong_t s11;	/* saved register */
 
 #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
-	u32_t fcsr;		/* Control and status register */
+	uint32_t fcsr;		/* Control and status register */
 	RV_FP_TYPE fs0;		/* saved floating-point register */
 	RV_FP_TYPE fs1;		/* saved floating-point register */
 	RV_FP_TYPE fs2;		/* saved floating-point register */
@@ -69,7 +69,7 @@ struct _callee_saved {
 typedef struct _callee_saved _callee_saved_t;
 
 struct _thread_arch {
-	u32_t swap_return_value; /* Return value of z_swap() */
+	uint32_t swap_return_value; /* Return value of z_swap() */
 };
 
 typedef struct _thread_arch _thread_arch_t;
diff --git a/include/arch/x86/acpi.h b/include/arch/x86/acpi.h
index 5e691f4490..207fbc480b 100644
--- a/include/arch/x86/acpi.h
+++ b/include/arch/x86/acpi.h
@@ -18,10 +18,10 @@ extern struct acpi_cpu *z_acpi_get_cpu(int);
 #define ACPI_RSDP_SIGNATURE	0x2052545020445352 /* 'RSD PTR ' */
 
 struct acpi_rsdp {
-	u64_t signature;	/* ACPI_RSDP_SIG */
-	u8_t checksum;
-	u8_t dontcare[7];
-	u32_t rsdt;		/* physical address of RSDT */
+	uint64_t signature;	/* ACPI_RSDP_SIG */
+	uint8_t checksum;
+	uint8_t dontcare[7];
+	uint32_t rsdt;		/* physical address of RSDT */
 } __packed;
 
 /*
@@ -29,11 +29,11 @@ struct acpi_rsdp {
  */
 
 struct acpi_sdt {
-	u32_t signature;
-	u32_t length;		/* in bytes, of entire table */
-	u8_t dontcare0;
-	u8_t checksum;		/* of entire table */
-	u8_t dontcare1[26];
+	uint32_t signature;
+	uint32_t length;		/* in bytes, of entire table */
+	uint8_t dontcare0;
+	uint8_t checksum;		/* of entire table */
+	uint8_t dontcare1[26];
 } __packed;
 
 /*
@@ -44,7 +44,7 @@ struct acpi_sdt {
 
 struct acpi_rsdt {
 	struct acpi_sdt sdt;
-	u32_t sdts[];  /* physical addresses of other SDTs */
+	uint32_t sdts[];  /* physical addresses of other SDTs */
 } __packed;
 
 /*
@@ -55,14 +55,14 @@ struct acpi_rsdt {
 #define ACPI_MADT_SIGNATURE 0x43495041	/* 'APIC' */
 
 struct acpi_madt_entry {
-	u8_t type;
-	u8_t length;
+	uint8_t type;
+	uint8_t length;
 } __packed;
 
 struct acpi_madt {
 	struct acpi_sdt sdt;
-	u32_t lapic;	/* local APIC MMIO address */
-	u32_t flags;	/* see ACPI_MADT_FLAGS_* below */
+	uint32_t lapic;	/* local APIC MMIO address */
+	uint32_t flags;	/* see ACPI_MADT_FLAGS_* below */
 	struct acpi_madt_entry entries[];
 } __packed;
 
@@ -76,9 +76,9 @@ struct acpi_madt {
 
 struct acpi_cpu {
 	struct acpi_madt_entry entry;
-	u8_t dontcare;
-	u8_t id;	/* local APIC ID */
-	u8_t flags;	/* see ACPI_MADT_CPU_FLAGS_* */
+	uint8_t dontcare;
+	uint8_t id;	/* local APIC ID */
+	uint8_t flags;	/* see ACPI_MADT_CPU_FLAGS_* */
 } __packed;
 
 #define ACPI_CPU_FLAGS_ENABLED 0x01
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index 7af7d8da70..35a752ef45 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -30,103 +30,103 @@ static ALWAYS_INLINE void arch_irq_unlock(unsigned int key)
 	}
 }
 
-static ALWAYS_INLINE void sys_out8(u8_t data, io_port_t port)
+static ALWAYS_INLINE void sys_out8(uint8_t data, io_port_t port)
 {
 	__asm__ volatile("outb %b0, %w1" :: "a"(data), "Nd"(port));
 }
 
-static ALWAYS_INLINE u8_t sys_in8(io_port_t port)
+static ALWAYS_INLINE uint8_t sys_in8(io_port_t port)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	__asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port));
 
 	return ret;
 }
 
-static ALWAYS_INLINE void sys_out16(u16_t data, io_port_t port)
+static ALWAYS_INLINE void sys_out16(uint16_t data, io_port_t port)
 {
 	__asm__ volatile("outw %w0, %w1" :: "a"(data), "Nd"(port));
 }
 
-static ALWAYS_INLINE u16_t sys_in16(io_port_t port)
+static ALWAYS_INLINE uint16_t sys_in16(io_port_t port)
 {
-	u16_t ret;
+	uint16_t ret;
 
 	__asm__ volatile("inw %w1, %w0" : "=a"(ret) : "Nd"(port));
 
 	return ret;
 }
 
-static ALWAYS_INLINE void sys_out32(u32_t data, io_port_t port)
+static ALWAYS_INLINE void sys_out32(uint32_t data, io_port_t port)
 {
 	__asm__ volatile("outl %0, %w1" :: "a"(data), "Nd"(port));
 }
 
-static ALWAYS_INLINE u32_t sys_in32(io_port_t port)
+static ALWAYS_INLINE uint32_t sys_in32(io_port_t port)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("inl %w1, %0" : "=a"(ret) : "Nd"(port));
 
 	return ret;
 }
 
-static ALWAYS_INLINE void sys_write8(u8_t data, mm_reg_t addr)
+static ALWAYS_INLINE void sys_write8(uint8_t data, mm_reg_t addr)
 {
 	__asm__ volatile("movb %0, %1"
 			 :
-			 : "q"(data), "m" (*(volatile u8_t *)(uintptr_t) addr)
+			 : "q"(data), "m" (*(volatile uint8_t *)(uintptr_t) addr)
 			 : "memory");
 }
 
-static ALWAYS_INLINE u8_t sys_read8(mm_reg_t addr)
+static ALWAYS_INLINE uint8_t sys_read8(mm_reg_t addr)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	__asm__ volatile("movb %1, %0"
 			 : "=q"(ret)
-			 : "m" (*(volatile u8_t *)(uintptr_t) addr)
+			 : "m" (*(volatile uint8_t *)(uintptr_t) addr)
 			 : "memory");
 
 	return ret;
 }
 
-static ALWAYS_INLINE void sys_write16(u16_t data, mm_reg_t addr)
+static ALWAYS_INLINE void sys_write16(uint16_t data, mm_reg_t addr)
 {
 	__asm__ volatile("movw %0, %1"
 			 :
-			 : "r"(data), "m" (*(volatile u16_t *)(uintptr_t) addr)
+			 : "r"(data), "m" (*(volatile uint16_t *)(uintptr_t) addr)
 			 : "memory");
 }
 
-static ALWAYS_INLINE u16_t sys_read16(mm_reg_t addr)
+static ALWAYS_INLINE uint16_t sys_read16(mm_reg_t addr)
 {
-	u16_t ret;
+	uint16_t ret;
 
 	__asm__ volatile("movw %1, %0"
 			 : "=r"(ret)
-			 : "m" (*(volatile u16_t *)(uintptr_t) addr)
+			 : "m" (*(volatile uint16_t *)(uintptr_t) addr)
 			 : "memory");
 
 	return ret;
 }
 
-static ALWAYS_INLINE void sys_write32(u32_t data, mm_reg_t addr)
+static ALWAYS_INLINE void sys_write32(uint32_t data, mm_reg_t addr)
 {
 	__asm__ volatile("movl %0, %1"
 			 :
-			 : "r"(data), "m" (*(volatile u32_t *)(uintptr_t) addr)
+			 : "r"(data), "m" (*(volatile uint32_t *)(uintptr_t) addr)
 			 : "memory");
 }
 
-static ALWAYS_INLINE u32_t sys_read32(mm_reg_t addr)
+static ALWAYS_INLINE uint32_t sys_read32(mm_reg_t addr)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("movl %1, %0"
 			 : "=r"(ret)
-			 : "m" (*(volatile u32_t *)(uintptr_t) addr)
+			 : "m" (*(volatile uint32_t *)(uintptr_t) addr)
 			 : "memory");
 
 	return ret;
@@ -135,7 +135,7 @@ static ALWAYS_INLINE u32_t sys_read32(mm_reg_t addr)
 static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 {
 	__asm__ volatile("btsl %1, %0"
-			 : "+m" (*(volatile u32_t *) (addr))
+			 : "+m" (*(volatile uint32_t *) (addr))
 			 : "Ir" (bit)
 			 : "memory");
 }
@@ -143,7 +143,7 @@ static ALWAYS_INLINE void sys_set_bit(mem_addr_t addr, unsigned int bit)
 static ALWAYS_INLINE void sys_clear_bit(mem_addr_t addr, unsigned int bit)
 {
 	__asm__ volatile("btrl %1, %0"
-			 : "+m" (*(volatile u32_t *) (addr))
+			 : "+m" (*(volatile uint32_t *) (addr))
 			 : "Ir" (bit));
 }
 
@@ -153,7 +153,7 @@ static ALWAYS_INLINE int sys_test_bit(mem_addr_t addr, unsigned int bit)
 
 	__asm__ volatile("btl %2, %1;"
 			 "sbb %0, %0"
-			 : "=r" (ret), "+m" (*(volatile u32_t *) (addr))
+			 : "=r" (ret), "+m" (*(volatile uint32_t *) (addr))
 			 : "Ir" (bit));
 
 	return ret;
@@ -166,7 +166,7 @@ static ALWAYS_INLINE int sys_test_and_set_bit(mem_addr_t addr,
 
 	__asm__ volatile("btsl %2, %1;"
 			 "sbb %0, %0"
-			 : "=r" (ret), "+m" (*(volatile u32_t *) (addr))
+			 : "=r" (ret), "+m" (*(volatile uint32_t *) (addr))
 			 : "Ir" (bit));
 
 	return ret;
@@ -179,7 +179,7 @@ static ALWAYS_INLINE int sys_test_and_clear_bit(mem_addr_t addr,
 
 	__asm__ volatile("btrl %2, %1;"
 			 "sbb %0, %0"
-			 : "=r" (ret), "+m" (*(volatile u32_t *) (addr))
+			 : "=r" (ret), "+m" (*(volatile uint32_t *) (addr))
 			 : "Ir" (bit));
 
 	return ret;
@@ -219,9 +219,9 @@ extern unsigned char _irq_to_interrupt_vector[];
 extern void arch_irq_enable(unsigned int irq);
 extern void arch_irq_disable(unsigned int irq);
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
@@ -235,9 +235,9 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
  * @brief read timestamp register, 32-bits only, unserialized
  */
 
-static ALWAYS_INLINE u32_t z_do_read_cpu_timestamp32(void)
+static ALWAYS_INLINE uint32_t z_do_read_cpu_timestamp32(void)
 {
-	u32_t rv;
+	uint32_t rv;
 
 	__asm__ volatile("rdtsc" : "=a" (rv) : : "%edx");
 
@@ -248,14 +248,14 @@ static ALWAYS_INLINE u32_t z_do_read_cpu_timestamp32(void)
  *  @brief read timestamp register ensuring serialization
  */
 
-static inline u64_t z_tsc_read(void)
+static inline uint64_t z_tsc_read(void)
 {
 	union {
 		struct  {
-			u32_t lo;
-			u32_t hi;
+			uint32_t lo;
+			uint32_t hi;
 		};
-		u64_t  value;
+		uint64_t  value;
 	}  rv;
 
 	/* rdtsc & cpuid clobbers eax, ebx, ecx and edx registers */
diff --git a/include/arch/x86/ia32/arch.h b/include/arch/x86/ia32/arch.h
index 439ce08691..75d3a655bc 100644
--- a/include/arch/x86/ia32/arch.h
+++ b/include/arch/x86/ia32/arch.h
@@ -224,12 +224,12 @@ typedef struct s_isrList {
  * FIXME: z_sys_power_save_idle_exit is defined in kernel.h, which cannot be
  *	  included here due to circular dependency
  */
-extern void z_sys_power_save_idle_exit(s32_t ticks);
+extern void z_sys_power_save_idle_exit(int32_t ticks);
 
 static inline void arch_irq_direct_pm(void)
 {
 	if (_kernel.idle) {
-		s32_t idle_val = _kernel.idle;
+		int32_t idle_val = _kernel.idle;
 
 		_kernel.idle = 0;
 		z_sys_power_save_idle_exit(idle_val);
@@ -345,13 +345,13 @@ typedef struct nanoEsf {
 
 
 struct _x86_syscall_stack_frame {
-	u32_t eip;
-	u32_t cs;
-	u32_t eflags;
+	uint32_t eip;
+	uint32_t cs;
+	uint32_t eflags;
 
 	/* These are only present if cs = USER_CODE_SEG */
-	u32_t esp;
-	u32_t ss;
+	uint32_t esp;
+	uint32_t ss;
 };
 
 static ALWAYS_INLINE unsigned int arch_irq_lock(void)
diff --git a/include/arch/x86/ia32/segmentation.h b/include/arch/x86/ia32/segmentation.h
index c5b8287a2a..6eae975b64 100644
--- a/include/arch/x86/ia32/segmentation.h
+++ b/include/arch/x86/ia32/segmentation.h
@@ -52,45 +52,45 @@ extern "C" {
 
 /* Section 7.2.1 of IA architecture SW developer manual, Vol 3. */
 struct __packed task_state_segment {
-	u16_t backlink;
-	u16_t reserved_1;
-	u32_t esp0;
-	u16_t ss0;
-	u16_t reserved_2;
-	u32_t esp1;
-	u16_t ss1;
-	u16_t reserved_3;
-	u32_t esp2;
-	u16_t ss2;
-	u16_t reserved_4;
-	u32_t cr3;
-	u32_t eip;
-	u32_t eflags;
-	u32_t eax;
-	u32_t ecx;
-	u32_t edx;
-	u32_t ebx;
-	u32_t esp;
-	u32_t ebp;
-	u32_t esi;
-	u32_t edi;
-	u16_t es;
-	u16_t reserved_5;
-	u16_t cs;
-	u16_t reserved_6;
-	u16_t ss;
-	u16_t reserved_7;
-	u16_t ds;
-	u16_t reserved_8;
-	u16_t fs;
-	u16_t reserved_9;
-	u16_t gs;
-	u16_t reserved_10;
-	u16_t ldt_ss;
-	u16_t reserved_11;
-	u8_t t:1;		/* Trap bit */
-	u16_t reserved_12:15;
-	u16_t iomap;
+	uint16_t backlink;
+	uint16_t reserved_1;
+	uint32_t esp0;
+	uint16_t ss0;
+	uint16_t reserved_2;
+	uint32_t esp1;
+	uint16_t ss1;
+	uint16_t reserved_3;
+	uint32_t esp2;
+	uint16_t ss2;
+	uint16_t reserved_4;
+	uint32_t cr3;
+	uint32_t eip;
+	uint32_t eflags;
+	uint32_t eax;
+	uint32_t ecx;
+	uint32_t edx;
+	uint32_t ebx;
+	uint32_t esp;
+	uint32_t ebp;
+	uint32_t esi;
+	uint32_t edi;
+	uint16_t es;
+	uint16_t reserved_5;
+	uint16_t cs;
+	uint16_t reserved_6;
+	uint16_t ss;
+	uint16_t reserved_7;
+	uint16_t ds;
+	uint16_t reserved_8;
+	uint16_t fs;
+	uint16_t reserved_9;
+	uint16_t gs;
+	uint16_t reserved_10;
+	uint16_t ldt_ss;
+	uint16_t reserved_11;
+	uint8_t t:1;		/* Trap bit */
+	uint16_t reserved_12:15;
+	uint16_t iomap;
 };
 
 #define SEG_SELECTOR(index, table, dpl) (index << 3 | table << 2 | dpl)
@@ -109,39 +109,39 @@ struct __packed segment_descriptor {
 	/* First DWORD: 0-15 */
 	union {
 		/* IRQ, call, trap gates */
-		u16_t limit_low;
+		uint16_t limit_low;
 
 		/* Task gates */
-		u16_t reserved_task_gate_0;
+		uint16_t reserved_task_gate_0;
 
 		/* Everything else */
-		u16_t offset_low;
+		uint16_t offset_low;
 	};
 
 	/* First DWORD: 16-31 */
 	union {
 		/* Call/Task/Interrupt/Trap gates */
-		u16_t segment_selector;
+		uint16_t segment_selector;
 
 		/* TSS/LDT/Segments */
-		u16_t base_low;	/* Bits 0-15 */
+		uint16_t base_low;	/* Bits 0-15 */
 	};
 
 	/* Second DWORD: 0-7 */
 	union {
 		/* TSS/LDT/Segments */
-		u8_t base_mid;	/* Bits 16-23 */
+		uint8_t base_mid;	/* Bits 16-23 */
 
 		/* Task gates */
-		u8_t reserved_task_gate_1;
+		uint8_t reserved_task_gate_1;
 
 		/* IRQ/Trap/Call Gates */
 		struct {
 			/* Reserved except in case of call gates */
-			u8_t reserved_or_param:5;
+			uint8_t reserved_or_param:5;
 
 			/* Bits 5-7 0 0 0 per CPU manual */
-			u8_t always_0_0:3;
+			uint8_t always_0_0:3;
 		};
 	};
 
@@ -150,59 +150,59 @@ struct __packed segment_descriptor {
 		/* Code or data Segments */
 		struct {
 			/* Set by the processor, init to 0 */
-			u8_t accessed:1;
+			uint8_t accessed:1;
 
 			/* executable ? readable : writable */
-			u8_t rw:1;
+			uint8_t rw:1;
 			/* executable ? conforming : direction */
-			u8_t cd:1;
+			uint8_t cd:1;
 			/* 1=code 0=data */
-			u8_t executable:1;
+			uint8_t executable:1;
 
 			/* Next 3 fields actually common to all */
 
 			/* 1=code or data, 0=system type */
-			u8_t descriptor_type:1;
+			uint8_t descriptor_type:1;
 
-			u8_t dpl:2;
-			u8_t present:1;
+			uint8_t dpl:2;
+			uint8_t present:1;
 		};
 
 		/* System types */
 		struct {
 			/* One of the SEG_TYPE_* macros above */
-			u8_t type:4;
+			uint8_t type:4;
 
 			/* Alas, C doesn't let you do a union of the first
 			 * 4 bits of a bitfield and put the rest outside of it,
 			 * it ends up getting padded.
 			 */
-			u8_t use_other_union:4;
+			uint8_t use_other_union:4;
 		};
 	};
 
 	/* Second DWORD: 16-31 */
 	union {
 		/* Call/IRQ/trap gates */
-		u16_t offset_hi;
+		uint16_t offset_hi;
 
 		/* Task Gates */
-		u16_t reserved_task_gate_2;
+		uint16_t reserved_task_gate_2;
 
 		/* segment/LDT/TSS */
 		struct {
-			u8_t limit_hi:4;
+			uint8_t limit_hi:4;
 
 			/* flags */
-			u8_t avl:1;		/* CPU ignores this */
+			uint8_t avl:1;		/* CPU ignores this */
 
 			/* 1=Indicates 64-bit code segment in IA-32e mode */
-			u8_t flags_l:1; /* L field */
+			uint8_t flags_l:1; /* L field */
 
-			u8_t db:1; /* D/B field 1=32-bit 0=16-bit*/
-			u8_t granularity:1;
+			uint8_t db:1; /* D/B field 1=32-bit 0=16-bit*/
+			uint8_t granularity:1;
 
-			u8_t base_hi;	/* Bits 24-31 */
+			uint8_t base_hi;	/* Bits 24-31 */
 		};
 	};
 
@@ -213,7 +213,7 @@ struct __packed segment_descriptor {
  * IA manual calls this a 'pseudo descriptor'.
  */
 struct __packed pseudo_descriptor {
-	u16_t size;
+	uint16_t size;
 	struct segment_descriptor *entries;
 };
 
@@ -225,7 +225,7 @@ struct __packed far_ptr {
 	/** Far pointer offset, unused when invoking a task. */
 	void *offset;
 	/** Far pointer segment/gate selector. */
-	u16_t sel;
+	uint16_t sel;
 };
 
 
@@ -241,7 +241,7 @@ struct __packed far_ptr {
  * or implement some tool to populate values post-link like gen_idt does.
  */
 #define _LIMIT_AND_BASE(base_p, limit_p, granularity_p) \
-	.base_low = (((u32_t)base_p) & 0xFFFF), \
+	.base_low = (((uint32_t)base_p) & 0xFFFF), \
 	.base_mid = (((base_p) >> 16) & 0xFF), \
 	.base_hi = (((base_p) >> 24) & 0xFF), \
 	.limit_low = ((limit_p) & 0xFFFF), \
@@ -372,8 +372,8 @@ extern const struct pseudo_descriptor z_idt;
  * @param segment_selector Segment selector
  */
 static inline void z_sd_set_seg_offset(struct segment_descriptor *sd,
-				      u16_t segment_selector,
-				      u32_t offset)
+				      uint16_t segment_selector,
+				      uint32_t offset)
 {
 	sd->offset_low = offset & 0xFFFFU;
 	sd->offset_hi = offset >> 16U;
@@ -391,8 +391,8 @@ static inline void z_sd_set_seg_offset(struct segment_descriptor *sd,
  * @param dpl descriptor privilege level
  */
 static inline void z_init_irq_gate(struct segment_descriptor *sd,
-				  u16_t seg_selector, u32_t offset,
-				  u32_t dpl)
+				  uint16_t seg_selector, uint32_t offset,
+				  uint32_t dpl)
 {
 	z_sd_set_seg_offset(sd, seg_selector, offset);
 	sd->dpl = dpl;
@@ -406,7 +406,7 @@ static inline void z_init_irq_gate(struct segment_descriptor *sd,
  *
  * @param sel Segment selector in GDT for desired TSS
  */
-static inline void _set_tss(u16_t sel)
+static inline void _set_tss(uint16_t sel)
 {
 	__asm__ __volatile__ ("ltr %0" :: "r" (sel));
 }
@@ -417,9 +417,9 @@ static inline void _set_tss(u16_t sel)
  *
  * @return Segment selector for current IA task
  */
-static inline u16_t _get_tss(void)
+static inline uint16_t _get_tss(void)
 {
-	u16_t sel;
+	uint16_t sel;
 
 	__asm__ __volatile__ ("str %0" : "=r" (sel));
 	return sel;
@@ -453,9 +453,9 @@ static inline void _get_idt(struct pseudo_descriptor *idt)
  *
  * @return Segment selector in the GDT for the current LDT
  */
-static inline u16_t _get_ldt(void)
+static inline uint16_t _get_ldt(void)
 {
-	u16_t ret;
+	uint16_t ret;
 
 	__asm__ __volatile__ ("sldt %0" : "=m" (ret));
 	return ret;
@@ -467,7 +467,7 @@ static inline u16_t _get_ldt(void)
  *
  * @param ldt Segment selector in the GDT for an LDT
  */
-static inline void _set_ldt(u16_t ldt)
+static inline void _set_ldt(uint16_t ldt)
 {
 	__asm__ __volatile__ ("lldt %0" :: "m" (ldt));
 
@@ -503,9 +503,9 @@ static inline void z_set_idt(const struct pseudo_descriptor *idt)
  *
  * @return Segment selector
  */
-static inline u16_t _get_cs(void)
+static inline uint16_t _get_cs(void)
 {
-	u16_t cs = 0U;
+	uint16_t cs = 0U;
 
 	__asm__ __volatile__ ("mov %%cs, %0" : "=r" (cs));
 	return cs;
@@ -517,9 +517,9 @@ static inline u16_t _get_cs(void)
  *
  * @return Segment selector
  */
-static inline u16_t _get_ds(void)
+static inline uint16_t _get_ds(void)
 {
-	u16_t ds = 0U;
+	uint16_t ds = 0U;
 
 	__asm__ __volatile__ ("mov %%ds, %0" : "=r" (ds));
 	return ds;
diff --git a/include/arch/x86/ia32/sys_io.h b/include/arch/x86/ia32/sys_io.h
index 16555d9173..9a982438bc 100644
--- a/include/arch/x86/ia32/sys_io.h
+++ b/include/arch/x86/ia32/sys_io.h
@@ -18,7 +18,7 @@
 static ALWAYS_INLINE
 	void sys_io_set_bit(io_port_t port, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("inl	%w1, %0;\n\t"
 			 "btsl	%2, %0;\n\t"
@@ -30,7 +30,7 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	void sys_io_clear_bit(io_port_t port, unsigned int bit)
 {
-	u32_t reg = 0;
+	uint32_t reg = 0;
 
 	__asm__ volatile("inl	%w1, %0;\n\t"
 			 "btrl	%2, %0;\n\t"
@@ -42,7 +42,7 @@ static ALWAYS_INLINE
 static ALWAYS_INLINE
 	int sys_io_test_bit(io_port_t port, unsigned int bit)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("inl	%w1, %0\n\t"
 			 "btl	%2, %0\n\t"
diff --git a/include/arch/x86/ia32/syscall.h b/include/arch/x86/ia32/syscall.h
index ba4f9c40b9..db486ee8ba 100644
--- a/include/arch/x86/ia32/syscall.h
+++ b/include/arch/x86/ia32/syscall.h
@@ -39,7 +39,7 @@ static inline uintptr_t arch_syscall_invoke6(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5, uintptr_t arg6,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("push %%ebp\n\t"
 			 "mov %[arg6], %%ebp\n\t"
@@ -58,7 +58,7 @@ static inline uintptr_t arch_syscall_invoke5(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg5,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
@@ -72,7 +72,7 @@ static inline uintptr_t arch_syscall_invoke4(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3, uintptr_t arg4,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
@@ -86,7 +86,7 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t arg3,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
@@ -98,7 +98,7 @@ static inline uintptr_t arch_syscall_invoke3(uintptr_t arg1, uintptr_t arg2,
 static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
@@ -111,7 +111,7 @@ static inline uintptr_t arch_syscall_invoke2(uintptr_t arg1, uintptr_t arg2,
 static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1,
 					     uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
@@ -123,7 +123,7 @@ static inline uintptr_t arch_syscall_invoke1(uintptr_t arg1,
 
 static inline uintptr_t arch_syscall_invoke0(uintptr_t call_id)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	__asm__ volatile("int $0x80"
 			 : "=a" (ret)
diff --git a/include/arch/x86/ia32/thread.h b/include/arch/x86/ia32/thread.h
index 437fba7e78..8a847c87c4 100644
--- a/include/arch/x86/ia32/thread.h
+++ b/include/arch/x86/ia32/thread.h
@@ -212,7 +212,7 @@ typedef struct s_preempFloatReg {
  */
 
 struct _thread_arch {
-	u8_t flags;
+	uint8_t flags;
 
 #ifdef CONFIG_USERSPACE
 	/* Pointer to page tables used by this thread. Supervisor threads
diff --git a/include/arch/x86/intel64/thread.h b/include/arch/x86/intel64/thread.h
index b5d0e7605e..f79e7fb158 100644
--- a/include/arch/x86/intel64/thread.h
+++ b/include/arch/x86/intel64/thread.h
@@ -53,25 +53,25 @@ struct x86_tss64 {
 	 * but we need to get (some of) their offsets from assembly.
 	 */
 
-	u8_t reserved0[4];
+	uint8_t reserved0[4];
 
-	u64_t rsp0;		/* privileged stacks */
-	u64_t rsp1;
-	u64_t rsp2;
+	uint64_t rsp0;		/* privileged stacks */
+	uint64_t rsp1;
+	uint64_t rsp2;
 
-	u8_t reserved[8];
+	uint8_t reserved[8];
 
-	u64_t ist1;		/* interrupt stacks */
-	u64_t ist2;
-	u64_t ist3;
-	u64_t ist4;
-	u64_t ist5;
-	u64_t ist6;
-	u64_t ist7;
+	uint64_t ist1;		/* interrupt stacks */
+	uint64_t ist2;
+	uint64_t ist3;
+	uint64_t ist4;
+	uint64_t ist5;
+	uint64_t ist6;
+	uint64_t ist7;
 
-	u8_t reserved1[10];
+	uint8_t reserved1[10];
 
-	u16_t iomapb;		/* offset to I/O base */
+	uint16_t iomapb;		/* offset to I/O base */
 
 	/*
 	 * Zephyr specific portion. Stash per-CPU data here for convenience.
@@ -97,21 +97,21 @@ typedef struct x86_tss64 x86_tss64_t;
  */
 
 struct _callee_saved {
-	u64_t rsp;
-	u64_t rbx;
-	u64_t rbp;
-	u64_t r12;
-	u64_t r13;
-	u64_t r14;
-	u64_t r15;
-	u64_t rip;
-	u64_t rflags;
+	uint64_t rsp;
+	uint64_t rbx;
+	uint64_t rbp;
+	uint64_t r12;
+	uint64_t r13;
+	uint64_t r14;
+	uint64_t r15;
+	uint64_t rip;
+	uint64_t rflags;
 };
 
 typedef struct _callee_saved _callee_saved_t;
 
 struct _thread_arch {
-	u8_t flags;
+	uint8_t flags;
 
 #ifdef CONFIG_USERSPACE
 	/* Pointer to page tables used by this thread. Supervisor threads
@@ -126,19 +126,19 @@ struct _thread_arch {
 	char *psp;
 
 	/* SS and CS selectors for this thread when restoring context */
-	u64_t ss;
-	u64_t cs;
+	uint64_t ss;
+	uint64_t cs;
 #endif
 
-	u64_t rax;
-	u64_t rcx;
-	u64_t rdx;
-	u64_t rsi;
-	u64_t rdi;
-	u64_t r8;
-	u64_t r9;
-	u64_t r10;
-	u64_t r11;
+	uint64_t rax;
+	uint64_t rcx;
+	uint64_t rdx;
+	uint64_t rsi;
+	uint64_t rdi;
+	uint64_t r8;
+	uint64_t r9;
+	uint64_t r10;
+	uint64_t r11;
 	char __aligned(X86_FXSAVE_ALIGN) sse[X86_FXSAVE_SIZE];
 };
 
diff --git a/include/arch/x86/memmap.h b/include/arch/x86/memmap.h
index d4bc09df60..21c65c4338 100644
--- a/include/arch/x86/memmap.h
+++ b/include/arch/x86/memmap.h
@@ -48,8 +48,8 @@ enum x86_memmap_entry_type {
 };
 
 struct x86_memmap_entry {
-	u64_t base;
-	u64_t length;
+	uint64_t base;
+	uint64_t length;
 	enum x86_memmap_entry_type type;
 };
 
diff --git a/include/arch/x86/mmustructs.h b/include/arch/x86/mmustructs.h
index 267342a94e..2acedbf74a 100644
--- a/include/arch/x86/mmustructs.h
+++ b/include/arch/x86/mmustructs.h
@@ -15,8 +15,8 @@
 #define MMU_PAGE_SHIFT 12U
 #define PAGES(x) ((x) << (MMU_PAGE_SHIFT))
 #define MMU_ARE_IN_SAME_PAGE(a, b) \
-	(((u32_t)(a) & ~MMU_PAGE_MASK) == ((u32_t)(b) & ~MMU_PAGE_MASK))
-#define MMU_IS_ON_PAGE_BOUNDARY(a) (!((u32_t)(a) & MMU_PAGE_MASK))
+	(((uint32_t)(a) & ~MMU_PAGE_MASK) == ((uint32_t)(b) & ~MMU_PAGE_MASK))
+#define MMU_IS_ON_PAGE_BOUNDARY(a) (!((uint32_t)(a) & MMU_PAGE_MASK))
 
 /*
  * Common flags in the same bit position regardless of which structure level,
@@ -137,7 +137,7 @@
 struct mmu_region {
 	uintptr_t address; /*Start address of the memory region */
 	size_t size; /* Size of the memory region*/
-	u64_t flags; /* Permissions needed for this region*/
+	uint64_t flags; /* Permissions needed for this region*/
 };
 
 /* permission_flags are calculated using the macros
@@ -177,24 +177,24 @@ struct mmu_region {
 #define Z_X86_PD_AREA	(Z_X86_PT_AREA * Z_X86_NUM_PD_ENTRIES)
 #define Z_X86_PDPT_AREA (Z_X86_PD_AREA * Z_X86_NUM_PDPT_ENTRIES)
 
-typedef u64_t k_mem_partition_attr_t;
+typedef uint64_t k_mem_partition_attr_t;
 
 #ifdef CONFIG_X86_64
 struct x86_mmu_pml4 {
-	u64_t entry[Z_X86_NUM_PML4_ENTRIES];
+	uint64_t entry[Z_X86_NUM_PML4_ENTRIES];
 };
 #endif
 
 struct x86_mmu_pdpt {
-	u64_t entry[Z_X86_NUM_PDPT_ENTRIES];
+	uint64_t entry[Z_X86_NUM_PDPT_ENTRIES];
 };
 
 struct x86_mmu_pd {
-	u64_t entry[Z_X86_NUM_PD_ENTRIES];
+	uint64_t entry[Z_X86_NUM_PD_ENTRIES];
 };
 
 struct x86_mmu_pt {
-	u64_t entry[Z_X86_NUM_PT_ENTRIES];
+	uint64_t entry[Z_X86_NUM_PT_ENTRIES];
 };
 
 struct x86_page_tables {
@@ -209,7 +209,7 @@ struct x86_page_tables {
  * Inline functions for getting the next linked structure
  */
 #ifdef CONFIG_X86_64
-static inline u64_t *z_x86_pml4_get_pml4e(struct x86_mmu_pml4 *pml4,
+static inline uint64_t *z_x86_pml4_get_pml4e(struct x86_mmu_pml4 *pml4,
 					  uintptr_t addr)
 {
 	int index = (addr >> 39U) & (Z_X86_NUM_PML4_ENTRIES - 1);
@@ -217,7 +217,7 @@ static inline u64_t *z_x86_pml4_get_pml4e(struct x86_mmu_pml4 *pml4,
 	return &pml4->entry[index];
 }
 
-static inline struct x86_mmu_pdpt *z_x86_pml4e_get_pdpt(u64_t pml4e)
+static inline struct x86_mmu_pdpt *z_x86_pml4e_get_pdpt(uint64_t pml4e)
 {
 	uintptr_t addr = pml4e & Z_X86_MMU_PML4E_PDPT_MASK;
 
@@ -225,7 +225,7 @@ static inline struct x86_mmu_pdpt *z_x86_pml4e_get_pdpt(u64_t pml4e)
 }
 #endif
 
-static inline u64_t *z_x86_pdpt_get_pdpte(struct x86_mmu_pdpt *pdpt,
+static inline uint64_t *z_x86_pdpt_get_pdpte(struct x86_mmu_pdpt *pdpt,
 					  uintptr_t addr)
 {
 	int index = (addr >> 30U) & (Z_X86_NUM_PDPT_ENTRIES - 1);
@@ -233,7 +233,7 @@ static inline u64_t *z_x86_pdpt_get_pdpte(struct x86_mmu_pdpt *pdpt,
 	return &pdpt->entry[index];
 }
 
-static inline struct x86_mmu_pd *z_x86_pdpte_get_pd(u64_t pdpte)
+static inline struct x86_mmu_pd *z_x86_pdpte_get_pd(uint64_t pdpte)
 {
 	uintptr_t addr = pdpte & Z_X86_MMU_PDPTE_PD_MASK;
 
@@ -243,14 +243,14 @@ static inline struct x86_mmu_pd *z_x86_pdpte_get_pd(u64_t pdpte)
 	return (struct x86_mmu_pd *)addr;
 }
 
-static inline u64_t *z_x86_pd_get_pde(struct x86_mmu_pd *pd, uintptr_t addr)
+static inline uint64_t *z_x86_pd_get_pde(struct x86_mmu_pd *pd, uintptr_t addr)
 {
 	int index = (addr >> 21U) & (Z_X86_NUM_PD_ENTRIES - 1);
 
 	return &pd->entry[index];
 }
 
-static inline struct x86_mmu_pt *z_x86_pde_get_pt(u64_t pde)
+static inline struct x86_mmu_pt *z_x86_pde_get_pt(uint64_t pde)
 {
 	uintptr_t addr = pde & Z_X86_MMU_PDE_PT_MASK;
 
@@ -259,7 +259,7 @@ static inline struct x86_mmu_pt *z_x86_pde_get_pt(u64_t pde)
 	return (struct x86_mmu_pt *)addr;
 }
 
-static inline u64_t *z_x86_pt_get_pte(struct x86_mmu_pt *pt, uintptr_t addr)
+static inline uint64_t *z_x86_pt_get_pte(struct x86_mmu_pt *pt, uintptr_t addr)
 {
 	int index = (addr >> 12U) & (Z_X86_NUM_PT_ENTRIES - 1);
 
@@ -277,7 +277,7 @@ z_x86_get_pml4(struct x86_page_tables *ptables)
 	return &ptables->pml4;
 }
 
-static inline u64_t *z_x86_get_pml4e(struct x86_page_tables *ptables,
+static inline uint64_t *z_x86_get_pml4e(struct x86_page_tables *ptables,
 				     uintptr_t addr)
 {
 	return z_x86_pml4_get_pml4e(z_x86_get_pml4(ptables), addr);
@@ -298,7 +298,7 @@ z_x86_get_pdpt(struct x86_page_tables *ptables, uintptr_t addr)
 }
 #endif /* CONFIG_X86_64 */
 
-static inline u64_t *z_x86_get_pdpte(struct x86_page_tables *ptables,
+static inline uint64_t *z_x86_get_pdpte(struct x86_page_tables *ptables,
 				       uintptr_t addr)
 {
 	return z_x86_pdpt_get_pdpte(z_x86_get_pdpt(ptables, addr), addr);
@@ -310,7 +310,7 @@ z_x86_get_pd(struct x86_page_tables *ptables, uintptr_t addr)
 	return z_x86_pdpte_get_pd(*z_x86_get_pdpte(ptables, addr));
 }
 
-static inline u64_t *z_x86_get_pde(struct x86_page_tables *ptables,
+static inline uint64_t *z_x86_get_pde(struct x86_page_tables *ptables,
 				     uintptr_t addr)
 {
 	return z_x86_pd_get_pde(z_x86_get_pd(ptables, addr), addr);
@@ -322,7 +322,7 @@ z_x86_get_pt(struct x86_page_tables *ptables, uintptr_t addr)
 	return z_x86_pde_get_pt(*z_x86_get_pde(ptables, addr));
 }
 
-static inline u64_t *z_x86_get_pte(struct x86_page_tables *ptables,
+static inline uint64_t *z_x86_get_pte(struct x86_page_tables *ptables,
 				     uintptr_t addr)
 {
 	return z_x86_pt_get_pte(z_x86_get_pt(ptables, addr), addr);
@@ -397,7 +397,7 @@ extern struct x86_page_tables z_x86_user_ptables;
  * @param pte_flags Output parameter for page table entry flags
  */
 void z_x86_mmu_get_flags(struct x86_page_tables *ptables, void *addr,
-			 u64_t *pde_flags, u64_t *pte_flags);
+			 uint64_t *pde_flags, uint64_t *pte_flags);
 
 /**
  * @brief set flags in the MMU page tables
@@ -415,12 +415,12 @@ void z_x86_mmu_get_flags(struct x86_page_tables *ptables, void *addr,
  *              when modifying the active page tables
  */
 void z_x86_mmu_set_flags(struct x86_page_tables *ptables, void *ptr,
-			 size_t size, u64_t flags, u64_t mask, bool flush);
+			 size_t size, uint64_t flags, uint64_t mask, bool flush);
 
 int z_x86_mmu_validate(struct x86_page_tables *ptables, void *addr, size_t size,
 		       bool write);
 
-void z_x86_add_mmu_region(uintptr_t addr, size_t size, u64_t flags);
+void z_x86_add_mmu_region(uintptr_t addr, size_t size, uint64_t flags);
 
 #endif /* _ASMLANGUAGE */
 
diff --git a/include/arch/x86/msr.h b/include/arch/x86/msr.h
index f45e0535c3..3d85922086 100644
--- a/include/arch/x86/msr.h
+++ b/include/arch/x86/msr.h
@@ -55,24 +55,24 @@ extern "C" {
  * due to ABI differences with long return values, z_x86_msr_read() is not.
  */
 
-static inline void z_x86_msr_write(unsigned int msr, u64_t data)
+static inline void z_x86_msr_write(unsigned int msr, uint64_t data)
 {
-	u32_t high = data >> 32;
-	u32_t low = data & 0xFFFFFFFF;
+	uint32_t high = data >> 32;
+	uint32_t low = data & 0xFFFFFFFF;
 
 	__asm__ volatile ("wrmsr" : : "c"(msr), "a"(low), "d"(high));
 }
 
 #ifdef CONFIG_X86_64
 
-static inline u64_t z_x86_msr_read(unsigned int msr)
+static inline uint64_t z_x86_msr_read(unsigned int msr)
 {
 	union {
 		struct {
-			u32_t lo;
-			u32_t hi;
+			uint32_t lo;
+			uint32_t hi;
 		};
-		u64_t value;
+		uint64_t value;
 	} rv;
 
 	__asm__ volatile ("rdmsr" : "=a" (rv.lo), "=d" (rv.hi) : "c" (msr));
@@ -82,9 +82,9 @@ static inline u64_t z_x86_msr_read(unsigned int msr)
 
 #else
 
-static inline u64_t z_x86_msr_read(unsigned int msr)
+static inline uint64_t z_x86_msr_read(unsigned int msr)
 {
-	u64_t ret;
+	uint64_t ret;
 
 	__asm__ volatile("rdmsr" : "=A" (ret) : "c" (msr));
 
diff --git a/include/arch/x86/multiboot.h b/include/arch/x86/multiboot.h
index fc947b0b31..59cd60cd1b 100644
--- a/include/arch/x86/multiboot.h
+++ b/include/arch/x86/multiboot.h
@@ -17,21 +17,21 @@
  */
 
 struct multiboot_info {
-	u32_t flags;
-	u32_t mem_lower;
-	u32_t mem_upper;
-	u32_t unused0[8];
-	u32_t mmap_length;
-	u32_t mmap_addr;
-	u32_t unused1[9];
-	u32_t fb_addr_lo;
-	u32_t fb_addr_hi;
-	u32_t fb_pitch;
-	u32_t fb_width;
-	u32_t fb_height;
-	u8_t  fb_bpp;
-	u8_t  fb_type;
-	u8_t  fb_color_info[6];
+	uint32_t flags;
+	uint32_t mem_lower;
+	uint32_t mem_upper;
+	uint32_t unused0[8];
+	uint32_t mmap_length;
+	uint32_t mmap_addr;
+	uint32_t unused1[9];
+	uint32_t fb_addr_lo;
+	uint32_t fb_addr_hi;
+	uint32_t fb_pitch;
+	uint32_t fb_width;
+	uint32_t fb_height;
+	uint8_t  fb_bpp;
+	uint8_t  fb_type;
+	uint8_t  fb_color_info[6];
 };
 
 extern struct multiboot_info multiboot_info;
@@ -43,10 +43,10 @@ extern void z_multiboot_init(struct multiboot_info *);
  */
 
 struct multiboot_mmap {
-	u32_t size;
-	u64_t base;
-	u64_t length;
-	u32_t type;
+	uint32_t size;
+	uint64_t base;
+	uint64_t length;
+	uint32_t type;
 } __packed;
 
 #endif /* _ASMLANGUAGE */
diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
index d6d2c51757..4f6601fcc4 100644
--- a/include/arch/xtensa/arch.h
+++ b/include/arch/xtensa/arch.h
@@ -30,7 +30,7 @@
 #define ARCH_STACK_PTR_ALIGN 16
 
 /* Xtensa GPRs are often designated by two different names */
-#define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; }
+#define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
 
 #include <arch/xtensa/exc.h>
 
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 /* internal routine documented in C file, needed by IRQ_CONNECT() macro */
-extern void z_irq_priority_set(u32_t irq, u32_t prio, u32_t flags);
+extern void z_irq_priority_set(uint32_t irq, uint32_t prio, uint32_t flags);
 
 #define ARCH_IRQ_CONNECT(irq_p, priority_p, isr_p, isr_param_p, flags_p) \
 { \
@@ -51,9 +51,9 @@ extern void z_irq_spurious(void *unused);
 
 #define XTENSA_ERR_NORET
 
-extern u32_t z_timer_cycle_get_32(void);
+extern uint32_t z_timer_cycle_get_32(void);
 
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return z_timer_cycle_get_32();
 }
diff --git a/include/arch/xtensa/arch_inlines.h b/include/arch/xtensa/arch_inlines.h
index 0251fb1c7f..547704a6ab 100644
--- a/include/arch/xtensa/arch_inlines.h
+++ b/include/arch/xtensa/arch_inlines.h
@@ -13,7 +13,7 @@
 #include <kernel_structs.h>
 
 #define RSR(sr) \
-	({u32_t v; \
+	({uint32_t v; \
 	 __asm__ volatile ("rsr." sr " %0" : "=a"(v)); \
 	 v; })
 
diff --git a/include/arch/xtensa/exc.h b/include/arch/xtensa/exc.h
index d8dd772093..9ea111689c 100644
--- a/include/arch/xtensa/exc.h
+++ b/include/arch/xtensa/exc.h
@@ -29,7 +29,7 @@ extern "C" {
 struct __esf {
 	/* FIXME - not finished yet */
 	sys_define_gpr_with_alias(a1, sp);
-	u32_t pc;
+	uint32_t pc;
 };
 
 /* Xtensa uses a variable length stack frame depending on how many
diff --git a/include/arch/xtensa/irq.h b/include/arch/xtensa/irq.h
index 5d75e4f3f0..395ba92683 100644
--- a/include/arch/xtensa/irq.h
+++ b/include/arch/xtensa/irq.h
@@ -39,7 +39,7 @@
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 extern int z_soc_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 				     void (*routine)(void *parameter),
-				     void *parameter, u32_t flags);
+				     void *parameter, uint32_t flags);
 #endif
 
 #else
@@ -53,12 +53,12 @@ extern int z_soc_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 
 #endif
 
-static ALWAYS_INLINE void z_xtensa_irq_enable(u32_t irq)
+static ALWAYS_INLINE void z_xtensa_irq_enable(uint32_t irq)
 {
 	z_xt_ints_on(1 << irq);
 }
 
-static ALWAYS_INLINE void z_xtensa_irq_disable(u32_t irq)
+static ALWAYS_INLINE void z_xtensa_irq_disable(uint32_t irq)
 {
 	z_xt_ints_off(1 << irq);
 }
diff --git a/include/arch/xtensa/thread.h b/include/arch/xtensa/thread.h
index d05b950d1f..cf4708ffc8 100644
--- a/include/arch/xtensa/thread.h
+++ b/include/arch/xtensa/thread.h
@@ -35,7 +35,7 @@ struct _callee_saved {
 	 * callee-saved, but their values are pushed onto the stack rather than
 	 * stored in the k_thread structure:
 	 */
-	u32_t retval; /* a2 */
+	uint32_t retval; /* a2 */
 	XtExcFrame *topOfStack; /* a1 = sp */
 };
 
@@ -83,7 +83,7 @@ struct _thread_arch {
 	 * before any #ifdef'ed fields since the host tools currently use a
 	 * fixed offset to read the 'flags' field.
 	 */
-	u32_t flags;
+	uint32_t flags;
 #ifdef CONFIG_ERRNO
 	int errno_var;
 #endif
diff --git a/include/audio/codec.h b/include/audio/codec.h
index 64fc0731dd..6b69b2d04b 100644
--- a/include/audio/codec.h
+++ b/include/audio/codec.h
@@ -96,7 +96,7 @@ typedef union {
  * Codec configuration parameters
  */
 struct audio_codec_cfg {
-	u32_t			mclk_freq;	/* MCLK input frequency in Hz */
+	uint32_t			mclk_freq;	/* MCLK input frequency in Hz */
 	audio_dai_type_t	dai_type;	/* Digital interface type */
 	audio_dai_cfg_t		dai_cfg;	/* DAI configuration info */
 };
diff --git a/include/audio/dmic.h b/include/audio/dmic.h
index 2dc2954ea2..5d9053e4aa 100644
--- a/include/audio/dmic.h
+++ b/include/audio/dmic.h
@@ -68,22 +68,22 @@ struct pdm_io_cfg {
 	/* parameters global to all PDM controllers */
 
 	/* minimum clock frequency supported by the mic */
-	u32_t	min_pdm_clk_freq;
+	uint32_t	min_pdm_clk_freq;
 	/* maximum clock frequency supported by the mic */
-	u32_t	max_pdm_clk_freq;
+	uint32_t	max_pdm_clk_freq;
 	/* minimum duty cycle in % supported by the mic */
-	u8_t	min_pdm_clk_dc;
+	uint8_t	min_pdm_clk_dc;
 	/* maximum duty cycle in % supported by the mic */
-	u8_t	max_pdm_clk_dc;
+	uint8_t	max_pdm_clk_dc;
 
 	/* parameters unique to each PDM controller */
 
 	/* Bit mask to optionally invert PDM clock */
-	u8_t	pdm_clk_pol;
+	uint8_t	pdm_clk_pol;
 	/* Bit mask to optionally invert mic data */
-	u8_t	pdm_data_pol;
+	uint8_t	pdm_data_pol;
 	/* Collection of clock skew values for each PDM port */
-	u32_t	pdm_clk_skew;
+	uint32_t	pdm_clk_skew;
 };
 
 /**
@@ -96,11 +96,11 @@ struct pcm_stream_cfg {
 	 */
 
 	/* PCM sample rate of stream */
-	u32_t			pcm_rate;
+	uint32_t			pcm_rate;
 	/* PCM sample width of stream */
-	u8_t			pcm_width;
+	uint8_t			pcm_width;
 	/* PCM sample block size per transfer */
-	u16_t			block_size;
+	uint16_t			block_size;
 	/* SLAB for DMIC driver to allocate buffers for stream */
 	struct k_mem_slab	*mem_slab;
 };
@@ -127,19 +127,19 @@ struct pdm_chan_cfg {
 	 * to be adjacent to each other.
 	 */
 	/* Requested channel map */
-	u32_t	req_chan_map_lo;	/* Channels 0 to 7 */
-	u32_t	req_chan_map_hi;	/* Channels 8 to 15 */
+	uint32_t	req_chan_map_lo;	/* Channels 0 to 7 */
+	uint32_t	req_chan_map_hi;	/* Channels 8 to 15 */
 	/* Actual channel map that the driver could configure */
-	u32_t	act_chan_map_lo;	/* Channels 0 to 7 */
-	u32_t	act_chan_map_hi;	/* Channels 8 to 15 */
+	uint32_t	act_chan_map_lo;	/* Channels 0 to 7 */
+	uint32_t	act_chan_map_hi;	/* Channels 8 to 15 */
 	/* requested number of channels */
-	u8_t	req_num_chan;
+	uint8_t	req_num_chan;
 	/* Actual number of channels that the driver could configure */
-	u8_t	act_num_chan;
+	uint8_t	act_num_chan;
 	/* requested number of streams for each channel */
-	u8_t	req_num_streams;
+	uint8_t	req_num_streams;
 	/* Actual number of streams that the driver could configure */
-	u8_t	act_num_streams;
+	uint8_t	act_num_streams;
 };
 
 /**
@@ -161,8 +161,8 @@ struct dmic_cfg {
 struct _dmic_ops {
 	int (*configure)(struct device *dev, struct dmic_cfg *config);
 	int (*trigger)(struct device *dev, enum dmic_trigger cmd);
-	int (*read)(struct device *dev, u8_t stream, void **buffer,
-			size_t *size, s32_t timeout);
+	int (*read)(struct device *dev, uint8_t stream, void **buffer,
+			size_t *size, int32_t timeout);
 };
 
 /**
@@ -177,7 +177,7 @@ struct _dmic_ops {
  *
  * @return Bit-map containing the PDM and L/R channel information
  */
-static inline u32_t dmic_build_channel_map(u8_t channel, u8_t pdm,
+static inline uint32_t dmic_build_channel_map(uint8_t channel, uint8_t pdm,
 		enum pdm_lr lr)
 {
 	return ((((pdm & BIT_MASK(3)) << 1) | lr) <<
@@ -198,10 +198,10 @@ static inline u32_t dmic_build_channel_map(u8_t channel, u8_t pdm,
  *
  * @return none
  */
-static inline void dmic_parse_channel_map(u32_t channel_map_lo,
-		u32_t channel_map_hi, u8_t channel, u8_t *pdm, enum pdm_lr *lr)
+static inline void dmic_parse_channel_map(uint32_t channel_map_lo,
+		uint32_t channel_map_hi, uint8_t channel, uint8_t *pdm, enum pdm_lr *lr)
 {
-	u32_t channel_map;
+	uint32_t channel_map;
 
 	channel_map = (channel < 8) ? channel_map_lo : channel_map_hi;
 	channel_map >>= ((channel & BIT_MASK(3)) * 4U);
@@ -221,7 +221,7 @@ static inline void dmic_parse_channel_map(u32_t channel_map_lo,
  *
  * @return Bit-map containing the clock skew information
  */
-static inline u32_t dmic_build_clk_skew_map(u8_t pdm, u8_t skew)
+static inline uint32_t dmic_build_clk_skew_map(uint8_t pdm, uint8_t skew)
 {
 	return ((skew & BIT_MASK(4)) << ((pdm & BIT_MASK(3)) * 4U));
 }
@@ -278,8 +278,8 @@ static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd)
  *
  * @return 0 on success, a negative error code on failure
  */
-static inline int dmic_read(struct device *dev, u8_t stream, void **buffer,
-		size_t *size, s32_t timeout)
+static inline int dmic_read(struct device *dev, uint8_t stream, void **buffer,
+		size_t *size, int32_t timeout)
 {
 	const struct _dmic_ops *api =
 		(const struct _dmic_ops *)dev->driver_api;
diff --git a/include/bluetooth/a2dp-codec.h b/include/bluetooth/a2dp-codec.h
index d6b96a8b17..0a1fa2382b 100644
--- a/include/bluetooth/a2dp-codec.h
+++ b/include/bluetooth/a2dp-codec.h
@@ -59,11 +59,11 @@ extern "C" {
 /** @brief SBC Codec */
 struct bt_a2dp_codec_sbc_params {
 	/** First two octets of configuration */
-	u8_t config[2];
+	uint8_t config[2];
 	/** Minimum Bitpool Value */
-	u8_t min_bitpool;
+	uint8_t min_bitpool;
 	/** Maximum Bitpool Value */
-	u8_t max_bitpool;
+	uint8_t max_bitpool;
 } __packed;
 
 #ifdef __cplusplus
diff --git a/include/bluetooth/a2dp.h b/include/bluetooth/a2dp.h
index 59db78428e..2349f69fb3 100644
--- a/include/bluetooth/a2dp.h
+++ b/include/bluetooth/a2dp.h
@@ -38,15 +38,15 @@ enum bt_a2dp_codec_id {
 /** @brief Preset for the endpoint */
 struct bt_a2dp_preset {
 	/** Length of preset */
-	u8_t len;
+	uint8_t len;
 	/** Preset */
-	u8_t preset[0];
+	uint8_t preset[0];
 };
 
 /** @brief Stream End Point */
 struct bt_a2dp_endpoint {
 	/** Code ID */
-	u8_t codec_id;
+	uint8_t codec_id;
 	/** Stream End Point Information */
 	struct bt_avdtp_seid_lsep info;
 	/** Pointer to preset codec chosen */
@@ -102,7 +102,7 @@ struct bt_a2dp *bt_a2dp_connect(struct bt_conn *conn);
  *  @return 0 in case of success and error code in case of error.
  */
 int bt_a2dp_register_endpoint(struct bt_a2dp_endpoint *endpoint,
-			      u8_t media_type, u8_t role);
+			      uint8_t media_type, uint8_t role);
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/addr.h b/include/bluetooth/addr.h
index e2a0e452c5..1cc41aeae2 100644
--- a/include/bluetooth/addr.h
+++ b/include/bluetooth/addr.h
@@ -31,12 +31,12 @@ extern "C" {
 
 /** Bluetooth Device Address */
 typedef struct {
-	u8_t  val[6];
+	uint8_t  val[6];
 } bt_addr_t;
 
 /** Bluetooth LE Device Address */
 typedef struct {
-	u8_t      type;
+	uint8_t      type;
 	bt_addr_t a;
 } bt_addr_le_t;
 
diff --git a/include/bluetooth/avdtp.h b/include/bluetooth/avdtp.h
index c053a3be3d..574b2cd05b 100644
--- a/include/bluetooth/avdtp.h
+++ b/include/bluetooth/avdtp.h
@@ -17,17 +17,17 @@ extern "C" {
 /** @brief AVDTP SEID Information */
 struct bt_avdtp_seid_info {
 	/** Stream End Point ID */
-	u8_t id:6;
+	uint8_t id:6;
 	/** End Point usage status */
-	u8_t inuse:1;
+	uint8_t inuse:1;
 	/** Reserved */
-	u8_t rfa0:1;
+	uint8_t rfa0:1;
 	/** Media-type of the End Point */
-	u8_t media_type:4;
+	uint8_t media_type:4;
 	/** TSEP of the End Point */
-	u8_t tsep:1;
+	uint8_t tsep:1;
 	/** Reserved */
-	u8_t rfa1:3;
+	uint8_t rfa1:3;
 } __packed;
 
 /** @brief AVDTP Local SEP*/
@@ -43,7 +43,7 @@ struct bt_avdtp_stream {
 	struct bt_l2cap_br_chan chan; /* Transport Channel*/
 	struct bt_avdtp_seid_info lsep; /* Configured Local SEP */
 	struct bt_avdtp_seid_info rsep; /* Configured Remote SEP*/
-	u8_t state; /* current state of the stream */
+	uint8_t state; /* current state of the stream */
 	struct bt_avdtp_stream *next;
 };
 
diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h
index 8ab9dce817..f10b64a739 100644
--- a/include/bluetooth/bluetooth.h
+++ b/include/bluetooth/bluetooth.h
@@ -53,7 +53,7 @@ struct bt_conn;
 
 struct bt_le_ext_adv_sent_info {
 	/** The number of advertising events completed. */
-	u8_t num_sent;
+	uint8_t num_sent;
 };
 
 struct bt_le_ext_adv_connected_info {
@@ -210,7 +210,7 @@ void bt_id_get(bt_addr_le_t *addrs, size_t *count);
  *  @return Identity identifier (>= 0) in case of success, or a negative
  *          error code on failure.
  */
-int bt_id_create(bt_addr_le_t *addr, u8_t *irk);
+int bt_id_create(bt_addr_le_t *addr, uint8_t *irk);
 
 /** @brief Reset/reclaim an identity for reuse.
  *
@@ -243,7 +243,7 @@ int bt_id_create(bt_addr_le_t *addr, u8_t *irk);
  *  @return Identity identifier (>= 0) in case of success, or a negative
  *          error code on failure.
  */
-int bt_id_reset(u8_t id, bt_addr_le_t *addr, u8_t *irk);
+int bt_id_reset(uint8_t id, bt_addr_le_t *addr, uint8_t *irk);
 
 /** @brief Delete an identity.
  *
@@ -260,7 +260,7 @@ int bt_id_reset(u8_t id, bt_addr_le_t *addr, u8_t *irk);
  *
  *  @return 0 in case of success, or a negative error code on failure.
  */
-int bt_id_delete(u8_t id);
+int bt_id_delete(uint8_t id);
 
 /** @brief Bluetooth data.
  *
@@ -269,9 +269,9 @@ int bt_id_delete(u8_t id);
  *  bt_le_adv_start() function.
  */
 struct bt_data {
-	u8_t type;
-	u8_t data_len;
-	const u8_t *data;
+	uint8_t type;
+	uint8_t data_len;
+	const uint8_t *data;
 };
 
 /** @brief Helper to declare elements of bt_data arrays
@@ -287,7 +287,7 @@ struct bt_data {
 	{ \
 		.type = (_type), \
 		.data_len = (_data_len), \
-		.data = (const u8_t *)(_data), \
+		.data = (const uint8_t *)(_data), \
 	}
 
 /** @brief Helper to declare elements of bt_data arrays
@@ -299,8 +299,8 @@ struct bt_data {
  *  @param _bytes Variable number of single-byte parameters
  */
 #define BT_DATA_BYTES(_type, _bytes...) \
-	BT_DATA(_type, ((u8_t []) { _bytes }), \
-		sizeof((u8_t []) { _bytes }))
+	BT_DATA(_type, ((uint8_t []) { _bytes }), \
+		sizeof((uint8_t []) { _bytes }))
 
 /** Advertising options */
 enum {
@@ -458,13 +458,13 @@ struct bt_le_adv_param {
 	 *  @note It is not possible to have multiple connectable advertising
 	 *        sets advertising simultaneously using different identities.
 	 */
-	u8_t  id;
+	uint8_t  id;
 
 	/** @brief Advertising Set Identifier, valid range 0x00 - 0x0f.
 	 *
 	 *  @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
 	 **/
-	u8_t  sid;
+	uint8_t  sid;
 
 	/** @brief Secondary channel maximum skip count.
 	 *
@@ -473,16 +473,16 @@ struct bt_le_adv_param {
 	 *
 	 *  @note Requires @ref BT_LE_ADV_OPT_EXT_ADV
 	 */
-	u8_t  secondary_max_skip;
+	uint8_t  secondary_max_skip;
 
 	/** Bit-field of advertising options */
-	u32_t options;
+	uint32_t options;
 
 	/** Minimum Advertising Interval (N * 0.625) */
-	u32_t interval_min;
+	uint32_t interval_min;
 
 	/** Maximum Advertising Interval (N * 0.625) */
-	u32_t interval_max;
+	uint32_t interval_max;
 
 	/** @brief Directed advertising to peer
 	 *
@@ -640,13 +640,13 @@ struct bt_le_ext_adv_start_param {
 	 *  If privacy :option:`CONFIG_BT_PRIVACY` is enabled then the timeout
 	 *  must be less than :option:`CONFIG_BT_RPA_TIMEOUT`.
 	 */
-	u16_t timeout;
+	uint16_t timeout;
 	/** @brief Number of advertising events.
 	 *
 	 *  Application will be notified by the advertiser sent callback.
 	 *  Set to zero for no limit.
 	 */
-	u8_t  num_events;
+	uint8_t  num_events;
 };
 
 /** @brief Start advertising with the given advertising set
@@ -740,15 +740,15 @@ int bt_le_ext_adv_delete(struct bt_le_ext_adv *adv);
  *  @return Index of the advertising set object.
  *  The range of the returned value is 0..CONFIG_BT_EXT_ADV_MAX_ADV_SET-1
  */
-u8_t bt_le_ext_adv_get_index(struct bt_le_ext_adv *adv);
+uint8_t bt_le_ext_adv_get_index(struct bt_le_ext_adv *adv);
 
 /** @brief Advertising set info structure. */
 struct bt_le_ext_adv_info {
 	/* Local identity */
-	u8_t                    id;
+	uint8_t                    id;
 
 	/** Currently selected Transmit Power (dBM). */
-	s8_t                     tx_power;
+	int8_t                     tx_power;
 };
 
 /** @brief Get advertising set info
@@ -772,8 +772,8 @@ int bt_le_ext_adv_get_info(const struct bt_le_ext_adv *adv,
  *  @param adv_type Type of advertising response from advertiser.
  *  @param buf Buffer containing advertiser data.
  */
-typedef void bt_le_scan_cb_t(const bt_addr_le_t *addr, s8_t rssi,
-			     u8_t adv_type, struct net_buf_simple *buf);
+typedef void bt_le_scan_cb_t(const bt_addr_le_t *addr, int8_t rssi,
+			     uint8_t adv_type, struct net_buf_simple *buf);
 
 enum {
 	/** Convenience value when no options are specified. */
@@ -811,40 +811,40 @@ enum {
 /** LE scan parameters */
 struct bt_le_scan_param {
 	/** Scan type (BT_LE_SCAN_TYPE_ACTIVE or BT_LE_SCAN_TYPE_PASSIVE) */
-	u8_t  type;
+	uint8_t  type;
 
 	union {
 		/** Bit-field of scanning filter options. */
-		u32_t filter_dup __deprecated;
+		uint32_t filter_dup __deprecated;
 
 		/** Bit-field of scanning options. */
-		u32_t options;
+		uint32_t options;
 	};
 
 	/** Scan interval (N * 0.625 ms) */
-	u16_t interval;
+	uint16_t interval;
 
 	/** Scan window (N * 0.625 ms) */
-	u16_t window;
+	uint16_t window;
 
 	/** @brief Scan timeout (N * 10 ms)
 	 *
 	 *  Application will be notified by the scan timeout callback.
 	 *  Set zero to disable timeout.
 	 */
-	u16_t timeout;
+	uint16_t timeout;
 
 	/** @brief Scan interval LE Coded PHY (N * 0.625 MS)
 	 *
 	 *  Set zero to use same as LE 1M PHY scan interval.
 	 */
-	u16_t interval_coded;
+	uint16_t interval_coded;
 
 	/** @brief Scan window LE Coded PHY (N * 0.625 MS)
 	 *
 	 *  Set zero to use same as LE 1M PHY scan window.
 	 */
-	u16_t window_coded;
+	uint16_t window_coded;
 };
 
 /** LE advertisement packet information */
@@ -857,25 +857,25 @@ struct bt_le_scan_recv_info {
 	const bt_addr_le_t *addr;
 
 	/** Advertising Set Identifier. */
-	u8_t sid;
+	uint8_t sid;
 
 	/** Strength of advertiser signal. */
-	s8_t rssi;
+	int8_t rssi;
 
 	/** Transmit power of the advertiser. */
-	s8_t tx_power;
+	int8_t tx_power;
 
 	/** Advertising packet type. */
-	u8_t adv_type;
+	uint8_t adv_type;
 
 	/** Advertising packet properties. */
-	u16_t adv_props;
+	uint16_t adv_props;
 
 	/** Primary advertising channel PHY. */
-	u8_t primary_phy;
+	uint8_t primary_phy;
 
 	/** Secondary advertising channel PHY. */
-	u8_t secondary_phy;
+	uint8_t secondary_phy;
 };
 
 /** Listener context for (LE) scanning. */
@@ -1035,7 +1035,7 @@ int bt_le_whitelist_clear(void);
  *  @return Zero on success or error code otherwise, positive in case of
  *          protocol error or negative (POSIX) in case of stack internal error.
  */
-int bt_le_set_chan_map(u8_t chan_map[5]);
+int bt_le_set_chan_map(uint8_t chan_map[5]);
 
 /** @brief Helper for parsing advertising (or EIR or OOB) data.
  *
@@ -1057,10 +1057,10 @@ void bt_data_parse(struct net_buf_simple *ad,
 /** LE Secure Connections pairing Out of Band data. */
 struct bt_le_oob_sc_data {
 	/** Random Number. */
-	u8_t r[16];
+	uint8_t r[16];
 
 	/** Confirm Value. */
-	u8_t c[16];
+	uint8_t c[16];
 };
 
 /** LE Out of Band information. */
@@ -1101,7 +1101,7 @@ struct bt_le_oob {
  *  @return Zero on success or error code otherwise, positive in case of
  *          protocol error or negative (POSIX) in case of stack internal error.
  */
-int bt_le_oob_get_local(u8_t id, struct bt_le_oob *oob);
+int bt_le_oob_get_local(uint8_t id, struct bt_le_oob *oob);
 
 /** @brief Get local LE Out of Band (OOB) information.
  *
@@ -1132,19 +1132,19 @@ int bt_le_ext_adv_oob_get_local(struct bt_le_ext_adv *adv,
 /** @brief BR/EDR discovery result structure */
 struct bt_br_discovery_result {
 	/** private */
-	u8_t _priv[4];
+	uint8_t _priv[4];
 
 	/** Remote device address */
 	bt_addr_t addr;
 
 	/** RSSI from inquiry */
-	s8_t rssi;
+	int8_t rssi;
 
 	/** Class of Device */
-	u8_t cod[3];
+	uint8_t cod[3];
 
 	/** Extended Inquiry Response */
-	u8_t eir[240];
+	uint8_t eir[240];
 };
 
 /** @typedef bt_br_discovery_cb_t
@@ -1166,7 +1166,7 @@ struct bt_br_discovery_param {
 	/** Maximum length of the discovery in units of 1.28 seconds.
 	 *  Valid range is 0x01 - 0x30.
 	 */
-	u8_t length;
+	uint8_t length;
 
 	/** True if limited discovery procedure is to be used. */
 	bool limited;
@@ -1345,7 +1345,7 @@ int bt_br_set_connectable(bool enable);
  *
  *  @return 0 on success or negative error value on failure.
  */
-int bt_unpair(u8_t id, const bt_addr_le_t *addr);
+int bt_unpair(uint8_t id, const bt_addr_le_t *addr);
 
 /** Information about a bond with a remote device. */
 struct bt_bond_info {
@@ -1359,7 +1359,7 @@ struct bt_bond_info {
  *  @param func       Function to call for each bond.
  *  @param user_data  Data to pass to the callback function.
  */
-void bt_foreach_bond(u8_t id, void (*func)(const struct bt_bond_info *info,
+void bt_foreach_bond(uint8_t id, void (*func)(const struct bt_bond_info *info,
 					   void *user_data),
 		     void *user_data);
 
diff --git a/include/bluetooth/buf.h b/include/bluetooth/buf.h
index 61542ff563..1d092d5724 100644
--- a/include/bluetooth/buf.h
+++ b/include/bluetooth/buf.h
@@ -101,7 +101,7 @@ struct net_buf *bt_buf_get_cmd_complete(k_timeout_t timeout);
  *                      the special values K_NO_WAIT and K_FOREVER.
  *  @return A new buffer.
  */
-struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, k_timeout_t timeout);
+struct net_buf *bt_buf_get_evt(uint8_t evt, bool discardable, k_timeout_t timeout);
 
 /** Set the buffer type
  *
@@ -110,7 +110,7 @@ struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, k_timeout_t timeout);
  */
 static inline void bt_buf_set_type(struct net_buf *buf, enum bt_buf_type type)
 {
-	*(u8_t *)net_buf_user_data(buf) = type;
+	*(uint8_t *)net_buf_user_data(buf) = type;
 }
 
 /** Get the buffer type
@@ -127,7 +127,7 @@ static inline enum bt_buf_type bt_buf_get_type(struct net_buf *buf)
 	 * a temporary cast to 8-bit to ensure only 8 bits are read from
 	 * the pointer.
 	 */
-	return (enum bt_buf_type)(*(u8_t *)net_buf_user_data(buf));
+	return (enum bt_buf_type)(*(uint8_t *)net_buf_user_data(buf));
 }
 
 /**
diff --git a/include/bluetooth/conn.h b/include/bluetooth/conn.h
index 76ddcce35a..dbced7db7b 100644
--- a/include/bluetooth/conn.h
+++ b/include/bluetooth/conn.h
@@ -33,10 +33,10 @@ struct bt_conn;
 
 /** Connection parameters for LE connections */
 struct bt_le_conn_param {
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
 };
 
 /** @brief Initialize connection parameters
@@ -77,14 +77,14 @@ struct bt_le_conn_param {
 
 /** Connection PHY information for LE connections */
 struct bt_conn_le_phy_info {
-	u8_t tx_phy; /** Connection transmit PHY */
-	u8_t rx_phy; /** Connection receive PHY */
+	uint8_t tx_phy; /** Connection transmit PHY */
+	uint8_t rx_phy; /** Connection receive PHY */
 };
 
 /** Preferred PHY parameters for LE connections */
 struct bt_conn_le_phy_param {
-	u8_t pref_tx_phy; /** Bitmask of preferred transmit PHYs */
-	u8_t pref_rx_phy; /** Bitmask of preferred receive PHYs */
+	uint8_t pref_tx_phy; /** Bitmask of preferred transmit PHYs */
+	uint8_t pref_rx_phy; /** Bitmask of preferred receive PHYs */
 };
 
 /** Initialize PHY parameters
@@ -131,21 +131,21 @@ struct bt_conn_le_phy_param {
 /** Connection data length information for LE connections */
 struct bt_conn_le_data_len_info {
 	/** Maximum Link Layer transmission payload size in bytes. */
-	u16_t tx_max_len;
+	uint16_t tx_max_len;
 	/** Maximum Link Layer transmission payload time in us. */
-	u16_t tx_max_time;
+	uint16_t tx_max_time;
 	/** Maximum Link Layer reception payload size in bytes. */
-	u16_t rx_max_len;
+	uint16_t rx_max_len;
 	/** Maximum Link Layer reception payload time in us. */
-	u16_t rx_max_time;
+	uint16_t rx_max_time;
 };
 
 /** Connection data length parameters for LE connections */
 struct bt_conn_le_data_len_param {
 	/** Maximum Link Layer transmission payload size in bytes. */
-	u16_t tx_max_len;
+	uint16_t tx_max_len;
 	/** Maximum Link Layer transmission payload time in us. */
-	u16_t tx_max_time;
+	uint16_t tx_max_time;
 };
 
 /** Initialize transmit data length parameters
@@ -218,7 +218,7 @@ void bt_conn_foreach(int type, void (*func)(struct bt_conn *conn, void *data),
  *
  *  @return Connection object or NULL if not found.
  */
-struct bt_conn *bt_conn_lookup_addr_le(u8_t id, const bt_addr_le_t *peer);
+struct bt_conn *bt_conn_lookup_addr_le(uint8_t id, const bt_addr_le_t *peer);
 
 /** @brief Get destination (peer) address of a connection.
  *
@@ -238,7 +238,7 @@ const bt_addr_le_t *bt_conn_get_dst(const struct bt_conn *conn);
  *  @return Index of the connection object.
  *          The range of the returned value is 0..CONFIG_BT_MAX_CONN-1
  */
-u8_t bt_conn_index(struct bt_conn *conn);
+uint8_t bt_conn_index(struct bt_conn *conn);
 
 /** Connection Type */
 enum {
@@ -264,9 +264,9 @@ struct bt_conn_le_info {
 	const bt_addr_le_t *local;
 	/** Remote device address used during connection setup. */
 	const bt_addr_le_t *remote;
-	u16_t interval; /** Connection interval */
-	u16_t latency; /** Connection slave latency */
-	u16_t timeout; /** Connection supervision timeout */
+	uint16_t interval; /** Connection interval */
+	uint16_t latency; /** Connection slave latency */
+	uint16_t timeout; /** Connection supervision timeout */
 
 #if defined(CONFIG_BT_USER_PHY_UPDATE)
 	const struct bt_conn_le_phy_info      *phy;
@@ -292,11 +292,11 @@ enum {
 /** Connection Info Structure */
 struct bt_conn_info {
 	/** Connection Type. */
-	u8_t type;
+	uint8_t type;
 	/** Connection Role. */
-	u8_t role;
+	uint8_t role;
 	/** Which local identity the connection was created with */
-	u8_t id;
+	uint8_t id;
 	/** Connection Type specific Info.*/
 	union {
 		/** LE Connection specific Info. */
@@ -310,17 +310,17 @@ struct bt_conn_info {
 struct bt_conn_le_remote_info {
 
 	/** Remote LE feature set (bitmask). */
-	const u8_t *features;
+	const uint8_t *features;
 };
 
 /** BR/EDR Connection Remote Info structure */
 struct bt_conn_br_remote_info {
 
 	/** Remote feature set (pages of bitmasks). */
-	const u8_t *features;
+	const uint8_t *features;
 
 	/** Number of pages in the remote feature set. */
-	u8_t num_pages;
+	uint8_t num_pages;
 };
 
 /** @brief Connection Remote Info Structure
@@ -330,16 +330,16 @@ struct bt_conn_br_remote_info {
  */
 struct bt_conn_remote_info {
 	/** Connection Type */
-	u8_t  type;
+	uint8_t  type;
 
 	/** Remote Link Layer version */
-	u8_t  version;
+	uint8_t  version;
 
 	/** Remote manufacturer identifier */
-	u16_t manufacturer;
+	uint16_t manufacturer;
 
 	/** Per-manufacturer unique revision */
-	u16_t subversion;
+	uint16_t subversion;
 
 	union {
 		/** LE connection remote info */
@@ -417,7 +417,7 @@ int bt_conn_le_phy_update(struct bt_conn *conn,
  *
  *  @return Zero on success or (negative) error code on failure.
  */
-int bt_conn_disconnect(struct bt_conn *conn, u8_t reason);
+int bt_conn_disconnect(struct bt_conn *conn, uint8_t reason);
 
 enum {
 	/** Convenience value when no options are specified. */
@@ -441,25 +441,25 @@ enum {
 struct bt_conn_le_create_param {
 
 	/** Bit-field of create connection options. */
-	u32_t options;
+	uint32_t options;
 
 	/** Scan interval (N * 0.625 ms) */
-	u16_t interval;
+	uint16_t interval;
 
 	/** Scan window (N * 0.625 ms) */
-	u16_t window;
+	uint16_t window;
 
 	/** @brief Scan interval LE Coded PHY (N * 0.625 MS)
 	 *
 	 *  Set zero to use same as LE 1M PHY scan interval
 	 */
-	u16_t interval_coded;
+	uint16_t interval_coded;
 
 	/** @brief Scan window LE Coded PHY (N * 0.625 MS)
 	 *
 	 *  Set zero to use same as LE 1M PHY scan window.
 	 */
-	u16_t window_coded;
+	uint16_t window_coded;
 
 	/** @brief Connection initiation timeout (N * 10 MS)
 	 *
@@ -468,7 +468,7 @@ struct bt_conn_le_create_param {
 	 *
 	 *  @note Unused in @ref bt_conn_create_auto_le
 	 */
-	u16_t timeout;
+	uint16_t timeout;
 };
 
 /** @brief Initialize create connection parameters
@@ -716,7 +716,7 @@ static inline int __deprecated bt_conn_security(struct bt_conn *conn,
  *
  *  @return Encryption key size.
  */
-u8_t bt_conn_enc_key_size(struct bt_conn *conn);
+uint8_t bt_conn_enc_key_size(struct bt_conn *conn);
 
 enum bt_security_err {
 	/** Security procedure successful. */
@@ -777,7 +777,7 @@ struct bt_conn_cb {
 	 *    advertiser started by @ref bt_le_adv_start failed to be connected
 	 *    within the timeout.
 	 */
-	void (*connected)(struct bt_conn *conn, u8_t err);
+	void (*connected)(struct bt_conn *conn, uint8_t err);
 
 	/** @brief A connection has been disconnected.
 	 *
@@ -796,7 +796,7 @@ struct bt_conn_cb {
 	 *  @param conn Connection object.
 	 *  @param reason HCI reason for the disconnection.
 	 */
-	void (*disconnected)(struct bt_conn *conn, u8_t reason);
+	void (*disconnected)(struct bt_conn *conn, uint8_t reason);
 
 	/** @brief LE connection parameter update request.
 	 *
@@ -832,8 +832,8 @@ struct bt_conn_cb {
 	 *  @param latency Connection latency.
 	 *  @param timeout Connection supervision timeout.
 	 */
-	void (*le_param_updated)(struct bt_conn *conn, u16_t interval,
-				 u16_t latency, u16_t timeout);
+	void (*le_param_updated)(struct bt_conn *conn, uint16_t interval,
+				 uint16_t latency, uint16_t timeout);
 #if defined(CONFIG_BT_SMP)
 	/** @brief Remote Identity Address has been resolved.
 	 *
@@ -945,7 +945,7 @@ void bt_set_oob_data_flag(bool enable);
  *
  *  @return Zero on success or -EINVAL if NULL
  */
-int bt_le_oob_set_legacy_tk(struct bt_conn *conn, const u8_t *tk);
+int bt_le_oob_set_legacy_tk(struct bt_conn *conn, const uint8_t *tk);
 
 /** @brief Set OOB data during LE Secure Connections (SC) pairing procedure
  *
@@ -1051,26 +1051,26 @@ struct bt_conn_oob_info {
  */
 struct bt_conn_pairing_feat {
 	/** IO Capability, Core Spec. Vol 3, Part H, 3.5.1, Table 3.4 */
-	u8_t io_capability;
+	uint8_t io_capability;
 
 	/** OOB data flag, Core Spec. Vol 3, Part H, 3.5.1, Table 3.5 */
-	u8_t oob_data_flag;
+	uint8_t oob_data_flag;
 
 	/** AuthReq, Core Spec. Vol 3, Part H, 3.5.1, Fig. 3.3 */
-	u8_t auth_req;
+	uint8_t auth_req;
 
 	/** Maximum Encryption Key Size, Core Spec. Vol 3, Part H, 3.5.1 */
-	u8_t max_enc_key_size;
+	uint8_t max_enc_key_size;
 
 	/** Initiator Key Distribution/Generation, Core Spec. Vol 3, Part H,
 	 *  3.6.1, Fig. 3.11
 	 */
-	u8_t init_key_dist;
+	uint8_t init_key_dist;
 
 	/** Responder Key Distribution/Generation, Core Spec. Vol 3, Part H
 	 *  3.6.1, Fig. 3.11
 	 */
-	u8_t resp_key_dist;
+	uint8_t resp_key_dist;
 };
 #endif /* CONFIG_BT_SMP_APP_PAIRING_ACCEPT */
 
diff --git a/include/bluetooth/controller.h b/include/bluetooth/controller.h
index 05d0c150a7..1f45ddbe98 100644
--- a/include/bluetooth/controller.h
+++ b/include/bluetooth/controller.h
@@ -27,7 +27,7 @@ extern "C" {
  *
  *  @param addr Public address
  */
-void bt_ctlr_set_public_addr(const u8_t *addr);
+void bt_ctlr_set_public_addr(const uint8_t *addr);
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/crypto.h b/include/bluetooth/crypto.h
index 32e9d5e69f..e529504fc8 100644
--- a/include/bluetooth/crypto.h
+++ b/include/bluetooth/crypto.h
@@ -49,8 +49,8 @@ int bt_rand(void *buf, size_t len);
  *
  *  @return Zero on success or error code otherwise.
  */
-int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16]);
+int bt_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16]);
 
 /** @brief AES encrypt big-endian data.
  *
@@ -64,8 +64,8 @@ int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
  *
  *  @return Zero on success or error code otherwise.
  */
-int bt_encrypt_be(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16]);
+int bt_encrypt_be(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16]);
 
 
 /** @brief Decrypt big-endian data with AES-CCM.
@@ -88,9 +88,9 @@ int bt_encrypt_be(const u8_t key[16], const u8_t plaintext[16],
  *  @retval -EINVAL  Invalid parameters.
  *  @retval -EBADMSG Authentication failed.
  */
-int bt_ccm_decrypt(const u8_t key[16], u8_t nonce[13], const u8_t *enc_data,
-		   size_t len, const u8_t *aad, size_t aad_len,
-		   u8_t *plaintext, size_t mic_size);
+int bt_ccm_decrypt(const uint8_t key[16], uint8_t nonce[13], const uint8_t *enc_data,
+		   size_t len, const uint8_t *aad, size_t aad_len,
+		   uint8_t *plaintext, size_t mic_size);
 
 
 /** @brief Encrypt big-endian data with AES-CCM.
@@ -112,9 +112,9 @@ int bt_ccm_decrypt(const u8_t key[16], u8_t nonce[13], const u8_t *enc_data,
  *  @retval 0        Successfully encrypted the data.
  *  @retval -EINVAL  Invalid parameters.
  */
-int bt_ccm_encrypt(const u8_t key[16], u8_t nonce[13], const u8_t *enc_data,
-		   size_t len, const u8_t *aad, size_t aad_len,
-		   u8_t *plaintext, size_t mic_size);
+int bt_ccm_encrypt(const uint8_t key[16], uint8_t nonce[13], const uint8_t *enc_data,
+		   size_t len, const uint8_t *aad, size_t aad_len,
+		   uint8_t *plaintext, size_t mic_size);
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/gatt.h b/include/bluetooth/gatt.h
index d858db3ef9..4b0eb1017b 100644
--- a/include/bluetooth/gatt.h
+++ b/include/bluetooth/gatt.h
@@ -120,8 +120,8 @@ struct bt_gatt_attr {
 	 */
 	ssize_t			(*read)(struct bt_conn *conn,
 					const struct bt_gatt_attr *attr,
-					void *buf, u16_t len,
-					u16_t offset);
+					void *buf, uint16_t len,
+					uint16_t offset);
 
 	/** @brief Attribute write callback
 	 *
@@ -140,15 +140,15 @@ struct bt_gatt_attr {
 	 */
 	ssize_t			(*write)(struct bt_conn *conn,
 					 const struct bt_gatt_attr *attr,
-					 const void *buf, u16_t len,
-					 u16_t offset, u8_t flags);
+					 const void *buf, uint16_t len,
+					 uint16_t offset, uint8_t flags);
 
 	/** Attribute user data */
 	void			*user_data;
 	/** Attribute handle */
-	u16_t			handle;
+	uint16_t			handle;
 	/** Attribute permissions */
-	u8_t			perm;
+	uint8_t			perm;
 };
 
 /** @brief GATT Service structure */
@@ -173,7 +173,7 @@ struct bt_gatt_service_val {
 	/** Service UUID. */
 	const struct bt_uuid	*uuid;
 	/** Service end handle. */
-	u16_t			end_handle;
+	uint16_t			end_handle;
 };
 
 /** @brief Include Attribute Value. */
@@ -181,9 +181,9 @@ struct bt_gatt_include {
 	/** Service UUID. */
 	const struct bt_uuid	*uuid;
 	/** Service start handle. */
-	u16_t			start_handle;
+	uint16_t			start_handle;
 	/** Service end handle. */
-	u16_t			end_handle;
+	uint16_t			end_handle;
 };
 
 /** Characteristic Properties Bit field values */
@@ -245,9 +245,9 @@ struct bt_gatt_chrc {
 	/** Characteristic UUID. */
 	const struct bt_uuid	*uuid;
 	/** Characteristic Value handle. */
-	u16_t			value_handle;
+	uint16_t			value_handle;
 	/** Characteristic properties. */
-	u8_t			properties;
+	uint8_t			properties;
 };
 
 /** Characteristic Extended Properties Bit field values */
@@ -257,7 +257,7 @@ struct bt_gatt_chrc {
 /** @brief Characteristic Extended Properties Attribute Value. */
 struct bt_gatt_cep {
 	/** Characteristic Extended properties */
-	u16_t		properties;
+	uint16_t		properties;
 };
 
 /** Client Characteristic Configuration Values */
@@ -278,23 +278,23 @@ struct bt_gatt_cep {
 /** Client Characteristic Configuration Attribute Value */
 struct bt_gatt_ccc {
 	/** Client Characteristic Configuration flags */
-	u16_t		flags;
+	uint16_t		flags;
 };
 
 /** @brief GATT Characteristic Presentation Format Attribute Value. */
 struct bt_gatt_cpf {
 	/** Format of the value of the characteristic */
-	u8_t format;
+	uint8_t format;
 	/** Exponent field to determine how the value of this characteristic is
 	 * further formatted
 	 */
-	s8_t exponent;
+	int8_t exponent;
 	/** Unit of the characteristic */
-	u16_t unit;
+	uint16_t unit;
 	/** Name space of the description */
-	u8_t name_space;
+	uint8_t name_space;
 	/** Description of the characteristic as defined in a higher layer profile */
-	u16_t description;
+	uint16_t description;
 } __packed;
 
 /**
@@ -343,7 +343,7 @@ enum {
  *  @return BT_GATT_ITER_CONTINUE if should continue to the next attribute.
  *  @return BT_GATT_ITER_STOP to stop.
  */
-typedef u8_t (*bt_gatt_attr_func_t)(const struct bt_gatt_attr *attr,
+typedef uint8_t (*bt_gatt_attr_func_t)(const struct bt_gatt_attr *attr,
 				       void *user_data);
 
 /** @brief Attribute iterator by type.
@@ -358,7 +358,7 @@ typedef u8_t (*bt_gatt_attr_func_t)(const struct bt_gatt_attr *attr,
  *  @param func Callback function.
  *  @param user_data Data to pass to the callback.
  */
-void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
+void bt_gatt_foreach_attr_type(uint16_t start_handle, uint16_t end_handle,
 			       const struct bt_uuid *uuid,
 			       const void *attr_data, uint16_t num_matches,
 			       bt_gatt_attr_func_t func,
@@ -373,7 +373,7 @@ void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
  *  @param func Callback function.
  *  @param user_data Data to pass to the callback.
  */
-static inline void bt_gatt_foreach_attr(u16_t start_handle, u16_t end_handle,
+static inline void bt_gatt_foreach_attr(uint16_t start_handle, uint16_t end_handle,
 					bt_gatt_attr_func_t func,
 					void *user_data)
 {
@@ -417,8 +417,8 @@ uint16_t bt_gatt_attr_value_handle(const struct bt_gatt_attr *attr);
  *          case of error.
  */
 ssize_t bt_gatt_attr_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			  void *buf, u16_t buf_len, u16_t offset,
-			  const void *value, u16_t value_len);
+			  void *buf, uint16_t buf_len, uint16_t offset,
+			  const void *value, uint16_t value_len);
 
 /** @brief Read Service Attribute helper.
  *
@@ -437,7 +437,7 @@ ssize_t bt_gatt_attr_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
  */
 ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr,
-				  void *buf, u16_t len, u16_t offset);
+				  void *buf, uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_SERVICE_DEFINE
  *  @brief Statically define and register a service.
@@ -503,7 +503,7 @@ ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_read_included(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr,
-				   void *buf, u16_t len, u16_t offset);
+				   void *buf, uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_INCLUDE_SERVICE
  *  @brief Include Service Declaration Macro.
@@ -533,7 +533,7 @@ ssize_t bt_gatt_attr_read_included(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset);
+			       uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_CHARACTERISTIC
  *  @brief Characteristic and Value Declaration Macro.
@@ -571,9 +571,9 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
  *  @param data Configuration pointer data.
  */
 struct bt_gatt_ccc_cfg {
-	u8_t                    id;
+	uint8_t                    id;
 	bt_addr_le_t		peer;
-	u16_t			value;
+	uint16_t			value;
 };
 
 /** Internal representation of CCC value */
@@ -582,14 +582,14 @@ struct _bt_gatt_ccc {
 	struct bt_gatt_ccc_cfg cfg[BT_GATT_CCC_MAX];
 
 	/** Highest value of all connected peer's subscriptions */
-	u16_t value;
+	uint16_t value;
 
 	/** @brief CCC attribute changed callback
 	 *
 	 *  @param attr   The attribute that's changed value
 	 *  @param value  New value
 	 */
-	void (*cfg_changed)(const struct bt_gatt_attr *attr, u16_t value);
+	void (*cfg_changed)(const struct bt_gatt_attr *attr, uint16_t value);
 
 	/** @brief CCC attribute write validation callback
 	 *
@@ -601,7 +601,7 @@ struct _bt_gatt_ccc {
 	 *          BT_GATT_ERR() with a specific error code.
 	 */
 	ssize_t (*cfg_write)(struct bt_conn *conn,
-			     const struct bt_gatt_attr *attr, u16_t value);
+			     const struct bt_gatt_attr *attr, uint16_t value);
 
 	/** @brief CCC attribute match handler
 	 *
@@ -636,7 +636,7 @@ struct _bt_gatt_ccc {
  */
 ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset);
+			      uint16_t len, uint16_t offset);
 
 /** @brief Write Client Characteristic Configuration Attribute helper.
  *
@@ -656,7 +656,7 @@ ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
-			       u16_t len, u16_t offset, u8_t flags);
+			       uint16_t len, uint16_t offset, uint8_t flags);
 
 
 /** @def BT_GATT_CCC_INITIALIZER
@@ -719,7 +719,7 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_read_cep(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset);
+			      uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_CEP
  *  @brief Characteristic Extended Properties Declaration Macro.
@@ -751,7 +751,7 @@ ssize_t bt_gatt_attr_read_cep(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset);
+			      uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_CUD
  *  @brief Characteristic User Format Descriptor Declaration Macro.
@@ -783,7 +783,7 @@ ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
  */
 ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset);
+			      uint16_t len, uint16_t offset);
 
 /** @def BT_GATT_CPF
  *  @brief Characteristic Presentation Format Descriptor Declaration Macro.
@@ -845,7 +845,7 @@ struct bt_gatt_notify_params {
 	/** Notification Value data */
 	const void *data;
 	/** Notification Value length */
-	u16_t len;
+	uint16_t len;
 	/** Notification Value callback */
 	bt_gatt_complete_func_t func;
 	/** Notification Value callback user data */
@@ -880,7 +880,7 @@ int bt_gatt_notify_cb(struct bt_conn *conn,
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_gatt_notify_multiple(struct bt_conn *conn, u16_t num_params,
+int bt_gatt_notify_multiple(struct bt_conn *conn, uint16_t num_params,
 			    struct bt_gatt_notify_params *params);
 
 /** @brief Notify attribute value change.
@@ -904,7 +904,7 @@ int bt_gatt_notify_multiple(struct bt_conn *conn, u16_t num_params,
  */
 static inline int bt_gatt_notify(struct bt_conn *conn,
 				 const struct bt_gatt_attr *attr,
-				 const void *data, u16_t len)
+				 const void *data, uint16_t len)
 {
 	struct bt_gatt_notify_params params;
 
@@ -926,7 +926,7 @@ static inline int bt_gatt_notify(struct bt_conn *conn,
  */
 typedef void (*bt_gatt_indicate_func_t)(struct bt_conn *conn,
 					const struct bt_gatt_attr *attr,
-					u8_t err);
+					uint8_t err);
 
 /** @brief GATT Indicate Value parameters */
 struct bt_gatt_indicate_params {
@@ -939,7 +939,7 @@ struct bt_gatt_indicate_params {
 	/** Indicate Value data*/
 	const void *data;
 	/** Indicate Value length*/
-	u16_t len;
+	uint16_t len;
 };
 
 /** @brief Indicate attribute value change.
@@ -990,7 +990,7 @@ int bt_gatt_indicate(struct bt_conn *conn,
  *  @return true if the attribute object has been subscribed.
  */
 bool bt_gatt_is_subscribed(struct bt_conn *conn,
-			   const struct bt_gatt_attr *attr, u16_t ccc_value);
+			   const struct bt_gatt_attr *attr, uint16_t ccc_value);
 
 /** @brief Get ATT MTU for a connection
  *
@@ -1001,7 +1001,7 @@ bool bt_gatt_is_subscribed(struct bt_conn *conn,
  *
  *  @return MTU in bytes
  */
-u16_t bt_gatt_get_mtu(struct bt_conn *conn);
+uint16_t bt_gatt_get_mtu(struct bt_conn *conn);
 
 /** @} */
 
@@ -1014,7 +1014,7 @@ u16_t bt_gatt_get_mtu(struct bt_conn *conn);
 /** @brief GATT Exchange MTU parameters */
 struct bt_gatt_exchange_params {
 	/** Response callback */
-	void (*func)(struct bt_conn *conn, u8_t err,
+	void (*func)(struct bt_conn *conn, uint8_t err,
 		     struct bt_gatt_exchange_params *params);
 };
 
@@ -1050,7 +1050,7 @@ struct bt_gatt_discover_params;
  *  @return BT_GATT_ITER_CONTINUE if should continue attribute discovery.
  *  @return BT_GATT_ITER_STOP to stop discovery procedure.
  */
-typedef u8_t (*bt_gatt_discover_func_t)(struct bt_conn *conn,
+typedef uint8_t (*bt_gatt_discover_func_t)(struct bt_conn *conn,
 					const struct bt_gatt_attr *attr,
 					struct bt_gatt_discover_params *params);
 
@@ -1096,19 +1096,19 @@ struct bt_gatt_discover_params {
 	union {
 		struct {
 			/** Include service attribute declaration handle */
-			u16_t attr_handle;
+			uint16_t attr_handle;
 			/** Included service start handle */
-			u16_t start_handle;
+			uint16_t start_handle;
 			/** Included service end handle */
-			u16_t end_handle;
+			uint16_t end_handle;
 		} _included;
 		/** Discover start handle */
-		u16_t start_handle;
+		uint16_t start_handle;
 	};
 	/** Discover end handle */
-	u16_t end_handle;
+	uint16_t end_handle;
 	/** Discover type */
-	u8_t type;
+	uint8_t type;
 };
 
 /** @brief GATT Discover function
@@ -1153,9 +1153,9 @@ struct bt_gatt_read_params;
  *  @return BT_GATT_ITER_CONTINUE if should continue to the next attribute.
  *  @return BT_GATT_ITER_STOP to stop.
  */
-typedef u8_t (*bt_gatt_read_func_t)(struct bt_conn *conn, u8_t err,
+typedef uint8_t (*bt_gatt_read_func_t)(struct bt_conn *conn, uint8_t err,
 				    struct bt_gatt_read_params *params,
-				    const void *data, u16_t length);
+				    const void *data, uint16_t length);
 
 /** @brief GATT Read parameters
  *
@@ -1177,13 +1177,13 @@ struct bt_gatt_read_params {
 	size_t handle_count;
 	union {
 		struct {
-			u16_t handle;
-			u16_t offset;
+			uint16_t handle;
+			uint16_t offset;
 		} single;
-		u16_t *handles;
+		uint16_t *handles;
 		struct {
-			u16_t start_handle;
-			u16_t end_handle;
+			uint16_t start_handle;
+			uint16_t end_handle;
 			struct bt_uuid *uuid;
 		} by_uuid;
 	};
@@ -1220,7 +1220,7 @@ struct bt_gatt_write_params;
  *  @param err ATT error code.
  *  @param params Write parameters used.
  */
-typedef void (*bt_gatt_write_func_t)(struct bt_conn *conn, u8_t err,
+typedef void (*bt_gatt_write_func_t)(struct bt_conn *conn, uint8_t err,
 				     struct bt_gatt_write_params *params);
 
 /** @brief GATT Write parameters */
@@ -1228,13 +1228,13 @@ struct bt_gatt_write_params {
 	/** Response callback */
 	bt_gatt_write_func_t func;
 	/** Attribute handle */
-	u16_t handle;
+	uint16_t handle;
 	/** Attribute data offset */
-	u16_t offset;
+	uint16_t offset;
 	/** Data to be written */
 	const void *data;
 	/** Length of the data */
-	u16_t length;
+	uint16_t length;
 };
 
 /** @brief Write Attribute Value by handle
@@ -1275,8 +1275,8 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params);
  *
  *  @return 0 in case of success or negative value in case of error.
  */
-int bt_gatt_write_without_response_cb(struct bt_conn *conn, u16_t handle,
-				      const void *data, u16_t length,
+int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
+				      const void *data, uint16_t length,
 				      bool sign, bt_gatt_complete_func_t func,
 				      void *user_data);
 
@@ -1294,8 +1294,8 @@ int bt_gatt_write_without_response_cb(struct bt_conn *conn, u16_t handle,
  *  @return 0 in case of success or negative value in case of error.
  */
 static inline int bt_gatt_write_without_response(struct bt_conn *conn,
-						 u16_t handle, const void *data,
-						 u16_t length, bool sign)
+						 uint16_t handle, const void *data,
+						 uint16_t length, bool sign)
 {
 	return bt_gatt_write_without_response_cb(conn, handle, data, length,
 						 sign, NULL, NULL);
@@ -1315,9 +1315,9 @@ struct bt_gatt_subscribe_params;
  *  @return BT_GATT_ITER_CONTINUE to continue receiving value notifications.
  *          BT_GATT_ITER_STOP to unsubscribe from value notifications.
  */
-typedef u8_t (*bt_gatt_notify_func_t)(struct bt_conn *conn,
+typedef uint8_t (*bt_gatt_notify_func_t)(struct bt_conn *conn,
 				      struct bt_gatt_subscribe_params *params,
-				      const void *data, u16_t length);
+				      const void *data, uint16_t length);
 
 /** Subscription flags */
 enum {
@@ -1361,11 +1361,11 @@ struct bt_gatt_subscribe_params {
 	/** Notification value callback */
 	bt_gatt_notify_func_t notify;
 	/** Subscribe value handle */
-	u16_t value_handle;
+	uint16_t value_handle;
 	/** Subscribe CCC handle */
-	u16_t ccc_handle;
+	uint16_t ccc_handle;
 	/** Subscribe value */
-	u16_t value;
+	uint16_t value;
 	/** Subscription flags */
 	ATOMIC_DEFINE(flags, BT_GATT_SUBSCRIBE_NUM_FLAGS);
 
diff --git a/include/bluetooth/hci.h b/include/bluetooth/hci.h
index 33ed3a7d68..7dd58141f7 100644
--- a/include/bluetooth/hci.h
+++ b/include/bluetooth/hci.h
@@ -34,8 +34,8 @@ extern "C" {
 #define BT_ENC_KEY_SIZE_MAX                     0x10
 
 struct bt_hci_evt_hdr {
-	u8_t  evt;
-	u8_t  len;
+	uint8_t  evt;
+	uint8_t  len;
 } __packed;
 #define BT_HCI_EVT_HDR_SIZE             2
 
@@ -54,14 +54,14 @@ struct bt_hci_evt_hdr {
 #define bt_acl_handle_pack(h, f)        ((h) | ((f) << 12))
 
 struct bt_hci_acl_hdr {
-	u16_t handle;
-	u16_t len;
+	uint16_t handle;
+	uint16_t len;
 } __packed;
 #define BT_HCI_ACL_HDR_SIZE             4
 
 struct bt_hci_cmd_hdr {
-	u16_t opcode;
-	u8_t  param_len;
+	uint16_t opcode;
+	uint8_t  param_len;
 } __packed;
 #define BT_HCI_CMD_HDR_SIZE             3
 
@@ -222,9 +222,9 @@ struct bt_hci_cmd_hdr {
 
 #define BT_HCI_OP_INQUIRY                       BT_OP(BT_OGF_LINK_CTRL, 0x0001)
 struct bt_hci_op_inquiry {
-	u8_t lap[3];
-	u8_t length;
-	u8_t num_rsp;
+	uint8_t lap[3];
+	uint8_t length;
+	uint8_t num_rsp;
 } __packed;
 
 #define BT_HCI_OP_INQUIRY_CANCEL                BT_OP(BT_OGF_LINK_CTRL, 0x0002)
@@ -232,17 +232,17 @@ struct bt_hci_op_inquiry {
 #define BT_HCI_OP_CONNECT                       BT_OP(BT_OGF_LINK_CTRL, 0x0005)
 struct bt_hci_cp_connect {
 	bt_addr_t bdaddr;
-	u16_t  packet_type;
-	u8_t   pscan_rep_mode;
-	u8_t   reserved;
-	u16_t  clock_offset;
-	u8_t   allow_role_switch;
+	uint16_t  packet_type;
+	uint8_t   pscan_rep_mode;
+	uint8_t   reserved;
+	uint16_t  clock_offset;
+	uint8_t   allow_role_switch;
 } __packed;
 
 #define BT_HCI_OP_DISCONNECT                    BT_OP(BT_OGF_LINK_CTRL, 0x0006)
 struct bt_hci_cp_disconnect {
-	u16_t handle;
-	u8_t  reason;
+	uint16_t handle;
+	uint8_t  reason;
 } __packed;
 
 #define BT_HCI_OP_CONNECT_CANCEL                BT_OP(BT_OGF_LINK_CTRL, 0x0008)
@@ -250,48 +250,48 @@ struct bt_hci_cp_connect_cancel {
 	bt_addr_t bdaddr;
 } __packed;
 struct bt_hci_rp_connect_cancel {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_OP_ACCEPT_CONN_REQ               BT_OP(BT_OGF_LINK_CTRL, 0x0009)
 struct bt_hci_cp_accept_conn_req {
 	bt_addr_t bdaddr;
-	u8_t      role;
+	uint8_t      role;
 } __packed;
 
 #define BT_HCI_OP_SETUP_SYNC_CONN               BT_OP(BT_OGF_LINK_CTRL, 0x0028)
 struct bt_hci_cp_setup_sync_conn {
-	u16_t  handle;
-	u32_t  tx_bandwidth;
-	u32_t  rx_bandwidth;
-	u16_t  max_latency;
-	u16_t  content_format;
-	u8_t   retrans_effort;
-	u16_t  pkt_type;
+	uint16_t  handle;
+	uint32_t  tx_bandwidth;
+	uint32_t  rx_bandwidth;
+	uint16_t  max_latency;
+	uint16_t  content_format;
+	uint8_t   retrans_effort;
+	uint16_t  pkt_type;
 } __packed;
 
 #define BT_HCI_OP_ACCEPT_SYNC_CONN_REQ          BT_OP(BT_OGF_LINK_CTRL, 0x0029)
 struct bt_hci_cp_accept_sync_conn_req {
 	bt_addr_t bdaddr;
-	u32_t  tx_bandwidth;
-	u32_t  rx_bandwidth;
-	u16_t  max_latency;
-	u16_t  content_format;
-	u8_t   retrans_effort;
-	u16_t  pkt_type;
+	uint32_t  tx_bandwidth;
+	uint32_t  rx_bandwidth;
+	uint16_t  max_latency;
+	uint16_t  content_format;
+	uint8_t   retrans_effort;
+	uint16_t  pkt_type;
 } __packed;
 
 #define BT_HCI_OP_REJECT_CONN_REQ               BT_OP(BT_OGF_LINK_CTRL, 0x000a)
 struct bt_hci_cp_reject_conn_req {
 	bt_addr_t bdaddr;
-	u8_t      reason;
+	uint8_t      reason;
 } __packed;
 
 #define BT_HCI_OP_LINK_KEY_REPLY                BT_OP(BT_OGF_LINK_CTRL, 0x000b)
 struct bt_hci_cp_link_key_reply {
 	bt_addr_t bdaddr;
-	u8_t   link_key[16];
+	uint8_t   link_key[16];
 } __packed;
 
 #define BT_HCI_OP_LINK_KEY_NEG_REPLY            BT_OP(BT_OGF_LINK_CTRL, 0x000c)
@@ -302,11 +302,11 @@ struct bt_hci_cp_link_key_neg_reply {
 #define BT_HCI_OP_PIN_CODE_REPLY                BT_OP(BT_OGF_LINK_CTRL, 0x000d)
 struct bt_hci_cp_pin_code_reply {
 	bt_addr_t bdaddr;
-	u8_t   pin_len;
-	u8_t   pin_code[16];
+	uint8_t   pin_len;
+	uint8_t   pin_code[16];
 } __packed;
 struct bt_hci_rp_pin_code_reply {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
@@ -315,27 +315,27 @@ struct bt_hci_cp_pin_code_neg_reply {
 	bt_addr_t bdaddr;
 } __packed;
 struct bt_hci_rp_pin_code_neg_reply {
-	u8_t   status;
+	uint8_t   status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_OP_AUTH_REQUESTED                BT_OP(BT_OGF_LINK_CTRL, 0x0011)
 struct bt_hci_cp_auth_requested {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_SET_CONN_ENCRYPT              BT_OP(BT_OGF_LINK_CTRL, 0x0013)
 struct bt_hci_cp_set_conn_encrypt {
-	u16_t handle;
-	u8_t  encrypt;
+	uint16_t handle;
+	uint8_t  encrypt;
 } __packed;
 
 #define BT_HCI_OP_REMOTE_NAME_REQUEST           BT_OP(BT_OGF_LINK_CTRL, 0x0019)
 struct bt_hci_cp_remote_name_request {
 	bt_addr_t bdaddr;
-	u8_t      pscan_rep_mode;
-	u8_t      reserved;
-	u16_t     clock_offset;
+	uint8_t      pscan_rep_mode;
+	uint8_t      reserved;
+	uint16_t     clock_offset;
 } __packed;
 
 #define BT_HCI_OP_REMOTE_NAME_CANCEL            BT_OP(BT_OGF_LINK_CTRL, 0x001a)
@@ -343,32 +343,32 @@ struct bt_hci_cp_remote_name_cancel {
 	bt_addr_t bdaddr;
 } __packed;
 struct bt_hci_rp_remote_name_cancel {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_OP_READ_REMOTE_FEATURES          BT_OP(BT_OGF_LINK_CTRL, 0x001b)
 struct bt_hci_cp_read_remote_features {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_READ_REMOTE_EXT_FEATURES      BT_OP(BT_OGF_LINK_CTRL, 0x001c)
 struct bt_hci_cp_read_remote_ext_features {
-	u16_t handle;
-	u8_t  page;
+	uint16_t handle;
+	uint8_t  page;
 } __packed;
 
 #define BT_HCI_OP_READ_REMOTE_VERSION_INFO      BT_OP(BT_OGF_LINK_CTRL, 0x001d)
 struct bt_hci_cp_read_remote_version_info {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_IO_CAPABILITY_REPLY           BT_OP(BT_OGF_LINK_CTRL, 0x002b)
 struct bt_hci_cp_io_capability_reply {
 	bt_addr_t bdaddr;
-	u8_t   capability;
-	u8_t   oob_data;
-	u8_t   authentication;
+	uint8_t   capability;
+	uint8_t   oob_data;
+	uint8_t   authentication;
 } __packed;
 
 #define BT_HCI_OP_USER_CONFIRM_REPLY            BT_OP(BT_OGF_LINK_CTRL, 0x002c)
@@ -377,14 +377,14 @@ struct bt_hci_cp_user_confirm_reply {
 	bt_addr_t bdaddr;
 } __packed;
 struct bt_hci_rp_user_confirm_reply {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_OP_USER_PASSKEY_REPLY            BT_OP(BT_OGF_LINK_CTRL, 0x002e)
 struct bt_hci_cp_user_passkey_reply {
 	bt_addr_t bdaddr;
-	u32_t     passkey;
+	uint32_t     passkey;
 } __packed;
 
 #define BT_HCI_OP_USER_PASSKEY_NEG_REPLY        BT_OP(BT_OGF_LINK_CTRL, 0x002f)
@@ -395,19 +395,19 @@ struct bt_hci_cp_user_passkey_neg_reply {
 #define BT_HCI_OP_IO_CAPABILITY_NEG_REPLY       BT_OP(BT_OGF_LINK_CTRL, 0x0034)
 struct bt_hci_cp_io_capability_neg_reply {
 	bt_addr_t bdaddr;
-	u8_t   reason;
+	uint8_t   reason;
 } __packed;
 
 #define BT_HCI_OP_SET_EVENT_MASK                BT_OP(BT_OGF_BASEBAND, 0x0001)
 struct bt_hci_cp_set_event_mask {
-	u8_t  events[8];
+	uint8_t  events[8];
 } __packed;
 
 #define BT_HCI_OP_RESET                         BT_OP(BT_OGF_BASEBAND, 0x0003)
 
 #define BT_HCI_OP_WRITE_LOCAL_NAME              BT_OP(BT_OGF_BASEBAND, 0x0013)
 struct bt_hci_write_local_name {
-	u8_t local_name[248];
+	uint8_t local_name[248];
 } __packed;
 
 #define BT_HCI_OP_WRITE_PAGE_TIMEOUT            BT_OP(BT_OGF_BASEBAND, 0x0018)
@@ -421,88 +421,88 @@ struct bt_hci_write_local_name {
 #define BT_TX_POWER_LEVEL_MAX                   0x01
 #define BT_HCI_OP_READ_TX_POWER_LEVEL           BT_OP(BT_OGF_BASEBAND, 0x002d)
 struct bt_hci_cp_read_tx_power_level {
-	u16_t handle;
-	u8_t  type;
+	uint16_t handle;
+	uint8_t  type;
 } __packed;
 
 struct bt_hci_rp_read_tx_power_level {
-	u8_t  status;
-	u16_t handle;
-	s8_t  tx_power_level;
+	uint8_t  status;
+	uint16_t handle;
+	int8_t  tx_power_level;
 } __packed;
 
 #define BT_HCI_CTL_TO_HOST_FLOW_DISABLE         0x00
 #define BT_HCI_CTL_TO_HOST_FLOW_ENABLE          0x01
 #define BT_HCI_OP_SET_CTL_TO_HOST_FLOW          BT_OP(BT_OGF_BASEBAND, 0x0031)
 struct bt_hci_cp_set_ctl_to_host_flow {
-	u8_t  flow_enable;
+	uint8_t  flow_enable;
 } __packed;
 
 #define BT_HCI_OP_HOST_BUFFER_SIZE              BT_OP(BT_OGF_BASEBAND, 0x0033)
 struct bt_hci_cp_host_buffer_size {
-	u16_t acl_mtu;
-	u8_t  sco_mtu;
-	u16_t acl_pkts;
-	u16_t sco_pkts;
+	uint16_t acl_mtu;
+	uint8_t  sco_mtu;
+	uint16_t acl_pkts;
+	uint16_t sco_pkts;
 } __packed;
 
 struct bt_hci_handle_count {
-	u16_t handle;
-	u16_t count;
+	uint16_t handle;
+	uint16_t count;
 } __packed;
 
 #define BT_HCI_OP_HOST_NUM_COMPLETED_PACKETS    BT_OP(BT_OGF_BASEBAND, 0x0035)
 struct bt_hci_cp_host_num_completed_packets {
-	u8_t  num_handles;
+	uint8_t  num_handles;
 	struct bt_hci_handle_count h[0];
 } __packed;
 
 #define BT_HCI_OP_WRITE_INQUIRY_MODE            BT_OP(BT_OGF_BASEBAND, 0x0045)
 struct bt_hci_cp_write_inquiry_mode {
-	u8_t  mode;
+	uint8_t  mode;
 } __packed;
 
 #define BT_HCI_OP_WRITE_SSP_MODE                BT_OP(BT_OGF_BASEBAND, 0x0056)
 struct bt_hci_cp_write_ssp_mode {
-	u8_t mode;
+	uint8_t mode;
 } __packed;
 
 #define BT_HCI_OP_SET_EVENT_MASK_PAGE_2         BT_OP(BT_OGF_BASEBAND, 0x0063)
 struct bt_hci_cp_set_event_mask_page_2 {
-	u8_t  events_page_2[8];
+	uint8_t  events_page_2[8];
 } __packed;
 
 #define BT_HCI_OP_LE_WRITE_LE_HOST_SUPP         BT_OP(BT_OGF_BASEBAND, 0x006d)
 struct bt_hci_cp_write_le_host_supp {
-	u8_t  le;
-	u8_t  simul;
+	uint8_t  le;
+	uint8_t  simul;
 } __packed;
 
 #define BT_HCI_OP_WRITE_SC_HOST_SUPP            BT_OP(BT_OGF_BASEBAND, 0x007a)
 struct bt_hci_cp_write_sc_host_supp {
-	u8_t  sc_support;
+	uint8_t  sc_support;
 } __packed;
 
 #define BT_HCI_OP_READ_AUTH_PAYLOAD_TIMEOUT     BT_OP(BT_OGF_BASEBAND, 0x007b)
 struct bt_hci_cp_read_auth_payload_timeout {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 struct bt_hci_rp_read_auth_payload_timeout {
-	u8_t  status;
-	u16_t handle;
-	u16_t auth_payload_timeout;
+	uint8_t  status;
+	uint16_t handle;
+	uint16_t auth_payload_timeout;
 } __packed;
 
 #define BT_HCI_OP_WRITE_AUTH_PAYLOAD_TIMEOUT    BT_OP(BT_OGF_BASEBAND, 0x007c)
 struct bt_hci_cp_write_auth_payload_timeout {
-	u16_t handle;
-	u16_t auth_payload_timeout;
+	uint16_t handle;
+	uint16_t auth_payload_timeout;
 } __packed;
 
 struct bt_hci_rp_write_auth_payload_timeout {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 /* HCI version from Assigned Numbers */
@@ -521,60 +521,60 @@ struct bt_hci_rp_write_auth_payload_timeout {
 
 #define BT_HCI_OP_READ_LOCAL_VERSION_INFO       BT_OP(BT_OGF_INFO, 0x0001)
 struct bt_hci_rp_read_local_version_info {
-	u8_t  status;
-	u8_t  hci_version;
-	u16_t hci_revision;
-	u8_t  lmp_version;
-	u16_t manufacturer;
-	u16_t lmp_subversion;
+	uint8_t  status;
+	uint8_t  hci_version;
+	uint16_t hci_revision;
+	uint8_t  lmp_version;
+	uint16_t manufacturer;
+	uint16_t lmp_subversion;
 } __packed;
 
 #define BT_HCI_OP_READ_SUPPORTED_COMMANDS       BT_OP(BT_OGF_INFO, 0x0002)
 struct bt_hci_rp_read_supported_commands {
-	u8_t  status;
-	u8_t  commands[64];
+	uint8_t  status;
+	uint8_t  commands[64];
 } __packed;
 
 #define BT_HCI_OP_READ_LOCAL_EXT_FEATURES       BT_OP(BT_OGF_INFO, 0x0004)
 struct bt_hci_cp_read_local_ext_features {
-	u8_t page;
+	uint8_t page;
 };
 struct bt_hci_rp_read_local_ext_features {
-	u8_t  status;
-	u8_t  page;
-	u8_t  max_page;
-	u8_t  ext_features[8];
+	uint8_t  status;
+	uint8_t  page;
+	uint8_t  max_page;
+	uint8_t  ext_features[8];
 } __packed;
 
 #define BT_HCI_OP_READ_LOCAL_FEATURES           BT_OP(BT_OGF_INFO, 0x0003)
 struct bt_hci_rp_read_local_features {
-	u8_t  status;
-	u8_t  features[8];
+	uint8_t  status;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_OP_READ_BUFFER_SIZE              BT_OP(BT_OGF_INFO, 0x0005)
 struct bt_hci_rp_read_buffer_size {
-	u8_t  status;
-	u16_t acl_max_len;
-	u8_t  sco_max_len;
-	u16_t acl_max_num;
-	u16_t sco_max_num;
+	uint8_t  status;
+	uint16_t acl_max_len;
+	uint8_t  sco_max_len;
+	uint16_t acl_max_num;
+	uint16_t sco_max_num;
 } __packed;
 
 #define BT_HCI_OP_READ_BD_ADDR                  BT_OP(BT_OGF_INFO, 0x0009)
 struct bt_hci_rp_read_bd_addr {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_OP_READ_RSSI                     BT_OP(BT_OGF_STATUS, 0x0005)
 struct bt_hci_cp_read_rssi {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 struct bt_hci_rp_read_rssi {
-	u8_t  status;
-	u16_t handle;
-	s8_t  rssi;
+	uint8_t  status;
+	uint16_t handle;
+	int8_t  rssi;
 } __packed;
 
 #define BT_HCI_ENCRYPTION_KEY_SIZE_MIN          7
@@ -582,32 +582,32 @@ struct bt_hci_rp_read_rssi {
 
 #define BT_HCI_OP_READ_ENCRYPTION_KEY_SIZE      BT_OP(BT_OGF_STATUS, 0x0008)
 struct bt_hci_cp_read_encryption_key_size {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 struct bt_hci_rp_read_encryption_key_size {
-	u8_t  status;
-	u16_t handle;
-	u8_t  key_size;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  key_size;
 } __packed;
 
 /* BLE */
 
 #define BT_HCI_OP_LE_SET_EVENT_MASK             BT_OP(BT_OGF_LE, 0x0001)
 struct bt_hci_cp_le_set_event_mask {
-	u8_t events[8];
+	uint8_t events[8];
 } __packed;
 
 #define BT_HCI_OP_LE_READ_BUFFER_SIZE           BT_OP(BT_OGF_LE, 0x0002)
 struct bt_hci_rp_le_read_buffer_size {
-	u8_t  status;
-	u16_t le_max_len;
-	u8_t  le_max_num;
+	uint8_t  status;
+	uint16_t le_max_len;
+	uint8_t  le_max_num;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_LOCAL_FEATURES        BT_OP(BT_OGF_LE, 0x0003)
 struct bt_hci_rp_le_read_local_features {
-	u8_t  status;
-	u8_t  features[8];
+	uint8_t  status;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_OP_LE_SET_RANDOM_ADDRESS         BT_OP(BT_OGF_LE, 0x0005)
@@ -638,31 +638,31 @@ struct bt_hci_cp_le_set_random_address {
 
 #define BT_HCI_OP_LE_SET_ADV_PARAM              BT_OP(BT_OGF_LE, 0x0006)
 struct bt_hci_cp_le_set_adv_param {
-	u16_t        min_interval;
-	u16_t        max_interval;
-	u8_t         type;
-	u8_t         own_addr_type;
+	uint16_t        min_interval;
+	uint16_t        max_interval;
+	uint8_t         type;
+	uint8_t         own_addr_type;
 	bt_addr_le_t direct_addr;
-	u8_t         channel_map;
-	u8_t         filter_policy;
+	uint8_t         channel_map;
+	uint8_t         filter_policy;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_ADV_CHAN_TX_POWER     BT_OP(BT_OGF_LE, 0x0007)
 struct bt_hci_rp_le_read_chan_tx_power {
-	u8_t  status;
-	s8_t  tx_power_level;
+	uint8_t  status;
+	int8_t  tx_power_level;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_ADV_DATA               BT_OP(BT_OGF_LE, 0x0008)
 struct bt_hci_cp_le_set_adv_data {
-	u8_t  len;
-	u8_t  data[31];
+	uint8_t  len;
+	uint8_t  data[31];
 } __packed;
 
 #define BT_HCI_OP_LE_SET_SCAN_RSP_DATA          BT_OP(BT_OGF_LE, 0x0009)
 struct bt_hci_cp_le_set_scan_rsp_data {
-	u8_t  len;
-	u8_t  data[31];
+	uint8_t  len;
+	uint8_t  data[31];
 } __packed;
 
 #define BT_HCI_LE_ADV_DISABLE                   0x00
@@ -670,7 +670,7 @@ struct bt_hci_cp_le_set_scan_rsp_data {
 
 #define BT_HCI_OP_LE_SET_ADV_ENABLE             BT_OP(BT_OGF_LE, 0x000a)
 struct bt_hci_cp_le_set_adv_enable {
-	u8_t  enable;
+	uint8_t  enable;
 } __packed;
 
 /* Scan types */
@@ -682,11 +682,11 @@ struct bt_hci_cp_le_set_adv_enable {
 #define BT_HCI_LE_SCAN_FP_USE_WHITELIST         0x01
 
 struct bt_hci_cp_le_set_scan_param {
-	u8_t  scan_type;
-	u16_t interval;
-	u16_t window;
-	u8_t  addr_type;
-	u8_t  filter_policy;
+	uint8_t  scan_type;
+	uint16_t interval;
+	uint16_t window;
+	uint8_t  addr_type;
+	uint8_t  filter_policy;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_SCAN_ENABLE            BT_OP(BT_OGF_LE, 0x000c)
@@ -698,8 +698,8 @@ struct bt_hci_cp_le_set_scan_param {
 #define BT_HCI_LE_SCAN_FILTER_DUP_ENABLE        0x01
 
 struct bt_hci_cp_le_set_scan_enable {
-	u8_t  enable;
-	u8_t  filter_dup;
+	uint8_t  enable;
+	uint8_t  filter_dup;
 } __packed;
 
 #define BT_HCI_OP_LE_CREATE_CONN                BT_OP(BT_OGF_LE, 0x000d)
@@ -708,25 +708,25 @@ struct bt_hci_cp_le_set_scan_enable {
 #define BT_HCI_LE_CREATE_CONN_FP_WHITELIST      0x01
 
 struct bt_hci_cp_le_create_conn {
-	u16_t        scan_interval;
-	u16_t        scan_window;
-	u8_t         filter_policy;
+	uint16_t        scan_interval;
+	uint16_t        scan_window;
+	uint8_t         filter_policy;
 	bt_addr_le_t peer_addr;
-	u8_t         own_addr_type;
-	u16_t        conn_interval_min;
-	u16_t        conn_interval_max;
-	u16_t        conn_latency;
-	u16_t        supervision_timeout;
-	u16_t        min_ce_len;
-	u16_t        max_ce_len;
+	uint8_t         own_addr_type;
+	uint16_t        conn_interval_min;
+	uint16_t        conn_interval_max;
+	uint16_t        conn_latency;
+	uint16_t        supervision_timeout;
+	uint16_t        min_ce_len;
+	uint16_t        max_ce_len;
 } __packed;
 
 #define BT_HCI_OP_LE_CREATE_CONN_CANCEL         BT_OP(BT_OGF_LE, 0x000e)
 
 #define BT_HCI_OP_LE_READ_WL_SIZE               BT_OP(BT_OGF_LE, 0x000f)
 struct bt_hci_rp_le_read_wl_size {
-	u8_t  status;
-	u8_t  wl_size;
+	uint8_t  status;
+	uint8_t  wl_size;
 } __packed;
 
 #define BT_HCI_OP_LE_CLEAR_WL                   BT_OP(BT_OGF_LE, 0x0010)
@@ -743,163 +743,163 @@ struct bt_hci_cp_le_rem_dev_from_wl {
 
 #define BT_HCI_OP_LE_CONN_UPDATE                BT_OP(BT_OGF_LE, 0x0013)
 struct hci_cp_le_conn_update {
-	u16_t handle;
-	u16_t conn_interval_min;
-	u16_t conn_interval_max;
-	u16_t conn_latency;
-	u16_t supervision_timeout;
-	u16_t min_ce_len;
-	u16_t max_ce_len;
+	uint16_t handle;
+	uint16_t conn_interval_min;
+	uint16_t conn_interval_max;
+	uint16_t conn_latency;
+	uint16_t supervision_timeout;
+	uint16_t min_ce_len;
+	uint16_t max_ce_len;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_HOST_CHAN_CLASSIF      BT_OP(BT_OGF_LE, 0x0014)
 struct bt_hci_cp_le_set_host_chan_classif {
-	u8_t  ch_map[5];
+	uint8_t  ch_map[5];
 } __packed;
 
 #define BT_HCI_OP_LE_READ_CHAN_MAP              BT_OP(BT_OGF_LE, 0x0015)
 struct bt_hci_cp_le_read_chan_map {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 struct bt_hci_rp_le_read_chan_map {
-	u8_t  status;
-	u16_t handle;
-	u8_t  ch_map[5];
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  ch_map[5];
 } __packed;
 
 #define BT_HCI_OP_LE_READ_REMOTE_FEATURES       BT_OP(BT_OGF_LE, 0x0016)
 struct bt_hci_cp_le_read_remote_features {
-	u16_t  handle;
+	uint16_t  handle;
 } __packed;
 
 #define BT_HCI_OP_LE_ENCRYPT                    BT_OP(BT_OGF_LE, 0x0017)
 struct bt_hci_cp_le_encrypt {
-	u8_t  key[16];
-	u8_t  plaintext[16];
+	uint8_t  key[16];
+	uint8_t  plaintext[16];
 } __packed;
 struct bt_hci_rp_le_encrypt {
-	u8_t  status;
-	u8_t  enc_data[16];
+	uint8_t  status;
+	uint8_t  enc_data[16];
 } __packed;
 
 #define BT_HCI_OP_LE_RAND                       BT_OP(BT_OGF_LE, 0x0018)
 struct bt_hci_rp_le_rand {
-	u8_t  status;
-	u8_t  rand[8];
+	uint8_t  status;
+	uint8_t  rand[8];
 } __packed;
 
 #define BT_HCI_OP_LE_START_ENCRYPTION           BT_OP(BT_OGF_LE, 0x0019)
 struct bt_hci_cp_le_start_encryption {
-	u16_t handle;
-	u64_t rand;
-	u16_t ediv;
-	u8_t  ltk[16];
+	uint16_t handle;
+	uint64_t rand;
+	uint16_t ediv;
+	uint8_t  ltk[16];
 } __packed;
 
 #define BT_HCI_OP_LE_LTK_REQ_REPLY              BT_OP(BT_OGF_LE, 0x001a)
 struct bt_hci_cp_le_ltk_req_reply {
-	u16_t handle;
-	u8_t  ltk[16];
+	uint16_t handle;
+	uint8_t  ltk[16];
 } __packed;
 struct bt_hci_rp_le_ltk_req_reply {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_LTK_REQ_NEG_REPLY          BT_OP(BT_OGF_LE, 0x001b)
 struct bt_hci_cp_le_ltk_req_neg_reply {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 struct bt_hci_rp_le_ltk_req_neg_reply {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_SUPP_STATES           BT_OP(BT_OGF_LE, 0x001c)
 struct bt_hci_rp_le_read_supp_states {
-	u8_t  status;
-	u8_t  le_states[8];
+	uint8_t  status;
+	uint8_t  le_states[8];
 } __packed;
 
 #define BT_HCI_OP_LE_RX_TEST                    BT_OP(BT_OGF_LE, 0x001d)
 struct bt_hci_cp_le_rx_test {
-	u8_t  rx_ch;
+	uint8_t  rx_ch;
 } __packed;
 
 #define BT_HCI_OP_LE_TX_TEST                    BT_OP(BT_OGF_LE, 0x001e)
 struct bt_hci_cp_le_tx_test {
-	u8_t  tx_ch;
-	u8_t  test_data_len;
-	u8_t  pkt_payload;
+	uint8_t  tx_ch;
+	uint8_t  test_data_len;
+	uint8_t  pkt_payload;
 } __packed;
 
 #define BT_HCI_OP_LE_TEST_END                   BT_OP(BT_OGF_LE, 0x001f)
 struct bt_hci_rp_le_test_end {
-	u8_t  status;
-	u16_t rx_pkt_count;
+	uint8_t  status;
+	uint16_t rx_pkt_count;
 } __packed;
 
 #define BT_HCI_OP_LE_CONN_PARAM_REQ_REPLY       BT_OP(BT_OGF_LE, 0x0020)
 struct bt_hci_cp_le_conn_param_req_reply {
-	u16_t handle;
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
-	u16_t min_ce_len;
-	u16_t max_ce_len;
+	uint16_t handle;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
+	uint16_t min_ce_len;
+	uint16_t max_ce_len;
 } __packed;
 struct bt_hci_rp_le_conn_param_req_reply {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_CONN_PARAM_REQ_NEG_REPLY   BT_OP(BT_OGF_LE, 0x0021)
 struct bt_hci_cp_le_conn_param_req_neg_reply {
-	u16_t handle;
-	u8_t  reason;
+	uint16_t handle;
+	uint8_t  reason;
 } __packed;
 struct bt_hci_rp_le_conn_param_req_neg_reply {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_DATA_LEN               BT_OP(BT_OGF_LE, 0x0022)
 struct bt_hci_cp_le_set_data_len {
-	u16_t handle;
-	u16_t tx_octets;
-	u16_t tx_time;
+	uint16_t handle;
+	uint16_t tx_octets;
+	uint16_t tx_time;
 } __packed;
 struct bt_hci_rp_le_set_data_len {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_DEFAULT_DATA_LEN      BT_OP(BT_OGF_LE, 0x0023)
 struct bt_hci_rp_le_read_default_data_len {
-	u8_t  status;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
+	uint8_t  status;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
 } __packed;
 
 #define BT_HCI_OP_LE_WRITE_DEFAULT_DATA_LEN     BT_OP(BT_OGF_LE, 0x0024)
 struct bt_hci_cp_le_write_default_data_len {
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
 } __packed;
 
 #define BT_HCI_OP_LE_P256_PUBLIC_KEY            BT_OP(BT_OGF_LE, 0x0025)
 
 #define BT_HCI_OP_LE_GENERATE_DHKEY             BT_OP(BT_OGF_LE, 0x0026)
 struct bt_hci_cp_le_generate_dhkey {
-	u8_t key[64];
+	uint8_t key[64];
 } __packed;
 
 #define BT_HCI_OP_LE_ADD_DEV_TO_RL              BT_OP(BT_OGF_LE, 0x0027)
 struct bt_hci_cp_le_add_dev_to_rl {
 	bt_addr_le_t  peer_id_addr;
-	u8_t          peer_irk[16];
-	u8_t          local_irk[16];
+	uint8_t          peer_irk[16];
+	uint8_t          local_irk[16];
 } __packed;
 
 #define BT_HCI_OP_LE_REM_DEV_FROM_RL            BT_OP(BT_OGF_LE, 0x0028)
@@ -911,8 +911,8 @@ struct bt_hci_cp_le_rem_dev_from_rl {
 
 #define BT_HCI_OP_LE_READ_RL_SIZE               BT_OP(BT_OGF_LE, 0x002a)
 struct bt_hci_rp_le_read_rl_size {
-	u8_t  status;
-	u8_t  rl_size;
+	uint8_t  status;
+	uint8_t  rl_size;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_PEER_RPA              BT_OP(BT_OGF_LE, 0x002b)
@@ -920,7 +920,7 @@ struct bt_hci_cp_le_read_peer_rpa {
 	bt_addr_le_t  peer_id_addr;
 } __packed;
 struct bt_hci_rp_le_read_peer_rpa {
-	u8_t       status;
+	uint8_t       status;
 	bt_addr_t  peer_rpa;
 } __packed;
 
@@ -929,7 +929,7 @@ struct bt_hci_cp_le_read_local_rpa {
 	bt_addr_le_t  peer_id_addr;
 } __packed;
 struct bt_hci_rp_le_read_local_rpa {
-	u8_t       status;
+	uint8_t       status;
 	bt_addr_t  local_rpa;
 } __packed;
 
@@ -938,21 +938,21 @@ struct bt_hci_rp_le_read_local_rpa {
 
 #define BT_HCI_OP_LE_SET_ADDR_RES_ENABLE        BT_OP(BT_OGF_LE, 0x002d)
 struct bt_hci_cp_le_set_addr_res_enable {
-	u8_t  enable;
+	uint8_t  enable;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_RPA_TIMEOUT            BT_OP(BT_OGF_LE, 0x002e)
 struct bt_hci_cp_le_set_rpa_timeout {
-	u16_t rpa_timeout;
+	uint16_t rpa_timeout;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_MAX_DATA_LEN          BT_OP(BT_OGF_LE, 0x002f)
 struct bt_hci_rp_le_read_max_data_len {
-	u8_t  status;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
-	u16_t max_rx_octets;
-	u16_t max_rx_time;
+	uint8_t  status;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
+	uint16_t max_rx_octets;
+	uint16_t max_rx_time;
 } __packed;
 
 #define BT_HCI_LE_PHY_1M                        0x01
@@ -961,13 +961,13 @@ struct bt_hci_rp_le_read_max_data_len {
 
 #define BT_HCI_OP_LE_READ_PHY                   BT_OP(BT_OGF_LE, 0x0030)
 struct bt_hci_cp_le_read_phy {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 struct bt_hci_rp_le_read_phy {
-	u8_t  status;
-	u16_t handle;
-	u8_t  tx_phy;
-	u8_t  rx_phy;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  tx_phy;
+	uint8_t  rx_phy;
 } __packed;
 
 #define BT_HCI_LE_PHY_TX_ANY                    BIT(0)
@@ -979,9 +979,9 @@ struct bt_hci_rp_le_read_phy {
 
 #define BT_HCI_OP_LE_SET_DEFAULT_PHY            BT_OP(BT_OGF_LE, 0x0031)
 struct bt_hci_cp_le_set_default_phy {
-	u8_t all_phys;
-	u8_t tx_phys;
-	u8_t rx_phys;
+	uint8_t all_phys;
+	uint8_t tx_phys;
+	uint8_t rx_phys;
 } __packed;
 
 #define BT_HCI_LE_PHY_CODED_ANY                 0x00
@@ -990,11 +990,11 @@ struct bt_hci_cp_le_set_default_phy {
 
 #define BT_HCI_OP_LE_SET_PHY                    BT_OP(BT_OGF_LE, 0x0032)
 struct bt_hci_cp_le_set_phy {
-	u16_t  handle;
-	u8_t   all_phys;
-	u8_t   tx_phys;
-	u8_t   rx_phys;
-	u16_t  phy_opts;
+	uint16_t  handle;
+	uint8_t   all_phys;
+	uint8_t   tx_phys;
+	uint8_t   rx_phys;
+	uint16_t  phy_opts;
 } __packed;
 
 #define BT_HCI_LE_MOD_INDEX_STANDARD            0x00
@@ -1002,9 +1002,9 @@ struct bt_hci_cp_le_set_phy {
 
 #define BT_HCI_OP_LE_ENH_RX_TEST                BT_OP(BT_OGF_LE, 0x0033)
 struct bt_hci_cp_le_enh_rx_test {
-	u8_t  rx_ch;
-	u8_t  phy;
-	u8_t  mod_index;
+	uint8_t  rx_ch;
+	uint8_t  phy;
+	uint8_t  mod_index;
 } __packed;
 
 /* Extends BT_HCI_LE_PHY */
@@ -1013,15 +1013,15 @@ struct bt_hci_cp_le_enh_rx_test {
 
 #define BT_HCI_OP_LE_ENH_TX_TEST                BT_OP(BT_OGF_LE, 0x0034)
 struct bt_hci_cp_le_enh_tx_test {
-	u8_t  tx_ch;
-	u8_t  test_data_len;
-	u8_t  pkt_payload;
-	u8_t  phy;
+	uint8_t  tx_ch;
+	uint8_t  test_data_len;
+	uint8_t  pkt_payload;
+	uint8_t  phy;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_ADV_SET_RANDOM_ADDR    BT_OP(BT_OGF_LE, 0x0035)
 struct bt_hci_cp_le_set_adv_set_random_addr {
-	u8_t      handle;
+	uint8_t      handle;
 	bt_addr_t bdaddr;
 } __packed;
 
@@ -1040,24 +1040,24 @@ struct bt_hci_cp_le_set_adv_set_random_addr {
 
 #define BT_HCI_OP_LE_SET_EXT_ADV_PARAM          BT_OP(BT_OGF_LE, 0x0036)
 struct bt_hci_cp_le_set_ext_adv_param {
-	u8_t         handle;
-	u16_t        props;
-	u8_t         prim_min_interval[3];
-	u8_t         prim_max_interval[3];
-	u8_t         prim_channel_map;
-	u8_t         own_addr_type;
+	uint8_t         handle;
+	uint16_t        props;
+	uint8_t         prim_min_interval[3];
+	uint8_t         prim_max_interval[3];
+	uint8_t         prim_channel_map;
+	uint8_t         own_addr_type;
 	bt_addr_le_t peer_addr;
-	u8_t         filter_policy;
-	s8_t         tx_power;
-	u8_t         prim_adv_phy;
-	u8_t         sec_adv_max_skip;
-	u8_t         sec_adv_phy;
-	u8_t         sid;
-	u8_t         scan_req_notify_enable;
+	uint8_t         filter_policy;
+	int8_t         tx_power;
+	uint8_t         prim_adv_phy;
+	uint8_t         sec_adv_max_skip;
+	uint8_t         sec_adv_phy;
+	uint8_t         sid;
+	uint8_t         scan_req_notify_enable;
 } __packed;
 struct bt_hci_rp_le_set_ext_adv_param {
-	u8_t  status;
-	s8_t  tx_power;
+	uint8_t  status;
+	int8_t  tx_power;
 } __packed;
 
 #define BT_HCI_LE_EXT_ADV_OP_INTERM_FRAG        0x00
@@ -1073,81 +1073,81 @@ struct bt_hci_rp_le_set_ext_adv_param {
 
 #define BT_HCI_OP_LE_SET_EXT_ADV_DATA           BT_OP(BT_OGF_LE, 0x0037)
 struct bt_hci_cp_le_set_ext_adv_data {
-	u8_t  handle;
-	u8_t  op;
-	u8_t  frag_pref;
-	u8_t  len;
-	u8_t  data[251];
+	uint8_t  handle;
+	uint8_t  op;
+	uint8_t  frag_pref;
+	uint8_t  len;
+	uint8_t  data[251];
 } __packed;
 
 #define BT_HCI_OP_LE_SET_EXT_SCAN_RSP_DATA      BT_OP(BT_OGF_LE, 0x0038)
 struct bt_hci_cp_le_set_ext_scan_rsp_data {
-	u8_t  handle;
-	u8_t  op;
-	u8_t  frag_pref;
-	u8_t  len;
-	u8_t  data[251];
+	uint8_t  handle;
+	uint8_t  op;
+	uint8_t  frag_pref;
+	uint8_t  len;
+	uint8_t  data[251];
 } __packed;
 
 #define BT_HCI_OP_LE_SET_EXT_ADV_ENABLE         BT_OP(BT_OGF_LE, 0x0039)
 struct bt_hci_ext_adv_set {
-	u8_t  handle;
-	u16_t duration;
-	u8_t  max_ext_adv_evts;
+	uint8_t  handle;
+	uint16_t duration;
+	uint8_t  max_ext_adv_evts;
 } __packed;
 
 struct bt_hci_cp_le_set_ext_adv_enable {
-	u8_t  enable;
-	u8_t  set_num;
+	uint8_t  enable;
+	uint8_t  set_num;
 	struct bt_hci_ext_adv_set s[0];
 } __packed;
 
 #define BT_HCI_OP_LE_READ_MAX_ADV_DATA_LEN      BT_OP(BT_OGF_LE, 0x003a)
 struct bt_hci_rp_le_read_max_adv_data_len {
-	u8_t  status;
-	u16_t max_adv_data_len;
+	uint8_t  status;
+	uint16_t max_adv_data_len;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_NUM_ADV_SETS          BT_OP(BT_OGF_LE, 0x003b)
 struct bt_hci_rp_le_read_num_adv_sets {
-	u8_t  status;
-	u8_t  num_sets;
+	uint8_t  status;
+	uint8_t  num_sets;
 } __packed;
 
 #define BT_HCI_OP_LE_REMOVE_ADV_SET             BT_OP(BT_OGF_LE, 0x003c)
 struct bt_hci_cp_le_remove_adv_set {
-	u8_t  handle;
+	uint8_t  handle;
 } __packed;
 
 #define BT_HCI_OP_CLEAR_ADV_SETS                BT_OP(BT_OGF_LE, 0x003d)
 
 #define BT_HCI_OP_LE_SET_PER_ADV_PARAM          BT_OP(BT_OGF_LE, 0x003e)
 struct bt_hci_cp_le_set_per_adv_param {
-	u8_t  handle;
-	u16_t min_interval;
-	u16_t max_interval;
-	u16_t props;
+	uint8_t  handle;
+	uint16_t min_interval;
+	uint16_t max_interval;
+	uint16_t props;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_PER_ADV_DATA           BT_OP(BT_OGF_LE, 0x003f)
 struct bt_hci_cp_le_set_per_adv_data {
-	u8_t  handle;
-	u8_t  op;
-	u8_t  len;
-	u8_t  data[251];
+	uint8_t  handle;
+	uint8_t  op;
+	uint8_t  len;
+	uint8_t  data[251];
 } __packed;
 
 #define BT_HCI_OP_LE_SET_PER_ADV_ENABLE         BT_OP(BT_OGF_LE, 0x0040)
 struct bt_hci_cp_le_set_per_adv_enable {
-	u8_t  enable;
-	u8_t  handle;
+	uint8_t  enable;
+	uint8_t  handle;
 } __packed;
 
 #define BT_HCI_OP_LE_SET_EXT_SCAN_PARAM         BT_OP(BT_OGF_LE, 0x0041)
 struct bt_hci_ext_scan_phy {
-	u8_t  type;
-	u16_t interval;
-	u16_t window;
+	uint8_t  type;
+	uint16_t interval;
+	uint16_t window;
 } __packed;
 
 #define BT_HCI_LE_EXT_SCAN_PHY_1M               BIT(0)
@@ -1155,9 +1155,9 @@ struct bt_hci_ext_scan_phy {
 #define BT_HCI_LE_EXT_SCAN_PHY_CODED            BIT(2)
 
 struct bt_hci_cp_le_set_ext_scan_param {
-	u8_t  own_addr_type;
-	u8_t  filter_policy;
-	u8_t  phys;
+	uint8_t  own_addr_type;
+	uint8_t  filter_policy;
+	uint8_t  phys;
 	struct bt_hci_ext_scan_phy p[0];
 } __packed;
 
@@ -1166,87 +1166,87 @@ struct bt_hci_cp_le_set_ext_scan_param {
 
 #define BT_HCI_OP_LE_SET_EXT_SCAN_ENABLE        BT_OP(BT_OGF_LE, 0x0042)
 struct bt_hci_cp_le_set_ext_scan_enable {
-	u8_t  enable;
-	u8_t  filter_dup;
-	u16_t duration;
-	u16_t period;
+	uint8_t  enable;
+	uint8_t  filter_dup;
+	uint16_t duration;
+	uint16_t period;
 } __packed;
 
 #define BT_HCI_OP_LE_EXT_CREATE_CONN            BT_OP(BT_OGF_LE, 0x0043)
 struct bt_hci_ext_conn_phy {
-	u16_t scan_interval;
-	u16_t scan_window;
-	u16_t conn_interval_min;
-	u16_t conn_interval_max;
-	u16_t conn_latency;
-	u16_t supervision_timeout;
-	u16_t min_ce_len;
-	u16_t max_ce_len;
+	uint16_t scan_interval;
+	uint16_t scan_window;
+	uint16_t conn_interval_min;
+	uint16_t conn_interval_max;
+	uint16_t conn_latency;
+	uint16_t supervision_timeout;
+	uint16_t min_ce_len;
+	uint16_t max_ce_len;
 } __packed;
 
 struct bt_hci_cp_le_ext_create_conn {
-	u8_t         filter_policy;
-	u8_t         own_addr_type;
+	uint8_t         filter_policy;
+	uint8_t         own_addr_type;
 	bt_addr_le_t peer_addr;
-	u8_t         phys;
+	uint8_t         phys;
 	struct bt_hci_ext_conn_phy p[0];
 } __packed;
 
 #define BT_HCI_OP_LE_PER_ADV_CREATE_SYNC        BT_OP(BT_OGF_LE, 0x0044)
 struct bt_hci_cp_le_per_adv_create_sync {
-	u8_t         filter_policy;
-	u8_t         sid;
+	uint8_t         filter_policy;
+	uint8_t         sid;
 	bt_addr_le_t addr;
-	u16_t        skip;
-	u16_t        sync_timeout;
-	u8_t         unused;
+	uint16_t        skip;
+	uint16_t        sync_timeout;
+	uint8_t         unused;
 } __packed;
 
 #define BT_HCI_OP_LE_PER_ADV_CREATE_SYNC_CANCEL BT_OP(BT_OGF_LE, 0x0045)
 
 #define BT_HCI_OP_LE_PER_ADV_TERMINATE_SYNC     BT_OP(BT_OGF_LE, 0x0046)
 struct bt_hci_cp_le_per_adv_terminate_sync {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_OP_LE_ADD_DEV_TO_PER_ADV_LIST    BT_OP(BT_OGF_LE, 0x0047)
 struct bt_hci_cp_le_add_dev_to_per_adv_list {
 	bt_addr_le_t addr;
-	u8_t         sid;
+	uint8_t         sid;
 } __packed;
 
 #define BT_HCI_OP_LE_REM_DEV_FROM_PER_ADV_LIST  BT_OP(BT_OGF_LE, 0x0048)
 struct bt_hci_cp_le_rem_dev_from_per_adv_list {
 	bt_addr_le_t addr;
-	u8_t         sid;
+	uint8_t         sid;
 } __packed;
 
 #define BT_HCI_OP_LE_CLEAR_PER_ADV_LIST         BT_OP(BT_OGF_LE, 0x0049)
 
 #define BT_HCI_OP_LE_READ_PER_ADV_LIST_SIZE     BT_OP(BT_OGF_LE, 0x004a)
 struct bt_hci_rp_le_read_per_adv_list_size {
-	u8_t  status;
-	u8_t  list_size;
+	uint8_t  status;
+	uint8_t  list_size;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_TX_POWER              BT_OP(BT_OGF_LE, 0x004b)
 struct bt_hci_rp_le_read_tx_power {
-	u8_t  status;
-	s8_t  min_tx_power;
-	s8_t  max_tx_power;
+	uint8_t  status;
+	int8_t  min_tx_power;
+	int8_t  max_tx_power;
 } __packed;
 
 #define BT_HCI_OP_LE_READ_RF_PATH_COMP          BT_OP(BT_OGF_LE, 0x004c)
 struct bt_hci_rp_le_read_rf_path_comp {
-	u8_t  status;
-	s16_t tx_path_comp;
-	s16_t rx_path_comp;
+	uint8_t  status;
+	int16_t tx_path_comp;
+	int16_t rx_path_comp;
 } __packed;
 
 #define BT_HCI_OP_LE_WRITE_RF_PATH_COMP         BT_OP(BT_OGF_LE, 0x004d)
 struct bt_hci_cp_le_write_rf_path_comp {
-	s16_t  tx_path_comp;
-	s16_t  rx_path_comp;
+	int16_t  tx_path_comp;
+	int16_t  rx_path_comp;
 } __packed;
 
 #define BT_HCI_LE_PRIVACY_MODE_NETWORK          0x00
@@ -1255,7 +1255,7 @@ struct bt_hci_cp_le_write_rf_path_comp {
 #define BT_HCI_OP_LE_SET_PRIVACY_MODE           BT_OP(BT_OGF_LE, 0x004e)
 struct bt_hci_cp_le_set_privacy_mode {
 	bt_addr_le_t id_addr;
-	u8_t         mode;
+	uint8_t         mode;
 } __packed;
 
 /* Event definitions */
@@ -1265,95 +1265,95 @@ struct bt_hci_cp_le_set_privacy_mode {
 
 #define BT_HCI_EVT_INQUIRY_COMPLETE             0x01
 struct bt_hci_evt_inquiry_complete {
-	u8_t status;
+	uint8_t status;
 } __packed;
 
 #define BT_HCI_EVT_CONN_COMPLETE                0x03
 struct bt_hci_evt_conn_complete {
-	u8_t      status;
-	u16_t     handle;
+	uint8_t      status;
+	uint16_t     handle;
 	bt_addr_t bdaddr;
-	u8_t      link_type;
-	u8_t      encr_enabled;
+	uint8_t      link_type;
+	uint8_t      encr_enabled;
 } __packed;
 
 #define BT_HCI_EVT_CONN_REQUEST                 0x04
 struct bt_hci_evt_conn_request {
 	bt_addr_t bdaddr;
-	u8_t      dev_class[3];
-	u8_t      link_type;
+	uint8_t      dev_class[3];
+	uint8_t      link_type;
 } __packed;
 
 #define BT_HCI_EVT_DISCONN_COMPLETE             0x05
 struct bt_hci_evt_disconn_complete {
-	u8_t  status;
-	u16_t handle;
-	u8_t  reason;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  reason;
 } __packed;
 
 #define BT_HCI_EVT_AUTH_COMPLETE                0x06
 struct bt_hci_evt_auth_complete {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_EVT_REMOTE_NAME_REQ_COMPLETE     0x07
 struct bt_hci_evt_remote_name_req_complete {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
-	u8_t      name[248];
+	uint8_t      name[248];
 } __packed;
 
 #define BT_HCI_EVT_ENCRYPT_CHANGE               0x08
 struct bt_hci_evt_encrypt_change {
-	u8_t  status;
-	u16_t handle;
-	u8_t  encrypt;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  encrypt;
 } __packed;
 
 #define BT_HCI_EVT_REMOTE_FEATURES              0x0b
 struct bt_hci_evt_remote_features {
-	u8_t  status;
-	u16_t handle;
-	u8_t  features[8];
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_EVT_REMOTE_VERSION_INFO          0x0c
 struct bt_hci_evt_remote_version_info {
-	u8_t  status;
-	u16_t handle;
-	u8_t  version;
-	u16_t manufacturer;
-	u16_t subversion;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  version;
+	uint16_t manufacturer;
+	uint16_t subversion;
 } __packed;
 
 #define BT_HCI_EVT_CMD_COMPLETE                 0x0e
 struct bt_hci_evt_cmd_complete {
-	u8_t  ncmd;
-	u16_t opcode;
+	uint8_t  ncmd;
+	uint16_t opcode;
 } __packed;
 
 struct bt_hci_evt_cc_status {
-	u8_t  status;
+	uint8_t  status;
 } __packed;
 
 #define BT_HCI_EVT_CMD_STATUS                   0x0f
 struct bt_hci_evt_cmd_status {
-	u8_t  status;
-	u8_t  ncmd;
-	u16_t opcode;
+	uint8_t  status;
+	uint8_t  ncmd;
+	uint16_t opcode;
 } __packed;
 
 #define BT_HCI_EVT_ROLE_CHANGE                  0x12
 struct bt_hci_evt_role_change {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
-	u8_t      role;
+	uint8_t      role;
 } __packed;
 
 #define BT_HCI_EVT_NUM_COMPLETED_PACKETS        0x13
 struct bt_hci_evt_num_completed_packets {
-	u8_t  num_handles;
+	uint8_t  num_handles;
 	struct bt_hci_handle_count h[0];
 } __packed;
 
@@ -1381,8 +1381,8 @@ struct bt_hci_evt_link_key_req {
 #define BT_HCI_EVT_LINK_KEY_NOTIFY              0x18
 struct bt_hci_evt_link_key_notify {
 	bt_addr_t bdaddr;
-	u8_t      link_key[16];
-	u8_t      key_type;
+	uint8_t      link_key[16];
+	uint8_t      key_type;
 } __packed;
 
 /* Overflow link types */
@@ -1391,57 +1391,57 @@ struct bt_hci_evt_link_key_notify {
 
 #define BT_HCI_EVT_DATA_BUF_OVERFLOW            0x1a
 struct bt_hci_evt_data_buf_overflow {
-	u8_t      link_type;
+	uint8_t      link_type;
 } __packed;
 
 #define BT_HCI_EVT_INQUIRY_RESULT_WITH_RSSI     0x22
 struct bt_hci_evt_inquiry_result_with_rssi {
 	bt_addr_t addr;
-	u8_t      pscan_rep_mode;
-	u8_t      reserved;
-	u8_t      cod[3];
-	u16_t     clock_offset;
-	s8_t      rssi;
+	uint8_t      pscan_rep_mode;
+	uint8_t      reserved;
+	uint8_t      cod[3];
+	uint16_t     clock_offset;
+	int8_t      rssi;
 } __packed;
 
 #define BT_HCI_EVT_REMOTE_EXT_FEATURES          0x23
 struct bt_hci_evt_remote_ext_features {
-	u8_t  status;
-	u16_t handle;
-	u8_t  page;
-	u8_t  max_page;
-	u8_t  features[8];
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  page;
+	uint8_t  max_page;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_EVT_SYNC_CONN_COMPLETE           0x2c
 struct bt_hci_evt_sync_conn_complete {
-	u8_t      status;
-	u16_t     handle;
+	uint8_t      status;
+	uint16_t     handle;
 	bt_addr_t bdaddr;
-	u8_t      link_type;
-	u8_t      tx_interval;
-	u8_t      retansmission_window;
-	u16_t     rx_pkt_length;
-	u16_t     tx_pkt_length;
-	u8_t      air_mode;
+	uint8_t      link_type;
+	uint8_t      tx_interval;
+	uint8_t      retansmission_window;
+	uint16_t     rx_pkt_length;
+	uint16_t     tx_pkt_length;
+	uint8_t      air_mode;
 } __packed;
 
 #define BT_HCI_EVT_EXTENDED_INQUIRY_RESULT      0x2f
 struct bt_hci_evt_extended_inquiry_result {
-	u8_t      num_reports;
+	uint8_t      num_reports;
 	bt_addr_t addr;
-	u8_t      pscan_rep_mode;
-	u8_t      reserved;
-	u8_t      cod[3];
-	u16_t     clock_offset;
-	s8_t      rssi;
-	u8_t      eir[240];
+	uint8_t      pscan_rep_mode;
+	uint8_t      reserved;
+	uint8_t      cod[3];
+	uint16_t     clock_offset;
+	int8_t      rssi;
+	uint8_t      eir[240];
 } __packed;
 
 #define BT_HCI_EVT_ENCRYPT_KEY_REFRESH_COMPLETE 0x30
 struct bt_hci_evt_encrypt_key_refresh_complete {
-	u8_t  status;
-	u16_t handle;
+	uint8_t  status;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_EVT_IO_CAPA_REQ                  0x31
@@ -1452,15 +1452,15 @@ struct bt_hci_evt_io_capa_req {
 #define BT_HCI_EVT_IO_CAPA_RESP                 0x32
 struct bt_hci_evt_io_capa_resp {
 	bt_addr_t bdaddr;
-	u8_t      capability;
-	u8_t      oob_data;
-	u8_t      authentication;
+	uint8_t      capability;
+	uint8_t      oob_data;
+	uint8_t      authentication;
 } __packed;
 
 #define BT_HCI_EVT_USER_CONFIRM_REQ             0x33
 struct bt_hci_evt_user_confirm_req {
 	bt_addr_t bdaddr;
-	u32_t     passkey;
+	uint32_t     passkey;
 } __packed;
 
 #define BT_HCI_EVT_USER_PASSKEY_REQ             0x34
@@ -1470,24 +1470,24 @@ struct bt_hci_evt_user_passkey_req {
 
 #define BT_HCI_EVT_SSP_COMPLETE                 0x36
 struct bt_hci_evt_ssp_complete {
-	u8_t      status;
+	uint8_t      status;
 	bt_addr_t bdaddr;
 } __packed;
 
 #define BT_HCI_EVT_USER_PASSKEY_NOTIFY          0x3b
 struct bt_hci_evt_user_passkey_notify {
 	bt_addr_t bdaddr;
-	u32_t     passkey;
+	uint32_t     passkey;
 } __packed;
 
 #define BT_HCI_EVT_LE_META_EVENT                0x3e
 struct bt_hci_evt_le_meta_event {
-	u8_t  subevent;
+	uint8_t  subevent;
 } __packed;
 
 #define BT_HCI_EVT_AUTH_PAYLOAD_TIMEOUT_EXP     0x57
 struct bt_hci_evt_auth_payload_timeout_exp {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_ROLE_MASTER                      0x00
@@ -1495,113 +1495,113 @@ struct bt_hci_evt_auth_payload_timeout_exp {
 
 #define BT_HCI_EVT_LE_CONN_COMPLETE             0x01
 struct bt_hci_evt_le_conn_complete {
-	u8_t         status;
-	u16_t        handle;
-	u8_t         role;
+	uint8_t         status;
+	uint16_t        handle;
+	uint8_t         role;
 	bt_addr_le_t peer_addr;
-	u16_t        interval;
-	u16_t        latency;
-	u16_t        supv_timeout;
-	u8_t         clock_accuracy;
+	uint16_t        interval;
+	uint16_t        latency;
+	uint16_t        supv_timeout;
+	uint8_t         clock_accuracy;
 } __packed;
 
 #define BT_HCI_EVT_LE_ADVERTISING_REPORT        0x02
 struct bt_hci_evt_le_advertising_info {
-	u8_t         evt_type;
+	uint8_t         evt_type;
 	bt_addr_le_t addr;
-	u8_t         length;
-	u8_t         data[0];
+	uint8_t         length;
+	uint8_t         data[0];
 } __packed;
 struct bt_hci_evt_le_advertising_report {
-	u8_t num_reports;
+	uint8_t num_reports;
 	struct bt_hci_evt_le_advertising_info adv_info[0];
 } __packed;
 
 #define BT_HCI_EVT_LE_CONN_UPDATE_COMPLETE      0x03
 struct bt_hci_evt_le_conn_update_complete {
-	u8_t  status;
-	u16_t handle;
-	u16_t interval;
-	u16_t latency;
-	u16_t supv_timeout;
+	uint8_t  status;
+	uint16_t handle;
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t supv_timeout;
 } __packed;
 
 #define BT_HCI_EV_LE_REMOTE_FEAT_COMPLETE       0x04
 struct bt_hci_evt_le_remote_feat_complete {
-	u8_t  status;
-	u16_t handle;
-	u8_t  features[8];
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_EVT_LE_LTK_REQUEST               0x05
 struct bt_hci_evt_le_ltk_request {
-	u16_t handle;
-	u64_t rand;
-	u16_t ediv;
+	uint16_t handle;
+	uint64_t rand;
+	uint16_t ediv;
 } __packed;
 
 #define BT_HCI_EVT_LE_CONN_PARAM_REQ            0x06
 struct bt_hci_evt_le_conn_param_req {
-	u16_t handle;
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
+	uint16_t handle;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
 } __packed;
 
 #define BT_HCI_EVT_LE_DATA_LEN_CHANGE           0x07
 struct bt_hci_evt_le_data_len_change {
-	u16_t handle;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
-	u16_t max_rx_octets;
-	u16_t max_rx_time;
+	uint16_t handle;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
+	uint16_t max_rx_octets;
+	uint16_t max_rx_time;
 } __packed;
 
 #define BT_HCI_EVT_LE_P256_PUBLIC_KEY_COMPLETE  0x08
 struct bt_hci_evt_le_p256_public_key_complete {
-	u8_t status;
-	u8_t key[64];
+	uint8_t status;
+	uint8_t key[64];
 } __packed;
 
 #define BT_HCI_EVT_LE_GENERATE_DHKEY_COMPLETE   0x09
 struct bt_hci_evt_le_generate_dhkey_complete {
-	u8_t status;
-	u8_t dhkey[32];
+	uint8_t status;
+	uint8_t dhkey[32];
 } __packed;
 
 #define BT_HCI_EVT_LE_ENH_CONN_COMPLETE         0x0a
 struct bt_hci_evt_le_enh_conn_complete {
-	u8_t         status;
-	u16_t        handle;
-	u8_t         role;
+	uint8_t         status;
+	uint16_t        handle;
+	uint8_t         role;
 	bt_addr_le_t peer_addr;
 	bt_addr_t    local_rpa;
 	bt_addr_t    peer_rpa;
-	u16_t        interval;
-	u16_t        latency;
-	u16_t        supv_timeout;
-	u8_t         clock_accuracy;
+	uint16_t        interval;
+	uint16_t        latency;
+	uint16_t        supv_timeout;
+	uint8_t         clock_accuracy;
 } __packed;
 
 #define BT_HCI_EVT_LE_DIRECT_ADV_REPORT         0x0b
 struct bt_hci_evt_le_direct_adv_info {
-	u8_t         evt_type;
+	uint8_t         evt_type;
 	bt_addr_le_t addr;
 	bt_addr_le_t dir_addr;
-	s8_t         rssi;
+	int8_t         rssi;
 } __packed;
 struct bt_hci_evt_le_direct_adv_report {
-	u8_t num_reports;
+	uint8_t num_reports;
 	struct bt_hci_evt_le_direct_adv_info direct_adv_info[0];
 } __packed;
 
 #define BT_HCI_EVT_LE_PHY_UPDATE_COMPLETE       0x0c
 struct bt_hci_evt_le_phy_update_complete {
-	u8_t  status;
-	u16_t handle;
-	u8_t  tx_phy;
-	u8_t  rx_phy;
+	uint8_t  status;
+	uint16_t handle;
+	uint8_t  tx_phy;
+	uint8_t  rx_phy;
 } __packed;
 
 #define BT_HCI_EVT_LE_EXT_ADVERTISING_REPORT    0x0d
@@ -1618,63 +1618,63 @@ struct bt_hci_evt_le_phy_update_complete {
 #define BT_HCI_LE_ADV_EVT_TYPE_DATA_STATUS_INCOMPLETE 2
 
 struct bt_hci_evt_le_ext_advertising_info {
-	u16_t        evt_type;
+	uint16_t        evt_type;
 	bt_addr_le_t addr;
-	u8_t         prim_phy;
-	u8_t         sec_phy;
-	u8_t         sid;
-	s8_t         tx_power;
-	s8_t         rssi;
-	u16_t        interval;
+	uint8_t         prim_phy;
+	uint8_t         sec_phy;
+	uint8_t         sid;
+	int8_t         tx_power;
+	int8_t         rssi;
+	uint16_t        interval;
 	bt_addr_le_t direct_addr;
-	u8_t         length;
-	u8_t         data[0];
+	uint8_t         length;
+	uint8_t         data[0];
 } __packed;
 struct bt_hci_evt_le_ext_advertising_report {
-	u8_t num_reports;
+	uint8_t num_reports;
 	struct bt_hci_evt_le_ext_advertising_info adv_info[0];
 } __packed;
 
 #define BT_HCI_EVT_LE_PER_ADV_SYNC_ESTABLISHED  0x0e
 struct bt_hci_evt_le_per_adv_sync_established {
-	u8_t         status;
-	u16_t        handle;
-	u8_t         sid;
+	uint8_t         status;
+	uint16_t        handle;
+	uint8_t         sid;
 	bt_addr_le_t adv_addr;
-	u8_t         phy;
-	u16_t        interval;
-	u8_t         clock_accuracy;
+	uint8_t         phy;
+	uint16_t        interval;
+	uint8_t         clock_accuracy;
 } __packed;
 
 #define BT_HCI_EVT_LE_PER_ADVERTISING_REPORT    0x0f
 struct bt_hci_evt_le_per_advertising_report {
-	u16_t handle;
-	s8_t  tx_power;
-	s8_t  rssi;
-	u8_t  unused;
-	u8_t  data_status;
-	u8_t  length;
-	u8_t  data[0];
+	uint16_t handle;
+	int8_t  tx_power;
+	int8_t  rssi;
+	uint8_t  unused;
+	uint8_t  data_status;
+	uint8_t  length;
+	uint8_t  data[0];
 } __packed;
 
 #define BT_HCI_EVT_LE_PER_ADV_SYNC_LOST         0x10
 struct bt_hci_evt_le_per_adv_sync_lost {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 #define BT_HCI_EVT_LE_SCAN_TIMEOUT              0x11
 
 #define BT_HCI_EVT_LE_ADV_SET_TERMINATED        0x12
 struct bt_hci_evt_le_adv_set_terminated {
-	u8_t  status;
-	u8_t  adv_handle;
-	u16_t conn_handle;
-	u8_t  num_completed_ext_adv_evts;
+	uint8_t  status;
+	uint8_t  adv_handle;
+	uint16_t conn_handle;
+	uint8_t  num_completed_ext_adv_evts;
 } __packed;
 
 #define BT_HCI_EVT_LE_SCAN_REQ_RECEIVED         0x13
 struct bt_hci_evt_le_scan_req_received {
-	u8_t         handle;
+	uint8_t         handle;
 	bt_addr_le_t addr;
 } __packed;
 
@@ -1683,8 +1683,8 @@ struct bt_hci_evt_le_scan_req_received {
 
 #define BT_HCI_EVT_LE_CHAN_SEL_ALGO             0x14
 struct bt_hci_evt_le_chan_sel_algo {
-	u16_t handle;
-	u8_t  chan_sel_algo;
+	uint16_t handle;
+	uint8_t  chan_sel_algo;
 } __packed;
 
 /* Event mask bits */
@@ -1779,7 +1779,7 @@ struct bt_hci_evt_le_chan_sel_algo {
   *
   * @return Newly allocated buffer.
   */
-struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len);
+struct net_buf *bt_hci_cmd_create(uint16_t opcode, uint8_t param_len);
 
 /** Send a HCI command asynchronously.
   *
@@ -1798,7 +1798,7 @@ struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len);
   *
   * @return 0 on success or negative error value on failure.
   */
-int bt_hci_cmd_send(u16_t opcode, struct net_buf *buf);
+int bt_hci_cmd_send(uint16_t opcode, struct net_buf *buf);
 
 /** Send a HCI command synchronously.
   *
@@ -1823,7 +1823,7 @@ int bt_hci_cmd_send(u16_t opcode, struct net_buf *buf);
   *
   * @return 0 on success or negative error value on failure.
   */
-int bt_hci_cmd_send_sync(u16_t opcode, struct net_buf *buf,
+int bt_hci_cmd_send_sync(uint16_t opcode, struct net_buf *buf,
 			 struct net_buf **rsp);
 
 /** @brief Get connection handle for a connection.
@@ -1833,7 +1833,7 @@ int bt_hci_cmd_send_sync(u16_t opcode, struct net_buf *buf,
  *
  * @return 0 on success or negative error value on failure.
  */
-int bt_hci_get_conn_handle(const struct bt_conn *conn, u16_t *conn_handle);
+int bt_hci_get_conn_handle(const struct bt_conn *conn, uint16_t *conn_handle);
 
 /** @typedef bt_hci_vnd_evt_cb_t
   * @brief Callback type for vendor handling of HCI Vendor-Specific Events.
diff --git a/include/bluetooth/hci_raw.h b/include/bluetooth/hci_raw.h
index d40fa6254b..030fb0ca3c 100644
--- a/include/bluetooth/hci_raw.h
+++ b/include/bluetooth/hci_raw.h
@@ -74,7 +74,7 @@ enum {
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_hci_raw_set_mode(u8_t mode);
+int bt_hci_raw_set_mode(uint8_t mode);
 
 /** @brief Get Bluetooth RAW channel mode
  *
@@ -82,7 +82,7 @@ int bt_hci_raw_set_mode(u8_t mode);
  *
  *  @return Access mode.
  */
-u8_t bt_hci_raw_get_mode(void);
+uint8_t bt_hci_raw_get_mode(void);
 
 #define BT_HCI_ERR_EXT_HANDLED  0xff
 
@@ -101,7 +101,7 @@ u8_t bt_hci_raw_get_mode(void);
 
 struct bt_hci_raw_cmd_ext {
 	/** Opcode of the command */
-	u16_t  op;
+	uint16_t  op;
 
 	/** Minimal length of the command */
 	size_t min_len;
@@ -117,7 +117,7 @@ struct bt_hci_raw_cmd_ext {
 	 *  BT_HCI_ERR_SUCCESS which just indicates that the command can be
 	 *  sent to the controller to be processed.
 	 */
-	u8_t   (*func)(struct net_buf *buf);
+	uint8_t   (*func)(struct net_buf *buf);
 };
 
 /** @brief Register Bluetooth RAW command extension table
diff --git a/include/bluetooth/hci_vs.h b/include/bluetooth/hci_vs.h
index d8c89ee9a9..e4f94b6a83 100644
--- a/include/bluetooth/hci_vs.h
+++ b/include/bluetooth/hci_vs.h
@@ -52,37 +52,37 @@ extern "C" {
 #define BT_HCI_VS_FW_VAR_RESCUE_IMG             0x0004
 #define BT_HCI_OP_VS_READ_VERSION_INFO		BT_OP(BT_OGF_VS, 0x0001)
 struct bt_hci_rp_vs_read_version_info {
-	u8_t  status;
-	u16_t hw_platform;
-	u16_t hw_variant;
-	u8_t  fw_variant;
-	u8_t  fw_version;
-	u16_t fw_revision;
-	u32_t fw_build;
+	uint8_t  status;
+	uint16_t hw_platform;
+	uint16_t hw_variant;
+	uint8_t  fw_variant;
+	uint8_t  fw_version;
+	uint16_t fw_revision;
+	uint32_t fw_build;
 } __packed;
 
 #define BT_HCI_OP_VS_READ_SUPPORTED_COMMANDS	BT_OP(BT_OGF_VS, 0x0002)
 struct bt_hci_rp_vs_read_supported_commands {
-	u8_t  status;
-	u8_t  commands[64];
+	uint8_t  status;
+	uint8_t  commands[64];
 } __packed;
 
 #define BT_HCI_OP_VS_READ_SUPPORTED_FEATURES	BT_OP(BT_OGF_VS, 0x0003)
 struct bt_hci_rp_vs_read_supported_features {
-	u8_t  status;
-	u8_t  features[8];
+	uint8_t  status;
+	uint8_t  features[8];
 } __packed;
 
 #define BT_HCI_OP_VS_SET_EVENT_MASK             BT_OP(BT_OGF_VS, 0x0004)
 struct bt_hci_cp_vs_set_event_mask {
-	u8_t  event_mask[8];
+	uint8_t  event_mask[8];
 } __packed;
 
 #define BT_HCI_VS_RESET_SOFT                    0x00
 #define BT_HCI_VS_RESET_HARD                    0x01
 #define BT_HCI_OP_VS_RESET                      BT_OP(BT_OGF_VS, 0x0005)
 struct bt_hci_cp_vs_reset {
-	u8_t  type;
+	uint8_t  type;
 } __packed;
 
 #define BT_HCI_OP_VS_WRITE_BD_ADDR              BT_OP(BT_OGF_VS, 0x0006)
@@ -97,52 +97,52 @@ struct bt_hci_cp_vs_write_bd_addr {
 #define BT_HCI_VS_TRACE_VDC                     0x01
 #define BT_HCI_OP_VS_SET_TRACE_ENABLE           BT_OP(BT_OGF_VS, 0x0007)
 struct bt_hci_cp_vs_set_trace_enable {
-	u8_t  enable;
-	u8_t  type;
+	uint8_t  enable;
+	uint8_t  type;
 } __packed;
 
 #define BT_HCI_OP_VS_READ_BUILD_INFO            BT_OP(BT_OGF_VS, 0x0008)
 struct bt_hci_rp_vs_read_build_info {
-	u8_t  status;
-	u8_t  info[0];
+	uint8_t  status;
+	uint8_t  info[0];
 } __packed;
 
 struct bt_hci_vs_static_addr {
 	bt_addr_t bdaddr;
-	u8_t      ir[16];
+	uint8_t      ir[16];
 } __packed;
 
 #define BT_HCI_OP_VS_READ_STATIC_ADDRS          BT_OP(BT_OGF_VS, 0x0009)
 struct bt_hci_rp_vs_read_static_addrs {
-	u8_t   status;
-	u8_t   num_addrs;
+	uint8_t   status;
+	uint8_t   num_addrs;
 	struct bt_hci_vs_static_addr a[0];
 } __packed;
 
 #define BT_HCI_OP_VS_READ_KEY_HIERARCHY_ROOTS   BT_OP(BT_OGF_VS, 0x000a)
 struct bt_hci_rp_vs_read_key_hierarchy_roots {
-	u8_t  status;
-	u8_t  ir[16];
-	u8_t  er[16];
+	uint8_t  status;
+	uint8_t  ir[16];
+	uint8_t  er[16];
 } __packed;
 
 #define BT_HCI_OP_VS_READ_CHIP_TEMP             BT_OP(BT_OGF_VS, 0x000b)
 struct bt_hci_rp_vs_read_chip_temp {
-	u8_t  status;
-	s8_t  temps;
+	uint8_t  status;
+	int8_t  temps;
 } __packed;
 
 struct bt_hci_vs_cmd {
-	u16_t vendor_id;
-	u16_t opcode_base;
+	uint16_t vendor_id;
+	uint16_t opcode_base;
 } __packed;
 
 #define BT_HCI_VS_VID_ANDROID                   0x0001
 #define BT_HCI_VS_VID_MICROSOFT                 0x0002
 #define BT_HCI_OP_VS_READ_HOST_STACK_CMDS       BT_OP(BT_OGF_VS, 0x000c)
 struct bt_hci_rp_vs_read_host_stack_cmds {
-	u8_t   status;
-	u8_t   num_cmds;
+	uint8_t   status;
+	uint8_t   num_cmds;
 	struct bt_hci_vs_cmd c[0];
 } __packed;
 
@@ -150,7 +150,7 @@ struct bt_hci_rp_vs_read_host_stack_cmds {
 #define BT_HCI_VS_SCAN_REQ_REPORTS_ENABLED      0x01
 #define BT_HCI_OP_VS_SET_SCAN_REQ_REPORTS       BT_OP(BT_OGF_VS, 0x000d)
 struct bt_hci_cp_vs_set_scan_req_reports {
-	u8_t  enable;
+	uint8_t  enable;
 } __packed;
 
 #define BT_HCI_VS_LL_HANDLE_TYPE_ADV       0x00
@@ -159,37 +159,37 @@ struct bt_hci_cp_vs_set_scan_req_reports {
 #define BT_HCI_VS_LL_TX_POWER_LEVEL_NO_PREF     0x7F
 #define BT_HCI_OP_VS_WRITE_TX_POWER_LEVEL       BT_OP(BT_OGF_VS, 0x000e)
 struct bt_hci_cp_vs_write_tx_power_level {
-	u8_t  handle_type;
-	u16_t handle;
-	s8_t  tx_power_level;
+	uint8_t  handle_type;
+	uint16_t handle;
+	int8_t  tx_power_level;
 } __packed;
 
 struct bt_hci_rp_vs_write_tx_power_level {
-	u8_t  status;
-	u8_t  handle_type;
-	u16_t handle;
-	s8_t  selected_tx_power;
+	uint8_t  status;
+	uint8_t  handle_type;
+	uint16_t handle;
+	int8_t  selected_tx_power;
 } __packed;
 
 #define BT_HCI_OP_VS_READ_TX_POWER_LEVEL        BT_OP(BT_OGF_VS, 0x000f)
 struct bt_hci_cp_vs_read_tx_power_level {
-	u8_t  handle_type;
-	u16_t handle;
+	uint8_t  handle_type;
+	uint16_t handle;
 } __packed;
 
 struct bt_hci_rp_vs_read_tx_power_level {
-	u8_t  status;
-	u8_t  handle_type;
-	u16_t handle;
-	s8_t  tx_power_level;
+	uint8_t  status;
+	uint8_t  handle_type;
+	uint16_t handle;
+	int8_t  tx_power_level;
 } __packed;
 
 #define BT_HCI_OP_VS_READ_USB_TRANSPORT_MODE    BT_OP(BT_OGF_VS, 0x0010)
 
 struct bt_hci_rp_vs_read_usb_transport_mode {
-	u8_t  status;
-	u8_t  num_supported_modes;
-	u8_t  supported_mode[0];
+	uint8_t  status;
+	uint8_t  num_supported_modes;
+	uint8_t  supported_mode[0];
 } __packed;
 
 #define BT_HCI_VS_USB_H2_MODE                  0x00
@@ -198,19 +198,19 @@ struct bt_hci_rp_vs_read_usb_transport_mode {
 #define BT_HCI_OP_VS_SET_USB_TRANSPORT_MODE    BT_OP(BT_OGF_VS, 0x0011)
 
 struct bt_hci_cp_vs_set_usb_transport_mode {
-	u8_t  mode;
+	uint8_t  mode;
 } __packed;
 
 /* Events */
 
 struct bt_hci_evt_vs {
-	u8_t  subevent;
+	uint8_t  subevent;
 } __packed;
 
 #define BT_HCI_EVT_VS_FATAL_ERROR              0x02
 struct bt_hci_evt_vs_fatal_error {
-	u64_t pc;
-	u8_t  err_info[0];
+	uint64_t pc;
+	uint8_t  err_info[0];
 } __packed;
 
 #define BT_HCI_VS_TRACE_LMP_TX                 0x01
@@ -220,14 +220,14 @@ struct bt_hci_evt_vs_fatal_error {
 #define BT_HCI_VS_TRACE_LE_CONN_IND            0x05
 #define BT_HCI_EVT_VS_TRACE_INFO               0x03
 struct bt_hci_evt_vs_trace_info {
-	u8_t  type;
-	u8_t  data[0];
+	uint8_t  type;
+	uint8_t  data[0];
 } __packed;
 
 #define BT_HCI_EVT_VS_SCAN_REQ_RX              0x04
 struct bt_hci_evt_vs_scan_req_rx {
 	bt_addr_le_t addr;
-	s8_t         rssi;
+	int8_t         rssi;
 } __packed;
 
 /* Event mask bits */
@@ -243,132 +243,132 @@ struct bt_hci_evt_vs_scan_req_rx {
 #define BT_HCI_MESH_EVT_PREFIX                 0xF0
 
 struct bt_hci_cp_mesh {
-	u8_t         opcode;
+	uint8_t         opcode;
 } __packed;
 
 #define BT_HCI_OC_MESH_GET_OPTS                0x00
 struct bt_hci_rp_mesh_get_opts {
-	u8_t      status;
-	u8_t      opcode;
-	u8_t      revision;
-	u8_t      ch_map;
-	s8_t      min_tx_power;
-	s8_t      max_tx_power;
-	u8_t      max_scan_filter;
-	u8_t      max_filter_pattern;
-	u8_t      max_adv_slot;
-	u8_t      max_tx_window;
-	u8_t      evt_prefix_len;
-	u8_t      evt_prefix;
+	uint8_t      status;
+	uint8_t      opcode;
+	uint8_t      revision;
+	uint8_t      ch_map;
+	int8_t      min_tx_power;
+	int8_t      max_tx_power;
+	uint8_t      max_scan_filter;
+	uint8_t      max_filter_pattern;
+	uint8_t      max_adv_slot;
+	uint8_t      max_tx_window;
+	uint8_t      evt_prefix_len;
+	uint8_t      evt_prefix;
 } __packed;
 
 #define BT_HCI_MESH_PATTERN_LEN_MAX            0x0f
 
 #define BT_HCI_OC_MESH_SET_SCAN_FILTER         0x01
 struct bt_hci_mesh_pattern {
-	u8_t pattern_len;
-	u8_t pattern[0];
+	uint8_t pattern_len;
+	uint8_t pattern[0];
 } __packed;
 
 struct bt_hci_cp_mesh_set_scan_filter {
-	u8_t      scan_filter;
-	u8_t      filter_dup;
-	u8_t      num_patterns;
+	uint8_t      scan_filter;
+	uint8_t      filter_dup;
+	uint8_t      num_patterns;
 	struct    bt_hci_mesh_pattern patterns[0];
 } __packed;
 struct bt_hci_rp_mesh_set_scan_filter {
-	u8_t      status;
-	u8_t      opcode;
-	u8_t      scan_filter;
+	uint8_t      status;
+	uint8_t      opcode;
+	uint8_t      scan_filter;
 } __packed;
 
 #define BT_HCI_OC_MESH_ADVERTISE               0x02
 struct bt_hci_cp_mesh_advertise {
-	u8_t      adv_slot;
-	u8_t      own_addr_type;
+	uint8_t      adv_slot;
+	uint8_t      own_addr_type;
 	bt_addr_t random_addr;
-	u8_t      ch_map;
-	s8_t      tx_power;
-	u8_t      min_tx_delay;
-	u8_t      max_tx_delay;
-	u8_t      retx_count;
-	u8_t      retx_interval;
-	u8_t      scan_delay;
-	u16_t     scan_duration;
-	u8_t      scan_filter;
-	u8_t      data_len;
-	u8_t      data[31];
+	uint8_t      ch_map;
+	int8_t      tx_power;
+	uint8_t      min_tx_delay;
+	uint8_t      max_tx_delay;
+	uint8_t      retx_count;
+	uint8_t      retx_interval;
+	uint8_t      scan_delay;
+	uint16_t     scan_duration;
+	uint8_t      scan_filter;
+	uint8_t      data_len;
+	uint8_t      data[31];
 } __packed;
 struct bt_hci_rp_mesh_advertise {
-	u8_t      status;
-	u8_t      opcode;
-	u8_t      adv_slot;
+	uint8_t      status;
+	uint8_t      opcode;
+	uint8_t      adv_slot;
 } __packed;
 
 #define BT_HCI_OC_MESH_ADVERTISE_TIMED         0x03
 struct bt_hci_cp_mesh_advertise_timed {
-	u8_t      adv_slot;
-	u8_t      own_addr_type;
+	uint8_t      adv_slot;
+	uint8_t      own_addr_type;
 	bt_addr_t random_addr;
-	u8_t      ch_map;
-	s8_t      tx_power;
-	u8_t      retx_count;
-	u8_t      retx_interval;
-	u32_t     instant;
-	u16_t     tx_delay;
-	u16_t     tx_window;
-	u8_t      data_len;
-	u8_t      data[31];
+	uint8_t      ch_map;
+	int8_t      tx_power;
+	uint8_t      retx_count;
+	uint8_t      retx_interval;
+	uint32_t     instant;
+	uint16_t     tx_delay;
+	uint16_t     tx_window;
+	uint8_t      data_len;
+	uint8_t      data[31];
 } __packed;
 struct bt_hci_rp_mesh_advertise_timed {
-	u8_t      status;
-	u8_t      opcode;
-	u8_t      adv_slot;
+	uint8_t      status;
+	uint8_t      opcode;
+	uint8_t      adv_slot;
 } __packed;
 
 #define BT_HCI_OC_MESH_ADVERTISE_CANCEL        0x04
 struct bt_hci_cp_mesh_advertise_cancel {
-	u8_t      adv_slot;
+	uint8_t      adv_slot;
 } __packed;
 struct bt_hci_rp_mesh_advertise_cancel {
-	u8_t      status;
-	u8_t      opcode;
-	u8_t      adv_slot;
+	uint8_t      status;
+	uint8_t      opcode;
+	uint8_t      adv_slot;
 } __packed;
 
 #define BT_HCI_OC_MESH_SET_SCANNING            0x05
 struct bt_hci_cp_mesh_set_scanning {
-	u8_t      enable;
-	u8_t      ch_map;
-	u8_t      scan_filter;
+	uint8_t      enable;
+	uint8_t      ch_map;
+	uint8_t      scan_filter;
 } __packed;
 struct bt_hci_rp_mesh_set_scanning {
-	u8_t      status;
-	u8_t      opcode;
+	uint8_t      status;
+	uint8_t      opcode;
 } __packed;
 
 /* Events */
 struct bt_hci_evt_mesh {
-	u8_t  prefix;
-	u8_t  subevent;
+	uint8_t  prefix;
+	uint8_t  subevent;
 } __packed;
 
 #define BT_HCI_EVT_MESH_ADV_COMPLETE           0x00
 struct bt_hci_evt_mesh_adv_complete {
-	u8_t         adv_slot;
+	uint8_t         adv_slot;
 } __packed;
 
 #define BT_HCI_EVT_MESH_SCANNING_REPORT        0x01
 struct bt_hci_evt_mesh_scan_report {
 	bt_addr_le_t addr;
-	u8_t         chan;
-	s8_t         rssi;
-	u32_t        instant;
-	u8_t         data_len;
-	u8_t         data[0];
+	uint8_t         chan;
+	int8_t         rssi;
+	uint32_t        instant;
+	uint8_t         data_len;
+	uint8_t         data[0];
 } __packed;
 struct bt_hci_evt_mesh_scanning_report {
-	u8_t num_reports;
+	uint8_t num_reports;
 	struct bt_hci_evt_mesh_scan_report reports[0];
 } __packed;
 
diff --git a/include/bluetooth/hfp_hf.h b/include/bluetooth/hfp_hf.h
index 1ae0567ba0..1925fcc9b0 100644
--- a/include/bluetooth/hfp_hf.h
+++ b/include/bluetooth/hfp_hf.h
@@ -40,9 +40,9 @@ enum bt_hfp_hf_at_cmd {
 /** @brief HFP HF Command completion field */
 struct bt_hfp_hf_cmd_complete {
 	/* Command complete status */
-	u8_t type;
+	uint8_t type;
 	/* CME error number to be added */
-	u8_t cme;
+	uint8_t cme;
 };
 
 /** @brief HFP profile application callback */
@@ -71,7 +71,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value service indicator value received from the AG.
 	 */
-	void (*service)(struct bt_conn *conn, u32_t value);
+	void (*service)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides call indicator value to the application
@@ -79,7 +79,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value call indicator value received from the AG.
 	 */
-	void (*call)(struct bt_conn *conn, u32_t value);
+	void (*call)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides call setup indicator value to the application
@@ -87,7 +87,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value call setup indicator value received from the AG.
 	 */
-	void (*call_setup)(struct bt_conn *conn, u32_t value);
+	void (*call_setup)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides call held indicator value to the application
@@ -95,7 +95,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value call held indicator value received from the AG.
 	 */
-	void (*call_held)(struct bt_conn *conn, u32_t value);
+	void (*call_held)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides signal indicator value to the application
@@ -103,7 +103,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value signal indicator value received from the AG.
 	 */
-	void (*signal)(struct bt_conn *conn, u32_t value);
+	void (*signal)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback provides roaming indicator value to the application
@@ -111,7 +111,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value roaming indicator value received from the AG.
 	 */
-	void (*roam)(struct bt_conn *conn, u32_t value);
+	void (*roam)(struct bt_conn *conn, uint32_t value);
 	/** HF indicator Callback
 	 *
 	 *  This callback battery service indicator value to the application
@@ -119,7 +119,7 @@ struct bt_hfp_hf_cb {
 	 *  @param conn Connection object.
 	 *  @param value battery indicator value received from the AG.
 	 */
-	void (*battery)(struct bt_conn *conn, u32_t value);
+	void (*battery)(struct bt_conn *conn, uint32_t value);
 	/** HF incoming call Ring indication callback to application
 	 *
 	 *  If this callback is provided it will be called whenever there
diff --git a/include/bluetooth/l2cap.h b/include/bluetooth/l2cap.h
index a43c74e15a..dd198ea430 100644
--- a/include/bluetooth/l2cap.h
+++ b/include/bluetooth/l2cap.h
@@ -104,9 +104,9 @@ struct bt_l2cap_chan {
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
 	bt_l2cap_chan_state_t		state;
 	/** Remote PSM to be connected */
-	u16_t				psm;
+	uint16_t				psm;
 	/** Helps match request context during CoC */
-	u8_t				ident;
+	uint8_t				ident;
 	bt_security_t			required_sec_level;
 #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
 };
@@ -114,13 +114,13 @@ struct bt_l2cap_chan {
 /** @brief LE L2CAP Endpoint structure. */
 struct bt_l2cap_le_endpoint {
 	/** Endpoint CID */
-	u16_t				cid;
+	uint16_t				cid;
 	/** Endpoint Maximum Transmission Unit */
-	u16_t				mtu;
+	uint16_t				mtu;
 	/** Endpoint Maximum PDU payload Size */
-	u16_t				mps;
+	uint16_t				mps;
 	/** Endpoint initial credits */
-	u16_t				init_credits;
+	uint16_t				init_credits;
 	/** Endpoint credits */
 	atomic_t			credits;
 };
@@ -141,7 +141,7 @@ struct bt_l2cap_le_chan {
 	struct k_work			tx_work;
 	/** Segment SDU packet from upper layer */
 	struct net_buf			*_sdu;
-	u16_t				_sdu_len;
+	uint16_t				_sdu_len;
 
 	struct k_work			rx_work;
 	struct k_fifo			rx_queue;
@@ -161,9 +161,9 @@ struct bt_l2cap_le_chan {
 /** @brief BREDR L2CAP Endpoint structure. */
 struct bt_l2cap_br_endpoint {
 	/** Endpoint CID */
-	u16_t				cid;
+	uint16_t				cid;
 	/** Endpoint Maximum Transmission Unit */
-	u16_t				mtu;
+	uint16_t				mtu;
 };
 
 /** @brief BREDR L2CAP Channel structure. */
@@ -214,7 +214,7 @@ struct bt_l2cap_chan_ops {
 	 *  by HCI layer and set to 0 when success and to non-zero (reference to
 	 *  HCI Error Codes) when security/authentication failed.
 	 */
-	void (*encrypt_change)(struct bt_l2cap_chan *chan, u8_t hci_status);
+	void (*encrypt_change)(struct bt_l2cap_chan *chan, uint8_t hci_status);
 
 	/** @brief Channel alloc_buf callback
 	 *
@@ -289,7 +289,7 @@ struct bt_l2cap_server {
 	 *                  recommended however), or auto-allocated by the
 	 *                  stack if the app gave 0 as the value.
 	 */
-	u16_t			psm;
+	uint16_t			psm;
 
 	/** Required minimim security level */
 	bt_security_t		sec_level;
@@ -358,7 +358,7 @@ int bt_l2cap_br_server_register(struct bt_l2cap_server *server);
  *  @return 0 in case of success or negative value in case of error.
  */
 int bt_l2cap_ecred_chan_connect(struct bt_conn *conn,
-				struct bt_l2cap_chan **chans, u16_t psm);
+				struct bt_l2cap_chan **chans, uint16_t psm);
 
 /** @brief Connect L2CAP channel
  *
@@ -379,7 +379,7 @@ int bt_l2cap_ecred_chan_connect(struct bt_conn *conn,
  *  @return 0 in case of success or negative value in case of error.
  */
 int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			  u16_t psm);
+			  uint16_t psm);
 
 /** @brief Disconnect L2CAP channel
  *
diff --git a/include/bluetooth/mesh/access.h b/include/bluetooth/mesh/access.h
index d89a78dd34..e59cc5d482 100644
--- a/include/bluetooth/mesh/access.h
+++ b/include/bluetooth/mesh/access.h
@@ -59,14 +59,14 @@ extern "C" {
 /** Abstraction that describes a Mesh Element */
 struct bt_mesh_elem {
 	/** Unicast Address. Set at runtime during provisioning. */
-	u16_t addr;
+	uint16_t addr;
 
 	/** Location Descriptor (GATT Bluetooth Namespace Descriptors) */
-	const u16_t loc;
+	const uint16_t loc;
 	/** The number of SIG models in this element */
-	const u8_t model_count;
+	const uint8_t model_count;
 	/** The number of vendor models in this element */
-	const u8_t vnd_model_count;
+	const uint8_t vnd_model_count;
 
 	/** The list of SIG models in this element */
 	struct bt_mesh_model * const models;
@@ -137,34 +137,34 @@ struct bt_mesh_elem {
 /** Message sending context. */
 struct bt_mesh_msg_ctx {
 	/** NetKey Index of the subnet to send the message on. */
-	u16_t net_idx;
+	uint16_t net_idx;
 
 	/** AppKey Index to encrypt the message with. */
-	u16_t app_idx;
+	uint16_t app_idx;
 
 	/** Remote address. */
-	u16_t addr;
+	uint16_t addr;
 
 	/** Destination address of a received message. Not used for sending. */
-	u16_t recv_dst;
+	uint16_t recv_dst;
 
 	/** RSSI of received packet. Not used for sending. */
-	s8_t  recv_rssi;
+	int8_t  recv_rssi;
 
 	/** Received TTL value. Not used for sending. */
-	u8_t  recv_ttl;
+	uint8_t  recv_ttl;
 
 	/** Force sending reliably by using segment acknowledgement */
 	bool  send_rel;
 
 	/** TTL, or BT_MESH_TTL_DEFAULT for default TTL. */
-	u8_t  send_ttl;
+	uint8_t  send_ttl;
 };
 
 /** Model opcode handler. */
 struct bt_mesh_model_op {
 	/** OpCode encoded using the BT_MESH_MODEL_OP_* macros */
-	const u32_t  opcode;
+	const uint32_t  opcode;
 
 	/** Minimum required message length */
 	const size_t min_len;
@@ -339,7 +339,7 @@ struct bt_mesh_model_op {
  *
  *  @return Transmission count (actual transmissions is N + 1).
  */
-#define BT_MESH_TRANSMIT_COUNT(transmit) (((transmit) & (u8_t)BIT_MASK(3)))
+#define BT_MESH_TRANSMIT_COUNT(transmit) (((transmit) & (uint8_t)BIT_MASK(3)))
 
 /** @def BT_MESH_TRANSMIT_INT
  *
@@ -394,19 +394,19 @@ struct bt_mesh_model_pub {
 	/** The model the context belongs to. Initialized by the stack. */
 	struct bt_mesh_model *mod;
 
-	u16_t addr;         /**< Publish Address. */
-	u16_t key:12,       /**< Publish AppKey Index. */
+	uint16_t addr;         /**< Publish Address. */
+	uint16_t key:12,       /**< Publish AppKey Index. */
 	      cred:1,       /**< Friendship Credentials Flag. */
 	      send_rel:1;   /**< Force reliable sending (segment acks) */
 
-	u8_t  ttl;          /**< Publish Time to Live. */
-	u8_t  retransmit;   /**< Retransmit Count & Interval Steps. */
-	u8_t  period;       /**< Publish Period. */
-	u8_t  period_div:4, /**< Divisor for the Period. */
+	uint8_t  ttl;          /**< Publish Time to Live. */
+	uint8_t  retransmit;   /**< Retransmit Count & Interval Steps. */
+	uint8_t  period;       /**< Publish Period. */
+	uint8_t  period_div:4, /**< Divisor for the Period. */
 	      fast_period:1,/**< Use FastPeriodDivisor */
 	      count:3;      /**< Retransmissions left. */
 
-	u32_t period_start; /**< Start of the current period. */
+	uint32_t period_start; /**< Start of the current period. */
 
 	/** @brief Publication buffer, containing the publication message.
 	 *
@@ -513,27 +513,27 @@ struct bt_mesh_model_cb {
 struct bt_mesh_model {
 	union {
 		/** SIG model ID */
-		const u16_t id;
+		const uint16_t id;
 		/** Vendor model ID */
 		struct {
-			u16_t company; /**< Vendor's company ID */
-			u16_t id;      /**< Model ID */
+			uint16_t company; /**< Vendor's company ID */
+			uint16_t id;      /**< Model ID */
 		} vnd;
 	};
 
 	/* Internal information, mainly for persistent storage */
-	u8_t  elem_idx;   /* Belongs to Nth element */
-	u8_t  mod_idx;    /* Is the Nth model in the element */
-	u16_t flags;      /* Model flags for internal bookkeeping */
+	uint8_t  elem_idx;   /* Belongs to Nth element */
+	uint8_t  mod_idx;    /* Is the Nth model in the element */
+	uint16_t flags;      /* Model flags for internal bookkeeping */
 
 	/** Model Publication */
 	struct bt_mesh_model_pub * const pub;
 
 	/** AppKey List */
-	u16_t keys[CONFIG_BT_MESH_MODEL_KEY_COUNT];
+	uint16_t keys[CONFIG_BT_MESH_MODEL_KEY_COUNT];
 
 	/** Subscription List (group or virtual addresses) */
-	u16_t groups[CONFIG_BT_MESH_MODEL_GROUP_COUNT];
+	uint16_t groups[CONFIG_BT_MESH_MODEL_GROUP_COUNT];
 
 	/** Opcode handler list */
 	const struct bt_mesh_model_op * const op;
@@ -559,7 +559,7 @@ struct bt_mesh_send_cb {
 	 *  @param err      Error occurring during sending.
 	 *  @param cb_data  Callback data, as passed to the send API.
 	 */
-	void (*start)(u16_t duration, int err, void *cb_data);
+	void (*start)(uint16_t duration, int err, void *cb_data);
 	/** @brief Handler called at the end of the transmission.
 	 *
 	 *  @param err     Error occurring during sending.
@@ -577,7 +577,7 @@ struct bt_mesh_send_cb {
  *  @param msg    Message buffer.
  *  @param opcode Opcode to encode.
  */
-void bt_mesh_model_msg_init(struct net_buf_simple *msg, u32_t opcode);
+void bt_mesh_model_msg_init(struct net_buf_simple *msg, uint32_t opcode);
 
 /** Special TTL value to request using configured default TTL */
 #define BT_MESH_TTL_DEFAULT 0xff
@@ -633,7 +633,7 @@ struct bt_mesh_elem *bt_mesh_model_elem(struct bt_mesh_model *mod);
  *          if no SIG model with the given ID exists in the given element.
  */
 struct bt_mesh_model *bt_mesh_model_find(const struct bt_mesh_elem *elem,
-					 u16_t id);
+					 uint16_t id);
 
 /** @brief Find a vendor model.
  *
@@ -645,7 +645,7 @@ struct bt_mesh_model *bt_mesh_model_find(const struct bt_mesh_elem *elem,
  *          if no vendor model with the given ID exists in the given element.
  */
 struct bt_mesh_model *bt_mesh_model_find_vnd(const struct bt_mesh_elem *elem,
-					     u16_t company, u16_t id);
+					     uint16_t company, uint16_t id);
 
 /** @brief Get whether the model is in the primary element of the device.
  *
@@ -696,9 +696,9 @@ int bt_mesh_model_extend(struct bt_mesh_model *mod,
 
 /** Node Composition */
 struct bt_mesh_comp {
-	u16_t cid; /**< Company ID */
-	u16_t pid; /**< Product ID */
-	u16_t vid; /**< Version ID */
+	uint16_t cid; /**< Company ID */
+	uint16_t pid; /**< Product ID */
+	uint16_t vid; /**< Version ID */
 
 	size_t elem_count; /**< The number of elements in this device. */
 	struct bt_mesh_elem *elem; /**< List of elements. */
diff --git a/include/bluetooth/mesh/cdb.h b/include/bluetooth/mesh/cdb.h
index c8c20b9b23..4695afa40c 100644
--- a/include/bluetooth/mesh/cdb.h
+++ b/include/bluetooth/mesh/cdb.h
@@ -24,32 +24,32 @@ enum {
 };
 
 struct bt_mesh_cdb_node {
-	u8_t  uuid[16];
-	u16_t addr;
-	u16_t net_idx;
-	u8_t  num_elem;
-	u8_t  dev_key[16];
+	uint8_t  uuid[16];
+	uint16_t addr;
+	uint16_t net_idx;
+	uint8_t  num_elem;
+	uint8_t  dev_key[16];
 
 	ATOMIC_DEFINE(flags, BT_MESH_CDB_NODE_FLAG_COUNT);
 };
 
 struct bt_mesh_cdb_subnet {
-	u16_t net_idx;
+	uint16_t net_idx;
 
 	bool kr_flag;
-	u8_t kr_phase;
+	uint8_t kr_phase;
 
 	struct {
-		u8_t net_key[16];
+		uint8_t net_key[16];
 	} keys[2];
 };
 
 struct bt_mesh_cdb_app_key {
-	u16_t net_idx;
-	u16_t app_idx;
+	uint16_t net_idx;
+	uint16_t app_idx;
 
 	struct {
-		u8_t app_key[16];
+		uint8_t app_key[16];
 	} keys[2];
 };
 
@@ -64,7 +64,7 @@ enum {
 };
 
 struct bt_mesh_cdb {
-	u32_t iv_index;
+	uint32_t iv_index;
 
 	ATOMIC_DEFINE(flags, BT_MESH_CDB_FLAG_COUNT);
 
@@ -85,7 +85,7 @@ extern struct bt_mesh_cdb bt_mesh_cdb;
  *
  *  @return 0 on success or negative error code on failure.
  */
-int bt_mesh_cdb_create(const u8_t key[16]);
+int bt_mesh_cdb_create(const uint8_t key[16]);
 
 /** @brief Clear the Mesh Configuration Database.
  *
@@ -106,7 +106,7 @@ void bt_mesh_cdb_clear(void);
  *  @param iv_index The new IV Index to use.
  *  @param iv_update True if there is an ongoing IV Update procedure.
  */
-void bt_mesh_cdb_iv_update(u32_t iv_index, bool iv_update);
+void bt_mesh_cdb_iv_update(uint32_t iv_index, bool iv_update);
 
 /** @brief Allocate a node.
  *
@@ -120,8 +120,8 @@ void bt_mesh_cdb_iv_update(u32_t iv_index, bool iv_update);
  *
  *  @return The new node or NULL if it cannot be allocated.
  */
-struct bt_mesh_cdb_node *bt_mesh_cdb_node_alloc(const u8_t uuid[16], u16_t addr,
-						u8_t num_elem, u16_t net_idx);
+struct bt_mesh_cdb_node *bt_mesh_cdb_node_alloc(const uint8_t uuid[16], uint16_t addr,
+						uint8_t num_elem, uint16_t net_idx);
 
 /** @brief Delete a node.
  *
@@ -142,7 +142,7 @@ void bt_mesh_cdb_node_del(struct bt_mesh_cdb_node *node, bool store);
  *  @return The node that has an element with address addr or NULL if no such
  *          node exists.
  */
-struct bt_mesh_cdb_node *bt_mesh_cdb_node_get(u16_t addr);
+struct bt_mesh_cdb_node *bt_mesh_cdb_node_get(uint16_t addr);
 
 /** @brief Store node to persistent storage.
  *
@@ -164,7 +164,7 @@ enum {
  *  @return BT_MESH_CDB_ITER_CONTINUE to continue to iterate through the nodes
  *          or BT_MESH_CDB_ITER_STOP to stop.
  */
-typedef u8_t (*bt_mesh_cdb_node_func_t)(struct bt_mesh_cdb_node *node,
+typedef uint8_t (*bt_mesh_cdb_node_func_t)(struct bt_mesh_cdb_node *node,
 					void *user_data);
 
 /** @brief Node iterator.
@@ -185,7 +185,7 @@ void bt_mesh_cdb_node_foreach(bt_mesh_cdb_node_func_t func, void *user_data);
  *
  *  @return The new subnet or NULL if it cannot be allocated.
  */
-struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_alloc(u16_t net_idx);
+struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_alloc(uint16_t net_idx);
 
 /** @brief Delete a subnet.
  *
@@ -205,7 +205,7 @@ void bt_mesh_cdb_subnet_del(struct bt_mesh_cdb_subnet *sub, bool store);
  *  @return The subnet with the specified NetIdx or NULL if no such subnet
  *          exists.
  */
-struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_get(u16_t net_idx);
+struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_get(uint16_t net_idx);
 
 /** @brief Store subnet to persistent storage.
  *
@@ -219,7 +219,7 @@ void bt_mesh_cdb_subnet_store(const struct bt_mesh_cdb_subnet *sub);
  *
  *  @return The flags for the subnet.
  */
-u8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub);
+uint8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub);
 
 
 /** @brief Allocate an application key.
@@ -231,8 +231,8 @@ u8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub);
  *
  *  @return The new application key or NULL if it cannot be allocated.
  */
-struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_alloc(u16_t net_idx,
-						      u16_t app_idx);
+struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_alloc(uint16_t net_idx,
+						      uint16_t app_idx);
 
 /** @brief Delete an application key.
  *
@@ -252,7 +252,7 @@ void bt_mesh_cdb_app_key_del(struct bt_mesh_cdb_app_key *key, bool store);
  *  @return The application key with the specified AppIdx or NULL if no such key
  *          exists.
  */
-struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_get(u16_t app_idx);
+struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_get(uint16_t app_idx);
 
 /** @brief Store application key to persistent storage.
  *
diff --git a/include/bluetooth/mesh/cfg_cli.h b/include/bluetooth/mesh/cfg_cli.h
index 1f28e7d9e0..e53b4f28b3 100644
--- a/include/bluetooth/mesh/cfg_cli.h
+++ b/include/bluetooth/mesh/cfg_cli.h
@@ -28,7 +28,7 @@ struct bt_mesh_cfg_cli {
 
 	/* Internal parameters for tracking message responses. */
 	struct k_sem          op_sync;
-	u32_t                 op_pending;
+	uint32_t                 op_pending;
 	void                 *op_param;
 };
 
@@ -53,8 +53,8 @@ struct bt_mesh_cfg_cli {
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_comp_data_get(u16_t net_idx, u16_t addr, u8_t page,
-			      u8_t *status, struct net_buf_simple *comp);
+int bt_mesh_cfg_comp_data_get(uint16_t net_idx, uint16_t addr, uint8_t page,
+			      uint8_t *status, struct net_buf_simple *comp);
 
 /** @brief Get the target node's network beacon state.
  *
@@ -66,7 +66,7 @@ int bt_mesh_cfg_comp_data_get(u16_t net_idx, u16_t addr, u8_t page,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status);
+int bt_mesh_cfg_beacon_get(uint16_t net_idx, uint16_t addr, uint8_t *status);
 
 /** @brief Set the target node's network beacon state.
  *
@@ -80,7 +80,7 @@ int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
+int bt_mesh_cfg_beacon_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *status);
 
 /** @brief Get the target node's Time To Live value.
  *
@@ -90,7 +90,7 @@ int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_ttl_get(u16_t net_idx, u16_t addr, u8_t *ttl);
+int bt_mesh_cfg_ttl_get(uint16_t net_idx, uint16_t addr, uint8_t *ttl);
 
 /** @brief Set the target node's Time To Live value.
  *
@@ -101,7 +101,7 @@ int bt_mesh_cfg_ttl_get(u16_t net_idx, u16_t addr, u8_t *ttl);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_ttl_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *ttl);
+int bt_mesh_cfg_ttl_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *ttl);
 
 /** @brief Get the target node's Friend feature status.
  *
@@ -113,7 +113,7 @@ int bt_mesh_cfg_ttl_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *ttl);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_friend_get(u16_t net_idx, u16_t addr, u8_t *status);
+int bt_mesh_cfg_friend_get(uint16_t net_idx, uint16_t addr, uint8_t *status);
 
 /** @brief Set the target node's Friend feature state.
  *
@@ -128,7 +128,7 @@ int bt_mesh_cfg_friend_get(u16_t net_idx, u16_t addr, u8_t *status);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_friend_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
+int bt_mesh_cfg_friend_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *status);
 
 /** @brief Get the target node's Proxy feature state.
  *
@@ -141,7 +141,7 @@ int bt_mesh_cfg_friend_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_gatt_proxy_get(u16_t net_idx, u16_t addr, u8_t *status);
+int bt_mesh_cfg_gatt_proxy_get(uint16_t net_idx, uint16_t addr, uint8_t *status);
 
 /** @brief Set the target node's Proxy feature state.
  *
@@ -157,8 +157,8 @@ int bt_mesh_cfg_gatt_proxy_get(u16_t net_idx, u16_t addr, u8_t *status);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_gatt_proxy_set(u16_t net_idx, u16_t addr, u8_t val,
-			       u8_t *status);
+int bt_mesh_cfg_gatt_proxy_set(uint16_t net_idx, uint16_t addr, uint8_t val,
+			       uint8_t *status);
 
 /** @brief Get the target node's Relay feature state.
  *
@@ -173,8 +173,8 @@ int bt_mesh_cfg_gatt_proxy_set(u16_t net_idx, u16_t addr, u8_t val,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
-			  u8_t *transmit);
+int bt_mesh_cfg_relay_get(uint16_t net_idx, uint16_t addr, uint8_t *status,
+			  uint8_t *transmit);
 
 /** @brief Set the target node's Relay parameters.
  *
@@ -195,8 +195,8 @@ int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
-			  u8_t new_transmit, u8_t *status, u8_t *transmit);
+int bt_mesh_cfg_relay_set(uint16_t net_idx, uint16_t addr, uint8_t new_relay,
+			  uint8_t new_transmit, uint8_t *status, uint8_t *transmit);
 
 /** @brief Add a network key to the target node.
  *
@@ -208,8 +208,8 @@ int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_net_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			    const u8_t net_key[16], u8_t *status);
+int bt_mesh_cfg_net_key_add(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			    const uint8_t net_key[16], uint8_t *status);
 
 /** @brief Get a list of the target node's network key indexes.
  *
@@ -223,7 +223,7 @@ int bt_mesh_cfg_net_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_net_key_get(u16_t net_idx, u16_t addr, u16_t *keys,
+int bt_mesh_cfg_net_key_get(uint16_t net_idx, uint16_t addr, uint16_t *keys,
 			    size_t *key_cnt);
 
 /** @brief Add an application key to the target node.
@@ -237,9 +237,9 @@ int bt_mesh_cfg_net_key_get(u16_t net_idx, u16_t addr, u16_t *keys,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_app_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			    u16_t key_app_idx, const u8_t app_key[16],
-			    u8_t *status);
+int bt_mesh_cfg_app_key_add(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			    uint16_t key_app_idx, const uint8_t app_key[16],
+			    uint8_t *status);
 
 /** @brief Get a list of the target node's application key indexes for a
  *         specific network key.
@@ -258,8 +258,8 @@ int bt_mesh_cfg_app_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_app_key_get(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			    u8_t *status, u16_t *keys, size_t *key_cnt);
+int bt_mesh_cfg_app_key_get(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			    uint8_t *status, uint16_t *keys, size_t *key_cnt);
 
 /** @brief Bind an application to a SIG model on the target node.
  *
@@ -272,8 +272,8 @@ int bt_mesh_cfg_app_key_get(u16_t net_idx, u16_t addr, u16_t key_net_idx,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_app_bind(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			     u16_t mod_app_idx, u16_t mod_id, u8_t *status);
+int bt_mesh_cfg_mod_app_bind(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			     uint16_t mod_app_idx, uint16_t mod_id, uint8_t *status);
 
 /** @brief Bind an application to a vendor model on the target node.
  *
@@ -287,9 +287,9 @@ int bt_mesh_cfg_mod_app_bind(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_app_bind_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t mod_app_idx, u16_t mod_id, u16_t cid,
-				 u8_t *status);
+int bt_mesh_cfg_mod_app_bind_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t mod_app_idx, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status);
 
 /** @brief Get a list of all applications bound to a SIG model on the target
  *         node.
@@ -307,8 +307,8 @@ int bt_mesh_cfg_mod_app_bind_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_app_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, u8_t *status, u16_t *apps,
+int bt_mesh_cfg_mod_app_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, uint8_t *status, uint16_t *apps,
 			    size_t *app_cnt);
 
 
@@ -329,9 +329,9 @@ int bt_mesh_cfg_mod_app_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_app_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid, u8_t *status,
-				u16_t *apps, size_t *app_cnt);
+int bt_mesh_cfg_mod_app_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid, uint8_t *status,
+				uint16_t *apps, size_t *app_cnt);
 
 /** @def BT_MESH_PUB_PERIOD_100MS
  *
@@ -378,25 +378,25 @@ int bt_mesh_cfg_mod_app_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 /** Model publication configuration parameters. */
 struct bt_mesh_cfg_mod_pub {
 	/** Publication destination address. */
-	u16_t  addr;
+	uint16_t  addr;
 	/** Application index to publish with. */
-	u16_t  app_idx;
+	uint16_t  app_idx;
 	/** Friendship credential flag. */
 	bool   cred_flag;
 	/** Time To Live to publish with. */
-	u8_t   ttl;
+	uint8_t   ttl;
 	/**
 	 * Encoded publish period.
 	 * @see BT_MESH_PUB_PERIOD_100MS, BT_MESH_PUB_PERIOD_SEC,
 	 * BT_MESH_PUB_PERIOD_10SEC,
 	 * BT_MESH_PUB_PERIOD_10MIN
 	 */
-	u8_t   period;
+	uint8_t   period;
 	/**
 	 * Encoded transmit parameters.
 	 * @see BT_MESH_TRANSMIT
 	 */
-	u8_t   transmit;
+	uint8_t   transmit;
 };
 
 /** @brief Get publish parameters for a SIG model on the target node.
@@ -410,9 +410,9 @@ struct bt_mesh_cfg_mod_pub {
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
-			    u8_t *status);
+int bt_mesh_cfg_mod_pub_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
+			    uint8_t *status);
 
 /** @brief Get publish parameters for a vendor model on the target node.
  *
@@ -426,9 +426,9 @@ int bt_mesh_cfg_mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_pub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid,
-				struct bt_mesh_cfg_mod_pub *pub, u8_t *status);
+int bt_mesh_cfg_mod_pub_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid,
+				struct bt_mesh_cfg_mod_pub *pub, uint8_t *status);
 
 /** @brief Set publish parameters for a SIG model on the target node.
  *
@@ -441,9 +441,9 @@ int bt_mesh_cfg_mod_pub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
-			    u8_t *status);
+int bt_mesh_cfg_mod_pub_set(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
+			    uint8_t *status);
 
 /** @brief Set publish parameters for a vendor model on the target node.
  *
@@ -457,9 +457,9 @@ int bt_mesh_cfg_mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_pub_set_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid,
-				struct bt_mesh_cfg_mod_pub *pub, u8_t *status);
+int bt_mesh_cfg_mod_pub_set_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid,
+				struct bt_mesh_cfg_mod_pub *pub, uint8_t *status);
 
 /** @brief Add a group address to a SIG model's subscription list.
  *
@@ -472,8 +472,8 @@ int bt_mesh_cfg_mod_pub_set_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t sub_addr, u16_t mod_id, u8_t *status);
+int bt_mesh_cfg_mod_sub_add(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t sub_addr, uint16_t mod_id, uint8_t *status);
 
 /** @brief Add a group address to a vendor model's subscription list.
  *
@@ -487,9 +487,9 @@ int bt_mesh_cfg_mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t sub_addr, u16_t mod_id, u16_t cid,
-				 u8_t *status);
+int bt_mesh_cfg_mod_sub_add_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t sub_addr, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status);
 
 /** @brief Delete a group address in a SIG model's subscription list.
  *
@@ -502,8 +502,8 @@ int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t sub_addr, u16_t mod_id, u8_t *status);
+int bt_mesh_cfg_mod_sub_del(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t sub_addr, uint16_t mod_id, uint8_t *status);
 
 /** @brief Delete a group address in a vendor model's subscription list.
  *
@@ -517,9 +517,9 @@ int bt_mesh_cfg_mod_sub_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t sub_addr, u16_t mod_id, u16_t cid,
-				 u8_t *status);
+int bt_mesh_cfg_mod_sub_del_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t sub_addr, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status);
 
 /** @brief Overwrite all addresses in a SIG model's subscription list with a
  * group address.
@@ -536,8 +536,8 @@ int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_overwrite(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				  u16_t sub_addr, u16_t mod_id, u8_t *status);
+int bt_mesh_cfg_mod_sub_overwrite(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				  uint16_t sub_addr, uint16_t mod_id, uint8_t *status);
 
 /** @brief Overwrite all addresses in a vendor model's subscription list with a
  * group address.
@@ -555,9 +555,9 @@ int bt_mesh_cfg_mod_sub_overwrite(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
-				      u16_t elem_addr, u16_t sub_addr,
-				      u16_t mod_id, u16_t cid, u8_t *status);
+int bt_mesh_cfg_mod_sub_overwrite_vnd(uint16_t net_idx, uint16_t addr,
+				      uint16_t elem_addr, uint16_t sub_addr,
+				      uint16_t mod_id, uint16_t cid, uint8_t *status);
 
 /** @brief Add a virtual address to a SIG model's subscription list.
  *
@@ -571,9 +571,9 @@ int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			       const u8_t label[16], u16_t mod_id,
-			       u16_t *virt_addr, u8_t *status);
+int bt_mesh_cfg_mod_sub_va_add(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			       const uint8_t label[16], uint16_t mod_id,
+			       uint16_t *virt_addr, uint8_t *status);
 
 /** @brief Add a virtual address to a vendor model's subscription list.
  *
@@ -588,9 +588,9 @@ int bt_mesh_cfg_mod_sub_va_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				   const u8_t label[16], u16_t mod_id,
-				   u16_t cid, u16_t *virt_addr, u8_t *status);
+int bt_mesh_cfg_mod_sub_va_add_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				   const uint8_t label[16], uint16_t mod_id,
+				   uint16_t cid, uint16_t *virt_addr, uint8_t *status);
 
 /** @brief Delete a virtual address in a SIG model's subscription list.
  *
@@ -604,9 +604,9 @@ int bt_mesh_cfg_mod_sub_va_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			       const u8_t label[16], u16_t mod_id,
-			       u16_t *virt_addr, u8_t *status);
+int bt_mesh_cfg_mod_sub_va_del(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			       const uint8_t label[16], uint16_t mod_id,
+			       uint16_t *virt_addr, uint8_t *status);
 
 /** @brief Delete a virtual address in a vendor model's subscription list.
  *
@@ -621,9 +621,9 @@ int bt_mesh_cfg_mod_sub_va_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				   const u8_t label[16], u16_t mod_id,
-				   u16_t cid, u16_t *virt_addr, u8_t *status);
+int bt_mesh_cfg_mod_sub_va_del_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				   const uint8_t label[16], uint16_t mod_id,
+				   uint16_t cid, uint16_t *virt_addr, uint8_t *status);
 
 /** @brief Overwrite all addresses in a SIG model's subscription list with a
  * virtual address.
@@ -641,10 +641,10 @@ int bt_mesh_cfg_mod_sub_va_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_overwrite(u16_t net_idx, u16_t addr,
-				     u16_t elem_addr, const u8_t label[16],
-				     u16_t mod_id, u16_t *virt_addr,
-				     u8_t *status);
+int bt_mesh_cfg_mod_sub_va_overwrite(uint16_t net_idx, uint16_t addr,
+				     uint16_t elem_addr, const uint8_t label[16],
+				     uint16_t mod_id, uint16_t *virt_addr,
+				     uint8_t *status);
 
 /** @brief Overwrite all addresses in a vendor model's subscription list with a
  * virtual address.
@@ -663,10 +663,10 @@ int bt_mesh_cfg_mod_sub_va_overwrite(u16_t net_idx, u16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_va_overwrite_vnd(u16_t net_idx, u16_t addr,
-					 u16_t elem_addr, const u8_t label[16],
-					 u16_t mod_id, u16_t cid,
-					 u16_t *virt_addr, u8_t *status);
+int bt_mesh_cfg_mod_sub_va_overwrite_vnd(uint16_t net_idx, uint16_t addr,
+					 uint16_t elem_addr, const uint8_t label[16],
+					 uint16_t mod_id, uint16_t cid,
+					 uint16_t *virt_addr, uint8_t *status);
 
 /** @brief Get the subscription list of a SIG model on the target node.
  *
@@ -683,8 +683,8 @@ int bt_mesh_cfg_mod_sub_va_overwrite_vnd(u16_t net_idx, u16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, u8_t *status, u16_t *subs,
+int bt_mesh_cfg_mod_sub_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, uint8_t *status, uint16_t *subs,
 			    size_t *sub_cnt);
 
 /** @brief Get the subscription list of a vendor model on the target node.
@@ -703,22 +703,22 @@ int bt_mesh_cfg_mod_sub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_mod_sub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid, u8_t *status,
-				u16_t *subs, size_t *sub_cnt);
+int bt_mesh_cfg_mod_sub_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid, uint8_t *status,
+				uint16_t *subs, size_t *sub_cnt);
 
 /** Heartbeat subscription configuration parameters. */
 struct bt_mesh_cfg_hb_sub {
 	/** Source address to receive Heartbeat messages from. */
-	u16_t src;
+	uint16_t src;
 	/** Destination address to receive Heartbeat messages on. */
-	u16_t dst;
+	uint16_t dst;
 	/**
 	 * Logarithmic subscription period to keep listening for.
 	 * The decoded subscription period is (1 << (period - 1)), or 0 if
 	 * period is 0.
 	 */
-	u8_t  period;
+	uint8_t  period;
 	/**
 	 * Logarithmic Heartbeat subscription receive count.
 	 * The decoded Heartbeat count is (1 << (count - 1)) if count is
@@ -726,7 +726,7 @@ struct bt_mesh_cfg_hb_sub {
 	 *
 	 * Ignored in Heartbeat subscription set.
 	 */
-	u8_t  count;
+	uint8_t  count;
 	/**
 	 * Minimum hops in received messages, ie the shortest registered path
 	 * from the publishing node to the subscribing node. A Heartbeat
@@ -734,7 +734,7 @@ struct bt_mesh_cfg_hb_sub {
 	 *
 	 * Ignored in Heartbeat subscription set.
 	 */
-	u8_t  min;
+	uint8_t  min;
 	/**
 	 * Maximum hops in received messages, ie the longest registered path
 	 * from the publishing node to the subscribing node. A Heartbeat
@@ -742,7 +742,7 @@ struct bt_mesh_cfg_hb_sub {
 	 *
 	 * Ignored in Heartbeat subscription set.
 	 */
-	u8_t  max;
+	uint8_t  max;
 };
 
 /** @brief Set the target node's Heartbeat subscription parameters.
@@ -754,8 +754,8 @@ struct bt_mesh_cfg_hb_sub {
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_hb_sub_set(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_sub *sub, u8_t *status);
+int bt_mesh_cfg_hb_sub_set(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_sub *sub, uint8_t *status);
 
 /** @brief Get the target node's Heartbeta subscription parameters.
  *
@@ -766,13 +766,13 @@ int bt_mesh_cfg_hb_sub_set(u16_t net_idx, u16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_hb_sub_get(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_sub *sub, u8_t *status);
+int bt_mesh_cfg_hb_sub_get(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_sub *sub, uint8_t *status);
 
 /** Heartbeat publication configuration parameters. */
 struct bt_mesh_cfg_hb_pub {
 	/** Heartbeat destination address. */
-	u16_t dst;
+	uint16_t dst;
 	/**
 	 * Logarithmic Heartbeat count. Decoded as (1 << (count - 1)) if count
 	 * is between 1 and 0x11, 0 if count is 0, or "indefinitely" if count is
@@ -784,24 +784,24 @@ struct bt_mesh_cfg_hb_pub {
 	 * When returned from Heartbeat publication get, this parameter denotes
 	 * the number of Heartbeat messages remaining to be sent.
 	 */
-	u8_t  count;
+	uint8_t  count;
 	/**
 	 * Logarithmic Heartbeat publication transmit interval in seconds.
 	 * Decoded as (1 << (period - 1)) if period is between 1 and 0x11.
 	 * If period is 0, Heartbeat publication is disabled.
 	 */
-	u8_t  period;
+	uint8_t  period;
 	/** Publication message Time To Live value. */
-	u8_t  ttl;
+	uint8_t  ttl;
 	/**
 	 * Bitmap of features that trigger Heartbeat publications.
 	 * Legal values are @ref BT_MESH_FEAT_RELAY,
 	 * @ref BT_MESH_FEAT_PROXY, @ref BT_MESH_FEAT_FRIEND and
 	 * @ref BT_MESH_FEAT_LOW_POWER
 	 */
-	u16_t feat;
+	uint16_t feat;
 	/** Network index to publish with. */
-	u16_t net_idx;
+	uint16_t net_idx;
 };
 
 /** @brief Set the target node's Heartbeat publication parameters.
@@ -815,8 +815,8 @@ struct bt_mesh_cfg_hb_pub {
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_hb_pub_set(u16_t net_idx, u16_t addr,
-			   const struct bt_mesh_cfg_hb_pub *pub, u8_t *status);
+int bt_mesh_cfg_hb_pub_set(uint16_t net_idx, uint16_t addr,
+			   const struct bt_mesh_cfg_hb_pub *pub, uint8_t *status);
 
 /** @brief Get the target node's Heartbeat publication parameters.
  *
@@ -827,20 +827,20 @@ int bt_mesh_cfg_hb_pub_set(u16_t net_idx, u16_t addr,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_cfg_hb_pub_get(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_pub *pub, u8_t *status);
+int bt_mesh_cfg_hb_pub_get(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_pub *pub, uint8_t *status);
 
 /** @brief Get the current transmission timeout value.
  *
  *  @return The configured transmission timeout in milliseconds.
  */
-s32_t bt_mesh_cfg_cli_timeout_get(void);
+int32_t bt_mesh_cfg_cli_timeout_get(void);
 
 /** @brief Set the transmission timeout value.
  *
  *  @param timeout The new transmission timeout.
  */
-void bt_mesh_cfg_cli_timeout_set(s32_t timeout);
+void bt_mesh_cfg_cli_timeout_set(int32_t timeout);
 
 /** @cond INTERNAL_HIDDEN */
 extern const struct bt_mesh_model_op bt_mesh_cfg_cli_op[];
diff --git a/include/bluetooth/mesh/cfg_srv.h b/include/bluetooth/mesh/cfg_srv.h
index d53a4fad9d..9db9c85fb9 100644
--- a/include/bluetooth/mesh/cfg_srv.h
+++ b/include/bluetooth/mesh/cfg_srv.h
@@ -26,61 +26,61 @@ struct bt_mesh_cfg_srv {
 	/** Composition data model entry pointer. */
 	struct bt_mesh_model *model;
 
-	u8_t net_transmit;         /**< Network Transmit state */
-	u8_t relay;                /**< Relay Mode state */
-	u8_t relay_retransmit;     /**< Relay Retransmit state */
-	u8_t beacon;               /**< Secure Network Beacon state */
-	u8_t gatt_proxy;           /**< GATT Proxy state */
-	u8_t frnd;                 /**< Friend state */
-	u8_t default_ttl;          /**< Default TTL */
+	uint8_t net_transmit;         /**< Network Transmit state */
+	uint8_t relay;                /**< Relay Mode state */
+	uint8_t relay_retransmit;     /**< Relay Retransmit state */
+	uint8_t beacon;               /**< Secure Network Beacon state */
+	uint8_t gatt_proxy;           /**< GATT Proxy state */
+	uint8_t frnd;                 /**< Friend state */
+	uint8_t default_ttl;          /**< Default TTL */
 
 	/** Heartbeat Publication parameters */
 	struct bt_mesh_hb_pub {
 		struct k_delayed_work timer;
 
 		/** Destination address. */
-		u16_t dst;
+		uint16_t dst;
 		/** Remaining publish count. */
-		u16_t count;
+		uint16_t count;
 		/** Logarithmic publish interval in seconds. */
-		u8_t  period;
+		uint8_t  period;
 		/** Time To Live value. */
-		u8_t  ttl;
+		uint8_t  ttl;
 		/**
 		 * Bitmap of features that trigger a Heartbeat publication if
 		 * they change. Legal values are
 		 * @ref BT_MESH_FEAT_RELAY, @ref BT_MESH_FEAT_PROXY,
 		 * @ref BT_MESH_FEAT_FRIEND and @ref BT_MESH_FEAT_LOW_POWER.
 		 */
-		u16_t feat;
+		uint16_t feat;
 		/** Network index used for publishing. */
-		u16_t net_idx;
+		uint16_t net_idx;
 	} hb_pub;
 
 	/** Heartbeat Subscription parameters. */
 	struct bt_mesh_hb_sub {
 		/** Subscription period exipration timestamp. */
-		s64_t  expiry;
+		int64_t  expiry;
 		/** Source address to receive Heartbeats from. */
-		u16_t src;
+		uint16_t src;
 		/** Destination address to received Heartbeats on. */
-		u16_t dst;
+		uint16_t dst;
 		/** The number of received Heartbeat messages so far. */
-		u16_t count;
+		uint16_t count;
 		/**
 		 * Minimum hops in received messages, ie the shortest registered
 		 * path from the publishing node to the subscribing node. A
 		 * Heartbeat received from an immediate neighbor has hop
 		 * count = 1.
 		 */
-		u8_t  min_hops;
+		uint8_t  min_hops;
 		/**
 		 * Maximum hops in received messages, ie the longest registered
 		 * path from the publishing node to the subscribing node. A
 		 * Heartbeat received from an immediate neighbor has hop
 		 * count = 1.
 		 */
-		u8_t  max_hops;
+		uint8_t  max_hops;
 
 		/** @brief Optional Heartbeat subscription tracking callback.
 		 *
@@ -94,7 +94,7 @@ struct bt_mesh_cfg_srv {
 		 *              @ref BT_MESH_FEAT_FRIEND and
 		 *              @ref BT_MESH_FEAT_LOW_POWER.
 		 */
-		void (*func)(u8_t hops, u16_t feat);
+		void (*func)(uint8_t hops, uint16_t feat);
 	} hb_sub;
 };
 
diff --git a/include/bluetooth/mesh/health_cli.h b/include/bluetooth/mesh/health_cli.h
index ecc279cad7..66c2aa6adf 100644
--- a/include/bluetooth/mesh/health_cli.h
+++ b/include/bluetooth/mesh/health_cli.h
@@ -41,13 +41,13 @@ struct bt_mesh_health_cli {
 	 *  @param faults      Array of faults.
 	 *  @param fault_count Number of faults in the fault array.
 	 */
-	void (*current_status)(struct bt_mesh_health_cli *cli, u16_t addr,
-			       u8_t test_id, u16_t cid, u8_t *faults,
+	void (*current_status)(struct bt_mesh_health_cli *cli, uint16_t addr,
+			       uint8_t test_id, uint16_t cid, uint8_t *faults,
 			       size_t fault_count);
 
 	/* Internal parameters for tracking message responses. */
 	struct k_sem          op_sync;
-	u32_t                 op_pending;
+	uint32_t                 op_pending;
 	void                 *op_param;
 };
 
@@ -83,8 +83,8 @@ int bt_mesh_health_cli_set(struct bt_mesh_model *model);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_fault_get(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t *test_id, u8_t *faults,
+int bt_mesh_health_fault_get(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t *test_id, uint8_t *faults,
 				 size_t *fault_count);
 
 /** @brief Clear the registered faults for the given Company ID.
@@ -100,8 +100,8 @@ int bt_mesh_health_fault_get(u16_t addr, u16_t app_idx, u16_t cid,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_fault_clear(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t *test_id, u8_t *faults,
+int bt_mesh_health_fault_clear(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t *test_id, uint8_t *faults,
 				 size_t *fault_count);
 
 /** @brief Invoke a self-test procedure for the given Company ID.
@@ -115,8 +115,8 @@ int bt_mesh_health_fault_clear(u16_t addr, u16_t app_idx, u16_t cid,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_fault_test(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t test_id, u8_t *faults,
+int bt_mesh_health_fault_test(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t test_id, uint8_t *faults,
 				 size_t *fault_count);
 
 /** @brief Get the target node's Health fast period divisor.
@@ -135,7 +135,7 @@ int bt_mesh_health_fault_test(u16_t addr, u16_t app_idx, u16_t cid,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_period_get(u16_t addr, u16_t app_idx, u8_t *divisor);
+int bt_mesh_health_period_get(uint16_t addr, uint16_t app_idx, uint8_t *divisor);
 
 /** @brief Set the target node's Health fast period divisor.
  *
@@ -154,8 +154,8 @@ int bt_mesh_health_period_get(u16_t addr, u16_t app_idx, u8_t *divisor);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_period_set(u16_t addr, u16_t app_idx, u8_t divisor,
-				 u8_t *updated_divisor);
+int bt_mesh_health_period_set(uint16_t addr, uint16_t app_idx, uint8_t divisor,
+				 uint8_t *updated_divisor);
 
 /** @brief Get the current attention timer value.
  *
@@ -165,7 +165,7 @@ int bt_mesh_health_period_set(u16_t addr, u16_t app_idx, u8_t divisor,
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_attention_get(u16_t addr, u16_t app_idx, u8_t *attention);
+int bt_mesh_health_attention_get(uint16_t addr, uint16_t app_idx, uint8_t *attention);
 
 /** @brief Set the attention timer.
  *
@@ -177,20 +177,20 @@ int bt_mesh_health_attention_get(u16_t addr, u16_t app_idx, u8_t *attention);
  *
  *  @return 0 on success, or (negative) error code on failure.
  */
-int bt_mesh_health_attention_set(u16_t addr, u16_t app_idx, u8_t attention,
-				 u8_t *updated_attention);
+int bt_mesh_health_attention_set(uint16_t addr, uint16_t app_idx, uint8_t attention,
+				 uint8_t *updated_attention);
 
 /** @brief Get the current transmission timeout value.
  *
  *  @return The configured transmission timeout in milliseconds.
  */
-s32_t bt_mesh_health_cli_timeout_get(void);
+int32_t bt_mesh_health_cli_timeout_get(void);
 
 /** @brief Set the transmission timeout value.
  *
  *  @param timeout The new transmission timeout.
  */
-void bt_mesh_health_cli_timeout_set(s32_t timeout);
+void bt_mesh_health_cli_timeout_set(int32_t timeout);
 
 /** @cond INTERNAL_HIDDEN */
 extern const struct bt_mesh_model_op bt_mesh_health_cli_op[];
diff --git a/include/bluetooth/mesh/health_srv.h b/include/bluetooth/mesh/health_srv.h
index 029e398de5..259f8ef2a0 100644
--- a/include/bluetooth/mesh/health_srv.h
+++ b/include/bluetooth/mesh/health_srv.h
@@ -50,9 +50,9 @@ struct bt_mesh_health_srv_cb {
 	 *
 	 *  @return 0 on success, or (negative) error code otherwise.
 	 */
-	int (*fault_get_cur)(struct bt_mesh_model *model, u8_t *test_id,
-			     u16_t *company_id, u8_t *faults,
-			     u8_t *fault_count);
+	int (*fault_get_cur)(struct bt_mesh_model *model, uint8_t *test_id,
+			     uint16_t *company_id, uint8_t *faults,
+			     uint8_t *fault_count);
 
 	/** @brief Callback for fetching all registered faults.
 	 *
@@ -76,9 +76,9 @@ struct bt_mesh_health_srv_cb {
 	 *
 	 *  @return 0 on success, or (negative) error code otherwise.
 	 */
-	int (*fault_get_reg)(struct bt_mesh_model *model, u16_t company_id,
-			     u8_t *test_id, u8_t *faults,
-			     u8_t *fault_count);
+	int (*fault_get_reg)(struct bt_mesh_model *model, uint16_t company_id,
+			     uint8_t *test_id, uint8_t *faults,
+			     uint8_t *fault_count);
 
 	/** @brief Clear all registered faults associated with the given Company
 	 * ID.
@@ -88,7 +88,7 @@ struct bt_mesh_health_srv_cb {
 	 *
 	 *  @return 0 on success, or (negative) error code otherwise.
 	 */
-	int (*fault_clear)(struct bt_mesh_model *model, u16_t company_id);
+	int (*fault_clear)(struct bt_mesh_model *model, uint16_t company_id);
 
 	/** @brief Run a self-test.
 	 *
@@ -105,8 +105,8 @@ struct bt_mesh_health_srv_cb {
 	 * (negative) error code otherwise. Note that the fault array will not
 	 * be reported back to the client if the test execution didn't start.
 	 */
-	int (*fault_test)(struct bt_mesh_model *model, u8_t test_id,
-			  u16_t company_id);
+	int (*fault_test)(struct bt_mesh_model *model, uint8_t test_id,
+			  uint16_t company_id);
 
 	/** @brief Start calling attention to the device.
 	 *
diff --git a/include/bluetooth/mesh/main.h b/include/bluetooth/mesh/main.h
index 02cb572bf1..7a80558320 100644
--- a/include/bluetooth/mesh/main.h
+++ b/include/bluetooth/mesh/main.h
@@ -66,7 +66,7 @@ typedef enum {
 /** Provisioning properties & capabilities. */
 struct bt_mesh_prov {
 	/** The UUID that's used when advertising as unprovisioned */
-	const u8_t *uuid;
+	const uint8_t *uuid;
 
 	/** Optional URI. This will be advertised separately from the
 	 *  unprovisioned beacon, however the unprovisioned beacon will
@@ -79,19 +79,19 @@ struct bt_mesh_prov {
 	bt_mesh_prov_oob_info_t oob_info;
 
 	/** Static OOB value */
-	const u8_t *static_val;
+	const uint8_t *static_val;
 	/** Static OOB value length */
-	u8_t        static_val_len;
+	uint8_t        static_val_len;
 
 	/** Maximum size of Output OOB supported */
-	u8_t        output_size;
+	uint8_t        output_size;
 	/** Supported Output OOB Actions */
-	u16_t       output_actions;
+	uint16_t       output_actions;
 
 	/** Maximum size of Input OOB supported */
-	u8_t        input_size;
+	uint8_t        input_size;
 	/** Supported Input OOB Actions */
-	u16_t       input_actions;
+	uint16_t       input_actions;
 
 	/** @brief Output of a number is requested.
 	 *
@@ -103,7 +103,7 @@ struct bt_mesh_prov {
 	 *
 	 *  @return Zero on success or negative error code otherwise
 	 */
-	int         (*output_number)(bt_mesh_output_action_t act, u32_t num);
+	int         (*output_number)(bt_mesh_output_action_t act, uint32_t num);
 
 	/** @brief Output of a string is requested.
 	 *
@@ -130,7 +130,7 @@ struct bt_mesh_prov {
 	 *
 	 *  @return Zero on success or negative error code otherwise
 	 */
-	int         (*input)(bt_mesh_input_action_t act, u8_t size);
+	int         (*input)(bt_mesh_input_action_t act, uint8_t size);
 
 	/** @brief The other device finished their OOB input.
 	 *
@@ -150,9 +150,9 @@ struct bt_mesh_prov {
 	 *  @param uri_hash Pointer to URI Hash value. NULL if no hash was
 	 *                  present in the beacon.
 	 */
-	void        (*unprovisioned_beacon)(u8_t uuid[16],
+	void        (*unprovisioned_beacon)(uint8_t uuid[16],
 					    bt_mesh_prov_oob_info_t oob_info,
-					    u32_t *uri_hash);
+					    uint32_t *uri_hash);
 
 	/** @brief Provisioning link has been opened.
 	 *
@@ -181,7 +181,7 @@ struct bt_mesh_prov {
 	 *  @param net_idx NetKeyIndex given during provisioning.
 	 *  @param addr    Primary element address.
 	 */
-	void        (*complete)(u16_t net_idx, u16_t addr);
+	void        (*complete)(uint16_t net_idx, uint16_t addr);
 
 	/** @brief A new node has been added to the provisioning database.
 	 *
@@ -194,8 +194,8 @@ struct bt_mesh_prov {
 	 *  @param addr     Primary element address.
 	 *  @param num_elem Number of elements that this node has.
 	 */
-	void        (*node_added)(u16_t net_idx, u8_t uuid[16], u16_t addr,
-				  u8_t num_elem);
+	void        (*node_added)(uint16_t net_idx, uint8_t uuid[16], uint16_t addr,
+				  uint8_t num_elem);
 
 	/** @brief Node has been reset.
 	 *
@@ -228,7 +228,7 @@ int bt_mesh_input_string(const char *str);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_mesh_input_number(u32_t num);
+int bt_mesh_input_number(uint32_t num);
 
 /** @brief Enable specific provisioning bearers
  *
@@ -265,9 +265,9 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
-		      u8_t flags, u32_t iv_index, u16_t addr,
-		      const u8_t dev_key[16]);
+int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
+		      uint8_t flags, uint32_t iv_index, uint16_t addr,
+		      const uint8_t dev_key[16]);
 
 /** @brief Provision a Mesh Node using PB-ADV
  *
@@ -279,8 +279,8 @@ int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_mesh_provision_adv(const u8_t uuid[16], u16_t net_idx, u16_t addr,
-			  u8_t attention_duration);
+int bt_mesh_provision_adv(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
+			  uint8_t attention_duration);
 
 /** @brief Check if the local node has been provisioned.
  *
@@ -432,7 +432,7 @@ int bt_mesh_lpn_poll(void);
  *
  *  @param cb Function to call when the Friendship status changes.
  */
-void bt_mesh_lpn_set_cb(void (*cb)(u16_t friend_addr, bool established));
+void bt_mesh_lpn_set_cb(void (*cb)(uint16_t friend_addr, bool established));
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/rfcomm.h b/include/bluetooth/rfcomm.h
index 5efbb8ab95..80551c210c 100644
--- a/include/bluetooth/rfcomm.h
+++ b/include/bluetooth/rfcomm.h
@@ -89,10 +89,10 @@ struct bt_rfcomm_dlc {
 	bt_security_t              required_sec_level;
 	bt_rfcomm_role_t           role;
 
-	u16_t                      mtu;
-	u8_t                       dlci;
-	u8_t                       state;
-	u8_t                       rx_credit;
+	uint16_t                      mtu;
+	uint8_t                       dlci;
+	uint8_t                       state;
+	uint8_t                       rx_credit;
 
 	/* Stack & kernel data for TX thread */
 	struct k_thread            tx_thread;
@@ -101,7 +101,7 @@ struct bt_rfcomm_dlc {
 
 struct bt_rfcomm_server {
 	/** Server Channel */
-	u8_t channel;
+	uint8_t channel;
 
 	/** Server accept callback
 	 *
@@ -143,7 +143,7 @@ int bt_rfcomm_server_register(struct bt_rfcomm_server *server);
  *  @return 0 in case of success or negative value in case of error.
  */
 int bt_rfcomm_dlc_connect(struct bt_conn *conn, struct bt_rfcomm_dlc *dlc,
-			  u8_t channel);
+			  uint8_t channel);
 
 /** @brief Send data to RFCOMM
  *
diff --git a/include/bluetooth/sdp.h b/include/bluetooth/sdp.h
index 3e1ea6ef83..58215f10be 100644
--- a/include/bluetooth/sdp.h
+++ b/include/bluetooth/sdp.h
@@ -271,24 +271,24 @@ extern "C" {
 
 /** @brief SDP Generic Data Element Value. */
 struct bt_sdp_data_elem {
-	u8_t        type;
-	u32_t       data_size;
-	u32_t       total_size;
+	uint8_t        type;
+	uint32_t       data_size;
+	uint32_t       total_size;
 	const void *data;
 };
 
 /** @brief SDP Attribute Value. */
 struct bt_sdp_attribute {
-	u16_t                id;  /* Attribute ID */
+	uint16_t                id;  /* Attribute ID */
 	struct bt_sdp_data_elem val; /* Attribute data */
 };
 
 /** @brief SDP Service Record Value. */
 struct bt_sdp_record {
-	u32_t                    handle;     /* Redundant, for quick ref */
+	uint32_t                    handle;     /* Redundant, for quick ref */
 	struct bt_sdp_attribute *attrs;      /* Base addr of attr array */
 	size_t                   attr_count; /* Number of attributes */
-	u8_t                     index;      /* Index of the record in LL */
+	uint8_t                     index;      /* Index of the record in LL */
 	struct bt_sdp_record    *next;
 };
 
@@ -301,17 +301,17 @@ struct bt_sdp_record {
 /** @def BT_SDP_ARRAY_8
  *  @brief Declare an array of 8-bit elements in an attribute.
  */
-#define BT_SDP_ARRAY_8(...) ((u8_t[]) {__VA_ARGS__})
+#define BT_SDP_ARRAY_8(...) ((uint8_t[]) {__VA_ARGS__})
 
 /** @def BT_SDP_ARRAY_16
  *  @brief Declare an array of 16-bit elements in an attribute.
  */
-#define BT_SDP_ARRAY_16(...) ((u16_t[]) {__VA_ARGS__})
+#define BT_SDP_ARRAY_16(...) ((uint16_t[]) {__VA_ARGS__})
 
 /** @def BT_SDP_ARRAY_32
  *  @brief Declare an array of 32-bit elements in an attribute.
  */
-#define BT_SDP_ARRAY_32(...) ((u32_t[]) {__VA_ARGS__})
+#define BT_SDP_ARRAY_32(...) ((uint32_t[]) {__VA_ARGS__})
 
 /** @def BT_SDP_TYPE_SIZE
  *  @brief Declare a fixed-size data element header.
@@ -506,7 +506,7 @@ enum {
  *  record data and continue discovery for given UUID. By returning
  *  BT_SDP_DISCOVER_UUID_CONTINUE user allows this discovery continuation.
  */
-typedef u8_t (*bt_sdp_discover_func_t)
+typedef uint8_t (*bt_sdp_discover_func_t)
 		(struct bt_conn *conn, struct bt_sdp_client_result *result);
 
 /** @brief Main user structure used in SDP discovery of remote. */
@@ -573,7 +573,7 @@ enum bt_sdp_proto {
  *  value is found, or negative if error occurred during processing.
  */
 int bt_sdp_get_proto_param(const struct net_buf *buf, enum bt_sdp_proto proto,
-			   u16_t *param);
+			   uint16_t *param);
 
 /** @brief Get profile version.
  *
@@ -587,8 +587,8 @@ int bt_sdp_get_proto_param(const struct net_buf *buf, enum bt_sdp_proto proto,
  *
  *  @return 0 on success, negative value if error occurred during processing.
  */
-int bt_sdp_get_profile_version(const struct net_buf *buf, u16_t profile,
-			       u16_t *version);
+int bt_sdp_get_profile_version(const struct net_buf *buf, uint16_t profile,
+			       uint16_t *version);
 
 /** @brief Get SupportedFeatures attribute value
  *
@@ -600,7 +600,7 @@ int bt_sdp_get_profile_version(const struct net_buf *buf, u16_t profile,
  *
  *  @return 0 on success if feature found and valid, negative in case any error
  */
-int bt_sdp_get_features(const struct net_buf *buf, u16_t *features);
+int bt_sdp_get_features(const struct net_buf *buf, uint16_t *features);
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/services/bas.h b/include/bluetooth/services/bas.h
index c3374e680b..54711aed44 100644
--- a/include/bluetooth/services/bas.h
+++ b/include/bluetooth/services/bas.h
@@ -30,7 +30,7 @@ extern "C" {
  *
  *  @return The battery level in percent.
  */
-u8_t bt_gatt_bas_get_battery_level(void);
+uint8_t bt_gatt_bas_get_battery_level(void);
 
 /** @brief Update battery level value.
  *
@@ -41,7 +41,7 @@ u8_t bt_gatt_bas_get_battery_level(void);
  *
  *  @return Zero in case of success and error code in case of error.
  */
-int bt_gatt_bas_set_battery_level(u8_t level);
+int bt_gatt_bas_set_battery_level(uint8_t level);
 
 
 #ifdef __cplusplus
diff --git a/include/bluetooth/services/hrs.h b/include/bluetooth/services/hrs.h
index 97edf2cdb8..1d54770738 100644
--- a/include/bluetooth/services/hrs.h
+++ b/include/bluetooth/services/hrs.h
@@ -29,7 +29,7 @@ extern "C" {
  *
  *  @return Zero in case of success and error code in case of error.
  */
-int bt_gatt_hrs_notify(u16_t heartrate);
+int bt_gatt_hrs_notify(uint16_t heartrate);
 
 #ifdef __cplusplus
 }
diff --git a/include/bluetooth/testing.h b/include/bluetooth/testing.h
index 8907e6cc7d..087a7e6ece 100644
--- a/include/bluetooth/testing.h
+++ b/include/bluetooth/testing.h
@@ -33,13 +33,13 @@ extern "C" {
  */
 struct bt_test_cb {
 #if defined(CONFIG_BT_MESH)
-	void (*mesh_net_recv)(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
+	void (*mesh_net_recv)(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst,
 			      const void *payload, size_t payload_len);
-	void (*mesh_model_bound)(u16_t addr, struct bt_mesh_model *model,
-				 u16_t key_idx);
-	void (*mesh_model_unbound)(u16_t addr, struct bt_mesh_model *model,
-				   u16_t key_idx);
-	void (*mesh_prov_invalid_bearer)(u8_t opcode);
+	void (*mesh_model_bound)(uint16_t addr, struct bt_mesh_model *model,
+				 uint16_t key_idx);
+	void (*mesh_model_unbound)(uint16_t addr, struct bt_mesh_model *model,
+				   uint16_t key_idx);
+	void (*mesh_prov_invalid_bearer)(uint8_t opcode);
 	void (*mesh_trans_incomp_timer_exp)(void);
 #endif /* CONFIG_BT_MESH */
 
@@ -67,7 +67,7 @@ void bt_test_cb_unregister(struct bt_test_cb *cb);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_test_mesh_lpn_group_add(u16_t group);
+int bt_test_mesh_lpn_group_add(uint16_t group);
 
 /** Send Friend Subscription List Remove message.
  *
@@ -80,7 +80,7 @@ int bt_test_mesh_lpn_group_add(u16_t group);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int bt_test_mesh_lpn_group_remove(u16_t *groups, size_t groups_count);
+int bt_test_mesh_lpn_group_remove(uint16_t *groups, size_t groups_count);
 
 /** Clear replay protection list cache.
  *
diff --git a/include/bluetooth/uuid.h b/include/bluetooth/uuid.h
index ef2c8311f4..a1137956c7 100644
--- a/include/bluetooth/uuid.h
+++ b/include/bluetooth/uuid.h
@@ -32,22 +32,22 @@ enum {
 
 /** @brief This is a 'tentative' type and should be used as a pointer only */
 struct bt_uuid {
-	u8_t type;
+	uint8_t type;
 };
 
 struct bt_uuid_16 {
 	struct bt_uuid uuid;
-	u16_t val;
+	uint16_t val;
 };
 
 struct bt_uuid_32 {
 	struct bt_uuid uuid;
-	u32_t val;
+	uint32_t val;
 };
 
 struct bt_uuid_128 {
 	struct bt_uuid uuid;
-	u8_t val[16];
+	uint8_t val[16];
 };
 
 #define BT_UUID_INIT_16(value)		\
@@ -587,7 +587,7 @@ int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2);
  *
  *  @return true if the data was valid and the UUID was successfully created.
  */
-bool bt_uuid_create(struct bt_uuid *uuid, const u8_t *data, u8_t data_len);
+bool bt_uuid_create(struct bt_uuid *uuid, const uint8_t *data, uint8_t data_len);
 
 /** @brief Convert Bluetooth UUID to string.
  *
diff --git a/include/canbus/isotp.h b/include/canbus/isotp.h
index 88566391cb..1ee29a68e6 100644
--- a/include/canbus/isotp.h
+++ b/include/canbus/isotp.h
@@ -102,15 +102,15 @@ extern "C" {
 struct isotp_msg_id {
 	/** Message identifier*/
 	union {
-		u32_t std_id  : 11;
-		u32_t ext_id  : 29;
+		uint32_t std_id  : 11;
+		uint32_t ext_id  : 29;
 	};
 	/** extended address */
-	u8_t ext_addr;
+	uint8_t ext_addr;
 	/** Indicates the identifier type (standard or extended) */
-	u8_t id_type : 1;
+	uint8_t id_type : 1;
 	/** Indicates if extended addressing is used */
-	u8_t use_ext_addr : 1;
+	uint8_t use_ext_addr : 1;
 };
 
 /*
@@ -127,8 +127,8 @@ struct isotp_msg_id {
  * Used to pass the options to the bind and send functions.
  */
 struct isotp_fc_opts {
-	u8_t bs;    /**< Block size. Number of CF PDUs before next CF is sent */
-	u8_t stmin; /**< Minimum separation time. Min time between frames */
+	uint8_t bs;    /**< Block size. Number of CF PDUs before next CF is sent */
+	uint8_t stmin; /**< Minimum separation time. Min time between frames */
 };
 
 typedef void (*isotp_tx_callback_t)(int error_nr, void *arg);
@@ -190,7 +190,7 @@ void isotp_unbind(struct isotp_recv_ctx *ctx);
  * @retval ISOTP_WAIT_TIMEOUT when "timeout" timed out
  * @retval ISOTP_N_* on error
  */
-int isotp_recv(struct isotp_recv_ctx *ctx, u8_t *data, size_t len,
+int isotp_recv(struct isotp_recv_ctx *ctx, uint8_t *data, size_t len,
 	       k_timeout_t timeout);
 
 /**
@@ -236,7 +236,7 @@ int isotp_recv_net(struct isotp_recv_ctx *ctx, struct net_buf **buffer,
  * @retval ISOTP_N_* on error
  */
 int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev,
-	       const u8_t *data, size_t len,
+	       const uint8_t *data, size_t len,
 	       const struct isotp_msg_id *tx_addr,
 	       const struct isotp_msg_id *rx_addr,
 	       isotp_tx_callback_t complete_cb, void *cb_arg);
@@ -261,7 +261,7 @@ int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev,
  * @retval ISOTP_N_* on error
  */
 int isotp_send_ctx_buf(struct device *can_dev,
-		       const u8_t *data, size_t len,
+		       const uint8_t *data, size_t len,
 		       const struct isotp_msg_id *tx_addr,
 		       const struct isotp_msg_id *rx_addr,
 		       isotp_tx_callback_t complete_cb, void *cb_arg,
@@ -316,7 +316,7 @@ int isotp_send_net_ctx_buf(struct device *can_dev,
  * @retval ISOTP_* on error
  */
 int isotp_send_buf(struct device *can_dev,
-		   const u8_t *data, size_t len,
+		   const uint8_t *data, size_t len,
 		   const struct isotp_msg_id *tx_addr,
 		   const struct isotp_msg_id *rx_addr,
 		   isotp_tx_callback_t complete_cb, void *cb_arg,
@@ -332,12 +332,12 @@ struct isotp_callback {
 
 struct isotp_send_ctx {
 	int filter_id;
-	u32_t error_nr;
+	uint32_t error_nr;
 	struct device *can_dev;
 	union {
 		struct net_buf *buf;
 		struct {
-			const u8_t *data;
+			const uint8_t *data;
 			size_t len;
 		};
 	};
@@ -348,16 +348,16 @@ struct isotp_send_ctx {
 		struct k_sem fin_sem;
 	};
 	struct isotp_fc_opts opts;
-	u8_t state;
-	u8_t tx_backlog;
+	uint8_t state;
+	uint8_t tx_backlog;
 	struct isotp_msg_id rx_addr;
 	struct isotp_msg_id tx_addr;
-	u8_t wft;
-	u8_t bs;
-	u8_t sn : 4;
-	u8_t is_net_buf  : 1;
-	u8_t is_ctx_slab : 1;
-	u8_t has_callback: 1;
+	uint8_t wft;
+	uint8_t bs;
+	uint8_t sn : 4;
+	uint8_t is_net_buf  : 1;
+	uint8_t is_ctx_slab : 1;
+	uint8_t has_callback: 1;
 };
 
 struct isotp_recv_ctx {
@@ -366,7 +366,7 @@ struct isotp_recv_ctx {
 	struct net_buf *buf;
 	struct net_buf *act_frag;
 	sys_snode_t alloc_node;
-	u32_t length;
+	uint32_t length;
 	int error_nr;
 	struct k_work work;
 	struct _timeout timeout;
@@ -374,10 +374,10 @@ struct isotp_recv_ctx {
 	struct isotp_msg_id rx_addr;
 	struct isotp_msg_id tx_addr;
 	struct isotp_fc_opts opts;
-	u8_t state;
-	u8_t bs;
-	u8_t wft;
-	u8_t sn_expected : 4;
+	uint8_t state;
+	uint8_t bs;
+	uint8_t wft;
+	uint8_t sn_expected : 4;
 };
 
 /** @endcond */
diff --git a/include/console/tty.h b/include/console/tty.h
index 08ac26e8dd..3419d73667 100644
--- a/include/console/tty.h
+++ b/include/console/tty.h
@@ -19,16 +19,16 @@ struct tty_serial {
 	struct device *uart_dev;
 
 	struct k_sem rx_sem;
-	u8_t *rx_ringbuf;
-	u32_t rx_ringbuf_sz;
-	u16_t rx_get, rx_put;
-	s32_t rx_timeout;
+	uint8_t *rx_ringbuf;
+	uint32_t rx_ringbuf_sz;
+	uint16_t rx_get, rx_put;
+	int32_t rx_timeout;
 
 	struct k_sem tx_sem;
-	u8_t *tx_ringbuf;
-	u32_t tx_ringbuf_sz;
-	u16_t tx_get, tx_put;
-	s32_t tx_timeout;
+	uint8_t *tx_ringbuf;
+	uint32_t tx_ringbuf_sz;
+	uint16_t tx_get, tx_put;
+	int32_t tx_timeout;
 };
 
 /**
@@ -60,7 +60,7 @@ int tty_init(struct tty_serial *tty, struct device *uart_dev);
  * @param tty tty device structure
  * @param timeout timeout in milliseconds, or 0, or SYS_FOREVER_MS.
  */
-static inline void tty_set_rx_timeout(struct tty_serial *tty, s32_t timeout)
+static inline void tty_set_rx_timeout(struct tty_serial *tty, int32_t timeout)
 {
 	tty->rx_timeout = timeout;
 }
@@ -74,7 +74,7 @@ static inline void tty_set_rx_timeout(struct tty_serial *tty, s32_t timeout)
  * @param tty tty device structure
  * @param timeout timeout in milliseconds, or 0, or SYS_FOREVER_MS.
  */
-static inline void tty_set_tx_timeout(struct tty_serial *tty, s32_t timeout)
+static inline void tty_set_tx_timeout(struct tty_serial *tty, int32_t timeout)
 {
 	tty->tx_timeout = timeout;
 }
diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index 019daa4e2c..71e2732986 100644
--- a/include/crypto/cipher.h
+++ b/include/crypto/cipher.h
@@ -120,7 +120,7 @@ static inline int cipher_begin_session(struct device *dev,
 				       enum cipher_op optype)
 {
 	struct crypto_driver_api *api;
-	u32_t flags;
+	uint32_t flags;
 
 	api = (struct crypto_driver_api *) dev->driver_api;
 	ctx->device = dev;
@@ -225,7 +225,7 @@ static inline int cipher_block_op(struct cipher_ctx *ctx,
  * @return 0 on success, negative errno code on fail.
  */
 static inline int cipher_cbc_op(struct cipher_ctx *ctx,
-				struct cipher_pkt *pkt, u8_t *iv)
+				struct cipher_pkt *pkt, uint8_t *iv)
 {
 	__ASSERT(ctx->ops.cipher_mode == CRYPTO_CIPHER_MODE_CBC, "CBC mode "
 		 "session invoking a different mode handler");
@@ -252,7 +252,7 @@ static inline int cipher_cbc_op(struct cipher_ctx *ctx,
  * @return 0 on success, negative errno code on fail.
  */
 static inline int cipher_ctr_op(struct cipher_ctx *ctx,
-				struct cipher_pkt *pkt, u8_t *iv)
+				struct cipher_pkt *pkt, uint8_t *iv)
 {
 	__ASSERT(ctx->ops.cipher_mode == CRYPTO_CIPHER_MODE_CTR, "CTR mode "
 		 "session invoking a different mode handler");
@@ -274,7 +274,7 @@ static inline int cipher_ctr_op(struct cipher_ctx *ctx,
  * @return 0 on success, negative errno code on fail.
  */
 static inline int cipher_ccm_op(struct cipher_ctx *ctx,
-				struct cipher_aead_pkt *pkt, u8_t *nonce)
+				struct cipher_aead_pkt *pkt, uint8_t *nonce)
 {
 	__ASSERT(ctx->ops.cipher_mode == CRYPTO_CIPHER_MODE_CCM, "CCM mode "
 		 "session invoking a different mode handler");
@@ -296,7 +296,7 @@ static inline int cipher_ccm_op(struct cipher_ctx *ctx,
  * @return 0 on success, negative errno code on fail.
  */
 static inline int cipher_gcm_op(struct cipher_ctx *ctx,
-				struct cipher_aead_pkt *pkt, u8_t *nonce)
+				struct cipher_aead_pkt *pkt, uint8_t *nonce)
 {
 	__ASSERT(ctx->ops.cipher_mode == CRYPTO_CIPHER_MODE_GCM, "GCM mode "
 		 "session invoking a different mode handler");
diff --git a/include/crypto/cipher_structs.h b/include/crypto/cipher_structs.h
index e9405059bc..16acb60b03 100644
--- a/include/crypto/cipher_structs.h
+++ b/include/crypto/cipher_structs.h
@@ -60,16 +60,16 @@ typedef int (*block_op_t)(struct cipher_ctx *ctx, struct cipher_pkt *pkt);
  * like  CBC, CTR, CCM.
  */
 typedef int (*cbc_op_t)(struct cipher_ctx *ctx, struct cipher_pkt *pkt,
-			u8_t *iv);
+			uint8_t *iv);
 
 typedef int (*ctr_op_t)(struct cipher_ctx *ctx, struct cipher_pkt *pkt,
-			u8_t *ctr);
+			uint8_t *ctr);
 
 typedef int (*ccm_op_t)(struct cipher_ctx *ctx, struct cipher_aead_pkt *pkt,
-			 u8_t *nonce);
+			 uint8_t *nonce);
 
 typedef int (*gcm_op_t)(struct cipher_ctx *ctx, struct cipher_aead_pkt *pkt,
-			 u8_t *nonce);
+			 uint8_t *nonce);
 
 struct cipher_ops {
 
@@ -85,20 +85,20 @@ struct cipher_ops {
 };
 
 struct ccm_params {
-	u16_t tag_len;
-	u16_t nonce_len;
+	uint16_t tag_len;
+	uint16_t nonce_len;
 };
 
 struct ctr_params {
 	/* CTR mode counter is a split counter composed of iv and counter
 	 * such that ivlen + ctr_len = keylen
 	 */
-	u32_t ctr_len;
+	uint32_t ctr_len;
 };
 
 struct gcm_params {
-	u16_t tag_len;
-	u16_t nonce_len;
+	uint16_t tag_len;
+	uint16_t nonce_len;
 };
 
 /**
@@ -118,7 +118,7 @@ struct cipher_ctx {
 	/** To be populated by the app before calling begin_session() */
 	union {
 		/* Cryptographic key to be used in this session */
-		u8_t *bit_stream;
+		uint8_t *bit_stream;
 		/* For cases where  key is protected and is not
 		 * available to caller
 		 */
@@ -158,7 +158,7 @@ struct cipher_ctx {
 	/** Cryptographic keylength in bytes. To be populated by the app
 	 * before calling begin_session()
 	 */
-	u16_t  keylen;
+	uint16_t  keylen;
 
 	/** How certain fields are to be interpreted for this session.
 	 * (A bitmask of CAP_* below.)
@@ -166,7 +166,7 @@ struct cipher_ctx {
 	 * An app can obtain the capability flags supported by a hw/driver
 	 * by calling cipher_query_hwcaps().
 	 */
-	u16_t flags;
+	uint16_t flags;
 };
 
 /* cipher_ctx.flags values. Not all drivers support all flags.
@@ -211,7 +211,7 @@ struct cipher_ctx {
 struct cipher_pkt {
 
 	/** Start address of input buffer */
-	u8_t *in_buf;
+	uint8_t *in_buf;
 
 	/** Bytes to be operated upon */
 	int  in_len;
@@ -220,7 +220,7 @@ struct cipher_pkt {
 	 * the application. Can be NULL for in-place ops. To be populated
 	 * with contents by the driver on return from op / async callback.
 	 */
-	u8_t *out_buf;
+	uint8_t *out_buf;
 
 	/** Size of the out_buf area allocated by the application. Drivers
 	 * should not write past the size of output buffer.
@@ -252,16 +252,16 @@ struct cipher_aead_pkt {
 	/**
 	 * Start address for Associated Data. This has to be supplied by app.
 	 */
-	u8_t *ad;
+	uint8_t *ad;
 
 	/** Size of  Associated Data. This has to be supplied by the app. */
-	u32_t ad_len;
+	uint32_t ad_len;
 
 	/** Start address for the auth hash. For an encryption op this will
 	 * be populated by the driver when it returns from cipher_ccm_op call.
 	 * For a decryption op this has to be supplied by the app.
 	 */
-	u8_t *tag;
+	uint8_t *tag;
 };
 
 /* Prototype for the application function to be invoked by the crypto driver
diff --git a/include/data/json.h b/include/data/json.h
index 04c12765de..ca6dd6e9f8 100644
--- a/include/data/json.h
+++ b/include/data/json.h
@@ -58,10 +58,10 @@ struct json_obj_descr {
 	 * power of 2 in order to keep this value in the 0-3 range
 	 * and thus use only 2 bits.
 	 */
-	u32_t align_shift : 2;
+	uint32_t align_shift : 2;
 
 	/* 127 characters is more than enough for a field name. */
-	u32_t field_name_len : 7;
+	uint32_t field_name_len : 7;
 
 	/* Valid values here (enum json_tokens): JSON_TOK_STRING,
 	 * JSON_TOK_NUMBER, JSON_TOK_TRUE, JSON_TOK_FALSE,
@@ -69,10 +69,10 @@ struct json_obj_descr {
 	 * ignored.) Maximum value is '}' (125), so this has to be 7 bits
 	 * long.
 	 */
-	u32_t type : 7;
+	uint32_t type : 7;
 
 	/* 65535 bytes is more than enough for many JSON payloads. */
-	u32_t offset : 16;
+	uint32_t offset : 16;
 
 	union {
 		struct {
diff --git a/include/data/jwt.h b/include/data/jwt.h
index 547e2f42fa..811f3cf588 100644
--- a/include/data/jwt.h
+++ b/include/data/jwt.h
@@ -76,8 +76,8 @@ int jwt_init_builder(struct jwt_builder *builder,
  * @brief add JWT primary payload.
  */
 int jwt_add_payload(struct jwt_builder *builder,
-		    s32_t exp,
-		    s32_t iat,
+		    int32_t exp,
+		    int32_t iat,
 		    const char *aud);
 
 /**
diff --git a/include/device.h b/include/device.h
index 33be2b79b7..f08c6915eb 100644
--- a/include/device.h
+++ b/include/device.h
@@ -256,7 +256,7 @@ struct device {
 	const void *driver_api;
 	void * const driver_data;
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-	int (*device_pm_control)(struct device *device, u32_t command,
+	int (*device_pm_control)(struct device *device, uint32_t command,
 				 void *context, device_pm_cb cb, void *arg);
 	struct device_pm * const pm;
 #endif
@@ -349,7 +349,7 @@ __syscall struct device *device_get_binding(const char *name);
  *
  * @param state State id which name should be returned
  */
-const char *device_pm_state_str(u32_t state);
+const char *device_pm_state_str(uint32_t state);
 
 /**
  * @brief Indicate that the device is in the middle of a transaction
@@ -390,7 +390,7 @@ void device_busy_clear(struct device *busy_dev);
  * @retval -ENOTSUP for all operations.
  */
 int device_pm_control_nop(struct device *unused_device,
-			  u32_t unused_ctrl_command,
+			  uint32_t unused_ctrl_command,
 			  void *unused_context,
 			  device_pm_cb cb,
 			  void *unused_arg);
@@ -409,7 +409,7 @@ int device_pm_control_nop(struct device *unused_device,
  * @retval Errno Negative errno code if failure. Callback will not be called.
  */
 static inline int device_set_power_state(struct device *device,
-					 u32_t device_power_state,
+					 uint32_t device_power_state,
 					 device_pm_cb cb, void *arg)
 {
 	return device->device_pm_control(device,
@@ -431,7 +431,7 @@ static inline int device_set_power_state(struct device *device,
  * @retval Errno Negative errno code if failure.
  */
 static inline int device_get_power_state(struct device *device,
-					 u32_t *device_power_state)
+					 uint32_t *device_power_state)
 {
 	return device->device_pm_control(device,
 					 DEVICE_PM_GET_POWER_STATE,
diff --git a/include/devicetree.h b/include/devicetree.h
index 5503414d2f..79f5ec1228 100644
--- a/include/devicetree.h
+++ b/include/devicetree.h
@@ -518,7 +518,7 @@
  * phandle properties
  *
  * These are special-cased to manage the impedance mismatch between
- * phandles, which are just u32_t node properties that only make sense
+ * phandles, which are just uint32_t node properties that only make sense
  * within the tree itself, and C values.
  */
 
diff --git a/include/dfu/flash_img.h b/include/dfu/flash_img.h
index 5b390a4406..accf0e565d 100644
--- a/include/dfu/flash_img.h
+++ b/include/dfu/flash_img.h
@@ -15,7 +15,7 @@ extern "C" {
 #endif
 
 struct flash_img_context {
-	u8_t buf[CONFIG_IMG_BLOCK_BUF_SIZE];
+	uint8_t buf[CONFIG_IMG_BLOCK_BUF_SIZE];
 	const struct flash_area *flash_area;
 	struct stream_flash_ctx stream;
 };
@@ -28,7 +28,7 @@ struct flash_img_context {
  *
  * @return  0 on success, negative errno code on fail
  */
-int flash_img_init_id(struct flash_img_context *ctx, u8_t area_id);
+int flash_img_init_id(struct flash_img_context *ctx, uint8_t area_id);
 
 /**
  * @brief Initialize context needed for writing the image to the flash.
@@ -65,7 +65,7 @@ size_t flash_img_bytes_written(struct flash_img_context *ctx);
  *
  * @return  0 on success, negative errno code on fail
  */
-int flash_img_buffered_write(struct flash_img_context *ctx, u8_t *data,
+int flash_img_buffered_write(struct flash_img_context *ctx, uint8_t *data,
 		    size_t len, bool flush);
 
 #ifdef __cplusplus
diff --git a/include/dfu/mcuboot.h b/include/dfu/mcuboot.h
index 5aee627f76..870ad18813 100644
--- a/include/dfu/mcuboot.h
+++ b/include/dfu/mcuboot.h
@@ -49,10 +49,10 @@ extern "C" {
  * represents the information it contains.
  */
 struct mcuboot_img_sem_ver {
-	u8_t major;
-	u8_t minor;
-	u16_t revision;
-	u32_t build_num;
+	uint8_t major;
+	uint8_t minor;
+	uint16_t revision;
+	uint32_t build_num;
 };
 
 /**
@@ -66,7 +66,7 @@ struct mcuboot_img_sem_ver {
  */
 struct mcuboot_img_header_v1 {
 	/** The size of the image, in bytes. */
-	u32_t image_size;
+	uint32_t image_size;
 	/** The image version. */
 	struct mcuboot_img_sem_ver sem_ver;
 };
@@ -88,7 +88,7 @@ struct mcuboot_img_header {
 	 *
 	 * The value 1 corresponds to MCUboot versions 1.x.y.
 	 */
-	u32_t mcuboot_version;
+	uint32_t mcuboot_version;
 	/**
 	 * The header information. It is only valid to access fields
 	 * in the union member corresponding to the mcuboot_version
@@ -114,7 +114,7 @@ struct mcuboot_img_header {
  *                    necessary information, an error is returned.
  * @return Zero on success, a negative value on error.
  */
-int boot_read_bank_header(u8_t area_id,
+int boot_read_bank_header(uint8_t area_id,
 			  struct mcuboot_img_header *header,
 			  size_t header_size);
 
@@ -179,7 +179,7 @@ int boot_request_upgrade(int permanent);
  * @param area_id flash_area ID of image bank to be erased.
  * @return 0 on success, negative errno code on fail.
  */
-int boot_erase_img_bank(u8_t area_id);
+int boot_erase_img_bank(uint8_t area_id);
 
 #ifdef __cplusplus
 }
diff --git a/include/disk/disk_access.h b/include/disk/disk_access.h
index bf6a45c48a..03fd14a94e 100644
--- a/include/disk/disk_access.h
+++ b/include/disk/disk_access.h
@@ -64,11 +64,11 @@ struct disk_info {
 struct disk_operations {
 	int (*init)(struct disk_info *disk);
 	int (*status)(struct disk_info *disk);
-	int (*read)(struct disk_info *disk, u8_t *data_buf,
-		    u32_t start_sector, u32_t num_sector);
-	int (*write)(struct disk_info *disk, const u8_t *data_buf,
-		     u32_t start_sector, u32_t num_sector);
-	int (*ioctl)(struct disk_info *disk, u8_t cmd, void *buff);
+	int (*read)(struct disk_info *disk, uint8_t *data_buf,
+		    uint32_t start_sector, uint32_t num_sector);
+	int (*write)(struct disk_info *disk, const uint8_t *data_buf,
+		     uint32_t start_sector, uint32_t num_sector);
+	int (*ioctl)(struct disk_info *disk, uint8_t cmd, void *buff);
 };
 
 /*
@@ -101,8 +101,8 @@ int disk_access_status(const char *pdrv);
  *
  * @return 0 on success, negative errno code on fail
  */
-int disk_access_read(const char *pdrv, u8_t *data_buf,
-		     u32_t start_sector, u32_t num_sector);
+int disk_access_read(const char *pdrv, uint8_t *data_buf,
+		     uint32_t start_sector, uint32_t num_sector);
 
 /*
  * @brief write data to disk
@@ -115,8 +115,8 @@ int disk_access_read(const char *pdrv, u8_t *data_buf,
  *
  * @return 0 on success, negative errno code on fail
  */
-int disk_access_write(const char *pdrv, const u8_t *data_buf,
-		      u32_t start_sector, u32_t num_sector);
+int disk_access_write(const char *pdrv, const uint8_t *data_buf,
+		      uint32_t start_sector, uint32_t num_sector);
 
 /*
  * @brief Get/Configure disk parameters
@@ -127,7 +127,7 @@ int disk_access_write(const char *pdrv, const u8_t *data_buf,
  *
  * @return 0 on success, negative errno code on fail
  */
-int disk_access_ioctl(const char *pdrv, u8_t cmd, void *buff);
+int disk_access_ioctl(const char *pdrv, uint8_t cmd, void *buff);
 
 int disk_access_register(struct disk_info *disk);
 
diff --git a/include/display/cfb.h b/include/display/cfb.h
index 525a4aa5e7..96339fbbb6 100644
--- a/include/display/cfb.h
+++ b/include/display/cfb.h
@@ -50,10 +50,10 @@ enum cfb_font_caps {
 struct cfb_font {
 	const void *data;
 	enum cfb_font_caps caps;
-	u8_t width;
-	u8_t height;
-	u8_t first_char;
-	u8_t last_char;
+	uint8_t width;
+	uint8_t height;
+	uint8_t first_char;
+	uint8_t last_char;
 };
 
 /**
@@ -88,7 +88,7 @@ struct cfb_font {
  *
  * @return 0 on success, negative value otherwise
  */
-int cfb_print(struct device *dev, char *str, u16_t x, u16_t y);
+int cfb_print(struct device *dev, char *str, uint16_t x, uint16_t y);
 
 /**
  * @brief Clear framebuffer.
@@ -137,7 +137,7 @@ int cfb_get_display_parameter(struct device *dev, enum cfb_display_param);
  *
  * @return 0 on success, negative value otherwise
  */
-int cfb_framebuffer_set_font(struct device *dev, u8_t idx);
+int cfb_framebuffer_set_font(struct device *dev, uint8_t idx);
 
 /**
  * @brief Get font size.
@@ -149,7 +149,7 @@ int cfb_framebuffer_set_font(struct device *dev, u8_t idx);
  *
  * @return 0 on success, negative value otherwise
  */
-int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height);
+int cfb_get_font_size(struct device *dev, uint8_t idx, uint8_t *width, uint8_t *height);
 
 /**
  * @brief Get number of fonts.
diff --git a/include/display/framebuf.h b/include/display/framebuf.h
index e2e577ae1c..a69220b9e9 100644
--- a/include/display/framebuf.h
+++ b/include/display/framebuf.h
@@ -13,9 +13,9 @@ extern const struct display_driver_api framebuf_display_api;
 
 struct framebuf_dev_data {
 	void			  *buffer;
-	u32_t			  pitch;
-	u16_t			  width;
-	u16_t			  height;
+	uint32_t			  pitch;
+	uint16_t			  width;
+	uint16_t			  height;
 };
 
 #define FRAMEBUF_DATA(dev) ((struct framebuf_dev_data *) ((dev)->driver_data))
diff --git a/include/display/grove_lcd.h b/include/display/grove_lcd.h
index ca9335c9c9..60eb411eff 100644
--- a/include/display/grove_lcd.h
+++ b/include/display/grove_lcd.h
@@ -34,7 +34,7 @@ extern "C" {
  *  @param data the ASCII text to display
  *  @param size the length of the text in bytes
  */
-void glcd_print(struct device *port, char *data, u32_t size);
+void glcd_print(struct device *port, char *data, uint32_t size);
 
 
 /**
@@ -44,7 +44,7 @@ void glcd_print(struct device *port, char *data, u32_t size);
  *  @param col the column for the cursor to be moved to (0-15)
  *  @param row the row it should be moved to (0 or 1)
  */
-void glcd_cursor_pos_set(struct device *port, u8_t col, u8_t row);
+void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row);
 
 /**
  *  @brief Clear the current display
@@ -71,7 +71,7 @@ void glcd_clear(struct device *port);
  *  @param opt An 8bit bitmask of GLCD_DS_* options.
  *
  */
-void glcd_display_state_set(struct device *port, u8_t opt);
+void glcd_display_state_set(struct device *port, uint8_t opt);
 
 /**
  * @brief return the display feature set associated with the device
@@ -80,7 +80,7 @@ void glcd_display_state_set(struct device *port, u8_t opt);
  *
  * @return the display feature set associated with the device.
  */
-u8_t glcd_display_state_get(struct device *port);
+uint8_t glcd_display_state_get(struct device *port);
 
 /* Defines for the GLCD_CMD_INPUT_SET to change text direction */
 #define GLCD_IS_SHIFT_INCREMENT	(1 << 1)
@@ -97,7 +97,7 @@ u8_t glcd_display_state_get(struct device *port);
  *  @param opt A bitmask of GLCD_IS_* options
  *
  */
-void glcd_input_state_set(struct device *port, u8_t opt);
+void glcd_input_state_set(struct device *port, uint8_t opt);
 
 /**
  * @brief return the input set associated with the device
@@ -106,7 +106,7 @@ void glcd_input_state_set(struct device *port, u8_t opt);
  *
  * @return the input set associated with the device.
  */
-u8_t glcd_input_state_get(struct device *port);
+uint8_t glcd_input_state_get(struct device *port);
 
 /* Defines for the LCD_FUNCTION_SET */
 #define GLCD_FS_8BIT_MODE	(1 << 4)
@@ -125,7 +125,7 @@ u8_t glcd_input_state_get(struct device *port);
  *  of the display as per needed.  Controlling things like the number of rows,
  *  dot size, and text display quality.
  */
-void glcd_function_set(struct device *port, u8_t opt);
+void glcd_function_set(struct device *port, uint8_t opt);
 
 /**
  * @brief return the function set associated with the device
@@ -134,7 +134,7 @@ void glcd_function_set(struct device *port, u8_t opt);
  *
  * @return the function features set associated with the device.
  */
-u8_t glcd_function_get(struct device *port);
+uint8_t glcd_function_get(struct device *port);
 
 
 /* Available color selections */
@@ -147,7 +147,7 @@ u8_t glcd_function_get(struct device *port);
  *  @param port Pointer to device structure for driver instance.
  *  @param color One of the predefined color options
  */
-void glcd_color_select(struct device *port, u8_t color);
+void glcd_color_select(struct device *port, uint8_t color);
 
 
 /**
@@ -158,7 +158,7 @@ void glcd_color_select(struct device *port, u8_t color);
  *  @param g A numeric value for the green color (max is 255)
  *  @param b A numeric value for the blue color (max is 255)
  */
-void glcd_color_set(struct device *port, u8_t r, u8_t g, u8_t b);
+void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b);
 
 
 /**
diff --git a/include/display/mb_display.h b/include/display/mb_display.h
index 0ad091a45c..cb8a15421d 100644
--- a/include/display/mb_display.h
+++ b/include/display/mb_display.h
@@ -37,13 +37,13 @@ extern "C" {
 struct mb_image {
 	union {
 		struct {
-			u8_t c1:1,
+			uint8_t c1:1,
 				c2:1,
 				c3:1,
 				c4:1,
 				c5:1;
 		} r[5];
-		u8_t row[5];
+		uint8_t row[5];
 	};
 };
 
@@ -129,8 +129,8 @@ struct mb_display *mb_display_get(void);
  * @param img       Array of image bitmaps (struct mb_image objects).
  * @param img_count Number of images in 'img' array.
  */
-void mb_display_image(struct mb_display *disp, u32_t mode, s32_t duration,
-		      const struct mb_image *img, u8_t img_count);
+void mb_display_image(struct mb_display *disp, uint32_t mode, int32_t duration,
+		      const struct mb_image *img, uint8_t img_count);
 
 /**
  * @brief Print a string of characters on the BBC micro:bit LED display.
@@ -150,7 +150,7 @@ void mb_display_image(struct mb_display *disp, u32_t mode, s32_t duration,
  * @param ...      Optional list of format arguments.
  */
 __printf_like(4, 5) void mb_display_print(struct mb_display *disp,
-					  u32_t mode, s32_t duration,
+					  uint32_t mode, int32_t duration,
 					  const char *fmt, ...);
 
 /**
diff --git a/include/drivers/adc.h b/include/drivers/adc.h
index a80cf6c2c8..0d1a5746d9 100644
--- a/include/drivers/adc.h
+++ b/include/drivers/adc.h
@@ -62,7 +62,7 @@ enum adc_gain {
  * @retval -EINVAL if the gain could not be interpreted
  */
 int adc_gain_invert(enum adc_gain gain,
-		    s32_t *value);
+		    int32_t *value);
 
 /** @brief ADC references. */
 enum adc_reference {
@@ -108,7 +108,7 @@ struct adc_channel_cfg {
 	 * Particular drivers do not necessarily support all the possible units.
 	 * Value range is 0-16383 for a given unit.
 	 */
-	u16_t acquisition_time;
+	uint16_t acquisition_time;
 
 	/**
 	 * Channel identifier.
@@ -132,10 +132,10 @@ struct adc_channel_cfg {
 	 * on the underlying hardware capabilities or configured via a dedicated
 	 * Kconfig option).
 	 */
-	u8_t channel_id   : 5;
+	uint8_t channel_id   : 5;
 
 	/** Channel type: single-ended or differential. */
-	u8_t differential : 1;
+	uint8_t differential : 1;
 
 #ifdef CONFIG_ADC_CONFIGURABLE_INPUTS
 	/**
@@ -143,14 +143,14 @@ struct adc_channel_cfg {
 	 * This is a driver dependent value that identifies an ADC input to be
 	 * associated with the channel.
 	 */
-	u8_t input_positive;
+	uint8_t input_positive;
 
 	/**
 	 * Negative ADC input (used only for differential channels).
 	 * This is a driver dependent value that identifies an ADC input to be
 	 * associated with the channel.
 	 */
-	u8_t input_negative;
+	uint8_t input_negative;
 #endif /* CONFIG_ADC_CONFIGURABLE_INPUTS */
 };
 
@@ -177,12 +177,12 @@ struct adc_channel_cfg {
  * @retval 0 on successful conversion
  * @retval -EINVAL if the gain is not reversible
  */
-static inline int adc_raw_to_millivolts(s32_t ref_mv,
+static inline int adc_raw_to_millivolts(int32_t ref_mv,
 					enum adc_gain gain,
-					u8_t resolution,
-					s32_t *valp)
+					uint8_t resolution,
+					int32_t *valp)
 {
-	s32_t adc_mv = *valp * ref_mv;
+	int32_t adc_mv = *valp * ref_mv;
 	int ret = adc_gain_invert(gain, &adc_mv);
 
 	if (ret == 0) {
@@ -227,7 +227,7 @@ enum adc_action {
 typedef enum adc_action (*adc_sequence_callback)(
 				struct device *dev,
 				const struct adc_sequence *sequence,
-				u16_t sampling_index);
+				uint16_t sampling_index);
 
 /**
  * @brief Structure defining additional options for an ADC sampling sequence.
@@ -242,7 +242,7 @@ struct adc_sequence_options {
 	 * kernel's system clock. Particular drivers may use some dedicated
 	 * hardware timers and achieve a better precision.
 	 */
-	u32_t interval_us;
+	uint32_t interval_us;
 
 	/**
 	 * Callback function to be called after each sampling is done.
@@ -254,7 +254,7 @@ struct adc_sequence_options {
 	 * Number of extra samplings to perform (the total number of samplings
 	 * is 1 + extra_samplings).
 	 */
-	u16_t extra_samplings;
+	uint16_t extra_samplings;
 };
 
 /**
@@ -273,7 +273,7 @@ struct adc_sequence {
 	 * All selected channels must be configured with adc_channel_setup()
 	 * before they are used in a sequence.
 	 */
-	u32_t channels;
+	uint32_t channels;
 
 	/**
 	 * Pointer to a buffer where the samples are to be written. Samples
@@ -301,7 +301,7 @@ struct adc_sequence {
 	 * for differential ones:
 	 *   - 2^(resolution-1) .. 2^(resolution-1) - 1.
 	 */
-	u8_t resolution;
+	uint8_t resolution;
 
 	/**
 	 * Oversampling setting.
@@ -309,7 +309,7 @@ struct adc_sequence {
 	 * This feature may be unsupported by a given ADC hardware, or in
 	 * a specific mode (e.g. when sampling multiple channels).
 	 */
-	u8_t oversampling;
+	uint8_t oversampling;
 
 	/**
 	 * Perform calibration before the reading is taken if requested.
@@ -359,7 +359,7 @@ __subsystem struct adc_driver_api {
 #ifdef CONFIG_ADC_ASYNC
 	adc_api_read_async    read_async;
 #endif
-	u16_t ref_internal;	/* mV */
+	uint16_t ref_internal;	/* mV */
 };
 
 /**
@@ -461,7 +461,7 @@ static inline int z_impl_adc_read_async(struct device *dev,
  * @return a positive value is the reference voltage value.  Returns
  * zero if reference voltage information is not available.
  */
-static inline u16_t adc_ref_internal(struct device *dev)
+static inline uint16_t adc_ref_internal(struct device *dev)
 {
 	const struct adc_driver_api *api =
 				(const struct adc_driver_api *)dev->driver_api;
diff --git a/include/drivers/adc/lmp90xxx.h b/include/drivers/adc/lmp90xxx.h
index 88bcb406a8..f00b216c2c 100644
--- a/include/drivers/adc/lmp90xxx.h
+++ b/include/drivers/adc/lmp90xxx.h
@@ -13,13 +13,13 @@
 /* LMP90xxx supports GPIO D0..D6 */
 #define LMP90XXX_GPIO_MAX 6
 
-int lmp90xxx_gpio_set_output(struct device *dev, u8_t pin);
+int lmp90xxx_gpio_set_output(struct device *dev, uint8_t pin);
 
-int lmp90xxx_gpio_set_input(struct device *dev, u8_t pin);
+int lmp90xxx_gpio_set_input(struct device *dev, uint8_t pin);
 
-int lmp90xxx_gpio_set_pin_value(struct device *dev, u8_t pin, bool value);
+int lmp90xxx_gpio_set_pin_value(struct device *dev, uint8_t pin, bool value);
 
-int lmp90xxx_gpio_get_pin_value(struct device *dev, u8_t pin, bool *value);
+int lmp90xxx_gpio_get_pin_value(struct device *dev, uint8_t pin, bool *value);
 
 int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value);
 
diff --git a/include/drivers/bluetooth/hci_driver.h b/include/drivers/bluetooth/hci_driver.h
index 5d079605ec..bc538443c0 100644
--- a/include/drivers/bluetooth/hci_driver.h
+++ b/include/drivers/bluetooth/hci_driver.h
@@ -46,7 +46,7 @@ enum {
  * @return true if the event can be processed in the RX thread, false
  *         if it cannot.
  */
-static inline bool bt_hci_evt_is_prio(u8_t evt)
+static inline bool bt_hci_evt_is_prio(uint8_t evt)
 {
 	switch (evt) {
 	case BT_HCI_EVT_CMD_COMPLETE:
@@ -103,7 +103,7 @@ int bt_recv_prio(struct net_buf *buf);
  *
  *  @return Number of addresses read.
  */
-u8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], u8_t size);
+uint8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], uint8_t size);
 
 /** Possible values for the 'bus' member of the bt_hci_driver struct */
 enum bt_hci_driver_bus {
@@ -137,7 +137,7 @@ struct bt_hci_driver {
 	 *  set at buildtime, or set at runtime before the HCI driver's
 	 *  open() callback returns.
 	 */
-	u32_t quirks;
+	uint32_t quirks;
 
 	/**
 	 * @brief Open the HCI transport.
@@ -205,7 +205,7 @@ int bt_hci_transport_setup(struct device *dev);
  *
  * @return Newly allocated buffer.
  */
-struct net_buf *bt_hci_evt_create(u8_t evt, u8_t len);
+struct net_buf *bt_hci_evt_create(uint8_t evt, uint8_t len);
 
 /** Allocate an HCI Command Complete event buffer.
  *
@@ -219,7 +219,7 @@ struct net_buf *bt_hci_evt_create(u8_t evt, u8_t len);
  *
  * @return Newly allocated buffer.
  */
-struct net_buf *bt_hci_cmd_complete_create(u16_t op, u8_t plen);
+struct net_buf *bt_hci_cmd_complete_create(uint16_t op, uint8_t plen);
 
 /** Allocate an HCI Command Status event buffer.
  *
@@ -233,7 +233,7 @@ struct net_buf *bt_hci_cmd_complete_create(u16_t op, u8_t plen);
  *
  * @return Newly allocated buffer.
  */
-struct net_buf *bt_hci_cmd_status_create(u16_t op, u8_t status);
+struct net_buf *bt_hci_cmd_status_create(uint16_t op, uint8_t status);
 
 #ifdef __cplusplus
 }
diff --git a/include/drivers/can.h b/include/drivers/can.h
index 7e2f2ecdfb..ab832c5bcd 100644
--- a/include/drivers/can.h
+++ b/include/drivers/can.h
@@ -122,7 +122,7 @@ enum can_state {
  * bit 30	: remote transmission request flag (1 = rtr frame)
  * bit 31	: frame format flag (0 = standard 11 bit, 1 = extended 29 bit)
  */
-typedef u32_t canid_t;
+typedef uint32_t canid_t;
 
 /**
  * @brief CAN frame structure that is compatible with Linux. This is mainly
@@ -136,16 +136,16 @@ struct can_frame {
 	canid_t can_id;
 
 	/** The length of the message */
-	u8_t can_dlc;
+	uint8_t can_dlc;
 
 	/** @cond INTERNAL_HIDDEN */
-	u8_t pad;   /* padding */
-	u8_t res0;  /* reserved / padding */
-	u8_t res1;  /* reserved / padding */
+	uint8_t pad;   /* padding */
+	uint8_t res0;  /* reserved / padding */
+	uint8_t res1;  /* reserved / padding */
 	/** @endcond */
 
 	/** The message data */
-	u8_t data[CAN_MAX_DLEN];
+	uint8_t data[CAN_MAX_DLEN];
 };
 
 /**
@@ -170,29 +170,29 @@ struct zcan_frame {
 	/** Indicates the identifier type (standard or extended)
 	 * use can_ide enum for assignment
 	 */
-	u32_t id_type : 1;
+	uint32_t id_type : 1;
 	/** Set the message to a transmission request instead of data frame
 	 * use can_rtr enum for assignment
 	 */
-	u32_t rtr     : 1;
+	uint32_t rtr     : 1;
 	/** Message identifier*/
 	union {
-		u32_t std_id  : 11;
-		u32_t ext_id  : 29;
+		uint32_t std_id  : 11;
+		uint32_t ext_id  : 29;
 	};
 	/** The length of the message (max. 8) in byte */
-	u8_t dlc;
+	uint8_t dlc;
 	/** The message data*/
 	union {
-		u8_t data[8];
-		u32_t data_32[2];
+		uint8_t data[8];
+		uint32_t data_32[2];
 	};
 #if defined(CONFIG_CAN_RX_TIMESTAMP)
 	/** Timer value of the CAN free running timer.
 	 * The timer is incremented every bit time and captured at the start
 	 * of frame bit (SOF).
 	 */
-	u16_t timestamp;
+	uint16_t timestamp;
 #endif
 } __packed;
 
@@ -209,20 +209,20 @@ struct zcan_filter {
 	/** Indicates the identifier type (standard or extended)
 	 * use can_ide enum for assignment
 	 */
-	u32_t id_type      : 1;
+	uint32_t id_type      : 1;
 	/** target state of the rtr bit */
-	u32_t rtr          : 1;
+	uint32_t rtr          : 1;
 	/** target state of the identifier */
 	union {
-		u32_t std_id   : 11;
-		u32_t ext_id   : 29;
+		uint32_t std_id   : 11;
+		uint32_t ext_id   : 29;
 	};
 	/** rtr bit mask */
-	u32_t rtr_mask     : 1;
+	uint32_t rtr_mask     : 1;
 	/** identifier mask*/
 	union {
-		u32_t std_id_mask  : 11;
-		u32_t ext_id_mask  : 29;
+		uint32_t std_id_mask  : 11;
+		uint32_t ext_id_mask  : 29;
 	};
 } __packed;
 
@@ -232,8 +232,8 @@ struct zcan_filter {
  * Used to pass the bus error counters to userspace
  */
 struct can_bus_err_cnt {
-	u8_t tx_err_cnt;
-	u8_t rx_err_cnt;
+	uint8_t tx_err_cnt;
+	uint8_t rx_err_cnt;
 };
 
 /**
@@ -243,7 +243,7 @@ struct can_bus_err_cnt {
  * @param error_flags status of the performed send operation
  * @param arg argument that was passed when the message was sent
  */
-typedef void (*can_tx_callback_t)(u32_t error_flags, void *arg);
+typedef void (*can_tx_callback_t)(uint32_t error_flags, void *arg);
 
 /**
  * @typedef can_rx_callback_t
@@ -266,7 +266,7 @@ typedef void(*can_state_change_isr_t)(enum can_state state,
 					  struct can_bus_err_cnt err_cnt);
 
 typedef int (*can_configure_t)(struct device *dev, enum can_mode mode,
-				u32_t bitrate);
+				uint32_t bitrate);
 
 typedef int (*can_send_t)(struct device *dev, const struct zcan_frame *msg,
 			  k_timeout_t timeout, can_tx_callback_t callback_isr,
@@ -295,8 +295,8 @@ typedef void(*can_register_state_change_isr_t)(struct device *dev,
 #endif
 struct can_frame_buffer {
 	struct zcan_frame buf[CONFIG_CAN_WORKQ_FRAMES_BUF_CNT];
-	u16_t head;
-	u16_t tail;
+	uint16_t head;
+	uint16_t tail;
 };
 
 /**
@@ -379,8 +379,8 @@ static inline int z_impl_can_send(struct device *dev,
  * @retval -EIO General input / output error.
  * @retval -EINVAL if length > 8.
  */
-static inline int can_write(struct device *dev, const u8_t *data, u8_t length,
-			    u32_t id, enum can_rtr rtr, k_timeout_t timeout)
+static inline int can_write(struct device *dev, const uint8_t *data, uint8_t length,
+			    uint32_t id, enum can_rtr rtr, k_timeout_t timeout)
 {
 	struct zcan_frame msg;
 
@@ -515,10 +515,10 @@ static inline void z_impl_can_detach(struct device *dev, int filter_id)
  * @retval -EIO General input / output error, failed to configure device.
  */
 __syscall int can_configure(struct device *dev, enum can_mode mode,
-			    u32_t bitrate);
+			    uint32_t bitrate);
 
 static inline int z_impl_can_configure(struct device *dev, enum can_mode mode,
-				      u32_t bitrate)
+				      uint32_t bitrate)
 {
 	const struct can_driver_api *api =
 		(const struct can_driver_api *)dev->driver_api;
diff --git a/include/drivers/clock_control.h b/include/drivers/clock_control.h
index ade64b2c8d..1210eff28a 100644
--- a/include/drivers/clock_control.h
+++ b/include/drivers/clock_control.h
@@ -104,7 +104,7 @@ typedef int (*clock_control)(struct device *dev, clock_control_subsys_t sys);
 
 typedef int (*clock_control_get)(struct device *dev,
 				 clock_control_subsys_t sys,
-				 u32_t *rate);
+				 uint32_t *rate);
 
 typedef int (*clock_control_async_on_fn)(struct device *dev,
 				   clock_control_subsys_t sys,
@@ -226,7 +226,7 @@ static inline enum clock_control_status clock_control_get_status(
  */
 static inline int clock_control_get_rate(struct device *dev,
 					 clock_control_subsys_t sys,
-					 u32_t *rate)
+					 uint32_t *rate)
 {
 	const struct clock_control_driver_api *api =
 		(const struct clock_control_driver_api *)dev->driver_api;
diff --git a/include/drivers/clock_control/arm_clock_control.h b/include/drivers/clock_control/arm_clock_control.h
index c966307284..8a7c5679c6 100644
--- a/include/drivers/clock_control/arm_clock_control.h
+++ b/include/drivers/clock_control/arm_clock_control.h
@@ -34,7 +34,7 @@ struct arm_clock_control_t {
 	/* Clock can be configured for 3 states: Active, Sleep, Deep Sleep */
 	enum arm_soc_state_t state;
 	/* Identifies the device on the bus */
-	u32_t device;
+	uint32_t device;
 };
 
 #endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_ARM_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/clock_control/stm32_clock_control.h b/include/drivers/clock_control/stm32_clock_control.h
index 63bd104571..48e344f333 100644
--- a/include/drivers/clock_control/stm32_clock_control.h
+++ b/include/drivers/clock_control/stm32_clock_control.h
@@ -16,8 +16,8 @@
 #define STM32_CLOCK_CONTROL_NAME "stm32-cc"
 
 struct stm32_pclken {
-	u32_t bus;
-	u32_t enr;
+	uint32_t bus;
+	uint32_t enr;
 };
 
 #endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_STM32_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/console/console.h b/include/drivers/console/console.h
index b50544ec2d..fd19467ffa 100644
--- a/include/drivers/console/console.h
+++ b/include/drivers/console/console.h
@@ -22,7 +22,7 @@ struct console_input {
 	/** FIFO uses first word itself, reserve space */
 	intptr_t _unused;
 	/** Whether this is an mcumgr command */
-	u8_t is_mcumgr : 1;
+	uint8_t is_mcumgr : 1;
 	/** Buffer where the input line is recorded */
 	char line[CONSOLE_MAX_LINE_LEN];
 };
@@ -42,7 +42,7 @@ struct console_input {
  *  @return N/A
  */
 typedef void (*console_input_fn)(struct k_fifo *avail, struct k_fifo *lines,
-				 u8_t (*completion)(char *str, u8_t len));
+				 uint8_t (*completion)(char *str, uint8_t len));
 
 #ifdef __cplusplus
 }
diff --git a/include/drivers/console/ipm_console.h b/include/drivers/console/ipm_console.h
index 75294f91d1..96002d30b4 100644
--- a/include/drivers/console/ipm_console.h
+++ b/include/drivers/console/ipm_console.h
@@ -41,7 +41,7 @@ struct ipm_console_receiver_config_info {
 	 * Ring buffer data area for stashing characters from the interrupt
 	 * callback
 	 */
-	u32_t *ring_buf_data;
+	uint32_t *ring_buf_data;
 
 	/** Size of ring_buf_data in 32-bit chunks */
 	unsigned int rb_size32;
diff --git a/include/drivers/console/uart_console.h b/include/drivers/console/uart_console.h
index e30489cbee..b2e542dcb0 100644
--- a/include/drivers/console/uart_console.h
+++ b/include/drivers/console/uart_console.h
@@ -30,7 +30,7 @@ extern "C" {
  *  @return N/A
  */
 void uart_register_input(struct k_fifo *avail, struct k_fifo *lines,
-			 u8_t (*completion)(char *str, u8_t len));
+			 uint8_t (*completion)(char *str, uint8_t len));
 
 /*
  * Allows having debug hooks in the console driver for handling incoming
@@ -44,7 +44,7 @@ typedef UART_CONSOLE_OUT_DEBUG_HOOK_SIG(uart_console_out_debug_hook_t);
 void uart_console_out_debug_hook_install(
 				uart_console_out_debug_hook_t *hook);
 
-typedef int (*uart_console_in_debug_hook_t) (u8_t);
+typedef int (*uart_console_in_debug_hook_t) (uint8_t);
 
 void uart_console_in_debug_hook_install(uart_console_in_debug_hook_t hook);
 
diff --git a/include/drivers/console/uart_mcumgr.h b/include/drivers/console/uart_mcumgr.h
index 8fe43984d0..4950ed4a97 100644
--- a/include/drivers/console/uart_mcumgr.h
+++ b/include/drivers/console/uart_mcumgr.h
@@ -25,7 +25,7 @@ extern "C" {
  */
 struct uart_mcumgr_rx_buf {
 	void *fifo_reserved;   /* 1st word reserved for use by fifo */
-	u8_t data[CONFIG_UART_MCUMGR_RX_BUF_SIZE];
+	uint8_t data[CONFIG_UART_MCUMGR_RX_BUF_SIZE];
 	int length;
 };
 
@@ -48,7 +48,7 @@ typedef void uart_mcumgr_recv_fn(struct uart_mcumgr_rx_buf *rx_buf);
  *
  * @return                      0 on success; negative error code on failure.
  */
-int uart_mcumgr_send(const u8_t *data, int len);
+int uart_mcumgr_send(const uint8_t *data, int len);
 
 /**
  * @brief Frees the supplied receive buffer.
diff --git a/include/drivers/console/uart_pipe.h b/include/drivers/console/uart_pipe.h
index 5059c4ce69..290e706b56 100644
--- a/include/drivers/console/uart_pipe.h
+++ b/include/drivers/console/uart_pipe.h
@@ -32,7 +32,7 @@ extern "C" {
  *
  *  @return Buffer to be used on next receive.
  */
-typedef u8_t *(*uart_pipe_recv_cb)(u8_t *buf, size_t *off);
+typedef uint8_t *(*uart_pipe_recv_cb)(uint8_t *buf, size_t *off);
 
 /** @brief Register UART application.
  *
@@ -42,7 +42,7 @@ typedef u8_t *(*uart_pipe_recv_cb)(u8_t *buf, size_t *off);
  *  @param len Size of buffer.
  *  @param cb Callback to be called on data reception.
  */
-void uart_pipe_register(u8_t *buf, size_t len, uart_pipe_recv_cb cb);
+void uart_pipe_register(uint8_t *buf, size_t len, uart_pipe_recv_cb cb);
 
 /** @brief Send data over UART.
  *
@@ -53,7 +53,7 @@ void uart_pipe_register(u8_t *buf, size_t len, uart_pipe_recv_cb cb);
  *
  *  @return 0 on success or negative error
  */
-int uart_pipe_send(const u8_t *data, int len);
+int uart_pipe_send(const uint8_t *data, int len);
 
 #ifdef __cplusplus
 }
diff --git a/include/drivers/counter.h b/include/drivers/counter.h
index 16824a07ae..43a2d17ee8 100644
--- a/include/drivers/counter.h
+++ b/include/drivers/counter.h
@@ -106,7 +106,7 @@ extern "C" {
  * @param user_data User data.
  */
 typedef void (*counter_alarm_callback_t)(struct device *dev,
-					 u8_t chan_id, u32_t ticks,
+					 uint8_t chan_id, uint32_t ticks,
 					 void *user_data);
 
 /** @brief Alarm callback structure.
@@ -125,9 +125,9 @@ typedef void (*counter_alarm_callback_t)(struct device *dev,
  */
 struct counter_alarm_cfg {
 	counter_alarm_callback_t callback;
-	u32_t ticks;
+	uint32_t ticks;
 	void *user_data;
-	u32_t flags;
+	uint32_t flags;
 };
 
 /** @brief Callback called when counter turns around.
@@ -146,10 +146,10 @@ typedef void (*counter_top_callback_t)(struct device *dev, void *user_data);
  * @param flags		Flags. See @ref COUNTER_TOP_FLAGS.
  */
 struct counter_top_cfg {
-	u32_t ticks;
+	uint32_t ticks;
 	counter_top_callback_t callback;
 	void *user_data;
-	u32_t flags;
+	uint32_t flags;
 };
 
 /** @brief Structure with generic counter features.
@@ -163,26 +163,26 @@ struct counter_top_cfg {
  *			see @ref counter_set_channel_alarm.
  */
 struct counter_config_info {
-	u32_t max_top_value;
-	u32_t freq;
-	u8_t flags;
-	u8_t channels;
+	uint32_t max_top_value;
+	uint32_t freq;
+	uint8_t flags;
+	uint8_t channels;
 };
 
 typedef int (*counter_api_start)(struct device *dev);
 typedef int (*counter_api_stop)(struct device *dev);
-typedef int (*counter_api_get_value)(struct device *dev, u32_t *ticks);
-typedef int (*counter_api_set_alarm)(struct device *dev, u8_t chan_id,
+typedef int (*counter_api_get_value)(struct device *dev, uint32_t *ticks);
+typedef int (*counter_api_set_alarm)(struct device *dev, uint8_t chan_id,
 				const struct counter_alarm_cfg *alarm_cfg);
-typedef int (*counter_api_cancel_alarm)(struct device *dev, u8_t chan_id);
+typedef int (*counter_api_cancel_alarm)(struct device *dev, uint8_t chan_id);
 typedef int (*counter_api_set_top_value)(struct device *dev,
 					 const struct counter_top_cfg *cfg);
-typedef u32_t (*counter_api_get_pending_int)(struct device *dev);
-typedef u32_t (*counter_api_get_top_value)(struct device *dev);
-typedef u32_t (*counter_api_get_max_relative_alarm)(struct device *dev);
-typedef u32_t (*counter_api_get_guard_period)(struct device *dev, u32_t flags);
-typedef int (*counter_api_set_guard_period)(struct device *dev, u32_t ticks,
-						u32_t flags);
+typedef uint32_t (*counter_api_get_pending_int)(struct device *dev);
+typedef uint32_t (*counter_api_get_top_value)(struct device *dev);
+typedef uint32_t (*counter_api_get_max_relative_alarm)(struct device *dev);
+typedef uint32_t (*counter_api_get_guard_period)(struct device *dev, uint32_t flags);
+typedef int (*counter_api_set_guard_period)(struct device *dev, uint32_t ticks,
+						uint32_t flags);
 
 __subsystem struct counter_driver_api {
 	counter_api_start start;
@@ -223,9 +223,9 @@ static inline bool z_impl_counter_is_counting_up(const struct device *dev)
  *
  * @return Number of alarm channels.
  */
-__syscall u8_t counter_get_num_of_channels(const struct device *dev);
+__syscall uint8_t counter_get_num_of_channels(const struct device *dev);
 
-static inline u8_t z_impl_counter_get_num_of_channels(const struct device *dev)
+static inline uint8_t z_impl_counter_get_num_of_channels(const struct device *dev)
 {
 	const struct counter_config_info *config =
 			(const struct counter_config_info *)dev->config_info;
@@ -241,9 +241,9 @@ static inline u8_t z_impl_counter_get_num_of_channels(const struct device *dev)
  * @return Frequency of the counter in Hz, or zero if the counter does
  * not have a fixed frequency.
  */
-__syscall u32_t counter_get_frequency(const struct device *dev);
+__syscall uint32_t counter_get_frequency(const struct device *dev);
 
-static inline u32_t z_impl_counter_get_frequency(const struct device *dev)
+static inline uint32_t z_impl_counter_get_frequency(const struct device *dev)
 {
 	const struct counter_config_info *config =
 			(const struct counter_config_info *)dev->config_info;
@@ -259,16 +259,16 @@ static inline u32_t z_impl_counter_get_frequency(const struct device *dev)
  *
  * @return Converted ticks. Ticks will be saturated if exceed 32 bits.
  */
-__syscall u32_t counter_us_to_ticks(const struct device *dev, u64_t us);
+__syscall uint32_t counter_us_to_ticks(const struct device *dev, uint64_t us);
 
-static inline u32_t z_impl_counter_us_to_ticks(const struct device *dev,
-					       u64_t us)
+static inline uint32_t z_impl_counter_us_to_ticks(const struct device *dev,
+					       uint64_t us)
 {
 	const struct counter_config_info *config =
 			(const struct counter_config_info *)dev->config_info;
-	u64_t ticks = (us * config->freq) / USEC_PER_SEC;
+	uint64_t ticks = (us * config->freq) / USEC_PER_SEC;
 
-	return (ticks > (u64_t)UINT32_MAX) ? UINT32_MAX : ticks;
+	return (ticks > (uint64_t)UINT32_MAX) ? UINT32_MAX : ticks;
 }
 
 /**
@@ -279,15 +279,15 @@ static inline u32_t z_impl_counter_us_to_ticks(const struct device *dev,
  *
  * @return Converted microseconds.
  */
-__syscall u64_t counter_ticks_to_us(const struct device *dev, u32_t ticks);
+__syscall uint64_t counter_ticks_to_us(const struct device *dev, uint32_t ticks);
 
-static inline u64_t z_impl_counter_ticks_to_us(const struct device *dev,
-					       u32_t ticks)
+static inline uint64_t z_impl_counter_ticks_to_us(const struct device *dev,
+					       uint32_t ticks)
 {
 	const struct counter_config_info *config =
 			(const struct counter_config_info *)dev->config_info;
 
-	return ((u64_t)ticks * USEC_PER_SEC) / config->freq;
+	return ((uint64_t)ticks * USEC_PER_SEC) / config->freq;
 }
 
 /**
@@ -297,9 +297,9 @@ static inline u64_t z_impl_counter_ticks_to_us(const struct device *dev,
  *
  * @return Max top value.
  */
-__syscall u32_t counter_get_max_top_value(const struct device *dev);
+__syscall uint32_t counter_get_max_top_value(const struct device *dev);
 
-static inline u32_t z_impl_counter_get_max_top_value(const struct device *dev)
+static inline uint32_t z_impl_counter_get_max_top_value(const struct device *dev)
 {
 	const struct counter_config_info *config =
 			(const struct counter_config_info *)dev->config_info;
@@ -352,9 +352,9 @@ static inline int z_impl_counter_stop(struct device *dev)
  * @retval 0 If successful.
  * @retval Negative error code on failure getting the counter value
  */
-__syscall int counter_get_value(struct device *dev, u32_t *ticks);
+__syscall int counter_get_value(struct device *dev, uint32_t *ticks);
 
-static inline int z_impl_counter_get_value(struct device *dev, u32_t *ticks)
+static inline int z_impl_counter_get_value(struct device *dev, uint32_t *ticks)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -381,11 +381,11 @@ static inline int z_impl_counter_get_value(struct device *dev, u32_t *ticks)
  * @retval -EINVAL if alarm settings are invalid.
  * @retval -ETIME  if absolute alarm was set too late.
  */
-__syscall int counter_set_channel_alarm(struct device *dev, u8_t chan_id,
+__syscall int counter_set_channel_alarm(struct device *dev, uint8_t chan_id,
 				const struct counter_alarm_cfg *alarm_cfg);
 
 static inline int z_impl_counter_set_channel_alarm(struct device *dev,
-			u8_t chan_id, const struct counter_alarm_cfg *alarm_cfg)
+			uint8_t chan_id, const struct counter_alarm_cfg *alarm_cfg)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -409,10 +409,10 @@ static inline int z_impl_counter_set_channel_alarm(struct device *dev,
  * @retval -ENOTSUP if request is not supported or the counter was not started
  *		    yet.
  */
-__syscall int counter_cancel_channel_alarm(struct device *dev, u8_t chan_id);
+__syscall int counter_cancel_channel_alarm(struct device *dev, uint8_t chan_id);
 
 static inline int z_impl_counter_cancel_channel_alarm(struct device *dev,
-						      u8_t chan_id)
+						      uint8_t chan_id)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -495,9 +495,9 @@ static inline int z_impl_counter_get_pending_int(struct device *dev)
  *
  * @return Top value.
  */
-__syscall u32_t counter_get_top_value(struct device *dev);
+__syscall uint32_t counter_get_top_value(struct device *dev);
 
-static inline u32_t z_impl_counter_get_top_value(struct device *dev)
+static inline uint32_t z_impl_counter_get_top_value(struct device *dev)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -513,9 +513,9 @@ static inline u32_t z_impl_counter_get_top_value(struct device *dev)
  *
  * @return Max alarm value.
  */
-__deprecated __syscall u32_t counter_get_max_relative_alarm(struct device *dev);
+__deprecated __syscall uint32_t counter_get_max_relative_alarm(struct device *dev);
 
-static inline u32_t z_impl_counter_get_max_relative_alarm(struct device *dev)
+static inline uint32_t z_impl_counter_get_max_relative_alarm(struct device *dev)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -551,11 +551,11 @@ static inline u32_t z_impl_counter_get_max_relative_alarm(struct device *dev)
  * @retval -ENOTSUP if function or flags are not supported.
  * @retval -EINVAL if ticks value is invalid.
  */
-__syscall int counter_set_guard_period(struct device *dev, u32_t ticks,
-					u32_t flags);
+__syscall int counter_set_guard_period(struct device *dev, uint32_t ticks,
+					uint32_t flags);
 
 static inline int z_impl_counter_set_guard_period(struct device *dev,
-						   u32_t ticks, u32_t flags)
+						   uint32_t ticks, uint32_t flags)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -578,10 +578,10 @@ static inline int z_impl_counter_set_guard_period(struct device *dev,
  * @return Guard period given in counter ticks or 0 if function or flags are
  *	   not supported.
  */
-__syscall u32_t counter_get_guard_period(struct device *dev, u32_t flags);
+__syscall uint32_t counter_get_guard_period(struct device *dev, uint32_t flags);
 
-static inline u32_t z_impl_counter_get_guard_period(struct device *dev,
-							u32_t flags)
+static inline uint32_t z_impl_counter_get_guard_period(struct device *dev,
+							uint32_t flags)
 {
 	const struct counter_driver_api *api =
 				(struct counter_driver_api *)dev->driver_api;
@@ -593,9 +593,9 @@ static inline u32_t z_impl_counter_get_guard_period(struct device *dev,
 typedef void (*counter_callback_t)(struct device *dev, void *user_data);
 
 /* Deprecated counter read function. Use counter_get_value() instead. */
-__deprecated static inline u32_t counter_read(struct device *dev)
+__deprecated static inline uint32_t counter_read(struct device *dev)
 {
-	u32_t ticks;
+	uint32_t ticks;
 
 	if (counter_get_value(dev, &ticks) == 0) {
 		return ticks;
diff --git a/include/drivers/dac.h b/include/drivers/dac.h
index a52a5b9f84..e17766cd4a 100644
--- a/include/drivers/dac.h
+++ b/include/drivers/dac.h
@@ -34,8 +34,8 @@ extern "C" {
  *                   capabilities).
  */
 struct dac_channel_cfg {
-	u8_t channel_id;
-	u8_t resolution;
+	uint8_t channel_id;
+	uint8_t resolution;
 };
 
 /**
@@ -56,7 +56,7 @@ typedef int (*dac_api_channel_setup)(struct device *dev,
  * See dac_write_value() for argument descriptions.
  */
 typedef int (*dac_api_write_value)(struct device *dev,
-				    u8_t channel, u32_t value);
+				    uint8_t channel, uint32_t value);
 
 /*
  * DAC driver API
@@ -107,10 +107,10 @@ static inline int z_impl_dac_channel_setup(struct device *dev,
  * @retval 0        On success.
  * @retval -EINVAL  If a parameter with an invalid value has been provided.
  */
-__syscall int dac_write_value(struct device *dev, u8_t channel, u32_t value);
+__syscall int dac_write_value(struct device *dev, uint8_t channel, uint32_t value);
 
 static inline int z_impl_dac_write_value(struct device *dev,
-						u8_t channel, u32_t value)
+						uint8_t channel, uint32_t value)
 {
 	const struct dac_driver_api *api =
 				(const struct dac_driver_api *)dev->driver_api;
diff --git a/include/drivers/display.h b/include/drivers/display.h
index 1608ae2266..3b42fd4fd8 100644
--- a/include/drivers/display.h
+++ b/include/drivers/display.h
@@ -81,16 +81,16 @@ enum display_orientation {
  * @struct display_capabilities
  * @brief Structure holding display capabilities
  *
- * @var u16_t display_capabilities::x_resolution
+ * @var uint16_t display_capabilities::x_resolution
  * Display resolution in the X direction
  *
- * @var u16_t display_capabilities::y_resolution
+ * @var uint16_t display_capabilities::y_resolution
  * Display resolution in the Y direction
  *
- * @var u32_t display_capabilities::supported_pixel_formats
+ * @var uint32_t display_capabilities::supported_pixel_formats
  * Bitwise or of pixel formats supported by the display
  *
- * @var u32_t display_capabilities::screen_info
+ * @var uint32_t display_capabilities::screen_info
  * Information about display panel
  *
  * @var enum display_pixel_format display_capabilities::current_pixel_format
@@ -101,10 +101,10 @@ enum display_orientation {
  *
  */
 struct display_capabilities {
-	u16_t x_resolution;
-	u16_t y_resolution;
-	u32_t supported_pixel_formats;
-	u32_t screen_info;
+	uint16_t x_resolution;
+	uint16_t y_resolution;
+	uint32_t supported_pixel_formats;
+	uint32_t screen_info;
 	enum display_pixel_format current_pixel_format;
 	enum display_orientation current_orientation;
 };
@@ -113,24 +113,24 @@ struct display_capabilities {
  * @struct display_buffer_descriptor
  * @brief Structure to describe display data buffer layout
  *
- * @var u32_t display_buffer_descriptor::buf_size
+ * @var uint32_t display_buffer_descriptor::buf_size
  * Data buffer size in bytes
  *
- * @var u16_t display_buffer_descriptor::width
+ * @var uint16_t display_buffer_descriptor::width
  * Data buffer row width in pixels
  *
- * @var u16_t display_buffer_descriptor::height
+ * @var uint16_t display_buffer_descriptor::height
  * Data buffer column height in pixels
  *
- * @var u16_t display_buffer_descriptor::pitch
+ * @var uint16_t display_buffer_descriptor::pitch
  * Number of pixels between consecutive rows in the data buffer
  *
  */
 struct display_buffer_descriptor {
-	u32_t buf_size;
-	u16_t width;
-	u16_t height;
-	u16_t pitch;
+	uint32_t buf_size;
+	uint16_t width;
+	uint16_t height;
+	uint16_t pitch;
 };
 
 /**
@@ -152,8 +152,8 @@ typedef int (*display_blanking_off_api)(const struct device *dev);
  * @brief Callback API for writing data to the display
  * See display_write() for argument description
  */
-typedef int (*display_write_api)(const struct device *dev, const u16_t x,
-				 const u16_t y,
+typedef int (*display_write_api)(const struct device *dev, const uint16_t x,
+				 const uint16_t y,
 				 const struct display_buffer_descriptor *desc,
 				 const void *buf);
 
@@ -162,8 +162,8 @@ typedef int (*display_write_api)(const struct device *dev, const u16_t x,
  * @brief Callback API for reading data from the display
  * See display_read() for argument description
  */
-typedef int (*display_read_api)(const struct device *dev, const u16_t x,
-				const u16_t y,
+typedef int (*display_read_api)(const struct device *dev, const uint16_t x,
+				const uint16_t y,
 				const struct display_buffer_descriptor *desc,
 				void *buf);
 
@@ -180,7 +180,7 @@ typedef void *(*display_get_framebuffer_api)(const struct device *dev);
  * See display_set_brightness() for argument description
  */
 typedef int (*display_set_brightness_api)(const struct device *dev,
-					  const u8_t brightness);
+					  const uint8_t brightness);
 
 /**
  * @typedef display_set_contrast_api
@@ -188,7 +188,7 @@ typedef int (*display_set_brightness_api)(const struct device *dev,
  * See display_set_contrast() for argument description
  */
 typedef int (*display_set_contrast_api)(const struct device *dev,
-					const u8_t contrast);
+					const uint8_t contrast);
 
 /**
  * @typedef display_get_capabilities_api
@@ -245,8 +245,8 @@ struct display_driver_api {
  *
  * @retval 0 on success else negative errno code.
  */
-static inline int display_write(const struct device *dev, const u16_t x,
-				const u16_t y,
+static inline int display_write(const struct device *dev, const uint16_t x,
+				const uint16_t y,
 				const struct display_buffer_descriptor *desc,
 				const void *buf)
 {
@@ -267,8 +267,8 @@ static inline int display_write(const struct device *dev, const u16_t x,
  *
  * @retval 0 on success else negative errno code.
  */
-static inline int display_read(const struct device *dev, const u16_t x,
-			       const u16_t y,
+static inline int display_read(const struct device *dev, const uint16_t x,
+			       const uint16_t y,
 			       const struct display_buffer_descriptor *desc,
 			       void *buf)
 {
@@ -352,7 +352,7 @@ static inline int display_blanking_off(const struct device *dev)
  * @retval 0 on success else negative errno code.
  */
 static inline int display_set_brightness(const struct device *dev,
-					 u8_t brightness)
+					 uint8_t brightness)
 {
 	struct display_driver_api *api =
 		(struct display_driver_api *)dev->driver_api;
@@ -371,7 +371,7 @@ static inline int display_set_brightness(const struct device *dev,
  *
  * @retval 0 on success else negative errno code.
  */
-static inline int display_set_contrast(const struct device *dev, u8_t contrast)
+static inline int display_set_contrast(const struct device *dev, uint8_t contrast)
 {
 	struct display_driver_api *api =
 		(struct display_driver_api *)dev->driver_api;
diff --git a/include/drivers/dma.h b/include/drivers/dma.h
index 11c0bd0a3d..9053b08ac3 100644
--- a/include/drivers/dma.h
+++ b/include/drivers/dma.h
@@ -76,23 +76,23 @@ enum dma_addr_adj {
  *     reserved           [ 13 : 15 ]
  */
 struct dma_block_config {
-	u32_t source_address;
-	u32_t source_gather_interval;
-	u32_t dest_address;
-	u32_t dest_scatter_interval;
-	u16_t dest_scatter_count;
-	u16_t source_gather_count;
-	u32_t block_size;
+	uint32_t source_address;
+	uint32_t source_gather_interval;
+	uint32_t dest_address;
+	uint32_t dest_scatter_interval;
+	uint16_t dest_scatter_count;
+	uint16_t source_gather_count;
+	uint32_t block_size;
 	struct dma_block_config *next_block;
-	u16_t  source_gather_en :  1;
-	u16_t  dest_scatter_en :   1;
-	u16_t  source_addr_adj :   2;
-	u16_t  dest_addr_adj :     2;
-	u16_t  source_reload_en :  1;
-	u16_t  dest_reload_en :    1;
-	u16_t  fifo_mode_control : 4;
-	u16_t  flow_control_mode : 1;
-	u16_t  reserved :          3;
+	uint16_t  source_gather_en :  1;
+	uint16_t  dest_scatter_en :   1;
+	uint16_t  source_addr_adj :   2;
+	uint16_t  dest_addr_adj :     2;
+	uint16_t  source_reload_en :  1;
+	uint16_t  dest_reload_en :    1;
+	uint16_t  fifo_mode_control : 4;
+	uint16_t  flow_control_mode : 1;
+	uint16_t  reserved :          3;
 };
 
 /**
@@ -133,24 +133,24 @@ struct dma_block_config {
  *              (error_code: zero-transfer success, non zero-error happens).
  */
 struct dma_config {
-	u32_t  dma_slot :             6;
-	u32_t  channel_direction :    3;
-	u32_t  complete_callback_en : 1;
-	u32_t  error_callback_en :    1;
-	u32_t  source_handshake :     1;
-	u32_t  dest_handshake :       1;
-	u32_t  channel_priority :     4;
-	u32_t  source_chaining_en :   1;
-	u32_t  dest_chaining_en :     1;
-	u32_t  reserved :            13;
-	u32_t  source_data_size :    16;
-	u32_t  dest_data_size :      16;
-	u32_t  source_burst_length : 16;
-	u32_t  dest_burst_length :   16;
-	u32_t block_count;
+	uint32_t  dma_slot :             6;
+	uint32_t  channel_direction :    3;
+	uint32_t  complete_callback_en : 1;
+	uint32_t  error_callback_en :    1;
+	uint32_t  source_handshake :     1;
+	uint32_t  dest_handshake :       1;
+	uint32_t  channel_priority :     4;
+	uint32_t  source_chaining_en :   1;
+	uint32_t  dest_chaining_en :     1;
+	uint32_t  reserved :            13;
+	uint32_t  source_data_size :    16;
+	uint32_t  dest_data_size :      16;
+	uint32_t  source_burst_length : 16;
+	uint32_t  dest_burst_length :   16;
+	uint32_t block_count;
 	struct dma_block_config *head_block;
 	void *callback_arg;
-	void (*dma_callback)(void *callback_arg, u32_t channel,
+	void (*dma_callback)(void *callback_arg, uint32_t channel,
 			     int error_code);
 };
 
@@ -166,7 +166,7 @@ struct dma_config {
 struct dma_status {
 	bool busy;
 	enum dma_channel_direction dir;
-	u32_t pending_length;
+	uint32_t pending_length;
 };
 
 /**
@@ -176,17 +176,17 @@ struct dma_status {
  * public documentation.
  */
 
-typedef int (*dma_api_config)(struct device *dev, u32_t channel,
+typedef int (*dma_api_config)(struct device *dev, uint32_t channel,
 			      struct dma_config *config);
 
-typedef int (*dma_api_reload)(struct device *dev, u32_t channel,
-		u32_t src, u32_t dst, size_t size);
+typedef int (*dma_api_reload)(struct device *dev, uint32_t channel,
+		uint32_t src, uint32_t dst, size_t size);
 
-typedef int (*dma_api_start)(struct device *dev, u32_t channel);
+typedef int (*dma_api_start)(struct device *dev, uint32_t channel);
 
-typedef int (*dma_api_stop)(struct device *dev, u32_t channel);
+typedef int (*dma_api_stop)(struct device *dev, uint32_t channel);
 
-typedef int (*dma_api_get_status)(struct device *dev, u32_t channel,
+typedef int (*dma_api_get_status)(struct device *dev, uint32_t channel,
 				  struct dma_status *status);
 
 __subsystem struct dma_driver_api {
@@ -211,7 +211,7 @@ __subsystem struct dma_driver_api {
  * @retval 0 if successful.
  * @retval Negative errno code if failure.
  */
-static inline int dma_config(struct device *dev, u32_t channel,
+static inline int dma_config(struct device *dev, uint32_t channel,
 			     struct dma_config *config)
 {
 	const struct dma_driver_api *api =
@@ -233,8 +233,8 @@ static inline int dma_config(struct device *dev, u32_t channel,
  * @retval 0 if successful.
  * @retval Negative errno code if failure.
  */
-static inline int dma_reload(struct device *dev, u32_t channel,
-		u32_t src, u32_t dst, size_t size)
+static inline int dma_reload(struct device *dev, uint32_t channel,
+		uint32_t src, uint32_t dst, size_t size)
 {
 	const struct dma_driver_api *api =
 		(const struct dma_driver_api *)dev->driver_api;
@@ -260,9 +260,9 @@ static inline int dma_reload(struct device *dev, u32_t channel,
  * @retval 0 if successful.
  * @retval Negative errno code if failure.
  */
-__syscall int dma_start(struct device *dev, u32_t channel);
+__syscall int dma_start(struct device *dev, uint32_t channel);
 
-static inline int z_impl_dma_start(struct device *dev, u32_t channel)
+static inline int z_impl_dma_start(struct device *dev, uint32_t channel)
 {
 	const struct dma_driver_api *api =
 		(const struct dma_driver_api *)dev->driver_api;
@@ -283,9 +283,9 @@ static inline int z_impl_dma_start(struct device *dev, u32_t channel)
  * @retval 0 if successful.
  * @retval Negative errno code if failure.
  */
-__syscall int dma_stop(struct device *dev, u32_t channel);
+__syscall int dma_stop(struct device *dev, uint32_t channel);
 
-static inline int z_impl_dma_stop(struct device *dev, u32_t channel)
+static inline int z_impl_dma_stop(struct device *dev, uint32_t channel)
 {
 	const struct dma_driver_api *api =
 		(const struct dma_driver_api *)dev->driver_api;
@@ -307,7 +307,7 @@ static inline int z_impl_dma_stop(struct device *dev, u32_t channel)
  * @retval non-negative if successful.
  * @retval Negative errno code if failure.
  */
-static inline int dma_get_status(struct device *dev, u32_t channel,
+static inline int dma_get_status(struct device *dev, uint32_t channel,
 				 struct dma_status *stat)
 {
 	const struct dma_driver_api *api =
@@ -333,7 +333,7 @@ static inline int dma_get_status(struct device *dev, u32_t channel,
  *
  * @retval common DMA index to be placed into registers.
  */
-static inline u32_t dma_width_index(u32_t size)
+static inline uint32_t dma_width_index(uint32_t size)
 {
 	/* Check boundaries (max supported width is 32 Bytes) */
 	if (size < 1 || size > 32) {
@@ -362,7 +362,7 @@ static inline u32_t dma_width_index(u32_t size)
  *
  * @retval common DMA index to be placed into registers.
  */
-static inline u32_t dma_burst_index(u32_t burst)
+static inline uint32_t dma_burst_index(uint32_t burst)
 {
 	/* Check boundaries (max supported burst length is 256) */
 	if (burst < 1 || burst > 256) {
diff --git a/include/drivers/entropy.h b/include/drivers/entropy.h
index 0891ecebf9..6af011e516 100644
--- a/include/drivers/entropy.h
+++ b/include/drivers/entropy.h
@@ -34,8 +34,8 @@ extern "C" {
  * See entropy_get_entropy() for argument description
  */
 typedef int (*entropy_get_entropy_t)(struct device *dev,
-				    u8_t *buffer,
-				    u16_t length);
+				    uint8_t *buffer,
+				    uint16_t length);
 /**
  * @typedef entropy_get_entropy_isr_t
  * @brief Callback API to get entropy from an ISR.
@@ -43,9 +43,9 @@ typedef int (*entropy_get_entropy_t)(struct device *dev,
  * See entropy_get_entropy_isr() for argument description
  */
 typedef int (*entropy_get_entropy_isr_t)(struct device *dev,
-					 u8_t *buffer,
-					 u16_t length,
-					 u32_t flags);
+					 uint8_t *buffer,
+					 uint16_t length,
+					 uint32_t flags);
 __subsystem struct entropy_driver_api {
 	entropy_get_entropy_t     get_entropy;
 	entropy_get_entropy_isr_t get_entropy_isr;
@@ -62,12 +62,12 @@ __subsystem struct entropy_driver_api {
  * @retval -ERRNO errno code on error.
  */
 __syscall int entropy_get_entropy(struct device *dev,
-				  u8_t *buffer,
-				  u16_t length);
+				  uint8_t *buffer,
+				  uint16_t length);
 
 static inline int z_impl_entropy_get_entropy(struct device *dev,
-					    u8_t *buffer,
-					    u16_t length)
+					    uint8_t *buffer,
+					    uint16_t length)
 {
 	const struct entropy_driver_api *api =
 		(const struct entropy_driver_api *)dev->driver_api;
@@ -91,9 +91,9 @@ static inline int z_impl_entropy_get_entropy(struct device *dev,
  * @retval number of bytes filled with entropy or -error.
  */
 static inline int entropy_get_entropy_isr(struct device *dev,
-					  u8_t *buffer,
-					  u16_t length,
-					  u32_t flags)
+					  uint8_t *buffer,
+					  uint16_t length,
+					  uint32_t flags)
 {
 	const struct entropy_driver_api *api =
 		(const struct entropy_driver_api *)dev->driver_api;
diff --git a/include/drivers/espi.h b/include/drivers/espi.h
index f5d7d93ea5..b02843a435 100644
--- a/include/drivers/espi.h
+++ b/include/drivers/espi.h
@@ -228,9 +228,9 @@ struct espi_event {
 	/** Event type */
 	enum espi_bus_event evt_type;
 	/** Additional details for bus event type */
-	u32_t evt_details;
+	uint32_t evt_details;
 	/** Data associated to the event */
-	u32_t evt_data;
+	uint32_t evt_data;
 };
 
 /**
@@ -242,7 +242,7 @@ struct espi_cfg {
 	/** Supported channels */
 	enum espi_channel channel_caps;
 	/** Maximum supported frequency in MHz */
-	u8_t max_freq;
+	uint8_t max_freq;
 };
 
 /**
@@ -250,27 +250,27 @@ struct espi_cfg {
  */
 struct espi_request_packet {
 	enum espi_cycle_type cycle_type;
-	u8_t tag;
-	u16_t len;
-	u32_t address;
-	u8_t *data;
+	uint8_t tag;
+	uint16_t len;
+	uint32_t address;
+	uint8_t *data;
 };
 
 /**
  * @brief eSPI out-of-band transaction packet format
  */
 struct espi_oob_packet {
-	u8_t *buf;
-	u16_t len;
+	uint8_t *buf;
+	uint16_t len;
 };
 
 /**
  * @brief eSPI flash transactions packet format
  */
 struct espi_flash_packet {
-	u8_t *buf;
-	u32_t flash_addr;
-	u16_t len;
+	uint8_t *buf;
+	uint32_t flash_addr;
+	uint16_t len;
 };
 
 struct espi_callback;
@@ -330,16 +330,16 @@ typedef int (*espi_api_read_request)(struct device *dev,
 typedef int (*espi_api_write_request)(struct device *dev,
 				      struct espi_request_packet *req);
 typedef int (*espi_api_lpc_read_request)(struct device *dev,
-				enum lpc_peripheral_opcode op, u32_t *data);
+				enum lpc_peripheral_opcode op, uint32_t *data);
 typedef int (*espi_api_lpc_write_request)(struct device *dev,
-				enum lpc_peripheral_opcode op, u32_t *data);
+				enum lpc_peripheral_opcode op, uint32_t *data);
 /* Logical Channel 1 APIs */
 typedef int (*espi_api_send_vwire)(struct device *dev,
 				   enum espi_vwire_signal vw,
-				   u8_t level);
+				   uint8_t level);
 typedef int (*espi_api_receive_vwire)(struct device *dev,
 				      enum espi_vwire_signal vw,
-				      u8_t *level);
+				      uint8_t *level);
 /* Logical Channel 2 APIs */
 typedef int (*espi_api_send_oob)(struct device *dev,
 				 struct espi_oob_packet *pckt);
@@ -536,11 +536,11 @@ static inline int z_impl_espi_write_request(struct device *dev,
  * @retval -EINVAL for unimplemented lpc opcode, but in range.
  */
 __syscall int espi_read_lpc_request(struct device *dev,
-				enum lpc_peripheral_opcode op, u32_t *data);
+				enum lpc_peripheral_opcode op, uint32_t *data);
 
 static inline int z_impl_espi_read_lpc_request(struct device *dev,
 					       enum lpc_peripheral_opcode op,
-					       u32_t *data)
+					       uint32_t *data)
 {
 	const struct espi_driver_api *api =
 		(const struct espi_driver_api *)dev->driver_api;
@@ -569,11 +569,11 @@ static inline int z_impl_espi_read_lpc_request(struct device *dev,
  */
 __syscall int espi_write_lpc_request(struct device *dev,
 				     enum lpc_peripheral_opcode op,
-				     u32_t *data);
+				     uint32_t *data);
 
 static inline int z_impl_espi_write_lpc_request(struct device *dev,
 						enum lpc_peripheral_opcode op,
-						u32_t *data)
+						uint32_t *data)
 {
 	const struct espi_driver_api *api =
 		(const struct espi_driver_api *)dev->driver_api;
@@ -600,11 +600,11 @@ static inline int z_impl_espi_write_lpc_request(struct device *dev,
  */
 __syscall int espi_send_vwire(struct device *dev,
 			      enum espi_vwire_signal signal,
-			      u8_t level);
+			      uint8_t level);
 
 static inline int z_impl_espi_send_vwire(struct device *dev,
 					 enum espi_vwire_signal signal,
-					 u8_t level)
+					 uint8_t level)
 {
 	const struct espi_driver_api *api =
 		(const struct espi_driver_api *)dev->driver_api;
@@ -626,11 +626,11 @@ static inline int z_impl_espi_send_vwire(struct device *dev,
  */
 __syscall int espi_receive_vwire(struct device *dev,
 				 enum espi_vwire_signal signal,
-				 u8_t *level);
+				 uint8_t *level);
 
 static inline int z_impl_espi_receive_vwire(struct device *dev,
 					    enum espi_vwire_signal signal,
-					    u8_t *level)
+					    uint8_t *level)
 {
 	const struct espi_driver_api *api =
 		(const struct espi_driver_api *)dev->driver_api;
diff --git a/include/drivers/flash.h b/include/drivers/flash.h
index 04d83b0c58..336c863410 100644
--- a/include/drivers/flash.h
+++ b/include/drivers/flash.h
@@ -211,7 +211,7 @@ static inline int z_impl_flash_write_protection_set(struct device *dev,
 struct flash_pages_info {
 	off_t start_offset; /* offset from the base of flash address */
 	size_t size;
-	u32_t index;
+	uint32_t index;
 };
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
@@ -236,7 +236,7 @@ __syscall int flash_get_page_info_by_offs(struct device *dev, off_t offset,
  *
  *  @return  0 on success, -EINVAL  if page of the index doesn't exist.
  */
-__syscall int flash_get_page_info_by_idx(struct device *dev, u32_t page_index,
+__syscall int flash_get_page_info_by_idx(struct device *dev, uint32_t page_index,
 					 struct flash_pages_info *info);
 
 /**
diff --git a/include/drivers/gna.h b/include/drivers/gna.h
index 49d660cbc9..f47130e018 100644
--- a/include/drivers/gna.h
+++ b/include/drivers/gna.h
@@ -39,19 +39,19 @@ struct gna_config {
  * Describes the key parameters of the neural network model
  */
 struct gna_model_header {
-	u32_t	labase_offset;
-	u32_t	model_size;
-	u32_t	gna_mode;
-	u32_t	layer_count;
-	u32_t	bytes_per_input;
-	u32_t	bytes_per_output;
-	u32_t	num_input_nodes;
-	u32_t	num_output_nodes;
-	u32_t	input_ptr_offset;
-	u32_t	output_ptr_offset;
-	u32_t	rw_region_size;
-	u32_t	input_scaling_factor;
-	u32_t	output_scaling_factor;
+	uint32_t	labase_offset;
+	uint32_t	model_size;
+	uint32_t	gna_mode;
+	uint32_t	layer_count;
+	uint32_t	bytes_per_input;
+	uint32_t	bytes_per_output;
+	uint32_t	num_input_nodes;
+	uint32_t	num_output_nodes;
+	uint32_t	input_ptr_offset;
+	uint32_t	output_ptr_offset;
+	uint32_t	rw_region_size;
+	uint32_t	input_scaling_factor;
+	uint32_t	output_scaling_factor;
 };
 
 /**
@@ -78,9 +78,9 @@ struct gna_inference_req {
  * Statistics of the inference operation returned after completion
  */
 struct gna_inference_stats {
-	u32_t total_cycles;
-	u32_t stall_cycles;
-	u32_t cycles_per_sec;
+	uint32_t total_cycles;
+	uint32_t stall_cycles;
+	uint32_t cycles_per_sec;
 };
 
 /**
diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h
index 99cf6b6d02..7aeec662c5 100644
--- a/include/drivers/gpio.h
+++ b/include/drivers/gpio.h
@@ -400,7 +400,7 @@ extern "C" {
  * The pin with index n is present in the set if and only if the bit
  * identified by (1U << n) is set.
  */
-typedef u32_t gpio_port_pins_t;
+typedef uint32_t gpio_port_pins_t;
 
 /**
  * @brief Provides values for a set of pins associated with a port.
@@ -413,7 +413,7 @@ typedef u32_t gpio_port_pins_t;
  * Values of this type are often paired with a `gpio_port_pins_t` value
  * that specifies which encoded pin values are valid for the operation.
  */
-typedef u32_t gpio_port_value_t;
+typedef uint32_t gpio_port_value_t;
 
 /**
  * @brief Provides a type to hold a GPIO pin index.
@@ -421,7 +421,7 @@ typedef u32_t gpio_port_value_t;
  * This reduced-size type is sufficient to record a pin number,
  * e.g. from a devicetree GPIOS property.
  */
-typedef u8_t gpio_pin_t;
+typedef uint8_t gpio_pin_t;
 
 /**
  * @brief Provides a type to hold GPIO devicetree flags.
@@ -430,7 +430,7 @@ typedef u8_t gpio_pin_t;
  * bits of the full flags field, so use a reduced-size type to record
  * that part of a GPIOS property.
  */
-typedef u8_t gpio_dt_flags_t;
+typedef uint8_t gpio_dt_flags_t;
 
 /**
  * @brief Provides a type to hold GPIO configuration flags.
@@ -438,7 +438,7 @@ typedef u8_t gpio_dt_flags_t;
  * This type is sufficient to hold all flags used to control GPIO
  * configuration, whether pin or interrupt.
  */
-typedef u32_t gpio_flags_t;
+typedef uint32_t gpio_flags_t;
 
 /**
  * @brief Maximum number of pins that are supported by `gpio_port_pins_t`.
@@ -559,7 +559,7 @@ __subsystem struct gpio_driver_api {
 			       bool set);
 	int (*enable_callback)(struct device *port, gpio_pin_t pin);
 	int (*disable_callback)(struct device *port, gpio_pin_t pin);
-	u32_t (*get_pending_int)(struct device *dev);
+	uint32_t (*get_pending_int)(struct device *dev);
 };
 
 __syscall int gpio_config(struct device *port, gpio_pin_t pin,
@@ -1205,7 +1205,7 @@ static inline int gpio_pin_toggle(struct device *port, gpio_pin_t pin)
 /* Deprecated in 2.2 release */
 __deprecated static inline int gpio_pin_write(struct device *port,
 					      gpio_pin_t pin,
-					      u32_t value)
+					      uint32_t value)
 {
 	return gpio_pin_set(port, pin, value != 0);
 }
@@ -1227,7 +1227,7 @@ __deprecated static inline int gpio_pin_write(struct device *port,
 /* Deprecated in 2.2 release */
 __deprecated static inline int gpio_pin_read(struct device *port,
 					     gpio_pin_t pin,
-					     u32_t *value)
+					     uint32_t *value)
 {
 	int rv = gpio_pin_get(port, pin);
 
diff --git a/include/drivers/gpio/gpio_mmio32.h b/include/drivers/gpio/gpio_mmio32.h
index 9135c27a09..ad1e2780e7 100644
--- a/include/drivers/gpio/gpio_mmio32.h
+++ b/include/drivers/gpio/gpio_mmio32.h
@@ -14,8 +14,8 @@
 struct gpio_mmio32_config {
 	/* gpio_driver_config needs to be first */
 	struct gpio_driver_config common;
-	volatile u32_t *reg;
-	u32_t mask;
+	volatile uint32_t *reg;
+	uint32_t mask;
 };
 
 struct gpio_mmio32_context {
@@ -49,7 +49,7 @@ static const struct gpio_mmio32_config _dev_name##_dev_cfg = {		\
 	.common = {							\
 		 .port_pin_mask = _mask,				\
 	},								\
-	.reg	= (volatile u32_t *)_address,				\
+	.reg	= (volatile uint32_t *)_address,				\
 	.mask	= _mask,						\
 };									\
 									\
diff --git a/include/drivers/hwinfo.h b/include/drivers/hwinfo.h
index d9dec16abb..0c659d1380 100644
--- a/include/drivers/hwinfo.h
+++ b/include/drivers/hwinfo.h
@@ -50,9 +50,9 @@ extern "C" {
  * @retval -ENOTSUP if there is no implementation for the particular device.
  * @retval any negative value on driver specific errors.
  */
-__syscall ssize_t hwinfo_get_device_id(u8_t *buffer, size_t length);
+__syscall ssize_t hwinfo_get_device_id(uint8_t *buffer, size_t length);
 
-ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length);
+ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length);
 
 /**
  * @}
diff --git a/include/drivers/i2c.h b/include/drivers/i2c.h
index e6d36ba54c..b20f3db089 100644
--- a/include/drivers/i2c.h
+++ b/include/drivers/i2c.h
@@ -112,13 +112,13 @@ extern "C" {
  */
 struct i2c_msg {
 	/** Data buffer in bytes */
-	u8_t		*buf;
+	uint8_t		*buf;
 
 	/** Length of buffer in bytes */
-	u32_t	len;
+	uint32_t	len;
 
 	/** Flags for this message */
-	u8_t		flags;
+	uint8_t		flags;
 };
 
 /**
@@ -132,11 +132,11 @@ struct i2c_slave_config;
 typedef int (*i2c_slave_write_requested_cb_t)(
 		struct i2c_slave_config *config);
 typedef int (*i2c_slave_read_requested_cb_t)(
-		struct i2c_slave_config *config, u8_t *val);
+		struct i2c_slave_config *config, uint8_t *val);
 typedef int (*i2c_slave_write_received_cb_t)(
-		struct i2c_slave_config *config, u8_t val);
+		struct i2c_slave_config *config, uint8_t val);
 typedef int (*i2c_slave_read_processed_cb_t)(
-		struct i2c_slave_config *config, u8_t *val);
+		struct i2c_slave_config *config, uint8_t *val);
 typedef int (*i2c_slave_stop_cb_t)(struct i2c_slave_config *config);
 
 struct i2c_slave_callbacks {
@@ -156,19 +156,19 @@ struct i2c_slave_config {
 	/** Private, do not modify */
 	sys_snode_t node;
 	/** Flags for the slave device defined by I2C_SLAVE_FLAGS_* constants */
-	u8_t flags;
+	uint8_t flags;
 	/** Address for this slave device */
-	u16_t address;
+	uint16_t address;
 	/** Callback functions */
 	const struct i2c_slave_callbacks *callbacks;
 };
 
 typedef int (*i2c_api_configure_t)(struct device *dev,
-				   u32_t dev_config);
+				   uint32_t dev_config);
 typedef int (*i2c_api_full_io_t)(struct device *dev,
 				 struct i2c_msg *msgs,
-				 u8_t num_msgs,
-				 u16_t addr);
+				 uint8_t num_msgs,
+				 uint16_t addr);
 typedef int (*i2c_api_slave_register_t)(struct device *dev,
 					struct i2c_slave_config *cfg);
 typedef int (*i2c_api_slave_unregister_t)(struct device *dev,
@@ -205,9 +205,9 @@ struct i2c_slave_driver_api {
  * @retval 0 If successful.
  * @retval -EIO General input / output error, failed to configure device.
  */
-__syscall int i2c_configure(struct device *dev, u32_t dev_config);
+__syscall int i2c_configure(struct device *dev, uint32_t dev_config);
 
-static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config)
+static inline int z_impl_i2c_configure(struct device *dev, uint32_t dev_config)
 {
 	const struct i2c_driver_api *api =
 		(const struct i2c_driver_api *)dev->driver_api;
@@ -242,12 +242,12 @@ static inline int z_impl_i2c_configure(struct device *dev, u32_t dev_config)
  * @retval -EIO General input / output error.
  */
 __syscall int i2c_transfer(struct device *dev,
-			   struct i2c_msg *msgs, u8_t num_msgs,
-			   u16_t addr);
+			   struct i2c_msg *msgs, uint8_t num_msgs,
+			   uint16_t addr);
 
 static inline int z_impl_i2c_transfer(struct device *dev,
-				     struct i2c_msg *msgs, u8_t num_msgs,
-				     u16_t addr)
+				     struct i2c_msg *msgs, uint8_t num_msgs,
+				     uint16_t addr)
 {
 	const struct i2c_driver_api *api =
 		(const struct i2c_driver_api *)dev->driver_api;
@@ -405,12 +405,12 @@ static inline int z_impl_i2c_slave_driver_unregister(struct device *dev)
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_write(struct device *dev, const u8_t *buf,
-			    u32_t num_bytes, u16_t addr)
+static inline int i2c_write(struct device *dev, const uint8_t *buf,
+			    uint32_t num_bytes, uint16_t addr)
 {
 	struct i2c_msg msg;
 
-	msg.buf = (u8_t *)buf;
+	msg.buf = (uint8_t *)buf;
 	msg.len = num_bytes;
 	msg.flags = I2C_MSG_WRITE | I2C_MSG_STOP;
 
@@ -430,8 +430,8 @@ static inline int i2c_write(struct device *dev, const u8_t *buf,
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_read(struct device *dev, u8_t *buf,
-			   u32_t num_bytes, u16_t addr)
+static inline int i2c_read(struct device *dev, uint8_t *buf,
+			   uint32_t num_bytes, uint16_t addr)
 {
 	struct i2c_msg msg;
 
@@ -459,17 +459,17 @@ static inline int i2c_read(struct device *dev, u8_t *buf,
  * @retval 0 if successful
  * @retval negative on error.
  */
-static inline int i2c_write_read(struct device *dev, u16_t addr,
+static inline int i2c_write_read(struct device *dev, uint16_t addr,
 				 const void *write_buf, size_t num_write,
 				 void *read_buf, size_t num_read)
 {
 	struct i2c_msg msg[2];
 
-	msg[0].buf = (u8_t *)write_buf;
+	msg[0].buf = (uint8_t *)write_buf;
 	msg[0].len = num_write;
 	msg[0].flags = I2C_MSG_WRITE;
 
-	msg[1].buf = (u8_t *)read_buf;
+	msg[1].buf = (uint8_t *)read_buf;
 	msg[1].len = num_read;
 	msg[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
 
@@ -494,10 +494,10 @@ static inline int i2c_write_read(struct device *dev, u16_t addr,
  * @retval -EIO General input / output error.
  */
 static inline int i2c_burst_read(struct device *dev,
-				 u16_t dev_addr,
-				 u8_t start_addr,
-				 u8_t *buf,
-				 u32_t num_bytes)
+				 uint16_t dev_addr,
+				 uint8_t start_addr,
+				 uint8_t *buf,
+				 uint32_t num_bytes)
 {
 	return i2c_write_read(dev, dev_addr,
 			      &start_addr, sizeof(start_addr),
@@ -525,10 +525,10 @@ static inline int i2c_burst_read(struct device *dev,
  * @retval -EIO General input / output error.
  */
 static inline int i2c_burst_write(struct device *dev,
-				  u16_t dev_addr,
-				  u8_t start_addr,
-				  const u8_t *buf,
-				  u32_t num_bytes)
+				  uint16_t dev_addr,
+				  uint8_t start_addr,
+				  const uint8_t *buf,
+				  uint32_t num_bytes)
 {
 	struct i2c_msg msg[2];
 
@@ -536,7 +536,7 @@ static inline int i2c_burst_write(struct device *dev,
 	msg[0].len = 1U;
 	msg[0].flags = I2C_MSG_WRITE;
 
-	msg[1].buf = (u8_t *)buf;
+	msg[1].buf = (uint8_t *)buf;
 	msg[1].len = num_bytes;
 	msg[1].flags = I2C_MSG_WRITE | I2C_MSG_STOP;
 
@@ -557,8 +557,8 @@ static inline int i2c_burst_write(struct device *dev,
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr,
-				    u8_t reg_addr, u8_t *value)
+static inline int i2c_reg_read_byte(struct device *dev, uint16_t dev_addr,
+				    uint8_t reg_addr, uint8_t *value)
 {
 	return i2c_write_read(dev, dev_addr,
 			      &reg_addr, sizeof(reg_addr),
@@ -582,10 +582,10 @@ static inline int i2c_reg_read_byte(struct device *dev, u16_t dev_addr,
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr,
-				     u8_t reg_addr, u8_t value)
+static inline int i2c_reg_write_byte(struct device *dev, uint16_t dev_addr,
+				     uint8_t reg_addr, uint8_t value)
 {
-	u8_t tx_buf[2] = {reg_addr, value};
+	uint8_t tx_buf[2] = {reg_addr, value};
 
 	return i2c_write(dev, tx_buf, 2, dev_addr);
 }
@@ -608,11 +608,11 @@ static inline int i2c_reg_write_byte(struct device *dev, u16_t dev_addr,
  * @retval 0 If successful.
  * @retval -EIO General input / output error.
  */
-static inline int i2c_reg_update_byte(struct device *dev, u8_t dev_addr,
-				      u8_t reg_addr, u8_t mask,
-				      u8_t value)
+static inline int i2c_reg_update_byte(struct device *dev, uint8_t dev_addr,
+				      uint8_t reg_addr, uint8_t mask,
+				      uint8_t value)
 {
-	u8_t old_value, new_value;
+	uint8_t old_value, new_value;
 	int rc;
 
 	rc = i2c_reg_read_byte(dev, dev_addr, reg_addr, &old_value);
@@ -630,7 +630,7 @@ static inline int i2c_reg_update_byte(struct device *dev, u8_t dev_addr,
 
 struct i2c_client_config {
 	char *i2c_master;
-	u16_t i2c_addr;
+	uint16_t i2c_addr;
 };
 
 #define I2C_DECLARE_CLIENT_CONFIG	struct i2c_client_config i2c_client
diff --git a/include/drivers/i2c/slave/eeprom.h b/include/drivers/i2c/slave/eeprom.h
index d90bf92054..6e5dcd6c1e 100644
--- a/include/drivers/i2c/slave/eeprom.h
+++ b/include/drivers/i2c/slave/eeprom.h
@@ -29,7 +29,7 @@
  * @retval 0 If successful.
  * @retval -EINVAL Invalid data size
  */
-int eeprom_slave_program(struct device *dev, u8_t *eeprom_data,
+int eeprom_slave_program(struct device *dev, uint8_t *eeprom_data,
 			 unsigned int length);
 
 /**
@@ -42,7 +42,7 @@ int eeprom_slave_program(struct device *dev, u8_t *eeprom_data,
  * @retval 0 If successful.
  * @retval -EINVAL Invalid data pointer or offset
  */
-int eeprom_slave_read(struct device *dev, u8_t *eeprom_data,
+int eeprom_slave_read(struct device *dev, uint8_t *eeprom_data,
 		      unsigned int offset);
 
 /**
diff --git a/include/drivers/i2s.h b/include/drivers/i2s.h
index b15b1d2c8f..4b54985680 100644
--- a/include/drivers/i2s.h
+++ b/include/drivers/i2s.h
@@ -35,7 +35,7 @@ extern "C" {
  */
 
 
-typedef u8_t i2s_fmt_t;
+typedef uint8_t i2s_fmt_t;
 
 /** Data Format bit field position. */
 #define I2S_FMT_DATA_FORMAT_SHIFT           0
@@ -167,7 +167,7 @@ typedef u8_t i2s_fmt_t;
 #define I2S_FMT_CLK_IF_NB		(2 << I2S_FMT_CLK_FORMAT_SHIFT)
 #define I2S_FMT_CLK_IF_IB		(3 << I2S_FMT_CLK_FORMAT_SHIFT)
 
-typedef u8_t i2s_opt_t;
+typedef uint8_t i2s_opt_t;
 
 /** Run bit clock continuously */
 #define I2S_OPT_BIT_CLK_CONT                (0 << 0)
@@ -297,14 +297,14 @@ enum i2s_trigger_cmd {
  *        queue is full or RX queue is empty, or 0, or SYS_FOREVER_MS.
  */
 struct i2s_config {
-	u8_t word_size;
-	u8_t channels;
+	uint8_t word_size;
+	uint8_t channels;
 	i2s_fmt_t format;
 	i2s_opt_t options;
-	u32_t frame_clk_freq;
+	uint32_t frame_clk_freq;
 	struct k_mem_slab *mem_slab;
 	size_t block_size;
-	s32_t timeout;
+	int32_t timeout;
 };
 
 /**
diff --git a/include/drivers/ieee802154/cc1200.h b/include/drivers/ieee802154/cc1200.h
index 3c14e8b3e3..f184078f74 100644
--- a/include/drivers/ieee802154/cc1200.h
+++ b/include/drivers/ieee802154/cc1200.h
@@ -22,13 +22,13 @@
  *
  */
 struct cc1200_rf_registers_set {
-	u32_t chan_center_freq0;
-	u16_t channel_limit;
-	/* to fit in u16_t, spacing is a multiple of 100 Hz,
+	uint32_t chan_center_freq0;
+	uint16_t channel_limit;
+	/* to fit in uint16_t, spacing is a multiple of 100 Hz,
 	 * 12.5KHz for instance will be 125.
 	 */
-	u16_t channel_spacing;
-	u8_t registers[100];
+	uint16_t channel_spacing;
+	uint8_t registers[100];
 };
 
 #ifndef CONFIG_IEEE802154_CC1200_RF_PRESET
diff --git a/include/drivers/interrupt_controller/ioapic.h b/include/drivers/interrupt_controller/ioapic.h
index 94ff0bb82b..d4f61aeac7 100644
--- a/include/drivers/interrupt_controller/ioapic.h
+++ b/include/drivers/interrupt_controller/ioapic.h
@@ -38,7 +38,7 @@ extern "C" {
 void z_ioapic_irq_enable(unsigned int irq);
 void z_ioapic_irq_disable(unsigned int irq);
 void z_ioapic_int_vec_set(unsigned int irq, unsigned int vector);
-void z_ioapic_irq_set(unsigned int irq, unsigned int vector, u32_t flags);
+void z_ioapic_irq_set(unsigned int irq, unsigned int vector, uint32_t flags);
 #endif /* _ASMLANGUAGE */
 
 #ifdef __cplusplus
diff --git a/include/drivers/interrupt_controller/loapic.h b/include/drivers/interrupt_controller/loapic.h
index 5fbe066223..4f0c68c246 100644
--- a/include/drivers/interrupt_controller/loapic.h
+++ b/include/drivers/interrupt_controller/loapic.h
@@ -64,7 +64,7 @@ extern void z_loapic_irq_disable(unsigned int irq);
  *
  * @param reg the LOAPIC register number to read (LOAPIC_*)
  */
-static inline u64_t x86_read_x2apic(unsigned int reg)
+static inline uint64_t x86_read_x2apic(unsigned int reg)
 {
 	reg >>= 4;
 	return z_x86_msr_read(X86_X2APIC_BASE_MSR + reg);
@@ -75,7 +75,7 @@ static inline u64_t x86_read_x2apic(unsigned int reg)
  *
  * @param reg the LOAPIC register number to read (LOAPIC_*)
  */
-static inline u32_t x86_read_xapic(unsigned int reg)
+static inline uint32_t x86_read_xapic(unsigned int reg)
 {
 	return sys_read32(CONFIG_LOAPIC_BASE_ADDRESS + reg);
 }
@@ -90,7 +90,7 @@ static inline u32_t x86_read_xapic(unsigned int reg)
  *
  * @param reg the LOAPIC register number to read (LOAPIC_*)
  */
-static inline u32_t x86_read_loapic(unsigned int reg)
+static inline uint32_t x86_read_loapic(unsigned int reg)
 {
 #ifdef CONFIG_X2APIC
 	return x86_read_x2apic(reg);
@@ -105,7 +105,7 @@ static inline u32_t x86_read_loapic(unsigned int reg)
  * @param reg the LOAPIC register number to write (one of LOAPIC_*)
  * @param val 64-bit value to write
  */
-static inline void x86_write_x2apic(unsigned int reg, u64_t val)
+static inline void x86_write_x2apic(unsigned int reg, uint64_t val)
 {
 	reg >>= 4;
 	z_x86_msr_write(X86_X2APIC_BASE_MSR + reg, val);
@@ -117,7 +117,7 @@ static inline void x86_write_x2apic(unsigned int reg, u64_t val)
  * @param reg the LOAPIC register number to write (one of LOAPIC_*)
  * @param val 32-bit value to write
  */
-static inline void x86_write_xapic(unsigned int reg, u32_t val)
+static inline void x86_write_xapic(unsigned int reg, uint32_t val)
 {
 	sys_write32(val, CONFIG_LOAPIC_BASE_ADDRESS + reg);
 }
@@ -133,7 +133,7 @@ static inline void x86_write_xapic(unsigned int reg, u32_t val)
  * @param reg the LOAPIC register number to write (one of LOAPIC_*)
  * @param val 32-bit value to write
  */
-static inline void x86_write_loapic(unsigned int reg, u32_t val)
+static inline void x86_write_loapic(unsigned int reg, uint32_t val)
 {
 #ifdef CONFIG_X2APIC
 	x86_write_x2apic(reg, val);
@@ -149,7 +149,7 @@ static inline void x86_write_loapic(unsigned int reg, u32_t val)
  * @param ipi Type of IPI: one of the LOAPIC_ICR_IPI_* constants.
  * @param vector If applicable, the target vector (0 otherwise).
  */
-static inline void z_loapic_ipi(u8_t apic_id, u32_t ipi, u8_t vector)
+static inline void z_loapic_ipi(uint8_t apic_id, uint32_t ipi, uint8_t vector)
 {
 	ipi |= vector;
 
@@ -168,7 +168,7 @@ static inline void z_loapic_ipi(u8_t apic_id, u32_t ipi, u8_t vector)
 	 * x2APIC mode is greatly simplified: one write, no delivery status.
 	 */
 
-	x86_write_x2apic(LOAPIC_ICRLO, (((u64_t) apic_id) << 32) | ipi);
+	x86_write_x2apic(LOAPIC_ICRLO, (((uint64_t) apic_id) << 32) | ipi);
 #endif
 }
 
diff --git a/include/drivers/interrupt_controller/sam0_eic.h b/include/drivers/interrupt_controller/sam0_eic.h
index 0aa4e9f385..f53db81767 100644
--- a/include/drivers/interrupt_controller/sam0_eic.h
+++ b/include/drivers/interrupt_controller/sam0_eic.h
@@ -11,7 +11,7 @@
 #include <zephyr/types.h>
 
 /* callback for EIC interrupt */
-typedef void (*sam0_eic_callback_t)(u32_t pins, void *data);
+typedef void (*sam0_eic_callback_t)(uint32_t pins, void *data);
 
 /**
  * @brief EIC trigger condition
@@ -80,6 +80,6 @@ int sam0_eic_disable_interrupt(int port, int pin);
  *
  * @param port port index (A=0, etc)
  */
-u32_t sam0_eic_interrupt_pending(int port);
+uint32_t sam0_eic_interrupt_pending(int port);
 
 #endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_H_ */
diff --git a/include/drivers/interrupt_controller/sysapic.h b/include/drivers/interrupt_controller/sysapic.h
index 355815274b..2fff10fa91 100644
--- a/include/drivers/interrupt_controller/sysapic.h
+++ b/include/drivers/interrupt_controller/sysapic.h
@@ -22,7 +22,7 @@
 #define LOAPIC_IRQ_COUNT 6  /* Default to LOAPIC_TIMER to LOAPIC_ERROR */
 
 void z_irq_controller_irq_config(unsigned int vector, unsigned int irq,
-				 u32_t flags);
+				 uint32_t flags);
 
 int z_irq_controller_isr_vector_get(void);
 
diff --git a/include/drivers/ipm.h b/include/drivers/ipm.h
index 2ef4956329..326f49b23f 100644
--- a/include/drivers/ipm.h
+++ b/include/drivers/ipm.h
@@ -37,12 +37,12 @@ extern "C" {
  *
  * @param "void *context" Arbitrary context pointer provided at
  *        registration time.
- * @param "u32_t id" Message type identifier.
+ * @param "uint32_t id" Message type identifier.
  * @param "volatile void *data" Message data pointer. The correct
  *        amount of data to read out
  * must be inferred using the message id/upper level protocol.
  */
-typedef void (*ipm_callback_t)(void *context, u32_t id, volatile void *data);
+typedef void (*ipm_callback_t)(void *context, uint32_t id, volatile void *data);
 
 /**
  * @typedef ipm_send_t
@@ -50,7 +50,7 @@ typedef void (*ipm_callback_t)(void *context, u32_t id, volatile void *data);
  *
  * See @a ipm_send() for argument definitions.
  */
-typedef int (*ipm_send_t)(struct device *ipmdev, int wait, u32_t id,
+typedef int (*ipm_send_t)(struct device *ipmdev, int wait, uint32_t id,
 			  const void *data, int size);
 /**
  * @typedef ipm_max_data_size_get_t
@@ -66,7 +66,7 @@ typedef int (*ipm_max_data_size_get_t)(struct device *ipmdev);
  *
  * See @a ipm_max_id_val_get() for argument definitions.
  */
-typedef u32_t (*ipm_max_id_val_get_t)(struct device *ipmdev);
+typedef uint32_t (*ipm_max_id_val_get_t)(struct device *ipmdev);
 
 /**
  * @typedef ipm_register_callback_t
@@ -128,10 +128,10 @@ __subsystem struct ipm_driver_api {
  *                   or the device isn't an outbound IPM channel.
  * @retval 0         On success.
  */
-__syscall int ipm_send(struct device *ipmdev, int wait, u32_t id,
+__syscall int ipm_send(struct device *ipmdev, int wait, uint32_t id,
 		       const void *data, int size);
 
-static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id,
+static inline int z_impl_ipm_send(struct device *ipmdev, int wait, uint32_t id,
 			   const void *data, int size)
 {
 	const struct ipm_driver_api *api =
@@ -188,9 +188,9 @@ static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev)
  *
  * @return Maximum possible value of a message ID.
  */
-__syscall u32_t ipm_max_id_val_get(struct device *ipmdev);
+__syscall uint32_t ipm_max_id_val_get(struct device *ipmdev);
 
-static inline u32_t z_impl_ipm_max_id_val_get(struct device *ipmdev)
+static inline uint32_t z_impl_ipm_max_id_val_get(struct device *ipmdev)
 {
 	const struct ipm_driver_api *api =
 		(const struct ipm_driver_api *)ipmdev->driver_api;
diff --git a/include/drivers/kscan.h b/include/drivers/kscan.h
index 5b92035466..61a353cf88 100644
--- a/include/drivers/kscan.h
+++ b/include/drivers/kscan.h
@@ -41,7 +41,7 @@ extern "C" {
  * @param row	Describes row change.
  * @param pressed Describes the kind of key event.
  */
-typedef void (*kscan_callback_t)(struct device *dev, u32_t row, u32_t column,
+typedef void (*kscan_callback_t)(struct device *dev, uint32_t row, uint32_t column,
 				 bool pressed);
 
 /**
diff --git a/include/drivers/led.h b/include/drivers/led.h
index 0cc318d309..d1cf120798 100644
--- a/include/drivers/led.h
+++ b/include/drivers/led.h
@@ -28,8 +28,8 @@
  *
  * @see led_blink() for argument descriptions.
  */
-typedef int (*led_api_blink)(struct device *dev, u32_t led,
-			     u32_t delay_on, u32_t delay_off);
+typedef int (*led_api_blink)(struct device *dev, uint32_t led,
+			     uint32_t delay_on, uint32_t delay_off);
 
 /**
  * @typedef led_api_set_brightness()
@@ -37,15 +37,15 @@ typedef int (*led_api_blink)(struct device *dev, u32_t led,
  *
  * @see led_set_brightness() for argument descriptions.
  */
-typedef int (*led_api_set_brightness)(struct device *dev, u32_t led,
-				      u8_t value);
+typedef int (*led_api_set_brightness)(struct device *dev, uint32_t led,
+				      uint8_t value);
 /**
  * @typedef led_api_on()
  * @brief Callback API for turning on an LED
  *
  * @see led_on() for argument descriptions.
  */
-typedef int (*led_api_on)(struct device *dev, u32_t led);
+typedef int (*led_api_on)(struct device *dev, uint32_t led);
 
 /**
  * @typedef led_api_off()
@@ -53,7 +53,7 @@ typedef int (*led_api_on)(struct device *dev, u32_t led);
  *
  * @see led_off() for argument descriptions.
  */
-typedef int (*led_api_off)(struct device *dev, u32_t led);
+typedef int (*led_api_off)(struct device *dev, uint32_t led);
 
 /**
  * @brief LED driver API
@@ -78,11 +78,11 @@ __subsystem struct led_driver_api {
  * @param delay_off Time period (in milliseconds) an LED should be OFF
  * @return 0 on success, negative on error
  */
-__syscall int led_blink(struct device *dev, u32_t led,
-			    u32_t delay_on, u32_t delay_off);
+__syscall int led_blink(struct device *dev, uint32_t led,
+			    uint32_t delay_on, uint32_t delay_off);
 
-static inline int z_impl_led_blink(struct device *dev, u32_t led,
-			    u32_t delay_on, u32_t delay_off)
+static inline int z_impl_led_blink(struct device *dev, uint32_t led,
+			    uint32_t delay_on, uint32_t delay_off)
 {
 	const struct led_driver_api *api =
 		(const struct led_driver_api *)dev->driver_api;
@@ -101,11 +101,11 @@ static inline int z_impl_led_blink(struct device *dev, u32_t led,
  * @param value Brightness value to set in percent
  * @return 0 on success, negative on error
  */
-__syscall int led_set_brightness(struct device *dev, u32_t led,
-				     u8_t value);
+__syscall int led_set_brightness(struct device *dev, uint32_t led,
+				     uint8_t value);
 
-static inline int z_impl_led_set_brightness(struct device *dev, u32_t led,
-				     u8_t value)
+static inline int z_impl_led_set_brightness(struct device *dev, uint32_t led,
+				     uint8_t value)
 {
 	const struct led_driver_api *api =
 		(const struct led_driver_api *)dev->driver_api;
@@ -122,9 +122,9 @@ static inline int z_impl_led_set_brightness(struct device *dev, u32_t led,
  * @param led LED channel/pin
  * @return 0 on success, negative on error
  */
-__syscall int led_on(struct device *dev, u32_t led);
+__syscall int led_on(struct device *dev, uint32_t led);
 
-static inline int z_impl_led_on(struct device *dev, u32_t led)
+static inline int z_impl_led_on(struct device *dev, uint32_t led)
 {
 	const struct led_driver_api *api =
 		(const struct led_driver_api *)dev->driver_api;
@@ -141,9 +141,9 @@ static inline int z_impl_led_on(struct device *dev, u32_t led)
  * @param led LED channel/pin
  * @return 0 on success, negative on error
  */
-__syscall int led_off(struct device *dev, u32_t led);
+__syscall int led_off(struct device *dev, uint32_t led);
 
-static inline int z_impl_led_off(struct device *dev, u32_t led)
+static inline int z_impl_led_off(struct device *dev, uint32_t led)
 {
 	const struct led_driver_api *api =
 		(const struct led_driver_api *)dev->driver_api;
diff --git a/include/drivers/led/ht16k33.h b/include/drivers/led/ht16k33.h
index 832db3f900..fb6e91de3d 100644
--- a/include/drivers/led/ht16k33.h
+++ b/include/drivers/led/ht16k33.h
@@ -24,7 +24,7 @@
  */
 int ht16k33_register_keyscan_device(struct device *parent,
 				    struct device *child,
-				    u8_t keyscan_idx);
+				    uint8_t keyscan_idx);
 
 /**
  * Check if a HT16K33 keyscan interrupt is pending.
@@ -32,7 +32,7 @@ int ht16k33_register_keyscan_device(struct device *parent,
  * @param  parent HT16K33 parent device.
  * @return status != 0 if an interrupt is pending.
  */
-u32_t ht16k33_get_pending_int(struct device *parent);
+uint32_t ht16k33_get_pending_int(struct device *parent);
 
 /**
  * Dispatch keyscan row data from a keyscan event to be handled by a
@@ -42,6 +42,6 @@ u32_t ht16k33_get_pending_int(struct device *parent);
  * @param keys  Bitmask of key state for the row.
  */
 void ht16k33_process_keyscan_row_data(struct device *child,
-				      u32_t keys);
+				      uint32_t keys);
 
 #endif /* ZEPHYR_INCLUDE_DRIVERS_LED_HT16K33_H_ */
diff --git a/include/drivers/led_strip.h b/include/drivers/led_strip.h
index 7824bad739..161d5d6c08 100644
--- a/include/drivers/led_strip.h
+++ b/include/drivers/led_strip.h
@@ -41,14 +41,14 @@ struct led_rgb {
 	 * Pad/scratch space needed by some drivers. Users should
 	 * ignore.
 	 */
-	u8_t scratch;
+	uint8_t scratch;
 #endif
 	/** Red channel */
-	u8_t r;
+	uint8_t r;
 	/** Green channel */
-	u8_t g;
+	uint8_t g;
 	/** Blue channel */
-	u8_t b;
+	uint8_t b;
 };
 
 /**
@@ -66,7 +66,7 @@ typedef int (*led_api_update_rgb)(struct device *dev, struct led_rgb *pixels,
  *
  * @see led_strip_update_channels() for argument descriptions.
  */
-typedef int (*led_api_update_channels)(struct device *dev, u8_t *channels,
+typedef int (*led_api_update_channels)(struct device *dev, uint8_t *channels,
 				       size_t num_channels);
 
 /**
@@ -121,7 +121,7 @@ static inline int led_strip_update_rgb(struct device *dev,
  * @warning May overwrite @a channels
  */
 static inline int led_strip_update_channels(struct device *dev,
-					    u8_t *channels,
+					    uint8_t *channels,
 					    size_t num_channels) {
 	const struct led_strip_driver_api *api =
 		(const struct led_strip_driver_api *)dev->driver_api;
diff --git a/include/drivers/lora.h b/include/drivers/lora.h
index b2cb016f73..25e1fe12f5 100644
--- a/include/drivers/lora.h
+++ b/include/drivers/lora.h
@@ -39,12 +39,12 @@ enum lora_coding_rate {
 };
 
 struct lora_modem_config {
-	u32_t frequency;
+	uint32_t frequency;
 	enum lora_signal_bandwidth bandwidth;
 	enum lora_datarate datarate;
 	enum lora_coding_rate coding_rate;
-	u16_t preamble_len;
-	s8_t tx_power;
+	uint16_t preamble_len;
+	int8_t tx_power;
 	bool tx;
 };
 
@@ -64,7 +64,7 @@ typedef int (*lora_api_config)(struct device *dev,
  * @see lora_send() for argument descriptions.
  */
 typedef int (*lora_api_send)(struct device *dev,
-			     u8_t *data, u32_t data_len);
+			     uint8_t *data, uint32_t data_len);
 
 /**
  * @typedef lora_api_recv()
@@ -72,8 +72,8 @@ typedef int (*lora_api_send)(struct device *dev,
  *
  * @see lora_recv() for argument descriptions.
  */
-typedef int (*lora_api_recv)(struct device *dev, u8_t *data, u8_t size,
-			     k_timeout_t timeout, s16_t *rssi, s8_t *snr);
+typedef int (*lora_api_recv)(struct device *dev, uint8_t *data, uint8_t size,
+			     k_timeout_t timeout, int16_t *rssi, int8_t *snr);
 
 /**
  * @typedef lora_api_test_cw()
@@ -81,8 +81,8 @@ typedef int (*lora_api_recv)(struct device *dev, u8_t *data, u8_t size,
  *
  * @see lora_test_cw() for argument descriptions.
  */
-typedef int (*lora_api_test_cw)(struct device *dev, u32_t frequency,
-				s8_t tx_power, u16_t duration);
+typedef int (*lora_api_test_cw)(struct device *dev, uint32_t frequency,
+				int8_t tx_power, uint16_t duration);
 
 struct lora_driver_api {
 	lora_api_config config;
@@ -118,7 +118,7 @@ static inline int lora_config(struct device *dev,
  * @return 0 on success, negative on error
  */
 static inline int lora_send(struct device *dev,
-			    u8_t *data, u32_t data_len)
+			    uint8_t *data, uint32_t data_len)
 {
 	const struct lora_driver_api *api = dev->driver_api;
 
@@ -141,8 +141,8 @@ static inline int lora_send(struct device *dev,
  * @param snr       SNR of received data
  * @return Length of the data received on success, negative on error
  */
-static inline int lora_recv(struct device *dev, u8_t *data, u8_t size,
-			    k_timeout_t timeout, s16_t *rssi, s8_t *snr)
+static inline int lora_recv(struct device *dev, uint8_t *data, uint8_t size,
+			    k_timeout_t timeout, int16_t *rssi, int8_t *snr)
 {
 	const struct lora_driver_api *api = dev->driver_api;
 
@@ -161,8 +161,8 @@ static inline int lora_recv(struct device *dev, u8_t *data, u8_t size,
  * @param duration  Transmission duration in seconds.
  * @return 0 on success, negative on error
  */
-static inline int lora_test_cw(struct device *dev, u32_t frequency,
-			       s8_t tx_power, u16_t duration)
+static inline int lora_test_cw(struct device *dev, uint32_t frequency,
+			       int8_t tx_power, uint16_t duration)
 {
 	const struct lora_driver_api *api = dev->driver_api;
 
diff --git a/include/drivers/pcie/msi.h b/include/drivers/pcie/msi.h
index 4067059b59..865df77b48 100644
--- a/include/drivers/pcie/msi.h
+++ b/include/drivers/pcie/msi.h
@@ -26,7 +26,7 @@ extern "C" {
  * now, capabilities-related code is only included when MSI is. It
  * can easily be separated out if/when its use spreads.
  */
-extern u32_t pcie_get_cap(pcie_bdf_t bdf, u32_t cap_id);
+extern uint32_t pcie_get_cap(pcie_bdf_t bdf, uint32_t cap_id);
 
 /*
  * Configuration word 13 contains the head of the capabilities list.
@@ -51,7 +51,7 @@ extern u32_t pcie_get_cap(pcie_bdf_t bdf, u32_t cap_id);
  * @param irq The IRQ we wish to trigger via MSI.
  * @return A (32-bit) value for the MSI MAP register.
  */
-extern u32_t pcie_msi_map(unsigned int irq);
+extern uint32_t pcie_msi_map(unsigned int irq);
 
 /**
  * @brief Compute the data for an MSI posted write.
@@ -61,7 +61,7 @@ extern u32_t pcie_msi_map(unsigned int irq);
  * @param irq The IRQ we wish to trigger via MSI.
  * @return A (16-bit) value for MSI MDR register.
  */
-extern u16_t pcie_msi_mdr(unsigned int irq);
+extern uint16_t pcie_msi_mdr(unsigned int irq);
 
 /**
  * @brief Configure the given PCI endpoint to generate MSIs.
diff --git a/include/drivers/pcie/pcie.h b/include/drivers/pcie/pcie.h
index 07ce569a21..4db3243a28 100644
--- a/include/drivers/pcie/pcie.h
+++ b/include/drivers/pcie/pcie.h
@@ -23,7 +23,7 @@ extern "C" {
  * in include/dt-bindings/pcie/pcie.h: see PCIE_BDF() and friends, since
  * these tuples are referenced from devicetree.
  */
-typedef u32_t pcie_bdf_t;
+typedef uint32_t pcie_bdf_t;
 
 /**
  * @typedef pcie_id_t
@@ -33,7 +33,7 @@ typedef u32_t pcie_bdf_t;
  * pair, which is meant to tell the system what the PCI(e) endpoint is. Again,
  * look to PCIE_ID_* macros in include/dt-bindings/pcie/pcie.h for more.
  */
-typedef u32_t pcie_id_t;
+typedef uint32_t pcie_id_t;
 
 /*
  * These functions are arch-, board-, or SoC-specific.
@@ -48,7 +48,7 @@ typedef u32_t pcie_id_t;
  * @param reg the configuration word index (not address)
  * @return the word read (0xFFFFFFFFU if nonexistent endpoint or word)
  */
-extern u32_t pcie_conf_read(pcie_bdf_t bdf, unsigned int reg);
+extern uint32_t pcie_conf_read(pcie_bdf_t bdf, unsigned int reg);
 
 /**
  * @brief Write a 32-bit word to an endpoint's configuration space.
@@ -59,7 +59,7 @@ extern u32_t pcie_conf_read(pcie_bdf_t bdf, unsigned int reg);
  * @param reg the configuration word index (not address)
  * @param data the value to write
  */
-extern void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, u32_t data);
+extern void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, uint32_t data);
 
 /**
  * @brief Probe for the presence of a PCI(e) endpoint.
@@ -82,7 +82,7 @@ extern bool pcie_probe(pcie_bdf_t bdf, pcie_id_t id);
  * are order-preserving with respect to the endpoint BARs: e.g., index 0
  * will return the lowest-numbered memory BAR on the endpoint.
  */
-extern u32_t pcie_get_mbar(pcie_bdf_t bdf, unsigned int index);
+extern uint32_t pcie_get_mbar(pcie_bdf_t bdf, unsigned int index);
 
 /**
  * @brief Get the nth I/O address assigned to an endpoint.
@@ -92,7 +92,7 @@ extern u32_t pcie_get_mbar(pcie_bdf_t bdf, unsigned int index);
  *
  * Analogous to pcie_get_mbar(), except returns I/O region data.
  */
-extern u32_t pcie_get_iobar(pcie_bdf_t bdf, unsigned int index);
+extern uint32_t pcie_get_iobar(pcie_bdf_t bdf, unsigned int index);
 
 /**
  * @brief Set or reset bits in the endpoint command/status register.
@@ -101,7 +101,7 @@ extern u32_t pcie_get_iobar(pcie_bdf_t bdf, unsigned int index);
  * @param bits the powerset of bits of interest
  * @param on use true to set bits, false to reset them
  */
-extern void pcie_set_cmd(pcie_bdf_t bdf, u32_t bits, bool on);
+extern void pcie_set_cmd(pcie_bdf_t bdf, uint32_t bits, bool on);
 
 /**
  * @brief Return the IRQ assigned by the firmware/board to an endpoint.
diff --git a/include/drivers/peci.h b/include/drivers/peci.h
index 93b316d5dd..de745e3d54 100644
--- a/include/drivers/peci.h
+++ b/include/drivers/peci.h
@@ -165,7 +165,7 @@ enum peci_command_code {
  * an additional byte for this in rx buffer.
  */
 struct peci_buf {
-	u8_t *buf;
+	uint8_t *buf;
 	size_t len;
 };
 
@@ -174,7 +174,7 @@ struct peci_buf {
  */
 struct peci_msg {
 	/** Client address */
-	u8_t addr;
+	uint8_t addr;
 	/** Command code */
 	enum peci_command_code cmd_code;
 	/** Pointer to buffer of write data */
@@ -182,7 +182,7 @@ struct peci_msg {
 	/** Pointer to buffer of read data */
 	struct peci_buf rx_buffer;
 	/** PECI msg flags */
-	u8_t flags;
+	uint8_t flags;
 };
 
 /**
@@ -192,7 +192,7 @@ struct peci_msg {
  *
  * (Internal use only.)
  */
-typedef int (*peci_config_t)(struct device *dev, u32_t bitrate);
+typedef int (*peci_config_t)(struct device *dev, uint32_t bitrate);
 typedef int (*peci_transfer_t)(struct device *dev, struct peci_msg *msg);
 typedef int (*peci_disable_t)(struct device *dev);
 typedef int (*peci_enable_t)(struct device *dev);
@@ -218,9 +218,9 @@ struct peci_driver_api {
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-__syscall int peci_config(struct device *dev, u32_t bitrate);
+__syscall int peci_config(struct device *dev, uint32_t bitrate);
 
-static inline int z_impl_peci_config(struct device *dev, u32_t bitrate)
+static inline int z_impl_peci_config(struct device *dev, uint32_t bitrate)
 {
 	struct peci_driver_api *api;
 
diff --git a/include/drivers/pinmux.h b/include/drivers/pinmux.h
index 7fbf5b2271..b1e203d2e5 100644
--- a/include/drivers/pinmux.h
+++ b/include/drivers/pinmux.h
@@ -54,25 +54,25 @@ extern "C" {
  * @brief Callback API upon setting a PIN's function
  * See pinmux_pin_set() for argument description
  */
-typedef int (*pmux_set)(struct device *dev, u32_t pin, u32_t func);
+typedef int (*pmux_set)(struct device *dev, uint32_t pin, uint32_t func);
 /**
  * @typedef pmux_get
  * @brief Callback API upon getting a PIN's function
  * See pinmux_pin_get() for argument description
  */
-typedef int (*pmux_get)(struct device *dev, u32_t pin, u32_t *func);
+typedef int (*pmux_get)(struct device *dev, uint32_t pin, uint32_t *func);
 /**
  * @typedef pmux_pullup
  * @brief Callback API upon setting a PIN's pullup
  * See pinmix_pin_pullup() for argument description
  */
-typedef int (*pmux_pullup)(struct device *dev, u32_t pin, u8_t func);
+typedef int (*pmux_pullup)(struct device *dev, uint32_t pin, uint8_t func);
 /**
  * @typedef pmux_input
  * @brief Callback API upon setting a PIN's input function
  * See pinmux_input() for argument description
  */
-typedef int (*pmux_input)(struct device *dev, u32_t pin, u8_t func);
+typedef int (*pmux_input)(struct device *dev, uint32_t pin, uint8_t func);
 
 __subsystem struct pinmux_driver_api {
 	pmux_set set;
@@ -81,7 +81,7 @@ __subsystem struct pinmux_driver_api {
 	pmux_input input;
 };
 
-static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func)
+static inline int pinmux_pin_set(struct device *dev, uint32_t pin, uint32_t func)
 {
 	const struct pinmux_driver_api *api =
 		(const struct pinmux_driver_api *)dev->driver_api;
@@ -89,7 +89,7 @@ static inline int pinmux_pin_set(struct device *dev, u32_t pin, u32_t func)
 	return api->set(dev, pin, func);
 }
 
-static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func)
+static inline int pinmux_pin_get(struct device *dev, uint32_t pin, uint32_t *func)
 {
 	const struct pinmux_driver_api *api =
 		(const struct pinmux_driver_api *)dev->driver_api;
@@ -97,7 +97,7 @@ static inline int pinmux_pin_get(struct device *dev, u32_t pin, u32_t *func)
 	return api->get(dev, pin, func);
 }
 
-static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func)
+static inline int pinmux_pin_pullup(struct device *dev, uint32_t pin, uint8_t func)
 {
 	const struct pinmux_driver_api *api =
 		(const struct pinmux_driver_api *)dev->driver_api;
@@ -105,8 +105,8 @@ static inline int pinmux_pin_pullup(struct device *dev, u32_t pin, u8_t func)
 	return api->pullup(dev, pin, func);
 }
 
-static inline int pinmux_pin_input_enable(struct device *dev, u32_t pin,
-					  u8_t func)
+static inline int pinmux_pin_input_enable(struct device *dev, uint32_t pin,
+					  uint8_t func)
 {
 	const struct pinmux_driver_api *api =
 		(const struct pinmux_driver_api *)dev->driver_api;
diff --git a/include/drivers/ps2.h b/include/drivers/ps2.h
index e7eec94b55..0f76947f75 100644
--- a/include/drivers/ps2.h
+++ b/include/drivers/ps2.h
@@ -35,7 +35,7 @@ extern "C" {
  * @param dev   Pointer to the device structure for the driver instance.
  * @param data  Data byte passed pack to the user.
  */
-typedef void (*ps2_callback_t)(struct device *dev, u8_t data);
+typedef void (*ps2_callback_t)(struct device *dev, uint8_t data);
 
 /**
  * @cond INTERNAL_HIDDEN
@@ -45,8 +45,8 @@ typedef void (*ps2_callback_t)(struct device *dev, u8_t data);
  * (Internal use only.)
  */
 typedef int (*ps2_config_t)(struct device *dev, ps2_callback_t callback_isr);
-typedef int (*ps2_read_t)(struct device *dev, u8_t *value);
-typedef int (*ps2_write_t)(struct device *dev, u8_t value);
+typedef int (*ps2_read_t)(struct device *dev, uint8_t *value);
+typedef int (*ps2_write_t)(struct device *dev, uint8_t value);
 typedef int (*ps2_disable_callback_t)(struct device *dev);
 typedef int (*ps2_enable_callback_t)(struct device *dev);
 
@@ -91,9 +91,9 @@ static inline int z_impl_ps2_config(struct device *dev,
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-__syscall int ps2_write(struct device *dev, u8_t value);
+__syscall int ps2_write(struct device *dev, uint8_t value);
 
-static inline int z_impl_ps2_write(struct device *dev, u8_t value)
+static inline int z_impl_ps2_write(struct device *dev, uint8_t value)
 {
 	const struct ps2_driver_api *api =
 			(const struct ps2_driver_api *)dev->driver_api;
@@ -109,9 +109,9 @@ static inline int z_impl_ps2_write(struct device *dev, u8_t value)
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-__syscall int ps2_read(struct device *dev,  u8_t *value);
+__syscall int ps2_read(struct device *dev,  uint8_t *value);
 
-static inline int z_impl_ps2_read(struct device *dev, u8_t *value)
+static inline int z_impl_ps2_read(struct device *dev, uint8_t *value)
 {
 	const struct ps2_driver_api *api =
 			(const struct ps2_driver_api *)dev->driver_api;
diff --git a/include/drivers/pwm.h b/include/drivers/pwm.h
index cefb23bac6..2a0f01dbfa 100644
--- a/include/drivers/pwm.h
+++ b/include/drivers/pwm.h
@@ -32,15 +32,15 @@ extern "C" {
 /**
  * @brief Provides a type to hold PWM configuration flags.
  */
-typedef u8_t pwm_flags_t;
+typedef uint8_t pwm_flags_t;
 
 /**
  * @typedef pwm_pin_set_t
  * @brief Callback API upon setting the pin
  * See @a pwm_pin_set_cycles() for argument description
  */
-typedef int (*pwm_pin_set_t)(struct device *dev, u32_t pwm,
-			     u32_t period_cycles, u32_t pulse_cycles,
+typedef int (*pwm_pin_set_t)(struct device *dev, uint32_t pwm,
+			     uint32_t period_cycles, uint32_t pulse_cycles,
 			     pwm_flags_t flags);
 
 /**
@@ -48,8 +48,8 @@ typedef int (*pwm_pin_set_t)(struct device *dev, u32_t pwm,
  * @brief Callback API upon getting cycles per second
  * See @a pwm_get_cycles_per_sec() for argument description
  */
-typedef int (*pwm_get_cycles_per_sec_t)(struct device *dev, u32_t pwm,
-					u64_t *cycles);
+typedef int (*pwm_get_cycles_per_sec_t)(struct device *dev, uint32_t pwm,
+					uint64_t *cycles);
 
 /** @brief PWM driver API definition. */
 __subsystem struct pwm_driver_api {
@@ -74,11 +74,11 @@ __subsystem struct pwm_driver_api {
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-__syscall int pwm_pin_set_cycles(struct device *dev, u32_t pwm,
-				 u32_t period, u32_t pulse, pwm_flags_t flags);
+__syscall int pwm_pin_set_cycles(struct device *dev, uint32_t pwm,
+				 uint32_t period, uint32_t pulse, pwm_flags_t flags);
 
-static inline int z_impl_pwm_pin_set_cycles(struct device *dev, u32_t pwm,
-					    u32_t period, u32_t pulse,
+static inline int z_impl_pwm_pin_set_cycles(struct device *dev, uint32_t pwm,
+					    uint32_t period, uint32_t pulse,
 					    pwm_flags_t flags)
 {
 	struct pwm_driver_api *api;
@@ -99,11 +99,11 @@ static inline int z_impl_pwm_pin_set_cycles(struct device *dev, u32_t pwm,
  * @retval Negative errno code if failure.
  */
 
-__syscall int pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-				     u64_t *cycles);
+__syscall int pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+				     uint64_t *cycles);
 
-static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
-					       u64_t *cycles)
+static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm,
+					       uint64_t *cycles)
 {
 	struct pwm_driver_api *api;
 
@@ -123,28 +123,28 @@ static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, u32_t pwm,
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-static inline int pwm_pin_set_usec(struct device *dev, u32_t pwm,
-				   u32_t period, u32_t pulse,
+static inline int pwm_pin_set_usec(struct device *dev, uint32_t pwm,
+				   uint32_t period, uint32_t pulse,
 				   pwm_flags_t flags)
 {
-	u64_t period_cycles, pulse_cycles, cycles_per_sec;
+	uint64_t period_cycles, pulse_cycles, cycles_per_sec;
 
 	if (pwm_get_cycles_per_sec(dev, pwm, &cycles_per_sec) != 0) {
 		return -EIO;
 	}
 
 	period_cycles = (period * cycles_per_sec) / USEC_PER_SEC;
-	if (period_cycles >= ((u64_t)1 << 32)) {
+	if (period_cycles >= ((uint64_t)1 << 32)) {
 		return -ENOTSUP;
 	}
 
 	pulse_cycles = (pulse * cycles_per_sec) / USEC_PER_SEC;
-	if (pulse_cycles >= ((u64_t)1 << 32)) {
+	if (pulse_cycles >= ((uint64_t)1 << 32)) {
 		return -ENOTSUP;
 	}
 
-	return pwm_pin_set_cycles(dev, pwm, (u32_t)period_cycles,
-				  (u32_t)pulse_cycles, flags);
+	return pwm_pin_set_cycles(dev, pwm, (uint32_t)period_cycles,
+				  (uint32_t)pulse_cycles, flags);
 }
 
 /**
@@ -159,28 +159,28 @@ static inline int pwm_pin_set_usec(struct device *dev, u32_t pwm,
  * @retval 0 If successful.
  * @retval Negative errno code if failure.
  */
-static inline int pwm_pin_set_nsec(struct device *dev, u32_t pwm,
-				   u32_t period, u32_t pulse,
+static inline int pwm_pin_set_nsec(struct device *dev, uint32_t pwm,
+				   uint32_t period, uint32_t pulse,
 				   pwm_flags_t flags)
 {
-	u64_t period_cycles, pulse_cycles, cycles_per_sec;
+	uint64_t period_cycles, pulse_cycles, cycles_per_sec;
 
 	if (pwm_get_cycles_per_sec(dev, pwm, &cycles_per_sec) != 0) {
 		return -EIO;
 	}
 
 	period_cycles = (period * cycles_per_sec) / NSEC_PER_SEC;
-	if (period_cycles >= ((u64_t)1 << 32)) {
+	if (period_cycles >= ((uint64_t)1 << 32)) {
 		return -ENOTSUP;
 	}
 
 	pulse_cycles = (pulse * cycles_per_sec) / NSEC_PER_SEC;
-	if (pulse_cycles >= ((u64_t)1 << 32)) {
+	if (pulse_cycles >= ((uint64_t)1 << 32)) {
 		return -ENOTSUP;
 	}
 
-	return pwm_pin_set_cycles(dev, pwm, (u32_t)period_cycles,
-				  (u32_t)pulse_cycles, flags);
+	return pwm_pin_set_cycles(dev, pwm, (uint32_t)period_cycles,
+				  (uint32_t)pulse_cycles, flags);
 }
 
 #ifdef __cplusplus
diff --git a/include/drivers/rtc/maxim_ds3231.h b/include/drivers/rtc/maxim_ds3231.h
index 8ef7cb8a42..64f93e8d59 100644
--- a/include/drivers/rtc/maxim_ds3231.h
+++ b/include/drivers/rtc/maxim_ds3231.h
@@ -229,8 +229,8 @@ extern "C" {
  * maxim_ds3231_alarm::user_data.
  */
 typedef void (*maxim_ds3231_alarm_callback_handler_t)(struct device *dev,
-						      u8_t id,
-						      u32_t syncclock,
+						      uint8_t id,
+						      uint32_t syncclock,
 						      void *user_data);
 
 /** @brief Signature used to notify a user of the DS3231 that an
@@ -309,7 +309,7 @@ struct maxim_ds3231_alarm {
 	 * maxim_ds3231_set_alarm() to return an error, leaving the
 	 * alarm configuration unchanged.
 	 */
-	u8_t flags;
+	uint8_t flags;
 };
 
 /** @brief Register the RTC clock against system clocks.
@@ -332,7 +332,7 @@ struct maxim_ds3231_syncpoint {
 	 * running at between 1 kHz and 1 MHz, allowing for
 	 * microsecond to millisecond accuracy in synchronization.
 	 */
-	u32_t syncclock;
+	uint32_t syncclock;
 };
 
 /** @brief Read the local synchronization clock.
@@ -358,7 +358,7 @@ struct maxim_ds3231_syncpoint {
  *
  * @return the current value of the synchronization clock.
  */
-static inline u32_t maxim_ds3231_read_syncclock(struct device *dev)
+static inline uint32_t maxim_ds3231_read_syncclock(struct device *dev)
 {
 	return k_uptime_get_32();
 }
@@ -371,7 +371,7 @@ static inline u32_t maxim_ds3231_read_syncclock(struct device *dev)
  *
  * @return the frequency of the selected synchronization clock.
  */
-static inline u32_t maxim_ds3231_syncclock_frequency(struct device *dev)
+static inline uint32_t maxim_ds3231_syncclock_frequency(struct device *dev)
 {
 	return 1000U;
 }
@@ -394,8 +394,8 @@ static inline u32_t maxim_ds3231_syncclock_frequency(struct device *dev)
  * negative error code from an I2C transaction.
  */
 int maxim_ds3231_ctrl_update(struct device *dev,
-			     u8_t set_bits,
-			     u8_t clear_bits);
+			     uint8_t set_bits,
+			     uint8_t clear_bits);
 
 /**
  * @brief Read the ctrl_stat register then set and clear bits in it.
@@ -427,8 +427,8 @@ int maxim_ds3231_ctrl_update(struct device *dev,
  * code from an I2C transaction.
  */
 int maxim_ds3231_stat_update(struct device *dev,
-			     u8_t set_bits,
-			     u8_t clear_bits);
+			     uint8_t set_bits,
+			     uint8_t clear_bits);
 
 /** @brief Read a DS3231 alarm configuration.
  *
@@ -449,7 +449,7 @@ int maxim_ds3231_stat_update(struct device *dev,
  * negative error code from an I2C transaction or invalid parameter.
  */
 int maxim_ds3231_get_alarm(struct device *dev,
-			   u8_t id,
+			   uint8_t id,
 			   struct maxim_ds3231_alarm *cfg);
 
 /** @brief Configure a DS3231 alarm.
@@ -473,7 +473,7 @@ int maxim_ds3231_get_alarm(struct device *dev,
  * from an I2C transaction or an invalid parameter.
  */
 int maxim_ds3231_set_alarm(struct device *dev,
-			   u8_t id,
+			   uint8_t id,
 			   const struct maxim_ds3231_alarm *cfg);
 
 /** @brief Synchronize the RTC against the local clock.
diff --git a/include/drivers/sensor.h b/include/drivers/sensor.h
index 6c27a32778..55f5b00d0c 100644
--- a/include/drivers/sensor.h
+++ b/include/drivers/sensor.h
@@ -42,9 +42,9 @@ extern "C" {
  */
 struct sensor_value {
 	/** Integer part of the value. */
-	s32_t val1;
+	int32_t val1;
 	/** Fractional part of the value (in one-millionth parts). */
-	s32_t val2;
+	int32_t val2;
 };
 
 /**
@@ -527,9 +527,9 @@ static inline int z_impl_sensor_channel_get(struct device *dev,
  *
  * @return The converted value, in Gs.
  */
-static inline s32_t sensor_ms2_to_g(const struct sensor_value *ms2)
+static inline int32_t sensor_ms2_to_g(const struct sensor_value *ms2)
 {
-	s64_t micro_ms2 = ms2->val1 * 1000000LL + ms2->val2;
+	int64_t micro_ms2 = ms2->val1 * 1000000LL + ms2->val2;
 
 	if (micro_ms2 > 0) {
 		return (micro_ms2 + SENSOR_G / 2) / SENSOR_G;
@@ -544,10 +544,10 @@ static inline s32_t sensor_ms2_to_g(const struct sensor_value *ms2)
  * @param g The G value to be converted.
  * @param ms2 A pointer to a sensor_value struct, where the result is stored.
  */
-static inline void sensor_g_to_ms2(s32_t g, struct sensor_value *ms2)
+static inline void sensor_g_to_ms2(int32_t g, struct sensor_value *ms2)
 {
-	ms2->val1 = ((s64_t)g * SENSOR_G) / 1000000LL;
-	ms2->val2 = ((s64_t)g * SENSOR_G) % 1000000LL;
+	ms2->val1 = ((int64_t)g * SENSOR_G) / 1000000LL;
+	ms2->val2 = ((int64_t)g * SENSOR_G) % 1000000LL;
 }
 
 /**
@@ -557,9 +557,9 @@ static inline void sensor_g_to_ms2(s32_t g, struct sensor_value *ms2)
  *
  * @return The converted value, in degrees.
  */
-static inline s32_t sensor_rad_to_degrees(const struct sensor_value *rad)
+static inline int32_t sensor_rad_to_degrees(const struct sensor_value *rad)
 {
-	s64_t micro_rad_s = rad->val1 * 1000000LL + rad->val2;
+	int64_t micro_rad_s = rad->val1 * 1000000LL + rad->val2;
 
 	if (micro_rad_s > 0) {
 		return (micro_rad_s * 180LL + SENSOR_PI / 2) / SENSOR_PI;
@@ -574,10 +574,10 @@ static inline s32_t sensor_rad_to_degrees(const struct sensor_value *rad)
  * @param d The value (in degrees) to be converted.
  * @param rad A pointer to a sensor_value struct, where the result is stored.
  */
-static inline void sensor_degrees_to_rad(s32_t d, struct sensor_value *rad)
+static inline void sensor_degrees_to_rad(int32_t d, struct sensor_value *rad)
 {
-	rad->val1 = ((s64_t)d * SENSOR_PI / 180LL) / 1000000LL;
-	rad->val2 = ((s64_t)d * SENSOR_PI / 180LL) % 1000000LL;
+	rad->val1 = ((int64_t)d * SENSOR_PI / 180LL) / 1000000LL;
+	rad->val2 = ((int64_t)d * SENSOR_PI / 180LL) % 1000000LL;
 }
 
 /**
diff --git a/include/drivers/sensor/ccs811.h b/include/drivers/sensor/ccs811.h
index 821880e056..fa28e1d828 100644
--- a/include/drivers/sensor/ccs811.h
+++ b/include/drivers/sensor/ccs811.h
@@ -47,26 +47,26 @@ extern "C" {
 /** @brief Information collected from the sensor on each fetch. */
 struct ccs811_result_type {
 	/** Equivalent carbon dioxide in parts-per-million volume (ppmv). */
-	u16_t co2;
+	uint16_t co2;
 
 	/**
 	 * Equivalent total volatile organic compounts in
 	 * parts-per-billion volume.
 	 */
-	u16_t voc;
+	uint16_t voc;
 
 	/** Raw voltage and current measured by sensor. */
-	u16_t raw;
+	uint16_t raw;
 
 	/** Sensor status at completion of most recent fetch. */
-	u8_t status;
+	uint8_t status;
 
 	/**
 	 * Sensor error flags at completion of most recent fetch.
 	 *
 	 * Note that errors are cleared when read.
 	 */
-	u8_t error;
+	uint8_t error;
 };
 
 /**
@@ -89,10 +89,10 @@ const struct ccs811_result_type *ccs811_result(struct device *dev);
  * firmware versions.
  */
 struct ccs811_configver_type {
-	u16_t fw_boot_version;
-	u16_t fw_app_version;
-	u8_t hw_version;
-	u8_t mode;
+	uint16_t fw_boot_version;
+	uint16_t fw_app_version;
+	uint8_t hw_version;
+	uint8_t mode;
 };
 
 /**
@@ -135,7 +135,7 @@ int ccs811_baseline_fetch(struct device *dev);
  *
  * @return 0 if successful, negative errno code if failure.
  */
-int ccs811_baseline_update(struct device *dev, u16_t baseline);
+int ccs811_baseline_update(struct device *dev, uint16_t baseline);
 
 /**
  * @brief Update the ENV_DATA register.
diff --git a/include/drivers/spi.h b/include/drivers/spi.h
index 18fb98c4a3..6d875a2432 100644
--- a/include/drivers/spi.h
+++ b/include/drivers/spi.h
@@ -132,8 +132,8 @@ extern "C" {
  */
 struct spi_cs_control {
 	struct device	*gpio_dev;
-	u32_t		gpio_pin;
-	u32_t		delay;
+	uint32_t		gpio_pin;
+	uint32_t		delay;
 };
 
 /**
@@ -158,9 +158,9 @@ struct spi_cs_control {
  * transceive call. Rest of the attributes are not meant to be tweaked.
  */
 struct spi_config {
-	u32_t		frequency;
-	u16_t		operation;
-	u16_t		slave;
+	uint32_t		frequency;
+	uint16_t		operation;
+	uint16_t		slave;
 
 	const struct spi_cs_control *cs;
 };
diff --git a/include/drivers/timer/system_timer.h b/include/drivers/timer/system_timer.h
index f3c4dc9a8e..6ad46a4761 100644
--- a/include/drivers/timer/system_timer.h
+++ b/include/drivers/timer/system_timer.h
@@ -41,7 +41,7 @@ extern int z_clock_driver_init(struct device *device);
  * management.  It is a weak symbol that will be implemented as a noop
  * if undefined in the clock driver.
  */
-extern int z_clock_device_ctrl(struct device *device, u32_t ctrl_command,
+extern int z_clock_device_ctrl(struct device *device, uint32_t ctrl_command,
 			       void *context, device_pm_cb cb, void *arg);
 
 /**
@@ -87,7 +87,7 @@ extern int z_clock_device_ctrl(struct device *device, u32_t ctrl_command,
  * @param idle Hint to the driver that the system is about to enter
  *        the idle state immediately after setting the timeout
  */
-extern void z_clock_set_timeout(s32_t ticks, bool idle);
+extern void z_clock_set_timeout(int32_t ticks, bool idle);
 
 /**
  * @brief Timer idle exit notification
@@ -114,7 +114,7 @@ extern void z_clock_idle_exit(void);
  *
  * @param ticks Elapsed time, in ticks
  */
-extern void z_clock_announce(s32_t ticks);
+extern void z_clock_announce(int32_t ticks);
 
 /**
  * @brief Ticks elapsed since last z_clock_announce() call
@@ -124,7 +124,7 @@ extern void z_clock_announce(s32_t ticks);
  * this with appropriate locking, the driver needs only provide an
  * instantaneous answer.
  */
-extern u32_t z_clock_elapsed(void);
+extern uint32_t z_clock_elapsed(void);
 
 #ifdef __cplusplus
 }
diff --git a/include/drivers/uart.h b/include/drivers/uart.h
index 7d8a6a89aa..ad46583487 100644
--- a/include/drivers/uart.h
+++ b/include/drivers/uart.h
@@ -171,7 +171,7 @@ enum uart_rx_stop_reason {
 /** @brief UART TX event data. */
 struct uart_event_tx {
 	/** @brief Pointer to current buffer. */
-	const u8_t *buf;
+	const uint8_t *buf;
 	/** @brief Number of bytes sent. */
 	size_t len;
 };
@@ -184,7 +184,7 @@ struct uart_event_tx {
  */
 struct uart_event_rx {
 	/** @brief Pointer to current buffer. */
-	u8_t *buf;
+	uint8_t *buf;
 	/** @brief Currently received data offset in bytes. */
 	size_t offset;
 	/** @brief Number of new bytes received. */
@@ -194,7 +194,7 @@ struct uart_event_rx {
 /** @brief UART RX buffer released event data. */
 struct uart_event_rx_buf {
 	/* @brief Pointer to buffer that is no longer in use. */
-	u8_t *buf;
+	uint8_t *buf;
 };
 
 /** @brief UART RX stopped data. */
@@ -242,11 +242,11 @@ typedef void (*uart_callback_t)(struct uart_event *evt, void *user_data);
  * @param flow_ctrl Flow control setting, use @ref uart_config_flow_control
  */
 struct uart_config {
-	u32_t baudrate;
-	u8_t parity;
-	u8_t stop_bits;
-	u8_t data_bits;
-	u8_t flow_ctrl;
+	uint32_t baudrate;
+	uint8_t parity;
+	uint8_t stop_bits;
+	uint8_t data_bits;
+	uint8_t flow_ctrl;
 };
 
 /** @brief Parity modes */
@@ -324,12 +324,12 @@ typedef void (*uart_irq_config_func_t)(struct device *port);
  */
 struct uart_device_config {
 	union {
-		u32_t port;
-		u8_t *base;
-		u32_t regs;
+		uint32_t port;
+		uint8_t *base;
+		uint32_t regs;
 	};
 
-	u32_t sys_clk_freq;
+	uint32_t sys_clk_freq;
 
 #if defined(CONFIG_UART_INTERRUPT_DRIVEN) || defined(CONFIG_UART_ASYNC_API)
 	uart_irq_config_func_t	irq_config_func;
@@ -344,13 +344,13 @@ __subsystem struct uart_driver_api {
 	int (*callback_set)(struct device *dev, uart_callback_t callback,
 			    void *user_data);
 
-	int (*tx)(struct device *dev, const u8_t *buf, size_t len,
-		  s32_t timeout);
+	int (*tx)(struct device *dev, const uint8_t *buf, size_t len,
+		  int32_t timeout);
 	int (*tx_abort)(struct device *dev);
 
-	int (*rx_enable)(struct device *dev, u8_t *buf, size_t len,
-			 s32_t timeout);
-	int (*rx_buf_rsp)(struct device *dev, u8_t *buf, size_t len);
+	int (*rx_enable)(struct device *dev, uint8_t *buf, size_t len,
+			 int32_t timeout);
+	int (*rx_buf_rsp)(struct device *dev, uint8_t *buf, size_t len);
 	int (*rx_disable)(struct device *dev);
 
 #endif
@@ -369,10 +369,10 @@ __subsystem struct uart_driver_api {
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 
 	/** Interrupt driven FIFO fill function */
-	int (*fifo_fill)(struct device *dev, const u8_t *tx_data, int len);
+	int (*fifo_fill)(struct device *dev, const uint8_t *tx_data, int len);
 
 	/** Interrupt driven FIFO read function */
-	int (*fifo_read)(struct device *dev, u8_t *rx_data, const int size);
+	int (*fifo_read)(struct device *dev, uint8_t *rx_data, const int size);
 
 	/** Interrupt driven transfer enabling function */
 	void (*irq_tx_enable)(struct device *dev);
@@ -415,12 +415,12 @@ __subsystem struct uart_driver_api {
 #endif
 
 #ifdef CONFIG_UART_LINE_CTRL
-	int (*line_ctrl_set)(struct device *dev, u32_t ctrl, u32_t val);
-	int (*line_ctrl_get)(struct device *dev, u32_t ctrl, u32_t *val);
+	int (*line_ctrl_set)(struct device *dev, uint32_t ctrl, uint32_t val);
+	int (*line_ctrl_get)(struct device *dev, uint32_t ctrl, uint32_t *val);
 #endif
 
 #ifdef CONFIG_UART_DRV_CMD
-	int (*drv_cmd)(struct device *dev, u32_t cmd, u32_t p);
+	int (*drv_cmd)(struct device *dev, uint32_t cmd, uint32_t p);
 #endif
 
 };
@@ -461,11 +461,11 @@ static inline int uart_callback_set(struct device *dev,
  * @retval -EBUSY There is already an ongoing transfer.
  * @retval 0	  If successful, negative errno code otherwise.
  */
-__syscall int uart_tx(struct device *dev, const u8_t *buf, size_t len,
-		      s32_t timeout);
+__syscall int uart_tx(struct device *dev, const uint8_t *buf, size_t len,
+		      int32_t timeout);
 
-static inline int z_impl_uart_tx(struct device *dev, const u8_t *buf,
-				 size_t len, s32_t timeout)
+static inline int z_impl_uart_tx(struct device *dev, const uint8_t *buf,
+				 size_t len, int32_t timeout)
 
 {
 	const struct uart_driver_api *api =
@@ -510,11 +510,11 @@ static inline int z_impl_uart_tx_abort(struct device *dev)
  * @retval 0	  If successful, negative errno code otherwise.
  *
  */
-__syscall int uart_rx_enable(struct device *dev, u8_t *buf, size_t len,
-			     s32_t timeout);
+__syscall int uart_rx_enable(struct device *dev, uint8_t *buf, size_t len,
+			     int32_t timeout);
 
-static inline int z_impl_uart_rx_enable(struct device *dev, u8_t *buf,
-					size_t len, s32_t timeout)
+static inline int z_impl_uart_rx_enable(struct device *dev, uint8_t *buf,
+					size_t len, int32_t timeout)
 {
 	const struct uart_driver_api *api =
 				(const struct uart_driver_api *)dev->driver_api;
@@ -540,7 +540,7 @@ static inline int z_impl_uart_rx_enable(struct device *dev, u8_t *buf,
  * @retval 0	  If successful, negative errno code otherwise.
  *
  */
-static inline int uart_rx_buf_rsp(struct device *dev, u8_t *buf, size_t len)
+static inline int uart_rx_buf_rsp(struct device *dev, uint8_t *buf, size_t len)
 {
 	const struct uart_driver_api *api =
 				(const struct uart_driver_api *)dev->driver_api;
@@ -715,7 +715,7 @@ static inline int z_impl_uart_config_get(struct device *dev,
  *
  * @return Number of bytes sent.
  */
-static inline int uart_fifo_fill(struct device *dev, const u8_t *tx_data,
+static inline int uart_fifo_fill(struct device *dev, const uint8_t *tx_data,
 				 int size)
 {
 	const struct uart_driver_api *api =
@@ -750,7 +750,7 @@ static inline int uart_fifo_fill(struct device *dev, const u8_t *tx_data,
  *
  * @return Number of bytes read.
  */
-static inline int uart_fifo_read(struct device *dev, u8_t *rx_data,
+static inline int uart_fifo_read(struct device *dev, uint8_t *rx_data,
 				 const int size)
 {
 	const struct uart_driver_api *api =
@@ -1082,10 +1082,10 @@ static inline void uart_irq_callback_set(struct device *dev,
  * @retval failed Otherwise.
  */
 __syscall int uart_line_ctrl_set(struct device *dev,
-				 u32_t ctrl, u32_t val);
+				 uint32_t ctrl, uint32_t val);
 
 static inline int z_impl_uart_line_ctrl_set(struct device *dev,
-					   u32_t ctrl, u32_t val)
+					   uint32_t ctrl, uint32_t val)
 {
 	const struct uart_driver_api *api =
 		(const struct uart_driver_api *)dev->driver_api;
@@ -1107,10 +1107,10 @@ static inline int z_impl_uart_line_ctrl_set(struct device *dev,
  * @retval 0 If successful.
  * @retval failed Otherwise.
  */
-__syscall int uart_line_ctrl_get(struct device *dev, u32_t ctrl, u32_t *val);
+__syscall int uart_line_ctrl_get(struct device *dev, uint32_t ctrl, uint32_t *val);
 
 static inline int z_impl_uart_line_ctrl_get(struct device *dev,
-					   u32_t ctrl, u32_t *val)
+					   uint32_t ctrl, uint32_t *val)
 {
 	const struct uart_driver_api *api =
 		(const struct uart_driver_api *)dev->driver_api;
@@ -1139,9 +1139,9 @@ static inline int z_impl_uart_line_ctrl_get(struct device *dev,
  * @retval 0 If successful.
  * @retval failed Otherwise.
  */
-__syscall int uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p);
+__syscall int uart_drv_cmd(struct device *dev, uint32_t cmd, uint32_t p);
 
-static inline int z_impl_uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p)
+static inline int z_impl_uart_drv_cmd(struct device *dev, uint32_t cmd, uint32_t p)
 {
 	const struct uart_driver_api *api =
 		(const struct uart_driver_api *)dev->driver_api;
diff --git a/include/drivers/usb/usb_dc.h b/include/drivers/usb/usb_dc.h
index 3153e515d8..ac719e8823 100644
--- a/include/drivers/usb/usb_dc.h
+++ b/include/drivers/usb/usb_dc.h
@@ -131,9 +131,9 @@ struct usb_dc_ep_cfg_data {
 	 *       IN  EP = 0x80 | \<endpoint number\>
 	 *       OUT EP = 0x00 | \<endpoint number\>
 	 */
-	u8_t ep_addr;
+	uint8_t ep_addr;
 	/** Endpoint max packet size */
-	u16_t ep_mps;
+	uint16_t ep_mps;
 	/** Endpoint Transfer Type.
 	 * May be Bulk, Interrupt, Control or Isochronous
 	 */
@@ -143,14 +143,14 @@ struct usb_dc_ep_cfg_data {
 /**
  * Callback function signature for the USB Endpoint status
  */
-typedef void (*usb_dc_ep_callback)(u8_t ep,
+typedef void (*usb_dc_ep_callback)(uint8_t ep,
 				   enum usb_dc_ep_cb_status_code cb_status);
 
 /**
  * Callback function signature for the device
  */
 typedef void (*usb_dc_status_callback)(enum usb_dc_status_code cb_status,
-				       const u8_t *param);
+				       const uint8_t *param);
 
 /**
  * @brief Attach USB for device connection
@@ -190,7 +190,7 @@ int usb_dc_reset(void);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_set_address(const u8_t addr);
+int usb_dc_set_address(const uint8_t addr);
 
 /**
  * @brief Set USB device controller status callback
@@ -239,7 +239,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data * const cfg);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_set_stall(const u8_t ep);
+int usb_dc_ep_set_stall(const uint8_t ep);
 
 /**
  * @brief Clear stall condition for the selected endpoint
@@ -249,7 +249,7 @@ int usb_dc_ep_set_stall(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_clear_stall(const u8_t ep);
+int usb_dc_ep_clear_stall(const uint8_t ep);
 
 /**
  * @brief Check if the selected endpoint is stalled
@@ -260,7 +260,7 @@ int usb_dc_ep_clear_stall(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled);
+int usb_dc_ep_is_stalled(const uint8_t ep, uint8_t *const stalled);
 
 /**
  * @brief Halt the selected endpoint
@@ -270,7 +270,7 @@ int usb_dc_ep_is_stalled(const u8_t ep, u8_t *const stalled);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_halt(const u8_t ep);
+int usb_dc_ep_halt(const uint8_t ep);
 
 /**
  * @brief Enable the selected endpoint
@@ -284,7 +284,7 @@ int usb_dc_ep_halt(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_enable(const u8_t ep);
+int usb_dc_ep_enable(const uint8_t ep);
 
 /**
  * @brief Disable the selected endpoint
@@ -298,7 +298,7 @@ int usb_dc_ep_enable(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_disable(const u8_t ep);
+int usb_dc_ep_disable(const uint8_t ep);
 
 /**
  * @brief Flush the selected endpoint
@@ -310,7 +310,7 @@ int usb_dc_ep_disable(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_flush(const u8_t ep);
+int usb_dc_ep_flush(const uint8_t ep);
 
 /**
  * @brief Write data to the specified endpoint
@@ -330,8 +330,8 @@ int usb_dc_ep_flush(const u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
-		    const u32_t data_len, u32_t * const ret_bytes);
+int usb_dc_ep_write(const uint8_t ep, const uint8_t *const data,
+		    const uint32_t data_len, uint32_t * const ret_bytes);
 
 /**
  * @brief Read data from the specified endpoint
@@ -352,8 +352,8 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_read(const u8_t ep, u8_t *const data,
-		   const u32_t max_data_len, u32_t *const read_bytes);
+int usb_dc_ep_read(const uint8_t ep, uint8_t *const data,
+		   const uint32_t max_data_len, uint32_t *const read_bytes);
 
 /**
  * @brief Set callback function for the specified endpoint
@@ -369,7 +369,7 @@ int usb_dc_ep_read(const u8_t ep, u8_t *const data,
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb);
+int usb_dc_ep_set_callback(const uint8_t ep, const usb_dc_ep_callback cb);
 
 /**
  * @brief Read data from the specified endpoint
@@ -389,8 +389,8 @@ int usb_dc_ep_set_callback(const u8_t ep, const usb_dc_ep_callback cb);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-			u32_t *read_bytes);
+int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+			uint32_t *read_bytes);
 
 /**
  * @brief Continue reading data from the endpoint
@@ -405,7 +405,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_dc_ep_read_continue(u8_t ep);
+int usb_dc_ep_read_continue(uint8_t ep);
 
 /**
  * @brief Get endpoint max packet size
@@ -415,7 +415,7 @@ int usb_dc_ep_read_continue(u8_t ep);
  *
  * @return Enpoint max packet size (mps)
  */
-int usb_dc_ep_mps(u8_t ep);
+int usb_dc_ep_mps(uint8_t ep);
 
 /**
  * @brief Start the host wake up procedure.
diff --git a/include/drivers/video.h b/include/drivers/video.h
index e6208528ce..ff8a3f2a2a 100644
--- a/include/drivers/video.h
+++ b/include/drivers/video.h
@@ -45,10 +45,10 @@ extern "C" {
  *    of the first pixel of the next row (>=width).
  */
 struct video_format {
-	u32_t pixelformat;
-	u32_t width;
-	u32_t height;
-	u32_t pitch;
+	uint32_t pixelformat;
+	uint32_t width;
+	uint32_t height;
+	uint32_t pitch;
 };
 
 /**
@@ -65,13 +65,13 @@ struct video_format {
  * @param height_step is the height step size.
  */
 struct video_format_cap {
-	u32_t pixelformat;
-	u32_t width_min;
-	u32_t width_max;
-	u32_t height_min;
-	u32_t height_max;
-	u16_t width_step;
-	u16_t height_step;
+	uint32_t pixelformat;
+	uint32_t width_min;
+	uint32_t width_max;
+	uint32_t height_min;
+	uint32_t height_max;
+	uint16_t width_step;
+	uint16_t height_step;
 };
 
 /**
@@ -85,7 +85,7 @@ struct video_format_cap {
  */
 struct video_caps {
 	const struct video_format_cap *format_caps;
-	u8_t min_vbuf_count;
+	uint8_t min_vbuf_count;
 };
 
 /**
@@ -104,10 +104,10 @@ struct video_caps {
  */
 struct video_buffer {
 	void *driver_data;
-	u8_t *buffer;
-	u32_t size;
-	u32_t bytesused;
-	u32_t timestamp;
+	uint8_t *buffer;
+	uint32_t size;
+	uint32_t bytesused;
+	uint32_t timestamp;
 };
 
 /**
@@ -545,7 +545,7 @@ void video_buffer_release(struct video_buffer *buf);
 
 /* fourcc - four-character-code */
 #define video_fourcc(a, b, c, d)\
-	((u32_t)(a) | ((u32_t)(b) << 8) | ((u32_t)(c) << 16) | ((u32_t)(d) << 24))
+	((uint32_t)(a) | ((uint32_t)(b) << 8) | ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
 
 /* Raw bayer formats */
 #define VIDEO_PIX_FMT_BGGR8  video_fourcc('B', 'G', 'G', 'R') /*  8  BGBG.. GRGR.. */
diff --git a/include/drivers/watchdog.h b/include/drivers/watchdog.h
index 90ca1cc5d3..03ea92e139 100644
--- a/include/drivers/watchdog.h
+++ b/include/drivers/watchdog.h
@@ -76,8 +76,8 @@ extern "C" {
  *	 rounded up.
  */
 struct wdt_window {
-	u32_t min;
-	u32_t max;
+	uint32_t min;
+	uint32_t max;
 };
 
 /** Watchdog callback. */
@@ -102,7 +102,7 @@ struct wdt_timeout_cfg {
 #ifdef CONFIG_WDT_MULTISTAGE
 	struct wdt_timeout_cfg *next;
 #endif
-	u8_t flags;
+	uint8_t flags;
 };
 
 /**
@@ -110,7 +110,7 @@ struct wdt_timeout_cfg {
  * @brief Callback API for setting up watchdog instance.
  * See wdt_setup() for argument descriptions
  */
-typedef int (*wdt_api_setup)(struct device *dev, u8_t options);
+typedef int (*wdt_api_setup)(struct device *dev, uint8_t options);
 
 /**
  * @typedef wdt_api_disable
@@ -160,9 +160,9 @@ __subsystem struct wdt_driver_api {
  * @retval -ENOTSUP If any of the set options is not supported.
  * @retval -EBUSY If watchdog instance has been already setup.
  */
-__syscall int wdt_setup(struct device *dev, u8_t options);
+__syscall int wdt_setup(struct device *dev, uint8_t options);
 
-static inline int z_impl_wdt_setup(struct device *dev, u8_t options)
+static inline int z_impl_wdt_setup(struct device *dev, uint8_t options)
 {
 	const struct wdt_driver_api *api =
 		(const struct wdt_driver_api *)dev->driver_api;
diff --git a/include/fs/fcb.h b/include/fs/fcb.h
index fd31642fd6..379d2b00cd 100644
--- a/include/fs/fcb.h
+++ b/include/fs/fcb.h
@@ -49,13 +49,13 @@ struct fcb_entry {
 	struct flash_sector *fe_sector;
 	/**< Pointer to info about sector where data are placed */
 
-	u32_t fe_elem_off;
+	uint32_t fe_elem_off;
 	/**< Offset from the start of the sector to beginning of element. */
 
-	u32_t fe_data_off;
+	uint32_t fe_data_off;
 	/**< Offset from the start of the sector to the start of element. */
 
-	u16_t fe_data_len; /**< Size of data area in fcb entry*/
+	uint16_t fe_data_len; /**< Size of data area in fcb entry*/
 };
 
 /**
@@ -85,15 +85,15 @@ struct fcb_entry_ctx {
  */
 struct fcb {
 	/* Caller of fcb_init fills this in */
-	u32_t f_magic;
+	uint32_t f_magic;
 	/**< Magic value. It is placed in the beginning of FCB flash  sector.
 	 * FCB uses this when determining whether sector contains valid data
 	 * or not.
 	 */
 
-	u8_t f_version; /**<  Current version number of the data */
-	u8_t f_sector_cnt; /**< Number of elements in sector array */
-	u8_t f_scratch_cnt;
+	uint8_t f_version; /**<  Current version number of the data */
+	uint8_t f_sector_cnt; /**< Number of elements in sector array */
+	uint8_t f_scratch_cnt;
 	/**< Number of sectors to keep empty. This can be used if you need
 	 * to have scratch space for garbage collecting when FCB fills up.
 	 */
@@ -111,10 +111,10 @@ struct fcb {
 	 */
 
 	struct fcb_entry f_active; /**< internal state */
-	u16_t f_active_id;
+	uint16_t f_active_id;
 	/**< Flash location where the newest data is, internal state */
 
-	u8_t f_align;
+	uint8_t f_align;
 	/**< writes to flash have to aligned to this, internal state */
 
 	const struct flash_area *fap;
@@ -159,7 +159,7 @@ int fcb_init(int f_area_id, struct fcb *fcb);
  *
  * @return 0 on success, non-zero on failure.
  */
-int fcb_append(struct fcb *fcb, u16_t len, struct fcb_entry *loc);
+int fcb_append(struct fcb *fcb, uint16_t len, struct fcb_entry *loc);
 
 /**
  * Finishes entry append operation.
@@ -273,7 +273,7 @@ int fcb_is_empty(struct fcb *fcb);
  *
  * @return 0 on there are any fcbs available; -ENOENT otherwise
  */
-int fcb_offset_last_n(struct fcb *fcb, u8_t entries,
+int fcb_offset_last_n(struct fcb *fcb, uint8_t entries,
 		      struct fcb_entry *last_n_entry);
 
 /**
diff --git a/include/fs/littlefs.h b/include/fs/littlefs.h
index 6b864b1010..a709a0216a 100644
--- a/include/fs/littlefs.h
+++ b/include/fs/littlefs.h
@@ -23,15 +23,15 @@ struct fs_littlefs {
 	struct lfs_config cfg;
 
 	/* Must be cfg.cache_size */
-	u8_t *read_buffer;
+	uint8_t *read_buffer;
 
 	/* Must be cfg.cache_size */
-	u8_t *prog_buffer;
+	uint8_t *prog_buffer;
 
 	/* Mustbe cfg.lookahead_size/4 elements, and
 	 * cfg.lookahead_size must be a multiple of 8.
 	 */
-	u32_t *lookahead_buffer[CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE / sizeof(u32_t)];
+	uint32_t *lookahead_buffer[CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE / sizeof(uint32_t)];
 
 	/* These structures are filled automatically at mount. */
 	struct lfs lfs;
@@ -68,9 +68,9 @@ struct fs_littlefs {
  * @param lookahead_sz see :option:`CONFIG_FS_LITTLEFS_LOOKAHEAD_SIZE`
  */
 #define FS_LITTLEFS_DECLARE_CUSTOM_CONFIG(name, read_sz, prog_sz, cache_sz, lookahead_sz) \
-	static u8_t __aligned(4) name ## _read_buffer[cache_sz];			  \
-	static u8_t __aligned(4) name ## _prog_buffer[cache_sz];			  \
-	static u32_t name ## _lookahead_buffer[(lookahead_sz) / sizeof(u32_t)];		  \
+	static uint8_t __aligned(4) name ## _read_buffer[cache_sz];			  \
+	static uint8_t __aligned(4) name ## _prog_buffer[cache_sz];			  \
+	static uint32_t name ## _lookahead_buffer[(lookahead_sz) / sizeof(uint32_t)];		  \
 	static struct fs_littlefs name = {						  \
 		.cfg = {								  \
 			.read_size = (read_sz),						  \
diff --git a/include/fs/nvs.h b/include/fs/nvs.h
index 471489c9dd..ae200ea82b 100644
--- a/include/fs/nvs.h
+++ b/include/fs/nvs.h
@@ -35,7 +35,7 @@ extern "C" {
  *
  * @param offset File system offset in flash
  * @param ate_wra: Allocation table entry write address. Addresses are stored
- * as u32_t: high 2 bytes are sector, low 2 bytes are offset in sector,
+ * as uint32_t: high 2 bytes are sector, low 2 bytes are offset in sector,
  * @param data_wra: Data write address.
  * @param sector_size File system is divided into sectors each sector should be
  * multiple of pagesize
@@ -46,13 +46,13 @@ extern "C" {
  */
 struct nvs_fs {
 	off_t offset;		/* filesystem offset in flash */
-	u32_t ate_wra;		/* next alloc table entry write address */
-	u32_t data_wra;		/* next data write address */
-	u16_t sector_size;	/* filesystem is divided into sectors,
+	uint32_t ate_wra;		/* next alloc table entry write address */
+	uint32_t data_wra;		/* next data write address */
+	uint16_t sector_size;	/* filesystem is divided into sectors,
 				 * sector size should be multiple of pagesize
 				 */
-	u16_t sector_count;	/* amount of sectors in the filesystem */
-	u8_t write_block_size;  /* write block size for alignment */
+	uint16_t sector_count;	/* amount of sectors in the filesystem */
+	uint8_t write_block_size;  /* write block size for alignment */
 	bool ready;		/* is the filesystem initialized ? */
 
 	struct k_mutex nvs_lock;
@@ -106,7 +106,7 @@ int nvs_clear(struct nvs_fs *fs);
  * of bytes requested to be written. On error returns -ERRNO code.
  */
 
-ssize_t nvs_write(struct nvs_fs *fs, u16_t id, const void *data, size_t len);
+ssize_t nvs_write(struct nvs_fs *fs, uint16_t id, const void *data, size_t len);
 
 /**
  * @brief nvs_delete
@@ -118,7 +118,7 @@ ssize_t nvs_write(struct nvs_fs *fs, u16_t id, const void *data, size_t len);
  * @retval 0 Success
  * @retval -ERRNO errno code if error
  */
-int nvs_delete(struct nvs_fs *fs, u16_t id);
+int nvs_delete(struct nvs_fs *fs, uint16_t id);
 
 /**
  * @brief nvs_read
@@ -135,7 +135,7 @@ int nvs_delete(struct nvs_fs *fs, u16_t id);
  * number of bytes requested to read this indicates not all bytes were read,
  * and more data is available. On error returns -ERRNO code.
  */
-ssize_t nvs_read(struct nvs_fs *fs, u16_t id, void *data, size_t len);
+ssize_t nvs_read(struct nvs_fs *fs, uint16_t id, void *data, size_t len);
 
 /**
  * @brief nvs_read_hist
@@ -153,8 +153,8 @@ ssize_t nvs_read(struct nvs_fs *fs, u16_t id, void *data, size_t len);
  * number of bytes requested to read this indicates not all bytes were read,
  * and more data is available. On error returns -ERRNO code.
  */
-ssize_t nvs_read_hist(struct nvs_fs *fs, u16_t id, void *data, size_t len,
-		  u16_t cnt);
+ssize_t nvs_read_hist(struct nvs_fs *fs, uint16_t id, void *data, size_t len,
+		  uint16_t cnt);
 
 /**
  * @brief nvs_calc_free_space
diff --git a/include/init.h b/include/init.h
index e1977e8758..7b4f49fe64 100644
--- a/include/init.h
+++ b/include/init.h
@@ -45,7 +45,7 @@ struct init_entry {
 	struct device *dev;
 };
 
-void z_sys_init_run_level(s32_t level);
+void z_sys_init_run_level(int32_t level);
 
 /* A counter is used to avoid issues when two or more system devices
  * are declared in the same C file with the same init function.
diff --git a/include/irq.h b/include/irq.h
index 781bb50de8..083ffa1ca0 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -64,7 +64,7 @@ extern "C" {
 static inline int
 irq_connect_dynamic(unsigned int irq, unsigned int priority,
 		    void (*routine)(void *parameter), void *parameter,
-		    u32_t flags)
+		    uint32_t flags)
 {
 	return arch_irq_connect_dynamic(irq, priority, routine, parameter,
 					flags);
diff --git a/include/irq_nextlevel.h b/include/irq_nextlevel.h
index 206c631e02..2d8fb0c3e3 100644
--- a/include/irq_nextlevel.h
+++ b/include/irq_nextlevel.h
@@ -24,7 +24,7 @@ extern "C" {
 typedef void (*irq_next_level_func_t)(struct device *dev, unsigned int irq);
 typedef unsigned int (*irq_next_level_get_state_t)(struct device *dev);
 typedef void (*irq_next_level_priority_t)(struct device *dev,
-		unsigned int irq, unsigned int prio, u32_t flags);
+		unsigned int irq, unsigned int prio, uint32_t flags);
 typedef int (*irq_next_level_get_line_state_t)(struct device *dev,
 					       unsigned int irq);
 
@@ -49,7 +49,7 @@ struct irq_next_level_api {
  *
  * @return N/A
  */
-static inline void irq_enable_next_level(struct device *dev, u32_t irq)
+static inline void irq_enable_next_level(struct device *dev, uint32_t irq)
 {
 	const struct irq_next_level_api *api =
 		(const struct irq_next_level_api *)dev->driver_api;
@@ -67,7 +67,7 @@ static inline void irq_enable_next_level(struct device *dev, u32_t irq)
  *
  * @return N/A
  */
-static inline void irq_disable_next_level(struct device *dev, u32_t irq)
+static inline void irq_disable_next_level(struct device *dev, uint32_t irq)
 {
 	const struct irq_next_level_api *api =
 		(const struct irq_next_level_api *)dev->driver_api;
@@ -106,8 +106,8 @@ static inline unsigned int irq_is_enabled_next_level(struct device *dev)
  *
  * @return N/A
  */
-static inline void irq_set_priority_next_level(struct device *dev, u32_t irq,
-		u32_t prio, u32_t flags)
+static inline void irq_set_priority_next_level(struct device *dev, uint32_t irq,
+		uint32_t prio, uint32_t flags)
 {
 	const struct irq_next_level_api *api =
 		(const struct irq_next_level_api *)dev->driver_api;
diff --git a/include/kernel.h b/include/kernel.h
index f4a22a26f5..0018d3663a 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -78,7 +78,7 @@ extern "C" {
 
 #ifdef CONFIG_OBJECT_TRACING
 #define _OBJECT_TRACING_NEXT_PTR(type) struct type *__next;
-#define _OBJECT_TRACING_LINKED_FLAG u8_t __linked;
+#define _OBJECT_TRACING_LINKED_FLAG uint8_t __linked;
 #define _OBJECT_TRACING_INIT \
 	.__next = NULL,	     \
 	.__linked = 0,
@@ -153,7 +153,7 @@ struct z_stack_data {
 	size_t size;
 
 	/* Stack buffer for privilege mode elevations */
-	u8_t *priv;
+	uint8_t *priv;
 };
 #endif /* CONFIG_GEN_PRIV_STACKS */
 
@@ -184,9 +184,9 @@ union z_object_data {
  * z_object_find() */
 struct z_object {
 	void *name;
-	u8_t perms[CONFIG_MAX_THREAD_BYTES];
-	u8_t type;
-	u8_t flags;
+	uint8_t perms[CONFIG_MAX_THREAD_BYTES];
+	uint8_t type;
+	uint8_t flags;
 	union z_object_data data;
 } __packed __aligned(4);
 
@@ -457,10 +457,10 @@ struct _thread_base {
 	_wait_q_t *pended_on;
 
 	/* user facing 'thread options'; values defined in include/kernel.h */
-	u8_t user_options;
+	uint8_t user_options;
 
 	/* thread state */
-	u8_t thread_state;
+	uint8_t thread_state;
 
 	/*
 	 * scheduler lock count and thread priority
@@ -479,37 +479,37 @@ struct _thread_base {
 	union {
 		struct {
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-			u8_t sched_locked;
-			s8_t prio;
+			uint8_t sched_locked;
+			int8_t prio;
 #else /* LITTLE and PDP */
-			s8_t prio;
-			u8_t sched_locked;
+			int8_t prio;
+			uint8_t sched_locked;
 #endif
 		};
-		u16_t preempt;
+		uint16_t preempt;
 	};
 
 #ifdef CONFIG_SCHED_DEADLINE
 	int prio_deadline;
 #endif
 
-	u32_t order_key;
+	uint32_t order_key;
 
 #ifdef CONFIG_SMP
 	/* True for the per-CPU idle threads */
-	u8_t is_idle;
+	uint8_t is_idle;
 
 	/* CPU index on which thread was last run */
-	u8_t cpu;
+	uint8_t cpu;
 
 	/* Recursive count of irq_lock() calls */
-	u8_t global_lock_count;
+	uint8_t global_lock_count;
 
 #endif
 
 #ifdef CONFIG_SCHED_CPU_MASK
 	/* "May run on" bits for each CPU */
-	u8_t cpu_mask;
+	uint8_t cpu_mask;
 #endif
 
 	/* data returned by APIs */
@@ -802,7 +802,7 @@ __syscall k_tid_t k_thread_create(struct k_thread *new_thread,
 				  size_t stack_size,
 				  k_thread_entry_t entry,
 				  void *p1, void *p2, void *p3,
-				  int prio, u32_t options, k_timeout_t delay);
+				  int prio, uint32_t options, k_timeout_t delay);
 
 /**
  * @brief Drop a thread's privileges permanently to user mode
@@ -923,7 +923,7 @@ __syscall int k_thread_join(struct k_thread *thread, k_timeout_t timeout);
  * @return Zero if the requested time has elapsed or the number of milliseconds
  * left to sleep, if thread was woken up by \ref k_wakeup call.
  */
-__syscall s32_t k_sleep(k_timeout_t timeout);
+__syscall int32_t k_sleep(k_timeout_t timeout);
 
 /**
  * @brief Put the current thread to sleep.
@@ -935,7 +935,7 @@ __syscall s32_t k_sleep(k_timeout_t timeout);
  * @return Zero if the requested time has elapsed or the number of milliseconds
  * left to sleep, if thread was woken up by \ref k_wakeup call.
  */
-static inline s32_t k_msleep(s32_t ms)
+static inline int32_t k_msleep(int32_t ms)
 {
 	return k_sleep(Z_TIMEOUT_MS(ms));
 }
@@ -954,7 +954,7 @@ static inline s32_t k_msleep(s32_t ms)
  * @return Zero if the requested time has elapsed or the number of microseconds
  * left to sleep, if thread was woken up by \ref k_wakeup call.
  */
-__syscall s32_t k_usleep(s32_t us);
+__syscall int32_t k_usleep(int32_t us);
 
 /**
  * @brief Cause the current thread to busy wait.
@@ -970,7 +970,7 @@ __syscall s32_t k_usleep(s32_t us);
  *
  * @return N/A
  */
-__syscall void k_busy_wait(u32_t usec_to_wait);
+__syscall void k_busy_wait(uint32_t usec_to_wait);
 
 /**
  * @brief Yield the current thread.
@@ -1085,8 +1085,8 @@ struct _static_thread_data {
 	void *init_p2;
 	void *init_p3;
 	int init_prio;
-	u32_t init_options;
-	s32_t init_delay;
+	uint32_t init_options;
+	int32_t init_delay;
 	void (*init_abort)(void);
 	const char *init_name;
 };
@@ -1364,7 +1364,7 @@ __syscall void k_thread_resume(k_tid_t thread);
  *
  * @return N/A
  */
-extern void k_sched_time_slice_set(s32_t slice, int prio);
+extern void k_sched_time_slice_set(int32_t slice, int prio);
 
 /** @} */
 
@@ -1766,7 +1766,7 @@ struct k_timer {
 	k_timeout_t period;
 
 	/* timer status */
-	u32_t status;
+	uint32_t status;
 
 	/* user-specific data, also used to support legacy features */
 	void *user_data;
@@ -1910,7 +1910,7 @@ __syscall void k_timer_stop(struct k_timer *timer);
  *
  * @return Timer status.
  */
-__syscall u32_t k_timer_status_get(struct k_timer *timer);
+__syscall uint32_t k_timer_status_get(struct k_timer *timer);
 
 /**
  * @brief Synchronize thread to timer expiration.
@@ -1929,7 +1929,7 @@ __syscall u32_t k_timer_status_get(struct k_timer *timer);
  *
  * @return Timer status.
  */
-__syscall u32_t k_timer_status_sync(struct k_timer *timer);
+__syscall uint32_t k_timer_status_sync(struct k_timer *timer);
 
 #ifdef CONFIG_SYS_CLOCK_EXISTS
 
@@ -1974,7 +1974,7 @@ static inline k_ticks_t z_impl_k_timer_remaining_ticks(struct k_timer *timer)
  *
  * @return Remaining time (in milliseconds).
  */
-static inline u32_t k_timer_remaining_get(struct k_timer *timer)
+static inline uint32_t k_timer_remaining_get(struct k_timer *timer)
 {
 	return k_ticks_to_ms_floor32(k_timer_remaining_ticks(timer));
 }
@@ -2036,7 +2036,7 @@ static inline void *z_impl_k_timer_user_data_get(struct k_timer *timer)
  *
  * @return Current uptime in ticks.
  */
-__syscall s64_t k_uptime_ticks(void);
+__syscall int64_t k_uptime_ticks(void);
 
 /**
  * @brief Get system uptime.
@@ -2053,7 +2053,7 @@ __syscall s64_t k_uptime_ticks(void);
  *
  * @return Current uptime in milliseconds.
  */
-static inline s64_t k_uptime_get(void)
+static inline int64_t k_uptime_get(void)
 {
 	return k_ticks_to_ms_floor64(k_uptime_ticks());
 }
@@ -2113,9 +2113,9 @@ __deprecated static inline void k_disable_sys_clock_always_on(void)
  *
  * @return The low 32 bits of the current uptime, in milliseconds.
  */
-static inline u32_t k_uptime_get_32(void)
+static inline uint32_t k_uptime_get_32(void)
 {
-	return (u32_t)k_uptime_get();
+	return (uint32_t)k_uptime_get();
 }
 
 /**
@@ -2129,9 +2129,9 @@ static inline u32_t k_uptime_get_32(void)
  *
  * @return Elapsed time.
  */
-static inline s64_t k_uptime_delta(s64_t *reftime)
+static inline int64_t k_uptime_delta(int64_t *reftime)
 {
-	s64_t uptime, delta;
+	int64_t uptime, delta;
 
 	uptime = k_uptime_get();
 	delta = uptime - *reftime;
@@ -2155,9 +2155,9 @@ static inline s64_t k_uptime_delta(s64_t *reftime)
  *
  * @deprecated in 2.3 release, replace with k_uptime_delta()
  */
-__deprecated static inline u32_t k_uptime_delta_32(s64_t *reftime)
+__deprecated static inline uint32_t k_uptime_delta_32(int64_t *reftime)
 {
-	return (u32_t)k_uptime_delta(reftime);
+	return (uint32_t)k_uptime_delta(reftime);
 }
 
 /**
@@ -2168,7 +2168,7 @@ __deprecated static inline u32_t k_uptime_delta_32(s64_t *reftime)
  *
  * @return Current hardware clock up-counter (in cycles).
  */
-static inline u32_t k_cycle_get_32(void)
+static inline uint32_t k_cycle_get_32(void)
 {
 	return arch_k_cycle_get_32();
 }
@@ -2274,7 +2274,7 @@ extern void k_queue_append(struct k_queue *queue, void *data);
  * @retval 0 on success
  * @retval -ENOMEM if there isn't sufficient RAM in the caller's resource pool
  */
-__syscall s32_t k_queue_alloc_append(struct k_queue *queue, void *data);
+__syscall int32_t k_queue_alloc_append(struct k_queue *queue, void *data);
 
 /**
  * @brief Prepend an element to a queue.
@@ -2308,7 +2308,7 @@ extern void k_queue_prepend(struct k_queue *queue, void *data);
  * @retval 0 on success
  * @retval -ENOMEM if there isn't sufficient RAM in the caller's resource pool
  */
-__syscall s32_t k_queue_alloc_prepend(struct k_queue *queue, void *data);
+__syscall int32_t k_queue_alloc_prepend(struct k_queue *queue, void *data);
 
 /**
  * @brief Inserts an element to a queue.
@@ -2887,7 +2887,7 @@ struct k_lifo {
 /**
  * @cond INTERNAL_HIDDEN
  */
-#define K_STACK_FLAG_ALLOC	((u8_t)1)	/* Buffer was allocated */
+#define K_STACK_FLAG_ALLOC	((uint8_t)1)	/* Buffer was allocated */
 
 typedef uintptr_t stack_data_t;
 
@@ -2898,7 +2898,7 @@ struct k_stack {
 
 	_OBJECT_TRACING_NEXT_PTR(k_stack)
 	_OBJECT_TRACING_LINKED_FLAG
-	u8_t flags;
+	uint8_t flags;
 };
 
 #define Z_STACK_INITIALIZER(obj, stack_buffer, stack_num_entries) \
@@ -2934,7 +2934,7 @@ struct k_stack {
  * @return N/A
  */
 void k_stack_init(struct k_stack *stack,
-		  stack_data_t *buffer, u32_t num_entries);
+		  stack_data_t *buffer, uint32_t num_entries);
 
 
 /**
@@ -2951,8 +2951,8 @@ void k_stack_init(struct k_stack *stack,
  * @return -ENOMEM if memory couldn't be allocated
  */
 
-__syscall s32_t k_stack_alloc_init(struct k_stack *stack,
-				   u32_t num_entries);
+__syscall int32_t k_stack_alloc_init(struct k_stack *stack,
+				   uint32_t num_entries);
 
 /**
  * @brief Release a stack's allocated buffer
@@ -3026,7 +3026,7 @@ struct k_work;
 struct k_work_poll;
 
 /* private, used by k_poll and k_work_poll */
-typedef int (*_poller_cb_t)(struct k_poll_event *event, u32_t state);
+typedef int (*_poller_cb_t)(struct k_poll_event *event, uint32_t state);
 struct _poller {
 	volatile bool is_polling;
 	struct k_thread *thread;
@@ -3436,7 +3436,7 @@ static inline k_ticks_t k_delayed_work_remaining_ticks(
  *
  * @return Remaining time (in milliseconds).
  */
-static inline s32_t k_delayed_work_remaining_get(struct k_delayed_work *work)
+static inline int32_t k_delayed_work_remaining_get(struct k_delayed_work *work)
 {
 	return k_ticks_to_ms_floor32(z_timeout_remaining(&work->timeout));
 }
@@ -3569,7 +3569,7 @@ struct k_mutex {
 	struct k_thread *owner;
 
 	/** Current lock count */
-	u32_t lock_count;
+	uint32_t lock_count;
 
 	/** Original thread priority */
 	int owner_orig_prio;
@@ -3679,8 +3679,8 @@ __syscall int k_mutex_unlock(struct k_mutex *mutex);
 
 struct k_sem {
 	_wait_q_t wait_q;
-	u32_t count;
-	u32_t limit;
+	uint32_t count;
+	uint32_t limit;
 	_POLL_EVENT;
 
 	_OBJECT_TRACING_NEXT_PTR(k_sem)
@@ -3829,7 +3829,7 @@ struct k_msgq {
 	/** Message size */
 	size_t msg_size;
 	/** Maximal number of messages */
-	u32_t max_msgs;
+	uint32_t max_msgs;
 	/** Start of message buffer */
 	char *buffer_start;
 	/** End of message buffer */
@@ -3839,13 +3839,13 @@ struct k_msgq {
 	/** Write pointer */
 	char *write_ptr;
 	/** Number of used messages */
-	u32_t used_msgs;
+	uint32_t used_msgs;
 
 	_OBJECT_TRACING_NEXT_PTR(k_msgq)
 	_OBJECT_TRACING_LINKED_FLAG
 
 	/** Message queue */
-	u8_t flags;
+	uint8_t flags;
 };
 /**
  * @cond INTERNAL_HIDDEN
@@ -3879,9 +3879,9 @@ struct k_msgq_attrs {
 	/** Message Size */
 	size_t msg_size;
 	/** Maximal number of messages */
-	u32_t max_msgs;
+	uint32_t max_msgs;
 	/** Used messages */
-	u32_t used_msgs;
+	uint32_t used_msgs;
 };
 
 
@@ -3931,7 +3931,7 @@ struct k_msgq_attrs {
  * @return N/A
  */
 void k_msgq_init(struct k_msgq *q, char *buffer, size_t msg_size,
-		 u32_t max_msgs);
+		 uint32_t max_msgs);
 
 /**
  * @brief Initialize a message queue.
@@ -3953,7 +3953,7 @@ void k_msgq_init(struct k_msgq *q, char *buffer, size_t msg_size,
  *	an integer overflow.
  */
 __syscall int k_msgq_alloc_init(struct k_msgq *msgq, size_t msg_size,
-				u32_t max_msgs);
+				uint32_t max_msgs);
 
 /**
  * @brief Release allocated buffer for a queue
@@ -4045,7 +4045,7 @@ __syscall void k_msgq_purge(struct k_msgq *msgq);
  *
  * @return Number of unused ring buffer entries.
  */
-__syscall u32_t k_msgq_num_free_get(struct k_msgq *msgq);
+__syscall uint32_t k_msgq_num_free_get(struct k_msgq *msgq);
 
 /**
  * @brief Get basic attributes of a message queue.
@@ -4061,7 +4061,7 @@ __syscall void  k_msgq_get_attrs(struct k_msgq *msgq,
 				 struct k_msgq_attrs *attrs);
 
 
-static inline u32_t z_impl_k_msgq_num_free_get(struct k_msgq *msgq)
+static inline uint32_t z_impl_k_msgq_num_free_get(struct k_msgq *msgq)
 {
 	return msgq->max_msgs - msgq->used_msgs;
 }
@@ -4075,9 +4075,9 @@ static inline u32_t z_impl_k_msgq_num_free_get(struct k_msgq *msgq)
  *
  * @return Number of messages.
  */
-__syscall u32_t k_msgq_num_used_get(struct k_msgq *msgq);
+__syscall uint32_t k_msgq_num_used_get(struct k_msgq *msgq);
 
-static inline u32_t z_impl_k_msgq_num_used_get(struct k_msgq *msgq)
+static inline uint32_t z_impl_k_msgq_num_used_get(struct k_msgq *msgq)
 {
 	return msgq->used_msgs;
 }
@@ -4096,11 +4096,11 @@ static inline u32_t z_impl_k_msgq_num_used_get(struct k_msgq *msgq)
  */
 struct k_mbox_msg {
 	/** internal use only - needed for legacy API support */
-	u32_t _mailbox;
+	uint32_t _mailbox;
 	/** size of message (in bytes) */
 	size_t size;
 	/** application-defined information value */
-	u32_t info;
+	uint32_t info;
 	/** sender's message data buffer */
 	void *tx_data;
 	/** internal use only - needed for legacy API support */
@@ -4309,7 +4309,7 @@ struct k_pipe {
 
 	_OBJECT_TRACING_NEXT_PTR(k_pipe)
 	_OBJECT_TRACING_LINKED_FLAG
-	u8_t	       flags;		/**< Flags */
+	uint8_t	       flags;		/**< Flags */
 };
 
 /**
@@ -4493,11 +4493,11 @@ __syscall size_t k_pipe_write_avail(struct k_pipe *pipe);
 
 struct k_mem_slab {
 	_wait_q_t wait_q;
-	u32_t num_blocks;
+	uint32_t num_blocks;
 	size_t block_size;
 	char *buffer;
 	char *free_list;
-	u32_t num_used;
+	uint32_t num_used;
 
 	_OBJECT_TRACING_NEXT_PTR(k_mem_slab)
 	_OBJECT_TRACING_LINKED_FLAG
@@ -4576,7 +4576,7 @@ struct k_mem_slab {
  *
  */
 extern int k_mem_slab_init(struct k_mem_slab *slab, void *buffer,
-			   size_t block_size, u32_t num_blocks);
+			   size_t block_size, uint32_t num_blocks);
 
 /**
  * @brief Allocate memory from a memory slab.
@@ -4621,7 +4621,7 @@ extern void k_mem_slab_free(struct k_mem_slab *slab, void **mem);
  *
  * @return Number of allocated memory blocks.
  */
-static inline u32_t k_mem_slab_num_used_get(struct k_mem_slab *slab)
+static inline uint32_t k_mem_slab_num_used_get(struct k_mem_slab *slab)
 {
 	return slab->num_used;
 }
@@ -4636,7 +4636,7 @@ static inline u32_t k_mem_slab_num_used_get(struct k_mem_slab *slab)
  *
  * @return Number of unallocated memory blocks.
  */
-static inline u32_t k_mem_slab_num_free_get(struct k_mem_slab *slab)
+static inline uint32_t k_mem_slab_num_free_get(struct k_mem_slab *slab)
 {
 	return slab->num_blocks - slab->num_used;
 }
@@ -4972,19 +4972,19 @@ struct k_poll_event {
 	struct _poller *poller;
 
 	/** optional user-specified tag, opaque, untouched by the API */
-	u32_t tag:8;
+	uint32_t tag:8;
 
 	/** bitfield of event types (bitwise-ORed K_POLL_TYPE_xxx values) */
-	u32_t type:_POLL_NUM_TYPES;
+	uint32_t type:_POLL_NUM_TYPES;
 
 	/** bitfield of event states (bitwise-ORed K_POLL_STATE_xxx values) */
-	u32_t state:_POLL_NUM_STATES;
+	uint32_t state:_POLL_NUM_STATES;
 
 	/** mode of operation, from enum k_poll_modes */
-	u32_t mode:1;
+	uint32_t mode:1;
 
 	/** unused bits in 32-bit word */
-	u32_t unused:_POLL_EVENT_NUM_UNUSED_BITS;
+	uint32_t unused:_POLL_EVENT_NUM_UNUSED_BITS;
 
 	/** per-type data */
 	union {
@@ -5034,7 +5034,7 @@ struct k_poll_event {
  * @return N/A
  */
 
-extern void k_poll_event_init(struct k_poll_event *event, u32_t type,
+extern void k_poll_event_init(struct k_poll_event *event, uint32_t type,
 			      int mode, void *obj);
 
 /**
@@ -5149,7 +5149,7 @@ __syscall int k_poll_signal_raise(struct k_poll_signal *signal, int result);
 /**
  * @internal
  */
-extern void z_handle_obj_poll_events(sys_dlist_t *events, u32_t state);
+extern void z_handle_obj_poll_events(sys_dlist_t *events, uint32_t state);
 
 /** @} */
 
@@ -5200,7 +5200,7 @@ static inline void k_cpu_atomic_idle(unsigned int key)
 /**
  * @internal
  */
-extern void z_sys_power_save_idle_exit(s32_t ticks);
+extern void z_sys_power_save_idle_exit(int32_t ticks);
 
 #ifdef ARCH_EXCEPT
 /* This architecture has direct support for triggering a CPU exception */
@@ -5258,7 +5258,7 @@ extern void z_sys_power_save_idle_exit(s32_t ticks);
  * @internal
  */
 extern void z_init_thread_base(struct _thread_base *thread_base,
-			      int priority, u32_t initial_state,
+			      int priority, uint32_t initial_state,
 			      unsigned int options);
 
 #ifdef CONFIG_MULTITHREADING
@@ -5327,7 +5327,7 @@ struct k_mem_domain {
 	/** domain q */
 	sys_dlist_t mem_domain_q;
 	/** number of partitions in the domain */
-	u8_t num_partitions;
+	uint8_t num_partitions;
 };
 
 
@@ -5344,7 +5344,7 @@ struct k_mem_domain {
  * @param parts An array of pointers to the memory partitions. Can be NULL
  *              if num_parts is zero.
  */
-extern void k_mem_domain_init(struct k_mem_domain *domain, u8_t num_parts,
+extern void k_mem_domain_init(struct k_mem_domain *domain, uint8_t num_parts,
 			      struct k_mem_partition *parts[]);
 /**
  * @brief Destroy a memory domain.
diff --git a/include/kernel_structs.h b/include/kernel_structs.h
index bba45f5c00..f2e68123f2 100644
--- a/include/kernel_structs.h
+++ b/include/kernel_structs.h
@@ -101,7 +101,7 @@ typedef struct _ready_q _ready_q_t;
 
 struct _cpu {
 	/* nested interrupt count */
-	u32_t nested;
+	uint32_t nested;
 
 	/* interrupt stack pointer base */
 	char *irq_stack;
@@ -122,11 +122,11 @@ struct _cpu {
 	int slice_ticks;
 #endif
 
-	u8_t id;
+	uint8_t id;
 
 #ifdef CONFIG_SMP
 	/* True when _current is allowed to context switch */
-	u8_t swap_ok;
+	uint8_t swap_ok;
 #endif
 };
 
@@ -141,7 +141,7 @@ struct z_kernel {
 #endif
 
 #ifdef CONFIG_SYS_POWER_MANAGEMENT
-	s32_t idle; /* Number of ticks for kernel idling */
+	int32_t idle; /* Number of ticks for kernel idling */
 #endif
 
 	/*
@@ -220,7 +220,7 @@ typedef void (*_timeout_func_t)(struct _timeout *t);
 
 struct _timeout {
 	sys_dnode_t node;
-	s32_t dticks;
+	int32_t dticks;
 	_timeout_func_t fn;
 };
 
diff --git a/include/kernel_version.h b/include/kernel_version.h
index 23e2adb003..6d3109fed3 100644
--- a/include/kernel_version.h
+++ b/include/kernel_version.h
@@ -44,7 +44,7 @@ extern "C" {
  *
  * @return kernel version
  */
-extern u32_t sys_kernel_version_get(void);
+extern uint32_t sys_kernel_version_get(void);
 
 /**
  * @}
diff --git a/include/linker/intlist.ld b/include/linker/intlist.ld
index 5b3530ba11..d04a193221 100644
--- a/include/linker/intlist.ld
+++ b/include/linker/intlist.ld
@@ -10,7 +10,7 @@
  * What we create here is a data structure:
  *
  * struct {
- *	u32_t num_vectors;       <- typically CONFIG_NUM_IRQS
+ *	uint32_t num_vectors;       <- typically CONFIG_NUM_IRQS
  *	struct _isr_list isrs[]; <- Usually of smaller size than num_vectors
  * }
  *
diff --git a/include/logging/log.h b/include/logging/log.h
index 142fde13b5..5894a25b8c 100644
--- a/include/logging/log.h
+++ b/include/logging/log.h
@@ -413,7 +413,7 @@ static inline char *log_strdup(const char *str)
 			IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) ?	      \
 			&LOG_ITEM_DYNAMIC_DATA(GET_ARG1(__VA_ARGS__)) : NULL; \
 									      \
-	static const u32_t __log_level __unused =			      \
+	static const uint32_t __log_level __unused =			      \
 					_LOG_LEVEL_RESOLVE(__VA_ARGS__)
 
 /**
@@ -423,7 +423,7 @@ static inline char *log_strdup(const char *str)
  * @param level Level used in file or in function.
  *
  */
-#define LOG_LEVEL_SET(level) static const u32_t __log_level __unused = \
+#define LOG_LEVEL_SET(level) static const uint32_t __log_level __unused = \
 				Z_LOG_RESOLVED_LEVEL(level, 0)
 
 /**
diff --git a/include/logging/log_backend.h b/include/logging/log_backend.h
index ba48863d30..e3f1b23ab7 100644
--- a/include/logging/log_backend.h
+++ b/include/logging/log_backend.h
@@ -32,13 +32,13 @@ struct log_backend_api {
 	void (*put)(const struct log_backend *const backend,
 		    struct log_msg *msg);
 	void (*put_sync_string)(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
+			 struct log_msg_ids src_level, uint32_t timestamp,
 			 const char *fmt, va_list ap);
 	void (*put_sync_hexdump)(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t len);
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t len);
 
-	void (*dropped)(const struct log_backend *const backend, u32_t cnt);
+	void (*dropped)(const struct log_backend *const backend, uint32_t cnt);
 	void (*panic)(const struct log_backend *const backend);
 	void (*init)(void);
 };
@@ -48,7 +48,7 @@ struct log_backend_api {
  */
 struct log_backend_control_block {
 	void *ctx;
-	u8_t id;
+	uint8_t id;
 	bool active;
 };
 
@@ -114,7 +114,7 @@ static inline void log_backend_put(const struct log_backend *const backend,
 static inline void log_backend_put_sync_string(
 					const struct log_backend *const backend,
 					struct log_msg_ids src_level,
-					u32_t timestamp, const char *fmt,
+					uint32_t timestamp, const char *fmt,
 					va_list ap)
 {
 	__ASSERT_NO_MSG(backend != NULL);
@@ -138,8 +138,8 @@ static inline void log_backend_put_sync_string(
 static inline void log_backend_put_sync_hexdump(
 					const struct log_backend *const backend,
 					struct log_msg_ids src_level,
-					u32_t timestamp, const char *metadata,
-					const u8_t *data, u32_t len)
+					uint32_t timestamp, const char *metadata,
+					const uint8_t *data, uint32_t len)
 {
 	__ASSERT_NO_MSG(backend != NULL);
 
@@ -158,7 +158,7 @@ static inline void log_backend_put_sync_hexdump(
  * @param[in] cnt      Number of dropped logs since last notification.
  */
 static inline void log_backend_dropped(const struct log_backend *const backend,
-				       u32_t cnt)
+				       uint32_t cnt)
 {
 	__ASSERT_NO_MSG(backend != NULL);
 
@@ -187,7 +187,7 @@ static inline void log_backend_panic(const struct log_backend *const backend)
  * @param id       ID.
  */
 static inline void log_backend_id_set(const struct log_backend *const backend,
-				      u8_t id)
+				      uint8_t id)
 {
 	__ASSERT_NO_MSG(backend != NULL);
 	backend->cb->id = id;
@@ -201,7 +201,7 @@ static inline void log_backend_id_set(const struct log_backend *const backend,
  * @param[in] backend  Pointer to the backend instance.
  * @return    Id.
  */
-static inline u8_t log_backend_id_get(const struct log_backend *const backend)
+static inline uint8_t log_backend_id_get(const struct log_backend *const backend)
 {
 	__ASSERT_NO_MSG(backend != NULL);
 	return backend->cb->id;
@@ -214,7 +214,7 @@ static inline u8_t log_backend_id_get(const struct log_backend *const backend)
  *
  * @return    Pointer to the backend instance.
  */
-static inline const struct log_backend *log_backend_get(u32_t idx)
+static inline const struct log_backend *log_backend_get(uint32_t idx)
 {
 	return &__log_backends_start[idx];
 }
diff --git a/include/logging/log_core.h b/include/logging/log_core.h
index 53589d1d78..8ba679ca55 100644
--- a/include/logging/log_core.h
+++ b/include/logging/log_core.h
@@ -35,13 +35,13 @@ extern "C" {
 #endif
 
 #define LOG_FUNCTION_PREFIX_MASK \
-	(((u32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_ERR) << \
+	(((uint32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_ERR) << \
 	  LOG_LEVEL_ERR) | \
-	 ((u32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_WRN) << \
+	 ((uint32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_WRN) << \
 	  LOG_LEVEL_WRN) | \
-	 ((u32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_INF) << \
+	 ((uint32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_INF) << \
 	  LOG_LEVEL_INF) | \
-	 ((u32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_DBG) << LOG_LEVEL_DBG))
+	 ((uint32_t)IS_ENABLED(CONFIG_LOG_FUNC_NAME_PREFIX_DBG) << LOG_LEVEL_DBG))
 
 /** @brief Macro for returning local level value if defined or default.
  *
@@ -294,7 +294,7 @@ static inline char z_log_minimal_level_to_char(int level)
 
 #define Z_LOG(_level, ...)			       \
 	__LOG(_level,				       \
-	      (u16_t)LOG_CURRENT_MODULE_ID(),	       \
+	      (uint16_t)LOG_CURRENT_MODULE_ID(),	       \
 	      LOG_CURRENT_DYNAMIC_DATA_ADDR(),	       \
 	      __VA_ARGS__)
 
@@ -347,7 +347,7 @@ static inline char z_log_minimal_level_to_char(int level)
 
 #define Z_LOG_HEXDUMP(_level, _data, _length, _str)	       \
 	__LOG_HEXDUMP(_level,				       \
-		      (u16_t)LOG_CURRENT_MODULE_ID(),	       \
+		      (uint16_t)LOG_CURRENT_MODULE_ID(),	       \
 		      LOG_CURRENT_DYNAMIC_DATA_ADDR(),	       \
 		      _data, _length, _str)
 
@@ -421,7 +421,7 @@ extern struct log_source_const_data __log_const_end[0];
  * @param source_id Source ID.
  * @return Name.
  */
-static inline const char *log_name_get(u32_t source_id)
+static inline const char *log_name_get(uint32_t source_id)
 {
 	return __log_const_start[source_id].name;
 }
@@ -431,7 +431,7 @@ static inline const char *log_name_get(u32_t source_id)
  * @param source_id Source ID.
  * @return Level.
  */
-static inline u8_t log_compiled_level_get(u32_t source_id)
+static inline uint8_t log_compiled_level_get(uint32_t source_id)
 {
 	return __log_const_start[source_id].level;
 }
@@ -443,15 +443,15 @@ static inline u8_t log_compiled_level_get(u32_t source_id)
  *
  * @return Source ID.
  */
-static inline u32_t log_const_source_id(
+static inline uint32_t log_const_source_id(
 				const struct log_source_const_data *data)
 {
-	return ((u8_t *)data - (u8_t *)__log_const_start)/
+	return ((uint8_t *)data - (uint8_t *)__log_const_start)/
 			sizeof(struct log_source_const_data);
 }
 
 /** @brief Get number of registered sources. */
-static inline u32_t log_sources_count(void)
+static inline uint32_t log_sources_count(void)
 {
 	return log_const_source_id(__log_const_end);
 }
@@ -474,7 +474,7 @@ extern struct log_source_dynamic_data __log_dynamic_end[0];
  *
  * @return Pointer to the filter set.
  */
-static inline u32_t *log_dynamic_filters_get(u32_t source_id)
+static inline uint32_t *log_dynamic_filters_get(uint32_t source_id)
 {
 	return &__log_dynamic_start[source_id].filters;
 }
@@ -486,9 +486,9 @@ static inline u32_t *log_dynamic_filters_get(u32_t source_id)
  *
  * @return Source ID.
  */
-static inline u32_t log_dynamic_source_id(struct log_source_dynamic_data *data)
+static inline uint32_t log_dynamic_source_id(struct log_source_dynamic_data *data)
 {
-	return ((u8_t *)data - (u8_t *)__log_dynamic_start)/
+	return ((uint8_t *)data - (uint8_t *)__log_dynamic_start)/
 			sizeof(struct log_source_dynamic_data);
 }
 
@@ -551,7 +551,7 @@ void log_3(const char *str,
  */
 void log_n(const char *str,
 	   log_arg_t *args,
-	   u32_t narg,
+	   uint32_t narg,
 	   struct log_msg_ids src_level);
 
 /** @brief Hexdump log.
@@ -561,7 +561,7 @@ void log_n(const char *str,
  * @param length	Data length.
  * @param src_level	Log identification.
  */
-void log_hexdump(const char *str, const void *data, u32_t length,
+void log_hexdump(const char *str, const void *data, uint32_t length,
 		 struct log_msg_ids src_level);
 
 /** @brief Process log message synchronously.
@@ -580,7 +580,7 @@ void log_string_sync(struct log_msg_ids src_level, const char *fmt, ...);
  * @param len		Data length.
  */
 void log_hexdump_sync(struct log_msg_ids src_level, const char *metadata,
-		      const void *data, u32_t len);
+		      const void *data, uint32_t len);
 
 /**
  * @brief Writes a generic log message to the log.
@@ -618,14 +618,14 @@ void log_free(void *buf);
  *
  * Value can be used to determine pool size.
  */
-u32_t log_get_strdup_pool_utilization(void);
+uint32_t log_get_strdup_pool_utilization(void);
 
 /**
  * @brief Get length of the longest string duplicated.
  *
  * Value can be used to determine buffer size in the string duplicates pool.
  */
-u32_t log_get_strdup_longest_string(void);
+uint32_t log_get_strdup_longest_string(void);
 
 /** @brief Indicate to the log core that one log message has been dropped.
  */
@@ -654,10 +654,10 @@ void __printf_like(2, 3) log_from_user(struct log_msg_ids src_level,
  *
  * @return Mask with %s format specifiers found.
  */
-u32_t z_log_get_s_mask(const char *str, u32_t nargs);
+uint32_t z_log_get_s_mask(const char *str, uint32_t nargs);
 
 /* Internal function used by log_from_user(). */
-__syscall void z_log_string_from_user(u32_t src_level_val, const char *str);
+__syscall void z_log_string_from_user(uint32_t src_level_val, const char *str);
 
 /** @brief Log binary data (displayed as hexdump) from user mode context.
  *
@@ -670,12 +670,12 @@ __syscall void z_log_string_from_user(u32_t src_level_val, const char *str);
  * @param len		Data length.
  */
 void log_hexdump_from_user(struct log_msg_ids src_level, const char *metadata,
-			   const void *data, u32_t len);
+			   const void *data, uint32_t len);
 
 /* Internal function used by log_hexdump_from_user(). */
-__syscall void z_log_hexdump_from_user(u32_t src_level_val,
+__syscall void z_log_hexdump_from_user(uint32_t src_level_val,
 				       const char *metadata,
-				       const u8_t *data, u32_t len);
+				       const uint8_t *data, uint32_t len);
 
 #include <syscalls/log_core.h>
 
diff --git a/include/logging/log_ctrl.h b/include/logging/log_ctrl.h
index 13b8f41ebf..0f90583a9a 100644
--- a/include/logging/log_ctrl.h
+++ b/include/logging/log_ctrl.h
@@ -29,7 +29,7 @@ extern "C" {
  * @{
  */
 
-typedef u32_t (*timestamp_get_t)(void);
+typedef uint32_t (*timestamp_get_t)(void);
 
 /** @brief Function system initialization of the logger.
  *
@@ -63,7 +63,7 @@ void log_thread_set(k_tid_t process_tid);
  *
  * @return 0 on success or error.
  */
-int log_set_timestamp_func(timestamp_get_t timestamp_getter, u32_t freq);
+int log_set_timestamp_func(timestamp_get_t timestamp_getter, uint32_t freq);
 
 /**
  * @brief Switch the logger subsystem to the panic mode.
@@ -92,7 +92,7 @@ __syscall bool log_process(bool bypass);
  *
  * @return Number of currently buffered log messages.
  */
-__syscall u32_t log_buffered_cnt(void);
+__syscall uint32_t log_buffered_cnt(void);
 
 /** @brief Get number of independent logger sources (modules and instances)
  *
@@ -100,7 +100,7 @@ __syscall u32_t log_buffered_cnt(void);
  *
  * @return Number of sources.
  */
-u32_t log_src_cnt_get(u32_t domain_id);
+uint32_t log_src_cnt_get(uint32_t domain_id);
 
 
 /** @brief Get name of the source (module or instance).
@@ -110,7 +110,7 @@ u32_t log_src_cnt_get(u32_t domain_id);
  *
  * @return Source name or NULL if invalid arguments.
  */
-const char *log_source_name_get(u32_t domain_id, u32_t src_id);
+const char *log_source_name_get(uint32_t domain_id, uint32_t src_id);
 
 /** @brief Get name of the domain.
  *
@@ -118,7 +118,7 @@ const char *log_source_name_get(u32_t domain_id, u32_t src_id);
  *
  * @return Domain name.
  */
-const char *log_domain_name_get(u32_t domain_id);
+const char *log_domain_name_get(uint32_t domain_id);
 
 /**
  * @brief Get source filter for the provided backend.
@@ -130,8 +130,8 @@ const char *log_domain_name_get(u32_t domain_id);
  *
  * @return		Severity level.
  */
-u32_t log_filter_get(struct log_backend const *const backend,
-		     u32_t domain_id, u32_t src_id, bool runtime);
+uint32_t log_filter_get(struct log_backend const *const backend,
+		     uint32_t domain_id, uint32_t src_id, bool runtime);
 
 /**
  * @brief Set filter on given source for the provided backend.
@@ -144,10 +144,10 @@ u32_t log_filter_get(struct log_backend const *const backend,
  * @return Actual level set which may be limited by compiled level. If filter
  *	   was set for all backends then maximal level that was set is returned.
  */
-__syscall u32_t log_filter_set(struct log_backend const *const backend,
-			       u32_t domain_id,
-			       u32_t src_id,
-			       u32_t level);
+__syscall uint32_t log_filter_set(struct log_backend const *const backend,
+			       uint32_t domain_id,
+			       uint32_t src_id,
+			       uint32_t level);
 
 /**
  *
@@ -159,7 +159,7 @@ __syscall u32_t log_filter_set(struct log_backend const *const backend,
  */
 void log_backend_enable(struct log_backend const *const backend,
 			void *ctx,
-			u32_t level);
+			uint32_t level);
 
 /**
  *
diff --git a/include/logging/log_frontend.h b/include/logging/log_frontend.h
index f1e5fc453f..441674e4bb 100644
--- a/include/logging/log_frontend.h
+++ b/include/logging/log_frontend.h
@@ -64,7 +64,7 @@ void log_frontend_3(const char *str,
  */
 void log_frontend_n(const char *str,
 		    log_arg_t *args,
-		    u32_t narg,
+		    uint32_t narg,
 		    struct log_msg_ids src_level);
 
 /** @brief Hexdump log.
@@ -75,8 +75,8 @@ void log_frontend_n(const char *str,
  * @param src_level	Log identification.
  */
 void log_frontend_hexdump(const char *str,
-			  const u8_t *data,
-			  u32_t length,
+			  const uint8_t *data,
+			  uint32_t length,
 			  struct log_msg_ids src_level);
 
 
diff --git a/include/logging/log_instance.h b/include/logging/log_instance.h
index 53eb3814b6..25eb47f3f2 100644
--- a/include/logging/log_instance.h
+++ b/include/logging/log_instance.h
@@ -15,25 +15,25 @@ extern "C" {
 /** @brief Constant data associated with the source of log messages. */
 struct log_source_const_data {
 	const char *name;
-	u8_t level;
+	uint8_t level;
 #ifdef CONFIG_NIOS2
 	/* Workaround alert! Dummy data to ensure that structure is >8 bytes.
 	 * Nios2 uses global pointer register for structures <=8 bytes and
 	 * apparently does not handle well variables placed in custom sections.
 	 */
-	u32_t dummy;
+	uint32_t dummy;
 #endif
 };
 
 /** @brief Dynamic data associated with the source of log messages. */
 struct log_source_dynamic_data {
-	u32_t filters;
+	uint32_t filters;
 #ifdef CONFIG_NIOS2
 	/* Workaround alert! Dummy data to ensure that structure is >8 bytes.
 	 * Nios2 uses global pointer register for structures <=8 bytes and
 	 * apparently does not handle well variables placed in custom sections.
 	 */
-	u32_t dummy[2];
+	uint32_t dummy[2];
 #endif
 };
 
diff --git a/include/logging/log_msg.h b/include/logging/log_msg.h
index f0187140e9..84c55c3e83 100644
--- a/include/logging/log_msg.h
+++ b/include/logging/log_msg.h
@@ -70,8 +70,8 @@ typedef unsigned long log_arg_t;
 
 /** @brief Common part of log message header. */
 #define COMMON_PARAM_HDR() \
-	u16_t type : 1;	   \
-	u16_t ext : 1
+	uint16_t type : 1;	   \
+	uint16_t ext : 1
 
 /** @brief Number of bits used for storing length of hexdump log message. */
 #define LOG_MSG_HEXDUMP_LENGTH_BITS 14
@@ -81,28 +81,28 @@ typedef unsigned long log_arg_t;
 
 /** @brief Part of log message header identifying source and level. */
 struct log_msg_ids {
-	u16_t level     : 3;    /*!< Severity. */
-	u16_t domain_id : 3;    /*!< Originating domain. */
-	u16_t source_id : 10;   /*!< Source ID. */
+	uint16_t level     : 3;    /*!< Severity. */
+	uint16_t domain_id : 3;    /*!< Originating domain. */
+	uint16_t source_id : 10;   /*!< Source ID. */
 };
 
 /** Part of log message header common to standard and hexdump log message. */
 struct log_msg_generic_hdr {
 	COMMON_PARAM_HDR();
-	u16_t reserved : 14;
+	uint16_t reserved : 14;
 };
 
 /** Part of log message header specific to standard log message. */
 struct log_msg_std_hdr {
 	COMMON_PARAM_HDR();
-	u16_t reserved : 10;
-	u16_t nargs    : 4;
+	uint16_t reserved : 10;
+	uint16_t nargs    : 4;
 };
 
 /** Part of log message header specific to hexdump log message. */
 struct log_msg_hexdump_hdr {
 	COMMON_PARAM_HDR();
-	u16_t length     : LOG_MSG_HEXDUMP_LENGTH_BITS;
+	uint16_t length     : LOG_MSG_HEXDUMP_LENGTH_BITS;
 };
 
 /** Log message header structure */
@@ -112,16 +112,16 @@ struct log_msg_hdr {
 		struct log_msg_generic_hdr generic;
 		struct log_msg_std_hdr std;
 		struct log_msg_hexdump_hdr hexdump;
-		u16_t raw;
+		uint16_t raw;
 	} params;
 	struct log_msg_ids ids; /*!< Identification part of the message.*/
-	u32_t timestamp;        /*!< Timestamp. */
+	uint32_t timestamp;        /*!< Timestamp. */
 };
 
 /** @brief Data part of log message. */
 union log_msg_head_data {
 	log_arg_t args[LOG_MSG_NARGS_SINGLE_CHUNK];
-	u8_t bytes[LOG_MSG_HEXDUMP_BYTES_SINGLE_CHUNK];
+	uint8_t bytes[LOG_MSG_HEXDUMP_BYTES_SINGLE_CHUNK];
 };
 
 /** @brief Data part of extended log message. */
@@ -129,7 +129,7 @@ struct log_msg_ext_head_data {
 	struct log_msg_cont *next;
 	union log_msg_ext_head_data_data {
 		log_arg_t args[LOG_MSG_NARGS_HEAD_CHUNK];
-		u8_t bytes[LOG_MSG_HEXDUMP_BYTES_HEAD_CHUNK];
+		uint8_t bytes[LOG_MSG_HEXDUMP_BYTES_HEAD_CHUNK];
 	} data;
 };
 
@@ -149,7 +149,7 @@ struct log_msg_cont {
 	struct log_msg_cont *next; /*!< Pointer to the next chunk. */
 	union log_msg_cont_data {
 		log_arg_t args[ARGS_CONT_MSG];
-		u8_t bytes[HEXDUMP_BYTES_CONT_MSG];
+		uint8_t bytes[HEXDUMP_BYTES_CONT_MSG];
 	} payload;
 };
 
@@ -186,7 +186,7 @@ void log_msg_put(struct log_msg *msg);
  *
  * @return Domain ID.
  */
-static inline u32_t log_msg_domain_id_get(struct log_msg *msg)
+static inline uint32_t log_msg_domain_id_get(struct log_msg *msg)
 {
 	return msg->hdr.ids.domain_id;
 }
@@ -197,7 +197,7 @@ static inline u32_t log_msg_domain_id_get(struct log_msg *msg)
  *
  * @return Source ID.
  */
-static inline u32_t log_msg_source_id_get(struct log_msg *msg)
+static inline uint32_t log_msg_source_id_get(struct log_msg *msg)
 {
 	return msg->hdr.ids.source_id;
 }
@@ -208,7 +208,7 @@ static inline u32_t log_msg_source_id_get(struct log_msg *msg)
  *
  * @return Severity message.
  */
-static inline u32_t log_msg_level_get(struct log_msg *msg)
+static inline uint32_t log_msg_level_get(struct log_msg *msg)
 {
 	return msg->hdr.ids.level;
 }
@@ -219,7 +219,7 @@ static inline u32_t log_msg_level_get(struct log_msg *msg)
  *
  * @return Timestamp value.
  */
-static inline u32_t log_msg_timestamp_get(struct log_msg *msg)
+static inline uint32_t log_msg_timestamp_get(struct log_msg *msg)
 {
 	return msg->hdr.timestamp;
 }
@@ -242,7 +242,7 @@ static inline bool log_msg_is_std(struct log_msg *msg)
  *
  * @return Number of arguments.
  */
-u32_t log_msg_nargs_get(struct log_msg *msg);
+uint32_t log_msg_nargs_get(struct log_msg *msg);
 
 /** @brief Gets argument from standard log message.
  *
@@ -252,7 +252,7 @@ u32_t log_msg_nargs_get(struct log_msg *msg);
  * @return Argument value or 0 if arg_idx exceeds number of arguments in the
  *	   message.
  */
-log_arg_t log_msg_arg_get(struct log_msg *msg, u32_t arg_idx);
+log_arg_t log_msg_arg_get(struct log_msg *msg, uint32_t arg_idx);
 
 
 /** @brief Gets pointer to the unformatted string from standard log message.
@@ -278,8 +278,8 @@ const char *log_msg_str_get(struct log_msg *msg);
  * @return Pointer to allocated head of the message or NULL
  */
 struct log_msg *log_msg_hexdump_create(const char *str,
-				       const u8_t *data,
-				       u32_t length);
+				       const uint8_t *data,
+				       uint32_t length);
 
 /** @brief Put data into hexdump log message.
  *
@@ -289,7 +289,7 @@ struct log_msg *log_msg_hexdump_create(const char *str,
  * @param[in]		offset   Offset.
  */
 void log_msg_hexdump_data_put(struct log_msg *msg,
-			      u8_t *data,
+			      uint8_t *data,
 			      size_t *length,
 			      size_t offset);
 
@@ -301,7 +301,7 @@ void log_msg_hexdump_data_put(struct log_msg *msg,
  * @param[in]		offset   Offset.
  */
 void log_msg_hexdump_data_get(struct log_msg *msg,
-			      u8_t *data,
+			      uint8_t *data,
 			      size_t *length,
 			      size_t offset);
 
@@ -456,7 +456,7 @@ static inline struct log_msg *log_msg_create_3(const char *str,
  */
 struct log_msg *log_msg_create_n(const char *str,
 				 log_arg_t *args,
-				 u32_t nargs);
+				 uint32_t nargs);
 
 /**
  * @}
diff --git a/include/logging/log_output.h b/include/logging/log_output.h
index ddccab4a7b..a66c21068a 100644
--- a/include/logging/log_output.h
+++ b/include/logging/log_output.h
@@ -63,7 +63,7 @@ extern "C" {
  *       its responsibility to mark them as dropped or discarded by returning
  *       the corresponding number of bytes dropped or discarded to the caller.
  */
-typedef int (*log_output_func_t)(u8_t *buf, size_t size, void *ctx);
+typedef int (*log_output_func_t)(uint8_t *buf, size_t size, void *ctx);
 
 /* @brief Control block structure for log_output instance.  */
 struct log_output_control_block {
@@ -76,7 +76,7 @@ struct log_output_control_block {
 struct log_output {
 	log_output_func_t func;
 	struct log_output_control_block *control_block;
-	u8_t *buf;
+	uint8_t *buf;
 	size_t size;
 };
 
@@ -107,7 +107,7 @@ struct log_output {
  */
 void log_output_msg_process(const struct log_output *log_output,
 			    struct log_msg *msg,
-			    u32_t flags);
+			    uint32_t flags);
 
 /** @brief Process log string
  *
@@ -123,8 +123,8 @@ void log_output_msg_process(const struct log_output *log_output,
  *
  */
 void log_output_string(const struct log_output *log_output,
-		       struct log_msg_ids src_level, u32_t timestamp,
-		       const char *fmt, va_list ap, u32_t flags);
+		       struct log_msg_ids src_level, uint32_t timestamp,
+		       const char *fmt, va_list ap, uint32_t flags);
 
 /** @brief Process log hexdump
  *
@@ -141,9 +141,9 @@ void log_output_string(const struct log_output *log_output,
  *
  */
 void log_output_hexdump(const struct log_output *log_output,
-			     struct log_msg_ids src_level, u32_t timestamp,
-			     const char *metadata, const u8_t *data,
-			     u32_t length, u32_t flags);
+			     struct log_msg_ids src_level, uint32_t timestamp,
+			     const char *metadata, const uint8_t *data,
+			     uint32_t length, uint32_t flags);
 
 /** @brief Process dropped messages indication.
  *
@@ -152,7 +152,7 @@ void log_output_hexdump(const struct log_output *log_output,
  * @param log_output Pointer to the log output instance.
  * @param cnt        Number of dropped messages.
  */
-void log_output_dropped_process(const struct log_output *log_output, u32_t cnt);
+void log_output_dropped_process(const struct log_output *log_output, uint32_t cnt);
 
 /** @brief Flush output buffer.
  *
@@ -186,7 +186,7 @@ static inline void log_output_hostname_set(const struct log_output *log_output,
  *
  * @param freq Frequency in Hz.
  */
-void log_output_timestamp_freq_set(u32_t freq);
+void log_output_timestamp_freq_set(uint32_t freq);
 
 /**
  * @}
diff --git a/include/mempool_sys.h b/include/mempool_sys.h
index 7c158130af..1ff1dc85f9 100644
--- a/include/mempool_sys.h
+++ b/include/mempool_sys.h
@@ -18,9 +18,9 @@
  * good to move to a variable bit size based on configuration.
  */
 struct k_mem_block_id {
-	u32_t pool : 8;
-	u32_t level : 4;
-	u32_t block : 20;
+	uint32_t pool : 8;
+	uint32_t level : 4;
+	uint32_t block : 20;
 };
 
 struct k_mem_block {
diff --git a/include/mgmt/serial.h b/include/mgmt/serial.h
index 694565b0e1..0e9b132586 100644
--- a/include/mgmt/serial.h
+++ b/include/mgmt/serial.h
@@ -84,7 +84,7 @@ struct mcumgr_serial_rx_ctxt {
 	struct net_buf *nb;
 
 	/* Length of full packet, as read from header. */
-	u16_t pkt_len;
+	uint16_t pkt_len;
 };
 
 /** @typedef mcumgr_serial_tx_cb
@@ -119,7 +119,7 @@ typedef int (*mcumgr_serial_tx_cb)(const void *data, int len, void *arg);
  */
 struct net_buf *mcumgr_serial_process_frag(
 	struct mcumgr_serial_rx_ctxt *rx_ctxt,
-	const u8_t *frag, int frag_len);
+	const uint8_t *frag, int frag_len);
 
 /**
  * @brief Encodes and transmits an mcumgr packet over serial.
@@ -131,7 +131,7 @@ struct net_buf *mcumgr_serial_process_frag(
  *
  * @return                      0 on success; negative error code on failure.
  */
-int mcumgr_serial_tx_pkt(const u8_t *data, int len, mcumgr_serial_tx_cb cb,
+int mcumgr_serial_tx_pkt(const uint8_t *data, int len, mcumgr_serial_tx_cb cb,
 			 void *arg);
 
 #ifdef __cplusplus
diff --git a/include/mgmt/smp_shell.h b/include/mgmt/smp_shell.h
index a509ff2570..774fafd099 100644
--- a/include/mgmt/smp_shell.h
+++ b/include/mgmt/smp_shell.h
@@ -22,8 +22,8 @@ struct smp_shell_data {
 	char mcumgr_buff[128];
 	bool cmd_rdy;
 	atomic_t esc_state;
-	u32_t cur;
-	u32_t end;
+	uint32_t cur;
+	uint32_t end;
 };
 
 /**
diff --git a/include/net/buf.h b/include/net/buf.h
index 38c51178c9..f6b77717f1 100644
--- a/include/net/buf.h
+++ b/include/net/buf.h
@@ -40,7 +40,7 @@ extern "C" {
  *  @param _size Maximum data storage for the buffer.
  */
 #define NET_BUF_SIMPLE_DEFINE(_name, _size)     \
-	u8_t net_buf_data_##_name[_size];       \
+	uint8_t net_buf_data_##_name[_size];       \
 	struct net_buf_simple _name = {         \
 		.data   = net_buf_data_##_name, \
 		.len    = 0,                    \
@@ -59,7 +59,7 @@ extern "C" {
  * @param _size Maximum data storage for the buffer.
  */
 #define NET_BUF_SIMPLE_DEFINE_STATIC(_name, _size)        \
-	static __noinit u8_t net_buf_data_##_name[_size]; \
+	static __noinit uint8_t net_buf_data_##_name[_size]; \
 	static struct net_buf_simple _name = {            \
 		.data   = net_buf_data_##_name,           \
 		.len    = 0,                              \
@@ -82,18 +82,18 @@ extern "C" {
  */
 struct net_buf_simple {
 	/** Pointer to the start of data in the buffer. */
-	u8_t *data;
+	uint8_t *data;
 
 	/** Length of the data behind the data pointer. */
-	u16_t len;
+	uint16_t len;
 
 	/** Amount of data that this buffer can store. */
-	u16_t size;
+	uint16_t size;
 
 	/** Start of the data storage. Not to be accessed directly
 	 *  (the data pointer should be used instead).
 	 */
-	u8_t *__buf;
+	uint8_t *__buf;
 };
 
 /**
@@ -115,7 +115,7 @@ struct net_buf_simple {
 #define NET_BUF_SIMPLE(_size)                        \
 	((struct net_buf_simple *)(&(struct {        \
 		struct net_buf_simple buf;           \
-		u8_t data[_size];                    \
+		uint8_t data[_size];                    \
 	}) {                                         \
 		.buf.size = _size,                   \
 	}))
@@ -133,7 +133,7 @@ static inline void net_buf_simple_init(struct net_buf_simple *buf,
 				       size_t reserve_head)
 {
 	if (!buf->__buf) {
-		buf->__buf = (u8_t *)buf + sizeof(*buf);
+		buf->__buf = (uint8_t *)buf + sizeof(*buf);
 	}
 
 	buf->data = buf->__buf + reserve_head;
@@ -217,7 +217,7 @@ void *net_buf_simple_add_mem(struct net_buf_simple *buf, const void *mem,
  *
  * @return Pointer to the value added
  */
-u8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, u8_t val);
+uint8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, uint8_t val);
 
 /**
  * @brief Add 16-bit value at the end of the buffer
@@ -229,7 +229,7 @@ u8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, u8_t val);
  * @param buf Buffer to update.
  * @param val 16-bit value to be added.
  */
-void net_buf_simple_add_le16(struct net_buf_simple *buf, u16_t val);
+void net_buf_simple_add_le16(struct net_buf_simple *buf, uint16_t val);
 
 /**
  * @brief Add 16-bit value at the end of the buffer
@@ -241,7 +241,7 @@ void net_buf_simple_add_le16(struct net_buf_simple *buf, u16_t val);
  * @param buf Buffer to update.
  * @param val 16-bit value to be added.
  */
-void net_buf_simple_add_be16(struct net_buf_simple *buf, u16_t val);
+void net_buf_simple_add_be16(struct net_buf_simple *buf, uint16_t val);
 
 /**
  * @brief Add 24-bit value at the end of the buffer
@@ -253,7 +253,7 @@ void net_buf_simple_add_be16(struct net_buf_simple *buf, u16_t val);
  * @param buf Buffer to update.
  * @param val 24-bit value to be added.
  */
-void net_buf_simple_add_le24(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_add_le24(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Add 24-bit value at the end of the buffer
@@ -265,7 +265,7 @@ void net_buf_simple_add_le24(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 24-bit value to be added.
  */
-void net_buf_simple_add_be24(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_add_be24(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Add 32-bit value at the end of the buffer
@@ -277,7 +277,7 @@ void net_buf_simple_add_be24(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 32-bit value to be added.
  */
-void net_buf_simple_add_le32(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_add_le32(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Add 32-bit value at the end of the buffer
@@ -289,7 +289,7 @@ void net_buf_simple_add_le32(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 32-bit value to be added.
  */
-void net_buf_simple_add_be32(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_add_be32(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Add 48-bit value at the end of the buffer
@@ -301,7 +301,7 @@ void net_buf_simple_add_be32(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 48-bit value to be added.
  */
-void net_buf_simple_add_le48(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_add_le48(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Add 48-bit value at the end of the buffer
@@ -313,7 +313,7 @@ void net_buf_simple_add_le48(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 48-bit value to be added.
  */
-void net_buf_simple_add_be48(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_add_be48(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Add 64-bit value at the end of the buffer
@@ -325,7 +325,7 @@ void net_buf_simple_add_be48(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 64-bit value to be added.
  */
-void net_buf_simple_add_le64(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_add_le64(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Add 64-bit value at the end of the buffer
@@ -337,7 +337,7 @@ void net_buf_simple_add_le64(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 64-bit value to be added.
  */
-void net_buf_simple_add_be64(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_add_be64(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Push data to the beginning of the buffer.
@@ -361,7 +361,7 @@ void *net_buf_simple_push(struct net_buf_simple *buf, size_t len);
  * @param buf Buffer to update.
  * @param val 16-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_le16(struct net_buf_simple *buf, u16_t val);
+void net_buf_simple_push_le16(struct net_buf_simple *buf, uint16_t val);
 
 /**
  * @brief Push 16-bit value to the beginning of the buffer
@@ -372,7 +372,7 @@ void net_buf_simple_push_le16(struct net_buf_simple *buf, u16_t val);
  * @param buf Buffer to update.
  * @param val 16-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_be16(struct net_buf_simple *buf, u16_t val);
+void net_buf_simple_push_be16(struct net_buf_simple *buf, uint16_t val);
 
 /**
  * @brief Push 8-bit value to the beginning of the buffer
@@ -382,7 +382,7 @@ void net_buf_simple_push_be16(struct net_buf_simple *buf, u16_t val);
  * @param buf Buffer to update.
  * @param val 8-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_u8(struct net_buf_simple *buf, u8_t val);
+void net_buf_simple_push_u8(struct net_buf_simple *buf, uint8_t val);
 
 /**
  * @brief Push 24-bit value to the beginning of the buffer
@@ -393,7 +393,7 @@ void net_buf_simple_push_u8(struct net_buf_simple *buf, u8_t val);
  * @param buf Buffer to update.
  * @param val 24-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_le24(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_push_le24(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Push 24-bit value to the beginning of the buffer
@@ -404,7 +404,7 @@ void net_buf_simple_push_le24(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 24-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_be24(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_push_be24(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Push 32-bit value to the beginning of the buffer
@@ -415,7 +415,7 @@ void net_buf_simple_push_be24(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 32-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_le32(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_push_le32(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Push 32-bit value to the beginning of the buffer
@@ -426,7 +426,7 @@ void net_buf_simple_push_le32(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 32-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_be32(struct net_buf_simple *buf, u32_t val);
+void net_buf_simple_push_be32(struct net_buf_simple *buf, uint32_t val);
 
 /**
  * @brief Push 48-bit value to the beginning of the buffer
@@ -437,7 +437,7 @@ void net_buf_simple_push_be32(struct net_buf_simple *buf, u32_t val);
  * @param buf Buffer to update.
  * @param val 48-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_le48(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_push_le48(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Push 48-bit value to the beginning of the buffer
@@ -448,7 +448,7 @@ void net_buf_simple_push_le48(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 48-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_be48(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_push_be48(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Push 64-bit value to the beginning of the buffer
@@ -459,7 +459,7 @@ void net_buf_simple_push_be48(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 64-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_le64(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_push_le64(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Push 64-bit value to the beginning of the buffer
@@ -470,7 +470,7 @@ void net_buf_simple_push_le64(struct net_buf_simple *buf, u64_t val);
  * @param buf Buffer to update.
  * @param val 64-bit value to be pushed to the buffer.
  */
-void net_buf_simple_push_be64(struct net_buf_simple *buf, u64_t val);
+void net_buf_simple_push_be64(struct net_buf_simple *buf, uint64_t val);
 
 /**
  * @brief Remove data from the beginning of the buffer.
@@ -508,7 +508,7 @@ void *net_buf_simple_pull_mem(struct net_buf_simple *buf, size_t len);
  *
  * @return The 8-bit removed value
  */
-u8_t net_buf_simple_pull_u8(struct net_buf_simple *buf);
+uint8_t net_buf_simple_pull_u8(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 16 bits from the beginning of the buffer.
@@ -520,7 +520,7 @@ u8_t net_buf_simple_pull_u8(struct net_buf_simple *buf);
  *
  * @return 16-bit value converted from little endian to host endian.
  */
-u16_t net_buf_simple_pull_le16(struct net_buf_simple *buf);
+uint16_t net_buf_simple_pull_le16(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 16 bits from the beginning of the buffer.
@@ -532,7 +532,7 @@ u16_t net_buf_simple_pull_le16(struct net_buf_simple *buf);
  *
  * @return 16-bit value converted from big endian to host endian.
  */
-u16_t net_buf_simple_pull_be16(struct net_buf_simple *buf);
+uint16_t net_buf_simple_pull_be16(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 24 bits from the beginning of the buffer.
@@ -544,7 +544,7 @@ u16_t net_buf_simple_pull_be16(struct net_buf_simple *buf);
  *
  * @return 24-bit value converted from little endian to host endian.
  */
-u32_t net_buf_simple_pull_le24(struct net_buf_simple *buf);
+uint32_t net_buf_simple_pull_le24(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 24 bits from the beginning of the buffer.
@@ -556,7 +556,7 @@ u32_t net_buf_simple_pull_le24(struct net_buf_simple *buf);
  *
  * @return 24-bit value converted from big endian to host endian.
  */
-u32_t net_buf_simple_pull_be24(struct net_buf_simple *buf);
+uint32_t net_buf_simple_pull_be24(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 32 bits from the beginning of the buffer.
@@ -568,7 +568,7 @@ u32_t net_buf_simple_pull_be24(struct net_buf_simple *buf);
  *
  * @return 32-bit value converted from little endian to host endian.
  */
-u32_t net_buf_simple_pull_le32(struct net_buf_simple *buf);
+uint32_t net_buf_simple_pull_le32(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 32 bits from the beginning of the buffer.
@@ -580,7 +580,7 @@ u32_t net_buf_simple_pull_le32(struct net_buf_simple *buf);
  *
  * @return 32-bit value converted from big endian to host endian.
  */
-u32_t net_buf_simple_pull_be32(struct net_buf_simple *buf);
+uint32_t net_buf_simple_pull_be32(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 48 bits from the beginning of the buffer.
@@ -592,7 +592,7 @@ u32_t net_buf_simple_pull_be32(struct net_buf_simple *buf);
  *
  * @return 48-bit value converted from little endian to host endian.
  */
-u64_t net_buf_simple_pull_le48(struct net_buf_simple *buf);
+uint64_t net_buf_simple_pull_le48(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 48 bits from the beginning of the buffer.
@@ -604,7 +604,7 @@ u64_t net_buf_simple_pull_le48(struct net_buf_simple *buf);
  *
  * @return 48-bit value converted from big endian to host endian.
  */
-u64_t net_buf_simple_pull_be48(struct net_buf_simple *buf);
+uint64_t net_buf_simple_pull_be48(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 64 bits from the beginning of the buffer.
@@ -616,7 +616,7 @@ u64_t net_buf_simple_pull_be48(struct net_buf_simple *buf);
  *
  * @return 64-bit value converted from little endian to host endian.
  */
-u64_t net_buf_simple_pull_le64(struct net_buf_simple *buf);
+uint64_t net_buf_simple_pull_le64(struct net_buf_simple *buf);
 
 /**
  * @brief Remove and convert 64 bits from the beginning of the buffer.
@@ -628,7 +628,7 @@ u64_t net_buf_simple_pull_le64(struct net_buf_simple *buf);
  *
  * @return 64-bit value converted from big endian to host endian.
  */
-u64_t net_buf_simple_pull_be64(struct net_buf_simple *buf);
+uint64_t net_buf_simple_pull_be64(struct net_buf_simple *buf);
 
 /**
  * @brief Get the tail pointer for a buffer.
@@ -639,7 +639,7 @@ u64_t net_buf_simple_pull_be64(struct net_buf_simple *buf);
  *
  * @return Tail pointer for the buffer.
  */
-static inline u8_t *net_buf_simple_tail(struct net_buf_simple *buf)
+static inline uint8_t *net_buf_simple_tail(struct net_buf_simple *buf)
 {
 	return buf->data + buf->len;
 }
@@ -675,9 +675,9 @@ size_t net_buf_simple_tailroom(struct net_buf_simple *buf);
  */
 struct net_buf_simple_state {
 	/** Offset of the data pointer from the beginning of the storage */
-	u16_t offset;
+	uint16_t offset;
 	/** Length of data */
-	u16_t len;
+	uint16_t len;
 };
 
 /**
@@ -748,13 +748,13 @@ struct net_buf {
 	};
 
 	/** Reference count. */
-	u8_t ref;
+	uint8_t ref;
 
 	/** Bit-field of buffer flags. */
-	u8_t flags;
+	uint8_t flags;
 
 	/** Where the buffer should go when freed up. */
-	u8_t pool_id;
+	uint8_t pool_id;
 
 	/* Union for convenience access to the net_buf_simple members, also
 	 * preserving the old API.
@@ -763,32 +763,32 @@ struct net_buf {
 		/* The ABI of this struct must match net_buf_simple */
 		struct {
 			/** Pointer to the start of data in the buffer. */
-			u8_t *data;
+			uint8_t *data;
 
 			/** Length of the data behind the data pointer. */
-			u16_t len;
+			uint16_t len;
 
 			/** Amount of data that this buffer can store. */
-			u16_t size;
+			uint16_t size;
 
 			/** Start of the data storage. Not to be accessed
 			 *  directly (the data pointer should be used
 			 *  instead).
 			 */
-			u8_t *__buf;
+			uint8_t *__buf;
 		};
 
 		struct net_buf_simple b;
 	};
 
 	/** System metadata for this buffer. */
-	u8_t user_data[CONFIG_NET_BUF_USER_DATA_SIZE] __net_buf_align;
+	uint8_t user_data[CONFIG_NET_BUF_USER_DATA_SIZE] __net_buf_align;
 };
 
 struct net_buf_data_cb {
-	u8_t * (*alloc)(struct net_buf *buf, size_t *size, k_timeout_t timeout);
-	u8_t * (*ref)(struct net_buf *buf, u8_t *data);
-	void   (*unref)(struct net_buf *buf, u8_t *data);
+	uint8_t * (*alloc)(struct net_buf *buf, size_t *size, k_timeout_t timeout);
+	uint8_t * (*ref)(struct net_buf *buf, uint8_t *data);
+	void   (*unref)(struct net_buf *buf, uint8_t *data);
 };
 
 struct net_buf_data_alloc {
@@ -806,17 +806,17 @@ struct net_buf_pool {
 	struct k_lifo free;
 
 	/** Number of buffers in pool */
-	const u16_t buf_count;
+	const uint16_t buf_count;
 
 	/** Number of uninitialized buffers */
-	u16_t uninit_count;
+	uint16_t uninit_count;
 
 #if defined(CONFIG_NET_BUF_POOL_USAGE)
 	/** Amount of available buffers in the pool. */
-	s16_t avail_count;
+	int16_t avail_count;
 
 	/** Total size of the pool. */
-	const u16_t pool_size;
+	const uint16_t pool_size;
 
 	/** Name of the pool. Used when printing pool information. */
 	const char *name;
@@ -895,7 +895,7 @@ extern const struct net_buf_data_alloc net_buf_heap_alloc;
 
 struct net_buf_pool_fixed {
 	size_t data_size;
-	u8_t *data_pool;
+	uint8_t *data_pool;
 };
 
 /** @cond INTERNAL_HIDDEN */
@@ -931,10 +931,10 @@ extern const struct net_buf_data_cb net_buf_fixed_cb;
  */
 #define NET_BUF_POOL_FIXED_DEFINE(_name, _count, _data_size, _destroy)        \
 	static struct net_buf net_buf_##_name[_count] __noinit;               \
-	static u8_t __noinit net_buf_data_##_name[_count][_data_size];        \
+	static uint8_t __noinit net_buf_data_##_name[_count][_data_size];        \
 	static const struct net_buf_pool_fixed net_buf_fixed_##_name = {      \
 		.data_size = _data_size,                                      \
-		.data_pool = (u8_t *)net_buf_data_##_name,                    \
+		.data_pool = (uint8_t *)net_buf_data_##_name,                    \
 	};                                                                    \
 	static const struct net_buf_data_alloc net_buf_fixed_alloc_##_name = {\
 		.cb = &net_buf_fixed_cb,                                      \
diff --git a/include/net/can.h b/include/net/can.h
index 61f3ca81bf..449ecac3cc 100644
--- a/include/net/can.h
+++ b/include/net/can.h
@@ -130,7 +130,7 @@ struct canbus_net_ctx {
 	/** The interface associated with this device */
 	struct net_if *iface;
 	/** The link layer address chosen for this interface */
-	u16_t ll_addr;
+	uint16_t ll_addr;
 };
 
 /**
@@ -138,7 +138,7 @@ struct canbus_net_ctx {
  * Both together are 28 bit to fit a CAN extended identifier with 29 bit length.
  */
 struct net_canbus_lladdr {
-	u16_t addr : 14;
+	uint16_t addr : 14;
 };
 
 /**
@@ -150,9 +150,9 @@ struct net_canbus_lladdr {
  */
 struct canbus_fc_opts {
 	/** Block size. Number of CF PDUs before next CF is sent */
-	u8_t bs;
+	uint8_t bs;
 	/**< Minimum separation time. Min time between frames */
-	u8_t stmin;
+	uint8_t stmin;
 };
 
 /**
@@ -171,19 +171,19 @@ struct canbus_isotp_tx_ctx {
 	/** CAN destination address */
 	struct net_canbus_lladdr dest_addr;
 	/** Remaining data to transmit in bytes */
-	u16_t rem_len;
+	uint16_t rem_len;
 	/** Number of bytes in the tx queue */
-	s8_t tx_backlog;
+	int8_t tx_backlog;
 	/** State of the transmission */
-	u8_t state;
+	uint8_t state;
 	/** Actual block number that is transmitted. Counts from BS to 0 */
-	u8_t act_block_nr;
+	uint8_t act_block_nr;
 	/** Number of WAIT frames received */
-	u8_t wft;
+	uint8_t wft;
 	/** Sequence number that is added to CF */
-	u8_t sn : 4;
+	uint8_t sn : 4;
 	/** Transmission is multicast */
-	u8_t is_mcast : 1;
+	uint8_t is_mcast : 1;
 };
 
 /**
@@ -196,15 +196,15 @@ struct canbus_isotp_rx_ctx {
 	/** Timeout for RX timeout*/
 	struct _timeout timeout;
 	/** Remaining data to receive. Goes from message length to zero */
-	u16_t rem_len;
+	uint16_t rem_len;
 	/** State of the reception */
-	u8_t state;
+	uint8_t state;
 	/** Number of frames received in this block. Counts from BS to 0 */
-	u8_t act_block_nr;
+	uint8_t act_block_nr;
 	/** Number of WAIT frames transmitted */
-	u8_t wft;
+	uint8_t wft;
 	/** Expected sequence number in CF */
-	u8_t sn : 4;
+	uint8_t sn : 4;
 };
 
 /**
diff --git a/include/net/coap.h b/include/net/coap.h
index 732399a217..960b5e854d 100644
--- a/include/net/coap.h
+++ b/include/net/coap.h
@@ -192,30 +192,30 @@ struct coap_resource {
 struct coap_observer {
 	sys_snode_t list;
 	struct sockaddr addr;
-	u8_t token[8];
-	u8_t tkl;
+	uint8_t token[8];
+	uint8_t tkl;
 };
 
 /**
  * @brief Representation of a CoAP Packet.
  */
 struct coap_packet {
-	u8_t *data; /* User allocated buffer */
-	u16_t offset; /* CoAP lib maintains offset while adding data */
-	u16_t max_len; /* Max CoAP packet data length */
-	u8_t hdr_len; /* CoAP header length */
-	u16_t opt_len; /* Total options length (delta + len + value) */
-	u16_t delta; /* Used for delta calculation in CoAP packet */
+	uint8_t *data; /* User allocated buffer */
+	uint16_t offset; /* CoAP lib maintains offset while adding data */
+	uint16_t max_len; /* Max CoAP packet data length */
+	uint8_t hdr_len; /* CoAP header length */
+	uint16_t opt_len; /* Total options length (delta + len + value) */
+	uint16_t delta; /* Used for delta calculation in CoAP packet */
 };
 
 struct coap_option {
-	u16_t delta;
+	uint16_t delta;
 #if defined(CONFIG_COAP_EXTENDED_OPTIONS_LEN)
-	u16_t len;
-	u8_t value[CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE];
+	uint16_t len;
+	uint8_t value[CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE];
 #else
-	u8_t len;
-	u8_t value[12];
+	uint8_t len;
+	uint8_t value[12];
 #endif
 };
 
@@ -233,11 +233,11 @@ typedef int (*coap_reply_t)(const struct coap_packet *response,
  */
 struct coap_pending {
 	struct sockaddr addr;
-	u32_t t0;
-	u32_t timeout;
-	u16_t id;
-	u8_t *data;
-	u16_t len;
+	uint32_t t0;
+	uint32_t timeout;
+	uint16_t id;
+	uint8_t *data;
+	uint16_t len;
 };
 
 /**
@@ -248,9 +248,9 @@ struct coap_reply {
 	coap_reply_t reply;
 	void *user_data;
 	int age;
-	u16_t id;
-	u8_t token[8];
-	u8_t tkl;
+	uint16_t id;
+	uint8_t token[8];
+	uint8_t tkl;
 };
 
 /**
@@ -260,7 +260,7 @@ struct coap_reply {
  *
  * @return the CoAP version in packet
  */
-u8_t coap_header_get_version(const struct coap_packet *cpkt);
+uint8_t coap_header_get_version(const struct coap_packet *cpkt);
 
 /**
  * @brief Returns the type of the CoAP packet.
@@ -269,7 +269,7 @@ u8_t coap_header_get_version(const struct coap_packet *cpkt);
  *
  * @return the type of the packet
  */
-u8_t coap_header_get_type(const struct coap_packet *cpkt);
+uint8_t coap_header_get_type(const struct coap_packet *cpkt);
 
 /**
  * @brief Returns the token (if any) in the CoAP packet.
@@ -279,7 +279,7 @@ u8_t coap_header_get_type(const struct coap_packet *cpkt);
  *
  * @return Token length in the CoAP packet.
  */
-u8_t coap_header_get_token(const struct coap_packet *cpkt, u8_t *token);
+uint8_t coap_header_get_token(const struct coap_packet *cpkt, uint8_t *token);
 
 /**
  * @brief Returns the code of the CoAP packet.
@@ -288,7 +288,7 @@ u8_t coap_header_get_token(const struct coap_packet *cpkt, u8_t *token);
  *
  * @return the code present in the packet
  */
-u8_t coap_header_get_code(const struct coap_packet *cpkt);
+uint8_t coap_header_get_code(const struct coap_packet *cpkt);
 
 /**
  * @brief Returns the message id associated with the CoAP packet.
@@ -297,7 +297,7 @@ u8_t coap_header_get_code(const struct coap_packet *cpkt);
  *
  * @return the message id present in the packet
  */
-u16_t coap_header_get_id(const struct coap_packet *cpkt);
+uint16_t coap_header_get_id(const struct coap_packet *cpkt);
 
 /**
  * @brief Returns the data pointer and length of the CoAP packet.
@@ -308,7 +308,7 @@ u16_t coap_header_get_id(const struct coap_packet *cpkt);
  * @return data pointer and length if payload exists
  *         NULL pointer and length set to 0 in case there is no payload
  */
-const u8_t *coap_packet_get_payload(const struct coap_packet *cpkt, u16_t *len);
+const uint8_t *coap_packet_get_payload(const struct coap_packet *cpkt, uint16_t *len);
 
 /**
  * @brief Parses the CoAP packet in data, validating it and
@@ -323,8 +323,8 @@ const u8_t *coap_packet_get_payload(const struct coap_packet *cpkt, u16_t *len);
  *
  * @return 0 in case of success or negative in case of error.
  */
-int coap_packet_parse(struct coap_packet *cpkt, u8_t *data, u16_t len,
-		      struct coap_option *options, u8_t opt_num);
+int coap_packet_parse(struct coap_packet *cpkt, uint8_t *data, uint16_t len,
+		      struct coap_option *options, uint8_t opt_num);
 
 /**
  * @brief Creates a new CoAP Packet from input data.
@@ -341,9 +341,9 @@ int coap_packet_parse(struct coap_packet *cpkt, u8_t *data, u16_t len,
  *
  * @return 0 in case of success or negative in case of error.
  */
-int coap_packet_init(struct coap_packet *cpkt, u8_t *data, u16_t max_len,
-		     u8_t ver, u8_t type, u8_t token_len,
-		     u8_t *token, u8_t code, u16_t id);
+int coap_packet_init(struct coap_packet *cpkt, uint8_t *data, uint16_t max_len,
+		     uint8_t ver, uint8_t type, uint8_t token_len,
+		     uint8_t *token, uint8_t code, uint16_t id);
 
 /**
  * @brief Returns a randomly generated array of 8 bytes, that can be
@@ -351,14 +351,14 @@ int coap_packet_init(struct coap_packet *cpkt, u8_t *data, u16_t max_len,
  *
  * @return a 8-byte pseudo-random token.
  */
-u8_t *coap_next_token(void);
+uint8_t *coap_next_token(void);
 
 /**
  * @brief Helper to generate message ids
  *
  * @return a new message id
  */
-u16_t coap_next_id(void);
+uint16_t coap_next_id(void);
 
 /**
  * @brief Return the values associated with the option of value @a
@@ -373,8 +373,8 @@ u16_t coap_next_id(void);
  * @return The number of options found in packet matching code,
  * negative on error.
  */
-int coap_find_options(const struct coap_packet *cpkt, u16_t code,
-		      struct coap_option *options, u16_t veclen);
+int coap_find_options(const struct coap_packet *cpkt, uint16_t code,
+		      struct coap_option *options, uint16_t veclen);
 
 /**
  * @brief Appends an option to the packet.
@@ -391,8 +391,8 @@ int coap_find_options(const struct coap_packet *cpkt, u16_t code,
  *
  * @return 0 in case of success or negative in case of error.
  */
-int coap_packet_append_option(struct coap_packet *cpkt, u16_t code,
-			      const u8_t *value, u16_t len);
+int coap_packet_append_option(struct coap_packet *cpkt, uint16_t code,
+			      const uint8_t *value, uint16_t len);
 
 /**
  * @brief Converts an option to its integer representation.
@@ -419,7 +419,7 @@ unsigned int coap_option_value_to_int(const struct coap_option *option);
  *
  * @return 0 in case of success or negative in case of error.
  */
-int coap_append_option_int(struct coap_packet *cpkt, u16_t code,
+int coap_append_option_int(struct coap_packet *cpkt, uint16_t code,
 			   unsigned int val);
 
 /**
@@ -440,8 +440,8 @@ int coap_packet_append_payload_marker(struct coap_packet *cpkt);
  *
  * @return 0 in case of success or negative in case of error.
  */
-int coap_packet_append_payload(struct coap_packet *cpkt, u8_t *payload,
-			       u16_t payload_len);
+int coap_packet_append_payload(struct coap_packet *cpkt, uint8_t *payload,
+			       uint16_t payload_len);
 
 /**
  * @brief When a request is received, call the appropriate methods of
@@ -459,7 +459,7 @@ int coap_packet_append_payload(struct coap_packet *cpkt, u8_t *payload,
 int coap_handle_request(struct coap_packet *cpkt,
 			struct coap_resource *resources,
 			struct coap_option *options,
-			u8_t opt_num,
+			uint8_t opt_num,
 			struct sockaddr *addr, socklen_t addr_len);
 
 /**
@@ -488,7 +488,7 @@ enum coap_block_size {
  *
  * @return The size in bytes that the block_size represents
  */
-static inline u16_t coap_block_size_to_bytes(
+static inline uint16_t coap_block_size_to_bytes(
 	enum coap_block_size block_size)
 {
 	return (1 << (block_size + 4));
diff --git a/include/net/coap_link_format.h b/include/net/coap_link_format.h
index fab2dbb64c..17374202b6 100644
--- a/include/net/coap_link_format.h
+++ b/include/net/coap_link_format.h
@@ -32,7 +32,7 @@ extern "C" {
 int coap_well_known_core_get(struct coap_resource *resource,
 			     struct coap_packet *request,
 			     struct coap_packet *response,
-			     u8_t *data, u16_t len);
+			     uint8_t *data, uint16_t len);
 
 /**
  * In case you want to add attributes to the resources included in the
diff --git a/include/net/dns_resolve.h b/include/net/dns_resolve.h
index 2afbea989c..442d4c7b67 100644
--- a/include/net/dns_resolve.h
+++ b/include/net/dns_resolve.h
@@ -90,7 +90,7 @@ enum dns_query_type {
 struct dns_addrinfo {
 	struct sockaddr ai_addr;
 	socklen_t       ai_addrlen;
-	u8_t            ai_family;
+	uint8_t            ai_family;
 	char            ai_canonname[DNS_MAX_NAME_SIZE + 1];
 };
 
@@ -169,10 +169,10 @@ struct dns_resolve_context {
 		struct net_context *net_ctx;
 
 		/** Is this server mDNS one */
-		u8_t is_mdns : 1;
+		uint8_t is_mdns : 1;
 
 		/** Is this server LLMNR one */
-		u8_t is_llmnr : 1;
+		uint8_t is_llmnr : 1;
 	} servers[CONFIG_DNS_RESOLVER_MAX_SERVERS + DNS_MAX_MCAST_SERVERS];
 
 	/** This timeout is also used when a buffer is required from the
@@ -207,7 +207,7 @@ struct dns_resolve_context {
 		enum dns_query_type query_type;
 
 		/** DNS id of this query */
-		u16_t id;
+		uint16_t id;
 
 		/** Hash of the DNS name + query type we are querying.
 		 * This hash is calculated so we can match the response that
@@ -215,7 +215,7 @@ struct dns_resolve_context {
 		 * setting the DNS id to 0, which means that the id alone
 		 * cannot be used to find correct pending query.
 		 */
-		u16_t query_hash;
+		uint16_t query_hash;
 	} queries[CONFIG_DNS_NUM_CONCUR_QUERIES];
 
 	/** Is this context in use */
@@ -276,7 +276,7 @@ int dns_resolve_close(struct dns_resolve_context *ctx);
  * @return 0 if ok, <0 if error.
  */
 int dns_resolve_cancel(struct dns_resolve_context *ctx,
-		       u16_t dns_id);
+		       uint16_t dns_id);
 
 /**
  * @brief Cancel a pending DNS query using id, name and type.
@@ -291,7 +291,7 @@ int dns_resolve_cancel(struct dns_resolve_context *ctx,
  * @return 0 if ok, <0 if error.
  */
 int dns_resolve_cancel_with_name(struct dns_resolve_context *ctx,
-				 u16_t dns_id,
+				 uint16_t dns_id,
 				 const char *query_name,
 				 enum dns_query_type query_type);
 
@@ -325,10 +325,10 @@ int dns_resolve_cancel_with_name(struct dns_resolve_context *ctx,
 int dns_resolve_name(struct dns_resolve_context *ctx,
 		     const char *query,
 		     enum dns_query_type type,
-		     u16_t *dns_id,
+		     uint16_t *dns_id,
 		     dns_resolve_cb_t cb,
 		     void *user_data,
-		     s32_t timeout);
+		     int32_t timeout);
 
 /**
  * @brief Get default DNS context.
@@ -371,10 +371,10 @@ struct dns_resolve_context *dns_resolve_get_default(void);
  */
 static inline int dns_get_addr_info(const char *query,
 				    enum dns_query_type type,
-				    u16_t *dns_id,
+				    uint16_t *dns_id,
 				    dns_resolve_cb_t cb,
 				    void *user_data,
-				    s32_t timeout)
+				    int32_t timeout)
 {
 	return dns_resolve_name(dns_resolve_get_default(),
 				query,
@@ -394,7 +394,7 @@ static inline int dns_get_addr_info(const char *query,
  *
  * @return 0 if ok, <0 if error.
  */
-static inline int dns_cancel_addr_info(u16_t dns_id)
+static inline int dns_cancel_addr_info(uint16_t dns_id)
 {
 	return dns_resolve_cancel(dns_resolve_get_default(), dns_id);
 }
diff --git a/include/net/ethernet.h b/include/net/ethernet.h
index cca2179f7d..86f1b55f4b 100644
--- a/include/net/ethernet.h
+++ b/include/net/ethernet.h
@@ -43,7 +43,7 @@ extern "C" {
 /** @cond INTERNAL_HIDDEN */
 
 struct net_eth_addr {
-	u8_t addr[6];
+	uint8_t addr[6];
 };
 
 #define NET_ETH_HDR(pkt) ((struct net_eth_hdr *)net_pkt_data(pkt))
@@ -253,7 +253,7 @@ struct ethernet_api {
 	 * this information if needed.
 	 */
 	int (*vlan_setup)(struct device *dev, struct net_if *iface,
-			  u16_t tag, bool enable);
+			  uint16_t tag, bool enable);
 #endif /* CONFIG_NET_VLAN */
 
 #if defined(CONFIG_PTP_CLOCK)
@@ -274,7 +274,7 @@ BUILD_ASSERT(offsetof(struct ethernet_api, iface_api) == 0);
 struct net_eth_hdr {
 	struct net_eth_addr dst;
 	struct net_eth_addr src;
-	u16_t type;
+	uint16_t type;
 } __packed;
 
 struct ethernet_vlan {
@@ -282,7 +282,7 @@ struct ethernet_vlan {
 	struct net_if *iface;
 
 	/** VLAN tag */
-	u16_t tag;
+	uint16_t tag;
 };
 
 #if defined(CONFIG_NET_VLAN_COUNT)
@@ -304,7 +304,7 @@ struct ethernet_lldp {
 	const struct net_lldpdu *lldpdu;
 
 	/** LLDP Data Unit optional TLVs for the interface */
-	const u8_t *optional_du;
+	const uint8_t *optional_du;
 
 	/** Length of the optional Data Unit TLVs */
 	size_t optional_len;
@@ -313,10 +313,10 @@ struct ethernet_lldp {
 	struct net_if *iface;
 
 	/** LLDP TX timer start time */
-	s64_t tx_timer_start;
+	int64_t tx_timer_start;
 
 	/** LLDP TX timeout */
-	u32_t tx_timer_timeout;
+	uint32_t tx_timer_timeout;
 
 	/** LLDP RX callback function */
 	net_lldp_recv_cb_t cb;
@@ -372,7 +372,7 @@ struct ethernet_context {
 	 * context. The same information can be dug from the vlan array but
 	 * this saves some time in RX path.
 	 */
-	s8_t vlan_enabled;
+	int8_t vlan_enabled;
 #endif
 
 	/** Is this context already initialized */
@@ -397,10 +397,10 @@ struct net_eth_vlan_hdr {
 	struct net_eth_addr dst;
 	struct net_eth_addr src;
 	struct {
-		u16_t tpid; /* tag protocol id  */
-		u16_t tci;  /* tag control info */
+		uint16_t tpid; /* tag protocol id  */
+		uint16_t tci;  /* tag control info */
 	} vlan;
-	u16_t type;
+	uint16_t type;
 } __packed;
 
 
@@ -510,9 +510,9 @@ enum ethernet_hw_caps net_eth_get_hw_capabilities(struct net_if *iface)
  * @return 0 if ok, <0 if error
  */
 #if defined(CONFIG_NET_VLAN)
-int net_eth_vlan_enable(struct net_if *iface, u16_t tag);
+int net_eth_vlan_enable(struct net_if *iface, uint16_t tag);
 #else
-static inline int net_eth_vlan_enable(struct net_if *iface, u16_t tag)
+static inline int net_eth_vlan_enable(struct net_if *iface, uint16_t tag)
 {
 	return -EINVAL;
 }
@@ -527,9 +527,9 @@ static inline int net_eth_vlan_enable(struct net_if *iface, u16_t tag)
  * @return 0 if ok, <0 if error
  */
 #if defined(CONFIG_NET_VLAN)
-int net_eth_vlan_disable(struct net_if *iface, u16_t tag);
+int net_eth_vlan_disable(struct net_if *iface, uint16_t tag);
 #else
-static inline int net_eth_vlan_disable(struct net_if *iface, u16_t tag)
+static inline int net_eth_vlan_disable(struct net_if *iface, uint16_t tag)
 {
 	return -EINVAL;
 }
@@ -544,9 +544,9 @@ static inline int net_eth_vlan_disable(struct net_if *iface, u16_t tag)
  * is not configured for that interface.
  */
 #if defined(CONFIG_NET_VLAN)
-u16_t net_eth_get_vlan_tag(struct net_if *iface);
+uint16_t net_eth_get_vlan_tag(struct net_if *iface);
 #else
-static inline u16_t net_eth_get_vlan_tag(struct net_if *iface)
+static inline uint16_t net_eth_get_vlan_tag(struct net_if *iface)
 {
 	return NET_VLAN_TAG_UNSPEC;
 }
@@ -563,10 +563,10 @@ static inline u16_t net_eth_get_vlan_tag(struct net_if *iface)
  * exists.
  */
 #if defined(CONFIG_NET_VLAN)
-struct net_if *net_eth_get_vlan_iface(struct net_if *iface, u16_t tag);
+struct net_if *net_eth_get_vlan_iface(struct net_if *iface, uint16_t tag);
 #else
 static inline
-struct net_if *net_eth_get_vlan_iface(struct net_if *iface, u16_t tag)
+struct net_if *net_eth_get_vlan_iface(struct net_if *iface, uint16_t tag)
 {
 	return NULL;
 }
diff --git a/include/net/ethernet_mgmt.h b/include/net/ethernet_mgmt.h
index c5e6e4c453..ad9f7896e8 100644
--- a/include/net/ethernet_mgmt.h
+++ b/include/net/ethernet_mgmt.h
@@ -167,10 +167,10 @@ static inline void ethernet_mgmt_raise_carrier_off_event(struct net_if *iface)
  * @param tag VLAN tag which is enabled.
  */
 #if defined(CONFIG_NET_L2_ETHERNET_MGMT)
-void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface, u16_t tag);
+void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface, uint16_t tag);
 #else
 static inline void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface,
-							  u16_t tag)
+							  uint16_t tag)
 {
 	ARG_UNUSED(iface);
 	ARG_UNUSED(tag);
@@ -184,10 +184,10 @@ static inline void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface,
  * @param tag VLAN tag which is disabled.
  */
 #if defined(CONFIG_NET_L2_ETHERNET_MGMT)
-void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface, u16_t tag);
+void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface, uint16_t tag);
 #else
 static inline void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface,
-							   u16_t tag)
+							   uint16_t tag)
 {
 	ARG_UNUSED(iface);
 	ARG_UNUSED(tag);
diff --git a/include/net/ethernet_vlan.h b/include/net/ethernet_vlan.h
index e91c3321c1..3a8a2f5c6e 100644
--- a/include/net/ethernet_vlan.h
+++ b/include/net/ethernet_vlan.h
@@ -36,7 +36,7 @@ extern "C" {
  *
  * @return VLAN identifier.
  */
-static inline u16_t net_eth_vlan_get_vid(u16_t tci)
+static inline uint16_t net_eth_vlan_get_vid(uint16_t tci)
 {
 	return tci & 0x0fff;
 }
@@ -48,7 +48,7 @@ static inline u16_t net_eth_vlan_get_vid(u16_t tci)
  *
  * @return Drop eligible indicator.
  */
-static inline u8_t net_eth_vlan_get_dei(u16_t tci)
+static inline uint8_t net_eth_vlan_get_dei(uint16_t tci)
 {
 	return (tci >> 12) & 0x01;
 }
@@ -60,7 +60,7 @@ static inline u8_t net_eth_vlan_get_dei(u16_t tci)
  *
  * @return Priority code point.
  */
-static inline u8_t net_eth_vlan_get_pcp(u16_t tci)
+static inline uint8_t net_eth_vlan_get_pcp(uint16_t tci)
 {
 	return (tci >> 13) & 0x07;
 }
@@ -73,7 +73,7 @@ static inline u8_t net_eth_vlan_get_pcp(u16_t tci)
  *
  * @return New TCI value.
  */
-static inline u16_t net_eth_vlan_set_vid(u16_t tci, u16_t vid)
+static inline uint16_t net_eth_vlan_set_vid(uint16_t tci, uint16_t vid)
 {
 	return (tci & 0xf000) | (vid & 0x0fff);
 }
@@ -86,7 +86,7 @@ static inline u16_t net_eth_vlan_set_vid(u16_t tci, u16_t vid)
  *
  * @return New TCI value.
  */
-static inline u16_t net_eth_vlan_set_dei(u16_t tci, bool dei)
+static inline uint16_t net_eth_vlan_set_dei(uint16_t tci, bool dei)
 {
 	return (tci & 0xefff) | ((!!dei) << 12);
 }
@@ -99,7 +99,7 @@ static inline u16_t net_eth_vlan_set_dei(u16_t tci, bool dei)
  *
  * @return New TCI value.
  */
-static inline u16_t net_eth_vlan_set_pcp(u16_t tci, u8_t pcp)
+static inline uint16_t net_eth_vlan_set_pcp(uint16_t tci, uint8_t pcp)
 {
 	return (tci & 0x1fff) | ((pcp & 0x07) << 13);
 }
diff --git a/include/net/gptp.h b/include/net/gptp.h
index 4b82d35642..de1415a86a 100644
--- a/include/net/gptp.h
+++ b/include/net/gptp.h
@@ -43,10 +43,10 @@ extern "C" {
  */
 struct gptp_scaled_ns {
 	/** High half. */
-	s32_t high;
+	int32_t high;
 
 	/** Low half. */
-	s64_t low;
+	int64_t low;
 } __packed;
 
 /**
@@ -54,10 +54,10 @@ struct gptp_scaled_ns {
  */
 struct gptp_uscaled_ns {
 	/** High half. */
-	u32_t high;
+	uint32_t high;
 
 	/** Low half. */
-	u64_t low;
+	uint64_t low;
 } __packed;
 
 /** @cond INTERNAL_HIDDEN */
@@ -119,64 +119,64 @@ static inline double gptp_pow2(int exp)
  */
 struct gptp_port_identity {
 	/** Clock identity of the port. */
-	u8_t clk_id[GPTP_CLOCK_ID_LEN];
+	uint8_t clk_id[GPTP_CLOCK_ID_LEN];
 
 	/** Number of the port. */
-	u16_t port_number;
+	uint16_t port_number;
 } __packed;
 
 struct gptp_flags {
 	union {
 		/** Byte access. */
-		u8_t octets[2];
+		uint8_t octets[2];
 
 		/** Whole field access. */
-		u16_t all;
+		uint16_t all;
 	};
 } __packed;
 
 struct gptp_hdr {
 	/** Type of the message. */
-	u8_t message_type:4;
+	uint8_t message_type:4;
 
 	/** Transport specific, always 1. */
-	u8_t transport_specific:4;
+	uint8_t transport_specific:4;
 
 	/** Version of the PTP, always 2. */
-	u8_t ptp_version:4;
+	uint8_t ptp_version:4;
 
 	/** Reserved field. */
-	u8_t reserved0:4;
+	uint8_t reserved0:4;
 
 	/** Total length of the message from the header to the last TLV. */
-	u16_t message_length;
+	uint16_t message_length;
 
 	/** Domain number, always 0. */
-	u8_t domain_number;
+	uint8_t domain_number;
 
 	/** Reserved field. */
-	u8_t reserved1;
+	uint8_t reserved1;
 
 	/** Message flags. */
 	struct gptp_flags flags;
 
 	/** Correction Field. The content depends of the message type. */
-	s64_t correction_field;
+	int64_t correction_field;
 
 	/** Reserved field. */
-	u32_t reserved2;
+	uint32_t reserved2;
 
 	/** Port Identity of the sender. */
 	struct gptp_port_identity port_id;
 
 	/** Sequence Id. */
-	u16_t sequence_id;
+	uint16_t sequence_id;
 
 	/** Control value. Sync: 0, Follow-up: 2, Others: 5. */
-	u8_t control;
+	uint8_t control;
 
 	/** Message Interval in Log2 for Sync and Announce messages. */
-	s8_t log_msg_interval;
+	int8_t log_msg_interval;
 } __packed;
 
 /** @cond INTERNAL_HIDDEN */
@@ -194,9 +194,9 @@ struct gptp_hdr {
  * @typedef gptp_phase_dis_callback_t
  * @brief Define callback that is called after a phase discontinuity has been
  *        sent by the grandmaster.
- * @param "u8_t *gm_identity" A pointer to first element of a
+ * @param "uint8_t *gm_identity" A pointer to first element of a
  *        ClockIdentity array. The size of the array is GPTP_CLOCK_ID_LEN.
- * @param "u16_t *gm_time_base" A pointer to the value of timeBaseIndicator
+ * @param "uint16_t *gm_time_base" A pointer to the value of timeBaseIndicator
  *        of the current grandmaster.
  * @param "struct scaled_ns *last_gm_ph_change" A pointer to the value of
  *        lastGmPhaseChange received from grandmaster.
@@ -204,8 +204,8 @@ struct gptp_hdr {
  *        lastGmFreqChange received from the grandmaster.
  */
 typedef void (*gptp_phase_dis_callback_t)(
-	u8_t *gm_identity,
-	u16_t *time_base,
+	uint8_t *gm_identity,
+	uint16_t *time_base,
 	struct gptp_scaled_ns *last_gm_ph_change,
 	double *last_gm_freq_change);
 
@@ -241,7 +241,7 @@ struct gptp_clk_src_time_invoke_params {
 	struct gptp_scaled_ns last_gm_phase_change;
 
 	/** Time Base - changed only if Phase or Frequency changes. */
-	u16_t time_base_indicator;
+	uint16_t time_base_indicator;
 };
 
 /**
@@ -285,7 +285,7 @@ int gptp_event_capture(struct net_ptp_time *slave_time, bool *gm_present);
  *
  * @return Pointer to output buffer
  */
-char *gptp_sprint_clock_id(const u8_t *clk_id, char *output,
+char *gptp_sprint_clock_id(const uint8_t *clk_id, char *output,
 			   size_t output_len);
 
 /**
diff --git a/include/net/hostname.h b/include/net/hostname.h
index b6cdca928a..38bbcab94f 100644
--- a/include/net/hostname.h
+++ b/include/net/hostname.h
@@ -63,10 +63,10 @@ static inline void net_hostname_init(void)
  * @return 0 if ok, <0 if error
  */
 #if defined(CONFIG_NET_HOSTNAME_UNIQUE)
-int net_hostname_set_postfix(const u8_t *hostname_postfix,
+int net_hostname_set_postfix(const uint8_t *hostname_postfix,
 			      int postfix_len);
 #else
-static inline int net_hostname_set_postfix(const u8_t *hostname_postfix,
+static inline int net_hostname_set_postfix(const uint8_t *hostname_postfix,
 					   int postfix_len)
 {
 	return -EMSGSIZE;
diff --git a/include/net/http_client.h b/include/net/http_client.h
index 3cc1cf5ed5..ed7850d23d 100644
--- a/include/net/http_client.h
+++ b/include/net/http_client.h
@@ -106,12 +106,12 @@ struct http_response {
 	http_response_cb_t cb;
 
 	/** Where the body starts */
-	u8_t *body_start;
+	uint8_t *body_start;
 
 	/** Where the response is stored, this is to be
 	 * provided by the user.
 	 */
-	u8_t *recv_buf;
+	uint8_t *recv_buf;
 
 	/** Response buffer maximum length */
 	size_t recv_buf_len;
@@ -145,9 +145,9 @@ struct http_response {
 	 */
 	char http_status[HTTP_STATUS_STR_SIZE];
 
-	u8_t cl_present : 1;
-	u8_t body_found : 1;
-	u8_t message_complete : 1;
+	uint8_t cl_present : 1;
+	uint8_t body_found : 1;
+	uint8_t message_complete : 1;
 };
 
 /** HTTP client internal data that the application should not touch
@@ -202,7 +202,7 @@ struct http_request {
 	const struct http_parser_settings *http_cb;
 
 	/** User supplied buffer where received data is stored */
-	u8_t *recv_buf;
+	uint8_t *recv_buf;
 
 	/** Length of the user supplied receive buffer */
 	size_t recv_buf_len;
@@ -279,7 +279,7 @@ struct http_request {
  * @return <0 if error, >=0 amount of data sent to the server
  */
 int http_client_req(int sock, struct http_request *req,
-		    s32_t timeout, void *user_data);
+		    int32_t timeout, void *user_data);
 
 #ifdef __cplusplus
 }
diff --git a/include/net/http_parser.h b/include/net/http_parser.h
index 973174fea1..534c6ea9f4 100644
--- a/include/net/http_parser.h
+++ b/include/net/http_parser.h
@@ -31,14 +31,14 @@
 	(!defined(_MSC_VER) || _MSC_VER < 1600) && !defined(__WINE__)
 #include <BaseTsd.h>
 #include <stddef.h>
-typedef __int8 s8_t;
-typedef unsigned __int8 u8_t;
-typedef __int16 s16_t;
-typedef unsigned __int16 u16_t;
-typedef __int32 s32_t;
-typedef unsigned __int32 u32_t;
-typedef __int64 s64_t;
-typedef unsigned __int64 u64_t;
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #else
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -189,8 +189,8 @@ struct http_parser {
 	unsigned int index : 7;        /* index into current matcher */
 	unsigned int lenient_http_headers : 1;
 
-	u32_t nread;          /* # bytes read in various scenarios */
-	u64_t content_length; /* # bytes in body (0 if no Content-Length
+	uint32_t nread;          /* # bytes read in various scenarios */
+	uint64_t content_length; /* # bytes in body (0 if no Content-Length
 				  * header)
 				  */
 	/** READ-ONLY **/
diff --git a/include/net/http_parser_url.h b/include/net/http_parser_url.h
index 5e3eedb87f..9d736a7a3a 100644
--- a/include/net/http_parser_url.h
+++ b/include/net/http_parser_url.h
@@ -46,17 +46,17 @@ enum http_parser_url_fields {
  * Callers should index into field_data[] with UF_* values iff field_set
  * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
  * because we probably have padding left over), we convert any port to
- * a u16_t.
+ * a uint16_t.
  */
 struct http_parser_url {
-	u16_t field_set;           /* Bitmask of (1 << UF_*) values */
-	u16_t port;                /* Converted UF_PORT string */
+	uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
+	uint16_t port;                /* Converted UF_PORT string */
 
 	struct {
-		u16_t off;               /* Offset into buffer in which field
+		uint16_t off;               /* Offset into buffer in which field
 					  * starts
 					  */
-		u16_t len;               /* Length of run in buffer */
+		uint16_t len;               /* Length of run in buffer */
 	} field_data[UF_MAX];
 };
 
diff --git a/include/net/ieee802154.h b/include/net/ieee802154.h
index 814342b494..75868c0f71 100644
--- a/include/net/ieee802154.h
+++ b/include/net/ieee802154.h
@@ -31,24 +31,24 @@ extern "C" {
 #define IEEE802154_NO_CHANNEL		USHRT_MAX
 
 struct ieee802154_security_ctx {
-	u32_t frame_counter;
+	uint32_t frame_counter;
 	struct cipher_ctx enc;
 	struct cipher_ctx dec;
-	u8_t key[16];
-	u8_t key_len;
-	u8_t level	: 3;
-	u8_t key_mode	: 2;
-	u8_t _unused	: 3;
+	uint8_t key[16];
+	uint8_t key_len;
+	uint8_t level	: 3;
+	uint8_t key_mode	: 2;
+	uint8_t _unused	: 3;
 };
 
 /* This not meant to be used by any code but 802.15.4 L2 stack */
 struct ieee802154_context {
 	enum net_l2_flags flags;
-	u16_t pan_id;
-	u16_t channel;
+	uint16_t pan_id;
+	uint16_t channel;
 	struct k_sem ack_lock;
-	u16_t short_addr;
-	u8_t ext_addr[IEEE802154_MAX_ADDR_LENGTH];
+	uint16_t short_addr;
+	uint8_t ext_addr[IEEE802154_MAX_ADDR_LENGTH];
 #ifdef CONFIG_NET_L2_IEEE802154_MGMT
 	struct ieee802154_req_params *scan_ctx;
 	union {
@@ -56,21 +56,21 @@ struct ieee802154_context {
 		struct k_sem req_lock;
 	};
 	union {
-		u8_t ext_addr[IEEE802154_MAX_ADDR_LENGTH];
-		u16_t short_addr;
+		uint8_t ext_addr[IEEE802154_MAX_ADDR_LENGTH];
+		uint16_t short_addr;
 	} coord;
-	u8_t coord_addr_len;
+	uint8_t coord_addr_len;
 #endif
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 	struct ieee802154_security_ctx sec_ctx;
 #endif
-	s16_t tx_power;
-	u8_t sequence;
-	u8_t ack_seq;
-	u8_t ack_received	: 1;
-	u8_t ack_requested	: 1;
-	u8_t associated		: 1;
-	u8_t _unused		: 5;
+	int16_t tx_power;
+	uint8_t sequence;
+	uint8_t ack_seq;
+	uint8_t ack_received	: 1;
+	uint8_t ack_requested	: 1;
+	uint8_t associated		: 1;
+	uint8_t _unused		: 5;
 };
 
 #define IEEE802154_L2_CTX_TYPE	struct ieee802154_context
diff --git a/include/net/ieee802154_mgmt.h b/include/net/ieee802154_mgmt.h
index 2ab119b0fe..db55adf47d 100644
--- a/include/net/ieee802154_mgmt.h
+++ b/include/net/ieee802154_mgmt.h
@@ -187,26 +187,26 @@ enum net_event_ieee802154_cmd {
  */
 struct ieee802154_req_params {
 	/** The set of channels to scan, use above macros to manage it */
-	u32_t channel_set;
+	uint32_t channel_set;
 
 	/** Duration of scan, per-channel, in milliseconds */
-	u32_t duration;
+	uint32_t duration;
 
 	/** Current channel in use as a result */
-	u16_t channel;
+	uint16_t channel;
 	/** Current pan_id in use as a result */
-	u16_t pan_id;
+	uint16_t pan_id;
 
 	/** Result address */
 	union {
-		u8_t addr[IEEE802154_MAX_ADDR_LENGTH];
-		u16_t short_addr;
+		uint8_t addr[IEEE802154_MAX_ADDR_LENGTH];
+		uint16_t short_addr;
 	};
 
 	/** length of address */
-	u8_t len;
+	uint8_t len;
 	/** Link quality information, between 0 and 255 */
-	u8_t lqi;
+	uint8_t lqi;
 };
 
 /**
@@ -215,11 +215,11 @@ struct ieee802154_req_params {
  * Used to setup the link-layer security settings
  */
 struct ieee802154_security_params {
-	u8_t key[16];
-	u8_t key_len;
-	u8_t key_mode	: 2;
-	u8_t level	: 3;
-	u8_t _unused	: 3;
+	uint8_t key[16];
+	uint8_t key_len;
+	uint8_t key_mode	: 2;
+	uint8_t level	: 3;
+	uint8_t _unused	: 3;
 };
 
 #ifdef __cplusplus
diff --git a/include/net/ieee802154_radio.h b/include/net/ieee802154_radio.h
index 51ea4f2f56..7626b686a2 100644
--- a/include/net/ieee802154_radio.h
+++ b/include/net/ieee802154_radio.h
@@ -50,7 +50,7 @@ enum ieee802154_event {
 	IEEE802154_EVENT_TX_STARTED /* Data transmission started */
 };
 
-typedef void (*energy_scan_done_cb_t)(struct device *dev, s16_t max_ed);
+typedef void (*energy_scan_done_cb_t)(struct device *dev, int16_t max_ed);
 
 typedef void (*ieee802154_event_cb_t)(struct device *dev,
 				      enum ieee802154_event evt,
@@ -59,9 +59,9 @@ typedef void (*ieee802154_event_cb_t)(struct device *dev,
 struct ieee802154_filter {
 /** @cond ignore */
 	union {
-		u8_t *ieee_addr;
-		u16_t short_addr;
-		u16_t pan_id;
+		uint8_t *ieee_addr;
+		uint16_t short_addr;
+		uint16_t pan_id;
 	};
 /* @endcond */
 };
@@ -137,7 +137,7 @@ struct ieee802154_config {
 
 		/** ``IEEE802154_CONFIG_ACK_FPB`` */
 		struct {
-			u8_t *addr;
+			uint8_t *addr;
 			bool extended;
 			bool enabled;
 		} ack_fpb;
@@ -173,7 +173,7 @@ struct ieee802154_radio_api {
 	int (*cca)(struct device *dev);
 
 	/** Set current channel */
-	int (*set_channel)(struct device *dev, u16_t channel);
+	int (*set_channel)(struct device *dev, uint16_t channel);
 
 	/** Set/Unset filters (for IEEE802154_HW_FILTER ) */
 	int (*filter)(struct device *dev,
@@ -182,7 +182,7 @@ struct ieee802154_radio_api {
 		      const struct ieee802154_filter *filter);
 
 	/** Set TX power level in dbm */
-	int (*set_txpower)(struct device *dev, s16_t dbm);
+	int (*set_txpower)(struct device *dev, int16_t dbm);
 
 	/** Transmit a packet fragment */
 	int (*tx)(struct device *dev, enum ieee802154_tx_mode mode,
@@ -201,7 +201,7 @@ struct ieee802154_radio_api {
 
 #ifdef CONFIG_NET_L2_IEEE802154_SUB_GHZ
 	/** Get the available amount of Sub-GHz channels */
-	u16_t (*get_subg_channel_count)(struct device *dev);
+	uint16_t (*get_subg_channel_count)(struct device *dev);
 #endif /* CONFIG_NET_L2_IEEE802154_SUB_GHZ */
 
 	/** Run an energy detection scan.
@@ -209,7 +209,7 @@ struct ieee802154_radio_api {
 	 *  duration parameter is in ms.
 	 */
 	int (*ed_scan)(struct device *dev,
-		       u16_t duration,
+		       uint16_t duration,
 		       energy_scan_done_cb_t done_cb);
 };
 
diff --git a/include/net/lldp.h b/include/net/lldp.h
index 6395d3ea63..75502e1369 100644
--- a/include/net/lldp.h
+++ b/include/net/lldp.h
@@ -27,7 +27,7 @@ extern "C" {
 /** @cond INTERNAL_HIDDEN */
 
 #define LLDP_TLV_GET_LENGTH(type_length)	(type_length & BIT_MASK(9))
-#define LLDP_TLV_GET_TYPE(type_length)		((u8_t)(type_length >> 9))
+#define LLDP_TLV_GET_TYPE(type_length)		((uint8_t)(type_length >> 9))
 
 /* LLDP Definitions */
 
@@ -135,29 +135,29 @@ enum net_lldp_tlv_type {
 /** Chassis ID TLV, see chapter 8.5.2 in IEEE 802.1AB */
 struct net_lldp_chassis_tlv {
 	/** 7 bits for type, 9 bits for length */
-	u16_t type_length;
+	uint16_t type_length;
 	/** ID subtype */
-	u8_t subtype;
+	uint8_t subtype;
 	/** Chassis ID value */
-	u8_t value[NET_LLDP_CHASSIS_ID_VALUE_LEN];
+	uint8_t value[NET_LLDP_CHASSIS_ID_VALUE_LEN];
 } __packed;
 
 /** Port ID TLV, see chapter 8.5.3 in IEEE 802.1AB */
 struct net_lldp_port_tlv {
 	/** 7 bits for type, 9 bits for length */
-	u16_t type_length;
+	uint16_t type_length;
 	/** ID subtype */
-	u8_t subtype;
+	uint8_t subtype;
 	/** Port ID value */
-	u8_t value[NET_LLDP_PORT_ID_VALUE_LEN];
+	uint8_t value[NET_LLDP_PORT_ID_VALUE_LEN];
 } __packed;
 
 /** Time To Live TLV, see chapter 8.5.4 in IEEE 802.1AB */
 struct net_lldp_time_to_live_tlv {
 	/** 7 bits for type, 9 bits for length */
-	u16_t type_length;
+	uint16_t type_length;
 	/** Time To Live (TTL) value */
-	u16_t ttl;
+	uint16_t ttl;
 } __packed;
 
 /**
@@ -189,7 +189,7 @@ int net_lldp_config(struct net_if *iface, const struct net_lldpdu *lldpdu);
  *
  * @return 0 if ok, <0 if error
  */
-int net_lldp_config_optional(struct net_if *iface, const u8_t *tlv, size_t len);
+int net_lldp_config_optional(struct net_if *iface, const uint8_t *tlv, size_t len);
 
 /**
  * @brief Initialize LLDP engine.
diff --git a/include/net/lwm2m.h b/include/net/lwm2m.h
index 2699d630ac..1adfe07253 100644
--- a/include/net/lwm2m.h
+++ b/include/net/lwm2m.h
@@ -128,8 +128,8 @@ struct lwm2m_ctx {
  *
  * @return Callback returns a pointer to the data buffer or NULL for failure.
  */
-typedef void *(*lwm2m_engine_get_data_cb_t)(u16_t obj_inst_id,
-					    u16_t res_id, u16_t res_inst_id,
+typedef void *(*lwm2m_engine_get_data_cb_t)(uint16_t obj_inst_id,
+					    uint16_t res_id, uint16_t res_inst_id,
 					    size_t *data_len);
 
 /**
@@ -157,9 +157,9 @@ typedef void *(*lwm2m_engine_get_data_cb_t)(u16_t obj_inst_id,
  * @return Callback returns a negative error code (errno.h) indicating
  *         reason of failure or 0 for success.
  */
-typedef int (*lwm2m_engine_set_data_cb_t)(u16_t obj_inst_id,
-					  u16_t res_id, u16_t res_inst_id,
-					  u8_t *data, u16_t data_len,
+typedef int (*lwm2m_engine_set_data_cb_t)(uint16_t obj_inst_id,
+					  uint16_t res_id, uint16_t res_inst_id,
+					  uint8_t *data, uint16_t data_len,
 					  bool last_block, size_t total_size);
 
 /**
@@ -179,7 +179,7 @@ typedef int (*lwm2m_engine_set_data_cb_t)(u16_t obj_inst_id,
  * @return Callback returns a negative error code (errno.h) indicating
  *         reason of failure or 0 for success.
  */
-typedef int (*lwm2m_engine_user_cb_t)(u16_t obj_inst_id);
+typedef int (*lwm2m_engine_user_cb_t)(uint16_t obj_inst_id);
 
 /**
  * @brief Power source types used for the "Available Power Sources" resource of
@@ -233,7 +233,7 @@ typedef int (*lwm2m_engine_user_cb_t)(u16_t obj_inst_id);
  * @return The newly added index of the power source.  The index is used
  *         for removing the power source, setting voltage or setting current.
  */
-__deprecated int lwm2m_device_add_pwrsrc(u8_t pwr_src_type);
+__deprecated int lwm2m_device_add_pwrsrc(uint8_t pwr_src_type);
 
 /**
  * @brief Remove power source previously registered in the LwM2M Device object.
@@ -274,7 +274,7 @@ __deprecated int lwm2m_device_set_pwrsrc_current_ma(int index, int current_ma);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_device_add_err(u8_t error_code);
+int lwm2m_device_add_err(uint8_t error_code);
 
 
 /**
@@ -367,8 +367,8 @@ struct coap_block_context *lwm2m_firmware_get_block_context();
  * @brief 32-bit variant of the LwM2M float structure
  */
 typedef struct float32_value {
-	s32_t val1;
-	s32_t val2;
+	int32_t val1;
+	int32_t val2;
 } float32_value_t;
 
 /**
@@ -380,8 +380,8 @@ typedef struct float32_value {
  * @brief 32-bit variant of the LwM2M float structure
  */
 typedef struct float64_value {
-	s64_t val1;
-	s64_t val2;
+	int64_t val1;
+	int64_t val2;
 } float64_value_t;
 
 /**
@@ -406,7 +406,7 @@ int lwm2m_engine_create_obj_inst(char *pathstr);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_opaque(char *pathstr, char *data_ptr, u16_t data_len);
+int lwm2m_engine_set_opaque(char *pathstr, char *data_ptr, uint16_t data_len);
 
 /**
  * @brief Set resource (instance) value (string)
@@ -426,7 +426,7 @@ int lwm2m_engine_set_string(char *pathstr, char *data_ptr);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_u8(char *pathstr, u8_t value);
+int lwm2m_engine_set_u8(char *pathstr, uint8_t value);
 
 /**
  * @brief Set resource (instance) value (u16)
@@ -436,7 +436,7 @@ int lwm2m_engine_set_u8(char *pathstr, u8_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_u16(char *pathstr, u16_t value);
+int lwm2m_engine_set_u16(char *pathstr, uint16_t value);
 
 /**
  * @brief Set resource (instance) value (u32)
@@ -446,7 +446,7 @@ int lwm2m_engine_set_u16(char *pathstr, u16_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_u32(char *pathstr, u32_t value);
+int lwm2m_engine_set_u32(char *pathstr, uint32_t value);
 
 /**
  * @brief Set resource (instance) value (u64)
@@ -456,7 +456,7 @@ int lwm2m_engine_set_u32(char *pathstr, u32_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_u64(char *pathstr, u64_t value);
+int lwm2m_engine_set_u64(char *pathstr, uint64_t value);
 
 /**
  * @brief Set resource (instance) value (s8)
@@ -466,7 +466,7 @@ int lwm2m_engine_set_u64(char *pathstr, u64_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_s8(char *pathstr, s8_t value);
+int lwm2m_engine_set_s8(char *pathstr, int8_t value);
 
 /**
  * @brief Set resource (instance) value (s16)
@@ -476,7 +476,7 @@ int lwm2m_engine_set_s8(char *pathstr, s8_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_s16(char *pathstr, s16_t value);
+int lwm2m_engine_set_s16(char *pathstr, int16_t value);
 
 /**
  * @brief Set resource (instance) value (s32)
@@ -486,7 +486,7 @@ int lwm2m_engine_set_s16(char *pathstr, s16_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_s32(char *pathstr, s32_t value);
+int lwm2m_engine_set_s32(char *pathstr, int32_t value);
 
 /**
  * @brief Set resource (instance) value (s64)
@@ -496,7 +496,7 @@ int lwm2m_engine_set_s32(char *pathstr, s32_t value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_s64(char *pathstr, s64_t value);
+int lwm2m_engine_set_s64(char *pathstr, int64_t value);
 
 /**
  * @brief Set resource (instance) value (bool)
@@ -537,7 +537,7 @@ int lwm2m_engine_set_float64(char *pathstr, float64_value_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_opaque(char *pathstr, void *buf, u16_t buflen);
+int lwm2m_engine_get_opaque(char *pathstr, void *buf, uint16_t buflen);
 
 /**
  * @brief Get resource (instance) value (string)
@@ -548,7 +548,7 @@ int lwm2m_engine_get_opaque(char *pathstr, void *buf, u16_t buflen);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_string(char *pathstr, void *str, u16_t strlen);
+int lwm2m_engine_get_string(char *pathstr, void *str, uint16_t strlen);
 
 /**
  * @brief Get resource (instance) value (u8)
@@ -558,7 +558,7 @@ int lwm2m_engine_get_string(char *pathstr, void *str, u16_t strlen);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_u8(char *pathstr, u8_t *value);
+int lwm2m_engine_get_u8(char *pathstr, uint8_t *value);
 
 /**
  * @brief Get resource (instance) value (u16)
@@ -568,7 +568,7 @@ int lwm2m_engine_get_u8(char *pathstr, u8_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_u16(char *pathstr, u16_t *value);
+int lwm2m_engine_get_u16(char *pathstr, uint16_t *value);
 
 /**
  * @brief Get resource (instance) value (u32)
@@ -578,7 +578,7 @@ int lwm2m_engine_get_u16(char *pathstr, u16_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_u32(char *pathstr, u32_t *value);
+int lwm2m_engine_get_u32(char *pathstr, uint32_t *value);
 
 /**
  * @brief Get resource (instance) value (u64)
@@ -588,7 +588,7 @@ int lwm2m_engine_get_u32(char *pathstr, u32_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_u64(char *pathstr, u64_t *value);
+int lwm2m_engine_get_u64(char *pathstr, uint64_t *value);
 
 /**
  * @brief Get resource (instance) value (s8)
@@ -598,7 +598,7 @@ int lwm2m_engine_get_u64(char *pathstr, u64_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_s8(char *pathstr, s8_t *value);
+int lwm2m_engine_get_s8(char *pathstr, int8_t *value);
 
 /**
  * @brief Get resource (instance) value (s16)
@@ -608,7 +608,7 @@ int lwm2m_engine_get_s8(char *pathstr, s8_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_s16(char *pathstr, s16_t *value);
+int lwm2m_engine_get_s16(char *pathstr, int16_t *value);
 
 /**
  * @brief Get resource (instance) value (s32)
@@ -618,7 +618,7 @@ int lwm2m_engine_get_s16(char *pathstr, s16_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_s32(char *pathstr, s32_t *value);
+int lwm2m_engine_get_s32(char *pathstr, int32_t *value);
 
 /**
  * @brief Get resource (instance) value (s64)
@@ -628,7 +628,7 @@ int lwm2m_engine_get_s32(char *pathstr, s32_t *value);
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_s64(char *pathstr, s64_t *value);
+int lwm2m_engine_get_s64(char *pathstr, int64_t *value);
 
 /**
  * @brief Get resource (instance) value (bool)
@@ -728,7 +728,7 @@ int lwm2m_engine_register_exec_callback(char *pathstr,
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_register_create_callback(u16_t obj_id,
+int lwm2m_engine_register_create_callback(uint16_t obj_id,
 					  lwm2m_engine_user_cb_t cb);
 
 /**
@@ -741,7 +741,7 @@ int lwm2m_engine_register_create_callback(u16_t obj_id,
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_register_delete_callback(u16_t obj_id,
+int lwm2m_engine_register_delete_callback(uint16_t obj_id,
 					  lwm2m_engine_user_cb_t cb);
 
 /**
@@ -772,8 +772,8 @@ int lwm2m_engine_register_delete_callback(u16_t obj_id,
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, u16_t data_len,
-			      u8_t data_flags);
+int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, uint16_t data_len,
+			      uint8_t data_flags);
 
 /**
  * @brief Get data buffer for a resource
@@ -788,8 +788,8 @@ int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, u16_t data_len,
  *
  * @return 0 for success or negative in case of error.
  */
-int lwm2m_engine_get_res_data(char *pathstr, void **data_ptr, u16_t *data_len,
-			      u8_t *data_flags);
+int lwm2m_engine_get_res_data(char *pathstr, void **data_ptr, uint16_t *data_len,
+			      uint8_t *data_flags);
 
 /**
  * @brief Create a resource instance
diff --git a/include/net/mqtt.h b/include/net/mqtt.h
index 4b43539648..755c14d330 100644
--- a/include/net/mqtt.h
+++ b/include/net/mqtt.h
@@ -150,8 +150,8 @@ enum mqtt_suback_return_code {
 
 /** @brief Abstracts UTF-8 encoded strings. */
 struct mqtt_utf8 {
-	u8_t *utf8;             /**< Pointer to UTF-8 string. */
-	u32_t size;             /**< Size of UTF string, in bytes. */
+	uint8_t *utf8;             /**< Pointer to UTF-8 string. */
+	uint32_t size;             /**< Size of UTF string, in bytes. */
 };
 
 /**
@@ -168,8 +168,8 @@ struct mqtt_utf8 {
 
 /** @brief Abstracts binary strings. */
 struct mqtt_binstr {
-	u8_t *data;             /**< Pointer to binary stream. */
-	u32_t len;              /**< Length of binary stream. */
+	uint8_t *data;             /**< Pointer to binary stream. */
+	uint32_t len;              /**< Length of binary stream. */
 };
 
 /** @brief Abstracts MQTT UTF-8 encoded topic that can be subscribed
@@ -182,7 +182,7 @@ struct mqtt_topic {
 	/** Quality of service requested for the subscription.
 	 *  @ref mqtt_qos for details.
 	 */
-	u8_t qos;
+	uint8_t qos;
 };
 
 /** @brief Parameters for a publish message. */
@@ -197,7 +197,7 @@ struct mqtt_connack_param {
 	 *  the Client and Server have a consistent view about whether there
 	 *  is already stored Session state.
 	 */
-	u8_t session_present_flag;
+	uint8_t session_present_flag;
 
 	/** The appropriate non-zero Connect return code indicates if the Server
 	 *  is unable to process a connection request for some reason.
@@ -207,33 +207,33 @@ struct mqtt_connack_param {
 
 /** @brief Parameters for MQTT publish acknowledgment (PUBACK). */
 struct mqtt_puback_param {
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /** @brief Parameters for MQTT publish receive (PUBREC). */
 struct mqtt_pubrec_param {
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /** @brief Parameters for MQTT publish release (PUBREL). */
 struct mqtt_pubrel_param {
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /** @brief Parameters for MQTT publish complete (PUBCOMP). */
 struct mqtt_pubcomp_param {
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /** @brief Parameters for MQTT subscription acknowledgment (SUBACK). */
 struct mqtt_suback_param {
-	u16_t message_id;
+	uint16_t message_id;
 	struct mqtt_binstr return_codes;
 };
 
 /** @brief Parameters for MQTT unsubscribe acknowledgment (UNSUBACK). */
 struct mqtt_unsuback_param {
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /** @brief Parameters for a publish message. */
@@ -244,17 +244,17 @@ struct mqtt_publish_param {
 	struct mqtt_publish_message message;
 
 	/** Message id used for the publish message. Redundant for QoS 0. */
-	u16_t message_id;
+	uint16_t message_id;
 
 	/** Duplicate flag. If 1, it indicates the message is being
 	 *  retransmitted. Has no meaning with QoS 0.
 	 */
-	u8_t dup_flag : 1;
+	uint8_t dup_flag : 1;
 
 	/** Retain flag. If 1, the message shall be stored persistently
 	 *  by the broker.
 	 */
-	u8_t retain_flag : 1;
+	uint8_t retain_flag : 1;
 };
 
 /** @brief List of topics in a subscription request. */
@@ -263,10 +263,10 @@ struct mqtt_subscription_list {
 	struct mqtt_topic *list;
 
 	/** Number of topics in the subscription list */
-	u16_t list_count;
+	uint16_t list_count;
 
 	/** Message id used to identify subscription request. */
-	u16_t message_id;
+	uint16_t message_id;
 };
 
 /**
@@ -337,7 +337,7 @@ struct mqtt_sec_config {
 	int peer_verify;
 
 	/** Indicates the number of entries in the cipher list. */
-	u32_t cipher_count;
+	uint32_t cipher_count;
 
 	/** Indicates the list of ciphers to be used for the session.
 	 *  May be NULL to use the default ciphers.
@@ -345,7 +345,7 @@ struct mqtt_sec_config {
 	int *cipher_list;
 
 	/** Indicates the number of entries in the sec tag list. */
-	u32_t sec_tag_count;
+	uint32_t sec_tag_count;
 
 	/** Indicates the list of security tags to be used for the session. */
 	sec_tag_t *sec_tag_list;
@@ -420,7 +420,7 @@ struct mqtt_transport {
 		int sock;
 
 		/** Websocket timeout, in milliseconds. */
-		s32_t timeout;
+		int32_t timeout;
 	} websocket;
 #endif
 
@@ -440,16 +440,16 @@ struct mqtt_internal {
 	/** Internal. Wall clock value (in milliseconds) of the last activity
 	 *  that occurred. Needed for periodic PING.
 	 */
-	u32_t last_activity;
+	uint32_t last_activity;
 
 	/** Internal. Client's state in the connection. */
-	u32_t state;
+	uint32_t state;
 
 	/** Internal.  Packet length read so far. */
-	u32_t rx_buf_datalen;
+	uint32_t rx_buf_datalen;
 
 	/** Internal. Remaining payload length to read. */
-	u32_t remaining_payload;
+	uint32_t remaining_payload;
 };
 
 /**
@@ -495,36 +495,36 @@ struct mqtt_client {
 	mqtt_evt_cb_t evt_cb;
 
 	/** Receive buffer used for MQTT packet reception in RX path. */
-	u8_t *rx_buf;
+	uint8_t *rx_buf;
 
 	/** Size of receive buffer. */
-	u32_t rx_buf_size;
+	uint32_t rx_buf_size;
 
 	/** Transmit buffer used for creating MQTT packet in TX path. */
-	u8_t *tx_buf;
+	uint8_t *tx_buf;
 
 	/** Size of transmit buffer. */
-	u32_t tx_buf_size;
+	uint32_t tx_buf_size;
 
 	/** Keepalive interval for this client in seconds.
 	 *  Default is CONFIG_MQTT_KEEPALIVE.
 	 */
-	u16_t keepalive;
+	uint16_t keepalive;
 
 	/** MQTT protocol version. */
-	u8_t protocol_version;
+	uint8_t protocol_version;
 
 	/** Unanswered PINGREQ count on this connection. */
-	s8_t unacked_ping;
+	int8_t unacked_ping;
 
 	/** Will retain flag, 1 if will message shall be retained persistently.
 	 */
-	u8_t will_retain : 1;
+	uint8_t will_retain : 1;
 
 	/** Clean session flag indicating a fresh (1) or a retained session (0).
 	 *  Default is 1.
 	 */
-	u8_t clean_session : 1;
+	uint8_t clean_session : 1;
 };
 
 /**
@@ -732,7 +732,7 @@ int mqtt_live(struct mqtt_client *client);
  *         be sent. Function will return UINT32_MAX if keep alive messages are
  *         not enabled.
  */
-u32_t mqtt_keepalive_time_left(const struct mqtt_client *client);
+uint32_t mqtt_keepalive_time_left(const struct mqtt_client *client);
 
 /**
  * @brief Receive an incoming MQTT packet. The registered callback will be
@@ -795,7 +795,7 @@ int mqtt_read_publish_payload_blocking(struct mqtt_client *client, void *buffer,
  * @return 0 if success, otherwise a negative error code (errno.h) indicating
  *         reason of failure.
  */
-int mqtt_readall_publish_payload(struct mqtt_client *client, u8_t *buffer,
+int mqtt_readall_publish_payload(struct mqtt_client *client, uint8_t *buffer,
 				 size_t length);
 
 #ifdef __cplusplus
diff --git a/include/net/net_config.h b/include/net/net_config.h
index 32effcc021..be6d214edf 100644
--- a/include/net/net_config.h
+++ b/include/net/net_config.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * @return 0 if ok, <0 if error.
  */
-int net_config_init(const char *app_info, u32_t flags, s32_t timeout);
+int net_config_init(const char *app_info, uint32_t flags, int32_t timeout);
 
 /**
  * @}
diff --git a/include/net/net_context.h b/include/net/net_context.h
index 9d8d39b1ca..e5c4dc29dc 100644
--- a/include/net/net_context.h
+++ b/include/net/net_context.h
@@ -296,7 +296,7 @@ __net_socket struct net_context {
 	struct {
 #if defined(CONFIG_NET_CONTEXT_PRIORITY)
 		/** Priority of the network data sent via this net_context */
-		u8_t priority;
+		uint8_t priority;
 #endif
 #if defined(CONFIG_NET_CONTEXT_TIMESTAMP)
 		bool timestamp;
@@ -313,18 +313,18 @@ __net_socket struct net_context {
 	} options;
 
 	/** Protocol (UDP, TCP or IEEE 802.3 protocol value) */
-	u16_t proto;
+	uint16_t proto;
 
 	/** Flags for the context */
-	u16_t flags;
+	uint16_t flags;
 
 	/** Network interface assigned to this context */
-	s8_t iface;
+	int8_t iface;
 
 	/** IPv6 hop limit or IPv4 ttl for packets sent via this context. */
 	union {
-		u8_t ipv6_hop_limit;
-		u8_t ipv4_ttl;
+		uint8_t ipv6_hop_limit;
+		uint8_t ipv4_ttl;
 	};
 
 #if defined(CONFIG_SOCKS)
@@ -473,7 +473,7 @@ static inline sa_family_t net_context_get_family(struct net_context *context)
 static inline void net_context_set_family(struct net_context *context,
 					  sa_family_t family)
 {
-	u8_t flag = 0U;
+	uint8_t flag = 0U;
 
 	NET_ASSERT(context);
 
@@ -516,7 +516,7 @@ enum net_sock_type net_context_get_type(struct net_context *context)
 static inline void net_context_set_type(struct net_context *context,
 					enum net_sock_type type)
 {
-	u16_t flag = 0U;
+	uint16_t flag = 0U;
 
 	NET_ASSERT(context);
 
@@ -588,7 +588,7 @@ static inline int net_context_get_filter_id(struct net_context *context)
  *
  * @return Network context IP protocol.
  */
-static inline u16_t net_context_get_ip_proto(struct net_context *context)
+static inline uint16_t net_context_get_ip_proto(struct net_context *context)
 {
 	return context->proto;
 }
@@ -604,7 +604,7 @@ static inline u16_t net_context_get_ip_proto(struct net_context *context)
  * protocol value)
  */
 static inline void net_context_set_ip_proto(struct net_context *context,
-					    u16_t proto)
+					    uint16_t proto)
 {
 	context->proto = proto;
 }
@@ -643,24 +643,24 @@ static inline void net_context_set_iface(struct net_context *context,
 	context->iface = net_if_get_by_iface(iface);
 }
 
-static inline u8_t net_context_get_ipv4_ttl(struct net_context *context)
+static inline uint8_t net_context_get_ipv4_ttl(struct net_context *context)
 {
 	return context->ipv4_ttl;
 }
 
 static inline void net_context_set_ipv4_ttl(struct net_context *context,
-					    u8_t ttl)
+					    uint8_t ttl)
 {
 	context->ipv4_ttl = ttl;
 }
 
-static inline u8_t net_context_get_ipv6_hop_limit(struct net_context *context)
+static inline uint8_t net_context_get_ipv6_hop_limit(struct net_context *context)
 {
 	return context->ipv6_hop_limit;
 }
 
 static inline void net_context_set_ipv6_hop_limit(struct net_context *context,
-						  u8_t hop_limit)
+						  uint8_t hop_limit)
 {
 	context->ipv6_hop_limit = hop_limit;
 }
@@ -709,7 +709,7 @@ static inline bool net_context_is_proxy_enabled(struct net_context *context)
  */
 int net_context_get(sa_family_t family,
 		    enum net_sock_type type,
-		    u16_t ip_proto,
+		    uint16_t ip_proto,
 		    struct net_context **context);
 
 /**
@@ -1042,7 +1042,7 @@ int net_context_recv(struct net_context *context,
  * @return 0 if ok, < 0 if error
  */
 int net_context_update_recv_wnd(struct net_context *context,
-				s32_t delta);
+				int32_t delta);
 
 enum net_context_option {
 	NET_OPT_PRIORITY	= 1,
diff --git a/include/net/net_event.h b/include/net/net_event.h
index 46ae0b08b7..0a25646e52 100644
--- a/include/net/net_event.h
+++ b/include/net/net_event.h
@@ -215,7 +215,7 @@ struct net_event_ipv6_nbr {
 struct net_event_ipv6_route {
 	struct in6_addr nexthop;
 	struct in6_addr addr; /* addr/prefix */
-	u8_t prefix_len;
+	uint8_t prefix_len;
 };
 
 #endif /* CONFIG_NET_MGMT_EVENT_INFO */
diff --git a/include/net/net_if.h b/include/net/net_if.h
index 060c33047f..22dd69cf02 100644
--- a/include/net/net_if.h
+++ b/include/net/net_if.h
@@ -57,7 +57,7 @@ struct net_if_addr {
 #if defined(CONFIG_NET_IPV6_DAD) && defined(CONFIG_NET_NATIVE_IPV6)
 	/** Duplicate address detection (DAD) timer */
 	sys_snode_t dad_node;
-	u32_t dad_start;
+	uint32_t dad_start;
 #endif
 	/** How the IP address was set */
 	enum net_addr_type addr_type;
@@ -67,19 +67,19 @@ struct net_if_addr {
 
 #if defined(CONFIG_NET_IPV6_DAD) && defined(CONFIG_NET_NATIVE_IPV6)
 	/** How many times we have done DAD */
-	u8_t dad_count;
+	uint8_t dad_count;
 #endif
 
 	/** Is the IP address valid forever */
-	u8_t is_infinite : 1;
+	uint8_t is_infinite : 1;
 
 	/** Is this IP address used or not */
-	u8_t is_used : 1;
+	uint8_t is_used : 1;
 
 	/** Is this IP address usage limited to the subnet (mesh) or not */
-	u8_t is_mesh_local : 1;
+	uint8_t is_mesh_local : 1;
 
-	u8_t _unused : 5;
+	uint8_t _unused : 5;
 };
 
 /**
@@ -92,12 +92,12 @@ struct net_if_mcast_addr {
 	struct net_addr address;
 
 	/** Is this multicast IP address used or not */
-	u8_t is_used : 1;
+	uint8_t is_used : 1;
 
 	/** Did we join to this group */
-	u8_t is_joined : 1;
+	uint8_t is_joined : 1;
 
-	u8_t _unused : 6;
+	uint8_t _unused : 6;
 };
 
 /**
@@ -116,15 +116,15 @@ struct net_if_ipv6_prefix {
 	struct net_if *iface;
 
 	/** Prefix length */
-	u8_t len;
+	uint8_t len;
 
 	/** Is the IP prefix valid forever */
-	u8_t is_infinite : 1;
+	uint8_t is_infinite : 1;
 
 	/** Is this prefix used or not */
-	u8_t is_used : 1;
+	uint8_t is_used : 1;
 
-	u8_t _unused : 6;
+	uint8_t _unused : 6;
 };
 
 /**
@@ -143,21 +143,21 @@ struct net_if_router {
 	struct net_if *iface;
 
 	/** Router life timer start */
-	u32_t life_start;
+	uint32_t life_start;
 
 	/** Router lifetime */
-	u16_t lifetime;
+	uint16_t lifetime;
 
 	/** Is this router used or not */
-	u8_t is_used : 1;
+	uint8_t is_used : 1;
 
 	/** Is default router */
-	u8_t is_default : 1;
+	uint8_t is_default : 1;
 
 	/** Is the router valid forever */
-	u8_t is_infinite : 1;
+	uint8_t is_infinite : 1;
 
-	u8_t _unused : 5;
+	uint8_t _unused : 5;
 };
 
 /*
@@ -230,26 +230,26 @@ struct net_if_ipv6 {
 	struct net_if_ipv6_prefix prefix[NET_IF_MAX_IPV6_PREFIX];
 
 	/** Default reachable time (RFC 4861, page 52) */
-	u32_t base_reachable_time;
+	uint32_t base_reachable_time;
 
 	/** Reachable time (RFC 4861, page 20) */
-	u32_t reachable_time;
+	uint32_t reachable_time;
 
 	/** Retransmit timer (RFC 4861, page 52) */
-	u32_t retrans_timer;
+	uint32_t retrans_timer;
 #if defined(CONFIG_NET_IPV6_ND) && defined(CONFIG_NET_NATIVE_IPV6)
 	/** Router solicitation timer node */
 	sys_snode_t rs_node;
 
 	/* RS start time */
-	u32_t rs_start;
+	uint32_t rs_start;
 
 	/** RS count */
-	u8_t rs_count;
+	uint8_t rs_count;
 #endif
 
 	/** IPv6 hop limit */
-	u8_t hop_limit;
+	uint8_t hop_limit;
 };
 
 /** @cond INTERNAL_HIDDEN */
@@ -276,7 +276,7 @@ struct net_if_ipv4 {
 	struct in_addr netmask;
 
 	/** IPv4 time-to-live */
-	u8_t ttl;
+	uint8_t ttl;
 };
 
 #if defined(CONFIG_NET_DHCPV4) && defined(CONFIG_NET_NATIVE_IPV4)
@@ -285,21 +285,21 @@ struct net_if_dhcpv4 {
 	sys_snode_t node;
 
 	/** Timer start */
-	s64_t timer_start;
+	int64_t timer_start;
 
 	/** Time for INIT, DISCOVER, REQUESTING, RENEWAL */
-	u32_t request_time;
+	uint32_t request_time;
 
-	u32_t xid;
+	uint32_t xid;
 
 	/** IP address Lease time */
-	u32_t lease_time;
+	uint32_t lease_time;
 
 	/** IP address Renewal time */
-	u32_t renewal_time;
+	uint32_t renewal_time;
 
 	/** IP address Rebinding time */
-	u32_t rebinding_time;
+	uint32_t rebinding_time;
 
 	/** Server ID */
 	struct in_addr server_id;
@@ -314,7 +314,7 @@ struct net_if_dhcpv4 {
 	enum net_dhcpv4_state state;
 
 	/** Number of attempts made for REQUEST and RENEWAL messages */
-	u8_t attempts;
+	uint8_t attempts;
 };
 #endif /* CONFIG_NET_DHCPV4 */
 
@@ -327,10 +327,10 @@ struct net_if_ipv4_autoconf {
 	struct net_if *iface;
 
 	/** Timer start */
-	s64_t timer_start;
+	int64_t timer_start;
 
 	/** Time for INIT, DISCOVER, REQUESTING, RENEWAL */
-	u32_t timer_timeout;
+	uint32_t timer_timeout;
 
 	/** Current IP addr */
 	struct in_addr current_ip;
@@ -343,13 +343,13 @@ struct net_if_ipv4_autoconf {
 	enum net_ipv4_autoconf_state state;
 
 	/** Number of sent probe requests */
-	u8_t probe_cnt;
+	uint8_t probe_cnt;
 
 	/** Number of sent announcements */
-	u8_t announce_cnt;
+	uint8_t announce_cnt;
 
 	/** Incoming conflict count */
-	u8_t conflict_cnt;
+	uint8_t conflict_cnt;
 };
 #endif /* CONFIG_NET_IPV4_AUTO */
 
@@ -446,7 +446,7 @@ struct net_if_dev {
 #endif /* CONFIG_NET_OFFLOAD */
 
 	/** The hardware MTU */
-	u16_t mtu;
+	uint16_t mtu;
 
 #if defined(CONFIG_NET_SOCKETS_OFFLOAD)
 	/** Indicate whether interface is offloaded at socket level. */
@@ -726,7 +726,7 @@ static inline void net_if_stop_rs(struct net_if *iface)
  * @brief Set a network interface's link address
  *
  * @param iface Pointer to a network interface structure
- * @param addr A pointer to a u8_t buffer representing the address. The buffer
+ * @param addr A pointer to a uint8_t buffer representing the address. The buffer
  *             must remain valid throughout interface lifetime.
  * @param len length of the address buffer
  * @param type network bearer type of this link address
@@ -734,7 +734,7 @@ static inline void net_if_stop_rs(struct net_if *iface)
  * @return 0 on success
  */
 static inline int net_if_set_link_addr(struct net_if *iface,
-				       u8_t *addr, u8_t len,
+				       uint8_t *addr, uint8_t len,
 				       enum net_link_type type)
 {
 	if (net_if_flag_is_set(iface, NET_IF_UP)) {
@@ -757,7 +757,7 @@ static inline int net_if_set_link_addr(struct net_if *iface,
  *
  * @return the MTU
  */
-static inline u16_t net_if_get_mtu(struct net_if *iface)
+static inline uint16_t net_if_get_mtu(struct net_if *iface)
 {
 	return iface->if_dev->mtu;
 }
@@ -769,7 +769,7 @@ static inline u16_t net_if_get_mtu(struct net_if *iface)
  * @param mtu New MTU, note that we store only 16 bit mtu value.
  */
 static inline void net_if_set_mtu(struct net_if *iface,
-				  u16_t mtu)
+				  uint16_t mtu)
 {
 	iface->if_dev->mtu = mtu;
 }
@@ -925,7 +925,7 @@ __syscall int net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr);
 struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 					 struct in6_addr *addr,
 					 enum net_addr_type addr_type,
-					 u32_t vlifetime);
+					 uint32_t vlifetime);
 
 /**
  * @brief Add a IPv6 address to an interface by index
@@ -940,7 +940,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 __syscall bool net_if_ipv6_addr_add_by_index(int index,
 					     struct in6_addr *addr,
 					     enum net_addr_type addr_type,
-					     u32_t vlifetime);
+					     uint32_t vlifetime);
 
 /**
  * @brief Update validity lifetime time of an IPv6 address.
@@ -949,7 +949,7 @@ __syscall bool net_if_ipv6_addr_add_by_index(int index,
  * @param vlifetime Validity time for this address
  */
 void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr,
-				      u32_t vlifetime);
+				      uint32_t vlifetime);
 
 /**
  * @brief Remove an IPv6 address from an interface
@@ -1129,7 +1129,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface,
  */
 struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface,
 						     struct in6_addr *addr,
-						     u8_t len);
+						     uint8_t len);
 
 /**
  * @brief Add a IPv6 prefix to an network interface.
@@ -1143,8 +1143,8 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface,
  */
 struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,
 						  struct in6_addr *prefix,
-						  u8_t len,
-						  u32_t lifetime);
+						  uint8_t len,
+						  uint32_t lifetime);
 
 /**
  * @brief Remove an IPv6 prefix from an interface
@@ -1156,7 +1156,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,
  * @return True if successfully removed, false otherwise
  */
 bool net_if_ipv6_prefix_rm(struct net_if *iface, struct in6_addr *addr,
-			   u8_t len);
+			   uint8_t len);
 
 /**
  * @brief Set the infinite status of the prefix
@@ -1177,7 +1177,7 @@ static inline void net_if_ipv6_prefix_set_lf(struct net_if_ipv6_prefix *prefix,
  * @param lifetime Prefix lifetime in seconds
  */
 void net_if_ipv6_prefix_set_timer(struct net_if_ipv6_prefix *prefix,
-				  u32_t lifetime);
+				  uint32_t lifetime);
 
 /**
  * @brief Unset the prefix lifetime timer.
@@ -1251,7 +1251,7 @@ struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface,
  * @param lifetime Lifetime of this router.
  */
 void net_if_ipv6_router_update_lifetime(struct net_if_router *router,
-					u16_t lifetime);
+					uint16_t lifetime);
 
 /**
  * @brief Add IPv6 router to the system.
@@ -1264,7 +1264,7 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router,
  */
 struct net_if_router *net_if_ipv6_router_add(struct net_if *iface,
 					     struct in6_addr *addr,
-					     u16_t router_lifetime);
+					     uint16_t router_lifetime);
 
 /**
  * @brief Remove IPv6 router from the system.
@@ -1283,7 +1283,7 @@ bool net_if_ipv6_router_rm(struct net_if_router *router);
  *
  * @return Hop limit
  */
-static inline u8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
+static inline uint8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1303,7 +1303,7 @@ static inline u8_t net_if_ipv6_get_hop_limit(struct net_if *iface)
  * @param hop_limit New hop limit
  */
 static inline void net_ipv6_set_hop_limit(struct net_if *iface,
-					  u8_t hop_limit)
+					  uint8_t hop_limit)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1321,7 +1321,7 @@ static inline void net_ipv6_set_hop_limit(struct net_if *iface,
  * @param reachable_time New reachable time
  */
 static inline void net_if_ipv6_set_base_reachable_time(struct net_if *iface,
-						       u32_t reachable_time)
+						       uint32_t reachable_time)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1339,7 +1339,7 @@ static inline void net_if_ipv6_set_base_reachable_time(struct net_if *iface,
  *
  * @return Reachable timeout
  */
-static inline u32_t net_if_ipv6_get_reachable_time(struct net_if *iface)
+static inline uint32_t net_if_ipv6_get_reachable_time(struct net_if *iface)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1359,7 +1359,7 @@ static inline u32_t net_if_ipv6_get_reachable_time(struct net_if *iface)
  *
  * @return Reachable time
  */
-u32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6);
+uint32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6);
 
 /**
  * @brief Set IPv6 reachable time for a given interface. This requires
@@ -1381,7 +1381,7 @@ static inline void net_if_ipv6_set_reachable_time(struct net_if_ipv6 *ipv6)
  * @param retrans_timer New retransmit timer
  */
 static inline void net_if_ipv6_set_retrans_timer(struct net_if *iface,
-						 u32_t retrans_timer)
+						 uint32_t retrans_timer)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1399,7 +1399,7 @@ static inline void net_if_ipv6_set_retrans_timer(struct net_if *iface,
  *
  * @return Retransmit timer
  */
-static inline u32_t net_if_ipv6_get_retrans_timer(struct net_if *iface)
+static inline uint32_t net_if_ipv6_get_retrans_timer(struct net_if *iface)
 {
 #if defined(CONFIG_NET_NATIVE_IPV6)
 	if (!iface->config.ip.ipv6) {
@@ -1534,7 +1534,7 @@ int net_if_config_ipv4_put(struct net_if *iface);
  *
  * @return Time-to-live
  */
-static inline u8_t net_if_ipv4_get_ttl(struct net_if *iface)
+static inline uint8_t net_if_ipv4_get_ttl(struct net_if *iface)
 {
 #if defined(CONFIG_NET_NATIVE_IPV4)
 	if (!iface->config.ip.ipv4) {
@@ -1571,7 +1571,7 @@ struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr,
 struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,
 					 struct in_addr *addr,
 					 enum net_addr_type addr_type,
-					 u32_t vlifetime);
+					 uint32_t vlifetime);
 
 /**
  * @brief Remove a IPv4 address from an interface
@@ -1606,7 +1606,7 @@ __syscall int net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr);
 __syscall bool net_if_ipv4_addr_add_by_index(int index,
 					     struct in_addr *addr,
 					     enum net_addr_type addr_type,
-					     u32_t vlifetime);
+					     uint32_t vlifetime);
 
 /**
  * @brief Remove a IPv4 address from an interface by interface index
@@ -1711,7 +1711,7 @@ struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
 struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
 					     struct in_addr *addr,
 					     bool is_default,
-					     u16_t router_lifetime);
+					     uint16_t router_lifetime);
 
 /**
  * @brief Remove IPv4 router from the system.
diff --git a/include/net/net_ip.h b/include/net/net_ip.h
index 256e01a7e2..0a2ea18292 100644
--- a/include/net/net_ip.h
+++ b/include/net/net_ip.h
@@ -136,19 +136,19 @@ enum net_sock_type {
 /** IPv6 address struct */
 struct in6_addr {
 	union {
-		u8_t s6_addr[16];
-		u16_t s6_addr16[8]; /* In big endian */
-		u32_t s6_addr32[4]; /* In big endian */
+		uint8_t s6_addr[16];
+		uint16_t s6_addr16[8]; /* In big endian */
+		uint32_t s6_addr32[4]; /* In big endian */
 	};
 };
 
 /** IPv4 address struct */
 struct in_addr {
 	union {
-		u8_t s4_addr[4];
-		u16_t s4_addr16[2]; /* In big endian */
-		u32_t s4_addr32[1]; /* In big endian */
-		u32_t s_addr; /* In big endian, for POSIX compatibility. */
+		uint8_t s4_addr[4];
+		uint16_t s4_addr16[2]; /* In big endian */
+		uint32_t s4_addr32[1]; /* In big endian */
+		uint32_t s_addr; /* In big endian, for POSIX compatibility. */
 	};
 };
 
@@ -166,50 +166,50 @@ typedef size_t socklen_t;
 /** Socket address struct for IPv6. */
 struct sockaddr_in6 {
 	sa_family_t		sin6_family;   /* AF_INET6               */
-	u16_t			sin6_port;     /* Port number            */
+	uint16_t			sin6_port;     /* Port number            */
 	struct in6_addr		sin6_addr;     /* IPv6 address           */
-	u8_t			sin6_scope_id; /* interfaces for a scope */
+	uint8_t			sin6_scope_id; /* interfaces for a scope */
 };
 
 struct sockaddr_in6_ptr {
 	sa_family_t		sin6_family;   /* AF_INET6               */
-	u16_t			sin6_port;     /* Port number            */
+	uint16_t			sin6_port;     /* Port number            */
 	struct in6_addr		*sin6_addr;    /* IPv6 address           */
-	u8_t			sin6_scope_id; /* interfaces for a scope */
+	uint8_t			sin6_scope_id; /* interfaces for a scope */
 };
 
 /** Socket address struct for IPv4. */
 struct sockaddr_in {
 	sa_family_t		sin_family;    /* AF_INET      */
-	u16_t			sin_port;      /* Port number  */
+	uint16_t			sin_port;      /* Port number  */
 	struct in_addr		sin_addr;      /* IPv4 address */
 };
 
 struct sockaddr_in_ptr {
 	sa_family_t		sin_family;    /* AF_INET      */
-	u16_t			sin_port;      /* Port number  */
+	uint16_t			sin_port;      /* Port number  */
 	struct in_addr		*sin_addr;     /* IPv4 address */
 };
 
 /** Socket address struct for packet socket. */
 struct sockaddr_ll {
 	sa_family_t sll_family;   /* Always AF_PACKET        */
-	u16_t       sll_protocol; /* Physical-layer protocol */
+	uint16_t       sll_protocol; /* Physical-layer protocol */
 	int         sll_ifindex;  /* Interface number        */
-	u16_t       sll_hatype;   /* ARP hardware type       */
-	u8_t        sll_pkttype;  /* Packet type             */
-	u8_t        sll_halen;    /* Length of address       */
-	u8_t        sll_addr[8];  /* Physical-layer address  */
+	uint16_t       sll_hatype;   /* ARP hardware type       */
+	uint8_t        sll_pkttype;  /* Packet type             */
+	uint8_t        sll_halen;    /* Length of address       */
+	uint8_t        sll_addr[8];  /* Physical-layer address  */
 };
 
 struct sockaddr_ll_ptr {
 	sa_family_t sll_family;   /* Always AF_PACKET        */
-	u16_t       sll_protocol; /* Physical-layer protocol */
+	uint16_t       sll_protocol; /* Physical-layer protocol */
 	int         sll_ifindex;  /* Interface number        */
-	u16_t       sll_hatype;   /* ARP hardware type       */
-	u8_t        sll_pkttype;  /* Packet type             */
-	u8_t        sll_halen;    /* Length of address       */
-	u8_t        *sll_addr;    /* Physical-layer address  */
+	uint16_t       sll_hatype;   /* ARP hardware type       */
+	uint8_t        sll_pkttype;  /* Packet type             */
+	uint8_t        sll_halen;    /* Length of address       */
+	uint8_t        *sll_addr;    /* Physical-layer address  */
 };
 
 struct sockaddr_can_ptr {
@@ -260,16 +260,16 @@ struct cmsghdr {
 #if !defined(CMSG_NXTHDR)
 #define CMSG_NXTHDR(msghdr, cmsg)					 \
 	(((cmsg) == NULL) ? CMSG_FIRSTHDR(msghdr) :			 \
-	 (((u8_t *)(cmsg) + ALIGN_H((cmsg)->cmsg_len)	+		 \
+	 (((uint8_t *)(cmsg) + ALIGN_H((cmsg)->cmsg_len)	+		 \
 	   ALIGN_D(sizeof(struct cmsghdr)) >				 \
-	   (u8_t *)((msghdr)->msg_control) + (msghdr)->msg_controllen) ? \
+	   (uint8_t *)((msghdr)->msg_control) + (msghdr)->msg_controllen) ? \
 	  NULL :							 \
-	  (struct cmsghdr *)((u8_t *)(cmsg) +				 \
+	  (struct cmsghdr *)((uint8_t *)(cmsg) +				 \
 			     ALIGN_H((cmsg)->cmsg_len))))
 #endif
 
 #if !defined(CMSG_DATA)
-#define CMSG_DATA(cmsg) ((u8_t *)(cmsg) + ALIGN_D(sizeof(struct cmsghdr)))
+#define CMSG_DATA(cmsg) ((uint8_t *)(cmsg) + ALIGN_D(sizeof(struct cmsghdr)))
 #endif
 
 #if !defined(CMSG_SPACE)
@@ -415,8 +415,8 @@ enum net_priority {
 struct net_tuple {
 	struct net_addr *remote_addr;  /**< IPv6/IPv4 remote address */
 	struct net_addr *local_addr;   /**< IPv6/IPv4 local address  */
-	u16_t remote_port;             /**< UDP/TCP remote port      */
-	u16_t local_port;              /**< UDP/TCP local port       */
+	uint16_t remote_port;             /**< UDP/TCP remote port      */
+	uint16_t local_port;              /**< UDP/TCP local port       */
 	enum net_ip_protocol ip_proto; /**< IP protocol              */
 };
 
@@ -445,60 +445,60 @@ enum net_addr_type {
 /** @cond INTERNAL_HIDDEN */
 
 struct net_ipv6_hdr {
-	u8_t vtc;
-	u8_t tcflow;
-	u16_t flow;
-	u16_t len;
-	u8_t nexthdr;
-	u8_t hop_limit;
+	uint8_t vtc;
+	uint8_t tcflow;
+	uint16_t flow;
+	uint16_t len;
+	uint8_t nexthdr;
+	uint8_t hop_limit;
 	struct in6_addr src;
 	struct in6_addr dst;
 } __packed;
 
 struct net_ipv6_frag_hdr {
-	u8_t nexthdr;
-	u8_t reserved;
-	u16_t offset;
-	u32_t id;
+	uint8_t nexthdr;
+	uint8_t reserved;
+	uint16_t offset;
+	uint32_t id;
 } __packed;
 
 struct net_ipv4_hdr {
-	u8_t vhl;
-	u8_t tos;
-	u16_t len;
-	u8_t id[2];
-	u8_t offset[2];
-	u8_t ttl;
-	u8_t proto;
-	u16_t chksum;
+	uint8_t vhl;
+	uint8_t tos;
+	uint16_t len;
+	uint8_t id[2];
+	uint8_t offset[2];
+	uint8_t ttl;
+	uint8_t proto;
+	uint16_t chksum;
 	struct in_addr src;
 	struct in_addr dst;
 } __packed;
 
 struct net_icmp_hdr {
-	u8_t type;
-	u8_t code;
-	u16_t chksum;
+	uint8_t type;
+	uint8_t code;
+	uint16_t chksum;
 } __packed;
 
 struct net_udp_hdr {
-	u16_t src_port;
-	u16_t dst_port;
-	u16_t len;
-	u16_t chksum;
+	uint16_t src_port;
+	uint16_t dst_port;
+	uint16_t len;
+	uint16_t chksum;
 } __packed;
 
 struct net_tcp_hdr {
-	u16_t src_port;
-	u16_t dst_port;
-	u8_t seq[4];
-	u8_t ack[4];
-	u8_t offset;
-	u8_t flags;
-	u8_t wnd[2];
-	u16_t chksum;
-	u8_t urg[2];
-	u8_t optdata[0];
+	uint16_t src_port;
+	uint16_t dst_port;
+	uint8_t seq[4];
+	uint8_t ack[4];
+	uint8_t offset;
+	uint8_t flags;
+	uint8_t wnd[2];
+	uint16_t chksum;
+	uint8_t urg[2];
+	uint8_t optdata[0];
 } __packed;
 
 static inline const char *net_addr_type2str(enum net_addr_type type)
@@ -630,14 +630,14 @@ static inline bool net_ipv6_is_my_maddr(struct in6_addr *maddr)
  *
  * @return True if IPv6 prefixes are the same, False otherwise.
  */
-static inline bool net_ipv6_is_prefix(const u8_t *addr1,
-				      const u8_t *addr2,
-				      u8_t length)
+static inline bool net_ipv6_is_prefix(const uint8_t *addr1,
+				      const uint8_t *addr2,
+				      uint8_t length)
 {
-	u8_t bits = 128 - length;
-	u8_t bytes = length / 8U;
-	u8_t remain = bits % 8;
-	u8_t mask;
+	uint8_t bits = 128 - length;
+	uint8_t bytes = length / 8U;
+	uint8_t remain = bits % 8;
+	uint8_t mask;
 
 	if (length > 128) {
 		return false;
@@ -1016,10 +1016,10 @@ void net_ipv6_addr_create_solicited_node(const struct in6_addr *src,
  *  @param addr7 16-bit word which is part of the address
  */
 static inline void net_ipv6_addr_create(struct in6_addr *addr,
-					u16_t addr0, u16_t addr1,
-					u16_t addr2, u16_t addr3,
-					u16_t addr4, u16_t addr5,
-					u16_t addr6, u16_t addr7)
+					uint16_t addr0, uint16_t addr1,
+					uint16_t addr2, uint16_t addr3,
+					uint16_t addr4, uint16_t addr5,
+					uint16_t addr6, uint16_t addr7)
 {
 	UNALIGNED_PUT(htons(addr0), &addr->s6_addr16[0]);
 	UNALIGNED_PUT(htons(addr1), &addr->s6_addr16[1]);
@@ -1310,9 +1310,9 @@ bool net_ipaddr_parse(const char *str, size_t str_len,
  *
  * @return < 0 if seq1 < seq2, 0 if seq1 == seq2, > 0 if seq > seq2
  */
-static inline s32_t net_tcp_seq_cmp(u32_t seq1, u32_t seq2)
+static inline int32_t net_tcp_seq_cmp(uint32_t seq1, uint32_t seq2)
 {
-	return (s32_t)(seq1 - seq2);
+	return (int32_t)(seq1 - seq2);
 }
 
 /**
@@ -1325,7 +1325,7 @@ static inline s32_t net_tcp_seq_cmp(u32_t seq1, u32_t seq2)
  *
  * @return True if seq > seq2
  */
-static inline bool net_tcp_seq_greater(u32_t seq1, u32_t seq2)
+static inline bool net_tcp_seq_greater(uint32_t seq1, uint32_t seq2)
 {
 	return net_tcp_seq_cmp(seq1, seq2) > 0;
 }
@@ -1341,7 +1341,7 @@ static inline bool net_tcp_seq_greater(u32_t seq1, u32_t seq2)
  *
  * @return 0 if ok, <0 if error
  */
-int net_bytes_from_str(u8_t *buf, int buf_len, const char *src);
+int net_bytes_from_str(uint8_t *buf, int buf_len, const char *src);
 
 /**
  * @brief Convert Tx network packet priority to traffic class so we can place
@@ -1371,10 +1371,10 @@ int net_rx_priority2tc(enum net_priority prio);
  *
  * @return Network priority
  */
-static inline enum net_priority net_vlan2priority(u8_t priority)
+static inline enum net_priority net_vlan2priority(uint8_t priority)
 {
 	/* Map according to IEEE 802.1Q */
-	static const u8_t vlan2priority[] = {
+	static const uint8_t vlan2priority[] = {
 		NET_PRIORITY_BE,
 		NET_PRIORITY_BK,
 		NET_PRIORITY_EE,
@@ -1400,10 +1400,10 @@ static inline enum net_priority net_vlan2priority(u8_t priority)
  *
  * @return VLAN priority (PCP)
  */
-static inline u8_t net_priority2vlan(enum net_priority priority)
+static inline uint8_t net_priority2vlan(enum net_priority priority)
 {
 	/* The conversion works both ways */
-	return (u8_t)net_vlan2priority(priority);
+	return (uint8_t)net_vlan2priority(priority);
 }
 
 /**
diff --git a/include/net/net_linkaddr.h b/include/net/net_linkaddr.h
index 053afd9de8..e6b0747ce0 100644
--- a/include/net/net_linkaddr.h
+++ b/include/net/net_linkaddr.h
@@ -41,7 +41,7 @@ extern "C" {
 /**
  * Type of the link address. This indicates the network technology that this
  * address is used in. Note that in order to save space we store the value
- * into a u8_t variable, so please do not introduce any values > 255 in
+ * into a uint8_t variable, so please do not introduce any values > 255 in
  * this enum.
  */
 enum net_link_type {
@@ -68,13 +68,13 @@ enum net_link_type {
  */
 struct net_linkaddr {
 	/** The array of byte representing the address */
-	u8_t *addr;
+	uint8_t *addr;
 
 	/** Length of that address array */
-	u8_t len;
+	uint8_t len;
 
 	/** What kind of address is this for */
-	u8_t type;
+	uint8_t type;
 };
 
 /**
@@ -83,19 +83,19 @@ struct net_linkaddr {
  *  Used to hold the link address information. This variant is needed
  *  when we have to store the link layer address.
  *
- *  Note that you cannot cast this to net_linkaddr as u8_t * is
- *  handled differently than u8_t addr[] and the fields are purposely
+ *  Note that you cannot cast this to net_linkaddr as uint8_t * is
+ *  handled differently than uint8_t addr[] and the fields are purposely
  *  in different order.
  */
 struct net_linkaddr_storage {
 	/** What kind of address is this for */
-	u8_t type;
+	uint8_t type;
 
 	/** The real length of the ll address. */
-	u8_t len;
+	uint8_t len;
 
 	/** The array of bytes representing the address */
-	u8_t addr[NET_LINK_ADDR_MAX_LENGTH];
+	uint8_t addr[NET_LINK_ADDR_MAX_LENGTH];
 };
 
 /**
@@ -130,7 +130,7 @@ static inline bool net_linkaddr_cmp(struct net_linkaddr *lladdr1,
  * This value should always be <= NET_LINK_ADDR_MAX_LENGTH.
  */
 static inline int net_linkaddr_set(struct net_linkaddr_storage *lladdr_store,
-				   u8_t *new_addr, u8_t new_len)
+				   uint8_t *new_addr, uint8_t new_len)
 {
 	if (!lladdr_store || !new_addr) {
 		return -EINVAL;
diff --git a/include/net/net_mgmt.h b/include/net/net_mgmt.h
index 9791a2378e..d8208ace4c 100644
--- a/include/net/net_mgmt.h
+++ b/include/net/net_mgmt.h
@@ -85,7 +85,7 @@ struct net_if;
  *        NULL otherwise.
  * @param len Length in byte of the memory pointed by data.
  */
-typedef int (*net_mgmt_request_handler_t)(u32_t mgmt_request,
+typedef int (*net_mgmt_request_handler_t)(uint32_t mgmt_request,
 					  struct net_if *iface,
 					  void *data, size_t len);
 
@@ -93,7 +93,7 @@ typedef int (*net_mgmt_request_handler_t)(u32_t mgmt_request,
 	net_mgmt_##_mgmt_request(_mgmt_request, _iface, _data, _len)
 
 #define NET_MGMT_DEFINE_REQUEST_HANDLER(_mgmt_request)			\
-	extern int net_mgmt_##_mgmt_request(u32_t mgmt_request,	\
+	extern int net_mgmt_##_mgmt_request(uint32_t mgmt_request,	\
 					    struct net_if *iface,	\
 					    void *data, size_t len)
 
@@ -107,12 +107,12 @@ struct net_mgmt_event_callback;
  * @brief Define the user's callback handler function signature
  * @param "struct net_mgmt_event_callback *cb"
  *        Original struct net_mgmt_event_callback owning this handler.
- * @param "u32_t mgmt_event" The network event being notified.
+ * @param "uint32_t mgmt_event" The network event being notified.
  * @param "struct net_if *iface" A pointer on a struct net_if to which the
  *        the event belongs to, if it's an event on an iface. NULL otherwise.
  */
 typedef void (*net_mgmt_event_handler_t)(struct net_mgmt_event_callback *cb,
-					 u32_t mgmt_event,
+					 uint32_t mgmt_event,
 					 struct net_if *iface);
 
 /**
@@ -154,11 +154,11 @@ struct net_mgmt_event_callback {
 		 * matching one to several commands. Layer and layer code will
 		 * be made of an exact match.
 		 */
-		u32_t event_mask;
+		uint32_t event_mask;
 		/** Internal place holder when a synchronous event wait is
 		 * successfully unlocked on a event.
 		 */
-		u32_t raised_event;
+		uint32_t raised_event;
 	};
 };
 
@@ -172,7 +172,7 @@ struct net_mgmt_event_callback {
 static inline
 void net_mgmt_init_event_callback(struct net_mgmt_event_callback *cb,
 				  net_mgmt_event_handler_t handler,
-				  u32_t mgmt_event_mask)
+				  uint32_t mgmt_event_mask)
 {
 	__ASSERT(cb, "Callback pointer should not be NULL");
 	__ASSERT(handler, "Handler pointer should not be NULL");
@@ -218,10 +218,10 @@ void net_mgmt_del_event_callback(struct net_mgmt_event_callback *cb);
  *       is not defined.
  */
 #ifdef CONFIG_NET_MGMT_EVENT
-void net_mgmt_event_notify_with_info(u32_t mgmt_event, struct net_if *iface,
+void net_mgmt_event_notify_with_info(uint32_t mgmt_event, struct net_if *iface,
 				     void *info, size_t length);
 
-static inline void net_mgmt_event_notify(u32_t mgmt_event, struct net_if *iface)
+static inline void net_mgmt_event_notify(uint32_t mgmt_event, struct net_if *iface)
 {
 	net_mgmt_event_notify_with_info(mgmt_event, iface, NULL, 0);
 }
@@ -233,7 +233,7 @@ static inline void net_mgmt_event_notify(u32_t mgmt_event, struct net_if *iface)
 /**
  * @brief Used to wait synchronously on an event mask
  * @param mgmt_event_mask A mask of relevant events to wait on.
- * @param raised_event a pointer on a u32_t to get which event from
+ * @param raised_event a pointer on a uint32_t to get which event from
  *        the mask generated the event. Can be NULL if the caller is not
  *        interested in that information.
  * @param iface a pointer on a place holder for the iface on which the
@@ -251,15 +251,15 @@ static inline void net_mgmt_event_notify(u32_t mgmt_event, struct net_if *iface)
  *         actual event.
  */
 #ifdef CONFIG_NET_MGMT_EVENT
-int net_mgmt_event_wait(u32_t mgmt_event_mask,
-			u32_t *raised_event,
+int net_mgmt_event_wait(uint32_t mgmt_event_mask,
+			uint32_t *raised_event,
 			struct net_if **iface,
 			const void **info,
 			size_t *info_length,
 			k_timeout_t timeout);
 #else
-static inline int net_mgmt_event_wait(u32_t mgmt_event_mask,
-				      u32_t *raised_event,
+static inline int net_mgmt_event_wait(uint32_t mgmt_event_mask,
+				      uint32_t *raised_event,
 				      struct net_if **iface,
 				      const void **info,
 				      size_t *info_length,
@@ -275,7 +275,7 @@ static inline int net_mgmt_event_wait(u32_t mgmt_event_mask,
  * @param mgmt_event_mask A mask of relevant events to wait on. Listened
  *        to events should be relevant to iface events and thus have the bit
  *        NET_MGMT_IFACE_BIT set.
- * @param raised_event a pointer on a u32_t to get which event from
+ * @param raised_event a pointer on a uint32_t to get which event from
  *        the mask generated the event. Can be NULL if the caller is not
  *        interested in that information.
  * @param info a valid pointer if user wants to get the information the
@@ -290,15 +290,15 @@ static inline int net_mgmt_event_wait(u32_t mgmt_event_mask,
  */
 #ifdef CONFIG_NET_MGMT_EVENT
 int net_mgmt_event_wait_on_iface(struct net_if *iface,
-				 u32_t mgmt_event_mask,
-				 u32_t *raised_event,
+				 uint32_t mgmt_event_mask,
+				 uint32_t *raised_event,
 				 const void **info,
 				 size_t *info_length,
 				 k_timeout_t timeout);
 #else
 static inline int net_mgmt_event_wait_on_iface(struct net_if *iface,
-					       u32_t mgmt_event_mask,
-					       u32_t *raised_event,
+					       uint32_t mgmt_event_mask,
+					       uint32_t *raised_event,
 					       const void **info,
 					       size_t *info_length,
 					       k_timeout_t timeout)
diff --git a/include/net/net_offload.h b/include/net/net_offload.h
index a3e509d7bb..9d15bc48b8 100644
--- a/include/net/net_offload.h
+++ b/include/net/net_offload.h
@@ -62,7 +62,7 @@ struct net_offload {
 		       const struct sockaddr *addr,
 		       socklen_t addrlen,
 		       net_context_connect_cb_t cb,
-		       s32_t timeout,
+		       int32_t timeout,
 		       void *user_data);
 
 	/**
@@ -71,7 +71,7 @@ struct net_offload {
 	 */
 	int (*accept)(struct net_context *context,
 		      net_tcp_accept_cb_t cb,
-		      s32_t timeout,
+		      int32_t timeout,
 		      void *user_data);
 
 	/**
@@ -79,7 +79,7 @@ struct net_offload {
 	 */
 	int (*send)(struct net_pkt *pkt,
 		    net_context_send_cb_t cb,
-		    s32_t timeout,
+		    int32_t timeout,
 		    void *user_data);
 
 	/**
@@ -89,7 +89,7 @@ struct net_offload {
 		      const struct sockaddr *dst_addr,
 		      socklen_t addrlen,
 		      net_context_send_cb_t cb,
-		      s32_t timeout,
+		      int32_t timeout,
 		      void *user_data);
 
 	/**
@@ -98,7 +98,7 @@ struct net_offload {
 	 */
 	int (*recv)(struct net_context *context,
 		    net_context_recv_cb_t cb,
-		    s32_t timeout,
+		    int32_t timeout,
 		    void *user_data);
 
 	/**
diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h
index 197965ca59..60f876bdb2 100644
--- a/include/net/net_pkt.h
+++ b/include/net/net_pkt.h
@@ -50,7 +50,7 @@ struct net_pkt_cursor {
 	/** Current net_buf pointer by the cursor */
 	struct net_buf *buf;
 	/** Current position in the data buffer of the net_buf */
-	u8_t *pos;
+	uint8_t *pos;
 };
 
 /**
@@ -117,7 +117,7 @@ struct net_pkt {
 #endif /* CONFIG_NET_PKT_TIMESTAMP */
 #if defined(CONFIG_NET_PKT_TXTIME)
 		/** Network packet TX time in the future (in nanoseconds) */
-		u64_t txtime;
+		uint64_t txtime;
 #endif /* CONFIG_NET_PKT_TXTIME */
 	};
 #endif /* CONFIG_NET_PKT_TIMESTAMP || CONFIG_NET_PKT_TXTIME */
@@ -138,50 +138,50 @@ struct net_pkt {
 	};
 #endif
 
-	u8_t ip_hdr_len;	/* pre-filled in order to avoid func call */
+	uint8_t ip_hdr_len;	/* pre-filled in order to avoid func call */
 
-	u8_t overwrite  : 1;	/* Is packet content being overwritten? */
+	uint8_t overwrite  : 1;	/* Is packet content being overwritten? */
 
-	u8_t sent_or_eof: 1;	/* For outgoing packet: is this sent or not
+	uint8_t sent_or_eof: 1;	/* For outgoing packet: is this sent or not
 				 * For incoming packet of a socket: last
 				 * packet before EOF
 				 * Used only if defined(CONFIG_NET_TCP)
 				 */
 	union {
-		u8_t pkt_queued: 1; /* For outgoing packet: is this packet
+		uint8_t pkt_queued: 1; /* For outgoing packet: is this packet
 				     * queued to be sent but has not reached
 				     * the driver yet.
 				     * Used only if defined(CONFIG_NET_TCP)
 				     */
-		u8_t gptp_pkt: 1; /* For outgoing packet: is this packet
+		uint8_t gptp_pkt: 1; /* For outgoing packet: is this packet
 				   * a GPTP packet.
 				   * Used only if defined (CONFIG_NET_GPTP)
 				   */
 	};
 
-	u8_t forwarding : 1;	/* Are we forwarding this pkt
+	uint8_t forwarding : 1;	/* Are we forwarding this pkt
 				 * Used only if defined(CONFIG_NET_ROUTE)
 				 */
-	u8_t family     : 3;	/* IPv4 vs IPv6 */
+	uint8_t family     : 3;	/* IPv4 vs IPv6 */
 
 	union {
-		u8_t ipv4_auto_arp_msg : 1; /* Is this pkt IPv4 autoconf ARP
+		uint8_t ipv4_auto_arp_msg : 1; /* Is this pkt IPv4 autoconf ARP
 					     * message. Used only if
 					     * defined(CONFIG_NET_IPV4_AUTO).
 					     * Note: family needs to be
 					     * AF_INET.
 					     */
-		u8_t lldp_pkt          : 1; /* Is this pkt an LLDP message.
+		uint8_t lldp_pkt          : 1; /* Is this pkt an LLDP message.
 					     * Used only if
 					     * defined(CONFIG_NET_LLDP).
 					     * Note: family needs to be
 					     * AF_UNSPEC.
 					     */
-		u8_t ppp_msg           : 1; /* This is a PPP message */
+		uint8_t ppp_msg           : 1; /* This is a PPP message */
 	};
 
 #if defined(CONFIG_NET_TCP)
-	u8_t tcp_first_msg     : 1; /* Is this the first time this pkt is sent,
+	uint8_t tcp_first_msg     : 1; /* Is this the first time this pkt is sent,
 				     * or is this a resend of a TCP segment.
 				     */
 #endif
@@ -190,16 +190,16 @@ struct net_pkt {
 		/* IPv6 hop limit or IPv4 ttl for this network packet.
 		 * The value is shared between IPv6 and IPv4.
 		 */
-		u8_t ipv6_hop_limit;
-		u8_t ipv4_ttl;
+		uint8_t ipv6_hop_limit;
+		uint8_t ipv4_ttl;
 	};
 
 	union {
 #if defined(CONFIG_NET_IPV4)
-		u8_t ipv4_opts_len; /* Length if IPv4 Header Options */
+		uint8_t ipv4_opts_len; /* Length if IPv4 Header Options */
 #endif
 #if defined(CONFIG_NET_IPV6)
-		u16_t ipv6_ext_len; /* length of extension headers */
+		uint16_t ipv6_ext_len; /* length of extension headers */
 #endif
 	};
 
@@ -207,7 +207,7 @@ struct net_pkt {
 	/** Network packet priority, can be left out in which case packet
 	 * is not prioritised.
 	 */
-	u8_t priority;
+	uint8_t priority;
 #endif
 
 #if defined(CONFIG_NET_VLAN)
@@ -216,7 +216,7 @@ struct net_pkt {
 	 * Identifier (VID, called more commonly VLAN tag). This value is
 	 * kept in host byte order.
 	 */
-	u16_t vlan_tci;
+	uint16_t vlan_tci;
 #endif /* CONFIG_NET_VLAN */
 
 #if defined(CONFIG_NET_IPV6)
@@ -225,22 +225,22 @@ struct net_pkt {
 	 * packet. Note that this value should be updated by who ever
 	 * adds IPv6 extension headers to the network packet.
 	 */
-	u16_t ipv6_prev_hdr_start;
+	uint16_t ipv6_prev_hdr_start;
 
 #if defined(CONFIG_NET_IPV6_FRAGMENT)
-	u16_t ipv6_fragment_offset;	/* Fragment offset of this packet */
-	u32_t ipv6_fragment_id;	/* Fragment id */
-	u16_t ipv6_frag_hdr_start;	/* Where starts the fragment header */
+	uint16_t ipv6_fragment_offset;	/* Fragment offset of this packet */
+	uint32_t ipv6_fragment_id;	/* Fragment id */
+	uint16_t ipv6_frag_hdr_start;	/* Where starts the fragment header */
 #endif /* CONFIG_NET_IPV6_FRAGMENT */
 
-	u8_t ipv6_ext_opt_len; /* IPv6 ND option length */
-	u8_t ipv6_next_hdr;	/* What is the very first next header */
+	uint8_t ipv6_ext_opt_len; /* IPv6 ND option length */
+	uint8_t ipv6_next_hdr;	/* What is the very first next header */
 #endif /* CONFIG_NET_IPV6 */
 
 #if defined(CONFIG_IEEE802154)
-	u8_t ieee802154_rssi; /* Received Signal Strength Indication */
-	u8_t ieee802154_lqi;  /* Link Quality Indicator */
-	u8_t ieee802154_ack_fpb : 1; /* Frame Pending Bit was set in the ACK */
+	uint8_t ieee802154_rssi; /* Received Signal Strength Indication */
+	uint8_t ieee802154_lqi;  /* Link Quality Indicator */
+	uint8_t ieee802154_ack_fpb : 1; /* Frame Pending Bit was set in the ACK */
 #endif
 #if defined(CONFIG_NET_L2_CANBUS)
 	union {
@@ -311,12 +311,12 @@ static inline void net_pkt_set_orig_iface(struct net_pkt *pkt,
 #endif
 }
 
-static inline u8_t net_pkt_family(struct net_pkt *pkt)
+static inline uint8_t net_pkt_family(struct net_pkt *pkt)
 {
 	return pkt->family;
 }
 
-static inline void net_pkt_set_family(struct net_pkt *pkt, u8_t family)
+static inline void net_pkt_set_family(struct net_pkt *pkt, uint8_t family)
 {
 	pkt->family = family;
 }
@@ -331,17 +331,17 @@ static inline void net_pkt_set_gptp(struct net_pkt *pkt, bool is_gptp)
 	pkt->gptp_pkt = is_gptp;
 }
 
-static inline u8_t net_pkt_ip_hdr_len(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ip_hdr_len(struct net_pkt *pkt)
 {
 	return pkt->ip_hdr_len;
 }
 
-static inline void net_pkt_set_ip_hdr_len(struct net_pkt *pkt, u8_t len)
+static inline void net_pkt_set_ip_hdr_len(struct net_pkt *pkt, uint8_t len)
 {
 	pkt->ip_hdr_len = len;
 }
 
-static inline u8_t net_pkt_sent(struct net_pkt *pkt)
+static inline uint8_t net_pkt_sent(struct net_pkt *pkt)
 {
 	return pkt->sent_or_eof;
 }
@@ -351,7 +351,7 @@ static inline void net_pkt_set_sent(struct net_pkt *pkt, bool sent)
 	pkt->sent_or_eof = sent;
 }
 
-static inline u8_t net_pkt_queued(struct net_pkt *pkt)
+static inline uint8_t net_pkt_queued(struct net_pkt *pkt)
 {
 	return pkt->pkt_queued;
 }
@@ -361,7 +361,7 @@ static inline void net_pkt_set_queued(struct net_pkt *pkt, bool send)
 	pkt->pkt_queued = send;
 }
 
-static inline u8_t net_pkt_tcp_1st_msg(struct net_pkt *pkt)
+static inline uint8_t net_pkt_tcp_1st_msg(struct net_pkt *pkt)
 {
 #if defined(CONFIG_NET_TCP)
 	return pkt->tcp_first_msg;
@@ -381,7 +381,7 @@ static inline void net_pkt_set_tcp_1st_msg(struct net_pkt *pkt, bool is_1st)
 }
 
 #if defined(CONFIG_NET_SOCKETS)
-static inline u8_t net_pkt_eof(struct net_pkt *pkt)
+static inline uint8_t net_pkt_eof(struct net_pkt *pkt)
 {
 	return pkt->sent_or_eof;
 }
@@ -410,29 +410,29 @@ static inline bool net_pkt_forwarding(struct net_pkt *pkt)
 #endif
 
 #if defined(CONFIG_NET_IPV4)
-static inline u8_t net_pkt_ipv4_ttl(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv4_ttl(struct net_pkt *pkt)
 {
 	return pkt->ipv4_ttl;
 }
 
 static inline void net_pkt_set_ipv4_ttl(struct net_pkt *pkt,
-					u8_t ttl)
+					uint8_t ttl)
 {
 	pkt->ipv4_ttl = ttl;
 }
 
-static inline u8_t net_pkt_ipv4_opts_len(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv4_opts_len(struct net_pkt *pkt)
 {
 	return pkt->ipv4_opts_len;
 }
 
 static inline void net_pkt_set_ipv4_opts_len(struct net_pkt *pkt,
-					     u8_t opts_len)
+					     uint8_t opts_len)
 {
 	pkt->ipv4_opts_len = opts_len;
 }
 #else
-static inline u8_t net_pkt_ipv4_ttl(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv4_ttl(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -440,20 +440,20 @@ static inline u8_t net_pkt_ipv4_ttl(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv4_ttl(struct net_pkt *pkt,
-					u8_t ttl)
+					uint8_t ttl)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(ttl);
 }
 
-static inline u8_t net_pkt_ipv4_opts_len(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv4_opts_len(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 	return 0;
 }
 
 static inline void net_pkt_set_ipv4_opts_len(struct net_pkt *pkt,
-					     u8_t opts_len)
+					     uint8_t opts_len)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(opts_len);
@@ -461,60 +461,60 @@ static inline void net_pkt_set_ipv4_opts_len(struct net_pkt *pkt,
 #endif
 
 #if defined(CONFIG_NET_IPV6)
-static inline u8_t net_pkt_ipv6_ext_opt_len(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_ext_opt_len(struct net_pkt *pkt)
 {
 	return pkt->ipv6_ext_opt_len;
 }
 
 static inline void net_pkt_set_ipv6_ext_opt_len(struct net_pkt *pkt,
-						u8_t len)
+						uint8_t len)
 {
 	pkt->ipv6_ext_opt_len = len;
 }
 
-static inline u8_t net_pkt_ipv6_next_hdr(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_next_hdr(struct net_pkt *pkt)
 {
 	return pkt->ipv6_next_hdr;
 }
 
-static inline void net_pkt_set_ipv6_next_hdr(struct net_pkt *pkt, u8_t next_hdr)
+static inline void net_pkt_set_ipv6_next_hdr(struct net_pkt *pkt, uint8_t next_hdr)
 {
 	pkt->ipv6_next_hdr = next_hdr;
 }
 
-static inline u16_t net_pkt_ipv6_ext_len(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_ext_len(struct net_pkt *pkt)
 {
 	return pkt->ipv6_ext_len;
 }
 
-static inline void net_pkt_set_ipv6_ext_len(struct net_pkt *pkt, u16_t len)
+static inline void net_pkt_set_ipv6_ext_len(struct net_pkt *pkt, uint16_t len)
 {
 	pkt->ipv6_ext_len = len;
 }
 
-static inline u16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)
 {
 	return pkt->ipv6_prev_hdr_start;
 }
 
 static inline void net_pkt_set_ipv6_hdr_prev(struct net_pkt *pkt,
-					     u16_t offset)
+					     uint16_t offset)
 {
 	pkt->ipv6_prev_hdr_start = offset;
 }
 
-static inline u8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)
 {
 	return pkt->ipv6_hop_limit;
 }
 
 static inline void net_pkt_set_ipv6_hop_limit(struct net_pkt *pkt,
-					      u8_t hop_limit)
+					      uint8_t hop_limit)
 {
 	pkt->ipv6_hop_limit = hop_limit;
 }
 #else /* CONFIG_NET_IPV6 */
-static inline u8_t net_pkt_ipv6_ext_opt_len(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_ext_opt_len(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -522,39 +522,39 @@ static inline u8_t net_pkt_ipv6_ext_opt_len(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_ext_opt_len(struct net_pkt *pkt,
-						u8_t len)
+						uint8_t len)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(len);
 }
 
-static inline u8_t net_pkt_ipv6_next_hdr(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_next_hdr(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
 	return 0;
 }
 
-static inline void net_pkt_set_ipv6_next_hdr(struct net_pkt *pkt, u8_t next_hdr)
+static inline void net_pkt_set_ipv6_next_hdr(struct net_pkt *pkt, uint8_t next_hdr)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(next_hdr);
 }
 
-static inline u16_t net_pkt_ipv6_ext_len(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_ext_len(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
 	return 0;
 }
 
-static inline void net_pkt_set_ipv6_ext_len(struct net_pkt *pkt, u16_t len)
+static inline void net_pkt_set_ipv6_ext_len(struct net_pkt *pkt, uint16_t len)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(len);
 }
 
-static inline u16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -562,13 +562,13 @@ static inline u16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_hdr_prev(struct net_pkt *pkt,
-					     u16_t offset)
+					     uint16_t offset)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(offset);
 }
 
-static inline u8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -576,14 +576,14 @@ static inline u8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_hop_limit(struct net_pkt *pkt,
-					      u8_t hop_limit)
+					      uint8_t hop_limit)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(hop_limit);
 }
 #endif /* CONFIG_NET_IPV6 */
 
-static inline u16_t net_pkt_ip_opts_len(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ip_opts_len(struct net_pkt *pkt)
 {
 #if defined(CONFIG_NET_IPV6)
 	return pkt->ipv6_ext_len;
@@ -597,40 +597,40 @@ static inline u16_t net_pkt_ip_opts_len(struct net_pkt *pkt)
 }
 
 #if defined(CONFIG_NET_IPV6_FRAGMENT)
-static inline u16_t net_pkt_ipv6_fragment_start(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_fragment_start(struct net_pkt *pkt)
 {
 	return pkt->ipv6_frag_hdr_start;
 }
 
 static inline void net_pkt_set_ipv6_fragment_start(struct net_pkt *pkt,
-						   u16_t start)
+						   uint16_t start)
 {
 	pkt->ipv6_frag_hdr_start = start;
 }
 
-static inline u16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)
 {
 	return pkt->ipv6_fragment_offset;
 }
 
 static inline void net_pkt_set_ipv6_fragment_offset(struct net_pkt *pkt,
-						    u16_t offset)
+						    uint16_t offset)
 {
 	pkt->ipv6_fragment_offset = offset;
 }
 
-static inline u32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)
+static inline uint32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)
 {
 	return pkt->ipv6_fragment_id;
 }
 
 static inline void net_pkt_set_ipv6_fragment_id(struct net_pkt *pkt,
-						u32_t id)
+						uint32_t id)
 {
 	pkt->ipv6_fragment_id = id;
 }
 #else /* CONFIG_NET_IPV6_FRAGMENT */
-static inline u16_t net_pkt_ipv6_fragment_start(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_fragment_start(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -638,13 +638,13 @@ static inline u16_t net_pkt_ipv6_fragment_start(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_fragment_start(struct net_pkt *pkt,
-						   u16_t start)
+						   uint16_t start)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(start);
 }
 
-static inline u16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)
+static inline uint16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -652,13 +652,13 @@ static inline u16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_fragment_offset(struct net_pkt *pkt,
-						    u16_t offset)
+						    uint16_t offset)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(offset);
 }
 
-static inline u32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)
+static inline uint32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
@@ -666,7 +666,7 @@ static inline u32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)
 }
 
 static inline void net_pkt_set_ipv6_fragment_id(struct net_pkt *pkt,
-						u32_t id)
+						uint32_t id)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(id);
@@ -674,18 +674,18 @@ static inline void net_pkt_set_ipv6_fragment_id(struct net_pkt *pkt,
 #endif /* CONFIG_NET_IPV6_FRAGMENT */
 
 #if NET_TC_COUNT > 1
-static inline u8_t net_pkt_priority(struct net_pkt *pkt)
+static inline uint8_t net_pkt_priority(struct net_pkt *pkt)
 {
 	return pkt->priority;
 }
 
 static inline void net_pkt_set_priority(struct net_pkt *pkt,
-					u8_t priority)
+					uint8_t priority)
 {
 	pkt->priority = priority;
 }
 #else /* NET_TC_COUNT == 1 */
-static inline u8_t net_pkt_priority(struct net_pkt *pkt)
+static inline uint8_t net_pkt_priority(struct net_pkt *pkt)
 {
 	return 0;
 }
@@ -695,23 +695,23 @@ static inline u8_t net_pkt_priority(struct net_pkt *pkt)
 #endif /* NET_TC_COUNT > 1 */
 
 #if defined(CONFIG_NET_VLAN)
-static inline u16_t net_pkt_vlan_tag(struct net_pkt *pkt)
+static inline uint16_t net_pkt_vlan_tag(struct net_pkt *pkt)
 {
 	return net_eth_vlan_get_vid(pkt->vlan_tci);
 }
 
-static inline void net_pkt_set_vlan_tag(struct net_pkt *pkt, u16_t tag)
+static inline void net_pkt_set_vlan_tag(struct net_pkt *pkt, uint16_t tag)
 {
 	pkt->vlan_tci = net_eth_vlan_set_vid(pkt->vlan_tci, tag);
 }
 
-static inline u8_t net_pkt_vlan_priority(struct net_pkt *pkt)
+static inline uint8_t net_pkt_vlan_priority(struct net_pkt *pkt)
 {
 	return net_eth_vlan_get_pcp(pkt->vlan_tci);
 }
 
 static inline void net_pkt_set_vlan_priority(struct net_pkt *pkt,
-					     u8_t priority)
+					     uint8_t priority)
 {
 	pkt->vlan_tci = net_eth_vlan_set_pcp(pkt->vlan_tci, priority);
 }
@@ -726,28 +726,28 @@ static inline void net_pkt_set_vlan_dei(struct net_pkt *pkt, bool dei)
 	pkt->vlan_tci = net_eth_vlan_set_dei(pkt->vlan_tci, dei);
 }
 
-static inline void net_pkt_set_vlan_tci(struct net_pkt *pkt, u16_t tci)
+static inline void net_pkt_set_vlan_tci(struct net_pkt *pkt, uint16_t tci)
 {
 	pkt->vlan_tci = tci;
 }
 
-static inline u16_t net_pkt_vlan_tci(struct net_pkt *pkt)
+static inline uint16_t net_pkt_vlan_tci(struct net_pkt *pkt)
 {
 	return pkt->vlan_tci;
 }
 #else
-static inline u16_t net_pkt_vlan_tag(struct net_pkt *pkt)
+static inline uint16_t net_pkt_vlan_tag(struct net_pkt *pkt)
 {
 	return NET_VLAN_TAG_UNSPEC;
 }
 
-static inline void net_pkt_set_vlan_tag(struct net_pkt *pkt, u16_t tag)
+static inline void net_pkt_set_vlan_tag(struct net_pkt *pkt, uint16_t tag)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(tag);
 }
 
-static inline u8_t net_pkt_vlan_priority(struct net_pkt *pkt)
+static inline uint8_t net_pkt_vlan_priority(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 	return 0;
@@ -764,12 +764,12 @@ static inline void net_pkt_set_vlan_dei(struct net_pkt *pkt, bool dei)
 	ARG_UNUSED(dei);
 }
 
-static inline u16_t net_pkt_vlan_tci(struct net_pkt *pkt)
+static inline uint16_t net_pkt_vlan_tci(struct net_pkt *pkt)
 {
 	return NET_VLAN_TAG_UNSPEC; /* assumes priority is 0 */
 }
 
-static inline void net_pkt_set_vlan_tci(struct net_pkt *pkt, u16_t tci)
+static inline void net_pkt_set_vlan_tci(struct net_pkt *pkt, uint16_t tci)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(tci);
@@ -805,24 +805,24 @@ static inline void net_pkt_set_timestamp(struct net_pkt *pkt,
 #endif /* CONFIG_NET_PKT_TIMESTAMP */
 
 #if defined(CONFIG_NET_PKT_TXTIME)
-static inline u64_t net_pkt_txtime(struct net_pkt *pkt)
+static inline uint64_t net_pkt_txtime(struct net_pkt *pkt)
 {
 	return pkt->txtime;
 }
 
-static inline void net_pkt_set_txtime(struct net_pkt *pkt, u64_t txtime)
+static inline void net_pkt_set_txtime(struct net_pkt *pkt, uint64_t txtime)
 {
 	pkt->txtime = txtime;
 }
 #else
-static inline u64_t net_pkt_txtime(struct net_pkt *pkt)
+static inline uint64_t net_pkt_txtime(struct net_pkt *pkt)
 {
 	ARG_UNUSED(pkt);
 
 	return 0;
 }
 
-static inline void net_pkt_set_txtime(struct net_pkt *pkt, u64_t txtime)
+static inline void net_pkt_set_txtime(struct net_pkt *pkt, uint64_t txtime)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(txtime);
@@ -834,12 +834,12 @@ static inline size_t net_pkt_get_len(struct net_pkt *pkt)
 	return net_buf_frags_len(pkt->frags);
 }
 
-static inline u8_t *net_pkt_data(struct net_pkt *pkt)
+static inline uint8_t *net_pkt_data(struct net_pkt *pkt)
 {
 	return pkt->frags->data;
 }
 
-static inline u8_t *net_pkt_ip_data(struct net_pkt *pkt)
+static inline uint8_t *net_pkt_ip_data(struct net_pkt *pkt)
 {
 	return pkt->frags->data;
 }
@@ -856,7 +856,7 @@ static inline struct net_linkaddr *net_pkt_lladdr_dst(struct net_pkt *pkt)
 
 static inline void net_pkt_lladdr_swap(struct net_pkt *pkt)
 {
-	u8_t *addr = net_pkt_lladdr_src(pkt)->addr;
+	uint8_t *addr = net_pkt_lladdr_src(pkt)->addr;
 
 	net_pkt_lladdr_src(pkt)->addr = net_pkt_lladdr_dst(pkt)->addr;
 	net_pkt_lladdr_dst(pkt)->addr = addr;
@@ -869,24 +869,24 @@ static inline void net_pkt_lladdr_clear(struct net_pkt *pkt)
 }
 
 #if defined(CONFIG_IEEE802154) || defined(CONFIG_IEEE802154_RAW_MODE)
-static inline u8_t net_pkt_ieee802154_rssi(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ieee802154_rssi(struct net_pkt *pkt)
 {
 	return pkt->ieee802154_rssi;
 }
 
 static inline void net_pkt_set_ieee802154_rssi(struct net_pkt *pkt,
-					       u8_t rssi)
+					       uint8_t rssi)
 {
 	pkt->ieee802154_rssi = rssi;
 }
 
-static inline u8_t net_pkt_ieee802154_lqi(struct net_pkt *pkt)
+static inline uint8_t net_pkt_ieee802154_lqi(struct net_pkt *pkt)
 {
 	return pkt->ieee802154_lqi;
 }
 
 static inline void net_pkt_set_ieee802154_lqi(struct net_pkt *pkt,
-					      u8_t lqi)
+					      uint8_t lqi)
 {
 	pkt->ieee802154_lqi = lqi;
 }
@@ -1676,53 +1676,53 @@ struct net_pkt *net_pkt_shallow_clone(struct net_pkt *pkt,
  */
 int net_pkt_read(struct net_pkt *pkt, void *data, size_t length);
 
-/* Read u8_t data data a net_pkt */
-static inline int net_pkt_read_u8(struct net_pkt *pkt, u8_t *data)
+/* Read uint8_t data data a net_pkt */
+static inline int net_pkt_read_u8(struct net_pkt *pkt, uint8_t *data)
 {
 	return net_pkt_read(pkt, data, 1);
 }
 
 /**
- * @brief Read u16_t big endian data from a net_pkt
+ * @brief Read uint16_t big endian data from a net_pkt
  *
  * @details net_pkt's cursor should be properly initialized and,
  *          if needed, positioned using net_pkt_skip.
  *          Cursor position will be updated after the operation.
  *
  * @param pkt  The network packet from where to read
- * @param data The destination u16_t where to copy the data
+ * @param data The destination uint16_t where to copy the data
  *
  * @return 0 on success, negative errno code otherwise.
  */
-int net_pkt_read_be16(struct net_pkt *pkt, u16_t *data);
+int net_pkt_read_be16(struct net_pkt *pkt, uint16_t *data);
 
 /**
- * @brief Read u16_t little endian data from a net_pkt
+ * @brief Read uint16_t little endian data from a net_pkt
  *
  * @details net_pkt's cursor should be properly initialized and,
  *          if needed, positioned using net_pkt_skip.
  *          Cursor position will be updated after the operation.
  *
  * @param pkt  The network packet from where to read
- * @param data The destination u16_t where to copy the data
+ * @param data The destination uint16_t where to copy the data
  *
  * @return 0 on success, negative errno code otherwise.
  */
-int net_pkt_read_le16(struct net_pkt *pkt, u16_t *data);
+int net_pkt_read_le16(struct net_pkt *pkt, uint16_t *data);
 
 /**
- * @brief Read u32_t big endian data from a net_pkt
+ * @brief Read uint32_t big endian data from a net_pkt
  *
  * @details net_pkt's cursor should be properly initialized and,
  *          if needed, positioned using net_pkt_skip.
  *          Cursor position will be updated after the operation.
  *
  * @param pkt  The network packet from where to read
- * @param data The destination u32_t where to copy the data
+ * @param data The destination uint32_t where to copy the data
  *
  * @return 0 on success, negative errno code otherwise.
  */
-int net_pkt_read_be32(struct net_pkt *pkt, u32_t *data);
+int net_pkt_read_be32(struct net_pkt *pkt, uint32_t *data);
 
 /**
  * @brief Write data into a net_pkt
@@ -1739,42 +1739,42 @@ int net_pkt_read_be32(struct net_pkt *pkt, u32_t *data);
  */
 int net_pkt_write(struct net_pkt *pkt, const void *data, size_t length);
 
-/* Write u8_t data into a net_pkt. */
-static inline int net_pkt_write_u8(struct net_pkt *pkt, u8_t data)
+/* Write uint8_t data into a net_pkt. */
+static inline int net_pkt_write_u8(struct net_pkt *pkt, uint8_t data)
 {
-	return net_pkt_write(pkt, &data, sizeof(u8_t));
+	return net_pkt_write(pkt, &data, sizeof(uint8_t));
 }
 
-/* Write u16_t big endian data into a net_pkt. */
-static inline int net_pkt_write_be16(struct net_pkt *pkt, u16_t data)
+/* Write uint16_t big endian data into a net_pkt. */
+static inline int net_pkt_write_be16(struct net_pkt *pkt, uint16_t data)
 {
-	u16_t data_be16 = htons(data);
+	uint16_t data_be16 = htons(data);
 
-	return net_pkt_write(pkt, &data_be16, sizeof(u16_t));
+	return net_pkt_write(pkt, &data_be16, sizeof(uint16_t));
 }
 
-/* Write u32_t big endian data into a net_pkt. */
-static inline int net_pkt_write_be32(struct net_pkt *pkt, u32_t data)
+/* Write uint32_t big endian data into a net_pkt. */
+static inline int net_pkt_write_be32(struct net_pkt *pkt, uint32_t data)
 {
-	u32_t data_be32 = htonl(data);
+	uint32_t data_be32 = htonl(data);
 
-	return net_pkt_write(pkt, &data_be32, sizeof(u32_t));
+	return net_pkt_write(pkt, &data_be32, sizeof(uint32_t));
 }
 
-/* Write u32_t little endian data into a net_pkt. */
-static inline int net_pkt_write_le32(struct net_pkt *pkt, u32_t data)
+/* Write uint32_t little endian data into a net_pkt. */
+static inline int net_pkt_write_le32(struct net_pkt *pkt, uint32_t data)
 {
-	u32_t data_le32 = sys_cpu_to_le32(data);
+	uint32_t data_le32 = sys_cpu_to_le32(data);
 
-	return net_pkt_write(pkt, &data_le32, sizeof(u32_t));
+	return net_pkt_write(pkt, &data_le32, sizeof(uint32_t));
 }
 
-/* Write u16_t little endian data into a net_pkt. */
-static inline int net_pkt_write_le16(struct net_pkt *pkt, u16_t data)
+/* Write uint16_t little endian data into a net_pkt. */
+static inline int net_pkt_write_le16(struct net_pkt *pkt, uint16_t data)
 {
-	u16_t data_le16 = sys_cpu_to_le16(data);
+	uint16_t data_le16 = sys_cpu_to_le16(data);
 
-	return net_pkt_write(pkt, &data_le16, sizeof(u16_t));
+	return net_pkt_write(pkt, &data_le16, sizeof(uint16_t));
 }
 
 /**
@@ -1822,7 +1822,7 @@ int net_pkt_pull(struct net_pkt *pkt, size_t length);
  * @return a valid offset on success, 0 otherwise as there is nothing that
  *         can be done to evaluate the offset.
  */
-u16_t net_pkt_get_current_offset(struct net_pkt *pkt);
+uint16_t net_pkt_get_current_offset(struct net_pkt *pkt);
 
 /**
  * @brief Check if a data size could fit contiguously
diff --git a/include/net/net_stats.h b/include/net/net_stats.h
index 0d0318e2b5..ba59a4659a 100644
--- a/include/net/net_stats.h
+++ b/include/net/net_stats.h
@@ -33,7 +33,7 @@ extern "C" {
  * @typedef net_stats_t
  * @brief Network statistics counter
  */
-typedef u32_t net_stats_t;
+typedef uint32_t net_stats_t;
 
 /**
  * @brief Number of bytes sent and received.
@@ -206,7 +206,7 @@ struct net_stats_ipv6_mld {
  * @brief Network packet transfer times for calculating average TX time
  */
 struct net_stats_tx_time {
-	u64_t sum;
+	uint64_t sum;
 	net_stats_t count;
 };
 
@@ -214,7 +214,7 @@ struct net_stats_tx_time {
  * @brief Network packet receive times for calculating average RX time
  */
 struct net_stats_rx_time {
-	u64_t sum;
+	uint64_t sum;
 	net_stats_t count;
 };
 
@@ -226,14 +226,14 @@ struct net_stats_tc {
 		struct net_stats_tx_time tx_time;
 		net_stats_t pkts;
 		net_stats_t bytes;
-		u8_t priority;
+		uint8_t priority;
 	} sent[NET_TC_TX_COUNT];
 
 	struct {
 		struct net_stats_rx_time rx_time;
 		net_stats_t pkts;
 		net_stats_t bytes;
-		u8_t priority;
+		uint8_t priority;
 	} recv[NET_TC_RX_COUNT];
 };
 
@@ -242,10 +242,10 @@ struct net_stats_tc {
  * @brief Power management statistics
  */
 struct net_stats_pm {
-	u64_t overall_suspend_time;
+	uint64_t overall_suspend_time;
 	net_stats_t suspend_count;
-	u32_t last_suspend_time;
-	u32_t start_time;
+	uint32_t last_suspend_time;
+	uint32_t start_time;
 };
 
 
@@ -386,7 +386,7 @@ struct net_stats_eth_hw_timestamp {
  */
 struct net_stats_eth_vendor {
 	const char * const key;
-	u32_t value;
+	uint32_t value;
 };
 #endif
 
diff --git a/include/net/net_timeout.h b/include/net/net_timeout.h
index 2cbc293427..a16546151f 100644
--- a/include/net/net_timeout.h
+++ b/include/net/net_timeout.h
@@ -31,7 +31,7 @@ extern "C" {
 /** Let the max timeout be 100 ms lower because of
  * possible rounding in delayed work implementation.
  */
-#define NET_TIMEOUT_MAX_VALUE ((u32_t)(INT32_MAX - 100))
+#define NET_TIMEOUT_MAX_VALUE ((uint32_t)(INT32_MAX - 100))
 
 /** Generic struct for handling network timeouts */
 struct net_timeout {
@@ -39,20 +39,20 @@ struct net_timeout {
 	sys_snode_t node;
 
 	/** Address lifetime timer start time */
-	u32_t timer_start;
+	uint32_t timer_start;
 
 	/** Address lifetime timer timeout in milliseconds. Note that this
 	 * value is signed as k_delayed_work_submit() only supports signed
 	 * delay value.
 	 */
-	s32_t timer_timeout;
+	int32_t timer_timeout;
 
 	/** Timer wrap count. Used if the timer timeout is larger than
 	 * about 24 days. The reason we need to track wrap arounds, is
 	 * that the timer timeout used in k_delayed_work_submit() is
 	 * 32-bit signed value and the resolution is 1ms.
 	 */
-	s32_t wrap_counter;
+	int32_t wrap_counter;
 };
 
 #ifdef __cplusplus
diff --git a/include/net/openthread.h b/include/net/openthread.h
index d48e1a571b..81d847dd95 100644
--- a/include/net/openthread.h
+++ b/include/net/openthread.h
@@ -24,9 +24,9 @@ struct pkt_list_elem {
 struct openthread_context {
 	otInstance *instance;
 	struct net_if *iface;
-	u16_t pkt_list_in_idx;
-	u16_t pkt_list_out_idx;
-	u8_t pkt_list_full;
+	uint16_t pkt_list_in_idx;
+	uint16_t pkt_list_out_idx;
+	uint8_t pkt_list_full;
 	struct pkt_list_elem pkt_list[CONFIG_OPENTHREAD_PKT_LIST_SIZE];
 };
 
diff --git a/include/net/ppp.h b/include/net/ppp.h
index fb1c1ca400..3e019f761b 100644
--- a/include/net/ppp.h
+++ b/include/net/ppp.h
@@ -236,7 +236,7 @@ struct ppp_fsm {
 		/** Acknowledge Configuration Information */
 		int (*config_info_ack)(struct ppp_fsm *fsm,
 				       struct net_pkt *pkt,
-				       u16_t length);
+				       uint16_t length);
 
 		/** Add Configuration Information */
 		struct net_buf *(*config_info_add)(struct ppp_fsm *fsm);
@@ -247,19 +247,19 @@ struct ppp_fsm {
 		/** Negative Acknowledge Configuration Information */
 		int (*config_info_nack)(struct ppp_fsm *fsm,
 					struct net_pkt *pkt,
-					u16_t length,
+					uint16_t length,
 					bool rejected);
 
 		/** Request peer's Configuration Information */
 		int (*config_info_req)(struct ppp_fsm *fsm,
 				       struct net_pkt *pkt,
-				       u16_t length,
+				       uint16_t length,
 				       struct net_buf **buf);
 
 		/** Reject Configuration Information */
 		int (*config_info_rej)(struct ppp_fsm *fsm,
 				       struct net_pkt *pkt,
-				       u16_t length);
+				       uint16_t length);
 
 		/** Reset Configuration Information */
 		void (*config_info_reset)(struct ppp_fsm *fsm);
@@ -287,27 +287,27 @@ struct ppp_fsm {
 		 */
 		enum net_verdict (*proto_extension)(struct ppp_fsm *fsm,
 						    enum ppp_packet_type code,
-						    u8_t id,
+						    uint8_t id,
 						    struct net_pkt *pkt);
 	} cb;
 
 	/** Option bits */
-	u32_t flags;
+	uint32_t flags;
 
 	/** Number of re-transmissions left */;
-	u32_t retransmits;
+	uint32_t retransmits;
 
 	/** Number of NACK loops since last ACK */
-	u32_t nack_loops;
+	uint32_t nack_loops;
 
 	/** Number of NACKs received */
-	u32_t recv_nack_loops;
+	uint32_t recv_nack_loops;
 
 	/** Reason for closing protocol */
 	char terminate_reason[PPP_MAX_TERMINATE_REASON_LEN];
 
 	/** PPP protocol number for this FSM */
-	u16_t protocol;
+	uint16_t protocol;
 
 	/** Current state of PPP link */
 	enum ppp_state state;
@@ -316,13 +316,13 @@ struct ppp_fsm {
 	const char *name;
 
 	/** Current id */
-	u8_t id;
+	uint8_t id;
 
 	/** Current request id */
-	u8_t req_id;
+	uint8_t req_id;
 
 	/** Have received valid Ack, Nack or Reject to a Request */
-	u8_t ack_received : 1;
+	uint8_t ack_received : 1;
 };
 
 /** PPP configuration options */
@@ -338,35 +338,35 @@ struct ppp_option_pkt {
 	} type;
 
 	/** Option length */
-	u8_t len;
+	uint8_t len;
 };
 
 struct lcp_options {
 	/** Magic number */
-	u32_t magic;
+	uint32_t magic;
 
 	/** Async char map */
-	u32_t async_map;
+	uint32_t async_map;
 
 	/** Maximum Receive Unit value */
-	u16_t mru;
+	uint16_t mru;
 
 	/* Flags what to negotiate */
 
 	/** Negotiate MRU */
-	u16_t negotiate_mru : 1;
+	uint16_t negotiate_mru : 1;
 
 	/** Negotiate */
-	u16_t negotiate_async_map :1;
+	uint16_t negotiate_async_map :1;
 
 	/** Negotiate HDLC protocol field compression*/
-	u16_t negotiate_proto_compression :1;
+	uint16_t negotiate_proto_compression :1;
 
 	/** Negotiate HDLC address/control field compression */
-	u16_t negotiate_addr_compression :1;
+	uint16_t negotiate_addr_compression :1;
 
 	/** Negotiate magic number */
-	u16_t negotiate_magic :1;
+	uint16_t negotiate_magic :1;
 };
 
 struct ipcp_options {
@@ -378,7 +378,7 @@ struct ipcp_options {
 
 struct ipv6cp_options {
 	/** Interface identifier */
-	u8_t iid[PPP_INTERFACE_IDENTIFIER_LEN];
+	uint8_t iid[PPP_INTERFACE_IDENTIFIER_LEN];
 };
 
 /** PPP L2 context specific to certain network interface */
@@ -416,7 +416,7 @@ struct ppp_context {
 		struct lcp_options peer_accepted;
 
 		/** Magic-Number value */
-		u32_t magic;
+		uint32_t magic;
 	} lcp;
 
 #if defined(CONFIG_NET_IPV4)
@@ -475,10 +475,10 @@ struct ppp_context {
 		struct k_sem wait_echo_reply;
 
 		/** Echo-Req data value */
-		u32_t echo_req_data;
+		uint32_t echo_req_data;
 
 		/** Echo-Reply data value */
-		u32_t echo_reply_data;
+		uint32_t echo_reply_data;
 	} shell;
 #endif
 
@@ -498,34 +498,34 @@ struct ppp_context {
 	int network_protos_up;
 
 	/** Is this context already initialized */
-	u16_t is_init : 1;
+	uint16_t is_init : 1;
 
 	/** Is PPP ready to receive packets */
-	u16_t is_ready_to_serve : 1;
+	uint16_t is_ready_to_serve : 1;
 
 	/** Is PPP L2 enabled or not */
-	u16_t is_enabled : 1;
+	uint16_t is_enabled : 1;
 
 	/** PPP startup pending */
-	u16_t is_startup_pending : 1;
+	uint16_t is_startup_pending : 1;
 
 	/** PPP enable pending */
-	u16_t is_enable_done : 1;
+	uint16_t is_enable_done : 1;
 
 	/** Network status (up / down) */
-	u16_t is_network_up : 1;
+	uint16_t is_network_up : 1;
 
 	/** IPCP status (up / down) */
-	u16_t is_ipcp_up : 1;
+	uint16_t is_ipcp_up : 1;
 
 	/** IPCP open status (open / closed) */
-	u16_t is_ipcp_open : 1;
+	uint16_t is_ipcp_open : 1;
 
 	/** IPV6CP status (up / down) */
-	u16_t is_ipv6cp_up : 1;
+	uint16_t is_ipv6cp_up : 1;
 
 	/** IPV6CP open status (open / closed) */
-	u16_t is_ipv6cp_open : 1;
+	uint16_t is_ipv6cp_open : 1;
 };
 
 /**
@@ -618,9 +618,9 @@ static inline void ppp_mgmt_raise_carrier_off_event(struct net_if *iface)
  * index is not a valid PPP network index.
  */
 #if defined(CONFIG_NET_L2_PPP)
-int net_ppp_ping(int idx, s32_t timeout);
+int net_ppp_ping(int idx, int32_t timeout);
 #else
-static inline int net_ppp_ping(int idx, s32_t timeout)
+static inline int net_ppp_ping(int idx, int32_t timeout)
 {
 	ARG_UNUSED(idx);
 	ARG_UNUSED(timeout);
diff --git a/include/net/ptp_time.h b/include/net/ptp_time.h
index 54d65f2d80..740416c2ba 100644
--- a/include/net/ptp_time.h
+++ b/include/net/ptp_time.h
@@ -41,22 +41,22 @@ struct net_ptp_time {
 	union {
 		struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-			u32_t low;
-			u16_t high;
-			u16_t unused;
+			uint32_t low;
+			uint16_t high;
+			uint16_t unused;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-			u16_t unused;
-			u16_t high;
-			u32_t low;
+			uint16_t unused;
+			uint16_t high;
+			uint32_t low;
 #else
 #error "Unknown byte order"
 #endif
 		} _sec;
-		u64_t second;
+		uint64_t second;
 	};
 
 	/** Nanoseconds. */
-	u32_t nanosecond;
+	uint32_t nanosecond;
 };
 
 #ifdef __cplusplus
@@ -78,36 +78,36 @@ struct net_ptp_extended_time {
 	union {
 		struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-			u32_t low;
-			u16_t high;
-			u16_t unused;
+			uint32_t low;
+			uint16_t high;
+			uint16_t unused;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-			u16_t unused;
-			u16_t high;
-			u32_t low;
+			uint16_t unused;
+			uint16_t high;
+			uint32_t low;
 #else
 #error "Unknown byte order"
 #endif
 		} _sec;
-		u64_t second;
+		uint64_t second;
 	};
 
 	/** Fractional nanoseconds on 48 bits. */
 	union {
 		struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-			u32_t low;
-			u16_t high;
-			u16_t unused;
+			uint32_t low;
+			uint16_t high;
+			uint16_t unused;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-			u16_t unused;
-			u16_t high;
-			u32_t low;
+			uint16_t unused;
+			uint16_t high;
+			uint32_t low;
 #else
 #error "Unknown byte order"
 #endif
 		} _fns;
-		u64_t fract_nsecond;
+		uint64_t fract_nsecond;
 	};
 } __packed;
 
diff --git a/include/net/sntp.h b/include/net/sntp.h
index 5b65a37a03..9a4868b503 100644
--- a/include/net/sntp.h
+++ b/include/net/sntp.h
@@ -39,13 +39,13 @@ struct sntp_ctx {
 	 *  This is used to check if the originated timestamp in the server
 	 *  reply matches the one in client request.
 	 */
-	u32_t expected_orig_ts;
+	uint32_t expected_orig_ts;
 };
 
 /** Time as returned by SNTP API, fractional seconds since 1 Jan 1970 */
 struct sntp_time {
-	u64_t seconds;
-	u32_t fraction;
+	uint64_t seconds;
+	uint32_t fraction;
 };
 
 /**
@@ -69,8 +69,8 @@ int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr,
  *
  * @return 0 if ok, <0 if error (-ETIMEDOUT if timeout).
  */
-__deprecated int sntp_request(struct sntp_ctx *ctx, u32_t timeout,
-			      u64_t *epoch_time);
+__deprecated int sntp_request(struct sntp_ctx *ctx, uint32_t timeout,
+			      uint64_t *epoch_time);
 
 /**
  * @brief Perform SNTP query
@@ -82,7 +82,7 @@ __deprecated int sntp_request(struct sntp_ctx *ctx, u32_t timeout,
  *
  * @return 0 if ok, <0 if error (-ETIMEDOUT if timeout).
  */
-int sntp_query(struct sntp_ctx *ctx, u32_t timeout,
+int sntp_query(struct sntp_ctx *ctx, uint32_t timeout,
 	       struct sntp_time *time);
 
 /**
@@ -105,7 +105,7 @@ void sntp_close(struct sntp_ctx *ctx);
  *
  * @return 0 if ok, <0 if error (-ETIMEDOUT if timeout).
  */
-int sntp_simple(const char *server, u32_t timeout,
+int sntp_simple(const char *server, uint32_t timeout,
 		struct sntp_time *time);
 
 #ifdef __cplusplus
diff --git a/include/net/socket_net_mgmt.h b/include/net/socket_net_mgmt.h
index 5a9faae8fa..9d83106f05 100644
--- a/include/net/socket_net_mgmt.h
+++ b/include/net/socket_net_mgmt.h
@@ -67,7 +67,7 @@ struct sockaddr_nm {
 	uintptr_t nm_pid;
 
 	/** net_mgmt mask */
-	u32_t nm_mask;
+	uint32_t nm_mask;
 };
 
 
@@ -76,13 +76,13 @@ struct sockaddr_nm {
  */
 struct net_mgmt_msghdr {
 	/** Network management version */
-	u32_t nm_msg_version;
+	uint32_t nm_msg_version;
 
 	/** Length of the data */
-	u32_t nm_msg_len;
+	uint32_t nm_msg_len;
 
 	/** The actual message data follows */
-	u8_t nm_msg[];
+	uint8_t nm_msg[];
 };
 
 /**
diff --git a/include/net/socket_select.h b/include/net/socket_select.h
index d7cdec5ca6..98c59a13d7 100644
--- a/include/net/socket_select.h
+++ b/include/net/socket_select.h
@@ -27,7 +27,7 @@ struct zsock_timeval {
 };
 
 typedef struct zsock_fd_set {
-	u32_t bitset[(CONFIG_POSIX_MAX_FDS + 31) / 32];
+	uint32_t bitset[(CONFIG_POSIX_MAX_FDS + 31) / 32];
 } zsock_fd_set;
 
 
diff --git a/include/net/tftp.h b/include/net/tftp.h
index 92b33ec2c9..424fc568bc 100644
--- a/include/net/tftp.h
+++ b/include/net/tftp.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif
 
 struct tftpc {
-	u8_t   *user_buf;
-	u32_t  user_buf_size;
+	uint8_t   *user_buf;
+	uint32_t  user_buf_size;
 };
 
 /* TFTP Client Error codes. */
diff --git a/include/net/trickle.h b/include/net/trickle.h
index 530915757a..51966b6cb0 100644
--- a/include/net/trickle.h
+++ b/include/net/trickle.h
@@ -51,15 +51,15 @@ typedef void (*net_trickle_cb_t)(struct net_trickle *trickle,
  * only via the Trickle API.
  */
 struct net_trickle {
-	u32_t Imin;		/* Min interval size in ms */
-	u8_t Imax;		/* Max number of doublings */
-	u8_t k;			/* Redundancy constant */
+	uint32_t Imin;		/* Min interval size in ms */
+	uint8_t Imax;		/* Max number of doublings */
+	uint8_t k;			/* Redundancy constant */
 
-	u32_t I;		/* Current interval size */
-	u32_t Istart;		/* Start of the interval in ms */
-	u8_t c;			/* Consistency counter */
+	uint32_t I;		/* Current interval size */
+	uint32_t Istart;		/* Start of the interval in ms */
+	uint8_t c;			/* Consistency counter */
 
-	u32_t Imax_abs;		/* Max interval size in ms (not doublings)
+	uint32_t Imax_abs;		/* Max interval size in ms (not doublings)
 				 */
 
 	struct k_delayed_work timer;
@@ -82,9 +82,9 @@ struct net_trickle {
  * @return Return 0 if ok and <0 if error.
  */
 int net_trickle_create(struct net_trickle *trickle,
-		       u32_t Imin,
-		       u8_t Imax,
-		       u8_t k);
+		       uint32_t Imin,
+		       uint8_t Imax,
+		       uint8_t k);
 
 /**
  * @brief Start a Trickle timer.
diff --git a/include/net/websocket.h b/include/net/websocket.h
index 93f355e1b3..57a4237ba7 100644
--- a/include/net/websocket.h
+++ b/include/net/websocket.h
@@ -99,7 +99,7 @@ struct websocket_request {
 	const struct http_parser_settings *http_cb;
 
 	/** User supplied buffer where HTTP connection data is stored */
-	u8_t *tmp_buf;
+	uint8_t *tmp_buf;
 
 	/** Length of the user supplied temp buffer */
 	size_t tmp_buf_len;
@@ -124,7 +124,7 @@ struct websocket_request {
  * @return Websocket id to be used when sending/receiving Websocket data.
  */
 int websocket_connect(int http_sock, struct websocket_request *req,
-		      s32_t timeout, void *user_data);
+		      int32_t timeout, void *user_data);
 
 /**
  * @brief Send websocket msg to peer.
@@ -147,9 +147,9 @@ int websocket_connect(int http_sock, struct websocket_request *req,
  *
  * @return <0 if error, >=0 amount of bytes sent
  */
-int websocket_send_msg(int ws_sock, const u8_t *payload, size_t payload_len,
+int websocket_send_msg(int ws_sock, const uint8_t *payload, size_t payload_len,
 		       enum websocket_opcode opcode, bool mask, bool final,
-		       s32_t timeout);
+		       int32_t timeout);
 
 /**
  * @brief Receive websocket msg from peer.
@@ -168,8 +168,8 @@ int websocket_send_msg(int ws_sock, const u8_t *payload, size_t payload_len,
  *
  * @return <0 if error, >=0 amount of bytes received
  */
-int websocket_recv_msg(int ws_sock, u8_t *buf, size_t buf_len,
-		       u32_t *message_type, u64_t *remaining, s32_t timeout);
+int websocket_recv_msg(int ws_sock, uint8_t *buf, size_t buf_len,
+		       uint32_t *message_type, uint64_t *remaining, int32_t timeout);
 
 /**
  * @brief Close websocket.
diff --git a/include/net/wifi_mgmt.h b/include/net/wifi_mgmt.h
index 114f483395..f76f353de7 100644
--- a/include/net/wifi_mgmt.h
+++ b/include/net/wifi_mgmt.h
@@ -81,22 +81,22 @@ enum net_event_wifi_cmd {
  * via its info attribute (see net_mgmt.h)
  */
 struct wifi_scan_result {
-	u8_t ssid[WIFI_SSID_MAX_LEN];
-	u8_t ssid_length;
+	uint8_t ssid[WIFI_SSID_MAX_LEN];
+	uint8_t ssid_length;
 
-	u8_t channel;
+	uint8_t channel;
 	enum wifi_security_type security;
-	s8_t rssi;
+	int8_t rssi;
 };
 
 struct wifi_connect_req_params {
-	u8_t *ssid;
-	u8_t ssid_length; /* Max 32 */
+	uint8_t *ssid;
+	uint8_t ssid_length; /* Max 32 */
 
-	u8_t *psk;
-	u8_t psk_length; /* Min 8 - Max 64 */
+	uint8_t *psk;
+	uint8_t psk_length; /* Min 8 - Max 64 */
 
-	u8_t channel;
+	uint8_t channel;
 	enum wifi_security_type security;
 };
 
diff --git a/include/posix/posix_types.h b/include/posix/posix_types.h
index 93d0b10aa7..dc875e351c 100644
--- a/include/posix/posix_types.h
+++ b/include/posix/posix_types.h
@@ -24,7 +24,7 @@ typedef unsigned long useconds_t;
 /* time related attributes */
 #ifndef CONFIG_NEWLIB_LIBC
 #ifndef __clockid_t_defined
-typedef u32_t clockid_t;
+typedef uint32_t clockid_t;
 #endif
 #endif /*CONFIG_NEWLIB_LIBC */
 #ifndef __timer_t_defined
@@ -37,11 +37,11 @@ typedef struct pthread_attr_t {
 	int priority;
 	void *stack;
 	size_t stacksize;
-	u32_t flags;
-	u32_t delayedstart;
-	u32_t schedpolicy;
-	s32_t detachstate;
-	u32_t initialized;
+	uint32_t flags;
+	uint32_t delayedstart;
+	uint32_t schedpolicy;
+	int32_t detachstate;
+	uint32_t initialized;
 } pthread_attr_t;
 
 typedef void *pthread_t;
@@ -52,7 +52,7 @@ typedef struct k_sem sem_t;
 /* Mutex */
 typedef struct pthread_mutex {
 	pthread_t owner;
-	u16_t lock_count;
+	uint16_t lock_count;
 	int type;
 	_wait_q_t wait_q;
 } pthread_mutex_t;
@@ -79,13 +79,13 @@ typedef struct pthread_barrier {
 typedef struct pthread_barrierattr {
 } pthread_barrierattr_t;
 
-typedef u32_t pthread_rwlockattr_t;
+typedef uint32_t pthread_rwlockattr_t;
 
 typedef struct pthread_rwlock_obj {
 	struct k_sem rd_sem;
 	struct k_sem wr_sem;
 	struct k_sem reader_active;/* blocks WR till reader has acquired lock */
-	s32_t status;
+	int32_t status;
 	k_tid_t wr_owner;
 } pthread_rwlock_t;
 
diff --git a/include/posix/pthread_key.h b/include/posix/pthread_key.h
index 808cd7cd27..a509695023 100644
--- a/include/posix/pthread_key.h
+++ b/include/posix/pthread_key.h
@@ -15,7 +15,7 @@
 extern "C" {
 #endif
 
-typedef u32_t pthread_once_t;
+typedef uint32_t pthread_once_t;
 
 /* pthread_key */
 typedef void *pthread_key_t;
diff --git a/include/posix/sys/eventfd.h b/include/posix/sys/eventfd.h
index 038b2c6961..5b0388e5e6 100644
--- a/include/posix/sys/eventfd.h
+++ b/include/posix/sys/eventfd.h
@@ -21,7 +21,7 @@ extern "C" {
 #define EFD_NONBLOCK  O_NONBLOCK
 #define EFD_FLAGS_SET (EFD_SEMAPHORE | EFD_NONBLOCK)
 
-typedef u64_t eventfd_t;
+typedef uint64_t eventfd_t;
 
 /**
  * @brief Create a file descriptor for event notification
diff --git a/include/posix/time.h b/include/posix/time.h
index 3fa7e75882..28518b01fc 100644
--- a/include/posix/time.h
+++ b/include/posix/time.h
@@ -74,7 +74,7 @@ extern "C" {
 #define TIMER_ABSTIME 4
 #endif
 
-static inline s32_t _ts_to_ms(const struct timespec *to)
+static inline int32_t _ts_to_ms(const struct timespec *to)
 {
 	return (to->tv_sec * MSEC_PER_SEC) + (to->tv_nsec / NSEC_PER_MSEC);
 }
diff --git a/include/power/power.h b/include/power/power.h
index d0c5f9fb98..0fc8671eed 100644
--- a/include/power/power.h
+++ b/include/power/power.h
@@ -285,7 +285,7 @@ void _sys_resume(void);
  * @return Power state which was entered or SYS_POWER_STATE_ACTIVE if SoC was
  *         kept in the active state.
  */
-enum power_states _sys_suspend(s32_t ticks);
+enum power_states _sys_suspend(int32_t ticks);
 
 /**
  * @brief Do any SoC or architecture specific post ops after sleep state exits.
diff --git a/include/random/rand32.h b/include/random/rand32.h
index b8ed332edf..f1b18023b1 100644
--- a/include/random/rand32.h
+++ b/include/random/rand32.h
@@ -43,7 +43,7 @@ extern "C" {
  *
  * @return 32-bit random value.
  */
-extern u32_t sys_rand32_get(void);
+extern uint32_t sys_rand32_get(void);
 /**
  * @brief Fill the destination buffer with random data values that should
  * pass general randomness tests.
diff --git a/include/shared_irq.h b/include/shared_irq.h
index ef9950cea7..ae2ba647c0 100644
--- a/include/shared_irq.h
+++ b/include/shared_irq.h
@@ -35,15 +35,15 @@ extern int shared_irq_initialize(struct device *port);
 typedef void (*shared_irq_config_irq_t)(void);
 
 struct shared_irq_config {
-	u32_t irq_num;
+	uint32_t irq_num;
 	shared_irq_config_irq_t config;
-	u32_t client_count;
+	uint32_t client_count;
 };
 
 struct shared_irq_client {
 	struct device *isr_dev;
 	isr_t isr_func;
-	u32_t enabled;
+	uint32_t enabled;
 };
 
 struct shared_irq_runtime {
diff --git a/include/shell/shell.h b/include/shell/shell.h
index 5ebd27b631..2e138172e9 100644
--- a/include/shell/shell.h
+++ b/include/shell/shell.h
@@ -100,8 +100,8 @@ struct shell_cmd_entry {
 struct shell;
 
 struct shell_static_args {
-	u8_t mandatory; /*!< Number of mandatory arguments. */
-	u8_t optional;  /*!< Number of optional arguments. */
+	uint8_t mandatory; /*!< Number of mandatory arguments. */
+	uint8_t optional;  /*!< Number of optional arguments. */
 };
 
 /**
@@ -514,18 +514,18 @@ struct shell_stats {
  * @internal @brief Flags for internal shell usage.
  */
 struct shell_flags {
-	u32_t insert_mode :1; /*!< Controls insert mode for text introduction.*/
-	u32_t use_colors  :1; /*!< Controls colored syntax.*/
-	u32_t echo        :1; /*!< Controls shell echo.*/
-	u32_t processing  :1; /*!< Shell is executing process function.*/
-	u32_t tx_rdy      :1;
-	u32_t mode_delete :1; /*!< Operation mode of backspace key */
-	u32_t history_exit:1; /*!< Request to exit history mode */
-	u32_t cmd_ctx	  :1; /*!< Shell is executing command */
-	u32_t last_nl     :8; /*!< Last received new line character */
+	uint32_t insert_mode :1; /*!< Controls insert mode for text introduction.*/
+	uint32_t use_colors  :1; /*!< Controls colored syntax.*/
+	uint32_t echo        :1; /*!< Controls shell echo.*/
+	uint32_t processing  :1; /*!< Shell is executing process function.*/
+	uint32_t tx_rdy      :1;
+	uint32_t mode_delete :1; /*!< Operation mode of backspace key */
+	uint32_t history_exit:1; /*!< Request to exit history mode */
+	uint32_t cmd_ctx	  :1; /*!< Shell is executing command */
+	uint32_t last_nl     :8; /*!< Last received new line character */
 };
 
-BUILD_ASSERT((sizeof(struct shell_flags) == sizeof(u32_t)),
+BUILD_ASSERT((sizeof(struct shell_flags) == sizeof(uint32_t)),
 	     "Structure must fit in 4 bytes");
 
 
@@ -533,7 +533,7 @@ BUILD_ASSERT((sizeof(struct shell_flags) == sizeof(u32_t)),
  * @internal @brief Union for internal shell usage.
  */
 union shell_internal {
-	u32_t value;
+	uint32_t value;
 	struct shell_flags flags;
 };
 
@@ -563,10 +563,10 @@ struct shell_ctx {
 	/*!< VT100 color and cursor position, terminal width.*/
 	struct shell_vt100_ctx vt100_ctx;
 
-	u16_t cmd_buff_len; /*!< Command length.*/
-	u16_t cmd_buff_pos; /*!< Command buffer cursor position.*/
+	uint16_t cmd_buff_len; /*!< Command length.*/
+	uint16_t cmd_buff_pos; /*!< Command buffer cursor position.*/
 
-	u16_t cmd_tmp_buff_len; /*!< Command length in tmp buffer.*/
+	uint16_t cmd_tmp_buff_len; /*!< Command length in tmp buffer.*/
 
 	/*!< Command input buffer.*/
 	char cmd_buff[CONFIG_SHELL_CMD_BUFF_SIZE];
@@ -641,7 +641,7 @@ extern void shell_print_stream(const void *user_ctx, const char *data,
 		     _log_queue_size, _log_timeout, _shell_flag)	      \
 	static const struct shell _name;				      \
 	static struct shell_ctx UTIL_CAT(_name, _ctx);			      \
-	static u8_t _name##_out_buffer[CONFIG_SHELL_PRINTF_BUFF_SIZE];	      \
+	static uint8_t _name##_out_buffer[CONFIG_SHELL_PRINTF_BUFF_SIZE];	      \
 	SHELL_LOG_BACKEND_DEFINE(_name, _name##_out_buffer,		      \
 				 CONFIG_SHELL_PRINTF_BUFF_SIZE,		      \
 				 _log_queue_size, _log_timeout);	      \
@@ -682,7 +682,7 @@ extern void shell_print_stream(const void *user_ctx, const char *data,
  * @return Standard error code.
  */
 int shell_init(const struct shell *shell, const void *transport_config,
-	       bool use_colors, bool log_backend, u32_t init_log_level);
+	       bool use_colors, bool log_backend, uint32_t init_log_level);
 
 /**
  * @brief Uninitializes the transport layer and the internal shell state.
@@ -772,7 +772,7 @@ void shell_vfprintf(const struct shell *shell, enum shell_vt100_color color,
  * @param[in] data	Pointer to data.
  * @param[in] len	Length of data.
  */
-void shell_hexdump(const struct shell *shell, const u8_t *data, size_t len);
+void shell_hexdump(const struct shell *shell, const uint8_t *data, size_t len);
 
 /**
  * @brief Print info message to the shell.
diff --git a/include/shell/shell_fprintf.h b/include/shell/shell_fprintf.h
index 6fbe337f21..1d600662b3 100644
--- a/include/shell/shell_fprintf.h
+++ b/include/shell/shell_fprintf.h
@@ -27,7 +27,7 @@ struct shell_fprintf_control_block {
  * @brief fprintf context
  */
 struct shell_fprintf {
-	u8_t *buffer;
+	uint8_t *buffer;
 	size_t buffer_size;
 	shell_fprintf_fwrite fwrite;
 	const void *user_ctx;
diff --git a/include/shell/shell_history.h b/include/shell/shell_history.h
index 7aa8ca0469..3c1e38e6d4 100644
--- a/include/shell/shell_history.h
+++ b/include/shell/shell_history.h
@@ -31,7 +31,7 @@ struct shell_history {
  * @param _size Memory dedicated for shell history.
  */
 #define SHELL_HISTORY_DEFINE(_name, _size) \
-	static u8_t __noinit __aligned(sizeof(void *)) \
+	static uint8_t __noinit __aligned(sizeof(void *)) \
 			_name##_ring_buf_data[_size]; \
 	static struct ring_buf _name##_ring_buf = \
 		{ \
@@ -80,7 +80,7 @@ void shell_history_mode_exit(struct shell_history *history);
  * @return True if remains in history mode.
  */
 bool shell_history_get(struct shell_history *history, bool up,
-		       u8_t *dst, u16_t *len);
+		       uint8_t *dst, uint16_t *len);
 
 /**
  * @brief Put line into shell command history.
@@ -92,7 +92,7 @@ bool shell_history_get(struct shell_history *history, bool up,
  * @param len		Data length.
  *
  */
-void shell_history_put(struct shell_history *history, u8_t *line, size_t len);
+void shell_history_put(struct shell_history *history, uint8_t *line, size_t len);
 
 /**
  * @brief Get state of shell history.
diff --git a/include/shell/shell_log_backend.h b/include/shell/shell_log_backend.h
index 381bcc6fe3..abdeecef0b 100644
--- a/include/shell/shell_log_backend.h
+++ b/include/shell/shell_log_backend.h
@@ -37,17 +37,17 @@ struct shell_log_backend {
 	struct k_msgq *msgq;
 	const struct log_output *log_output;
 	struct shell_log_backend_control_block *control_block;
-	u32_t timeout;
+	uint32_t timeout;
 };
 
 /** @brief Shell log backend message structure. */
 struct shell_log_backend_msg {
 	struct log_msg *msg;
-	u32_t timestamp;
+	uint32_t timestamp;
 };
 
 /** @brief Prototype of function outputing processed data. */
-int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx);
+int shell_log_backend_output_func(uint8_t *data, size_t length, void *ctx);
 
 /** @def SHELL_LOG_BACKEND_DEFINE
  *  @brief Macro for creating instance of shell log backend.
@@ -93,7 +93,7 @@ int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx);
  * @param init_log_level	Initial log level set to all logging sources.
  */
 void shell_log_backend_enable(const struct shell_log_backend *backend,
-			      void *ctx, u32_t init_log_level);
+			      void *ctx, uint32_t init_log_level);
 
 /** @brief Disable shell log backend.
  *
diff --git a/include/shell/shell_telnet.h b/include/shell/shell_telnet.h
index c514f1609f..42eb6a3a4e 100644
--- a/include/shell/shell_telnet.h
+++ b/include/shell/shell_telnet.h
@@ -21,7 +21,7 @@ struct shell_telnet_line_buf {
 	char buf[CONFIG_SHELL_TELNET_LINE_BUF_SIZE];
 
 	/** Current line length. */
-	u16_t len;
+	uint16_t len;
 };
 
 /** TELNET-based shell transport. */
diff --git a/include/shell/shell_types.h b/include/shell/shell_types.h
index 2e29ad97fc..379f29a8b6 100644
--- a/include/shell/shell_types.h
+++ b/include/shell/shell_types.h
@@ -31,19 +31,19 @@ struct shell_vt100_colors {
 };
 
 struct shell_multiline_cons {
-	u16_t cur_x;     /* horizontal cursor position in edited command line.*/
-	u16_t cur_x_end; /* horizontal cursor position at the end of command.*/
-	u16_t cur_y;     /* vertical cursor position in edited command.*/
-	u16_t cur_y_end; /* vertical cursor position at the end of command.*/
-	u16_t terminal_hei; /* terminal screen height.*/
-	u16_t terminal_wid; /* terminal screen width.*/
-	u8_t name_len;   /*!<console name length.*/
+	uint16_t cur_x;     /* horizontal cursor position in edited command line.*/
+	uint16_t cur_x_end; /* horizontal cursor position at the end of command.*/
+	uint16_t cur_y;     /* vertical cursor position in edited command.*/
+	uint16_t cur_y_end; /* vertical cursor position at the end of command.*/
+	uint16_t terminal_hei; /* terminal screen height.*/
+	uint16_t terminal_wid; /* terminal screen width.*/
+	uint8_t name_len;   /*!<console name length.*/
 };
 
 struct shell_vt100_ctx {
 	struct shell_multiline_cons cons;
 	struct shell_vt100_colors col;
-	u16_t printed_cmd;  /* printed commands counter */
+	uint16_t printed_cmd;  /* printed commands counter */
 };
 
 #ifdef __cplusplus
diff --git a/include/shell/shell_uart.h b/include/shell/shell_uart.h
index 6f2ae8ac0a..24a38583ee 100644
--- a/include/shell/shell_uart.h
+++ b/include/shell/shell_uart.h
@@ -37,7 +37,7 @@ struct shell_uart_ctrl_blk {
 	RING_BUF_DECLARE(_name##_tx_ringbuf, _size)
 
 #define UART_SHELL_TX_BUF_DECLARE(_name) \
-	u8_t _name##_txbuf[SHELL_UART_TX_BUF_SIZE]
+	uint8_t _name##_txbuf[SHELL_UART_TX_BUF_SIZE]
 
 #define UART_SHELL_RX_TIMER_DECLARE(_name) /* Empty */
 
diff --git a/include/stats/stats.h b/include/stats/stats.h
index d5c55e0c0b..fe2f99247a 100644
--- a/include/stats/stats.h
+++ b/include/stats/stats.h
@@ -59,15 +59,15 @@ extern "C" {
 #endif
 
 struct stats_name_map {
-	u16_t snm_off;
+	uint16_t snm_off;
 	const char *snm_name;
 } __attribute__((packed));
 
 struct stats_hdr {
 	const char *s_name;
-	u8_t s_size;
-	u16_t s_cnt;
-	u8_t s_pad1;
+	uint8_t s_size;
+	uint16_t s_cnt;
+	uint8_t s_pad1;
 #ifdef CONFIG_STATS_NAMES
 	const struct stats_name_map *s_map;
 	int s_map_cnt;
@@ -107,28 +107,28 @@ struct stats_hdr {
  *
  * @param var__                 The name to assign to the entry.
  */
-#define STATS_SECT_ENTRY(var__) u32_t var__;
+#define STATS_SECT_ENTRY(var__) uint32_t var__;
 
 /**
  * @brief Declares a 16-bit stat entry inside a group struct.
  *
  * @param var__                 The name to assign to the entry.
  */
-#define STATS_SECT_ENTRY16(var__) u16_t var__;
+#define STATS_SECT_ENTRY16(var__) uint16_t var__;
 
 /**
  * @brief Declares a 32-bit stat entry inside a group struct.
  *
  * @param var__                 The name to assign to the entry.
  */
-#define STATS_SECT_ENTRY32(var__) u32_t var__;
+#define STATS_SECT_ENTRY32(var__) uint32_t var__;
 
 /**
  * @brief Declares a 64-bit stat entry inside a group struct.
  *
  * @param var__                 The name to assign to the entry.
  */
-#define STATS_SECT_ENTRY64(var__) u64_t var__;
+#define STATS_SECT_ENTRY64(var__) uint64_t var__;
 
 /**
  * @brief Increases a statistic entry by the specified amount.
@@ -167,9 +167,9 @@ struct stats_hdr {
 #define STATS_CLEAR(group__, var__) \
 	((group__).var__ = 0)
 
-#define STATS_SIZE_16 (sizeof(u16_t))
-#define STATS_SIZE_32 (sizeof(u32_t))
-#define STATS_SIZE_64 (sizeof(u64_t))
+#define STATS_SIZE_16 (sizeof(uint16_t))
+#define STATS_SIZE_32 (sizeof(uint32_t))
+#define STATS_SIZE_64 (sizeof(uint64_t))
 
 #define STATS_SIZE_INIT_PARMS(group__, size__) \
 	(size__),			       \
@@ -214,8 +214,8 @@ struct stats_hdr {
  * @param group__               The group containing the entry to clear.
  * @param var__                 The statistic entry to clear.
  */
-void stats_init(struct stats_hdr *shdr, u8_t size, u16_t cnt,
-		const struct stats_name_map *map, u16_t map_cnt);
+void stats_init(struct stats_hdr *shdr, uint8_t size, uint16_t cnt,
+		const struct stats_name_map *map, uint16_t map_cnt);
 
 /**
  * @brief Registers a statistics group to be managed.
@@ -255,8 +255,8 @@ int stats_register(const char *name, struct stats_hdr *shdr);
  *
  * @see STATS_INIT_AND_REG
  */
-int stats_init_and_reg(struct stats_hdr *hdr, u8_t size, u16_t cnt,
-		       const struct stats_name_map *map, u16_t map_cnt,
+int stats_init_and_reg(struct stats_hdr *hdr, uint8_t size, uint16_t cnt,
+		       const struct stats_name_map *map, uint16_t map_cnt,
 		       const char *name);
 
 /**
@@ -279,7 +279,7 @@ void stats_reset(struct stats_hdr *shdr);
  *                              nonzero to abort the walk.
  */
 typedef int stats_walk_fn(struct stats_hdr *hdr, void *arg,
-			  const char *name, u16_t off);
+			  const char *name, uint16_t off);
 
 /**
  * @brief Applies a function to every stat entry in a group.
diff --git a/include/storage/flash_map.h b/include/storage/flash_map.h
index 6449cb18cb..4e960ae698 100644
--- a/include/storage/flash_map.h
+++ b/include/storage/flash_map.h
@@ -56,9 +56,9 @@ extern "C" {
  * contains all data needed to operate on the flash partitions.
  */
 struct flash_area {
-	u8_t fa_id; /** ID of flash area */
-	u8_t fa_device_id;
-	u16_t pad16;
+	uint8_t fa_id; /** ID of flash area */
+	uint8_t fa_device_id;
+	uint16_t pad16;
 	off_t fa_off; /** flash partition offset */
 	size_t fa_size; /** flash partition size */
 	const char *fa_dev_name; /** flash device name */
@@ -84,7 +84,7 @@ struct flash_sector {
  * @param[out] fa Pointer which has to reference flash_area. If
  * @p ID is unknown, it will be NULL on output.
  */
-int flash_area_open(u8_t id, const struct flash_area **fa);
+int flash_area_open(uint8_t id, const struct flash_area **fa);
 
 /**
  * @brief Close flash_area
@@ -155,7 +155,7 @@ int flash_area_erase(const struct flash_area *fa, off_t off, size_t len);
  *
  * @return Alignment restriction for flash writes in [B].
  */
-u8_t flash_area_align(const struct flash_area *fa);
+uint8_t flash_area_align(const struct flash_area *fa);
 
 /**
  * Retrieve info about sectors within the area.
@@ -169,7 +169,7 @@ u8_t flash_area_align(const struct flash_area *fa);
  * -ENOMEM if There are too many flash pages on the flash_area to fit in the
  * array.
  */
-int flash_area_get_sectors(int fa_id, u32_t *count,
+int flash_area_get_sectors(int fa_id, uint32_t *count,
 			   struct flash_sector *sectors);
 
 /**
diff --git a/include/storage/stream_flash.h b/include/storage/stream_flash.h
index e783bcc47b..5fc4ef6e61 100644
--- a/include/storage/stream_flash.h
+++ b/include/storage/stream_flash.h
@@ -42,7 +42,7 @@ extern "C" {
  * @param len The length of the data read.
  * @param offset The offset the data was read from.
  */
-typedef int (*stream_flash_callback_t)(u8_t *buf, size_t len, size_t offset);
+typedef int (*stream_flash_callback_t)(uint8_t *buf, size_t len, size_t offset);
 
 /**
  * @brief Structure for stream flash context
@@ -51,7 +51,7 @@ typedef int (*stream_flash_callback_t)(u8_t *buf, size_t len, size_t offset);
  * with them through the below API.
  */
 struct stream_flash_ctx {
-	u8_t *buf; /* Write buffer */
+	uint8_t *buf; /* Write buffer */
 	size_t buf_len; /* Length of write buffer */
 	size_t buf_bytes; /* Number of bytes currently stored in write buf */
 	struct device *fdev; /* Flash device */
@@ -81,7 +81,7 @@ struct stream_flash_ctx {
  * @return non-negative on success, negative errno code on fail
  */
 int stream_flash_init(struct stream_flash_ctx *ctx, struct device *fdev,
-		      u8_t *buf, size_t buf_len, size_t offset, size_t size,
+		      uint8_t *buf, size_t buf_len, size_t offset, size_t size,
 		      stream_flash_callback_t cb);
 /**
  * @brief Read number of bytes written to the flash.
@@ -108,7 +108,7 @@ size_t stream_flash_bytes_written(struct stream_flash_ctx *ctx);
  *
  * @return non-negative on success, negative errno code on fail
  */
-int stream_flash_buffered_write(struct stream_flash_ctx *ctx, const u8_t *data,
+int stream_flash_buffered_write(struct stream_flash_ctx *ctx, const uint8_t *data,
 				size_t len, bool flush);
 
 /**
diff --git a/include/sw_isr_table.h b/include/sw_isr_table.h
index 04088ff028..e15ca7410e 100644
--- a/include/sw_isr_table.h
+++ b/include/sw_isr_table.h
@@ -46,9 +46,9 @@ extern struct _isr_table_entry _sw_isr_table[];
  */
 struct _isr_list {
 	/** IRQ line number */
-	s32_t irq;
+	int32_t irq;
 	/** Flags for this IRQ, see ISR_FLAG_* definitions */
-	s32_t flags;
+	int32_t flags;
 	/** ISR to call */
 	void *func;
 	/** Parameter for non-direct IRQs */
diff --git a/include/sys/arch_interface.h b/include/sys/arch_interface.h
index d46d7ea546..9ceeef73b7 100644
--- a/include/sys/arch_interface.h
+++ b/include/sys/arch_interface.h
@@ -56,7 +56,7 @@ typedef void (*k_thread_entry_t)(void *p1, void *p2, void *p3);
  *
  * @see k_cycle_get_32()
  */
-static inline u32_t arch_k_cycle_get_32(void);
+static inline uint32_t arch_k_cycle_get_32(void);
 
 /** @} */
 
@@ -264,7 +264,7 @@ int arch_irq_is_enabled(unsigned int irq);
  */
 int arch_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			     void (*routine)(void *parameter),
-			     void *parameter, u32_t flags);
+			     void *parameter, uint32_t flags);
 
 /**
  * @def ARCH_IRQ_CONNECT(irq, pri, isr, arg, flags)
@@ -543,7 +543,7 @@ void arch_mem_domain_thread_remove(struct k_thread *thread);
  * @param partition_id The partition index that needs to be deleted
  */
 void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
-				      u32_t partition_id);
+				      uint32_t partition_id);
 
 /**
  * @brief Add a partition to the memory domain
@@ -555,7 +555,7 @@ void arch_mem_domain_partition_remove(struct k_mem_domain *domain,
  * @param partition_id The partition that needs to be added
  */
 void arch_mem_domain_partition_add(struct k_mem_domain *domain,
-				   u32_t partition_id);
+				   uint32_t partition_id);
 
 /**
  * @brief Remove the memory domain
@@ -661,16 +661,16 @@ size_t arch_user_string_nlen(const char *s, size_t maxsize, int *err);
  */
 
 #ifdef CONFIG_EXECUTION_BENCHMARKING
-extern u64_t arch_timing_swap_start;
-extern u64_t arch_timing_swap_end;
-extern u64_t arch_timing_irq_start;
-extern u64_t arch_timing_irq_end;
-extern u64_t arch_timing_tick_start;
-extern u64_t arch_timing_tick_end;
-extern u64_t arch_timing_user_mode_end;
-extern u32_t arch_timing_value_swap_end;
-extern u64_t arch_timing_value_swap_common;
-extern u64_t arch_timing_value_swap_temp;
+extern uint64_t arch_timing_swap_start;
+extern uint64_t arch_timing_swap_end;
+extern uint64_t arch_timing_irq_start;
+extern uint64_t arch_timing_irq_end;
+extern uint64_t arch_timing_tick_start;
+extern uint64_t arch_timing_tick_end;
+extern uint64_t arch_timing_user_mode_end;
+extern uint32_t arch_timing_value_swap_end;
+extern uint64_t arch_timing_value_swap_common;
+extern uint64_t arch_timing_value_swap_temp;
 #endif /* CONFIG_EXECUTION_BENCHMARKING */
 
 /** @} */
diff --git a/include/sys/atomic.h b/include/sys/atomic.h
index 9114f20fbf..8c1c891b99 100644
--- a/include/sys/atomic.h
+++ b/include/sys/atomic.h
@@ -408,7 +408,7 @@ extern atomic_val_t atomic_nand(atomic_t *target, atomic_val_t value);
  */
 
 #define ATOMIC_BITS (sizeof(atomic_val_t) * 8)
-#define ATOMIC_MASK(bit) (1 << ((u32_t)(bit) & (ATOMIC_BITS - 1)))
+#define ATOMIC_MASK(bit) (1 << ((uint32_t)(bit) & (ATOMIC_BITS - 1)))
 #define ATOMIC_ELEM(addr, bit) ((addr) + ((bit) / ATOMIC_BITS))
 
 /**
diff --git a/include/sys/base64.h b/include/sys/base64.h
index e526a5df19..51d96c5833 100644
--- a/include/sys/base64.h
+++ b/include/sys/base64.h
@@ -50,7 +50,7 @@ extern "C" {
  * @note           Call this function with dlen = 0 to obtain the
  *                 required buffer size in *olen
  */
-int base64_encode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
+int base64_encode(uint8_t *dst, size_t dlen, size_t *olen, const uint8_t *src,
 		  size_t slen);
 
 /**
@@ -69,7 +69,7 @@ int base64_encode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
  * @note           Call this function with *dst = NULL or dlen = 0 to obtain
  *                 the required buffer size in *olen
  */
-int base64_decode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
+int base64_decode(uint8_t *dst, size_t dlen, size_t *olen, const uint8_t *src,
 		  size_t slen);
 
 #ifdef __cplusplus
diff --git a/include/sys/byteorder.h b/include/sys/byteorder.h
index 9ab353700b..33e257b8a0 100644
--- a/include/sys/byteorder.h
+++ b/include/sys/byteorder.h
@@ -17,21 +17,21 @@
 #include <toolchain.h>
 
 /* Internal helpers only used by the sys_* APIs further below */
-#define __bswap_16(x) ((u16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
-#define __bswap_24(x) ((u32_t) ((((x) >> 16) & 0xff) | \
+#define __bswap_16(x) ((uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
+#define __bswap_24(x) ((uint32_t) ((((x) >> 16) & 0xff) | \
 				   (((x)) & 0xff00) | \
 				   (((x) & 0xff) << 16)))
-#define __bswap_32(x) ((u32_t) ((((x) >> 24) & 0xff) | \
+#define __bswap_32(x) ((uint32_t) ((((x) >> 24) & 0xff) | \
 				   (((x) >> 8) & 0xff00) | \
 				   (((x) & 0xff00) << 8) | \
 				   (((x) & 0xff) << 24)))
-#define __bswap_48(x) ((u64_t) ((((x) >> 40) & 0xff) | \
+#define __bswap_48(x) ((uint64_t) ((((x) >> 40) & 0xff) | \
 				   (((x) >> 24) & 0xff00) | \
 				   (((x) >> 8) & 0xff0000) | \
 				   (((x) & 0xff0000) << 8) | \
 				   (((x) & 0xff00) << 24) | \
 				   (((x) & 0xff) << 40)))
-#define __bswap_64(x) ((u64_t) ((((x) >> 56) & 0xff) | \
+#define __bswap_64(x) ((uint64_t) ((((x) >> 56) & 0xff) | \
 				   (((x) >> 40) & 0xff00) | \
 				   (((x) >> 24) & 0xff0000) | \
 				   (((x) >> 8) & 0xff000000) | \
@@ -223,7 +223,7 @@
  *  @param val 16-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_be16(u16_t val, u8_t dst[2])
+static inline void sys_put_be16(uint16_t val, uint8_t dst[2])
 {
 	dst[0] = val >> 8;
 	dst[1] = val;
@@ -238,7 +238,7 @@ static inline void sys_put_be16(u16_t val, u8_t dst[2])
  *  @param val 24-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_be24(u32_t val, u8_t dst[3])
+static inline void sys_put_be24(uint32_t val, uint8_t dst[3])
 {
 	dst[0] = val >> 16;
 	sys_put_be16(val, &dst[1]);
@@ -253,7 +253,7 @@ static inline void sys_put_be24(u32_t val, u8_t dst[3])
  *  @param val 32-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_be32(u32_t val, u8_t dst[4])
+static inline void sys_put_be32(uint32_t val, uint8_t dst[4])
 {
 	sys_put_be16(val >> 16, dst);
 	sys_put_be16(val, &dst[2]);
@@ -268,7 +268,7 @@ static inline void sys_put_be32(u32_t val, u8_t dst[4])
  *  @param val 48-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_be48(u64_t val, u8_t dst[6])
+static inline void sys_put_be48(uint64_t val, uint8_t dst[6])
 {
 	sys_put_be16(val >> 32, dst);
 	sys_put_be32(val, &dst[2]);
@@ -283,7 +283,7 @@ static inline void sys_put_be48(u64_t val, u8_t dst[6])
  *  @param val 64-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_be64(u64_t val, u8_t dst[8])
+static inline void sys_put_be64(uint64_t val, uint8_t dst[8])
 {
 	sys_put_be32(val >> 32, dst);
 	sys_put_be32(val, &dst[4]);
@@ -298,7 +298,7 @@ static inline void sys_put_be64(u64_t val, u8_t dst[8])
  *  @param val 16-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_le16(u16_t val, u8_t dst[2])
+static inline void sys_put_le16(uint16_t val, uint8_t dst[2])
 {
 	dst[0] = val;
 	dst[1] = val >> 8;
@@ -313,7 +313,7 @@ static inline void sys_put_le16(u16_t val, u8_t dst[2])
  *  @param val 24-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_le24(u32_t val, u8_t dst[3])
+static inline void sys_put_le24(uint32_t val, uint8_t dst[3])
 {
 	sys_put_le16(val, dst);
 	dst[2] = val >> 16;
@@ -328,7 +328,7 @@ static inline void sys_put_le24(u32_t val, u8_t dst[3])
  *  @param val 32-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_le32(u32_t val, u8_t dst[4])
+static inline void sys_put_le32(uint32_t val, uint8_t dst[4])
 {
 	sys_put_le16(val, dst);
 	sys_put_le16(val >> 16, &dst[2]);
@@ -343,7 +343,7 @@ static inline void sys_put_le32(u32_t val, u8_t dst[4])
  *  @param val 48-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_le48(u64_t val, u8_t dst[6])
+static inline void sys_put_le48(uint64_t val, uint8_t dst[6])
 {
 	sys_put_le32(val, dst);
 	sys_put_le16(val >> 32, &dst[4]);
@@ -358,7 +358,7 @@ static inline void sys_put_le48(u64_t val, u8_t dst[6])
  *  @param val 64-bit integer in host endianness.
  *  @param dst Destination memory address to store the result.
  */
-static inline void sys_put_le64(u64_t val, u8_t dst[8])
+static inline void sys_put_le64(uint64_t val, uint8_t dst[8])
 {
 	sys_put_le32(val, dst);
 	sys_put_le32(val >> 32, &dst[4]);
@@ -374,9 +374,9 @@ static inline void sys_put_le64(u64_t val, u8_t dst[8])
  *
  *  @return 16-bit integer in host endianness.
  */
-static inline u16_t sys_get_be16(const u8_t src[2])
+static inline uint16_t sys_get_be16(const uint8_t src[2])
 {
-	return ((u16_t)src[0] << 8) | src[1];
+	return ((uint16_t)src[0] << 8) | src[1];
 }
 
 /**
@@ -389,9 +389,9 @@ static inline u16_t sys_get_be16(const u8_t src[2])
  *
  *  @return 24-bit integer in host endianness.
  */
-static inline u32_t sys_get_be24(const u8_t src[3])
+static inline uint32_t sys_get_be24(const uint8_t src[3])
 {
-	return ((u32_t)src[0] << 16) | sys_get_be16(&src[1]);
+	return ((uint32_t)src[0] << 16) | sys_get_be16(&src[1]);
 }
 
 /**
@@ -404,9 +404,9 @@ static inline u32_t sys_get_be24(const u8_t src[3])
  *
  *  @return 32-bit integer in host endianness.
  */
-static inline u32_t sys_get_be32(const u8_t src[4])
+static inline uint32_t sys_get_be32(const uint8_t src[4])
 {
-	return ((u32_t)sys_get_be16(&src[0]) << 16) | sys_get_be16(&src[2]);
+	return ((uint32_t)sys_get_be16(&src[0]) << 16) | sys_get_be16(&src[2]);
 }
 
 /**
@@ -419,9 +419,9 @@ static inline u32_t sys_get_be32(const u8_t src[4])
  *
  *  @return 48-bit integer in host endianness.
  */
-static inline u64_t sys_get_be48(const u8_t src[6])
+static inline uint64_t sys_get_be48(const uint8_t src[6])
 {
-	return ((u64_t)sys_get_be32(&src[0]) << 32) | sys_get_be16(&src[4]);
+	return ((uint64_t)sys_get_be32(&src[0]) << 32) | sys_get_be16(&src[4]);
 }
 
 /**
@@ -434,9 +434,9 @@ static inline u64_t sys_get_be48(const u8_t src[6])
  *
  *  @return 64-bit integer in host endianness.
  */
-static inline u64_t sys_get_be64(const u8_t src[8])
+static inline uint64_t sys_get_be64(const uint8_t src[8])
 {
-	return ((u64_t)sys_get_be32(&src[0]) << 32) | sys_get_be32(&src[4]);
+	return ((uint64_t)sys_get_be32(&src[0]) << 32) | sys_get_be32(&src[4]);
 }
 
 /**
@@ -449,9 +449,9 @@ static inline u64_t sys_get_be64(const u8_t src[8])
  *
  *  @return 16-bit integer in host endianness.
  */
-static inline u16_t sys_get_le16(const u8_t src[2])
+static inline uint16_t sys_get_le16(const uint8_t src[2])
 {
-	return ((u16_t)src[1] << 8) | src[0];
+	return ((uint16_t)src[1] << 8) | src[0];
 }
 
 /**
@@ -464,9 +464,9 @@ static inline u16_t sys_get_le16(const u8_t src[2])
  *
  *  @return 24-bit integer in host endianness.
  */
-static inline u32_t sys_get_le24(const u8_t src[3])
+static inline uint32_t sys_get_le24(const uint8_t src[3])
 {
-	return ((u32_t)src[2] << 16) | sys_get_le16(&src[0]);
+	return ((uint32_t)src[2] << 16) | sys_get_le16(&src[0]);
 }
 
 /**
@@ -479,9 +479,9 @@ static inline u32_t sys_get_le24(const u8_t src[3])
  *
  *  @return 32-bit integer in host endianness.
  */
-static inline u32_t sys_get_le32(const u8_t src[4])
+static inline uint32_t sys_get_le32(const uint8_t src[4])
 {
-	return ((u32_t)sys_get_le16(&src[2]) << 16) | sys_get_le16(&src[0]);
+	return ((uint32_t)sys_get_le16(&src[2]) << 16) | sys_get_le16(&src[0]);
 }
 
 /**
@@ -494,9 +494,9 @@ static inline u32_t sys_get_le32(const u8_t src[4])
  *
  *  @return 48-bit integer in host endianness.
  */
-static inline u64_t sys_get_le48(const u8_t src[6])
+static inline uint64_t sys_get_le48(const uint8_t src[6])
 {
-	return ((u64_t)sys_get_le32(&src[2]) << 32) | sys_get_le16(&src[0]);
+	return ((uint64_t)sys_get_le32(&src[2]) << 32) | sys_get_le16(&src[0]);
 }
 
 /**
@@ -509,9 +509,9 @@ static inline u64_t sys_get_le48(const u8_t src[6])
  *
  *  @return 64-bit integer in host endianness.
  */
-static inline u64_t sys_get_le64(const u8_t src[8])
+static inline uint64_t sys_get_le64(const uint8_t src[8])
 {
-	return ((u64_t)sys_get_le32(&src[4]) << 32) | sys_get_le32(&src[0]);
+	return ((uint64_t)sys_get_le32(&src[4]) << 32) | sys_get_le32(&src[0]);
 }
 
 /**
@@ -529,8 +529,8 @@ static inline u64_t sys_get_le64(const u8_t src[8])
  */
 static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
 {
-	u8_t *pdst = (u8_t *)dst;
-	const u8_t *psrc = (const u8_t *)src;
+	uint8_t *pdst = (uint8_t *)dst;
+	const uint8_t *psrc = (const uint8_t *)src;
 
 	__ASSERT(((psrc < pdst && (psrc + length) <= pdst) ||
 		  (psrc > pdst && (pdst + length) <= psrc)),
@@ -558,10 +558,10 @@ static inline void sys_mem_swap(void *buf, size_t length)
 	size_t i;
 
 	for (i = 0; i < (length/2); i++) {
-		u8_t tmp = ((u8_t *)buf)[i];
+		uint8_t tmp = ((uint8_t *)buf)[i];
 
-		((u8_t *)buf)[i] = ((u8_t *)buf)[length - 1 - i];
-		((u8_t *)buf)[length - 1 - i] = tmp;
+		((uint8_t *)buf)[i] = ((uint8_t *)buf)[length - 1 - i];
+		((uint8_t *)buf)[length - 1 - i] = tmp;
 	}
 }
 
diff --git a/include/sys/crc.h b/include/sys/crc.h
index d088ad5787..56d677f2b1 100644
--- a/include/sys/crc.h
+++ b/include/sys/crc.h
@@ -52,8 +52,8 @@ extern "C" {
  *
  * @return The computed CRC16 value
  */
-u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
-	    u16_t initial_value, bool pad);
+uint16_t crc16(const uint8_t *src, size_t len, uint16_t polynomial,
+	    uint16_t initial_value, bool pad);
 
 /**
  * @brief Generic function for computing CRC 8
@@ -70,7 +70,7 @@ u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
  *
  * @return The computed CRC8 value
  */
-u8_t crc8(const u8_t *src, size_t len, u8_t polynomial, u8_t initial_value,
+uint8_t crc8(const uint8_t *src, size_t len, uint8_t polynomial, uint8_t initial_value,
 	  bool reversed);
 
 /**
@@ -96,7 +96,7 @@ u8_t crc8(const u8_t *src, size_t len, u8_t polynomial, u8_t initial_value,
  *
  * @return The computed CRC16 value
  */
-u16_t crc16_ccitt(u16_t seed, const u8_t *src, size_t len);
+uint16_t crc16_ccitt(uint16_t seed, const uint8_t *src, size_t len);
 
 /**
  * @brief Compute the CRC-16/XMODEM checksum of a buffer.
@@ -120,7 +120,7 @@ u16_t crc16_ccitt(u16_t seed, const u8_t *src, size_t len);
  *
  * @return The computed CRC16 value
  */
-u16_t crc16_itu_t(u16_t seed, const u8_t *src, size_t len);
+uint16_t crc16_itu_t(uint16_t seed, const uint8_t *src, size_t len);
 
 /**
  * @brief Compute ANSI variant of CRC 16
@@ -133,7 +133,7 @@ u16_t crc16_itu_t(u16_t seed, const u8_t *src, size_t len);
  *
  * @return The computed CRC16 value
  */
-static inline u16_t crc16_ansi(const u8_t *src, size_t len)
+static inline uint16_t crc16_ansi(const uint8_t *src, size_t len)
 {
 	return crc16(src, len, 0x8005, 0xffff, true);
 }
@@ -147,7 +147,7 @@ static inline u16_t crc16_ansi(const u8_t *src, size_t len)
  * @return CRC32 value.
  *
  */
-u32_t crc32_ieee(const u8_t *data, size_t len);
+uint32_t crc32_ieee(const uint8_t *data, size_t len);
 
 /**
  * @brief Update an IEEE conforming CRC32 checksum.
@@ -159,7 +159,7 @@ u32_t crc32_ieee(const u8_t *data, size_t len);
  * @return CRC32 value.
  *
  */
-u32_t crc32_ieee_update(u32_t crc, const u8_t *data, size_t len);
+uint32_t crc32_ieee_update(uint32_t crc, const uint8_t *data, size_t len);
 
 /**
  * @brief Compute CCITT variant of CRC 8
@@ -172,7 +172,7 @@ u32_t crc32_ieee_update(u32_t crc, const u8_t *data, size_t len);
  *
  * @return The computed CRC8 value
  */
-u8_t crc8_ccitt(u8_t initial_value, const void *buf, size_t len);
+uint8_t crc8_ccitt(uint8_t initial_value, const void *buf, size_t len);
 
 /**
  * @brief Compute the CRC-7 checksum of a buffer.
@@ -187,7 +187,7 @@ u8_t crc8_ccitt(u8_t initial_value, const void *buf, size_t len);
  *
  * @return The computed CRC7 value
  */
-u8_t crc7_be(u8_t seed, const u8_t *src, size_t len);
+uint8_t crc7_be(uint8_t seed, const uint8_t *src, size_t len);
 
 /**
  * @}
diff --git a/include/sys/math_extras.h b/include/sys/math_extras.h
index bef9a78a6b..02c0f5c9c1 100644
--- a/include/sys/math_extras.h
+++ b/include/sys/math_extras.h
@@ -28,9 +28,9 @@
  * true if the operation overflowed.
  */
 /**@{*/
-static bool u16_add_overflow(u16_t a, u16_t b, u16_t *result);
-static bool u32_add_overflow(u32_t a, u32_t b, u32_t *result);
-static bool u64_add_overflow(u64_t a, u64_t b, u64_t *result);
+static bool u16_add_overflow(uint16_t a, uint16_t b, uint16_t *result);
+static bool u32_add_overflow(uint32_t a, uint32_t b, uint32_t *result);
+static bool u64_add_overflow(uint64_t a, uint64_t b, uint64_t *result);
 static bool size_add_overflow(size_t a, size_t b, size_t *result);
 /**@}*/
 
@@ -41,9 +41,9 @@ static bool size_add_overflow(size_t a, size_t b, size_t *result);
  * true if the operation overflowed.
  */
 /**@{*/
-static bool u16_mul_overflow(u16_t a, u16_t b, u16_t *result);
-static bool u32_mul_overflow(u32_t a, u32_t b, u32_t *result);
-static bool u64_mul_overflow(u64_t a, u64_t b, u64_t *result);
+static bool u16_mul_overflow(uint16_t a, uint16_t b, uint16_t *result);
+static bool u32_mul_overflow(uint32_t a, uint32_t b, uint32_t *result);
+static bool u64_mul_overflow(uint64_t a, uint64_t b, uint64_t *result);
 static bool size_mul_overflow(size_t a, size_t b, size_t *result);
 /**@}*/
 
@@ -54,8 +54,8 @@ static bool size_mul_overflow(size_t a, size_t b, size_t *result);
  * When `x = 0`, this is the size of `x` in bits.
  */
 /**@{*/
-static int u32_count_leading_zeros(u32_t x);
-static int u64_count_leading_zeros(u64_t x);
+static int u32_count_leading_zeros(uint32_t x);
+static int u64_count_leading_zeros(uint64_t x);
 /**@}*/
 
 /**
@@ -65,8 +65,8 @@ static int u64_count_leading_zeros(u64_t x);
  * When `x = 0`, this is the size of `x` in bits.
  */
 /**@{*/
-static int u32_count_trailing_zeros(u32_t x);
-static int u64_count_trailing_zeros(u64_t x);
+static int u32_count_trailing_zeros(uint32_t x);
+static int u64_count_trailing_zeros(uint64_t x);
 /**@}*/
 
 #include <sys/math_extras_impl.h>
diff --git a/include/sys/math_extras_impl.h b/include/sys/math_extras_impl.h
index bc7d23dcd7..a6f0ec79c2 100644
--- a/include/sys/math_extras_impl.h
+++ b/include/sys/math_extras_impl.h
@@ -29,17 +29,17 @@
 #endif
 
 #if use_builtin(__builtin_add_overflow)
-static inline bool u16_add_overflow(u16_t a, u16_t b, u16_t *result)
+static inline bool u16_add_overflow(uint16_t a, uint16_t b, uint16_t *result)
 {
 	return __builtin_add_overflow(a, b, result);
 }
 
-static inline bool u32_add_overflow(u32_t a, u32_t b, u32_t *result)
+static inline bool u32_add_overflow(uint32_t a, uint32_t b, uint32_t *result)
 {
 	return __builtin_add_overflow(a, b, result);
 }
 
-static inline bool u64_add_overflow(u64_t a, u64_t b, u64_t *result)
+static inline bool u64_add_overflow(uint64_t a, uint64_t b, uint64_t *result)
 {
 	return __builtin_add_overflow(a, b, result);
 }
@@ -49,27 +49,27 @@ static inline bool size_add_overflow(size_t a, size_t b, size_t *result)
 	return __builtin_add_overflow(a, b, result);
 }
 #else /* !use_builtin(__builtin_add_overflow) */
-static inline bool u16_add_overflow(u16_t a, u16_t b, u16_t *result)
+static inline bool u16_add_overflow(uint16_t a, uint16_t b, uint16_t *result)
 {
-	u16_t c = a + b;
+	uint16_t c = a + b;
 
 	*result = c;
 
 	return c < a;
 }
 
-static inline bool u32_add_overflow(u32_t a, u32_t b, u32_t *result)
+static inline bool u32_add_overflow(uint32_t a, uint32_t b, uint32_t *result)
 {
-	u32_t c = a + b;
+	uint32_t c = a + b;
 
 	*result = c;
 
 	return c < a;
 }
 
-static inline bool u64_add_overflow(u64_t a, u64_t b, u64_t *result)
+static inline bool u64_add_overflow(uint64_t a, uint64_t b, uint64_t *result)
 {
-	u64_t c = a + b;
+	uint64_t c = a + b;
 
 	*result = c;
 
@@ -87,17 +87,17 @@ static inline bool size_add_overflow(size_t a, size_t b, size_t *result)
 #endif /* use_builtin(__builtin_add_overflow) */
 
 #if use_builtin(__builtin_mul_overflow)
-static inline bool u16_mul_overflow(u16_t a, u16_t b, u16_t *result)
+static inline bool u16_mul_overflow(uint16_t a, uint16_t b, uint16_t *result)
 {
 	return __builtin_mul_overflow(a, b, result);
 }
 
-static inline bool u32_mul_overflow(u32_t a, u32_t b, u32_t *result)
+static inline bool u32_mul_overflow(uint32_t a, uint32_t b, uint32_t *result)
 {
 	return __builtin_mul_overflow(a, b, result);
 }
 
-static inline bool u64_mul_overflow(u64_t a, u64_t b, u64_t *result)
+static inline bool u64_mul_overflow(uint64_t a, uint64_t b, uint64_t *result)
 {
 	return __builtin_mul_overflow(a, b, result);
 }
@@ -107,27 +107,27 @@ static inline bool size_mul_overflow(size_t a, size_t b, size_t *result)
 	return __builtin_mul_overflow(a, b, result);
 }
 #else /* !use_builtin(__builtin_mul_overflow) */
-static inline bool u16_mul_overflow(u16_t a, u16_t b, u16_t *result)
+static inline bool u16_mul_overflow(uint16_t a, uint16_t b, uint16_t *result)
 {
-	u16_t c = a * b;
+	uint16_t c = a * b;
 
 	*result = c;
 
 	return a != 0 && (c / a) != b;
 }
 
-static inline bool u32_mul_overflow(u32_t a, u32_t b, u32_t *result)
+static inline bool u32_mul_overflow(uint32_t a, uint32_t b, uint32_t *result)
 {
-	u32_t c = a * b;
+	uint32_t c = a * b;
 
 	*result = c;
 
 	return a != 0 && (c / a) != b;
 }
 
-static inline bool u64_mul_overflow(u64_t a, u64_t b, u64_t *result)
+static inline bool u64_mul_overflow(uint64_t a, uint64_t b, uint64_t *result)
 {
-	u64_t c = a * b;
+	uint64_t c = a * b;
 
 	*result = c;
 
@@ -185,12 +185,12 @@ static inline bool size_mul_overflow(size_t a, size_t b, size_t *result)
  */
 
 #if use_builtin(__builtin_clz)
-static inline int u32_count_leading_zeros(u32_t x)
+static inline int u32_count_leading_zeros(uint32_t x)
 {
 	return x == 0 ? 32 : __builtin_clz(x);
 }
 #else /* !use_builtin(__builtin_clz) */
-static inline int u32_count_leading_zeros(u32_t x)
+static inline int u32_count_leading_zeros(uint32_t x)
 {
 	int b;
 
@@ -203,15 +203,15 @@ static inline int u32_count_leading_zeros(u32_t x)
 #endif /* use_builtin(__builtin_clz) */
 
 #if use_builtin(__builtin_clzll)
-static inline int u64_count_leading_zeros(u64_t x)
+static inline int u64_count_leading_zeros(uint64_t x)
 {
 	return x == 0 ? 64 : __builtin_clzll(x);
 }
 #else /* !use_builtin(__builtin_clzll) */
-static inline int u64_count_leading_zeros(u64_t x)
+static inline int u64_count_leading_zeros(uint64_t x)
 {
-	if (x == (u32_t)x) {
-		return 32 + u32_count_leading_zeros((u32_t)x);
+	if (x == (uint32_t)x) {
+		return 32 + u32_count_leading_zeros((uint32_t)x);
 	} else {
 		return u32_count_leading_zeros(x >> 32);
 	}
@@ -219,12 +219,12 @@ static inline int u64_count_leading_zeros(u64_t x)
 #endif /* use_builtin(__builtin_clzll) */
 
 #if use_builtin(__builtin_ctz)
-static inline int u32_count_trailing_zeros(u32_t x)
+static inline int u32_count_trailing_zeros(uint32_t x)
 {
 	return x == 0 ? 32 : __builtin_ctz(x);
 }
 #else /* !use_builtin(__builtin_ctz) */
-static inline int u32_count_trailing_zeros(u32_t x)
+static inline int u32_count_trailing_zeros(uint32_t x)
 {
 	int b;
 
@@ -237,15 +237,15 @@ static inline int u32_count_trailing_zeros(u32_t x)
 #endif /* use_builtin(__builtin_ctz) */
 
 #if use_builtin(__builtin_ctzll)
-static inline int u64_count_trailing_zeros(u64_t x)
+static inline int u64_count_trailing_zeros(uint64_t x)
 {
 	return x == 0 ? 64 : __builtin_ctzll(x);
 }
 #else /* !use_builtin(__builtin_ctzll) */
-static inline int u64_count_trailing_zeros(u64_t x)
+static inline int u64_count_trailing_zeros(uint64_t x)
 {
-	if ((u32_t)x) {
-		return u32_count_trailing_zeros((u32_t)x);
+	if ((uint32_t)x) {
+		return u32_count_trailing_zeros((uint32_t)x);
 	} else {
 		return 32 + u32_count_trailing_zeros(x >> 32);
 	}
diff --git a/include/sys/mempool.h b/include/sys/mempool.h
index f4079f5012..1eb017e82d 100644
--- a/include/sys/mempool.h
+++ b/include/sys/mempool.h
@@ -18,8 +18,8 @@ struct sys_mem_pool {
 
 struct sys_mem_pool_block {
 	struct sys_mem_pool *pool;
-	u32_t level : 4;
-	u32_t block : 28;
+	uint32_t level : 4;
+	uint32_t block : 28;
 };
 
 /**
diff --git a/include/sys/mempool_base.h b/include/sys/mempool_base.h
index 714e6cbd51..711854a824 100644
--- a/include/sys/mempool_base.h
+++ b/include/sys/mempool_base.h
@@ -17,8 +17,8 @@
 
 struct sys_mem_pool_lvl {
 	union {
-		u32_t *bits_p;
-		u32_t bits[sizeof(u32_t *)/4];
+		uint32_t *bits_p;
+		uint32_t bits[sizeof(uint32_t *)/4];
 	};
 	sys_dlist_t free_list;
 };
@@ -29,11 +29,11 @@ struct sys_mem_pool_lvl {
 struct sys_mem_pool_base {
 	void *buf;
 	size_t max_sz;
-	u16_t n_max;
-	u8_t n_levels;
-	s8_t max_inline_level;
+	uint16_t n_max;
+	uint8_t n_levels;
+	int8_t max_inline_level;
 	struct sys_mem_pool_lvl *levels;
-	u8_t flags;
+	uint8_t flags;
 };
 
 #define _MPOOL_MINBLK sizeof(sys_dnode_t)
@@ -59,7 +59,7 @@ struct sys_mem_pool_base {
 	Z_MPOOL_HAVE_LVL((maxsz), (minsz), 14) +	\
 	Z_MPOOL_HAVE_LVL((maxsz), (minsz), 15))
 
-/* Rounds the needed bits up to integer multiples of u32_t */
+/* Rounds the needed bits up to integer multiples of uint32_t */
 #define Z_MPOOL_LBIT_WORDS_UNCLAMPED(n_max, l) \
 	((((n_max) << (2*(l))) + 31) / 32)
 
@@ -67,7 +67,7 @@ struct sys_mem_pool_base {
  * otherwise the calculated unclamped value
  */
 #define Z_MPOOL_LBIT_WORDS(n_max, l)					 \
-	(Z_MPOOL_LBIT_WORDS_UNCLAMPED(n_max, l) <= sizeof(u32_t *)/4 ? 0 \
+	(Z_MPOOL_LBIT_WORDS_UNCLAMPED(n_max, l) <= sizeof(uint32_t *)/4 ? 0 \
 	 : Z_MPOOL_LBIT_WORDS_UNCLAMPED(n_max, l))
 
 /* How many bytes for the bitfields of a single level? */
@@ -98,9 +98,9 @@ struct sys_mem_pool_base {
 void z_sys_mem_pool_base_init(struct sys_mem_pool_base *p);
 
 int z_sys_mem_pool_block_alloc(struct sys_mem_pool_base *p, size_t size,
-			      u32_t *level_p, u32_t *block_p, void **data_p);
+			      uint32_t *level_p, uint32_t *block_p, void **data_p);
 
-void z_sys_mem_pool_block_free(struct sys_mem_pool_base *p, u32_t level,
-			      u32_t block);
+void z_sys_mem_pool_block_free(struct sys_mem_pool_base *p, uint32_t level,
+			      uint32_t block);
 
 #endif /* ZEPHYR_INCLUDE_SYS_MEMPOOL_BASE_H_ */
diff --git a/include/sys/notify.h b/include/sys/notify.h
index ce3791520f..a51b0982cb 100644
--- a/include/sys/notify.h
+++ b/include/sys/notify.h
@@ -162,7 +162,7 @@ struct sys_notify {
 	 * are zeroed by the async notify API init functions, and will
 	 * be zeroed by sys_notify_finalize().
 	 */
-	u32_t volatile flags;
+	uint32_t volatile flags;
 
 	/*
 	 * The result of the operation.
@@ -175,9 +175,9 @@ struct sys_notify {
 };
 
 /** @internal */
-static inline u32_t sys_notify_get_method(const struct sys_notify *notify)
+static inline uint32_t sys_notify_get_method(const struct sys_notify *notify)
 {
-	u32_t method = notify->flags >> SYS_NOTIFY_METHOD_POS;
+	uint32_t method = notify->flags >> SYS_NOTIFY_METHOD_POS;
 
 	return method & SYS_NOTIFY_METHOD_MASK;
 }
diff --git a/include/sys/onoff.h b/include/sys/onoff.h
index 7649416665..d8cf96b026 100644
--- a/include/sys/onoff.h
+++ b/include/sys/onoff.h
@@ -172,10 +172,10 @@ struct onoff_manager {
 	int last_res;
 
 	/* Flags identifying the service state. */
-	u16_t flags;
+	uint16_t flags;
 
 	/* Number of active clients for the service. */
-	u16_t refs;
+	uint16_t refs;
 };
 
 /** @brief Initializer for a onoff_transitions object.
@@ -249,7 +249,7 @@ struct onoff_client;
  */
 typedef void (*onoff_client_callback)(struct onoff_manager *mgr,
 				      struct onoff_client *cli,
-				      u32_t state,
+				      uint32_t state,
 				      int res);
 
 /**
@@ -508,7 +508,7 @@ int onoff_reset(struct onoff_manager *mgr,
  */
 typedef void (*onoff_monitor_callback)(struct onoff_manager *mgr,
 				       struct onoff_monitor *mon,
-				       u32_t state,
+				       uint32_t state,
 				       int res);
 
 /**
diff --git a/include/sys/ring_buffer.h b/include/sys/ring_buffer.h
index 1a112f9295..5d44b10522 100644
--- a/include/sys/ring_buffer.h
+++ b/include/sys/ring_buffer.h
@@ -19,33 +19,33 @@
 extern "C" {
 #endif
 
-#define SIZE32_OF(x) (sizeof((x))/sizeof(u32_t))
+#define SIZE32_OF(x) (sizeof((x))/sizeof(uint32_t))
 
 /**
  * @brief A structure to represent a ring buffer
  */
 struct ring_buf {
-	u32_t head;	 /**< Index in buf for the head element */
-	u32_t tail;	 /**< Index in buf for the tail element */
+	uint32_t head;	 /**< Index in buf for the head element */
+	uint32_t tail;	 /**< Index in buf for the tail element */
 	union ring_buf_misc {
 		struct ring_buf_misc_item_mode {
-			u32_t dropped_put_count; /**< Running tally of the
+			uint32_t dropped_put_count; /**< Running tally of the
 						   * number of failed put
 						   * attempts.
 						   */
 		} item_mode;
 		struct ring_buf_misc_byte_mode {
-			u32_t tmp_tail;
-			u32_t tmp_head;
+			uint32_t tmp_tail;
+			uint32_t tmp_head;
 		} byte_mode;
 	} misc;
-	u32_t size;   /**< Size of buf in 32-bit chunks */
+	uint32_t size;   /**< Size of buf in 32-bit chunks */
 
 	union ring_buf_buffer {
-		u32_t *buf32;	 /**< Memory region for stored entries */
-		u8_t *buf8;
+		uint32_t *buf32;	 /**< Memory region for stored entries */
+		uint8_t *buf8;
 	} buf;
-	u32_t mask;   /**< Modulo mask if size is a power of 2 */
+	uint32_t mask;   /**< Modulo mask if size is a power of 2 */
 };
 
 /**
@@ -71,7 +71,7 @@ struct ring_buf {
  * @param pow Ring buffer size exponent.
  */
 #define RING_BUF_ITEM_DECLARE_POW2(name, pow) \
-	static u32_t _ring_buffer_data_##name[BIT(pow)]; \
+	static uint32_t _ring_buffer_data_##name[BIT(pow)]; \
 	struct ring_buf name = { \
 		.size = (BIT(pow)),	  \
 		.mask = (BIT(pow)) - 1, \
@@ -97,7 +97,7 @@ struct ring_buf {
  * @param size32 Size of ring buffer (in 32-bit words).
  */
 #define RING_BUF_ITEM_DECLARE_SIZE(name, size32) \
-	static u32_t _ring_buffer_data_##name[size32]; \
+	static uint32_t _ring_buffer_data_##name[size32]; \
 	struct ring_buf name = { \
 		.size = size32, \
 		.buf = { .buf32 = _ring_buffer_data_##name} \
@@ -121,7 +121,7 @@ struct ring_buf {
  * @param size8 Size of ring buffer (in bytes).
  */
 #define RING_BUF_DECLARE(name, size8) \
-	static u8_t _ring_buffer_data_##name[size8]; \
+	static uint8_t _ring_buffer_data_##name[size8]; \
 	struct ring_buf name = { \
 		.size = size8, \
 		.buf = { .buf8 = _ring_buffer_data_##name} \
@@ -141,14 +141,14 @@ struct ring_buf {
  *
  * @param buf Address of ring buffer.
  * @param size Ring buffer size (in 32-bit words or bytes).
- * @param data Ring buffer data area (u32_t data[size] or u8_t data[size] for
+ * @param data Ring buffer data area (uint32_t data[size] or uint8_t data[size] for
  *	       bytes mode).
  */
-static inline void ring_buf_init(struct ring_buf *buf, u32_t size, void *data)
+static inline void ring_buf_init(struct ring_buf *buf, uint32_t size, void *data)
 {
 	memset(buf, 0, sizeof(struct ring_buf));
 	buf->size = size;
-	buf->buf.buf32 = (u32_t *)data;
+	buf->buf.buf32 = (uint32_t *)data;
 	if (is_power_of_two(size)) {
 		buf->mask = size - 1;
 	} else {
@@ -166,8 +166,8 @@ static inline void ring_buf_init(struct ring_buf *buf, u32_t size, void *data)
  *
  *  @return Ring buffer free space (in 32-bit words or bytes).
  */
-static inline u32_t z_ring_buf_custom_space_get(u32_t size, u32_t head,
-					      u32_t tail)
+static inline uint32_t z_ring_buf_custom_space_get(uint32_t size, uint32_t head,
+					      uint32_t tail)
 {
 	if (tail < head) {
 		return head - tail - 1;
@@ -208,7 +208,7 @@ static inline void ring_buf_reset(struct ring_buf *buf)
  *
  * @return Ring buffer free space (in 32-bit words or bytes).
  */
-static inline u32_t ring_buf_space_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_space_get(struct ring_buf *buf)
 {
 	return z_ring_buf_custom_space_get(buf->size, buf->head, buf->tail);
 }
@@ -220,7 +220,7 @@ static inline u32_t ring_buf_space_get(struct ring_buf *buf)
  *
  * @return Ring buffer capacity (in 32-bit words or bytes).
  */
-static inline u32_t ring_buf_capacity_get(struct ring_buf *buf)
+static inline uint32_t ring_buf_capacity_get(struct ring_buf *buf)
 {
 	/* One element is used to distinguish between empty and full state. */
 	return buf->size - 1;
@@ -247,8 +247,8 @@ static inline u32_t ring_buf_capacity_get(struct ring_buf *buf)
  * @retval 0 Data item was written.
  * @retval -EMSGSIZE Ring buffer has insufficient free space.
  */
-int ring_buf_item_put(struct ring_buf *buf, u16_t type, u8_t value,
-		      u32_t *data, u8_t size32);
+int ring_buf_item_put(struct ring_buf *buf, uint16_t type, uint8_t value,
+		      uint32_t *data, uint8_t size32);
 
 /**
  * @brief Read a data item from a ring buffer.
@@ -274,8 +274,8 @@ int ring_buf_item_put(struct ring_buf *buf, u16_t type, u8_t value,
  * @retval -EMSGSIZE Data area @a data is too small; @a size32 now contains
  *         the number of 32-bit words needed.
  */
-int ring_buf_item_get(struct ring_buf *buf, u16_t *type, u8_t *value,
-		      u32_t *data, u8_t *size32);
+int ring_buf_item_get(struct ring_buf *buf, uint16_t *type, uint8_t *value,
+		      uint32_t *data, uint8_t *size32);
 
 /**
  * @brief Allocate buffer for writing data to a ring buffer.
@@ -301,7 +301,7 @@ int ring_buf_item_get(struct ring_buf *buf, u16_t *type, u8_t *value,
  * @return Size of allocated buffer which can be smaller than requested if
  *	   there is not enough free space or buffer wraps.
  */
-u32_t ring_buf_put_claim(struct ring_buf *buf, u8_t **data, u32_t size);
+uint32_t ring_buf_put_claim(struct ring_buf *buf, uint8_t **data, uint32_t size);
 
 /**
  * @brief Indicate number of bytes written to allocated buffers.
@@ -321,7 +321,7 @@ u32_t ring_buf_put_claim(struct ring_buf *buf, u8_t **data, u32_t size);
  * @retval 0 Successful operation.
  * @retval -EINVAL Provided @a size exceeds free space in the ring buffer.
  */
-int ring_buf_put_finish(struct ring_buf *buf, u32_t size);
+int ring_buf_put_finish(struct ring_buf *buf, uint32_t size);
 
 /**
  * @brief Write (copy) data to a ring buffer.
@@ -343,7 +343,7 @@ int ring_buf_put_finish(struct ring_buf *buf, u32_t size);
  *
  * @retval Number of bytes written.
  */
-u32_t ring_buf_put(struct ring_buf *buf, const u8_t *data, u32_t size);
+uint32_t ring_buf_put(struct ring_buf *buf, const uint8_t *data, uint32_t size);
 
 /**
  * @brief Get address of a valid data in a ring buffer.
@@ -369,7 +369,7 @@ u32_t ring_buf_put(struct ring_buf *buf, const u8_t *data, u32_t size);
  * @return Number of valid bytes in the provided buffer which can be smaller
  *	   than requested if there is not enough free space or buffer wraps.
  */
-u32_t ring_buf_get_claim(struct ring_buf *buf, u8_t **data, u32_t size);
+uint32_t ring_buf_get_claim(struct ring_buf *buf, uint8_t **data, uint32_t size);
 
 /**
  * @brief Indicate number of bytes read from claimed buffer.
@@ -389,7 +389,7 @@ u32_t ring_buf_get_claim(struct ring_buf *buf, u8_t **data, u32_t size);
  * @retval 0 Successful operation.
  * @retval -EINVAL Provided @a size exceeds valid bytes in the ring buffer.
  */
-int ring_buf_get_finish(struct ring_buf *buf, u32_t size);
+int ring_buf_get_finish(struct ring_buf *buf, uint32_t size);
 
 /**
  * @brief Read data from a ring buffer.
@@ -411,7 +411,7 @@ int ring_buf_get_finish(struct ring_buf *buf, u32_t size);
  *
  * @retval Number of bytes written to the output buffer.
  */
-u32_t ring_buf_get(struct ring_buf *buf, u8_t *data, u32_t size);
+uint32_t ring_buf_get(struct ring_buf *buf, uint8_t *data, uint32_t size);
 
 /**
  * @}
diff --git a/include/sys/sflist.h b/include/sys/sflist.h
index fc5f9dedbf..c6cb138d25 100644
--- a/include/sys/sflist.h
+++ b/include/sys/sflist.h
@@ -26,9 +26,9 @@ extern "C" {
 #endif
 
 #ifdef __LP64__
-typedef u64_t unative_t;
+typedef uint64_t unative_t;
 #else
-typedef u32_t unative_t;
+typedef uint32_t unative_t;
 #endif
 
 struct _sfnode {
@@ -207,12 +207,12 @@ static inline sys_sfnode_t *z_sfnode_next_peek(sys_sfnode_t *node)
 	return (sys_sfnode_t *)(node->next_and_flags & ~SYS_SFLIST_FLAGS_MASK);
 }
 
-static inline u8_t sys_sfnode_flags_get(sys_sfnode_t *node);
+static inline uint8_t sys_sfnode_flags_get(sys_sfnode_t *node);
 
 static inline void z_sfnode_next_set(sys_sfnode_t *parent,
 				       sys_sfnode_t *child)
 {
-	u8_t cur_flags = sys_sfnode_flags_get(parent);
+	uint8_t cur_flags = sys_sfnode_flags_get(parent);
 
 	parent->next_and_flags = cur_flags | (unative_t)child;
 }
@@ -261,7 +261,7 @@ static inline sys_sfnode_t *sys_sflist_peek_tail(sys_sflist_t *list)
  * @param node A pointer to the node to fetch flags from
  * @return The value of flags, which will be between 0 and 3
  */
-static inline u8_t sys_sfnode_flags_get(sys_sfnode_t *node)
+static inline uint8_t sys_sfnode_flags_get(sys_sfnode_t *node)
 {
 	return node->next_and_flags & SYS_SFLIST_FLAGS_MASK;
 }
@@ -279,7 +279,7 @@ static inline u8_t sys_sfnode_flags_get(sys_sfnode_t *node)
  * @param node A pointer to the node to set the flags on
  * @param flags A value between 0 and 3 to set the flags value
  */
-static inline void sys_sfnode_init(sys_sfnode_t *node, u8_t flags)
+static inline void sys_sfnode_init(sys_sfnode_t *node, uint8_t flags)
 {
 	__ASSERT((flags & ~SYS_SFLIST_FLAGS_MASK) == 0UL, "flags too large");
 	node->next_and_flags = flags;
@@ -295,7 +295,7 @@ static inline void sys_sfnode_init(sys_sfnode_t *node, u8_t flags)
  * @param node A pointer to the node to set the flags on
  * @param flags A value between 0 and 3 to set the flags value
  */
-static inline void sys_sfnode_flags_set(sys_sfnode_t *node, u8_t flags)
+static inline void sys_sfnode_flags_set(sys_sfnode_t *node, uint8_t flags)
 {
 	__ASSERT((flags & ~SYS_SFLIST_FLAGS_MASK) == 0UL, "flags too large");
 	node->next_and_flags = (unative_t)(z_sfnode_next_peek(node)) | flags;
diff --git a/include/sys/speculation.h b/include/sys/speculation.h
index 1b05e226e4..a0731c8bc8 100644
--- a/include/sys/speculation.h
+++ b/include/sys/speculation.h
@@ -30,10 +30,10 @@
  * @param array_size Size of the array
  * @return The original index value if < size, or 0
  */
-static inline u32_t k_array_index_sanitize(u32_t index, u32_t array_size)
+static inline uint32_t k_array_index_sanitize(uint32_t index, uint32_t array_size)
 {
 #ifdef CONFIG_BOUNDS_CHECK_BYPASS_MITIGATION
-	s32_t signed_index = index, signed_array_size = array_size;
+	int32_t signed_index = index, signed_array_size = array_size;
 
 	/* Take the difference between index and max.
 	 * A proper value will result in a negative result. We also AND in
@@ -43,7 +43,7 @@ static inline u32_t k_array_index_sanitize(u32_t index, u32_t array_size)
 	 * Sign-extend just the sign bit to produce a mask of all 1s (accept)
 	 * or all 0s (truncate).
 	 */
-	u32_t mask = ((signed_index - signed_array_size) & ~signed_index) >> 31;
+	uint32_t mask = ((signed_index - signed_array_size) & ~signed_index) >> 31;
 
 	return index & mask;
 #else
diff --git a/include/sys/sys_heap.h b/include/sys/sys_heap.h
index 829658ca7f..4d23220817 100644
--- a/include/sys/sys_heap.h
+++ b/include/sys/sys_heap.h
@@ -55,10 +55,10 @@ struct sys_heap {
 };
 
 struct z_heap_stress_result {
-	u32_t total_allocs;
-	u32_t successful_allocs;
-	u32_t total_frees;
-	u64_t accumulated_in_use_bytes;
+	uint32_t total_allocs;
+	uint32_t successful_allocs;
+	uint32_t total_frees;
+	uint64_t accumulated_in_use_bytes;
 };
 
 /** @brief Initialize sys_heap
@@ -150,7 +150,7 @@ bool sys_heap_validate(struct sys_heap *h);
 void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
 		     void (*free)(void *arg, void *p),
 		     void *arg, size_t total_bytes,
-		     u32_t op_count,
+		     uint32_t op_count,
 		     void *scratch_mem, size_t scratch_bytes,
 		     int target_percent,
 		     struct z_heap_stress_result *result);
diff --git a/include/sys/sys_io.h b/include/sys/sys_io.h
index 153400c251..f34999186c 100644
--- a/include/sys/sys_io.h
+++ b/include/sys/sys_io.h
@@ -16,14 +16,14 @@
 extern "C" {
 #endif
 
-typedef u32_t io_port_t;
-typedef u32_t mm_reg_t;
+typedef uint32_t io_port_t;
+typedef uint32_t mm_reg_t;
 typedef uintptr_t mem_addr_t;
 
 /* Port I/O functions */
 
 /**
- * @fn static inline void sys_out8(u8_t data, io_port_t port);
+ * @fn static inline void sys_out8(uint8_t data, io_port_t port);
  * @brief Output a byte to an I/O port
  *
  * This function writes a byte to the given port.
@@ -33,7 +33,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u8_t sys_in8(io_port_t port);
+ * @fn static inline uint8_t sys_in8(io_port_t port);
  * @brief Input a byte from an I/O port
  *
  * This function reads a byte from the port.
@@ -44,7 +44,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline void sys_out16(u16_t data, io_port_t port);
+ * @fn static inline void sys_out16(uint16_t data, io_port_t port);
  * @brief Output a 16 bits to an I/O port
  *
  * This function writes a 16 bits to the given port.
@@ -54,7 +54,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u16_t sys_in16(io_port_t port);
+ * @fn static inline uint16_t sys_in16(io_port_t port);
  * @brief Input 16 bits from an I/O port
  *
  * This function reads 16 bits from the port.
@@ -65,7 +65,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline void sys_out32(u32_t data, io_port_t port);
+ * @fn static inline void sys_out32(uint32_t data, io_port_t port);
  * @brief Output 32 bits to an I/O port
  *
  * This function writes 32 bits to the given port.
@@ -75,7 +75,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u32_t sys_in32(io_port_t port);
+ * @fn static inline uint32_t sys_in32(io_port_t port);
  * @brief Input 32 bits from an I/O port
  *
  * This function reads 32 bits from the port.
@@ -147,7 +147,7 @@ typedef uintptr_t mem_addr_t;
 /* Memory mapped registers I/O functions */
 
 /**
- * @fn static inline void sys_write8(u8_t data, mm_reg_t addr);
+ * @fn static inline void sys_write8(uint8_t data, mm_reg_t addr);
  * @brief Write a byte to a memory mapped register
  *
  * This function writes a byte to the given memory mapped register.
@@ -157,7 +157,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u8_t sys_read8(mm_reg_t addr);
+ * @fn static inline uint8_t sys_read8(mm_reg_t addr);
  * @brief Read a byte from a memory mapped register
  *
  * This function reads a byte from the given memory mapped register.
@@ -168,7 +168,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline void sys_write16(u16_t data, mm_reg_t addr);
+ * @fn static inline void sys_write16(uint16_t data, mm_reg_t addr);
  * @brief Write 16 bits to a memory mapped register
  *
  * This function writes 16 bits to the given memory mapped register.
@@ -178,7 +178,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u16_t sys_read16(mm_reg_t addr);
+ * @fn static inline uint16_t sys_read16(mm_reg_t addr);
  * @brief Read 16 bits from a memory mapped register
  *
  * This function reads 16 bits from the given memory mapped register.
@@ -190,7 +190,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline void sys_write32(u32_t data, mm_reg_t addr);
+ * @fn static inline void sys_write32(uint32_t data, mm_reg_t addr);
  * @brief Write 32 bits to a memory mapped register
  *
  * This function writes 32 bits to the given memory mapped register.
@@ -200,7 +200,7 @@ typedef uintptr_t mem_addr_t;
  */
 
 /**
- * @fn static inline u32_t sys_read32(mm_reg_t addr);
+ * @fn static inline uint32_t sys_read32(mm_reg_t addr);
  * @brief Read 32 bits from a memory mapped register
  *
  * This function reads 32 bits from the given memory mapped register.
diff --git a/include/sys/time_units.h b/include/sys/time_units.h
index ddcb5fc7a1..2b412e9076 100644
--- a/include/sys/time_units.h
+++ b/include/sys/time_units.h
@@ -75,8 +75,8 @@ static TIME_CONSTEXPR inline int sys_clock_hw_cycles_per_sec(void)
  *    round_off - Return the nearest value to the resulting fraction
  *                (pass both round_up/off as false to get "round_down")
  */
-static TIME_CONSTEXPR ALWAYS_INLINE u64_t z_tmcvt(u64_t t, u32_t from_hz,
-						  u32_t to_hz, bool const_hz,
+static TIME_CONSTEXPR ALWAYS_INLINE uint64_t z_tmcvt(uint64_t t, uint32_t from_hz,
+						  uint32_t to_hz, bool const_hz,
 						  bool result32, bool round_up,
 						  bool round_off)
 {
@@ -86,13 +86,13 @@ static TIME_CONSTEXPR ALWAYS_INLINE u64_t z_tmcvt(u64_t t, u32_t from_hz,
 		(from_hz > to_hz) && ((from_hz % to_hz) == 0);
 
 	if (from_hz == to_hz) {
-		return result32 ? ((u32_t)t) : t;
+		return result32 ? ((uint32_t)t) : t;
 	}
 
-	u64_t off = 0;
+	uint64_t off = 0;
 
 	if (!mul_ratio) {
-		u32_t rdivisor = div_ratio ? (from_hz / to_hz) : from_hz;
+		uint32_t rdivisor = div_ratio ? (from_hz / to_hz) : from_hz;
 
 		if (round_up) {
 			off = rdivisor - 1;
@@ -109,19 +109,19 @@ static TIME_CONSTEXPR ALWAYS_INLINE u64_t z_tmcvt(u64_t t, u32_t from_hz,
 	if (div_ratio) {
 		t += off;
 		if (result32 && (t < BIT64(32))) {
-			return ((u32_t)t) / (from_hz / to_hz);
+			return ((uint32_t)t) / (from_hz / to_hz);
 		} else {
 			return t / (from_hz / to_hz);
 		}
 	} else if (mul_ratio) {
 		if (result32) {
-			return ((u32_t)t) * (to_hz / from_hz);
+			return ((uint32_t)t) * (to_hz / from_hz);
 		} else {
 			return t * (to_hz / from_hz);
 		}
 	} else {
 		if (result32) {
-			return (u32_t)((t * to_hz + off) / from_hz);
+			return (uint32_t)((t * to_hz + off) / from_hz);
 		} else {
 			return (t * to_hz + off) / from_hz;
 		}
@@ -211,7 +211,7 @@ static TIME_CONSTEXPR ALWAYS_INLINE u64_t z_tmcvt(u64_t t, u32_t from_hz,
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_cyc_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, true, false, false);
@@ -225,7 +225,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_cyc_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, false, false, false);
@@ -239,7 +239,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_cyc_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, true, false, true);
@@ -253,7 +253,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_cyc_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, false, false, true);
@@ -267,7 +267,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_cyc_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, true, true, false);
@@ -281,7 +281,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_cyc_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_cyc_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_cyc, Z_CCYC, false, true, false);
@@ -295,7 +295,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_cyc_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_ticks_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, true, false, false);
@@ -309,7 +309,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_ticks_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, false, false, false);
@@ -323,7 +323,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_ticks_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, true, false, true);
@@ -337,7 +337,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_ticks_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, false, false, true);
@@ -351,7 +351,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ms_to_ticks_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, true, true, false);
@@ -365,7 +365,7 @@ static TIME_CONSTEXPR inline u32_t k_ms_to_ticks_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ms_to_ticks_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ms, Z_HZ_ticks, true, false, true, false);
@@ -379,7 +379,7 @@ static TIME_CONSTEXPR inline u64_t k_ms_to_ticks_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_cyc_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_cyc_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, true, false, false);
@@ -393,7 +393,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_cyc_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_cyc_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_cyc_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, false, false, false);
@@ -407,7 +407,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_cyc_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_cyc_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_cyc_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, true, false, true);
@@ -421,7 +421,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_cyc_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_cyc_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_cyc_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, false, false, true);
@@ -435,7 +435,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_cyc_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_cyc_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_cyc_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, true, true, false);
@@ -449,7 +449,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_cyc_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_cyc_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_cyc_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_cyc, Z_CCYC, false, true, false);
@@ -463,7 +463,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_cyc_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_ticks_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_ticks_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, true, false, false);
@@ -477,7 +477,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_ticks_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_ticks_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_ticks_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, false, false, false);
@@ -491,7 +491,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_ticks_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_ticks_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_ticks_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, true, false, true);
@@ -505,7 +505,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_ticks_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_ticks_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_ticks_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, false, false, true);
@@ -519,7 +519,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_ticks_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_us_to_ticks_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_us_to_ticks_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, true, true, false);
@@ -533,7 +533,7 @@ static TIME_CONSTEXPR inline u32_t k_us_to_ticks_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_us_to_ticks_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_us_to_ticks_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_us, Z_HZ_ticks, true, false, true, false);
@@ -547,7 +547,7 @@ static TIME_CONSTEXPR inline u64_t k_us_to_ticks_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_cyc_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, true, false, false);
@@ -561,7 +561,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_cyc_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, false, false, false);
@@ -575,7 +575,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_cyc_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, true, false, true);
@@ -589,7 +589,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_cyc_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, false, false, true);
@@ -603,7 +603,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_cyc_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, true, true, false);
@@ -617,7 +617,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_cyc_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_cyc_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_cyc, Z_CCYC, false, true, false);
@@ -631,7 +631,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_cyc_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_ticks_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, true, false, false);
@@ -645,7 +645,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_ticks_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, false, false, false);
@@ -659,7 +659,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_ticks_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, true, false, true);
@@ -673,7 +673,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_ticks_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, false, false, true);
@@ -687,7 +687,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ns_to_ticks_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, true, true, false);
@@ -701,7 +701,7 @@ static TIME_CONSTEXPR inline u32_t k_ns_to_ticks_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ns_to_ticks_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ns, Z_HZ_ticks, true, false, true, false);
@@ -715,7 +715,7 @@ static TIME_CONSTEXPR inline u64_t k_ns_to_ticks_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ms_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, true, false, false);
@@ -729,7 +729,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ms_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, false, false, false);
@@ -743,7 +743,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ms_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, true, false, true);
@@ -757,7 +757,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ms_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, false, false, true);
@@ -771,7 +771,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ms_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, true, true, false);
@@ -785,7 +785,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ms_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ms_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ms, Z_CCYC, false, true, false);
@@ -799,7 +799,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ms_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_us_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_us_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, true, false, false);
@@ -813,7 +813,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_us_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_us_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_us_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, false, false, false);
@@ -827,7 +827,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_us_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_us_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_us_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, true, false, true);
@@ -841,7 +841,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_us_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_us_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_us_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, false, false, true);
@@ -855,7 +855,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_us_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_us_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_us_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, true, true, false);
@@ -869,7 +869,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_us_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_us_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_us_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_us, Z_CCYC, false, true, false);
@@ -883,7 +883,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_us_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ns_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, true, false, false);
@@ -897,7 +897,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ns_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, false, false, false);
@@ -911,7 +911,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ns_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, true, false, true);
@@ -925,7 +925,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ns_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, false, false, true);
@@ -939,7 +939,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ns_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, true, true, false);
@@ -953,7 +953,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ns_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ns_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ns, Z_CCYC, false, true, false);
@@ -967,7 +967,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ns_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ticks_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, true, false, false);
@@ -981,7 +981,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ticks_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, false, false, false);
@@ -995,7 +995,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ticks_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, true, false, true);
@@ -1009,7 +1009,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ticks_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, false, false, true);
@@ -1023,7 +1023,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_cyc_to_ticks_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, true, true, false);
@@ -1037,7 +1037,7 @@ static TIME_CONSTEXPR inline u32_t k_cyc_to_ticks_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_cyc_to_ticks_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_cyc, Z_HZ_ticks, Z_CCYC, false, true, false);
@@ -1051,7 +1051,7 @@ static TIME_CONSTEXPR inline u64_t k_cyc_to_ticks_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ms_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, true, false, false);
@@ -1065,7 +1065,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ms_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, false, false, false);
@@ -1079,7 +1079,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ms_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, true, false, true);
@@ -1093,7 +1093,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ms_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, false, false, true);
@@ -1107,7 +1107,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ms_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, true, true, false);
@@ -1121,7 +1121,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ms_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ms_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ms, true, false, true, false);
@@ -1135,7 +1135,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ms_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_us_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_us_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, true, false, false);
@@ -1149,7 +1149,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_us_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_us_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_us_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, false, false, false);
@@ -1163,7 +1163,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_us_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_us_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_us_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, true, false, true);
@@ -1177,7 +1177,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_us_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_us_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_us_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, false, false, true);
@@ -1191,7 +1191,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_us_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_us_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_us_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, true, true, false);
@@ -1205,7 +1205,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_us_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_us_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_us_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_us, true, false, true, false);
@@ -1219,7 +1219,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_us_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ns_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, true, false, false);
@@ -1233,7 +1233,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ns_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, false, false, false);
@@ -1247,7 +1247,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ns_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, true, false, true);
@@ -1261,7 +1261,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ns_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, false, false, true);
@@ -1275,7 +1275,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_ns_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, true, true, false);
@@ -1289,7 +1289,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_ns_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_ns_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_ns, true, false, true, false);
@@ -1303,7 +1303,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_ns_ceil64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_floor32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_cyc_floor32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, true, false, false);
@@ -1317,7 +1317,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_floor32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_cyc_floor64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_cyc_floor64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, false, false, false);
@@ -1331,7 +1331,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_cyc_floor64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_near32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_cyc_near32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, true, false, true);
@@ -1345,7 +1345,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_near32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_cyc_near64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_cyc_near64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, false, false, true);
@@ -1359,7 +1359,7 @@ static TIME_CONSTEXPR inline u64_t k_ticks_to_cyc_near64(u64_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_ceil32(u32_t t)
+static TIME_CONSTEXPR inline uint32_t k_ticks_to_cyc_ceil32(uint32_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, true, true, false);
@@ -1373,7 +1373,7 @@ static TIME_CONSTEXPR inline u32_t k_ticks_to_cyc_ceil32(u32_t t)
  *
  * @return The converted time value
  */
-static TIME_CONSTEXPR inline u64_t k_ticks_to_cyc_ceil64(u64_t t)
+static TIME_CONSTEXPR inline uint64_t k_ticks_to_cyc_ceil64(uint64_t t)
 {
 	/* Generated.  Do not edit.  See above. */
 	return z_tmcvt(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, false, true, false);
diff --git a/include/sys/timeutil.h b/include/sys/timeutil.h
index 023e16de29..ab7a422771 100644
--- a/include/sys/timeutil.h
+++ b/include/sys/timeutil.h
@@ -38,7 +38,7 @@ extern "C" {
  *
  * @see http://man7.org/linux/man-pages/man3/timegm.3.html
  */
-s64_t timeutil_timegm64(const struct tm *tm);
+int64_t timeutil_timegm64(const struct tm *tm);
 
 /**
  * @brief Convert broken-down time to a POSIX epoch offset in seconds.
diff --git a/include/sys/util.h b/include/sys/util.h
index a53265e800..8828c4d736 100644
--- a/include/sys/util.h
+++ b/include/sys/util.h
@@ -118,9 +118,9 @@ static inline bool is_power_of_two(unsigned int x)
 	return (x != 0U) && ((x & (x - 1)) == 0U);
 }
 
-static inline s64_t arithmetic_shift_right(s64_t value, u8_t shift)
+static inline int64_t arithmetic_shift_right(int64_t value, uint8_t shift)
 {
-	s64_t sign_ext;
+	int64_t sign_ext;
 
 	if (shift == 0U) {
 		return value;
@@ -144,7 +144,7 @@ static inline s64_t arithmetic_shift_right(s64_t value, u8_t shift)
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int char2hex(char c, u8_t *x);
+int char2hex(char c, uint8_t *x);
 
 /**
  * @brief      Convert a single hexadecimal nibble into a character.
@@ -154,7 +154,7 @@ int char2hex(char c, u8_t *x);
  *
  *  @return Zero on success or (negative) error code otherwise.
  */
-int hex2char(u8_t x, char *c);
+int hex2char(uint8_t x, char *c);
 
 /**
  * @brief      Convert a binary array into string representation.
@@ -166,7 +166,7 @@ int hex2char(u8_t x, char *c);
  *
  * @return     The length of the converted string, or 0 if an error occurred.
  */
-size_t bin2hex(const u8_t *buf, size_t buflen, char *hex, size_t hexlen);
+size_t bin2hex(const uint8_t *buf, size_t buflen, char *hex, size_t hexlen);
 
 /*
  * Convert hex string to byte string
@@ -184,12 +184,12 @@ size_t bin2hex(const u8_t *buf, size_t buflen, char *hex, size_t hexlen);
  *
  * @return     The length of the binary array , or 0 if an error occurred.
  */
-size_t hex2bin(const char *hex, size_t hexlen, u8_t *buf, size_t buflen);
+size_t hex2bin(const char *hex, size_t hexlen, uint8_t *buf, size_t buflen);
 
 /**
- * @brief      Convert a u8_t into decimal string representation.
+ * @brief      Convert a uint8_t into decimal string representation.
  *
- * Convert a u8_t value into ASCII decimal string representation.
+ * Convert a uint8_t value into ASCII decimal string representation.
  * The string is terminated if there is enough space in buf.
  *
  * @param[out] buf     Address of where to store the string representation.
@@ -199,7 +199,7 @@ size_t hex2bin(const char *hex, size_t hexlen, u8_t *buf, size_t buflen);
  * @return     The length of the converted string (excluding terminator if
  *             any), or 0 if an error occurred.
  */
-u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value);
+uint8_t u8_to_dec(char *buf, uint8_t buflen, uint8_t value);
 
 #endif /* !_ASMLANGUAGE */
 
@@ -297,12 +297,12 @@ u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value);
  *
  * Usage example:
  *
- * \#define MACRO(x) COND_CODE_1(CONFIG_FLAG, (u32_t x;), ())
+ * \#define MACRO(x) COND_CODE_1(CONFIG_FLAG, (uint32_t x;), ())
  *
  * It can be considered as alternative to:
  *
  * \#if defined(CONFIG_FLAG) && (CONFIG_FLAG == 1)
- * \#define MACRO(x) u32_t x;
+ * \#define MACRO(x) uint32_t x;
  * \#else
  * \#define MACRO(x)
  * \#endif
@@ -331,12 +331,12 @@ u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value);
  *
  * Usage example:
  *
- * IF_ENABLED(CONFIG_FLAG, (u32_t foo;))
+ * IF_ENABLED(CONFIG_FLAG, (uint32_t foo;))
  *
  * It can be considered as more compact alternative to:
  *
  * \#if defined(CONFIG_FLAG) && (CONFIG_FLAG == 1)
- *	u32_t foo;
+ *	uint32_t foo;
  * \#endif
  *
  * @param _flag		Evaluated flag
diff --git a/include/sys_clock.h b/include/sys_clock.h
index ba8f82fa51..32344046ac 100644
--- a/include/sys_clock.h
+++ b/include/sys_clock.h
@@ -43,9 +43,9 @@ extern "C" {
  * is always a 64 bit count of ticks.
  */
 #ifdef CONFIG_TIMEOUT_64BIT
-typedef s64_t k_ticks_t;
+typedef int64_t k_ticks_t;
 #else
-typedef u32_t k_ticks_t;
+typedef uint32_t k_ticks_t;
 #endif
 
 #define K_TICKS_FOREVER ((k_ticks_t) -1)
@@ -102,7 +102,7 @@ typedef struct {
 #else
 
 /* Legacy timeout API */
-typedef s32_t k_timeout_t;
+typedef int32_t k_timeout_t;
 #define K_TIMEOUT_EQ(a, b) ((a) == (b))
 #define Z_TIMEOUT_NO_WAIT 0
 #define Z_TIMEOUT_TICKS(t) k_ticks_to_ms_ceil32(t)
@@ -161,19 +161,19 @@ extern void z_enable_sys_clock(void);
 #endif
 
 #define __ticks_to_ms(t) __DEPRECATED_MACRO \
-	k_ticks_to_ms_floor64((u64_t)(t))
+	k_ticks_to_ms_floor64((uint64_t)(t))
 #define z_ms_to_ticks(t) \
-	((s32_t)k_ms_to_ticks_ceil32((u32_t)(t)))
+	((int32_t)k_ms_to_ticks_ceil32((uint32_t)(t)))
 #define __ticks_to_us(t) __DEPRECATED_MACRO \
-	((s32_t)k_ticks_to_us_floor32((u32_t)(t)))
+	((int32_t)k_ticks_to_us_floor32((uint32_t)(t)))
 #define z_us_to_ticks(t) __DEPRECATED_MACRO \
-	((s32_t)k_us_to_ticks_ceil32((u32_t)(t)))
+	((int32_t)k_us_to_ticks_ceil32((uint32_t)(t)))
 #define sys_clock_hw_cycles_per_tick() __DEPRECATED_MACRO \
 	((int)k_ticks_to_cyc_floor32(1U))
 #define SYS_CLOCK_HW_CYCLES_TO_NS64(t) __DEPRECATED_MACRO \
-	k_cyc_to_ns_floor64((u64_t)(t))
+	k_cyc_to_ns_floor64((uint64_t)(t))
 #define SYS_CLOCK_HW_CYCLES_TO_NS(t) __DEPRECATED_MACRO \
-	((u32_t)k_cyc_to_ns_floor64(t))
+	((uint32_t)k_cyc_to_ns_floor64(t))
 
 /* added tick needed to account for tick in progress */
 #define _TICK_ALIGN 1
@@ -183,7 +183,7 @@ extern void z_enable_sys_clock(void);
  * and calculates the average cycle time
  */
 #define SYS_CLOCK_HW_CYCLES_TO_NS_AVG(X, NCYCLES) \
-	(u32_t)(k_cyc_to_ns_floor64(X) / NCYCLES)
+	(uint32_t)(k_cyc_to_ns_floor64(X) / NCYCLES)
 
 /**
  * @defgroup clock_apis Kernel Clock APIs
@@ -202,7 +202,7 @@ extern void z_enable_sys_clock(void);
  * @return the current system tick count
  *
  */
-u32_t z_tick_get_32(void);
+uint32_t z_tick_get_32(void);
 
 /**
  *
@@ -211,14 +211,14 @@ u32_t z_tick_get_32(void);
  * @return the current system tick count
  *
  */
-s64_t z_tick_get(void);
+int64_t z_tick_get(void);
 
 #ifndef CONFIG_SYS_CLOCK_EXISTS
 #define z_tick_get() (0)
 #define z_tick_get_32() (0)
 #endif
 
-u64_t z_timeout_end_calc(k_timeout_t timeout);
+uint64_t z_timeout_end_calc(k_timeout_t timeout);
 
 #ifdef __cplusplus
 }
diff --git a/include/timeout_q.h b/include/timeout_q.h
index 74b5a7368e..e32dc13873 100644
--- a/include/timeout_q.h
+++ b/include/timeout_q.h
@@ -54,9 +54,9 @@ static inline int z_abort_thread_timeout(struct k_thread *thread)
 	return z_abort_timeout(&thread->base.timeout);
 }
 
-s32_t z_get_next_timeout_expiry(void);
+int32_t z_get_next_timeout_expiry(void);
 
-void z_set_timeout_expiry(s32_t ticks, bool idle);
+void z_set_timeout_expiry(int32_t ticks, bool idle);
 
 k_ticks_t z_timeout_remaining(struct _timeout *timeout);
 
@@ -66,7 +66,7 @@ k_ticks_t z_timeout_remaining(struct _timeout *timeout);
 #define z_init_thread_timeout(t) do {} while (false)
 #define z_abort_thread_timeout(t) (0)
 #define z_is_inactive_timeout(t) 0
-#define z_get_next_timeout_expiry() ((s32_t) K_TICKS_FOREVER)
+#define z_get_next_timeout_expiry() ((int32_t) K_TICKS_FOREVER)
 #define z_set_timeout_expiry(t, i) do {} while (false)
 
 static inline void z_add_thread_timeout(struct k_thread *th, k_timeout_t ticks)
diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h
index e63d1e16b4..1c7008a966 100644
--- a/include/toolchain/gcc.h
+++ b/include/toolchain/gcc.h
@@ -441,7 +441,7 @@ do {                                                                    \
  * @note Macro has limited usage compared to the standard macro as it cannot be
  *	 used:
  *	 - to generate constant integer, e.g. __aligned(Z_MAX(4,5))
- *	 - static variable, e.g. array like static u8_t array[Z_MAX(...)];
+ *	 - static variable, e.g. array like static uint8_t array[Z_MAX(...)];
  */
 #define Z_MAX(a, b) ({ \
 		/* random suffix to avoid naming conflict */ \
diff --git a/include/toolchain/zephyr_stdint.h b/include/toolchain/zephyr_stdint.h
index b74d3fad88..7cea619bdf 100644
--- a/include/toolchain/zephyr_stdint.h
+++ b/include/toolchain/zephyr_stdint.h
@@ -11,7 +11,7 @@
  * Some gcc versions and/or configurations as found in the Zephyr SDK
  * (questionably) define __INT32_TYPE__ and derrivatives as a long int
  * which makes the printf format checker to complain about long vs int
- * mismatch when %u is given a u32_t argument, and u32_t pointers not
+ * mismatch when %u is given a uint32_t argument, and uint32_t pointers not
  * being compatible with int pointers. Let's redefine them to follow
  * common expectations and usage.
  */
diff --git a/include/tracing/tracing_format.h b/include/tracing/tracing_format.h
index 24acf8df6f..0da6dbfca0 100644
--- a/include/tracing/tracing_format.h
+++ b/include/tracing/tracing_format.h
@@ -17,8 +17,8 @@ extern "C" {
  * @brief A structure to represent tracing data format.
  */
 typedef struct tracing_data {
-	u8_t *data;
-	u32_t length;
+	uint8_t *data;
+	uint32_t length;
 } __packed tracing_data_t;
 
 /**
@@ -33,7 +33,7 @@ typedef struct tracing_data {
  * @brief Macro to format data to tracing data format.
  */
 #define TRACING_FORMAT_DATA(x)						       \
-	((struct tracing_data){.data = (u8_t *)&(x), .length = sizeof((x))})
+	((struct tracing_data){.data = (uint8_t *)&(x), .length = sizeof((x))})
 
 /**
  * @brief Macro to trace a message in tracing data format.
@@ -62,7 +62,7 @@ void tracing_format_string(const char *str, ...);
  * @param data   Raw data to be traced.
  * @param length Raw data length.
  */
-void tracing_format_raw_data(u8_t *data, u32_t length);
+void tracing_format_raw_data(uint8_t *data, uint32_t length);
 
 /**
  * @brief Tracing a message in tracing data format.
@@ -70,7 +70,7 @@ void tracing_format_raw_data(u8_t *data, u32_t length);
  * @param tracing_data_array Tracing_data format data array to be traced.
  * @param count Tracing_data array data count.
  */
-void tracing_format_data(tracing_data_t *tracing_data_array, u32_t count);
+void tracing_format_data(tracing_data_t *tracing_data_array, uint32_t count);
 
 #ifdef __cplusplus
 }
diff --git a/include/usb/bos.h b/include/usb/bos.h
index df86fe437c..991a8cce71 100644
--- a/include/usb/bos.h
+++ b/include/usb/bos.h
@@ -20,41 +20,41 @@
 
 /* BOS Capability Descriptor */
 struct usb_bos_platform_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDevCapabilityType;
-	u8_t bReserved;
-	u8_t PlatformCapabilityUUID[16];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDevCapabilityType;
+	uint8_t bReserved;
+	uint8_t PlatformCapabilityUUID[16];
 } __packed;
 
 /* BOS Descriptor */
 struct usb_bos_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u16_t wTotalLength;
-	u8_t bNumDeviceCaps;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t wTotalLength;
+	uint8_t bNumDeviceCaps;
 } __packed;
 
 /* BOS Capability webusb */
 struct usb_bos_capability_webusb {
-	u16_t bcdVersion;
-	u8_t bVendorCode;
-	u8_t iLandingPage;
+	uint16_t bcdVersion;
+	uint8_t bVendorCode;
+	uint8_t iLandingPage;
 } __packed;
 
 /* BOS Capability MS OS Descriptors version 2 */
 struct usb_bos_capability_msos {
-	u32_t dwWindowsVersion;
-	u16_t wMSOSDescriptorSetTotalLength;
-	u8_t bMS_VendorCode;
-	u8_t bAltEnumCode;
+	uint32_t dwWindowsVersion;
+	uint16_t wMSOSDescriptorSetTotalLength;
+	uint8_t bMS_VendorCode;
+	uint8_t bAltEnumCode;
 } __packed;
 
 size_t usb_bos_get_length(void);
 void usb_bos_fix_total_length(void);
 void usb_bos_register_cap(struct usb_bos_platform_descriptor *hdr);
 const void *usb_bos_get_header(void);
-int usb_handle_bos(struct usb_setup_packet *setup, s32_t *len, u8_t **data);
+int usb_handle_bos(struct usb_setup_packet *setup, int32_t *len, uint8_t **data);
 #else
 #define usb_handle_bos(x, y, z)		-ENOTSUP
 #endif
diff --git a/include/usb/class/usb_audio.h b/include/usb/class/usb_audio.h
index 496109508a..19fe21b91d 100644
--- a/include/usb/class/usb_audio.h
+++ b/include/usb/class/usb_audio.h
@@ -155,8 +155,8 @@ enum usb_audio_direction {
 struct usb_audio_fu_evt {
 	enum usb_audio_direction dir;
 	enum usb_audio_fucs cs;
-	u8_t channel;
-	u8_t val_len;
+	uint8_t channel;
+	uint8_t val_len;
 	const void *val;
 };
 
diff --git a/include/usb/class/usb_cdc.h b/include/usb/class/usb_cdc.h
index 7c973585e1..9cd4b5e876 100644
--- a/include/usb/class/usb_cdc.h
+++ b/include/usb/class/usb_cdc.h
@@ -103,66 +103,66 @@
 
 /** Header Functional Descriptor */
 struct cdc_header_descriptor {
-	u8_t bFunctionLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u16_t bcdCDC;
+	uint8_t bFunctionLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint16_t bcdCDC;
 } __packed;
 
 /** Union Interface Functional Descriptor */
 struct cdc_union_descriptor {
-	u8_t bFunctionLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bControlInterface;
-	u8_t bSubordinateInterface0;
+	uint8_t bFunctionLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bControlInterface;
+	uint8_t bSubordinateInterface0;
 } __packed;
 
 /** Call Management Functional Descriptor */
 struct cdc_cm_descriptor {
-	u8_t bFunctionLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bmCapabilities;
-	u8_t bDataInterface;
+	uint8_t bFunctionLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bmCapabilities;
+	uint8_t bDataInterface;
 } __packed;
 
 /** Abstract Control Management Functional Descriptor */
 struct cdc_acm_descriptor {
-	u8_t bFunctionLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bmCapabilities;
+	uint8_t bFunctionLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bmCapabilities;
 } __packed;
 
 /** Data structure for GET_LINE_CODING / SET_LINE_CODING class requests */
 struct cdc_acm_line_coding {
-	u32_t dwDTERate;
-	u8_t bCharFormat;
-	u8_t bParityType;
-	u8_t bDataBits;
+	uint32_t dwDTERate;
+	uint8_t bCharFormat;
+	uint8_t bParityType;
+	uint8_t bDataBits;
 } __packed;
 
 /** Data structure for the notification about SerialState */
 struct cdc_acm_notification {
-	u8_t bmRequestType;
-	u8_t bNotificationType;
-	u16_t wValue;
-	u16_t wIndex;
-	u16_t wLength;
-	u16_t data;
+	uint8_t bmRequestType;
+	uint8_t bNotificationType;
+	uint16_t wValue;
+	uint16_t wIndex;
+	uint16_t wLength;
+	uint16_t data;
 } __packed;
 
 /** Ethernet Networking Functional Descriptor */
 struct cdc_ecm_descriptor {
-	u8_t bFunctionLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t iMACAddress;
-	u32_t bmEthernetStatistics;
-	u16_t wMaxSegmentSize;
-	u16_t wNumberMCFilters;
-	u8_t bNumberPowerFilters;
+	uint8_t bFunctionLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t iMACAddress;
+	uint32_t bmEthernetStatistics;
+	uint16_t wMaxSegmentSize;
+	uint16_t wNumberMCFilters;
+	uint8_t bNumberPowerFilters;
 } __packed;
 
 #endif /* ZEPHYR_INCLUDE_USB_CLASS_USB_CDC_H_ */
diff --git a/include/usb/class/usb_dfu.h b/include/usb/class/usb_dfu.h
index 3eb99a04ea..9427a60a5a 100644
--- a/include/usb/class/usb_dfu.h
+++ b/include/usb/class/usb_dfu.h
@@ -76,12 +76,12 @@
 
 /** Run-Time Functional Descriptor */
 struct dfu_runtime_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bmAttributes;
-	u16_t wDetachTimeOut;
-	u16_t wTransferSize;
-	u16_t bcdDFUVersion;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bmAttributes;
+	uint16_t wDetachTimeOut;
+	uint16_t wTransferSize;
+	uint16_t bcdDFUVersion;
 } __packed;
 
 /** bStatus values for the DFU_GETSTATUS response */
diff --git a/include/usb/class/usb_hid.h b/include/usb/class/usb_hid.h
index 83cc7defbc..91034d9e92 100644
--- a/include/usb/class/usb_hid.h
+++ b/include/usb/class/usb_hid.h
@@ -23,16 +23,16 @@ extern "C" {
 #endif
 
 struct usb_hid_class_subdescriptor {
-	u8_t bDescriptorType;
-	u16_t wDescriptorLength;
+	uint8_t bDescriptorType;
+	uint16_t wDescriptorLength;
 } __packed;
 
 struct usb_hid_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u16_t bcdHID;
-	u8_t bCountryCode;
-	u8_t bNumDescriptors;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t bcdHID;
+	uint8_t bCountryCode;
+	uint8_t bNumDescriptors;
 
 	/*
 	 * Specification says at least one Class Descriptor needs to
@@ -57,11 +57,11 @@ struct usb_hid_descriptor {
 
 /* Public headers */
 
-typedef int (*hid_cb_t)(struct usb_setup_packet *setup, s32_t *len,
-			u8_t **data);
+typedef int (*hid_cb_t)(struct usb_setup_packet *setup, int32_t *len,
+			uint8_t **data);
 typedef void (*hid_int_ready_callback)(void);
-typedef void (*hid_protocol_cb_t)(u8_t protocol);
-typedef void (*hid_idle_cb_t)(u16_t report_id);
+typedef void (*hid_protocol_cb_t)(uint8_t protocol);
+typedef void (*hid_idle_cb_t)(uint16_t report_id);
 
 struct hid_ops {
 	hid_cb_t get_report;
@@ -431,16 +431,16 @@ enum hid_kbd_led {
 };
 
 /* Register HID device */
-void usb_hid_register_device(struct device *dev, const u8_t *desc, size_t size,
+void usb_hid_register_device(struct device *dev, const uint8_t *desc, size_t size,
 			     const struct hid_ops *op);
 
 /* Write to hid interrupt endpoint */
-int hid_int_ep_write(const struct device *dev, const u8_t *data, u32_t data_len,
-		     u32_t *bytes_ret);
+int hid_int_ep_write(const struct device *dev, const uint8_t *data, uint32_t data_len,
+		     uint32_t *bytes_ret);
 
 /* Read from hid interrupt endpoint */
-int hid_int_ep_read(const struct device *dev, u8_t *data, u32_t max_data_len,
-		    u32_t *ret_bytes);
+int hid_int_ep_read(const struct device *dev, uint8_t *data, uint32_t max_data_len,
+		    uint32_t *ret_bytes);
 
 /* Initialize USB HID */
 int usb_hid_init(const struct device *dev);
diff --git a/include/usb/class/usb_msc.h b/include/usb/class/usb_msc.h
index 23dbeeac3a..add76ac68b 100644
--- a/include/usb/class/usb_msc.h
+++ b/include/usb/class/usb_msc.h
@@ -62,13 +62,13 @@
 
 /** MSC Bulk-Only Command Block Wrapper (CBW) */
 struct CBW {
-	u32_t Signature;
-	u32_t Tag;
-	u32_t DataLength;
-	u8_t  Flags;
-	u8_t  LUN;
-	u8_t  CBLength;
-	u8_t  CB[16];
+	uint32_t Signature;
+	uint32_t Tag;
+	uint32_t DataLength;
+	uint8_t  Flags;
+	uint8_t  LUN;
+	uint8_t  CBLength;
+	uint8_t  CB[16];
 } __packed;
 
 /** MSC Command Status Wrapper (CBW) Signature */
@@ -81,10 +81,10 @@ struct CBW {
 
 /** MSC Bulk-Only Command Status Wrapper (CSW) */
 struct CSW {
-	u32_t Signature;
-	u32_t Tag;
-	u32_t DataResidue;
-	u8_t  Status;
+	uint32_t Signature;
+	uint32_t Tag;
+	uint32_t DataResidue;
+	uint8_t  Status;
 } __packed;
 
 /** SCSI transparent command set used by MSC */
diff --git a/include/usb/usb_common.h b/include/usb/usb_common.h
index 1e7c7a0252..8854de2261 100644
--- a/include/usb/usb_common.h
+++ b/include/usb/usb_common.h
@@ -138,74 +138,74 @@
 
 /** Standard Device Descriptor */
 struct usb_device_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u16_t bcdUSB;
-	u8_t bDeviceClass;
-	u8_t bDeviceSubClass;
-	u8_t bDeviceProtocol;
-	u8_t bMaxPacketSize0;
-	u16_t idVendor;
-	u16_t idProduct;
-	u16_t bcdDevice;
-	u8_t iManufacturer;
-	u8_t iProduct;
-	u8_t iSerialNumber;
-	u8_t bNumConfigurations;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t bcdUSB;
+	uint8_t bDeviceClass;
+	uint8_t bDeviceSubClass;
+	uint8_t bDeviceProtocol;
+	uint8_t bMaxPacketSize0;
+	uint16_t idVendor;
+	uint16_t idProduct;
+	uint16_t bcdDevice;
+	uint8_t iManufacturer;
+	uint8_t iProduct;
+	uint8_t iSerialNumber;
+	uint8_t bNumConfigurations;
 } __packed;
 
 /** Unicode (UTF16LE) String Descriptor */
 struct usb_string_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u16_t bString;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t bString;
 } __packed;
 
 /** Association Descriptor */
 struct usb_association_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bFirstInterface;
-	u8_t bInterfaceCount;
-	u8_t bFunctionClass;
-	u8_t bFunctionSubClass;
-	u8_t bFunctionProtocol;
-	u8_t iFunction;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bFirstInterface;
+	uint8_t bInterfaceCount;
+	uint8_t bFunctionClass;
+	uint8_t bFunctionSubClass;
+	uint8_t bFunctionProtocol;
+	uint8_t iFunction;
 } __packed;
 
 /** Standard Configuration Descriptor */
 struct usb_cfg_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u16_t wTotalLength;
-	u8_t bNumInterfaces;
-	u8_t bConfigurationValue;
-	u8_t iConfiguration;
-	u8_t bmAttributes;
-	u8_t bMaxPower;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t wTotalLength;
+	uint8_t bNumInterfaces;
+	uint8_t bConfigurationValue;
+	uint8_t iConfiguration;
+	uint8_t bmAttributes;
+	uint8_t bMaxPower;
 } __packed;
 
 /** Standard Interface Descriptor */
 struct usb_if_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bInterfaceNumber;
-	u8_t bAlternateSetting;
-	u8_t bNumEndpoints;
-	u8_t bInterfaceClass;
-	u8_t bInterfaceSubClass;
-	u8_t bInterfaceProtocol;
-	u8_t iInterface;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bInterfaceNumber;
+	uint8_t bAlternateSetting;
+	uint8_t bNumEndpoints;
+	uint8_t bInterfaceClass;
+	uint8_t bInterfaceSubClass;
+	uint8_t bInterfaceProtocol;
+	uint8_t iInterface;
 } __packed;
 
 /** Standard Endpoint Descriptor */
 struct usb_ep_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bEndpointAddress;
-	u8_t bmAttributes;
-	u16_t wMaxPacketSize;
-	u8_t bInterval;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bEndpointAddress;
+	uint8_t bmAttributes;
+	uint16_t wMaxPacketSize;
+	uint8_t bInterval;
 } __packed;
 
 #endif /* ZEPHYR_INCLUDE_USB_USB_COMMON_H_ */
diff --git a/include/usb/usb_device.h b/include/usb/usb_device.h
index d8a76bd645..e4d27dcf5f 100644
--- a/include/usb/usb_device.h
+++ b/include/usb/usb_device.h
@@ -83,11 +83,11 @@ extern "C" {
 
 /** setup packet definitions */
 struct usb_setup_packet {
-	u8_t bmRequestType;  /**< characteristics of the specific request */
-	u8_t bRequest;       /**< specific request */
-	u16_t wValue;        /**< request specific parameter */
-	u16_t wIndex;        /**< request specific parameter */
-	u16_t wLength;       /**< length of data transferred in data phase */
+	uint8_t bmRequestType;  /**< characteristics of the specific request */
+	uint8_t bRequest;       /**< specific request */
+	uint16_t wValue;        /**< request specific parameter */
+	uint16_t wIndex;        /**< request specific parameter */
+	uint16_t wLength;       /**< length of data transferred in data phase */
 };
 
 /**
@@ -99,7 +99,7 @@ struct usb_setup_packet {
 /**
  * @brief Callback function signature for the USB Endpoint status
  */
-typedef void (*usb_ep_callback)(u8_t ep,
+typedef void (*usb_ep_callback)(uint8_t ep,
 				enum usb_dc_ep_cb_status_code cb_status);
 
 /**
@@ -114,13 +114,13 @@ typedef void (*usb_ep_callback)(u8_t ep,
  * data to be transmitted buffer respectively.
  */
 typedef int (*usb_request_handler)(struct usb_setup_packet *setup,
-				   s32_t *transfer_len, u8_t **payload_data);
+				   int32_t *transfer_len, uint8_t **payload_data);
 
 /**
  * @brief Function for interface runtime configuration
  */
 typedef void (*usb_interface_config)(struct usb_desc_header *head,
-				     u8_t bInterfaceNumber);
+				     uint8_t bInterfaceNumber);
 
 /**
  * @brief USB Endpoint Configuration
@@ -140,7 +140,7 @@ struct usb_ep_cfg_data {
 	 *   IN  EP = 0x80 | \<endpoint number\>
 	 *   OUT EP = 0x00 | \<endpoint number\>
 	 */
-	u8_t ep_addr;
+	uint8_t ep_addr;
 };
 
 /**
@@ -178,7 +178,7 @@ struct usb_cfg_data {
 	 * USB device description, see
 	 * http://www.beyondlogic.org/usbnutshell/usb5.shtml#DeviceDescriptors
 	 */
-	const u8_t *usb_device_description;
+	const uint8_t *usb_device_description;
 	/** Pointer to interface descriptor */
 	const void *interface_descriptor;
 	/** Function for interface runtime configuration */
@@ -186,11 +186,11 @@ struct usb_cfg_data {
 	/** Callback to be notified on USB connection status change */
 	void (*cb_usb_status)(struct usb_cfg_data *cfg,
 			      enum usb_dc_status_code cb_status,
-			      const u8_t *param);
+			      const uint8_t *param);
 	/** USB interface (Class) handler and storage space */
 	struct usb_interface_cfg_data interface;
 	/** Number of individual endpoints in the device configuration */
-	u8_t num_endpoints;
+	uint8_t num_endpoints;
 	/**
 	 * Pointer to an array of endpoint structs of length equal to the
 	 * number of EP associated with the device description,
@@ -209,7 +209,7 @@ struct usb_cfg_data {
  *
  * @return 0 on success, negative errno code on fail
  */
-int usb_set_config(const u8_t *usb_descriptor);
+int usb_set_config(const uint8_t *usb_descriptor);
 
 /**
  * @brief Deconfigure USB controller
@@ -265,7 +265,7 @@ int usb_disable(void);
  *
  * @return 0 on success, negative errno code on fail
  */
-int usb_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *bytes_ret);
+int usb_write(uint8_t ep, const uint8_t *data, uint32_t data_len, uint32_t *bytes_ret);
 
 /**
  * @brief Read data from the specified endpoint
@@ -284,7 +284,7 @@ int usb_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *bytes_ret);
  *
  * @return  0 on success, negative errno code on fail
  */
-int usb_read(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *ret_bytes);
+int usb_read(uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_t *ret_bytes);
 
 /**
  * @brief Set STALL condition on the specified endpoint
@@ -297,7 +297,7 @@ int usb_read(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *ret_bytes);
  *
  * @return  0 on success, negative errno code on fail
  */
-int usb_ep_set_stall(u8_t ep);
+int usb_ep_set_stall(uint8_t ep);
 
 /**
  * @brief Clears STALL condition on the specified endpoint
@@ -310,7 +310,7 @@ int usb_ep_set_stall(u8_t ep);
  *
  * @return  0 on success, negative errno code on fail
  */
-int usb_ep_clear_stall(u8_t ep);
+int usb_ep_clear_stall(uint8_t ep);
 
 /**
  * @brief Read data from the specified endpoint
@@ -330,8 +330,8 @@ int usb_ep_clear_stall(u8_t ep);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
-		     u32_t *read_bytes);
+int usb_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,
+		     uint32_t *read_bytes);
 
 
 /**
@@ -347,12 +347,12 @@ int usb_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_ep_read_continue(u8_t ep);
+int usb_ep_read_continue(uint8_t ep);
 
 /**
  * Callback function signature for transfer completion.
  */
-typedef void (*usb_transfer_callback)(u8_t ep, int tsize, void *priv);
+typedef void (*usb_transfer_callback)(uint8_t ep, int tsize, void *priv);
 
 /* USB transfer flags */
 #define USB_TRANS_READ       BIT(0)   /** Read transfer flag */
@@ -365,7 +365,7 @@ typedef void (*usb_transfer_callback)(u8_t ep, int tsize, void *priv);
  * If a USB class driver wants to use high-level transfer functions, driver
  * needs to register this callback as usb endpoint callback.
  */
-void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code);
+void usb_transfer_ep_callback(uint8_t ep, enum usb_dc_ep_cb_status_code);
 
 /**
  * @brief Start a transfer
@@ -384,7 +384,7 @@ void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code);
  *
  * @return 0 on success, negative errno code on fail.
  */
-int usb_transfer(u8_t ep, u8_t *data, size_t dlen, unsigned int flags,
+int usb_transfer(uint8_t ep, uint8_t *data, size_t dlen, unsigned int flags,
 		 usb_transfer_callback cb, void *priv);
 
 /**
@@ -401,7 +401,7 @@ int usb_transfer(u8_t ep, u8_t *data, size_t dlen, unsigned int flags,
  *
  * @return number of bytes transferred on success, negative errno code on fail.
  */
-int usb_transfer_sync(u8_t ep, u8_t *data, size_t dlen, unsigned int flags);
+int usb_transfer_sync(uint8_t ep, uint8_t *data, size_t dlen, unsigned int flags);
 
 /**
  * @brief Cancel any ongoing transfer on the specified endpoint
@@ -411,7 +411,7 @@ int usb_transfer_sync(u8_t ep, u8_t *data, size_t dlen, unsigned int flags);
  *
  * @return 0 on success, negative errno code on fail.
  */
-void usb_cancel_transfer(u8_t ep);
+void usb_cancel_transfer(uint8_t ep);
 
 /**
  * @brief Cancel all ongoing transfers
@@ -426,7 +426,7 @@ void usb_cancel_transfers(void);
  *
  * @return true if transfer is ongoing, false otherwise.
  */
-bool usb_transfer_is_busy(u8_t ep);
+bool usb_transfer_is_busy(uint8_t ep);
 
 /**
  * @brief Start the USB remote wakeup procedure
diff --git a/include/usb/usbstruct.h b/include/usb/usbstruct.h
index b9ae6ffec3..935cac438e 100644
--- a/include/usb/usbstruct.h
+++ b/include/usb/usbstruct.h
@@ -80,8 +80,8 @@
 
 /** USB descriptor header */
 struct usb_desc_header {
-	u8_t bLength;               /**< descriptor length */
-	u8_t bDescriptorType;       /**< descriptor type */
+	uint8_t bLength;               /**< descriptor length */
+	uint8_t bDescriptorType;       /**< descriptor type */
 };
 
 #define GET_DESC_TYPE(x)            (((x)>>8)&0xFF)
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 4245572b0d..ffa6aaf5b7 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -577,7 +577,7 @@ config LEGACY_TIMEOUT_API
 	  The k_timeout_t API has changed to become an opaque type
 	  that must be initialized with macros.  Older applications
 	  can choose this to continue using the old style of timeouts
-	  (which were s32_t counts of milliseconds), at the cost of
+	  (which were int32_t counts of milliseconds), at the cost of
 	  not being able to use new features.
 
 config TIMEOUT_64BIT
diff --git a/kernel/device.c b/kernel/device.c
index 53df56d838..0e6f2aa21e 100644
--- a/kernel/device.c
+++ b/kernel/device.c
@@ -24,8 +24,8 @@ extern struct device __device_start[];
 extern struct device __device_end[];
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-extern u32_t __device_busy_start[];
-extern u32_t __device_busy_end[];
+extern uint32_t __device_busy_start[];
+extern uint32_t __device_busy_end[];
 #define DEVICE_BUSY_SIZE (__device_busy_end - __device_busy_start)
 #endif
 
@@ -40,7 +40,7 @@ extern u32_t __device_busy_end[];
  *
  * @param level init level to run.
  */
-void z_sys_init_run_level(s32_t level)
+void z_sys_init_run_level(int32_t level)
 {
 	static const struct init_entry *levels[] = {
 		__init_PRE_KERNEL_1_start,
@@ -119,7 +119,7 @@ static inline struct device *z_vrfy_device_get_binding(const char *name)
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
 int device_pm_control_nop(struct device *unused_device,
-		       u32_t unused_ctrl_command,
+		       uint32_t unused_ctrl_command,
 		       void *unused_context,
 		       device_pm_cb cb,
 		       void *unused_arg)
diff --git a/kernel/idle.c b/kernel/idle.c
index 701b4b79ea..5393803b09 100644
--- a/kernel/idle.c
+++ b/kernel/idle.c
@@ -63,7 +63,7 @@ void __attribute__((weak)) _sys_resume_from_deep_sleep(void)
  * @return N/A
  */
 #if !SMP_FALLBACK
-static void set_kernel_idle_time_in_ticks(s32_t ticks)
+static void set_kernel_idle_time_in_ticks(int32_t ticks)
 {
 #ifdef CONFIG_SYS_POWER_MANAGEMENT
 	_kernel.idle = ticks;
@@ -72,7 +72,7 @@ static void set_kernel_idle_time_in_ticks(s32_t ticks)
 
 static void sys_power_save_idle(void)
 {
-	s32_t ticks = z_get_next_timeout_expiry();
+	int32_t ticks = z_get_next_timeout_expiry();
 
 	/* The documented behavior of CONFIG_TICKLESS_IDLE_THRESH is
 	 * that the system should not enter a tickless idle for
@@ -113,7 +113,7 @@ static void sys_power_save_idle(void)
 }
 #endif
 
-void z_sys_power_save_idle_exit(s32_t ticks)
+void z_sys_power_save_idle_exit(int32_t ticks)
 {
 #if defined(CONFIG_SYS_POWER_SLEEP_STATES)
 	/* Some CPU low power states require notification at the ISR
@@ -146,7 +146,7 @@ void idle(void *unused1, void *unused2, void *unused3)
 #ifdef CONFIG_BOOT_TIME_MEASUREMENT
 	/* record timestamp when idling begins */
 
-	extern u32_t z_timestamp_idle;
+	extern uint32_t z_timestamp_idle;
 
 	z_timestamp_idle = k_cycle_get_32();
 #endif
diff --git a/kernel/include/kernel_arch_interface.h b/kernel/include/kernel_arch_interface.h
index 781a40dd7c..1ced9dff01 100644
--- a/kernel/include/kernel_arch_interface.h
+++ b/kernel/include/kernel_arch_interface.h
@@ -36,7 +36,7 @@ extern "C" {
  *
  * @param usec_to_wait Wait period, in microseconds
  */
-void arch_busy_wait(u32_t usec_to_wait);
+void arch_busy_wait(uint32_t usec_to_wait);
 #endif
 
 /** @} */
diff --git a/kernel/include/kernel_internal.h b/kernel/include/kernel_internal.h
index c137d784f0..c0852d08d3 100644
--- a/kernel/include/kernel_internal.h
+++ b/kernel/include/kernel_internal.h
@@ -44,7 +44,7 @@ extern void z_setup_new_thread(struct k_thread *new_thread,
 			      k_thread_stack_t *stack, size_t stack_size,
 			      k_thread_entry_t entry,
 			      void *p1, void *p2, void *p3,
-			      int prio, u32_t options, const char *name);
+			      int prio, uint32_t options, const char *name);
 
 static inline void z_new_thread_init(struct k_thread *thread,
 				     char *stack, size_t stack_size)
@@ -117,15 +117,15 @@ extern void z_smp_init(void);
 
 extern void smp_timer_init(void);
 
-extern void z_early_boot_rand_get(u8_t *buf, size_t length);
+extern void z_early_boot_rand_get(uint8_t *buf, size_t length);
 
 #if CONFIG_STACK_POINTER_RANDOM
 extern int z_stack_adjust_initialized;
 #endif
 
 #ifdef CONFIG_BOOT_TIME_MEASUREMENT
-extern u32_t z_timestamp_main; /* timestamp when main task starts */
-extern u32_t z_timestamp_idle; /* timestamp when CPU goes idle */
+extern uint32_t z_timestamp_main; /* timestamp when main task starts */
+extern uint32_t z_timestamp_idle; /* timestamp when CPU goes idle */
 #endif
 
 extern struct k_thread z_main_thread;
@@ -138,7 +138,7 @@ extern K_THREAD_STACK_ARRAY_DEFINE(z_interrupt_stacks, CONFIG_MP_NUM_CPUS,
 				   CONFIG_ISR_STACK_SIZE);
 
 #ifdef CONFIG_GEN_PRIV_STACKS
-extern u8_t *z_priv_stack_find(k_thread_stack_t *stack);
+extern uint8_t *z_priv_stack_find(k_thread_stack_t *stack);
 #endif
 
 #ifdef __cplusplus
diff --git a/kernel/include/ksched.h b/kernel/include/ksched.h
index 4a88befbf6..2f350fa64c 100644
--- a/kernel/include/ksched.h
+++ b/kernel/include/ksched.h
@@ -43,11 +43,11 @@ int z_is_thread_time_slicing(struct k_thread *thread);
 void z_unpend_thread_no_timeout(struct k_thread *thread);
 int z_pend_curr(struct k_spinlock *lock, k_spinlock_key_t key,
 	       _wait_q_t *wait_q, k_timeout_t timeout);
-int z_pend_curr_irqlock(u32_t key, _wait_q_t *wait_q, k_timeout_t timeout);
+int z_pend_curr_irqlock(uint32_t key, _wait_q_t *wait_q, k_timeout_t timeout);
 void z_pend_thread(struct k_thread *thread, _wait_q_t *wait_q,
 		   k_timeout_t timeout);
 void z_reschedule(struct k_spinlock *lock, k_spinlock_key_t key);
-void z_reschedule_irqlock(u32_t key);
+void z_reschedule_irqlock(uint32_t key);
 struct k_thread *z_unpend_first_thread(_wait_q_t *wait_q);
 void z_unpend_thread(struct k_thread *thread);
 int z_unpend_all(_wait_q_t *wait_q);
@@ -110,7 +110,7 @@ static inline bool z_is_thread_pending(struct k_thread *thread)
 
 static inline bool z_is_thread_prevented_from_running(struct k_thread *thread)
 {
-	u8_t state = thread->base.thread_state;
+	uint8_t state = thread->base.thread_state;
 
 	return (state & (_THREAD_PENDING | _THREAD_PRESTART | _THREAD_DEAD |
 			 _THREAD_DUMMY | _THREAD_SUSPENDED)) != 0U;
@@ -133,7 +133,7 @@ static inline bool z_has_thread_started(struct k_thread *thread)
 	return (thread->base.thread_state & _THREAD_PRESTART) == 0U;
 }
 
-static inline bool z_is_thread_state_set(struct k_thread *thread, u32_t state)
+static inline bool z_is_thread_state_set(struct k_thread *thread, uint32_t state)
 {
 	return (thread->base.thread_state & state) != 0U;
 }
@@ -170,13 +170,13 @@ static inline void z_mark_thread_as_not_pending(struct k_thread *thread)
 	thread->base.thread_state &= ~_THREAD_PENDING;
 }
 
-static inline void z_set_thread_states(struct k_thread *thread, u32_t states)
+static inline void z_set_thread_states(struct k_thread *thread, uint32_t states)
 {
 	thread->base.thread_state |= states;
 }
 
 static inline void z_reset_thread_states(struct k_thread *thread,
-					u32_t states)
+					uint32_t states)
 {
 	thread->base.thread_state &= ~states;
 }
diff --git a/kernel/init.c b/kernel/init.c
index fb25ff3fb3..6f97f644b4 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -52,8 +52,8 @@ LOG_MODULE_REGISTER(os);
 /* boot time measurement items */
 
 #ifdef CONFIG_BOOT_TIME_MEASUREMENT
-u32_t __noinit z_timestamp_main;  /* timestamp when main task starts */
-u32_t __noinit z_timestamp_idle;  /* timestamp when CPU goes idle */
+uint32_t __noinit z_timestamp_main;  /* timestamp when main task starts */
+uint32_t __noinit z_timestamp_idle;  /* timestamp when CPU goes idle */
 #endif
 
 /* init/main and idle threads */
@@ -108,11 +108,11 @@ void z_bss_zero(void)
 	(void)memset(__bss_start, 0, __bss_end - __bss_start);
 #if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_ccm), okay)
 	(void)memset(&__ccm_bss_start, 0,
-		     ((u32_t) &__ccm_bss_end - (u32_t) &__ccm_bss_start));
+		     ((uint32_t) &__ccm_bss_end - (uint32_t) &__ccm_bss_start));
 #endif
 #if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay)
 	(void)memset(&__dtcm_bss_start, 0,
-		     ((u32_t) &__dtcm_bss_end - (u32_t) &__dtcm_bss_start));
+		     ((uint32_t) &__dtcm_bss_end - (uint32_t) &__dtcm_bss_start));
 #endif
 #ifdef CONFIG_CODE_DATA_RELOCATION
 	extern void bss_zeroing_relocation(void);
@@ -121,7 +121,7 @@ void z_bss_zero(void)
 #endif	/* CONFIG_CODE_DATA_RELOCATION */
 #ifdef CONFIG_COVERAGE_GCOV
 	(void)memset(&__gcov_bss_start, 0,
-		 ((u32_t) &__gcov_bss_end - (u32_t) &__gcov_bss_start));
+		 ((uint32_t) &__gcov_bss_end - (uint32_t) &__gcov_bss_start));
 #endif
 }
 
@@ -169,9 +169,9 @@ void z_data_copy(void)
 	 * value gets set later in z_cstart().
 	 */
 	uintptr_t guard_copy = __stack_chk_guard;
-	u8_t *src = (u8_t *)&_app_smem_rom_start;
-	u8_t *dst = (u8_t *)&_app_smem_start;
-	u32_t count = _app_smem_end - _app_smem_start;
+	uint8_t *src = (uint8_t *)&_app_smem_rom_start;
+	uint8_t *dst = (uint8_t *)&_app_smem_start;
+	uint32_t count = _app_smem_end - _app_smem_start;
 
 	guard_copy = __stack_chk_guard;
 	while (count > 0) {
@@ -373,9 +373,9 @@ static FUNC_NORETURN void switch_to_main_thread(void)
 #endif /* CONFIG_MULTITHREADING */
 
 #if defined(CONFIG_ENTROPY_HAS_DRIVER) || defined(CONFIG_TEST_RANDOM_GENERATOR)
-void z_early_boot_rand_get(u8_t *buf, size_t length)
+void z_early_boot_rand_get(uint8_t *buf, size_t length)
 {
-	int n = sizeof(u32_t);
+	int n = sizeof(uint32_t);
 #ifdef CONFIG_ENTROPY_HAS_DRIVER
 	struct device *entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	int rc;
@@ -410,12 +410,12 @@ sys_rand_fallback:
 	 */
 
 	while (length > 0) {
-		u32_t rndbits;
-		u8_t *p_rndbits = (u8_t *)&rndbits;
+		uint32_t rndbits;
+		uint8_t *p_rndbits = (uint8_t *)&rndbits;
 
 		rndbits = sys_rand32_get();
 
-		if (length < sizeof(u32_t)) {
+		if (length < sizeof(uint32_t)) {
 			n = length;
 		}
 
@@ -467,7 +467,7 @@ FUNC_NORETURN void z_cstart(void)
 #ifdef CONFIG_STACK_CANARIES
 	uintptr_t stack_guard;
 
-	z_early_boot_rand_get((u8_t *)&stack_guard, sizeof(stack_guard));
+	z_early_boot_rand_get((uint8_t *)&stack_guard, sizeof(stack_guard));
 	__stack_chk_guard = stack_guard;
 	__stack_chk_guard <<= 8;
 #endif	/* CONFIG_STACK_CANARIES */
diff --git a/kernel/kheap.c b/kernel/kheap.c
index 12344ceb12..8951649b1b 100644
--- a/kernel/kheap.c
+++ b/kernel/kheap.c
@@ -28,7 +28,7 @@ SYS_INIT(statics_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
 
 void *k_heap_alloc(struct k_heap *h, size_t bytes, k_timeout_t timeout)
 {
-	s64_t now, end = z_timeout_end_calc(timeout);
+	int64_t now, end = z_timeout_end_calc(timeout);
 	void *ret = NULL;
 	k_spinlock_key_t key = k_spin_lock(&h->lock);
 
diff --git a/kernel/mailbox.c b/kernel/mailbox.c
index cd9016feb9..bb20e8ff10 100644
--- a/kernel/mailbox.c
+++ b/kernel/mailbox.c
@@ -120,7 +120,7 @@ void k_mbox_init(struct k_mbox *mbox_ptr)
 static int mbox_message_match(struct k_mbox_msg *tx_msg,
 			       struct k_mbox_msg *rx_msg)
 {
-	u32_t temp_info;
+	uint32_t temp_info;
 
 	if (((tx_msg->tx_target_thread == (k_tid_t)K_ANY) ||
 	     (tx_msg->tx_target_thread == rx_msg->tx_target_thread)) &&
diff --git a/kernel/mem_domain.c b/kernel/mem_domain.c
index 8534ae71ca..1458269ee0 100644
--- a/kernel/mem_domain.c
+++ b/kernel/mem_domain.c
@@ -13,17 +13,17 @@
 #include <spinlock.h>
 
 static struct k_spinlock lock;
-static u8_t max_partitions;
+static uint8_t max_partitions;
 
 #if (defined(CONFIG_EXECUTE_XOR_WRITE) || \
 	defined(CONFIG_MPU_REQUIRES_NON_OVERLAPPING_REGIONS)) && __ASSERT_ON
 static bool sane_partition(const struct k_mem_partition *part,
 			   const struct k_mem_partition *parts,
-			   u32_t num_parts)
+			   uint32_t num_parts)
 {
 	bool exec, write;
-	u32_t last;
-	u32_t i;
+	uint32_t last;
+	uint32_t i;
 
 	last = part->start + part->size - 1;
 	exec = K_MEM_PARTITION_IS_EXECUTABLE(part->attr);
@@ -38,7 +38,7 @@ static bool sane_partition(const struct k_mem_partition *part,
 
 	for (i = 0U; i < num_parts; i++) {
 		bool cur_write, cur_exec;
-		u32_t cur_last;
+		uint32_t cur_last;
 
 		cur_last = parts[i].start + parts[i].size - 1;
 
@@ -80,7 +80,7 @@ static inline bool sane_partition_domain(const struct k_mem_domain *domain,
 #define sane_partition_domain(...) (true)
 #endif
 
-void k_mem_domain_init(struct k_mem_domain *domain, u8_t num_parts,
+void k_mem_domain_init(struct k_mem_domain *domain, uint8_t num_parts,
 		       struct k_mem_partition *parts[])
 {
 	k_spinlock_key_t key;
@@ -95,7 +95,7 @@ void k_mem_domain_init(struct k_mem_domain *domain, u8_t num_parts,
 	(void)memset(domain->partitions, 0, sizeof(domain->partitions));
 
 	if (num_parts != 0U) {
-		u32_t i;
+		uint32_t i;
 
 		for (i = 0U; i < num_parts; i++) {
 			__ASSERT(parts[i] != NULL, "");
diff --git a/kernel/mem_slab.c b/kernel/mem_slab.c
index 6c4dc807dd..7c516896a6 100644
--- a/kernel/mem_slab.c
+++ b/kernel/mem_slab.c
@@ -31,7 +31,7 @@ struct k_mem_slab *_trace_list_k_mem_slab;
  */
 static int create_free_list(struct k_mem_slab *slab)
 {
-	u32_t j;
+	uint32_t j;
 	char *p;
 
 	/* blocks must be word aligned */
@@ -80,7 +80,7 @@ SYS_INIT(init_mem_slab_module, PRE_KERNEL_1,
 	 CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
 
 int k_mem_slab_init(struct k_mem_slab *slab, void *buffer,
-		    size_t block_size, u32_t num_blocks)
+		    size_t block_size, uint32_t num_blocks)
 {
 	int rc = 0;
 
diff --git a/kernel/mempool_sys.c b/kernel/mempool_sys.c
index da78107ece..a8d749bf9b 100644
--- a/kernel/mempool_sys.c
+++ b/kernel/mempool_sys.c
@@ -48,14 +48,14 @@ int k_mem_pool_alloc(struct k_mem_pool *p, struct k_mem_block *block,
 		     size_t size, k_timeout_t timeout)
 {
 	int ret;
-	u64_t end = 0;
+	uint64_t end = 0;
 
 	__ASSERT(!(arch_is_in_isr() && !K_TIMEOUT_EQ(timeout, K_NO_WAIT)), "");
 
 	end = z_timeout_end_calc(timeout);
 
 	while (true) {
-		u32_t level_num, block_num;
+		uint32_t level_num, block_num;
 
 		ret = z_sys_mem_pool_block_alloc(&p->base, size,
 						 &level_num, &block_num,
@@ -72,7 +72,7 @@ int k_mem_pool_alloc(struct k_mem_pool *p, struct k_mem_block *block,
 		z_pend_curr_unlocked(&p->wait_q, timeout);
 
 		if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			s64_t remaining = end - z_tick_get();
+			int64_t remaining = end - z_tick_get();
 
 			if (remaining <= 0) {
 				break;
diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index f7351f28ea..106d46ac59 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c
@@ -47,7 +47,7 @@ SYS_INIT(init_msgq_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
 #endif /* CONFIG_OBJECT_TRACING */
 
 void k_msgq_init(struct k_msgq *msgq, char *buffer, size_t msg_size,
-		 u32_t max_msgs)
+		 uint32_t max_msgs)
 {
 	msgq->msg_size = msg_size;
 	msgq->max_msgs = max_msgs;
@@ -66,7 +66,7 @@ void k_msgq_init(struct k_msgq *msgq, char *buffer, size_t msg_size,
 }
 
 int z_impl_k_msgq_alloc_init(struct k_msgq *msgq, size_t msg_size,
-			    u32_t max_msgs)
+			    uint32_t max_msgs)
 {
 	void *buffer;
 	int ret;
@@ -90,7 +90,7 @@ int z_impl_k_msgq_alloc_init(struct k_msgq *msgq, size_t msg_size,
 
 #ifdef CONFIG_USERSPACE
 int z_vrfy_k_msgq_alloc_init(struct k_msgq *q, size_t msg_size,
-			    u32_t max_msgs)
+			    uint32_t max_msgs)
 {
 	Z_OOPS(Z_SYSCALL_OBJ_NEVER_INIT(q, K_OBJ_MSGQ));
 
@@ -312,14 +312,14 @@ static inline void z_vrfy_k_msgq_purge(struct k_msgq *q)
 }
 #include <syscalls/k_msgq_purge_mrsh.c>
 
-static inline u32_t z_vrfy_k_msgq_num_free_get(struct k_msgq *q)
+static inline uint32_t z_vrfy_k_msgq_num_free_get(struct k_msgq *q)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(q, K_OBJ_MSGQ));
 	return z_impl_k_msgq_num_free_get(q);
 }
 #include <syscalls/k_msgq_num_free_get_mrsh.c>
 
-static inline u32_t z_vrfy_k_msgq_num_used_get(struct k_msgq *q)
+static inline uint32_t z_vrfy_k_msgq_num_used_get(struct k_msgq *q)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(q, K_OBJ_MSGQ));
 	return z_impl_k_msgq_num_used_get(q);
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 31819666b1..551cbe26ac 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -93,7 +93,7 @@ static inline int z_vrfy_k_mutex_init(struct k_mutex *mutex)
 #include <syscalls/k_mutex_init_mrsh.c>
 #endif
 
-static s32_t new_prio_for_inheritance(s32_t target, s32_t limit)
+static int32_t new_prio_for_inheritance(int32_t target, int32_t limit)
 {
 	int new_prio = z_is_prio_higher(target, limit) ? target : limit;
 
@@ -102,7 +102,7 @@ static s32_t new_prio_for_inheritance(s32_t target, s32_t limit)
 	return new_prio;
 }
 
-static bool adjust_owner_prio(struct k_mutex *mutex, s32_t new_prio)
+static bool adjust_owner_prio(struct k_mutex *mutex, int32_t new_prio)
 {
 	if (mutex->owner->base.prio != new_prio) {
 
diff --git a/kernel/pipes.c b/kernel/pipes.c
index d28d7a33cf..f841767c67 100644
--- a/kernel/pipes.c
+++ b/kernel/pipes.c
@@ -639,7 +639,7 @@ int z_impl_k_pipe_get(struct k_pipe *pipe, void *data, size_t bytes_to_read,
 				  sys_dlist_get(&xfer_list);
 	while ((thread != NULL) && (num_bytes_read < bytes_to_read)) {
 		desc = (struct k_pipe_desc *)thread->base.swap_data;
-		bytes_copied = pipe_xfer((u8_t *)data + num_bytes_read,
+		bytes_copied = pipe_xfer((uint8_t *)data + num_bytes_read,
 					  bytes_to_read - num_bytes_read,
 					  desc->buffer, desc->bytes_to_xfer);
 
@@ -663,7 +663,7 @@ int z_impl_k_pipe_get(struct k_pipe *pipe, void *data, size_t bytes_to_read,
 
 	if ((writer != NULL) && (num_bytes_read < bytes_to_read)) {
 		desc = (struct k_pipe_desc *)writer->base.swap_data;
-		bytes_copied = pipe_xfer((u8_t *)data + num_bytes_read,
+		bytes_copied = pipe_xfer((uint8_t *)data + num_bytes_read,
 					  bytes_to_read - num_bytes_read,
 					  desc->buffer, desc->bytes_to_xfer);
 
@@ -722,7 +722,7 @@ int z_impl_k_pipe_get(struct k_pipe *pipe, void *data, size_t bytes_to_read,
 
 	struct k_pipe_desc  pipe_desc;
 
-	pipe_desc.buffer        = (u8_t *)data + num_bytes_read;
+	pipe_desc.buffer        = (uint8_t *)data + num_bytes_read;
 	pipe_desc.bytes_to_xfer = bytes_to_read - num_bytes_read;
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
diff --git a/kernel/poll.c b/kernel/poll.c
index 4fe88ffbad..9c0ab7289a 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -35,7 +35,7 @@
  */
 static struct k_spinlock lock;
 
-void k_poll_event_init(struct k_poll_event *event, u32_t type,
+void k_poll_event_init(struct k_poll_event *event, uint32_t type,
 		       int mode, void *obj)
 {
 	__ASSERT(mode == K_POLL_MODE_NOTIFY_ONLY,
@@ -53,7 +53,7 @@ void k_poll_event_init(struct k_poll_event *event, u32_t type,
 }
 
 /* must be called with interrupts locked */
-static inline bool is_condition_met(struct k_poll_event *event, u32_t *state)
+static inline bool is_condition_met(struct k_poll_event *event, uint32_t *state)
 {
 	switch (event->type) {
 	case K_POLL_TYPE_SEM_AVAILABLE:
@@ -182,7 +182,7 @@ static inline void clear_event_registrations(struct k_poll_event *events,
 	}
 }
 
-static inline void set_event_ready(struct k_poll_event *event, u32_t state)
+static inline void set_event_ready(struct k_poll_event *event, uint32_t state)
 {
 	event->poller = NULL;
 	event->state |= state;
@@ -197,7 +197,7 @@ static inline int register_events(struct k_poll_event *events,
 
 	for (int ii = 0; ii < num_events; ii++) {
 		k_spinlock_key_t key;
-		u32_t state;
+		uint32_t state;
 
 		key = k_spin_lock(&lock);
 		if (is_condition_met(&events[ii], &state)) {
@@ -217,7 +217,7 @@ static inline int register_events(struct k_poll_event *events,
 	return events_registered;
 }
 
-static int k_poll_poller_cb(struct k_poll_event *event, u32_t state)
+static int k_poll_poller_cb(struct k_poll_event *event, uint32_t state)
 {
 	struct k_thread *thread = event->poller->thread;
 
@@ -307,7 +307,7 @@ static inline int z_vrfy_k_poll(struct k_poll_event *events,
 	int ret;
 	k_spinlock_key_t key;
 	struct k_poll_event *events_copy = NULL;
-	u32_t bounds;
+	uint32_t bounds;
 
 	/* Validate the events buffer and make a copy of it in an
 	 * allocated kernel-side buffer.
@@ -378,7 +378,7 @@ oops_free:
 #endif
 
 /* must be called with interrupts locked */
-static int signal_poll_event(struct k_poll_event *event, u32_t state)
+static int signal_poll_event(struct k_poll_event *event, uint32_t state)
 {
 	struct _poller *poller = event->poller;
 	int retcode = 0;
@@ -399,7 +399,7 @@ static int signal_poll_event(struct k_poll_event *event, u32_t state)
 	return retcode;
 }
 
-void z_handle_obj_poll_events(sys_dlist_t *events, u32_t state)
+void z_handle_obj_poll_events(sys_dlist_t *events, uint32_t state)
 {
 	struct k_poll_event *poll_event;
 
@@ -521,7 +521,7 @@ static void triggered_work_expiration_handler(struct _timeout *timeout)
 	k_work_submit_to_queue(work_q, &twork->work);
 }
 
-static int triggered_work_poller_cb(struct k_poll_event *event, u32_t status)
+static int triggered_work_poller_cb(struct k_poll_event *event, uint32_t status)
 {
 	struct _poller *poller = event->poller;
 
diff --git a/kernel/queue.c b/kernel/queue.c
index 578325a115..1564fb7372 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c
@@ -33,7 +33,7 @@ void *z_queue_node_peek(sys_sfnode_t *node, bool needs_free)
 {
 	void *ret;
 
-	if ((node != NULL) && (sys_sfnode_flags_get(node) != (u8_t)0)) {
+	if ((node != NULL) && (sys_sfnode_flags_get(node) != (uint8_t)0)) {
 		/* If the flag is set, then the enqueue operation for this item
 		 * did a behind-the scenes memory allocation of an alloc_node
 		 * struct, which is what got put in the queue. Free it and pass
@@ -106,7 +106,7 @@ static void prepare_thread_to_run(struct k_thread *thread, void *data)
 	z_ready_thread(thread);
 }
 
-static inline void handle_poll_events(struct k_queue *queue, u32_t state)
+static inline void handle_poll_events(struct k_queue *queue, uint32_t state)
 {
 #ifdef CONFIG_POLL
 	z_handle_obj_poll_events(&queue->poll_events, state);
@@ -137,7 +137,7 @@ static inline void z_vrfy_k_queue_cancel_wait(struct k_queue *queue)
 #include <syscalls/k_queue_cancel_wait_mrsh.c>
 #endif
 
-static s32_t queue_insert(struct k_queue *queue, void *prev, void *data,
+static int32_t queue_insert(struct k_queue *queue, void *prev, void *data,
 			  bool alloc)
 {
 	k_spinlock_key_t key = k_spin_lock(&queue->lock);
@@ -189,14 +189,14 @@ void k_queue_prepend(struct k_queue *queue, void *data)
 	(void)queue_insert(queue, NULL, data, false);
 }
 
-s32_t z_impl_k_queue_alloc_append(struct k_queue *queue, void *data)
+int32_t z_impl_k_queue_alloc_append(struct k_queue *queue, void *data)
 {
 	return queue_insert(queue, sys_sflist_peek_tail(&queue->data_q), data,
 			    true);
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_queue_alloc_append(struct k_queue *queue,
+static inline int32_t z_vrfy_k_queue_alloc_append(struct k_queue *queue,
 						void *data)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
@@ -205,13 +205,13 @@ static inline s32_t z_vrfy_k_queue_alloc_append(struct k_queue *queue,
 #include <syscalls/k_queue_alloc_append_mrsh.c>
 #endif
 
-s32_t z_impl_k_queue_alloc_prepend(struct k_queue *queue, void *data)
+int32_t z_impl_k_queue_alloc_prepend(struct k_queue *queue, void *data)
 {
 	return queue_insert(queue, NULL, data, true);
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_queue_alloc_prepend(struct k_queue *queue,
+static inline int32_t z_vrfy_k_queue_alloc_prepend(struct k_queue *queue,
 						 void *data)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
diff --git a/kernel/sched.c b/kernel/sched.c
index 093dd2847a..20567cbf73 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -288,7 +288,7 @@ void z_reset_time_slice(void)
 	}
 }
 
-void k_sched_time_slice_set(s32_t slice, int prio)
+void k_sched_time_slice_set(int32_t slice, int prio)
 {
 	LOCKED(&sched_spinlock) {
 		_current_cpu->slice_ticks = 0;
@@ -506,7 +506,7 @@ void z_thread_single_abort(struct k_thread *thread)
 			}
 		}
 
-		u32_t mask = _THREAD_DEAD;
+		uint32_t mask = _THREAD_DEAD;
 
 		/* If the abort is happening in interrupt context,
 		 * that means that execution will never return to the
@@ -649,7 +649,7 @@ void z_thread_timeout(struct _timeout *timeout)
 }
 #endif
 
-int z_pend_curr_irqlock(u32_t key, _wait_q_t *wait_q, k_timeout_t timeout)
+int z_pend_curr_irqlock(uint32_t key, _wait_q_t *wait_q, k_timeout_t timeout)
 {
 	pend(_current, wait_q, timeout);
 
@@ -737,7 +737,7 @@ void z_thread_priority_set(struct k_thread *thread, int prio)
 	}
 }
 
-static inline int resched(u32_t key)
+static inline int resched(uint32_t key)
 {
 #ifdef CONFIG_SMP
 	_current_cpu->swap_ok = 0;
@@ -755,7 +755,7 @@ void z_reschedule(struct k_spinlock *lock, k_spinlock_key_t key)
 	}
 }
 
-void z_reschedule_irqlock(u32_t key)
+void z_reschedule_irqlock(uint32_t key)
 {
 	if (resched(key)) {
 		z_swap_irqlock(key);
@@ -1076,7 +1076,7 @@ static inline void z_vrfy_k_thread_priority_set(k_tid_t thread, int prio)
 	Z_OOPS(Z_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	Z_OOPS(Z_SYSCALL_VERIFY_MSG(_is_valid_prio(prio, NULL),
 				    "invalid thread priority %d", prio));
-	Z_OOPS(Z_SYSCALL_VERIFY_MSG((s8_t)prio >= thread->base.prio,
+	Z_OOPS(Z_SYSCALL_VERIFY_MSG((int8_t)prio >= thread->base.prio,
 				    "thread priority may only be downgraded (%d < %d)",
 				    prio, thread->base.prio));
 
@@ -1142,10 +1142,10 @@ static inline void z_vrfy_k_yield(void)
 #include <syscalls/k_yield_mrsh.c>
 #endif
 
-static s32_t z_tick_sleep(s32_t ticks)
+static int32_t z_tick_sleep(int32_t ticks)
 {
 #ifdef CONFIG_MULTITHREADING
-	u32_t expected_wakeup_time;
+	uint32_t expected_wakeup_time;
 
 	__ASSERT(!arch_is_in_isr(), "");
 
@@ -1195,7 +1195,7 @@ static s32_t z_tick_sleep(s32_t ticks)
 	return 0;
 }
 
-s32_t z_impl_k_sleep(k_timeout_t timeout)
+int32_t z_impl_k_sleep(k_timeout_t timeout)
 {
 	k_ticks_t ticks;
 
@@ -1203,7 +1203,7 @@ s32_t z_impl_k_sleep(k_timeout_t timeout)
 
 	if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
 		k_thread_suspend(_current);
-		return (s32_t) K_TICKS_FOREVER;
+		return (int32_t) K_TICKS_FOREVER;
 	}
 
 #ifdef CONFIG_LEGACY_TIMEOUT_API
@@ -1217,16 +1217,16 @@ s32_t z_impl_k_sleep(k_timeout_t timeout)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_sleep(k_timeout_t timeout)
+static inline int32_t z_vrfy_k_sleep(k_timeout_t timeout)
 {
 	return z_impl_k_sleep(timeout);
 }
 #include <syscalls/k_sleep_mrsh.c>
 #endif
 
-s32_t z_impl_k_usleep(int us)
+int32_t z_impl_k_usleep(int us)
 {
-	s32_t ticks;
+	int32_t ticks;
 
 	ticks = k_us_to_ticks_ceil64(us);
 	ticks = z_tick_sleep(ticks);
@@ -1234,7 +1234,7 @@ s32_t z_impl_k_usleep(int us)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_usleep(int us)
+static inline int32_t z_vrfy_k_usleep(int us)
 {
 	return z_impl_k_usleep(us);
 }
@@ -1381,7 +1381,7 @@ BUILD_ASSERT(CONFIG_MP_NUM_CPUS <= 8, "Too many CPUs for mask word");
 # endif
 
 
-static int cpu_mask_mod(k_tid_t thread, u32_t enable_mask, u32_t disable_mask)
+static int cpu_mask_mod(k_tid_t thread, uint32_t enable_mask, uint32_t disable_mask)
 {
 	int ret = 0;
 
diff --git a/kernel/stack.c b/kernel/stack.c
index be00a1fd34..d9c4b53a76 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -42,7 +42,7 @@ SYS_INIT(init_stack_module, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
 #endif /* CONFIG_OBJECT_TRACING */
 
 void k_stack_init(struct k_stack *stack, stack_data_t *buffer,
-		  u32_t num_entries)
+		  uint32_t num_entries)
 {
 	z_waitq_init(&stack->wait_q);
 	stack->lock = (struct k_spinlock) {};
@@ -53,16 +53,16 @@ void k_stack_init(struct k_stack *stack, stack_data_t *buffer,
 	z_object_init(stack);
 }
 
-s32_t z_impl_k_stack_alloc_init(struct k_stack *stack, u32_t num_entries)
+int32_t z_impl_k_stack_alloc_init(struct k_stack *stack, uint32_t num_entries)
 {
 	void *buffer;
-	s32_t ret;
+	int32_t ret;
 
 	buffer = z_thread_malloc(num_entries * sizeof(stack_data_t));
 	if (buffer != NULL) {
 		k_stack_init(stack, buffer, num_entries);
 		stack->flags = K_STACK_FLAG_ALLOC;
-		ret = (s32_t)0;
+		ret = (int32_t)0;
 	} else {
 		ret = -ENOMEM;
 	}
@@ -71,8 +71,8 @@ s32_t z_impl_k_stack_alloc_init(struct k_stack *stack, u32_t num_entries)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s32_t z_vrfy_k_stack_alloc_init(struct k_stack *stack,
-					      u32_t num_entries)
+static inline int32_t z_vrfy_k_stack_alloc_init(struct k_stack *stack,
+					      uint32_t num_entries)
 {
 	Z_OOPS(Z_SYSCALL_OBJ_NEVER_INIT(stack, K_OBJ_STACK));
 	Z_OOPS(Z_SYSCALL_VERIFY(num_entries > 0));
@@ -87,7 +87,7 @@ int k_stack_cleanup(struct k_stack *stack)
 		return -EAGAIN;
 	}
 
-	if ((stack->flags & K_STACK_FLAG_ALLOC) != (u8_t)0) {
+	if ((stack->flags & K_STACK_FLAG_ALLOC) != (uint8_t)0) {
 		k_free(stack->base);
 		stack->base = NULL;
 		stack->flags &= ~K_STACK_FLAG_ALLOC;
diff --git a/kernel/thread.c b/kernel/thread.c
index a1288aead2..5dc1b4ec87 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -115,19 +115,19 @@ bool z_is_thread_essential(void)
 }
 
 #ifdef CONFIG_SYS_CLOCK_EXISTS
-void z_impl_k_busy_wait(u32_t usec_to_wait)
+void z_impl_k_busy_wait(uint32_t usec_to_wait)
 {
 #if !defined(CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT)
 	/* use 64-bit math to prevent overflow when multiplying */
-	u32_t cycles_to_wait = (u32_t)(
-		(u64_t)usec_to_wait *
-		(u64_t)sys_clock_hw_cycles_per_sec() /
-		(u64_t)USEC_PER_SEC
+	uint32_t cycles_to_wait = (uint32_t)(
+		(uint64_t)usec_to_wait *
+		(uint64_t)sys_clock_hw_cycles_per_sec() /
+		(uint64_t)USEC_PER_SEC
 	);
-	u32_t start_cycles = k_cycle_get_32();
+	uint32_t start_cycles = k_cycle_get_32();
 
 	for (;;) {
-		u32_t current_cycles = k_cycle_get_32();
+		uint32_t current_cycles = k_cycle_get_32();
 
 		/* this handles the rollover on an unsigned 32-bit value */
 		if ((current_cycles - start_cycles) >= cycles_to_wait) {
@@ -140,7 +140,7 @@ void z_impl_k_busy_wait(u32_t usec_to_wait)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline void z_vrfy_k_busy_wait(u32_t usec_to_wait)
+static inline void z_vrfy_k_busy_wait(uint32_t usec_to_wait)
 {
 	z_impl_k_busy_wait(usec_to_wait);
 }
@@ -358,13 +358,13 @@ static inline int z_vrfy_k_thread_name_copy(k_tid_t thread,
  */
 void z_check_stack_sentinel(void)
 {
-	u32_t *stack;
+	uint32_t *stack;
 
 	if ((_current->base.thread_state & _THREAD_DUMMY) != 0) {
 		return;
 	}
 
-	stack = (u32_t *)_current->stack_info.start;
+	stack = (uint32_t *)_current->stack_info.start;
 	if (*stack != STACK_SENTINEL) {
 		/* Restore it so further checks don't trigger this same error */
 		*stack = STACK_SENTINEL;
@@ -422,9 +422,9 @@ static inline size_t adjust_stack_size(size_t stack_size)
 	size_t random_val;
 
 	if (!z_stack_adjust_initialized) {
-		z_early_boot_rand_get((u8_t *)&random_val, sizeof(random_val));
+		z_early_boot_rand_get((uint8_t *)&random_val, sizeof(random_val));
 	} else {
-		sys_rand_get((u8_t *)&random_val, sizeof(random_val));
+		sys_rand_get((uint8_t *)&random_val, sizeof(random_val));
 	}
 
 	/* Don't need to worry about alignment of the size here,
@@ -457,7 +457,7 @@ void z_setup_new_thread(struct k_thread *new_thread,
 		       k_thread_stack_t *stack, size_t stack_size,
 		       k_thread_entry_t entry,
 		       void *p1, void *p2, void *p3,
-		       int prio, u32_t options, const char *name)
+		       int prio, uint32_t options, const char *name)
 {
 	Z_ASSERT_VALID_PRIO(prio, entry);
 
@@ -504,7 +504,7 @@ void z_setup_new_thread(struct k_thread *new_thread,
 	 * We periodically check that it's still present and kill the thread
 	 * if it isn't.
 	 */
-	*((u32_t *)new_thread->stack_info.start) = STACK_SENTINEL;
+	*((uint32_t *)new_thread->stack_info.start) = STACK_SENTINEL;
 #endif /* CONFIG_STACK_SENTINEL */
 #ifdef CONFIG_THREAD_USERSPACE_LOCAL_DATA
 #ifndef CONFIG_THREAD_USERSPACE_LOCAL_DATA_ARCH_DEFER_SETUP
@@ -575,7 +575,7 @@ k_tid_t z_impl_k_thread_create(struct k_thread *new_thread,
 			      k_thread_stack_t *stack,
 			      size_t stack_size, k_thread_entry_t entry,
 			      void *p1, void *p2, void *p3,
-			      int prio, u32_t options, k_timeout_t delay)
+			      int prio, uint32_t options, k_timeout_t delay)
 {
 	__ASSERT(!arch_is_in_isr(), "Threads may not be created in ISRs");
 
@@ -602,7 +602,7 @@ k_tid_t z_vrfy_k_thread_create(struct k_thread *new_thread,
 			       k_thread_stack_t *stack,
 			       size_t stack_size, k_thread_entry_t entry,
 			       void *p1, void *p2, void *p3,
-			       int prio, u32_t options, k_timeout_t delay)
+			       int prio, uint32_t options, k_timeout_t delay)
 {
 	size_t total_size, stack_obj_size;
 	struct z_object *stack_object;
@@ -720,12 +720,12 @@ void z_init_static_threads(void)
 #endif
 
 void z_init_thread_base(struct _thread_base *thread_base, int priority,
-		       u32_t initial_state, unsigned int options)
+		       uint32_t initial_state, unsigned int options)
 {
 	/* k_q_node is initialized upon first insertion in a list */
 
-	thread_base->user_options = (u8_t)options;
-	thread_base->thread_state = (u8_t)initial_state;
+	thread_base->user_options = (uint8_t)options;
+	thread_base->thread_state = (uint8_t)initial_state;
 
 	thread_base->prio = priority;
 
@@ -829,15 +829,15 @@ void irq_offload(irq_offload_routine_t routine, void *parameter)
 int z_impl_k_thread_stack_space_get(const struct k_thread *thread,
 				    size_t *unused_ptr)
 {
-	const u8_t *start = (u8_t *)thread->stack_info.start;
+	const uint8_t *start = (uint8_t *)thread->stack_info.start;
 	size_t size = thread->stack_info.size;
 	size_t unused = 0;
-	const u8_t *checked_stack = start;
+	const uint8_t *checked_stack = start;
 	/* Take the address of any local variable as a shallow bound for the
 	 * stack pointer.  Addresses above it are guaranteed to be
 	 * accessible.
 	 */
-	const u8_t *stack_pointer = (const u8_t *)&start;
+	const uint8_t *stack_pointer = (const uint8_t *)&start;
 
 	/* If we are currently running on the stack being analyzed, some
 	 * memory management hardware will generate an exception if we
diff --git a/kernel/timeout.c b/kernel/timeout.c
index 523a7a47c4..e5f3b05f2e 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -17,7 +17,7 @@
 			__i.key == 0;					\
 			k_spin_unlock(lck, __key), __i.key = 1)
 
-static u64_t curr_tick;
+static uint64_t curr_tick;
 
 static sys_dlist_t timeout_list = SYS_DLIST_STATIC_INIT(&timeout_list);
 
@@ -64,16 +64,16 @@ static void remove_timeout(struct _timeout *t)
 	sys_dlist_remove(&t->node);
 }
 
-static s32_t elapsed(void)
+static int32_t elapsed(void)
 {
 	return announce_remaining == 0 ? z_clock_elapsed() : 0;
 }
 
-static s32_t next_timeout(void)
+static int32_t next_timeout(void)
 {
 	struct _timeout *to = first();
-	s32_t ticks_elapsed = elapsed();
-	s32_t ret = to == NULL ? MAX_WAIT : MAX(0, to->dticks - ticks_elapsed);
+	int32_t ticks_elapsed = elapsed();
+	int32_t ret = to == NULL ? MAX_WAIT : MAX(0, to->dticks - ticks_elapsed);
 
 #ifdef CONFIG_TIMESLICING
 	if (_current_cpu->slice_ticks && _current_cpu->slice_ticks < ret) {
@@ -184,9 +184,9 @@ k_ticks_t z_timeout_expires(struct _timeout *timeout)
 	return ticks;
 }
 
-s32_t z_get_next_timeout_expiry(void)
+int32_t z_get_next_timeout_expiry(void)
 {
-	s32_t ret = (s32_t) K_TICKS_FOREVER;
+	int32_t ret = (int32_t) K_TICKS_FOREVER;
 
 	LOCKED(&timeout_lock) {
 		ret = next_timeout();
@@ -194,7 +194,7 @@ s32_t z_get_next_timeout_expiry(void)
 	return ret;
 }
 
-void z_set_timeout_expiry(s32_t ticks, bool idle)
+void z_set_timeout_expiry(int32_t ticks, bool idle)
 {
 	LOCKED(&timeout_lock) {
 		int next = next_timeout();
@@ -217,7 +217,7 @@ void z_set_timeout_expiry(s32_t ticks, bool idle)
 	}
 }
 
-void z_clock_announce(s32_t ticks)
+void z_clock_announce(int32_t ticks)
 {
 #ifdef CONFIG_TIMESLICING
 	z_time_slice(ticks);
@@ -253,9 +253,9 @@ void z_clock_announce(s32_t ticks)
 	k_spin_unlock(&timeout_lock, key);
 }
 
-s64_t z_tick_get(void)
+int64_t z_tick_get(void)
 {
-	u64_t t = 0U;
+	uint64_t t = 0U;
 
 	LOCKED(&timeout_lock) {
 		t = curr_tick + z_clock_elapsed();
@@ -263,22 +263,22 @@ s64_t z_tick_get(void)
 	return t;
 }
 
-u32_t z_tick_get_32(void)
+uint32_t z_tick_get_32(void)
 {
 #ifdef CONFIG_TICKLESS_KERNEL
-	return (u32_t)z_tick_get();
+	return (uint32_t)z_tick_get();
 #else
-	return (u32_t)curr_tick;
+	return (uint32_t)curr_tick;
 #endif
 }
 
-s64_t z_impl_k_uptime_ticks(void)
+int64_t z_impl_k_uptime_ticks(void)
 {
 	return z_tick_get();
 }
 
 #ifdef CONFIG_USERSPACE
-static inline s64_t z_vrfy_k_uptime_ticks(void)
+static inline int64_t z_vrfy_k_uptime_ticks(void)
 {
 	return z_impl_k_uptime_ticks();
 }
@@ -290,7 +290,7 @@ static inline s64_t z_vrfy_k_uptime_ticks(void)
  * synchronously with the user passing a new timeout value.  It should
  * not be used iteratively to adjust a timeout.
  */
-u64_t z_timeout_end_calc(k_timeout_t timeout)
+uint64_t z_timeout_end_calc(k_timeout_t timeout)
 {
 	k_ticks_t dt;
 
diff --git a/kernel/timer.c b/kernel/timer.c
index 350a603406..9a9b268cd1 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -186,10 +186,10 @@ static inline void z_vrfy_k_timer_stop(struct k_timer *timer)
 #include <syscalls/k_timer_stop_mrsh.c>
 #endif
 
-u32_t z_impl_k_timer_status_get(struct k_timer *timer)
+uint32_t z_impl_k_timer_status_get(struct k_timer *timer)
 {
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t result = timer->status;
+	uint32_t result = timer->status;
 
 	timer->status = 0U;
 	k_spin_unlock(&lock, key);
@@ -198,7 +198,7 @@ u32_t z_impl_k_timer_status_get(struct k_timer *timer)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline u32_t z_vrfy_k_timer_status_get(struct k_timer *timer)
+static inline uint32_t z_vrfy_k_timer_status_get(struct k_timer *timer)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_status_get(timer);
@@ -206,12 +206,12 @@ static inline u32_t z_vrfy_k_timer_status_get(struct k_timer *timer)
 #include <syscalls/k_timer_status_get_mrsh.c>
 #endif
 
-u32_t z_impl_k_timer_status_sync(struct k_timer *timer)
+uint32_t z_impl_k_timer_status_sync(struct k_timer *timer)
 {
 	__ASSERT(!arch_is_in_isr(), "");
 
 	k_spinlock_key_t key = k_spin_lock(&lock);
-	u32_t result = timer->status;
+	uint32_t result = timer->status;
 
 	if (result == 0U) {
 		if (!z_is_inactive_timeout(&timer->timeout)) {
@@ -235,7 +235,7 @@ u32_t z_impl_k_timer_status_sync(struct k_timer *timer)
 }
 
 #ifdef CONFIG_USERSPACE
-static inline u32_t z_vrfy_k_timer_status_sync(struct k_timer *timer)
+static inline uint32_t z_vrfy_k_timer_status_sync(struct k_timer *timer)
 {
 	Z_OOPS(Z_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_status_sync(timer);
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 04f3239867..941a767c9c 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -55,7 +55,7 @@ static struct k_spinlock obj_lock;         /* kobj struct data */
 #define MAX_THREAD_BITS		(CONFIG_MAX_THREAD_BYTES * 8)
 
 #ifdef CONFIG_DYNAMIC_OBJECTS
-extern u8_t _thread_idx_map[CONFIG_MAX_THREAD_BYTES];
+extern uint8_t _thread_idx_map[CONFIG_MAX_THREAD_BYTES];
 #endif
 
 static void clear_perms_cb(struct z_object *ko, void *ctx_ptr);
@@ -100,7 +100,7 @@ struct perm_ctx {
  */
 BUILD_ASSERT(CONFIG_PRIVILEGED_STACK_SIZE % Z_PRIVILEGE_STACK_ALIGN == 0);
 
-u8_t *z_priv_stack_find(k_thread_stack_t *stack)
+uint8_t *z_priv_stack_find(k_thread_stack_t *stack)
 {
 	struct z_object *obj = z_object_find(stack);
 
@@ -117,7 +117,7 @@ struct dyn_obj {
 	struct z_object kobj;
 	sys_dnode_t obj_list;
 	struct rbnode node; /* must be immediately before data member */
-	u8_t data[]; /* The object itself */
+	uint8_t data[]; /* The object itself */
 };
 
 extern struct z_object *z_object_gperf_find(void *obj);
diff --git a/kernel/version.c b/kernel/version.c
index a2b7cf0987..799e555f1a 100644
--- a/kernel/version.c
+++ b/kernel/version.c
@@ -15,7 +15,7 @@
  *
  * @return kernel version
  */
-u32_t sys_kernel_version_get(void)
+uint32_t sys_kernel_version_get(void)
 {
 	return KERNELVERSION;
 }
diff --git a/lib/cmsis_rtos_v1/cmsis_msgq.c b/lib/cmsis_rtos_v1/cmsis_msgq.c
index f3319a5d20..161a41e04a 100644
--- a/lib/cmsis_rtos_v1/cmsis_msgq.c
+++ b/lib/cmsis_rtos_v1/cmsis_msgq.c
@@ -62,7 +62,7 @@ osStatus osMessagePut(osMessageQId queue_id, uint32_t info, uint32_t millisec)
 osEvent osMessageGet(osMessageQId queue_id, uint32_t millisec)
 {
 	osMessageQDef_t *queue_def = (osMessageQDef_t *)queue_id;
-	u32_t info;
+	uint32_t info;
 	osEvent evt = {0};
 	int retval;
 
diff --git a/lib/cmsis_rtos_v1/cmsis_signal.c b/lib/cmsis_rtos_v1/cmsis_signal.c
index 0215ddf179..fbb64a2bdd 100644
--- a/lib/cmsis_rtos_v1/cmsis_signal.c
+++ b/lib/cmsis_rtos_v1/cmsis_signal.c
@@ -73,8 +73,8 @@ osEvent osSignalWait(int32_t signals, uint32_t millisec)
 {
 	int retval, key;
 	osEvent evt;
-	u32_t time_delta_ms, timeout = millisec;
-	u64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
+	uint32_t time_delta_ms, timeout = millisec;
+	uint64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
 
 	if (k_is_in_isr()) {
 		evt.status = osErrorISR;
@@ -91,7 +91,7 @@ osEvent osSignalWait(int32_t signals, uint32_t millisec)
 
 	for (;;) {
 
-		time_stamp_start = (u64_t)k_cycle_get_32();
+		time_stamp_start = (uint64_t)k_cycle_get_32();
 
 		switch (millisec) {
 		case 0:
@@ -141,10 +141,10 @@ osEvent osSignalWait(int32_t signals, uint32_t millisec)
 		 * timeout value accordingly based on the time that has
 		 * already elapsed.
 		 */
-		hwclk_cycles_delta = (u64_t)k_cycle_get_32() - time_stamp_start;
+		hwclk_cycles_delta = (uint64_t)k_cycle_get_32() - time_stamp_start;
 		time_delta_ns =
-			(u32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
-		time_delta_ms =	(u32_t)time_delta_ns/NSEC_PER_MSEC;
+			(uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
+		time_delta_ms =	(uint32_t)time_delta_ns/NSEC_PER_MSEC;
 
 		if (timeout > time_delta_ms) {
 			timeout -= time_delta_ms;
diff --git a/lib/cmsis_rtos_v1/cmsis_thread.c b/lib/cmsis_rtos_v1/cmsis_thread.c
index 216e525a80..b632089602 100644
--- a/lib/cmsis_rtos_v1/cmsis_thread.c
+++ b/lib/cmsis_rtos_v1/cmsis_thread.c
@@ -12,17 +12,17 @@
 
 static inline int _is_thread_cmsis_inactive(struct k_thread *thread)
 {
-	u8_t state = thread->base.thread_state;
+	uint8_t state = thread->base.thread_state;
 
 	return state & (_THREAD_PRESTART | _THREAD_DEAD);
 }
 
-static inline s32_t zephyr_to_cmsis_priority(u32_t z_prio)
+static inline int32_t zephyr_to_cmsis_priority(uint32_t z_prio)
 {
 	return(osPriorityRealtime - z_prio);
 }
 
-static inline u32_t cmsis_to_zephyr_priority(s32_t c_prio)
+static inline uint32_t cmsis_to_zephyr_priority(int32_t c_prio)
 {
 	return(osPriorityRealtime - c_prio);
 }
@@ -40,9 +40,9 @@ static void zephyr_thread_wrapper(void *arg1, void *arg2, void *arg3)
 osThreadId osThreadCreate(const osThreadDef_t *thread_def, void *arg)
 {
 	struct k_thread *cm_thread;
-	u32_t prio;
+	uint32_t prio;
 	k_tid_t tid;
-	u32_t stacksz;
+	uint32_t stacksz;
 
 	k_thread_stack_t
 	   (*stk_ptr)[K_THREAD_STACK_LEN(CONFIG_CMSIS_THREAD_MAX_STACK_SIZE)];
@@ -109,7 +109,7 @@ osThreadId osThreadGetId(void)
 osPriority osThreadGetPriority(osThreadId thread_id)
 {
 	k_tid_t thread = (k_tid_t)thread_id;
-	u32_t priority;
+	uint32_t priority;
 
 	if ((thread_id == NULL) || (k_is_in_isr())) {
 		return osPriorityError;
diff --git a/lib/cmsis_rtos_v1/cmsis_timer.c b/lib/cmsis_rtos_v1/cmsis_timer.c
index 916eaf1a14..57c283c090 100644
--- a/lib/cmsis_rtos_v1/cmsis_timer.c
+++ b/lib/cmsis_rtos_v1/cmsis_timer.c
@@ -16,7 +16,7 @@ static void zephyr_timer_wrapper(struct k_timer *timer);
 struct timer_obj {
 	struct k_timer ztimer;
 	os_timer_type type;
-	u32_t status;
+	uint32_t status;
 	void (*callback_function)(void const *argument);
 	void *arg;
 };
diff --git a/lib/cmsis_rtos_v2/event_flags.c b/lib/cmsis_rtos_v2/event_flags.c
index 961a47af2b..7b497871a5 100644
--- a/lib/cmsis_rtos_v2/event_flags.c
+++ b/lib/cmsis_rtos_v2/event_flags.c
@@ -86,7 +86,7 @@ uint32_t osEventFlagsClear(osEventFlagsId_t ef_id, uint32_t flags)
 {
 	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
 	int key;
-	u32_t sig;
+	uint32_t sig;
 
 	if ((ef_id == NULL) || (flags & 0x80000000)) {
 		return osFlagsErrorParameter;
@@ -108,9 +108,9 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 {
 	struct cv2_event_flags *events = (struct cv2_event_flags *)ef_id;
 	int retval, key;
-	u32_t sig;
-	u32_t time_delta_ms, timeout_ms = k_ticks_to_ms_floor64(timeout);
-	u64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
+	uint32_t sig;
+	uint32_t time_delta_ms, timeout_ms = k_ticks_to_ms_floor64(timeout);
+	uint64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
 
 	/* Can be called from ISRs only if timeout is set to 0 */
 	if (timeout > 0 && k_is_in_isr()) {
@@ -123,7 +123,7 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 
 	for (;;) {
 
-		time_stamp_start = (u64_t)k_cycle_get_32();
+		time_stamp_start = (uint64_t)k_cycle_get_32();
 
 		switch (timeout) {
 		case 0:
@@ -170,12 +170,12 @@ uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags,
 			 * the time that has already elapsed.
 			 */
 			hwclk_cycles_delta =
-				(u64_t)k_cycle_get_32() - time_stamp_start;
+				(uint64_t)k_cycle_get_32() - time_stamp_start;
 
 			time_delta_ns =
-				(u32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
+				(uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
 
-			time_delta_ms = (u32_t)time_delta_ns / NSEC_PER_MSEC;
+			time_delta_ms = (uint32_t)time_delta_ns / NSEC_PER_MSEC;
 
 			if (timeout_ms > time_delta_ms) {
 				timeout_ms -= time_delta_ms;
diff --git a/lib/cmsis_rtos_v2/kernel.c b/lib/cmsis_rtos_v2/kernel.c
index 2e05b9aa22..ed6d5fb85b 100644
--- a/lib/cmsis_rtos_v2/kernel.c
+++ b/lib/cmsis_rtos_v2/kernel.c
@@ -9,14 +9,14 @@
 #include <kernel.h>
 #include <cmsis_os2.h>
 
-extern u32_t z_tick_get_32(void);
+extern uint32_t z_tick_get_32(void);
 
 /**
  * @brief Get RTOS Kernel Information.
  */
 osStatus_t osKernelGetInfo(osVersion_t *version, char *id_buf, uint32_t id_size)
 {
-	u32_t ver = sys_kernel_version_get();
+	uint32_t ver = sys_kernel_version_get();
 
 	if (version != NULL) {
 		version->api = ver;
@@ -135,7 +135,7 @@ osStatus_t osDelay(uint32_t ticks)
  */
 osStatus_t osDelayUntil(uint32_t ticks)
 {
-	u32_t ticks_elapsed;
+	uint32_t ticks_elapsed;
 
 	if (k_is_in_isr()) {
 		return osErrorISR;
diff --git a/lib/cmsis_rtos_v2/thread.c b/lib/cmsis_rtos_v2/thread.c
index 43ecbc3396..d673ee542b 100644
--- a/lib/cmsis_rtos_v2/thread.c
+++ b/lib/cmsis_rtos_v2/thread.c
@@ -26,8 +26,8 @@ static const osThreadAttr_t init_thread_attrs = {
 
 static sys_dlist_t thread_list;
 static struct cv2_thread cv2_thread_pool[CONFIG_CMSIS_V2_THREAD_MAX_COUNT];
-static u32_t thread_num;
-static u32_t thread_num_dynamic;
+static uint32_t thread_num;
+static uint32_t thread_num_dynamic;
 
 static K_THREAD_STACK_ARRAY_DEFINE(cv2_thread_stack_pool,		     \
 				   CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT, \
@@ -35,17 +35,17 @@ static K_THREAD_STACK_ARRAY_DEFINE(cv2_thread_stack_pool,		     \
 
 static inline int _is_thread_cmsis_inactive(struct k_thread *thread)
 {
-	u8_t state = thread->base.thread_state;
+	uint8_t state = thread->base.thread_state;
 
 	return state & (_THREAD_PRESTART | _THREAD_DEAD);
 }
 
-static inline u32_t zephyr_to_cmsis_priority(u32_t z_prio)
+static inline uint32_t zephyr_to_cmsis_priority(uint32_t z_prio)
 {
 	return (osPriorityISR - z_prio);
 }
 
-static inline u32_t cmsis_to_zephyr_priority(u32_t c_prio)
+static inline uint32_t cmsis_to_zephyr_priority(uint32_t c_prio)
 {
 	return (osPriorityISR - c_prio);
 }
@@ -101,14 +101,14 @@ osThreadId_t get_cmsis_thread_id(k_tid_t tid)
 osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
 			 const osThreadAttr_t *attr)
 {
-	s32_t prio;
+	int32_t prio;
 	osPriority_t cv2_prio;
 	struct cv2_thread *tid;
-	static u32_t one_time;
+	static uint32_t one_time;
 	void *stack;
 	size_t stack_size;
-	u32_t this_thread_num;
-	u32_t this_thread_num_dynamic;
+	uint32_t this_thread_num;
+	uint32_t this_thread_num_dynamic;
 
 	if (k_is_in_isr()) {
 		return NULL;
@@ -248,7 +248,7 @@ osThreadId_t osThreadGetId(void)
 osPriority_t osThreadGetPriority(osThreadId_t thread_id)
 {
 	struct cv2_thread *tid = (struct cv2_thread *)thread_id;
-	u32_t priority;
+	uint32_t priority;
 
 	if (k_is_in_isr() || (tid == NULL) ||
 	    (is_cmsis_rtos_v2_thread(tid) == NULL) ||
@@ -545,7 +545,7 @@ osStatus_t osThreadTerminate(osThreadId_t thread_id)
 uint32_t osThreadGetCount(void)
 {
 	struct k_thread *thread;
-	u32_t count = 0U;
+	uint32_t count = 0U;
 
 	__ASSERT(!k_is_in_isr(), "");
 	for (thread = _kernel.threads; thread; thread = thread->next_thread) {
@@ -563,7 +563,7 @@ uint32_t osThreadGetCount(void)
 uint32_t osThreadEnumerate(osThreadId_t *thread_array, uint32_t array_items)
 {
 	struct k_thread *thread;
-	u32_t count = 0U;
+	uint32_t count = 0U;
 	osThreadId_t tid;
 
 	__ASSERT(!k_is_in_isr(), "");
diff --git a/lib/cmsis_rtos_v2/thread_flags.c b/lib/cmsis_rtos_v2/thread_flags.c
index 564f9821a5..cf7cb02fff 100644
--- a/lib/cmsis_rtos_v2/thread_flags.c
+++ b/lib/cmsis_rtos_v2/thread_flags.c
@@ -88,9 +88,9 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 {
 	struct cv2_thread *tid;
 	int retval, key;
-	u32_t sig;
-	u32_t time_delta_ms, timeout_ms = k_ticks_to_ms_floor64(timeout);
-	u64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
+	uint32_t sig;
+	uint32_t time_delta_ms, timeout_ms = k_ticks_to_ms_floor64(timeout);
+	uint64_t time_stamp_start, hwclk_cycles_delta, time_delta_ns;
 
 	if (k_is_in_isr()) {
 		return osFlagsErrorUnknown;
@@ -107,7 +107,7 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 
 	for (;;) {
 
-		time_stamp_start = (u64_t)k_cycle_get_32();
+		time_stamp_start = (uint64_t)k_cycle_get_32();
 
 		switch (timeout) {
 		case 0:
@@ -153,12 +153,12 @@ uint32_t osThreadFlagsWait(uint32_t flags, uint32_t options, uint32_t timeout)
 			 * the time that has already elapsed.
 			 */
 			hwclk_cycles_delta =
-				(u64_t)k_cycle_get_32() - time_stamp_start;
+				(uint64_t)k_cycle_get_32() - time_stamp_start;
 
 			time_delta_ns =
-				(u32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
+				(uint32_t)k_cyc_to_ns_floor64(hwclk_cycles_delta);
 
-			time_delta_ms = (u32_t)time_delta_ns / NSEC_PER_MSEC;
+			time_delta_ms = (uint32_t)time_delta_ns / NSEC_PER_MSEC;
 
 			if (timeout_ms > time_delta_ms) {
 				timeout_ms -= time_delta_ms;
diff --git a/lib/cmsis_rtos_v2/wrapper.h b/lib/cmsis_rtos_v2/wrapper.h
index 1693161585..47355702a8 100644
--- a/lib/cmsis_rtos_v2/wrapper.h
+++ b/lib/cmsis_rtos_v2/wrapper.h
@@ -18,9 +18,9 @@ struct cv2_thread {
 	struct k_thread z_thread;
 	struct k_poll_signal poll_signal;
 	struct k_poll_event poll_event;
-	u32_t signal_results;
+	uint32_t signal_results;
 	char name[16];
-	u32_t attr_bits;
+	uint32_t attr_bits;
 	struct k_sem join_guard;
 	char has_joined;
 };
@@ -28,7 +28,7 @@ struct cv2_thread {
 struct cv2_timer {
 	struct k_timer z_timer;
 	osTimerType_t type;
-	u32_t status;
+	uint32_t status;
 	char name[16];
 	void (*callback_function)(void *argument);
 	void *arg;
@@ -37,7 +37,7 @@ struct cv2_timer {
 struct cv2_mutex {
 	struct k_mutex z_mutex;
 	char name[16];
-	u32_t state;
+	uint32_t state;
 };
 
 struct cv2_sem {
@@ -62,7 +62,7 @@ struct cv2_msgq {
 struct cv2_event_flags {
 	struct k_poll_signal poll_signal;
 	struct k_poll_event poll_event;
-	u32_t signal_results;
+	uint32_t signal_results;
 	char name[16];
 };
 
diff --git a/lib/gui/lvgl/lvgl.c b/lib/gui/lvgl/lvgl.c
index c310000b74..94a3e0eb56 100644
--- a/lib/gui/lvgl/lvgl.c
+++ b/lib/gui/lvgl/lvgl.c
@@ -29,9 +29,9 @@ static lv_disp_buf_t disp_buf;
 
 #define NBR_PIXELS_IN_BUFFER (BUFFER_SIZE * 8 / CONFIG_LVGL_BITS_PER_PIXEL)
 
-static u8_t buf0[BUFFER_SIZE];
+static uint8_t buf0[BUFFER_SIZE];
 #ifdef CONFIG_LVGL_DOUBLE_VDB
-static u8_t buf1[BUFFER_SIZE];
+static uint8_t buf1[BUFFER_SIZE];
 #endif
 
 #endif /* CONFIG_LVGL_BUFFER_ALLOC_STATIC */
@@ -56,7 +56,7 @@ static void lvgl_log(lv_log_level_t level, const char *file, uint32_t line,
 	 * * LOG_LEVEL_INF 3
 	 * * LOG_LEVEL_DBG 4
 	 */
-	u8_t zephyr_level = LOG_LEVEL_DBG - level;
+	uint8_t zephyr_level = LOG_LEVEL_DBG - level;
 
 	ARG_UNUSED(file);
 	ARG_UNUSED(line);
@@ -85,8 +85,8 @@ static int lvgl_allocate_rendering_buffers(lv_disp_drv_t *disp_drv)
 {
 	void *buf0 = NULL;
 	void *buf1 = NULL;
-	u16_t buf_nbr_pixels;
-	u32_t buf_size;
+	uint16_t buf_nbr_pixels;
+	uint32_t buf_size;
 	struct display_capabilities cap;
 	struct device *display_dev = (struct device *)disp_drv->user_data;
 
@@ -153,8 +153,8 @@ static int lvgl_allocate_rendering_buffers(lv_disp_drv_t *disp_drv)
 K_MSGQ_DEFINE(kscan_msgq, sizeof(lv_indev_data_t),
 	      CONFIG_LVGL_POINTER_KSCAN_MSGQ_COUNT, 4);
 
-static void lvgl_pointer_kscan_callback(struct device *dev, u32_t row,
-					u32_t col, bool pressed)
+static void lvgl_pointer_kscan_callback(struct device *dev, uint32_t row,
+					uint32_t col, bool pressed)
 {
 	lv_indev_data_t data = {
 		.point.x = col,
diff --git a/lib/gui/lvgl/lvgl_display.h b/lib/gui/lvgl/lvgl_display.h
index b73c0a2c3e..cb5b267e0e 100644
--- a/lib/gui/lvgl/lvgl_display.h
+++ b/lib/gui/lvgl/lvgl_display.h
@@ -24,16 +24,16 @@ void lvgl_flush_cb_32bit(struct _disp_drv_t *disp_drv,
 		const lv_area_t *area, lv_color_t *color_p);
 
 void lvgl_set_px_cb_mono(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa);
 void lvgl_set_px_cb_16bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa);
 void lvgl_set_px_cb_24bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa);
 void lvgl_set_px_cb_32bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa);
 
 void lvgl_rounder_cb_mono(struct _disp_drv_t *disp_drv, lv_area_t *area);
diff --git a/lib/gui/lvgl/lvgl_display_16bit.c b/lib/gui/lvgl/lvgl_display_16bit.c
index 66f6d74951..ca776fd8e6 100644
--- a/lib/gui/lvgl/lvgl_display_16bit.c
+++ b/lib/gui/lvgl/lvgl_display_16bit.c
@@ -12,8 +12,8 @@ void lvgl_flush_cb_16bit(struct _disp_drv_t *disp_drv,
 		const lv_area_t *area, lv_color_t *color_p)
 {
 	struct device *display_dev = (struct device *)disp_drv->user_data;
-	u16_t w = area->x2 - area->x1 + 1;
-	u16_t h = area->y2 - area->y1 + 1;
+	uint16_t w = area->x2 - area->x1 + 1;
+	uint16_t h = area->y2 - area->y1 + 1;
 	struct display_buffer_descriptor desc;
 
 	desc.buf_size = w * 2U * h;
@@ -27,10 +27,10 @@ void lvgl_flush_cb_16bit(struct _disp_drv_t *disp_drv,
 
 #ifndef CONFIG_LVGL_COLOR_DEPTH_16
 void lvgl_set_px_cb_16bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa)
 {
-	u16_t *buf_xy = (u16_t *)(buf + x * 2U + y * 2U * buf_w);
+	uint16_t *buf_xy = (uint16_t *)(buf + x * 2U + y * 2U * buf_w);
 	*buf_xy = lv_color_to16(color);
 }
 #endif
diff --git a/lib/gui/lvgl/lvgl_display_24bit.c b/lib/gui/lvgl/lvgl_display_24bit.c
index bc75349bb1..38b48d0b42 100644
--- a/lib/gui/lvgl/lvgl_display_24bit.c
+++ b/lib/gui/lvgl/lvgl_display_24bit.c
@@ -12,8 +12,8 @@ void lvgl_flush_cb_24bit(struct _disp_drv_t *disp_drv,
 		const lv_area_t *area, lv_color_t *color_p)
 {
 	struct device *display_dev = (struct device *)disp_drv->user_data;
-	u16_t w = area->x2 - area->x1 + 1;
-	u16_t h = area->y2 - area->y1 + 1;
+	uint16_t w = area->x2 - area->x1 + 1;
+	uint16_t h = area->y2 - area->y1 + 1;
 	struct display_buffer_descriptor desc;
 
 	desc.buf_size = w * 3U * h;
@@ -26,10 +26,10 @@ void lvgl_flush_cb_24bit(struct _disp_drv_t *disp_drv,
 }
 
 void lvgl_set_px_cb_24bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa)
 {
-	u8_t *buf_xy = buf + x * 3U + y * 3U * buf_w;
+	uint8_t *buf_xy = buf + x * 3U + y * 3U * buf_w;
 	lv_color32_t converted_color;
 
 #ifdef CONFIG_LVGL_COLOR_DEPTH_32
diff --git a/lib/gui/lvgl/lvgl_display_32bit.c b/lib/gui/lvgl/lvgl_display_32bit.c
index eebd132c25..b52b1b881f 100644
--- a/lib/gui/lvgl/lvgl_display_32bit.c
+++ b/lib/gui/lvgl/lvgl_display_32bit.c
@@ -12,8 +12,8 @@ void lvgl_flush_cb_32bit(struct _disp_drv_t *disp_drv,
 		const lv_area_t *area, lv_color_t *color_p)
 {
 	struct device *display_dev = (struct device *)disp_drv->user_data;
-	u16_t w = area->x2 - area->x1 + 1;
-	u16_t h = area->y2 - area->y1 + 1;
+	uint16_t w = area->x2 - area->x1 + 1;
+	uint16_t h = area->y2 - area->y1 + 1;
 	struct display_buffer_descriptor desc;
 
 	desc.buf_size = w * 4U * h;
@@ -27,10 +27,10 @@ void lvgl_flush_cb_32bit(struct _disp_drv_t *disp_drv,
 
 #ifndef CONFIG_LVGL_COLOR_DEPTH_32
 void lvgl_set_px_cb_32bit(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa)
 {
-	u32_t *buf_xy = (u32_t *)(buf + x * 4U + y * 4U * buf_w);
+	uint32_t *buf_xy = (uint32_t *)(buf + x * 4U + y * 4U * buf_w);
 	*buf_xy = lv_color_to32(color);
 }
 #endif
diff --git a/lib/gui/lvgl/lvgl_display_mono.c b/lib/gui/lvgl/lvgl_display_mono.c
index 18769a87cb..79bbbaf7ae 100644
--- a/lib/gui/lvgl/lvgl_display_mono.c
+++ b/lib/gui/lvgl/lvgl_display_mono.c
@@ -11,8 +11,8 @@
 void lvgl_flush_cb_mono(struct _disp_drv_t *disp_drv,
 		const lv_area_t *area, lv_color_t *color_p)
 {
-	u16_t w = area->x2 - area->x1 + 1;
-	u16_t h = area->y2 - area->y1 + 1;
+	uint16_t w = area->x2 - area->x1 + 1;
+	uint16_t h = area->y2 - area->y1 + 1;
 	struct device *display_dev = (struct device *)disp_drv->user_data;
 	struct display_capabilities cap;
 	struct display_buffer_descriptor desc;
@@ -34,12 +34,12 @@ void lvgl_flush_cb_mono(struct _disp_drv_t *disp_drv,
 
 
 void lvgl_set_px_cb_mono(struct _disp_drv_t *disp_drv,
-		u8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+		uint8_t *buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
 		lv_color_t color, lv_opa_t opa)
 {
 	struct device *display_dev = (struct device *)disp_drv->user_data;
-	u8_t *buf_xy;
-	u8_t bit;
+	uint8_t *buf_xy;
+	uint8_t bit;
 	struct display_capabilities cap;
 
 	display_get_capabilities(display_dev, &cap);
diff --git a/lib/gui/lvgl/lvgl_fs.c b/lib/gui/lvgl/lvgl_fs.c
index 4f7512ac08..22e5512532 100644
--- a/lib/gui/lvgl/lvgl_fs.c
+++ b/lib/gui/lvgl/lvgl_fs.c
@@ -84,7 +84,7 @@ static lv_fs_res_t lvgl_fs_remove(struct _lv_fs_drv_t *drv, const char *path)
 }
 
 static lv_fs_res_t lvgl_fs_read(struct _lv_fs_drv_t *drv, void *file,
-		void *buf, u32_t btr, u32_t *br)
+		void *buf, uint32_t btr, uint32_t *br)
 {
 	int err;
 
@@ -101,7 +101,7 @@ static lv_fs_res_t lvgl_fs_read(struct _lv_fs_drv_t *drv, void *file,
 }
 
 static lv_fs_res_t lvgl_fs_write(struct _lv_fs_drv_t *drv, void *file,
-		const void *buf, u32_t btw, u32_t *bw)
+		const void *buf, uint32_t btw, uint32_t *bw)
 {
 	int err;
 
@@ -124,7 +124,7 @@ static lv_fs_res_t lvgl_fs_write(struct _lv_fs_drv_t *drv, void *file,
 	return errno_to_lv_fs_res(err);
 }
 
-static lv_fs_res_t lvgl_fs_seek(struct _lv_fs_drv_t *drv, void *file, u32_t pos)
+static lv_fs_res_t lvgl_fs_seek(struct _lv_fs_drv_t *drv, void *file, uint32_t pos)
 {
 	int err;
 
@@ -133,7 +133,7 @@ static lv_fs_res_t lvgl_fs_seek(struct _lv_fs_drv_t *drv, void *file, u32_t pos)
 }
 
 static lv_fs_res_t lvgl_fs_tell(struct _lv_fs_drv_t *drv, void *file,
-		u32_t *pos_p)
+		uint32_t *pos_p)
 {
 	*pos_p = fs_tell((struct fs_file_t *)file);
 	return LV_FS_RES_OK;
@@ -151,7 +151,7 @@ static lv_fs_res_t lvgl_fs_trunc(struct _lv_fs_drv_t *drv, void *file)
 }
 
 static lv_fs_res_t lvgl_fs_size(struct _lv_fs_drv_t *drv, void *file,
-		u32_t *fsize)
+		uint32_t *fsize)
 {
 	int err;
 	off_t org_pos;
@@ -191,8 +191,8 @@ static lv_fs_res_t lvgl_fs_rename(struct _lv_fs_drv_t *drv, const char *from,
 	return errno_to_lv_fs_res(err);
 }
 
-static lv_fs_res_t lvgl_fs_free(struct _lv_fs_drv_t *drv, u32_t *total_p,
-		u32_t *free_p)
+static lv_fs_res_t lvgl_fs_free(struct _lv_fs_drv_t *drv, uint32_t *total_p,
+		uint32_t *free_p)
 {
 	/* We have no easy way of telling the total file system size.
 	 * Zephyr can only return this information per mount point.
diff --git a/lib/libc/newlib/libc-hooks.c b/lib/libc/newlib/libc-hooks.c
index 89712bc74e..43aa566dc7 100644
--- a/lib/libc/newlib/libc-hooks.c
+++ b/lib/libc/newlib/libc-hooks.c
@@ -84,7 +84,7 @@ static int malloc_prepare(struct device *unused)
 	ARG_UNUSED(unused);
 
 #if CONFIG_NEWLIB_LIBC_ALIGNED_HEAP_SIZE
-	z_malloc_partition.start = (u32_t)heap_base;
+	z_malloc_partition.start = (uint32_t)heap_base;
 #else
 	z_malloc_partition.start = HEAP_BASE;
 #endif
diff --git a/lib/os/base64.c b/lib/os/base64.c
index c73b1391c1..87a0e857c4 100644
--- a/lib/os/base64.c
+++ b/lib/os/base64.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <sys/base64.h>
 
-static const u8_t base64_enc_map[64] = {
+static const uint8_t base64_enc_map[64] = {
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
 	'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
 	'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
@@ -36,7 +36,7 @@ static const u8_t base64_enc_map[64] = {
 	'8', '9', '+', '/'
 };
 
-static const u8_t base64_dec_map[128] = {
+static const uint8_t base64_dec_map[128] = {
 	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
 	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
 	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
@@ -57,12 +57,12 @@ static const u8_t base64_dec_map[128] = {
 /*
  * Encode a buffer into base64 format
  */
-int base64_encode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
+int base64_encode(uint8_t *dst, size_t dlen, size_t *olen, const uint8_t *src,
 		  size_t slen)
 {
 	size_t i, n;
 	int C1, C2, C3;
-	u8_t *p;
+	uint8_t *p;
 
 	if (slen == 0) {
 		*olen = 0;
@@ -121,12 +121,12 @@ int base64_encode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
 /*
  * Decode a base64-formatted buffer
  */
-int base64_decode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
+int base64_decode(uint8_t *dst, size_t dlen, size_t *olen, const uint8_t *src,
 		  size_t slen)
 {
 	size_t i, n;
-	u32_t j, x;
-	u8_t *p;
+	uint32_t j, x;
+	uint8_t *p;
 
 	/* First pass: check for validity and get output length */
 	for (i = n = j = 0U; i < slen; i++) {
diff --git a/lib/os/crc16_sw.c b/lib/os/crc16_sw.c
index 28181c821c..f463413d75 100644
--- a/lib/os/crc16_sw.c
+++ b/lib/os/crc16_sw.c
@@ -6,10 +6,10 @@
 
 #include <sys/crc.h>
 
-u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
-	    u16_t initial_value, bool pad)
+uint16_t crc16(const uint8_t *src, size_t len, uint16_t polynomial,
+	    uint16_t initial_value, bool pad)
 {
-	u16_t crc = initial_value;
+	uint16_t crc = initial_value;
 	size_t padding = pad ? sizeof(crc) : 0;
 	size_t i, b;
 
@@ -17,7 +17,7 @@ u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
 	for (i = 0; i < len + padding; i++) {
 
 		for (b = 0; b < 8; b++) {
-			u16_t divide = crc & 0x8000UL;
+			uint16_t divide = crc & 0x8000UL;
 
 			crc = (crc << 1U);
 
@@ -35,10 +35,10 @@ u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
 	return crc;
 }
 
-u16_t crc16_ccitt(u16_t seed, const u8_t *src, size_t len)
+uint16_t crc16_ccitt(uint16_t seed, const uint8_t *src, size_t len)
 {
 	for (; len > 0; len--) {
-		u8_t e, f;
+		uint8_t e, f;
 
 		e = seed ^ *src++;
 		f = e ^ (e << 4);
@@ -48,7 +48,7 @@ u16_t crc16_ccitt(u16_t seed, const u8_t *src, size_t len)
 	return seed;
 }
 
-u16_t crc16_itu_t(u16_t seed, const u8_t *src, size_t len)
+uint16_t crc16_itu_t(uint16_t seed, const uint8_t *src, size_t len)
 {
 	for (; len > 0; len--) {
 		seed = (seed >> 8U) | (seed << 8U);
diff --git a/lib/os/crc32_sw.c b/lib/os/crc32_sw.c
index 7308c8ed18..a72f28c5a3 100644
--- a/lib/os/crc32_sw.c
+++ b/lib/os/crc32_sw.c
@@ -6,18 +6,18 @@
 
 #include <sys/crc.h>
 
-u32_t crc32_ieee(const u8_t *data, size_t len)
+uint32_t crc32_ieee(const uint8_t *data, size_t len)
 {
 	return crc32_ieee_update(0x0, data, len);
 }
 
-u32_t crc32_ieee_update(u32_t crc, const u8_t *data, size_t len)
+uint32_t crc32_ieee_update(uint32_t crc, const uint8_t *data, size_t len)
 {
 	crc = ~crc;
 	for (size_t i = 0; i < len; i++) {
 		crc = crc ^ data[i];
 
-		for (u8_t j = 0; j < 8; j++) {
+		for (uint8_t j = 0; j < 8; j++) {
 			crc = (crc >> 1) ^ (0xEDB88320 & -(crc & 1));
 		}
 	}
diff --git a/lib/os/crc7_sw.c b/lib/os/crc7_sw.c
index 381d747d67..674e988b25 100644
--- a/lib/os/crc7_sw.c
+++ b/lib/os/crc7_sw.c
@@ -6,11 +6,11 @@
 
 #include <sys/crc.h>
 
-u8_t crc7_be(u8_t seed, const u8_t *src, size_t len)
+uint8_t crc7_be(uint8_t seed, const uint8_t *src, size_t len)
 {
 	while (len--) {
-		u8_t e = seed ^ *src++;
-		u8_t f = e ^ (e >> 4) ^ (e >> 7);
+		uint8_t e = seed ^ *src++;
+		uint8_t f = e ^ (e >> 4) ^ (e >> 7);
 
 		seed = (f << 1) ^ (f << 4);
 	}
diff --git a/lib/os/crc8_sw.c b/lib/os/crc8_sw.c
index eb052c90e8..854ea9f739 100644
--- a/lib/os/crc8_sw.c
+++ b/lib/os/crc8_sw.c
@@ -8,15 +8,15 @@
 
 #include <sys/crc.h>
 
-static const u8_t crc8_ccitt_small_table[16] = {
+static const uint8_t crc8_ccitt_small_table[16] = {
 	0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15,
 	0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d
 };
 
-u8_t crc8_ccitt(u8_t val, const void *buf, size_t cnt)
+uint8_t crc8_ccitt(uint8_t val, const void *buf, size_t cnt)
 {
 	size_t i;
-	const u8_t *p = buf;
+	const uint8_t *p = buf;
 
 	for (i = 0; i < cnt; i++) {
 		val ^= p[i];
@@ -26,10 +26,10 @@ u8_t crc8_ccitt(u8_t val, const void *buf, size_t cnt)
 	return val;
 }
 
-u8_t crc8(const u8_t *src, size_t len, u8_t polynomial, u8_t initial_value,
+uint8_t crc8(const uint8_t *src, size_t len, uint8_t polynomial, uint8_t initial_value,
 	  bool reversed)
 {
-	u8_t crc = initial_value;
+	uint8_t crc = initial_value;
 	size_t i, j;
 
 	for (i = 0; i < len; i++) {
diff --git a/lib/os/dec.c b/lib/os/dec.c
index bb9a1d0554..f649ed2256 100644
--- a/lib/os/dec.c
+++ b/lib/os/dec.c
@@ -6,11 +6,11 @@
 
 #include <sys/util.h>
 
-u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value)
+uint8_t u8_to_dec(char *buf, uint8_t buflen, uint8_t value)
 {
-	u8_t divisor = 100;
-	u8_t num_digits = 0;
-	u8_t digit;
+	uint8_t divisor = 100;
+	uint8_t num_digits = 0;
+	uint8_t digit;
 
 	while (buflen > 0 && divisor > 0) {
 		digit = value / divisor;
diff --git a/lib/os/heap-validate.c b/lib/os/heap-validate.c
index 8119a66e2e..486fdf76a2 100644
--- a/lib/os/heap-validate.c
+++ b/lib/os/heap-validate.c
@@ -79,7 +79,7 @@ bool sys_heap_validate(struct sys_heap *heap)
 	 */
 	for (int b = 0; b <= bucket_idx(h, h->len); b++) {
 		chunkid_t c0 = h->buckets[b].next;
-		u32_t n = 0;
+		uint32_t n = 0;
 
 		check_nexts(h, b);
 
@@ -173,7 +173,7 @@ struct z_heap_stress_rec {
 	size_t nblocks;
 	size_t blocks_alloced;
 	size_t bytes_alloced;
-	u32_t target_percent;
+	uint32_t target_percent;
 };
 
 struct z_heap_stress_block {
@@ -185,13 +185,13 @@ struct z_heap_stress_block {
  *
  * Here to guarantee cross-platform test repeatability.
  */
-static u32_t rand32(void)
+static uint32_t rand32(void)
 {
-	static u64_t state = 123456789; /* seed */
+	static uint64_t state = 123456789; /* seed */
 
 	state = state * 2862933555777941757UL + 3037000493UL;
 
-	return (u32_t)(state >> 32);
+	return (uint32_t)(state >> 32);
 }
 
 static bool rand_alloc_choice(struct z_heap_stress_rec *sr)
@@ -219,9 +219,9 @@ static bool rand_alloc_choice(struct z_heap_stress_rec *sr)
 	 * though!).
 	 */
 	__ASSERT(sr->total_bytes < 0xffffffffU / 100, "too big for u32!");
-	u32_t full_pct = (100 * sr->bytes_alloced) / sr->total_bytes;
-	u32_t target = sr->target_percent ? sr->target_percent : 1;
-	u32_t free_chance = 0xffffffffU;
+	uint32_t full_pct = (100 * sr->bytes_alloced) / sr->total_bytes;
+	uint32_t target = sr->target_percent ? sr->target_percent : 1;
+	uint32_t free_chance = 0xffffffffU;
 
 	if (full_pct < sr->target_percent) {
 		free_chance = full_pct * (0x80000000U / target);
@@ -262,7 +262,7 @@ static size_t rand_free_choice(struct z_heap_stress_rec *sr)
 void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
 		     void (*free)(void *arg, void *p),
 		     void *arg, size_t total_bytes,
-		     u32_t op_count,
+		     uint32_t op_count,
 		     void *scratch_mem, size_t scratch_bytes,
 		     int target_percent,
 		     struct z_heap_stress_result *result)
@@ -279,7 +279,7 @@ void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
 
 	*result = (struct z_heap_stress_result) {0};
 
-	for (u32_t i = 0; i < op_count; i++) {
+	for (uint32_t i = 0; i < op_count; i++) {
 		if (rand_alloc_choice(&sr)) {
 			size_t sz = rand_alloc_size(&sr);
 			void *p = sr.alloc(sr.arg, sz);
diff --git a/lib/os/heap.c b/lib/os/heap.c
index 227f296888..f14f1720d6 100644
--- a/lib/os/heap.c
+++ b/lib/os/heap.c
@@ -9,7 +9,7 @@
 
 static void *chunk_mem(struct z_heap *h, chunkid_t c)
 {
-	u8_t *ret = ((u8_t *)&h->buf[c]) + chunk_header_bytes(h);
+	uint8_t *ret = ((uint8_t *)&h->buf[c]) + chunk_header_bytes(h);
 
 	CHECK(!(((size_t)ret) & (big_heap(h) ? 7 : 3)));
 
@@ -115,8 +115,8 @@ void sys_heap_free(struct sys_heap *heap, void *mem)
 	}
 
 	struct z_heap *h = heap->heap;
-	chunkid_t c = ((u8_t *)mem - chunk_header_bytes(h)
-		       - (u8_t *)h->buf) / CHUNK_UNIT;
+	chunkid_t c = ((uint8_t *)mem - chunk_header_bytes(h)
+		       - (uint8_t *)h->buf) / CHUNK_UNIT;
 
 	/* Merge with right chunk?  We can just absorb it. */
 	if (!last_chunk(h, c) && !used(h, right_chunk(h, c))) {
@@ -217,7 +217,7 @@ void sys_heap_init(struct sys_heap *heap, void *mem, size_t bytes)
 	struct z_heap *h = (struct z_heap *)addr;
 
 	heap->heap = (struct z_heap *)addr;
-	h->buf = (u64_t *)addr;
+	h->buf = (uint64_t *)addr;
 	h->buckets = (void *)(addr + CHUNK_UNIT * hdr_chunks);
 	h->len = buf_sz;
 	h->size_mask = (1 << (big_heap(h) ? 31 : 15)) - 1;
diff --git a/lib/os/heap.h b/lib/os/heap.h
index c73b3cf254..6e2ca0989a 100644
--- a/lib/os/heap.h
+++ b/lib/os/heap.h
@@ -52,12 +52,12 @@ typedef size_t chunkid_t;
 enum chunk_fields { SIZE_AND_USED, LEFT_SIZE, FREE_PREV, FREE_NEXT };
 
 struct z_heap {
-	u64_t *buf;
+	uint64_t *buf;
 	struct z_heap_bucket *buckets;
-	u32_t len;
-	u32_t size_mask;
-	u32_t chunk0;
-	u32_t avail_buckets;
+	uint32_t len;
+	uint32_t size_mask;
+	uint32_t chunk0;
+	uint32_t avail_buckets;
 };
 
 struct z_heap_bucket {
@@ -76,9 +76,9 @@ static inline size_t chunk_field(struct z_heap *h, chunkid_t c,
 	void *cmem = &h->buf[c];
 
 	if (big_heap(h)) {
-		return ((u32_t *)cmem)[f];
+		return ((uint32_t *)cmem)[f];
 	} else {
-		return ((u16_t *)cmem)[f];
+		return ((uint16_t *)cmem)[f];
 	}
 }
 
@@ -92,9 +92,9 @@ static inline void chunk_set(struct z_heap *h, chunkid_t c,
 	void *cmem = &h->buf[c];
 
 	if (big_heap(h)) {
-		((u32_t *)cmem)[f] = (u32_t) val;
+		((uint32_t *)cmem)[f] = (uint32_t) val;
 	} else {
-		((u16_t *)cmem)[f] = (u16_t) val;
+		((uint16_t *)cmem)[f] = (uint16_t) val;
 	}
 }
 
diff --git a/lib/os/hex.c b/lib/os/hex.c
index e9f46f8a2c..89580850bd 100644
--- a/lib/os/hex.c
+++ b/lib/os/hex.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <sys/util.h>
 
-int char2hex(char c, u8_t *x)
+int char2hex(char c, uint8_t *x)
 {
 	if (c >= '0' && c <= '9') {
 		*x = c - '0';
@@ -24,7 +24,7 @@ int char2hex(char c, u8_t *x)
 	return 0;
 }
 
-int hex2char(u8_t x, char *c)
+int hex2char(uint8_t x, char *c)
 {
 	if (x <= 9) {
 		*c = x + '0';
@@ -37,7 +37,7 @@ int hex2char(u8_t x, char *c)
 	return 0;
 }
 
-size_t bin2hex(const u8_t *buf, size_t buflen, char *hex, size_t hexlen)
+size_t bin2hex(const uint8_t *buf, size_t buflen, char *hex, size_t hexlen)
 {
 	if ((hexlen + 1) < buflen * 2) {
 		return 0;
@@ -56,9 +56,9 @@ size_t bin2hex(const u8_t *buf, size_t buflen, char *hex, size_t hexlen)
 	return 2 * buflen;
 }
 
-size_t hex2bin(const char *hex, size_t hexlen, u8_t *buf, size_t buflen)
+size_t hex2bin(const char *hex, size_t hexlen, uint8_t *buf, size_t buflen)
 {
-	u8_t dec;
+	uint8_t dec;
 
 	if (buflen < hexlen / 2 + hexlen % 2) {
 		return 0;
diff --git a/lib/os/json.c b/lib/os/json.c
index 8e03a0010e..22808ca883 100644
--- a/lib/os/json.c
+++ b/lib/os/json.c
@@ -388,7 +388,7 @@ static int arr_next(struct json_obj *json, struct token *value)
 	return element_token(value->type);
 }
 
-static int decode_num(const struct token *token, s32_t *num)
+static int decode_num(const struct token *token, int32_t *num)
 {
 	/* FIXME: strtod() is not available in newlib/minimal libc,
 	 * so using strtol() here.
@@ -457,7 +457,7 @@ static int decode_value(struct json_obj *obj,
 		return 0;
 	}
 	case JSON_TOK_NUMBER: {
-		s32_t *num = field;
+		int32_t *num = field;
 
 		return decode_num(value, num);
 	}
@@ -478,7 +478,7 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr)
 {
 	switch (descr->type) {
 	case JSON_TOK_NUMBER:
-		return sizeof(s32_t);
+		return sizeof(int32_t);
 	case JSON_TOK_STRING:
 		return sizeof(char *);
 	case JSON_TOK_TRUE:
@@ -540,7 +540,7 @@ static int obj_parse(struct json_obj *obj, const struct json_obj_descr *descr,
 		     size_t descr_len, void *val)
 {
 	struct json_obj_key_value kv;
-	s32_t decoded_fields = 0;
+	int32_t decoded_fields = 0;
 	size_t i;
 	int ret;
 
@@ -773,10 +773,10 @@ static int str_encode(const char **str, json_append_bytes_t append_bytes,
 	return ret;
 }
 
-static int num_encode(const s32_t *num, json_append_bytes_t append_bytes,
+static int num_encode(const int32_t *num, json_append_bytes_t append_bytes,
 		      void *data)
 {
-	char buf[3 * sizeof(s32_t)];
+	char buf[3 * sizeof(int32_t)];
 	int ret;
 
 	ret = snprintk(buf, sizeof(buf), "%d", *num);
diff --git a/lib/os/mempool.c b/lib/os/mempool.c
index 80ed9f2f4d..6258a4c6fa 100644
--- a/lib/os/mempool.c
+++ b/lib/os/mempool.c
@@ -18,21 +18,21 @@
 
 static void *block_ptr(struct sys_mem_pool_base *p, size_t lsz, int block)
 {
-	return (u8_t *)p->buf + lsz * block;
+	return (uint8_t *)p->buf + lsz * block;
 }
 
 static int block_num(struct sys_mem_pool_base *p, void *block, int sz)
 {
-	return ((u8_t *)block - (u8_t *)p->buf) / sz;
+	return ((uint8_t *)block - (uint8_t *)p->buf) / sz;
 }
 
 /* Places a 32 bit output pointer in word, and an integer bit index
  * within that word as the return value
  */
 static int get_bit_ptr(struct sys_mem_pool_base *p, int level, int bn,
-		       u32_t **word)
+		       uint32_t **word)
 {
-	u32_t *bitarray = level <= p->max_inline_level ?
+	uint32_t *bitarray = level <= p->max_inline_level ?
 		p->levels[level].bits : p->levels[level].bits_p;
 
 	*word = &bitarray[bn / 32];
@@ -42,7 +42,7 @@ static int get_bit_ptr(struct sys_mem_pool_base *p, int level, int bn,
 
 static void set_alloc_bit(struct sys_mem_pool_base *p, int level, int bn)
 {
-	u32_t *word;
+	uint32_t *word;
 	int bit = get_bit_ptr(p, level, bn, &word);
 
 	*word |= (1<<bit);
@@ -50,7 +50,7 @@ static void set_alloc_bit(struct sys_mem_pool_base *p, int level, int bn)
 
 static void clear_alloc_bit(struct sys_mem_pool_base *p, int level, int bn)
 {
-	u32_t *word;
+	uint32_t *word;
 	int bit = get_bit_ptr(p, level, bn, &word);
 
 	*word &= ~(1<<bit);
@@ -58,7 +58,7 @@ static void clear_alloc_bit(struct sys_mem_pool_base *p, int level, int bn)
 
 static inline bool alloc_bit_is_set(struct sys_mem_pool_base *p, int level, int bn)
 {
-	u32_t *word;
+	uint32_t *word;
 	int bit = get_bit_ptr(p, level, bn, &word);
 
 	return (*word >> bit) & 1;
@@ -69,7 +69,7 @@ static inline bool alloc_bit_is_set(struct sys_mem_pool_base *p, int level, int
  */
 static int partner_alloc_bits(struct sys_mem_pool_base *p, int level, int bn)
 {
-	u32_t *word;
+	uint32_t *word;
 	int bit = get_bit_ptr(p, level, bn, &word);
 
 	return (*word >> (4*(bit / 4))) & 0xf;
@@ -79,7 +79,7 @@ void z_sys_mem_pool_base_init(struct sys_mem_pool_base *p)
 {
 	int i;
 	size_t buflen = p->n_max * p->max_sz, sz = p->max_sz;
-	u32_t *bits = (u32_t *)((u8_t *)p->buf + buflen);
+	uint32_t *bits = (uint32_t *)((uint8_t *)p->buf + buflen);
 
 	p->max_inline_level = -1;
 
@@ -222,7 +222,7 @@ static void *block_break(struct sys_mem_pool_base *p, void *block, int l,
 }
 
 int z_sys_mem_pool_block_alloc(struct sys_mem_pool_base *p, size_t size,
-			      u32_t *level_p, u32_t *block_p, void **data_p)
+			      uint32_t *level_p, uint32_t *block_p, void **data_p)
 {
 	int i, from_l, alloc_l = -1;
 	unsigned int key;
@@ -296,11 +296,11 @@ int z_sys_mem_pool_block_alloc(struct sys_mem_pool_base *p, size_t size,
 	return 0;
 }
 
-void z_sys_mem_pool_block_free(struct sys_mem_pool_base *p, u32_t level,
-			      u32_t block)
+void z_sys_mem_pool_block_free(struct sys_mem_pool_base *p, uint32_t level,
+			      uint32_t block)
 {
 	size_t lsizes[LVL_ARRAY_SZ(p->n_levels)];
-	u32_t i;
+	uint32_t i;
 
 	/* As in z_sys_mem_pool_block_alloc(), we build a table of level sizes
 	 * to avoid having to store it in precious RAM bytes.
@@ -323,7 +323,7 @@ void z_sys_mem_pool_block_free(struct sys_mem_pool_base *p, u32_t level,
 void *sys_mem_pool_alloc(struct sys_mem_pool *p, size_t size)
 {
 	struct sys_mem_pool_block *blk;
-	u32_t level, block;
+	uint32_t level, block;
 	char *ret;
 
 	sys_mutex_lock(&p->mutex, K_FOREVER);
diff --git a/lib/os/notify.c b/lib/os/notify.c
index ba5d2a3125..7ab53e5c9a 100644
--- a/lib/os/notify.c
+++ b/lib/os/notify.c
@@ -50,7 +50,7 @@ sys_notify_generic_callback sys_notify_finalize(struct sys_notify *notify,
 {
 	struct k_poll_signal *sig = NULL;
 	sys_notify_generic_callback rv = 0;
-	u32_t method = sys_notify_get_method(notify);
+	uint32_t method = sys_notify_get_method(notify);
 
 	/* Store the result and capture secondary notification
 	 * information.
diff --git a/lib/os/onoff.c b/lib/os/onoff.c
index cde5517879..cb522b2e81 100644
--- a/lib/os/onoff.c
+++ b/lib/os/onoff.c
@@ -113,7 +113,7 @@ enum event_type {
 };
 
 static void set_state(struct onoff_manager *mgr,
-		      u32_t state)
+		      uint32_t state)
 {
 	mgr->flags = (state & ONOFF_STATE_MASK)
 		     | (mgr->flags & ~ONOFF_STATE_MASK);
@@ -153,7 +153,7 @@ int onoff_manager_init(struct onoff_manager *mgr,
 }
 
 static void notify_monitors(struct onoff_manager *mgr,
-			    u32_t state,
+			    uint32_t state,
 			    int res)
 {
 	sys_slist_t *mlist = &mgr->monitors;
@@ -167,7 +167,7 @@ static void notify_monitors(struct onoff_manager *mgr,
 
 static void notify_one(struct onoff_manager *mgr,
 		       struct onoff_client *cli,
-		       u32_t state,
+		       uint32_t state,
 		       int res)
 {
 	onoff_client_callback cb =
@@ -180,7 +180,7 @@ static void notify_one(struct onoff_manager *mgr,
 
 static void notify_all(struct onoff_manager *mgr,
 		       sys_slist_t *list,
-		       u32_t state,
+		       uint32_t state,
 		       int res)
 {
 	while (!sys_slist_is_empty(list)) {
@@ -211,7 +211,7 @@ static void transition_complete(struct onoff_manager *mgr,
 static int process_recheck(struct onoff_manager *mgr)
 {
 	int evt = EVT_NOP;
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 
 	if ((state == ONOFF_STATE_OFF)
 	    && !sys_slist_is_empty(&mgr->clients)) {
@@ -236,7 +236,7 @@ static void process_complete(struct onoff_manager *mgr,
 			     sys_slist_t *clients,
 			     int res)
 {
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 
 	if (res < 0) {
 		/* Enter ERROR state and notify all clients. */
@@ -298,7 +298,7 @@ static void process_event(struct onoff_manager *mgr,
 			  k_spinlock_key_t key)
 {
 	sys_slist_t clients;
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 	int res = 0;
 	bool processing = ((mgr->flags & ONOFF_FLAG_PROCESSING) != 0);
 
@@ -373,7 +373,7 @@ static void process_event(struct onoff_manager *mgr,
 		if (do_monitors
 		    || !sys_slist_is_empty(&clients)
 		    || (transit != NULL)) {
-			u32_t flags = mgr->flags | ONOFF_FLAG_PROCESSING;
+			uint32_t flags = mgr->flags | ONOFF_FLAG_PROCESSING;
 
 			mgr->flags = flags;
 			state = flags & ONOFF_STATE_MASK;
@@ -428,7 +428,7 @@ int onoff_request(struct onoff_manager *mgr,
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&mgr->lock);
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 
 	/* Reject if this would overflow the reference count. */
 	if (mgr->refs == SERVICE_REFS_MAX) {
@@ -477,7 +477,7 @@ int onoff_release(struct onoff_manager *mgr)
 	bool stop = false;      /* trigger a stop transition */
 
 	k_spinlock_key_t key = k_spin_lock(&mgr->lock);
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 	int rv = state;
 
 	if (state != ONOFF_STATE_ON) {
@@ -519,7 +519,7 @@ int onoff_reset(struct onoff_manager *mgr,
 	}
 
 	k_spinlock_key_t key = k_spin_lock(&mgr->lock);
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 
 	rv = state;
 
@@ -548,7 +548,7 @@ int onoff_cancel(struct onoff_manager *mgr,
 
 	int rv = -EALREADY;
 	k_spinlock_key_t key = k_spin_lock(&mgr->lock);
-	u32_t state = mgr->flags & ONOFF_STATE_MASK;
+	uint32_t state = mgr->flags & ONOFF_STATE_MASK;
 
 	if (sys_slist_find_and_remove(&mgr->clients, &cli->node)) {
 		__ASSERT_NO_MSG((state == ONOFF_STATE_TO_ON)
diff --git a/lib/os/ring_buffer.c b/lib/os/ring_buffer.c
index 250d54e2d7..8d9fcbf56a 100644
--- a/lib/os/ring_buffer.c
+++ b/lib/os/ring_buffer.c
@@ -12,19 +12,19 @@
 /**
  * Internal data structure for a buffer header.
  *
- * We want all of this to fit in a single u32_t. Every item stored in the
+ * We want all of this to fit in a single uint32_t. Every item stored in the
  * ring buffer will be one of these headers plus any extra data supplied
  */
 struct ring_element {
-	u32_t  type   :16; /**< Application-specific */
-	u32_t  length :8;  /**< length in 32-bit chunks */
-	u32_t  value  :8;  /**< Room for small integral values */
+	uint32_t  type   :16; /**< Application-specific */
+	uint32_t  length :8;  /**< length in 32-bit chunks */
+	uint32_t  value  :8;  /**< Room for small integral values */
 };
 
-int ring_buf_item_put(struct ring_buf *buf, u16_t type, u8_t value,
-		      u32_t *data, u8_t size32)
+int ring_buf_item_put(struct ring_buf *buf, uint16_t type, uint8_t value,
+		      uint32_t *data, uint8_t size32)
 {
-	u32_t i, space, index, rc;
+	uint32_t i, space, index, rc;
 
 	space = ring_buf_space_get(buf);
 	if (space >= (size32 + 1)) {
@@ -56,11 +56,11 @@ int ring_buf_item_put(struct ring_buf *buf, u16_t type, u8_t value,
 	return rc;
 }
 
-int ring_buf_item_get(struct ring_buf *buf, u16_t *type, u8_t *value,
-		      u32_t *data, u8_t *size32)
+int ring_buf_item_get(struct ring_buf *buf, uint16_t *type, uint8_t *value,
+		      uint32_t *data, uint8_t *size32)
 {
 	struct ring_element *header;
-	u32_t i, index;
+	uint32_t i, index;
 
 	if (ring_buf_is_empty(buf)) {
 		return -EAGAIN;
@@ -101,14 +101,14 @@ int ring_buf_item_get(struct ring_buf *buf, u16_t *type, u8_t *value,
  *
  * @return value % max.
  */
-static inline u32_t wrap(u32_t val, u32_t max)
+static inline uint32_t wrap(uint32_t val, uint32_t max)
 {
 	return val >= max ? (val - max) : val;
 }
 
-u32_t ring_buf_put_claim(struct ring_buf *buf, u8_t **data, u32_t size)
+uint32_t ring_buf_put_claim(struct ring_buf *buf, uint8_t **data, uint32_t size)
 {
-	u32_t space, trail_size, allocated;
+	uint32_t space, trail_size, allocated;
 
 	space = z_ring_buf_custom_space_get(buf->size, buf->head,
 					    buf->misc.byte_mode.tmp_tail);
@@ -127,7 +127,7 @@ u32_t ring_buf_put_claim(struct ring_buf *buf, u8_t **data, u32_t size)
 	return allocated;
 }
 
-int ring_buf_put_finish(struct ring_buf *buf, u32_t size)
+int ring_buf_put_finish(struct ring_buf *buf, uint32_t size)
 {
 	if (size > ring_buf_space_get(buf)) {
 		return -EINVAL;
@@ -139,11 +139,11 @@ int ring_buf_put_finish(struct ring_buf *buf, u32_t size)
 	return 0;
 }
 
-u32_t ring_buf_put(struct ring_buf *buf, const u8_t *data, u32_t size)
+uint32_t ring_buf_put(struct ring_buf *buf, const uint8_t *data, uint32_t size)
 {
-	u8_t *dst;
-	u32_t partial_size;
-	u32_t total_size = 0U;
+	uint8_t *dst;
+	uint32_t partial_size;
+	uint32_t total_size = 0U;
 	int err;
 
 	do {
@@ -160,9 +160,9 @@ u32_t ring_buf_put(struct ring_buf *buf, const u8_t *data, u32_t size)
 	return total_size;
 }
 
-u32_t ring_buf_get_claim(struct ring_buf *buf, u8_t **data, u32_t size)
+uint32_t ring_buf_get_claim(struct ring_buf *buf, uint8_t **data, uint32_t size)
 {
-	u32_t space, granted_size, trail_size;
+	uint32_t space, granted_size, trail_size;
 
 	space = (buf->size - 1) -
 		z_ring_buf_custom_space_get(buf->size,
@@ -183,9 +183,9 @@ u32_t ring_buf_get_claim(struct ring_buf *buf, u8_t **data, u32_t size)
 	return granted_size;
 }
 
-int ring_buf_get_finish(struct ring_buf *buf, u32_t size)
+int ring_buf_get_finish(struct ring_buf *buf, uint32_t size)
 {
-	u32_t allocated = (buf->size - 1) - ring_buf_space_get(buf);
+	uint32_t allocated = (buf->size - 1) - ring_buf_space_get(buf);
 
 	if (size > allocated) {
 		return -EINVAL;
@@ -197,11 +197,11 @@ int ring_buf_get_finish(struct ring_buf *buf, u32_t size)
 	return 0;
 }
 
-u32_t ring_buf_get(struct ring_buf *buf, u8_t *data, u32_t size)
+uint32_t ring_buf_get(struct ring_buf *buf, uint8_t *data, uint32_t size)
 {
-	u8_t *src;
-	u32_t partial_size;
-	u32_t total_size = 0U;
+	uint8_t *src;
+	uint32_t partial_size;
+	uint32_t total_size = 0U;
 	int err;
 
 	do {
diff --git a/lib/os/timeutil.c b/lib/os/timeutil.c
index fbaffa0df0..ab9feadd44 100644
--- a/lib/os/timeutil.c
+++ b/lib/os/timeutil.c
@@ -26,13 +26,13 @@
  *
  * @see http://howardhinnant.github.io/date_algorithms.html#days_from_civil
  */
-static s64_t time_days_from_civil(s64_t y,
+static int64_t time_days_from_civil(int64_t y,
 				  unsigned int m,
 				  unsigned int d)
 {
 	y -= m <= 2;
 
-	s64_t era = (y >= 0 ? y : y - 399) / 400;
+	int64_t era = (y >= 0 ? y : y - 399) / 400;
 	unsigned int yoe = y - era * 400;
 	unsigned int doy = (153U * (m + (m > 2 ? -3 : 9)) + 2U) / 5U + d;
 	unsigned int doe = yoe * 365U + yoe / 4U - yoe / 100U + doy;
@@ -40,13 +40,13 @@ static s64_t time_days_from_civil(s64_t y,
 	return era * 146097 + (time_t)doe - 719468;
 }
 
-s64_t timeutil_timegm64(const struct tm *tm)
+int64_t timeutil_timegm64(const struct tm *tm)
 {
-	s64_t y = 1900 + (s64_t)tm->tm_year;
+	int64_t y = 1900 + (int64_t)tm->tm_year;
 	unsigned int m = tm->tm_mon + 1;
 	unsigned int d = tm->tm_mday - 1;
-	s64_t ndays = time_days_from_civil(y, m, d);
-	s64_t time = tm->tm_sec;
+	int64_t ndays = time_days_from_civil(y, m, d);
+	int64_t time = tm->tm_sec;
 
 	time += 60LL * (tm->tm_min + 60LL * tm->tm_hour);
 	time += 86400LL * ndays;
@@ -56,13 +56,13 @@ s64_t timeutil_timegm64(const struct tm *tm)
 
 time_t timeutil_timegm(const struct tm *tm)
 {
-	s64_t time = timeutil_timegm64(tm);
+	int64_t time = timeutil_timegm64(tm);
 	time_t rv = (time_t)time;
 
 	errno = 0;
-	if ((sizeof(rv) == sizeof(s32_t))
-	    && ((time < (s64_t)INT32_MIN)
-		|| (time > (s64_t)INT32_MAX))) {
+	if ((sizeof(rv) == sizeof(int32_t))
+	    && ((time < (int64_t)INT32_MIN)
+		|| (time > (int64_t)INT32_MAX))) {
 		errno = ERANGE;
 		rv = -1;
 	}
diff --git a/lib/posix/clock.c b/lib/posix/clock.c
index bf7ba590ad..f11c3e6d53 100644
--- a/lib/posix/clock.c
+++ b/lib/posix/clock.c
@@ -25,7 +25,7 @@ static struct timespec rt_clock_base;
  */
 int z_impl_clock_gettime(clockid_t clock_id, struct timespec *ts)
 {
-	u64_t elapsed_msecs;
+	uint64_t elapsed_msecs;
 	struct timespec base;
 
 	switch (clock_id) {
@@ -44,8 +44,8 @@ int z_impl_clock_gettime(clockid_t clock_id, struct timespec *ts)
 	}
 
 	elapsed_msecs = k_uptime_get();
-	ts->tv_sec = (s32_t) (elapsed_msecs / MSEC_PER_SEC);
-	ts->tv_nsec = (s32_t) ((elapsed_msecs % MSEC_PER_SEC) *
+	ts->tv_sec = (int32_t) (elapsed_msecs / MSEC_PER_SEC);
+	ts->tv_nsec = (int32_t) ((elapsed_msecs % MSEC_PER_SEC) *
 					USEC_PER_MSEC * NSEC_PER_USEC);
 
 	ts->tv_sec += base.tv_sec;
@@ -84,8 +84,8 @@ int clock_settime(clockid_t clock_id, const struct timespec *tp)
 		return -1;
 	}
 
-	u64_t elapsed_msecs = k_uptime_get();
-	s64_t delta = (s64_t)NSEC_PER_SEC * tp->tv_sec + tp->tv_nsec
+	uint64_t elapsed_msecs = k_uptime_get();
+	int64_t delta = (int64_t)NSEC_PER_SEC * tp->tv_sec + tp->tv_nsec
 		- elapsed_msecs * USEC_PER_MSEC * NSEC_PER_USEC;
 
 	base.tv_sec = delta / NSEC_PER_SEC;
diff --git a/lib/posix/mqueue.c b/lib/posix/mqueue.c
index a5728e0725..7983f56c95 100644
--- a/lib/posix/mqueue.c
+++ b/lib/posix/mqueue.c
@@ -22,7 +22,7 @@ typedef struct mqueue_object {
 typedef struct mqueue_desc {
 	char *mem_desc;
 	mqueue_object *mqueue;
-	u32_t  flags;
+	uint32_t  flags;
 } mqueue_desc;
 
 K_SEM_DEFINE(mq_sem, 1, 1);
@@ -30,9 +30,9 @@ K_SEM_DEFINE(mq_sem, 1, 1);
 /* Initialize the list */
 sys_slist_t mq_list = SYS_SLIST_STATIC_INIT(&mq_list);
 
-s64_t timespec_to_timeoutms(const struct timespec *abstime);
+int64_t timespec_to_timeoutms(const struct timespec *abstime);
 static mqueue_object *find_in_list(const char *name);
-static s32_t send_message(mqueue_desc *mqd, const char *msg_ptr, size_t msg_len,
+static int32_t send_message(mqueue_desc *mqd, const char *msg_ptr, size_t msg_len,
 			  k_timeout_t timeout);
 static int receive_message(mqueue_desc *mqd, char *msg_ptr, size_t msg_len,
 			   k_timeout_t timeout);
@@ -136,10 +136,10 @@ mqd_t mq_open(const char *name, int oflags, ...)
 
 		strcpy(msg_queue->name, name);
 
-		mq_buf_ptr = k_malloc(msg_size * max_msgs * sizeof(u8_t));
+		mq_buf_ptr = k_malloc(msg_size * max_msgs * sizeof(uint8_t));
 		if (mq_buf_ptr != NULL) {
 			(void)memset(mq_buf_ptr, 0,
-				     msg_size * max_msgs * sizeof(u8_t));
+				     msg_size * max_msgs * sizeof(uint8_t));
 			msg_queue->mem_buffer = mq_buf_ptr;
 		} else {
 			goto free_mq_buffer;
@@ -248,7 +248,7 @@ int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
 		 unsigned int msg_prio, const struct timespec *abstime)
 {
 	mqueue_desc *mqd = (mqueue_desc *)mqdes;
-	s32_t timeout = (s32_t) timespec_to_timeoutms(abstime);
+	int32_t timeout = (int32_t) timespec_to_timeoutms(abstime);
 
 	return send_message(mqd, msg_ptr, msg_len, K_MSEC(timeout));
 }
@@ -279,7 +279,7 @@ int mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len,
 			unsigned int *msg_prio, const struct timespec *abstime)
 {
 	mqueue_desc *mqd = (mqueue_desc *)mqdes;
-	s32_t timeout = (s32_t) timespec_to_timeoutms(abstime);
+	int32_t timeout = (int32_t) timespec_to_timeoutms(abstime);
 
 	return receive_message(mqd, msg_ptr, msg_len, K_MSEC(timeout));
 }
@@ -360,10 +360,10 @@ static mqueue_object *find_in_list(const char *name)
 	return NULL;
 }
 
-static s32_t send_message(mqueue_desc *mqd, const char *msg_ptr, size_t msg_len,
+static int32_t send_message(mqueue_desc *mqd, const char *msg_ptr, size_t msg_len,
 			  k_timeout_t timeout)
 {
-	s32_t ret = -1;
+	int32_t ret = -1;
 
 	if (mqd == NULL) {
 		errno = EBADF;
@@ -387,7 +387,7 @@ static s32_t send_message(mqueue_desc *mqd, const char *msg_ptr, size_t msg_len,
 	return 0;
 }
 
-static s32_t receive_message(mqueue_desc *mqd, char *msg_ptr, size_t msg_len,
+static int32_t receive_message(mqueue_desc *mqd, char *msg_ptr, size_t msg_len,
 			     k_timeout_t timeout)
 {
 	int ret = -1;
diff --git a/lib/posix/pthread.c b/lib/posix/pthread.c
index a1437b6464..12d4c2d84f 100644
--- a/lib/posix/pthread.c
+++ b/lib/posix/pthread.c
@@ -37,7 +37,7 @@ static const pthread_attr_t init_pthread_attrs = {
 static struct posix_thread posix_thread_pool[CONFIG_MAX_PTHREAD_COUNT];
 PTHREAD_MUTEX_DEFINE(pthread_pool_lock);
 
-static bool is_posix_prio_valid(u32_t priority, int policy)
+static bool is_posix_prio_valid(uint32_t priority, int policy)
 {
 	if (priority >= sched_get_priority_min(policy) &&
 	    priority <= sched_get_priority_max(policy)) {
@@ -47,9 +47,9 @@ static bool is_posix_prio_valid(u32_t priority, int policy)
 	return false;
 }
 
-static u32_t zephyr_to_posix_priority(s32_t z_prio, int *policy)
+static uint32_t zephyr_to_posix_priority(int32_t z_prio, int *policy)
 {
-	u32_t prio;
+	uint32_t prio;
 
 	if (z_prio < 0) {
 		*policy = SCHED_FIFO;
@@ -62,9 +62,9 @@ static u32_t zephyr_to_posix_priority(s32_t z_prio, int *policy)
 	return prio;
 }
 
-static s32_t posix_to_zephyr_priority(u32_t priority, int policy)
+static int32_t posix_to_zephyr_priority(uint32_t priority, int policy)
 {
-	s32_t prio;
+	int32_t prio;
 
 	if (policy == SCHED_FIFO) {
 		/* Zephyr COOP priority starts from -1 */
@@ -131,8 +131,8 @@ static void zephyr_thread_wrapper(void *arg1, void *arg2, void *arg3)
 int pthread_create(pthread_t *newthread, const pthread_attr_t *attr,
 		   void *(*threadroutine)(void *), void *arg)
 {
-	s32_t prio;
-	u32_t pthread_num;
+	int32_t prio;
+	uint32_t pthread_num;
 	pthread_condattr_t cond_attr;
 	struct posix_thread *thread;
 
@@ -313,7 +313,7 @@ int pthread_getschedparam(pthread_t pthread, int *policy,
 			  struct sched_param *param)
 {
 	struct posix_thread *thread = (struct posix_thread *) pthread;
-	u32_t priority;
+	uint32_t priority;
 
 	if ((thread == NULL) || (thread->state == PTHREAD_TERMINATED)) {
 		return ESRCH;
diff --git a/lib/posix/pthread_common.c b/lib/posix/pthread_common.c
index a2dbfa7f5f..9e209adb3c 100644
--- a/lib/posix/pthread_common.c
+++ b/lib/posix/pthread_common.c
@@ -10,9 +10,9 @@
 #include <posix/time.h>
 
 #ifdef CONFIG_POSIX_CLOCK
-s64_t timespec_to_timeoutms(const struct timespec *abstime)
+int64_t timespec_to_timeoutms(const struct timespec *abstime)
 {
-	s64_t milli_secs, secs, nsecs;
+	int64_t milli_secs, secs, nsecs;
 	struct timespec curtime;
 
 	/* FIXME: Zephyr does have CLOCK_REALTIME to get time.
diff --git a/lib/posix/pthread_cond.c b/lib/posix/pthread_cond.c
index ff713a6274..e84f270cc3 100644
--- a/lib/posix/pthread_cond.c
+++ b/lib/posix/pthread_cond.c
@@ -9,7 +9,7 @@
 #include <wait_q.h>
 #include <posix/pthread.h>
 
-s64_t timespec_to_timeoutms(const struct timespec *abstime);
+int64_t timespec_to_timeoutms(const struct timespec *abstime);
 
 static int cond_wait(pthread_cond_t *cv, pthread_mutex_t *mut,
 		     k_timeout_t timeout)
@@ -78,6 +78,6 @@ int pthread_cond_wait(pthread_cond_t *cv, pthread_mutex_t *mut)
 int pthread_cond_timedwait(pthread_cond_t *cv, pthread_mutex_t *mut,
 			   const struct timespec *abstime)
 {
-	s32_t timeout = (s32_t)timespec_to_timeoutms(abstime);
+	int32_t timeout = (int32_t)timespec_to_timeoutms(abstime);
 	return cond_wait(cv, mut, K_MSEC(timeout));
 }
diff --git a/lib/posix/pthread_mutex.c b/lib/posix/pthread_mutex.c
index fe01f94f74..f1371848f3 100644
--- a/lib/posix/pthread_mutex.c
+++ b/lib/posix/pthread_mutex.c
@@ -9,7 +9,7 @@
 #include <wait_q.h>
 #include <posix/pthread.h>
 
-s64_t timespec_to_timeoutms(const struct timespec *abstime);
+int64_t timespec_to_timeoutms(const struct timespec *abstime);
 
 #define MUTEX_MAX_REC_LOCK 32767
 
@@ -77,7 +77,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
 int pthread_mutex_timedlock(pthread_mutex_t *m,
 			    const struct timespec *abstime)
 {
-	s32_t timeout = (s32_t)timespec_to_timeoutms(abstime);
+	int32_t timeout = (int32_t)timespec_to_timeoutms(abstime);
 	return acquire_mutex(m, K_MSEC(timeout));
 }
 
diff --git a/lib/posix/pthread_rwlock.c b/lib/posix/pthread_rwlock.c
index 24ef2cab68..88323c38c0 100644
--- a/lib/posix/pthread_rwlock.c
+++ b/lib/posix/pthread_rwlock.c
@@ -13,9 +13,9 @@
 
 #define CONCURRENT_READER_LIMIT  (CONFIG_MAX_PTHREAD_COUNT + 1)
 
-s64_t timespec_to_timeoutms(const struct timespec *abstime);
-static u32_t read_lock_acquire(pthread_rwlock_t *rwlock, s32_t timeout);
-static u32_t write_lock_acquire(pthread_rwlock_t *rwlock, s32_t timeout);
+int64_t timespec_to_timeoutms(const struct timespec *abstime);
+static uint32_t read_lock_acquire(pthread_rwlock_t *rwlock, int32_t timeout);
+static uint32_t write_lock_acquire(pthread_rwlock_t *rwlock, int32_t timeout);
 
 /**
  * @brief Initialize read-write lock object.
@@ -85,15 +85,15 @@ int pthread_rwlock_rdlock(pthread_rwlock_t *rwlock)
 int pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock,
 			       const struct timespec *abstime)
 {
-	s32_t timeout;
-	u32_t ret = 0U;
+	int32_t timeout;
+	uint32_t ret = 0U;
 
 	if (rwlock->status == NOT_INITIALIZED || abstime->tv_nsec < 0 ||
 	    abstime->tv_nsec > NSEC_PER_SEC) {
 		return EINVAL;
 	}
 
-	timeout = (s32_t) timespec_to_timeoutms(abstime);
+	timeout = (int32_t) timespec_to_timeoutms(abstime);
 
 	if (read_lock_acquire(rwlock, timeout) != 0U) {
 		ret = ETIMEDOUT;
@@ -147,15 +147,15 @@ int pthread_rwlock_wrlock(pthread_rwlock_t *rwlock)
 int pthread_rwlock_timedwrlock(pthread_rwlock_t *rwlock,
 			       const struct timespec *abstime)
 {
-	s32_t timeout;
-	u32_t ret = 0U;
+	int32_t timeout;
+	uint32_t ret = 0U;
 
 	if (rwlock->status == NOT_INITIALIZED || abstime->tv_nsec < 0 ||
 	    abstime->tv_nsec > NSEC_PER_SEC) {
 		return EINVAL;
 	}
 
-	timeout = (s32_t) timespec_to_timeoutms(abstime);
+	timeout = (int32_t) timespec_to_timeoutms(abstime);
 
 	if (write_lock_acquire(rwlock, timeout) != 0U) {
 		ret = ETIMEDOUT;
@@ -212,9 +212,9 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
 }
 
 
-static u32_t read_lock_acquire(pthread_rwlock_t *rwlock, s32_t timeout)
+static uint32_t read_lock_acquire(pthread_rwlock_t *rwlock, int32_t timeout)
 {
-	u32_t ret = 0U;
+	uint32_t ret = 0U;
 
 	if (k_sem_take(&rwlock->wr_sem, SYS_TIMEOUT_MS(timeout)) == 0) {
 		k_sem_take(&rwlock->reader_active, K_NO_WAIT);
@@ -227,10 +227,10 @@ static u32_t read_lock_acquire(pthread_rwlock_t *rwlock, s32_t timeout)
 	return ret;
 }
 
-static u32_t write_lock_acquire(pthread_rwlock_t *rwlock, s32_t timeout)
+static uint32_t write_lock_acquire(pthread_rwlock_t *rwlock, int32_t timeout)
 {
-	u32_t ret = 0U;
-	s64_t elapsed_time, st_time = k_uptime_get();
+	uint32_t ret = 0U;
+	int64_t elapsed_time, st_time = k_uptime_get();
 	k_timeout_t k_timeout;
 
 	k_timeout = SYS_TIMEOUT_MS(timeout);
diff --git a/lib/posix/semaphore.c b/lib/posix/semaphore.c
index 7823b1415b..cc10606898 100644
--- a/lib/posix/semaphore.c
+++ b/lib/posix/semaphore.c
@@ -90,8 +90,8 @@ int sem_post(sem_t *semaphore)
  */
 int sem_timedwait(sem_t *semaphore, struct timespec *abstime)
 {
-	s32_t timeout;
-	s64_t current_ms, abstime_ms;
+	int32_t timeout;
+	int64_t current_ms, abstime_ms;
 
 	__ASSERT(abstime, "abstime pointer NULL");
 
@@ -100,13 +100,13 @@ int sem_timedwait(sem_t *semaphore, struct timespec *abstime)
 		return -1;
 	}
 
-	current_ms = (s64_t)k_uptime_get();
-	abstime_ms = (s64_t)_ts_to_ms(abstime);
+	current_ms = (int64_t)k_uptime_get();
+	abstime_ms = (int64_t)_ts_to_ms(abstime);
 
 	if (abstime_ms <= current_ms) {
 		timeout = 0;
 	} else {
-		timeout = (s32_t)(abstime_ms - current_ms);
+		timeout = (int32_t)(abstime_ms - current_ms);
 	}
 
 	if (k_sem_take(semaphore, K_MSEC(timeout))) {
diff --git a/lib/posix/timer.c b/lib/posix/timer.c
index 8d71b4d6f1..e8fb63e8d7 100644
--- a/lib/posix/timer.c
+++ b/lib/posix/timer.c
@@ -19,8 +19,8 @@ struct timer_obj {
 	void (*sigev_notify_function)(sigval val);
 	sigval val;
 	struct timespec interval;	/* Reload value */
-	u32_t reload;			/* Reload value in ms */
-	u32_t status;
+	uint32_t reload;			/* Reload value in ms */
+	uint32_t status;
 };
 
 K_MEM_SLAB_DEFINE(posix_timer_slab, sizeof(struct timer_obj),
@@ -91,8 +91,8 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
 int timer_gettime(timer_t timerid, struct itimerspec *its)
 {
 	struct timer_obj *timer = (struct timer_obj *)timerid;
-	s32_t remaining, leftover;
-	s64_t   nsecs, secs;
+	int32_t remaining, leftover;
+	int64_t   nsecs, secs;
 
 	if (timer == NULL) {
 		errno = EINVAL;
@@ -103,9 +103,9 @@ int timer_gettime(timer_t timerid, struct itimerspec *its)
 		remaining = k_timer_remaining_get(&timer->ztimer);
 		secs =  remaining / MSEC_PER_SEC;
 		leftover = remaining - (secs * MSEC_PER_SEC);
-		nsecs = (s64_t)leftover * NSEC_PER_MSEC;
-		its->it_value.tv_sec = (s32_t) secs;
-		its->it_value.tv_nsec = (s32_t) nsecs;
+		nsecs = (int64_t)leftover * NSEC_PER_MSEC;
+		its->it_value.tv_sec = (int32_t) secs;
+		its->it_value.tv_nsec = (int32_t) nsecs;
 	} else {
 		/* Timer is disarmed */
 		its->it_value.tv_sec = 0;
@@ -126,7 +126,7 @@ int timer_settime(timer_t timerid, int flags, const struct itimerspec *value,
 		  struct itimerspec *ovalue)
 {
 	struct timer_obj *timer = (struct timer_obj *) timerid;
-	u32_t duration, current;
+	uint32_t duration, current;
 
 	if (timer == NULL ||
 	    value->it_interval.tv_nsec < 0 ||
diff --git a/lib/updatehub/updatehub.c b/lib/updatehub/updatehub.c
index 8b2f344bee..0f75775ad1 100644
--- a/lib/updatehub/updatehub.c
+++ b/lib/updatehub/updatehub.c
@@ -60,8 +60,8 @@ static struct updatehub_context {
 	struct flash_img_context flash_ctx;
 	struct tc_sha256_state_struct sha256sum;
 	enum updatehub_response code_status;
-	u8_t uri_path[MAX_PATH_SIZE];
-	u8_t payload[MAX_PAYLOAD_SIZE];
+	uint8_t uri_path[MAX_PATH_SIZE];
+	uint8_t payload[MAX_PAYLOAD_SIZE];
 	int downloaded_size;
 	struct pollfd fds[1];
 	int sock;
@@ -76,7 +76,7 @@ static struct update_info {
 
 static struct k_delayed_work updatehub_work_handle;
 
-static int bin2hex_str(u8_t *bin, size_t bin_len, char *str, size_t str_buf_len)
+static int bin2hex_str(uint8_t *bin, size_t bin_len, char *str, size_t str_buf_len)
 {
 	if (bin == NULL || str == NULL) {
 		return -1;
@@ -229,8 +229,8 @@ static int send_request(enum coap_msgtype msgtype, enum coap_method method,
 {
 	struct coap_packet request_packet;
 	int ret = -1;
-	u8_t content_application_json = 50;
-	u8_t *data = k_malloc(MAX_PAYLOAD_SIZE);
+	uint8_t content_application_json = 50;
+	uint8_t *data = k_malloc(MAX_PAYLOAD_SIZE);
 
 	if (data == NULL) {
 		LOG_ERR("Could not alloc data memory");
@@ -339,7 +339,7 @@ error:
 
 static bool install_update_cb_sha256(void)
 {
-	u8_t hash[TC_SHA256_DIGEST_SIZE];
+	uint8_t hash[TC_SHA256_DIGEST_SIZE];
 	char sha256[SHA256_HEX_DIGEST_SIZE];
 
 	if (tc_sha256_final(hash, &ctx.sha256sum) < 1) {
@@ -366,7 +366,7 @@ static bool install_update_cb_sha256(void)
 static void install_update_cb(void)
 {
 	struct coap_packet response_packet;
-	u8_t *data = k_malloc(MAX_DOWNLOAD_DATA);
+	uint8_t *data = k_malloc(MAX_DOWNLOAD_DATA);
 	int rcvd = -1;
 
 	if (data == NULL) {
diff --git a/lib/updatehub/updatehub_device.c b/lib/updatehub/updatehub_device.c
index 611720ef7e..73da4214f5 100644
--- a/lib/updatehub/updatehub_device.c
+++ b/lib/updatehub/updatehub_device.c
@@ -9,7 +9,7 @@
 
 bool updatehub_get_device_identity(char *id, int id_max_len)
 {
-	u8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE];
+	uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE];
 	size_t length;
 
 	length = hwinfo_get_device_id(hwinfo_id, DEVICE_ID_BIN_MAX_SIZE);
diff --git a/samples/application_development/code_relocation/src/main.c b/samples/application_development/code_relocation/src/main.c
index 20476668b6..91a2df8297 100644
--- a/samples/application_development/code_relocation/src/main.c
+++ b/samples/application_development/code_relocation/src/main.c
@@ -20,7 +20,7 @@
 #include <arch/arm/aarch32/cortex_m/cmsis.h>
 void disable_mpu_rasr_xn(void)
 {
-	u32_t index;
+	uint32_t index;
 	/* Kept the max index as 8(irrespective of soc) because the sram
 	 * would most likely be set at index 2.
 	 */
diff --git a/samples/application_development/code_relocation/src/test_file1.c b/samples/application_development/code_relocation/src/test_file1.c
index 9184beadda..8f1d7f13b2 100644
--- a/samples/application_development/code_relocation/src/test_file1.c
+++ b/samples/application_development/code_relocation/src/test_file1.c
@@ -7,14 +7,14 @@
 #include <zephyr.h>
 #include <sys/printk.h>
 
-u32_t var_sram2_data = 10U;
-u32_t var_sram2_bss;
+uint32_t var_sram2_data = 10U;
+uint32_t var_sram2_bss;
 K_SEM_DEFINE(test, 0, 1);
-const u32_t var_sram2_rodata = 100U;
+const uint32_t var_sram2_rodata = 100U;
 
-__in_section(custom_section, static, var) u32_t var_custom_data = 1U;
+__in_section(custom_section, static, var) uint32_t var_custom_data = 1U;
 
-extern void function_in_sram(s32_t value);
+extern void function_in_sram(int32_t value);
 void function_in_custom_section(void);
 void function_in_sram2(void)
 {
diff --git a/samples/application_development/code_relocation/src/test_file2.c b/samples/application_development/code_relocation/src/test_file2.c
index d2a55b6fac..40190d8088 100644
--- a/samples/application_development/code_relocation/src/test_file2.c
+++ b/samples/application_development/code_relocation/src/test_file2.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <sys/printk.h>
 
-void function_in_sram(s32_t value)
+void function_in_sram(int32_t value)
 {
 	printk("Address of function_in_sram %p\n", &function_in_sram);
 	printk("Hello World! %s\n", CONFIG_BOARD);
diff --git a/samples/application_development/code_relocation/src/test_file3.c b/samples/application_development/code_relocation/src/test_file3.c
index 688ddd5df4..b64355b304 100644
--- a/samples/application_development/code_relocation/src/test_file3.c
+++ b/samples/application_development/code_relocation/src/test_file3.c
@@ -7,8 +7,8 @@
 #include <zephyr.h>
 #include <sys/printk.h>
 
-u32_t var_file3_sram_data = 10U;
-u32_t var_file3_sram2_bss;
+uint32_t var_file3_sram_data = 10U;
+uint32_t var_file3_sram2_bss;
 
 void function_in_split_multiple(void)
 {
diff --git a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c
index ba8b22c23c..59a91c7c5b 100644
--- a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c
+++ b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.c
@@ -13,7 +13,7 @@
  */
 
 static struct hello_world_dev_data {
-	u32_t foo;
+	uint32_t foo;
 } data;
 
 static int init(struct device *dev)
diff --git a/samples/basic/blinky_pwm/src/main.c b/samples/basic/blinky_pwm/src/main.c
index 94285b2618..f243805a32 100644
--- a/samples/basic/blinky_pwm/src/main.c
+++ b/samples/basic/blinky_pwm/src/main.c
@@ -43,9 +43,9 @@
 void main(void)
 {
 	struct device *pwm;
-	u32_t max_period;
-	u32_t period;
-	u8_t dir = 0U;
+	uint32_t max_period;
+	uint32_t period;
+	uint8_t dir = 0U;
 	int ret;
 
 	printk("PWM-based blinky\n");
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index 4973810857..1e9f9579e1 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -51,7 +51,7 @@ static void match_led_to_button(struct device *button, struct device *led);
 static struct gpio_callback button_cb_data;
 
 void button_pressed(struct device *dev, struct gpio_callback *cb,
-		    u32_t pins)
+		    uint32_t pins)
 {
 	printk("Button pressed at %" PRIu32 "\n", k_cycle_get_32());
 }
diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c
index 54add86c18..444e97138a 100644
--- a/samples/basic/fade_led/src/main.c
+++ b/samples/basic/fade_led/src/main.c
@@ -50,8 +50,8 @@
 void main(void)
 {
 	struct device *pwm;
-	u32_t pulse_width = 0U;
-	u8_t dir = 1U;
+	uint32_t pulse_width = 0U;
+	uint8_t dir = 1U;
 	int ret;
 
 	printk("PWM-based LED fade\n");
diff --git a/samples/basic/rgb_led/src/main.c b/samples/basic/rgb_led/src/main.c
index ccb28ee7d9..36bf60ef85 100644
--- a/samples/basic/rgb_led/src/main.c
+++ b/samples/basic/rgb_led/src/main.c
@@ -71,8 +71,8 @@
 #define PERIOD_USEC	(USEC_PER_SEC / 50U)
 #define STEPSIZE_USEC	2000
 
-static int pwm_set(struct device *pwm_dev, u32_t pwm_pin,
-		     u32_t pulse_width, pwm_flags_t flags)
+static int pwm_set(struct device *pwm_dev, uint32_t pwm_pin,
+		     uint32_t pulse_width, pwm_flags_t flags)
 {
 	return pwm_pin_set_usec(pwm_dev, pwm_pin, PERIOD_USEC,
 				pulse_width, flags);
@@ -83,7 +83,7 @@ enum { RED, GREEN, BLUE };
 void main(void)
 {
 	struct device *pwm_dev[3];
-	u32_t pulse_red, pulse_green, pulse_blue; /* pulse widths */
+	uint32_t pulse_red, pulse_green, pulse_blue; /* pulse widths */
 	int ret;
 
 	printk("PWM-based RGB LED control\n");
diff --git a/samples/basic/servo_motor/src/main.c b/samples/basic/servo_motor/src/main.c
index 4f89a6a67b..da9a00866a 100644
--- a/samples/basic/servo_motor/src/main.c
+++ b/samples/basic/servo_motor/src/main.c
@@ -39,7 +39,7 @@ enum direction {
 void main(void)
 {
 	struct device *pwm;
-	u32_t pulse_width = MIN_PULSE_USEC;
+	uint32_t pulse_width = MIN_PULSE_USEC;
 	enum direction dir = UP;
 	int ret;
 
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index b34f491379..9132d83567 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -32,8 +32,8 @@
 
 struct printk_data_t {
 	void *fifo_reserved; /* 1st word reserved for use by fifo */
-	u32_t led;
-	u32_t cnt;
+	uint32_t led;
+	uint32_t cnt;
 };
 
 K_FIFO_DEFINE(printk_fifo);
@@ -45,7 +45,7 @@ struct led {
 	unsigned int gpio_flags;
 };
 
-void blink(const struct led *led, u32_t sleep_ms, u32_t id)
+void blink(const struct led *led, uint32_t sleep_ms, uint32_t id)
 {
 	struct device *gpio_dev;
 	int cnt = 0;
diff --git a/samples/bluetooth/central/src/main.c b/samples/bluetooth/central/src/main.c
index c92f2fde3f..c2a164cccb 100644
--- a/samples/bluetooth/central/src/main.c
+++ b/samples/bluetooth/central/src/main.c
@@ -23,7 +23,7 @@ static void start_scan(void);
 
 static struct bt_conn *default_conn;
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
 	char addr_str[BT_ADDR_LE_STR_LEN];
@@ -73,7 +73,7 @@ static void start_scan(void)
 	printk("Scanning successfully started\n");
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
@@ -98,7 +98,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	bt_conn_disconnect(conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c
index 779c420b08..a4171d4e6f 100644
--- a/samples/bluetooth/central_hr/src/main.c
+++ b/samples/bluetooth/central_hr/src/main.c
@@ -27,9 +27,9 @@ static struct bt_uuid_16 uuid = BT_UUID_INIT_16(0);
 static struct bt_gatt_discover_params discover_params;
 static struct bt_gatt_subscribe_params subscribe_params;
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			   struct bt_gatt_subscribe_params *params,
-			   const void *data, u16_t length)
+			   const void *data, uint16_t length)
 {
 	if (!data) {
 		printk("[UNSUBSCRIBED]\n");
@@ -42,7 +42,7 @@ static u8_t notify_func(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
 			     struct bt_gatt_discover_params *params)
 {
@@ -106,15 +106,15 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	switch (data->type) {
 	case BT_DATA_UUID16_SOME:
 	case BT_DATA_UUID16_ALL:
-		if (data->data_len % sizeof(u16_t) != 0U) {
+		if (data->data_len % sizeof(uint16_t) != 0U) {
 			printk("AD malformed\n");
 			return true;
 		}
 
-		for (i = 0; i < data->data_len; i += sizeof(u16_t)) {
+		for (i = 0; i < data->data_len; i += sizeof(uint16_t)) {
 			struct bt_le_conn_param *param;
 			struct bt_uuid *uuid;
-			u16_t u16;
+			uint16_t u16;
 			int err;
 
 			memcpy(&u16, &data->data[i], sizeof(u16));
@@ -144,7 +144,7 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	return true;
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
 	char dev[BT_ADDR_LE_STR_LEN];
@@ -182,7 +182,7 @@ static void start_scan(void)
 	printk("Scanning successfully started\n");
 }
 
-static void connected(struct bt_conn *conn, u8_t conn_err)
+static void connected(struct bt_conn *conn, uint8_t conn_err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 	int err;
@@ -217,7 +217,7 @@ static void connected(struct bt_conn *conn, u8_t conn_err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
diff --git a/samples/bluetooth/central_ht/src/main.c b/samples/bluetooth/central_ht/src/main.c
index adb18da5f3..4f5d4136fe 100644
--- a/samples/bluetooth/central_ht/src/main.c
+++ b/samples/bluetooth/central_ht/src/main.c
@@ -45,13 +45,13 @@ static double pow(double x, double y)
 	return result;
 }
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			   struct bt_gatt_subscribe_params *params,
-			   const void *data, u16_t length)
+			   const void *data, uint16_t length)
 {
 	double temperature;
-	u32_t mantissa;
-	s8_t exponent;
+	uint32_t mantissa;
+	int8_t exponent;
 
 	if (!data) {
 		printk("[UNSUBSCRIBED]\n");
@@ -60,8 +60,8 @@ static u8_t notify_func(struct bt_conn *conn,
 	}
 
 	/* temperature value display */
-	mantissa = sys_get_le24(&((u8_t *)data)[1]);
-	exponent = ((u8_t *)data)[4];
+	mantissa = sys_get_le24(&((uint8_t *)data)[1]);
+	exponent = ((uint8_t *)data)[4];
 	temperature = (double)mantissa * pow(10, exponent);
 
 	printf("Temperature %gC.\n", temperature);
@@ -69,7 +69,7 @@ static u8_t notify_func(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
 			     struct bt_gatt_discover_params *params)
 {
@@ -123,7 +123,7 @@ static u8_t discover_func(struct bt_conn *conn,
 	return BT_GATT_ITER_STOP;
 }
 
-static void connected(struct bt_conn *conn, u8_t conn_err)
+static void connected(struct bt_conn *conn, uint8_t conn_err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 	int err;
@@ -168,14 +168,14 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	switch (data->type) {
 	case BT_DATA_UUID16_SOME:
 	case BT_DATA_UUID16_ALL:
-		if (data->data_len % sizeof(u16_t) != 0U) {
+		if (data->data_len % sizeof(uint16_t) != 0U) {
 			printk("AD malformed\n");
 			return true;
 		}
 
-		for (i = 0; i < data->data_len; i += sizeof(u16_t)) {
+		for (i = 0; i < data->data_len; i += sizeof(uint16_t)) {
 			struct bt_uuid *uuid;
-			u16_t u16;
+			uint16_t u16;
 			int err;
 
 			memcpy(&u16, &data->data[i], sizeof(u16));
@@ -206,7 +206,7 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	return true;
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
 	char dev[BT_ADDR_LE_STR_LEN];
@@ -236,7 +236,7 @@ static int scan_start(void)
 	return bt_le_scan_start(&scan_param, device_found);
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 	int err;
diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c
index 0338f52ce1..405fb45f52 100644
--- a/samples/bluetooth/eddystone/src/main.c
+++ b/samples/bluetooth/eddystone/src/main.c
@@ -120,12 +120,12 @@ enum {
 };
 
 struct eds_capabilities {
-	u8_t version;
-	u8_t slots;
-	u8_t uids;
-	u8_t adv_types;
-	u16_t slot_types;
-	u8_t tx_power;
+	uint8_t version;
+	uint8_t slots;
+	uint8_t uids;
+	uint8_t adv_types;
+	uint16_t slot_types;
+	uint8_t tx_power;
 } __packed;
 
 static struct eds_capabilities eds_caps = {
@@ -134,7 +134,7 @@ static struct eds_capabilities eds_caps = {
 	.slot_types = EDS_SLOT_URL, /* TODO: Add support for other slot types */
 };
 
-u8_t eds_active_slot;
+uint8_t eds_active_slot;
 
 enum {
 	EDS_LOCKED = 0x00,
@@ -143,14 +143,14 @@ enum {
 };
 
 struct eds_slot {
-	u8_t type;
-	u8_t state;
-	u8_t connectable;
-	u16_t interval;
-	u8_t tx_power;
-	u8_t adv_tx_power;
-	u8_t lock[16];
-	u8_t challenge[16];
+	uint8_t type;
+	uint8_t state;
+	uint8_t connectable;
+	uint16_t interval;
+	uint8_t tx_power;
+	uint8_t adv_tx_power;
+	uint8_t lock[16];
+	uint8_t challenge[16];
 	struct bt_data ad[3];
 };
 
@@ -178,7 +178,7 @@ static struct eds_slot eds_slots[NUMBER_OF_SLOTS] = {
 };
 
 static ssize_t read_caps(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	const struct eds_capabilities *caps = attr->user_data;
 
@@ -187,7 +187,7 @@ static ssize_t read_caps(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t read_slot(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset,
 				 &eds_active_slot, sizeof(eds_active_slot));
@@ -195,9 +195,9 @@ static ssize_t read_slot(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 static ssize_t write_slot(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr, const void *buf,
-			  u16_t len, u16_t offset, u8_t flags)
+			  uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t value;
+	uint8_t value;
 
 	if (offset + len > sizeof(value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -216,7 +216,7 @@ static ssize_t write_slot(struct bt_conn *conn,
 
 static ssize_t read_tx_power(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
-			     void *buf, u16_t len, u16_t offset)
+			     void *buf, uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -230,8 +230,8 @@ static ssize_t read_tx_power(struct bt_conn *conn,
 
 static ssize_t write_tx_power(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr,
-			      const void *buf, u16_t len, u16_t offset,
-			      u8_t flags)
+			      const void *buf, uint16_t len, uint16_t offset,
+			      uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -250,7 +250,7 @@ static ssize_t write_tx_power(struct bt_conn *conn,
 
 static ssize_t read_adv_tx_power(struct bt_conn *conn,
 				 const struct bt_gatt_attr *attr,
-				 void *buf, u16_t len, u16_t offset)
+				 void *buf, uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -264,9 +264,9 @@ static ssize_t read_adv_tx_power(struct bt_conn *conn,
 
 static ssize_t write_adv_tx_power(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr,
-				  const void *buf, u16_t len,
-				  u16_t offset,
-				  u8_t flags)
+				  const void *buf, uint16_t len,
+				  uint16_t offset,
+				  uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -285,7 +285,7 @@ static ssize_t write_adv_tx_power(struct bt_conn *conn,
 
 static ssize_t read_interval(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
-			     void *buf, u16_t len, u16_t offset)
+			     void *buf, uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -298,7 +298,7 @@ static ssize_t read_interval(struct bt_conn *conn,
 }
 
 static ssize_t read_lock(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -308,10 +308,10 @@ static ssize_t read_lock(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 static ssize_t write_lock(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr, const void *buf,
-			  u16_t len, u16_t offset, u8_t flags)
+			  uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
-	u8_t value;
+	uint8_t value;
 
 	if (slot->state == EDS_LOCKED) {
 		return BT_GATT_ERR(BT_ATT_ERR_WRITE_NOT_PERMITTED);
@@ -343,7 +343,7 @@ static ssize_t write_lock(struct bt_conn *conn,
 
 static ssize_t read_unlock(struct bt_conn *conn,
 			   const struct bt_gatt_attr *attr,
-			   void *buf, u16_t len, u16_t offset)
+			   void *buf, uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -364,7 +364,7 @@ static ssize_t read_unlock(struct bt_conn *conn,
 
 static ssize_t write_unlock(struct bt_conn *conn,
 			    const struct bt_gatt_attr *attr, const void *buf,
-			    u16_t len, u16_t offset, u8_t flags)
+			    uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -379,23 +379,23 @@ static ssize_t write_unlock(struct bt_conn *conn,
 	return BT_GATT_ERR(BT_ATT_ERR_NOT_SUPPORTED);
 }
 
-static u8_t eds_ecdh[32] = {}; /* TODO: Add ECDH key */
+static uint8_t eds_ecdh[32] = {}; /* TODO: Add ECDH key */
 
 static ssize_t read_ecdh(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(eds_ecdh));
 }
 
-static u8_t eds_eid[16] = {}; /* TODO: Add EID key */
+static uint8_t eds_eid[16] = {}; /* TODO: Add EID key */
 
 static ssize_t read_eid(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(eds_eid));
@@ -403,7 +403,7 @@ static ssize_t read_eid(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 static ssize_t read_adv_data(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -423,7 +423,7 @@ static ssize_t read_adv_data(struct bt_conn *conn,
 				 slot->ad[2].data_len - EDS_URL_READ_OFFSET);
 }
 
-static int eds_slot_restart(struct eds_slot *slot, u8_t type)
+static int eds_slot_restart(struct eds_slot *slot, uint8_t type)
 {
 	int err;
 
@@ -451,11 +451,11 @@ static int eds_slot_restart(struct eds_slot *slot, u8_t type)
 
 static ssize_t write_adv_data(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr,
-			      const void *buf, u16_t len, u16_t offset,
-			      u8_t flags)
+			      const void *buf, uint16_t len, uint16_t offset,
+			      uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
-	u8_t type;
+	uint8_t type;
 
 	if (slot->state == EDS_LOCKED) {
 		return BT_GATT_ERR(BT_ATT_ERR_READ_NOT_PERMITTED);
@@ -509,8 +509,8 @@ static ssize_t write_adv_data(struct bt_conn *conn,
 
 static ssize_t write_reset(struct bt_conn *conn,
 			   const struct bt_gatt_attr *attr,
-			   const void *buf, u16_t len, u16_t offset,
-			   u8_t flags)
+			   const void *buf, uint16_t len, uint16_t offset,
+			   uint8_t flags)
 {
 	/* TODO: Power cycle or reload for storage the values */
 	return BT_GATT_ERR(BT_ATT_ERR_WRITE_NOT_PERMITTED);
@@ -518,9 +518,9 @@ static ssize_t write_reset(struct bt_conn *conn,
 
 static ssize_t read_connectable(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	u8_t connectable = 0x01;
+	uint8_t connectable = 0x01;
 
 	/* Returning a non-zero value indicates that the beacon is capable
 	 * of becoming non-connectable
@@ -531,8 +531,8 @@ static ssize_t read_connectable(struct bt_conn *conn,
 
 static ssize_t write_connectable(struct bt_conn *conn,
 				 const struct bt_gatt_attr *attr,
-				 const void *buf, u16_t len, u16_t offset,
-				 u8_t flags)
+				 const void *buf, uint16_t len, uint16_t offset,
+				 uint8_t flags)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
@@ -646,7 +646,7 @@ static void idle_timeout(struct k_work *work)
 	}
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -656,7 +656,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	struct eds_slot *slot = &eds_slots[eds_active_slot];
 
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/handsfree/src/main.c
index ff92be2e7b..e15ed222c8 100644
--- a/samples/bluetooth/handsfree/src/main.c
+++ b/samples/bluetooth/handsfree/src/main.c
@@ -28,37 +28,37 @@ static void disconnected(struct bt_conn *conn)
 	printk("HFP HF Disconnected!\n");
 }
 
-static void service(struct bt_conn *conn, u32_t value)
+static void service(struct bt_conn *conn, uint32_t value)
 {
 	printk("Service indicator value: %u\n", value);
 }
 
-static void call(struct bt_conn *conn, u32_t value)
+static void call(struct bt_conn *conn, uint32_t value)
 {
 	printk("Call indicator value: %u\n", value);
 }
 
-static void call_setup(struct bt_conn *conn, u32_t value)
+static void call_setup(struct bt_conn *conn, uint32_t value)
 {
 	printk("Call Setup indicator value: %u\n", value);
 }
 
-static void call_held(struct bt_conn *conn, u32_t value)
+static void call_held(struct bt_conn *conn, uint32_t value)
 {
 	printk("Call Held indicator value: %u\n", value);
 }
 
-static void signal(struct bt_conn *conn, u32_t value)
+static void signal(struct bt_conn *conn, uint32_t value)
 {
 	printk("Signal indicator value: %u\n", value);
 }
 
-static void roam(struct bt_conn *conn, u32_t value)
+static void roam(struct bt_conn *conn, uint32_t value)
 {
 	printk("Roaming indicator value: %u\n", value);
 }
 
-static void battery(struct bt_conn *conn, u32_t value)
+static void battery(struct bt_conn *conn, uint32_t value)
 {
 	printk("Battery indicator value: %u\n", value);
 }
diff --git a/samples/bluetooth/hci_pwr_ctrl/src/main.c b/samples/bluetooth/hci_pwr_ctrl/src/main.c
index 4defe4e2b1..ab0afef08b 100644
--- a/samples/bluetooth/hci_pwr_ctrl/src/main.c
+++ b/samples/bluetooth/hci_pwr_ctrl/src/main.c
@@ -22,7 +22,7 @@
 #include <bluetooth/services/hrs.h>
 
 static struct bt_conn *default_conn;
-static u16_t default_conn_handle;
+static uint16_t default_conn_handle;
 
 static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
@@ -36,13 +36,13 @@ static const struct bt_data ad[] = {
 static struct k_thread pwr_thread_data;
 static K_THREAD_STACK_DEFINE(pwr_thread_stack, 320);
 
-static const s8_t txp[DEVICE_BEACON_TXPOWER_NUM] = {4, 0, -3, -8,
+static const int8_t txp[DEVICE_BEACON_TXPOWER_NUM] = {4, 0, -3, -8,
 						    -15, -18, -23, -30};
 static const struct bt_le_adv_param *param =
 	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME,
 			0x0020, 0x0020, NULL);
 
-static void read_conn_rssi(u16_t handle, s8_t *rssi)
+static void read_conn_rssi(uint16_t handle, int8_t *rssi)
 {
 	struct net_buf *buf, *rsp = NULL;
 	struct bt_hci_cp_read_rssi *cp;
@@ -61,7 +61,7 @@ static void read_conn_rssi(u16_t handle, s8_t *rssi)
 
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_READ_RSSI, buf, &rsp);
 	if (err) {
-		u8_t reason = rsp ?
+		uint8_t reason = rsp ?
 			((struct bt_hci_rp_read_rssi *)rsp->data)->status : 0;
 		printk("Read RSSI err: %d reason 0x%02x\n", err, reason);
 		return;
@@ -74,7 +74,7 @@ static void read_conn_rssi(u16_t handle, s8_t *rssi)
 }
 
 
-static void set_tx_power(u8_t handle_type, u16_t handle, s8_t tx_pwr_lvl)
+static void set_tx_power(uint8_t handle_type, uint16_t handle, int8_t tx_pwr_lvl)
 {
 	struct bt_hci_cp_vs_write_tx_power_level *cp;
 	struct bt_hci_rp_vs_write_tx_power_level *rp;
@@ -96,7 +96,7 @@ static void set_tx_power(u8_t handle_type, u16_t handle, s8_t tx_pwr_lvl)
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_WRITE_TX_POWER_LEVEL,
 				   buf, &rsp);
 	if (err) {
-		u8_t reason = rsp ?
+		uint8_t reason = rsp ?
 			((struct bt_hci_rp_vs_write_tx_power_level *)
 			  rsp->data)->status : 0;
 		printk("Set Tx power err: %d reason 0x%02x\n", err, reason);
@@ -109,7 +109,7 @@ static void set_tx_power(u8_t handle_type, u16_t handle, s8_t tx_pwr_lvl)
 	net_buf_unref(rsp);
 }
 
-static void get_tx_power(u8_t handle_type, u16_t handle, s8_t *tx_pwr_lvl)
+static void get_tx_power(uint8_t handle_type, uint16_t handle, int8_t *tx_pwr_lvl)
 {
 	struct bt_hci_cp_vs_read_tx_power_level *cp;
 	struct bt_hci_rp_vs_read_tx_power_level *rp;
@@ -131,7 +131,7 @@ static void get_tx_power(u8_t handle_type, u16_t handle, s8_t *tx_pwr_lvl)
 	err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_READ_TX_POWER_LEVEL,
 				   buf, &rsp);
 	if (err) {
-		u8_t reason = rsp ?
+		uint8_t reason = rsp ?
 			((struct bt_hci_rp_vs_read_tx_power_level *)
 			  rsp->data)->status : 0;
 		printk("Read Tx power err: %d reason 0x%02x\n", err, reason);
@@ -144,10 +144,10 @@ static void get_tx_power(u8_t handle_type, u16_t handle, s8_t *tx_pwr_lvl)
 	net_buf_unref(rsp);
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
-	s8_t txp;
+	int8_t txp;
 	int ret;
 
 	if (err) {
@@ -180,7 +180,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
@@ -217,7 +217,7 @@ static void bt_ready(int err)
 
 static void hrs_notify(void)
 {
-	static u8_t heartrate = 90U;
+	static uint8_t heartrate = 90U;
 
 	/* Heartrate measurements simulation */
 	heartrate++;
@@ -230,8 +230,8 @@ static void hrs_notify(void)
 
 void modulate_tx_power(void *p1, void *p2, void *p3)
 {
-	s8_t txp_get = 0;
-	u8_t idx = 0;
+	int8_t txp_get = 0;
+	uint8_t idx = 0;
 
 	while (1) {
 		if (!default_conn) {
@@ -248,8 +248,8 @@ void modulate_tx_power(void *p1, void *p2, void *p3)
 
 			idx = (idx+1) % DEVICE_BEACON_TXPOWER_NUM;
 		} else {
-			s8_t rssi = 0xFF;
-			s8_t txp_adaptive;
+			int8_t rssi = 0xFF;
+			int8_t txp_adaptive;
 
 			idx = 0;
 
@@ -279,7 +279,7 @@ void modulate_tx_power(void *p1, void *p2, void *p3)
 
 void main(void)
 {
-	s8_t txp_get = 0xFF;
+	int8_t txp_get = 0xFF;
 	int err;
 
 	default_conn = NULL;
diff --git a/samples/bluetooth/hci_rpmsg/src/main.c b/samples/bluetooth/hci_rpmsg/src/main.c
index 26f6abc429..8aafbfcba4 100644
--- a/samples/bluetooth/hci_rpmsg/src/main.c
+++ b/samples/bluetooth/hci_rpmsg/src/main.c
@@ -91,7 +91,7 @@ static unsigned char virtio_get_status(struct virtio_device *vdev)
 	return sys_read8(VDEV_STATUS_ADDR);
 }
 
-static u32_t virtio_get_features(struct virtio_device *vdev)
+static uint32_t virtio_get_features(struct virtio_device *vdev)
 {
 	return BIT(VIRTIO_RPMSG_F_NS);
 }
@@ -123,7 +123,7 @@ static void ipm_callback_process(struct k_work *work)
 	virtqueue_notification(vq[1]);
 }
 
-static void ipm_callback(void *context, u32_t id, volatile void *data)
+static void ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	LOG_INF("Got callback of id %u", id);
 	k_work_submit(&ipm_work);
@@ -143,7 +143,7 @@ static K_FIFO_DEFINE(tx_queue);
 #define HCI_RPMSG_SCO 0x03
 #define HCI_RPMSG_EVT 0x04
 
-static struct net_buf *hci_rpmsg_cmd_recv(u8_t *data, size_t remaining)
+static struct net_buf *hci_rpmsg_cmd_recv(uint8_t *data, size_t remaining)
 {
 	struct bt_hci_cmd_hdr *hdr = (void *)data;
 	struct net_buf *buf;
@@ -174,7 +174,7 @@ static struct net_buf *hci_rpmsg_cmd_recv(u8_t *data, size_t remaining)
 	return buf;
 }
 
-static struct net_buf *hci_rpmsg_acl_recv(u8_t *data, size_t remaining)
+static struct net_buf *hci_rpmsg_acl_recv(uint8_t *data, size_t remaining)
 {
 	struct bt_hci_acl_hdr *hdr = (void *)data;
 	struct net_buf *buf;
@@ -205,9 +205,9 @@ static struct net_buf *hci_rpmsg_acl_recv(u8_t *data, size_t remaining)
 	return buf;
 }
 
-static void hci_rpmsg_rx(u8_t *data, size_t len)
+static void hci_rpmsg_rx(uint8_t *data, size_t len)
 {
-	u8_t pkt_indicator;
+	uint8_t pkt_indicator;
 	struct net_buf *buf = NULL;
 	size_t remaining = len;
 
@@ -261,7 +261,7 @@ static void tx_thread(void *p1, void *p2, void *p3)
 
 static int hci_rpmsg_send(struct net_buf *buf)
 {
-	u8_t pkt_indicator;
+	uint8_t pkt_indicator;
 
 	LOG_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf),
 		buf->len);
@@ -291,17 +291,17 @@ static int hci_rpmsg_send(struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_CTLR_ASSERT_HANDLER)
-void bt_ctlr_assert_handle(char *file, u32_t line)
+void bt_ctlr_assert_handle(char *file, uint32_t line)
 {
 	LOG_ERR("Controller assert in: %s at %d", file, line);
 }
 #endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */
 
-int endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len, u32_t src,
+int endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len, uint32_t src,
 		void *priv)
 {
 	LOG_INF("Received message of %u bytes.", len);
-	hci_rpmsg_rx((u8_t *) data, len);
+	hci_rpmsg_rx((uint8_t *) data, len);
 
 	return RPMSG_SUCCESS;
 }
diff --git a/samples/bluetooth/hci_spi/src/main.c b/samples/bluetooth/hci_spi/src/main.c
index 8fd7888f4e..a8bc4f52d9 100644
--- a/samples/bluetooth/hci_spi/src/main.c
+++ b/samples/bluetooth/hci_spi/src/main.c
@@ -54,14 +54,14 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 /* Needs to be aligned with the SPI master buffer size */
 #define SPI_MAX_MSG_LEN        255
 
-static u8_t rxmsg[SPI_MAX_MSG_LEN];
+static uint8_t rxmsg[SPI_MAX_MSG_LEN];
 static struct spi_buf rx;
 const static struct spi_buf_set rx_bufs = {
 	.buffers = &rx,
 	.count = 1,
 };
 
-static u8_t txmsg[SPI_MAX_MSG_LEN];
+static uint8_t txmsg[SPI_MAX_MSG_LEN];
 static struct spi_buf tx;
 const static struct spi_buf_set tx_bufs = {
 	.buffers = &tx,
@@ -84,8 +84,8 @@ static K_SEM_DEFINE(sem_spi_tx, 0, 1);
 
 static inline int spi_send(struct net_buf *buf)
 {
-	u8_t header_master[5] = { 0 };
-	u8_t header_slave[5] = { READY_NOW, SANITY_CHECK,
+	uint8_t header_master[5] = { 0 };
+	uint8_t header_slave[5] = { READY_NOW, SANITY_CHECK,
 				 0x00, 0x00, 0x00 };
 	int ret;
 
@@ -144,8 +144,8 @@ static inline int spi_send(struct net_buf *buf)
 
 static void bt_tx_thread(void *p1, void *p2, void *p3)
 {
-	u8_t header_master[5];
-	u8_t header_slave[5] = { READY_NOW, SANITY_CHECK,
+	uint8_t header_master[5];
+	uint8_t header_slave[5] = { READY_NOW, SANITY_CHECK,
 				 0x00, 0x00, 0x00 };
 	struct net_buf *buf = NULL;
 	struct bt_hci_cmd_hdr cmd_hdr;
diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c
index 3d0e0f5c63..86ced28f42 100644
--- a/samples/bluetooth/hci_uart/src/main.c
+++ b/samples/bluetooth/hci_uart/src/main.c
@@ -49,7 +49,7 @@ static K_FIFO_DEFINE(tx_queue);
  */
 #define H4_DISCARD_LEN 33
 
-static int h4_read(struct device *uart, u8_t *buf,
+static int h4_read(struct device *uart, uint8_t *buf,
 		   size_t len, size_t min)
 {
 	int total = 0;
@@ -77,7 +77,7 @@ static int h4_read(struct device *uart, u8_t *buf,
 
 static size_t h4_discard(struct device *uart, size_t len)
 {
-	u8_t buf[H4_DISCARD_LEN];
+	uint8_t buf[H4_DISCARD_LEN];
 
 	return uart_fifo_read(uart, buf, MIN(len, sizeof(buf)));
 }
@@ -133,7 +133,7 @@ static void bt_uart_isr(struct device *unused)
 
 		/* Beginning of a new packet */
 		if (!remaining) {
-			u8_t type;
+			uint8_t type;
 
 			/* Get packet type */
 			read = h4_read(hci_uart_dev, &type, sizeof(type), 0);
@@ -230,9 +230,9 @@ static int h4_send(struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_CTLR_ASSERT_HANDLER)
-void bt_ctlr_assert_handle(char *file, u32_t line)
+void bt_ctlr_assert_handle(char *file, uint32_t line)
 {
-	u32_t len = 0U, pos = 0U;
+	uint32_t len = 0U, pos = 0U;
 
 	/* Disable interrupts, this is unrecoverable */
 	(void)irq_lock();
@@ -316,7 +316,7 @@ void main(void)
 		int i;
 
 		const struct {
-			const u8_t h4;
+			const uint8_t h4;
 			const struct bt_hci_evt_hdr hdr;
 			const struct bt_hci_evt_cmd_complete cc;
 		} __packed cc_evt = {
@@ -333,7 +333,7 @@ void main(void)
 
 		for (i = 0; i < sizeof(cc_evt); i++) {
 			uart_poll_out(hci_uart_dev,
-				      *(((const u8_t *)&cc_evt)+i));
+				      *(((const uint8_t *)&cc_evt)+i));
 		}
 	}
 
diff --git a/samples/bluetooth/ipsp/src/main.c b/samples/bluetooth/ipsp/src/main.c
index 4b992ab131..25980448a7 100644
--- a/samples/bluetooth/ipsp/src/main.c
+++ b/samples/bluetooth/ipsp/src/main.c
@@ -44,7 +44,7 @@ static struct in6_addr in6addr_my = MY_IP6ADDR;
 K_THREAD_STACK_DEFINE(thread_stack, STACKSIZE);
 static struct k_thread thread_data;
 
-static u8_t buf_tx[NET_IPV6_MTU];
+static uint8_t buf_tx[NET_IPV6_MTU];
 
 #define MAX_DBG_PRINT 64
 
@@ -160,7 +160,7 @@ static inline bool get_context(struct net_context **udp_recv6,
 
 static int build_reply(const char *name,
 		       struct net_pkt *pkt,
-		       u8_t *buf)
+		       uint8_t *buf)
 {
 	int reply_len = net_pkt_remaining_data(pkt);
 	int ret;
diff --git a/samples/bluetooth/mesh/src/board.h b/samples/bluetooth/mesh/src/board.h
index e02b70db67..df9ff8c2fa 100644
--- a/samples/bluetooth/mesh/src/board.h
+++ b/samples/bluetooth/mesh/src/board.h
@@ -7,14 +7,14 @@
  */
 
 #if defined(CONFIG_BOARD_BBC_MICROBIT)
-void board_output_number(bt_mesh_output_action_t action, u32_t number);
+void board_output_number(bt_mesh_output_action_t action, uint32_t number);
 
 void board_prov_complete(void);
 
 void board_init(void);
 #else
 static inline void board_output_number(bt_mesh_output_action_t action,
-				       u32_t number)
+				       uint32_t number)
 {
 }
 
diff --git a/samples/bluetooth/mesh/src/main.c b/samples/bluetooth/mesh/src/main.c
index ee8fbe3342..246f55c4a9 100644
--- a/samples/bluetooth/mesh/src/main.c
+++ b/samples/bluetooth/mesh/src/main.c
@@ -140,7 +140,7 @@ static const struct bt_mesh_comp comp = {
 	.elem_count = ARRAY_SIZE(elements),
 };
 
-static int output_number(bt_mesh_output_action_t action, u32_t number)
+static int output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	printk("OOB Number: %u\n", number);
 
@@ -149,7 +149,7 @@ static int output_number(bt_mesh_output_action_t action, u32_t number)
 	return 0;
 }
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	board_prov_complete();
 }
diff --git a/samples/bluetooth/mesh/src/microbit.c b/samples/bluetooth/mesh/src/microbit.c
index bf086c8581..55e3f6c43d 100644
--- a/samples/bluetooth/mesh/src/microbit.c
+++ b/samples/bluetooth/mesh/src/microbit.c
@@ -14,11 +14,11 @@
 
 #include "board.h"
 
-static u32_t oob_number;
+static uint32_t oob_number;
 static struct device *gpio;
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	struct mb_display *disp = mb_display_get();
 
@@ -43,7 +43,7 @@ static void configure_button(void)
 	gpio_add_callback(gpio, &button_cb);
 }
 
-void board_output_number(bt_mesh_output_action_t action, u32_t number)
+void board_output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	struct mb_display *disp = mb_display_get();
 	struct mb_image arrow = MB_IMAGE({ 0, 0, 1, 0, 0 },
diff --git a/samples/bluetooth/mesh_demo/src/board.h b/samples/bluetooth/mesh_demo/src/board.h
index a3db3026e9..628f0dca65 100644
--- a/samples/bluetooth/mesh_demo/src/board.h
+++ b/samples/bluetooth/mesh_demo/src/board.h
@@ -11,17 +11,17 @@
 #endif
 
 void board_button_1_pressed(void);
-u16_t board_set_target(void);
+uint16_t board_set_target(void);
 void board_play(const char *str);
 
 #if defined(CONFIG_BOARD_BBC_MICROBIT)
-void board_init(u16_t *addr);
+void board_init(uint16_t *addr);
 void board_play_tune(const char *str);
-void board_heartbeat(u8_t hops, u16_t feat);
-void board_other_dev_pressed(u16_t addr);
+void board_heartbeat(uint8_t hops, uint16_t feat);
+void board_other_dev_pressed(uint16_t addr);
 void board_attention(bool attention);
 #else
-static inline void board_init(u16_t *addr)
+static inline void board_init(uint16_t *addr)
 {
 	*addr = NODE_ADDR;
 }
@@ -30,11 +30,11 @@ static inline void board_play_tune(const char *str)
 {
 }
 
-void board_heartbeat(u8_t hops, u16_t feat)
+void board_heartbeat(uint8_t hops, uint16_t feat)
 {
 }
 
-void board_other_dev_pressed(u16_t addr)
+void board_other_dev_pressed(uint16_t addr)
 {
 }
 
diff --git a/samples/bluetooth/mesh_demo/src/main.c b/samples/bluetooth/mesh_demo/src/main.c
index 3e819c6ef3..aebdca65b7 100644
--- a/samples/bluetooth/mesh_demo/src/main.c
+++ b/samples/bluetooth/mesh_demo/src/main.c
@@ -22,25 +22,25 @@
 
 #define OP_VENDOR_BUTTON BT_MESH_MODEL_OP_3(0x00, BT_COMP_ID_LF)
 
-static const u8_t net_key[16] = {
+static const uint8_t net_key[16] = {
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 };
-static const u8_t dev_key[16] = {
+static const uint8_t dev_key[16] = {
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 };
-static const u8_t app_key[16] = {
+static const uint8_t app_key[16] = {
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 };
-static const u16_t net_idx;
-static const u16_t app_idx;
-static const u32_t iv_index;
-static u8_t flags;
-static u16_t addr = NODE_ADDR;
+static const uint16_t net_idx;
+static const uint16_t app_idx;
+static const uint32_t iv_index;
+static uint8_t flags;
+static uint16_t addr = NODE_ADDR;
 
-static void heartbeat(u8_t hops, u16_t feat)
+static void heartbeat(uint8_t hops, uint16_t feat)
 {
 	board_heartbeat(hops, feat);
 	board_play("100H");
@@ -169,7 +169,7 @@ static void configure(void)
 	board_play("100C100D100E100F100G100A100H");
 }
 
-static const u8_t dev_uuid[16] = { 0xdd, 0xdd };
+static const uint8_t dev_uuid[16] = { 0xdd, 0xdd };
 
 static const struct bt_mesh_prov prov = {
 	.uuid = dev_uuid,
@@ -228,7 +228,7 @@ static void bt_ready(int err)
 #endif
 }
 
-static u16_t target = GROUP_ADDR;
+static uint16_t target = GROUP_ADDR;
 
 void board_button_1_pressed(void)
 {
@@ -249,7 +249,7 @@ void board_button_1_pressed(void)
 	printk("Button message sent with OpCode 0x%08x\n", OP_VENDOR_BUTTON);
 }
 
-u16_t board_set_target(void)
+uint16_t board_set_target(void)
 {
 	switch (target) {
 	case GROUP_ADDR:
diff --git a/samples/bluetooth/mesh_demo/src/microbit.c b/samples/bluetooth/mesh_demo/src/microbit.c
index a9f6641d9a..2f7210afd4 100644
--- a/samples/bluetooth/mesh_demo/src/microbit.c
+++ b/samples/bluetooth/mesh_demo/src/microbit.c
@@ -42,14 +42,14 @@ static void button_send_pressed(struct k_work *work)
 }
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	struct mb_display *disp = mb_display_get();
 
 	if (pins & BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios))) {
 		k_work_submit(&button_work);
 	} else {
-		u16_t target = board_set_target();
+		uint16_t target = board_set_target();
 
 		if (target > 0x0009) {
 			mb_display_print(disp, MB_DISPLAY_MODE_SINGLE,
@@ -63,8 +63,8 @@ static void button_pressed(struct device *dev, struct gpio_callback *cb,
 
 static const struct {
 	char  note;
-	u32_t period;
-	u32_t sharp;
+	uint32_t period;
+	uint32_t sharp;
 } period_map[] = {
 	{ 'C',  3822,  3608 },
 	{ 'D',  3405,  3214 },
@@ -75,7 +75,7 @@ static const struct {
 	{ 'B',  2025,  2025 },
 };
 
-static u32_t get_period(char note, bool sharp)
+static uint32_t get_period(char note, bool sharp)
 {
 	int i;
 
@@ -101,7 +101,7 @@ static u32_t get_period(char note, bool sharp)
 void board_play_tune(const char *str)
 {
 	while (*str) {
-		u32_t period, duration = 0U;
+		uint32_t period, duration = 0U;
 
 		while (*str && !isdigit((unsigned char)*str)) {
 			str++;
@@ -137,7 +137,7 @@ void board_play_tune(const char *str)
 	}
 }
 
-void board_heartbeat(u8_t hops, u16_t feat)
+void board_heartbeat(uint8_t hops, uint16_t feat)
 {
 	struct mb_display *disp = mb_display_get();
 	const struct mb_image hops_img[] = {
@@ -177,7 +177,7 @@ void board_heartbeat(u8_t hops, u16_t feat)
 	}
 }
 
-void board_other_dev_pressed(u16_t addr)
+void board_other_dev_pressed(uint16_t addr)
 {
 	struct mb_display *disp = mb_display_get();
 
@@ -246,7 +246,7 @@ static void configure_button(void)
 	gpio_add_callback(gpio, &button_cb);
 }
 
-void board_init(u16_t *addr)
+void board_init(uint16_t *addr)
 {
 	struct mb_display *disp = mb_display_get();
 
diff --git a/samples/bluetooth/mesh_provisioner/src/main.c b/samples/bluetooth/mesh_provisioner/src/main.c
index b3ecf70d13..0c21eb3539 100644
--- a/samples/bluetooth/mesh_provisioner/src/main.c
+++ b/samples/bluetooth/mesh_provisioner/src/main.c
@@ -11,11 +11,11 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/mesh.h>
 
-static const u16_t net_idx;
-static const u16_t app_idx;
-static u16_t self_addr = 1, node_addr;
-static const u8_t dev_uuid[16] = { 0xdd, 0xdd };
-static u8_t node_uuid[16];
+static const uint16_t net_idx;
+static const uint16_t app_idx;
+static uint16_t self_addr = 1, node_addr;
+static const uint8_t dev_uuid[16] = { 0xdd, 0xdd };
+static uint8_t node_uuid[16];
 
 K_SEM_DEFINE(sem_unprov_beacon, 0, 1);
 K_SEM_DEFINE(sem_node_added, 0, 1);
@@ -34,8 +34,8 @@ static struct bt_mesh_cfg_srv cfg_srv = {
 static struct bt_mesh_cfg_cli cfg_cli = {
 };
 
-static void health_current_status(struct bt_mesh_health_cli *cli, u16_t addr,
-				  u8_t test_id, u16_t cid, u8_t *faults,
+static void health_current_status(struct bt_mesh_health_cli *cli, uint16_t addr,
+				  uint8_t test_id, uint16_t cid, uint8_t *faults,
 				  size_t fault_count)
 {
 	size_t i;
@@ -135,7 +135,7 @@ static void configure_node(struct bt_mesh_cdb_node *node)
 {
 	struct bt_mesh_cdb_app_key *key;
 	struct bt_mesh_cfg_mod_pub pub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	printk("Configuring node 0x%04x...\n", node->addr);
@@ -186,15 +186,15 @@ static void configure_node(struct bt_mesh_cdb_node *node)
 	printk("Configuration complete\n");
 }
 
-static void unprovisioned_beacon(u8_t uuid[16],
+static void unprovisioned_beacon(uint8_t uuid[16],
 				 bt_mesh_prov_oob_info_t oob_info,
-				 u32_t *uri_hash)
+				 uint32_t *uri_hash)
 {
 	memcpy(node_uuid, uuid, 16);
 	k_sem_give(&sem_unprov_beacon);
 }
 
-static void node_added(u16_t net_idx, u8_t uuid[16], u16_t addr, u8_t num_elem)
+static void node_added(uint16_t net_idx, uint8_t uuid[16], uint16_t addr, uint8_t num_elem)
 {
 	node_addr = addr;
 	k_sem_give(&sem_node_added);
@@ -208,7 +208,7 @@ static const struct bt_mesh_prov prov = {
 
 static int bt_ready(void)
 {
-	u8_t net_key[16], dev_key[16];
+	uint8_t net_key[16], dev_key[16];
 	int err;
 
 	err = bt_mesh_init(&prov, &comp);
@@ -253,7 +253,7 @@ static int bt_ready(void)
 	return 0;
 }
 
-static u8_t check_unconfigured(struct bt_mesh_cdb_node *node, void *data)
+static uint8_t check_unconfigured(struct bt_mesh_cdb_node *node, void *data)
 {
 	if (!atomic_test_bit(node->flags, BT_MESH_CDB_NODE_CONFIGURED)) {
 		if (node->addr == self_addr) {
diff --git a/samples/bluetooth/peripheral/src/cts.c b/samples/bluetooth/peripheral/src/cts.c
index 3bb76df9bc..9e55ab037e 100644
--- a/samples/bluetooth/peripheral/src/cts.c
+++ b/samples/bluetooth/peripheral/src/cts.c
@@ -22,16 +22,16 @@
 #include <bluetooth/uuid.h>
 #include <bluetooth/gatt.h>
 
-static u8_t ct[10];
-static u8_t ct_update;
+static uint8_t ct[10];
+static uint8_t ct_update;
 
-static void ct_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void ct_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	/* TODO: Handle value */
 }
 
 static ssize_t read_ct(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-		       void *buf, u16_t len, u16_t offset)
+		       void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -40,10 +40,10 @@ static ssize_t read_ct(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t write_ct(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			const void *buf, u16_t len, u16_t offset,
-			u8_t flags)
+			const void *buf, uint16_t len, uint16_t offset,
+			uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(ct)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -65,9 +65,9 @@ BT_GATT_SERVICE_DEFINE(cts_cvs,
 	BT_GATT_CCC(ct_ccc_cfg_changed, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
 );
 
-static void generate_current_time(u8_t *buf)
+static void generate_current_time(uint8_t *buf)
 {
-	u16_t year;
+	uint16_t year;
 
 	/* 'Exact Time 256' contains 'Day Date Time' which contains
 	 * 'Date Time' - characteristic contains fields for:
diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c
index f83f1de058..7c18fbead1 100644
--- a/samples/bluetooth/peripheral/src/main.c
+++ b/samples/bluetooth/peripheral/src/main.c
@@ -39,10 +39,10 @@ static struct bt_uuid_128 vnd_auth_uuid = BT_UUID_INIT_128(
 	0xf2, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t vnd_value[] = { 'V', 'e', 'n', 'd', 'o', 'r' };
+static uint8_t vnd_value[] = { 'V', 'e', 'n', 'd', 'o', 'r' };
 
 static ssize_t read_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -51,10 +51,10 @@ static ssize_t read_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t write_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, u16_t len, u16_t offset,
-			 u8_t flags)
+			 const void *buf, uint16_t len, uint16_t offset,
+			 uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(vnd_value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -65,24 +65,24 @@ static ssize_t write_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	return len;
 }
 
-static u8_t simulate_vnd;
-static u8_t indicating;
+static uint8_t simulate_vnd;
+static uint8_t indicating;
 static struct bt_gatt_indicate_params ind_params;
 
-static void vnd_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void vnd_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	simulate_vnd = (value == BT_GATT_CCC_INDICATE) ? 1 : 0;
 }
 
 static void indicate_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			u8_t err)
+			uint8_t err)
 {
 	printk("Indication %s\n", err != 0U ? "fail" : "success");
 	indicating = 0U;
 }
 
 #define MAX_DATA 74
-static u8_t vnd_long_value[] = {
+static uint8_t vnd_long_value[] = {
 		  'V', 'e', 'n', 'd', 'o', 'r', ' ', 'd', 'a', 't', 'a', '1',
 		  'V', 'e', 'n', 'd', 'o', 'r', ' ', 'd', 'a', 't', 'a', '2',
 		  'V', 'e', 'n', 'd', 'o', 'r', ' ', 'd', 'a', 't', 'a', '3',
@@ -93,7 +93,7 @@ static u8_t vnd_long_value[] = {
 
 static ssize_t read_long_vnd(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -103,9 +103,9 @@ static ssize_t read_long_vnd(struct bt_conn *conn,
 
 static ssize_t write_long_vnd(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (flags & BT_GATT_WRITE_FLAG_PREPARE) {
 		return 0;
@@ -131,7 +131,7 @@ static struct bt_gatt_cep vnd_long_cep = {
 static int signed_value;
 
 static ssize_t read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			   void *buf, u16_t len, u16_t offset)
+			   void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -140,10 +140,10 @@ static ssize_t read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr
 }
 
 static ssize_t write_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			    const void *buf, u16_t len, u16_t offset,
-			    u8_t flags)
+			    const void *buf, uint16_t len, uint16_t offset,
+			    uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(signed_value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -164,10 +164,10 @@ static const struct bt_uuid_128 vnd_write_cmd_uuid = BT_UUID_INIT_128(
 
 static ssize_t write_without_rsp_vnd(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	/* Write request received. Reject it since this char only accepts
 	 * Write Commands.
@@ -226,7 +226,7 @@ static const struct bt_data ad[] = {
 		      0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12),
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -235,7 +235,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 }
@@ -292,7 +292,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
@@ -305,7 +305,7 @@ static void bas_notify(void)
 
 static void hrs_notify(void)
 {
-	static u8_t heartrate = 90U;
+	static uint8_t heartrate = 90U;
 
 	/* Heartrate measurements simulation */
 	heartrate++;
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index 4431457aee..8b2448b70a 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -76,29 +76,29 @@
 
 /* Cycling Speed and Cadence Service declaration */
 
-static u32_t cwr; /* Cumulative Wheel Revolutions */
-static u8_t supported_locations[] = CSC_SUPPORTED_LOCATIONS;
-static u8_t sensor_location; /* Current Sensor Location */
+static uint32_t cwr; /* Cumulative Wheel Revolutions */
+static uint8_t supported_locations[] = CSC_SUPPORTED_LOCATIONS;
+static uint8_t sensor_location; /* Current Sensor Location */
 static bool csc_simulate;
 static bool ctrl_point_configured;
 
 static void csc_meas_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				     u16_t value)
+				     uint16_t value)
 {
 	csc_simulate = value == BT_GATT_CCC_NOTIFY;
 }
 
 static void ctrl_point_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				       u16_t value)
+				       uint16_t value)
 {
 	ctrl_point_configured = value == BT_GATT_CCC_INDICATE;
 }
 
 static ssize_t read_location(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(*value));
@@ -106,32 +106,32 @@ static ssize_t read_location(struct bt_conn *conn,
 
 static ssize_t read_csc_feature(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr, void *buf,
-				u16_t len, u16_t offset)
+				uint16_t len, uint16_t offset)
 {
-	u16_t csc_feature = CSC_FEATURE;
+	uint16_t csc_feature = CSC_FEATURE;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset,
 				 &csc_feature, sizeof(csc_feature));
 }
 
-static void ctrl_point_ind(struct bt_conn *conn, u8_t req_op, u8_t status,
-			   const void *data, u16_t data_len);
+static void ctrl_point_ind(struct bt_conn *conn, uint8_t req_op, uint8_t status,
+			   const void *data, uint16_t data_len);
 
 struct write_sc_ctrl_point_req {
-	u8_t op;
+	uint8_t op;
 	union {
-		u32_t cwr;
-		u8_t location;
+		uint32_t cwr;
+		uint8_t location;
 	};
 } __packed;
 
 static ssize_t write_ctrl_point(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	const struct write_sc_ctrl_point_req *req = buf;
-	u8_t status;
+	uint8_t status;
 	int i;
 
 	if (!ctrl_point_configured) {
@@ -218,17 +218,17 @@ BT_GATT_SERVICE_DEFINE(csc_svc,
 );
 
 struct sc_ctrl_point_ind {
-	u8_t op;
-	u8_t req_op;
-	u8_t status;
-	u8_t data[];
+	uint8_t op;
+	uint8_t req_op;
+	uint8_t status;
+	uint8_t data[];
 } __packed;
 
-static void ctrl_point_ind(struct bt_conn *conn, u8_t req_op, u8_t status,
-			   const void *data, u16_t data_len)
+static void ctrl_point_ind(struct bt_conn *conn, uint8_t req_op, uint8_t status,
+			   const void *data, uint16_t data_len)
 {
 	struct sc_ctrl_point_ind *ind;
-	u8_t buf[sizeof(*ind) + data_len];
+	uint8_t buf[sizeof(*ind) + data_len];
 
 	ind = (void *) buf;
 	ind->op = SC_CP_OP_RESPONSE;
@@ -244,28 +244,28 @@ static void ctrl_point_ind(struct bt_conn *conn, u8_t req_op, u8_t status,
 }
 
 struct csc_measurement_nfy {
-	u8_t flags;
-	u8_t data[];
+	uint8_t flags;
+	uint8_t data[];
 } __packed;
 
 struct wheel_rev_data_nfy {
-	u32_t cwr;
-	u16_t lwet;
+	uint32_t cwr;
+	uint16_t lwet;
 } __packed;
 
 struct crank_rev_data_nfy {
-	u16_t ccr;
-	u16_t lcet;
+	uint16_t ccr;
+	uint16_t lcet;
 } __packed;
 
-static void measurement_nfy(struct bt_conn *conn, u32_t cwr, u16_t lwet,
-			    u16_t ccr, u16_t lcet)
+static void measurement_nfy(struct bt_conn *conn, uint32_t cwr, uint16_t lwet,
+			    uint16_t ccr, uint16_t lcet)
 {
 	struct csc_measurement_nfy *nfy;
-	u8_t buf[sizeof(*nfy) +
+	uint8_t buf[sizeof(*nfy) +
 		    (cwr ? sizeof(struct wheel_rev_data_nfy) : 0) +
 		    (ccr ? sizeof(struct crank_rev_data_nfy) : 0)];
-	u16_t len = 0U;
+	uint16_t len = 0U;
 
 	nfy = (void *) buf;
 	nfy->flags = 0U;
@@ -296,14 +296,14 @@ static void measurement_nfy(struct bt_conn *conn, u32_t cwr, u16_t lwet,
 	bt_gatt_notify(NULL, &csc_svc.attrs[1], buf, sizeof(buf));
 }
 
-static u16_t lwet; /* Last Wheel Event Time */
-static u16_t ccr;  /* Cumulative Crank Revolutions */
-static u16_t lcet; /* Last Crank Event Time */
+static uint16_t lwet; /* Last Wheel Event Time */
+static uint16_t ccr;  /* Cumulative Crank Revolutions */
+static uint16_t lcet; /* Last Crank Event Time */
 
 static void csc_simulation(void)
 {
-	static u8_t i;
-	u32_t rand = sys_rand32_get();
+	static uint8_t i;
+	uint32_t rand = sys_rand32_get();
 	bool nfy_crank = false, nfy_wheel = false;
 
 	/* Measurements don't have to be updated every second */
@@ -341,7 +341,7 @@ static void csc_simulation(void)
 	i++;
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -350,7 +350,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 }
@@ -382,7 +382,7 @@ static void bt_ready(void)
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c
index ecfb420753..7bee14ace6 100644
--- a/samples/bluetooth/peripheral_dis/src/main.c
+++ b/samples/bluetooth/peripheral_dis/src/main.c
@@ -26,7 +26,7 @@ static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL, 0x0a, 0x18),
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -35,7 +35,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 }
diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c
index 2aaccbf77e..0036b948e3 100644
--- a/samples/bluetooth/peripheral_esp/src/main.c
+++ b/samples/bluetooth/peripheral_esp/src/main.c
@@ -48,10 +48,10 @@
 #define ESS_NOT_EQUAL_TO_REF_VALUE		0x09
 
 static ssize_t read_u16(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
-	const u16_t *u16 = attr->user_data;
-	u16_t value = sys_cpu_to_le16(*u16);
+	const uint16_t *u16 = attr->user_data;
+	uint16_t value = sys_cpu_to_le16(*u16);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &value,
 				 sizeof(value));
@@ -60,33 +60,33 @@ static ssize_t read_u16(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 /* Environmental Sensing Service Declaration */
 
 struct es_measurement {
-	u16_t flags; /* Reserved for Future Use */
-	u8_t sampling_func;
-	u32_t meas_period;
-	u32_t update_interval;
-	u8_t application;
-	u8_t meas_uncertainty;
+	uint16_t flags; /* Reserved for Future Use */
+	uint8_t sampling_func;
+	uint32_t meas_period;
+	uint32_t update_interval;
+	uint8_t application;
+	uint8_t meas_uncertainty;
 };
 
 struct temperature_sensor {
-	s16_t temp_value;
+	int16_t temp_value;
 
 	/* Valid Range */
-	s16_t lower_limit;
-	s16_t upper_limit;
+	int16_t lower_limit;
+	int16_t upper_limit;
 
 	/* ES trigger setting - Value Notification condition */
-	u8_t condition;
+	uint8_t condition;
 	union {
-		u32_t seconds;
-		s16_t ref_val; /* Reference temperature */
+		uint32_t seconds;
+		int16_t ref_val; /* Reference temperature */
 	};
 
 	struct es_measurement meas;
 };
 
 struct humidity_sensor {
-	s16_t humid_value;
+	int16_t humid_value;
 
 	struct es_measurement meas;
 };
@@ -126,23 +126,23 @@ static struct humidity_sensor sensor_3 = {
 };
 
 static void temp_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				 u16_t value)
+				 uint16_t value)
 {
 	simulate_temp = value == BT_GATT_CCC_NOTIFY;
 }
 
 struct read_es_measurement_rp {
-	u16_t flags; /* Reserved for Future Use */
-	u8_t sampling_function;
-	u8_t measurement_period[3];
-	u8_t update_interval[3];
-	u8_t application;
-	u8_t measurement_uncertainty;
+	uint16_t flags; /* Reserved for Future Use */
+	uint8_t sampling_function;
+	uint8_t measurement_period[3];
+	uint8_t update_interval[3];
+	uint8_t application;
+	uint8_t measurement_uncertainty;
 } __packed;
 
 static ssize_t read_es_measurement(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr, void *buf,
-				   u16_t len, u16_t offset)
+				   uint16_t len, uint16_t offset)
 {
 	const struct es_measurement *value = attr->user_data;
 	struct read_es_measurement_rp rsp;
@@ -160,10 +160,10 @@ static ssize_t read_es_measurement(struct bt_conn *conn,
 
 static ssize_t read_temp_valid_range(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr, void *buf,
-				     u16_t len, u16_t offset)
+				     uint16_t len, uint16_t offset)
 {
 	const struct temperature_sensor *sensor = attr->user_data;
-	u16_t tmp[] = {sys_cpu_to_le16(sensor->lower_limit),
+	uint16_t tmp[] = {sys_cpu_to_le16(sensor->lower_limit),
 			  sys_cpu_to_le16(sensor->upper_limit)};
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, tmp,
@@ -171,19 +171,19 @@ static ssize_t read_temp_valid_range(struct bt_conn *conn,
 }
 
 struct es_trigger_setting_seconds {
-	u8_t condition;
-	u8_t sec[3];
+	uint8_t condition;
+	uint8_t sec[3];
 } __packed;
 
 struct es_trigger_setting_reference {
-	u8_t condition;
-	s16_t ref_val;
+	uint8_t condition;
+	int16_t ref_val;
 } __packed;
 
 static ssize_t read_temp_trigger_setting(struct bt_conn *conn,
 					 const struct bt_gatt_attr *attr,
-					 void *buf, u16_t len,
-					 u16_t offset)
+					 void *buf, uint16_t len,
+					 uint16_t offset)
 {
 	const struct temperature_sensor *sensor = attr->user_data;
 
@@ -220,8 +220,8 @@ static ssize_t read_temp_trigger_setting(struct bt_conn *conn,
 	}
 }
 
-static bool check_condition(u8_t condition, s16_t old_val, s16_t new_val,
-			    s16_t ref_val)
+static bool check_condition(uint8_t condition, int16_t old_val, int16_t new_val,
+			    int16_t ref_val)
 {
 	switch (condition) {
 	case ESS_TRIGGER_INACTIVE:
@@ -250,7 +250,7 @@ static bool check_condition(u8_t condition, s16_t old_val, s16_t new_val,
 }
 
 static void update_temperature(struct bt_conn *conn,
-			       const struct bt_gatt_attr *chrc, s16_t value,
+			       const struct bt_gatt_attr *chrc, int16_t value,
 			       struct temperature_sensor *sensor)
 {
 	bool notify = check_condition(sensor->condition,
@@ -314,8 +314,8 @@ BT_GATT_SERVICE_DEFINE(ess_svc,
 
 static void ess_simulate(void)
 {
-	static u8_t i;
-	u16_t val;
+	static uint8_t i;
+	uint16_t val;
 
 	if (!(i % SENSOR_1_UPDATE_IVAL)) {
 		val = 1200 + i;
@@ -345,7 +345,7 @@ static const struct bt_data ad[] = {
 	/* TODO: Include Service Data AD */
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -354,7 +354,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 }
@@ -405,7 +405,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
diff --git a/samples/bluetooth/peripheral_hids/src/hog.c b/samples/bluetooth/peripheral_hids/src/hog.c
index cc8e21ab0b..2b1a39e305 100644
--- a/samples/bluetooth/peripheral_hids/src/hog.c
+++ b/samples/bluetooth/peripheral_hids/src/hog.c
@@ -28,14 +28,14 @@ enum {
 };
 
 struct hids_info {
-	u16_t version; /* version number of base USB HID Specification */
-	u8_t code; /* country HID Device hardware is localized for. */
-	u8_t flags;
+	uint16_t version; /* version number of base USB HID Specification */
+	uint8_t code; /* country HID Device hardware is localized for. */
+	uint8_t flags;
 } __packed;
 
 struct hids_report {
-	u8_t id; /* report id */
-	u8_t type; /* report type */
+	uint8_t id; /* report id */
+	uint8_t type; /* report type */
 } __packed;
 
 static struct hids_info info = {
@@ -55,9 +55,9 @@ static struct hids_report input = {
 	.type = HIDS_INPUT,
 };
 
-static u8_t simulate_input;
-static u8_t ctrl_point;
-static u8_t report_map[] = {
+static uint8_t simulate_input;
+static uint8_t ctrl_point;
+static uint8_t report_map[] = {
 	0x05, 0x01, /* Usage Page (Generic Desktop Ctrls) */
 	0x09, 0x02, /* Usage (Mouse) */
 	0xA1, 0x01, /* Collection (Application) */
@@ -89,7 +89,7 @@ static u8_t report_map[] = {
 
 static ssize_t read_info(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr, void *buf,
-			  u16_t len, u16_t offset)
+			  uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, attr->user_data,
 				 sizeof(struct hids_info));
@@ -97,7 +97,7 @@ static ssize_t read_info(struct bt_conn *conn,
 
 static ssize_t read_report_map(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, report_map,
 				 sizeof(report_map));
@@ -105,30 +105,30 @@ static ssize_t read_report_map(struct bt_conn *conn,
 
 static ssize_t read_report(struct bt_conn *conn,
 			   const struct bt_gatt_attr *attr, void *buf,
-			   u16_t len, u16_t offset)
+			   uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, attr->user_data,
 				 sizeof(struct hids_report));
 }
 
-static void input_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void input_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	simulate_input = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
 
 static ssize_t read_input_report(struct bt_conn *conn,
 				 const struct bt_gatt_attr *attr, void *buf,
-				 u16_t len, u16_t offset)
+				 uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, NULL, 0);
 }
 
 static ssize_t write_ctrl_point(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(ctrl_point)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/samples/bluetooth/peripheral_hids/src/main.c b/samples/bluetooth/peripheral_hids/src/main.c
index cd5f22b640..a2a40097d3 100644
--- a/samples/bluetooth/peripheral_hids/src/main.c
+++ b/samples/bluetooth/peripheral_hids/src/main.c
@@ -31,7 +31,7 @@ static const struct bt_data ad[] = {
 		      0x0f, 0x18), /* Battery Service */
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
@@ -49,7 +49,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index 87faef23ca..44fc6ef77b 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -29,7 +29,7 @@ static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL, 0x0d, 0x18, 0x0f, 0x18, 0x0a, 0x18),
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -39,7 +39,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
@@ -84,7 +84,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
@@ -97,7 +97,7 @@ static void bas_notify(void)
 
 static void hrs_notify(void)
 {
-	static u8_t heartrate = 90U;
+	static uint8_t heartrate = 90U;
 
 	/* Heartrate measurements simulation */
 	heartrate++;
diff --git a/samples/bluetooth/peripheral_ht/src/hts.c b/samples/bluetooth/peripheral_ht/src/hts.c
index 79dca8be9c..2c7afafd87 100644
--- a/samples/bluetooth/peripheral_ht/src/hts.c
+++ b/samples/bluetooth/peripheral_ht/src/hts.c
@@ -27,18 +27,18 @@
 
 static struct device *temp_dev;
 
-static u8_t simulate_htm;
-static u8_t indicating;
+static uint8_t simulate_htm;
+static uint8_t indicating;
 static struct bt_gatt_indicate_params ind_params;
 
 static void htmc_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				 u16_t value)
+				 uint16_t value)
 {
 	simulate_htm = (value == BT_GATT_CCC_INDICATE) ? 1 : 0;
 }
 
 static void indicate_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			u8_t err)
+			uint8_t err)
 {
 	printk("Indication %s\n", err != 0U ? "fail" : "success");
 	indicating = 0U;
@@ -73,10 +73,10 @@ void hts_indicate(void)
 	struct sensor_value temp_value;
 
 	if (simulate_htm) {
-		static u8_t htm[5];
+		static uint8_t htm[5];
 		static double temperature = 20U;
-		u32_t mantissa;
-		u8_t exponent;
+		uint32_t mantissa;
+		uint8_t exponent;
 		int r;
 
 		if (indicating) {
@@ -108,11 +108,11 @@ void hts_indicate(void)
 gatt_indicate:
 		printf("temperature is %gC\n", temperature);
 
-		mantissa = (u32_t)(temperature * 100);
-		exponent = (u8_t)-2;
+		mantissa = (uint32_t)(temperature * 100);
+		exponent = (uint8_t)-2;
 
 		htm[0] = 0; /* temperature in celcius */
-		sys_put_le24(mantissa, (u8_t *)&htm[1]);
+		sys_put_le24(mantissa, (uint8_t *)&htm[1]);
 		htm[4] = exponent;
 
 		ind_params.attr = &hts_svc.attrs[2];
diff --git a/samples/bluetooth/peripheral_ht/src/main.c b/samples/bluetooth/peripheral_ht/src/main.c
index 2d388f5e7e..2d0dd41fb3 100644
--- a/samples/bluetooth/peripheral_ht/src/main.c
+++ b/samples/bluetooth/peripheral_ht/src/main.c
@@ -33,7 +33,7 @@ static const struct bt_data ad[] = {
 		      0x0f, 0x18), /* Battery Service */
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
@@ -43,7 +43,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
@@ -90,7 +90,7 @@ static struct bt_conn_auth_cb auth_cb_display = {
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
diff --git a/samples/bluetooth/peripheral_sc_only/src/main.c b/samples/bluetooth/peripheral_sc_only/src/main.c
index 00fd0a8829..99b76ad212 100644
--- a/samples/bluetooth/peripheral_sc_only/src/main.c
+++ b/samples/bluetooth/peripheral_sc_only/src/main.c
@@ -24,7 +24,7 @@ static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
@@ -42,7 +42,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
diff --git a/samples/bluetooth/scan_adv/src/main.c b/samples/bluetooth/scan_adv/src/main.c
index 3dd80c0dfa..277f2496e7 100644
--- a/samples/bluetooth/scan_adv/src/main.c
+++ b/samples/bluetooth/scan_adv/src/main.c
@@ -14,13 +14,13 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
-static u8_t mfg_data[] = { 0xff, 0xff, 0x00 };
+static uint8_t mfg_data[] = { 0xff, 0xff, 0x00 };
 
 static const struct bt_data ad[] = {
 	BT_DATA(BT_DATA_MANUFACTURER_DATA, mfg_data, 3),
 };
 
-static void scan_cb(const bt_addr_le_t *addr, s8_t rssi, u8_t adv_type,
+static void scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_type,
 		    struct net_buf_simple *buf)
 {
 	mfg_data[2]++;
diff --git a/samples/bluetooth/st_ble_sensor/src/button_svc.c b/samples/bluetooth/st_ble_sensor/src/button_svc.c
index 7cd3f3ced7..a69469439e 100644
--- a/samples/bluetooth/st_ble_sensor/src/button_svc.c
+++ b/samples/bluetooth/st_ble_sensor/src/button_svc.c
@@ -36,10 +36,10 @@ extern volatile bool notify_enable;
 
 static struct device *button_dev;
 static struct gpio_callback gpio_cb;
-u16_t but_val;
+uint16_t but_val;
 
 void button_pressed(struct device *gpiob, struct gpio_callback *cb,
-		    u32_t pins)
+		    uint32_t pins)
 {
 	int err;
 
diff --git a/samples/bluetooth/st_ble_sensor/src/main.c b/samples/bluetooth/st_ble_sensor/src/main.c
index 3d635b7d8e..f6b3827505 100644
--- a/samples/bluetooth/st_ble_sensor/src/main.c
+++ b/samples/bluetooth/st_ble_sensor/src/main.c
@@ -27,14 +27,14 @@
 
 LOG_MODULE_REGISTER(main);
 
-extern u16_t but_val;
+extern uint16_t but_val;
 extern struct device *led_dev;
 extern bool led_state;
 
 /* Prototype */
 static ssize_t recv(struct bt_conn *conn,
 		    const struct bt_gatt_attr *attr, const void *buf,
-		    u16_t len, u16_t offset, u8_t flags);
+		    uint16_t len, uint16_t offset, uint8_t flags);
 
 /* ST Custom Service  */
 static struct bt_uuid_128 st_service_uuid = BT_UUID_INIT_128(
@@ -56,7 +56,7 @@ static struct bt_uuid_128 but_notif_uuid = BT_UUID_INIT_128(
 #define ADV_LEN 12
 
 /* Advertising data */
-static u8_t manuf_data[ADV_LEN] = {
+static uint8_t manuf_data[ADV_LEN] = {
 	0x01 /*SKD version */,
 	0x83 /* STM32WB - P2P Server 1 */,
 	0x00 /* GROUP A Feature  */,
@@ -82,7 +82,7 @@ struct bt_conn *conn;
 /* Notification state */
 volatile bool notify_enable;
 
-static void mpu_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void mpu_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	ARG_UNUSED(attr);
 	notify_enable = (value == BT_GATT_CCC_NOTIFY);
@@ -107,7 +107,7 @@ BT_GATT_CCC(mpu_ccc_cfg_changed, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
 
 static ssize_t recv(struct bt_conn *conn,
 		    const struct bt_gatt_attr *attr, const void *buf,
-		    u16_t len, u16_t offset, u8_t flags)
+		    uint16_t len, uint16_t offset, uint8_t flags)
 {
 	if (led_dev) {
 		if (led_state) {
@@ -139,7 +139,7 @@ static void bt_ready(int err)
 	LOG_INF("Configuration mode: waiting connections...");
 }
 
-static void connected(struct bt_conn *connected, u8_t err)
+static void connected(struct bt_conn *connected, uint8_t err)
 {
 	if (err) {
 		LOG_ERR("Connection failed (err %u)", err);
@@ -151,7 +151,7 @@ static void connected(struct bt_conn *connected, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *disconn, u8_t reason)
+static void disconnected(struct bt_conn *disconn, uint8_t reason)
 {
 	if (conn) {
 		bt_conn_unref(conn);
diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c
index b7fa2ec3c9..a696b84cf5 100644
--- a/samples/boards/96b_argonkey/microphone/src/main.c
+++ b/samples/boards/96b_argonkey/microphone/src/main.c
@@ -18,7 +18,7 @@
 
 #define AUDIO_FREQ		16000
 #define CHAN_SIZE		16
-#define PCM_BLK_SIZE_MS		((AUDIO_FREQ/1000) * sizeof(s16_t))
+#define PCM_BLK_SIZE_MS		((AUDIO_FREQ/1000) * sizeof(int16_t))
 
 #define NUM_MS		5000
 
@@ -97,7 +97,7 @@ size_t rx_size = PCM_BLK_SIZE_MS;
 void main(void)
 {
 	int i;
-	u32_t ms;
+	uint32_t ms;
 
 #ifdef CONFIG_LP3943
 	static struct device *ledc;
@@ -172,7 +172,7 @@ void main(void)
 	int j;
 
 	for (i = 0; i < NUM_MS; i++) {
-		u16_t *pcm_out = rx_block[i];
+		uint16_t *pcm_out = rx_block[i];
 
 		for (j = 0; j < rx_size/2; j++) {
 			printk("0x%04x,\n", pcm_out[j]);
@@ -184,7 +184,7 @@ void main(void)
 	int j;
 
 	for (i = 0; i < NUM_MS; i++) {
-		u16_t *pcm_out = rx_block[i];
+		uint16_t *pcm_out = rx_block[i];
 
 		for (j = 0; j < rx_size/2; j++) {
 			pcm_l = (char)(pcm_out[j] & 0xFF);
diff --git a/samples/boards/arc_secure_services/src/main.c b/samples/boards/arc_secure_services/src/main.c
index 3149512f4d..d5289d7620 100644
--- a/samples/boards/arc_secure_services/src/main.c
+++ b/samples/boards/arc_secure_services/src/main.c
@@ -29,7 +29,7 @@ void threadA(void *dummy1, void *dummy2, void *dummy3)
 
 	printk("Go to normal application\n");
 
-	arc_go_to_normal(*((u32_t *)(NORMAL_FIRMWARE_ENTRY)));
+	arc_go_to_normal(*((uint32_t *)(NORMAL_FIRMWARE_ENTRY)));
 
 	printk("should not come here\n");
 
@@ -42,7 +42,7 @@ K_THREAD_DEFINE(thread_a, STACKSIZE, threadA, NULL, NULL, NULL,
 void main(void)
 {
 	/* necessary configuration before go to normal */
-	s32_t i = 0;
+	int32_t i = 0;
 
 	/* allocate timer 0 and timer1 to normal mode */
 	z_arc_v2_irq_uinit_secure_set(IRQ_TIMER0, 0);
diff --git a/samples/boards/bbc_microbit/line_follower_robot/src/main.c b/samples/boards/bbc_microbit/line_follower_robot/src/main.c
index 50a62219d9..3108b9da53 100644
--- a/samples/boards/bbc_microbit/line_follower_robot/src/main.c
+++ b/samples/boards/bbc_microbit/line_follower_robot/src/main.c
@@ -24,7 +24,7 @@ unsigned char speed_hex[1];
 
 /* Setup gpio of the microbit board */
 static void line_detection(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	left_line[0] = gpio_pin_get_raw(gpio, EXT_P13_GPIO_PIN);
 	right_line[0] = gpio_pin_get_raw(gpio, EXT_P14_GPIO_PIN);
diff --git a/samples/boards/bbc_microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c
index 489dfd7578..bdc1effbe6 100644
--- a/samples/boards/bbc_microbit/pong/src/ble.c
+++ b/samples/boards/bbc_microbit/pong/src/ble.c
@@ -45,7 +45,7 @@ static const struct bt_data ad[] = {
 static struct bt_conn *default_conn;
 
 static const struct bt_gatt_attr *local_attr;
-static u16_t remote_handle;
+static uint16_t remote_handle;
 static bool remote_ready;
 static bool initiator;
 
@@ -70,14 +70,14 @@ enum {
 };
 
 struct ble_ball_info {
-	s8_t x_pos;
-	s8_t y_pos;
-	s8_t x_vel;
-	s8_t y_vel;
+	int8_t x_pos;
+	int8_t y_pos;
+	int8_t x_vel;
+	int8_t y_vel;
 } __packed;
 
 struct ble_data {
-	u8_t op;
+	uint8_t op;
 	union {
 		struct ble_ball_info ball;
 	};
@@ -85,7 +85,7 @@ struct ble_data {
 
 #define BALL_INFO_LEN (1 + sizeof(struct ble_ball_info))
 
-void ble_send_ball(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel)
+void ble_send_ball(int8_t x_pos, int8_t y_pos, int8_t x_vel, int8_t y_vel)
 {
 	struct ble_data data = {
 		.op           = BLE_BALL_INFO,
@@ -111,7 +111,7 @@ void ble_send_ball(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel)
 
 void ble_send_lost(void)
 {
-	u8_t lost = BLE_LOST;
+	uint8_t lost = BLE_LOST;
 	int err;
 
 	if (!default_conn || !remote_ready) {
@@ -125,9 +125,9 @@ void ble_send_lost(void)
 	}
 }
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			struct bt_gatt_subscribe_params *param,
-			const void *buf, u16_t len)
+			const void *buf, uint16_t len)
 {
 	const struct ble_data *data = buf;
 
@@ -163,7 +163,7 @@ static u8_t notify_func(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr,
 			  struct bt_gatt_discover_params *param)
 {
@@ -226,7 +226,7 @@ static u8_t discover_func(struct bt_conn *conn,
 	return BT_GATT_ITER_STOP;
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	struct bt_conn_info info;
 
@@ -254,7 +254,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	k_delayed_work_submit(&ble_work, K_NO_WAIT);
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
@@ -322,7 +322,7 @@ void ble_cancel_connect(void)
 	}
 }
 
-static bool pong_uuid_match(const u8_t *data, u8_t len)
+static bool pong_uuid_match(const uint8_t *data, uint8_t len)
 {
 	while (len >= 16U) {
 		if (!memcmp(data, pong_svc_uuid.val, 16)) {
@@ -357,7 +357,7 @@ static void create_conn(const bt_addr_le_t *addr)
 	k_delayed_work_submit(&ble_work, SCAN_TIMEOUT);
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
 	if (type != BT_GAP_ADV_TYPE_ADV_IND) {
@@ -365,8 +365,8 @@ static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
 	}
 
 	while (ad->len > 1) {
-		u8_t len = net_buf_simple_pull_u8(ad);
-		u8_t type;
+		uint8_t len = net_buf_simple_pull_u8(ad);
+		uint8_t type;
 
 		/* Check for early termination */
 		if (len == 0U) {
@@ -390,9 +390,9 @@ static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
 	}
 }
 
-static u32_t adv_timeout(void)
+static uint32_t adv_timeout(void)
 {
-	u32_t timeout;
+	uint32_t timeout;
 
 	if (bt_rand(&timeout, sizeof(timeout)) < 0) {
 		return 10 * MSEC_PER_SEC;
@@ -500,7 +500,7 @@ static void ble_timeout(struct k_work *work)
 	}
 }
 
-static void pong_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t val)
+static void pong_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t val)
 {
 	printk("val %u\n", val);
 
diff --git a/samples/boards/bbc_microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c
index 75ac364e05..6278f879c4 100644
--- a/samples/boards/bbc_microbit/pong/src/main.c
+++ b/samples/boards/bbc_microbit/pong/src/main.c
@@ -88,7 +88,7 @@ static const struct pong_choice mode_choice[] = {
 
 static bool remote_lost;
 static bool started;
-static s64_t ended;
+static int64_t ended;
 
 static struct k_delayed_work refresh;
 
@@ -104,8 +104,8 @@ static struct x_y ball_pos = BALL_START;
 /* Ball velocity */
 static struct x_y ball_vel = { 0, 0 };
 
-static s64_t a_timestamp;
-static s64_t b_timestamp;
+static int64_t a_timestamp;
+static int64_t b_timestamp;
 
 #define SOUND_PIN            EXT_P0_GPIO_PIN
 #define SOUND_PERIOD_PADDLE  200
@@ -230,8 +230,8 @@ static bool ball_visible(void)
 
 static void check_start(void)
 {
-	u32_t delta;
-	u8_t rnd;
+	uint32_t delta;
+	uint8_t rnd;
 
 	if (!a_timestamp || !b_timestamp) {
 		return;
@@ -380,7 +380,7 @@ static void game_refresh(struct k_work *work)
 	k_sem_give(&disp_update);
 }
 
-void pong_ball_received(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel)
+void pong_ball_received(int8_t x_pos, int8_t y_pos, int8_t x_vel, int8_t y_vel)
 {
 	printk("ball_received(%d, %d, %d, %d)\n", x_pos, y_pos, x_vel, y_vel);
 
@@ -393,7 +393,7 @@ void pong_ball_received(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel)
 }
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	/* Filter out spurious presses */
 	if (pins & BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios))) {
diff --git a/samples/boards/bbc_microbit/pong/src/pong.h b/samples/boards/bbc_microbit/pong/src/pong.h
index bbbea5973c..5dd47902f9 100644
--- a/samples/boards/bbc_microbit/pong/src/pong.h
+++ b/samples/boards/bbc_microbit/pong/src/pong.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-void pong_ball_received(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel);
+void pong_ball_received(int8_t x_pos, int8_t y_pos, int8_t x_vel, int8_t y_vel);
 void pong_conn_ready(bool initiator);
 void pong_remote_disconnected(void);
 void pong_remote_lost(void);
 
-void ble_send_ball(s8_t x_pos, s8_t y_pos, s8_t x_vel, s8_t y_vel);
+void ble_send_ball(int8_t x_pos, int8_t y_pos, int8_t x_vel, int8_t y_vel);
 void ble_send_lost(void);
 void ble_connect(void);
 void ble_cancel_connect(void);
diff --git a/samples/boards/bbc_microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c
index 9cb7919230..21c201031c 100644
--- a/samples/boards/bbc_microbit/sound/src/main.c
+++ b/samples/boards/bbc_microbit/sound/src/main.c
@@ -25,7 +25,7 @@
 
 static struct device *pwm;
 static struct device *gpio;
-static u32_t period = PERIOD_INIT;
+static uint32_t period = PERIOD_INIT;
 static struct k_work beep_work;
 static volatile bool beep_active;
 
@@ -46,7 +46,7 @@ static void beep(struct k_work *work)
 }
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	struct mb_display *disp;
 
diff --git a/samples/boards/intel_s1000_crb/audio/src/audio_core.c b/samples/boards/intel_s1000_crb/audio/src/audio_core.c
index 607962fdf5..eae4e3ab6e 100644
--- a/samples/boards/intel_s1000_crb/audio/src/audio_core.c
+++ b/samples/boards/intel_s1000_crb/audio/src/audio_core.c
@@ -20,12 +20,12 @@ LOG_MODULE_REGISTER(audio_core);
 #define AUDIO_ACTIVE_CHANNELS	2
 
 /* core audio processing buffers with interleaved samples */
-static s32_t mic_input[AUDIO_ACTIVE_CHANNELS][AUDIO_SAMPLES_PER_FRAME];
-static s32_t host_input[AUDIO_ACTIVE_CHANNELS][AUDIO_SAMPLES_PER_FRAME];
+static int32_t mic_input[AUDIO_ACTIVE_CHANNELS][AUDIO_SAMPLES_PER_FRAME];
+static int32_t host_input[AUDIO_ACTIVE_CHANNELS][AUDIO_SAMPLES_PER_FRAME];
 
 static bool tuning_reply_ready;
-static u32_t *tuning_command_buffer;
-static u32_t tuning_cmd_buf_size_in_words;
+static uint32_t *tuning_command_buffer;
+static uint32_t tuning_cmd_buf_size_in_words;
 
 #define CMD_START_AUDIO		1
 #define CMD_STOP_AUDIO		2
@@ -35,11 +35,11 @@ int audio_core_initialize(void)
 	return 0;
 }
 
-int audio_core_process_mic_source(s32_t *buffer, int channels)
+int audio_core_process_mic_source(int32_t *buffer, int channels)
 {
 	int sample;
 	int channel;
-	s32_t *read;
+	int32_t *read;
 
 	read = buffer;
 
@@ -54,11 +54,11 @@ int audio_core_process_mic_source(s32_t *buffer, int channels)
 	return 0;
 }
 
-int audio_core_process_host_source(s32_t *buffer, int channels)
+int audio_core_process_host_source(int32_t *buffer, int channels)
 {
 	int sample;
 	int channel;
-	s32_t *read;
+	int32_t *read;
 
 	read = buffer;
 
@@ -73,11 +73,11 @@ int audio_core_process_host_source(s32_t *buffer, int channels)
 	return 0;
 }
 
-int audio_core_process_speaker_sink(s32_t *buffer, int channels)
+int audio_core_process_speaker_sink(int32_t *buffer, int channels)
 {
 	int sample;
 	int channel;
-	s32_t *write;
+	int32_t *write;
 
 	write = buffer;
 
@@ -92,11 +92,11 @@ int audio_core_process_speaker_sink(s32_t *buffer, int channels)
 	return 0;
 }
 
-int audio_core_process_host_sink(s32_t *buffer, int channels)
+int audio_core_process_host_sink(int32_t *buffer, int channels)
 {
 	int sample;
 	int channel;
-	s32_t *write;
+	int32_t *write;
 
 	write = buffer;
 
@@ -116,7 +116,7 @@ int audio_core_notify_frame_tick(void)
 	return 0;
 }
 
-int audio_core_tuning_interface_init(u32_t *command_buffer, u32_t size_in_words)
+int audio_core_tuning_interface_init(uint32_t *command_buffer, uint32_t size_in_words)
 {
 	tuning_command_buffer = command_buffer;
 	tuning_cmd_buf_size_in_words = size_in_words;
@@ -125,8 +125,8 @@ int audio_core_tuning_interface_init(u32_t *command_buffer, u32_t size_in_words)
 
 int audio_core_notify_tuning_cmd(void)
 {
-	u32_t first_word = *((u32_t *)tuning_command_buffer);
-	u32_t command = (first_word << 16) >> 16;
+	uint32_t first_word = *((uint32_t *)tuning_command_buffer);
+	uint32_t command = (first_word << 16) >> 16;
 
 	switch (command) {
 	case CMD_START_AUDIO:
diff --git a/samples/boards/intel_s1000_crb/audio/src/audio_core.h b/samples/boards/intel_s1000_crb/audio/src/audio_core.h
index 4bfd0d0a87..5087e22e7d 100644
--- a/samples/boards/intel_s1000_crb/audio/src/audio_core.h
+++ b/samples/boards/intel_s1000_crb/audio/src/audio_core.h
@@ -39,15 +39,15 @@
 #define AUDIO_SAMPLES_PER_FRAME			192
 
 int audio_core_initialize(void);
-int audio_core_process_mic_source(s32_t *buffer, int channels);
-int audio_core_process_host_source(s32_t *buffer, int channels);
-int audio_core_process_speaker_sink(s32_t *buffer, int channels);
-int audio_core_process_host_sink(s32_t *buffer, int channels);
+int audio_core_process_mic_source(int32_t *buffer, int channels);
+int audio_core_process_host_source(int32_t *buffer, int channels);
+int audio_core_process_speaker_sink(int32_t *buffer, int channels);
+int audio_core_process_host_sink(int32_t *buffer, int channels);
 int audio_core_notify_frame_tick(void);
 
 /* tuning interface prototypes */
-int audio_core_tuning_interface_init(u32_t *command_buffer,
-		u32_t size_in_words);
+int audio_core_tuning_interface_init(uint32_t *command_buffer,
+		uint32_t size_in_words);
 int audio_core_notify_tuning_cmd(void);
 bool audio_core_is_tuning_reply_ready(void);
 
diff --git a/samples/boards/intel_s1000_crb/audio/src/audio_driver.c b/samples/boards/intel_s1000_crb/audio/src/audio_driver.c
index 91884b1f75..895ca8a194 100644
--- a/samples/boards/intel_s1000_crb/audio/src/audio_driver.c
+++ b/samples/boards/intel_s1000_crb/audio/src/audio_driver.c
@@ -44,9 +44,9 @@ LOG_MODULE_REGISTER(audio_io);
 static void audio_drv_thread(void);
 
 __attribute__((section(".dma_buffers"))) static struct {
-	s32_t	host_inout[HOST_INOUT_BUF_COUNT][HOST_FRAME_SAMPLES];
-	s32_t	spk_out[SPK_OUT_BUF_COUNT][SPK_FRAME_SAMPLES];
-	s32_t	mic_in[MIC_IN_BUF_COUNT][MIC_FRAME_SAMPLES];
+	int32_t	host_inout[HOST_INOUT_BUF_COUNT][HOST_FRAME_SAMPLES];
+	int32_t	spk_out[SPK_OUT_BUF_COUNT][SPK_FRAME_SAMPLES];
+	int32_t	mic_in[MIC_IN_BUF_COUNT][MIC_FRAME_SAMPLES];
 } audio_buffers;
 
 static struct device *codec_dev;
@@ -67,8 +67,8 @@ K_THREAD_DEFINE(audio_drv_thread_id, AUDIO_DRIVER_THREAD_STACKSIZE,
 
 static void audio_driver_process_audio_input(void)
 {
-	s32_t *host_in_buf;
-	s32_t *mic_in_buf;
+	int32_t *host_in_buf;
+	int32_t *mic_in_buf;
 	size_t size;
 	int ret;
 
@@ -96,8 +96,8 @@ static void audio_driver_process_audio_input(void)
 
 static void audio_driver_process_audio_output(void)
 {
-	s32_t *spk_out_buf;
-	s32_t *host_out_buf;
+	int32_t *spk_out_buf;
+	int32_t *host_out_buf;
 	int ret;
 
 	ret = k_mem_slab_alloc(&spk_out_mem_slab, (void *)&spk_out_buf,
diff --git a/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c b/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c
index eaab18c91c..cbf8c4f259 100644
--- a/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c
+++ b/samples/boards/intel_s1000_crb/audio/src/tuning_driver.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(tuning);
 #include "audio_core.h"
 #include "usb_transport.h"
 
-static void tun_drv_process_command(u8_t *data, u32_t len);
+static void tun_drv_process_command(uint8_t *data, uint32_t len);
 
 /* Buffer size in "words" for the tuning commands and replies */
 #define TUN_DRV_CMD_MAX_WORDS	(264)
@@ -31,13 +31,13 @@ static struct {
 	union usb_hid_report_hdr header;
 
 	/* command buffer for the tuning interface */
-	u8_t buffer[TUN_DRV_CMD_MAX_BYTES];
+	uint8_t buffer[TUN_DRV_CMD_MAX_BYTES];
 
 	/* length of valid data in the buffer */
-	u32_t len;
+	uint32_t len;
 
 	/* index into the buffer where incoming data is copied */
-	u32_t index;
+	uint32_t index;
 } __packed command_buffer;
 
 /* Allocate a synchronization semaphore */
@@ -54,7 +54,7 @@ static int tun_drv_io_thread(void)
 	LOG_INF("Starting tuning driver I/O thread ...");
 
 	/* initialize the audio core's tuning interface */
-	audio_core_tuning_interface_init((u32_t *)command_buffer.buffer,
+	audio_core_tuning_interface_init((uint32_t *)command_buffer.buffer,
 			TUN_DRV_CMD_MAX_WORDS);
 
 	/* initialize the tuning transport protocol driver */
@@ -73,14 +73,14 @@ static int tun_drv_io_thread(void)
 int tun_drv_packet_handler(void)
 {
 	int ret = 0;
-	u32_t len;
-	u32_t first_word;
+	uint32_t len;
+	uint32_t first_word;
 
 	if (audio_core_is_tuning_reply_ready() == false) {
 		return ret;
 	}
 
-	first_word = *((u32_t *)command_buffer.buffer);
+	first_word = *((uint32_t *)command_buffer.buffer);
 	len = (first_word >> 16) << 2;
 
 	ret = usb_transport_send_reply(command_buffer.buffer, len);
@@ -90,13 +90,13 @@ int tun_drv_packet_handler(void)
 	return ret;
 }
 
-static void tun_drv_process_command(u8_t *data, u32_t len)
+static void tun_drv_process_command(uint8_t *data, uint32_t len)
 {
-	u32_t first_word;
+	uint32_t first_word;
 
 	if (command_buffer.len == 0) {
 		/* extract command length */
-		first_word = *((u32_t *)data);
+		first_word = *((uint32_t *)data);
 		command_buffer.len = (first_word >> 16) << 2;
 
 		/* ensure total length does not exceed max */
diff --git a/samples/boards/intel_s1000_crb/audio/src/usb_transport.c b/samples/boards/intel_s1000_crb/audio/src/usb_transport.c
index 39a8c8fdaa..7fe1e2845c 100644
--- a/samples/boards/intel_s1000_crb/audio/src/usb_transport.c
+++ b/samples/boards/intel_s1000_crb/audio/src/usb_transport.c
@@ -17,17 +17,17 @@ LOG_MODULE_REGISTER(usb_transport);
 
 /* callback function list */
 static int usb_transport_get_report(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static int usb_transport_get_idle(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static int usb_transport_get_protocol(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static int usb_transport_set_report(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static int usb_transport_set_idle(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static int usb_transport_set_protocol(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data);
+		int32_t *len, uint8_t **data);
 static void usb_transport_host_ready(void);
 
 static const struct hid_ops usb_transport_callbacks = {
@@ -41,7 +41,7 @@ static const struct hid_ops usb_transport_callbacks = {
 };
 
 /* create an HID report descriptor with input and output reports */
-static const u8_t usb_transport_hid_report_desc[] = {
+static const uint8_t usb_transport_hid_report_desc[] = {
 	/* Usage page: vendor defined */
 	HID_GLOBAL_ITEM(ITEM_TAG_USAGE_PAGE, 2), 0x00, 0xFF,
 
@@ -108,10 +108,10 @@ int usb_transport_init(usb_transport_receive_callback_t callback)
 	return usb_hid_init(hid_device);
 }
 
-int usb_transport_send_reply(u8_t *data, u32_t len)
+int usb_transport_send_reply(uint8_t *data, uint32_t len)
 {
 	int ret = 0;
-	u32_t written = 0;
+	uint32_t written = 0;
 	union usb_hid_report_hdr *header;
 
 	/* roll back buffer to point to header */
@@ -131,7 +131,7 @@ int usb_transport_send_reply(u8_t *data, u32_t len)
 			len -= USB_TPORT_HID_REPORT_DATA_LEN;
 		}
 
-		ret = hid_int_ep_write(hid_device, (u8_t *)header,
+		ret = hid_int_ep_write(hid_device, (uint8_t *)header,
 				USB_TPORT_HID_REPORT_COUNT, &written);
 
 		if (ret) {
@@ -148,7 +148,7 @@ int usb_transport_send_reply(u8_t *data, u32_t len)
 		}
 
 		/* move pointer to fill next header */
-		header = (union usb_hid_report_hdr *)((u8_t *)header +
+		header = (union usb_hid_report_hdr *)((uint8_t *)header +
 				USB_TPORT_HID_REPORT_DATA_LEN);
 	}
 
@@ -156,31 +156,31 @@ int usb_transport_send_reply(u8_t *data, u32_t len)
 }
 
 static int usb_transport_get_report(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
 	LOG_DBG("usb_transport_get_report");
 	return 0;
 }
 
 static int usb_transport_get_idle(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
 	LOG_DBG("usb_transport_get_idle");
 	return 0;
 }
 
 static int usb_transport_get_protocol(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
 	LOG_DBG("usb_transport_get_protocol");
 	return 0;
 }
 
 static int usb_transport_set_report(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
-	u8_t	*buffer;
-	s32_t	size;
+	uint8_t	*buffer;
+	int32_t	size;
 
 	/* strip the HID header */
 	buffer = *data + sizeof(union usb_hid_report_hdr);
@@ -191,14 +191,14 @@ static int usb_transport_set_report(struct usb_setup_packet *setup,
 }
 
 static int usb_transport_set_idle(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
 	LOG_DBG("usb_transport_set_idle");
 	return 0;
 }
 
 static int usb_transport_set_protocol(struct usb_setup_packet *setup,
-		s32_t *len, u8_t **data)
+		int32_t *len, uint8_t **data)
 {
 	LOG_DBG("usb_transport_set_protocol");
 	return 0;
diff --git a/samples/boards/intel_s1000_crb/audio/src/usb_transport.h b/samples/boards/intel_s1000_crb/audio/src/usb_transport.h
index f3952ca2bc..e4614b9ca5 100644
--- a/samples/boards/intel_s1000_crb/audio/src/usb_transport.h
+++ b/samples/boards/intel_s1000_crb/audio/src/usb_transport.h
@@ -15,16 +15,16 @@
 /* 4 byte header in every HID report */
 union usb_hid_report_hdr {
 	struct {
-		u8_t	report_id;
-		u8_t	unused[2];
-		u8_t	byte_count;
+		uint8_t	report_id;
+		uint8_t	unused[2];
+		uint8_t	byte_count;
 	} __packed byte;
-	u32_t	word;
+	uint32_t	word;
 };
 
-typedef void (*usb_transport_receive_callback_t)(u8_t *data, u32_t len);
+typedef void (*usb_transport_receive_callback_t)(uint8_t *data, uint32_t len);
 
 int usb_transport_init(usb_transport_receive_callback_t callback);
-int usb_transport_send_reply(u8_t *data, u32_t len);
+int usb_transport_send_reply(uint8_t *data, uint32_t len);
 
 #endif /* TUNING_USB_TRANSPORT_H */
diff --git a/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c b/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c
index cab89a989d..6ee7cadd17 100644
--- a/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c
+++ b/samples/boards/intel_s1000_crb/dmic/src/dmic_sample.c
@@ -93,7 +93,7 @@ static void dmic_start(void)
 static void dmic_receive(void)
 {
 	int frame_counter = 0;
-	s32_t *mic_in_buf;
+	int32_t *mic_in_buf;
 	size_t size;
 	int ret;
 
diff --git a/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c b/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c
index 495ca63046..cd3b504fed 100644
--- a/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c
+++ b/samples/boards/intel_s1000_crb/i2s/src/i2s_sample.c
@@ -64,12 +64,12 @@ static struct device *host_i2s_dev;
 static struct device *codec_device;
 
 #ifndef AUDIO_PLAY_FROM_HOST
-static inline int audio_playback_buffer_fill(float phase_delta, s32_t *buffer,
+static inline int audio_playback_buffer_fill(float phase_delta, int32_t *buffer,
 		int channels, int samples)
 {
 	int channel;
-	s32_t sample;
-	s32_t *wr_ptr;
+	int32_t sample;
+	int32_t *wr_ptr;
 	int sample_index;
 	static float phase;
 
@@ -77,7 +77,7 @@ static inline int audio_playback_buffer_fill(float phase_delta, s32_t *buffer,
 	sample_index = 0;
 	while ((sample_index < samples) && (phase_delta != 0.0)) {
 		/* get sine(phase) and scale it */
-		sample = (s32_t)(SIGNAL_AMPLITUDE_SCALE * sinf(phase));
+		sample = (int32_t)(SIGNAL_AMPLITUDE_SCALE * sinf(phase));
 		/* update phase for next sample */
 		phase = fmodf(phase + phase_delta, FLOAT_VALUE_OF_2PI);
 		/* write same sample value to all channels */
@@ -272,7 +272,7 @@ static void i2s_play_audio(void)
 #ifndef AUDIO_PLAY_FROM_HOST
 		/* fill buffer with audio samples */
 		if (audio_playback_buffer_fill(audio_playback_tone_get_next(),
-					(s32_t *)in_buf, AUDIO_NUM_CHANNELS,
+					(int32_t *)in_buf, AUDIO_NUM_CHANNELS,
 					size) < size) {
 			/* break if all tones are exhausted */
 			k_mem_slab_free(&i2s_mem_slab, &in_buf);
diff --git a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
index 0c82eb8dc9..42b9a58a55 100644
--- a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
+++ b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.c
@@ -38,12 +38,12 @@ static struct k_thread thread_a_id;
 static struct k_thread thread_b_id;
 
 struct pm_counter {
-	u8_t entry_cnt;
-	u8_t exit_cnt;
+	uint8_t entry_cnt;
+	uint8_t exit_cnt;
 };
 
 /* Track time elapsed */
-static s64_t trigger_time;
+static int64_t trigger_time;
 static bool checks_enabled;
 /* Track entry/exit to sleep */
 struct pm_counter pm_counters[SLP_STATES_SUPPORTED];
@@ -65,7 +65,7 @@ struct pm_counter pm_counters[SLP_STATES_SUPPORTED];
 
 static void pm_latency_check(void)
 {
-	s64_t latency;
+	int64_t latency;
 	int secs;
 	int msecs;
 
@@ -126,7 +126,7 @@ void sys_pm_notify_power_state_exit(enum power_states state)
 	}
 }
 
-static void pm_check_counters(u8_t cycles)
+static void pm_check_counters(uint8_t cycles)
 {
 	for (int i = 0; i < SLP_STATES_SUPPORTED; i++) {
 		LOG_INF("PM state[%d] entry counter %d", i,
@@ -169,7 +169,7 @@ static void pm_trigger_marker(void)
 
 static void pm_exit_marker(void)
 {
-	s64_t residency_delta;
+	int64_t residency_delta;
 	int secs;
 	int msecs;
 
@@ -251,9 +251,9 @@ static void resume_all_tasks(void)
 	k_thread_resume(&thread_b_id);
 }
 
-int test_pwr_mgmt_multithread(bool use_logging, u8_t cycles)
+int test_pwr_mgmt_multithread(bool use_logging, uint8_t cycles)
 {
-	u8_t iterations = cycles;
+	uint8_t iterations = cycles;
 	/* Ensure we can enter deep sleep when stopping threads
 	 * No UART output should occurr when threads are suspended
 	 * Test to verify Zephyr RTOS issue #20033
@@ -316,9 +316,9 @@ int test_pwr_mgmt_multithread(bool use_logging, u8_t cycles)
 	return 0;
 }
 
-int test_pwr_mgmt_singlethread(bool use_logging, u8_t cycles)
+int test_pwr_mgmt_singlethread(bool use_logging, uint8_t cycles)
 {
-	u8_t iterations = cycles;
+	uint8_t iterations = cycles;
 
 	LOG_WRN("PM single-thread test started for cycles: %d, logging: %d",
 		cycles, use_logging);
diff --git a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.h b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.h
index 585726dafe..6cc0bcd539 100644
--- a/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.h
+++ b/samples/boards/mec15xxevb_assy6853/power_management/src/power_mgmt.h
@@ -21,7 +21,7 @@
  * @param cycles to repeat the cycle described above.
  * @retval 0 if successful, errno otherwise.
  */
-int test_pwr_mgmt_singlethread(bool use_logging, u8_t cycles);
+int test_pwr_mgmt_singlethread(bool use_logging, uint8_t cycles);
 
 /** @brief Alternates between light and deep sleep cycles.
  *
@@ -33,6 +33,6 @@ int test_pwr_mgmt_singlethread(bool use_logging, u8_t cycles);
  * @param cycles to repeat the cycle described above.
  * @retval 0 if successful, errno otherwise.
  */
-int test_pwr_mgmt_multithread(bool use_logging, u8_t cycles);
+int test_pwr_mgmt_multithread(bool use_logging, uint8_t cycles);
 
 #endif /* __TEST_PWRMGMT_H__ */
diff --git a/samples/boards/nrf/battery/src/battery.c b/samples/boards/nrf/battery/src/battery.c
index 1f4ffc4e84..940a7cfc93 100644
--- a/samples/boards/nrf/battery/src/battery.c
+++ b/samples/boards/nrf/battery/src/battery.c
@@ -36,13 +36,13 @@ LOG_MODULE_REGISTER(BATTERY, CONFIG_ADC_LOG_LEVEL);
 
 struct io_channel_config {
 	const char *label;
-	u8_t channel;
+	uint8_t channel;
 };
 
 struct gpio_channel_config {
 	const char *label;
-	u8_t pin;
-	u8_t flags;
+	uint8_t pin;
+	uint8_t flags;
 };
 
 struct divider_config {
@@ -52,8 +52,8 @@ struct divider_config {
 	 * the battery is measured through a voltage divider;
 	 * otherwise it is assumed to be directly connected to Vdd.
 	 */
-	u32_t output_ohm;
-	u32_t full_ohm;
+	uint32_t output_ohm;
+	uint32_t full_ohm;
 };
 
 static const struct divider_config divider_config = {
@@ -83,7 +83,7 @@ struct divider_data {
 	struct device *gpio;
 	struct adc_channel_cfg adc_cfg;
 	struct adc_sequence adc_seq;
-	s16_t raw;
+	int16_t raw;
 };
 static struct divider_data divider_data;
 
@@ -196,7 +196,7 @@ int battery_sample(void)
 		rc = adc_read(ddp->adc, sp);
 		sp->calibrate = false;
 		if (rc == 0) {
-			s32_t val = ddp->raw;
+			int32_t val = ddp->raw;
 
 			adc_raw_to_millivolts(adc_ref_internal(ddp->adc),
 					      ddp->adc_cfg.gain,
@@ -204,7 +204,7 @@ int battery_sample(void)
 					      &val);
 
 			if (dcp->output_ohm != 0) {
-				rc = val * (u64_t)dcp->full_ohm
+				rc = val * (uint64_t)dcp->full_ohm
 					/ dcp->output_ohm;
 				LOG_INF("raw %u ~ %u mV => %d mV\n",
 					ddp->raw, val, rc);
diff --git a/samples/boards/nrf/battery/src/battery.h b/samples/boards/nrf/battery/src/battery.h
index 0ffaae8d5d..9e7fd36924 100644
--- a/samples/boards/nrf/battery/src/battery.h
+++ b/samples/boards/nrf/battery/src/battery.h
@@ -31,10 +31,10 @@ int battery_sample(void);
  */
 struct battery_level_point {
 	/** Remaining life at #lvl_mV. */
-	u16_t lvl_pptt;
+	uint16_t lvl_pptt;
 
 	/** Battery voltage at #lvl_pptt remaining life. */
-	u16_t lvl_mV;
+	uint16_t lvl_mV;
 };
 
 /** Calculate the estimated battery level based on a measured voltage.
diff --git a/samples/boards/nrf/battery/src/main.c b/samples/boards/nrf/battery/src/main.c
index 5c25f3d982..1214fbf45a 100644
--- a/samples/boards/nrf/battery/src/main.c
+++ b/samples/boards/nrf/battery/src/main.c
@@ -40,7 +40,7 @@ static const struct battery_level_point levels[] = {
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/boards/nrf/mesh/onoff-app/src/main.c b/samples/boards/nrf/mesh/onoff-app/src/main.c
index 93d6f23753..4028525e2a 100644
--- a/samples/boards/nrf/mesh/onoff-app/src/main.c
+++ b/samples/boards/nrf/mesh/onoff-app/src/main.c
@@ -167,9 +167,9 @@ static const struct bt_mesh_model_op gen_onoff_cli_op[] = {
 };
 
 struct onoff_state {
-	u8_t current;
-	u8_t previous;
-	u8_t led_gpio_pin;
+	uint8_t current;
+	uint8_t previous;
+	uint8_t led_gpio_pin;
 	struct device *led_device;
 };
 
@@ -277,22 +277,22 @@ static const struct bt_mesh_comp comp = {
 struct device *sw_device;
 
 struct sw {
-	u8_t sw_num;
-	u8_t onoff_state;
+	uint8_t sw_num;
+	uint8_t onoff_state;
 	struct k_work button_work;
 	struct k_timer button_timer;
 };
 
 
-static u8_t button_press_cnt;
+static uint8_t button_press_cnt;
 static struct sw sw;
 
 static struct gpio_callback button_cb;
 
-static u8_t trans_id;
-static u32_t time, last_time;
-static u16_t primary_addr;
-static u16_t primary_net_idx;
+static uint8_t trans_id;
+static uint32_t time, last_time;
+static uint16_t primary_addr;
+static uint16_t primary_net_idx;
 
 /*
  * Generic OnOff Model Server Message Handlers
@@ -371,7 +371,7 @@ static void gen_onoff_status(struct bt_mesh_model *model,
 			     struct bt_mesh_msg_ctx *ctx,
 			     struct net_buf_simple *buf)
 {
-	u8_t	state;
+	uint8_t	state;
 
 	state = net_buf_simple_pull_u8(buf);
 
@@ -379,7 +379,7 @@ static void gen_onoff_status(struct bt_mesh_model *model,
 	       bt_mesh_model_elem(model)->addr, ctx->addr, state);
 }
 
-static int output_number(bt_mesh_output_action_t action, u32_t number)
+static int output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	printk("OOB Number %06u\n", number);
 	return 0;
@@ -391,7 +391,7 @@ static int output_string(const char *str)
 	return 0;
 }
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	printk("provisioning complete for net_idx 0x%04x addr 0x%04x\n",
 	       net_idx, addr);
@@ -404,7 +404,7 @@ static void prov_reset(void)
 	bt_mesh_prov_enable(BT_MESH_PROV_ADV | BT_MESH_PROV_GATT);
 }
 
-static u8_t dev_uuid[16] = { 0xdd, 0xdd };
+static uint8_t dev_uuid[16] = { 0xdd, 0xdd };
 
 #define BUTTON_DEBOUNCE_DELAY_MS 250
 
@@ -427,7 +427,7 @@ static uint8_t pin_to_sw(uint32_t pin_pos)
 }
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pin_pos)
+			   uint32_t pin_pos)
 {
 	/*
 	 * One button press within a 1 second interval sends an on message
@@ -482,7 +482,7 @@ static void button_pressed_worker(struct k_work *work)
 	struct bt_mesh_model_pub *pub_cli, *pub_srv;
 	struct sw *sw = CONTAINER_OF(work, struct sw, button_work);
 	int err;
-	u8_t sw_idx = sw->sw_num;
+	uint8_t sw_idx = sw->sw_num;
 
 	mod_cli = mod_cli_sw[sw_idx];
 	pub_cli = mod_cli->pub;
@@ -586,7 +586,7 @@ static void bt_ready(int err)
 	printk("Mesh initialized\n");
 }
 
-void init_led(u8_t dev, const char *port, u32_t pin_num, gpio_flags_t flags)
+void init_led(uint8_t dev, const char *port, uint32_t pin_num, gpio_flags_t flags)
 {
 	onoff_state[dev].led_device = device_get_binding(port);
 	gpio_pin_configure(onoff_state[dev].led_device, pin_num,
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
index 2d993c4abe..79e4e5c352 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
@@ -16,7 +16,7 @@ struct device *button_device[4];
 K_WORK_DEFINE(button_work, publish);
 
 static void button_pressed(struct device *dev,
-			   struct gpio_callback *cb, u32_t pins)
+			   struct gpio_callback *cb, uint32_t pins)
 {
 	k_work_submit(&button_work);
 }
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c
index cfbcec7690..43e3f461d9 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c
@@ -48,14 +48,14 @@ static void light_default_status_init(void)
 {
 	/* Retrieve Range of Lightness */
 	if (ctl->light->range) {
-		ctl->light->range_max = (u16_t) (ctl->light->range >> 16);
-		ctl->light->range_min = (u16_t) ctl->light->range;
+		ctl->light->range_max = (uint16_t) (ctl->light->range >> 16);
+		ctl->light->range_min = (uint16_t) ctl->light->range;
 	}
 
 	/* Retrieve Range of Temperature */
 	if (ctl->temp->range) {
-		ctl->temp->range_max = (u16_t) (ctl->temp->range >> 16);
-		ctl->temp->range_min = (u16_t) ctl->temp->range;
+		ctl->temp->range_max = (uint16_t) (ctl->temp->range >> 16);
+		ctl->temp->range_min = (uint16_t) ctl->temp->range;
 	}
 
 	ctl->light->last = constrain_lightness(ctl->light->last);
@@ -101,7 +101,7 @@ void update_vnd_led_gpio(void)
 
 void update_led_gpio(void)
 {
-	u8_t power, color;
+	uint8_t power, color;
 
 	power = 100 * ((float) ctl->light->current / 65535);
 	color = 100 * ((float) (ctl->temp->current - ctl->temp->range_min) /
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c
index 2f5c27780d..0234d8d971 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c
@@ -10,7 +10,7 @@
 
 #ifdef OOB_AUTH_ENABLE
 
-static int output_number(bt_mesh_output_action_t action, u32_t number)
+static int output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	printk("OOB Number: %u\n", number);
 	return 0;
@@ -24,7 +24,7 @@ static int output_string(const char *str)
 
 #endif
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 }
 
@@ -33,7 +33,7 @@ static void prov_reset(void)
 	bt_mesh_prov_enable(BT_MESH_PROV_ADV | BT_MESH_PROV_GATT);
 }
 
-static u8_t dev_uuid[16] = { 0xdd, 0xdd };
+static uint8_t dev_uuid[16] = { 0xdd, 0xdd };
 
 static const struct bt_mesh_prov prov = {
 	.uuid = dev_uuid,
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
index ad824fd2bf..be2e925c41 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
@@ -100,7 +100,7 @@ static void gen_onoff_get(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 3 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_ONOFF_STATUS);
-	net_buf_simple_add_u8(msg, (u8_t) get_current(ONOFF));
+	net_buf_simple_add_u8(msg, (uint8_t) get_current(ONOFF));
 
 	if (ctl->light->current == ctl->light->target) {
 		goto send;
@@ -108,7 +108,7 @@ static void gen_onoff_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_u8(msg, (u8_t) get_target(ONOFF));
+		net_buf_simple_add_u8(msg, (uint8_t) get_target(ONOFF));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -128,11 +128,11 @@ void gen_onoff_publish(struct bt_mesh_model *model)
 	}
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_ONOFF_STATUS);
-	net_buf_simple_add_u8(msg, (u8_t) get_current(ONOFF));
+	net_buf_simple_add_u8(msg, (uint8_t) get_current(ONOFF));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_u8(msg, (u8_t) get_target(ONOFF));
+		net_buf_simple_add_u8(msg, (uint8_t) get_target(ONOFF));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -146,8 +146,8 @@ static void gen_onoff_set_unack(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t tid, onoff, tt, delay;
-	s64_t now;
+	uint8_t tid, onoff, tt, delay;
+	int64_t now;
 
 	onoff = net_buf_simple_pull_u8(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -213,8 +213,8 @@ static void gen_onoff_set(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t tid, onoff, tt, delay;
-	s64_t now;
+	uint8_t tid, onoff, tt, delay;
+	int64_t now;
 
 	onoff = net_buf_simple_pull_u8(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -301,7 +301,7 @@ static void gen_level_get(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 5 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
-	net_buf_simple_add_le16(msg, (s16_t) get_current(LEVEL_LIGHT));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(LEVEL_LIGHT));
 
 	if (ctl->light->current == ctl->light->target) {
 		goto send;
@@ -309,7 +309,7 @@ static void gen_level_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (s16_t) get_target(LEVEL_LIGHT));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(LEVEL_LIGHT));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -329,11 +329,11 @@ void gen_level_publish(struct bt_mesh_model *model)
 	}
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
-	net_buf_simple_add_le16(msg, (s16_t) get_current(LEVEL_LIGHT));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(LEVEL_LIGHT));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (s16_t) get_target(LEVEL_LIGHT));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(LEVEL_LIGHT));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -347,11 +347,11 @@ static void gen_level_set_unack(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t level;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t level;
+	int64_t now;
 
-	level = (s16_t) net_buf_simple_pull_le16(buf);
+	level = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -411,11 +411,11 @@ static void gen_level_set(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t level;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t level;
+	int64_t now;
 
-	level = (s16_t) net_buf_simple_pull_le16(buf);
+	level = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -478,12 +478,12 @@ static void gen_delta_set_unack(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	static s16_t last_level;
-	s32_t target, delta;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	static int16_t last_level;
+	int32_t target, delta;
+	int64_t now;
 
-	delta = (s32_t) net_buf_simple_pull_le32(buf);
+	delta = (int32_t) net_buf_simple_pull_le32(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -498,7 +498,7 @@ static void gen_delta_set_unack(struct bt_mesh_model *model,
 		target = last_level + delta;
 
 	} else {
-		last_level = (s16_t) get_current(LEVEL_LIGHT);
+		last_level = (int16_t) get_current(LEVEL_LIGHT);
 		target = last_level + delta;
 	}
 
@@ -558,12 +558,12 @@ static void gen_delta_set(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	static s16_t last_level;
-	s32_t target, delta;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	static int16_t last_level;
+	int32_t target, delta;
+	int64_t now;
 
-	delta = (s32_t) net_buf_simple_pull_le32(buf);
+	delta = (int32_t) net_buf_simple_pull_le32(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -579,7 +579,7 @@ static void gen_delta_set(struct bt_mesh_model *model,
 		target = last_level + delta;
 
 	} else {
-		last_level = (s16_t) get_current(LEVEL_LIGHT);
+		last_level = (int16_t) get_current(LEVEL_LIGHT);
 		target = last_level + delta;
 	}
 
@@ -641,12 +641,12 @@ static void gen_move_set_unack(struct bt_mesh_model *model,
 			       struct bt_mesh_msg_ctx *ctx,
 			       struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta;
-	u16_t target;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta;
+	uint16_t target;
+	int64_t now;
 
-	delta = (s16_t) net_buf_simple_pull_le16(buf);
+	delta = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -714,12 +714,12 @@ static void gen_move_set(struct bt_mesh_model *model,
 			 struct bt_mesh_msg_ctx *ctx,
 			 struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta;
-	u16_t target;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta;
+	uint16_t target;
+	int64_t now;
 
-	delta = (s16_t) net_buf_simple_pull_le16(buf);
+	delta = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -837,7 +837,7 @@ static void gen_def_trans_time_set_unack(struct bt_mesh_model *model,
 					 struct bt_mesh_msg_ctx *ctx,
 					 struct net_buf_simple *buf)
 {
-	u8_t tt;
+	uint8_t tt;
 
 	tt = net_buf_simple_pull_u8(buf);
 
@@ -857,7 +857,7 @@ static void gen_def_trans_time_set(struct bt_mesh_model *model,
 				   struct bt_mesh_msg_ctx *ctx,
 				   struct net_buf_simple *buf)
 {
-	u8_t tt;
+	uint8_t tt;
 
 	tt = net_buf_simple_pull_u8(buf);
 
@@ -933,7 +933,7 @@ static void gen_onpowerup_set_unack(struct bt_mesh_model *model,
 				    struct bt_mesh_msg_ctx *ctx,
 				    struct net_buf_simple *buf)
 {
-	u8_t onpowerup;
+	uint8_t onpowerup;
 
 	onpowerup = net_buf_simple_pull_u8(buf);
 
@@ -953,7 +953,7 @@ static void gen_onpowerup_set(struct bt_mesh_model *model,
 			      struct bt_mesh_msg_ctx *ctx,
 			      struct net_buf_simple *buf)
 {
-	u8_t onpowerup;
+	uint8_t onpowerup;
 
 	onpowerup = net_buf_simple_pull_u8(buf);
 
@@ -996,9 +996,9 @@ static void vnd_set_unack(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t tid;
+	uint8_t tid;
 	int current;
-	s64_t now;
+	int64_t now;
 	struct vendor_state *state = model->user_data;
 
 	current = net_buf_simple_pull_le16(buf);
@@ -1048,7 +1048,7 @@ static void light_lightness_get(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 5 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_LIGHT_LIGHTNESS_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(ACTUAL));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(ACTUAL));
 
 	if (ctl->light->current == ctl->light->target) {
 		goto send;
@@ -1056,7 +1056,7 @@ static void light_lightness_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(ACTUAL));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(ACTUAL));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1076,11 +1076,11 @@ void light_lightness_publish(struct bt_mesh_model *model)
 	}
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_LIGHT_LIGHTNESS_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(ACTUAL));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(ACTUAL));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(ACTUAL));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(ACTUAL));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1094,9 +1094,9 @@ static void light_lightness_set_unack(struct bt_mesh_model *model,
 				      struct bt_mesh_msg_ctx *ctx,
 				      struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	u16_t actual;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	uint16_t actual;
+	int64_t now;
 
 	actual = net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -1158,9 +1158,9 @@ static void light_lightness_set(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	u16_t actual;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	uint16_t actual;
+	int64_t now;
 
 	actual = net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -1229,7 +1229,7 @@ static void light_lightness_linear_get(struct bt_mesh_model *model,
 
 	bt_mesh_model_msg_init(msg,
 			       BT_MESH_MODEL_LIGHT_LIGHTNESS_LINEAR_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(LINEAR));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(LINEAR));
 
 	if (ctl->light->current == ctl->light->target) {
 		goto send;
@@ -1237,7 +1237,7 @@ static void light_lightness_linear_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(LINEAR));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(LINEAR));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1258,11 +1258,11 @@ void light_lightness_linear_publish(struct bt_mesh_model *model)
 
 	bt_mesh_model_msg_init(msg,
 			       BT_MESH_MODEL_LIGHT_LIGHTNESS_LINEAR_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(LINEAR));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(LINEAR));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(LINEAR));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(LINEAR));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1276,9 +1276,9 @@ static void light_lightness_linear_set_unack(struct bt_mesh_model *model,
 					     struct bt_mesh_msg_ctx *ctx,
 					     struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	u16_t linear;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	uint16_t linear;
+	int64_t now;
 
 	linear = net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -1340,9 +1340,9 @@ static void light_lightness_linear_set(struct bt_mesh_model *model,
 				       struct bt_mesh_msg_ctx *ctx,
 				       struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	u16_t linear;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	uint16_t linear;
+	int64_t now;
 
 	linear = net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -1475,7 +1475,7 @@ static void light_lightness_default_set_unack(struct bt_mesh_model *model,
 					      struct bt_mesh_msg_ctx *ctx,
 					      struct net_buf_simple *buf)
 {
-	u16_t lightness;
+	uint16_t lightness;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	lightness = constrain_lightness(lightness);
@@ -1492,7 +1492,7 @@ static void light_lightness_default_set(struct bt_mesh_model *model,
 					struct bt_mesh_msg_ctx *ctx,
 					struct net_buf_simple *buf)
 {
-	u16_t lightness;
+	uint16_t lightness;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	lightness = constrain_lightness(lightness);
@@ -1532,7 +1532,7 @@ static void light_lightness_range_set_unack(struct bt_mesh_model *model,
 					    struct bt_mesh_msg_ctx *ctx,
 					    struct net_buf_simple *buf)
 {
-	u16_t min, max;
+	uint16_t min, max;
 
 	min = net_buf_simple_pull_le16(buf);
 	max = net_buf_simple_pull_le16(buf);
@@ -1564,7 +1564,7 @@ static void light_lightness_range_set(struct bt_mesh_model *model,
 				      struct bt_mesh_msg_ctx *ctx,
 				      struct net_buf_simple *buf)
 {
-	u16_t min, max;
+	uint16_t min, max;
 
 	min = net_buf_simple_pull_le16(buf);
 	max = net_buf_simple_pull_le16(buf);
@@ -1658,8 +1658,8 @@ static void light_ctl_get(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 9 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_LIGHT_CTL_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_LIGHT));
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_TEMP));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_LIGHT));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_TEMP));
 
 	if (ctl->light->current == ctl->light->target &&
 	    ctl->temp->current == ctl->temp->target) {
@@ -1668,8 +1668,8 @@ static void light_ctl_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_LIGHT));
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_TEMP));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_LIGHT));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_TEMP));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1693,13 +1693,13 @@ void light_ctl_publish(struct bt_mesh_model *model)
 	/* Here, as per Model specification, status should be
 	 * made up of lightness & temperature values only
 	 */
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_LIGHT));
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_TEMP));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_LIGHT));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_TEMP));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_LIGHT));
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_TEMP));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_LIGHT));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_TEMP));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -1713,14 +1713,14 @@ static void light_ctl_set_unack(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta_uv;
-	u16_t lightness, temp;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta_uv;
+	uint16_t lightness, temp;
+	int64_t now;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
@@ -1790,14 +1790,14 @@ static void light_ctl_set(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta_uv;
-	u16_t lightness, temp;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta_uv;
+	uint16_t lightness, temp;
+	int64_t now;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
@@ -1926,12 +1926,12 @@ static void light_ctl_default_set_unack(struct bt_mesh_model *model,
 					struct bt_mesh_msg_ctx *ctx,
 					struct net_buf_simple *buf)
 {
-	u16_t lightness, temp;
-	s16_t delta_uv;
+	uint16_t lightness, temp;
+	int16_t delta_uv;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
 		return;
@@ -1955,12 +1955,12 @@ static void light_ctl_default_set(struct bt_mesh_model *model,
 				  struct bt_mesh_msg_ctx *ctx,
 				  struct net_buf_simple *buf)
 {
-	u16_t lightness, temp;
-	s16_t delta_uv;
+	uint16_t lightness, temp;
+	int16_t delta_uv;
 
 	lightness = net_buf_simple_pull_le16(buf);
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
 		return;
@@ -2007,7 +2007,7 @@ static void light_ctl_temp_range_set_unack(struct bt_mesh_model *model,
 					   struct bt_mesh_msg_ctx *ctx,
 					   struct net_buf_simple *buf)
 {
-	u16_t min, max;
+	uint16_t min, max;
 
 	min = net_buf_simple_pull_le16(buf);
 	max = net_buf_simple_pull_le16(buf);
@@ -2041,7 +2041,7 @@ static void light_ctl_temp_range_set(struct bt_mesh_model *model,
 				     struct bt_mesh_msg_ctx *ctx,
 				     struct net_buf_simple *buf)
 {
-	u16_t min, max;
+	uint16_t min, max;
 
 	min = net_buf_simple_pull_le16(buf);
 	max = net_buf_simple_pull_le16(buf);
@@ -2140,8 +2140,8 @@ static void light_ctl_temp_get(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 9 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_LIGHT_CTL_TEMP_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_TEMP));
-	net_buf_simple_add_le16(msg, (s16_t) get_current(CTL_DELTA_UV));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_TEMP));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(CTL_DELTA_UV));
 
 	if (ctl->temp->current == ctl->temp->target &&
 	    ctl->duv->current == ctl->duv->target) {
@@ -2150,8 +2150,8 @@ static void light_ctl_temp_get(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_TEMP));
-		net_buf_simple_add_le16(msg, (s16_t) get_target(CTL_DELTA_UV));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_TEMP));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(CTL_DELTA_UV));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -2171,13 +2171,13 @@ void light_ctl_temp_publish(struct bt_mesh_model *model)
 	}
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_LIGHT_CTL_TEMP_STATUS);
-	net_buf_simple_add_le16(msg, (u16_t) get_current(CTL_TEMP));
-	net_buf_simple_add_le16(msg, (s16_t) get_current(CTL_DELTA_UV));
+	net_buf_simple_add_le16(msg, (uint16_t) get_current(CTL_TEMP));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(CTL_DELTA_UV));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (u16_t) get_target(CTL_TEMP));
-		net_buf_simple_add_le16(msg, (s16_t) get_target(CTL_DELTA_UV));
+		net_buf_simple_add_le16(msg, (uint16_t) get_target(CTL_TEMP));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(CTL_DELTA_UV));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -2191,13 +2191,13 @@ static void light_ctl_temp_set_unack(struct bt_mesh_model *model,
 				     struct bt_mesh_msg_ctx *ctx,
 				     struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta_uv;
-	u16_t temp;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta_uv;
+	uint16_t temp;
+	int64_t now;
 
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
@@ -2264,13 +2264,13 @@ static void light_ctl_temp_set(struct bt_mesh_model *model,
 			       struct bt_mesh_msg_ctx *ctx,
 			       struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta_uv;
-	u16_t temp;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta_uv;
+	uint16_t temp;
+	int64_t now;
 
 	temp = net_buf_simple_pull_le16(buf);
-	delta_uv = (s16_t) net_buf_simple_pull_le16(buf);
+	delta_uv = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	if (temp < TEMP_MIN || temp > TEMP_MAX) {
@@ -2344,7 +2344,7 @@ static void gen_level_get_temp(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 5 + 4);
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
-	net_buf_simple_add_le16(msg, (s16_t) get_current(LEVEL_TEMP));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(LEVEL_TEMP));
 
 	if (ctl->temp->current == ctl->temp->target) {
 		goto send;
@@ -2352,7 +2352,7 @@ static void gen_level_get_temp(struct bt_mesh_model *model,
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (s16_t) get_target(LEVEL_TEMP));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(LEVEL_TEMP));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -2372,11 +2372,11 @@ void gen_level_publish_temp(struct bt_mesh_model *model)
 	}
 
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_GEN_LEVEL_STATUS);
-	net_buf_simple_add_le16(msg, (s16_t) get_current(LEVEL_TEMP));
+	net_buf_simple_add_le16(msg, (int16_t) get_current(LEVEL_TEMP));
 
 	if (ctl->transition->counter) {
 		calculate_rt(ctl->transition);
-		net_buf_simple_add_le16(msg, (s16_t) get_target(LEVEL_TEMP));
+		net_buf_simple_add_le16(msg, (int16_t) get_target(LEVEL_TEMP));
 		net_buf_simple_add_u8(msg, ctl->transition->rt);
 	}
 
@@ -2390,11 +2390,11 @@ static void gen_level_set_unack_temp(struct bt_mesh_model *model,
 				     struct bt_mesh_msg_ctx *ctx,
 				     struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t level;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t level;
+	int64_t now;
 
-	level = (s16_t) net_buf_simple_pull_le16(buf);
+	level = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -2454,11 +2454,11 @@ static void gen_level_set_temp(struct bt_mesh_model *model,
 			       struct bt_mesh_msg_ctx *ctx,
 			       struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t level;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t level;
+	int64_t now;
 
-	level = (s16_t) net_buf_simple_pull_le16(buf);
+	level = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -2521,12 +2521,12 @@ static void gen_delta_set_unack_temp(struct bt_mesh_model *model,
 				     struct bt_mesh_msg_ctx *ctx,
 				     struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	static s16_t last_level;
-	s32_t target, delta;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	static int16_t last_level;
+	int32_t target, delta;
+	int64_t now;
 
-	delta = (s32_t) net_buf_simple_pull_le32(buf);
+	delta = (int32_t) net_buf_simple_pull_le32(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -2541,7 +2541,7 @@ static void gen_delta_set_unack_temp(struct bt_mesh_model *model,
 		target = last_level + delta;
 
 	} else {
-		last_level = (s16_t) get_current(LEVEL_TEMP);
+		last_level = (int16_t) get_current(LEVEL_TEMP);
 		target = last_level + delta;
 	}
 
@@ -2601,12 +2601,12 @@ static void gen_delta_set_temp(struct bt_mesh_model *model,
 			       struct bt_mesh_msg_ctx *ctx,
 			       struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	static s16_t last_level;
-	s32_t target, delta;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	static int16_t last_level;
+	int32_t target, delta;
+	int64_t now;
 
-	delta = (s32_t) net_buf_simple_pull_le32(buf);
+	delta = (int32_t) net_buf_simple_pull_le32(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -2622,7 +2622,7 @@ static void gen_delta_set_temp(struct bt_mesh_model *model,
 		target = last_level + delta;
 
 	} else {
-		last_level = (s16_t) get_current(LEVEL_TEMP);
+		last_level = (int16_t) get_current(LEVEL_TEMP);
 		target = last_level + delta;
 	}
 
@@ -2684,12 +2684,12 @@ static void gen_move_set_unack_temp(struct bt_mesh_model *model,
 				    struct bt_mesh_msg_ctx *ctx,
 				    struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta;
-	u16_t target;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta;
+	uint16_t target;
+	int64_t now;
 
-	delta = (s16_t) net_buf_simple_pull_le16(buf);
+	delta = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
@@ -2757,12 +2757,12 @@ static void gen_move_set_temp(struct bt_mesh_model *model,
 			      struct bt_mesh_msg_ctx *ctx,
 			      struct net_buf_simple *buf)
 {
-	u8_t tid, tt, delay;
-	s16_t delta;
-	u16_t target;
-	s64_t now;
+	uint8_t tid, tt, delay;
+	int16_t delta;
+	uint16_t target;
+	int64_t now;
 
-	delta = (s16_t) net_buf_simple_pull_le16(buf);
+	delta = (int16_t) net_buf_simple_pull_le16(buf);
 	tid = net_buf_simple_pull_u8(buf);
 
 	now = k_uptime_get();
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h
index f25974ba9b..e5336d14b2 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h
@@ -29,48 +29,48 @@
 
 struct vendor_state {
 	int current;
-	u32_t response;
-	u8_t last_tid;
-	u16_t last_src_addr;
-	u16_t last_dst_addr;
-	s64_t last_msg_timestamp;
+	uint32_t response;
+	uint8_t last_tid;
+	uint16_t last_src_addr;
+	uint16_t last_dst_addr;
+	int64_t last_msg_timestamp;
 };
 
 struct lightness {
-	u16_t current;
-	u16_t target;
+	uint16_t current;
+	uint16_t target;
 
-	u16_t def;
-	u16_t last;
+	uint16_t def;
+	uint16_t last;
 
-	u8_t status_code;
-	u16_t range_min;
-	u16_t range_max;
-	u32_t range;
+	uint8_t status_code;
+	uint16_t range_min;
+	uint16_t range_max;
+	uint32_t range;
 
 	int delta;
 };
 
 struct temperature {
-	u16_t current;
-	u16_t target;
+	uint16_t current;
+	uint16_t target;
 
-	u16_t def;
+	uint16_t def;
 
-	u8_t status_code;
-	u16_t range_min;
-	u16_t range_max;
-	u32_t range;
+	uint8_t status_code;
+	uint16_t range_min;
+	uint16_t range_max;
+	uint32_t range;
 
 	int delta;
 };
 
 
 struct delta_uv {
-	s16_t current;
-	s16_t target;
+	int16_t current;
+	int16_t target;
 
-	s16_t def;
+	int16_t def;
 
 	int delta;
 };
@@ -80,12 +80,12 @@ struct light_ctl_state {
 	struct temperature *temp;
 	struct delta_uv *duv;
 
-	u8_t onpowerup, tt;
+	uint8_t onpowerup, tt;
 
-	u8_t last_tid;
-	u16_t last_src_addr;
-	u16_t last_dst_addr;
-	s64_t last_msg_timestamp;
+	uint8_t last_tid;
+	uint16_t last_src_addr;
+	uint16_t last_dst_addr;
+	int64_t last_msg_timestamp;
 
 	struct transition *transition;
 };
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
index 7cd367cea8..437b035129 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
@@ -15,7 +15,7 @@
 #define ONOFF
 #define GENERIC_LEVEL
 
-static u8_t tid;
+static uint8_t tid;
 
 void publish(struct k_work *work)
 {
@@ -211,7 +211,7 @@ void publish(struct k_work *work)
 	if (gpio_pin_get(button_device[0],
 			 DT_GPIO_PIN(DT_ALIAS(sw0), gpios)) == 1) {
 #if defined(ONOFF)
-		static u8_t state = STATE_ON;
+		static uint8_t state = STATE_ON;
 
 		bt_mesh_model_msg_init(root_models[3].pub->msg,
 				       BT_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK);
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
index e0cfcd3284..83b4087542 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
@@ -35,11 +35,11 @@ static float sqrt(float square)
 	return root;
 }
 
-static s32_t ceiling(float num)
+static int32_t ceiling(float num)
 {
-	s32_t inum;
+	int32_t inum;
 
-	inum = (s32_t) num;
+	inum = (int32_t) num;
 	if (num == (float) inum) {
 		return inum;
 	}
@@ -47,21 +47,21 @@ static s32_t ceiling(float num)
 	return inum + 1;
 }
 
-static u16_t actual_to_linear(u16_t val)
+static uint16_t actual_to_linear(uint16_t val)
 {
 	float tmp;
 
 	tmp = ((float) val / UINT16_MAX);
 
-	return (u16_t) ceiling(UINT16_MAX * tmp * tmp);
+	return (uint16_t) ceiling(UINT16_MAX * tmp * tmp);
 }
 
-static u16_t linear_to_actual(u16_t val)
+static uint16_t linear_to_actual(uint16_t val)
 {
-	return (u16_t) (UINT16_MAX * sqrt(((float) val / UINT16_MAX)));
+	return (uint16_t) (UINT16_MAX * sqrt(((float) val / UINT16_MAX)));
 }
 
-u16_t constrain_lightness(u16_t light)
+uint16_t constrain_lightness(uint16_t light)
 {
 	if (light > 0 && light < ctl->light->range_min) {
 		light = ctl->light->range_min;
@@ -87,7 +87,7 @@ static void constrain_target_lightness2(void)
 	}
 }
 
-u16_t constrain_temperature(u16_t temp)
+uint16_t constrain_temperature(uint16_t temp)
 {
 	if (temp < ctl->temp->range_min) {
 		temp = ctl->temp->range_min;
@@ -98,7 +98,7 @@ u16_t constrain_temperature(u16_t temp)
 	return temp;
 }
 
-static s16_t light_ctl_temp_to_level(u16_t temp)
+static int16_t light_ctl_temp_to_level(uint16_t temp)
 {
 	float tmp;
 
@@ -108,34 +108,34 @@ static s16_t light_ctl_temp_to_level(u16_t temp)
 
 	tmp = tmp / (ctl->temp->range_max - ctl->temp->range_min);
 
-	return (s16_t) (tmp + INT16_MIN);
+	return (int16_t) (tmp + INT16_MIN);
 
 	/* 6.1.3.1.1 2nd formula end */
 }
 
-u16_t level_to_light_ctl_temp(s16_t level)
+uint16_t level_to_light_ctl_temp(int16_t level)
 {
-	u16_t tmp;
+	uint16_t tmp;
 	float diff;
 
 	/* Mesh Model Specification 6.1.3.1.1 1st formula start */
 	diff = (float) (ctl->temp->range_max - ctl->temp->range_min) /
 		       UINT16_MAX;
 
-	tmp = (u16_t) ((level - INT16_MIN) * diff);
+	tmp = (uint16_t) ((level - INT16_MIN) * diff);
 
 	return (ctl->temp->range_min + tmp);
 
 	/* 6.1.3.1.1 1st formula end */
 }
 
-void set_target(u8_t type, void *dptr)
+void set_target(uint8_t type, void *dptr)
 {
 	switch (type) {
 	case ONOFF: {
-		u8_t onoff;
+		uint8_t onoff;
 
-		onoff = *((u8_t *) dptr);
+		onoff = *((uint8_t *) dptr);
 		if (onoff == STATE_OFF) {
 			ctl->light->target = 0U;
 		} else if (onoff == STATE_ON) {
@@ -148,40 +148,40 @@ void set_target(u8_t type, void *dptr)
 	}
 	break;
 	case LEVEL_LIGHT:
-		ctl->light->target = *((s16_t *) dptr) - INT16_MIN;
+		ctl->light->target = *((int16_t *) dptr) - INT16_MIN;
 		ctl->light->target = constrain_lightness(ctl->light->target);
 		break;
 	case DELTA_LEVEL_LIGHT:
-		ctl->light->target =  *((s16_t *) dptr) - INT16_MIN;
+		ctl->light->target =  *((int16_t *) dptr) - INT16_MIN;
 		constrain_target_lightness2();
 		break;
 	case MOVE_LIGHT:
-		ctl->light->target = *((u16_t *) dptr);
+		ctl->light->target = *((uint16_t *) dptr);
 		break;
 	case ACTUAL:
-		ctl->light->target = *((u16_t *) dptr);
+		ctl->light->target = *((uint16_t *) dptr);
 		ctl->light->target = constrain_lightness(ctl->light->target);
 		break;
 	case LINEAR:
-		ctl->light->target = linear_to_actual(*((u16_t *) dptr));
+		ctl->light->target = linear_to_actual(*((uint16_t *) dptr));
 		ctl->light->target = constrain_lightness(ctl->light->target);
 		break;
 	case CTL_LIGHT:
-		ctl->light->target = *((u16_t *) dptr);
+		ctl->light->target = *((uint16_t *) dptr);
 		ctl->light->target = constrain_lightness(ctl->light->target);
 		break;
 	case LEVEL_TEMP:
-		ctl->temp->target = level_to_light_ctl_temp(*((s16_t *) dptr));
+		ctl->temp->target = level_to_light_ctl_temp(*((int16_t *) dptr));
 		break;
 	case MOVE_TEMP:
-		ctl->temp->target = *((u16_t *) dptr);
+		ctl->temp->target = *((uint16_t *) dptr);
 		break;
 	case CTL_TEMP:
-		ctl->temp->target = *((u16_t *) dptr);
+		ctl->temp->target = *((uint16_t *) dptr);
 		ctl->temp->target = constrain_temperature(ctl->temp->target);
 		break;
 	case CTL_DELTA_UV:
-		ctl->duv->target = *((s16_t *) dptr);
+		ctl->duv->target = *((int16_t *) dptr);
 		break;
 	default:
 		return;
@@ -192,7 +192,7 @@ void set_target(u8_t type, void *dptr)
 	}
 }
 
-int get_current(u8_t type)
+int get_current(uint8_t type)
 {
 	switch (type) {
 	case ONOFF:
@@ -206,7 +206,7 @@ int get_current(u8_t type)
 			}
 		}
 	case LEVEL_LIGHT:
-		return (s16_t) (ctl->light->current + INT16_MIN);
+		return (int16_t) (ctl->light->current + INT16_MIN);
 	case ACTUAL:
 		return ctl->light->current;
 	case LINEAR:
@@ -224,7 +224,7 @@ int get_current(u8_t type)
 	}
 }
 
-int get_target(u8_t type)
+int get_target(uint8_t type)
 {
 	switch (type) {
 	case ONOFF:
@@ -234,7 +234,7 @@ int get_target(u8_t type)
 			return STATE_OFF;
 		}
 	case LEVEL_LIGHT:
-		return (s16_t) (ctl->light->target + INT16_MIN);
+		return (int16_t) (ctl->light->target + INT16_MIN);
 	case ACTUAL:
 		return ctl->light->target;
 	case LINEAR:
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h
index 552014c208..90d6ae4902 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h
@@ -24,12 +24,12 @@ enum state_binding {
 	CTL_DELTA_UV
 };
 
-u16_t constrain_lightness(u16_t light);
-u16_t constrain_temperature(u16_t temp);
-u16_t level_to_light_ctl_temp(s16_t level);
+uint16_t constrain_lightness(uint16_t light);
+uint16_t constrain_temperature(uint16_t temp);
+uint16_t level_to_light_ctl_temp(int16_t level);
 
-void set_target(u8_t type, void *dptr);
-int get_current(u8_t type);
-int get_target(u8_t type);
+void set_target(uint8_t type, void *dptr);
+int get_current(uint8_t type);
+int get_target(uint8_t type);
 
 #endif
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
index b72fb76ac5..760f5b60c3 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
@@ -19,9 +19,9 @@ struct transition transition;
 
 void calculate_rt(struct transition *transition)
 {
-	u8_t steps, resolution;
-	s32_t duration_remainder;
-	s64_t now;
+	uint8_t steps, resolution;
+	int32_t duration_remainder;
+	int64_t now;
 
 	if (transition->type == MOVE) {
 		transition->rt = UNKNOWN_VALUE;
@@ -64,7 +64,7 @@ void calculate_rt(struct transition *transition)
 
 static bool set_transition_counter(struct transition *transition)
 {
-	u8_t steps_multiplier, resolution;
+	uint8_t steps_multiplier, resolution;
 
 	resolution = (transition->tt >> 6);
 	steps_multiplier = (transition->tt & 0x3F);
@@ -96,7 +96,7 @@ static bool set_transition_counter(struct transition *transition)
 	return true;
 }
 
-void set_transition_values(u8_t type)
+void set_transition_values(uint8_t type)
 {
 	if (!set_transition_counter(ctl->transition)) {
 		return;
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h
index a26ad7a28d..468ea74794 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h
@@ -20,14 +20,14 @@ enum transition_types {
 
 struct transition {
 	bool just_started;
-	u8_t type;
-	u8_t tt;
-	u8_t rt;
-	u8_t delay;
-	u32_t quo_tt;
-	u32_t counter;
-	u32_t total_duration;
-	s64_t start_timestamp;
+	uint8_t type;
+	uint8_t tt;
+	uint8_t rt;
+	uint8_t delay;
+	uint32_t quo_tt;
+	uint32_t counter;
+	uint32_t total_duration;
+	int64_t start_timestamp;
 
 	struct k_timer timer;
 };
@@ -37,7 +37,7 @@ extern struct transition transition;
 extern struct k_timer dummy_timer;
 
 void calculate_rt(struct transition *transition);
-void set_transition_values(u8_t type);
+void set_transition_values(uint8_t type);
 
 void onoff_handler(void);
 void level_lightness_handler(void);
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c
index 7a56d5d318..c343a624d5 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c
@@ -9,8 +9,8 @@
 #include "device_composition.h"
 #include "storage.h"
 
-static u8_t storage_id;
-u8_t reset_counter;
+static uint8_t storage_id;
+uint8_t reset_counter;
 
 static void save_reset_counter(void)
 {
@@ -59,7 +59,7 @@ static void save_last_target_states(void)
 
 static void save_lightness_range(void)
 {
-	ctl->light->range = (u32_t) ((ctl->light->range_max << 16) |
+	ctl->light->range = (uint32_t) ((ctl->light->range_max << 16) |
 				     ctl->light->range_min);
 
 	settings_save_one("ps/lr", &ctl->light->range,
@@ -68,7 +68,7 @@ static void save_lightness_range(void)
 
 static void save_temperature_range(void)
 {
-	ctl->temp->range = (u32_t) ((ctl->temp->range_max << 16) |
+	ctl->temp->range = (uint32_t) ((ctl->temp->range_max << 16) |
 				    ctl->temp->range_min);
 
 	settings_save_one("ps/tr", &ctl->temp->range, sizeof(ctl->temp->range));
@@ -106,7 +106,7 @@ static void storage_work_handler(struct k_work *work)
 
 K_WORK_DEFINE(storage_work, storage_work_handler);
 
-void save_on_flash(u8_t id)
+void save_on_flash(uint8_t id)
 {
 	storage_id = id;
 	k_work_submit(&storage_work);
diff --git a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h
index 81c68c6085..b06e8c7b92 100644
--- a/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h
+++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h
@@ -23,11 +23,11 @@ enum ps_variables_id {
 	TEMPERATURE_RANGE
 };
 
-extern u8_t reset_counter;
+extern uint8_t reset_counter;
 
 extern struct k_work storage_work;
 
 int ps_settings_init(void);
-void save_on_flash(u8_t id);
+void save_on_flash(uint8_t id);
 
 #endif
diff --git a/samples/boards/nrf/nrfx/src/main.c b/samples/boards/nrf/nrfx/src/main.c
index a38b7d65e8..2e0fa18c30 100644
--- a/samples/boards/nrf/nrfx/src/main.c
+++ b/samples/boards/nrf/nrfx/src/main.c
@@ -78,7 +78,7 @@ void main(void)
 	LOG_INF("nrfx_gpiote initialized");
 
 	/* Initialize DPPI channel */
-	u8_t channel;
+	uint8_t channel;
 
 	err = nrfx_dppi_channel_alloc(&channel);
 	if (err != NRFX_SUCCESS) {
diff --git a/samples/boards/olimex_stm32_e407/ccm/src/main.c b/samples/boards/olimex_stm32_e407/ccm/src/main.c
index 0bcbc01f61..7dea05524f 100644
--- a/samples/boards/olimex_stm32_e407/ccm/src/main.c
+++ b/samples/boards/olimex_stm32_e407/ccm/src/main.c
@@ -21,21 +21,21 @@
 
 #define CCM_DATA_ARRAY_VAL(i)	(((i)+1)*0x11)
 
-u8_t __ccm_data_section ccm_data_var_8 = CCM_DATA_VAR_8_VAL;
-u16_t __ccm_data_section ccm_data_var_16 = CCM_DATA_VAR_16_VAL;
-u32_t __ccm_data_section ccm_data_var_32 = CCM_DATA_VAR_32_VAL;
+uint8_t __ccm_data_section ccm_data_var_8 = CCM_DATA_VAR_8_VAL;
+uint16_t __ccm_data_section ccm_data_var_16 = CCM_DATA_VAR_16_VAL;
+uint32_t __ccm_data_section ccm_data_var_32 = CCM_DATA_VAR_32_VAL;
 
-u8_t __ccm_data_section ccm_data_array[CCM_DATA_ARRAY_SIZE] = {
+uint8_t __ccm_data_section ccm_data_array[CCM_DATA_ARRAY_SIZE] = {
 	CCM_DATA_ARRAY_VAL(0),
 	CCM_DATA_ARRAY_VAL(1),
 	CCM_DATA_ARRAY_VAL(2),
 	CCM_DATA_ARRAY_VAL(3),
 	CCM_DATA_ARRAY_VAL(4),
 };
-u8_t __ccm_bss_section ccm_bss_array[CCM_BSS_ARRAY_SIZE];
-u8_t __ccm_noinit_section ccm_noinit_array[CCM_NOINIT_ARRAY_SIZE];
+uint8_t __ccm_bss_section ccm_bss_array[CCM_BSS_ARRAY_SIZE];
+uint8_t __ccm_noinit_section ccm_noinit_array[CCM_NOINIT_ARRAY_SIZE];
 
-void print_array(const void *array, u32_t size)
+void print_array(const void *array, uint32_t size)
 {
 	int i;
 
diff --git a/samples/boards/reel_board/mesh_badge/src/board.h b/samples/boards/reel_board/mesh_badge/src/board.h
index fb9073fa1e..0790d45b2e 100644
--- a/samples/boards/reel_board/mesh_badge/src/board.h
+++ b/samples/boards/reel_board/mesh_badge/src/board.h
@@ -16,11 +16,11 @@ enum periph_device {
 void board_refresh_display(void);
 void board_show_text(const char *text, bool center, k_timeout_t duration);
 void board_blink_leds(void);
-void board_add_hello(u16_t addr, const char *name);
-void board_add_heartbeat(u16_t addr, u8_t hops);
+void board_add_hello(uint16_t addr, const char *name);
+void board_add_heartbeat(uint16_t addr, uint8_t hops);
 int get_hdc1010_val(struct sensor_value *val);
 int get_mma8652_val(struct sensor_value *val);
 int get_apds9960_val(struct sensor_value *val);
-int set_led_state(u8_t id, bool state);
+int set_led_state(uint8_t id, bool state);
 int periphs_init(void);
 int board_init(void);
diff --git a/samples/boards/reel_board/mesh_badge/src/main.c b/samples/boards/reel_board/mesh_badge/src/main.c
index 19c78ac763..30df8c731e 100644
--- a/samples/boards/reel_board/mesh_badge/src/main.c
+++ b/samples/boards/reel_board/mesh_badge/src/main.c
@@ -23,7 +23,7 @@ static const struct bt_data ad[] = {
 };
 
 static ssize_t read_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = bt_get_name();
 
@@ -32,8 +32,8 @@ static ssize_t read_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t write_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			  const void *buf, u16_t len, u16_t offset,
-			  u8_t flags)
+			  const void *buf, uint16_t len, uint16_t offset,
+			  uint8_t flags)
 {
 	char name[CONFIG_BT_DEVICE_NAME_MAX];
 	int err;
@@ -119,7 +119,7 @@ const struct bt_conn_auth_cb auth_cb = {
 	.pairing_failed = pairing_failed,
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	printk("Connected (err 0x%02x)\n", err);
 
@@ -130,7 +130,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
diff --git a/samples/boards/reel_board/mesh_badge/src/mesh.c b/samples/boards/reel_board/mesh_badge/src/mesh.c
index d6a33d68c7..b4486bb536 100644
--- a/samples/boards/reel_board/mesh_badge/src/mesh.c
+++ b/samples/boards/reel_board/mesh_badge/src/mesh.c
@@ -45,15 +45,15 @@ enum {
 };
 
 struct sensor_hdr_a {
-	u16_t prop_id:11;
-	u16_t length:4;
-	u16_t format:1;
+	uint16_t prop_id:11;
+	uint16_t length:4;
+	uint16_t format:1;
 } __packed;
 
 struct sensor_hdr_b {
-	u8_t length:7;
-	u8_t format:1;
-	u16_t prop_id;
+	uint8_t length:7;
+	uint8_t format:1;
+	uint16_t prop_id;
 } __packed;
 
 static struct k_work hello_work;
@@ -66,7 +66,7 @@ static struct led_onoff_state led_onoff_state[] = {
 	{ .dev_id = 0 },
 };
 
-static void heartbeat(u8_t hops, u16_t feat)
+static void heartbeat(uint8_t hops, uint16_t feat)
 {
 	board_show_text("Heartbeat Received", false, K_SECONDS(2));
 }
@@ -130,8 +130,8 @@ static void gen_onoff_set_unack(struct bt_mesh_model *model,
 	struct net_buf_simple *msg = model->pub->msg;
 	struct led_onoff_state *state = model->user_data;
 	int err;
-	u8_t tid, onoff;
-	s64_t now;
+	uint8_t tid, onoff;
+	int64_t now;
 
 	onoff = net_buf_simple_pull_u8(buf);
 	tid = net_buf_simple_pull_u8(buf);
@@ -206,7 +206,7 @@ static void sens_temperature_celsius_fill(struct net_buf_simple *msg)
 	struct sensor_hdr_a hdr;
 	/* TODO Get only temperature from sensor */
 	struct sensor_value val[2];
-	s16_t temp_degrees;
+	int16_t temp_degrees;
 
 	hdr.format = SENSOR_HDR_A;
 	hdr.length = sizeof(temp_degrees);
@@ -219,7 +219,7 @@ static void sens_temperature_celsius_fill(struct net_buf_simple *msg)
 	net_buf_simple_add_le16(msg, temp_degrees);
 }
 
-static void sens_unknown_fill(u16_t id, struct net_buf_simple *msg)
+static void sens_unknown_fill(uint16_t id, struct net_buf_simple *msg)
 {
 	struct sensor_hdr_b hdr;
 
@@ -239,7 +239,7 @@ static void sens_unknown_fill(u16_t id, struct net_buf_simple *msg)
 	net_buf_simple_add_mem(msg, &hdr, sizeof(hdr));
 }
 
-static void sensor_create_status(u16_t id, struct net_buf_simple *msg)
+static void sensor_create_status(uint16_t id, struct net_buf_simple *msg)
 {
 	bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_SENS_STATUS);
 
@@ -258,7 +258,7 @@ static void sensor_get(struct bt_mesh_model *model,
 		       struct net_buf_simple *buf)
 {
 	NET_BUF_SIMPLE_DEFINE(msg, 1 + MAX_SENS_STATUS_LEN + 4);
-	u16_t sensor_id;
+	uint16_t sensor_id;
 
 	sensor_id = net_buf_simple_pull_le16(buf);
 	sensor_create_status(sensor_id, &msg);
@@ -367,7 +367,7 @@ static void vnd_heartbeat(struct bt_mesh_model *model,
 			  struct bt_mesh_msg_ctx *ctx,
 			  struct net_buf_simple *buf)
 {
-	u8_t init_ttl, hops;
+	uint8_t init_ttl, hops;
 
 	/* Ignore messages from self */
 	if (ctx->addr == bt_mesh_model_elem(model)->addr) {
@@ -489,11 +489,11 @@ void mesh_send_baduser(void)
 
 static int provision_and_configure(void)
 {
-	static const u8_t net_key[16] = {
+	static const uint8_t net_key[16] = {
 		0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
 		0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
 	};
-	static const u8_t app_key[16] = {
+	static const uint8_t app_key[16] = {
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 	};
@@ -503,8 +503,8 @@ static int provision_and_configure(void)
 		.ttl = DEFAULT_TTL,
 		.period = BT_MESH_PUB_PERIOD_SEC(10),
 	};
-	u8_t dev_key[16];
-	u16_t addr;
+	uint8_t dev_key[16];
+	uint16_t addr;
 	int err;
 
 	err = bt_rand(dev_key, sizeof(dev_key));
@@ -586,14 +586,14 @@ bool mesh_is_initialized(void)
 	return elements[0].addr != BT_MESH_ADDR_UNASSIGNED;
 }
 
-u16_t mesh_get_addr(void)
+uint16_t mesh_get_addr(void)
 {
 	return elements[0].addr;
 }
 
 int mesh_init(void)
 {
-	static const u8_t dev_uuid[16] = { 0xc0, 0xff, 0xee };
+	static const uint8_t dev_uuid[16] = { 0xc0, 0xff, 0xee };
 	static const struct bt_mesh_prov prov = {
 		.uuid = dev_uuid,
 	};
diff --git a/samples/boards/reel_board/mesh_badge/src/mesh.h b/samples/boards/reel_board/mesh_badge/src/mesh.h
index 0790b5e5bd..ed66e0ad0a 100644
--- a/samples/boards/reel_board/mesh_badge/src/mesh.h
+++ b/samples/boards/reel_board/mesh_badge/src/mesh.h
@@ -24,19 +24,19 @@
 #define BT_MESH_MODEL_OP_SENS_STATUS		BT_MESH_MODEL_OP_1(0x52)
 
 struct led_onoff_state {
-	u8_t current;
-	u8_t previous;
-	u8_t dev_id;
+	uint8_t current;
+	uint8_t previous;
+	uint8_t dev_id;
 
-	u8_t last_tid;
-	u16_t last_tx_addr;
-	s64_t last_msg_timestamp;
+	uint8_t last_tid;
+	uint16_t last_tx_addr;
+	int64_t last_msg_timestamp;
 };
 
 void mesh_send_hello(void);
 void mesh_send_baduser(void);
 
-u16_t mesh_get_addr(void);
+uint16_t mesh_get_addr(void);
 bool mesh_is_initialized(void);
 void mesh_start(void);
 int mesh_init(void);
diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c
index 6daadc8879..e35f941377 100644
--- a/samples/boards/reel_board/mesh_badge/src/reel_board.c
+++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c
@@ -37,7 +37,7 @@ enum screen_ids {
 };
 
 struct font_info {
-	u8_t columns;
+	uint8_t columns;
 } fonts[] = {
 	[FONT_BIG] =    { .columns = 12 },
 	[FONT_MEDIUM] = { .columns = 16 },
@@ -50,7 +50,7 @@ struct font_info {
 
 static struct device *epd_dev;
 static bool pressed;
-static u8_t screen_id = SCREEN_MAIN;
+static uint8_t screen_id = SCREEN_MAIN;
 static struct device *gpio;
 static struct k_delayed_work epd_work;
 static struct k_delayed_work long_press_work;
@@ -78,8 +78,8 @@ struct k_delayed_work led_timer;
 static size_t print_line(enum font_size font_size, int row, const char *text,
 			 size_t len, bool center)
 {
-	u8_t font_height, font_width;
-	u8_t line[fonts[FONT_SMALL].columns + 1];
+	uint8_t font_height, font_width;
+	uint8_t line[fonts[FONT_SMALL].columns + 1];
 	int pad;
 
 	cfb_framebuffer_set_font(epd_dev, font_size);
@@ -168,12 +168,12 @@ void board_show_text(const char *text, bool center, k_timeout_t duration)
 }
 
 static struct stat {
-	u16_t addr;
+	uint16_t addr;
 	char name[9];
-	u8_t min_hops;
-	u8_t max_hops;
-	u16_t hello_count;
-	u16_t heartbeat_count;
+	uint8_t min_hops;
+	uint8_t max_hops;
+	uint16_t hello_count;
+	uint16_t heartbeat_count;
 } stats[STAT_COUNT] = {
 	[0 ... (STAT_COUNT - 1)] = {
 		.min_hops = BT_MESH_TTL_MAX,
@@ -181,11 +181,11 @@ static struct stat {
 	},
 };
 
-static u32_t stat_count;
+static uint32_t stat_count;
 
 #define NO_UPDATE -1
 
-static int add_hello(u16_t addr, const char *name)
+static int add_hello(uint16_t addr, const char *name)
 {
 	int i;
 
@@ -216,7 +216,7 @@ static int add_hello(u16_t addr, const char *name)
 	return NO_UPDATE;
 }
 
-static int add_heartbeat(u16_t addr, u8_t hops)
+static int add_heartbeat(uint16_t addr, uint8_t hops)
 {
 	int i;
 
@@ -251,18 +251,18 @@ static int add_heartbeat(u16_t addr, u8_t hops)
 	return NO_UPDATE;
 }
 
-void board_add_hello(u16_t addr, const char *name)
+void board_add_hello(uint16_t addr, const char *name)
 {
-	u32_t sort_i;
+	uint32_t sort_i;
 
 	sort_i = add_hello(addr, name);
 	if (sort_i != NO_UPDATE) {
 	}
 }
 
-void board_add_heartbeat(u16_t addr, u8_t hops)
+void board_add_heartbeat(uint16_t addr, uint8_t hops)
 {
-	u32_t sort_i;
+	uint32_t sort_i;
 
 	sort_i = add_heartbeat(addr, hops);
 	if (sort_i != NO_UPDATE) {
@@ -345,8 +345,8 @@ static void show_statistics(void)
 static void show_sensors_data(k_timeout_t interval)
 {
 	struct sensor_value val[3];
-	u8_t line = 0U;
-	u16_t len = 0U;
+	uint8_t line = 0U;
+	uint16_t len = 0U;
 
 	cfb_framebuffer_clear(epd_dev, false);
 
@@ -448,7 +448,7 @@ static bool button_is_pressed(void)
 }
 
 static void button_interrupt(struct device *dev, struct gpio_callback *cb,
-			     u32_t pins)
+			     uint32_t pins)
 {
 	if (button_is_pressed() == pressed) {
 		return;
@@ -475,8 +475,8 @@ static void button_interrupt(struct device *dev, struct gpio_callback *cb,
 		return;
 	case SCREEN_MAIN:
 		if (pins & BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios))) {
-			u32_t uptime = k_uptime_get_32();
-			static u32_t bad_count, press_ts;
+			uint32_t uptime = k_uptime_get_32();
+			static uint32_t bad_count, press_ts;
 
 			if (uptime - press_ts < 500) {
 				bad_count++;
@@ -526,7 +526,7 @@ static int configure_button(void)
 	return 0;
 }
 
-int set_led_state(u8_t id, bool state)
+int set_led_state(uint8_t id, bool state)
 {
 	return gpio_pin_set(leds[id].dev, leds[id].pin, state);
 }
diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
index a6848e975d..d66466f9d2 100644
--- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
+++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/ext_flash.c
@@ -21,9 +21,9 @@
 /*
  *  ======== CC1352R1_LAUNCHXL_sendExtFlashByte ========
  */
-void CC1352R1_LAUNCHXL_sendExtFlashByte(struct device *dev, u8_t byte)
+void CC1352R1_LAUNCHXL_sendExtFlashByte(struct device *dev, uint8_t byte)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* SPI Flash CS */
 	gpio_pin_set(dev, DIO20_PIN, 0);
@@ -78,7 +78,7 @@ void CC1352R1_LAUNCHXL_wakeUpExtFlash(struct device *dev)
 void CC1352R1_LAUNCHXL_shutDownExtFlash(void)
 {
 	struct device *dev;
-	u8_t extFlashShutdown = 0xB9;
+	uint8_t extFlashShutdown = 0xB9;
 
 	dev = device_get_binding(GPIO_PORT);
 	/* Set SPI Flash CS pin as output */
diff --git a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
index e6a0c322ee..9d629d9279 100644
--- a/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
+++ b/samples/boards/ti/cc13x2_cc26x2/system_off/src/main.c
@@ -27,7 +27,7 @@ extern void CC1352R1_LAUNCHXL_shutDownExtFlash(void);
 
 void main(void)
 {
-	u32_t config, status;
+	uint32_t config, status;
 	struct device *gpiob;
 
 	printk("\n%s system off demo\n", CONFIG_BOARD);
diff --git a/samples/boards/up_squared/gpio_counter/src/main.c b/samples/boards/up_squared/gpio_counter/src/main.c
index 39cb4a7597..4faae6e31c 100644
--- a/samples/boards/up_squared/gpio_counter/src/main.c
+++ b/samples/boards/up_squared/gpio_counter/src/main.c
@@ -38,8 +38,8 @@
  */
 
 struct _pin {
-	u32_t		hat_num;
-	u32_t		pin;
+	uint32_t		hat_num;
+	uint32_t		pin;
 	const char	*gpio_dev_name;
 	struct device	*gpio_dev;
 };
@@ -75,14 +75,14 @@ struct _pin intr_pin = {
 
 static struct gpio_callback gpio_cb;
 
-static volatile u32_t counter;
+static volatile uint32_t counter;
 
 K_SEM_DEFINE(counter_sem, 0, 1);
 
 #define NUM_PINS	ARRAY_SIZE(counter_pins)
 #define MASK		(BIT(NUM_PINS) - 1)
 
-void button_cb(struct device *gpiodev, struct gpio_callback *cb, u32_t pin)
+void button_cb(struct device *gpiodev, struct gpio_callback *cb, uint32_t pin)
 {
 	counter++;
 	k_sem_give(&counter_sem);
@@ -102,7 +102,7 @@ int get_gpio_dev(struct _pin *pin)
 
 void main(void)
 {
-	u32_t val;
+	uint32_t val;
 	int i, ret;
 
 	for (i = 0; i < NUM_PINS; i++) {
diff --git a/samples/display/cfb/src/main.c b/samples/display/cfb/src/main.c
index 27343aaf1f..e6fc64482b 100644
--- a/samples/display/cfb/src/main.c
+++ b/samples/display/cfb/src/main.c
@@ -24,10 +24,10 @@
 void main(void)
 {
 	struct device *dev;
-	u16_t rows;
-	u8_t ppt;
-	u8_t font_width;
-	u8_t font_height;
+	uint16_t rows;
+	uint8_t ppt;
+	uint8_t font_width;
+	uint8_t font_height;
 
 	dev = device_get_binding(DISPLAY_DRIVER);
 
diff --git a/samples/display/grove_display/src/main.c b/samples/display/grove_display/src/main.c
index d27168792b..f352ef4922 100644
--- a/samples/display/grove_display/src/main.c
+++ b/samples/display/grove_display/src/main.c
@@ -20,7 +20,7 @@
 /* sleep time in msec */
 #define SLEEPTIME  100
 
-u8_t clamp_rgb(int val)
+uint8_t clamp_rgb(int val)
 {
 	if (val > 255) {
 		return 255;
@@ -36,9 +36,9 @@ void main(void)
 	struct device *glcd;
 	char str[20];
 	int rgb[] = { 0x0, 0x0, 0x0 };
-	u8_t rgb_chg[3];
-	const u8_t rgb_step = 16U;
-	u8_t set_config;
+	uint8_t rgb_chg[3];
+	const uint8_t rgb_step = 16U;
+	uint8_t set_config;
 	int i, j, m;
 	int cnt;
 
diff --git a/samples/display/lvgl/src/main.c b/samples/display/lvgl/src/main.c
index 294d0be334..e04a9f318a 100644
--- a/samples/display/lvgl/src/main.c
+++ b/samples/display/lvgl/src/main.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(app);
 
 void main(void)
 {
-	u32_t count = 0U;
+	uint32_t count = 0U;
 	char count_str[11] = {0};
 	struct device *display_dev;
 	lv_obj_t *hello_world_label;
diff --git a/samples/drivers/can/src/main.c b/samples/drivers/can/src/main.c
index 1e857e37a6..7437052455 100644
--- a/samples/drivers/can/src/main.c
+++ b/samples/drivers/can/src/main.c
@@ -36,7 +36,7 @@ struct can_bus_err_cnt current_err_cnt;
 
 CAN_DEFINE_MSGQ(counter_msgq, 2);
 
-void tx_irq_callback(u32_t error_flags, void *arg)
+void tx_irq_callback(uint32_t error_flags, void *arg)
 {
 	char *sender = (char *)arg;
 
@@ -73,7 +73,7 @@ void rx_thread(void *arg1, void *arg2, void *arg3)
 		}
 
 		printk("Counter received: %u\n",
-		       sys_be16_to_cpu(UNALIGNED_GET((u16_t *)&msg.data)));
+		       sys_be16_to_cpu(UNALIGNED_GET((uint16_t *)&msg.data)));
 	}
 }
 
@@ -190,8 +190,8 @@ void main(void)
 		.ext_id = COUNTER_MSG_ID,
 		.dlc = 2
 	};
-	u8_t toggle = 1;
-	u16_t counter = 0;
+	uint8_t toggle = 1;
+	uint16_t counter = 0;
 	struct device *led_gpio_dev = NULL;
 	k_tid_t rx_tid, get_state_tid;
 	int ret;
@@ -267,7 +267,7 @@ void main(void)
 		k_sleep(SLEEP_TIME);
 
 		UNALIGNED_PUT(sys_cpu_to_be16(counter),
-			      (u16_t *)&counter_frame.data[0]);
+			      (uint16_t *)&counter_frame.data[0]);
 		counter++;
 		/* This sending call is blocking until the message is sent. */
 		can_send(can_dev, &counter_frame, K_MSEC(100), NULL, NULL);
diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c
index 4c96ea1f07..6be6662156 100644
--- a/samples/drivers/counter/alarm/src/main.c
+++ b/samples/drivers/counter/alarm/src/main.c
@@ -24,12 +24,12 @@ struct counter_alarm_cfg alarm_cfg;
 #endif
 
 static void test_counter_interrupt_fn(struct device *counter_dev,
-				      u8_t chan_id, u32_t ticks,
+				      uint8_t chan_id, uint32_t ticks,
 				      void *user_data)
 {
 	struct counter_alarm_cfg *config = user_data;
-	u32_t now_ticks;
-	u64_t now_usec;
+	uint32_t now_ticks;
+	uint64_t now_usec;
 	int now_sec;
 	int err;
 
@@ -49,7 +49,7 @@ static void test_counter_interrupt_fn(struct device *counter_dev,
 	config->ticks = config->ticks * 2U;
 
 	printk("Set alarm in %u sec (%u ticks)\n",
-	       (u32_t)(counter_ticks_to_us(counter_dev,
+	       (uint32_t)(counter_ticks_to_us(counter_dev,
 					   config->ticks) / USEC_PER_SEC),
 	       config->ticks);
 
@@ -82,7 +82,7 @@ void main(void)
 	err = counter_set_channel_alarm(counter_dev, ALARM_CHANNEL_ID,
 					&alarm_cfg);
 	printk("Set alarm in %u sec (%u ticks)\n",
-	       (u32_t)(counter_ticks_to_us(counter_dev,
+	       (uint32_t)(counter_ticks_to_us(counter_dev,
 					   alarm_cfg.ticks) / USEC_PER_SEC),
 	       alarm_cfg.ticks);
 
diff --git a/samples/drivers/counter/maxim_ds3231/src/main.c b/samples/drivers/counter/maxim_ds3231/src/main.c
index 3fb7c919b9..9087f0fa4b 100644
--- a/samples/drivers/counter/maxim_ds3231/src/main.c
+++ b/samples/drivers/counter/maxim_ds3231/src/main.c
@@ -31,8 +31,8 @@ static const char *format_time(time_t time,
 }
 
 static void sec_counter_callback(struct device *dev,
-				 u8_t id,
-				 u32_t ticks,
+				 uint8_t id,
+				 uint32_t ticks,
 				 void *ud)
 {
 	printk("Counter callback at %u ms, id %d, ticks %u, ud %p\n",
@@ -40,11 +40,11 @@ static void sec_counter_callback(struct device *dev,
 }
 
 static void sec_alarm_handler(struct device *dev,
-			      u8_t id,
-			      u32_t syncclock,
+			      uint8_t id,
+			      uint32_t syncclock,
 			      void *ud)
 {
-	u32_t now = maxim_ds3231_read_syncclock(dev);
+	uint32_t now = maxim_ds3231_read_syncclock(dev);
 	struct counter_alarm_cfg alarm = {
 		.callback = sec_counter_callback,
 		.ticks = 10,
@@ -95,42 +95,42 @@ void timespec_add(struct timespec *apb,
 }
 
 static void min_alarm_handler(struct device *dev,
-			      u8_t id,
-			      u32_t syncclock,
+			      uint8_t id,
+			      uint32_t syncclock,
 			      void *ud)
 {
-	u32_t time = 0;
+	uint32_t time = 0;
 	struct maxim_ds3231_syncpoint sp = { 0 };
 
 	(void)counter_get_value(dev, &time);
 
-	u32_t uptime = k_uptime_get_32();
-	u8_t us = uptime % 1000U;
+	uint32_t uptime = k_uptime_get_32();
+	uint8_t us = uptime % 1000U;
 
 	uptime /= 1000U;
-	u8_t se = uptime % 60U;
+	uint8_t se = uptime % 60U;
 
 	uptime /= 60U;
-	u8_t mn = uptime % 60U;
+	uint8_t mn = uptime % 60U;
 
 	uptime /= 60U;
-	u8_t hr = uptime;
+	uint8_t hr = uptime;
 
 	(void)maxim_ds3231_get_syncpoint(dev, &sp);
 
-	u32_t offset_syncclock = syncclock - sp.syncclock;
-	u32_t offset_s = time - (u32_t)sp.rtc.tv_sec;
-	u32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(dev);
+	uint32_t offset_syncclock = syncclock - sp.syncclock;
+	uint32_t offset_s = time - (uint32_t)sp.rtc.tv_sec;
+	uint32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(dev);
 	struct timespec adj;
 
 	adj.tv_sec = offset_syncclock / syncclock_Hz;
 	adj.tv_nsec = (offset_syncclock % syncclock_Hz)
-		* (u64_t)NSEC_PER_SEC / syncclock_Hz;
+		* (uint64_t)NSEC_PER_SEC / syncclock_Hz;
 
-	s32_t err_ppm = (s32_t)(offset_syncclock
+	int32_t err_ppm = (int32_t)(offset_syncclock
 				- offset_s * syncclock_Hz)
-			* (s64_t)1000000
-			/ (s32_t)syncclock_Hz / (s32_t)offset_s;
+			* (int64_t)1000000
+			/ (int32_t)syncclock_Hz / (int32_t)offset_s;
 	struct timespec *ts = &sp.rtc;
 
 	ts->tv_sec += adj.tv_sec;
@@ -142,7 +142,7 @@ static void min_alarm_handler(struct device *dev,
 
 	printk("%s: adj %d.%09lu, uptime %u:%02u:%02u.%03u, clk err %d ppm\n",
 	       format_time(time, -1),
-	       (u32_t)(ts->tv_sec - time), ts->tv_nsec,
+	       (uint32_t)(ts->tv_sec - time), ts->tv_nsec,
 	       hr, mn, se, us, err_ppm);
 }
 
@@ -151,7 +151,7 @@ struct maxim_ds3231_alarm min_alarm;
 
 static void show_counter(struct device *ds3231)
 {
-	u32_t now = 0;
+	uint32_t now = 0;
 
 	printk("\nCounter at %p\n", ds3231);
 	printk("\tMax top value: %u (%08x)\n",
@@ -182,16 +182,16 @@ static void set_aligned_clock(struct device *ds3231)
 		return;
 	}
 
-	u32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(ds3231);
-	u32_t syncclock = maxim_ds3231_read_syncclock(ds3231);
-	u32_t now = 0;
+	uint32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(ds3231);
+	uint32_t syncclock = maxim_ds3231_read_syncclock(ds3231);
+	uint32_t now = 0;
 	int rc = counter_get_value(ds3231, &now);
-	u32_t align_hour = now + 3600 - (now % 3600);
+	uint32_t align_hour = now + 3600 - (now % 3600);
 
 	struct maxim_ds3231_syncpoint sp = {
 		.rtc = {
 			.tv_sec = align_hour,
-			.tv_nsec = (u64_t)NSEC_PER_SEC * syncclock / syncclock_Hz,
+			.tv_nsec = (uint64_t)NSEC_PER_SEC * syncclock / syncclock_Hz,
 		},
 		.syncclock = syncclock,
 	};
@@ -205,7 +205,7 @@ static void set_aligned_clock(struct device *ds3231)
 	k_poll_signal_init(&ss);
 	sys_notify_init_signal(&notify, &ss);
 
-	u32_t t0 = k_uptime_get_32();
+	uint32_t t0 = k_uptime_get_32();
 
 	rc = maxim_ds3231_set(ds3231, &sp, &notify);
 
@@ -215,7 +215,7 @@ static void set_aligned_clock(struct device *ds3231)
 	/* Wait for the set to complete */
 	rc = k_poll(&sevt, 1, K_FOREVER);
 
-	u32_t t1 = k_uptime_get_32();
+	uint32_t t1 = k_uptime_get_32();
 
 	/* Delay so log messages from sync can complete */
 	k_sleep(K_MSEC(100));
@@ -223,7 +223,7 @@ static void set_aligned_clock(struct device *ds3231)
 
 	rc = maxim_ds3231_get_syncpoint(ds3231, &sp);
 	printk("wrote sync %d: %u %u at %u\n", rc,
-	       (u32_t)sp.rtc.tv_sec, (u32_t)sp.rtc.tv_nsec,
+	       (uint32_t)sp.rtc.tv_sec, (uint32_t)sp.rtc.tv_nsec,
 	       sp.syncclock);
 }
 
@@ -238,7 +238,7 @@ void main(void)
 		return;
 	}
 
-	u32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(ds3231);
+	uint32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(ds3231);
 
 	printk("DS3231 on %s syncclock %u Hz\n\n", CONFIG_BOARD, syncclock_Hz);
 
@@ -273,14 +273,14 @@ void main(void)
 	k_poll_signal_init(&ss);
 	sys_notify_init_signal(&notify, &ss);
 
-	u32_t t0 = k_uptime_get_32();
+	uint32_t t0 = k_uptime_get_32();
 
 	rc = maxim_ds3231_synchronize(ds3231, &notify);
 	printk("\nSynchronize init: %d\n", rc);
 
 	rc = k_poll(&sevt, 1, K_FOREVER);
 
-	u32_t t1 = k_uptime_get_32();
+	uint32_t t1 = k_uptime_get_32();
 
 	k_sleep(K_MSEC(100));   /* wait for log messages */
 
@@ -288,15 +288,15 @@ void main(void)
 
 	rc = maxim_ds3231_get_syncpoint(ds3231, &sp);
 	printk("\nread sync %d: %u %u at %u\n", rc,
-	       (u32_t)sp.rtc.tv_sec, (u32_t)sp.rtc.tv_nsec,
+	       (uint32_t)sp.rtc.tv_sec, (uint32_t)sp.rtc.tv_nsec,
 	       sp.syncclock);
 
 	rc = maxim_ds3231_get_alarm(ds3231, 0, &sec_alarm);
 	printk("\nAlarm 1 flags %x at %u: %d\n", sec_alarm.flags,
-	       (u32_t)sec_alarm.time, rc);
+	       (uint32_t)sec_alarm.time, rc);
 	rc = maxim_ds3231_get_alarm(ds3231, 1, &min_alarm);
 	printk("Alarm 2 flags %x at %u: %d\n", min_alarm.flags,
-	       (u32_t)min_alarm.time, rc);
+	       (uint32_t)min_alarm.time, rc);
 
 	/* One-shot auto-disable callback in 5 s.  The handler will
 	 * then use the base device counter API to schedule a second
@@ -321,21 +321,21 @@ void main(void)
 
 	rc = maxim_ds3231_set_alarm(ds3231, 0, &sec_alarm);
 	printk("Set sec alarm %x at %u ~ %s: %d\n", sec_alarm.flags,
-	       (u32_t)sec_alarm.time, format_time(sec_alarm.time, -1), rc);
+	       (uint32_t)sec_alarm.time, format_time(sec_alarm.time, -1), rc);
 
 	rc = maxim_ds3231_set_alarm(ds3231, 1, &min_alarm);
 	printk("Set min alarm flags %x at %u ~ %s: %d\n", min_alarm.flags,
-	       (u32_t)min_alarm.time, format_time(min_alarm.time, -1), rc);
+	       (uint32_t)min_alarm.time, format_time(min_alarm.time, -1), rc);
 
 	printk("%u ms in: get alarms: %d %d\n", k_uptime_get_32(),
 	       maxim_ds3231_get_alarm(ds3231, 0, &sec_alarm),
 	       maxim_ds3231_get_alarm(ds3231, 1, &min_alarm));
 	if (rc >= 0) {
 		printk("Sec alarm flags %x at %u ~ %s\n", sec_alarm.flags,
-		       (u32_t)sec_alarm.time, format_time(sec_alarm.time, -1));
+		       (uint32_t)sec_alarm.time, format_time(sec_alarm.time, -1));
 
 		printk("Min alarm flags %x at %u ~ %s\n", min_alarm.flags,
-		       (u32_t)min_alarm.time, format_time(min_alarm.time, -1));
+		       (uint32_t)min_alarm.time, format_time(min_alarm.time, -1));
 	}
 
 	k_sleep(K_FOREVER);
diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c
index 0528fa6ed0..08a4a8ea9b 100644
--- a/samples/drivers/crypto/src/main.c
+++ b/samples/drivers/crypto/src/main.c
@@ -29,12 +29,12 @@ LOG_MODULE_REGISTER(main);
 #error "You need to enable one crypto device"
 #endif
 
-static u8_t key[16] = {
+static uint8_t key[16] = {
 	0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88,
 	0x09, 0xcf, 0x4f, 0x3c
 };
 
-static u8_t plaintext[64] = {
+static uint8_t plaintext[64] = {
 	0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11,
 	0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
 	0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46,
@@ -43,10 +43,10 @@ static u8_t plaintext[64] = {
 	0xe6, 0x6c, 0x37, 0x10
 };
 
-u32_t cap_flags;
+uint32_t cap_flags;
 
-static void print_buffer_comparison(const u8_t *wanted_result,
-				    u8_t *result, size_t length)
+static void print_buffer_comparison(const uint8_t *wanted_result,
+				    uint8_t *result, size_t length)
 {
 	int i, j;
 
@@ -77,7 +77,7 @@ static void print_buffer_comparison(const u8_t *wanted_result,
 
 int validate_hw_compatibility(struct device *dev)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 
 	flags = cipher_query_hwcaps(dev);
 	if ((flags & CAP_RAW_KEY) == 0U) {
@@ -107,21 +107,21 @@ int validate_hw_compatibility(struct device *dev)
 void ecb_mode(struct device *dev)
 {
 	/* from FIPS-197 test vectors */
-	u8_t ecb_key[16] = {
+	uint8_t ecb_key[16] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 		0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
 	};
-	u8_t ecb_plaintext[16] = {
+	uint8_t ecb_plaintext[16] = {
 		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
 		0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF
 	};
-	const u8_t ecb_ciphertext[16] = {
+	const uint8_t ecb_ciphertext[16] = {
 		0x69, 0xC4, 0xE0, 0xD8, 0x6A, 0x7B, 0x04, 0x30,
 		0xD8, 0xCD, 0xB7, 0x80, 0x70, 0xB4, 0xC5, 0x5A
 	};
 
-	u8_t encrypted[16] = {0};
-	u8_t decrypted[16] = {0};
+	uint8_t encrypted[16] = {0};
+	uint8_t decrypted[16] = {0};
 	struct cipher_ctx ini = {
 		.keylen = sizeof(ecb_key),
 		.key.bit_stream = ecb_key,
@@ -190,7 +190,7 @@ out:
 	cipher_free_session(dev, &ini);
 }
 
-static const u8_t cbc_ciphertext[80] = {
+static const uint8_t cbc_ciphertext[80] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
 	0x0c, 0x0d, 0x0e, 0x0f, 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46,
 	0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d, 0x50, 0x86, 0xcb, 0x9b,
@@ -202,8 +202,8 @@ static const u8_t cbc_ciphertext[80] = {
 
 void cbc_mode(struct device *dev)
 {
-	u8_t encrypted[80] = {0};
-	u8_t decrypted[64] = {0};
+	uint8_t encrypted[80] = {0};
+	uint8_t decrypted[64] = {0};
 	struct cipher_ctx ini = {
 		.keylen = sizeof(key),
 		.key.bit_stream = key,
@@ -222,7 +222,7 @@ void cbc_mode(struct device *dev)
 		.out_buf_max = sizeof(decrypted),
 	};
 
-	static u8_t iv[16] = {
+	static uint8_t iv[16] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
 	};
@@ -278,7 +278,7 @@ out:
 	cipher_free_session(dev, &ini);
 }
 
-static const u8_t ctr_ciphertext[64] = {
+static const uint8_t ctr_ciphertext[64] = {
 	0x22, 0xe5, 0x2f, 0xb1, 0x77, 0xd8, 0x65, 0xb2,
 	0xf7, 0xc6, 0xb5, 0x12, 0x69, 0x2d, 0x11, 0x4d,
 	0xed, 0x6c, 0x1c, 0x72, 0x25, 0xda, 0xf6, 0xa2,
@@ -291,8 +291,8 @@ static const u8_t ctr_ciphertext[64] = {
 
 void ctr_mode(struct device *dev)
 {
-	u8_t encrypted[64] = {0};
-	u8_t decrypted[64] = {0};
+	uint8_t encrypted[64] = {0};
+	uint8_t decrypted[64] = {0};
 	struct cipher_ctx ini = {
 		.keylen = sizeof(key),
 		.key.bit_stream = key,
@@ -312,7 +312,7 @@ void ctr_mode(struct device *dev)
 		.out_buf = decrypted,
 		.out_buf_max = sizeof(decrypted),
 	};
-	u8_t iv[12] = {
+	uint8_t iv[12] = {
 		0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
 		0xf8, 0xf9, 0xfa, 0xfb
 	};
@@ -368,22 +368,22 @@ out:
 }
 
 /* RFC 3610 test vector #1 */
-static u8_t ccm_key[16] = {
+static uint8_t ccm_key[16] = {
 	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb,
 	0xcc, 0xcd, 0xce, 0xcf
 };
-static u8_t ccm_nonce[13] = {
+static uint8_t ccm_nonce[13] = {
 	0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
 	0xa5
 };
-static u8_t ccm_hdr[8] = {
+static uint8_t ccm_hdr[8] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 };
-static u8_t ccm_data[23] = {
+static uint8_t ccm_data[23] = {
 	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
 	0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
 };
-static const u8_t ccm_expected[31] = {
+static const uint8_t ccm_expected[31] = {
 	0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x63, 0xd2, 0xf0, 0x66, 0xd0, 0xc2,
 	0xc0, 0xf9, 0x89, 0x80, 0x6d, 0x5f, 0x6b, 0x61, 0xda, 0xc3, 0x84, 0x17,
 	0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0
@@ -391,8 +391,8 @@ static const u8_t ccm_expected[31] = {
 
 void ccm_mode(struct device *dev)
 {
-	u8_t encrypted[50];
-	u8_t decrypted[25];
+	uint8_t encrypted[50];
+	uint8_t decrypted[25];
 	struct cipher_ctx ini = {
 		.keylen = sizeof(ccm_key),
 		.key.bit_stream = ccm_key,
@@ -480,24 +480,24 @@ out:
 }
 
 /*  MACsec GCM-AES test vector 2.4.1 */
-static u8_t gcm_key[16] = {
+static uint8_t gcm_key[16] = {
 	0x07, 0x1b, 0x11, 0x3b, 0x0c, 0xa7, 0x43, 0xfe, 0xcc, 0xcf, 0x3d, 0x05,
 	0x1f, 0x73, 0x73, 0x82
 };
-static u8_t gcm_nonce[12] = {
+static uint8_t gcm_nonce[12] = {
 	0xf0, 0x76, 0x1e, 0x8d, 0xcd, 0x3d, 0x00, 0x01, 0x76, 0xd4, 0x57, 0xed
 };
-static u8_t gcm_hdr[20] = {
+static uint8_t gcm_hdr[20] = {
 	0xe2, 0x01, 0x06, 0xd7, 0xcd, 0x0d, 0xf0, 0x76, 0x1e, 0x8d, 0xcd, 0x3d,
 	0x88, 0xe5, 0x4c, 0x2a, 0x76, 0xd4, 0x57, 0xed
 };
-static u8_t gcm_data[42] = {
+static uint8_t gcm_data[42] = {
 	0x08, 0x00, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
 	0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24,
 	0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
 	0x31, 0x32, 0x33, 0x34, 0x00, 0x04
 };
-static const u8_t gcm_expected[58] = {
+static const uint8_t gcm_expected[58] = {
 	0x13, 0xb4, 0xc7, 0x2b, 0x38, 0x9d, 0xc5, 0x01, 0x8e, 0x72, 0xa1, 0x71,
 	0xdd, 0x85, 0xa5, 0xd3, 0x75, 0x22, 0x74, 0xd3, 0xa0, 0x19, 0xfb, 0xca,
 	0xed, 0x09, 0xa4, 0x25, 0xcd, 0x9b, 0x2e, 0x1c, 0x9b, 0x72, 0xee, 0xe7,
@@ -508,8 +508,8 @@ static const u8_t gcm_expected[58] = {
 
 void gcm_mode(struct device *dev)
 {
-	u8_t encrypted[60] = {0};
-	u8_t decrypted[44] = {0};
+	uint8_t encrypted[60] = {0};
+	uint8_t decrypted[44] = {0};
 	struct cipher_ctx ini = {
 		.keylen = sizeof(gcm_key),
 		.key.bit_stream = gcm_key,
diff --git a/samples/drivers/current_sensing/src/main.c b/samples/drivers/current_sensing/src/main.c
index 3f27d3f3ad..bdc035932e 100644
--- a/samples/drivers/current_sensing/src/main.c
+++ b/samples/drivers/current_sensing/src/main.c
@@ -32,10 +32,10 @@
 #define CUR_LSB		100
 #define PWR_LSB		2000
 
-int read_reg16(struct device *i2c_dev, u8_t reg_addr,
-	       u8_t *data)
+int read_reg16(struct device *i2c_dev, uint8_t reg_addr,
+	       uint8_t *data)
 {
-	u8_t wr_addr;
+	uint8_t wr_addr;
 	struct i2c_msg msgs[2];
 
 	/* Register address */
@@ -56,10 +56,10 @@ int read_reg16(struct device *i2c_dev, u8_t reg_addr,
 	return i2c_transfer(i2c_dev, &msgs[0], 2, I2C_SLV_ADDR);
 }
 
-int write_reg16(struct device *i2c_dev, u8_t reg_addr,
-		u8_t *data)
+int write_reg16(struct device *i2c_dev, uint8_t reg_addr,
+		uint8_t *data)
 {
-	u8_t wr_addr;
+	uint8_t wr_addr;
 	struct i2c_msg msgs[2];
 
 	/* Register address */
@@ -83,8 +83,8 @@ int write_reg16(struct device *i2c_dev, u8_t reg_addr,
 void main(void)
 {
 	struct device *i2c_dev;
-	u8_t data[2];
-	u32_t shunt_volt, bus_volt, current, power;
+	uint8_t data[2];
+	uint32_t shunt_volt, bus_volt, current, power;
 
 	i2c_dev = device_get_binding("I2C_0");
 	if (!i2c_dev) {
diff --git a/samples/drivers/display/src/main.c b/samples/drivers/display/src/main.c
index 4e672c488a..fa5d378486 100644
--- a/samples/drivers/display/src/main.c
+++ b/samples/drivers/display/src/main.c
@@ -58,7 +58,7 @@ enum corner {
 	BOTTOM_LEFT
 };
 
-typedef void (*fill_buffer)(enum corner corner, u8_t grey, u8_t *buf,
+typedef void (*fill_buffer)(enum corner corner, uint8_t grey, uint8_t *buf,
 			    size_t buf_size);
 
 
@@ -76,10 +76,10 @@ static void posix_exit_main(int exit_code)
 }
 #endif
 
-static void fill_buffer_argb8888(enum corner corner, u8_t grey, u8_t *buf,
+static void fill_buffer_argb8888(enum corner corner, uint8_t grey, uint8_t *buf,
 			       size_t buf_size)
 {
-	u32_t color = 0;
+	uint32_t color = 0;
 
 	switch (corner) {
 	case TOP_LEFT:
@@ -97,14 +97,14 @@ static void fill_buffer_argb8888(enum corner corner, u8_t grey, u8_t *buf,
 	}
 
 	for (size_t idx = 0; idx < buf_size; idx += 4) {
-		*((u32_t *)(buf + idx)) = color;
+		*((uint32_t *)(buf + idx)) = color;
 	}
 }
 
-static void fill_buffer_rgb888(enum corner corner, u8_t grey, u8_t *buf,
+static void fill_buffer_rgb888(enum corner corner, uint8_t grey, uint8_t *buf,
 			       size_t buf_size)
 {
-	u32_t color = 0;
+	uint32_t color = 0;
 
 	switch (corner) {
 	case TOP_LEFT:
@@ -128,10 +128,10 @@ static void fill_buffer_rgb888(enum corner corner, u8_t grey, u8_t *buf,
 	}
 }
 
-static u16_t get_rgb565_color(enum corner corner, u8_t grey)
+static uint16_t get_rgb565_color(enum corner corner, uint8_t grey)
 {
-	u16_t color = 0;
-	u16_t grey_5bit;
+	uint16_t color = 0;
+	uint16_t grey_5bit;
 
 	switch (corner) {
 	case TOP_LEFT:
@@ -152,10 +152,10 @@ static u16_t get_rgb565_color(enum corner corner, u8_t grey)
 	return color;
 }
 
-static void fill_buffer_rgb565(enum corner corner, u8_t grey, u8_t *buf,
+static void fill_buffer_rgb565(enum corner corner, uint8_t grey, uint8_t *buf,
 			       size_t buf_size)
 {
-	u16_t color = get_rgb565_color(corner, grey);
+	uint16_t color = get_rgb565_color(corner, grey);
 
 	for (size_t idx = 0; idx < buf_size; idx += 2) {
 		*(buf + idx + 0) = (color >> 8) & 0xFFu;
@@ -163,20 +163,20 @@ static void fill_buffer_rgb565(enum corner corner, u8_t grey, u8_t *buf,
 	}
 }
 
-static void fill_buffer_bgr565(enum corner corner, u8_t grey, u8_t *buf,
+static void fill_buffer_bgr565(enum corner corner, uint8_t grey, uint8_t *buf,
 			       size_t buf_size)
 {
-	u16_t color = get_rgb565_color(corner, grey);
+	uint16_t color = get_rgb565_color(corner, grey);
 
 	for (size_t idx = 0; idx < buf_size; idx += 2) {
-		*(u16_t *)(buf + idx) = color;
+		*(uint16_t *)(buf + idx) = color;
 	}
 }
 
-static void fill_buffer_mono(enum corner corner, u8_t grey, u8_t *buf,
+static void fill_buffer_mono(enum corner corner, uint8_t grey, uint8_t *buf,
 			     size_t buf_size)
 {
-	u16_t color;
+	uint16_t color;
 
 	switch (corner) {
 	case BOTTOM_LEFT:
@@ -199,8 +199,8 @@ void main(void)
 	size_t h_step;
 	size_t scale;
 	size_t grey_count;
-	u8_t *buf;
-	s32_t grey_scale_sleep;
+	uint8_t *buf;
+	int32_t grey_scale_sleep;
 	struct device *display_dev;
 	struct display_capabilities capabilities;
 	struct display_buffer_descriptor buf_desc;
diff --git a/samples/drivers/entropy/src/main.c b/samples/drivers/entropy/src/main.c
index 2bb4acabd8..e893581305 100644
--- a/samples/drivers/entropy/src/main.c
+++ b/samples/drivers/entropy/src/main.c
@@ -25,7 +25,7 @@ void main(void)
 
 	while (1) {
 #define BUFFER_LENGTH 10
-		u8_t buffer[BUFFER_LENGTH] = {0};
+		uint8_t buffer[BUFFER_LENGTH] = {0};
 		int r;
 
 		/* The BUFFER_LENGTH-1 is used so the driver will not
diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c
index f4b0452ac1..3c8b055d18 100644
--- a/samples/drivers/espi/src/main.c
+++ b/samples/drivers/espi/src/main.c
@@ -42,15 +42,15 @@ LOG_MODULE_DECLARE(espi, CONFIG_ESPI_LOG_LEVEL);
 #define EVENT_DETAILS(x)      ((x & EVENT_DETAILS_MASK) >> EVENT_DETAILS_POS)
 
 struct oob_header {
-	u8_t dest_slave_addr;
-	u8_t oob_cmd_code;
-	u8_t byte_cnt;
-	u8_t src_slave_addr;
+	uint8_t dest_slave_addr;
+	uint8_t oob_cmd_code;
+	uint8_t byte_cnt;
+	uint8_t src_slave_addr;
 };
 
 struct oob_response {
 	struct oob_header hdr;
-	u8_t buf[MAX_RESP_SIZE];
+	uint8_t buf[MAX_RESP_SIZE];
 };
 
 #ifdef CONFIG_ESPI_GPIO_DEV_NEEDED
@@ -65,14 +65,14 @@ static struct espi_callback vw_rdy_cb;
 static struct espi_callback vw_cb;
 static struct espi_callback p80_cb;
 
-static u8_t espi_rst_sts;
+static uint8_t espi_rst_sts;
 
 #ifdef CONFIG_ESPI_FLASH_CHANNEL
-static u8_t flash_write_buf[MAX_TEST_BUF_SIZE];
-static u8_t flash_read_buf[MAX_TEST_BUF_SIZE];
+static uint8_t flash_write_buf[MAX_TEST_BUF_SIZE];
+static uint8_t flash_read_buf[MAX_TEST_BUF_SIZE];
 #endif
 
-static void host_warn_handler(u32_t signal, u32_t status)
+static void host_warn_handler(uint32_t signal, uint32_t status)
 {
 	switch (signal) {
 	case ESPI_VWIRE_SIGNAL_HOST_RST_WARN:
@@ -148,8 +148,8 @@ static void vwire_handler(struct device *dev, struct espi_callback *cb,
 static void periph_handler(struct device *dev, struct espi_callback *cb,
 			   struct espi_event event)
 {
-	u8_t periph_type;
-	u8_t periph_index;
+	uint8_t periph_type;
+	uint8_t periph_index;
 
 	periph_type = EVENT_TYPE(event.evt_details);
 	periph_index = EVENT_DETAILS(event.evt_details);
@@ -217,10 +217,10 @@ int espi_init(void)
 	return ret;
 }
 
-static int wait_for_pin(struct device *dev, u8_t pin, u16_t timeout,
+static int wait_for_pin(struct device *dev, uint8_t pin, uint16_t timeout,
 			int exp_level)
 {
-	u16_t loop_cnt = timeout;
+	uint16_t loop_cnt = timeout;
 	int level;
 
 	do {
@@ -249,11 +249,11 @@ static int wait_for_pin(struct device *dev, u8_t pin, u16_t timeout,
 
 static int wait_for_vwire(struct device *espi_dev,
 			  enum espi_vwire_signal signal,
-			  u16_t timeout, u8_t exp_level)
+			  uint16_t timeout, uint8_t exp_level)
 {
 	int ret;
-	u8_t level;
-	u16_t loop_cnt = timeout;
+	uint8_t level;
+	uint16_t loop_cnt = timeout;
 
 	do {
 		ret = espi_receive_vwire(espi_dev, signal, &level);
@@ -278,9 +278,9 @@ static int wait_for_vwire(struct device *espi_dev,
 	return 0;
 }
 
-static int wait_for_espi_reset(u8_t exp_sts)
+static int wait_for_espi_reset(uint8_t exp_sts)
 {
-	u16_t loop_cnt = CONFIG_ESPI_VIRTUAL_WIRE_TIMEOUT;
+	uint16_t loop_cnt = CONFIG_ESPI_VIRTUAL_WIRE_TIMEOUT;
 
 	do {
 		if (exp_sts == espi_rst_sts) {
@@ -346,11 +346,11 @@ int espi_handshake(void)
 }
 
 #ifdef CONFIG_ESPI_FLASH_CHANNEL
-int read_test_block(u8_t *buf, u32_t start_flash_adr, u16_t block_len)
+int read_test_block(uint8_t *buf, uint32_t start_flash_adr, uint16_t block_len)
 {
-	u8_t i = 0;
-	u32_t flash_addr = start_flash_adr;
-	u16_t transactions = block_len/MAX_FLASH_REQUEST;
+	uint8_t i = 0;
+	uint32_t flash_addr = start_flash_adr;
+	uint16_t transactions = block_len/MAX_FLASH_REQUEST;
 	int ret = 0;
 	struct espi_flash_packet pckt;
 
@@ -373,11 +373,11 @@ int read_test_block(u8_t *buf, u32_t start_flash_adr, u16_t block_len)
 	return 0;
 }
 
-int write_test_block(u8_t *buf, u32_t start_flash_adr, u16_t block_len)
+int write_test_block(uint8_t *buf, uint32_t start_flash_adr, uint16_t block_len)
 {
-	u8_t i = 0;
-	u32_t flash_addr = start_flash_adr;
-	u16_t transactions = block_len/MAX_FLASH_REQUEST;
+	uint8_t i = 0;
+	uint32_t flash_addr = start_flash_adr;
+	uint16_t transactions = block_len/MAX_FLASH_REQUEST;
 	int ret = 0;
 	struct espi_flash_packet pckt;
 
@@ -401,11 +401,11 @@ int write_test_block(u8_t *buf, u32_t start_flash_adr, u16_t block_len)
 	return 0;
 }
 
-static int espi_flash_test(u32_t start_flash_addr, u8_t blocks)
+static int espi_flash_test(uint32_t start_flash_addr, uint8_t blocks)
 {
-	u8_t i;
-	u8_t pattern;
-	u32_t flash_addr;
+	uint8_t i;
+	uint8_t pattern;
+	uint32_t flash_addr;
 	int ret = 0;
 
 	LOG_INF("Test eSPI write flash");
@@ -471,9 +471,9 @@ int get_pch_temp(struct device *dev)
 	oob_hdr.src_slave_addr = SRC_SLV_ADDR;
 
 	/* Packetize OOB request */
-	req_pckt.buf = (u8_t *)&oob_hdr;
+	req_pckt.buf = (uint8_t *)&oob_hdr;
 	req_pckt.len = sizeof(struct oob_header);
-	resp_pckt.buf = (u8_t *)&rsp;
+	resp_pckt.buf = (uint8_t *)&rsp;
 	resp_pckt.len = MAX_RESP_SIZE;
 
 	ret = espi_send_oob(dev, &req_pckt);
diff --git a/samples/drivers/flash_shell/src/main.c b/samples/drivers/flash_shell/src/main.c
index 4a984c983b..7f02703b86 100644
--- a/samples/drivers/flash_shell/src/main.c
+++ b/samples/drivers/flash_shell/src/main.c
@@ -93,10 +93,10 @@ static int check_flash_device(const struct shell *shell)
 	return 0;
 }
 
-static void dump_buffer(const struct shell *shell, u8_t *buf, size_t size)
+static void dump_buffer(const struct shell *shell, uint8_t *buf, size_t size)
 {
 	bool newline = false;
-	u8_t *p = buf;
+	uint8_t *p = buf;
 
 	while (size >= 8) {
 		PR_SHELL(shell, "%02x %02x %02x %02x | %02x %02x %02x %02x\n",
@@ -135,21 +135,21 @@ static int parse_ul(const char *str, unsigned long *result)
 	return 0;
 }
 
-static int parse_u8(const char *str, u8_t *result)
+static int parse_u8(const char *str, uint8_t *result)
 {
 	unsigned long val;
 
 	if (parse_ul(str, &val) || val > 0xff) {
 		return -EINVAL;
 	}
-	*result = (u8_t)val;
+	*result = (uint8_t)val;
 	return 0;
 }
 
 /* Read bytes, dumping contents to console and printing on error. */
 static int do_read(const struct shell *shell, off_t offset, size_t len)
 {
-	u8_t buf[64];
+	uint8_t buf[64];
 	int ret;
 
 	while (len > sizeof(buf)) {
@@ -198,7 +198,7 @@ static int do_erase(const struct shell *shell, off_t offset, size_t size)
 }
 
 /* Write bytes, handling write protection and printing on error. */
-static int do_write(const struct shell *shell, off_t offset, u8_t *buf,
+static int do_write(const struct shell *shell, off_t offset, uint8_t *buf,
 		    size_t len, bool read_back)
 {
 	int ret;
@@ -298,7 +298,7 @@ exit:
 static int cmd_write(const struct shell *shell, size_t argc, char **argv)
 {
 	unsigned long int i, offset;
-	u8_t buf[ARGC_MAX];
+	uint8_t buf[ARGC_MAX];
 
 	int err = check_flash_device(shell);
 
@@ -516,7 +516,7 @@ static int cmd_page_write(const struct shell *shell, size_t argc, char **argv)
 {
 	struct flash_pages_info info;
 	unsigned long int page, off;
-	u8_t buf[ARGC_MAX];
+	uint8_t buf[ARGC_MAX];
 	size_t i;
 	int ret;
 
diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c
index 075020850f..2f425b434c 100644
--- a/samples/drivers/ht16k33/src/main.c
+++ b/samples/drivers/ht16k33/src/main.c
@@ -25,7 +25,7 @@ struct device *ks_dev[KEYSCAN_DEVICES];
 static struct gpio_callback ks_cb[KEYSCAN_DEVICES];
 
 static void keyscan_callback(struct device *gpiob,
-			     struct gpio_callback *cb, u32_t pins)
+			     struct gpio_callback *cb, uint32_t pins)
 {
 	LOG_INF("%s: 0x%08x", gpiob->name, pins);
 }
diff --git a/samples/drivers/i2c_fujitsu_fram/src/main.c b/samples/drivers/i2c_fujitsu_fram/src/main.c
index 6e94311d9b..11e5aa723f 100644
--- a/samples/drivers/i2c_fujitsu_fram/src/main.c
+++ b/samples/drivers/i2c_fujitsu_fram/src/main.c
@@ -18,10 +18,10 @@
 
 #define FRAM_I2C_ADDR	0x50
 
-static int write_bytes(struct device *i2c_dev, u16_t addr,
-		       u8_t *data, u32_t num_bytes)
+static int write_bytes(struct device *i2c_dev, uint16_t addr,
+		       uint8_t *data, uint32_t num_bytes)
 {
-	u8_t wr_addr[2];
+	uint8_t wr_addr[2];
 	struct i2c_msg msgs[2];
 
 	/* FRAM address */
@@ -43,10 +43,10 @@ static int write_bytes(struct device *i2c_dev, u16_t addr,
 	return i2c_transfer(i2c_dev, &msgs[0], 2, FRAM_I2C_ADDR);
 }
 
-static int read_bytes(struct device *i2c_dev, u16_t addr,
-		      u8_t *data, u32_t num_bytes)
+static int read_bytes(struct device *i2c_dev, uint16_t addr,
+		      uint8_t *data, uint32_t num_bytes)
 {
-	u8_t wr_addr[2];
+	uint8_t wr_addr[2];
 	struct i2c_msg msgs[2];
 
 	/* Now try to read back from FRAM */
@@ -73,8 +73,8 @@ static int read_bytes(struct device *i2c_dev, u16_t addr,
 void main(void)
 {
 	struct device *i2c_dev;
-	u8_t cmp_data[16];
-	u8_t data[16];
+	uint8_t cmp_data[16];
+	uint8_t data[16];
 	int i, ret;
 
 	i2c_dev = device_get_binding(I2C_DEV);
diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c
index 4e5f2f4696..b5539b544b 100644
--- a/samples/drivers/kscan/src/main.c
+++ b/samples/drivers/kscan/src/main.c
@@ -81,7 +81,7 @@ static struct k_timer block_matrix_timer;
 /*                                                                          */
 /****************************************************************************/
 
-static const u8_t keymap[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS] = {
+static const uint8_t keymap[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS] = {
 	{KEY_RSVD, 1, 112, 16, 2, KEY_RSVD, 30, KEY_RSVD},
 	{116, 117, 110, KEY_RSVD, 118, 17, 18, KEY_RSVD},
 	{113, KEY_RSVD, 114, 115, 3, KEY_RSVD, 119, KEY_RSVD},
@@ -101,19 +101,19 @@ static const u8_t keymap[MAX_MATRIX_KEY_COLS][MAX_MATRIX_KEY_ROWS] = {
 };
 
 /* Key used for typematic */
-static u8_t last_key;
+static uint8_t last_key;
 
 /* Typematic rate and delay values correspond to the data passed after
  * the F3 command (See the 8042 spec online)
  */
-static const u16_t period[] = {
+static const uint16_t period[] = {
 	33U,  37U,  42U,  46U,  50U,  54U,  58U,  63U,
 	67U,  75U,  83U,  92U, 100U, 109U, 116U, 125U,
 	133U, 149U, 167U, 182U, 200U, 217U, 232U, 250U,
 	270U, 303U, 333U, 370U, 400U, 435U, 470U, 500U
 };
 
-static const u16_t delay[] = { 250U, 500U, 750U, 1000U };
+static const uint16_t delay[] = { 250U, 500U, 750U, 1000U };
 
 static bool block_kb_matrix;
 
@@ -122,7 +122,7 @@ static void typematic_callback(struct k_timer *timer)
 	LOG_INF("Typematic : %u\n", last_key);
 }
 
-static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed)
+static void kb_callback(struct device *dev, uint32_t row, uint32_t col, bool pressed)
 {
 	ARG_UNUSED(dev);
 	last_key = keymap[col][row];
diff --git a/samples/drivers/kscan_touch/src/main.c b/samples/drivers/kscan_touch/src/main.c
index 31896ffaa9..37ee1c7262 100644
--- a/samples/drivers/kscan_touch/src/main.c
+++ b/samples/drivers/kscan_touch/src/main.c
@@ -19,7 +19,7 @@ struct device *kscan_dev;
 
 #define TOUCH_CONTROLLER_LABEL DT_LABEL(DT_ALIAS(kscan0))
 
-static void k_callback(struct device *dev, u32_t row, u32_t col, bool pressed)
+static void k_callback(struct device *dev, uint32_t row, uint32_t col, bool pressed)
 {
 	ARG_UNUSED(dev);
 	if (pressed) {
diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c
index 3670e1c24b..781eb8933c 100644
--- a/samples/drivers/lcd_hd44780/src/main.c
+++ b/samples/drivers/lcd_hd44780/src/main.c
@@ -155,11 +155,11 @@
 
 
 struct pi_lcd_data {
-	u8_t	disp_func;	/* Display Function */
-	u8_t	disp_cntl;	/* Display Control */
-	u8_t disp_mode;	/* Display Mode */
-	u8_t	cfg_rows;
-	u8_t	row_offsets[4];
+	uint8_t	disp_func;	/* Display Function */
+	uint8_t	disp_cntl;	/* Display Control */
+	uint8_t disp_mode;	/* Display Mode */
+	uint8_t	cfg_rows;
+	uint8_t	row_offsets[4];
 };
 
 /* Default Configuration - User can update */
@@ -171,7 +171,7 @@ struct pi_lcd_data lcd_data = {
 	.row_offsets = {0x00, 0x00, 0x00, 0x00}
 };
 
-void _set_row_offsets(s8_t row0, s8_t row1, s8_t row2, s8_t row3)
+void _set_row_offsets(int8_t row0, int8_t row1, int8_t row2, int8_t row3)
 {
 	lcd_data.row_offsets[0] = row0;
 	lcd_data.row_offsets[1] = row1;
@@ -191,7 +191,7 @@ void _pi_lcd_toggle_enable(struct device *gpio_dev)
 }
 
 
-void _pi_lcd_4bits_wr(struct device *gpio_dev, u8_t bits)
+void _pi_lcd_4bits_wr(struct device *gpio_dev, uint8_t bits)
 {
 	/* High bits */
 	GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC24_D4, LOW);
@@ -236,7 +236,7 @@ void _pi_lcd_4bits_wr(struct device *gpio_dev, u8_t bits)
 	_pi_lcd_toggle_enable(gpio_dev);
 }
 
-void _pi_lcd_8bits_wr(struct device *gpio_dev, u8_t bits)
+void _pi_lcd_8bits_wr(struct device *gpio_dev, uint8_t bits)
 {
 	/* High bits */
 	GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC21_D7, LOW);
@@ -278,7 +278,7 @@ void _pi_lcd_8bits_wr(struct device *gpio_dev, u8_t bits)
 	_pi_lcd_toggle_enable(gpio_dev);
 }
 
-void _pi_lcd_data(struct device *gpio_dev, u8_t bits)
+void _pi_lcd_data(struct device *gpio_dev, uint8_t bits)
 {
 	if (lcd_data.disp_func & LCD_8BIT_MODE) {
 		_pi_lcd_8bits_wr(gpio_dev, bits);
@@ -287,14 +287,14 @@ void _pi_lcd_data(struct device *gpio_dev, u8_t bits)
 	}
 }
 
-void _pi_lcd_command(struct device *gpio_dev, u8_t bits)
+void _pi_lcd_command(struct device *gpio_dev, uint8_t bits)
 {
 	/* mode = False for command */
 	GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC28_RS, LOW);
 	_pi_lcd_data(gpio_dev, bits);
 }
 
-void _pi_lcd_write(struct device *gpio_dev, u8_t bits)
+void _pi_lcd_write(struct device *gpio_dev, uint8_t bits)
 {
 	/* mode = True for character */
 	GPIO_PIN_WR(gpio_dev, GPIO_PIN_PC28_RS, HIGH);
@@ -313,7 +313,7 @@ void pi_lcd_home(struct device *gpio_dev)
 }
 
 /** Set curson position */
-void pi_lcd_set_cursor(struct device *gpio_dev, u8_t col, u8_t row)
+void pi_lcd_set_cursor(struct device *gpio_dev, uint8_t col, uint8_t row)
 {
 	size_t max_lines;
 
@@ -436,7 +436,7 @@ void pi_lcd_string(struct device *gpio_dev, char *msg)
 {
 	int i;
 	int len = 0;
-	u8_t data;
+	uint8_t data;
 
 	len = strlen(msg);
 	if (len > LCD_WIDTH) {
@@ -451,7 +451,7 @@ void pi_lcd_string(struct device *gpio_dev, char *msg)
 
 
 /** LCD initialization function */
-void pi_lcd_init(struct device *gpio_dev, u8_t cols, u8_t rows, u8_t dotsize)
+void pi_lcd_init(struct device *gpio_dev, uint8_t cols, uint8_t rows, uint8_t dotsize)
 {
 	if (rows > 1) {
 		lcd_data.disp_func |= LCD_2_LINE;
diff --git a/samples/drivers/led_apa102c_bitbang/src/main.c b/samples/drivers/led_apa102c_bitbang/src/main.c
index f15dc038ea..760cda1133 100644
--- a/samples/drivers/led_apa102c_bitbang/src/main.c
+++ b/samples/drivers/led_apa102c_bitbang/src/main.c
@@ -38,7 +38,7 @@
  * brightness is set very low, and RGB values are
  * set low too.
  */
-u32_t rgb[] = {
+uint32_t rgb[] = {
 	0xE1000010,
 	0xE1001000,
 	0xE1100000,
@@ -49,7 +49,7 @@ u32_t rgb[] = {
 /* Number of LEDS linked together */
 #define NUM_LEDS	1
 
-void send_rgb(struct device *gpio_dev, u32_t rgb)
+void send_rgb(struct device *gpio_dev, uint32_t rgb)
 {
 	int i;
 
diff --git a/samples/drivers/led_lp5562/src/main.c b/samples/drivers/led_lp5562/src/main.c
index ba899b7823..c3789ac505 100644
--- a/samples/drivers/led_lp5562/src/main.c
+++ b/samples/drivers/led_lp5562/src/main.c
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(main);
 /*
  * The following colors are shown in the given order.
  */
-static u8_t colors[COLORS_TO_SHOW][VALUES_PER_COLOR] = {
+static uint8_t colors[COLORS_TO_SHOW][VALUES_PER_COLOR] = {
 	{ 0xFF, 0x00, 0x00 }, /*< Red    */
 	{ 0x00, 0xFF, 0x00 }, /*< Green  */
 	{ 0x00, 0x00, 0xFF }, /*< Blue   */
@@ -51,7 +51,7 @@ static u8_t colors[COLORS_TO_SHOW][VALUES_PER_COLOR] = {
  *
  * @return Hex value scaled to percent.
  */
-static inline u8_t scale_color_to_percent(u8_t hex)
+static inline uint8_t scale_color_to_percent(uint8_t hex)
 {
 	return (hex * 100U) / 0xFF;
 }
@@ -66,7 +66,7 @@ static inline u8_t scale_color_to_percent(u8_t hex)
  *
  * @return 0 if successful, -ERRNO otherwise.
  */
-static int set_static_color(struct device *dev, u8_t r, u8_t g, u8_t b)
+static int set_static_color(struct device *dev, uint8_t r, uint8_t g, uint8_t b)
 {
 	int ret;
 
@@ -111,7 +111,7 @@ static int set_static_color(struct device *dev, u8_t r, u8_t g, u8_t b)
  * @return 0 if successful, -ERRNO otherwise.
  */
 static int blink_color(struct device *dev, bool r, bool g, bool b,
-		u32_t delay_on, u32_t delay_off)
+		uint32_t delay_on, uint32_t delay_off)
 {
 	int ret;
 
diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c
index a0e07dd099..91e8e64380 100644
--- a/samples/drivers/lora/receive/src/main.c
+++ b/samples/drivers/lora/receive/src/main.c
@@ -26,9 +26,9 @@ void main(void)
 	struct device *lora_dev;
 	struct lora_modem_config config;
 	int ret, len;
-	u8_t data[MAX_DATA_LEN] = {0};
-	s16_t rssi;
-	s8_t snr;
+	uint8_t data[MAX_DATA_LEN] = {0};
+	int16_t rssi;
+	int8_t snr;
 
 	lora_dev = device_get_binding(DEFAULT_RADIO);
 	if (!lora_dev) {
diff --git a/samples/drivers/peci/src/main.c b/samples/drivers/peci/src/main.c
index 01db3cfe2a..a386d9c5f7 100644
--- a/samples/drivers/peci/src/main.c
+++ b/samples/drivers/peci/src/main.c
@@ -25,8 +25,8 @@
 
 static struct device *peci_dev;
 static bool peci_initialized;
-static u8_t tjmax;
-static u8_t rx_fcs;
+static uint8_t tjmax;
+static uint8_t rx_fcs;
 static void monitor_temperature_func(void *dummy1, void *dummy2, void *dummy3);
 
 static struct k_thread temp_id;
@@ -55,15 +55,15 @@ int peci_ping(void)
 	return 0;
 }
 
-int peci_get_tjmax(u8_t *tjmax)
+int peci_get_tjmax(uint8_t *tjmax)
 {
 	int ret;
 	int retries = 3;
-	u8_t peci_resp;
+	uint8_t peci_resp;
 	struct peci_msg packet;
 
-	u8_t peci_resp_buf[PECI_RD_PKG_LEN_DWORD+1];
-	u8_t peci_req_buf[] = { PECI_CONFIGHOSTID,
+	uint8_t peci_resp_buf[PECI_RD_PKG_LEN_DWORD+1];
+	uint8_t peci_req_buf[] = { PECI_CONFIGHOSTID,
 				PECI_CONFIGINDEX_TJMAX,
 				PECI_CONFIGPARAM & 0x00FF,
 				(PECI_CONFIGPARAM & 0xFF00) >> 8,
@@ -99,11 +99,11 @@ int peci_get_tjmax(u8_t *tjmax)
 
 int peci_get_temp(int *temperature)
 {
-	s16_t raw_cpu_temp;
+	int16_t raw_cpu_temp;
 	int ret;
 	struct peci_msg packet = {0};
 
-	u8_t peci_resp_buf[PECI_GET_TEMP_RD_LEN+1];
+	uint8_t peci_resp_buf[PECI_GET_TEMP_RD_LEN+1];
 
 	rx_fcs = 0;
 	packet.tx_buffer.buf = NULL;
@@ -125,8 +125,8 @@ int peci_get_temp(int *temperature)
 	printk("Temp bytes: %02x", packet.rx_buffer.buf[0]);
 	printk("%02x\n", packet.rx_buffer.buf[1]);
 
-	raw_cpu_temp = (s16_t)(packet.rx_buffer.buf[0] |
-			(s16_t)((packet.rx_buffer.buf[1] << 8) & 0xFF00));
+	raw_cpu_temp = (int16_t)(packet.rx_buffer.buf[0] |
+			(int16_t)((packet.rx_buffer.buf[1] << 8) & 0xFF00));
 
 	if (raw_cpu_temp == 0x8000) {
 		printk("Invalid temp %x\n", raw_cpu_temp);
diff --git a/samples/drivers/ps2/src/main.c b/samples/drivers/ps2/src/main.c
index 4558714980..beb37e4dd0 100644
--- a/samples/drivers/ps2/src/main.c
+++ b/samples/drivers/ps2/src/main.c
@@ -28,7 +28,7 @@ static bool host_blocked;
 K_THREAD_DEFINE(aux_thread_id, TASK_STACK_SIZE, to_port_60_thread,
 		NULL, NULL, NULL, PRIORITY, 0, 0);
 K_SEM_DEFINE(p60_sem, 0, 1);
-K_MSGQ_DEFINE(aux_to_host_queue, sizeof(u8_t), 8, 4);
+K_MSGQ_DEFINE(aux_to_host_queue, sizeof(uint8_t), 8, 4);
 
 /* We use a timer to saturate the queue */
 K_TIMER_DEFINE(block_ps2_timer, saturate_ps2, NULL);
@@ -45,7 +45,7 @@ static void saturate_ps2(struct k_timer *timer)
 	ps2_enable_callback(ps2_0_dev);
 }
 
-static void mb_callback(struct device *dev, u8_t value)
+static void mb_callback(struct device *dev, uint8_t value)
 {
 	if (k_msgq_put(&aux_to_host_queue, &value, K_NO_WAIT) != 0) {
 		ps2_disable_callback(ps2_0_dev);
@@ -59,7 +59,7 @@ static void mb_callback(struct device *dev, u8_t value)
 /* This data is sent to BIOS and eventually is consumed by the host OS */
 static void to_port_60_thread(void *dummy1, void *dummy2, void *dummy3)
 {
-	u8_t data;
+	uint8_t data;
 
 	while (true) {
 		k_sem_take(&p60_sem, K_FOREVER);
diff --git a/samples/drivers/soc_flash_nrf/src/main.c b/samples/drivers/soc_flash_nrf/src/main.c
index cfa46f4f4f..bd3d842b61 100644
--- a/samples/drivers/soc_flash_nrf/src/main.c
+++ b/samples/drivers/soc_flash_nrf/src/main.c
@@ -30,16 +30,16 @@
 void main(void)
 {
 	struct device *flash_dev;
-	u32_t buf_array_1[4] = { TEST_DATA_WORD_0, TEST_DATA_WORD_1,
+	uint32_t buf_array_1[4] = { TEST_DATA_WORD_0, TEST_DATA_WORD_1,
 				    TEST_DATA_WORD_2, TEST_DATA_WORD_3 };
-	u32_t buf_array_2[4] = { TEST_DATA_WORD_3, TEST_DATA_WORD_1,
+	uint32_t buf_array_2[4] = { TEST_DATA_WORD_3, TEST_DATA_WORD_1,
 				    TEST_DATA_WORD_2, TEST_DATA_WORD_0 };
-	u32_t buf_array_3[8] = { TEST_DATA_WORD_0, TEST_DATA_WORD_1,
+	uint32_t buf_array_3[8] = { TEST_DATA_WORD_0, TEST_DATA_WORD_1,
 				    TEST_DATA_WORD_2, TEST_DATA_WORD_3,
 				    TEST_DATA_WORD_0, TEST_DATA_WORD_1,
 				    TEST_DATA_WORD_2, TEST_DATA_WORD_3 };
-	u32_t buf_word = 0U;
-	u32_t i, offset;
+	uint32_t buf_word = 0U;
+	uint32_t i, offset;
 
 	printf("\nNordic nRF5 Flash Testing\n");
 	printf("=========================\n");
@@ -67,13 +67,13 @@ void main(void)
 		printf("   Attempted to write %x at 0x%x\n", buf_array_1[i],
 				offset);
 		if (flash_write(flash_dev, offset, &buf_array_1[i],
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash write failed!\n");
 			return;
 		}
 		printf("   Attempted to read 0x%x\n", offset);
 		if (flash_read(flash_dev, offset, &buf_word,
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash read failed!\n");
 			return;
 		}
@@ -100,13 +100,13 @@ void main(void)
 		printf("   Attempted to write %x at 0x%x\n", buf_array_2[i],
 				offset);
 		if (flash_write(flash_dev, offset, &buf_array_2[i],
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash write failed!\n");
 			return;
 		}
 		printf("   Attempted to read 0x%x\n", offset);
 		if (flash_read(flash_dev, offset, &buf_word,
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash read failed!\n");
 			return;
 		}
@@ -132,13 +132,13 @@ void main(void)
 		printf("   Attempted to write %x at 0x%x\n", buf_array_3[i],
 				offset);
 		if (flash_write(flash_dev, offset, &buf_array_3[i],
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash write failed!\n");
 			return;
 		}
 		printf("   Attempted to read 0x%x\n", offset);
 		if (flash_read(flash_dev, offset, &buf_word,
-					sizeof(u32_t)) != 0) {
+					sizeof(uint32_t)) != 0) {
 			printf("   Flash read failed!\n");
 			return;
 		}
diff --git a/samples/drivers/spi_flash/src/main.c b/samples/drivers/spi_flash/src/main.c
index a183c1d060..d3b04db427 100644
--- a/samples/drivers/spi_flash/src/main.c
+++ b/samples/drivers/spi_flash/src/main.c
@@ -35,9 +35,9 @@
 
 void main(void)
 {
-	const u8_t expected[] = { 0x55, 0xaa, 0x66, 0x99 };
+	const uint8_t expected[] = { 0x55, 0xaa, 0x66, 0x99 };
 	const size_t len = sizeof(expected);
-	u8_t buf[sizeof(expected)];
+	uint8_t buf[sizeof(expected)];
 	struct device *flash_dev;
 	int rc;
 
@@ -88,14 +88,14 @@ void main(void)
 	if (memcmp(expected, buf, len) == 0) {
 		printf("Data read matches data written. Good!!\n");
 	} else {
-		const u8_t *wp = expected;
-		const u8_t *rp = buf;
-		const u8_t *rpe = rp + len;
+		const uint8_t *wp = expected;
+		const uint8_t *rp = buf;
+		const uint8_t *rpe = rp + len;
 
 		printf("Data read does not match data written!!\n");
 		while (rp < rpe) {
 			printf("%08x wrote %02x read %02x %s\n",
-			       (u32_t)(FLASH_TEST_REGION_OFFSET + (rp - buf)),
+			       (uint32_t)(FLASH_TEST_REGION_OFFSET + (rp - buf)),
 			       *wp, *rp, (*rp == *wp) ? "match" : "MISMATCH");
 			++rp;
 			++wp;
diff --git a/samples/drivers/spi_flash_at45/src/main.c b/samples/drivers/spi_flash_at45/src/main.c
index 351026ba94..276dc35fae 100644
--- a/samples/drivers/spi_flash_at45/src/main.c
+++ b/samples/drivers/spi_flash_at45/src/main.c
@@ -21,8 +21,8 @@
 #define TEST_REGION_OFFSET  0xFE00
 #define TEST_REGION_SIZE    0x400
 
-static u8_t write_buf[TEST_REGION_SIZE];
-static u8_t read_buf[TEST_REGION_SIZE];
+static uint8_t write_buf[TEST_REGION_SIZE];
+static uint8_t read_buf[TEST_REGION_SIZE];
 
 void main(void)
 {
@@ -31,7 +31,7 @@ void main(void)
 	struct device *flash_dev;
 	int i;
 	int err;
-	u8_t data;
+	uint8_t data;
 	struct flash_pages_info pages_info;
 	size_t page_count, chip_size;
 
@@ -59,7 +59,7 @@ void main(void)
 	++data;
 	printk("Preparing test content starting with 0x%02X.\n", data);
 	for (i = 0; i < TEST_REGION_SIZE; ++i) {
-		write_buf[i] = (u8_t)(data + i);
+		write_buf[i] = (uint8_t)(data + i);
 	}
 
 #if !IS_ENABLED(CONFIG_SPI_FLASH_AT45_USE_READ_MODIFY_WRITE)
diff --git a/samples/drivers/spi_fujitsu_fram/src/main.c b/samples/drivers/spi_fujitsu_fram/src/main.c
index f6c9792877..7dd027336e 100644
--- a/samples/drivers/spi_fujitsu_fram/src/main.c
+++ b/samples/drivers/spi_fujitsu_fram/src/main.c
@@ -20,12 +20,12 @@
 #define MB85RS64V_WRITE_CMD 0x02
 #define MAX_USER_DATA_LENGTH 1024
 
-static u8_t data[MAX_USER_DATA_LENGTH], cmp_data[MAX_USER_DATA_LENGTH];
+static uint8_t data[MAX_USER_DATA_LENGTH], cmp_data[MAX_USER_DATA_LENGTH];
 
 static int mb85rs64v_access(struct device *spi, struct spi_config *spi_cfg,
-			    u8_t cmd, u16_t addr, void *data, size_t len)
+			    uint8_t cmd, uint16_t addr, void *data, size_t len)
 {
-	u8_t access[3];
+	uint8_t access[3];
 	struct spi_buf bufs[] = {
 		{
 			.buf = access,
@@ -66,7 +66,7 @@ static int mb85rs64v_access(struct device *spi, struct spi_config *spi_cfg,
 
 static int mb85rs64v_read_id(struct device *spi, struct spi_config *spi_cfg)
 {
-	u8_t id[4];
+	uint8_t id[4];
 	int err;
 
 	err = mb85rs64v_access(spi, spi_cfg,
@@ -96,7 +96,7 @@ static int mb85rs64v_read_id(struct device *spi, struct spi_config *spi_cfg)
 }
 
 static int write_bytes(struct device *spi, struct spi_config *spi_cfg,
-		       u16_t addr, u8_t *data, u32_t num_bytes)
+		       uint16_t addr, uint8_t *data, uint32_t num_bytes)
 {
 	int err;
 
@@ -120,7 +120,7 @@ static int write_bytes(struct device *spi, struct spi_config *spi_cfg,
 }
 
 static int read_bytes(struct device *spi, struct spi_config *spi_cfg,
-		      u16_t addr, u8_t *data, u32_t num_bytes)
+		      uint16_t addr, uint8_t *data, uint32_t num_bytes)
 {
 	int err;
 
@@ -198,7 +198,7 @@ void main(void)
 
 	/* Do multi-byte read/write */
 	/* get some random data, and clear out data[] */
-	for (u32_t i = 0; i < sizeof(cmp_data); i++) {
+	for (uint32_t i = 0; i < sizeof(cmp_data); i++) {
 		cmp_data[i] = k_cycle_get_32() & 0xFF;
 		data[i] = 0x00;
 	}
@@ -210,7 +210,7 @@ void main(void)
 		return;
 	} else {
 		printk("Wrote %d bytes to address 0x00.\n",
-		       (u32_t) sizeof(cmp_data));
+		       (uint32_t) sizeof(cmp_data));
 	}
 
 	err = read_bytes(spi, &spi_cfg, 0x00, data, sizeof(data));
@@ -219,11 +219,11 @@ void main(void)
 		return;
 	} else {
 		printk("Read %d bytes from address 0x00.\n",
-		       (u32_t) sizeof(data));
+		       (uint32_t) sizeof(data));
 	}
 
 	err = 0;
-	for (u32_t i = 0; i < sizeof(cmp_data); i++) {
+	for (uint32_t i = 0; i < sizeof(cmp_data); i++) {
 		if (cmp_data[i] != data[i]) {
 			printk("Data comparison failed @ %d.\n", i);
 			err = -EIO;
diff --git a/samples/mpu/mpu_test/src/main.c b/samples/mpu/mpu_test/src/main.c
index 23c9a6a9bf..f919523242 100644
--- a/samples/mpu/mpu_test/src/main.c
+++ b/samples/mpu/mpu_test/src/main.c
@@ -32,7 +32,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
 
-	u32_t *p_mem = (u32_t *) RESERVED_MEM_MAP;
+	uint32_t *p_mem = (uint32_t *) RESERVED_MEM_MAP;
 
 	/* Reads from an address that is reserved in the memory map */
 	PR_SHELL(shell, "The value is: %d\n", *p_mem);
@@ -47,8 +47,8 @@ static int cmd_write_mcux(const struct shell *shell, size_t argc, char *argv[])
 	ARG_UNUSED(argv);
 
 	struct device *flash_dev;
-	u32_t value[2];
-	u32_t offset;
+	uint32_t value[2];
+	uint32_t offset;
 
 	flash_dev =
 		device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
@@ -85,8 +85,8 @@ static int cmd_write_stm32(const struct shell *shell, size_t argc, char *argv[])
 		device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
 
 	/* 16K reserved to the application */
-	u32_t offset = FLASH_MEM + 0x4000;
-	u32_t value = 0xBADC0DE;
+	uint32_t offset = FLASH_MEM + 0x4000;
+	uint32_t value = 0xBADC0DE;
 
 	PR_SHELL(shell, "write address: 0x%x\n", offset);
 
@@ -108,7 +108,7 @@ static int cmd_write(const struct shell *shell, size_t argc, char *argv[])
 	ARG_UNUSED(argv);
 
 	/* 16K reserved to the application */
-	u32_t *p_mem = (u32_t *) (FLASH_MEM + 0x4000);
+	uint32_t *p_mem = (uint32_t *) (FLASH_MEM + 0x4000);
 
 	PR_SHELL(shell, "write address: 0x%x\n", FLASH_MEM + 0x4000);
 
@@ -134,16 +134,16 @@ static int cmd_run(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_mtest(const struct shell *shell, size_t argc, char *argv[])
 {
-	u32_t *mem;
-	u32_t val;
+	uint32_t *mem;
+	uint32_t val;
 
-	val = (u32_t)strtol(argv[1], NULL, 16);
-	mem = (u32_t *) val;
+	val = (uint32_t)strtol(argv[1], NULL, 16);
+	mem = (uint32_t *) val;
 
 	if (argc == 2) {
 		PR_SHELL(shell, "The value is: 0x%x\n", *mem);
 	} else {
-		*mem = (u32_t) strtol(argv[2], NULL, 16);
+		*mem = (uint32_t) strtol(argv[2], NULL, 16);
 	}
 
 	return 0;
diff --git a/samples/net/cloud/google_iot_mqtt/src/dhcp.c b/samples/net/cloud/google_iot_mqtt/src/dhcp.c
index 29c07489c8..c757b726ce 100644
--- a/samples/net/cloud/google_iot_mqtt/src/dhcp.c
+++ b/samples/net/cloud/google_iot_mqtt/src/dhcp.c
@@ -23,7 +23,7 @@ static struct net_mgmt_event_callback mgmt_cb;
 static K_SEM_DEFINE(got_address, 0, 1);
 
 static void handler(struct net_mgmt_event_callback *cb,
-		    u32_t mgmt_event,
+		    uint32_t mgmt_event,
 		    struct net_if *iface)
 {
 	int i;
diff --git a/samples/net/cloud/google_iot_mqtt/src/main.c b/samples/net/cloud/google_iot_mqtt/src/main.c
index 0d914283b8..a60acfc2f1 100644
--- a/samples/net/cloud/google_iot_mqtt/src/main.c
+++ b/samples/net/cloud/google_iot_mqtt/src/main.c
@@ -24,13 +24,13 @@ LOG_MODULE_REGISTER(net_google_iot_mqtt, LOG_LEVEL_INF);
 #include <time.h>
 #include <inttypes.h>
 
-s64_t time_base;
+int64_t time_base;
 
 void do_sntp(struct addrinfo *addr)
 {
 	struct sntp_ctx ctx;
 	int rc;
-	s64_t stamp;
+	int64_t stamp;
 	struct sntp_time sntp_time;
 	char time_str[sizeof("1970-01-01T00:00:00")];
 
diff --git a/samples/net/cloud/google_iot_mqtt/src/protocol.c b/samples/net/cloud/google_iot_mqtt/src/protocol.c
index 5e6880dd86..80bcad1535 100644
--- a/samples/net/cloud/google_iot_mqtt/src/protocol.c
+++ b/samples/net/cloud/google_iot_mqtt/src/protocol.c
@@ -26,7 +26,7 @@ LOG_MODULE_DECLARE(net_google_iot_mqtt, LOG_LEVEL_DBG);
 
 #include <mbedtls/debug.h>
 
-extern s64_t time_base;
+extern int64_t time_base;
 
 /* private key information */
 extern unsigned char zepfull_private_der[];
@@ -37,21 +37,21 @@ extern unsigned int zepfull_private_der_len;
  */
 #include "globalsign.inc"
 
-static u8_t client_id[] = CONFIG_CLOUD_CLIENT_ID;
+static uint8_t client_id[] = CONFIG_CLOUD_CLIENT_ID;
 #ifdef CONFIG_CLOUD_SUBSCRIBE_CONFIG
-static u8_t subs_topic_str[] = CONFIG_CLOUD_SUBSCRIBE_CONFIG;
+static uint8_t subs_topic_str[] = CONFIG_CLOUD_SUBSCRIBE_CONFIG;
 static struct mqtt_topic subs_topic;
 static struct mqtt_subscription_list subs_list;
 #endif
-static u8_t client_username[] = "none";
-static u8_t pub_topic[] = CONFIG_CLOUD_PUBLISH_TOPIC;
+static uint8_t client_username[] = "none";
+static uint8_t pub_topic[] = CONFIG_CLOUD_PUBLISH_TOPIC;
 
 static struct mqtt_publish_param pub_data;
 
-static u8_t token[512];
+static uint8_t token[512];
 
 static bool connected;
-static u64_t next_alive;
+static uint64_t next_alive;
 
 /* The mqtt client struct */
 static struct mqtt_client client_ctx;
@@ -60,8 +60,8 @@ static struct mqtt_client client_ctx;
 static struct sockaddr_storage broker;
 
 /* Buffers for MQTT client. */
-static u8_t rx_buffer[1024];
-static u8_t tx_buffer[1024];
+static uint8_t rx_buffer[1024];
+static uint8_t tx_buffer[1024];
 
 static sec_tag_t m_sec_tags[] = {
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
@@ -82,7 +82,7 @@ static sec_tag_t m_sec_tags[] = {
  */
 time_t my_k_time(time_t *ptr)
 {
-	s64_t stamp;
+	int64_t stamp;
 	time_t now;
 
 	stamp = k_uptime_get();
@@ -132,7 +132,7 @@ void mqtt_evt_handler(struct mqtt_client *const client,
 #ifdef CONFIG_CLOUD_SUBSCRIBE_CONFIG
 	case MQTT_EVT_PUBLISH:
 		{
-			u8_t d[33];
+			uint8_t d[33];
 			int len = evt->param.publish.message.payload.len;
 			int bytes_read;
 
@@ -363,7 +363,7 @@ void mqtt_startup(char *hostname, int port)
 	pub_data.message.topic.topic.utf8 = pub_topic;
 	pub_data.message.topic.topic.size = strlen(pub_topic);
 	pub_data.message.topic.qos = MQTT_QOS_1_AT_LEAST_ONCE;
-	pub_data.message.payload.data = (u8_t *)pub_msg;
+	pub_data.message.payload.data = (uint8_t *)pub_msg;
 	pub_data.message_id = 1U;
 	pub_data.dup_flag = 0U;
 	pub_data.retain_flag = 1U;
diff --git a/samples/net/cloud/mqtt_azure/src/main.c b/samples/net/cloud/mqtt_azure/src/main.c
index af1cd2cd4f..dfc0dc5c31 100644
--- a/samples/net/cloud/mqtt_azure/src/main.c
+++ b/samples/net/cloud/mqtt_azure/src/main.c
@@ -19,8 +19,8 @@ LOG_MODULE_REGISTER(mqtt_azure, LOG_LEVEL_DBG);
 #include "test_certs.h"
 
 /* Buffers for MQTT client. */
-static u8_t rx_buffer[APP_MQTT_BUFFER_SIZE];
-static u8_t tx_buffer[APP_MQTT_BUFFER_SIZE];
+static uint8_t rx_buffer[APP_MQTT_BUFFER_SIZE];
+static uint8_t tx_buffer[APP_MQTT_BUFFER_SIZE];
 
 /* The mqtt client struct */
 static struct mqtt_client client_ctx;
@@ -63,7 +63,7 @@ static sec_tag_t m_sec_tags[] = {
 	APP_CA_CERT_TAG,
 };
 
-static u8_t topic[] = "devices/" MQTT_CLIENTID "/messages/devicebound/#";
+static uint8_t topic[] = "devices/" MQTT_CLIENTID "/messages/devicebound/#";
 static struct mqtt_topic subs_topic;
 static struct mqtt_subscription_list subs_list;
 
@@ -153,15 +153,15 @@ static void client_init(struct mqtt_client *client)
 	client->broker = &broker;
 	client->evt_cb = mqtt_event_handler;
 
-	client->client_id.utf8 = (u8_t *)MQTT_CLIENTID;
+	client->client_id.utf8 = (uint8_t *)MQTT_CLIENTID;
 	client->client_id.size = strlen(MQTT_CLIENTID);
 
-	password.utf8 = (u8_t *)CONFIG_SAMPLE_CLOUD_AZURE_PASSWORD;
+	password.utf8 = (uint8_t *)CONFIG_SAMPLE_CLOUD_AZURE_PASSWORD;
 	password.size = strlen(CONFIG_SAMPLE_CLOUD_AZURE_PASSWORD);
 
 	client->password = &password;
 
-	username.utf8 = (u8_t *)CONFIG_SAMPLE_CLOUD_AZURE_USERNAME;
+	username.utf8 = (uint8_t *)CONFIG_SAMPLE_CLOUD_AZURE_USERNAME;
 	username.size = strlen(CONFIG_SAMPLE_CLOUD_AZURE_USERNAME);
 
 	client->user_name = &username;
@@ -197,7 +197,7 @@ static void mqtt_event_handler(struct mqtt_client *const client,
 			       const struct mqtt_evt *evt)
 {
 	struct mqtt_puback_param puback;
-	u8_t data[33];
+	uint8_t data[33];
 	int len;
 	int bytes_read;
 
@@ -289,11 +289,11 @@ static int publish(struct mqtt_client *client, enum mqtt_qos qos)
 {
 	char payload[] = "{id=123}";
 	char topic[] = "devices/" MQTT_CLIENTID "/messages/events/";
-	u8_t len = strlen(topic);
+	uint8_t len = strlen(topic);
 	struct mqtt_publish_param param;
 
 	param.message.topic.qos = qos;
-	param.message.topic.topic.utf8 = (u8_t *)topic;
+	param.message.topic.topic.utf8 = (uint8_t *)topic;
 	param.message.topic.topic.size = len;
 	param.message.payload.data = payload;
 	param.message.payload.len = strlen(payload);
@@ -321,7 +321,7 @@ static void poll_mqtt(void)
  * then keep the application connection live by calling mqtt_live()
  * in regular intervals.
  */
-static u8_t timeout_for_publish(void)
+static uint8_t timeout_for_publish(void)
 {
 	return (10 + sys_rand32_get() % 5);
 }
@@ -347,7 +347,7 @@ end:
 
 static int try_to_connect(struct mqtt_client *client)
 {
-	u8_t retries = 3U;
+	uint8_t retries = 3U;
 	int rc;
 
 	LOG_DBG("attempting to connect...");
@@ -485,7 +485,7 @@ static void abort_mqtt_connection(void)
 }
 
 static void l4_event_handler(struct net_mgmt_event_callback *cb,
-			     u32_t mgmt_event, struct net_if *iface)
+			     uint32_t mgmt_event, struct net_if *iface)
 {
 	if ((mgmt_event & L4_EVENT_MASK) != mgmt_event) {
 		return;
diff --git a/samples/net/dhcpv4_client/src/main.c b/samples/net/dhcpv4_client/src/main.c
index ef383bf66e..423b34d3ab 100644
--- a/samples/net/dhcpv4_client/src/main.c
+++ b/samples/net/dhcpv4_client/src/main.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(net_dhcpv4_client_sample, LOG_LEVEL_DBG);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void handler(struct net_mgmt_event_callback *cb,
-		    u32_t mgmt_event,
+		    uint32_t mgmt_event,
 		    struct net_if *iface)
 {
 	int i = 0;
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index 96fd8f3baf..ead93600dc 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -135,7 +135,7 @@ static struct k_delayed_work ipv4_timer;
 static void do_ipv4_lookup(struct k_work *work)
 {
 	static const char *query = "www.zephyrproject.org";
-	static u16_t dns_id;
+	static uint16_t dns_id;
 	int ret;
 
 	ret = dns_get_addr_info(query,
@@ -153,7 +153,7 @@ static void do_ipv4_lookup(struct k_work *work)
 }
 
 static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 	char hr_addr[NET_IPV4_ADDR_LEN];
@@ -250,7 +250,7 @@ static void do_mdns_ipv4_lookup(struct k_work *work)
 static void do_ipv4_lookup(void)
 {
 	static const char *query = "www.zephyrproject.org";
-	static u16_t dns_id;
+	static uint16_t dns_id;
 	int ret;
 
 	ret = dns_get_addr_info(query,
@@ -292,7 +292,7 @@ static void setup_ipv4(struct net_if *iface)
 static void do_ipv6_lookup(void)
 {
 	static const char *query = "www.zephyrproject.org";
-	static u16_t dns_id;
+	static uint16_t dns_id;
 	int ret;
 
 	ret = dns_get_addr_info(query,
diff --git a/samples/net/gptp/src/main.c b/samples/net/gptp/src/main.c
index 93e65fafeb..a111dea8d0 100644
--- a/samples/net/gptp/src/main.c
+++ b/samples/net/gptp/src/main.c
@@ -51,7 +51,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 }
 
 static int setup_iface(struct net_if *iface, const char *ipv6_addr,
-		       const char *ipv4_addr, u16_t vlan_tag)
+		       const char *ipv4_addr, uint16_t vlan_tag)
 {
 	struct net_if_addr *ifaddr;
 	struct in_addr addr4;
@@ -123,13 +123,13 @@ static int init_vlan(void)
 }
 #endif /* CONFIG_NET_GPTP_VLAN */
 
-static void gptp_phase_dis_cb(u8_t *gm_identity,
-			      u16_t *time_base,
+static void gptp_phase_dis_cb(uint8_t *gm_identity,
+			      uint16_t *time_base,
 			      struct gptp_scaled_ns *last_gm_ph_change,
 			      double *last_gm_freq_change)
 {
 	char output[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
-	static u8_t id[8];
+	static uint8_t id[8];
 
 	if (memcmp(id, gm_identity, sizeof(id))) {
 		memcpy(id, gm_identity, sizeof(id));
diff --git a/samples/net/gsm_modem/src/main.c b/samples/net/gsm_modem/src/main.c
index 334ec6a6d9..3777e43a09 100644
--- a/samples/net/gsm_modem/src/main.c
+++ b/samples/net/gsm_modem/src/main.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(sample_gsm_ppp, LOG_LEVEL_DBG);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void event_handler(struct net_mgmt_event_callback *cb,
-			  u32_t mgmt_event, struct net_if *iface)
+			  uint32_t mgmt_event, struct net_if *iface)
 {
 	if ((mgmt_event & (NET_EVENT_L4_CONNECTED
 			   | NET_EVENT_L4_DISCONNECTED)) != mgmt_event) {
diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c
index dc0c35b766..026a31387b 100644
--- a/samples/net/ipv4_autoconf/src/main.c
+++ b/samples/net/ipv4_autoconf/src/main.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(net_ipv4_autoconf_sample, LOG_LEVEL_DBG);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void handler(struct net_mgmt_event_callback *cb,
-		    u32_t mgmt_event,
+		    uint32_t mgmt_event,
 		    struct net_if *iface)
 {
 	int i = 0;
diff --git a/samples/net/lldp/src/main.c b/samples/net/lldp/src/main.c
index 51060bcaf5..73c2e1e916 100644
--- a/samples/net/lldp/src/main.c
+++ b/samples/net/lldp/src/main.c
@@ -18,8 +18,8 @@ LOG_MODULE_REGISTER(net_lldp_sample, LOG_LEVEL_DBG);
 #include <net/ethernet.h>
 
 static struct lldp_system_name_tlv {
-	u16_t type_length;
-	u8_t name[4];
+	uint16_t type_length;
+	uint8_t name[4];
 } __packed tlv = {
 	.name = { 't', 'e', 's', 't' },
 };
@@ -29,9 +29,9 @@ static void set_optional_tlv(struct net_if *iface)
 	NET_DBG("");
 
 	tlv.type_length = htons((LLDP_TLV_SYSTEM_NAME << 9) |
-				((sizeof(tlv) - sizeof(u16_t)) & 0x01ff));
+				((sizeof(tlv) - sizeof(uint16_t)) & 0x01ff));
 
-	net_lldp_config_optional(iface, (u8_t *)&tlv, sizeof(tlv));
+	net_lldp_config_optional(iface, (uint8_t *)&tlv, sizeof(tlv));
 }
 
 /* User data for the interface callback */
@@ -66,7 +66,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 }
 
 static int setup_iface(struct net_if *iface, const char *ipv6_addr,
-		       const char *ipv4_addr, u16_t vlan_tag)
+		       const char *ipv4_addr, uint16_t vlan_tag)
 {
 	struct net_if_addr *ifaddr;
 	struct in_addr addr4;
@@ -152,9 +152,9 @@ static enum net_verdict parse_lldp(struct net_if *iface, struct net_pkt *pkt)
 	net_pkt_cursor_init(pkt);
 
 	while (1) {
-		u16_t type_length;
-		u16_t length;
-		u8_t type;
+		uint16_t type_length;
+		uint16_t length;
+		uint8_t type;
 
 		if (net_pkt_read_be16(pkt, &type_length)) {
 			LOG_DBG("End LLDP DU TLV");
@@ -162,7 +162,7 @@ static enum net_verdict parse_lldp(struct net_if *iface, struct net_pkt *pkt)
 		}
 
 		length = type_length & 0x1FF;
-		type = (u8_t)(type_length >> 9);
+		type = (uint8_t)(type_length >> 9);
 
 		/* Skip for now data */
 		if (net_pkt_skip(pkt, length)) {
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index fd86452afc..1a867f3353 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -62,19 +62,19 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define LED_GPIO_FLAGS	0
 #endif
 
-static u8_t bat_idx = LWM2M_DEVICE_PWR_SRC_TYPE_BAT_INT;
+static uint8_t bat_idx = LWM2M_DEVICE_PWR_SRC_TYPE_BAT_INT;
 static int bat_mv = 3800;
 static int bat_ma = 125;
-static u8_t usb_idx = LWM2M_DEVICE_PWR_SRC_TYPE_USB;
+static uint8_t usb_idx = LWM2M_DEVICE_PWR_SRC_TYPE_USB;
 static int usb_mv = 5000;
 static int usb_ma = 900;
-static u8_t bat_level = 95;
-static u8_t bat_status = LWM2M_DEVICE_BATTERY_STATUS_CHARGING;
+static uint8_t bat_level = 95;
+static uint8_t bat_status = LWM2M_DEVICE_BATTERY_STATUS_CHARGING;
 static int mem_free = 15;
 static int mem_total = 25;
 
 static struct device *led_dev;
-static u32_t led_state;
+static uint32_t led_state;
 
 static struct lwm2m_ctx client;
 
@@ -93,18 +93,18 @@ static const char client_psk_id[] = "Client_identity";
 static struct k_sem quit_lock;
 
 #if defined(CONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT)
-static u8_t firmware_buf[64];
+static uint8_t firmware_buf[64];
 #endif
 
 /* TODO: Move to a pre write hook that can handle ret codes once available */
-static int led_on_off_cb(u16_t obj_inst_id, u16_t res_id, u16_t res_inst_id,
-			 u8_t *data, u16_t data_len,
+static int led_on_off_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id,
+			 uint8_t *data, uint16_t data_len,
 			 bool last_block, size_t total_size)
 {
 	int ret = 0;
-	u32_t led_val;
+	uint32_t led_val;
 
-	led_val = *(u8_t *) data;
+	led_val = *(uint8_t *) data;
 	if (led_val != led_state) {
 		ret = gpio_pin_set(led_dev, LED_GPIO_PIN, (int) led_val);
 		if (ret) {
@@ -144,7 +144,7 @@ static int init_led_device(void)
 	return 0;
 }
 
-static int device_reboot_cb(u16_t obj_inst_id)
+static int device_reboot_cb(uint16_t obj_inst_id)
 {
 	LOG_INF("DEVICE: REBOOT");
 	/* Add an error for testing */
@@ -155,7 +155,7 @@ static int device_reboot_cb(u16_t obj_inst_id)
 	return 0;
 }
 
-static int device_factory_default_cb(u16_t obj_inst_id)
+static int device_factory_default_cb(uint16_t obj_inst_id)
 {
 	LOG_INF("DEVICE: FACTORY DEFAULT");
 	/* Add an error for testing */
@@ -167,7 +167,7 @@ static int device_factory_default_cb(u16_t obj_inst_id)
 }
 
 #if defined(CONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT)
-static int firmware_update_cb(u16_t obj_inst_id)
+static int firmware_update_cb(uint16_t obj_inst_id)
 {
 	LOG_DBG("UPDATE");
 
@@ -183,8 +183,8 @@ static int firmware_update_cb(u16_t obj_inst_id)
 #endif
 
 
-static void *temperature_get_buf(u16_t obj_inst_id, u16_t res_id,
-				 u16_t res_inst_id, size_t *data_len)
+static void *temperature_get_buf(uint16_t obj_inst_id, uint16_t res_id,
+				 uint16_t res_inst_id, size_t *data_len)
 {
 	/* Last read temperature value, will use 25.5C if no sensor available */
 	static struct float32_value v = { 25, 500000 };
@@ -212,16 +212,16 @@ static void *temperature_get_buf(u16_t obj_inst_id, u16_t res_id,
 
 
 #if defined(CONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT)
-static void *firmware_get_buf(u16_t obj_inst_id, u16_t res_id,
-			      u16_t res_inst_id, size_t *data_len)
+static void *firmware_get_buf(uint16_t obj_inst_id, uint16_t res_id,
+			      uint16_t res_inst_id, size_t *data_len)
 {
 	*data_len = sizeof(firmware_buf);
 	return firmware_buf;
 }
 
-static int firmware_block_received_cb(u16_t obj_inst_id,
-				      u16_t res_id, u16_t res_inst_id,
-				      u8_t *data, u16_t data_len,
+static int firmware_block_received_cb(uint16_t obj_inst_id,
+				      uint16_t res_id, uint16_t res_inst_id,
+				      uint8_t *data, uint16_t data_len,
 				      bool last_block, size_t total_size)
 {
 	LOG_INF("FIRMWARE: BLOCK RECEIVED: len:%u last_block:%d",
@@ -230,9 +230,9 @@ static int firmware_block_received_cb(u16_t obj_inst_id,
 }
 #endif
 
-static int timer_digital_state_cb(u16_t obj_inst_id,
-				  u16_t res_id, u16_t res_inst_id,
-				  u8_t *data, u16_t data_len,
+static int timer_digital_state_cb(uint16_t obj_inst_id,
+				  uint16_t res_id, uint16_t res_inst_id,
+				  uint8_t *data, uint16_t data_len,
 				  bool last_block, size_t total_size)
 {
 	bool *digital_state = (bool *)data;
@@ -250,8 +250,8 @@ static int lwm2m_setup(void)
 {
 	int ret;
 	char *server_url;
-	u16_t server_url_len;
-	u8_t server_url_flags;
+	uint16_t server_url_len;
+	uint8_t server_url_flags;
 
 	/* setup SECURITY object */
 
@@ -437,7 +437,7 @@ void main(void)
 #endif
 
 #if defined(CONFIG_HWINFO)
-	u8_t dev_id[16];
+	uint8_t dev_id[16];
 	char dev_str[33];
 	ssize_t length;
 	int i;
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index 479419a16a..3ed17e58b5 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -17,15 +17,15 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include "config.h"
 
 /* Buffers for MQTT client. */
-static u8_t rx_buffer[APP_MQTT_BUFFER_SIZE];
-static u8_t tx_buffer[APP_MQTT_BUFFER_SIZE];
+static uint8_t rx_buffer[APP_MQTT_BUFFER_SIZE];
+static uint8_t tx_buffer[APP_MQTT_BUFFER_SIZE];
 
 #if defined(CONFIG_MQTT_LIB_WEBSOCKET)
 /* Making RX buffer large enough that the full IPv6 packet can fit into it */
 #define MQTT_LIB_WEBSOCKET_RECV_BUF_LEN 1280
 
 /* Websocket needs temporary buffer to store partial packets */
-static u8_t temp_ws_rx_buf[MQTT_LIB_WEBSOCKET_RECV_BUF_LEN];
+static uint8_t temp_ws_rx_buf[MQTT_LIB_WEBSOCKET_RECV_BUF_LEN];
 #endif
 
 /* The mqtt client struct */
@@ -207,7 +207,7 @@ static char *get_mqtt_payload(enum mqtt_qos qos)
 	static char payload[30];
 
 	snprintk(payload, sizeof(payload), "{d:{temperature:%d}}",
-		 (u8_t)sys_rand32_get());
+		 (uint8_t)sys_rand32_get());
 #else
 	static char payload[] = "DOORS:OPEN_QoSx";
 
@@ -232,7 +232,7 @@ static int publish(struct mqtt_client *client, enum mqtt_qos qos)
 	struct mqtt_publish_param param;
 
 	param.message.topic.qos = qos;
-	param.message.topic.topic.utf8 = (u8_t *)get_mqtt_topic();
+	param.message.topic.topic.utf8 = (uint8_t *)get_mqtt_topic();
 	param.message.topic.topic.size =
 			strlen(param.message.topic.topic.utf8);
 	param.message.payload.data = get_mqtt_payload(qos);
@@ -291,7 +291,7 @@ static void client_init(struct mqtt_client *client)
 	/* MQTT client configuration */
 	client->broker = &broker;
 	client->evt_cb = mqtt_evt_handler;
-	client->client_id.utf8 = (u8_t *)MQTT_CLIENTID;
+	client->client_id.utf8 = (uint8_t *)MQTT_CLIENTID;
 	client->client_id.size = strlen(MQTT_CLIENTID);
 	client->password = NULL;
 	client->user_name = NULL;
@@ -384,8 +384,8 @@ static int try_to_connect(struct mqtt_client *client)
 
 static int process_mqtt_and_sleep(struct mqtt_client *client, int timeout)
 {
-	s64_t remaining = timeout;
-	s64_t start_time = k_uptime_get();
+	int64_t remaining = timeout;
+	int64_t start_time = k_uptime_get();
 	int rc;
 
 	while (remaining > 0 && connected) {
diff --git a/samples/net/promiscuous_mode/src/main.c b/samples/net/promiscuous_mode/src/main.c
index d775ebe3b2..39d29bfe74 100644
--- a/samples/net/promiscuous_mode/src/main.c
+++ b/samples/net/promiscuous_mode/src/main.c
@@ -40,7 +40,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 	LOG_INF("Promiscuous mode enabled for interface %p", iface);
 }
 
-static int get_ports(struct net_pkt *pkt, u16_t *src, u16_t *dst)
+static int get_ports(struct net_pkt *pkt, uint16_t *src, uint16_t *dst)
 {
 	struct net_udp_hdr hdr, *udp_hdr;
 
@@ -59,10 +59,10 @@ static void print_info(struct net_pkt *pkt)
 {
 	char src_addr_buf[NET_IPV6_ADDR_LEN], *src_addr;
 	char dst_addr_buf[NET_IPV6_ADDR_LEN], *dst_addr;
-	u16_t dst_port = 0U, src_port = 0U;
+	uint16_t dst_port = 0U, src_port = 0U;
 	sa_family_t family = AF_UNSPEC;
 	void *dst, *src;
-	u8_t next_hdr;
+	uint8_t next_hdr;
 	const char *proto;
 	size_t len;
 	int ret;
diff --git a/samples/net/sockets/can/src/main.c b/samples/net/sockets/can/src/main.c
index 86e0025ccc..6debf86214 100644
--- a/samples/net/sockets/can/src/main.c
+++ b/samples/net/sockets/can/src/main.c
@@ -111,7 +111,7 @@ static void rx(int *can_fd, int *do_close_period,
 	LOG_DBG("[%d] Waiting CAN data...", fd);
 
 	while (1) {
-		u8_t *data;
+		uint8_t *data;
 
 		memset(&frame, 0, sizeof(frame));
 		addr_len = sizeof(can_addr);
@@ -131,7 +131,7 @@ static void rx(int *can_fd, int *do_close_period,
 
 		if (!msg.rtr) {
 			if (msg.dlc > 8) {
-				data = (u8_t *)msg.data_32;
+				data = (uint8_t *)msg.data_32;
 			} else {
 				data = msg.data;
 			}
diff --git a/samples/net/sockets/civetweb/src/main.c b/samples/net/sockets/civetweb/src/main.c
index 1824bac1d7..ea6e752d99 100644
--- a/samples/net/sockets/civetweb/src/main.c
+++ b/samples/net/sockets/civetweb/src/main.c
@@ -17,7 +17,7 @@ K_THREAD_STACK_DEFINE(civetweb_stack, CIVETWEB_MAIN_THREAD_STACK_SIZE);
 struct civetweb_info {
 	const char *version;
 	const char *os;
-	u32_t features;
+	uint32_t features;
 	const char *feature_list;
 	const char *build;
 	const char *compiler;
diff --git a/samples/net/sockets/coap_client/src/coap-client.c b/samples/net/sockets/coap_client/src/coap-client.c
index e4ba0a60ab..0f46d189e9 100644
--- a/samples/net/sockets/coap_client/src/coap-client.c
+++ b/samples/net/sockets/coap_client/src/coap-client.c
@@ -86,13 +86,13 @@ static int start_coap_client(void)
 static int process_simple_coap_reply(void)
 {
 	struct coap_packet reply;
-	u8_t *data;
+	uint8_t *data;
 	int rcvd;
 	int ret;
 
 	wait();
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -126,15 +126,15 @@ end:
 	return ret;
 }
 
-static int send_simple_coap_request(u8_t method)
+static int send_simple_coap_request(uint8_t method)
 {
-	u8_t payload[] = "payload";
+	uint8_t payload[] = "payload";
 	struct coap_packet request;
 	const char * const *p;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -169,7 +169,7 @@ static int send_simple_coap_request(u8_t method)
 			goto end;
 		}
 
-		r = coap_packet_append_payload(&request, (u8_t *)payload,
+		r = coap_packet_append_payload(&request, (uint8_t *)payload,
 					       sizeof(payload) - 1);
 		if (r < 0) {
 			LOG_ERR("Not able to append payload");
@@ -194,7 +194,7 @@ end:
 
 static int send_simple_coap_msgs_and_wait_for_reply(void)
 {
-	u8_t test_type = 0U;
+	uint8_t test_type = 0U;
 	int r;
 
 	while (1) {
@@ -253,14 +253,14 @@ static int send_simple_coap_msgs_and_wait_for_reply(void)
 static int process_large_coap_reply(void)
 {
 	struct coap_packet reply;
-	u8_t *data;
+	uint8_t *data;
 	bool last_block;
 	int rcvd;
 	int ret;
 
 	wait();
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -312,7 +312,7 @@ static int send_large_coap_request(void)
 {
 	struct coap_packet request;
 	const char * const *p;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
 	if (blk_ctx.total_size == 0) {
@@ -320,7 +320,7 @@ static int send_large_coap_request(void)
 					 BLOCK_WISE_TRANSFER_SIZE_GET);
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -386,13 +386,13 @@ static int get_large_coap_msgs(void)
 	return 0;
 }
 
-static int send_obs_reply_ack(u16_t id, u8_t *token, u8_t tkl)
+static int send_obs_reply_ack(uint16_t id, uint8_t *token, uint8_t tkl)
 {
 	struct coap_packet request;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -416,17 +416,17 @@ end:
 static int process_obs_coap_reply(void)
 {
 	struct coap_packet reply;
-	u16_t id;
-	u8_t token[8];
-	u8_t *data;
-	u8_t type;
-	u8_t tkl;
+	uint16_t id;
+	uint8_t token[8];
+	uint8_t *data;
+	uint8_t type;
+	uint8_t tkl;
 	int rcvd;
 	int ret;
 
 	wait();
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -455,7 +455,7 @@ static int process_obs_coap_reply(void)
 		goto end;
 	}
 
-	tkl = coap_header_get_token(&reply, (u8_t *)token);
+	tkl = coap_header_get_token(&reply, (uint8_t *)token);
 	id = coap_header_get_id(&reply);
 
 	type = coap_header_get_type(&reply);
@@ -474,10 +474,10 @@ static int send_obs_coap_request(void)
 {
 	struct coap_packet request;
 	const char * const *p;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -519,10 +519,10 @@ static int send_obs_reset_coap_request(void)
 {
 	struct coap_packet request;
 	const char * const *p;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -562,7 +562,7 @@ end:
 
 static int register_observer(void)
 {
-	u8_t counter = 0U;
+	uint8_t counter = 0U;
 	int r;
 
 	while (1) {
diff --git a/samples/net/sockets/coap_server/src/coap-server.c b/samples/net/sockets/coap_server/src/coap-server.c
index df3135250e..401e4225f5 100644
--- a/samples/net/sockets/coap_server/src/coap-server.c
+++ b/samples/net/sockets/coap_server/src/coap-server.c
@@ -47,7 +47,7 @@ LOG_MODULE_REGISTER(net_coap_server_sample, LOG_LEVEL_DBG);
 /* CoAP socket fd */
 static int sock;
 
-static const u8_t plain_text_format;
+static const uint8_t plain_text_format;
 
 static struct coap_observer observers[NUM_OBSERVERS];
 
@@ -180,10 +180,10 @@ static int well_known_core_get(struct coap_resource *resource,
 			       struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_packet response;
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
@@ -207,13 +207,13 @@ static int piggyback_get(struct coap_resource *resource,
 			 struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_packet response;
-	u8_t payload[40];
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t payload[40];
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -231,13 +231,13 @@ static int piggyback_get(struct coap_resource *resource,
 		type = COAP_TYPE_NON_CON;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		goto end;
@@ -262,7 +262,7 @@ static int piggyback_get(struct coap_resource *resource,
 		goto end;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload,
+	r = coap_packet_append_payload(&response, (uint8_t *)payload,
 				       strlen(payload));
 	if (r < 0) {
 		goto end;
@@ -281,12 +281,12 @@ static int test_del(struct coap_resource *resource,
 		    struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_packet response;
-	u8_t token[8];
-	u8_t *data;
-	u8_t tkl;
-	u8_t code;
-	u8_t type;
-	u16_t id;
+	uint8_t token[8];
+	uint8_t *data;
+	uint8_t tkl;
+	uint8_t code;
+	uint8_t type;
+	uint16_t id;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -304,13 +304,13 @@ static int test_del(struct coap_resource *resource,
 		type = COAP_TYPE_NON_CON;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_DELETED, id);
 	if (r < 0) {
 		goto end;
@@ -329,14 +329,14 @@ static int test_put(struct coap_resource *resource,
 		    struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_packet response;
-	u8_t token[8];
-	const u8_t *payload;
-	u8_t *data;
-	u16_t payload_len;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
-	u16_t id;
+	uint8_t token[8];
+	const uint8_t *payload;
+	uint8_t *data;
+	uint16_t payload_len;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
+	uint16_t id;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -359,13 +359,13 @@ static int test_put(struct coap_resource *resource,
 		type = COAP_TYPE_NON_CON;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CHANGED, id);
 	if (r < 0) {
 		goto end;
@@ -389,14 +389,14 @@ static int test_post(struct coap_resource *resource,
 						      NULL };
 	const char * const *p;
 	struct coap_packet response;
-	u8_t token[8];
-	const u8_t *payload;
-	u8_t *data;
-	u16_t payload_len;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
-	u16_t id;
+	uint8_t token[8];
+	const uint8_t *payload;
+	uint8_t *data;
+	uint16_t payload_len;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
+	uint16_t id;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -419,13 +419,13 @@ static int test_post(struct coap_resource *resource,
 		type = COAP_TYPE_NON_CON;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CREATED, id);
 	if (r < 0) {
 		goto end;
@@ -454,13 +454,13 @@ static int query_get(struct coap_resource *resource,
 {
 	struct coap_option options[4];
 	struct coap_packet response;
-	u8_t payload[40];
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t payload[40];
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int i, r;
 
 	code = coap_header_get_code(request);
@@ -495,13 +495,13 @@ static int query_get(struct coap_resource *resource,
 
 	LOG_INF("*******");
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *) token,
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *) token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		goto end;
@@ -526,7 +526,7 @@ static int query_get(struct coap_resource *resource,
 		goto end;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload,
+	r = coap_packet_append_payload(&response, (uint8_t *)payload,
 				       strlen(payload));
 	if (r < 0) {
 		goto end;
@@ -549,12 +549,12 @@ static int location_query_post(struct coap_resource *resource,
 						      NULL };
 	const char * const *p;
 	struct coap_packet response;
-	u8_t *data;
-	u8_t token[8];
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t *data;
+	uint8_t token[8];
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -572,13 +572,13 @@ static int location_query_post(struct coap_resource *resource,
 		type = COAP_TYPE_NON_CON;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CREATED, id);
 	if (r < 0) {
 		goto end;
@@ -606,13 +606,13 @@ static int separate_get(struct coap_resource *resource,
 			struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_packet response;
-	u8_t payload[40];
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t payload[40];
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 
 	code = coap_header_get_code(request);
@@ -628,13 +628,13 @@ static int separate_get(struct coap_resource *resource,
 		return 0;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *)token, 0, id);
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *)token, 0, id);
 	if (r < 0) {
 		goto end;
 	}
@@ -652,7 +652,7 @@ static int separate_get(struct coap_resource *resource,
 
 	/* Do not free and allocate "data" again, re-use the buffer */
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		goto end;
@@ -677,7 +677,7 @@ static int separate_get(struct coap_resource *resource,
 		goto end;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload,
+	r = coap_packet_append_payload(&response, (uint8_t *)payload,
 				       strlen(payload));
 	if (r < 0) {
 		goto end;
@@ -698,14 +698,14 @@ static int large_get(struct coap_resource *resource,
 {
 	static struct coap_block_context ctx;
 	struct coap_packet response;
-	u8_t payload[64];
-	u8_t token[8];
-	u8_t *data;
-	u16_t size;
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t payload[64];
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t size;
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 
 	if (ctx.total_size == 0) {
@@ -727,13 +727,13 @@ static int large_get(struct coap_resource *resource,
 	LOG_INF("type: %u code %u id %u", type, code, id);
 	LOG_INF("*******");
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *) token,
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *) token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		return -EINVAL;
@@ -761,7 +761,7 @@ static int large_get(struct coap_resource *resource,
 
 	memset(payload, 'A', MIN(size, sizeof(payload)));
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload, size);
+	r = coap_packet_append_payload(&response, (uint8_t *)payload, size);
 	if (r < 0) {
 		goto end;
 	}
@@ -780,7 +780,7 @@ end:
 	return r;
 }
 
-static int get_option_int(const struct coap_packet *pkt, u8_t opt)
+static int get_option_int(const struct coap_packet *pkt, uint8_t opt)
 {
 	struct coap_option option;
 	int r;
@@ -799,14 +799,14 @@ static int large_update_put(struct coap_resource *resource,
 {
 	static struct coap_block_context ctx;
 	struct coap_packet response;
-	const u8_t *payload;
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u16_t len;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	const uint8_t *payload;
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint16_t len;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 	bool last_block;
 
@@ -857,13 +857,13 @@ static int large_update_put(struct coap_resource *resource,
 		code = COAP_RESPONSE_CODE_CHANGED;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *) token, code, id);
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *) token, code, id);
 	if (r < 0) {
 		goto end;
 	}
@@ -888,14 +888,14 @@ static int large_create_post(struct coap_resource *resource,
 {
 	static struct coap_block_context ctx;
 	struct coap_packet response;
-	const u8_t *payload;
-	u8_t token[8];
-	u8_t *data;
-	u16_t len;
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	const uint8_t *payload;
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t len;
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	int r;
 	bool last_block;
 
@@ -938,13 +938,13 @@ static int large_create_post(struct coap_resource *resource,
 		code = COAP_RESPONSE_CODE_CREATED;
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *)token, code, id);
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *)token, code, id);
 	if (r < 0) {
 		goto end;
 	}
@@ -965,8 +965,8 @@ end:
 
 static int send_notification_packet(const struct sockaddr *addr,
 				    socklen_t addr_len,
-				    u16_t age, u16_t id,
-				    const u8_t *token, u8_t tkl,
+				    uint16_t age, uint16_t id,
+				    const uint8_t *token, uint8_t tkl,
 				    bool is_response);
 
 static void retransmit_request(struct k_work *work)
@@ -1028,14 +1028,14 @@ static int create_pending_request(struct coap_packet *response,
 
 static int send_notification_packet(const struct sockaddr *addr,
 				    socklen_t addr_len,
-				    u16_t age, u16_t id,
-				    const u8_t *token, u8_t tkl,
+				    uint16_t age, uint16_t id,
+				    const uint8_t *token, uint8_t tkl,
 				    bool is_response)
 {
 	struct coap_packet response;
 	char payload[14];
-	u8_t *data;
-	u8_t type;
+	uint8_t *data;
+	uint8_t type;
 	int r;
 
 	if (is_response) {
@@ -1048,13 +1048,13 @@ static int send_notification_packet(const struct sockaddr *addr,
 		id = coap_next_id();
 	}
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, type, tkl, (u8_t *)token,
+			     1, type, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		goto end;
@@ -1086,7 +1086,7 @@ static int send_notification_packet(const struct sockaddr *addr,
 		goto end;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload,
+	r = coap_packet_append_payload(&response, (uint8_t *)payload,
 				       strlen(payload));
 	if (r < 0) {
 		goto end;
@@ -1119,11 +1119,11 @@ static int obs_get(struct coap_resource *resource,
 		   struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_observer *observer;
-	u8_t token[8];
-	u16_t id;
-	u8_t code;
-	u8_t type;
-	u8_t tkl;
+	uint8_t token[8];
+	uint16_t id;
+	uint8_t code;
+	uint8_t type;
+	uint8_t tkl;
 	bool observe = true;
 
 	if (!coap_request_is_observe(request)) {
@@ -1172,22 +1172,22 @@ static int core_get(struct coap_resource *resource,
 {
 	static const char dummy_str[] = "Just a test\n";
 	struct coap_packet response;
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t tkl;
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t tkl;
 	int r;
 
 	id = coap_header_get_id(request);
 	tkl = coap_header_get_token(request, token);
 
-	data = (u8_t *)k_malloc(MAX_COAP_MSG_LEN);
+	data = (uint8_t *)k_malloc(MAX_COAP_MSG_LEN);
 	if (!data) {
 		return -ENOMEM;
 	}
 
 	r = coap_packet_init(&response, data, MAX_COAP_MSG_LEN,
-			     1, COAP_TYPE_ACK, tkl, (u8_t *)token,
+			     1, COAP_TYPE_ACK, tkl, (uint8_t *)token,
 			     COAP_RESPONSE_CODE_CONTENT, id);
 	if (r < 0) {
 		r = -EINVAL;
@@ -1200,7 +1200,7 @@ static int core_get(struct coap_resource *resource,
 		goto end;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)dummy_str,
+	r = coap_packet_append_payload(&response, (uint8_t *)dummy_str,
 				       sizeof(dummy_str));
 	if (r < 0) {
 		r = -EINVAL;
@@ -1313,15 +1313,15 @@ static struct coap_resource *find_resouce_by_observer(
 	return NULL;
 }
 
-static void process_coap_request(u8_t *data, u16_t data_len,
+static void process_coap_request(uint8_t *data, uint16_t data_len,
 				 struct sockaddr *client_addr,
 				 socklen_t client_addr_len)
 {
 	struct coap_packet request;
 	struct coap_pending *pending;
 	struct coap_option options[16] = { 0 };
-	u8_t opt_num = 16U;
-	u8_t type;
+	uint8_t opt_num = 16U;
+	uint8_t type;
 	int r;
 
 	r = coap_packet_parse(&request, data, data_len, options, opt_num);
@@ -1382,7 +1382,7 @@ static int process_client_request(void)
 	int received;
 	struct sockaddr client_addr;
 	socklen_t client_addr_len;
-	u8_t request[MAX_COAP_MSG_LEN];
+	uint8_t request[MAX_COAP_MSG_LEN];
 
 	do {
 		client_addr_len = sizeof(client_addr);
diff --git a/samples/net/sockets/echo_client/src/common.h b/samples/net/sockets/echo_client/src/common.h
index b784fc5119..00214899a0 100644
--- a/samples/net/sockets/echo_client/src/common.h
+++ b/samples/net/sockets/echo_client/src/common.h
@@ -18,16 +18,16 @@ struct data {
 		/* Work controlling udp data sending */
 		struct k_delayed_work recv;
 		struct k_delayed_work transmit;
-		u32_t expecting;
-		u32_t counter;
-		u32_t mtu;
+		uint32_t expecting;
+		uint32_t counter;
+		uint32_t mtu;
 	} udp;
 
 	struct {
 		int sock;
-		u32_t expecting;
-		u32_t received;
-		u32_t counter;
+		uint32_t expecting;
+		uint32_t received;
+		uint32_t counter;
 	} tcp;
 };
 
diff --git a/samples/net/sockets/echo_client/src/echo-client.c b/samples/net/sockets/echo_client/src/echo-client.c
index c56410ef6b..e4342d637a 100644
--- a/samples/net/sockets/echo_client/src/echo-client.c
+++ b/samples/net/sockets/echo_client/src/echo-client.c
@@ -188,7 +188,7 @@ static void stop_udp_and_tcp(void)
 }
 
 static void event_handler(struct net_mgmt_event_callback *cb,
-			  u32_t mgmt_event, struct net_if *iface)
+			  uint32_t mgmt_event, struct net_if *iface)
 {
 	if ((mgmt_event & EVENT_MASK) != mgmt_event) {
 		return;
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index 2645459b02..35e0582d0c 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -69,7 +69,7 @@ static int send_tcp_data(struct data *data)
 	return ret;
 }
 
-static int compare_tcp_data(struct data *data, const char *buf, u32_t received)
+static int compare_tcp_data(struct data *data, const char *buf, uint32_t received)
 {
 	if (data->tcp.received + received > data->tcp.expecting) {
 		LOG_ERR("Too much data received: TCP %s", data->proto);
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 21df93a543..20ab3d4231 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -44,7 +44,7 @@ static int send_udp_data(struct data *data)
 	return ret < 0 ? -EIO : 0;
 }
 
-static int compare_udp_data(struct data *data, const char *buf, u32_t received)
+static int compare_udp_data(struct data *data, const char *buf, uint32_t received)
 {
 	if (received != data->udp.expecting) {
 		LOG_ERR("Invalid amount of data received: UDP %s", data->proto);
diff --git a/samples/net/sockets/echo_client/src/vlan.c b/samples/net/sockets/echo_client/src/vlan.c
index 73fd491d0a..96def8bd06 100644
--- a/samples/net/sockets/echo_client/src/vlan.c
+++ b/samples/net/sockets/echo_client/src/vlan.c
@@ -43,7 +43,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 }
 
 static int setup_iface(struct net_if *iface, const char *ipv6_addr,
-		       const char *ipv4_addr, u16_t vlan_tag)
+		       const char *ipv4_addr, uint16_t vlan_tag)
 {
 	struct net_if_addr *ifaddr;
 	struct in_addr addr4;
diff --git a/samples/net/sockets/echo_server/src/common.h b/samples/net/sockets/echo_server/src/common.h
index ef1832b8da..bb7de8acb8 100644
--- a/samples/net/sockets/echo_server/src/common.h
+++ b/samples/net/sockets/echo_server/src/common.h
@@ -22,7 +22,7 @@ struct data {
 	struct {
 		int sock;
 		char recv_buffer[RECV_BUFFER_SIZE];
-		u32_t counter;
+		uint32_t counter;
 	} udp;
 
 	struct {
@@ -31,7 +31,7 @@ struct data {
 		struct {
 			int sock;
 			char recv_buffer[RECV_BUFFER_SIZE];
-			u32_t counter;
+			uint32_t counter;
 		} accepted[CONFIG_NET_SAMPLE_NUM_HANDLERS];
 	} tcp;
 };
diff --git a/samples/net/sockets/echo_server/src/echo-server.c b/samples/net/sockets/echo_server/src/echo-server.c
index f08181cae0..5907ab8e5f 100644
--- a/samples/net/sockets/echo_server/src/echo-server.c
+++ b/samples/net/sockets/echo_server/src/echo-server.c
@@ -77,7 +77,7 @@ static void stop_udp_and_tcp(void)
 }
 
 static void event_handler(struct net_mgmt_event_callback *cb,
-			  u32_t mgmt_event, struct net_if *iface)
+			  uint32_t mgmt_event, struct net_if *iface)
 {
 	if ((mgmt_event & EVENT_MASK) != mgmt_event) {
 		return;
diff --git a/samples/net/sockets/echo_server/src/vlan.c b/samples/net/sockets/echo_server/src/vlan.c
index b1a09b640d..1b31aa1ec1 100644
--- a/samples/net/sockets/echo_server/src/vlan.c
+++ b/samples/net/sockets/echo_server/src/vlan.c
@@ -43,7 +43,7 @@ static void iface_cb(struct net_if *iface, void *user_data)
 }
 
 static int setup_iface(struct net_if *iface, const char *ipv6_addr,
-		       const char *ipv4_addr, u16_t vlan_tag)
+		       const char *ipv4_addr, uint16_t vlan_tag)
 {
 	struct net_if_addr *ifaddr;
 	struct in_addr addr4;
diff --git a/samples/net/sockets/http_client/src/main.c b/samples/net/sockets/http_client/src/main.c
index 87eeb821ce..e4399e7cbb 100644
--- a/samples/net/sockets/http_client/src/main.c
+++ b/samples/net/sockets/http_client/src/main.c
@@ -31,8 +31,8 @@ LOG_MODULE_REGISTER(net_http_client_sample, LOG_LEVEL_DBG);
 
 #define MAX_RECV_BUF_LEN 512
 
-static u8_t recv_buf_ipv4[MAX_RECV_BUF_LEN];
-static u8_t recv_buf_ipv6[MAX_RECV_BUF_LEN];
+static uint8_t recv_buf_ipv4[MAX_RECV_BUF_LEN];
+static uint8_t recv_buf_ipv6[MAX_RECV_BUF_LEN];
 
 static int setup_socket(sa_family_t family, const char *server, int port,
 			int *sock, struct sockaddr *addr, socklen_t addr_len)
@@ -152,7 +152,7 @@ void main(void)
 	struct sockaddr_in6 addr6;
 	struct sockaddr_in addr4;
 	int sock4 = -1, sock6 = -1;
-	s32_t timeout = 3 * MSEC_PER_SEC;
+	int32_t timeout = 3 * MSEC_PER_SEC;
 	int ret;
 	int port = HTTP_PORT;
 
diff --git a/samples/net/sockets/net_mgmt/src/main.c b/samples/net/sockets/net_mgmt/src/main.c
index cb85720a11..263a2121a7 100644
--- a/samples/net/sockets/net_mgmt/src/main.c
+++ b/samples/net/sockets/net_mgmt/src/main.c
@@ -84,7 +84,7 @@ static void listener(void)
 	struct sockaddr_nm event_addr;
 	socklen_t event_addr_len;
 	char ipaddr[INET6_ADDRSTRLEN];
-	u8_t buf[MAX_BUF_LEN];
+	uint8_t buf[MAX_BUF_LEN];
 	int fd, ret;
 
 	fd = socket(AF_NET_MGMT, SOCK_DGRAM, NET_MGMT_EVENT_PROTO);
diff --git a/samples/net/sockets/packet/src/packet.c b/samples/net/sockets/packet/src/packet.c
index afd51410c4..7ce4022973 100644
--- a/samples/net/sockets/packet/src/packet.c
+++ b/samples/net/sockets/packet/src/packet.c
@@ -99,7 +99,7 @@ static void wait_send(struct k_work *work)
 static void send_packet(void)
 {
 	struct sockaddr_ll dst;
-	u8_t send = 100U;
+	uint8_t send = 100U;
 	int ret;
 
 	dst.sll_ifindex = net_if_get_by_iface(net_if_get_default());
diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c
index 6af729cec0..a22314f5d8 100644
--- a/samples/net/sockets/sntp_client/src/main.c
+++ b/samples/net/sockets/sntp_client/src/main.c
@@ -49,7 +49,7 @@ void main(void)
 
 	LOG_INF("status: %d", rv);
 	LOG_INF("time since Epoch: high word: %u, low word: %u",
-		(u32_t)(sntp_time.seconds >> 32), (u32_t)sntp_time.seconds);
+		(uint32_t)(sntp_time.seconds >> 32), (uint32_t)sntp_time.seconds);
 
 #if defined(CONFIG_NET_IPV6)
 	sntp_close(&ctx);
@@ -77,7 +77,7 @@ void main(void)
 
 	LOG_INF("status: %d", rv);
 	LOG_INF("time since Epoch: high word: %u, low word: %u",
-		(u32_t)(sntp_time.seconds >> 32), (u32_t)sntp_time.seconds);
+		(uint32_t)(sntp_time.seconds >> 32), (uint32_t)sntp_time.seconds);
 #endif
 
 end:
diff --git a/samples/net/sockets/websocket_client/src/main.c b/samples/net/sockets/websocket_client/src/main.c
index 0901777b8f..aa09be137f 100644
--- a/samples/net/sockets/websocket_client/src/main.c
+++ b/samples/net/sockets/websocket_client/src/main.c
@@ -58,16 +58,16 @@ static const char lorem_ipsum[] =
 
 const int ipsum_len = MAX_RECV_BUF_LEN;
 
-static u8_t recv_buf_ipv4[MAX_RECV_BUF_LEN];
-static u8_t recv_buf_ipv6[MAX_RECV_BUF_LEN];
+static uint8_t recv_buf_ipv4[MAX_RECV_BUF_LEN];
+static uint8_t recv_buf_ipv6[MAX_RECV_BUF_LEN];
 
 /* We need to allocate bigger buffer for the websocket data we receive so that
  * the websocket header fits into it.
  */
 #define EXTRA_BUF_SPACE 30
 
-static u8_t temp_recv_buf_ipv4[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
-static u8_t temp_recv_buf_ipv6[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
+static uint8_t temp_recv_buf_ipv4[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
+static uint8_t temp_recv_buf_ipv6[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
 
 static int setup_socket(sa_family_t family, const char *server, int port,
 			int *sock, struct sockaddr *addr, socklen_t addr_len)
@@ -183,12 +183,12 @@ static ssize_t sendall_with_bsd_api(int sock, const void *buf, size_t len)
 	return send(sock, buf, len, 0);
 }
 
-static void recv_data_wso_api(int sock, size_t amount, u8_t *buf,
+static void recv_data_wso_api(int sock, size_t amount, uint8_t *buf,
 			      size_t buf_len, const char *proto)
 {
-	u64_t remaining = ULLONG_MAX;
+	uint64_t remaining = ULLONG_MAX;
 	int total_read;
-	u32_t message_type;
+	uint32_t message_type;
 	int ret, read_pos;
 
 	read_pos = 0;
@@ -227,7 +227,7 @@ static void recv_data_wso_api(int sock, size_t amount, u8_t *buf,
 	}
 }
 
-static void recv_data_bsd_api(int sock, size_t amount, u8_t *buf,
+static void recv_data_bsd_api(int sock, size_t amount, uint8_t *buf,
 			      size_t buf_len, const char *proto)
 {
 	int remaining;
@@ -266,7 +266,7 @@ static void recv_data_bsd_api(int sock, size_t amount, u8_t *buf,
 }
 
 static bool send_and_wait_msg(int sock, size_t amount, const char *proto,
-			      u8_t *buf, size_t buf_len)
+			      uint8_t *buf, size_t buf_len)
 {
 	static int count;
 	int ret;
@@ -326,7 +326,7 @@ void main(void)
 	};
 	int sock4 = -1, sock6 = -1;
 	int websock4 = -1, websock6 = -1;
-	s32_t timeout = 3 * MSEC_PER_SEC;
+	int32_t timeout = 3 * MSEC_PER_SEC;
 	struct sockaddr_in6 addr6;
 	struct sockaddr_in addr4;
 	size_t amount;
diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c
index 810084cd2b..1f2ac40dfe 100644
--- a/samples/net/telnet/src/telnet.c
+++ b/samples/net/telnet/src/telnet.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_telnet_sample, LOG_LEVEL_DBG);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 	char hr_addr[NET_IPV4_ADDR_LEN];
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index ef6c1cb759..92549bf90d 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -45,18 +45,18 @@ static K_THREAD_STACK_DEFINE(tx_stack, 1024);
 static struct k_thread tx_thread_data;
 
 /* Buffer for SLIP encoded data for the worst case */
-static u8_t slip_buf[1 + 2 * CONFIG_NET_BUF_DATA_SIZE];
+static uint8_t slip_buf[1 + 2 * CONFIG_NET_BUF_DATA_SIZE];
 
 /* ieee802.15.4 device */
 static struct ieee802154_radio_api *radio_api;
 static struct device *ieee802154_dev;
-u8_t mac_addr[8];
+uint8_t mac_addr[8];
 
 /* UART device */
 static struct device *uart_dev;
 
 /* SLIP state machine */
-static u8_t slip_state = STATE_OK;
+static uint8_t slip_state = STATE_OK;
 
 static struct net_pkt *pkt_curr;
 
@@ -158,7 +158,7 @@ static void interrupt_handler(struct device *dev)
 }
 
 /* Allocate and send data to USB Host */
-static void send_data(u8_t *cfg, u8_t *data, size_t len)
+static void send_data(uint8_t *cfg, uint8_t *data, size_t len)
 {
 	struct net_pkt *pkt;
 
@@ -187,8 +187,8 @@ static void send_data(u8_t *cfg, u8_t *data, size_t len)
 
 static void get_ieee_addr(void)
 {
-	u8_t cfg[2] = { '!', 'M' };
-	u8_t mac[8];
+	uint8_t cfg[2] = { '!', 'M' };
+	uint8_t mac[8];
 
 	LOG_DBG("");
 
@@ -200,7 +200,7 @@ static void get_ieee_addr(void)
 
 static void process_request(struct net_buf *buf)
 {
-	u8_t cmd = net_buf_pull_u8(buf);
+	uint8_t cmd = net_buf_pull_u8(buf);
 
 
 	switch (cmd) {
@@ -213,10 +213,10 @@ static void process_request(struct net_buf *buf)
 	}
 }
 
-static void send_pkt_report(u8_t seq, u8_t status, u8_t num_tx)
+static void send_pkt_report(uint8_t seq, uint8_t status, uint8_t num_tx)
 {
-	u8_t cfg[2] = { '!', 'R' };
-	u8_t report[3];
+	uint8_t cfg[2] = { '!', 'R' };
+	uint8_t report[3];
 
 	report[0] = seq;
 	report[1] = status;
@@ -228,7 +228,7 @@ static void send_pkt_report(u8_t seq, u8_t status, u8_t num_tx)
 static void process_data(struct net_pkt *pkt)
 {
 	struct net_buf *buf = net_buf_frag_last(pkt->buffer);
-	u8_t seq, num_attr;
+	uint8_t seq, num_attr;
 	int ret, i;
 
 	seq = net_buf_pull_u8(buf);
@@ -262,7 +262,7 @@ static void process_data(struct net_pkt *pkt)
 	send_pkt_report(seq, ret, 1);
 }
 
-static void set_channel(u8_t chan)
+static void set_channel(uint8_t chan)
 {
 	LOG_DBG("Set channel %u", chan);
 
@@ -272,7 +272,7 @@ static void set_channel(u8_t chan)
 static void process_config(struct net_pkt *pkt)
 {
 	struct net_buf *buf = net_buf_frag_last(pkt->buffer);
-	u8_t cmd = net_buf_pull_u8(buf);
+	uint8_t cmd = net_buf_pull_u8(buf);
 
 	LOG_DBG("Process config %c", cmd);
 
@@ -295,7 +295,7 @@ static void rx_thread(void)
 	while (true) {
 		struct net_pkt *pkt;
 		struct net_buf *buf;
-		u8_t specifier;
+		uint8_t specifier;
 
 		pkt = k_fifo_get(&rx_queue, K_FOREVER);
 		buf = net_buf_frag_last(pkt->buffer);
@@ -322,10 +322,10 @@ static void rx_thread(void)
 	}
 }
 
-static size_t slip_buffer(u8_t *sbuf, struct net_buf *buf)
+static size_t slip_buffer(uint8_t *sbuf, struct net_buf *buf)
 {
 	size_t len = buf->len;
-	u8_t *sbuf_orig = sbuf;
+	uint8_t *sbuf_orig = sbuf;
 	int i;
 
 	/**
@@ -334,7 +334,7 @@ static size_t slip_buffer(u8_t *sbuf, struct net_buf *buf)
 	 */
 
 	for (i = 0; i < len; i++) {
-		u8_t byte = net_buf_pull_u8(buf);
+		uint8_t byte = net_buf_pull_u8(buf);
 
 		switch (byte) {
 		case SLIP_END:
@@ -355,7 +355,7 @@ static size_t slip_buffer(u8_t *sbuf, struct net_buf *buf)
 	return sbuf - sbuf_orig;
 }
 
-static int try_write(u8_t *data, u16_t len)
+static int try_write(uint8_t *data, uint16_t len)
 {
 	int wrote;
 
@@ -427,9 +427,9 @@ static void init_tx_queue(void)
 /**
  * FIXME choose correct OUI, or add support in L2
  */
-static u8_t *get_mac(struct device *dev)
+static uint8_t *get_mac(struct device *dev)
 {
-	u32_t *ptr = (u32_t *)mac_addr;
+	uint32_t *ptr = (uint32_t *)mac_addr;
 
 	mac_addr[7] = 0x00;
 	mac_addr[6] = 0x12;
@@ -463,7 +463,7 @@ static bool init_ieee802154(void)
 	if (IEEE802154_HW_FILTER &
 	    radio_api->get_capabilities(ieee802154_dev)) {
 		struct ieee802154_filter filter;
-		u16_t short_addr;
+		uint16_t short_addr;
 
 		/* Set short address */
 		short_addr = (mac_addr[0] << 8) + mac_addr[1];
@@ -514,7 +514,7 @@ int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
 void main(void)
 {
 	struct device *dev;
-	u32_t baudrate, dtr = 0U;
+	uint32_t baudrate, dtr = 0U;
 	int ret;
 
 	LOG_INF("Starting wpan_serial application");
diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c
index 342c3d674b..ab0ae70083 100644
--- a/samples/net/wpanusb/src/wpanusb.c
+++ b/samples/net/wpanusb/src/wpanusb.c
@@ -33,7 +33,7 @@ static struct device *ieee802154_dev;
 static struct k_fifo tx_queue;
 
 /* IEEE802.15.4 frame + 1 byte len + 1 byte LQI */
-u8_t tx_buf[IEEE802154_MTU + 1 + 1];
+uint8_t tx_buf[IEEE802154_MTU + 1 + 1];
 
 /**
  * Stack for the tx thread.
@@ -83,7 +83,7 @@ static struct usb_ep_cfg_data wpanusb_ep[] = {
 
 static void wpanusb_status_cb(struct usb_cfg_data *cfg,
 			      enum usb_dc_status_code status,
-			      const u8_t *param)
+			      const uint8_t *param)
 {
 	ARG_UNUSED(param);
 	ARG_UNUSED(cfg);
@@ -123,7 +123,7 @@ static void wpanusb_status_cb(struct usb_cfg_data *cfg,
  * later processing
  */
 static int wpanusb_vendor_handler(struct usb_setup_packet *setup,
-				  s32_t *len, u8_t **data)
+				  int32_t *len, uint8_t **data)
 {
 	struct net_pkt *pkt;
 
@@ -184,7 +184,7 @@ static int set_ieee_addr(void *data, int len)
 	    radio_api->get_capabilities(ieee802154_dev)) {
 		struct ieee802154_filter filter;
 
-		filter.ieee_addr = (u8_t *)&req->ieee_addr;
+		filter.ieee_addr = (uint8_t *)&req->ieee_addr;
 
 		return radio_api->filter(ieee802154_dev, true,
 					 IEEE802154_FILTER_TYPE_IEEE_ADDR,
@@ -251,9 +251,9 @@ static int stop(void)
 
 static int tx(struct net_pkt *pkt)
 {
-	u8_t ep = wpanusb_config.endpoint[WPANUSB_IN_EP_IDX].ep_addr;
+	uint8_t ep = wpanusb_config.endpoint[WPANUSB_IN_EP_IDX].ep_addr;
 	struct net_buf *buf = net_buf_frag_last(pkt->buffer);
-	u8_t seq = net_buf_pull_u8(buf);
+	uint8_t seq = net_buf_pull_u8(buf);
 	int retries = 3;
 	int ret;
 
@@ -286,7 +286,7 @@ static void tx_thread(void)
 	LOG_DBG("Tx thread started");
 
 	while (1) {
-		u8_t cmd;
+		uint8_t cmd;
 		struct net_pkt *pkt;
 		struct net_buf *buf;
 
@@ -350,9 +350,9 @@ static void init_tx_queue(void)
 int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
 {
 	size_t len = net_pkt_get_len(pkt);
-	u8_t *p = tx_buf;
+	uint8_t *p = tx_buf;
 	int ret;
-	u8_t ep;
+	uint8_t ep;
 
 	LOG_DBG("Got data, pkt %p, len %d", pkt, len);
 
@@ -367,7 +367,7 @@ int net_recv_data(struct net_if *iface, struct net_pkt *pkt)
 	/**
 	 * Add length 1 byte
 	 */
-	*p++ = (u8_t)len;
+	*p++ = (uint8_t)len;
 
 	/* This is needed to work with pkt */
 	net_pkt_cursor_init(pkt);
diff --git a/samples/net/wpanusb/src/wpanusb.h b/samples/net/wpanusb/src/wpanusb.h
index 19057a15aa..0945a8a2fe 100644
--- a/samples/net/wpanusb/src/wpanusb.h
+++ b/samples/net/wpanusb/src/wpanusb.h
@@ -23,18 +23,18 @@ enum wpanusb_requests {
 };
 
 struct set_channel {
-	u8_t page;
-	u8_t channel;
+	uint8_t page;
+	uint8_t channel;
 } __packed;
 
 struct set_short_addr {
-	u16_t short_addr;
+	uint16_t short_addr;
 } __packed;
 
 struct set_pan_id {
-	u16_t pan_id;
+	uint16_t pan_id;
 } __packed;
 
 struct set_ieee_addr {
-	u64_t ieee_addr;
+	uint64_t ieee_addr;
 } __packed;
diff --git a/samples/net/zperf/src/shell_utils.c b/samples/net/zperf/src/shell_utils.c
index 3773f0bfa4..9ed89184d1 100644
--- a/samples/net/zperf/src/shell_utils.c
+++ b/samples/net/zperf/src/shell_utils.c
@@ -14,19 +14,19 @@
 
 #include "shell_utils.h"
 
-const u32_t TIME_US[] = { 60 * 1000 * 1000, 1000 * 1000, 1000, 0 };
+const uint32_t TIME_US[] = { 60 * 1000 * 1000, 1000 * 1000, 1000, 0 };
 const char *TIME_US_UNIT[] = { "m", "s", "ms", "us" };
-const u32_t KBPS[] = { 1024, 0 };
+const uint32_t KBPS[] = { 1024, 0 };
 const char *KBPS_UNIT[] = { "Mbps", "Kbps" };
-const u32_t K[] = { 1024 * 1024, 1024, 0 };
+const uint32_t K[] = { 1024 * 1024, 1024, 0 };
 const char *K_UNIT[] = { "M", "K", "" };
 
-void print_number(const struct shell *shell, u32_t value,
-		  const u32_t *divisor, const char **units)
+void print_number(const struct shell *shell, uint32_t value,
+		  const uint32_t *divisor, const char **units)
 {
 	const char **unit;
-	const u32_t *div;
-	u32_t dec, radix;
+	const uint32_t *div;
+	uint32_t dec, radix;
 
 	unit = units;
 	div = divisor;
@@ -46,11 +46,11 @@ void print_number(const struct shell *shell, u32_t value,
 	}
 }
 
-long parse_number(const char *string, const u32_t *divisor,
+long parse_number(const char *string, const uint32_t *divisor,
 		const char **units)
 {
 	const char **unit;
-	const u32_t *div;
+	const uint32_t *div;
 	char *suffix;
 	long dec;
 	int cmp;
diff --git a/samples/net/zperf/src/shell_utils.h b/samples/net/zperf/src/shell_utils.h
index 467c0653e6..0a48ced95d 100644
--- a/samples/net/zperf/src/shell_utils.h
+++ b/samples/net/zperf/src/shell_utils.h
@@ -11,15 +11,15 @@
 #define IPV4_STR_LEN_MAX 15
 #define IPV4_STR_LEN_MIN 7
 
-extern const u32_t TIME_US[];
+extern const uint32_t TIME_US[];
 extern const char *TIME_US_UNIT[];
-extern const u32_t KBPS[];
+extern const uint32_t KBPS[];
 extern const char *KBPS_UNIT[];
-extern const u32_t K[];
+extern const uint32_t K[];
 extern const char *K_UNIT[];
 
-extern void print_number(const struct shell *shell, u32_t value,
-			 const u32_t *divisor, const char **units);
-extern long parse_number(const char *string, const u32_t *divisor,
+extern void print_number(const struct shell *shell, uint32_t value,
+			 const uint32_t *divisor, const char **units);
+extern long parse_number(const char *string, const uint32_t *divisor,
 			 const char **units);
 #endif /* __SHELL_UTILS_H */
diff --git a/samples/net/zperf/src/zperf.h b/samples/net/zperf/src/zperf.h
index 503f322224..f47f55177c 100644
--- a/samples/net/zperf/src/zperf.h
+++ b/samples/net/zperf/src/zperf.h
@@ -9,16 +9,16 @@
 #define VERSION "1.1"
 
 struct zperf_results {
-	u32_t nb_packets_sent;
-	u32_t nb_packets_rcvd;
-	u32_t nb_packets_lost;
-	u32_t nb_packets_outorder;
-	u32_t nb_bytes_sent;
-	u32_t time_in_us;
-	u32_t jitter_in_us;
-	u32_t client_time_in_us;
-	u32_t packet_size;
-	u32_t nb_packets_errors;
+	uint32_t nb_packets_sent;
+	uint32_t nb_packets_rcvd;
+	uint32_t nb_packets_lost;
+	uint32_t nb_packets_outorder;
+	uint32_t nb_bytes_sent;
+	uint32_t time_in_us;
+	uint32_t jitter_in_us;
+	uint32_t client_time_in_us;
+	uint32_t packet_size;
+	uint32_t nb_packets_errors;
 };
 
 typedef void (*zperf_callback)(int status, struct zperf_results *);
diff --git a/samples/net/zperf/src/zperf_internal.h b/samples/net/zperf/src/zperf_internal.h
index d1e97cb4a6..0f83a05e0f 100644
--- a/samples/net/zperf/src/zperf_internal.h
+++ b/samples/net/zperf/src/zperf_internal.h
@@ -39,59 +39,59 @@
 
 #define HW_CYCLES_TO_USEC(__hw_cycle__) \
 	( \
-		((u64_t)(__hw_cycle__) * (u64_t)USEC_PER_SEC) / \
-		((u64_t)sys_clock_hw_cycles_per_sec())		\
+		((uint64_t)(__hw_cycle__) * (uint64_t)USEC_PER_SEC) / \
+		((uint64_t)sys_clock_hw_cycles_per_sec())		\
 	)
 
 #define HW_CYCLES_TO_SEC(__hw_cycle__) \
 	( \
-		((u64_t)(HW_CYCLES_TO_USEC(__hw_cycle__))) / \
-		((u64_t)USEC_PER_SEC) \
+		((uint64_t)(HW_CYCLES_TO_USEC(__hw_cycle__))) / \
+		((uint64_t)USEC_PER_SEC) \
 	)
 
 #define USEC_TO_HW_CYCLES(__usec__) \
 	( \
-	 ((u64_t)(__usec__) * (u64_t)sys_clock_hw_cycles_per_sec()) /	\
-		((u64_t)USEC_PER_SEC) \
+	 ((uint64_t)(__usec__) * (uint64_t)sys_clock_hw_cycles_per_sec()) /	\
+		((uint64_t)USEC_PER_SEC) \
 	)
 
 #define SEC_TO_HW_CYCLES(__sec__) \
-	USEC_TO_HW_CYCLES((u64_t)(__sec__) * \
-	(u64_t)USEC_PER_SEC)
+	USEC_TO_HW_CYCLES((uint64_t)(__sec__) * \
+	(uint64_t)USEC_PER_SEC)
 
 #define MSEC_TO_HW_CYCLES(__msec__) \
-		USEC_TO_HW_CYCLES((u64_t)(__msec__) * \
-		(u64_t)MSEC_PER_SEC)
+		USEC_TO_HW_CYCLES((uint64_t)(__msec__) * \
+		(uint64_t)MSEC_PER_SEC)
 
 struct zperf_udp_datagram {
-	s32_t id;
-	u32_t tv_sec;
-	u32_t tv_usec;
+	int32_t id;
+	uint32_t tv_sec;
+	uint32_t tv_usec;
 } __packed;
 
 struct zperf_client_hdr_v1 {
-	s32_t flags;
-	s32_t num_of_threads;
-	s32_t port;
-	s32_t buffer_len;
-	s32_t bandwidth;
-	s32_t num_of_bytes;
+	int32_t flags;
+	int32_t num_of_threads;
+	int32_t port;
+	int32_t buffer_len;
+	int32_t bandwidth;
+	int32_t num_of_bytes;
 };
 
 struct zperf_server_hdr {
-	s32_t flags;
-	s32_t total_len1;
-	s32_t total_len2;
-	s32_t stop_sec;
-	s32_t stop_usec;
-	s32_t error_cnt;
-	s32_t outorder_cnt;
-	s32_t datagrams;
-	s32_t jitter1;
-	s32_t jitter2;
+	int32_t flags;
+	int32_t total_len1;
+	int32_t total_len2;
+	int32_t stop_sec;
+	int32_t stop_usec;
+	int32_t error_cnt;
+	int32_t outorder_cnt;
+	int32_t datagrams;
+	int32_t jitter1;
+	int32_t jitter2;
 };
 
-static inline u32_t time_delta(u32_t ts, u32_t t)
+static inline uint32_t time_delta(uint32_t ts, uint32_t t)
 {
 	return (t >= ts) ? (t - ts) : (ULONG_MAX - ts + t);
 }
diff --git a/samples/net/zperf/src/zperf_session.c b/samples/net/zperf/src/zperf_session.c
index a51ae11aee..663fa07f2b 100644
--- a/samples/net/zperf/src/zperf_session.c
+++ b/samples/net/zperf/src/zperf_session.c
@@ -30,7 +30,7 @@ struct session *get_session(struct net_pkt *pkt,
 	struct in_addr ipv4 = { };
 	struct net_udp_hdr *udp_hdr;
 	int i = 0;
-	u16_t port;
+	uint16_t port;
 
 	if (!pkt) {
 		printk("Error! null pkt detected.\n");
diff --git a/samples/net/zperf/src/zperf_session.h b/samples/net/zperf/src/zperf_session.h
index d7413350ad..118ef6d11d 100644
--- a/samples/net/zperf/src/zperf_session.h
+++ b/samples/net/zperf/src/zperf_session.h
@@ -35,7 +35,7 @@ enum session_proto {
 
 struct session {
 	/* Tuple for UDP */
-	u16_t port;
+	uint16_t port;
 	struct net_addr ip;
 
 	/* TCP session */
@@ -44,15 +44,15 @@ struct session {
 	enum state state;
 
 	/* Stat data */
-	u32_t counter;
-	u32_t next_id;
-	u32_t outorder;
-	u32_t error;
-	u64_t length;
-	u32_t start_time;
-	u32_t last_time;
-	s32_t jitter;
-	s32_t last_transit_time;
+	uint32_t counter;
+	uint32_t next_id;
+	uint32_t outorder;
+	uint32_t error;
+	uint64_t length;
+	uint32_t start_time;
+	uint32_t last_time;
+	int32_t jitter;
+	int32_t last_transit_time;
 
 	/* Stats packet*/
 	struct zperf_server_hdr stat;
diff --git a/samples/net/zperf/src/zperf_shell.c b/samples/net/zperf/src/zperf_shell.c
index 11a84799a7..684638e692 100644
--- a/samples/net/zperf/src/zperf_shell.c
+++ b/samples/net/zperf/src/zperf_shell.c
@@ -363,20 +363,20 @@ static void shell_udp_upload_print_stats(const struct shell *shell,
 		shell_fprintf(shell, SHELL_NORMAL, "-\nUpload completed!\n");
 
 		if (results->time_in_us != 0U) {
-			rate_in_kbps = (u32_t)
-				(((u64_t)results->nb_bytes_sent *
-				  (u64_t)8 * (u64_t)USEC_PER_SEC) /
-				 ((u64_t)results->time_in_us * 1024U));
+			rate_in_kbps = (uint32_t)
+				(((uint64_t)results->nb_bytes_sent *
+				  (uint64_t)8 * (uint64_t)USEC_PER_SEC) /
+				 ((uint64_t)results->time_in_us * 1024U));
 		} else {
 			rate_in_kbps = 0U;
 		}
 
 		if (results->client_time_in_us != 0U) {
-			client_rate_in_kbps = (u32_t)
-				(((u64_t)results->nb_packets_sent *
-				  (u64_t)results->packet_size * (u64_t)8 *
-				  (u64_t)USEC_PER_SEC) /
-				 ((u64_t)results->client_time_in_us * 1024U));
+			client_rate_in_kbps = (uint32_t)
+				(((uint64_t)results->nb_packets_sent *
+				  (uint64_t)results->packet_size * (uint64_t)8 *
+				  (uint64_t)USEC_PER_SEC) /
+				 ((uint64_t)results->client_time_in_us * 1024U));
 		} else {
 			client_rate_in_kbps = 0U;
 		}
@@ -428,11 +428,11 @@ static void shell_tcp_upload_print_stats(const struct shell *shell,
 		shell_fprintf(shell, SHELL_NORMAL, "-\nUpload completed!\n");
 
 		if (results->client_time_in_us != 0U) {
-			client_rate_in_kbps = (u32_t)
-				(((u64_t)results->nb_packets_sent *
-				  (u64_t)results->packet_size * (u64_t)8 *
-				  (u64_t)USEC_PER_SEC) /
-				 ((u64_t)results->client_time_in_us * 1024U));
+			client_rate_in_kbps = (uint32_t)
+				(((uint64_t)results->nb_packets_sent *
+				  (uint64_t)results->packet_size * (uint64_t)8 *
+				  (uint64_t)USEC_PER_SEC) /
+				 ((uint64_t)results->client_time_in_us * 1024U));
 		} else {
 			client_rate_in_kbps = 0U;
 		}
@@ -697,7 +697,7 @@ static int shell_cmd_upload(const struct shell *shell, size_t argc,
 	sa_family_t family = AF_UNSPEC;
 	unsigned int duration_in_ms, packet_size, rate_in_kbps;
 	char *port_str;
-	u16_t port;
+	uint16_t port;
 	bool is_udp;
 	int start = 0;
 
@@ -836,10 +836,10 @@ static int shell_cmd_upload2(const struct shell *shell, size_t argc,
 			     char *argv[], enum net_ip_protocol proto)
 {
 	struct net_context *context6 = NULL, *context4 = NULL;
-	u16_t port = DEF_PORT;
+	uint16_t port = DEF_PORT;
 	unsigned int duration_in_ms, packet_size, rate_in_kbps;
 	sa_family_t family;
-	u8_t is_udp;
+	uint8_t is_udp;
 	int start = 0;
 
 	is_udp = proto == IPPROTO_UDP;
diff --git a/samples/net/zperf/src/zperf_tcp_receiver.c b/samples/net/zperf/src/zperf_tcp_receiver.c
index 9e382a053f..1042ab7576 100644
--- a/samples/net/zperf/src/zperf_tcp_receiver.c
+++ b/samples/net/zperf/src/zperf_tcp_receiver.c
@@ -41,7 +41,7 @@ static void tcp_received(struct net_context *context,
 {
 	const struct shell *shell = tcp_shell;
 	struct session *session;
-	u32_t time;
+	uint32_t time;
 
 	if (!shell) {
 		printk("Shell is not set!\n");
@@ -74,19 +74,19 @@ static void tcp_received(struct net_context *context,
 		}
 
 		if (pkt == NULL && status == 0) { /* EOF */
-			u32_t rate_in_kbps;
-			u32_t duration = HW_CYCLES_TO_USEC(
+			uint32_t rate_in_kbps;
+			uint32_t duration = HW_CYCLES_TO_USEC(
 				time_delta(session->start_time, time));
 
 			session->state = STATE_COMPLETED;
 
 			/* Compute baud rate */
 			if (duration != 0U) {
-				rate_in_kbps = (u32_t)
-					(((u64_t)session->length *
-					  (u64_t)8 *
-					  (u64_t)USEC_PER_SEC) /
-					 ((u64_t)duration * 1024U));
+				rate_in_kbps = (uint32_t)
+					(((uint64_t)session->length *
+					  (uint64_t)8 *
+					  (uint64_t)USEC_PER_SEC) /
+					 ((uint64_t)duration * 1024U));
 			} else {
 				rate_in_kbps = 0U;
 			}
diff --git a/samples/net/zperf/src/zperf_tcp_uploader.c b/samples/net/zperf/src/zperf_tcp_uploader.c
index 6f23871f2e..0b6fd046b5 100644
--- a/samples/net/zperf/src/zperf_tcp_uploader.c
+++ b/samples/net/zperf/src/zperf_tcp_uploader.c
@@ -27,11 +27,11 @@ void zperf_tcp_upload(const struct shell *shell,
 		      unsigned int packet_size,
 		      struct zperf_results *results)
 {
-	u32_t duration = MSEC_TO_HW_CYCLES(duration_in_ms);
-	u32_t nb_packets = 0U, nb_errors = 0U;
-	u32_t start_time, last_print_time, end_time;
-	u8_t time_elapsed = 0U, finished = 0U;
-	u32_t alloc_errors = 0U;
+	uint32_t duration = MSEC_TO_HW_CYCLES(duration_in_ms);
+	uint32_t nb_packets = 0U, nb_errors = 0U;
+	uint32_t start_time, last_print_time, end_time;
+	uint8_t time_elapsed = 0U, finished = 0U;
+	uint32_t alloc_errors = 0U;
 
 	if (packet_size > PACKET_SIZE_MAX) {
 		shell_fprintf(shell, SHELL_WARNING,
@@ -57,7 +57,7 @@ void zperf_tcp_upload(const struct shell *shell,
 
 	do {
 		int ret = 0;
-		u32_t loop_time;
+		uint32_t loop_time;
 
 		/* Timestamps */
 		loop_time = k_cycle_get_32();
diff --git a/samples/net/zperf/src/zperf_udp_receiver.c b/samples/net/zperf/src/zperf_udp_receiver.c
index 0617966fa6..a38e9e2273 100644
--- a/samples/net/zperf/src/zperf_udp_receiver.c
+++ b/samples/net/zperf/src/zperf_udp_receiver.c
@@ -53,7 +53,7 @@ static inline void set_dst_addr(const struct shell *shell,
 
 static inline void build_reply(struct zperf_udp_datagram *hdr,
 			       struct zperf_server_hdr *stat,
-			       u8_t *buf)
+			       uint8_t *buf)
 {
 	int pos = 0;
 	struct zperf_server_hdr *stat_hdr;
@@ -87,7 +87,7 @@ static int zperf_receiver_send_stat(const struct shell *shell,
 				    struct zperf_udp_datagram *hdr,
 				    struct zperf_server_hdr *stat)
 {
-	u8_t reply[BUF_SIZE];
+	uint8_t reply[BUF_SIZE];
 	struct sockaddr dst_addr;
 	int ret;
 
@@ -124,9 +124,9 @@ static void udp_received(struct net_context *context,
 	const struct shell *shell = user_data;
 	struct zperf_udp_datagram *hdr;
 	struct session *session;
-	s32_t transit_time;
-	u32_t time;
-	s32_t id;
+	int32_t transit_time;
+	uint32_t time;
+	int32_t id;
 
 	if (!pkt) {
 		return;
@@ -175,8 +175,8 @@ static void udp_received(struct net_context *context,
 		break;
 	case STATE_ONGOING:
 		if (id < 0) { /* Negative id means session end. */
-			u32_t rate_in_kbps;
-			u32_t duration;
+			uint32_t rate_in_kbps;
+			uint32_t duration;
 
 			shell_fprintf(shell, SHELL_NORMAL, "End of session!\n");
 
@@ -187,10 +187,10 @@ static void udp_received(struct net_context *context,
 
 			/* Compute baud rate */
 			if (duration != 0U) {
-				rate_in_kbps = (u32_t)
-					(((u64_t)session->length * (u64_t)8 *
-					  (u64_t)USEC_PER_SEC) /
-					 ((u64_t)duration * 1024U));
+				rate_in_kbps = (uint32_t)
+					(((uint64_t)session->length * (uint64_t)8 *
+					  (uint64_t)USEC_PER_SEC) /
+					 ((uint64_t)duration * 1024U));
 			} else {
 				rate_in_kbps = 0U;
 			}
@@ -251,7 +251,7 @@ static void udp_received(struct net_context *context,
 						  USEC_PER_SEC +
 						  ntohl(hdr->tv_usec));
 			if (session->last_transit_time != 0) {
-				s32_t delta_transit = transit_time -
+				int32_t delta_transit = transit_time -
 					session->last_transit_time;
 
 				delta_transit =
diff --git a/samples/net/zperf/src/zperf_udp_uploader.c b/samples/net/zperf/src/zperf_udp_uploader.c
index f077b440a2..2c1a4f9424 100644
--- a/samples/net/zperf/src/zperf_udp_uploader.c
+++ b/samples/net/zperf/src/zperf_udp_uploader.c
@@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG);
 #include "zperf.h"
 #include "zperf_internal.h"
 
-static u8_t sample_packet[sizeof(struct zperf_udp_datagram) +
+static uint8_t sample_packet[sizeof(struct zperf_udp_datagram) +
 			  sizeof(struct zperf_client_hdr_v1) +
 			  PACKET_SIZE_MAX];
 
@@ -73,9 +73,9 @@ static void stat_received(struct net_context *context,
 
 static inline void zperf_upload_fin(const struct shell *shell,
 				    struct net_context *context,
-				    u32_t nb_packets,
-				    u32_t end_time,
-				    u32_t packet_size,
+				    uint32_t nb_packets,
+				    uint32_t end_time,
+				    uint32_t packet_size,
 				    struct zperf_results *results)
 {
 	struct net_pkt *stat = NULL;
@@ -163,14 +163,14 @@ void zperf_udp_upload(const struct shell *shell,
 		      unsigned int rate_in_kbps,
 		      struct zperf_results *results)
 {
-	u32_t packet_duration = (u32_t)(((u64_t) packet_size *
+	uint32_t packet_duration = (uint32_t)(((uint64_t) packet_size *
 					       SEC_TO_HW_CYCLES(1) * 8U) /
-					      (u64_t)(rate_in_kbps * 1024U));
-	u32_t duration = MSEC_TO_HW_CYCLES(duration_in_ms);
-	u32_t print_interval = SEC_TO_HW_CYCLES(1);
-	u32_t delay = packet_duration;
-	u32_t nb_packets = 0U;
-	u32_t start_time, last_print_time, last_loop_time, end_time;
+					      (uint64_t)(rate_in_kbps * 1024U));
+	uint32_t duration = MSEC_TO_HW_CYCLES(duration_in_ms);
+	uint32_t print_interval = SEC_TO_HW_CYCLES(1);
+	uint32_t delay = packet_duration;
+	uint32_t nb_packets = 0U;
+	uint32_t start_time, last_print_time, last_loop_time, end_time;
 
 	if (packet_size > PACKET_SIZE_MAX) {
 		shell_fprintf(shell, SHELL_WARNING,
@@ -194,8 +194,8 @@ void zperf_udp_upload(const struct shell *shell,
 	do {
 		struct zperf_udp_datagram *datagram;
 		struct zperf_client_hdr_v1 *hdr;
-		u32_t loop_time;
-		s32_t adjust;
+		uint32_t loop_time;
+		int32_t adjust;
 		int ret;
 
 		/* Timestamp */
diff --git a/samples/nfc/nfc_hello/src/main.c b/samples/nfc/nfc_hello/src/main.c
index 17f7bfccbd..3edad832e7 100644
--- a/samples/nfc/nfc_hello/src/main.c
+++ b/samples/nfc/nfc_hello/src/main.c
@@ -15,11 +15,11 @@
 #define SLEEP_TIME	500
 
 static struct device *uart1_dev;
-static u8_t rx_buf[BUF_MAXSIZE];
-static u8_t tx_buf[BUF_MAXSIZE];
-static u8_t nci_reset[] = {0x20, 0x00, 0x01, 0x00};
+static uint8_t rx_buf[BUF_MAXSIZE];
+static uint8_t tx_buf[BUF_MAXSIZE];
+static uint8_t nci_reset[] = {0x20, 0x00, 0x01, 0x00};
 
-static void msg_dump(const char *s, u8_t *data, unsigned len)
+static void msg_dump(const char *s, uint8_t *data, unsigned len)
 {
 	unsigned i;
 
@@ -50,7 +50,7 @@ static void uart1_init(void)
 
 void main(void)
 {
-	u32_t *size = (u32_t *)tx_buf;
+	uint32_t *size = (uint32_t *)tx_buf;
 
 	printf("Sample app running on: %s\n", CONFIG_ARCH);
 
@@ -60,13 +60,13 @@ void main(void)
 	UNALIGNED_PUT(sys_cpu_to_be32(sizeof(nci_reset)), size);
 
 	/* NFC Controller Interface reset cmd */
-	memcpy(tx_buf + sizeof(u32_t), nci_reset, sizeof(nci_reset));
+	memcpy(tx_buf + sizeof(uint32_t), nci_reset, sizeof(nci_reset));
 
 	/*
 	 * Peer will receive: 0x00 0x00 0x00 0x04 0x20 0x00 0x01 0x00
 	 *	                nci_reset size   +    nci_reset cmd
 	 */
-	uart_fifo_fill(uart1_dev, tx_buf, sizeof(u32_t) + sizeof(nci_reset));
+	uart_fifo_fill(uart1_dev, tx_buf, sizeof(uint32_t) + sizeof(nci_reset));
 
 	while (1) {
 		k_msleep(SLEEP_TIME);
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index b852bfbf7e..fb68126748 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -97,7 +97,7 @@ static void set_phil_state_pos(int id)
 }
 
 #include <stdarg.h>
-static void print_phil_state(int id, const char *fmt, s32_t delay)
+static void print_phil_state(int id, const char *fmt, int32_t delay)
 {
 	int prio = k_thread_priority_get(k_current_get());
 
@@ -117,17 +117,17 @@ static void print_phil_state(int id, const char *fmt, s32_t delay)
 	printk("\n");
 }
 
-static s32_t get_random_delay(int id, int period_in_ms)
+static int32_t get_random_delay(int id, int period_in_ms)
 {
 	/*
 	 * The random delay is unit-less, and is based on the philosopher's ID
 	 * and the current uptime to create some pseudo-randomness. It produces
 	 * a value between 0 and 31.
 	 */
-	s32_t delay = (k_uptime_get_32()/100 * (id + 1)) & 0x1f;
+	int32_t delay = (k_uptime_get_32()/100 * (id + 1)) & 0x1f;
 
 	/* add 1 to not generate a delay of 0 */
-	s32_t ms = (delay + 1) * period_in_ms;
+	int32_t ms = (delay + 1) * period_in_ms;
 
 	return ms;
 }
@@ -157,7 +157,7 @@ void philosopher(void *id, void *unused1, void *unused2)
 	}
 
 	while (1) {
-		s32_t delay;
+		int32_t delay;
 
 		print_phil_state(my_id, "       STARVING       ", 0);
 		take(fork1);
diff --git a/samples/philosophers/src/phil_obj_abstract.h b/samples/philosophers/src/phil_obj_abstract.h
index 853b871fbc..7731109b0a 100644
--- a/samples/philosophers/src/phil_obj_abstract.h
+++ b/samples/philosophers/src/phil_obj_abstract.h
@@ -78,15 +78,15 @@
 	#else
 		typedef struct {
 			struct k_stack stack;
-			u32_t stack_mem[1];
+			uint32_t stack_mem[1];
 		} fork_obj_t;
 		#define fork_init(x) do { \
-			k_stack_init(x, (u32_t *)((x) + 1), 1); \
+			k_stack_init(x, (uint32_t *)((x) + 1), 1); \
 			k_stack_push(x, MAGIC); \
 		} while ((0))
 	#endif
 	#define take(x) do { \
-		u32_t data; k_stack_pop(x, &data, K_FOREVER); \
+		uint32_t data; k_stack_pop(x, &data, K_FOREVER); \
 		__ASSERT(data == MAGIC, "data was %x\n", data); \
 	} while ((0))
 	#define drop(x) k_stack_push(x, MAGIC)
diff --git a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
index e82fd69848..0736951996 100644
--- a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
@@ -90,7 +90,7 @@ static void set_phil_state_pos(int id)
 }
 
 #include <stdarg.h>
-static void print_phil_state(int id, const char *fmt, s32_t delay)
+static void print_phil_state(int id, const char *fmt, int32_t delay)
 {
 	int prio = osThreadGetPriority(osThreadGetId());
 
@@ -110,17 +110,17 @@ static void print_phil_state(int id, const char *fmt, s32_t delay)
 	printk("\n");
 }
 
-static s32_t get_random_delay(int id, int period_in_ms)
+static int32_t get_random_delay(int id, int period_in_ms)
 {
 	/*
 	 * The random delay is unit-less, and is based on the philosopher's ID
 	 * and the current uptime to create some pseudo-randomness. It produces
 	 * a value between 0 and 31.
 	 */
-	s32_t delay = (k_uptime_get_32() / 100 * (id + 1)) & 0x1f;
+	int32_t delay = (k_uptime_get_32() / 100 * (id + 1)) & 0x1f;
 
 	/* add 1 to not generate a delay of 0 */
-	s32_t ms = (delay + 1) * period_in_ms;
+	int32_t ms = (delay + 1) * period_in_ms;
 
 	return ms;
 }
@@ -147,7 +147,7 @@ void philosopher(void const *id)
 	}
 
 	while (1) {
-		s32_t delay;
+		int32_t delay;
 
 		print_phil_state(my_id, "       STARVING       ", 0);
 		take(fork1);
diff --git a/samples/portability/cmsis_rtos_v1/timer_synchronization/src/main.c b/samples/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
index ae141bc2f7..8b460cc87d 100644
--- a/samples/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
+++ b/samples/portability/cmsis_rtos_v1/timer_synchronization/src/main.c
@@ -18,19 +18,19 @@
 #define Q_LEN 1
 #define INITIAL_DATA_VALUE 5
 
-u32_t data;
+uint32_t data;
 
 void read_msg_callback(void const *arg);
 
 osTimerDef(myTimer, read_msg_callback);
 
-osMessageQDef(messageq, Q_LEN, u32_t);
+osMessageQDef(messageq, Q_LEN, uint32_t);
 osMessageQId message_id;
 
 void read_msg_callback(void const *arg)
 {
 	osEvent evt;
-	u32_t read_msg = 0U;
+	uint32_t read_msg = 0U;
 
 	evt = osMessageGet(message_id, 0);
 	read_msg = evt.value.v;
@@ -57,7 +57,7 @@ int send_msg_thread(void)
 void main(void)
 {
 	osTimerId timer_id;
-	u32_t counter = 10U;
+	uint32_t counter = 10U;
 
 	data = INITIAL_DATA_VALUE;
 	timer_id = osTimerCreate(osTimer(myTimer), osTimerPeriodic, NULL);
diff --git a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
index b18024bbde..d296853e23 100644
--- a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
@@ -126,7 +126,7 @@ static void set_phil_state_pos(int id)
 }
 
 #include <stdarg.h>
-static void print_phil_state(int id, const char *fmt, s32_t delay)
+static void print_phil_state(int id, const char *fmt, int32_t delay)
 {
 	int prio = osThreadGetPriority(osThreadGetId());
 
@@ -146,17 +146,17 @@ static void print_phil_state(int id, const char *fmt, s32_t delay)
 	printk("\n");
 }
 
-static s32_t get_random_delay(int id, int period_in_ms)
+static int32_t get_random_delay(int id, int period_in_ms)
 {
 	/*
 	 * The random delay is unit-less, and is based on the philosopher's ID
 	 * and the current uptime to create some pseudo-randomness. It produces
 	 * a value between 0 and 31.
 	 */
-	s32_t delay = (k_uptime_get_32()/100 * (id + 1)) & 0x1f;
+	int32_t delay = (k_uptime_get_32()/100 * (id + 1)) & 0x1f;
 
 	/* add 1 to not generate a delay of 0 */
-	s32_t ms = (delay + 1) * period_in_ms;
+	int32_t ms = (delay + 1) * period_in_ms;
 
 	return ms;
 }
@@ -183,7 +183,7 @@ void philosopher(void *id)
 	}
 
 	while (1) {
-		s32_t delay;
+		int32_t delay;
 
 		print_phil_state(my_id, "       STARVING       ", 0);
 		take(fork1);
diff --git a/samples/portability/cmsis_rtos_v2/timer_synchronization/src/main.c b/samples/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
index 50c5e3672e..1ea9b7ac29 100644
--- a/samples/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
+++ b/samples/portability/cmsis_rtos_v2/timer_synchronization/src/main.c
@@ -23,7 +23,7 @@ const osTimerAttr_t timer_attr = {
 
 osMessageQueueId_t message_id;
 
-u32_t data;
+uint32_t data;
 
 static char __aligned(4) sample_mem[sizeof(data) * Q_LEN];
 
@@ -38,7 +38,7 @@ static const osMessageQueueAttr_t mem_attrs = {
 
 void read_msg_callback(void *arg)
 {
-	u32_t read_msg;
+	uint32_t read_msg;
 	osStatus_t status;
 
 	status = osMessageQueueGet(message_id, (void *)&read_msg,
@@ -67,7 +67,7 @@ void main(void)
 {
 	osTimerId_t timer_id;
 	osStatus_t status;
-	u32_t counter = 10U;
+	uint32_t counter = 10U;
 
 	data = INITIAL_DATA_VALUE;
 
diff --git a/samples/scheduler/metairq_dispatch/src/main.c b/samples/scheduler/metairq_dispatch/src/main.c
index 9ca3e00aec..27e13975ae 100644
--- a/samples/scheduler/metairq_dispatch/src/main.c
+++ b/samples/scheduler/metairq_dispatch/src/main.c
@@ -33,10 +33,10 @@ K_THREAD_DEFINE(metairq_thread, STACK_SIZE, metairq_fn,
  */
 struct {
 	atomic_t num_mirq;
-	u32_t mirq_latencies[MAX_EVENTS];
+	uint32_t mirq_latencies[MAX_EVENTS];
 	struct {
-		u32_t nevt;
-		u32_t latencies[MAX_EVENTS * 2 / NUM_THREADS];
+		uint32_t nevt;
+		uint32_t latencies[MAX_EVENTS * 2 / NUM_THREADS];
 	} threads[NUM_THREADS];
 } stats;
 
@@ -73,21 +73,21 @@ static void metairq_fn(void *p1, void *p2, void *p3)
 /* Simple recursive implementation of an integer square root, cribbed
  * from wikipedia
  */
-static u32_t isqrt(u64_t n)
+static uint32_t isqrt(uint64_t n)
 {
 	if (n > 1) {
-		u64_t lo = isqrt(n >> 2) << 1;
-		u64_t hi = lo + 1;
+		uint64_t lo = isqrt(n >> 2) << 1;
+		uint64_t hi = lo + 1;
 
-		return (u32_t)(((hi * hi) > n) ? lo : hi);
+		return (uint32_t)(((hi * hi) > n) ? lo : hi);
 	}
-	return (u32_t) n;
+	return (uint32_t) n;
 }
 
-static void calc_stats(const u32_t *array, u32_t n,
-		       u32_t *lo, u32_t *hi, u32_t *mean, u32_t *stdev)
+static void calc_stats(const uint32_t *array, uint32_t n,
+		       uint32_t *lo, uint32_t *hi, uint32_t *mean, uint32_t *stdev)
 {
-	u64_t tot = 0, totsq = 0;
+	uint64_t tot = 0, totsq = 0;
 
 	*lo = INT_MAX;
 	*hi = 0;
@@ -97,10 +97,10 @@ static void calc_stats(const u32_t *array, u32_t n,
 		tot += array[i];
 	}
 
-	*mean = (u32_t)((tot + (n / 2)) / n);
+	*mean = (uint32_t)((tot + (n / 2)) / n);
 
 	for (int i = 0; i < n; i++) {
-		s64_t d = (s32_t) (array[i] - *mean);
+		int64_t d = (int32_t) (array[i] - *mean);
 
 		totsq += d * d;
 	}
@@ -108,7 +108,7 @@ static void calc_stats(const u32_t *array, u32_t n,
 	*stdev = isqrt((totsq + (n / 2)) / n);
 }
 
-static void record_latencies(struct msg *m, u32_t latency)
+static void record_latencies(struct msg *m, uint32_t latency)
 {
 	/* Workaround: qemu emulation shows an erroneously high
 	 * metairq latency for the very first event of 7-8us.  Maybe
@@ -134,7 +134,7 @@ static void record_latencies(struct msg *m, u32_t latency)
 	 * finish.
 	 */
 	if (m->seq == MAX_EVENTS - 1) {
-		u32_t hi, lo, mean, stdev, ret;
+		uint32_t hi, lo, mean, stdev, ret;
 
 		ret = k_sem_take(&report_cookie, K_FOREVER);
 		__ASSERT_NO_MSG(ret == 0);
@@ -178,7 +178,7 @@ static void thread_fn(void *p1, void *p2, void *p3)
 
 	while (true) {
 		int ret = k_msgq_get(&threads[id].msgq, &m, K_FOREVER);
-		u32_t start = k_cycle_get_32();
+		uint32_t start = k_cycle_get_32();
 
 		__ASSERT_NO_MSG(ret == 0);
 
@@ -195,7 +195,7 @@ static void thread_fn(void *p1, void *p2, void *p3)
 			}
 		}
 
-		u32_t dur = k_cycle_get_32() - start;
+		uint32_t dur = k_cycle_get_32() - start;
 
 #ifdef LOG_EVERY_EVENT
 		/* Log the message, its thread, and the following cycle values:
diff --git a/samples/scheduler/metairq_dispatch/src/main.h b/samples/scheduler/metairq_dispatch/src/main.h
index 6239220bd7..45425805f3 100644
--- a/samples/scheduler/metairq_dispatch/src/main.h
+++ b/samples/scheduler/metairq_dispatch/src/main.h
@@ -42,19 +42,19 @@
 /* The "messages" dispatched by our MetaIRQ thread */
 struct msg {
 	/* Sequence number */
-	u32_t seq;
+	uint32_t seq;
 
 	/* Cycle time when the message was "received" */
-	u32_t timestamp;
+	uint32_t timestamp;
 
 	/* Thread to which the message is targeted */
-	u32_t target;
+	uint32_t target;
 
 	/* Cycles of processing the message requires */
-	u32_t proc_cyc;
+	uint32_t proc_cyc;
 
 	/* Cycles of latency before the MetaIRQ thread received the message */
-	u32_t metairq_latency;
+	uint32_t metairq_latency;
 };
 
 /* Initialize the fake "message" device, after this messages will
diff --git a/samples/scheduler/metairq_dispatch/src/msgdev.c b/samples/scheduler/metairq_dispatch/src/msgdev.c
index ea5b11f600..8681a0df8a 100644
--- a/samples/scheduler/metairq_dispatch/src/msgdev.c
+++ b/samples/scheduler/metairq_dispatch/src/msgdev.c
@@ -20,11 +20,11 @@ static struct _timeout timeout;
  * the target thread should delay while "processing" the message, will
  * be a random number between zero and this value.
  */
-u32_t max_duty_cyc;
+uint32_t max_duty_cyc;
 
-u32_t msg_seq;
+uint32_t msg_seq;
 
-K_MSGQ_DEFINE(hw_msgs, sizeof(struct msg), 2, sizeof(u32_t));
+K_MSGQ_DEFINE(hw_msgs, sizeof(struct msg), 2, sizeof(uint32_t));
 
 static void timeout_reset(void);
 
@@ -33,17 +33,17 @@ static void timeout_reset(void);
  * inside the ISR and needs no locking for the otherwise non-atomic
  * state.
  */
-static u32_t rand32(void)
+static uint32_t rand32(void)
 {
-	static u64_t state;
+	static uint64_t state;
 
 	if (!state) {
-		state = ((u64_t)k_cycle_get_32()) << 16;
+		state = ((uint64_t)k_cycle_get_32()) << 16;
 	}
 
 	/* MMIX LCRNG parameters */
 	state = state * 6364136223846793005ULL + 1442695040888963407ULL;
-	return (u32_t)(state >> 32);
+	return (uint32_t)(state >> 32);
 }
 
 /* This acts as the "ISR" for our fake device.  It "reads from the
@@ -54,7 +54,7 @@ static u32_t rand32(void)
 static void dev_timer_expired(struct _timeout *t)
 {
 	__ASSERT_NO_MSG(t == &timeout);
-	u32_t timestamp = k_cycle_get_32();
+	uint32_t timestamp = k_cycle_get_32();
 	struct msg m;
 
 	m.seq = msg_seq++;
@@ -75,7 +75,7 @@ static void dev_timer_expired(struct _timeout *t)
 
 static void timeout_reset(void)
 {
-	u32_t ticks = rand32() % MAX_EVENT_DELAY_TICKS;
+	uint32_t ticks = rand32() % MAX_EVENT_DELAY_TICKS;
 
 #ifdef CONFIG_LEGACY_TIMEOUT_API
 	z_add_timeout(&timeout, dev_timer_expired, ticks);
@@ -91,9 +91,9 @@ void message_dev_init(void)
 	 * CPU.  We want the load to sometimes back up and require
 	 * queueing, but to be achievable over time.
 	 */
-	u64_t cyc_per_tick = k_ticks_to_cyc_near64(1);
-	u64_t avg_ticks_per_event = MAX_EVENT_DELAY_TICKS / 2;
-	u64_t avg_cyc_per_event = cyc_per_tick * avg_ticks_per_event;
+	uint64_t cyc_per_tick = k_ticks_to_cyc_near64(1);
+	uint64_t avg_ticks_per_event = MAX_EVENT_DELAY_TICKS / 2;
+	uint64_t avg_cyc_per_event = cyc_per_tick * avg_ticks_per_event;
 
 	max_duty_cyc = (2 * avg_cyc_per_event * AVERAGE_LOAD_TARGET_PCT) / 100;
 
diff --git a/samples/sensor/adt7420/src/main.c b/samples/sensor/adt7420/src/main.c
index a588856b19..c28211df94 100644
--- a/samples/sensor/adt7420/src/main.c
+++ b/samples/sensor/adt7420/src/main.c
@@ -22,7 +22,7 @@ K_SEM_DEFINE(sem, 0, 1);
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/sensor/apds9960/src/main.c b/samples/sensor/apds9960/src/main.c
index 9475776570..bb1ad6b8bd 100644
--- a/samples/sensor/apds9960/src/main.c
+++ b/samples/sensor/apds9960/src/main.c
@@ -76,7 +76,7 @@ void main(void)
 		       intensity.val1, pdata.val1);
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-		u32_t p_state;
+		uint32_t p_state;
 
 		p_state = DEVICE_PM_LOW_POWER_STATE;
 		device_set_power_state(dev, p_state, NULL, NULL);
diff --git a/samples/sensor/bmg160/src/main.c b/samples/sensor/bmg160/src/main.c
index de458723c4..cd186f270c 100644
--- a/samples/sensor/bmg160/src/main.c
+++ b/samples/sensor/bmg160/src/main.c
@@ -47,7 +47,7 @@ static void print_temp_data(struct device *bmg160)
 
 static void test_polling_mode(struct device *bmg160)
 {
-	s32_t remaining_test_time = MAX_TEST_TIME;
+	int32_t remaining_test_time = MAX_TEST_TIME;
 
 	do {
 		if (sensor_sample_fetch(bmg160) < 0) {
@@ -82,7 +82,7 @@ static void trigger_handler(struct device *bmg160, struct sensor_trigger *trigge
 
 static void test_trigger_mode(struct device *bmg160)
 {
-	s32_t remaining_test_time = MAX_TEST_TIME;
+	int32_t remaining_test_time = MAX_TEST_TIME;
 	struct sensor_trigger trig;
 	struct sensor_value attr;
 
diff --git a/samples/sensor/ccs811/src/main.c b/samples/sensor/ccs811/src/main.c
index f3df3edaba..a9f7f840ff 100644
--- a/samples/sensor/ccs811/src/main.c
+++ b/samples/sensor/ccs811/src/main.c
@@ -17,7 +17,7 @@ static bool app_fw_2;
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/sensor/dht/src/main.c b/samples/sensor/dht/src/main.c
index cea245a85c..d6ece0f288 100644
--- a/samples/sensor/dht/src/main.c
+++ b/samples/sensor/dht/src/main.c
@@ -12,7 +12,7 @@
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/sensor/fxos8700-hid/src/main.c b/samples/sensor/fxos8700-hid/src/main.c
index 7317cd0f51..7ac4efac48 100644
--- a/samples/sensor/fxos8700-hid/src/main.c
+++ b/samples/sensor/fxos8700-hid/src/main.c
@@ -58,10 +58,10 @@ LOG_MODULE_REGISTER(main);
 #define SENSOR_ACCEL_NAME DT_LABEL(DT_INST(0, nxp_fxos8700))
 #endif
 
-static const u8_t hid_report_desc[] = HID_MOUSE_REPORT_DESC(2);
+static const uint8_t hid_report_desc[] = HID_MOUSE_REPORT_DESC(2);
 
-static u32_t def_val[4];
-static volatile u8_t status[4];
+static uint32_t def_val[4];
+static volatile uint8_t status[4];
 static K_SEM_DEFINE(sem, 0, 1);	/* starts off "not available" */
 static struct gpio_callback callback[4];
 
@@ -75,10 +75,10 @@ static struct gpio_callback callback[4];
 
 
 static void left_button(struct device *gpio, struct gpio_callback *cb,
-			u32_t pins)
+			uint32_t pins)
 {
-	u32_t cur_val;
-	u8_t state = status[MOUSE_BTN_REPORT_POS];
+	uint32_t cur_val;
+	uint8_t state = status[MOUSE_BTN_REPORT_POS];
 
 	cur_val = gpio_pin_get(gpio, PIN0);
 	if (def_val[0] != cur_val) {
@@ -95,10 +95,10 @@ static void left_button(struct device *gpio, struct gpio_callback *cb,
 
 #if DT_PHA_HAS_CELL(DT_ALIAS(sw1), gpios, pin)
 static void right_button(struct device *gpio, struct gpio_callback *cb,
-			 u32_t pins)
+			 uint32_t pins)
 {
-	u32_t cur_val;
-	u8_t state = status[MOUSE_BTN_REPORT_POS];
+	uint32_t cur_val;
+	uint8_t state = status[MOUSE_BTN_REPORT_POS];
 
 	cur_val = gpio_pin_get(gpio, PIN1);
 	if (def_val[0] != cur_val) {
@@ -114,9 +114,9 @@ static void right_button(struct device *gpio, struct gpio_callback *cb,
 }
 #endif
 
-int callbacks_configure(struct device *gpio, u32_t pin, int flags,
+int callbacks_configure(struct device *gpio, uint32_t pin, int flags,
 			void (*handler)(struct device*, struct gpio_callback*,
-			u32_t), struct gpio_callback *callback, u32_t *val)
+			uint32_t), struct gpio_callback *callback, uint32_t *val)
 {
 	int ret;
 
@@ -132,7 +132,7 @@ int callbacks_configure(struct device *gpio, u32_t pin, int flags,
 		return ret;
 	}
 
-	*val = (u32_t)ret;
+	*val = (uint32_t)ret;
 
 	gpio_init_callback(callback, handler, BIT(pin));
 	gpio_add_callback(gpio, callback);
@@ -194,7 +194,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *tr)
 void main(void)
 {
 	int ret;
-	u8_t report[4] = { 0x00 };
+	uint8_t report[4] = { 0x00 };
 	struct device *led_dev, *accel_dev, *hid_dev;
 
 	led_dev = device_get_binding(LED_PORT);
diff --git a/samples/sensor/hmc5883l/src/main.c b/samples/sensor/hmc5883l/src/main.c
index 9613d68760..8a36dcc17e 100644
--- a/samples/sensor/hmc5883l/src/main.c
+++ b/samples/sensor/hmc5883l/src/main.c
@@ -11,10 +11,10 @@
 #include <sys/printk.h>
 
 
-static s32_t read_sensor(struct device *sensor)
+static int32_t read_sensor(struct device *sensor)
 {
 	struct sensor_value val[3];
-	s32_t ret = 0;
+	int32_t ret = 0;
 
 	ret = sensor_sample_fetch(sensor);
 	if (ret) {
diff --git a/samples/sensor/isl29035/src/main.c b/samples/sensor/isl29035/src/main.c
index 71e72add2f..ee0ff7b0e4 100644
--- a/samples/sensor/isl29035/src/main.c
+++ b/samples/sensor/isl29035/src/main.c
@@ -27,7 +27,7 @@ static void trigger_handler(struct device *dev,
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/sensor/lsm303dlhc/src/main.c b/samples/sensor/lsm303dlhc/src/main.c
index 314dd2a2b2..3718c38648 100644
--- a/samples/sensor/lsm303dlhc/src/main.c
+++ b/samples/sensor/lsm303dlhc/src/main.c
@@ -10,10 +10,10 @@
 #include <stdio.h>
 #include <sys/util.h>
 
-static s32_t read_sensor(struct device *sensor, enum sensor_channel channel)
+static int32_t read_sensor(struct device *sensor, enum sensor_channel channel)
 {
 	struct sensor_value val[3];
-	s32_t ret = 0;
+	int32_t ret = 0;
 
 	ret = sensor_sample_fetch(sensor);
 	if (ret < 0 && ret != -EBADMSG) {
diff --git a/samples/sensor/max44009/src/main.c b/samples/sensor/max44009/src/main.c
index 1c2d16599e..7f1588336e 100644
--- a/samples/sensor/max44009/src/main.c
+++ b/samples/sensor/max44009/src/main.c
@@ -19,7 +19,7 @@ void main(void)
 {
 	struct device *dev;
 	struct sensor_value val;
-	u32_t lum = 0U;
+	uint32_t lum = 0U;
 
 	printk("MAX44009 light sensor application\n");
 
diff --git a/samples/sensor/mcp9808/src/main.c b/samples/sensor/mcp9808/src/main.c
index 73306ebec3..1953a310e4 100644
--- a/samples/sensor/mcp9808/src/main.c
+++ b/samples/sensor/mcp9808/src/main.c
@@ -18,7 +18,7 @@
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/sensor/mpu6050/src/main.c b/samples/sensor/mpu6050/src/main.c
index c53dcf1263..914b6b3f31 100644
--- a/samples/sensor/mpu6050/src/main.c
+++ b/samples/sensor/mpu6050/src/main.c
@@ -12,7 +12,7 @@
 static const char *now_str(void)
 {
 	static char buf[16]; /* ...HH:MM:SS.MMM */
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	unsigned int ms = now % MSEC_PER_SEC;
 	unsigned int s;
 	unsigned int min;
diff --git a/samples/shields/lmp90100_evb/rtd/src/main.c b/samples/shields/lmp90100_evb/rtd/src/main.c
index beac5ef004..8201b913bc 100644
--- a/samples/shields/lmp90100_evb/rtd/src/main.c
+++ b/samples/shields/lmp90100_evb/rtd/src/main.c
@@ -49,7 +49,7 @@ void main(void)
 {
 	struct device *lmp90100;
 	double resistance;
-	s32_t buffer;
+	int32_t buffer;
 	int err;
 	const struct adc_channel_cfg ch_cfg = {
 		.channel_id = 0,
diff --git a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
index 70aba7d5bd..1910db1589 100644
--- a/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
+++ b/samples/shields/x_nucleo_iks02a1/microphone/src/main.c
@@ -15,7 +15,7 @@
 
 #define AUDIO_FREQ		16000
 #define CHAN_SIZE		16
-#define PCM_BLK_SIZE_MS		((AUDIO_FREQ/1000) * sizeof(s16_t))
+#define PCM_BLK_SIZE_MS		((AUDIO_FREQ/1000) * sizeof(int16_t))
 
 #define NUM_MS		1000
 
@@ -46,7 +46,7 @@ size_t rx_size = PCM_BLK_SIZE_MS;
 void main(void)
 {
 	int i;
-	u32_t ms;
+	uint32_t ms;
 	int ret;
 
 	struct device *mic_dev = device_get_binding(DT_LABEL(DT_INST(0, st_mpxxdtyy)));
@@ -89,7 +89,7 @@ void main(void)
 	int j;
 
 	for (i = 0; i < NUM_MS; i++) {
-		u16_t *pcm_out = rx_block[i];
+		uint16_t *pcm_out = rx_block[i];
 
 		for (j = 0; j < rx_size/2; j++) {
 			printk("0x%04x,\n", pcm_out[j]);
@@ -101,7 +101,7 @@ void main(void)
 	int j;
 
 	for (i = 0; i < NUM_MS; i++) {
-		u16_t *pcm_out = rx_block[i];
+		uint16_t *pcm_out = rx_block[i];
 
 		for (j = 0; j < rx_size/2; j++) {
 			pcm_l = (char)(pcm_out[j] & 0xFF);
diff --git a/samples/smp/pi/src/main.c b/samples/smp/pi/src/main.c
index eae6a27ff1..4073a03db6 100644
--- a/samples/smp/pi/src/main.c
+++ b/samples/smp/pi/src/main.c
@@ -79,7 +79,7 @@ void test_thread(void *arg1, void *arg2, void *arg3)
 
 void main(void)
 {
-	u32_t start_time, stop_time, cycles_spent, nanoseconds_spent;
+	uint32_t start_time, stop_time, cycles_spent, nanoseconds_spent;
 	int i;
 
 	printk("Calculate first %d digits of Pi independently by %d threads.\n",
@@ -103,7 +103,7 @@ void main(void)
 	stop_time = k_cycle_get_32();
 
 	cycles_spent = stop_time - start_time;
-	nanoseconds_spent = (u32_t)k_cyc_to_ns_floor64(cycles_spent);
+	nanoseconds_spent = (uint32_t)k_cyc_to_ns_floor64(cycles_spent);
 
 	for (i = 0; i < THREADS_NUM; i++)
 		printk("Pi value calculated by thread #%d: %s\n", i, buffer[i]);
diff --git a/samples/subsys/canbus/canopen/src/main.c b/samples/subsys/canbus/canopen/src/main.c
index d76865f157..c65a52ff77 100644
--- a/samples/subsys/canbus/canopen/src/main.c
+++ b/samples/subsys/canbus/canopen/src/main.c
@@ -47,7 +47,7 @@ struct led_indicator {
 
 static struct led_indicator led_green;
 static struct led_indicator led_red;
-static u32_t counter;
+static uint32_t counter;
 
 /**
  * @brief Callback for setting LED indicator state.
@@ -113,7 +113,7 @@ static void config_leds(CO_NMT_t *nmt)
  */
 static CO_SDO_abortCode_t odf_2102(CO_ODF_arg_t *odf_arg)
 {
-	u32_t value;
+	uint32_t value;
 
 	value = CO_getUint32(odf_arg->data);
 
@@ -127,7 +127,7 @@ static CO_SDO_abortCode_t odf_2102(CO_ODF_arg_t *odf_arg)
 
 	if (value != 0) {
 		/* Preserve old value */
-		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u32_t));
+		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint32_t));
 		return CO_SDO_AB_DATA_TRANSF;
 	}
 
@@ -146,7 +146,7 @@ static CO_SDO_abortCode_t odf_2102(CO_ODF_arg_t *odf_arg)
  */
 #ifdef BUTTON_PORT
 static void button_isr_callback(struct device *port, struct gpio_callback *cb,
-				u32_t pins)
+				uint32_t pins)
 {
 	counter++;
 }
@@ -202,9 +202,9 @@ void main(void)
 	CO_NMT_reset_cmd_t reset = CO_RESET_NOT;
 	CO_ReturnError_t err;
 	struct device *can;
-	u16_t timeout;
-	u32_t elapsed;
-	s64_t timestamp;
+	uint16_t timeout;
+	uint32_t elapsed;
+	int64_t timestamp;
 	int ret;
 
 	can = device_get_binding(CAN_INTERFACE);
@@ -278,7 +278,7 @@ void main(void)
 				 * exact time elapsed.
 				 */
 				k_sleep(K_MSEC(timeout));
-				elapsed = (u32_t)k_uptime_delta(&timestamp);
+				elapsed = (uint32_t)k_uptime_delta(&timestamp);
 			} else {
 				/*
 				 * Do not sleep, more processing to be
diff --git a/samples/subsys/canbus/isotp/src/main.c b/samples/subsys/canbus/isotp/src/main.c
index a90c718fd7..f5fea6b3c2 100644
--- a/samples/subsys/canbus/isotp/src/main.c
+++ b/samples/subsys/canbus/isotp/src/main.c
@@ -61,7 +61,7 @@ void rx_8_0_thread(void *arg1, void *arg2, void *arg3)
 	ARG_UNUSED(arg3);
 	int ret, rem_len, received_len;
 	struct net_buf *buf;
-	static u8_t rx_buffer[7];
+	static uint8_t rx_buffer[7];
 
 
 	ret = isotp_bind(&recv_ctx_8_0, can_dev,
@@ -107,7 +107,7 @@ void rx_0_5_thread(void *arg1, void *arg2, void *arg3)
 	ARG_UNUSED(arg2);
 	ARG_UNUSED(arg3);
 	int ret, received_len;
-	static u8_t rx_buffer[32];
+	static uint8_t rx_buffer[32];
 
 	ret = isotp_bind(&recv_ctx_0_5, can_dev,
 			 &tx_addr_0_5, &rx_addr_0_5,
diff --git a/samples/subsys/console/echo/src/main.c b/samples/subsys/console/echo/src/main.c
index 8413909dac..c0c1a38348 100644
--- a/samples/subsys/console/echo/src/main.c
+++ b/samples/subsys/console/echo/src/main.c
@@ -17,7 +17,7 @@ void main(void)
 	console_write(NULL, prompt, sizeof(prompt) - 1);
 
 	while (1) {
-		u8_t c = console_getchar();
+		uint8_t c = console_getchar();
 
 		console_putchar(c);
 		if (c == '\r') {
diff --git a/samples/subsys/console/getchar/src/main.c b/samples/subsys/console/getchar/src/main.c
index 809d92b51b..337e8e1439 100644
--- a/samples/subsys/console/getchar/src/main.c
+++ b/samples/subsys/console/getchar/src/main.c
@@ -15,7 +15,7 @@ void main(void)
 	printk("Start typing characters to see their hex codes printed\n");
 
 	while (1) {
-		u8_t c = console_getchar();
+		uint8_t c = console_getchar();
 
 		printk("char: [0x%x] %c\n", c, c);
 	}
diff --git a/samples/subsys/fs/fat_fs/src/main.c b/samples/subsys/fs/fat_fs/src/main.c
index 3bed8291be..67f7445dbb 100644
--- a/samples/subsys/fs/fat_fs/src/main.c
+++ b/samples/subsys/fs/fat_fs/src/main.c
@@ -35,9 +35,9 @@ void main(void)
 	/* raw disk i/o */
 	do {
 		static const char *disk_pdrv = "SD";
-		u64_t memory_size_mb;
-		u32_t block_count;
-		u32_t block_size;
+		uint64_t memory_size_mb;
+		uint32_t block_count;
+		uint32_t block_size;
 
 		if (disk_access_init(disk_pdrv) != 0) {
 			LOG_ERR("Storage init ERROR!");
@@ -58,8 +58,8 @@ void main(void)
 		}
 		printk("Sector size %u\n", block_size);
 
-		memory_size_mb = (u64_t)block_count * block_size;
-		printk("Memory Size(MB) %u\n", (u32_t)memory_size_mb>>20);
+		memory_size_mb = (uint64_t)block_count * block_size;
+		printk("Memory Size(MB) %u\n", (uint32_t)memory_size_mb>>20);
 	} while (0);
 
 	mp.mnt_point = disk_mount_pt;
diff --git a/samples/subsys/fs/littlefs/src/main.c b/samples/subsys/fs/littlefs/src/main.c
index 4adc4647da..819474dbb4 100644
--- a/samples/subsys/fs/littlefs/src/main.c
+++ b/samples/subsys/fs/littlefs/src/main.c
@@ -93,7 +93,7 @@ void main(void)
 		goto out;
 	}
 
-	u32_t boot_count = 0;
+	uint32_t boot_count = 0;
 
 	if (rc >= 0) {
 		rc = fs_read(&file, &boot_count, sizeof(boot_count));
diff --git a/samples/subsys/ipc/ipm_imx/src/main.c b/samples/subsys/ipc/ipm_imx/src/main.c
index 7afbb124e1..6508c10567 100644
--- a/samples/subsys/ipc/ipm_imx/src/main.c
+++ b/samples/subsys/ipc/ipm_imx/src/main.c
@@ -11,11 +11,11 @@
 
 static struct device *ipm;
 
-static void ipm_callback(void *context, u32_t id, volatile void *data)
+static void ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	int i;
 	int status;
-	u32_t *data32 = (u32_t *)data;
+	uint32_t *data32 = (uint32_t *)data;
 
 	printk("%s: id = %u, data = 0x", __func__, id);
 	for (i = 0; i < (CONFIG_IPM_IMX_MAX_DATA_SIZE / 4); i++) {
diff --git a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
index 4d395f8194..8c8b33a659 100644
--- a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
+++ b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
@@ -11,7 +11,7 @@
 
 struct device *ipm;
 
-void ping_ipm_callback(void *context, u32_t id, volatile void *data)
+void ping_ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	ipm_send(ipm, 1, 0, (const void *)data, 4);
 }
diff --git a/samples/subsys/ipc/ipm_mcux/src/main_master.c b/samples/subsys/ipc/ipm_mcux/src/main_master.c
index 2318011484..772e77ebc2 100644
--- a/samples/subsys/ipc/ipm_mcux/src/main_master.c
+++ b/samples/subsys/ipc/ipm_mcux/src/main_master.c
@@ -12,7 +12,7 @@
 struct device *ipm;
 int gcounter;
 
-void ping_ipm_callback(void *context, u32_t id, volatile void *data)
+void ping_ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	gcounter = *(int *)data;
 	/* Show current ping-pong counter value */
diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
index 93ef114471..64ec004c67 100644
--- a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
+++ b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
@@ -24,7 +24,7 @@ static void main_cpu_0(void)
 
 static void main_cpu_1(void)
 {
-	const u32_t set_mhu = 1;
+	const uint32_t set_mhu = 1;
 
 	ipm_send(mhu0, 0, MHU_CPU0, &set_mhu, 1);
 
@@ -32,10 +32,10 @@ static void main_cpu_1(void)
 	}
 }
 
-static void mhu_isr_callback(void *context, u32_t cpu_id,
+static void mhu_isr_callback(void *context, uint32_t cpu_id,
 					volatile void *data)
 {
-	const u32_t set_mhu = 1;
+	const uint32_t set_mhu = 1;
 
 	printk("MHU ISR on CPU %d\n", cpu_id);
 	if (cpu_id == MHU_CPU0) {
diff --git a/samples/subsys/ipc/openamp/remote/src/main.c b/samples/subsys/ipc/openamp/remote/src/main.c
index 86d44d5da2..f745f13b7d 100644
--- a/samples/subsys/ipc/openamp/remote/src/main.c
+++ b/samples/subsys/ipc/openamp/remote/src/main.c
@@ -66,7 +66,7 @@ static unsigned char virtio_get_status(struct virtio_device *vdev)
 	return sys_read8(VDEV_STATUS_ADDR);
 }
 
-static u32_t virtio_get_features(struct virtio_device *vdev)
+static uint32_t virtio_get_features(struct virtio_device *vdev)
 {
 	return 1 << VIRTIO_RPMSG_F_NS;
 }
@@ -76,11 +76,11 @@ static void virtio_notify(struct virtqueue *vq)
 #if defined(CONFIG_SOC_MPS2_AN521) || \
 	defined(CONFIG_SOC_V2M_MUSCA_A) || \
 	defined(CONFIG_SOC_V2M_MUSCA_B1)
-	u32_t current_core = sse_200_platform_get_cpu_id();
+	uint32_t current_core = sse_200_platform_get_cpu_id();
 
 	ipm_send(ipm_handle, 0, current_core ? 0 : 1, 0, 1);
 #else
-	u32_t dummy_data = 0x00110011; /* Some data must be provided */
+	uint32_t dummy_data = 0x00110011; /* Some data must be provided */
 
 	ipm_send(ipm_handle, 0, 0, &dummy_data, sizeof(dummy_data));
 #endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
@@ -95,13 +95,13 @@ struct virtio_dispatch dispatch = {
 static K_SEM_DEFINE(data_sem, 0, 1);
 static K_SEM_DEFINE(data_rx_sem, 0, 1);
 
-static void platform_ipm_callback(void *context, u32_t id, volatile void *data)
+static void platform_ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	k_sem_give(&data_sem);
 }
 
 int endpoint_cb(struct rpmsg_endpoint *ept, void *data,
-		size_t len, u32_t src, void *priv)
+		size_t len, uint32_t src, void *priv)
 {
 	received_data = *((unsigned int *) data);
 
diff --git a/samples/subsys/ipc/openamp/src/main.c b/samples/subsys/ipc/openamp/src/main.c
index 4d28adaa55..c7e97f3b5f 100644
--- a/samples/subsys/ipc/openamp/src/main.c
+++ b/samples/subsys/ipc/openamp/src/main.c
@@ -72,13 +72,13 @@ static void virtio_set_status(struct virtio_device *vdev, unsigned char status)
 	sys_write8(status, VDEV_STATUS_ADDR);
 }
 
-static u32_t virtio_get_features(struct virtio_device *vdev)
+static uint32_t virtio_get_features(struct virtio_device *vdev)
 {
 	return 1 << VIRTIO_RPMSG_F_NS;
 }
 
 static void virtio_set_features(struct virtio_device *vdev,
-				u32_t features)
+				uint32_t features)
 {
 }
 
@@ -87,11 +87,11 @@ static void virtio_notify(struct virtqueue *vq)
 #if defined(CONFIG_SOC_MPS2_AN521) || \
 	defined(CONFIG_SOC_V2M_MUSCA_A) || \
 	defined(CONFIG_SOC_V2M_MUSCA_B1)
-	u32_t current_core = sse_200_platform_get_cpu_id();
+	uint32_t current_core = sse_200_platform_get_cpu_id();
 
 	ipm_send(ipm_handle, 0, current_core ? 0 : 1, 0, 1);
 #else
-	u32_t dummy_data = 0x55005500; /* Some data must be provided */
+	uint32_t dummy_data = 0x55005500; /* Some data must be provided */
 
 	ipm_send(ipm_handle, 0, 0, &dummy_data, sizeof(dummy_data));
 #endif /* #if defined(CONFIG_SOC_MPS2_AN521) */
@@ -108,13 +108,13 @@ struct virtio_dispatch dispatch = {
 static K_SEM_DEFINE(data_sem, 0, 1);
 static K_SEM_DEFINE(data_rx_sem, 0, 1);
 
-static void platform_ipm_callback(void *context, u32_t id, volatile void *data)
+static void platform_ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	k_sem_give(&data_sem);
 }
 
 int endpoint_cb(struct rpmsg_endpoint *ept, void *data,
-		size_t len, u32_t src, void *priv)
+		size_t len, uint32_t src, void *priv)
 {
 	received_data = *((unsigned int *) data);
 
@@ -134,7 +134,7 @@ static void rpmsg_service_unbind(struct rpmsg_endpoint *ept)
 	rpmsg_destroy_ept(ep);
 }
 
-void ns_bind_cb(struct rpmsg_device *rdev, const char *name, u32_t dest)
+void ns_bind_cb(struct rpmsg_device *rdev, const char *name, uint32_t dest)
 {
 	(void)rpmsg_create_ept(ep, rdev, name,
 			RPMSG_ADDR_ANY, dest,
diff --git a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
index 336c4136e5..ad3c40bafb 100644
--- a/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
+++ b/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
@@ -66,7 +66,7 @@ static struct rpmsg_endpoint rcv_ept;
 static K_SEM_DEFINE(data_sem, 0, 1);
 static K_SEM_DEFINE(data_rx_sem, 0, 1);
 
-static void platform_ipm_callback(void *context, u32_t id, volatile void *data)
+static void platform_ipm_callback(void *context, uint32_t id, volatile void *data)
 {
 	LOG_DBG("%s: msg received from mb %d\n", __func__, id);
 	k_sem_give(&data_sem);
diff --git a/samples/subsys/logging/logger/src/ext_log_system_adapter.c b/samples/subsys/logging/logger/src/ext_log_system_adapter.c
index 946508a1d5..8c0714ad80 100644
--- a/samples/subsys/logging/logger/src/ext_log_system_adapter.c
+++ b/samples/subsys/logging/logger/src/ext_log_system_adapter.c
@@ -13,7 +13,7 @@
 LOG_MODULE_REGISTER(ext_log_system);
 
 /** @brief Translation of custom log levels to logging subsystem levels. */
-static const u8_t log_level_lut[] = {
+static const uint8_t log_level_lut[] = {
 	LOG_LEVEL_ERR,  /* EXT_LOG_CRITICAL */
 	LOG_LEVEL_ERR,  /* EXT_LOG_ERROR */
 	LOG_LEVEL_WRN,  /* EXT_LOG_WARNING */
diff --git a/samples/subsys/logging/logger/src/main.c b/samples/subsys/logging/logger/src/main.c
index ec288859d0..d3d3245581 100644
--- a/samples/subsys/logging/logger/src/main.c
+++ b/samples/subsys/logging/logger/src/main.c
@@ -44,7 +44,7 @@ SAMPLE_INSTANCE_DEFINE(app_part, inst2);
 #include <soc.h>
 #endif
 
-static u32_t timestamp_get(void)
+static uint32_t timestamp_get(void)
 {
 #ifdef CONFIG_SOC_FAMILY_NRF
 	return NRF_RTC1->COUNTER;
@@ -53,7 +53,7 @@ static u32_t timestamp_get(void)
 #endif
 }
 
-static u32_t timestamp_freq(void)
+static uint32_t timestamp_freq(void)
 {
 #ifdef CONFIG_SOC_FAMILY_NRF
 	return 32768 / (NRF_RTC1->PRESCALER + 1);
@@ -200,11 +200,11 @@ static void log_strdup_showcase(void)
  */
 static void performance_showcase(void)
 {
-	volatile u32_t current_timestamp;
-	volatile u32_t start_timestamp;
-	u32_t per_sec;
-	u32_t cnt = 0U;
-	u32_t window = 2U;
+	volatile uint32_t current_timestamp;
+	volatile uint32_t start_timestamp;
+	uint32_t per_sec;
+	uint32_t cnt = 0U;
+	uint32_t window = 2U;
 
 	printk("Logging performance showcase.\n");
 
diff --git a/samples/subsys/logging/logger/src/sample_instance.c b/samples/subsys/logging/logger/src/sample_instance.c
index 975a80cc4a..8d003ccebc 100644
--- a/samples/subsys/logging/logger/src/sample_instance.c
+++ b/samples/subsys/logging/logger/src/sample_instance.c
@@ -15,7 +15,7 @@ LOG_LEVEL_SET(LOG_LEVEL_INF);
 
 void sample_instance_call(struct sample_instance *inst)
 {
-	u8_t data[] = { 1, 2, 3, 4, 5, 6, 7, 8,
+	uint8_t data[] = { 1, 2, 3, 4, 5, 6, 7, 8,
 			9, 10, 11, 12, 13, 14, 15, 16,
 			17, 18, 19, 20, 21, 22, 23, 24,
 			25, 26, 27, 28, 29, 30, 31, 32,
diff --git a/samples/subsys/logging/logger/src/sample_instance.h b/samples/subsys/logging/logger/src/sample_instance.h
index 02e56674f4..f9ea4c9747 100644
--- a/samples/subsys/logging/logger/src/sample_instance.h
+++ b/samples/subsys/logging/logger/src/sample_instance.h
@@ -14,7 +14,7 @@
 
 struct sample_instance {
 	LOG_INSTANCE_PTR_DECLARE(log);
-	u32_t cnt;
+	uint32_t cnt;
 };
 
 #define SAMPLE_INSTANCE_DEFINE(_part, _name)				   \
diff --git a/samples/subsys/logging/syst/src/main.c b/samples/subsys/logging/syst/src/main.c
index 33e640e93b..b7a4ab9590 100644
--- a/samples/subsys/logging/syst/src/main.c
+++ b/samples/subsys/logging/syst/src/main.c
@@ -13,26 +13,26 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_DBG);
 
 struct test_frame {
-	u32_t id_type : 1;
-	u32_t rtr     : 1;
+	uint32_t id_type : 1;
+	uint32_t rtr     : 1;
 	/* Message identifier */
 	union {
-		u32_t std_id  : 11;
-		u32_t ext_id  : 29;
+		uint32_t std_id  : 11;
+		uint32_t ext_id  : 29;
 	};
 	/* The length of the message (max. 8) in byte */
-	u8_t dlc;
+	uint8_t dlc;
 	/* The message data */
 	union {
-		u8_t data[8];
-		u32_t data_32[2];
+		uint8_t data[8];
+		uint32_t data_32[2];
 	};
 } __packed;
 
 void main(void)
 {
 	struct test_frame frame = { 0 };
-	const u8_t data[DATA_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
+	const uint8_t data[DATA_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
 					0x05, 0x06, 0x07, 0x08 };
 	struct log_msg_ids src_level = {
 		.level = LOG_LEVEL_INTERNAL_RAW_STRING,
@@ -59,10 +59,10 @@ void main(void)
 	frame.dlc = sizeof(data);
 	memcpy(frame.data, data, sizeof(data));
 
-	LOG_HEXDUMP_ERR((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_WRN((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_INF((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_DBG((const u8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_ERR((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_WRN((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_INF((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_DBG((const uint8_t *)&frame, sizeof(frame), "frame");
 
 	/* raw string */
 	printk("hello sys-t on board %s\n", CONFIG_BOARD);
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c b/samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c
index 600e4ec627..70dc5b812d 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c
@@ -38,7 +38,7 @@ static void advertise(struct k_work *work)
 	LOG_INF("Advertising successfully started");
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		LOG_ERR("Connection failed (err 0x%02x)", err);
@@ -47,7 +47,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	LOG_INF("Disconnected (reason 0x%02x)", reason);
 	k_work_submit(&advertise_work);
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/src/udp.c b/samples/subsys/mgmt/mcumgr/smp_svr/src/udp.c
index 90a3510fd5..43fd485cb2 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/src/udp.c
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/src/udp.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(smp_udp_sample);
 static struct net_mgmt_event_callback mgmt_cb;
 
 static void event_handler(struct net_mgmt_event_callback *cb,
-			  u32_t mgmt_event, struct net_if *iface)
+			  uint32_t mgmt_event, struct net_if *iface)
 {
 	if ((mgmt_event & EVENT_MASK) != mgmt_event) {
 		return;
diff --git a/samples/subsys/nvs/src/main.c b/samples/subsys/nvs/src/main.c
index 05ef5c7442..2b098e41f6 100644
--- a/samples/subsys/nvs/src/main.c
+++ b/samples/subsys/nvs/src/main.c
@@ -65,8 +65,8 @@ void main(void)
 {
 	int rc = 0, cnt = 0, cnt_his = 0;
 	char buf[16];
-	u8_t key[8], longarray[128];
-	u32_t reboot_counter = 0U, reboot_counter_his;
+	uint8_t key[8], longarray[128];
+	uint32_t reboot_counter = 0U, reboot_counter_his;
 	struct flash_pages_info info;
 
 	/* define the nvs file system by settings with:
diff --git a/samples/subsys/power/device_pm/src/dummy_driver.c b/samples/subsys/power/device_pm/src/dummy_driver.c
index 0fda210b29..19485d7513 100644
--- a/samples/subsys/power/device_pm/src/dummy_driver.c
+++ b/samples/subsys/power/device_pm/src/dummy_driver.c
@@ -9,7 +9,7 @@
 #include "dummy_driver.h"
 
 static struct k_poll_event async_evt;
-u32_t device_power_state;
+uint32_t device_power_state;
 static struct device *parent;
 
 static int dummy_open(struct device *dev)
@@ -52,7 +52,7 @@ static int dummy_open(struct device *dev)
 	return ret;
 }
 
-static int dummy_read(struct device *dev, u32_t *val)
+static int dummy_read(struct device *dev, uint32_t *val)
 {
 	struct dummy_parent_api *api;
 	int ret;
@@ -64,7 +64,7 @@ static int dummy_read(struct device *dev, u32_t *val)
 	return ret;
 }
 
-static int dummy_write(struct device *dev, u32_t val)
+static int dummy_write(struct device *dev, uint32_t val)
 {
 	struct dummy_parent_api *api;
 	int ret;
@@ -93,7 +93,7 @@ static int dummy_close(struct device *dev)
 	return ret;
 }
 
-static u32_t dummy_get_power_state(struct device *dev)
+static uint32_t dummy_get_power_state(struct device *dev)
 {
 	return device_power_state;
 }
@@ -114,21 +114,21 @@ static int dummy_resume_from_suspend(struct device *dev)
 	return 0;
 }
 
-static int dummy_device_pm_ctrl(struct device *dev, u32_t ctrl_command,
+static int dummy_device_pm_ctrl(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	switch (ctrl_command) {
 	case DEVICE_PM_SET_POWER_STATE:
-		if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = dummy_resume_from_suspend(dev);
 		} else {
 			ret = dummy_suspend(dev);
 		}
 		break;
 	case DEVICE_PM_GET_POWER_STATE:
-		*((u32_t *)context) = dummy_get_power_state(dev);
+		*((uint32_t *)context) = dummy_get_power_state(dev);
 		break;
 	default:
 		ret = -EINVAL;
diff --git a/samples/subsys/power/device_pm/src/dummy_driver.h b/samples/subsys/power/device_pm/src/dummy_driver.h
index 0fc5994e5c..dfb0683e26 100644
--- a/samples/subsys/power/device_pm/src/dummy_driver.h
+++ b/samples/subsys/power/device_pm/src/dummy_driver.h
@@ -11,9 +11,9 @@
 typedef int (*dummy_api_open_t)(struct device *dev);
 
 typedef int (*dummy_api_read_t)(struct device *dev,
-				     u32_t *val);
+				     uint32_t *val);
 typedef int (*dummy_api_write_t)(struct device *dev,
-				     u32_t val);
+				     uint32_t val);
 typedef int (*dummy_api_close_t)(struct device *dev);
 
 struct dummy_driver_api {
diff --git a/samples/subsys/power/device_pm/src/dummy_parent.c b/samples/subsys/power/device_pm/src/dummy_parent.c
index 89c0718222..8bc7b1b2ce 100644
--- a/samples/subsys/power/device_pm/src/dummy_parent.c
+++ b/samples/subsys/power/device_pm/src/dummy_parent.c
@@ -7,10 +7,10 @@
 #include <sys/printk.h>
 #include "dummy_parent.h"
 
-static u32_t store_value;
-u32_t parent_power_state;
+static uint32_t store_value;
+uint32_t parent_power_state;
 
-static int dummy_transfer(struct device *dev, u32_t cmd, u32_t *val)
+static int dummy_transfer(struct device *dev, uint32_t cmd, uint32_t *val)
 {
 	printk("transfer()\n");
 
@@ -23,7 +23,7 @@ static int dummy_transfer(struct device *dev, u32_t cmd, u32_t *val)
 	return 0;
 }
 
-static u32_t dummy_get_power_state(struct device *dev)
+static uint32_t dummy_get_power_state(struct device *dev)
 {
 	return parent_power_state;
 }
@@ -44,21 +44,21 @@ static int dummy_resume_from_suspend(struct device *dev)
 	return 0;
 }
 
-static int dummy_parent_pm_ctrl(struct device *dev, u32_t ctrl_command,
+static int dummy_parent_pm_ctrl(struct device *dev, uint32_t ctrl_command,
 				void *context, device_pm_cb cb, void *arg)
 {
 	int ret = 0;
 
 	switch (ctrl_command) {
 	case DEVICE_PM_SET_POWER_STATE:
-		if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+		if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 			ret = dummy_resume_from_suspend(dev);
 		} else {
 			ret = dummy_suspend(dev);
 		}
 		break;
 	case DEVICE_PM_GET_POWER_STATE:
-		*((u32_t *)context) = dummy_get_power_state(dev);
+		*((uint32_t *)context) = dummy_get_power_state(dev);
 		break;
 	default:
 		ret = -EINVAL;
diff --git a/samples/subsys/power/device_pm/src/dummy_parent.h b/samples/subsys/power/device_pm/src/dummy_parent.h
index 77195b5559..986e294e7a 100644
--- a/samples/subsys/power/device_pm/src/dummy_parent.h
+++ b/samples/subsys/power/device_pm/src/dummy_parent.h
@@ -11,7 +11,7 @@
 #define DUMMY_PARENT_RD		0
 #define DUMMY_PARENT_WR		1
 
-typedef int (*dummy_api_transfer_t)(struct device *dev, u32_t cmd, u32_t *val);
+typedef int (*dummy_api_transfer_t)(struct device *dev, uint32_t cmd, uint32_t *val);
 
 struct dummy_parent_api {
 	dummy_api_transfer_t transfer;
diff --git a/samples/subsys/settings/src/main.c b/samples/subsys/settings/src/main.c
index e07b199e49..a9bc385d9d 100644
--- a/samples/subsys/settings/src/main.c
+++ b/samples/subsys/settings/src/main.c
@@ -24,11 +24,11 @@
 /* Default valuse are assigned to settings valuses consuments
  * All of them will be overwritten if storage contain proper key-values
  */
-u8_t angle_val;
-u64_t length_val = 100;
-u16_t length_1_val = 40;
-u32_t length_2_val = 60;
-s32_t voltage_val = -3000;
+uint8_t angle_val;
+uint64_t length_val = 100;
+uint16_t length_1_val = 40;
+uint32_t length_2_val = 60;
+int32_t voltage_val = -3000;
 char source_name_val[6] = "";
 
 int alpha_handle_set(const char *name, size_t len, settings_read_cb read_cb,
@@ -197,7 +197,7 @@ int beta_handle_get(const char *name, char *val, int val_len_max)
 static void example_save_and_load_basic(void)
 {
 	int i, rc;
-	s32_t val_s32;
+	int32_t val_s32;
 
 	printk(SECTION_BEGIN_LINE);
 	printk("basic load and save using registered handlers\n");
@@ -259,9 +259,9 @@ static void example_save_and_load_basic(void)
 }
 
 struct direct_length_data {
-	u64_t length;
-	u16_t length_1;
-	u32_t length_2;
+	uint64_t length;
+	uint16_t length_1;
+	uint32_t length_2;
 };
 
 static int direct_loader(const char *name, size_t len, settings_read_cb read_cb,
@@ -329,7 +329,7 @@ static void example_direct_load_subtree(void)
 struct direct_immediate_value {
 	size_t len;
 	void *dest;
-	u8_t fetched;
+	uint8_t fetched;
 };
 
 static int direct_loader_immediate_value(const char *name, size_t len,
@@ -388,7 +388,7 @@ int load_immediate_value(const char *name, void *dest, size_t len)
 
 static void example_without_handler(void)
 {
-	u8_t val_u8;
+	uint8_t val_u8;
 	int rc;
 
 	printk(SECTION_BEGIN_LINE);
@@ -464,7 +464,7 @@ static void example_initialization(void)
 
 static void example_delete(void)
 {
-	u64_t val_u64;
+	uint64_t val_u64;
 	int rc;
 
 	printk(SECTION_BEGIN_LINE);
@@ -493,7 +493,7 @@ static void example_delete(void)
 void example_runtime_usage(void)
 {
 	int rc;
-	u8_t injected_str[sizeof(source_name_val)] = "RT";
+	uint8_t injected_str[sizeof(source_name_val)] = "RT";
 
 	printk(SECTION_BEGIN_LINE);
 	printk("Inject the value to the setting destination in runtime\n\n");
diff --git a/samples/subsys/shell/shell_module/src/dynamic_cmd.c b/samples/subsys/shell/shell_module/src/dynamic_cmd.c
index 8f00befe7a..6b3f1a2f96 100644
--- a/samples/subsys/shell/shell_module/src/dynamic_cmd.c
+++ b/samples/subsys/shell/shell_module/src/dynamic_cmd.c
@@ -14,7 +14,7 @@
 /* buffer holding dynamicly created user commands */
 static char dynamic_cmd_buffer[MAX_CMD_CNT][MAX_CMD_LEN];
 /* commands counter */
-static u8_t dynamic_cmd_cnt;
+static uint8_t dynamic_cmd_cnt;
 
 typedef int cmp_t(const void *, const void *);
 extern void qsort(void *a, size_t n, size_t es, cmp_t *cmp);
@@ -28,8 +28,8 @@ static int string_cmp(const void *p_a, const void *p_b)
 static int cmd_dynamic_add(const struct shell *shell,
 			   size_t argc, char **argv)
 {
-	u16_t cmd_len;
-	u8_t idx;
+	uint16_t cmd_len;
+	uint8_t idx;
 
 	ARG_UNUSED(argc);
 
@@ -77,7 +77,7 @@ static int cmd_dynamic_execute(const struct shell *shell,
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
 
-	for (u8_t idx = 0; idx <  dynamic_cmd_cnt; idx++) {
+	for (uint8_t idx = 0; idx <  dynamic_cmd_cnt; idx++) {
 		if (!strcmp(dynamic_cmd_buffer[idx], argv[1])) {
 			shell_print(shell, "dynamic command: %s", argv[1]);
 			return 0;
@@ -95,7 +95,7 @@ static int cmd_dynamic_remove(const struct shell *shell, size_t argc,
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
 
-	for (u8_t idx = 0; idx <  dynamic_cmd_cnt; idx++) {
+	for (uint8_t idx = 0; idx <  dynamic_cmd_cnt; idx++) {
 		if (!strcmp(dynamic_cmd_buffer[idx], argv[1])) {
 			if (idx == MAX_CMD_CNT - 1) {
 				dynamic_cmd_buffer[idx][0] = '\0';
@@ -129,7 +129,7 @@ static int cmd_dynamic_show(const struct shell *shell,
 
 	shell_print(shell, "Dynamic command list:");
 
-	for (u8_t i = 0; i < dynamic_cmd_cnt; i++) {
+	for (uint8_t i = 0; i < dynamic_cmd_cnt; i++) {
 		shell_print(shell, "[%3d] %s", i, dynamic_cmd_buffer[i]);
 	}
 
diff --git a/samples/subsys/shell/shell_module/src/main.c b/samples/subsys/shell/shell_module/src/main.c
index e19a56d7b4..6bdab53302 100644
--- a/samples/subsys/shell/shell_module/src/main.c
+++ b/samples/subsys/shell/shell_module/src/main.c
@@ -27,7 +27,7 @@ void timer_expired_handler(struct k_timer *timer)
 K_TIMER_DEFINE(log_timer, timer_expired_handler, NULL);
 
 static int cmd_log_test_start(const struct shell *shell, size_t argc,
-			      char **argv, u32_t period)
+			      char **argv, uint32_t period)
 {
 	ARG_UNUSED(argv);
 
diff --git a/samples/subsys/usb/cdc_acm/src/main.c b/samples/subsys/usb/cdc_acm/src/main.c
index 8c2bb6abf5..7cc548939e 100644
--- a/samples/subsys/usb/cdc_acm/src/main.c
+++ b/samples/subsys/usb/cdc_acm/src/main.c
@@ -24,7 +24,7 @@
 LOG_MODULE_REGISTER(cdc_acm_echo, LOG_LEVEL_INF);
 
 #define RING_BUF_SIZE 1024
-u8_t ring_buffer[RING_BUF_SIZE];
+uint8_t ring_buffer[RING_BUF_SIZE];
 
 struct ring_buf ringbuf;
 
@@ -33,7 +33,7 @@ static void interrupt_handler(struct device *dev)
 	while (uart_irq_update(dev) && uart_irq_is_pending(dev)) {
 		if (uart_irq_rx_ready(dev)) {
 			int recv_len, rb_len;
-			u8_t buffer[64];
+			uint8_t buffer[64];
 			size_t len = MIN(ring_buf_space_get(&ringbuf),
 					 sizeof(buffer));
 
@@ -50,7 +50,7 @@ static void interrupt_handler(struct device *dev)
 		}
 
 		if (uart_irq_tx_ready(dev)) {
-			u8_t buffer[64];
+			uint8_t buffer[64];
 			int rb_len, send_len;
 
 			rb_len = ring_buf_get(&ringbuf, buffer, sizeof(buffer));
@@ -73,7 +73,7 @@ static void interrupt_handler(struct device *dev)
 void main(void)
 {
 	struct device *dev;
-	u32_t baudrate, dtr = 0U;
+	uint32_t baudrate, dtr = 0U;
 	int ret;
 
 	dev = device_get_binding("CDC_ACM_0");
diff --git a/samples/subsys/usb/cdc_acm_composite/src/main.c b/samples/subsys/usb/cdc_acm_composite/src/main.c
index 92a598501a..3191fb9d33 100644
--- a/samples/subsys/usb/cdc_acm_composite/src/main.c
+++ b/samples/subsys/usb/cdc_acm_composite/src/main.c
@@ -25,8 +25,8 @@ LOG_MODULE_REGISTER(cdc_acm_composite, LOG_LEVEL_INF);
 
 #define RING_BUF_SIZE	(64 * 2)
 
-u8_t buffer0[RING_BUF_SIZE];
-u8_t buffer1[RING_BUF_SIZE];
+uint8_t buffer0[RING_BUF_SIZE];
+uint8_t buffer1[RING_BUF_SIZE];
 
 static struct serial_data {
 	struct device *dev;
@@ -47,7 +47,7 @@ static void interrupt_handler(void *user_data)
 		LOG_DBG("dev %p dev_data %p", dev, dev_data);
 
 		if (uart_irq_rx_ready(dev)) {
-			u8_t buf[64];
+			uint8_t buf[64];
 			size_t read, wrote;
 			struct ring_buf *ringbuf =
 					&dev_data->peer_data->ringbuf;
@@ -67,7 +67,7 @@ static void interrupt_handler(void *user_data)
 		}
 
 		if (uart_irq_tx_ready(dev)) {
-			u8_t buf[64];
+			uint8_t buf[64];
 			size_t wrote, len;
 
 			len = ring_buf_get(&dev_data->ringbuf, buf,
@@ -85,7 +85,7 @@ static void interrupt_handler(void *user_data)
 
 static void uart_line_set(struct device *dev)
 {
-	u32_t baudrate;
+	uint32_t baudrate;
 	int ret;
 
 	/* They are optional, we use them to test the interrupt endpoint */
@@ -117,7 +117,7 @@ void main(void)
 	struct serial_data *dev_data0 = &peers[0];
 	struct serial_data *dev_data1 = &peers[1];
 	struct device *dev0, *dev1;
-	u32_t dtr = 0U;
+	uint32_t dtr = 0U;
 
 	dev0 = device_get_binding("CDC_ACM_0");
 	if (!dev0) {
diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c
index a6be4bd06b..0fc786bb66 100644
--- a/samples/subsys/usb/hid-cdc/src/main.c
+++ b/samples/subsys/usb/hid-cdc/src/main.c
@@ -152,8 +152,8 @@ static inline struct app_evt_t *app_evt_alloc(void)
 
 /* HID */
 
-static const u8_t hid_mouse_report_desc[] = HID_MOUSE_REPORT_DESC(2);
-static const u8_t hid_kbd_report_desc[] = HID_KEYBOARD_REPORT_DESC();
+static const uint8_t hid_mouse_report_desc[] = HID_MOUSE_REPORT_DESC(2);
+static const uint8_t hid_kbd_report_desc[] = HID_KEYBOARD_REPORT_DESC();
 
 static K_SEM_DEFINE(evt_sem, 0, 1);	/* starts off "not available" */
 static K_SEM_DEFINE(usb_sem, 1, 1);	/* starts off "available" */
@@ -161,7 +161,7 @@ static struct gpio_callback callback[4];
 
 static char data_buf_mouse[64], data_buf_kbd[64];
 static char string[64];
-static u8_t chr_ptr_mouse, chr_ptr_kbd, str_pointer;
+static uint8_t chr_ptr_mouse, chr_ptr_kbd, str_pointer;
 
 #define MOUSE_BTN_REPORT_POS	0
 #define MOUSE_X_REPORT_POS	1
@@ -224,7 +224,7 @@ static void clear_kbd_report(void)
 	k_sem_give(&evt_sem);
 }
 
-static int ascii_to_hid(u8_t ascii)
+static int ascii_to_hid(uint8_t ascii)
 {
 	if (ascii < 32) {
 		/* Character not supported */
@@ -339,7 +339,7 @@ static int ascii_to_hid(u8_t ascii)
 	return -1;
 }
 
-static bool needs_shift(u8_t ascii)
+static bool needs_shift(uint8_t ascii)
 {
 	if ((ascii < 33) || (ascii == 39U)) {
 		return false;
@@ -389,7 +389,7 @@ static void write_data(struct device *dev, const char *buf, int len)
 		int written;
 
 		data_transmitted = false;
-		written = uart_fifo_fill(dev, (const u8_t *)buf, len);
+		written = uart_fifo_fill(dev, (const uint8_t *)buf, len);
 		while (data_transmitted == false) {
 			k_yield();
 		}
@@ -412,10 +412,10 @@ static void cdc_mouse_int_handler(struct device *dev)
 	if (!uart_irq_rx_ready(dev)) {
 		return;
 	}
-	u32_t bytes_read;
+	uint32_t bytes_read;
 
 	while ((bytes_read = uart_fifo_read(dev,
-		(u8_t *)data_buf_mouse+chr_ptr_mouse,
+		(uint8_t *)data_buf_mouse+chr_ptr_mouse,
 		sizeof(data_buf_mouse)-chr_ptr_mouse))) {
 		chr_ptr_mouse += bytes_read;
 		if (data_buf_mouse[chr_ptr_mouse - 1] == '\r') {
@@ -458,10 +458,10 @@ static void cdc_kbd_int_handler(struct device *dev)
 	if (!uart_irq_rx_ready(dev)) {
 		return;
 	}
-	u32_t bytes_read;
+	uint32_t bytes_read;
 
 	while ((bytes_read = uart_fifo_read(dev,
-		(u8_t *)data_buf_kbd+chr_ptr_kbd,
+		(uint8_t *)data_buf_kbd+chr_ptr_kbd,
 		sizeof(data_buf_kbd)-chr_ptr_kbd))) {
 		chr_ptr_kbd += bytes_read;
 		if (data_buf_kbd[chr_ptr_kbd - 1] == '\r') {
@@ -480,7 +480,7 @@ static void cdc_kbd_int_handler(struct device *dev)
 
 /* Devices */
 
-static void btn0(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void btn0(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	struct app_evt_t *ev = app_evt_alloc();
 
@@ -490,7 +490,7 @@ static void btn0(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 }
 
 #if DT_NODE_HAS_STATUS(SW1_NODE, okay)
-static void btn1(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void btn1(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	struct app_evt_t *ev = app_evt_alloc();
 
@@ -501,7 +501,7 @@ static void btn1(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 #endif
 
 #if DT_NODE_HAS_STATUS(SW2_NODE, okay)
-static void btn2(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void btn2(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	struct app_evt_t *ev = app_evt_alloc();
 
@@ -512,7 +512,7 @@ static void btn2(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 #endif
 
 #if DT_NODE_HAS_STATUS(SW3_NODE, okay)
-static void btn3(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void btn3(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	struct app_evt_t *ev = app_evt_alloc();
 
@@ -522,9 +522,9 @@ static void btn3(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 }
 #endif
 
-int callbacks_configure(struct device *gpio, u32_t pin, int flags,
+int callbacks_configure(struct device *gpio, uint32_t pin, int flags,
 			void (*handler)(struct device*, struct gpio_callback*,
-			u32_t), struct gpio_callback *callback)
+			uint32_t), struct gpio_callback *callback)
 {
 	if (!gpio) {
 		LOG_ERR("Could not find PORT");
@@ -541,7 +541,7 @@ int callbacks_configure(struct device *gpio, u32_t pin, int flags,
 	return 0;
 }
 
-static void status_cb(enum usb_dc_status_code status, const u8_t *param)
+static void status_cb(enum usb_dc_status_code status, const uint8_t *param)
 {
 	LOG_INF("Status %d", status);
 }
@@ -551,7 +551,7 @@ void main(void)
 	int ret;
 
 	struct device *hid0_dev, *hid1_dev, *cdc0_dev, *cdc1_dev;
-	u32_t dtr = 0U;
+	uint32_t dtr = 0U;
 	struct app_evt_t *ev;
 
 	/* Configure devices */
@@ -667,7 +667,7 @@ void main(void)
 			case GPIO_BUTTON_0:
 			{
 				/* Move the mouse in random direction */
-				u8_t rep[] = {0x00, sys_rand32_get(),
+				uint8_t rep[] = {0x00, sys_rand32_get(),
 					      sys_rand32_get(), 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
@@ -680,7 +680,7 @@ void main(void)
 			case GPIO_BUTTON_1:
 			{
 				/* Press left mouse button */
-				u8_t rep[] = {0x00, 0x00, 0x00, 0x00};
+				uint8_t rep[] = {0x00, 0x00, 0x00, 0x00};
 
 				rep[MOUSE_BTN_REPORT_POS] |= MOUSE_BTN_LEFT;
 				k_sem_take(&usb_sem, K_FOREVER);
@@ -707,7 +707,7 @@ void main(void)
 			case GPIO_BUTTON_3:
 			{
 				/* Toggle CAPS LOCK */
-				u8_t rep[] = {0x00, 0x00, 0x00, 0x00,
+				uint8_t rep[] = {0x00, 0x00, 0x00, 0x00,
 					      0x00, 0x00, 0x00,
 					      HID_KEY_CAPSLOCK};
 
@@ -721,7 +721,7 @@ void main(void)
 			case CDC_UP:
 			{
 				/* Mouse up */
-				u8_t rep[] = {0x00, 0x00, 0xE0, 0x00};
+				uint8_t rep[] = {0x00, 0x00, 0xE0, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
 				hid_int_ep_write(hid0_dev, rep,
@@ -733,7 +733,7 @@ void main(void)
 			case CDC_DOWN:
 			{
 				/* Mouse down */
-				u8_t rep[] = {0x00, 0x00, 0x20, 0x00};
+				uint8_t rep[] = {0x00, 0x00, 0x20, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
 				hid_int_ep_write(hid0_dev, rep,
@@ -745,7 +745,7 @@ void main(void)
 			case CDC_RIGHT:
 			{
 				/* Mouse right */
-				u8_t rep[] = {0x00, 0x20, 0x00, 0x00};
+				uint8_t rep[] = {0x00, 0x20, 0x00, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
 				hid_int_ep_write(hid0_dev, rep,
@@ -757,7 +757,7 @@ void main(void)
 			case CDC_LEFT:
 			{
 				/* Mouse left */
-				u8_t rep[] = {0x00, 0xE0, 0x00, 0x00};
+				uint8_t rep[] = {0x00, 0xE0, 0x00, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
 				hid_int_ep_write(hid0_dev, rep,
@@ -786,7 +786,7 @@ void main(void)
 			case HID_MOUSE_CLEAR:
 			{
 				/* Clear mouse report */
-				u8_t rep[] = {0x00, 0x00, 0x00, 0x00};
+				uint8_t rep[] = {0x00, 0x00, 0x00, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
 				hid_int_ep_write(hid0_dev, rep,
@@ -796,7 +796,7 @@ void main(void)
 			case HID_KBD_CLEAR:
 			{
 				/* Clear kbd report */
-				u8_t rep[] = {0x00, 0x00, 0x00, 0x00,
+				uint8_t rep[] = {0x00, 0x00, 0x00, 0x00,
 					      0x00, 0x00, 0x00, 0x00};
 
 				k_sem_take(&usb_sem, K_FOREVER);
@@ -812,7 +812,7 @@ void main(void)
 					LOG_WRN("Unsupported character: %d",
 						string[str_pointer]);
 				} else {
-					u8_t rep[] = {0x00, 0x00, 0x00, 0x00,
+					uint8_t rep[] = {0x00, 0x00, 0x00, 0x00,
 						      0x00, 0x00, 0x00, 0x00};
 					if (needs_shift(string[str_pointer])) {
 						rep[0] |=
diff --git a/samples/subsys/usb/hid-mouse/src/main.c b/samples/subsys/usb/hid-mouse/src/main.c
index 539d9f64c9..516bd051cd 100644
--- a/samples/subsys/usb/hid-mouse/src/main.c
+++ b/samples/subsys/usb/hid-mouse/src/main.c
@@ -69,10 +69,10 @@ LOG_MODULE_REGISTER(main);
 #define LED_FLAGS	0
 #endif
 
-static const u8_t hid_report_desc[] = HID_MOUSE_REPORT_DESC(2);
+static const uint8_t hid_report_desc[] = HID_MOUSE_REPORT_DESC(2);
 
-static u8_t def_val[4];
-static volatile u8_t status[4];
+static uint8_t def_val[4];
+static volatile uint8_t status[4];
 static K_SEM_DEFINE(sem, 0, 1);	/* starts off "not available" */
 static struct gpio_callback callback[4];
 static enum usb_dc_status_code usb_status;
@@ -87,16 +87,16 @@ static enum usb_dc_status_code usb_status;
 
 
 
-static void status_cb(enum usb_dc_status_code status, const u8_t *param)
+static void status_cb(enum usb_dc_status_code status, const uint8_t *param)
 {
 	usb_status = status;
 }
 
 static void left_button(struct device *gpio, struct gpio_callback *cb,
-			u32_t pins)
+			uint32_t pins)
 {
 	int ret;
-	u8_t state = status[MOUSE_BTN_REPORT_POS];
+	uint8_t state = status[MOUSE_BTN_REPORT_POS];
 
 	if (IS_ENABLED(CONFIG_USB_DEVICE_REMOTE_WAKEUP)) {
 		if (usb_status == USB_DC_SUSPEND) {
@@ -112,7 +112,7 @@ static void left_button(struct device *gpio, struct gpio_callback *cb,
 		return;
 	}
 
-	if (def_val[0] != (u8_t)ret) {
+	if (def_val[0] != (uint8_t)ret) {
 		state |= MOUSE_BTN_LEFT;
 	} else {
 		state &= ~MOUSE_BTN_LEFT;
@@ -126,10 +126,10 @@ static void left_button(struct device *gpio, struct gpio_callback *cb,
 
 #if DT_NODE_HAS_STATUS(SW1_NODE, okay)
 static void right_button(struct device *gpio, struct gpio_callback *cb,
-			 u32_t pins)
+			 uint32_t pins)
 {
 	int ret;
-	u8_t state = status[MOUSE_BTN_REPORT_POS];
+	uint8_t state = status[MOUSE_BTN_REPORT_POS];
 
 	if (IS_ENABLED(CONFIG_USB_DEVICE_REMOTE_WAKEUP)) {
 		if (usb_status == USB_DC_SUSPEND) {
@@ -145,7 +145,7 @@ static void right_button(struct device *gpio, struct gpio_callback *cb,
 		return;
 	}
 
-	if (def_val[1] != (u8_t)ret) {
+	if (def_val[1] != (uint8_t)ret) {
 		state |= MOUSE_BTN_RIGHT;
 	} else {
 		state &= ~MOUSE_BTN_RIGHT;
@@ -159,10 +159,10 @@ static void right_button(struct device *gpio, struct gpio_callback *cb,
 #endif
 
 #if DT_NODE_HAS_STATUS(SW2_NODE, okay)
-static void x_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void x_move(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	int ret;
-	u8_t state = status[MOUSE_X_REPORT_POS];
+	uint8_t state = status[MOUSE_X_REPORT_POS];
 
 	ret = gpio_pin_get(gpio, PIN2);
 	if (ret < 0) {
@@ -171,7 +171,7 @@ static void x_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 		return;
 	}
 
-	if (def_val[2] != (u8_t)ret) {
+	if (def_val[2] != (uint8_t)ret) {
 		state += 10U;
 	}
 
@@ -183,10 +183,10 @@ static void x_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 #endif
 
 #if DT_NODE_HAS_STATUS(SW3_NODE, okay)
-static void y_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
+static void y_move(struct device *gpio, struct gpio_callback *cb, uint32_t pins)
 {
 	int ret;
-	u8_t state = status[MOUSE_Y_REPORT_POS];
+	uint8_t state = status[MOUSE_Y_REPORT_POS];
 
 	ret = gpio_pin_get(gpio, PIN3);
 	if (ret < 0) {
@@ -195,7 +195,7 @@ static void y_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 		return;
 	}
 
-	if (def_val[3] != (u8_t)ret) {
+	if (def_val[3] != (uint8_t)ret) {
 		state += 10U;
 	}
 
@@ -206,9 +206,9 @@ static void y_move(struct device *gpio, struct gpio_callback *cb, u32_t pins)
 }
 #endif
 
-int callbacks_configure(struct device *gpio, u32_t pin, int flags,
+int callbacks_configure(struct device *gpio, uint32_t pin, int flags,
 			gpio_callback_handler_t handler,
-			struct gpio_callback *callback, u8_t *val)
+			struct gpio_callback *callback, uint8_t *val)
 {
 	int ret;
 
@@ -231,7 +231,7 @@ int callbacks_configure(struct device *gpio, u32_t pin, int flags,
 		return ret;
 	}
 
-	*val = (u8_t)ret;
+	*val = (uint8_t)ret;
 
 	gpio_init_callback(callback, handler, BIT(pin));
 	ret = gpio_add_callback(gpio, callback);
@@ -254,7 +254,7 @@ int callbacks_configure(struct device *gpio, u32_t pin, int flags,
 void main(void)
 {
 	int ret;
-	u8_t report[4] = { 0x00 };
+	uint8_t report[4] = { 0x00 };
 	struct device *led_dev, *hid_dev;
 
 	led_dev = device_get_binding(LED_PORT);
diff --git a/samples/subsys/usb/hid/src/main.c b/samples/subsys/usb/hid/src/main.c
index bc199b13af..beed3640f9 100644
--- a/samples/subsys/usb/hid/src/main.c
+++ b/samples/subsys/usb/hid/src/main.c
@@ -24,7 +24,7 @@ static struct device *hdev;
 #define REPORT_TIMEOUT K_SECONDS(2)
 
 /* Some HID sample Report Descriptor */
-static const u8_t hid_report_desc[] = {
+static const uint8_t hid_report_desc[] = {
 	/* 0x05, 0x01,		USAGE_PAGE (Generic Desktop)		*/
 	HID_GI_USAGE_PAGE, USAGE_GEN_DESKTOP,
 	/* 0x09, 0x00,		USAGE (Undefined)			*/
@@ -61,7 +61,7 @@ static const u8_t hid_report_desc[] = {
 
 static void send_report(struct k_work *work)
 {
-	static u8_t report_1[2] = { REPORT_ID_1, 0x00 };
+	static uint8_t report_1[2] = { REPORT_ID_1, 0x00 };
 	int ret, wrote;
 
 	ret = hid_int_ep_write(hdev, report_1, sizeof(report_1), &wrote);
@@ -77,7 +77,7 @@ static void in_ready_cb(void)
 	k_delayed_work_submit(&delayed_report_send, REPORT_TIMEOUT);
 }
 
-static void status_cb(enum usb_dc_status_code status, const u8_t *param)
+static void status_cb(enum usb_dc_status_code status, const uint8_t *param)
 {
 	switch (status) {
 	case USB_DC_CONFIGURED:
@@ -91,9 +91,9 @@ static void status_cb(enum usb_dc_status_code status, const u8_t *param)
 	}
 }
 
-static void idle_cb(u16_t report_id)
+static void idle_cb(uint16_t report_id)
 {
-	static u8_t report_1[2] = { 0x00, 0xEB };
+	static uint8_t report_1[2] = { 0x00, 0xEB };
 	int ret, wrote;
 
 	ret = hid_int_ep_write(hdev, report_1, sizeof(report_1), &wrote);
@@ -101,7 +101,7 @@ static void idle_cb(u16_t report_id)
 	LOG_DBG("Idle callback: wrote %d bytes with ret %d", wrote, ret);
 }
 
-static void protocol_cb(u8_t protocol)
+static void protocol_cb(uint8_t protocol)
 {
 	LOG_DBG("New protocol: %s", protocol == HID_PROTOCOL_BOOT ?
 		"boot" : "report");
diff --git a/samples/subsys/usb/webusb/src/main.c b/samples/subsys/usb/webusb/src/main.c
index ca1135395b..99e61dc850 100644
--- a/samples/subsys/usb/webusb/src/main.c
+++ b/samples/subsys/usb/webusb/src/main.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(main);
 #include "webusb.h"
 
 /* Predefined response to control commands related to MS OS 2.0 descriptors */
-static const u8_t msos2_descriptor[] = {
+static const uint8_t msos2_descriptor[] = {
 	/* MS OS 2.0 set header descriptor   */
 	0x0A, 0x00,             /* Descriptor size (10 bytes)                 */
 	0x00, 0x00,             /* MS_OS_20_SET_HEADER_DESCRIPTOR             */
@@ -121,7 +121,7 @@ USB_DEVICE_BOS_DESC_DEFINE_CAP struct usb_bos_msosv2_desc {
 };
 
 /* WebUSB Device Requests */
-static const u8_t webusb_allowed_origins[] = {
+static const uint8_t webusb_allowed_origins[] = {
 	/* Allowed Origins Header:
 	 * https://wicg.github.io/webusb/#get-allowed-origins
 	 */
@@ -142,7 +142,7 @@ static const u8_t webusb_allowed_origins[] = {
 #define NUMBER_OF_ALLOWED_ORIGINS   1
 
 /* URL Descriptor: https://wicg.github.io/webusb/#url-descriptor */
-static const u8_t webusb_origin_url[] = {
+static const uint8_t webusb_origin_url[] = {
 	/* Length, DescriptorType, Scheme */
 	0x11, 0x03, 0x00,
 	'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', ':', '8', '0', '0', '0'
@@ -154,9 +154,9 @@ static const u8_t webusb_origin_url[] = {
  */
 #define MSOS_STRING_LENGTH	18
 static struct string_desc {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bString[MSOS_STRING_LENGTH];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bString[MSOS_STRING_LENGTH];
 
 } __packed msos1_string_descriptor = {
 	.bLength = MSOS_STRING_LENGTH,
@@ -170,7 +170,7 @@ static struct string_desc {
 	},
 };
 
-static const u8_t msos1_compatid_descriptor[] = {
+static const uint8_t msos1_compatid_descriptor[] = {
 	/* See https://github.com/pbatard/libwdi/wiki/WCID-Devices */
 	/* MS OS 1.0 header section */
 	0x28, 0x00, 0x00, 0x00, /* Descriptor size (40 bytes)          */
@@ -200,11 +200,11 @@ static const u8_t msos1_compatid_descriptor[] = {
  * @return  0 on success, negative errno code on fail
  */
 int custom_handle_req(struct usb_setup_packet *pSetup,
-		      s32_t *len, u8_t **data)
+		      int32_t *len, uint8_t **data)
 {
 	if (GET_DESC_TYPE(pSetup->wValue) == USB_STRING_DESC &&
 	    GET_DESC_INDEX(pSetup->wValue) == 0xEE) {
-		*data = (u8_t *)(&msos1_string_descriptor);
+		*data = (uint8_t *)(&msos1_string_descriptor);
 		*len = sizeof(msos1_string_descriptor);
 
 		LOG_DBG("Get MS OS Descriptor v1 string");
@@ -226,11 +226,11 @@ int custom_handle_req(struct usb_setup_packet *pSetup,
  * @return  0 on success, negative errno code on fail.
  */
 int vendor_handle_req(struct usb_setup_packet *pSetup,
-		      s32_t *len, u8_t **data)
+		      int32_t *len, uint8_t **data)
 {
 	/* Get Allowed origins request */
 	if (pSetup->bRequest == 0x01 && pSetup->wIndex == 0x01) {
-		*data = (u8_t *)(&webusb_allowed_origins);
+		*data = (uint8_t *)(&webusb_allowed_origins);
 		*len = sizeof(webusb_allowed_origins);
 
 		LOG_DBG("Get webusb_allowed_origins");
@@ -238,13 +238,13 @@ int vendor_handle_req(struct usb_setup_packet *pSetup,
 		return 0;
 	} else if (pSetup->bRequest == 0x01 && pSetup->wIndex == 0x02) {
 		/* Get URL request */
-		u8_t index = GET_DESC_INDEX(pSetup->wValue);
+		uint8_t index = GET_DESC_INDEX(pSetup->wValue);
 
 		if (index == 0U || index > NUMBER_OF_ALLOWED_ORIGINS) {
 			return -ENOTSUP;
 		}
 
-		*data = (u8_t *)(&webusb_origin_url);
+		*data = (uint8_t *)(&webusb_origin_url);
 		*len = sizeof(webusb_origin_url);
 
 		LOG_DBG("Get webusb_origin_url");
@@ -253,7 +253,7 @@ int vendor_handle_req(struct usb_setup_packet *pSetup,
 	} else if (pSetup->bRequest == 0x02 && pSetup->wIndex == 0x07) {
 		/* Get MS OS 2.0 Descriptors request */
 		/* 0x07 means "MS_OS_20_DESCRIPTOR_INDEX" */
-		*data = (u8_t *)(&msos2_descriptor);
+		*data = (uint8_t *)(&msos2_descriptor);
 		*len = sizeof(msos2_descriptor);
 
 		LOG_DBG("Get MS OS Descriptors v2");
@@ -264,7 +264,7 @@ int vendor_handle_req(struct usb_setup_packet *pSetup,
 		/* 0x04 means "Extended compat ID".
 		 * Use 0x05 instead for "Extended properties".
 		 */
-		*data = (u8_t *)(&msos1_compatid_descriptor);
+		*data = (uint8_t *)(&msos1_compatid_descriptor);
 		*len = sizeof(msos1_compatid_descriptor);
 
 		LOG_DBG("Get MS OS Descriptors CompatibeID");
diff --git a/samples/subsys/usb/webusb/src/webusb.c b/samples/subsys/usb/webusb/src/webusb.c
index 69e17cf68c..09d59bec71 100644
--- a/samples/subsys/usb/webusb/src/webusb.c
+++ b/samples/subsys/usb/webusb/src/webusb.c
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(webusb);
 
 static struct webusb_req_handlers *req_handlers;
 
-u8_t rx_buf[64];
+uint8_t rx_buf[64];
 
 #define INITIALIZER_IF(num_ep, iface_class)				\
 	{								\
@@ -84,7 +84,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct {
  * @return  0 on success, negative errno code on fail.
  */
 int webusb_custom_handle_req(struct usb_setup_packet *pSetup,
-			     s32_t *len, u8_t **data)
+			     int32_t *len, uint8_t **data)
 {
 	LOG_DBG("");
 
@@ -106,7 +106,7 @@ int webusb_custom_handle_req(struct usb_setup_packet *pSetup,
  * @return  0 on success, negative errno code on fail.
  */
 int webusb_vendor_handle_req(struct usb_setup_packet *pSetup,
-			     s32_t *len, u8_t **data)
+			     int32_t *len, uint8_t **data)
 {
 	/* Call the callback */
 	if (req_handlers && req_handlers->vendor_handler) {
@@ -131,12 +131,12 @@ void webusb_register_request_handlers(struct webusb_req_handlers *handlers)
 	req_handlers = handlers;
 }
 
-static void webusb_write_cb(u8_t ep, int size, void *priv)
+static void webusb_write_cb(uint8_t ep, int size, void *priv)
 {
 	LOG_DBG("ep %x size %u", ep, size);
 }
 
-static void webusb_read_cb(u8_t ep, int size, void *priv)
+static void webusb_read_cb(uint8_t ep, int size, void *priv)
 {
 	struct usb_cfg_data *cfg = priv;
 
@@ -162,7 +162,7 @@ done:
  */
 static void webusb_dev_status_cb(struct usb_cfg_data *cfg,
 				 enum usb_dc_status_code status,
-				 const u8_t *param)
+				 const uint8_t *param)
 {
 	ARG_UNUSED(param);
 	ARG_UNUSED(cfg);
diff --git a/samples/tfm_integration/psa_level_1/src/psa_attestation.c b/samples/tfm_integration/psa_level_1/src/psa_attestation.c
index 1c1e4bf33c..37b3f058e6 100644
--- a/samples/tfm_integration/psa_level_1/src/psa_attestation.c
+++ b/samples/tfm_integration/psa_level_1/src/psa_attestation.c
@@ -25,11 +25,11 @@ psa_status_t att_get_pub_key(void)
 	return err ? al_psa_status(err, __func__) : err;
 }
 
-psa_status_t att_get_iat(u8_t *ch_buffer, u32_t ch_sz,
-			 u8_t *token_buffer, u32_t *token_sz)
+psa_status_t att_get_iat(uint8_t *ch_buffer, uint32_t ch_sz,
+			 uint8_t *token_buffer, uint32_t *token_sz)
 {
 	psa_status_t err = PSA_SUCCESS;
-	u32_t sys_token_sz;
+	uint32_t sys_token_sz;
 	size_t token_buf_size = ATT_MAX_TOKEN_SIZE;
 
 
@@ -99,8 +99,8 @@ psa_status_t att_test(void)
 	 * 00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF
 	 * 00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF
 	 */
-	u32_t nonce_sz = 64;
-	u8_t nonce_buf[ATT_MAX_TOKEN_SIZE] = {
+	uint32_t nonce_sz = 64;
+	uint8_t nonce_buf[ATT_MAX_TOKEN_SIZE] = {
 		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
 		0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
 		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
@@ -113,8 +113,8 @@ psa_status_t att_test(void)
 	};
 
 	/* IAT response buffer. */
-	u32_t iat_sz = ATT_MAX_TOKEN_SIZE;
-	u8_t iat_buf[ATT_MAX_TOKEN_SIZE] = { 0 };
+	uint32_t iat_sz = ATT_MAX_TOKEN_SIZE;
+	uint8_t iat_buf[ATT_MAX_TOKEN_SIZE] = { 0 };
 
 	/* String format output config. */
 	struct sf_hex_tbl_fmt fmt = {
diff --git a/samples/tfm_integration/psa_level_1/src/psa_attestation.h b/samples/tfm_integration/psa_level_1/src/psa_attestation.h
index 2dadf5920e..004b68ac93 100644
--- a/samples/tfm_integration/psa_level_1/src/psa_attestation.h
+++ b/samples/tfm_integration/psa_level_1/src/psa_attestation.h
@@ -50,8 +50,8 @@ psa_status_t att_get_pub_key(void);
  *
  * @return Returns error code as specified in \ref psa_status_t
  */
-psa_status_t att_get_iat(u8_t *ch_buffer, u32_t ch_sz,
-			 u8_t *token_buffer, u32_t *token_sz);
+psa_status_t att_get_iat(uint8_t *ch_buffer, uint32_t ch_sz,
+			 uint8_t *token_buffer, uint32_t *token_sz);
 
 /**
  * @brief TODO!
diff --git a/samples/tfm_integration/psa_level_1/src/psa_crypto.c b/samples/tfm_integration/psa_level_1/src/psa_crypto.c
index d859999a1f..5d84aa4e99 100644
--- a/samples/tfm_integration/psa_level_1/src/psa_crypto.c
+++ b/samples/tfm_integration/psa_level_1/src/psa_crypto.c
@@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(app, CONFIG_LOG_DEFAULT_LEVEL);
 void crp_test_rng(void)
 {
 	psa_status_t status;
-	u8_t outbuf[256] = { 0 };
+	uint8_t outbuf[256] = { 0 };
 	struct sf_hex_tbl_fmt fmt = {
 		.ascii = true,
 		.addr_label = true,
@@ -44,10 +44,10 @@ void crp_test_sha256(void)
 	static const char *const msg[] = { "This is my test message, ",
 					   "please generate a hash for this." };
 	const size_t msg_size[] = { 25, 32 };
-	u8_t hash_val[PSA_HASH_SIZE(PSA_ALG_SHA_256)] = { 0 };
+	uint8_t hash_val[PSA_HASH_SIZE(PSA_ALG_SHA_256)] = { 0 };
 	size_t hash_len;
-	const u32_t msg_num = ARRAY_SIZE(msg) / sizeof(msg[0]);
-	u32_t idx;
+	const uint32_t msg_num = ARRAY_SIZE(msg) / sizeof(msg[0]);
+	uint32_t idx;
 	psa_status_t status;
 	psa_hash_operation_t handle = psa_hash_operation_init();
 
@@ -65,7 +65,7 @@ void crp_test_sha256(void)
 		status = al_psa_status(
 			psa_hash_update(
 				&handle,
-				(const u8_t *)msg[idx], msg_size[idx]),
+				(const uint8_t *)msg[idx], msg_size[idx]),
 			__func__);
 		if (status != PSA_SUCCESS) {
 			goto err;
diff --git a/samples/tfm_integration/psa_level_1/src/tfm_ipc.c b/samples/tfm_integration/psa_level_1/src/tfm_ipc.c
index 8c05fe0bb0..1aad8ee3ef 100644
--- a/samples/tfm_integration/psa_level_1/src/tfm_ipc.c
+++ b/samples/tfm_integration/psa_level_1/src/tfm_ipc.c
@@ -11,15 +11,15 @@
 
 K_MUTEX_DEFINE(tfm_mutex);
 
-s32_t tfm_ns_interface_dispatch(veneer_fn fn,
-				u32_t arg0, u32_t arg1,
-				u32_t arg2, u32_t arg3)
+int32_t tfm_ns_interface_dispatch(veneer_fn fn,
+				uint32_t arg0, uint32_t arg1,
+				uint32_t arg2, uint32_t arg3)
 {
-	s32_t result;
+	int32_t result;
 
 	/* TFM request protected by NS lock */
 	if (k_mutex_lock(&tfm_mutex, K_FOREVER) != 0) {
-		return (s32_t)TFM_ERROR_GENERIC;
+		return (int32_t)TFM_ERROR_GENERIC;
 	}
 
 	result = fn(arg0, arg1, arg2, arg3);
diff --git a/samples/tfm_integration/psa_level_1/src/util_app_cfg.c b/samples/tfm_integration/psa_level_1/src/util_app_cfg.c
index 9a783e2e77..fb1668b81a 100644
--- a/samples/tfm_integration/psa_level_1/src/util_app_cfg.c
+++ b/samples/tfm_integration/psa_level_1/src/util_app_cfg.c
@@ -32,7 +32,7 @@ psa_status_t cfg_create_data(void)
 	psa_status_t status;
 
 	LOG_INF("app_cfg: Creating new config file with UID 0x%llX",
-		(u64_t)cfg_data_uid);
+		(uint64_t)cfg_data_uid);
 
 	/*
 	 * psa_ps_create can also be used here, which enables to the use of
diff --git a/samples/tfm_integration/psa_level_1/src/util_app_cfg.h b/samples/tfm_integration/psa_level_1/src/util_app_cfg.h
index 588c00dbf9..d0d8cc0be1 100644
--- a/samples/tfm_integration/psa_level_1/src/util_app_cfg.h
+++ b/samples/tfm_integration/psa_level_1/src/util_app_cfg.h
@@ -24,7 +24,7 @@ struct cfg_data {
 	/**
 	 * @brief Magic number for config data payloads (0x55CFDA7A).
 	 */
-	u32_t magic;
+	uint32_t magic;
 
 	/**
 	 * @brief The version number for the stored config record.
@@ -33,10 +33,10 @@ struct cfg_data {
 	 * definition changes to allow version management of config data at
 	 * the application level.
 	 */
-	u16_t version;
+	uint16_t version;
 
 	/** @brief 256-byte debug scratch area. */
-	u8_t scratch[256];
+	uint8_t scratch[256];
 };
 
 /**
diff --git a/samples/tfm_integration/psa_level_1/src/util_sformat.c b/samples/tfm_integration/psa_level_1/src/util_sformat.c
index 46feee7f40..749434f0a2 100644
--- a/samples/tfm_integration/psa_level_1/src/util_sformat.c
+++ b/samples/tfm_integration/psa_level_1/src/util_sformat.c
@@ -10,7 +10,7 @@
 
 static void sf_hex_ascii(unsigned char *data, size_t len, unsigned char nonvis)
 {
-	u32_t idx;
+	uint32_t idx;
 
 	/* Render printable characters. */
 	idx = 0;
@@ -24,10 +24,10 @@ static void sf_hex_ascii(unsigned char *data, size_t len, unsigned char nonvis)
 void sf_hex_tabulate_16(struct sf_hex_tbl_fmt *fmt, unsigned char *data,
 			size_t len)
 {
-	u32_t idx;
-	u32_t cpos;     /* Current position. */
-	u32_t ca;       /* Current address. */
-	u32_t ea;       /* End address. */
+	uint32_t idx;
+	uint32_t cpos;     /* Current position. */
+	uint32_t ca;       /* Current address. */
+	uint32_t ea;       /* End address. */
 
 	if (!len) {
 		return;
diff --git a/samples/tfm_integration/psa_level_1/src/util_sformat.h b/samples/tfm_integration/psa_level_1/src/util_sformat.h
index aba3c0a252..02760cc927 100644
--- a/samples/tfm_integration/psa_level_1/src/util_sformat.h
+++ b/samples/tfm_integration/psa_level_1/src/util_sformat.h
@@ -19,11 +19,11 @@ extern "C" {
  */
 struct sf_hex_tbl_fmt {
 	/** Whether or not to render ASCII equivalents. */
-	u8_t ascii : 1;
+	uint8_t ascii : 1;
 	/** Whether or not to add address labels to the output. */
-	u8_t addr_label : 1;
+	uint8_t addr_label : 1;
 	/** The starting value for the address labels. */
-	u32_t addr;
+	uint32_t addr;
 } __packed;
 
 /**
diff --git a/samples/tfm_integration/tfm_ipc/src/main.c b/samples/tfm_integration/tfm_ipc/src/main.c
index b52aed40f9..e2551f00db 100644
--- a/samples/tfm_integration/tfm_ipc/src/main.c
+++ b/samples/tfm_integration/tfm_ipc/src/main.c
@@ -15,15 +15,15 @@
 
 K_MUTEX_DEFINE(tfm_mutex);
 
-s32_t tfm_ns_interface_dispatch(veneer_fn fn,
-				  u32_t arg0, u32_t arg1,
-				  u32_t arg2, u32_t arg3)
+int32_t tfm_ns_interface_dispatch(veneer_fn fn,
+				  uint32_t arg0, uint32_t arg1,
+				  uint32_t arg2, uint32_t arg3)
 {
-	s32_t result;
+	int32_t result;
 
 	/* TFM request protected by NS lock */
 	if (k_mutex_lock(&tfm_mutex, K_FOREVER) != 0) {
-		return (s32_t)TFM_ERROR_GENERIC;
+		return (int32_t)TFM_ERROR_GENERIC;
 	}
 
 	result = fn(arg0, arg1, arg2, arg3);
@@ -49,7 +49,7 @@ enum tfm_status_e tfm_ns_interface_init(void)
  */
 static void tfm_ipc_test_1001(void)
 {
-	u32_t version;
+	uint32_t version;
 
 	version = psa_framework_version();
 	if (version == PSA_FRAMEWORK_VERSION) {
@@ -68,7 +68,7 @@ static void tfm_ipc_test_1001(void)
  */
 static void tfm_ipc_test_1002(void)
 {
-	u32_t version;
+	uint32_t version;
 
 	version = psa_version(IPC_SERVICE_TEST_BASIC_SID);
 	if (version == PSA_VERSION_NONE) {
@@ -121,7 +121,7 @@ static void tfm_ipc_test_1004(void)
 					   sizeof(char) } };
 	psa_handle_t handle;
 	psa_status_t status;
-	u32_t version;
+	uint32_t version;
 
 	version = psa_version(IPC_SERVICE_TEST_BASIC_SID);
 	printk("TFM service support version is %d.\n", version);
diff --git a/samples/userspace/prod_consumer/src/sample_driver_foo.c b/samples/userspace/prod_consumer/src/sample_driver_foo.c
index 693254fd6f..7da2843ee8 100644
--- a/samples/userspace/prod_consumer/src/sample_driver_foo.c
+++ b/samples/userspace/prod_consumer/src/sample_driver_foo.c
@@ -27,7 +27,7 @@ struct sample_driver_foo_dev_data {
 	sample_driver_callback_t cb;
 	void *cb_context;
 	struct k_timer timer; /* to fake 'interrupts' */
-	u32_t count;
+	uint32_t count;
 };
 
 static int sample_driver_foo_write(struct device *dev, void *buf)
diff --git a/scripts/coccinelle/int_ms_to_timeout.cocci b/scripts/coccinelle/int_ms_to_timeout.cocci
index 31f01f76b1..2cfaaeb080 100644
--- a/scripts/coccinelle/int_ms_to_timeout.cocci
+++ b/scripts/coccinelle/int_ms_to_timeout.cocci
@@ -178,12 +178,12 @@ coccilib.report.print_report(p[0], msg);
  @
 identifier FN;
 identifier P;
-typedef s32_t, u32_t;
+typedef int32_t, uint32_t;
 @@
  FN(...,
 (int
-|s32_t
-|u32_t
+|int32_t
+|uint32_t
 )
  P, ...) {
  ...
@@ -201,12 +201,12 @@ typedef s32_t, u32_t;
 identifier FN;
 identifier P;
 position p;
-typedef s32_t, u32_t;
+typedef int32_t, uint32_t;
 @@
  FN(...,
 (int
-|s32_t
-|u32_t
+|int32_t
+|uint32_t
 )
  P, ...) {
  ...
diff --git a/scripts/coccinelle/irq_lock.cocci b/scripts/coccinelle/irq_lock.cocci
index 5ce9b7f217..ed8601329a 100644
--- a/scripts/coccinelle/irq_lock.cocci
+++ b/scripts/coccinelle/irq_lock.cocci
@@ -10,7 +10,7 @@ virtual patch
 @find depends on !(file in "ext")@
 type T;
 identifier i;
-typedef uint32_t,u32_t;
+typedef uint32_t,uint32_t;
 @@
 
 (
@@ -18,7 +18,7 @@ typedef uint32_t,u32_t;
 |
  unsigned int i = irq_lock();
 |
- u32_t i = irq_lock();
+ uint32_t i = irq_lock();
 |
 - T
 + unsigned int
@@ -35,7 +35,7 @@ identifier i;
 |
  unsigned int i;
 |
- u32_t i;
+ uint32_t i;
 |
 - T
 + unsigned int
diff --git a/scripts/coccinelle/unsigned_lesser_than_zero.cocci b/scripts/coccinelle/unsigned_lesser_than_zero.cocci
index 91c8543ef1..23d6e27e79 100644
--- a/scripts/coccinelle/unsigned_lesser_than_zero.cocci
+++ b/scripts/coccinelle/unsigned_lesser_than_zero.cocci
@@ -11,9 +11,9 @@ virtual report
 
 @r_cmp depends on !(file in "ext")@
 position p;
-typedef u8_t, u16_t, u32_t, u64_t;
+typedef uint8_t, uint16_t, uint32_t, uint64_t;
 {unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long,
-	size_t, u8_t, u16_t, u32_t, u64_t} v;
+	size_t, uint8_t, uint16_t, uint32_t, uint64_t} v;
 @@
 
 	(\( v@p < 0 \| v@p <= 0 \))
diff --git a/scripts/gen_cfb_font_header.py b/scripts/gen_cfb_font_header.py
index bbe00188be..4f062b0c9b 100755
--- a/scripts/gen_cfb_font_header.py
+++ b/scripts/gen_cfb_font_header.py
@@ -158,7 +158,7 @@ def generate_header():
 #include <zephyr.h>
 #include <display/cfb.h>
 
-static const u8_t cfb_font_{name:s}_{width:d}{height:d}[{elem:d}][{b:.0f}] = {{\n"""
+static const uint8_t cfb_font_{name:s}_{width:d}{height:d}[{elem:d}][{b:.0f}] = {{\n"""
                       .format(cmd=" ".join(clean_cmd),
                               name=args.name,
                               width=args.width,
diff --git a/scripts/gen_kobject_list.py b/scripts/gen_kobject_list.py
index f404efc332..5f12b80495 100755
--- a/scripts/gen_kobject_list.py
+++ b/scripts/gen_kobject_list.py
@@ -747,7 +747,7 @@ def write_gperf_table(fp, syms, objs, little_endian, static_begin, static_end):
     if "CONFIG_GEN_PRIV_STACKS" in syms:
         metadata_names["K_OBJ_THREAD_STACK_ELEMENT"] = "stack_data"
         if stack_counter != 0:
-            fp.write("static u8_t Z_GENERIC_SECTION(.priv_stacks.noinit) "
+            fp.write("static uint8_t Z_GENERIC_SECTION(.priv_stacks.noinit) "
                      " __aligned(Z_PRIVILEGE_STACK_ALIGN)"
                      " priv_stacks[%d][CONFIG_PRIVILEGED_STACK_SIZE];\n"
                      % stack_counter)
@@ -765,7 +765,7 @@ def write_gperf_table(fp, syms, objs, little_endian, static_begin, static_end):
                 # instead
                 size = ko.data
                 ko.data = "&stack_data[%d]" % counter
-                fp.write("\t{ %d, (u8_t *)(&priv_stacks[%d]) }"
+                fp.write("\t{ %d, (uint8_t *)(&priv_stacks[%d]) }"
                          % (size, counter))
                 if counter != (stack_counter - 1):
                     fp.write(",")
@@ -831,7 +831,7 @@ def write_gperf_table(fp, syms, objs, little_endian, static_begin, static_end):
     # Generate the array of already mapped thread indexes
     fp.write('\n')
     fp.write('Z_GENERIC_SECTION(.kobject_data.data) ')
-    fp.write('u8_t _thread_idx_map[%d] = {' % (thread_max_bytes))
+    fp.write('uint8_t _thread_idx_map[%d] = {' % (thread_max_bytes))
 
     for i in range(0, thread_max_bytes):
         fp.write(' 0x%x, ' % (thread_idx_map[i]))
diff --git a/scripts/gen_relocate_app.py b/scripts/gen_relocate_app.py
index 6c34948813..cec50b0e16 100644
--- a/scripts/gen_relocate_app.py
+++ b/scripts/gen_relocate_app.py
@@ -135,13 +135,13 @@ void bss_zeroing_relocation(void)
 
 MEMCPY_TEMPLATE = """
 	(void)memcpy(&__{0}_{1}_start, &__{0}_{1}_rom_start,
-		     (u32_t) &__{0}_{1}_size);
+		     (uint32_t) &__{0}_{1}_size);
 
 """
 
 MEMSET_TEMPLATE = """
  	(void)memset(&__{0}_bss_start, 0,
-		     (u32_t) &__{0}_bss_size);
+		     (uint32_t) &__{0}_bss_size);
 """
 
 
diff --git a/scripts/gen_syscalls.py b/scripts/gen_syscalls.py
index 30c12fe421..32531558b9 100755
--- a/scripts/gen_syscalls.py
+++ b/scripts/gen_syscalls.py
@@ -29,7 +29,7 @@ import argparse
 import os
 import json
 
-types64 = ["s64_t", "u64_t"]
+types64 = ["int64_t", "uint64_t"]
 
 # The kernel linkage is complicated.  These functions from
 # userspace_handlers.c are present in the kernel .a library after
@@ -174,7 +174,7 @@ def wrapper_defs(func_name, func_type, args):
     wrap += "static inline %s %s(%s)\n" % (func_type, func_name, decl_arglist)
     wrap += "{\n"
     wrap += "#ifdef CONFIG_USERSPACE\n"
-    wrap += ("\t" + "u64_t ret64;\n") if ret64 else ""
+    wrap += ("\t" + "uint64_t ret64;\n") if ret64 else ""
     wrap += "\t" + "if (z_syscall_trap()) {\n"
 
     for parmnum, rec in enumerate(split_args):
@@ -290,7 +290,7 @@ def marshall_defs(func_name, func_type, args):
         mrsh += "\t" + "%s ret = %s;\n" % (func_type, vrfy_call)
 
         if need_split(func_type):
-            ptr = "((u64_t *)%s)" % mrsh_rval(nmrsh - 1, nmrsh)
+            ptr = "((uint64_t *)%s)" % mrsh_rval(nmrsh - 1, nmrsh)
             mrsh += "\t" + "Z_OOPS(Z_SYSCALL_MEMORY_WRITE(%s, 8));\n" % ptr
             mrsh += "\t" + "*%s = ret;\n" % ptr
             mrsh += "\t" + "_current->syscall_frame = NULL;\n"
diff --git a/soc/arc/snps_arc_hsdk/soc.c b/soc/arc/snps_arc_hsdk/soc.c
index f3de79de06..098c7b76a0 100644
--- a/soc/arc/snps_arc_hsdk/soc.c
+++ b/soc/arc/snps_arc_hsdk/soc.c
@@ -16,8 +16,8 @@ static int arc_hsdk_init(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	u32_t core;
-	u32_t i;
+	uint32_t core;
+	uint32_t i;
 
 	/* allocate all IDU interrupts to master core */
 	core = z_arc_v2_core_id();
diff --git a/soc/arc/snps_nsim/soc.c b/soc/arc/snps_nsim/soc.c
index 2fbe6693b5..5a9fc38faa 100644
--- a/soc/arc/snps_nsim/soc.c
+++ b/soc/arc/snps_nsim/soc.c
@@ -21,8 +21,8 @@ static int arc_nsim_init(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	u32_t core;
-	u32_t i;
+	uint32_t core;
+	uint32_t i;
 
 	/* allocate all IDU interrupts to master core */
 	core = z_arc_v2_core_id();
diff --git a/soc/arm/arm/beetle/soc.c b/soc/arm/arm/beetle/soc.c
index 38e5faf21f..e89d2f6d9f 100644
--- a/soc/arm/arm/beetle/soc.c
+++ b/soc/arm/arm/beetle/soc.c
@@ -32,7 +32,7 @@
  */
 static int arm_beetle_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/arm/beetle/soc_registers.h b/soc/arm/arm/beetle/soc_registers.h
index c59bc45e9c..269f397dac 100644
--- a/soc/arm/arm/beetle/soc_registers.h
+++ b/soc/arm/arm/beetle/soc_registers.h
@@ -15,99 +15,99 @@
 /* System Control Register (SYSCON) */
 struct syscon {
 	/* Offset: 0x000 (r/w) remap control register */
-	volatile u32_t remap;
+	volatile uint32_t remap;
 	/* Offset: 0x004 (r/w) pmu control register */
-	volatile u32_t pmuctrl;
+	volatile uint32_t pmuctrl;
 	/* Offset: 0x008 (r/w) reset option register */
-	volatile u32_t resetop;
+	volatile uint32_t resetop;
 	/* Offset: 0x00c (r/w) emi control register */
-	volatile u32_t emictrl;
+	volatile uint32_t emictrl;
 	/* Offset: 0x010 (r/w) reset information register */
-	volatile u32_t rstinfo;
-	volatile u32_t reserved0[3];
+	volatile uint32_t rstinfo;
+	volatile uint32_t reserved0[3];
 	/* Offset: 0x020 (r/w)AHB peripheral access control set */
-	volatile u32_t ahbper0set;
+	volatile uint32_t ahbper0set;
 	/* Offset: 0x024 (r/w)AHB peripheral access control clear */
-	volatile u32_t ahbper0clr;
-	volatile u32_t reserved1[2];
+	volatile uint32_t ahbper0clr;
+	volatile uint32_t reserved1[2];
 	/* Offset: 0x030 (r/w)APB peripheral access control set */
-	volatile u32_t apbper0set;
+	volatile uint32_t apbper0set;
 	/* Offset: 0x034 (r/w)APB peripheral access control clear */
-	volatile u32_t apbper0clr;
-	volatile u32_t reserved2[2];
+	volatile uint32_t apbper0clr;
+	volatile uint32_t reserved2[2];
 	/* Offset: 0x040 (r/w) main clock control register */
-	volatile u32_t mainclk;
+	volatile uint32_t mainclk;
 	/* Offset: 0x044 (r/w) auxiliary / rtc control register */
-	volatile u32_t auxclk;
+	volatile uint32_t auxclk;
 	/* Offset: 0x048 (r/w) pll control register */
-	volatile u32_t pllctrl;
+	volatile uint32_t pllctrl;
 	/* Offset: 0x04c (r/w) pll status register */
-	volatile u32_t pllstatus;
+	volatile uint32_t pllstatus;
 	/* Offset: 0x050 (r/w) sleep control register */
-	volatile u32_t sleepcfg;
+	volatile uint32_t sleepcfg;
 	/* Offset: 0x054 (r/w) flash auxiliary settings control register */
-	volatile u32_t flashauxcfg;
-	volatile u32_t reserved3[10];
+	volatile uint32_t flashauxcfg;
+	volatile uint32_t reserved3[10];
 	/* Offset: 0x080 (r/w) AHB peripheral clock set in active state */
-	volatile u32_t ahbclkcfg0set;
+	volatile uint32_t ahbclkcfg0set;
 	/* Offset: 0x084 (r/w) AHB peripheral clock clear in active state */
-	volatile u32_t ahbclkcfg0clr;
+	volatile uint32_t ahbclkcfg0clr;
 	/* Offset: 0x088 (r/w) AHB peripheral clock set in sleep state */
-	volatile u32_t ahbclkcfg1set;
+	volatile uint32_t ahbclkcfg1set;
 	/* Offset: 0x08c (r/w) AHB peripheral clock clear in sleep state */
-	volatile u32_t ahbclkcfg1clr;
+	volatile uint32_t ahbclkcfg1clr;
 	/* Offset: 0x090 (r/w) AHB peripheral clock set in deep sleep state */
-	volatile u32_t ahbclkcfg2set;
+	volatile uint32_t ahbclkcfg2set;
 	/* Offset: 0x094 (r/w) AHB peripheral clock clear in deep sleep state */
-	volatile u32_t ahbclkcfg2clr;
-	volatile u32_t reserved4[2];
+	volatile uint32_t ahbclkcfg2clr;
+	volatile uint32_t reserved4[2];
 	/* Offset: 0x0a0 (r/w) APB peripheral clock set in active state */
-	volatile u32_t apbclkcfg0set;
+	volatile uint32_t apbclkcfg0set;
 	/* Offset: 0x0a4 (r/w) APB peripheral clock clear in active state */
-	volatile u32_t apbclkcfg0clr;
+	volatile uint32_t apbclkcfg0clr;
 	/* Offset: 0x0a8 (r/w) APB peripheral clock set in sleep state */
-	volatile u32_t apbclkcfg1set;
+	volatile uint32_t apbclkcfg1set;
 	/* Offset: 0x0ac (r/w) APB peripheral clock clear in sleep state */
-	volatile u32_t apbclkcfg1clr;
+	volatile uint32_t apbclkcfg1clr;
 	/* Offset: 0x0b0 (r/w) APB peripheral clock set in deep sleep state */
-	volatile u32_t apbclkcfg2set;
+	volatile uint32_t apbclkcfg2set;
 	/* Offset: 0x0b4 (r/w) APB peripheral clock clear in deep sleep state */
-	volatile u32_t apbclkcfg2clr;
-	volatile u32_t reserved5[2];
+	volatile uint32_t apbclkcfg2clr;
+	volatile uint32_t reserved5[2];
 	/* Offset: 0x0c0 (r/w) AHB peripheral reset select set */
-	volatile u32_t ahbprst0set;
+	volatile uint32_t ahbprst0set;
 	/* Offset: 0x0c4 (r/w) AHB peripheral reset select clear */
-	volatile u32_t ahbprst0clr;
+	volatile uint32_t ahbprst0clr;
 	/* Offset: 0x0c8 (r/w) APB peripheral reset select set */
-	volatile u32_t apbprst0set;
+	volatile uint32_t apbprst0set;
 	/* Offset: 0x0cc (r/w) APB peripheral reset select clear */
-	volatile u32_t apbprst0clr;
+	volatile uint32_t apbprst0clr;
 	/* Offset: 0x0d0 (r/w) AHB power down sleep wakeup source set */
-	volatile u32_t pwrdncfg0set;
+	volatile uint32_t pwrdncfg0set;
 	/* Offset: 0x0d4 (r/w) AHB power down sleep wakeup source clear */
-	volatile u32_t pwrdncfg0clr;
+	volatile uint32_t pwrdncfg0clr;
 	/* Offset: 0x0d8 (r/w) APB power down sleep wakeup source set */
-	volatile u32_t pwrdncfg1set;
+	volatile uint32_t pwrdncfg1set;
 	/* Offset: 0x0dc (r/w) APB power down sleep wakeup source clear */
-	volatile u32_t pwrdncfg1clr;
+	volatile uint32_t pwrdncfg1clr;
 	/* Offset: 0x0e0 ( /w) rtc reset */
-	volatile u32_t rtcreset;
+	volatile uint32_t rtcreset;
 	/* Offset: 0x0e4 (r/w) event interface control register */
-	volatile u32_t eventcfg;
-	volatile u32_t reserved6[2];
+	volatile uint32_t eventcfg;
+	volatile uint32_t reserved6[2];
 	/* Offset: 0x0f0 (r/w) sram power control overide */
-	volatile u32_t pwrovride0;
+	volatile uint32_t pwrovride0;
 	/* Offset: 0x0f4 (r/w) embedded flash power control overide */
-	volatile u32_t pwrovride1;
+	volatile uint32_t pwrovride1;
 	/* Offset: 0x0f8 (r/ ) memory status register */
-	volatile u32_t memorystatus;
-	volatile u32_t reserved7[1];
+	volatile uint32_t memorystatus;
+	volatile uint32_t reserved7[1];
 	/* Offset: 0x100 (r/w) io pad settings */
-	volatile u32_t gpiopadcfg0;
+	volatile uint32_t gpiopadcfg0;
 	/* Offset: 0x104 (r/w) io pad settings */
-	volatile u32_t gpiopadcfg1;
+	volatile uint32_t gpiopadcfg1;
 	/* Offset: 0x108 (r/w) testmode boot bypass */
-	volatile u32_t testmodecfg;
+	volatile uint32_t testmodecfg;
 };
 
 #endif /* _ARM_BEETLE_SOC_REGS_H_ */
diff --git a/soc/arm/arm/mps2/soc.c b/soc/arm/arm/mps2/soc.c
index 0c1d008237..1d6f956599 100644
--- a/soc/arm/arm/mps2/soc.c
+++ b/soc/arm/arm/mps2/soc.c
@@ -54,14 +54,14 @@ FPGAIO_INIT(2);
 void wakeup_cpu1(void)
 {
 	/* Set the Initial Secure Reset Vector Register for CPU 1 */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
 		CONFIG_FLASH_BASE_ADDRESS +
 		BL2_HEADER_SIZE +
 		CPU1_FLASH_ADDRESS -
 		CPU1_FLASH_OFFSET;
 
 	/* Set the CPU Boot wait control after reset */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
 }
 
 /**
@@ -69,11 +69,11 @@ void wakeup_cpu1(void)
  *
  * @return Current CPU ID
  */
-u32_t sse_200_platform_get_cpu_id(void)
+uint32_t sse_200_platform_get_cpu_id(void)
 {
-	volatile u32_t *p_cpu_id = (volatile u32_t *)SSE_200_CPU_ID_UNIT_BASE;
+	volatile uint32_t *p_cpu_id = (volatile uint32_t *)SSE_200_CPU_ID_UNIT_BASE;
 
-	return (u32_t)*p_cpu_id;
+	return (uint32_t)*p_cpu_id;
 }
 
 /**
diff --git a/soc/arm/arm/mps2/soc.h b/soc/arm/arm/mps2/soc.h
index 47cdfa1ead..54e2ec7023 100644
--- a/soc/arm/arm/mps2/soc.h
+++ b/soc/arm/arm/mps2/soc.h
@@ -20,6 +20,6 @@
 
 extern void wakeup_cpu1(void);
 
-extern u32_t sse_200_platform_get_cpu_id(void);
+extern uint32_t sse_200_platform_get_cpu_id(void);
 
 #endif /* _SOC_H_ */
diff --git a/soc/arm/arm/mps2/soc_registers.h b/soc/arm/arm/mps2/soc_registers.h
index aa2463c9e9..6bd11e185c 100644
--- a/soc/arm/arm/mps2/soc_registers.h
+++ b/soc/arm/arm/mps2/soc_registers.h
@@ -18,27 +18,27 @@
 /* Registers in the FPGA system control block */
 struct mps2_fpgaio {
 	/* Offset: 0x000 LED connections */
-	volatile u32_t led0;
+	volatile uint32_t led0;
 	/* Offset: 0x004 RESERVED */
-	volatile u32_t reserved1;
+	volatile uint32_t reserved1;
 	/* Offset: 0x008 Buttons */
-	volatile u32_t button;
+	volatile uint32_t button;
 	/* Offset: 0x00c RESERVED */
-	volatile u32_t reserved2;
+	volatile uint32_t reserved2;
 	/* Offset: 0x010 1Hz up counter */
-	volatile u32_t clk1hz;
+	volatile uint32_t clk1hz;
 	/* Offset: 0x014 100Hz up counter */
-	volatile u32_t clk100hz;
+	volatile uint32_t clk100hz;
 	/* Offset: 0x018 Cycle up counter */
-	volatile u32_t counter;
+	volatile uint32_t counter;
 	/* Offset: 0x01c Reload value for prescale counter */
-	volatile u32_t prescale;
+	volatile uint32_t prescale;
 	/* Offset: 0x020 32-bit Prescale counter */
-	volatile u32_t pscntr;
+	volatile uint32_t pscntr;
 	/* Offset: 0x024 RESERVED */
-	volatile u32_t reserved3[10];
+	volatile uint32_t reserved3[10];
 	/* Offset: 0x04c Misc control */
-	volatile u32_t misc;
+	volatile uint32_t misc;
 };
 
 /* Defines for bits in fpgaio led0 register */
diff --git a/soc/arm/arm/musca_a/soc.c b/soc/arm/arm/musca_a/soc.c
index 66ae4b0d02..83f5fa08c5 100644
--- a/soc/arm/arm/musca_a/soc.c
+++ b/soc/arm/arm/musca_a/soc.c
@@ -25,14 +25,14 @@
 void wakeup_cpu1(void)
 {
 	/* Set the Initial Secure Reset Vector Register for CPU 1 */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
 					CONFIG_FLASH_BASE_ADDRESS +
 					NON_SECURE_FLASH_ADDRESS +
 					NON_SECURE_IMAGE_HEADER -
 					NON_SECURE_FLASH_OFFSET;
 
 	/* Set the CPU Boot wait control after reset */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
 }
 
 /**
@@ -40,11 +40,11 @@ void wakeup_cpu1(void)
  *
  * @return Current CPU ID
  */
-u32_t sse_200_platform_get_cpu_id(void)
+uint32_t sse_200_platform_get_cpu_id(void)
 {
-	volatile u32_t *p_cpu_id = (volatile u32_t *)SSE_200_CPU_ID_UNIT_BASE;
+	volatile uint32_t *p_cpu_id = (volatile uint32_t *)SSE_200_CPU_ID_UNIT_BASE;
 
-	return (u32_t)*p_cpu_id;
+	return (uint32_t)*p_cpu_id;
 }
 
 /**
diff --git a/soc/arm/arm/musca_a/soc.h b/soc/arm/arm/musca_a/soc.h
index 6715918373..f6bae25264 100644
--- a/soc/arm/arm/musca_a/soc.h
+++ b/soc/arm/arm/musca_a/soc.h
@@ -15,6 +15,6 @@
 
 extern void wakeup_cpu1(void);
 
-extern u32_t sse_200_platform_get_cpu_id(void);
+extern uint32_t sse_200_platform_get_cpu_id(void);
 
 #endif /* _SOC_H_ */
diff --git a/soc/arm/arm/musca_b1/soc.c b/soc/arm/arm/musca_b1/soc.c
index 1da1fd7a74..7e8fb8fa93 100644
--- a/soc/arm/arm/musca_b1/soc.c
+++ b/soc/arm/arm/musca_b1/soc.c
@@ -25,14 +25,14 @@
 void wakeup_cpu1(void)
 {
 	/* Set the Initial Secure Reset Vector Register for CPU 1 */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_INITSVTOR1) =
 					CONFIG_FLASH_BASE_ADDRESS +
 					BL2_HEADER_SIZE +
 					NON_SECURE_FLASH_ADDRESS -
 					NON_SECURE_FLASH_OFFSET;
 
 	/* Set the CPU Boot wait control after reset */
-	*(u32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
+	*(uint32_t *)(SSE_200_SYSTEM_CTRL_CPU_WAIT) = 0;
 }
 
 /**
@@ -40,11 +40,11 @@ void wakeup_cpu1(void)
  *
  * @return Current CPU ID
  */
-u32_t sse_200_platform_get_cpu_id(void)
+uint32_t sse_200_platform_get_cpu_id(void)
 {
-	volatile u32_t *p_cpu_id = (volatile u32_t *)SSE_200_CPU_ID_UNIT_BASE;
+	volatile uint32_t *p_cpu_id = (volatile uint32_t *)SSE_200_CPU_ID_UNIT_BASE;
 
-	return (u32_t)*p_cpu_id;
+	return (uint32_t)*p_cpu_id;
 }
 
 /**
diff --git a/soc/arm/arm/musca_b1/soc.h b/soc/arm/arm/musca_b1/soc.h
index 8376965a1d..5223f3bb43 100644
--- a/soc/arm/arm/musca_b1/soc.h
+++ b/soc/arm/arm/musca_b1/soc.h
@@ -15,6 +15,6 @@
 
 extern void wakeup_cpu1(void);
 
-extern u32_t sse_200_platform_get_cpu_id(void);
+extern uint32_t sse_200_platform_get_cpu_id(void);
 
 #endif /* _SOC_H_ */
diff --git a/soc/arm/atmel_sam/common/soc_gpio.c b/soc/arm/atmel_sam/common/soc_gpio.c
index ac066e6da6..13c54a897b 100644
--- a/soc/arm/atmel_sam/common/soc_gpio.c
+++ b/soc/arm/atmel_sam/common/soc_gpio.c
@@ -21,7 +21,7 @@
 #error "Unsupported Atmel SAM MCU series"
 #endif
 
-static void configure_common_attr(Pio *pio, u32_t mask, u32_t flags)
+static void configure_common_attr(Pio *pio, uint32_t mask, uint32_t flags)
 {
 	/* Disable interrupts on the pin(s) */
 	pio->PIO_IDR = mask;
@@ -51,7 +51,7 @@ static void configure_common_attr(Pio *pio, u32_t mask, u32_t flags)
 	}
 }
 
-static void configure_input_attr(Pio *pio, u32_t mask, u32_t flags)
+static void configure_input_attr(Pio *pio, uint32_t mask, uint32_t flags)
 {
 	/* Configure input filter */
 	if ((flags & SOC_GPIO_IN_FILTER_MASK) != 0U) {
@@ -107,7 +107,7 @@ static void configure_input_attr(Pio *pio, u32_t mask, u32_t flags)
 	}
 }
 
-static void configure_output_attr(Pio *pio, u32_t mask, u32_t flags)
+static void configure_output_attr(Pio *pio, uint32_t mask, uint32_t flags)
 {
 	/* Enable control of the I/O line by the PIO_ODSR register */
 	pio->PIO_OWER = mask;
@@ -115,11 +115,11 @@ static void configure_output_attr(Pio *pio, u32_t mask, u32_t flags)
 
 void soc_gpio_configure(const struct soc_gpio_pin *pin)
 {
-	u32_t mask = pin->mask;
+	uint32_t mask = pin->mask;
 	Pio *pio = pin->regs;
-	u8_t periph_id = pin->periph_id;
-	u32_t flags = pin->flags;
-	u32_t type = pin->flags & SOC_GPIO_FUNC_MASK;
+	uint8_t periph_id = pin->periph_id;
+	uint32_t flags = pin->flags;
+	uint32_t type = pin->flags & SOC_GPIO_FUNC_MASK;
 
 	/* Configure pin attributes common to all functions */
 	configure_common_attr(pio, mask, flags);
diff --git a/soc/arm/atmel_sam/common/soc_gpio.h b/soc/arm/atmel_sam/common/soc_gpio.h
index f3c57c6d56..72a4a90547 100644
--- a/soc/arm/atmel_sam/common/soc_gpio.h
+++ b/soc/arm/atmel_sam/common/soc_gpio.h
@@ -69,10 +69,10 @@
 #define SOC_GPIO_FUNC_OUT_1             (6 << SOC_GPIO_FUNC_POS)
 
 struct soc_gpio_pin {
-	u32_t mask;     /** pin(s) bit mask */
+	uint32_t mask;     /** pin(s) bit mask */
 	Pio *regs;         /** pointer to registers of the PIO controller */
-	u8_t periph_id; /** peripheral ID of the PIO controller */
-	u32_t flags;    /** pin flags/attributes */
+	uint8_t periph_id; /** peripheral ID of the PIO controller */
+	uint32_t flags;    /** pin flags/attributes */
 };
 
 /**
@@ -147,7 +147,7 @@ static inline void soc_gpio_clear(const struct soc_gpio_pin *pin)
  * @return pin(s) value. To assess value of a specific pin the pin's bit
  * field has to be read.
  */
-static inline u32_t soc_gpio_get(const struct soc_gpio_pin *pin)
+static inline uint32_t soc_gpio_get(const struct soc_gpio_pin *pin)
 {
 	return pin->regs->PIO_PDSR & pin->mask;
 }
@@ -172,7 +172,7 @@ static inline u32_t soc_gpio_get(const struct soc_gpio_pin *pin)
  * @param div  slow clock divider, valid values: from 0 to 2^14 - 1
  */
 static inline void soc_gpio_debounce_length_set(const struct soc_gpio_pin *pin,
-						u32_t div)
+						uint32_t div)
 {
 	pin->regs->PIO_SCDR = PIO_SCDR_DIV(div);
 }
diff --git a/soc/arm/atmel_sam/common/soc_pmc.c b/soc/arm/atmel_sam/common/soc_pmc.c
index 928d33fd17..ead5fa43ed 100644
--- a/soc/arm/atmel_sam/common/soc_pmc.c
+++ b/soc/arm/atmel_sam/common/soc_pmc.c
@@ -16,7 +16,7 @@
 #error "Unsupported SoC, update soc_pmc.c functions"
 #endif
 
-void soc_pmc_peripheral_enable(u32_t id)
+void soc_pmc_peripheral_enable(uint32_t id)
 {
 	__ASSERT(id < ID_PERIPH_COUNT, "Invalid peripheral id");
 
@@ -33,7 +33,7 @@ void soc_pmc_peripheral_enable(u32_t id)
 	}
 }
 
-void soc_pmc_peripheral_disable(u32_t id)
+void soc_pmc_peripheral_disable(uint32_t id)
 {
 	__ASSERT(id < ID_PERIPH_COUNT, "Invalid peripheral id");
 
@@ -50,7 +50,7 @@ void soc_pmc_peripheral_disable(u32_t id)
 	}
 }
 
-u32_t soc_pmc_peripheral_is_enabled(u32_t id)
+uint32_t soc_pmc_peripheral_is_enabled(uint32_t id)
 {
 	__ASSERT(id < ID_PERIPH_COUNT, "Invalid peripheral id");
 
diff --git a/soc/arm/atmel_sam/common/soc_pmc.h b/soc/arm/atmel_sam/common/soc_pmc.h
index c5eef1b86e..8f31e24dbb 100644
--- a/soc/arm/atmel_sam/common/soc_pmc.h
+++ b/soc/arm/atmel_sam/common/soc_pmc.h
@@ -18,14 +18,14 @@
  *
  * @param id   peripheral module id, as defined in data sheet.
  */
-void soc_pmc_peripheral_enable(u32_t id);
+void soc_pmc_peripheral_enable(uint32_t id);
 
 /**
  * @brief Disable the clock of specified peripheral module.
  *
  * @param id   peripheral module id, as defined in data sheet.
  */
-void soc_pmc_peripheral_disable(u32_t id);
+void soc_pmc_peripheral_disable(uint32_t id);
 
 /**
  * @brief Check if specified peripheral module is enabled.
@@ -33,6 +33,6 @@ void soc_pmc_peripheral_disable(u32_t id);
  * @param id   peripheral module id, as defined in data sheet.
  * @return     1 if peripheral is enabled, 0 otherwise
  */
-u32_t soc_pmc_peripheral_is_enabled(u32_t id);
+uint32_t soc_pmc_peripheral_is_enabled(uint32_t id);
 
 #endif /* _ATMEL_SAM_SOC_PMC_H_ */
diff --git a/soc/arm/atmel_sam/sam3x/soc.c b/soc/arm/atmel_sam/sam3x/soc.c
index 7c383d025e..03ffb5aeff 100644
--- a/soc/arm/atmel_sam/sam3x/soc.c
+++ b/soc/arm/atmel_sam/sam3x/soc.c
@@ -43,7 +43,7 @@
  */
 static ALWAYS_INLINE void clock_init(void)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 #ifdef CONFIG_SOC_ATMEL_SAM3X_EXT_SLCK
 	/* Switch slow clock to the external 32 kHz crystal oscillator */
@@ -203,7 +203,7 @@ static ALWAYS_INLINE void clock_init(void)
  */
 static int atmel_sam3x_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/atmel_sam/sam4e/soc.c b/soc/arm/atmel_sam/sam4e/soc.c
index c7226903b3..8d7f032aa2 100644
--- a/soc/arm/atmel_sam/sam4e/soc.c
+++ b/soc/arm/atmel_sam/sam4e/soc.c
@@ -31,7 +31,7 @@
  */
 static ALWAYS_INLINE void clock_init(void)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 #ifdef CONFIG_SOC_ATMEL_SAM4E_EXT_SLCK
 	/* Switch slow clock to the external 32 KHz crystal oscillator. */
@@ -191,7 +191,7 @@ static ALWAYS_INLINE void clock_init(void)
  */
 static int atmel_sam4e_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/atmel_sam/sam4s/soc.c b/soc/arm/atmel_sam/sam4s/soc.c
index cfd29864aa..5e48062073 100644
--- a/soc/arm/atmel_sam/sam4s/soc.c
+++ b/soc/arm/atmel_sam/sam4s/soc.c
@@ -30,7 +30,7 @@
  */
 static ALWAYS_INLINE void clock_init(void)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 #ifdef CONFIG_SOC_ATMEL_SAM4S_EXT_SLCK
 	/* Switch slow clock to the external 32 KHz crystal oscillator. */
@@ -190,7 +190,7 @@ static ALWAYS_INLINE void clock_init(void)
  */
 static int atmel_sam4s_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/atmel_sam/same70/soc.c b/soc/arm/atmel_sam/same70/soc.c
index 62db692e6d..a152114fde 100644
--- a/soc/arm/atmel_sam/same70/soc.c
+++ b/soc/arm/atmel_sam/same70/soc.c
@@ -57,7 +57,7 @@ LOG_MODULE_REGISTER(soc);
  */
 static ALWAYS_INLINE void clock_init(void)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 #ifdef CONFIG_SOC_ATMEL_SAME70_EXT_SLCK
 	/* Switch slow clock to the external 32 kHz crystal oscillator */
@@ -225,7 +225,7 @@ static ALWAYS_INLINE void clock_init(void)
  */
 static int atmel_same70_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -258,7 +258,7 @@ static int atmel_same70_init(struct device *arg)
 	/* Check that the CHIP CIDR matches the HAL one */
 	if (CHIPID->CHIPID_CIDR != CHIP_CIDR) {
 		LOG_WRN("CIDR mismatch: chip = 0x%08x vs HAL = 0x%08x",
-			(u32_t)CHIPID->CHIPID_CIDR, (u32_t)CHIP_CIDR);
+			(uint32_t)CHIPID->CHIPID_CIDR, (uint32_t)CHIP_CIDR);
 	}
 
 	return 0;
diff --git a/soc/arm/atmel_sam/samv71/soc.c b/soc/arm/atmel_sam/samv71/soc.c
index b9ebc55f8b..d0d5a8fd3a 100644
--- a/soc/arm/atmel_sam/samv71/soc.c
+++ b/soc/arm/atmel_sam/samv71/soc.c
@@ -58,7 +58,7 @@ LOG_MODULE_REGISTER(soc);
  */
 static ALWAYS_INLINE void clock_init(void)
 {
-	u32_t reg_val;
+	uint32_t reg_val;
 
 #ifdef CONFIG_SOC_ATMEL_SAMV71_EXT_SLCK
 	/* Switch slow clock to the external 32 kHz crystal oscillator */
@@ -226,7 +226,7 @@ static ALWAYS_INLINE void clock_init(void)
  */
 static int atmel_samv71_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -259,7 +259,7 @@ static int atmel_samv71_init(struct device *arg)
 	/* Check that the CHIP CIDR matches the HAL one */
 	if (CHIPID->CHIPID_CIDR != CHIP_CIDR) {
 		LOG_WRN("CIDR mismatch: chip = 0x%08x vs HAL = 0x%08x",
-			(u32_t)CHIPID->CHIPID_CIDR, (u32_t)CHIP_CIDR);
+			(uint32_t)CHIPID->CHIPID_CIDR, (uint32_t)CHIP_CIDR);
 	}
 
 	return 0;
diff --git a/soc/arm/atmel_sam0/common/soc_samd2x.c b/soc/arm/atmel_sam0/common/soc_samd2x.c
index 56356d3fcf..89dca11380 100644
--- a/soc/arm/atmel_sam0/common/soc_samd2x.c
+++ b/soc/arm/atmel_sam0/common/soc_samd2x.c
@@ -56,11 +56,11 @@ static void xosc32k_init(void)
 static void osc32k_init(void)
 {
 #ifdef FUSES_OSC32K_CAL_ADDR
-	u32_t fuse = *(u32_t *)FUSES_OSC32K_CAL_ADDR;
-	u32_t calib = (fuse & FUSES_OSC32K_CAL_Msk) >> FUSES_OSC32K_CAL_Pos;
+	uint32_t fuse = *(uint32_t *)FUSES_OSC32K_CAL_ADDR;
+	uint32_t calib = (fuse & FUSES_OSC32K_CAL_Msk) >> FUSES_OSC32K_CAL_Pos;
 #else
-	u32_t fuse = *(u32_t *)FUSES_OSC32KCAL_ADDR;
-	u32_t calib = (fuse & FUSES_OSC32KCAL_Msk) >> FUSES_OSC32KCAL_Pos;
+	uint32_t fuse = *(uint32_t *)FUSES_OSC32KCAL_ADDR;
+	uint32_t calib = (fuse & FUSES_OSC32KCAL_Msk) >> FUSES_OSC32KCAL_Pos;
 #endif
 
 	SYSCTRL->OSC32K.reg = SYSCTRL_OSC32K_CALIB(calib) |
@@ -102,7 +102,7 @@ static void dfll_init(void)
 	while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
 	}
 
-	u32_t mul = (SOC_ATMEL_SAM0_MCK_FREQ_HZ +
+	uint32_t mul = (SOC_ATMEL_SAM0_MCK_FREQ_HZ +
 		     SOC_ATMEL_SAM0_GCLK1_FREQ_HZ / 2) /
 		    SOC_ATMEL_SAM0_GCLK1_FREQ_HZ;
 
@@ -174,7 +174,7 @@ static void dividers_init(void)
 
 static int atmel_samd_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/atmel_sam0/common/soc_samd5x.c b/soc/arm/atmel_sam0/common/soc_samd5x.c
index f61bc43be2..53ecaa9b77 100644
--- a/soc/arm/atmel_sam0/common/soc_samd5x.c
+++ b/soc/arm/atmel_sam0/common/soc_samd5x.c
@@ -43,10 +43,10 @@ static void osc32k_init(void)
 #error "No Clock Source selected."
 #endif
 
-static void dpll_init(u8_t n, u32_t f_cpu)
+static void dpll_init(uint8_t n, uint32_t f_cpu)
 {
 	/* We source the DPLL from 32kHz GCLK1 */
-	const u32_t LDR = ((f_cpu << 5) / SOC_ATMEL_SAM0_OSC32K_FREQ_HZ);
+	const uint32_t LDR = ((f_cpu << 5) / SOC_ATMEL_SAM0_OSC32K_FREQ_HZ);
 
 	/* disable the DPLL before changing the configuration */
 	OSCCTRL->Dpll[n].DPLLCTRLA.bit.ENABLE = 0;
@@ -78,7 +78,7 @@ static void dpll_init(u8_t n, u32_t f_cpu)
 
 static void dfll_init(void)
 {
-	u32_t reg = OSCCTRL_DFLLCTRLB_QLDIS
+	uint32_t reg = OSCCTRL_DFLLCTRLB_QLDIS
 #ifdef OSCCTRL_DFLLCTRLB_WAITLOCK
 		     | OSCCTRL_DFLLCTRLB_WAITLOCK
 #endif
@@ -91,7 +91,7 @@ static void dfll_init(void)
 	}
 }
 
-static void gclk_connect(u8_t gclk, u8_t src, u8_t div)
+static void gclk_connect(uint8_t gclk, uint8_t src, uint8_t div)
 {
 	GCLK->GENCTRL[gclk].reg = GCLK_GENCTRL_SRC(src)
 				| GCLK_GENCTRL_DIV(div)
@@ -100,8 +100,8 @@ static void gclk_connect(u8_t gclk, u8_t src, u8_t div)
 
 static int atmel_samd_init(struct device *arg)
 {
-	u32_t key;
-	u8_t dfll_div;
+	uint32_t key;
+	uint8_t dfll_div;
 
 	if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC < SAM0_DFLL_FREQ_HZ) {
 		dfll_div = 3;
diff --git a/soc/arm/bcm_vk/valkyrie/soc.c b/soc/arm/bcm_vk/valkyrie/soc.c
index 5e8542e140..7a2e39147a 100644
--- a/soc/arm/bcm_vk/valkyrie/soc.c
+++ b/soc/arm/bcm_vk/valkyrie/soc.c
@@ -18,7 +18,7 @@
  */
 static int valkyrie_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/bcm_vk/viper/soc.c b/soc/arm/bcm_vk/viper/soc.c
index f2c88621bc..e6903d73bd 100644
--- a/soc/arm/bcm_vk/viper/soc.c
+++ b/soc/arm/bcm_vk/viper/soc.c
@@ -19,7 +19,7 @@
  */
 static int viper_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/infineon_xmc/4xxx/soc.c b/soc/arm/infineon_xmc/4xxx/soc.c
index fe4015a63c..4fee581ac3 100644
--- a/soc/arm/infineon_xmc/4xxx/soc.c
+++ b/soc/arm/infineon_xmc/4xxx/soc.c
@@ -14,7 +14,7 @@
 
 void z_platform_init(void)
 {
-	u32_t temp;
+	uint32_t temp;
 
 	/* setup flash wait state */
 	temp = FLASH0->FCON;
diff --git a/soc/arm/microchip_mec/mec1501/device_power.c b/soc/arm/microchip_mec/mec1501/device_power.c
index 970a9a4cb9..cbf66869d2 100644
--- a/soc/arm/microchip_mec/mec1501/device_power.c
+++ b/soc/arm/microchip_mec/mec1501/device_power.c
@@ -65,7 +65,7 @@ void soc_deep_sleep_disable(void)
 void soc_deep_sleep_wait_clk_idle(void)
 {
 #ifdef DEEP_SLEEP_WAIT_ON_CLK_REQ_ENABLE
-	u32_t clkreq, cnt;
+	uint32_t clkreq, cnt;
 
 	cnt = DEEP_SLEEP_WAIT_CLK_REQ;
 	do {
@@ -105,7 +105,7 @@ void soc_deep_sleep_non_wake_dis(void)
 /* Variables used to save various HW state */
 #ifdef DEEP_SLEEP_PERIPH_SAVE_RESTORE
 
-static u32_t ecs[1];
+static uint32_t ecs[1];
 
 static void deep_sleep_save_ecs(void)
 {
@@ -115,7 +115,7 @@ static void deep_sleep_save_ecs(void)
 
 struct ds_timer_info {
 	uintptr_t addr;
-	u32_t restore_mask;
+	uint32_t restore_mask;
 };
 
 const struct ds_timer_info ds_timer_tbl[] = {
@@ -140,8 +140,8 @@ const struct ds_timer_info ds_timer_tbl[] = {
 	(sizeof(ds_timer_tbl) / sizeof(struct ds_timer_info))
 
 
-static u32_t timers[NUM_DS_TIMER_ENTRIES];
-static u8_t uart_activate[3];
+static uint32_t timers[NUM_DS_TIMER_ENTRIES];
+static uint8_t uart_activate[3];
 
 static void deep_sleep_save_uarts(void)
 {
@@ -168,7 +168,7 @@ static void deep_sleep_save_uarts(void)
 static void deep_sleep_save_timers(void)
 {
 	const struct ds_timer_info *p;
-	u32_t i;
+	uint32_t i;
 
 	p = &ds_timer_tbl[0];
 	for (i = 0; i < NUM_DS_TIMER_ENTRIES; i++) {
@@ -193,7 +193,7 @@ static void deep_sleep_restore_uarts(void)
 static void deep_sleep_restore_timers(void)
 {
 	const struct ds_timer_info *p;
-	u32_t i;
+	uint32_t i;
 
 	p = &ds_timer_tbl[0];
 	for (i = 0; i < NUM_DS_TIMER_ENTRIES; i++) {
diff --git a/soc/arm/microchip_mec/mec1501/power.c b/soc/arm/microchip_mec/mec1501/power.c
index b2821ff435..ad2e48bb1d 100644
--- a/soc/arm/microchip_mec/mec1501/power.c
+++ b/soc/arm/microchip_mec/mec1501/power.c
@@ -103,7 +103,7 @@ static void z_power_soc_sleep(void)
 #endif
 
 /*
- * Called from _sys_suspend(s32_t ticks) in subsys/power.c
+ * Called from _sys_suspend(int32_t ticks) in subsys/power.c
  * For deep sleep _sys_suspend has executed all the driver
  * power management call backs.
  */
diff --git a/soc/arm/microchip_mec/mec1501/soc.c b/soc/arm/microchip_mec/mec1501/soc.c
index a603fdb1d9..8ccf2b4870 100644
--- a/soc/arm/microchip_mec/mec1501/soc.c
+++ b/soc/arm/microchip_mec/mec1501/soc.c
@@ -46,12 +46,12 @@ static int soc_pcr_init(void)
  *   connected to the VBAT power rail. If using a battery one can
  *   check the VBAT Power Fail and Reset Status register for a VBAT POR.
  */
-static void clk32_change(u8_t new_clk32)
+static void clk32_change(uint8_t new_clk32)
 {
 	new_clk32 &= MCHP_VBATR_CLKEN_MASK;
 
 	if ((VBATR_REGS->CLK32_EN & MCHP_VBATR_CLKEN_MASK)
-		== (u32_t)new_clk32) {
+		== (uint32_t)new_clk32) {
 		return;
 	}
 
@@ -70,7 +70,7 @@ static void clk32_change(u8_t new_clk32)
 
 static int soc_clk32_init(void)
 {
-	u8_t new_clk32;
+	uint8_t new_clk32;
 
 #ifdef CONFIG_SOC_MEC1501_EXT_32K
   #ifdef CONFIG_SOC_MEC1501_EXT_32K_CRYSTAL
@@ -104,7 +104,7 @@ static int soc_clk32_init(void)
 static int soc_ecia_init(void)
 {
 	GIRQ_Type *pg;
-	u32_t n;
+	uint32_t n;
 
 	mchp_pcr_periph_slp_ctrl(PCR_ECIA, MCHP_PCR_SLEEP_DIS);
 
@@ -134,7 +134,7 @@ static int soc_ecia_init(void)
 
 static int soc_init(struct device *dev)
 {
-	u32_t isave;
+	uint32_t isave;
 
 	ARG_UNUSED(dev);
 
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
index 87f8d5bf28..b05ad00d82 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.c
+++ b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -40,7 +40,7 @@ void sys_arch_reboot(int type)
 
 static int nordicsemi_nrf51_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -58,7 +58,7 @@ static int nordicsemi_nrf51_init(struct device *arg)
 
 #define DELAY_CALL_OVERHEAD_US 2
 
-void arch_busy_wait(u32_t time_us)
+void arch_busy_wait(uint32_t time_us)
 {
 	if (time_us <= DELAY_CALL_OVERHEAD_US) {
 		return;
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
index 005ea2ffbb..2701ca599b 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.c
+++ b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -55,7 +55,7 @@ void sys_arch_reboot(int type)
 
 static int nordicsemi_nrf52_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -80,7 +80,7 @@ static int nordicsemi_nrf52_init(struct device *arg)
 	return 0;
 }
 
-void arch_busy_wait(u32_t time_us)
+void arch_busy_wait(uint32_t time_us)
 {
 	nrfx_coredep_delay_us(time_us);
 }
diff --git a/soc/arm/nordic_nrf/nrf53/soc.c b/soc/arm/nordic_nrf/nrf53/soc.c
index 64bd585c52..905558a3dc 100644
--- a/soc/arm/nordic_nrf/nrf53/soc.c
+++ b/soc/arm/nordic_nrf/nrf53/soc.c
@@ -38,7 +38,7 @@ LOG_MODULE_REGISTER(soc);
 
 static int nordicsemi_nrf53_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -56,7 +56,7 @@ static int nordicsemi_nrf53_init(struct device *arg)
 
 #if defined(CONFIG_SOC_NRF5340_CPUAPP) && \
 	!defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	*((u32_t *)0x500046D0) = 0x1;
+	*((uint32_t *)0x500046D0) = 0x1;
 #endif
 
 #if defined(CONFIG_SOC_DCDC_NRF53X_APP)
@@ -79,7 +79,7 @@ static int nordicsemi_nrf53_init(struct device *arg)
 	return 0;
 }
 
-void arch_busy_wait(u32_t time_us)
+void arch_busy_wait(uint32_t time_us)
 {
 	nrfx_coredep_delay_us(time_us);
 }
diff --git a/soc/arm/nordic_nrf/nrf91/soc.c b/soc/arm/nordic_nrf/nrf91/soc.c
index f2ff3735fc..ac239dcced 100644
--- a/soc/arm/nordic_nrf/nrf91/soc.c
+++ b/soc/arm/nordic_nrf/nrf91/soc.c
@@ -36,7 +36,7 @@ LOG_MODULE_REGISTER(soc);
 
 static int nordicsemi_nrf91_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
@@ -57,7 +57,7 @@ static int nordicsemi_nrf91_init(struct device *arg)
 	return 0;
 }
 
-void arch_busy_wait(u32_t time_us)
+void arch_busy_wait(uint32_t time_us)
 {
 	nrfx_coredep_delay_us(time_us);
 }
diff --git a/soc/arm/nordic_nrf/validate_base_addresses.c b/soc/arm/nordic_nrf/validate_base_addresses.c
index 41392a9e82..df9d7a232a 100644
--- a/soc/arm/nordic_nrf/validate_base_addresses.c
+++ b/soc/arm/nordic_nrf/validate_base_addresses.c
@@ -44,7 +44,7 @@
 #define CHECK_DT_REG(lbl, mdk_addr)					\
 	BUILD_ASSERT(							\
 		UTIL_OR(UTIL_NOT(DT_NODE_EXISTS(DT_NODELABEL(lbl))),	\
-			(DT_REG_ADDR(DT_NODELABEL(lbl)) == (u32_t)(mdk_addr))))
+			(DT_REG_ADDR(DT_NODELABEL(lbl)) == (uint32_t)(mdk_addr))))
 
 /**
  * If a node label "lbl" might have different addresses depending on
diff --git a/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.c b/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.c
index 18d9cfb977..599f20d172 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.c
+++ b/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.c
@@ -9,13 +9,13 @@
 #include "soc_clk_freq.h"
 
 #ifdef CONFIG_PWM_IMX
-u32_t get_pwm_clock_freq(PWM_Type *base)
+uint32_t get_pwm_clock_freq(PWM_Type *base)
 {
-	u32_t root;
-	u32_t hz;
-	u32_t pre, post;
+	uint32_t root;
+	uint32_t hz;
+	uint32_t pre, post;
 
-	switch ((u32_t)base) {
+	switch ((uint32_t)base) {
 	case PWM1_BASE:
 		root = CCM_GetRootMux(CCM, ccmRootPwm1);
 		CCM_GetRootDivider(CCM, ccmRootPwm1, &pre, &post);
diff --git a/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.h b/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.h
index e19cbb68ca..6b663a6c44 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.h
+++ b/soc/arm/nxp_imx/mcimx7_m4/soc_clk_freq.h
@@ -21,7 +21,7 @@ extern "C" {
  * @param base PWM base pointer.
  * @return clock frequency (in HZ) applies to the PWM module
  */
-u32_t get_pwm_clock_freq(PWM_Type *base);
+uint32_t get_pwm_clock_freq(PWM_Type *base);
 #endif /* CONFIG_PWM_IMX */
 
 #if defined(__cplusplus)
@@ -30,10 +30,10 @@ u32_t get_pwm_clock_freq(PWM_Type *base);
 
 /*! @brief Root control names for root clock setting. */
 enum _ccm_root_control_extra {
-	ccmRootPwm1   = (u32_t)(&CCM_TARGET_ROOT106),
-	ccmRootPwm2   = (u32_t)(&CCM_TARGET_ROOT107),
-	ccmRootPwm3   = (u32_t)(&CCM_TARGET_ROOT108),
-	ccmRootPwm4   = (u32_t)(&CCM_TARGET_ROOT109),
+	ccmRootPwm1   = (uint32_t)(&CCM_TARGET_ROOT106),
+	ccmRootPwm2   = (uint32_t)(&CCM_TARGET_ROOT107),
+	ccmRootPwm3   = (uint32_t)(&CCM_TARGET_ROOT108),
+	ccmRootPwm4   = (uint32_t)(&CCM_TARGET_ROOT109),
 };
 
 /*! @brief Clock source enumeration for PWM peripheral. */
@@ -50,9 +50,9 @@ enum _ccm_rootmux_pwm {
 
 /*! @brief CCM CCGR gate control. */
 enum _ccm_ccgr_gate_extra {
-	ccmCcgrGatePwm1      = (u32_t)(&CCM_CCGR132),
-	ccmCcgrGatePwm2      = (u32_t)(&CCM_CCGR133),
-	ccmCcgrGatePwm3      = (u32_t)(&CCM_CCGR134),
-	ccmCcgrGatePwm4      = (u32_t)(&CCM_CCGR135),
+	ccmCcgrGatePwm1      = (uint32_t)(&CCM_CCGR132),
+	ccmCcgrGatePwm2      = (uint32_t)(&CCM_CCGR133),
+	ccmCcgrGatePwm3      = (uint32_t)(&CCM_CCGR134),
+	ccmCcgrGatePwm4      = (uint32_t)(&CCM_CCGR135),
 };
 #endif /* __SOC_CLOCK_FREQ_H__ */
diff --git a/soc/arm/nxp_imx/rt/soc.c b/soc/arm/nxp_imx/rt/soc.c
index 9b25405ea2..060087d44a 100644
--- a/soc/arm/nxp_imx/rt/soc.c
+++ b/soc/arm/nxp_imx/rt/soc.c
@@ -234,8 +234,8 @@ void imxrt_usdhc_pinmux_cb_register(usdhc_pin_cfg_cb cb)
 	g_usdhc_pin_cfg_cb = cb;
 }
 
-void imxrt_usdhc_pinmux(u16_t nusdhc, bool init,
-	u32_t speed, u32_t strength)
+void imxrt_usdhc_pinmux(uint16_t nusdhc, bool init,
+	uint32_t speed, uint32_t strength)
 {
 	if (g_usdhc_pin_cfg_cb)
 		g_usdhc_pin_cfg_cb(nusdhc, init,
diff --git a/soc/arm/nxp_imx/rt/soc.h b/soc/arm/nxp_imx/rt/soc.h
index e25b8722a8..d2abc7920a 100644
--- a/soc/arm/nxp_imx/rt/soc.h
+++ b/soc/arm/nxp_imx/rt/soc.h
@@ -23,11 +23,11 @@ extern "C" {
 #if defined(CONFIG_DISK_ACCESS_USDHC1) ||	\
 	defined(CONFIG_DISK_ACCESS_USDHC2)
 
-typedef void (*usdhc_pin_cfg_cb)(u16_t nusdhc, bool init,
-	u32_t speed, u32_t strength);
+typedef void (*usdhc_pin_cfg_cb)(uint16_t nusdhc, bool init,
+	uint32_t speed, uint32_t strength);
 
-void imxrt_usdhc_pinmux(u16_t nusdhc,
-	bool init, u32_t speed, u32_t strength);
+void imxrt_usdhc_pinmux(uint16_t nusdhc,
+	bool init, uint32_t speed, uint32_t strength);
 
 void imxrt_usdhc_pinmux_cb_register(usdhc_pin_cfg_cb cb);
 
diff --git a/soc/arm/nxp_kinetis/flash_configuration.c b/soc/arm/nxp_kinetis/flash_configuration.c
index 0ed9cb1097..31faab03df 100644
--- a/soc/arm/nxp_kinetis/flash_configuration.c
+++ b/soc/arm/nxp_kinetis/flash_configuration.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <linker/sections.h>
 
-u8_t __kinetis_flash_config_section __kinetis_flash_config[] = {
+uint8_t __kinetis_flash_config_section __kinetis_flash_config[] = {
 	/* Backdoor Comparison Key (unused) */
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 
diff --git a/soc/arm/nxp_kinetis/k2x/soc.c b/soc/arm/nxp_kinetis/k2x/soc.c
index 3379c389d0..9320e211a8 100644
--- a/soc/arm/nxp_kinetis/k2x/soc.c
+++ b/soc/arm/nxp_kinetis/k2x/soc.c
@@ -127,7 +127,7 @@ static int fsl_frdm_k22f_init(struct device *arg)
 	unsigned int oldLevel; /* old interrupt lock level */
 #if !defined(CONFIG_ARM_MPU)
 #if defined(SYSMPU)
-	u32_t temp_reg;
+	uint32_t temp_reg;
 #endif
 #endif /* !CONFIG_ARM_MPU */
 
diff --git a/soc/arm/nxp_kinetis/k6x/soc.c b/soc/arm/nxp_kinetis/k6x/soc.c
index a463a81829..e410e483ef 100644
--- a/soc/arm/nxp_kinetis/k6x/soc.c
+++ b/soc/arm/nxp_kinetis/k6x/soc.c
@@ -126,7 +126,7 @@ static int k6x_init(struct device *arg)
 
 	unsigned int oldLevel; /* old interrupt lock level */
 #if !defined(CONFIG_ARM_MPU)
-	u32_t temp_reg;
+	uint32_t temp_reg;
 #endif /* !CONFIG_ARM_MPU */
 
 	/* disable interrupts */
diff --git a/soc/arm/nxp_kinetis/k8x/soc.c b/soc/arm/nxp_kinetis/k8x/soc.c
index 9f0d458da4..1697c9e3d8 100644
--- a/soc/arm/nxp_kinetis/k8x/soc.c
+++ b/soc/arm/nxp_kinetis/k8x/soc.c
@@ -101,7 +101,7 @@ static int k8x_init(struct device *arg)
 
 	unsigned int old_level; /* old interrupt lock level */
 #if !defined(CONFIG_ARM_MPU)
-	u32_t temp_reg;
+	uint32_t temp_reg;
 #endif /* !CONFIG_ARM_MPU */
 
 	/* Disable interrupts */
diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c
index 24ba6b158a..da52392479 100644
--- a/soc/arm/nxp_kinetis/ke1xf/soc.c
+++ b/soc/arm/nxp_kinetis/ke1xf/soc.c
@@ -228,7 +228,7 @@ static int ke1xf_init(struct device *arg)
 
 	unsigned int old_level; /* old interrupt lock level */
 #if !defined(CONFIG_ARM_MPU)
-	u32_t temp_reg;
+	uint32_t temp_reg;
 #endif /* !CONFIG_ARM_MPU */
 
 	/* Disable interrupts */
diff --git a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
index ba35c75dce..96c6e5a976 100644
--- a/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
+++ b/soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
@@ -46,7 +46,7 @@ static const sim_clock_config_t simConfig = {
  */
 static void CLOCK_SYS_FllStableDelay(void)
 {
-	u32_t i = 30000U;
+	uint32_t i = 30000U;
 	while (i--) {
 		__NOP();
 	}
diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.c b/soc/arm/nxp_lpc/lpc54xxx/soc.c
index eea67f9fe6..5df9426c4f 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/soc.c
+++ b/soc/arm/nxp_lpc/lpc54xxx/soc.c
@@ -147,7 +147,7 @@ static const char core_m0[] = {
 /* This function is also called at deep sleep resume. */
 int _slave_init(struct device *arg)
 {
-	s32_t temp;
+	int32_t temp;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f0/soc.c b/soc/arm/st_stm32/stm32f0/soc.c
index 71c28b0d5d..23ca8fe52a 100644
--- a/soc/arm/st_stm32/stm32f0/soc.c
+++ b/soc/arm/st_stm32/stm32f0/soc.c
@@ -56,7 +56,7 @@ void relocate_vector_table(void)
  */
 static int stm32f0_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f1/soc.c b/soc/arm/st_stm32/stm32f1/soc.c
index b5740cef95..c7ffd03418 100644
--- a/soc/arm/st_stm32/stm32f1/soc.c
+++ b/soc/arm/st_stm32/stm32f1/soc.c
@@ -24,7 +24,7 @@
  */
 static int stm32f1_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f2/soc.c b/soc/arm/st_stm32/stm32f2/soc.c
index 75167d145b..f238ebc71b 100644
--- a/soc/arm/st_stm32/stm32f2/soc.c
+++ b/soc/arm/st_stm32/stm32f2/soc.c
@@ -28,7 +28,7 @@
  */
 static int stm32f2_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f3/soc.c b/soc/arm/st_stm32/stm32f3/soc.c
index 5fca00e19b..fa1d116b74 100644
--- a/soc/arm/st_stm32/stm32f3/soc.c
+++ b/soc/arm/st_stm32/stm32f3/soc.c
@@ -24,7 +24,7 @@
  */
 static int stm32f3_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f4/soc.c b/soc/arm/st_stm32/stm32f4/soc.c
index f98e1a09e5..0a2f3e8e9f 100644
--- a/soc/arm/st_stm32/stm32f4/soc.c
+++ b/soc/arm/st_stm32/stm32f4/soc.c
@@ -25,7 +25,7 @@
  */
 static int st_stm32f4_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32f7/soc.c b/soc/arm/st_stm32/stm32f7/soc.c
index f6c2e41e25..0b39fbbb04 100644
--- a/soc/arm/st_stm32/stm32f7/soc.c
+++ b/soc/arm/st_stm32/stm32f7/soc.c
@@ -26,7 +26,7 @@
  */
 static int st_stm32f7_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32g0/soc.c b/soc/arm/st_stm32/stm32g0/soc.c
index ee8a176dcc..354f602fd2 100644
--- a/soc/arm/st_stm32/stm32g0/soc.c
+++ b/soc/arm/st_stm32/stm32g0/soc.c
@@ -27,7 +27,7 @@
  */
 static int stm32g0_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32g4/soc.c b/soc/arm/st_stm32/stm32g4/soc.c
index c22457a0ac..906e489323 100644
--- a/soc/arm/st_stm32/stm32g4/soc.c
+++ b/soc/arm/st_stm32/stm32g4/soc.c
@@ -24,7 +24,7 @@
  */
 static int stm32g4_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32h7/soc_m4.c b/soc/arm/st_stm32/stm32h7/soc_m4.c
index e7be63b713..85a70eae32 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m4.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m4.c
@@ -61,7 +61,7 @@ void stm32h7_m4_boot_stop(void)
  */
 static int stm32h7_m4_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	key = irq_lock();
 
diff --git a/soc/arm/st_stm32/stm32h7/soc_m7.c b/soc/arm/st_stm32/stm32h7/soc_m7.c
index 3486473fb3..3cbf1203a2 100644
--- a/soc/arm/st_stm32/stm32h7/soc_m7.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m7.c
@@ -62,7 +62,7 @@ static int stm32h7_m4_wakeup(struct device *arg)
  */
 static int stm32h7_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32l0/soc.c b/soc/arm/st_stm32/stm32l0/soc.c
index c4fa72db1b..afde0b6fbe 100644
--- a/soc/arm/st_stm32/stm32l0/soc.c
+++ b/soc/arm/st_stm32/stm32l0/soc.c
@@ -26,7 +26,7 @@
  */
 static int stm32l0_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32l1/soc.c b/soc/arm/st_stm32/stm32l1/soc.c
index 257889a15b..77b30dde26 100644
--- a/soc/arm/st_stm32/stm32l1/soc.c
+++ b/soc/arm/st_stm32/stm32l1/soc.c
@@ -26,7 +26,7 @@
  */
 static int stm32l1_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32l4/soc.c b/soc/arm/st_stm32/stm32l4/soc.c
index e23f8ae2a8..833dca7352 100644
--- a/soc/arm/st_stm32/stm32l4/soc.c
+++ b/soc/arm/st_stm32/stm32l4/soc.c
@@ -25,7 +25,7 @@
  */
 static int stm32l4_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32l5/soc.c b/soc/arm/st_stm32/stm32l5/soc.c
index a2a766f8d0..68cce1005b 100644
--- a/soc/arm/st_stm32/stm32l5/soc.c
+++ b/soc/arm/st_stm32/stm32l5/soc.c
@@ -24,7 +24,7 @@
  */
 static int stm32l5_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32mp1/soc.c b/soc/arm/st_stm32/stm32mp1/soc.c
index aea44c654d..2ff68bc2bb 100644
--- a/soc/arm/st_stm32/stm32mp1/soc.c
+++ b/soc/arm/st_stm32/stm32mp1/soc.c
@@ -26,7 +26,7 @@
  */
 static int stm32m4_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/st_stm32/stm32wb/soc.c b/soc/arm/st_stm32/stm32wb/soc.c
index 1609889455..c8fb3c5ffe 100644
--- a/soc/arm/st_stm32/stm32wb/soc.c
+++ b/soc/arm/st_stm32/stm32wb/soc.c
@@ -24,7 +24,7 @@
  */
 static int stm32wb_init(struct device *arg)
 {
-	u32_t key;
+	uint32_t key;
 
 	ARG_UNUSED(arg);
 
diff --git a/soc/arm/ti_lm3s6965/soc_config.c b/soc/arm/ti_lm3s6965/soc_config.c
index 4743bfd177..e23267b4ff 100644
--- a/soc/arm/ti_lm3s6965/soc_config.c
+++ b/soc/arm/ti_lm3s6965/soc_config.c
@@ -18,7 +18,7 @@
 #ifdef CONFIG_UART_STELLARIS
 #include <drivers/uart.h>
 
-#define RCGC1 (*((volatile u32_t *)0x400FE104))
+#define RCGC1 (*((volatile uint32_t *)0x400FE104))
 
 #define RCGC1_UART0_EN 0x00000001
 #define RCGC1_UART1_EN 0x00000002
@@ -47,7 +47,7 @@ SYS_INIT(uart_stellaris_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
 
 #ifdef CONFIG_ETH_STELLARIS
 
-#define RCGC2 (*((volatile u32_t *)0x400FE108))
+#define RCGC2 (*((volatile uint32_t *)0x400FE108))
 
 #define RCGC2_PHY_EN   0x40000000
 #define RCGC2_EMAC_EN  0x10000000
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
index 513ff564c7..2d9dacf09e 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/power.c
@@ -48,8 +48,8 @@ extern PowerCC26X2_ModuleState PowerCC26X2_module;
 void sys_set_power_state(enum power_states state)
 {
 #ifdef CONFIG_SYS_POWER_SLEEP_STATES
-	u32_t modeVIMS;
-	u32_t constraints;
+	uint32_t modeVIMS;
+	uint32_t constraints;
 #endif
 
 	LOG_DBG("SoC entering power state %d", state);
@@ -147,7 +147,7 @@ static int power_initialize(struct device *dev)
 static int unlatch_pins(struct device *dev)
 {
 	/* Get the reason for reset. */
-	u32_t rSrc = SysCtrlResetSourceGet();
+	uint32_t rSrc = SysCtrlResetSourceGet();
 
 	if (rSrc == RSTSRC_WAKEUP_FROM_SHUTDOWN) {
 		PowerCtrlPadSleepDisable();
diff --git a/soc/arm/ti_simplelink/cc32xx/soc.h b/soc/arm/ti_simplelink/cc32xx/soc.h
index 1300b70e48..9c841e0e4b 100644
--- a/soc/arm/ti_simplelink/cc32xx/soc.h
+++ b/soc/arm/ti_simplelink/cc32xx/soc.h
@@ -17,7 +17,7 @@
  * the ARM compiler from sign extending IRQn_Type values higher than 0x80
  * into negative IRQ values, which causes hard-to-debug Hard Faults.
  */
-typedef u32_t IRQn_Type;
+typedef uint32_t IRQn_Type;
 
 /* Need to keep the remaining from cmsis.h, as Zephyr expects these. */
 typedef enum {
diff --git a/soc/posix/inf_clock/posix_board_if.h b/soc/posix/inf_clock/posix_board_if.h
index 2d47e7b25a..0e4e118fde 100644
--- a/soc/posix/inf_clock/posix_board_if.h
+++ b/soc/posix/inf_clock/posix_board_if.h
@@ -23,7 +23,7 @@ extern "C" {
 
 void posix_irq_handler(void);
 void posix_exit(int exit_code);
-u64_t posix_get_hw_cycle(void);
+uint64_t posix_get_hw_cycle(void);
 
 #ifdef __cplusplus
 }
diff --git a/soc/riscv/litex-vexriscv/soc.h b/soc/riscv/litex-vexriscv/soc.h
index 04b900c896..035779c7c4 100644
--- a/soc/riscv/litex-vexriscv/soc.h
+++ b/soc/riscv/litex-vexriscv/soc.h
@@ -36,16 +36,16 @@ static inline unsigned int litex_read32(unsigned long addr)
 		| sys_read8(addr + 0xc);
 }
 
-static inline u64_t litex_read64(unsigned long addr)
+static inline uint64_t litex_read64(unsigned long addr)
 {
-	return (((u64_t)sys_read8(addr)) << 56)
-		| ((u64_t)sys_read8(addr + 0x4) << 48)
-		| ((u64_t)sys_read8(addr + 0x8) << 40)
-		| ((u64_t)sys_read8(addr + 0xc) << 32)
-		| ((u64_t)sys_read8(addr + 0x10) << 24)
-		| ((u64_t)sys_read8(addr + 0x14) << 16)
-		| ((u64_t)sys_read8(addr + 0x18) << 8)
-		| (u64_t)sys_read8(addr + 0x1c);
+	return (((uint64_t)sys_read8(addr)) << 56)
+		| ((uint64_t)sys_read8(addr + 0x4) << 48)
+		| ((uint64_t)sys_read8(addr + 0x8) << 40)
+		| ((uint64_t)sys_read8(addr + 0xc) << 32)
+		| ((uint64_t)sys_read8(addr + 0x10) << 24)
+		| ((uint64_t)sys_read8(addr + 0x14) << 16)
+		| ((uint64_t)sys_read8(addr + 0x18) << 8)
+		| (uint64_t)sys_read8(addr + 0x1c);
 }
 
 static inline void litex_write8(unsigned char value, unsigned long addr)
@@ -68,29 +68,29 @@ static inline void litex_write32(unsigned int value, unsigned long addr)
 }
 
 /* `reg_size` is assumed to be a multiple of 4 */
-static inline void litex_write(volatile u32_t *reg, u32_t reg_size, u32_t val)
+static inline void litex_write(volatile uint32_t *reg, uint32_t reg_size, uint32_t val)
 {
-	u32_t shifted_data;
-	volatile u32_t *reg_addr;
-	u32_t subregs = reg_size / 4;
+	uint32_t shifted_data;
+	volatile uint32_t *reg_addr;
+	uint32_t subregs = reg_size / 4;
 
 	for (int i = 0; i < subregs; ++i) {
 		shifted_data = val >> ((subregs - i - 1) * 8);
-		reg_addr = ((volatile u32_t *) reg) + i;
+		reg_addr = ((volatile uint32_t *) reg) + i;
 		*(reg_addr) = shifted_data;
 	}
 }
 
 /* `reg_size` is assumed to be a multiple of 4 */
-static inline u32_t litex_read(volatile u32_t *reg, u32_t reg_size)
+static inline uint32_t litex_read(volatile uint32_t *reg, uint32_t reg_size)
 {
-	u32_t shifted_data;
-	volatile u32_t *reg_addr;
-	u32_t result = 0;
-	u32_t subregs = reg_size / 4;
+	uint32_t shifted_data;
+	volatile uint32_t *reg_addr;
+	uint32_t result = 0;
+	uint32_t subregs = reg_size / 4;
 
 	for (int i = 0; i < subregs; ++i) {
-		reg_addr = ((volatile u32_t *) reg) + i;
+		reg_addr = ((volatile uint32_t *) reg) + i;
 		shifted_data = *(reg_addr);
 		result |= (shifted_data << ((subregs - i - 1) * 8));
 	}
diff --git a/soc/riscv/openisa_rv32m1/soc.c b/soc/riscv/openisa_rv32m1/soc.c
index e0d818692b..c21336864e 100644
--- a/soc/riscv/openisa_rv32m1/soc.c
+++ b/soc/riscv/openisa_rv32m1/soc.c
@@ -111,7 +111,7 @@ int arch_irq_is_enabled(unsigned int irq)
 			return (EVENT_UNIT->INTPTEN &
 				BIT(rv32m1_level1_irq(irq))) != 0;
 		} else {
-			u32_t channel, line, ier;
+			uint32_t channel, line, ier;
 
 			/*
 			 * Here we break the abstraction and look
diff --git a/soc/riscv/openisa_rv32m1/soc.h b/soc/riscv/openisa_rv32m1/soc.h
index 5a10ff6c31..22fd2147e0 100644
--- a/soc/riscv/openisa_rv32m1/soc.h
+++ b/soc/riscv/openisa_rv32m1/soc.h
@@ -45,7 +45,7 @@ static inline unsigned int rv32m1_irq_level(unsigned int irq)
  * @param The IRQ number in the Zephyr <irq.h> numbering system
  * @return Level 1 (i.e. event unit) IRQ number associated with irq
  */
-static inline u32_t rv32m1_level1_irq(unsigned int irq)
+static inline uint32_t rv32m1_level1_irq(unsigned int irq)
 {
 	/*
 	 * There's no need to do any math; the precondition is that
@@ -63,7 +63,7 @@ static inline u32_t rv32m1_level1_irq(unsigned int irq)
  *            to get, in the Zephyr <irq.h> numbering system
  * @return INTMUX channel number associated with the IRQ
  */
-static inline u32_t rv32m1_intmux_channel(unsigned int irq)
+static inline uint32_t rv32m1_intmux_channel(unsigned int irq)
 {
 	/*
 	 * Here we make use of these facts:
@@ -89,7 +89,7 @@ static inline u32_t rv32m1_intmux_channel(unsigned int irq)
  *        <irq.h> numbering system
  * @return The INTMUX interrupt ID, in the inclusive range 0 to 31
  */
-static inline u32_t rv32m1_intmux_line(unsigned int irq)
+static inline uint32_t rv32m1_intmux_line(unsigned int irq)
 {
 	return ((irq >> 8) & 0xff) - 1;
 }
diff --git a/soc/riscv/openisa_rv32m1/soc_context.h b/soc/riscv/openisa_rv32m1/soc_context.h
index 3a7faa19c9..ac9d2c42b9 100644
--- a/soc/riscv/openisa_rv32m1/soc_context.h
+++ b/soc/riscv/openisa_rv32m1/soc_context.h
@@ -15,12 +15,12 @@
 
 /* Extra state for RI5CY hardware loop registers. */
 #define SOC_ESF_MEMBERS					\
-	u32_t lpstart0;					\
-	u32_t lpend0;						\
-	u32_t lpcount0;					\
-	u32_t lpstart1;					\
-	u32_t lpend1;						\
-	u32_t lpcount1
+	uint32_t lpstart0;					\
+	uint32_t lpend0;						\
+	uint32_t lpcount0;					\
+	uint32_t lpstart1;					\
+	uint32_t lpend1;						\
+	uint32_t lpcount1
 
 /* Initial saved state. */
 #define SOC_ESF_INIT						\
diff --git a/soc/riscv/riscv-privilege/common/soc_common.h b/soc/riscv/riscv-privilege/common/soc_common.h
index e7a14ec8a8..cb3376bdb6 100644
--- a/soc/riscv/riscv-privilege/common/soc_common.h
+++ b/soc/riscv/riscv-privilege/common/soc_common.h
@@ -45,10 +45,10 @@ void soc_interrupt_init(void);
 #endif
 
 #if defined(CONFIG_RISCV_HAS_PLIC)
-void riscv_plic_irq_enable(u32_t irq);
-void riscv_plic_irq_disable(u32_t irq);
-int riscv_plic_irq_is_enabled(u32_t irq);
-void riscv_plic_set_priority(u32_t irq, u32_t priority);
+void riscv_plic_irq_enable(uint32_t irq);
+void riscv_plic_irq_disable(uint32_t irq);
+int riscv_plic_irq_is_enabled(uint32_t irq);
+void riscv_plic_set_priority(uint32_t irq, uint32_t priority);
 int riscv_plic_get_irq(void);
 #endif
 
diff --git a/soc/riscv/riscv-privilege/common/soc_common_irq.c b/soc/riscv/riscv-privilege/common/soc_common_irq.c
index 6f4864f837..be3cd4764b 100644
--- a/soc/riscv/riscv-privilege/common/soc_common_irq.c
+++ b/soc/riscv/riscv-privilege/common/soc_common_irq.c
@@ -13,7 +13,7 @@
 
 void arch_irq_enable(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 #if defined(CONFIG_RISCV_HAS_PLIC)
 	unsigned int level = irq_get_level(irq);
@@ -36,7 +36,7 @@ void arch_irq_enable(unsigned int irq)
 
 void arch_irq_disable(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 #if defined(CONFIG_RISCV_HAS_PLIC)
 	unsigned int level = irq_get_level(irq);
@@ -73,7 +73,7 @@ void arch_irq_priority_set(unsigned int irq, unsigned int prio)
 
 int arch_irq_is_enabled(unsigned int irq)
 {
-	u32_t mie;
+	uint32_t mie;
 
 #if defined(CONFIG_RISCV_HAS_PLIC)
 	unsigned int level = irq_get_level(irq);
diff --git a/soc/x86/apollo_lake/cpu.c b/soc/x86/apollo_lake/cpu.c
index 388b52a534..5916314d38 100644
--- a/soc/x86/apollo_lake/cpu.c
+++ b/soc/x86/apollo_lake/cpu.c
@@ -5,4 +5,4 @@
 
 #include <kernel.h>
 
-u8_t x86_cpu_loapics[] = { 0x00, 0x02, 0x04, 0x06 };
+uint8_t x86_cpu_loapics[] = { 0x00, 0x02, 0x04, 0x06 };
diff --git a/soc/xtensa/esp32/esp32-mp.c b/soc/xtensa/esp32/esp32-mp.c
index 4eb89601f3..5ee1f5d986 100644
--- a/soc/xtensa/esp32/esp32-mp.c
+++ b/soc/xtensa/esp32/esp32-mp.c
@@ -11,7 +11,7 @@
 #include <spinlock.h>
 #include <kernel_structs.h>
 
-#define Z_REG(base, off) (*(volatile u32_t *)((base) + (off)))
+#define Z_REG(base, off) (*(volatile uint32_t *)((base) + (off)))
 
 #define RTC_CNTL_BASE             0x3ff48000
 #define RTC_CNTL_OPTIONS0     Z_REG(RTC_CNTL_BASE, 0x0)
diff --git a/soc/xtensa/esp32/soc.c b/soc/xtensa/esp32/soc.c
index a0a0d11dbb..e67c3517d4 100644
--- a/soc/xtensa/esp32/soc.c
+++ b/soc/xtensa/esp32/soc.c
@@ -25,12 +25,12 @@ extern void z_cstart(void);
  */
 void __attribute__((section(".iram1"))) __start(void)
 {
-	volatile u32_t *wdt_rtc_reg = (u32_t *)RTC_CNTL_WDTCONFIG0_REG;
-	volatile u32_t *wdt_timg_reg = (u32_t *)TIMG_WDTCONFIG0_REG(0);
-	volatile u32_t *app_cpu_config_reg = (u32_t *)DPORT_APPCPU_CTRL_B_REG;
-	extern u32_t _init_start;
-	extern u32_t _bss_start;
-	extern u32_t _bss_end;
+	volatile uint32_t *wdt_rtc_reg = (uint32_t *)RTC_CNTL_WDTCONFIG0_REG;
+	volatile uint32_t *wdt_timg_reg = (uint32_t *)TIMG_WDTCONFIG0_REG(0);
+	volatile uint32_t *app_cpu_config_reg = (uint32_t *)DPORT_APPCPU_CTRL_B_REG;
+	extern uint32_t _init_start;
+	extern uint32_t _bss_start;
+	extern uint32_t _bss_end;
 
 	/* Move the exception vector table to IRAM. */
 	__asm__ __volatile__ (
diff --git a/soc/xtensa/esp32/soc.h b/soc/xtensa/esp32/soc.h
index 87ad2569de..f1c6ab1742 100644
--- a/soc/xtensa/esp32/soc.h
+++ b/soc/xtensa/esp32/soc.h
@@ -25,12 +25,12 @@ struct esp32_peripheral {
 	int rst;
 };
 
-static inline void esp32_set_mask32(u32_t v, u32_t mem_addr)
+static inline void esp32_set_mask32(uint32_t v, uint32_t mem_addr)
 {
 	sys_write32(sys_read32(mem_addr) | v, mem_addr);
 }
 
-static inline void esp32_clear_mask32(u32_t v, u32_t mem_addr)
+static inline void esp32_clear_mask32(uint32_t v, uint32_t mem_addr)
 {
 	sys_write32(sys_read32(mem_addr) & ~v, mem_addr);
 }
@@ -45,15 +45,15 @@ extern int esp32_rom_intr_matrix_set(int cpu_no,
 				     int interrupt_src,
 				     int interrupt_line);
 
-extern int esp32_rom_gpio_matrix_in(u32_t gpio, u32_t signal_index,
+extern int esp32_rom_gpio_matrix_in(uint32_t gpio, uint32_t signal_index,
 				    bool inverted);
-extern int esp32_rom_gpio_matrix_out(u32_t gpio, u32_t signal_index,
+extern int esp32_rom_gpio_matrix_out(uint32_t gpio, uint32_t signal_index,
 				     bool out_inverted,
 				     bool out_enabled_inverted);
 
 extern void esp32_rom_uart_attach(void);
-extern STATUS esp32_rom_uart_tx_one_char(u8_t chr);
-extern STATUS esp32_rom_uart_rx_one_char(u8_t *chr);
+extern STATUS esp32_rom_uart_tx_one_char(uint8_t chr);
+extern STATUS esp32_rom_uart_rx_one_char(uint8_t *chr);
 
 extern void esp32_rom_Cache_Flush(int cpu);
 extern void esp32_rom_Cache_Read_Enable(int cpu);
diff --git a/soc/xtensa/intel_apl_adsp/soc.c b/soc/xtensa/intel_apl_adsp/soc.c
index d769ba8196..4fccad5c2f 100644
--- a/soc/xtensa/intel_apl_adsp/soc.c
+++ b/soc/xtensa/intel_apl_adsp/soc.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(soc);
 
 #define CAVS_INTC_NODE(n) DT_INST(n, intel_cavs_intc)
 
-void z_soc_irq_enable(u32_t irq)
+void z_soc_irq_enable(uint32_t irq)
 {
 	struct device *dev_cavs;
 
@@ -61,7 +61,7 @@ void z_soc_irq_enable(u32_t irq)
 	irq_enable_next_level(dev_cavs, CAVS_IRQ_NUMBER(irq));
 }
 
-void z_soc_irq_disable(u32_t irq)
+void z_soc_irq_disable(uint32_t irq)
 {
 	struct device *dev_cavs;
 
@@ -141,7 +141,7 @@ out:
 #ifdef CONFIG_DYNAMIC_INTERRUPTS
 int z_soc_irq_connect_dynamic(unsigned int irq, unsigned int priority,
 			      void (*routine)(void *parameter),
-			      void *parameter, u32_t flags)
+			      void *parameter, uint32_t flags)
 {
 	uint32_t table_idx;
 	uint32_t cavs_irq, cavs_idx;
diff --git a/soc/xtensa/intel_apl_adsp/soc.h b/soc/xtensa/intel_apl_adsp/soc.h
index af5175494e..8e06af872a 100644
--- a/soc/xtensa/intel_apl_adsp/soc.h
+++ b/soc/xtensa/intel_apl_adsp/soc.h
@@ -105,9 +105,9 @@
 #define SOC_MDIVXR_SET_DIVIDER_BYPASS		BIT_MASK(12)
 
 struct soc_mclk_control_regs {
-	u32_t	mdivctrl;
-	u32_t	reserved[31];
-	u32_t	mdivxr[SOC_NUM_MCLK_OUTPUTS];
+	uint32_t	mdivctrl;
+	uint32_t	reserved[31];
+	uint32_t	mdivxr[SOC_NUM_MCLK_OUTPUTS];
 };
 
 #define PDM_BASE				0x00010000
@@ -133,11 +133,11 @@ struct soc_mclk_control_regs {
 
 struct soc_resource_alloc_regs {
 	union {
-		u16_t	lpgpdmacxo[SOC_NUM_LPGPDMAC];
-		u16_t	reserved[4];
+		uint16_t	lpgpdmacxo[SOC_NUM_LPGPDMAC];
+		uint16_t	reserved[4];
 	};
-	u32_t	dspiopo;
-	u32_t	geno;
+	uint32_t	dspiopo;
+	uint32_t	geno;
 };
 
 /* DMIC SHIM Registers */
@@ -146,8 +146,8 @@ struct soc_resource_alloc_regs {
 #define SOC_DMIC_SHIM_DMICLCTL_CPA		BIT(8)
 
 struct soc_dmic_shim_regs {
-	u32_t	dmiclcap;
-	u32_t	dmiclctl;
+	uint32_t	dmiclcap;
+	uint32_t	dmiclctl;
 };
 
 /* SOC DSP SHIM Registers */
@@ -208,40 +208,40 @@ struct soc_dmic_shim_regs {
 #define DSP_WCT_CS_TT(x)			BIT(4 + x)
 
 struct soc_dsp_shim_regs {
-	u32_t	reserved[8];
+	uint32_t	reserved[8];
 	union {
 		struct {
-			u32_t walclk32_lo;
-			u32_t walclk32_hi;
+			uint32_t walclk32_lo;
+			uint32_t walclk32_hi;
 		};
-		u64_t	walclk;
+		uint64_t	walclk;
 	};
-	u32_t	dspwctcs;
-	u32_t	reserved1[1];
+	uint32_t	dspwctcs;
+	uint32_t	reserved1[1];
 	union {
 		struct {
-			u32_t dspwct0c32_lo;
-			u32_t dspwct0c32_hi;
+			uint32_t dspwct0c32_lo;
+			uint32_t dspwct0c32_hi;
 		};
-		u64_t	dspwct0c;
+		uint64_t	dspwct0c;
 	};
 	union {
 		struct {
-			u32_t dspwct1c32_lo;
-			u32_t dspwct1c32_hi;
+			uint32_t dspwct1c32_lo;
+			uint32_t dspwct1c32_hi;
 		};
-		u64_t	dspwct1c;
+		uint64_t	dspwct1c;
 	};
-	u32_t	reserved2[14];
-	u32_t	clkctl;
-	u32_t	clksts;
-	u32_t	reserved3[4];
-	u16_t	pwrctl;
-	u16_t	pwrsts;
-	u32_t	lpsctl;
-	u32_t	lpsdmas0;
-	u32_t	lpsdmas1;
-	u32_t	reserved4[22];
+	uint32_t	reserved2[14];
+	uint32_t	clkctl;
+	uint32_t	clksts;
+	uint32_t	reserved3[4];
+	uint16_t	pwrctl;
+	uint16_t	pwrsts;
+	uint32_t	lpsctl;
+	uint32_t	lpsdmas0;
+	uint32_t	lpsdmas1;
+	uint32_t	reserved4[22];
 };
 
 /* macros for data cache operations */
@@ -250,8 +250,8 @@ struct soc_dsp_shim_regs {
 #define SOC_DCACHE_INVALIDATE(addr, size)	\
 	xthal_dcache_region_invalidate((addr), (size))
 
-extern void z_soc_irq_enable(u32_t irq);
-extern void z_soc_irq_disable(u32_t irq);
+extern void z_soc_irq_enable(uint32_t irq);
+extern void z_soc_irq_disable(uint32_t irq);
 extern int z_soc_irq_is_enabled(unsigned int irq);
 
 #endif /* __INC_SOC_H */
diff --git a/soc/xtensa/intel_apl_adsp/soc_mp.c b/soc/xtensa/intel_apl_adsp/soc_mp.c
index 4aa5e65fac..671307238a 100644
--- a/soc/xtensa/intel_apl_adsp/soc_mp.c
+++ b/soc/xtensa/intel_apl_adsp/soc_mp.c
@@ -55,17 +55,17 @@ static struct device *idc;
 extern void __start(void);
 
 struct cpustart_rec {
-	u32_t		cpu;
+	uint32_t		cpu;
 
 	arch_cpustart_t	fn;
 	char		*stack_top;
 	void		*arg;
-	u32_t		vecbase;
+	uint32_t		vecbase;
 
-	u32_t		alive;
+	uint32_t		alive;
 
 	/* padding to cache line */
-	u8_t		padding[XCHAL_DCACHE_LINESIZE - 6 * 4];
+	uint8_t		padding[XCHAL_DCACHE_LINESIZE - 6 * 4];
 };
 
 static __aligned(XCHAL_DCACHE_LINESIZE)
@@ -76,7 +76,7 @@ static void *mp_top;
 static void mp_entry2(void)
 {
 	volatile int ps, ie;
-	u32_t idc_reg;
+	uint32_t idc_reg;
 
 	/* Copy over VECBASE from the main CPU for an initial value
 	 * (will need to revisit this if we ever allow a user API to
@@ -149,8 +149,8 @@ __asm__("\n"
  */
 void z_mp_entry(void)
 {
-	*(u32_t *)CONFIG_SRAM_BASE_ADDRESS = 0xDEADBEEF;
-	SOC_DCACHE_FLUSH((u32_t *)CONFIG_SRAM_BASE_ADDRESS, 64);
+	*(uint32_t *)CONFIG_SRAM_BASE_ADDRESS = 0xDEADBEEF;
+	SOC_DCACHE_FLUSH((uint32_t *)CONFIG_SRAM_BASE_ADDRESS, 64);
 
 	mp_stack_switch(mp_top, mp_entry2);
 }
@@ -158,8 +158,8 @@ void z_mp_entry(void)
 void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
 		    arch_cpustart_t fn, void *arg)
 {
-	u32_t vecbase;
-	u32_t idc_reg;
+	uint32_t vecbase;
+	uint32_t idc_reg;
 
 	__ASSERT(cpu_num == 1, "Only supports only two CPUs!");
 
diff --git a/soc/xtensa/intel_s1000/soc.c b/soc/xtensa/intel_s1000/soc.c
index be728018c1..d7dcc33378 100644
--- a/soc/xtensa/intel_s1000/soc.c
+++ b/soc/xtensa/intel_s1000/soc.c
@@ -17,11 +17,11 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
-static u32_t ref_clk_freq;
+static uint32_t ref_clk_freq;
 
 #define CAVS_INTC_NODE(n) DT_INST(n, intel_cavs_intc)
 
-void z_soc_irq_enable(u32_t irq)
+void z_soc_irq_enable(uint32_t irq)
 {
 	struct device *dev_cavs, *dev_ictl;
 
@@ -80,7 +80,7 @@ void z_soc_irq_enable(u32_t irq)
 	irq_enable_next_level(dev_ictl, INTR_CNTL_IRQ_NUM(irq));
 }
 
-void z_soc_irq_disable(u32_t irq)
+void z_soc_irq_disable(uint32_t irq)
 {
 	struct device *dev_cavs, *dev_ictl;
 
@@ -224,7 +224,7 @@ static inline void soc_set_resource_ownership(void)
 		SOC_GENO_MNDIV_OWNER_DSP;
 }
 
-u32_t soc_get_ref_clk_freq(void)
+uint32_t soc_get_ref_clk_freq(void)
 {
 	return ref_clk_freq;
 }
@@ -297,7 +297,7 @@ static inline void soc_read_bootstraps(void)
 {
 	volatile struct soc_global_regs *regs =
 		(volatile struct soc_global_regs *)SOC_S1000_GLB_CTRL_BASE;
-	u32_t bootstrap;
+	uint32_t bootstrap;
 
 	bootstrap = regs->straps;
 
diff --git a/soc/xtensa/intel_s1000/soc.h b/soc/xtensa/intel_s1000/soc.h
index 099f238f41..51651b28d5 100644
--- a/soc/xtensa/intel_s1000/soc.h
+++ b/soc/xtensa/intel_s1000/soc.h
@@ -92,9 +92,9 @@
 #define SOC_MDIVXR_SET_DIVIDER_BYPASS		BIT_MASK(12)
 
 struct soc_mclk_control_regs {
-	u32_t	mdivctrl;
-	u32_t	reserved[31];
-	u32_t	mdivxr[SOC_NUM_MCLK_OUTPUTS];
+	uint32_t	mdivctrl;
+	uint32_t	reserved[31];
+	uint32_t	mdivxr[SOC_NUM_MCLK_OUTPUTS];
 };
 
 #define PDM_BASE				0x00010000
@@ -127,11 +127,11 @@ struct soc_mclk_control_regs {
 
 struct soc_resource_alloc_regs {
 	union {
-		u16_t	lpgpdmacxo[SOC_NUM_LPGPDMAC];
-		u16_t	reserved[4];
+		uint16_t	lpgpdmacxo[SOC_NUM_LPGPDMAC];
+		uint16_t	reserved[4];
 	};
-	u32_t	dspiopo;
-	u32_t	geno;
+	uint32_t	dspiopo;
+	uint32_t	geno;
 };
 
 /* L2 Local Memory Registers */
@@ -145,8 +145,8 @@ struct soc_resource_alloc_regs {
 #define SOC_DMIC_SHIM_DMICLCTL_CPA		BIT(8)
 
 struct soc_dmic_shim_regs {
-	u32_t	dmiclcap;
-	u32_t	dmiclctl;
+	uint32_t	dmiclcap;
+	uint32_t	dmiclctl;
 };
 
 /* SOC DSP SHIM Registers */
@@ -160,40 +160,40 @@ struct soc_dmic_shim_regs {
 #define SOC_PWRCTL_DISABLE_PWR_GATING_DSP1	BIT(1)
 
 struct soc_dsp_shim_regs {
-	u32_t	reserved[8];
+	uint32_t	reserved[8];
 	union {
 		struct {
-			u32_t walclk32_lo;
-			u32_t walclk32_hi;
+			uint32_t walclk32_lo;
+			uint32_t walclk32_hi;
 		};
-		u64_t	walclk;
+		uint64_t	walclk;
 	};
-	u32_t	dspwctcs;
-	u32_t	reserved1[1];
+	uint32_t	dspwctcs;
+	uint32_t	reserved1[1];
 	union {
 		struct {
-			u32_t dspwct0c32_lo;
-			u32_t dspwct0c32_hi;
+			uint32_t dspwct0c32_lo;
+			uint32_t dspwct0c32_hi;
 		};
-		u64_t	dspwct0c;
+		uint64_t	dspwct0c;
 	};
 	union {
 		struct {
-			u32_t dspwct1c32_lo;
-			u32_t dspwct1c32_hi;
+			uint32_t dspwct1c32_lo;
+			uint32_t dspwct1c32_hi;
 		};
-		u64_t	dspwct1c;
+		uint64_t	dspwct1c;
 	};
-	u32_t	reserved2[14];
-	u32_t	clkctl;
-	u32_t	clksts;
-	u32_t	reserved3[4];
-	u16_t	pwrctl;
-	u16_t	pwrsts;
-	u32_t	lpsctl;
-	u32_t	lpsdmas0;
-	u32_t	lpsdmas1;
-	u32_t	reserved4[22];
+	uint32_t	reserved2[14];
+	uint32_t	clkctl;
+	uint32_t	clksts;
+	uint32_t	reserved3[4];
+	uint16_t	pwrctl;
+	uint16_t	pwrsts;
+	uint32_t	lpsctl;
+	uint32_t	lpsdmas0;
+	uint32_t	lpsdmas1;
+	uint32_t	reserved4[22];
 };
 
 /* Global Control registers */
@@ -214,12 +214,12 @@ struct soc_dsp_shim_regs {
 #define SOC_S1000_STRAP_REF_CLK_24P576		(2 << 3)
 
 struct soc_global_regs {
-	u32_t	reserved1[5];
-	u32_t	cavs_dsp1power_control;
-	u32_t	reserved2[2];
-	u32_t	gna_power_control;
-	u32_t	reserved3[7];
-	u32_t	straps;
+	uint32_t	reserved1[5];
+	uint32_t	cavs_dsp1power_control;
+	uint32_t	reserved2[2];
+	uint32_t	gna_power_control;
+	uint32_t	reserved3[7];
+	uint32_t	straps;
 };
 
 /* macros for data cache operations */
@@ -228,10 +228,10 @@ struct soc_global_regs {
 #define SOC_DCACHE_INVALIDATE(addr, size)	\
 	xthal_dcache_region_invalidate((addr), (size))
 
-extern void z_soc_irq_enable(u32_t irq);
-extern void z_soc_irq_disable(u32_t irq);
+extern void z_soc_irq_enable(uint32_t irq);
+extern void z_soc_irq_disable(uint32_t irq);
 extern int z_soc_irq_is_enabled(unsigned int irq);
 
-extern u32_t soc_get_ref_clk_freq(void);
+extern uint32_t soc_get_ref_clk_freq(void);
 
 #endif /* __INC_SOC_H */
diff --git a/soc/xtensa/intel_s1000/soc_mp.c b/soc/xtensa/intel_s1000/soc_mp.c
index c7cf32594b..74c6d7c769 100644
--- a/soc/xtensa/intel_s1000/soc_mp.c
+++ b/soc/xtensa/intel_s1000/soc_mp.c
@@ -26,14 +26,14 @@ static struct device *idc;
 extern void __start(void);
 
 struct cpustart_rec {
-	u32_t		cpu;
+	uint32_t		cpu;
 	arch_cpustart_t	fn;
 	char		*stack_top;
 	void		*arg;
-	u32_t		vecbase;
-	u32_t		alive;
+	uint32_t		vecbase;
+	uint32_t		alive;
 	/* padding to cache line */
-	u8_t		padding[XCHAL_DCACHE_LINESIZE - 6 * 4];
+	uint8_t		padding[XCHAL_DCACHE_LINESIZE - 6 * 4];
 };
 
 static __aligned(XCHAL_DCACHE_LINESIZE)
@@ -122,7 +122,7 @@ void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
 		(volatile struct soc_dsp_shim_regs *)SOC_DSP_SHIM_REG_BASE;
 	volatile struct soc_global_regs *soc_glb_regs =
 		(volatile struct soc_global_regs *)SOC_S1000_GLB_CTRL_BASE;
-	u32_t vecbase;
+	uint32_t vecbase;
 
 	__ASSERT(cpu_num == 1, "Intel S1000 supports only two CPUs!");
 
@@ -150,7 +150,7 @@ void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
 	 * and set the vector.
 	 */
 	sys_write32(0x0, SOC_L2RAM_LOCAL_MEM_REG_LSPGCTL);
-	*((u32_t *)LPSRAM_BOOT_VECTOR_ADDR) = (u32_t)__start;
+	*((uint32_t *)LPSRAM_BOOT_VECTOR_ADDR) = (uint32_t)__start;
 
 	/* Disable power gating for DSP core #cpu_num */
 	dsp_shim_regs->pwrctl |= SOC_PWRCTL_DISABLE_PWR_GATING_DSP1;
diff --git a/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c b/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c
index 94e9b304f7..4e54fee3e6 100644
--- a/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c
+++ b/soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c
@@ -40,14 +40,14 @@ void log_3(const char *str,
 
 void log_n(const char *str,
 	   log_arg_t *args,
-	   u32_t narg,
+	   uint32_t narg,
 	   struct log_msg_ids src_level)
 {
 }
 
 void log_hexdump(const char *str,
-		 const u8_t *data,
-		 u32_t length,
+		 const uint8_t *data,
+		 uint32_t length,
 		 struct log_msg_ids src_level)
 {
 }
@@ -57,7 +57,7 @@ void log_string_sync(struct log_msg_ids src_level, const char *fmt, ...)
 }
 
 void log_hexdump_sync(struct log_msg_ids src_level, const char *metadata,
-		      const u8_t *data, u32_t len)
+		      const uint8_t *data, uint32_t len)
 {
 }
 
@@ -79,12 +79,12 @@ void log_free(void *buf)
 {
 }
 
-u32_t log_get_strdup_pool_utilization(void)
+uint32_t log_get_strdup_pool_utilization(void)
 {
 	return 0;
 }
 
-u32_t log_get_strdup_longest_string(void)
+uint32_t log_get_strdup_longest_string(void)
 {
 	return 0;
 }
@@ -99,6 +99,6 @@ void __printf_like(2, 3) log_from_user(struct log_msg_ids src_level,
 }
 
 void log_hexdump_from_user(struct log_msg_ids src_level, const char *metadata,
-			   const u8_t *data, u32_t len)
+			   const uint8_t *data, uint32_t len)
 {
 }
diff --git a/subsys/bluetooth/common/log.c b/subsys/bluetooth/common/log.c
index b6e6526191..9d1033b62f 100644
--- a/subsys/bluetooth/common/log.c
+++ b/subsys/bluetooth/common/log.c
@@ -24,7 +24,7 @@ const char *bt_hex_real(const void *buf, size_t len)
 {
 	static const char hex[] = "0123456789abcdef";
 	static char str[129];
-	const u8_t *b = buf;
+	const uint8_t *b = buf;
 	size_t i;
 
 	len = MIN(len, (sizeof(str) - 1) / 2);
diff --git a/subsys/bluetooth/common/log.h b/subsys/bluetooth/common/log.h
index 44ff7705ad..5acaf1d0c7 100644
--- a/subsys/bluetooth/common/log.h
+++ b/subsys/bluetooth/common/log.h
@@ -79,7 +79,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL);
 #endif/* CONFIG_BT_ASSERT*/
 
 #define BT_HEXDUMP_DBG(_data, _length, _str) \
-		LOG_HEXDUMP_DBG((const u8_t *)_data, _length, _str)
+		LOG_HEXDUMP_DBG((const uint8_t *)_data, _length, _str)
 
 /* NOTE: These helper functions always encodes into the same buffer storage.
  * It is the responsibility of the user of this function to copy the information
diff --git a/subsys/bluetooth/common/rpa.c b/subsys/bluetooth/common/rpa.c
index 9ad4ceb68e..51f77be3c5 100644
--- a/subsys/bluetooth/common/rpa.c
+++ b/subsys/bluetooth/common/rpa.c
@@ -38,8 +38,8 @@ static int internal_rand(void *buf, size_t len)
 }
 #endif /* defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CTLR_PRIVACY) */
 
-static int internal_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
-			       u8_t enc_data[16])
+static int internal_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
+			       uint8_t enc_data[16])
 {
 /* Force using controller encrypt function if supported. */
 #if defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO) && \
@@ -51,9 +51,9 @@ static int internal_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
 #endif
 }
 
-static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3])
+static int ah(const uint8_t irk[16], const uint8_t r[3], uint8_t out[3])
 {
-	u8_t res[16];
+	uint8_t res[16];
 	int err;
 
 	BT_DBG("irk %s", bt_hex(irk, 16));
@@ -80,9 +80,9 @@ static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3])
 }
 
 #if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_CTLR_PRIVACY)
-bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr)
+bool bt_rpa_irk_matches(const uint8_t irk[16], const bt_addr_t *addr)
 {
-	u8_t hash[3];
+	uint8_t hash[3];
 	int err;
 
 	BT_DBG("IRK %s bdaddr %s", bt_hex(irk, 16), bt_addr_str(addr));
@@ -97,7 +97,7 @@ bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr)
 #endif
 
 #if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_CTLR_PRIVACY)
-int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa)
+int bt_rpa_create(const uint8_t irk[16], bt_addr_t *rpa)
 {
 	int err;
 
@@ -118,7 +118,7 @@ int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa)
 	return 0;
 }
 #else
-int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa)
+int bt_rpa_create(const uint8_t irk[16], bt_addr_t *rpa)
 {
 	return -ENOTSUP;
 }
diff --git a/subsys/bluetooth/common/rpa.h b/subsys/bluetooth/common/rpa.h
index e80f663310..b99e6eda5b 100644
--- a/subsys/bluetooth/common/rpa.h
+++ b/subsys/bluetooth/common/rpa.h
@@ -12,5 +12,5 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
-bool bt_rpa_irk_matches(const u8_t irk[16], const bt_addr_t *addr);
-int bt_rpa_create(const u8_t irk[16], bt_addr_t *rpa);
+bool bt_rpa_irk_matches(const uint8_t irk[16], const bt_addr_t *addr);
+int bt_rpa_create(const uint8_t irk[16], bt_addr_t *rpa);
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index e78c16dd20..2c048047ee 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -207,7 +207,7 @@ config BT_CTLR_TX_BUFFER_SIZE
 	  then controller will perform fragmentation before transmitting on the
 	  the packet on air.
 	  Maximum is set to 251 due to implementation limitations (use of
-	  u8_t for length field in PDU buffer structure).
+	  uint8_t for length field in PDU buffer structure).
 
 choice
 	prompt "Tx Power"
diff --git a/subsys/bluetooth/controller/crypto/crypto.c b/subsys/bluetooth/controller/crypto/crypto.c
index d9d9aa133e..7213a929a6 100644
--- a/subsys/bluetooth/controller/crypto/crypto.c
+++ b/subsys/bluetooth/controller/crypto/crypto.c
@@ -16,8 +16,8 @@ int bt_rand(void *buf, size_t len)
 	return util_rand(buf, len);
 }
 
-int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16])
+int bt_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16])
 {
 	BT_DBG("key %s", bt_hex(key, 16));
 	BT_DBG("plaintext %s", bt_hex(plaintext, 16));
@@ -29,8 +29,8 @@ int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
 	return 0;
 }
 
-int bt_encrypt_be(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16])
+int bt_encrypt_be(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16])
 {
 	BT_DBG("key %s", bt_hex(key, 16));
 	BT_DBG("plaintext %s", bt_hex(plaintext, 16));
diff --git a/subsys/bluetooth/controller/hal/ccm.h b/subsys/bluetooth/controller/hal/ccm.h
index 08a5cd1456..8b183174f5 100644
--- a/subsys/bluetooth/controller/hal/ccm.h
+++ b/subsys/bluetooth/controller/hal/ccm.h
@@ -6,9 +6,9 @@
  */
 
 struct ccm {
-	u8_t  key[16];
-	u64_t counter;
-	u8_t  direction:1;
-	u8_t  resv1:7;
-	u8_t  iv[8];
+	uint8_t  key[16];
+	uint64_t counter;
+	uint8_t  direction:1;
+	uint8_t  resv1:7;
+	uint8_t  iv[8];
 } __packed;
diff --git a/subsys/bluetooth/controller/hal/cntr.h b/subsys/bluetooth/controller/hal/cntr.h
index 3f977581f9..6b4303e6c0 100644
--- a/subsys/bluetooth/controller/hal/cntr.h
+++ b/subsys/bluetooth/controller/hal/cntr.h
@@ -6,7 +6,7 @@
  */
 
 void cntr_init(void);
-u32_t cntr_start(void);
-u32_t cntr_stop(void);
-u32_t cntr_cnt_get(void);
-void cntr_cmp_set(u8_t cmp, u32_t value);
+uint32_t cntr_start(void);
+uint32_t cntr_stop(void);
+uint32_t cntr_cnt_get(void);
+void cntr_cmp_set(uint8_t cmp, uint32_t value);
diff --git a/subsys/bluetooth/controller/hal/debug.h b/subsys/bluetooth/controller/hal/debug.h
index 29b55da486..8734471ac7 100644
--- a/subsys/bluetooth/controller/hal/debug.h
+++ b/subsys/bluetooth/controller/hal/debug.h
@@ -6,7 +6,7 @@
  */
 
 #ifdef CONFIG_BT_CTLR_ASSERT_HANDLER
-void bt_ctlr_assert_handle(char *file, u32_t line);
+void bt_ctlr_assert_handle(char *file, uint32_t line);
 #define LL_ASSERT(cond) if (!(cond)) { \
 				bt_ctlr_assert_handle(__FILE__, \
 						      __LINE__); \
diff --git a/subsys/bluetooth/controller/hal/ecb.h b/subsys/bluetooth/controller/hal/ecb.h
index 08b8559630..e4c25a76a5 100644
--- a/subsys/bluetooth/controller/hal/ecb.h
+++ b/subsys/bluetooth/controller/hal/ecb.h
@@ -5,25 +5,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-typedef void (*ecb_fp) (u32_t status, u8_t *cipher_be, void *context);
+typedef void (*ecb_fp) (uint32_t status, uint8_t *cipher_be, void *context);
 
 struct ecb {
-	u8_t   in_key_be[16];
-	u8_t   in_clear_text_be[16];
-	u8_t   out_cipher_text_be[16];
+	uint8_t   in_key_be[16];
+	uint8_t   in_clear_text_be[16];
+	uint8_t   out_cipher_text_be[16];
 	/* if not null reverse copy into in_key_be */
-	u8_t   *in_key_le;
+	uint8_t   *in_key_le;
 	/* if not null reverse copy into in_clear_text_be */
-	u8_t   *in_clear_text_le;
+	uint8_t   *in_clear_text_le;
 	ecb_fp fp_ecb;
 	void   *context;
 };
 
-void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
-		    u8_t * const cipher_text_be);
-void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
-		 u8_t * const cipher_text_le, u8_t * const cipher_text_be);
-u32_t ecb_encrypt_nonblocking(struct ecb *ecb);
+void ecb_encrypt_be(uint8_t const *const key_be, uint8_t const *const clear_text_be,
+		    uint8_t * const cipher_text_be);
+void ecb_encrypt(uint8_t const *const key_le, uint8_t const *const clear_text_le,
+		 uint8_t * const cipher_text_le, uint8_t * const cipher_text_be);
+uint32_t ecb_encrypt_nonblocking(struct ecb *ecb);
 void isr_ecb(void *param);
 
-u32_t ecb_ut(void);
+uint32_t ecb_ut(void);
diff --git a/subsys/bluetooth/controller/hal/ticker.h b/subsys/bluetooth/controller/hal/ticker.h
index ba0f6de819..e99a826f03 100644
--- a/subsys/bluetooth/controller/hal/ticker.h
+++ b/subsys/bluetooth/controller/hal/ticker.h
@@ -7,7 +7,7 @@
 
 #include "hal/ticker_vendor_hal.h"
 
-u8_t hal_ticker_instance0_caller_id_get(u8_t user_id);
-void hal_ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain,
+uint8_t hal_ticker_instance0_caller_id_get(uint8_t user_id);
+void hal_ticker_instance0_sched(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 				void *instance);
-void hal_ticker_instance0_trigger_set(u32_t value);
+void hal_ticker_instance0_trigger_set(uint32_t value);
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index 62ed4721ed..b71f884d65 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -61,58 +61,58 @@
  * by hci_cmd_handle() and then used during the creation of cmd complete and
  * cmd status events to avoid passing it up the call chain.
  */
-static u16_t _opcode;
+static uint16_t _opcode;
 
 #if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0
 /* Scan duplicate filter */
 struct dup {
-	u8_t         mask;
+	uint8_t         mask;
 	bt_addr_le_t addr;
 };
 static struct dup dup_filter[CONFIG_BT_CTLR_DUP_FILTER_LEN];
-static s32_t dup_count;
-static u32_t dup_curr;
+static int32_t dup_count;
+static uint32_t dup_curr;
 #endif
 
 #if defined(CONFIG_BT_HCI_MESH_EXT)
 struct scan_filter {
-	u8_t count;
-	u8_t lengths[CONFIG_BT_CTLR_MESH_SF_PATTERNS];
-	u8_t patterns[CONFIG_BT_CTLR_MESH_SF_PATTERNS]
+	uint8_t count;
+	uint8_t lengths[CONFIG_BT_CTLR_MESH_SF_PATTERNS];
+	uint8_t patterns[CONFIG_BT_CTLR_MESH_SF_PATTERNS]
 		     [BT_HCI_MESH_PATTERN_LEN_MAX];
 };
 
 static struct scan_filter scan_filters[CONFIG_BT_CTLR_MESH_SCAN_FILTERS];
-static u8_t sf_curr;
+static uint8_t sf_curr;
 #endif
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-s32_t    hci_hbuf_total;
-u32_t    hci_hbuf_sent;
-u32_t    hci_hbuf_acked;
-u16_t    hci_hbuf_pend[CONFIG_BT_MAX_CONN];
+int32_t    hci_hbuf_total;
+uint32_t    hci_hbuf_sent;
+uint32_t    hci_hbuf_acked;
+uint16_t    hci_hbuf_pend[CONFIG_BT_MAX_CONN];
 atomic_t hci_state_mask;
 static struct k_poll_signal *hbuf_signal;
 #endif
 
 #if defined(CONFIG_BT_CONN)
-static u32_t conn_count;
+static uint32_t conn_count;
 #endif
 
 #define DEFAULT_EVENT_MASK           0x1fffffffffff
 #define DEFAULT_EVENT_MASK_PAGE_2    0x0
 #define DEFAULT_LE_EVENT_MASK 0x1f
 
-static u64_t event_mask = DEFAULT_EVENT_MASK;
-static u64_t event_mask_page_2 = DEFAULT_EVENT_MASK_PAGE_2;
-static u64_t le_event_mask = DEFAULT_LE_EVENT_MASK;
+static uint64_t event_mask = DEFAULT_EVENT_MASK;
+static uint64_t event_mask_page_2 = DEFAULT_EVENT_MASK_PAGE_2;
+static uint64_t le_event_mask = DEFAULT_LE_EVENT_MASK;
 
 #if defined(CONFIG_BT_CONN)
-static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle,
+static void le_conn_complete(struct pdu_data *pdu_data, uint16_t handle,
 			     struct net_buf *buf);
 #endif /* CONFIG_BT_CONN */
 
-void hci_evt_create(struct net_buf *buf, u8_t evt, u8_t len)
+void hci_evt_create(struct net_buf *buf, uint8_t evt, uint8_t len)
 {
 	struct bt_hci_evt_hdr *hdr;
 
@@ -121,7 +121,7 @@ void hci_evt_create(struct net_buf *buf, u8_t evt, u8_t len)
 	hdr->len = len;
 }
 
-struct net_buf *bt_hci_evt_create(u8_t evt, u8_t len)
+struct net_buf *bt_hci_evt_create(uint8_t evt, uint8_t len)
 {
 	struct net_buf *buf;
 
@@ -131,7 +131,7 @@ struct net_buf *bt_hci_evt_create(u8_t evt, u8_t len)
 	return buf;
 }
 
-struct net_buf *bt_hci_cmd_complete_create(u16_t op, u8_t plen)
+struct net_buf *bt_hci_cmd_complete_create(uint16_t op, uint8_t plen)
 {
 	struct net_buf *buf;
 	struct bt_hci_evt_cmd_complete *cc;
@@ -145,7 +145,7 @@ struct net_buf *bt_hci_cmd_complete_create(u16_t op, u8_t plen)
 	return buf;
 }
 
-struct net_buf *bt_hci_cmd_status_create(u16_t op, u8_t status)
+struct net_buf *bt_hci_cmd_status_create(uint16_t op, uint8_t status)
 {
 	struct net_buf *buf;
 	struct bt_hci_evt_cmd_status *cs;
@@ -160,19 +160,19 @@ struct net_buf *bt_hci_cmd_status_create(u16_t op, u8_t status)
 	return buf;
 }
 
-void *hci_cmd_complete(struct net_buf **buf, u8_t plen)
+void *hci_cmd_complete(struct net_buf **buf, uint8_t plen)
 {
 	*buf = bt_hci_cmd_complete_create(_opcode, plen);
 
 	return net_buf_add(*buf, plen);
 }
 
-static struct net_buf *cmd_status(u8_t status)
+static struct net_buf *cmd_status(uint8_t status)
 {
 	return bt_hci_cmd_status_create(_opcode, status);
 }
 
-static void *meta_evt(struct net_buf *buf, u8_t subevt, u8_t melen)
+static void *meta_evt(struct net_buf *buf, uint8_t subevt, uint8_t melen)
 {
 	struct bt_hci_evt_le_meta_event *me;
 
@@ -184,7 +184,7 @@ static void *meta_evt(struct net_buf *buf, u8_t subevt, u8_t melen)
 }
 
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-static void *mesh_evt(struct net_buf *buf, u8_t subevt, u8_t melen)
+static void *mesh_evt(struct net_buf *buf, uint8_t subevt, uint8_t melen)
 {
 	struct bt_hci_evt_mesh *me;
 
@@ -201,8 +201,8 @@ static void *mesh_evt(struct net_buf *buf, u8_t subevt, u8_t melen)
 static void disconnect(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_disconnect *cmd = (void *)buf->data;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_terminate_ind_send(handle, cmd->reason);
@@ -213,8 +213,8 @@ static void disconnect(struct net_buf *buf, struct net_buf **evt)
 static void read_remote_ver_info(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_read_remote_version_info *cmd = (void *)buf->data;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_version_ind_send(handle);
@@ -223,7 +223,7 @@ static void read_remote_ver_info(struct net_buf *buf, struct net_buf **evt)
 }
 #endif /* CONFIG_BT_CONN */
 
-static int link_control_cmd_handle(u16_t  ocf, struct net_buf *cmd,
+static int link_control_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 				   struct net_buf **evt)
 {
 	switch (ocf) {
@@ -309,7 +309,7 @@ static void reset(struct net_buf *buf, struct net_buf **evt)
 static void set_ctl_to_host_flow(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_set_ctl_to_host_flow *cmd = (void *)buf->data;
-	u8_t flow_enable = cmd->flow_enable;
+	uint8_t flow_enable = cmd->flow_enable;
 	struct bt_hci_evt_cc_status *ccst;
 
 	ccst = hci_cmd_complete(evt, sizeof(*ccst));
@@ -351,8 +351,8 @@ static void set_ctl_to_host_flow(struct net_buf *buf, struct net_buf **evt)
 static void host_buffer_size(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_host_buffer_size *cmd = (void *)buf->data;
-	u16_t acl_pkts = sys_le16_to_cpu(cmd->acl_pkts);
-	u16_t acl_mtu = sys_le16_to_cpu(cmd->acl_mtu);
+	uint16_t acl_pkts = sys_le16_to_cpu(cmd->acl_pkts);
+	uint16_t acl_mtu = sys_le16_to_cpu(cmd->acl_mtu);
 	struct bt_hci_evt_cc_status *ccst;
 
 	ccst = hci_cmd_complete(evt, sizeof(*ccst));
@@ -378,7 +378,7 @@ static void host_num_completed_packets(struct net_buf *buf,
 {
 	struct bt_hci_cp_host_num_completed_packets *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u32_t count = 0U;
+	uint32_t count = 0U;
 	int i;
 
 	/* special case, no event returned except for error conditions */
@@ -394,8 +394,8 @@ static void host_num_completed_packets(struct net_buf *buf,
 
 	/* leave *evt == NULL so no event is generated */
 	for (i = 0; i < cmd->num_handles; i++) {
-		u16_t h = sys_le16_to_cpu(cmd->h[i].handle);
-		u16_t c = sys_le16_to_cpu(cmd->h[i].count);
+		uint16_t h = sys_le16_to_cpu(cmd->h[i].handle);
+		uint16_t c = sys_le16_to_cpu(cmd->h[i].count);
 
 		if ((h >= ARRAY_SIZE(hci_hbuf_pend)) ||
 		    (c > hci_hbuf_pend[h])) {
@@ -419,9 +419,9 @@ static void read_auth_payload_timeout(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_read_auth_payload_timeout *cmd = (void *)buf->data;
 	struct bt_hci_rp_read_auth_payload_timeout *rp;
-	u16_t auth_payload_timeout;
-	u16_t handle;
-	u8_t status;
+	uint16_t auth_payload_timeout;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 
@@ -438,9 +438,9 @@ static void write_auth_payload_timeout(struct net_buf *buf,
 {
 	struct bt_hci_cp_write_auth_payload_timeout *cmd = (void *)buf->data;
 	struct bt_hci_rp_write_auth_payload_timeout *rp;
-	u16_t auth_payload_timeout;
-	u16_t handle;
-	u8_t status;
+	uint16_t auth_payload_timeout;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	auth_payload_timeout = sys_le16_to_cpu(cmd->auth_payload_timeout);
@@ -458,9 +458,9 @@ static void read_tx_power_level(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_read_tx_power_level *cmd = (void *)buf->data;
 	struct bt_hci_rp_read_tx_power_level *rp;
-	u16_t handle;
-	u8_t status;
-	u8_t type;
+	uint16_t handle;
+	uint8_t status;
+	uint8_t type;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	type = cmd->type;
@@ -475,7 +475,7 @@ static void read_tx_power_level(struct net_buf *buf, struct net_buf **evt)
 }
 #endif /* CONFIG_BT_CONN */
 
-static int ctrl_bb_cmd_handle(u16_t  ocf, struct net_buf *cmd,
+static int ctrl_bb_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 			      struct net_buf **evt)
 {
 	switch (ocf) {
@@ -710,7 +710,7 @@ static void read_bd_addr(struct net_buf *buf, struct net_buf **evt)
 	ll_addr_get(0, &rp->bdaddr.val[0]);
 }
 
-static int info_cmd_handle(u16_t  ocf, struct net_buf *cmd,
+static int info_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 			   struct net_buf **evt)
 {
 	switch (ocf) {
@@ -742,7 +742,7 @@ static void read_rssi(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_read_rssi *cmd = (void *)buf->data;
 	struct bt_hci_rp_read_rssi *rp;
-	u16_t handle;
+	uint16_t handle;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 
@@ -756,7 +756,7 @@ static void read_rssi(struct net_buf *buf, struct net_buf **evt)
 }
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
-static int status_cmd_handle(u16_t  ocf, struct net_buf *cmd,
+static int status_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 			     struct net_buf **evt)
 {
 	switch (ocf) {
@@ -812,7 +812,7 @@ static void le_set_random_address(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_random_address *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_addr_set(1, &cmd->bdaddr.val[0]);
 
@@ -843,7 +843,7 @@ static void le_add_dev_to_wl(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_add_dev_to_wl *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_wl_add(&cmd->addr);
 
@@ -855,7 +855,7 @@ static void le_rem_dev_from_wl(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_rem_dev_from_wl *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_wl_remove(&cmd->addr);
 
@@ -868,7 +868,7 @@ static void le_encrypt(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_encrypt *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_encrypt *rp;
-	u8_t enc_data[16];
+	uint8_t enc_data[16];
 
 	ecb_encrypt(cmd->key, cmd->plaintext, enc_data, NULL);
 
@@ -881,7 +881,7 @@ static void le_encrypt(struct net_buf *buf, struct net_buf **evt)
 static void le_rand(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_rp_le_rand *rp;
-	u8_t count = sizeof(rp->rand);
+	uint8_t count = sizeof(rp->rand);
 
 	rp = hci_cmd_complete(evt, sizeof(*rp));
 	rp->status = 0x00;
@@ -892,7 +892,7 @@ static void le_rand(struct net_buf *buf, struct net_buf **evt)
 static void le_read_supp_states(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_rp_le_read_supp_states *rp;
-	u64_t states = 0U;
+	uint64_t states = 0U;
 
 	rp = hci_cmd_complete(evt, sizeof(*rp));
 	rp->status = 0x00;
@@ -942,8 +942,8 @@ static void le_read_supp_states(struct net_buf *buf, struct net_buf **evt)
 	 * Initiating State + Active Scanning
 	 */
 	states &= ~(BIT64(22) | BIT64(23));
-	BT_DBG("states: 0x%08x%08x", (u32_t)(states >> 32),
-				     (u32_t)(states & 0xffffffff));
+	BT_DBG("states: 0x%08x%08x", (uint32_t)(states >> 32),
+				     (uint32_t)(states & 0xffffffff));
 	sys_put_le64(states, rp->le_states);
 }
 
@@ -952,14 +952,14 @@ static void le_set_adv_param(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_adv_param *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u16_t min_interval;
-	u8_t status;
+	uint16_t min_interval;
+	uint8_t status;
 
 	min_interval = sys_le16_to_cpu(cmd->min_interval);
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PARAM_CHECK) &&
 	    (cmd->type != BT_HCI_ADV_DIRECT_IND)) {
-		u16_t max_interval = sys_le16_to_cpu(cmd->max_interval);
+		uint16_t max_interval = sys_le16_to_cpu(cmd->max_interval);
 
 		if ((min_interval > max_interval) ||
 		    (min_interval < 0x0020) ||
@@ -1002,7 +1002,7 @@ static void le_set_adv_data(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_adv_data *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 	status = ll_adv_data_set(0, cmd->len, &cmd->data[0]);
@@ -1018,7 +1018,7 @@ static void le_set_scan_rsp_data(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_scan_rsp_data *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 	status = ll_adv_scan_rsp_set(0, cmd->len, &cmd->data[0]);
@@ -1034,7 +1034,7 @@ static void le_set_adv_enable(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_adv_enable *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT) || defined(CONFIG_BT_HCI_MESH_EXT)
 #if defined(CONFIG_BT_HCI_MESH_EXT)
@@ -1056,9 +1056,9 @@ static void le_set_scan_param(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_scan_param *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u16_t interval;
-	u16_t window;
-	u8_t status;
+	uint16_t interval;
+	uint16_t window;
+	uint8_t status;
 
 	interval = sys_le16_to_cpu(cmd->interval);
 	window = sys_le16_to_cpu(cmd->window);
@@ -1074,7 +1074,7 @@ static void le_set_scan_enable(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_scan_enable *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 #if CONFIG_BT_CTLR_DUP_FILTER_LEN > 0
 	/* initialize duplicate filtering */
@@ -1097,12 +1097,12 @@ static void le_set_scan_enable(struct net_buf *buf, struct net_buf **evt)
 static void le_create_connection(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_create_conn *cmd = (void *)buf->data;
-	u16_t supervision_timeout;
-	u16_t conn_interval_max;
-	u16_t scan_interval;
-	u16_t conn_latency;
-	u16_t scan_window;
-	u8_t status;
+	uint16_t supervision_timeout;
+	uint16_t conn_interval_max;
+	uint16_t scan_interval;
+	uint16_t conn_latency;
+	uint16_t scan_window;
+	uint8_t status;
 
 	scan_interval = sys_le16_to_cpu(cmd->scan_interval);
 	scan_window = sys_le16_to_cpu(cmd->scan_window);
@@ -1124,7 +1124,7 @@ static void le_create_conn_cancel(struct net_buf *buf, struct net_buf **evt,
 				  void **node_rx)
 {
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_connect_disable(node_rx);
 
@@ -1136,7 +1136,7 @@ static void le_set_host_chan_classif(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_host_chan_classif *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_chm_update(&cmd->ch_map[0]);
 
@@ -1148,13 +1148,13 @@ static void le_set_host_chan_classif(struct net_buf *buf, struct net_buf **evt)
 static void le_start_encryption(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_start_encryption *cmd = (void *)buf->data;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_enc_req_send(handle,
-				 (u8_t *)&cmd->rand,
-				 (u8_t *)&cmd->ediv,
+				 (uint8_t *)&cmd->rand,
+				 (uint8_t *)&cmd->ediv,
 				 &cmd->ltk[0]);
 
 	*evt = cmd_status(status);
@@ -1168,8 +1168,8 @@ static void le_ltk_req_reply(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_ltk_req_reply *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_ltk_req_reply *rp;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_start_enc_req_send(handle, 0x00, &cmd->ltk[0]);
@@ -1183,8 +1183,8 @@ static void le_ltk_req_neg_reply(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_ltk_req_neg_reply *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_ltk_req_neg_reply *rp;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_start_enc_req_send(handle, BT_HCI_ERR_PIN_OR_KEY_MISSING,
@@ -1200,8 +1200,8 @@ static void le_ltk_req_neg_reply(struct net_buf *buf, struct net_buf **evt)
 static void le_read_remote_features(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_read_remote_features *cmd = (void *)buf->data;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_feature_req_send(handle);
@@ -1213,8 +1213,8 @@ static void le_read_chan_map(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_read_chan_map *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_read_chan_map *rp;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 
@@ -1229,12 +1229,12 @@ static void le_read_chan_map(struct net_buf *buf, struct net_buf **evt)
 static void le_conn_update(struct net_buf *buf, struct net_buf **evt)
 {
 	struct hci_cp_le_conn_update *cmd = (void *)buf->data;
-	u16_t supervision_timeout;
-	u16_t conn_interval_min;
-	u16_t conn_interval_max;
-	u16_t conn_latency;
-	u16_t handle;
-	u8_t status;
+	uint16_t supervision_timeout;
+	uint16_t conn_interval_min;
+	uint16_t conn_interval_max;
+	uint16_t conn_latency;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	conn_interval_min = sys_le16_to_cpu(cmd->conn_interval_min);
@@ -1254,12 +1254,12 @@ static void le_conn_param_req_reply(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_conn_param_req_reply *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_conn_param_req_reply *rp;
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
-	u16_t handle;
-	u8_t status;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	interval_min = sys_le16_to_cpu(cmd->interval_min);
@@ -1280,8 +1280,8 @@ static void le_conn_param_req_neg_reply(struct net_buf *buf,
 {
 	struct bt_hci_cp_le_conn_param_req_neg_reply *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_conn_param_req_neg_reply *rp;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	status = ll_conn_update(handle, 2, cmd->reason, 0, 0, 0, 0);
@@ -1297,10 +1297,10 @@ static void le_set_data_len(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_data_len *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_set_data_len *rp;
-	u16_t tx_octets;
-	u16_t tx_time;
-	u16_t handle;
-	u8_t status;
+	uint16_t tx_octets;
+	uint16_t tx_time;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	tx_octets = sys_le16_to_cpu(cmd->tx_octets);
@@ -1315,8 +1315,8 @@ static void le_set_data_len(struct net_buf *buf, struct net_buf **evt)
 static void le_read_default_data_len(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_rp_le_read_default_data_len *rp;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
 
 	rp = hci_cmd_complete(evt, sizeof(*rp));
 
@@ -1332,9 +1332,9 @@ static void le_write_default_data_len(struct net_buf *buf,
 {
 	struct bt_hci_cp_le_write_default_data_len *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
-	u8_t status;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
+	uint8_t status;
 
 	max_tx_octets = sys_le16_to_cpu(cmd->max_tx_octets);
 	max_tx_time = sys_le16_to_cpu(cmd->max_tx_time);
@@ -1347,10 +1347,10 @@ static void le_write_default_data_len(struct net_buf *buf,
 static void le_read_max_data_len(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_rp_le_read_max_data_len *rp;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
-	u16_t max_rx_octets;
-	u16_t max_rx_time;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
+	uint16_t max_rx_octets;
+	uint16_t max_rx_time;
 
 	rp = hci_cmd_complete(evt, sizeof(*rp));
 
@@ -1370,8 +1370,8 @@ static void le_read_phy(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_read_phy *cmd = (void *)buf->data;
 	struct bt_hci_rp_le_read_phy *rp;
-	u16_t handle;
-	u8_t status;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 
@@ -1389,7 +1389,7 @@ static void le_set_default_phy(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_default_phy *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	if (cmd->all_phys & BT_HCI_LE_PHY_TX_ANY) {
 		cmd->tx_phys = 0x07;
@@ -1407,10 +1407,10 @@ static void le_set_default_phy(struct net_buf *buf, struct net_buf **evt)
 static void le_set_phy(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_phy *cmd = (void *)buf->data;
-	u16_t phy_opts;
-	u8_t mask_phys;
-	u16_t handle;
-	u8_t status;
+	uint16_t phy_opts;
+	uint8_t mask_phys;
+	uint16_t handle;
+	uint8_t status;
 
 	handle = sys_le16_to_cpu(cmd->handle);
 	phy_opts = sys_le16_to_cpu(cmd->phy_opts);
@@ -1463,7 +1463,7 @@ static void le_add_dev_to_rl(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_add_dev_to_rl *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_rl_add(&cmd->peer_id_addr, cmd->peer_irk, cmd->local_irk);
 
@@ -1475,7 +1475,7 @@ static void le_rem_dev_from_rl(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_rem_dev_from_rl *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_rl_remove(&cmd->peer_id_addr);
 
@@ -1530,7 +1530,7 @@ static void le_set_addr_res_enable(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_addr_res_enable *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t enable = cmd->enable;
+	uint8_t enable = cmd->enable;
 
 	ccst = hci_cmd_complete(evt, sizeof(*ccst));
 	ccst->status = ll_rl_enable(enable);
@@ -1540,7 +1540,7 @@ static void le_set_rpa_timeout(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_rpa_timeout *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u16_t timeout = sys_le16_to_cpu(cmd->rpa_timeout);
+	uint16_t timeout = sys_le16_to_cpu(cmd->rpa_timeout);
 
 	ll_rl_timeout_set(timeout);
 
@@ -1552,7 +1552,7 @@ static void le_set_privacy_mode(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_set_privacy_mode *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_priv_mode_set(&cmd->id_addr, cmd->mode);
 
@@ -1575,7 +1575,7 @@ static void le_rx_test(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_rx_test *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_test_rx(cmd->rx_ch, 0x01, 0);
 
@@ -1587,7 +1587,7 @@ static void le_tx_test(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_tx_test *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_test_tx(cmd->tx_ch, cmd->test_data_len, cmd->pkt_payload,
 			    0x01);
@@ -1599,7 +1599,7 @@ static void le_tx_test(struct net_buf *buf, struct net_buf **evt)
 static void le_test_end(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_rp_le_test_end *rp;
-	u16_t rx_pkt_count;
+	uint16_t rx_pkt_count;
 
 	ll_test_end(&rx_pkt_count);
 
@@ -1612,7 +1612,7 @@ static void le_enh_rx_test(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_enh_rx_test *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_test_rx(cmd->rx_ch, cmd->phy, cmd->mod_index);
 
@@ -1624,7 +1624,7 @@ static void le_enh_tx_test(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_le_enh_tx_test *cmd = (void *)buf->data;
 	struct bt_hci_evt_cc_status *ccst;
-	u8_t status;
+	uint8_t status;
 
 	status = ll_test_tx(cmd->tx_ch, cmd->test_data_len, cmd->pkt_payload,
 			    cmd->phy);
@@ -1634,7 +1634,7 @@ static void le_enh_tx_test(struct net_buf *buf, struct net_buf **evt)
 }
 #endif /* CONFIG_BT_CTLR_DTM_HCI */
 
-static int controller_cmd_handle(u16_t  ocf, struct net_buf *cmd,
+static int controller_cmd_handle(uint16_t  ocf, struct net_buf *cmd,
 				 struct net_buf **evt, void **node_rx)
 {
 	switch (ocf) {
@@ -1921,8 +1921,8 @@ static void vs_read_supported_features(struct net_buf *buf,
 	(void)memset(&rp->features[0], 0x00, sizeof(rp->features));
 }
 
-u8_t __weak hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
-					u8_t size)
+uint8_t __weak hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
+					uint8_t size)
 {
 	ARG_UNUSED(addrs);
 	ARG_UNUSED(size);
@@ -1933,7 +1933,7 @@ u8_t __weak hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
 /* If Zephyr VS HCI commands are not enabled provide this functionality directly
  */
 #if !defined(CONFIG_BT_HCI_VS_EXT)
-u8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], u8_t size)
+uint8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], uint8_t size)
 {
 	return hci_vendor_read_static_addr(addrs, size);
 }
@@ -1972,7 +1972,7 @@ static void vs_read_build_info(struct net_buf *buf, struct net_buf **evt)
 	memcpy(rp->info, build_info, sizeof(build_info));
 }
 
-void __weak hci_vendor_read_key_hierarchy_roots(u8_t ir[16], u8_t er[16])
+void __weak hci_vendor_read_key_hierarchy_roots(uint8_t ir[16], uint8_t er[16])
 {
 	/* Mark IR as invalid */
 	(void)memset(ir, 0x00, 16);
@@ -2006,9 +2006,9 @@ static void vs_write_tx_power_level(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_vs_write_tx_power_level *cmd = (void *)buf->data;
 	struct bt_hci_rp_vs_write_tx_power_level *rp;
-	u8_t handle_type;
-	u16_t handle;
-	u8_t status;
+	uint8_t handle_type;
+	uint16_t handle;
+	uint8_t status;
 
 	handle_type = cmd->handle_type;
 	handle = sys_le16_to_cpu(cmd->handle);
@@ -2027,9 +2027,9 @@ static void vs_read_tx_power_level(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_vs_read_tx_power_level *cmd = (void *)buf->data;
 	struct bt_hci_rp_vs_read_tx_power_level *rp;
-	u8_t handle_type;
-	u16_t handle;
-	u8_t status;
+	uint8_t handle_type;
+	uint16_t handle;
+	uint8_t status;
 
 	handle_type = cmd->handle_type;
 	handle = sys_le16_to_cpu(cmd->handle);
@@ -2072,10 +2072,10 @@ static void mesh_set_scan_filter(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_mesh_set_scan_filter *cmd = (void *)buf->data;
 	struct bt_hci_rp_mesh_set_scan_filter *rp;
-	u8_t filter = cmd->scan_filter - 1;
+	uint8_t filter = cmd->scan_filter - 1;
 	struct scan_filter *f;
-	u8_t status = 0x00;
-	u8_t i;
+	uint8_t status = 0x00;
+	uint8_t i;
 
 	if (filter > ARRAY_SIZE(scan_filters) ||
 	    cmd->num_patterns > CONFIG_BT_CTLR_MESH_SF_PATTERNS) {
@@ -2119,8 +2119,8 @@ static void mesh_advertise(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_mesh_advertise *cmd = (void *)buf->data;
 	struct bt_hci_rp_mesh_advertise *rp;
-	u8_t adv_slot = cmd->adv_slot;
-	u8_t status;
+	uint8_t adv_slot = cmd->adv_slot;
+	uint8_t status;
 
 	status = ll_mesh_advertise(adv_slot,
 				   cmd->own_addr_type, cmd->random_addr.val,
@@ -2144,8 +2144,8 @@ static void mesh_advertise_cancel(struct net_buf *buf, struct net_buf **evt)
 {
 	struct bt_hci_cp_mesh_advertise_cancel *cmd = (void *)buf->data;
 	struct bt_hci_rp_mesh_advertise_cancel *rp;
-	u8_t adv_slot = cmd->adv_slot;
-	u8_t status;
+	uint8_t adv_slot = cmd->adv_slot;
+	uint8_t status;
 
 	status = ll_mesh_advertise_cancel(adv_slot);
 	if (!status) {
@@ -2162,7 +2162,7 @@ static void mesh_advertise_cancel(struct net_buf *buf, struct net_buf **evt)
 static int mesh_cmd_handle(struct net_buf *cmd, struct net_buf **evt)
 {
 	struct bt_hci_cp_mesh *cp_mesh;
-	u8_t mesh_op;
+	uint8_t mesh_op;
 
 	if (cmd->len < sizeof(*cp_mesh)) {
 		BT_ERR("No HCI VSD Command header");
@@ -2197,7 +2197,7 @@ static int mesh_cmd_handle(struct net_buf *cmd, struct net_buf **evt)
 }
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 
-int hci_vendor_cmd_handle_common(u16_t ocf, struct net_buf *cmd,
+int hci_vendor_cmd_handle_common(uint16_t ocf, struct net_buf *cmd,
 				 struct net_buf **evt)
 {
 	switch (ocf) {
@@ -2267,7 +2267,7 @@ struct net_buf *hci_cmd_handle(struct net_buf *cmd, void **node_rx)
 {
 	struct bt_hci_cmd_hdr *chdr;
 	struct net_buf *evt = NULL;
-	u16_t ocf;
+	uint16_t ocf;
 	int err;
 
 	if (cmd->len < sizeof(*chdr)) {
@@ -2340,9 +2340,9 @@ int hci_acl_handle(struct net_buf *buf, struct net_buf **evt)
 	struct node_tx *node_tx;
 	struct bt_hci_acl_hdr *acl;
 	struct pdu_data *pdu_data;
-	u16_t handle;
-	u8_t flags;
-	u16_t len;
+	uint16_t handle;
+	uint8_t flags;
+	uint16_t len;
 
 	*evt = NULL;
 
@@ -2451,7 +2451,7 @@ static inline bool dup_found(struct pdu_adv *adv)
 
 #if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
 static inline void le_dir_adv_report(struct pdu_adv *adv, struct net_buf *buf,
-				     s8_t rssi, u8_t rl_idx)
+				     int8_t rssi, uint8_t rl_idx)
 {
 	struct bt_hci_evt_le_direct_adv_report *drp;
 	struct bt_hci_evt_le_direct_adv_info *dir_info;
@@ -2473,7 +2473,7 @@ static inline void le_dir_adv_report(struct pdu_adv *adv, struct net_buf *buf,
 		       sizeof(*drp) + sizeof(*dir_info));
 
 	drp->num_reports = 1U;
-	dir_info = (void *)(((u8_t *)drp) + sizeof(*drp));
+	dir_info = (void *)(((uint8_t *)drp) + sizeof(*drp));
 
 	/* Directed Advertising */
 	dir_info->evt_type = BT_HCI_ADV_DIRECT_IND;
@@ -2504,7 +2504,7 @@ static inline void le_dir_adv_report(struct pdu_adv *adv, struct net_buf *buf,
 
 #if defined(CONFIG_BT_OBSERVER)
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-static inline bool scan_filter_apply(u8_t filter, u8_t *data, u8_t len)
+static inline bool scan_filter_apply(uint8_t filter, uint8_t *data, uint8_t len)
 {
 	struct scan_filter *f = &scan_filters[filter];
 	int i;
@@ -2523,16 +2523,16 @@ static inline bool scan_filter_apply(u8_t filter, u8_t *data, u8_t len)
 
 static inline void le_mesh_scan_report(struct pdu_adv *adv,
 				       struct node_rx_pdu *node_rx,
-				       struct net_buf *buf, s8_t rssi)
+				       struct net_buf *buf, int8_t rssi)
 {
-	u8_t data_len = (adv->len - BDADDR_SIZE);
+	uint8_t data_len = (adv->len - BDADDR_SIZE);
 	struct bt_hci_evt_mesh_scanning_report *mep;
 	struct bt_hci_evt_mesh_scan_report *sr;
-	u32_t instant;
+	uint32_t instant;
 #if !defined(CONFIG_BT_LL_SW_SPLIT)
-	u8_t *extra;
+	uint8_t *extra;
 #endif
-	u8_t chan;
+	uint8_t chan;
 
 	LL_ASSERT(adv->type == PDU_ADV_TYPE_NONCONN_IND);
 
@@ -2559,12 +2559,12 @@ static inline void le_mesh_scan_report(struct pdu_adv *adv,
 			    sizeof(*mep) + sizeof(*sr));
 
 	mep->num_reports = 1U;
-	sr = (void *)(((u8_t *)mep) + sizeof(*mep));
+	sr = (void *)(((uint8_t *)mep) + sizeof(*mep));
 	sr->addr.type = adv->tx_addr;
 	memcpy(&sr->addr.a.val[0], &adv->adv_ind.addr[0], sizeof(bt_addr_t));
 	sr->chan = chan;
 	sr->rssi = rssi;
-	sys_put_le32(instant, (u8_t *)&sr->instant);
+	sys_put_le32(instant, (uint8_t *)&sr->instant);
 
 	sr->data_len = data_len;
 	memcpy(&sr->data[0], &adv->adv_ind.data[0], data_len);
@@ -2575,24 +2575,24 @@ static void le_advertising_report(struct pdu_data *pdu_data,
 				  struct node_rx_pdu *node_rx,
 				  struct net_buf *buf)
 {
-	const u8_t c_adv_type[] = { 0x00, 0x01, 0x03, 0xff, 0x04,
+	const uint8_t c_adv_type[] = { 0x00, 0x01, 0x03, 0xff, 0x04,
 				    0xff, 0x02 };
 	struct bt_hci_evt_le_advertising_report *sep;
 	struct pdu_adv *adv = (void *)pdu_data;
 	struct bt_hci_evt_le_advertising_info *adv_info;
-	u8_t data_len;
-	u8_t info_len;
+	uint8_t data_len;
+	uint8_t info_len;
 #if !defined(CONFIG_BT_LL_SW_SPLIT)
-	u8_t *extra;
+	uint8_t *extra;
 #endif
-	s8_t rssi;
+	int8_t rssi;
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t rl_idx;
+	uint8_t rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 #if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
-	u8_t direct;
+	uint8_t direct;
 #endif /* CONFIG_BT_CTLR_EXT_SCAN_FP */
-	s8_t *prssi;
+	int8_t *prssi;
 
 #if defined(CONFIG_BT_LL_SW_SPLIT)
 	rssi = -(node_rx->hdr.rx_ftr.rssi);
@@ -2665,7 +2665,7 @@ static void le_advertising_report(struct pdu_data *pdu_data,
 		       sizeof(*sep) + info_len);
 
 	sep->num_reports = 1U;
-	adv_info = (void *)(((u8_t *)sep) + sizeof(*sep));
+	adv_info = (void *)(((uint8_t *)sep) + sizeof(*sep));
 
 	adv_info->evt_type = c_adv_type[adv->type];
 
@@ -2696,12 +2696,12 @@ static void le_advertising_report(struct pdu_data *pdu_data,
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 static void le_adv_ext_report(struct pdu_data *pdu_data,
 			      struct node_rx_pdu *node_rx,
-			      struct net_buf *buf, u8_t phy)
+			      struct net_buf *buf, uint8_t phy)
 {
 	struct pdu_adv *adv = (void *)pdu_data;
-	s8_t rssi;
+	int8_t rssi;
 #if !defined(CONFIG_BT_LL_SW_SPLIT)
-	u8_t *extra;
+	uint8_t *extra;
 #endif
 
 #if defined(CONFIG_BT_LL_SW_SPLIT)
@@ -2718,11 +2718,11 @@ static void le_adv_ext_report(struct pdu_data *pdu_data,
 	if ((adv->type == PDU_ADV_TYPE_EXT_IND) && adv->len) {
 		struct pdu_adv_com_ext_adv *p;
 		struct ext_adv_hdr *h;
-		u8_t *ptr;
+		uint8_t *ptr;
 
 		p = (void *)&adv->adv_ext_ind;
 		h = (void *)p->ext_hdr_adi_adv_data;
-		ptr = (u8_t *)h + sizeof(*h);
+		ptr = (uint8_t *)h + sizeof(*h);
 
 		BT_DBG("Ext. adv mode= 0x%x, hdr len= %u", p->adv_mode,
 		       p->ext_hdr_len);
@@ -2742,9 +2742,9 @@ static void le_adv_ext_report(struct pdu_data *pdu_data,
 		}
 
 		if (h->tx_pwr) {
-			s8_t tx_pwr;
+			int8_t tx_pwr;
 
-			tx_pwr = *(s8_t *)ptr;
+			tx_pwr = *(int8_t *)ptr;
 			ptr++;
 
 			BT_DBG("Tx pwr= %d dB", tx_pwr);
@@ -2786,11 +2786,11 @@ static void le_scan_req_received(struct pdu_data *pdu_data,
 	if (!(event_mask & BT_EVT_MASK_LE_META_EVENT) ||
 	    !(le_event_mask & BT_EVT_MASK_LE_SCAN_REQ_RECEIVED)) {
 		bt_addr_le_t addr;
-		u8_t handle;
+		uint8_t handle;
 #if !defined(CONFIG_BT_LL_SW_SPLIT)
-		u8_t *extra;
+		uint8_t *extra;
 #endif
-		s8_t rssi;
+		int8_t rssi;
 
 		handle = 0U;
 		addr.type = adv->tx_addr;
@@ -2820,12 +2820,12 @@ static void le_scan_req_received(struct pdu_data *pdu_data,
 #endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */
 
 #if defined(CONFIG_BT_CONN)
-static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle,
+static void le_conn_complete(struct pdu_data *pdu_data, uint16_t handle,
 			     struct net_buf *buf)
 {
 	struct node_rx_cc *node_rx = (void *)pdu_data;
 	struct bt_hci_evt_le_conn_complete *lecc;
-	u8_t status = node_rx->status;
+	uint8_t status = node_rx->status;
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (!status) {
@@ -2903,7 +2903,7 @@ static void le_conn_complete(struct pdu_data *pdu_data, u16_t handle,
 	lecc->clock_accuracy = node_rx->sca;
 }
 
-static void disconn_complete(struct pdu_data *pdu_data, u16_t handle,
+static void disconn_complete(struct pdu_data *pdu_data, uint16_t handle,
 			     struct net_buf *buf)
 {
 	struct bt_hci_evt_disconn_complete *ep;
@@ -2917,7 +2917,7 @@ static void disconn_complete(struct pdu_data *pdu_data, u16_t handle,
 
 	ep->status = 0x00;
 	ep->handle = sys_cpu_to_le16(handle);
-	ep->reason = *((u8_t *)pdu_data);
+	ep->reason = *((uint8_t *)pdu_data);
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 	/* Clear any pending packets upon disconnection */
@@ -2929,7 +2929,7 @@ static void disconn_complete(struct pdu_data *pdu_data, u16_t handle,
 	conn_count--;
 }
 
-static void le_conn_update_complete(struct pdu_data *pdu_data, u16_t handle,
+static void le_conn_update_complete(struct pdu_data *pdu_data, uint16_t handle,
 				    struct net_buf *buf)
 {
 	struct bt_hci_evt_le_conn_update_complete *sep;
@@ -2951,7 +2951,7 @@ static void le_conn_update_complete(struct pdu_data *pdu_data, u16_t handle,
 }
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-static void enc_refresh_complete(struct pdu_data *pdu_data, u16_t handle,
+static void enc_refresh_complete(struct pdu_data *pdu_data, uint16_t handle,
 				 struct net_buf *buf)
 {
 	struct bt_hci_evt_encrypt_key_refresh_complete *ep;
@@ -2970,7 +2970,7 @@ static void enc_refresh_complete(struct pdu_data *pdu_data, u16_t handle,
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
-static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle,
+static void auth_payload_timeout_exp(struct pdu_data *pdu_data, uint16_t handle,
 				     struct net_buf *buf)
 {
 	struct bt_hci_evt_auth_payload_timeout_exp *ep;
@@ -2987,7 +2987,7 @@ static void auth_payload_timeout_exp(struct pdu_data *pdu_data, u16_t handle,
 #endif /* CONFIG_BT_CTLR_LE_PING */
 
 #if defined(CONFIG_BT_CTLR_CHAN_SEL_2)
-static void le_chan_sel_algo(struct pdu_data *pdu_data, u16_t handle,
+static void le_chan_sel_algo(struct pdu_data *pdu_data, uint16_t handle,
 			     struct net_buf *buf)
 {
 	struct bt_hci_evt_le_chan_sel_algo *sep;
@@ -3009,7 +3009,7 @@ static void le_chan_sel_algo(struct pdu_data *pdu_data, u16_t handle,
 #endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */
 
 #if defined(CONFIG_BT_CTLR_PHY)
-static void le_phy_upd_complete(struct pdu_data *pdu_data, u16_t handle,
+static void le_phy_upd_complete(struct pdu_data *pdu_data, uint16_t handle,
 				struct net_buf *buf)
 {
 	struct bt_hci_evt_le_phy_update_complete *sep;
@@ -3044,7 +3044,7 @@ static void mesh_adv_cplt(struct pdu_data *pdu_data,
 	struct bt_hci_evt_mesh_adv_complete *mep;
 
 	mep = mesh_evt(buf, BT_HCI_EVT_MESH_ADV_COMPLETE, sizeof(*mep));
-	mep->adv_slot = ((u8_t *)pdu_data)[0];
+	mep->adv_slot = ((uint8_t *)pdu_data)[0];
 }
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 
@@ -3059,7 +3059,7 @@ static void mesh_adv_cplt(struct pdu_data *pdu_data,
 static void encode_control(struct node_rx_pdu *node_rx,
 			   struct pdu_data *pdu_data, struct net_buf *buf)
 {
-	u16_t handle;
+	uint16_t handle;
 
 	handle = node_rx->hdr.handle;
 
@@ -3178,7 +3178,7 @@ static void encode_control(struct node_rx_pdu *node_rx,
 }
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-static void le_ltk_request(struct pdu_data *pdu_data, u16_t handle,
+static void le_ltk_request(struct pdu_data *pdu_data, uint16_t handle,
 			   struct net_buf *buf)
 {
 	struct bt_hci_evt_le_ltk_request *sep;
@@ -3191,11 +3191,11 @@ static void le_ltk_request(struct pdu_data *pdu_data, u16_t handle,
 	sep = meta_evt(buf, BT_HCI_EVT_LE_LTK_REQUEST, sizeof(*sep));
 
 	sep->handle = sys_cpu_to_le16(handle);
-	memcpy(&sep->rand, pdu_data->llctrl.enc_req.rand, sizeof(u64_t));
-	memcpy(&sep->ediv, pdu_data->llctrl.enc_req.ediv, sizeof(u16_t));
+	memcpy(&sep->rand, pdu_data->llctrl.enc_req.rand, sizeof(uint64_t));
+	memcpy(&sep->ediv, pdu_data->llctrl.enc_req.ediv, sizeof(uint16_t));
 }
 
-static void encrypt_change(u8_t err, u16_t handle,
+static void encrypt_change(uint8_t err, uint16_t handle,
 			   struct net_buf *buf)
 {
 	struct bt_hci_evt_encrypt_change *ep;
@@ -3213,8 +3213,8 @@ static void encrypt_change(u8_t err, u16_t handle,
 }
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
-static void le_remote_feat_complete(u8_t status, struct pdu_data *pdu_data,
-				    u16_t handle, struct net_buf *buf)
+static void le_remote_feat_complete(uint8_t status, struct pdu_data *pdu_data,
+				    uint16_t handle, struct net_buf *buf)
 {
 	struct bt_hci_evt_le_remote_feat_complete *sep;
 
@@ -3236,7 +3236,7 @@ static void le_remote_feat_complete(u8_t status, struct pdu_data *pdu_data,
 	}
 }
 
-static void le_unknown_rsp(struct pdu_data *pdu_data, u16_t handle,
+static void le_unknown_rsp(struct pdu_data *pdu_data, uint16_t handle,
 			   struct net_buf *buf)
 {
 
@@ -3253,7 +3253,7 @@ static void le_unknown_rsp(struct pdu_data *pdu_data, u16_t handle,
 }
 
 #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
-static void le_conn_param_req(struct pdu_data *pdu_data, u16_t handle,
+static void le_conn_param_req(struct pdu_data *pdu_data, uint16_t handle,
 			      struct net_buf *buf)
 {
 	struct bt_hci_evt_le_conn_param_req *sep;
@@ -3278,7 +3278,7 @@ static void le_conn_param_req(struct pdu_data *pdu_data, u16_t handle,
 #endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-static void le_data_len_change(struct pdu_data *pdu_data, u16_t handle,
+static void le_data_len_change(struct pdu_data *pdu_data, uint16_t handle,
 			       struct net_buf *buf)
 {
 	struct bt_hci_evt_le_data_len_change *sep;
@@ -3299,7 +3299,7 @@ static void le_data_len_change(struct pdu_data *pdu_data, u16_t handle,
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #if defined(CONFIG_BT_REMOTE_VERSION)
-void hci_remote_version_info_encode(struct pdu_data *pdu_data, u16_t handle,
+void hci_remote_version_info_encode(struct pdu_data *pdu_data, uint16_t handle,
 				    struct net_buf *buf)
 {
 	struct pdu_data_llctrl_version_ind *ver_ind;
@@ -3324,7 +3324,7 @@ void hci_remote_version_info_encode(struct pdu_data *pdu_data, u16_t handle,
 static void encode_data_ctrl(struct node_rx_pdu *node_rx,
 			     struct pdu_data *pdu_data, struct net_buf *buf)
 {
-	u16_t handle = node_rx->hdr.handle;
+	uint16_t handle = node_rx->hdr.handle;
 
 	switch (pdu_data->llctrl.opcode) {
 
@@ -3383,9 +3383,9 @@ void hci_acl_encode(struct node_rx_pdu *node_rx, struct net_buf *buf)
 {
 	struct pdu_data *pdu_data = PDU_DATA(node_rx);
 	struct bt_hci_acl_hdr *acl;
-	u16_t handle_flags;
-	u16_t handle;
-	u8_t *data;
+	uint16_t handle_flags;
+	uint16_t handle;
+	uint8_t *data;
 
 	handle = node_rx->hdr.handle;
 
@@ -3435,12 +3435,12 @@ void hci_evt_encode(struct node_rx_pdu *node_rx, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_CONN)
-void hci_num_cmplt_encode(struct net_buf *buf, u16_t handle, u8_t num)
+void hci_num_cmplt_encode(struct net_buf *buf, uint16_t handle, uint8_t num)
 {
 	struct bt_hci_evt_num_completed_packets *ep;
 	struct bt_hci_handle_count *hc;
-	u8_t num_handles;
-	u8_t len;
+	uint8_t num_handles;
+	uint8_t len;
 
 	num_handles = 1U;
 
@@ -3455,7 +3455,7 @@ void hci_num_cmplt_encode(struct net_buf *buf, u16_t handle, u8_t num)
 }
 #endif /* CONFIG_BT_CONN */
 
-u8_t hci_get_class(struct node_rx_pdu *node_rx)
+uint8_t hci_get_class(struct node_rx_pdu *node_rx)
 {
 #if defined(CONFIG_BT_CONN)
 	struct pdu_data *pdu_data = PDU_DATA(node_rx);
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
index 70b41f6f4e..f0a26a5b28 100644
--- a/subsys/bluetooth/controller/hci/hci_driver.c
+++ b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -66,7 +66,7 @@ static K_THREAD_STACK_DEFINE(recv_thread_stack, CONFIG_BT_RX_STACK_SIZE);
 static struct k_poll_signal hbuf_signal =
 		K_POLL_SIGNAL_INITIALIZER(hbuf_signal);
 static sys_slist_t hbuf_pend;
-static s32_t hbuf_count;
+static int32_t hbuf_count;
 #endif
 
 static struct net_buf *process_prio_evt(struct node_rx_pdu *node_rx)
@@ -88,8 +88,8 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 	while (1) {
 		struct node_rx_pdu *node_rx;
 		struct net_buf *buf;
-		u8_t num_cmplt;
-		u16_t handle;
+		uint8_t num_cmplt;
+		uint16_t handle;
 
 		/* While there are completed rx nodes */
 		while ((num_cmplt = ll_rx_get((void *)&node_rx, &handle))) {
@@ -149,7 +149,7 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
 }
 
 static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
-					  s8_t class)
+					  int8_t class)
 {
 	struct net_buf *buf = NULL;
 
@@ -189,7 +189,7 @@ static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
 
 static inline struct net_buf *process_node(struct node_rx_pdu *node_rx)
 {
-	u8_t class = node_rx->hdr.user_meta;
+	uint8_t class = node_rx->hdr.user_meta;
 	struct net_buf *buf = NULL;
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
@@ -231,9 +231,9 @@ static inline struct net_buf *process_hbuf(struct node_rx_pdu *n)
 {
 	/* shadow total count in case of preemption */
 	struct node_rx_pdu *node_rx = NULL;
-	s32_t hbuf_total = hci_hbuf_total;
+	int32_t hbuf_total = hci_hbuf_total;
 	struct net_buf *buf = NULL;
-	u8_t class;
+	uint8_t class;
 	int reset;
 
 	reset = atomic_test_and_clear_bit(&hci_state_mask, HCI_STATE_BIT_RESET);
@@ -419,7 +419,7 @@ static int acl_handle(struct net_buf *buf)
 
 static int hci_driver_send(struct net_buf *buf)
 {
-	u8_t type;
+	uint8_t type;
 	int err;
 
 	BT_DBG("enter");
@@ -455,7 +455,7 @@ static int hci_driver_send(struct net_buf *buf)
 
 static int hci_driver_open(void)
 {
-	u32_t err;
+	uint32_t err;
 
 	DEBUG_INIT();
 
diff --git a/subsys/bluetooth/controller/hci/hci_internal.h b/subsys/bluetooth/controller/hci/hci_internal.h
index 3afd11d8a6..8b6b0c9db6 100644
--- a/subsys/bluetooth/controller/hci/hci_internal.h
+++ b/subsys/bluetooth/controller/hci/hci_internal.h
@@ -6,9 +6,9 @@
  */
 
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
-extern s32_t    hci_hbuf_total;
-extern u32_t    hci_hbuf_sent;
-extern u32_t    hci_hbuf_acked;
+extern int32_t    hci_hbuf_total;
+extern uint32_t    hci_hbuf_sent;
+extern uint32_t    hci_hbuf_acked;
 extern atomic_t hci_state_mask;
 
 #define HCI_STATE_BIT_RESET 0
@@ -41,18 +41,18 @@ extern atomic_t hci_state_mask;
 void hci_init(struct k_poll_signal *signal_host_buf);
 struct net_buf *hci_cmd_handle(struct net_buf *cmd, void **node_rx);
 void hci_evt_encode(struct node_rx_pdu *node_rx, struct net_buf *buf);
-u8_t hci_get_class(struct node_rx_pdu *node_rx);
+uint8_t hci_get_class(struct node_rx_pdu *node_rx);
 #if defined(CONFIG_BT_CONN)
 int hci_acl_handle(struct net_buf *acl, struct net_buf **evt);
 void hci_acl_encode(struct node_rx_pdu *node_rx, struct net_buf *buf);
-void hci_num_cmplt_encode(struct net_buf *buf, u16_t handle, u8_t num);
+void hci_num_cmplt_encode(struct net_buf *buf, uint16_t handle, uint8_t num);
 #endif
-int hci_vendor_cmd_handle(u16_t ocf, struct net_buf *cmd,
+int hci_vendor_cmd_handle(uint16_t ocf, struct net_buf *cmd,
 			  struct net_buf **evt);
-u8_t hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
-				 u8_t size);
-void hci_vendor_read_key_hierarchy_roots(u8_t ir[16], u8_t er[16]);
-int hci_vendor_cmd_handle_common(u16_t ocf, struct net_buf *cmd,
+uint8_t hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
+				 uint8_t size);
+void hci_vendor_read_key_hierarchy_roots(uint8_t ir[16], uint8_t er[16]);
+int hci_vendor_cmd_handle_common(uint16_t ocf, struct net_buf *cmd,
 			     struct net_buf **evt);
-void *hci_cmd_complete(struct net_buf **buf, u8_t plen);
-void hci_evt_create(struct net_buf *buf, u8_t evt, u8_t len);
+void *hci_cmd_complete(struct net_buf **buf, uint8_t plen);
+void hci_evt_create(struct net_buf *buf, uint8_t evt, uint8_t len);
diff --git a/subsys/bluetooth/controller/hci/hci_user_ext.h b/subsys/bluetooth/controller/hci/hci_user_ext.h
index 4dbf977d0e..3fcdf7e04a 100644
--- a/subsys/bluetooth/controller/hci/hci_user_ext.h
+++ b/subsys/bluetooth/controller/hci/hci_user_ext.h
@@ -8,5 +8,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-s8_t hci_user_ext_get_class(struct node_rx_pdu *node_rx);
+int8_t hci_user_ext_get_class(struct node_rx_pdu *node_rx);
 void hci_user_ext_encode_control(struct node_rx_pdu *node_rx, struct pdu_data *pdu_data, struct net_buf *buf);
diff --git a/subsys/bluetooth/controller/hci/nordic/hci_vendor.c b/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
index 4bdf284909..1c0b6120e4 100644
--- a/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
+++ b/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
@@ -11,8 +11,8 @@
 
 #include <nrf.h>
 
-u8_t hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
-				 u8_t size)
+uint8_t hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
+				 uint8_t size)
 {
 	/* only one supported */
 	ARG_UNUSED(size);
@@ -52,7 +52,7 @@ u8_t hci_vendor_read_static_addr(struct bt_hci_vs_static_addr addrs[],
 	return 0;
 }
 
-void hci_vendor_read_key_hierarchy_roots(u8_t ir[16], u8_t er[16])
+void hci_vendor_read_key_hierarchy_roots(uint8_t ir[16], uint8_t er[16])
 {
 	/* Mark IR as invalid.
 	 * No public address is available, and static address IR should be read
diff --git a/subsys/bluetooth/controller/hci/nordic/hci_vendor.h b/subsys/bluetooth/controller/hci/nordic/hci_vendor.h
index 7b42bd705f..4d3245728e 100644
--- a/subsys/bluetooth/controller/hci/nordic/hci_vendor.h
+++ b/subsys/bluetooth/controller/hci/nordic/hci_vendor.h
@@ -19,7 +19,7 @@
 #endif /* CONFIG_SOC_COMPATIBLE_NRF */
 
 /* Map vendor command handler directly to common implementation */
-inline int hci_vendor_cmd_handle(u16_t ocf, struct net_buf *cmd,
+inline int hci_vendor_cmd_handle(uint16_t ocf, struct net_buf *cmd,
 				 struct net_buf **evt)
 {
 	return hci_vendor_cmd_handle_common(ocf, cmd, evt);
diff --git a/subsys/bluetooth/controller/hci/openisa/hci_vendor.h b/subsys/bluetooth/controller/hci/openisa/hci_vendor.h
index c90052dcb5..68519cc147 100644
--- a/subsys/bluetooth/controller/hci/openisa/hci_vendor.h
+++ b/subsys/bluetooth/controller/hci/openisa/hci_vendor.h
@@ -8,7 +8,7 @@
 #define BT_HCI_VS_HW_VAR  0
 
 /* Map vendor command handler directly to common implementation */
-inline int hci_vendor_cmd_handle(u16_t ocf, struct net_buf *cmd,
+inline int hci_vendor_cmd_handle(uint16_t ocf, struct net_buf *cmd,
 				 struct net_buf **evt)
 {
 	return hci_vendor_cmd_handle_common(ocf, cmd, evt);
diff --git a/subsys/bluetooth/controller/include/ll.h b/subsys/bluetooth/controller/include/ll.h
index 06c06cf444..3efb40681f 100644
--- a/subsys/bluetooth/controller/include/ll.h
+++ b/subsys/bluetooth/controller/include/ll.h
@@ -10,107 +10,107 @@
 int ll_init(struct k_sem *sem_rx);
 void ll_reset(void);
 
-u8_t *ll_addr_get(u8_t addr_type, u8_t *p_bdaddr);
-u8_t ll_addr_set(u8_t addr_type, u8_t const *const p_bdaddr);
+uint8_t *ll_addr_get(uint8_t addr_type, uint8_t *p_bdaddr);
+uint8_t ll_addr_set(uint8_t addr_type, uint8_t const *const p_bdaddr);
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-u8_t ll_adv_params_set(u8_t handle, u16_t evt_prop, u32_t interval,
-		       u8_t adv_type, u8_t own_addr_type,
-		       u8_t direct_addr_type, u8_t const *const direct_addr,
-		       u8_t chan_map, u8_t filter_policy, u8_t *tx_pwr,
-		       u8_t phy_p, u8_t skip, u8_t phy_s, u8_t sid, u8_t sreq);
-u8_t ll_adv_data_set(u16_t handle, u8_t len, u8_t const *const p_data);
-u8_t ll_adv_scan_rsp_set(u16_t handle, u8_t len, u8_t const *const p_data);
+uint8_t ll_adv_params_set(uint8_t handle, uint16_t evt_prop, uint32_t interval,
+		       uint8_t adv_type, uint8_t own_addr_type,
+		       uint8_t direct_addr_type, uint8_t const *const direct_addr,
+		       uint8_t chan_map, uint8_t filter_policy, uint8_t *tx_pwr,
+		       uint8_t phy_p, uint8_t skip, uint8_t phy_s, uint8_t sid, uint8_t sreq);
+uint8_t ll_adv_data_set(uint16_t handle, uint8_t len, uint8_t const *const p_data);
+uint8_t ll_adv_scan_rsp_set(uint16_t handle, uint8_t len, uint8_t const *const p_data);
 #else /* !CONFIG_BT_CTLR_ADV_EXT */
-u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
-		       u8_t own_addr_type, u8_t direct_addr_type,
-		       u8_t const *const direct_addr, u8_t chan_map,
-		       u8_t filter_policy);
-u8_t ll_adv_data_set(u8_t len, u8_t const *const p_data);
-u8_t ll_adv_scan_rsp_set(u8_t len, u8_t const *const p_data);
+uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
+		       uint8_t own_addr_type, uint8_t direct_addr_type,
+		       uint8_t const *const direct_addr, uint8_t chan_map,
+		       uint8_t filter_policy);
+uint8_t ll_adv_data_set(uint8_t len, uint8_t const *const p_data);
+uint8_t ll_adv_scan_rsp_set(uint8_t len, uint8_t const *const p_data);
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT) || defined(CONFIG_BT_HCI_MESH_EXT)
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-u8_t ll_adv_enable(u16_t handle, u8_t enable,
-		   u8_t at_anchor, u32_t ticks_anchor, u8_t retry,
-		   u8_t scan_window, u8_t scan_delay);
+uint8_t ll_adv_enable(uint16_t handle, uint8_t enable,
+		   uint8_t at_anchor, uint32_t ticks_anchor, uint8_t retry,
+		   uint8_t scan_window, uint8_t scan_delay);
 #else /* !CONFIG_BT_HCI_MESH_EXT */
-u8_t ll_adv_enable(u16_t handle, u8_t enable);
+uint8_t ll_adv_enable(uint16_t handle, uint8_t enable);
 #endif /* !CONFIG_BT_HCI_MESH_EXT */
 #else /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */
-u8_t ll_adv_enable(u8_t enable);
+uint8_t ll_adv_enable(uint8_t enable);
 #endif /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */
 
-u8_t ll_scan_params_set(u8_t type, u16_t interval, u16_t window,
-			u8_t own_addr_type, u8_t filter_policy);
-u8_t ll_scan_enable(u8_t enable);
+uint8_t ll_scan_params_set(uint8_t type, uint16_t interval, uint16_t window,
+			uint8_t own_addr_type, uint8_t filter_policy);
+uint8_t ll_scan_enable(uint8_t enable);
 
-u8_t ll_wl_size_get(void);
-u8_t ll_wl_clear(void);
-u8_t ll_wl_add(bt_addr_le_t *addr);
-u8_t ll_wl_remove(bt_addr_le_t *addr);
+uint8_t ll_wl_size_get(void);
+uint8_t ll_wl_clear(void);
+uint8_t ll_wl_add(bt_addr_le_t *addr);
+uint8_t ll_wl_remove(bt_addr_le_t *addr);
 
-void ll_rl_id_addr_get(u8_t rl_idx, u8_t *id_addr_type, u8_t *id_addr);
-u8_t ll_rl_size_get(void);
-u8_t ll_rl_clear(void);
-u8_t ll_rl_add(bt_addr_le_t *id_addr, const u8_t pirk[16],
-		const u8_t lirk[16]);
-u8_t ll_rl_remove(bt_addr_le_t *id_addr);
-void ll_rl_crpa_set(u8_t id_addr_type, u8_t *id_addr, u8_t rl_idx, u8_t *crpa);
-u8_t ll_rl_crpa_get(bt_addr_le_t *id_addr, bt_addr_t *crpa);
-u8_t ll_rl_lrpa_get(bt_addr_le_t *id_addr, bt_addr_t *lrpa);
-u8_t ll_rl_enable(u8_t enable);
-void  ll_rl_timeout_set(u16_t timeout);
-u8_t ll_priv_mode_set(bt_addr_le_t *id_addr, u8_t mode);
+void ll_rl_id_addr_get(uint8_t rl_idx, uint8_t *id_addr_type, uint8_t *id_addr);
+uint8_t ll_rl_size_get(void);
+uint8_t ll_rl_clear(void);
+uint8_t ll_rl_add(bt_addr_le_t *id_addr, const uint8_t pirk[16],
+		const uint8_t lirk[16]);
+uint8_t ll_rl_remove(bt_addr_le_t *id_addr);
+void ll_rl_crpa_set(uint8_t id_addr_type, uint8_t *id_addr, uint8_t rl_idx, uint8_t *crpa);
+uint8_t ll_rl_crpa_get(bt_addr_le_t *id_addr, bt_addr_t *crpa);
+uint8_t ll_rl_lrpa_get(bt_addr_le_t *id_addr, bt_addr_t *lrpa);
+uint8_t ll_rl_enable(uint8_t enable);
+void  ll_rl_timeout_set(uint16_t timeout);
+uint8_t ll_priv_mode_set(bt_addr_le_t *id_addr, uint8_t mode);
 
-u8_t ll_create_connection(u16_t scan_interval, u16_t scan_window,
-			  u8_t filter_policy, u8_t peer_addr_type,
-			  u8_t *peer_addr, u8_t own_addr_type,
-			  u16_t interval, u16_t latency, u16_t timeout);
-u8_t ll_connect_disable(void **rx);
-u8_t ll_conn_update(u16_t handle, u8_t cmd, u8_t status, u16_t interval_min,
-		    u16_t interval_max, u16_t latency, u16_t timeout);
-u8_t ll_chm_update(u8_t *chm);
-u8_t ll_chm_get(u16_t handle, u8_t *chm);
-u8_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv,
-		     u8_t *ltk);
-u8_t ll_start_enc_req_send(u16_t handle, u8_t err_code,
-			   u8_t const *const ltk);
-u8_t ll_feature_req_send(u16_t handle);
-u8_t ll_version_ind_send(u16_t handle);
-u8_t ll_terminate_ind_send(u16_t handle, u8_t reason);
-u8_t ll_rssi_get(u16_t handle, u8_t *rssi);
-u8_t ll_tx_pwr_lvl_get(u8_t handle_type,
-		       u16_t handle, u8_t type, s8_t *tx_pwr_lvl);
-void ll_tx_pwr_get(s8_t *min, s8_t *max);
-u8_t ll_tx_pwr_lvl_set(u8_t handle_type,
-		       u16_t handle, s8_t *tx_pwr_lvl);
+uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
+			  uint8_t filter_policy, uint8_t peer_addr_type,
+			  uint8_t *peer_addr, uint8_t own_addr_type,
+			  uint16_t interval, uint16_t latency, uint16_t timeout);
+uint8_t ll_connect_disable(void **rx);
+uint8_t ll_conn_update(uint16_t handle, uint8_t cmd, uint8_t status, uint16_t interval_min,
+		    uint16_t interval_max, uint16_t latency, uint16_t timeout);
+uint8_t ll_chm_update(uint8_t *chm);
+uint8_t ll_chm_get(uint16_t handle, uint8_t *chm);
+uint8_t ll_enc_req_send(uint16_t handle, uint8_t *rand, uint8_t *ediv,
+		     uint8_t *ltk);
+uint8_t ll_start_enc_req_send(uint16_t handle, uint8_t err_code,
+			   uint8_t const *const ltk);
+uint8_t ll_feature_req_send(uint16_t handle);
+uint8_t ll_version_ind_send(uint16_t handle);
+uint8_t ll_terminate_ind_send(uint16_t handle, uint8_t reason);
+uint8_t ll_rssi_get(uint16_t handle, uint8_t *rssi);
+uint8_t ll_tx_pwr_lvl_get(uint8_t handle_type,
+		       uint16_t handle, uint8_t type, int8_t *tx_pwr_lvl);
+void ll_tx_pwr_get(int8_t *min, int8_t *max);
+uint8_t ll_tx_pwr_lvl_set(uint8_t handle_type,
+		       uint16_t handle, int8_t *tx_pwr_lvl);
 
-u8_t ll_apto_get(u16_t handle, u16_t *apto);
-u8_t ll_apto_set(u16_t handle, u16_t apto);
+uint8_t ll_apto_get(uint16_t handle, uint16_t *apto);
+uint8_t ll_apto_set(uint16_t handle, uint16_t apto);
 
-u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time);
-void ll_length_default_get(u16_t *max_tx_octets, u16_t *max_tx_time);
-u32_t ll_length_default_set(u16_t max_tx_octets, u16_t max_tx_time);
-void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time,
-		       u16_t *max_rx_octets, u16_t *max_rx_time);
+uint32_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time);
+void ll_length_default_get(uint16_t *max_tx_octets, uint16_t *max_tx_time);
+uint32_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time);
+void ll_length_max_get(uint16_t *max_tx_octets, uint16_t *max_tx_time,
+		       uint16_t *max_rx_octets, uint16_t *max_rx_time);
 
-u8_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx);
-u8_t ll_phy_default_set(u8_t tx, u8_t rx);
-u8_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx);
+uint8_t ll_phy_get(uint16_t handle, uint8_t *tx, uint8_t *rx);
+uint8_t ll_phy_default_set(uint8_t tx, uint8_t rx);
+uint8_t ll_phy_req_send(uint16_t handle, uint8_t tx, uint8_t flags, uint8_t rx);
 
 /* Downstream - Data */
 void *ll_tx_mem_acquire(void);
 void ll_tx_mem_release(void *node_tx);
-int ll_tx_mem_enqueue(u16_t handle, void *node_tx);
+int ll_tx_mem_enqueue(uint16_t handle, void *node_tx);
 
 /* Upstream - Num. Completes, Events and Data */
-u8_t ll_rx_get(void **node_rx, u16_t *handle);
+uint8_t ll_rx_get(void **node_rx, uint16_t *handle);
 void ll_rx_dequeue(void);
 void ll_rx_mem_release(void **node_rx);
 
 /* External co-operation */
-void ll_timeslice_ticker_id_get(u8_t * const instance_index, u8_t * const user_id);
+void ll_timeslice_ticker_id_get(uint8_t * const instance_index, uint8_t * const user_id);
 void ll_radio_state_abort(void);
-u32_t ll_radio_state_is_idle(void);
+uint32_t ll_radio_state_is_idle(void);
diff --git a/subsys/bluetooth/controller/include/ll_settings.h b/subsys/bluetooth/controller/include/ll_settings.h
index db1f838369..c79a4fb153 100644
--- a/subsys/bluetooth/controller/include/ll_settings.h
+++ b/subsys/bluetooth/controller/include/ll_settings.h
@@ -6,16 +6,16 @@
 
 #if defined(CONFIG_BT_CTLR_VERSION_SETTINGS)
 
-u16_t ll_settings_company_id(void);
-u16_t ll_settings_subversion_number(void);
+uint16_t ll_settings_company_id(void);
+uint16_t ll_settings_subversion_number(void);
 
 #else
 
-static inline u16_t ll_settings_company_id(void)
+static inline uint16_t ll_settings_company_id(void)
 {
 	return CONFIG_BT_CTLR_COMPANY_ID;
 }
-static inline u16_t ll_settings_subversion_number(void)
+static inline uint16_t ll_settings_subversion_number(void)
 {
 	return CONFIG_BT_CTLR_SUBVERSION_NUMBER;
 }
diff --git a/subsys/bluetooth/controller/ll_sw/ll_addr.c b/subsys/bluetooth/controller/ll_sw/ll_addr.c
index ba82f65859..70bc853500 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_addr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_addr.c
@@ -22,10 +22,10 @@
 #include "ull_adv_internal.h"
 #include "ull_scan_internal.h"
 
-static u8_t pub_addr[BDADDR_SIZE];
-static u8_t rnd_addr[BDADDR_SIZE];
+static uint8_t pub_addr[BDADDR_SIZE];
+static uint8_t rnd_addr[BDADDR_SIZE];
 
-u8_t *ll_addr_get(u8_t addr_type, u8_t *bdaddr)
+uint8_t *ll_addr_get(uint8_t addr_type, uint8_t *bdaddr)
 {
 	if (addr_type > 1) {
 		return NULL;
@@ -46,7 +46,7 @@ u8_t *ll_addr_get(u8_t addr_type, u8_t *bdaddr)
 	return pub_addr;
 }
 
-u32_t ll_addr_set(u8_t addr_type, u8_t const *const bdaddr)
+uint32_t ll_addr_set(uint8_t addr_type, uint8_t const *const bdaddr)
 {
 	if (IS_ENABLED(CONFIG_BT_BROADCASTER) &&
 	    ull_adv_is_enabled(0)) {
@@ -67,7 +67,7 @@ u32_t ll_addr_set(u8_t addr_type, u8_t const *const bdaddr)
 	return 0;
 }
 
-void bt_ctlr_set_public_addr(const u8_t *addr)
+void bt_ctlr_set_public_addr(const uint8_t *addr)
 {
     (void)memcpy(pub_addr, addr, sizeof(pub_addr));
 }
diff --git a/subsys/bluetooth/controller/ll_sw/ll_settings.c b/subsys/bluetooth/controller/ll_sw/ll_settings.c
index d25ea39b9a..b806eb474f 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_settings.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_settings.c
@@ -18,14 +18,14 @@
 
 #if defined(CONFIG_BT_CTLR_VERSION_SETTINGS)
 
-static u16_t company_id = CONFIG_BT_CTLR_COMPANY_ID;
-static u16_t subversion = CONFIG_BT_CTLR_SUBVERSION_NUMBER;
+static uint16_t company_id = CONFIG_BT_CTLR_COMPANY_ID;
+static uint16_t subversion = CONFIG_BT_CTLR_SUBVERSION_NUMBER;
 
-u16_t ll_settings_company_id(void)
+uint16_t ll_settings_company_id(void)
 {
 	return company_id;
 }
-u16_t ll_settings_subversion_number(void)
+uint16_t ll_settings_subversion_number(void)
 {
 	return subversion;
 }
@@ -34,7 +34,7 @@ u16_t ll_settings_subversion_number(void)
 
 #if defined(CONFIG_BT_CTLR_SMI_TX_SETTING)
 
-static u8_t smi_tx;
+static uint8_t smi_tx;
 
 bool ll_settings_smi_tx(void)
 {
diff --git a/subsys/bluetooth/controller/ll_sw/ll_test.h b/subsys/bluetooth/controller/ll_sw/ll_test.h
index b24852b32d..c0dd8993b2 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_test.h
+++ b/subsys/bluetooth/controller/ll_sw/ll_test.h
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-u32_t ll_test_tx(u8_t chan, u8_t len, u8_t type, u8_t phy);
-u32_t ll_test_rx(u8_t chan, u8_t phy, u8_t mod_idx);
-u32_t ll_test_end(u16_t *num_rx);
+uint32_t ll_test_tx(uint8_t chan, uint8_t len, uint8_t type, uint8_t phy);
+uint32_t ll_test_rx(uint8_t chan, uint8_t phy, uint8_t mod_idx);
+uint32_t ll_test_end(uint16_t *num_rx);
diff --git a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
index c2f4632d4f..ad8b747202 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
@@ -34,8 +34,8 @@
 #include "ull_conn_types.h"
 #include "ull_conn_internal.h"
 
-u8_t ll_tx_pwr_lvl_get(u8_t handle_type,
-		       u16_t handle, u8_t type, s8_t *tx_pwr_lvl)
+uint8_t ll_tx_pwr_lvl_get(uint8_t handle_type,
+		       uint16_t handle, uint8_t type, int8_t *tx_pwr_lvl)
 {
 	switch (handle_type) {
 #if defined(CONFIG_BT_BROADCASTER) &&\
@@ -118,8 +118,8 @@ u8_t ll_tx_pwr_lvl_get(u8_t handle_type,
 }
 
 
-u8_t ll_tx_pwr_lvl_set(u8_t handle_type, u16_t handle,
-		       s8_t *tx_pwr_lvl)
+uint8_t ll_tx_pwr_lvl_set(uint8_t handle_type, uint16_t handle,
+		       int8_t *tx_pwr_lvl)
 {
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
 	if (*tx_pwr_lvl == BT_HCI_VS_LL_TX_POWER_LEVEL_NO_PREF) {
@@ -199,7 +199,7 @@ u8_t ll_tx_pwr_lvl_set(u8_t handle_type, u16_t handle,
 }
 #endif /* CONFIG_BT_LL_SW_SPLIT */
 
-void ll_tx_pwr_get(s8_t *min, s8_t *max)
+void ll_tx_pwr_get(int8_t *min, int8_t *max)
 {
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
 	*min = lll_radio_tx_pwr_min_get();
diff --git a/subsys/bluetooth/controller/ll_sw/lll.h b/subsys/bluetooth/controller/ll_sw/lll.h
index b9758cf73d..44e85b7a2e 100644
--- a/subsys/bluetooth/controller/ll_sw/lll.h
+++ b/subsys/bluetooth/controller/ll_sw/lll.h
@@ -16,8 +16,8 @@
 #define EVENT_PIPELINE_MAX 7
 #define EVENT_DONE_MAX 3
 
-#define HDR_ULL(p)     ((void *)((u8_t *)(p) + sizeof(struct evt_hdr)))
-#define HDR_ULL2LLL(p) ((struct lll_hdr *)((u8_t *)(p) + \
+#define HDR_ULL(p)     ((void *)((uint8_t *)(p) + sizeof(struct evt_hdr)))
+#define HDR_ULL2LLL(p) ((struct lll_hdr *)((uint8_t *)(p) + \
 					   sizeof(struct ull_hdr)))
 #define HDR_LLL2EVT(p) ((struct evt_hdr *)((struct lll_hdr *)(p))->parent)
 
@@ -78,27 +78,27 @@ enum ull_status {
 };
 
 struct evt_hdr {
-	u32_t ticks_xtal_to_start;
-	u32_t ticks_active_to_start;
-	u32_t ticks_preempt_to_start;
-	u32_t ticks_slot;
+	uint32_t ticks_xtal_to_start;
+	uint32_t ticks_active_to_start;
+	uint32_t ticks_preempt_to_start;
+	uint32_t ticks_slot;
 };
 
 struct ull_hdr {
-	u8_t ref; /* Number of ongoing (between Prepare and Done) events */
+	uint8_t ref; /* Number of ongoing (between Prepare and Done) events */
 	void (*disabled_cb)(void *param);
 	void *disabled_param;
 };
 
 struct lll_hdr {
 	void *parent;
-	u8_t is_stop:1;
+	uint8_t is_stop:1;
 };
 
 struct lll_prepare_param {
-	u32_t ticks_at_expire;
-	u32_t remainder;
-	u16_t lazy;
+	uint32_t ticks_at_expire;
+	uint32_t remainder;
+	uint16_t lazy;
 	void  *param;
 };
 
@@ -114,8 +114,8 @@ struct lll_event {
 	lll_is_abort_cb_t        is_abort_cb;
 	lll_abort_cb_t           abort_cb;
 	int                      prio;
-	u8_t                     is_resume:1;
-	u8_t                     is_aborted:1;
+	uint8_t                     is_resume:1;
+	uint8_t                     is_aborted:1;
 };
 
 enum node_rx_type {
@@ -193,19 +193,19 @@ enum node_rx_type {
 struct node_rx_ftr {
 	void  *param;
 	void  *extra;
-	u32_t ticks_anchor;
-	u32_t us_radio_end;
-	u32_t us_radio_rdy;
-	u8_t  rssi;
+	uint32_t ticks_anchor;
+	uint32_t us_radio_end;
+	uint32_t us_radio_rdy;
+	uint8_t  rssi;
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  lrpa_used:1;
-	u8_t  rl_idx;
+	uint8_t  lrpa_used:1;
+	uint8_t  rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 #if defined(CONFIG_BT_CTLR_EXT_SCAN_FP)
-	u8_t  direct;
+	uint8_t  direct;
 #endif /* CONFIG_BT_CTLR_EXT_SCAN_FP */
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-	u8_t  chan_idx;
+	uint8_t  chan_idx;
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 };
 
@@ -215,12 +215,12 @@ struct node_rx_hdr {
 	union {
 		void        *next;
 		memq_link_t *link;
-		u8_t        ack_last;
+		uint8_t        ack_last;
 	};
 
 	enum node_rx_type   type;
-	u8_t                user_meta; /* User metadata */
-	u16_t               handle;
+	uint8_t                user_meta; /* User metadata */
+	uint16_t               handle;
 
 	union {
 #if defined(CONFIG_BT_CTLR_RX_PDU_META)
@@ -232,7 +232,7 @@ struct node_rx_hdr {
 
 struct node_rx_pdu {
 	struct node_rx_hdr hdr;
-	u8_t               pdu[0];
+	uint8_t               pdu[0];
 };
 
 enum {
@@ -248,19 +248,19 @@ enum {
 };
 
 struct event_done_extra_slave {
-	u32_t start_to_address_actual_us;
-	u32_t window_widening_event_us;
-	u32_t preamble_to_addr_us;
+	uint32_t start_to_address_actual_us;
+	uint32_t window_widening_event_us;
+	uint32_t preamble_to_addr_us;
 };
 
 struct event_done_extra {
-	u8_t type;
+	uint8_t type;
 	union {
 		struct {
-			u16_t trx_cnt;
-			u8_t  crc_valid;
+			uint16_t trx_cnt;
+			uint8_t  crc_valid;
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-			u8_t  mic_state;
+			uint8_t  mic_state;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 			union {
 				struct event_done_extra_slave slave;
@@ -307,20 +307,20 @@ int lll_prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		struct lll_prepare_param *prepare_param);
 void lll_resume(void *param);
 void lll_disable(void *param);
-u32_t lll_radio_is_idle(void);
-s8_t lll_radio_tx_pwr_min_get(void);
-s8_t lll_radio_tx_pwr_max_get(void);
-s8_t lll_radio_tx_pwr_floor(s8_t tx_pwr_lvl);
+uint32_t lll_radio_is_idle(void);
+int8_t lll_radio_tx_pwr_min_get(void);
+int8_t lll_radio_tx_pwr_max_get(void);
+int8_t lll_radio_tx_pwr_floor(int8_t tx_pwr_lvl);
 
 int ull_prepare_enqueue(lll_is_abort_cb_t is_abort_cb,
 			       lll_abort_cb_t abort_cb,
 			       struct lll_prepare_param *prepare_param,
 			       lll_prepare_cb_t prepare_cb, int prio,
-			       u8_t is_resume);
+			       uint8_t is_resume);
 void *ull_prepare_dequeue_get(void);
-void *ull_prepare_dequeue_iter(u8_t *idx);
-void *ull_pdu_rx_alloc_peek(u8_t count);
-void *ull_pdu_rx_alloc_peek_iter(u8_t *idx);
+void *ull_prepare_dequeue_iter(uint8_t *idx);
+void *ull_pdu_rx_alloc_peek(uint8_t count);
+void *ull_pdu_rx_alloc_peek_iter(uint8_t *idx);
 void *ull_pdu_rx_alloc(void);
 void ull_rx_put(memq_link_t *link, void *rx);
 void ull_rx_sched(void);
diff --git a/subsys/bluetooth/controller/ll_sw/lll_chan.c b/subsys/bluetooth/controller/ll_sw/lll_chan.c
index c8c803e9f6..5a51e33a44 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_chan.c
+++ b/subsys/bluetooth/controller/ll_sw/lll_chan.c
@@ -16,23 +16,23 @@
 #include "hal/debug.h"
 
 #if defined(CONFIG_BT_CONN)
-static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index);
+static uint8_t chan_sel_remap(uint8_t *chan_map, uint8_t chan_index);
 #if defined(CONFIG_BT_CTLR_CHAN_SEL_2)
-static u16_t chan_prn(u16_t counter, u16_t chan_id);
+static uint16_t chan_prn(uint16_t counter, uint16_t chan_id);
 #endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */
 #endif /* CONFIG_BT_CONN */
 
 #if defined(CONFIG_BT_CONN)
-u8_t lll_chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map,
-		    u8_t chan_count)
+uint8_t lll_chan_sel_1(uint8_t *chan_use, uint8_t hop, uint16_t latency, uint8_t *chan_map,
+		    uint8_t chan_count)
 {
-	u8_t chan_next;
+	uint8_t chan_next;
 
 	chan_next = ((*chan_use) + (hop * (1 + latency))) % 37;
 	*chan_use = chan_next;
 
 	if ((chan_map[chan_next >> 3] & (1 << (chan_next % 8))) == 0U) {
-		u8_t chan_index;
+		uint8_t chan_index;
 
 		chan_index = chan_next % chan_count;
 		chan_next = chan_sel_remap(chan_map, chan_index);
@@ -45,19 +45,19 @@ u8_t lll_chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map,
 }
 
 #if defined(CONFIG_BT_CTLR_CHAN_SEL_2)
-u8_t lll_chan_sel_2(u16_t counter, u16_t chan_id, u8_t *chan_map,
-		    u8_t chan_count)
+uint8_t lll_chan_sel_2(uint16_t counter, uint16_t chan_id, uint8_t *chan_map,
+		    uint8_t chan_count)
 {
-	u8_t chan_next;
-	u16_t prn_e;
+	uint8_t chan_next;
+	uint16_t prn_e;
 
 	prn_e = chan_prn(counter, chan_id);
 	chan_next = prn_e % 37;
 
 	if ((chan_map[chan_next >> 3] & (1 << (chan_next % 8))) == 0U) {
-		u8_t chan_index;
+		uint8_t chan_index;
 
-		chan_index = ((u32_t)chan_count * prn_e) >> 16;
+		chan_index = ((uint32_t)chan_count * prn_e) >> 16;
 		chan_next = chan_sel_remap(chan_map, chan_index);
 
 	} else {
@@ -68,16 +68,16 @@ u8_t lll_chan_sel_2(u16_t counter, u16_t chan_id, u8_t *chan_map,
 }
 #endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */
 
-static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index)
+static uint8_t chan_sel_remap(uint8_t *chan_map, uint8_t chan_index)
 {
-	u8_t chan_next;
-	u8_t byte_count;
+	uint8_t chan_next;
+	uint8_t byte_count;
 
 	chan_next = 0U;
 	byte_count = 5U;
 	while (byte_count--) {
-		u8_t bite;
-		u8_t bit_count;
+		uint8_t bite;
+		uint8_t bit_count;
 
 		bite = *chan_map;
 		bit_count = 8U;
@@ -106,9 +106,9 @@ static u8_t chan_sel_remap(u8_t *chan_map, u8_t chan_index)
 #if defined(RADIO_UNIT_TEST)
 void lll_chan_sel_2_ut(void)
 {
-	u8_t chan_map_1[] = {0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
-	u8_t chan_map_2[] = {0x00, 0x06, 0xE0, 0x00, 0x1E};
-	u8_t m;
+	uint8_t chan_map_1[] = {0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
+	uint8_t chan_map_2[] = {0x00, 0x06, 0xE0, 0x00, 0x1E};
+	uint8_t m;
 
 	m = chan_sel_2(1, 0x305F, chan_map_1, 37);
 	LL_ASSERT(m == 20U);
@@ -133,28 +133,28 @@ void lll_chan_sel_2_ut(void)
 /* Attribution:
  * http://graphics.stanford.edu/%7Eseander/bithacks.html#ReverseByteWith32Bits
  */
-static u8_t chan_rev_8(u8_t b)
+static uint8_t chan_rev_8(uint8_t b)
 {
-	b = (((u32_t)b * 0x0802LU & 0x22110LU) |
-	     ((u32_t)b * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16;
+	b = (((uint32_t)b * 0x0802LU & 0x22110LU) |
+	     ((uint32_t)b * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16;
 
 	return b;
 }
 
-static u16_t chan_perm(u16_t i)
+static uint16_t chan_perm(uint16_t i)
 {
 	return (chan_rev_8((i >> 8) & 0xFF) << 8) | chan_rev_8(i & 0xFF);
 }
 
-static u16_t chan_mam(u16_t a, u16_t b)
+static uint16_t chan_mam(uint16_t a, uint16_t b)
 {
-	return ((u32_t)a * 17U + b) & 0xFFFF;
+	return ((uint32_t)a * 17U + b) & 0xFFFF;
 }
 
-static u16_t chan_prn(u16_t counter, u16_t chan_id)
+static uint16_t chan_prn(uint16_t counter, uint16_t chan_id)
 {
-	u8_t iterate;
-	u16_t prn_e;
+	uint8_t iterate;
+	uint16_t prn_e;
 
 	prn_e = counter ^ chan_id;
 
diff --git a/subsys/bluetooth/controller/ll_sw/lll_chan.h b/subsys/bluetooth/controller/ll_sw/lll_chan.h
index 8db4c3ef74..0062717367 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_chan.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_chan.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-u8_t lll_chan_sel_1(u8_t *chan_use, u8_t hop, u16_t latency, u8_t *chan_map,
-		    u8_t chan_count);
-u8_t lll_chan_sel_2(u16_t counter, u16_t chan_id, u8_t *chan_map,
-		    u8_t chan_count);
+uint8_t lll_chan_sel_1(uint8_t *chan_use, uint8_t hop, uint16_t latency, uint8_t *chan_map,
+		    uint8_t chan_count);
+uint8_t lll_chan_sel_2(uint16_t counter, uint16_t chan_id, uint8_t *chan_map,
+		    uint8_t chan_count);
diff --git a/subsys/bluetooth/controller/ll_sw/lll_conn.h b/subsys/bluetooth/controller/ll_sw/lll_conn.h
index 5c498e1d7a..48951eeec1 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_conn.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_conn.h
@@ -15,7 +15,7 @@
 #define LLL_CONN_MIC_FAIL 2
 
 struct lll_tx {
-	u16_t handle;
+	uint16_t handle;
 	void *node;
 };
 
@@ -25,89 +25,89 @@ struct node_tx {
 		memq_link_t *link;
 	};
 
-	u8_t pdu[];
+	uint8_t pdu[];
 };
 
 struct lll_conn {
 	struct lll_hdr hdr;
 
-	u8_t access_addr[4];
-	u8_t crc_init[3];
+	uint8_t access_addr[4];
+	uint8_t crc_init[3];
 
-	u16_t handle;
-	u16_t interval;
-	u16_t latency;
+	uint16_t handle;
+	uint16_t interval;
+	uint16_t latency;
 
-	u16_t latency_prepare;
-	u16_t latency_event;
-	u16_t event_counter;
+	uint16_t latency_prepare;
+	uint16_t latency_event;
+	uint16_t event_counter;
 
-	u8_t data_chan_map[5];
-	u8_t data_chan_count:6;
-	u8_t data_chan_sel:1;
-	u8_t role:1;
+	uint8_t data_chan_map[5];
+	uint8_t data_chan_count:6;
+	uint8_t data_chan_sel:1;
+	uint8_t role:1;
 
 	union {
 		struct {
-			u8_t data_chan_hop;
-			u8_t data_chan_use;
+			uint8_t data_chan_hop;
+			uint8_t data_chan_use;
 		};
 
-		u16_t data_chan_id;
+		uint16_t data_chan_id;
 	};
 
 #if defined(CONFIG_BT_PERIPHERAL)
 	struct {
-		u8_t  latency_enabled:1;
-		u32_t window_widening_periodic_us;
-		u32_t window_widening_max_us;
-		u32_t window_widening_prepare_us;
-		u32_t window_widening_event_us;
-		u32_t window_size_prepare_us;
-		u32_t window_size_event_us;
+		uint8_t  latency_enabled:1;
+		uint32_t window_widening_periodic_us;
+		uint32_t window_widening_max_us;
+		uint32_t window_widening_prepare_us;
+		uint32_t window_widening_event_us;
+		uint32_t window_size_prepare_us;
+		uint32_t window_size_event_us;
 	} slave;
 #endif /* CONFIG_BT_PERIPHERAL */
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-	u16_t max_tx_octets;
-	u16_t max_rx_octets;
+	uint16_t max_tx_octets;
+	uint16_t max_rx_octets;
 
 #if defined(CONFIG_BT_CTLR_PHY)
-	u16_t max_tx_time;
-	u16_t max_rx_time;
+	uint16_t max_tx_time;
+	uint16_t max_rx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #if defined(CONFIG_BT_CTLR_PHY)
-	u8_t phy_tx:3;
-	u8_t phy_flags:1;
-	u8_t phy_tx_time:3;
-	u8_t phy_rx:3;
+	uint8_t phy_tx:3;
+	uint8_t phy_flags:1;
+	uint8_t phy_tx_time:3;
+	uint8_t phy_rx:3;
 #endif /* CONFIG_BT_CTLR_PHY */
 
 	MEMQ_DECLARE(tx);
 	memq_link_t link_tx;
 	memq_link_t *link_tx_free;
-	u8_t  packet_tx_head_len;
-	u8_t  packet_tx_head_offset;
+	uint8_t  packet_tx_head_len;
+	uint8_t  packet_tx_head_offset;
 
-	u8_t sn:1;
-	u8_t nesn:1;
-	u8_t empty:1;
+	uint8_t sn:1;
+	uint8_t nesn:1;
+	uint8_t empty:1;
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-	u8_t enc_rx:1;
-	u8_t enc_tx:1;
+	uint8_t enc_rx:1;
+	uint8_t enc_tx:1;
 
 	struct ccm ccm_rx;
 	struct ccm ccm_tx;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)
-	u8_t  rssi_latest;
+	uint8_t  rssi_latest;
 #if defined(CONFIG_BT_CTLR_CONN_RSSI_EVENT)
-	u8_t  rssi_reported;
-	u8_t  rssi_sample_count;
+	uint8_t  rssi_reported;
+	uint8_t  rssi_sample_count;
 #endif /* CONFIG_BT_CTLR_CONN_RSSI_EVENT */
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
@@ -116,16 +116,16 @@ struct lll_conn {
 #endif /* CONFIG_BT_CTLR_CONN_META */
 
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
-	s8_t tx_pwr_lvl;
+	int8_t tx_pwr_lvl;
 #endif
 };
 
 int lll_conn_init(void);
 int lll_conn_reset(void);
 
-u8_t lll_conn_sca_local_get(void);
-u32_t lll_conn_ppm_local_get(void);
-u32_t lll_conn_ppm_get(u8_t sca);
+uint8_t lll_conn_sca_local_get(void);
+uint32_t lll_conn_ppm_local_get(void);
+uint32_t lll_conn_ppm_get(uint8_t sca);
 void lll_conn_prepare_reset(void);
 int lll_conn_is_abort_cb(void *next, int prio, void *curr,
 			 lll_prepare_cb_t *resume_cb, int *resume_prio);
@@ -136,7 +136,7 @@ void lll_conn_isr_abort(void *param);
 void lll_conn_rx_pkt_set(struct lll_conn *lll);
 void lll_conn_tx_pkt_set(struct lll_conn *lll, struct pdu_data *pdu_data_tx);
 void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx);
-void lll_conn_flush(u16_t handle, struct lll_conn *lll);
+void lll_conn_flush(uint16_t handle, struct lll_conn *lll);
 
-extern void ull_conn_lll_ack_enqueue(u16_t handle, struct node_tx *tx);
-extern u16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll);
+extern void ull_conn_lll_ack_enqueue(uint16_t handle, struct node_tx *tx);
+extern uint16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll);
diff --git a/subsys/bluetooth/controller/ll_sw/lll_filter.h b/subsys/bluetooth/controller/ll_sw/lll_filter.h
index 1dcb063bc1..da2edc3f9d 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_filter.h
+++ b/subsys/bluetooth/controller/ll_sw/lll_filter.h
@@ -8,32 +8,32 @@
 #define FILTER_IDX_NONE    0xFF
 
 struct lll_filter {
-	u8_t  enable_bitmask;
-	u8_t  addr_type_bitmask;
-	u8_t  bdaddr[WL_SIZE][BDADDR_SIZE];
+	uint8_t  enable_bitmask;
+	uint8_t  addr_type_bitmask;
+	uint8_t  bdaddr[WL_SIZE][BDADDR_SIZE];
 };
 
 /* Whitelist peer list */
 struct lll_whitelist {
-	u8_t      taken:1;
-	u8_t      id_addr_type:1;
-	u8_t      rl_idx;
+	uint8_t      taken:1;
+	uint8_t      id_addr_type:1;
+	uint8_t      rl_idx;
 	bt_addr_t id_addr;
 };
 
 struct lll_resolvelist {
-	u8_t      taken:1;
-	u8_t      rpas_ready:1;
-	u8_t      pirk:1;
-	u8_t      lirk:1;
-	u8_t      dev:1;
-	u8_t      wl:1;
+	uint8_t      taken:1;
+	uint8_t      rpas_ready:1;
+	uint8_t      pirk:1;
+	uint8_t      lirk:1;
+	uint8_t      dev:1;
+	uint8_t      wl:1;
 
-	u8_t      id_addr_type:1;
+	uint8_t      id_addr_type:1;
 	bt_addr_t id_addr;
 
-	u8_t      local_irk[16];
-	u8_t      pirk_idx;
+	uint8_t      local_irk[16];
+	uint8_t      pirk_idx;
 	bt_addr_t curr_rpa;
 	bt_addr_t peer_rpa;
 	bt_addr_t *local_rpa;
@@ -42,26 +42,26 @@ struct lll_resolvelist {
 #endif
 };
 
-bool ull_filter_lll_lrpa_used(u8_t rl_idx);
-extern bt_addr_t *ull_filter_lll_lrpa_get(u8_t rl_idx);
-extern u8_t *ull_filter_lll_irks_get(u8_t *count);
-extern u8_t ull_filter_lll_rl_idx(bool whitelist, u8_t devmatch_id);
-extern u8_t ull_filter_lll_rl_irk_idx(u8_t irkmatch_id);
-extern bool ull_filter_lll_irk_whitelisted(u8_t rl_idx);
+bool ull_filter_lll_lrpa_used(uint8_t rl_idx);
+extern bt_addr_t *ull_filter_lll_lrpa_get(uint8_t rl_idx);
+extern uint8_t *ull_filter_lll_irks_get(uint8_t *count);
+extern uint8_t ull_filter_lll_rl_idx(bool whitelist, uint8_t devmatch_id);
+extern uint8_t ull_filter_lll_rl_irk_idx(uint8_t irkmatch_id);
+extern bool ull_filter_lll_irk_whitelisted(uint8_t rl_idx);
 extern struct lll_filter *ull_filter_lll_get(bool whitelist);
 extern struct lll_whitelist *ull_filter_lll_whitelist_get(void);
 extern struct lll_resolvelist *ull_filter_lll_resolvelist_get(void);
-extern bool ull_filter_lll_rl_idx_allowed(u8_t irkmatch_ok, u8_t rl_idx);
-extern bool ull_filter_lll_rl_addr_allowed(u8_t id_addr_type, u8_t *id_addr,
-					   u8_t *rl_idx);
-extern bool ull_filter_lll_rl_addr_resolve(u8_t id_addr_type, u8_t *id_addr,
-					   u8_t rl_idx);
+extern bool ull_filter_lll_rl_idx_allowed(uint8_t irkmatch_ok, uint8_t rl_idx);
+extern bool ull_filter_lll_rl_addr_allowed(uint8_t id_addr_type, uint8_t *id_addr,
+					   uint8_t *rl_idx);
+extern bool ull_filter_lll_rl_addr_resolve(uint8_t id_addr_type, uint8_t *id_addr,
+					   uint8_t rl_idx);
 extern bool ull_filter_lll_rl_enabled(void);
 #if defined(CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY)
 typedef void (*resolve_callback_t)(void *param);
-extern u8_t ull_filter_deferred_resolve(bt_addr_t *rpa,
+extern uint8_t ull_filter_deferred_resolve(bt_addr_t *rpa,
 					resolve_callback_t cb);
-extern u8_t ull_filter_deferred_targeta_resolve(bt_addr_t *rpa,
-						u8_t rl_idx,
+extern uint8_t ull_filter_deferred_targeta_resolve(bt_addr_t *rpa,
+						uint8_t rl_idx,
 						resolve_callback_t cb);
 #endif
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
index 6574851775..48d40ece4e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
@@ -21,7 +21,7 @@
 #define NRF_RTC NRF_RTC0
 #endif
 
-static u8_t _refcount;
+static uint8_t _refcount;
 
 void cntr_init(void)
 {
@@ -30,7 +30,7 @@ void cntr_init(void)
 	nrf_rtc_int_enable(NRF_RTC, RTC_INTENSET_COMPARE0_Msk);
 }
 
-u32_t cntr_start(void)
+uint32_t cntr_start(void)
 {
 	if (_refcount++) {
 		return 1;
@@ -41,7 +41,7 @@ u32_t cntr_start(void)
 	return 0;
 }
 
-u32_t cntr_stop(void)
+uint32_t cntr_stop(void)
 {
 	LL_ASSERT(_refcount);
 
@@ -54,12 +54,12 @@ u32_t cntr_stop(void)
 	return 0;
 }
 
-u32_t cntr_cnt_get(void)
+uint32_t cntr_cnt_get(void)
 {
 	return nrf_rtc_counter_get(NRF_RTC);
 }
 
-void cntr_cmp_set(u8_t cmp, u32_t value)
+void cntr_cmp_set(uint8_t cmp, uint32_t value)
 {
 	nrf_rtc_cc_set(NRF_RTC, cmp, value);
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
index 4da8368268..8799993b68 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
@@ -21,16 +21,16 @@
 #include "hal/debug.h"
 
 struct ecb_param {
-	u8_t key[16];
-	u8_t clear_text[16];
-	u8_t cipher_text[16];
+	uint8_t key[16];
+	uint8_t clear_text[16];
+	uint8_t cipher_text[16];
 } __packed;
 
 static void do_ecb(struct ecb_param *ecb)
 {
 	do {
 		nrf_ecb_task_trigger(NRF_ECB, NRF_ECB_TASK_STOPECB);
-		NRF_ECB->ECBDATAPTR = (u32_t)ecb;
+		NRF_ECB->ECBDATAPTR = (uint32_t)ecb;
 		NRF_ECB->EVENTS_ENDECB = 0;
 		NRF_ECB->EVENTS_ERRORECB = 0;
 		nrf_ecb_task_trigger(NRF_ECB, NRF_ECB_TASK_STARTECB);
@@ -49,8 +49,8 @@ static void do_ecb(struct ecb_param *ecb)
 	NRF_ECB->ECBDATAPTR = 0;
 }
 
-void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
-		    u8_t * const cipher_text_be)
+void ecb_encrypt_be(uint8_t const *const key_be, uint8_t const *const clear_text_be,
+		    uint8_t * const cipher_text_be)
 {
 	struct ecb_param ecb;
 
@@ -62,8 +62,8 @@ void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
 	memcpy(cipher_text_be, &ecb.cipher_text[0], sizeof(ecb.cipher_text));
 }
 
-void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
-		 u8_t * const cipher_text_le, u8_t * const cipher_text_be)
+void ecb_encrypt(uint8_t const *const key_le, uint8_t const *const clear_text_le,
+		 uint8_t * const cipher_text_le, uint8_t * const cipher_text_be)
 {
 	struct ecb_param ecb;
 
@@ -83,7 +83,7 @@ void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
 	}
 }
 
-u32_t ecb_encrypt_nonblocking(struct ecb *ecb)
+uint32_t ecb_encrypt_nonblocking(struct ecb *ecb)
 {
 	/* prepare to be used in a BE AES h/w */
 	if (ecb->in_key_le) {
@@ -97,7 +97,7 @@ u32_t ecb_encrypt_nonblocking(struct ecb *ecb)
 	}
 
 	/* setup the encryption h/w */
-	NRF_ECB->ECBDATAPTR = (u32_t)ecb;
+	NRF_ECB->ECBDATAPTR = (uint32_t)ecb;
 	NRF_ECB->EVENTS_ENDECB = 0;
 	NRF_ECB->EVENTS_ERRORECB = 0;
 	nrf_ecb_int_enable(NRF_ECB, ECB_INTENSET_ERRORECB_Msk
@@ -150,12 +150,12 @@ void isr_ecb(void *param)
 }
 
 struct ecb_ut_context {
-	u32_t volatile done;
-	u32_t status;
-	u8_t  cipher_text[16];
+	uint32_t volatile done;
+	uint32_t status;
+	uint8_t  cipher_text[16];
 };
 
-static void ecb_cb(u32_t status, u8_t *cipher_be, void *context)
+static void ecb_cb(uint32_t status, uint8_t *cipher_be, void *context)
 {
 	struct ecb_ut_context *ecb_ut_context =
 		(struct ecb_ut_context *)context;
@@ -168,15 +168,15 @@ static void ecb_cb(u32_t status, u8_t *cipher_be, void *context)
 	}
 }
 
-u32_t ecb_ut(void)
+uint32_t ecb_ut(void)
 {
-	u8_t key[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+	uint8_t key[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
 			 0x99, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 };
-	u8_t clear_text[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+	uint8_t clear_text[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
 				0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44,
 				0x55 };
-	u8_t cipher_text[16];
-	u32_t status = 0U;
+	uint8_t cipher_text[16];
+	uint32_t status = 0U;
 	struct ecb ecb;
 	struct ecb_ut_context context;
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/mayfly.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/mayfly.c
index 6873fc758d..d6a6a6c99a 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/mayfly.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/mayfly.c
@@ -27,7 +27,7 @@
 #error Unknown LL variant.
 #endif
 
-void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable)
+void mayfly_enable_cb(uint8_t caller_id, uint8_t callee_id, uint8_t enable)
 {
 	(void)caller_id;
 
@@ -40,7 +40,7 @@ void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable)
 	}
 }
 
-u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id)
+uint32_t mayfly_is_enabled(uint8_t caller_id, uint8_t callee_id)
 {
 	(void)caller_id;
 
@@ -64,7 +64,7 @@ u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id)
 	return 0;
 }
 
-u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id)
+uint32_t mayfly_prio_is_equal(uint8_t caller_id, uint8_t callee_id)
 {
 	return (caller_id == callee_id) ||
 #if defined(CONFIG_BT_LL_SW_SPLIT)
@@ -90,7 +90,7 @@ u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id)
 	       0;
 }
 
-void mayfly_pend(u8_t caller_id, u8_t callee_id)
+void mayfly_pend(uint8_t caller_id, uint8_t callee_id)
 {
 	(void)caller_id;
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 051bae6d3c..8276c41317 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -44,8 +44,8 @@
 /* The following two constants are used in nrfx_glue.h for marking these PPI
  * channels and groups as occupied and thus unavailable to other modules.
  */
-const u32_t z_bt_ctlr_used_nrf_ppi_channels = HAL_USED_PPI_CHANNELS;
-const u32_t z_bt_ctlr_used_nrf_ppi_groups   = HAL_USED_PPI_GROUPS;
+const uint32_t z_bt_ctlr_used_nrf_ppi_channels = HAL_USED_PPI_CHANNELS;
+const uint32_t z_bt_ctlr_used_nrf_ppi_groups   = HAL_USED_PPI_GROUPS;
 
 static radio_isr_cb_t isr_cb;
 static void           *isr_cb_param;
@@ -120,9 +120,9 @@ void radio_reset(void)
 #endif
 }
 
-void radio_phy_set(u8_t phy, u8_t flags)
+void radio_phy_set(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	mode = hal_radio_phy_mode_get(phy, flags);
 
@@ -135,10 +135,10 @@ void radio_phy_set(u8_t phy, u8_t flags)
 #endif /* CONFIG_BT_CTLR_RADIO_ENABLE_FAST */
 }
 
-void radio_tx_power_set(s8_t power)
+void radio_tx_power_set(int8_t power)
 {
 	/* NOTE: valid value range is passed by Kconfig define. */
-	NRF_RADIO->TXPOWER = (u32_t)power;
+	NRF_RADIO->TXPOWER = (uint32_t)power;
 }
 
 void radio_tx_power_max_set(void)
@@ -146,27 +146,27 @@ void radio_tx_power_max_set(void)
 	NRF_RADIO->TXPOWER = hal_radio_tx_power_max_get();
 }
 
-s8_t radio_tx_power_min_get(void)
+int8_t radio_tx_power_min_get(void)
 {
-	return (s8_t)hal_radio_tx_power_min_get();
+	return (int8_t)hal_radio_tx_power_min_get();
 }
 
-s8_t radio_tx_power_max_get(void)
+int8_t radio_tx_power_max_get(void)
 {
-	return (s8_t)hal_radio_tx_power_max_get();
+	return (int8_t)hal_radio_tx_power_max_get();
 }
 
-s8_t radio_tx_power_floor(s8_t power)
+int8_t radio_tx_power_floor(int8_t power)
 {
-	return (s8_t)hal_radio_tx_power_floor(power);
+	return (int8_t)hal_radio_tx_power_floor(power);
 }
 
-void radio_freq_chan_set(u32_t chan)
+void radio_freq_chan_set(uint32_t chan)
 {
 	NRF_RADIO->FREQUENCY = chan;
 }
 
-void radio_whiten_iv_set(u32_t iv)
+void radio_whiten_iv_set(uint32_t iv)
 {
 	NRF_RADIO->DATAWHITEIV = iv;
 
@@ -175,7 +175,7 @@ void radio_whiten_iv_set(u32_t iv)
 			    RADIO_PCNF1_WHITEEN_Msk;
 }
 
-void radio_aa_set(u8_t *aa)
+void radio_aa_set(uint8_t *aa)
 {
 	NRF_RADIO->TXADDRESS =
 	    (((0UL) << RADIO_TXADDRESS_TXADDRESS_Pos) &
@@ -186,11 +186,11 @@ void radio_aa_set(u8_t *aa)
 	NRF_RADIO->BASE0 = (aa[2] << 24) | (aa[1] << 16) | (aa[0] << 8);
 }
 
-void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags)
+void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags)
 {
-	u8_t dc = flags & 0x01; /* Adv or Data channel */
-	u32_t extra;
-	u8_t phy;
+	uint8_t dc = flags & 0x01; /* Adv or Data channel */
+	uint32_t extra;
+	uint8_t phy;
 
 #if defined(CONFIG_SOC_SERIES_NRF51X)
 	ARG_UNUSED(phy);
@@ -242,15 +242,15 @@ void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags)
 
 	NRF_RADIO->PCNF0 = (((1UL) << RADIO_PCNF0_S0LEN_Pos) &
 			    RADIO_PCNF0_S0LEN_Msk) |
-			   ((((u32_t)bits_len) << RADIO_PCNF0_LFLEN_Pos) &
+			   ((((uint32_t)bits_len) << RADIO_PCNF0_LFLEN_Pos) &
 			    RADIO_PCNF0_LFLEN_Msk) |
-			   ((((u32_t)8-bits_len) << RADIO_PCNF0_S1LEN_Pos) &
+			   ((((uint32_t)8-bits_len) << RADIO_PCNF0_S1LEN_Pos) &
 			    RADIO_PCNF0_S1LEN_Msk) |
 			   extra;
 
 	NRF_RADIO->PCNF1 &= ~(RADIO_PCNF1_MAXLEN_Msk | RADIO_PCNF1_STATLEN_Msk |
 			      RADIO_PCNF1_BALEN_Msk | RADIO_PCNF1_ENDIAN_Msk);
-	NRF_RADIO->PCNF1 |= ((((u32_t)max_len) << RADIO_PCNF1_MAXLEN_Pos) &
+	NRF_RADIO->PCNF1 |= ((((uint32_t)max_len) << RADIO_PCNF1_MAXLEN_Pos) &
 			     RADIO_PCNF1_MAXLEN_Msk) |
 			    (((0UL) << RADIO_PCNF1_STATLEN_Pos) &
 			     RADIO_PCNF1_STATLEN_Msk) |
@@ -263,30 +263,30 @@ void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags)
 
 void radio_pkt_rx_set(void *rx_packet)
 {
-	NRF_RADIO->PACKETPTR = (u32_t)rx_packet;
+	NRF_RADIO->PACKETPTR = (uint32_t)rx_packet;
 }
 
 void radio_pkt_tx_set(void *tx_packet)
 {
-	NRF_RADIO->PACKETPTR = (u32_t)tx_packet;
+	NRF_RADIO->PACKETPTR = (uint32_t)tx_packet;
 }
 
-u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_tx_ready_delay_get(uint8_t phy, uint8_t flags)
 {
 	return hal_radio_tx_ready_delay_us_get(phy, flags);
 }
 
-u32_t radio_tx_chain_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_tx_chain_delay_get(uint8_t phy, uint8_t flags)
 {
 	return hal_radio_tx_chain_delay_us_get(phy, flags);
 }
 
-u32_t radio_rx_ready_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_rx_ready_delay_get(uint8_t phy, uint8_t flags)
 {
 	return hal_radio_rx_ready_delay_us_get(phy, flags);
 }
 
-u32_t radio_rx_chain_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_rx_chain_delay_get(uint8_t phy, uint8_t flags)
 {
 	return hal_radio_rx_chain_delay_us_get(phy, flags);
 }
@@ -326,15 +326,15 @@ void radio_status_reset(void)
 	NRF_RADIO->EVENTS_DISABLED = 0;
 }
 
-u32_t radio_is_ready(void)
+uint32_t radio_is_ready(void)
 {
 	return (NRF_RADIO->EVENTS_READY != 0);
 }
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-static u32_t last_pdu_end_us;
+static uint32_t last_pdu_end_us;
 
-u32_t radio_is_done(void)
+uint32_t radio_is_done(void)
 {
 	if (NRF_RADIO->EVENTS_END != 0) {
 		/* On packet END event increment last packet end time value.
@@ -349,23 +349,23 @@ u32_t radio_is_done(void)
 }
 
 #else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
-u32_t radio_is_done(void)
+uint32_t radio_is_done(void)
 {
 	return (NRF_RADIO->EVENTS_END != 0);
 }
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
-u32_t radio_has_disabled(void)
+uint32_t radio_has_disabled(void)
 {
 	return (NRF_RADIO->EVENTS_DISABLED != 0);
 }
 
-u32_t radio_is_idle(void)
+uint32_t radio_is_idle(void)
 {
 	return (NRF_RADIO->STATE == 0);
 }
 
-void radio_crc_configure(u32_t polynomial, u32_t iv)
+void radio_crc_configure(uint32_t polynomial, uint32_t iv)
 {
 	NRF_RADIO->CRCCNF =
 	    (((RADIO_CRCCNF_SKIPADDR_Skip) << RADIO_CRCCNF_SKIPADDR_Pos) &
@@ -376,13 +376,13 @@ void radio_crc_configure(u32_t polynomial, u32_t iv)
 	NRF_RADIO->CRCINIT = iv;
 }
 
-u32_t radio_crc_is_valid(void)
+uint32_t radio_crc_is_valid(void)
 {
 	return (NRF_RADIO->CRCSTATUS != 0);
 }
 
-static u8_t MALIGN(4) _pkt_empty[PDU_EM_SIZE_MAX];
-static u8_t MALIGN(4) _pkt_scratch[((HAL_RADIO_PDU_LEN_MAX + 3) >
+static uint8_t MALIGN(4) _pkt_empty[PDU_EM_SIZE_MAX];
+static uint8_t MALIGN(4) _pkt_scratch[((HAL_RADIO_PDU_LEN_MAX + 3) >
 				    PDU_AC_SIZE_MAX) ?
 				   (HAL_RADIO_PDU_LEN_MAX + 3) :
 				   PDU_AC_SIZE_MAX];
@@ -401,7 +401,7 @@ void *radio_pkt_scratch_get(void)
 	defined(CONFIG_BT_CTLR_LE_ENC) && \
 	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
 	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < (HAL_RADIO_PDU_LEN_MAX - 4)))
-static u8_t MALIGN(4) _pkt_decrypt[((HAL_RADIO_PDU_LEN_MAX + 3) >
+static uint8_t MALIGN(4) _pkt_decrypt[((HAL_RADIO_PDU_LEN_MAX + 3) >
 				    PDU_AC_SIZE_MAX) ?
 				   (HAL_RADIO_PDU_LEN_MAX + 3) :
 				   PDU_AC_SIZE_MAX];
@@ -412,14 +412,14 @@ void *radio_pkt_decrypt_get(void)
 #endif
 
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
-static u8_t sw_tifs_toggle;
+static uint8_t sw_tifs_toggle;
 
-static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next,
-		      u8_t flags_next)
+static void sw_switch(uint8_t dir, uint8_t phy_curr, uint8_t flags_curr, uint8_t phy_next,
+		      uint8_t flags_next)
 {
-	u8_t ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(sw_tifs_toggle);
-	u8_t cc = SW_SWITCH_TIMER_EVTS_COMP(sw_tifs_toggle);
-	u32_t delay;
+	uint8_t ppi = HAL_SW_SWITCH_RADIO_ENABLE_PPI(sw_tifs_toggle);
+	uint8_t cc = SW_SWITCH_TIMER_EVTS_COMP(sw_tifs_toggle);
+	uint32_t delay;
 
 	hal_radio_sw_switch_setup(cc, ppi, sw_tifs_toggle);
 
@@ -437,19 +437,19 @@ static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next,
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 #if defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
-		u8_t ppi_en =
+		uint8_t ppi_en =
 		    HAL_SW_SWITCH_RADIO_ENABLE_S2_PPI(sw_tifs_toggle);
-		u8_t ppi_dis =
+		uint8_t ppi_dis =
 			HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI(
 			    sw_tifs_toggle);
 
 		if (phy_curr & BIT(2)) {
 			/* Switching to TX after RX on LE Coded PHY. */
 
-			u8_t cc_s2 =
+			uint8_t cc_s2 =
 			    SW_SWITCH_TIMER_S2_EVTS_COMP(sw_tifs_toggle);
 
-			u32_t delay_s2;
+			uint32_t delay_s2;
 
 			/* Calculate assuming reception on S2 coding scheme. */
 			delay_s2 = HAL_RADIO_NS2US_ROUND(
@@ -487,10 +487,10 @@ static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next,
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 #if defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)
 		if (1) {
-			u8_t ppi_en =
+			uint8_t ppi_en =
 				HAL_SW_SWITCH_RADIO_ENABLE_S2_PPI(
 					sw_tifs_toggle);
-			u8_t ppi_dis =
+			uint8_t ppi_dis =
 				HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI(
 					sw_tifs_toggle);
 
@@ -524,7 +524,7 @@ static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next,
 }
 #endif /* CONFIG_BT_CTLR_TIFS_HW */
 
-void radio_switch_complete_and_rx(u8_t phy_rx)
+void radio_switch_complete_and_rx(uint8_t phy_rx)
 {
 #if defined(CONFIG_BT_CTLR_TIFS_HW)
 	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk |
@@ -537,8 +537,8 @@ void radio_switch_complete_and_rx(u8_t phy_rx)
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 }
 
-void radio_switch_complete_and_tx(u8_t phy_rx, u8_t flags_rx, u8_t phy_tx,
-				  u8_t flags_tx)
+void radio_switch_complete_and_tx(uint8_t phy_rx, uint8_t flags_rx, uint8_t phy_tx,
+				  uint8_t flags_tx)
 {
 #if defined(CONFIG_BT_CTLR_TIFS_HW)
 	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk |
@@ -568,7 +568,7 @@ void radio_rssi_measure(void)
 	     RADIO_SHORTS_DISABLED_RSSISTOP_Msk);
 }
 
-u32_t radio_rssi_get(void)
+uint32_t radio_rssi_get(void)
 {
 	return NRF_RADIO->RSSISAMPLE;
 }
@@ -578,26 +578,26 @@ void radio_rssi_status_reset(void)
 	NRF_RADIO->EVENTS_RSSIEND = 0;
 }
 
-u32_t radio_rssi_is_ready(void)
+uint32_t radio_rssi_is_ready(void)
 {
 	return (NRF_RADIO->EVENTS_RSSIEND != 0);
 }
 
-void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
-			    u8_t *bdaddr)
+void radio_filter_configure(uint8_t bitmask_enable, uint8_t bitmask_addr_type,
+			    uint8_t *bdaddr)
 {
-	u8_t index;
+	uint8_t index;
 
 	for (index = 0U; index < 8; index++) {
-		NRF_RADIO->DAB[index] = ((u32_t)bdaddr[3] << 24) |
-			((u32_t)bdaddr[2] << 16) |
-			((u32_t)bdaddr[1] << 8) |
+		NRF_RADIO->DAB[index] = ((uint32_t)bdaddr[3] << 24) |
+			((uint32_t)bdaddr[2] << 16) |
+			((uint32_t)bdaddr[1] << 8) |
 			bdaddr[0];
-		NRF_RADIO->DAP[index] = ((u32_t)bdaddr[5] << 8) | bdaddr[4];
+		NRF_RADIO->DAP[index] = ((uint32_t)bdaddr[5] << 8) | bdaddr[4];
 		bdaddr += 6;
 	}
 
-	NRF_RADIO->DACNF = ((u32_t)bitmask_addr_type << 8) | bitmask_enable;
+	NRF_RADIO->DACNF = ((uint32_t)bitmask_addr_type << 8) | bitmask_enable;
 }
 
 void radio_filter_disable(void)
@@ -610,17 +610,17 @@ void radio_filter_status_reset(void)
 	NRF_RADIO->EVENTS_DEVMATCH = 0;
 }
 
-u32_t radio_filter_has_match(void)
+uint32_t radio_filter_has_match(void)
 {
 	return (NRF_RADIO->EVENTS_DEVMATCH != 0);
 }
 
-u32_t radio_filter_match_get(void)
+uint32_t radio_filter_match_get(void)
 {
 	return NRF_RADIO->DAI;
 }
 
-void radio_bc_configure(u32_t n)
+void radio_bc_configure(uint32_t n)
 {
 	nrf_radio_bcc_set(NRF_RADIO, n);
 	NRF_RADIO->SHORTS |= RADIO_SHORTS_ADDRESS_BCSTART_Msk;
@@ -631,7 +631,7 @@ void radio_bc_status_reset(void)
 	NRF_RADIO->EVENTS_BCMATCH = 0;
 }
 
-u32_t radio_bc_has_match(void)
+uint32_t radio_bc_has_match(void)
 {
 	return (NRF_RADIO->EVENTS_BCMATCH != 0);
 }
@@ -659,7 +659,7 @@ void radio_tmr_status_reset(void)
 			BIT(HAL_TRIGGER_CRYPT_PPI));
 }
 
-void radio_tmr_tifs_set(u32_t tifs)
+void radio_tmr_tifs_set(uint32_t tifs)
 {
 #if defined(CONFIG_BT_CTLR_TIFS_HW)
 	NRF_RADIO->TIFS = tifs;
@@ -669,7 +669,7 @@ void radio_tmr_tifs_set(u32_t tifs)
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 }
 
-u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder)
+uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 {
 	if ((!(remainder / 1000000UL)) || (remainder & 0x80000000)) {
 		ticks_start--;
@@ -722,9 +722,9 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder)
 	return remainder;
 }
 
-u32_t radio_tmr_start_tick(u8_t trx, u32_t tick)
+uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t tick)
 {
-	u32_t remainder_us;
+	uint32_t remainder_us;
 
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_STOP);
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_CLEAR);
@@ -750,16 +750,16 @@ u32_t radio_tmr_start_tick(u8_t trx, u32_t tick)
 	return remainder_us;
 }
 
-void radio_tmr_start_us(u8_t trx, u32_t us)
+void radio_tmr_start_us(uint8_t trx, uint32_t us)
 {
 	nrf_timer_cc_set(EVENT_TIMER, 0, us);
 
 	hal_radio_enable_on_tick_ppi_config_and_enable(trx);
 }
 
-u32_t radio_tmr_start_now(u8_t trx)
+uint32_t radio_tmr_start_now(uint8_t trx)
 {
-	u32_t now, start;
+	uint32_t now, start;
 
 	hal_radio_enable_on_tick_ppi_config_and_enable(trx);
 
@@ -785,7 +785,7 @@ u32_t radio_tmr_start_now(u8_t trx)
 	return start;
 }
 
-u32_t radio_tmr_start_get(void)
+uint32_t radio_tmr_start_get(void)
 {
 	return nrf_rtc_cc_get(NRF_RTC0, 2);
 }
@@ -801,7 +801,7 @@ void radio_tmr_stop(void)
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */
 }
 
-void radio_tmr_hcto_configure(u32_t hcto)
+void radio_tmr_hcto_configure(uint32_t hcto)
 {
 	nrf_timer_cc_set(EVENT_TIMER, 1, hcto);
 
@@ -821,25 +821,25 @@ void radio_tmr_aa_capture(void)
 		BIT(HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI));
 }
 
-u32_t radio_tmr_aa_get(void)
+uint32_t radio_tmr_aa_get(void)
 {
 	return EVENT_TIMER->CC[1];
 }
 
-static u32_t radio_tmr_aa;
+static uint32_t radio_tmr_aa;
 
-void radio_tmr_aa_save(u32_t aa)
+void radio_tmr_aa_save(uint32_t aa)
 {
 	radio_tmr_aa = aa;
 }
 
-u32_t radio_tmr_aa_restore(void)
+uint32_t radio_tmr_aa_restore(void)
 {
 	/* NOTE: we dont need to restore for now, but return the saved value. */
 	return radio_tmr_aa;
 }
 
-u32_t radio_tmr_ready_get(void)
+uint32_t radio_tmr_ready_get(void)
 {
 	return EVENT_TIMER->CC[0];
 }
@@ -850,7 +850,7 @@ void radio_tmr_end_capture(void)
 	hal_radio_nrf_ppi_channels_enable(BIT(HAL_RADIO_END_TIME_CAPTURE_PPI));
 }
 
-u32_t radio_tmr_end_get(void)
+uint32_t radio_tmr_end_get(void)
 {
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 	return last_pdu_end_us;
@@ -859,19 +859,19 @@ u32_t radio_tmr_end_get(void)
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 }
 
-u32_t radio_tmr_tifs_base_get(void)
+uint32_t radio_tmr_tifs_base_get(void)
 {
 	return radio_tmr_end_get();
 }
 
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-static u32_t tmr_sample_val;
+static uint32_t tmr_sample_val;
 #endif /* CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 
 void radio_tmr_sample(void)
 {
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
-	u32_t cc;
+	uint32_t cc;
 
 	cc = EVENT_TIMER->CC[HAL_EVENT_TIMER_SAMPLE_CC_OFFSET];
 	nrf_timer_task_trigger(EVENT_TIMER, HAL_EVENT_TIMER_SAMPLE_TASK);
@@ -884,7 +884,7 @@ void radio_tmr_sample(void)
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
 }
 
-u32_t radio_tmr_sample_get(void)
+uint32_t radio_tmr_sample_get(void)
 {
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 	return tmr_sample_val;
@@ -961,7 +961,7 @@ void radio_gpio_lna_off(void)
 }
 #endif /* CONFIG_BT_CTLR_GPIO_LNA_PIN */
 
-void radio_gpio_pa_lna_enable(u32_t trx_us)
+void radio_gpio_pa_lna_enable(uint32_t trx_us)
 {
 	nrf_timer_cc_set(EVENT_TIMER, 2, trx_us);
 
@@ -978,11 +978,11 @@ void radio_gpio_pa_lna_disable(void)
 }
 #endif /* CONFIG_BT_CTLR_GPIO_PA_PIN || CONFIG_BT_CTLR_GPIO_LNA_PIN */
 
-static u8_t MALIGN(4) _ccm_scratch[(HAL_RADIO_PDU_LEN_MAX - 4) + 16];
+static uint8_t MALIGN(4) _ccm_scratch[(HAL_RADIO_PDU_LEN_MAX - 4) + 16];
 
-void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
+void *radio_ccm_rx_pkt_set(struct ccm *ccm, uint8_t phy, void *pkt)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
@@ -1032,7 +1032,7 @@ void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
 #if !defined(CONFIG_SOC_COMPATIBLE_NRF52832) && \
 	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
 	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < ((HAL_RADIO_PDU_LEN_MAX) - 4)))
-	u8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
+	uint8_t max_len = (NRF_RADIO->PCNF1 & RADIO_PCNF1_MAXLEN_Msk) >>
 			RADIO_PCNF1_MAXLEN_Pos;
 
 	NRF_CCM->MAXPACKETSIZE = max_len;
@@ -1040,10 +1040,10 @@ void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
 #endif /* !CONFIG_SOC_SERIES_NRF51X */
 
 	NRF_CCM->MODE = mode;
-	NRF_CCM->CNFPTR = (u32_t)ccm;
-	NRF_CCM->INPTR = (u32_t)_pkt_scratch;
-	NRF_CCM->OUTPTR = (u32_t)pkt;
-	NRF_CCM->SCRATCHPTR = (u32_t)_ccm_scratch;
+	NRF_CCM->CNFPTR = (uint32_t)ccm;
+	NRF_CCM->INPTR = (uint32_t)_pkt_scratch;
+	NRF_CCM->OUTPTR = (uint32_t)pkt;
+	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = 0;
 	NRF_CCM->EVENTS_ENDCRYPT = 0;
 	NRF_CCM->EVENTS_ERROR = 0;
@@ -1058,7 +1058,7 @@ void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
 
 void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
 	NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
@@ -1076,10 +1076,10 @@ void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 		CCM_MODE_DATARATE_Msk;
 #endif
 	NRF_CCM->MODE = mode;
-	NRF_CCM->CNFPTR = (u32_t)ccm;
-	NRF_CCM->INPTR = (u32_t)pkt;
-	NRF_CCM->OUTPTR = (u32_t)_pkt_scratch;
-	NRF_CCM->SCRATCHPTR = (u32_t)_ccm_scratch;
+	NRF_CCM->CNFPTR = (uint32_t)ccm;
+	NRF_CCM->INPTR = (uint32_t)pkt;
+	NRF_CCM->OUTPTR = (uint32_t)_pkt_scratch;
+	NRF_CCM->SCRATCHPTR = (uint32_t)_ccm_scratch;
 	NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
 	NRF_CCM->EVENTS_ENDCRYPT = 0;
 	NRF_CCM->EVENTS_ERROR = 0;
@@ -1089,7 +1089,7 @@ void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 	return _pkt_scratch;
 }
 
-u32_t radio_ccm_is_done(void)
+uint32_t radio_ccm_is_done(void)
 {
 	nrf_ccm_int_enable(NRF_CCM, CCM_INTENSET_ENDCRYPT_Msk);
 	while (NRF_CCM->EVENTS_ENDCRYPT == 0) {
@@ -1103,21 +1103,21 @@ u32_t radio_ccm_is_done(void)
 	return (NRF_CCM->EVENTS_ERROR == 0);
 }
 
-u32_t radio_ccm_mic_is_valid(void)
+uint32_t radio_ccm_mic_is_valid(void)
 {
 	return (NRF_CCM->MICSTATUS != 0);
 }
 
-static u8_t MALIGN(4) _aar_scratch[3];
+static uint8_t MALIGN(4) _aar_scratch[3];
 
-void radio_ar_configure(u32_t nirk, void *irk)
+void radio_ar_configure(uint32_t nirk, void *irk)
 {
 	NRF_AAR->ENABLE = (AAR_ENABLE_ENABLE_Enabled << AAR_ENABLE_ENABLE_Pos) &
 			  AAR_ENABLE_ENABLE_Msk;
 	NRF_AAR->NIRK = nirk;
-	NRF_AAR->IRKPTR = (u32_t)irk;
-	NRF_AAR->ADDRPTR = (u32_t)NRF_RADIO->PACKETPTR - 1;
-	NRF_AAR->SCRATCHPTR = (u32_t)&_aar_scratch[0];
+	NRF_AAR->IRKPTR = (uint32_t)irk;
+	NRF_AAR->ADDRPTR = (uint32_t)NRF_RADIO->PACKETPTR - 1;
+	NRF_AAR->SCRATCHPTR = (uint32_t)&_aar_scratch[0];
 
 	NRF_AAR->EVENTS_END = 0;
 	NRF_AAR->EVENTS_RESOLVED = 0;
@@ -1130,7 +1130,7 @@ void radio_ar_configure(u32_t nirk, void *irk)
 	hal_radio_nrf_ppi_channels_enable(BIT(HAL_TRIGGER_AAR_PPI));
 }
 
-u32_t radio_ar_match_get(void)
+uint32_t radio_ar_match_get(void)
 {
 	return NRF_AAR->STATUS;
 }
@@ -1143,7 +1143,7 @@ void radio_ar_status_reset(void)
 			  AAR_ENABLE_ENABLE_Msk;
 }
 
-u32_t radio_ar_has_match(void)
+uint32_t radio_ar_has_match(void)
 {
 	return (radio_bc_has_match() &&
 		NRF_AAR->EVENTS_END &&
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
index 0c93cbc967..b5c87648ad 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h
@@ -12,93 +12,93 @@ void radio_isr_set(radio_isr_cb_t cb, void *param);
 
 void radio_setup(void);
 void radio_reset(void);
-void radio_phy_set(u8_t phy, u8_t flags);
-void radio_tx_power_set(s8_t power);
+void radio_phy_set(uint8_t phy, uint8_t flags);
+void radio_tx_power_set(int8_t power);
 void radio_tx_power_max_set(void);
-s8_t radio_tx_power_min_get(void);
-s8_t radio_tx_power_max_get(void);
-s8_t radio_tx_power_floor(s8_t power);
-void radio_freq_chan_set(u32_t chan);
-void radio_whiten_iv_set(u32_t iv);
-void radio_aa_set(u8_t *aa);
-void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags);
+int8_t radio_tx_power_min_get(void);
+int8_t radio_tx_power_max_get(void);
+int8_t radio_tx_power_floor(int8_t power);
+void radio_freq_chan_set(uint32_t chan);
+void radio_whiten_iv_set(uint32_t iv);
+void radio_aa_set(uint8_t *aa);
+void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags);
 void radio_pkt_rx_set(void *rx_packet);
 void radio_pkt_tx_set(void *tx_packet);
-u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags);
-u32_t radio_tx_chain_delay_get(u8_t phy, u8_t flags);
-u32_t radio_rx_ready_delay_get(u8_t phy, u8_t flags);
-u32_t radio_rx_chain_delay_get(u8_t phy, u8_t flags);
+uint32_t radio_tx_ready_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_tx_chain_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_rx_ready_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_rx_chain_delay_get(uint8_t phy, uint8_t flags);
 void radio_rx_enable(void);
 void radio_tx_enable(void);
 void radio_disable(void);
 
 void radio_status_reset(void);
-u32_t radio_is_ready(void);
-u32_t radio_is_done(void);
-u32_t radio_has_disabled(void);
-u32_t radio_is_idle(void);
+uint32_t radio_is_ready(void);
+uint32_t radio_is_done(void);
+uint32_t radio_has_disabled(void);
+uint32_t radio_is_idle(void);
 
-void radio_crc_configure(u32_t polynomial, u32_t iv);
-u32_t radio_crc_is_valid(void);
+void radio_crc_configure(uint32_t polynomial, uint32_t iv);
+uint32_t radio_crc_is_valid(void);
 
 void *radio_pkt_empty_get(void);
 void *radio_pkt_scratch_get(void);
 void *radio_pkt_decrypt_get(void);
 
-void radio_switch_complete_and_rx(u8_t phy_rx);
-void radio_switch_complete_and_tx(u8_t phy_rx, u8_t flags_rx, u8_t phy_tx,
-				  u8_t flags_tx);
+void radio_switch_complete_and_rx(uint8_t phy_rx);
+void radio_switch_complete_and_tx(uint8_t phy_rx, uint8_t flags_rx, uint8_t phy_tx,
+				  uint8_t flags_tx);
 void radio_switch_complete_and_disable(void);
 
 void radio_rssi_measure(void);
-u32_t radio_rssi_get(void);
+uint32_t radio_rssi_get(void);
 void radio_rssi_status_reset(void);
-u32_t radio_rssi_is_ready(void);
+uint32_t radio_rssi_is_ready(void);
 
-void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
-			    u8_t *bdaddr);
+void radio_filter_configure(uint8_t bitmask_enable, uint8_t bitmask_addr_type,
+			    uint8_t *bdaddr);
 void radio_filter_disable(void);
 void radio_filter_status_reset(void);
-u32_t radio_filter_has_match(void);
-u32_t radio_filter_match_get(void);
+uint32_t radio_filter_has_match(void);
+uint32_t radio_filter_match_get(void);
 
-void radio_bc_configure(u32_t n);
+void radio_bc_configure(uint32_t n);
 void radio_bc_status_reset(void);
-u32_t radio_bc_has_match(void);
+uint32_t radio_bc_has_match(void);
 
 void radio_tmr_status_reset(void);
-void radio_tmr_tifs_set(u32_t tifs);
-u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder);
-u32_t radio_tmr_start_tick(u8_t trx, u32_t tick);
-void radio_tmr_start_us(u8_t trx, u32_t us);
-u32_t radio_tmr_start_now(u8_t trx);
-u32_t radio_tmr_start_get(void);
+void radio_tmr_tifs_set(uint32_t tifs);
+uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder);
+uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t tick);
+void radio_tmr_start_us(uint8_t trx, uint32_t us);
+uint32_t radio_tmr_start_now(uint8_t trx);
+uint32_t radio_tmr_start_get(void);
 void radio_tmr_stop(void);
-void radio_tmr_hcto_configure(u32_t hcto);
+void radio_tmr_hcto_configure(uint32_t hcto);
 void radio_tmr_aa_capture(void);
-u32_t radio_tmr_aa_get(void);
-void radio_tmr_aa_save(u32_t aa);
-u32_t radio_tmr_aa_restore(void);
-u32_t radio_tmr_ready_get(void);
+uint32_t radio_tmr_aa_get(void);
+void radio_tmr_aa_save(uint32_t aa);
+uint32_t radio_tmr_aa_restore(void);
+uint32_t radio_tmr_ready_get(void);
 void radio_tmr_end_capture(void);
-u32_t radio_tmr_end_get(void);
-u32_t radio_tmr_tifs_base_get(void);
+uint32_t radio_tmr_end_get(void);
+uint32_t radio_tmr_tifs_base_get(void);
 void radio_tmr_sample(void);
-u32_t radio_tmr_sample_get(void);
+uint32_t radio_tmr_sample_get(void);
 
 void radio_gpio_pa_setup(void);
 void radio_gpio_lna_setup(void);
 void radio_gpio_lna_on(void);
 void radio_gpio_lna_off(void);
-void radio_gpio_pa_lna_enable(u32_t trx_us);
+void radio_gpio_pa_lna_enable(uint32_t trx_us);
 void radio_gpio_pa_lna_disable(void);
 
-void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt);
+void *radio_ccm_rx_pkt_set(struct ccm *ccm, uint8_t phy, void *pkt);
 void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt);
-u32_t radio_ccm_is_done(void);
-u32_t radio_ccm_mic_is_valid(void);
+uint32_t radio_ccm_is_done(void);
+uint32_t radio_ccm_mic_is_valid(void);
 
-void radio_ar_configure(u32_t nirk, void *irk);
-u32_t radio_ar_match_get(void);
+void radio_ar_configure(uint32_t nirk, void *irk);
+uint32_t radio_ar_match_get(void);
 void radio_ar_status_reset(void);
-u32_t radio_ar_has_match(void);
+uint32_t radio_ar_has_match(void);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
index 5e80318704..35c1ac808a 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf51.h
@@ -31,10 +31,10 @@ static inline void hal_radio_ram_prio_setup(void)
 {
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -50,43 +50,43 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg30dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -94,56 +94,56 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_TXEN_TXIDLE_TX_US;
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_RXEN_RXIDLE_RX_US;
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_RX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_TXEN_TXIDLE_TX_NS;
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_RXEN_RXIDLE_RX_NS;
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
 	return HAL_RADIO_NRF51_TX_CHAIN_DELAY_NS;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
index 8e858d14fe..9c5479f867 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
@@ -200,24 +200,24 @@ static inline void hal_radio_reset(void)
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile SAADC;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
-			u32_t volatile SERIAL2;
-			u32_t volatile NFCT;
-			u32_t volatile I2S;
-			u32_t volatile PDM;
-			u32_t volatile PWM;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile SAADC;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
+			uint32_t volatile SERIAL2;
+			uint32_t volatile NFCT;
+			uint32_t volatile I2S;
+			uint32_t volatile PDM;
+			uint32_t volatile PWM;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -237,10 +237,10 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -256,47 +256,47 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -304,7 +304,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -317,7 +317,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -330,7 +330,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -338,7 +338,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52810_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -351,7 +351,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -364,7 +364,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -377,7 +377,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -385,7 +385,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52810_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
index 22deb0710f..cb84487b20 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52811.h
@@ -360,31 +360,31 @@
 static inline void hal_radio_reset(void)
 {
 	/* Anomalies 102, 106 and 107 */
-	*(volatile u32_t *)0x40001774 = ((*(volatile u32_t *)0x40001774) &
+	*(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
 					 0xfffffffe) | 0x01000000;
 }
 
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile SAADC;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
-			u32_t volatile SERIAL2;
-			u32_t volatile NFCT;
-			u32_t volatile I2S;
-			u32_t volatile PDM;
-			u32_t volatile PWM;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile SAADC;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
+			uint32_t volatile SERIAL2;
+			uint32_t volatile NFCT;
+			uint32_t volatile I2S;
+			uint32_t volatile PDM;
+			uint32_t volatile PWM;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -404,9 +404,9 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -415,7 +415,7 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 		/* Workaround: nRF52811 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c &= ~0x80000000;
+		*(volatile uint32_t *)0x4000173c &= ~0x80000000;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 
 		break;
@@ -425,7 +425,7 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 		/* Workaround: nRF52811 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c &= ~0x80000000;
+		*(volatile uint32_t *)0x4000173c &= ~0x80000000;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 
 		break;
@@ -439,9 +439,9 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 		}
 
 		/* Workaround: nRF52811 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c |= 0x80000000;
-		*(volatile u32_t *)0x4000173c =
-				((*(volatile u32_t *)0x4000173c) & 0xFFFFFF00) |
+		*(volatile uint32_t *)0x4000173c |= 0x80000000;
+		*(volatile uint32_t *)0x4000173c =
+				((*(volatile uint32_t *)0x4000173c) & 0xFFFFFF00) |
 				0x5C;
 		break;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
@@ -450,47 +450,47 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -498,7 +498,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -518,7 +518,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -538,7 +538,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -558,7 +558,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -578,7 +578,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -598,7 +598,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -618,7 +618,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -638,7 +638,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
index 8b95c9f3c4..46f6e9a531 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52820.h
@@ -365,19 +365,19 @@ static inline void hal_radio_reset(void)
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile reserved;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile reserved;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -391,9 +391,9 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.SERIAL0 = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -419,67 +419,67 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos7dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos6dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos5dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos2dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -487,7 +487,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -507,7 +507,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -527,7 +527,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -547,7 +547,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -567,7 +567,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -587,7 +587,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -607,7 +607,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -627,7 +627,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
index 646598f2cf..77d89ff7ff 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
@@ -197,31 +197,31 @@
 static inline void hal_radio_reset(void)
 {
 	/* Anomalies 102, 106 and 107 */
-	*(volatile u32_t *)0x40001774 = ((*(volatile u32_t *)0x40001774) &
+	*(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
 					 0xfffffffe) | 0x01000000;
 }
 
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile SAADC;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
-			u32_t volatile SERIAL2;
-			u32_t volatile NFCT;
-			u32_t volatile I2S;
-			u32_t volatile PDM;
-			u32_t volatile PWM;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile SAADC;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
+			uint32_t volatile SERIAL2;
+			uint32_t volatile NFCT;
+			uint32_t volatile I2S;
+			uint32_t volatile PDM;
+			uint32_t volatile PWM;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -241,10 +241,10 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -260,47 +260,47 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -308,7 +308,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -321,7 +321,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -334,7 +334,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -342,7 +342,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52832_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -355,7 +355,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -368,7 +368,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -381,7 +381,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(phy);
 	ARG_UNUSED(flags);
@@ -389,7 +389,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	return HAL_RADIO_NRF52832_TX_CHAIN_DELAY_US;
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
index f5bd4535c2..f9d8347cb2 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52833.h
@@ -365,24 +365,24 @@ static inline void hal_radio_reset(void)
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile SAADC;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
-			u32_t volatile SERIAL2;
-			u32_t volatile NFCT;
-			u32_t volatile I2S;
-			u32_t volatile PDM;
-			u32_t volatile PWM;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile SAADC;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
+			uint32_t volatile SERIAL2;
+			uint32_t volatile NFCT;
+			uint32_t volatile I2S;
+			uint32_t volatile PDM;
+			uint32_t volatile PWM;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -402,9 +402,9 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -430,67 +430,67 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos7dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos6dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos5dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos2dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -498,7 +498,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -518,7 +518,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -538,7 +538,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -558,7 +558,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -578,7 +578,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -598,7 +598,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -618,7 +618,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -638,7 +638,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
index a303e2024e..6382757d18 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
@@ -361,31 +361,31 @@
 static inline void hal_radio_reset(void)
 {
 	/* Anomalies 102, 106 and 107 */
-	*(volatile u32_t *)0x40001774 = ((*(volatile u32_t *)0x40001774) &
+	*(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
 					 0xfffffffe) | 0x01000000;
 }
 
 static inline void hal_radio_ram_prio_setup(void)
 {
 	struct {
-		u32_t volatile reserved_0[0x5a0 >> 2];
-		u32_t volatile bridge_type;
-		u32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
+		uint32_t volatile reserved_0[0x5a0 >> 2];
+		uint32_t volatile bridge_type;
+		uint32_t volatile reserved_1[((0xe00 - 0x5a0) >> 2) - 1];
 		struct {
-			u32_t volatile CPU0;
-			u32_t volatile SPIS1;
-			u32_t volatile RADIO;
-			u32_t volatile ECB;
-			u32_t volatile CCM;
-			u32_t volatile AAR;
-			u32_t volatile SAADC;
-			u32_t volatile UARTE;
-			u32_t volatile SERIAL0;
-			u32_t volatile SERIAL2;
-			u32_t volatile NFCT;
-			u32_t volatile I2S;
-			u32_t volatile PDM;
-			u32_t volatile PWM;
+			uint32_t volatile CPU0;
+			uint32_t volatile SPIS1;
+			uint32_t volatile RADIO;
+			uint32_t volatile ECB;
+			uint32_t volatile CCM;
+			uint32_t volatile AAR;
+			uint32_t volatile SAADC;
+			uint32_t volatile UARTE;
+			uint32_t volatile SERIAL0;
+			uint32_t volatile SERIAL2;
+			uint32_t volatile NFCT;
+			uint32_t volatile I2S;
+			uint32_t volatile PDM;
+			uint32_t volatile PWM;
 		} RAMPRI;
 	} volatile *NRF_AMLI = (void volatile *)0x40000000UL;
 
@@ -405,9 +405,9 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -416,7 +416,7 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 		/* Workaround: nRF52840 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c &= ~0x80000000;
+		*(volatile uint32_t *)0x4000173c &= ~0x80000000;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 
 		break;
@@ -426,7 +426,7 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
 		/* Workaround: nRF52840 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c &= ~0x80000000;
+		*(volatile uint32_t *)0x4000173c &= ~0x80000000;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
 
 		break;
@@ -440,9 +440,9 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 		}
 
 		/* Workaround: nRF52840 Engineering A Errata ID 164 */
-		*(volatile u32_t *)0x4000173c |= 0x80000000;
-		*(volatile u32_t *)0x4000173c =
-				((*(volatile u32_t *)0x4000173c) & 0xFFFFFF00) |
+		*(volatile uint32_t *)0x4000173c |= 0x80000000;
+		*(volatile uint32_t *)0x4000173c =
+				((*(volatile uint32_t *)0x4000173c) & 0xFFFFFF00) |
 				0x5C;
 		break;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
@@ -451,67 +451,67 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos7dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos7dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos6dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos6dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos5dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos5dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos2dBm) {
 		return RADIO_TXPOWER_TXPOWER_Pos2dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -519,7 +519,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -539,7 +539,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -559,7 +559,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -579,7 +579,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -599,7 +599,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -619,7 +619,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -639,7 +639,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -659,7 +659,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
index 6ebdd66825..c50035564b 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5340.h
@@ -368,9 +368,9 @@ static inline void hal_radio_ram_prio_setup(void)
 	/* TODO */
 }
 
-static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_phy_mode_get(uint8_t phy, uint8_t flags)
 {
-	u32_t mode;
+	uint32_t mode;
 
 	switch (phy) {
 	case BIT(0):
@@ -399,63 +399,63 @@ static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
 	return mode;
 }
 
-static inline u32_t hal_radio_tx_power_max_get(void)
+static inline uint32_t hal_radio_tx_power_max_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_0dBm;
 }
 
-static inline u32_t hal_radio_tx_power_min_get(void)
+static inline uint32_t hal_radio_tx_power_min_get(void)
 {
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
+static inline uint32_t hal_radio_tx_power_floor(int8_t tx_power_lvl)
 {
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
 		return RADIO_TXPOWER_TXPOWER_0dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg1dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg1dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg1dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg2dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg2dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg2dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg3dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg3dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg3dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg4dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg5dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg5dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg5dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg6dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg6dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg6dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg7dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg7dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg7dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg8dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg12dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg16dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg16dBm;
 	}
 
-	if (tx_power_lvl >= (s8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+	if (tx_power_lvl >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
 		return RADIO_TXPOWER_TXPOWER_Neg20dBm;
 	}
 
@@ -463,7 +463,7 @@ static inline u32_t hal_radio_tx_power_floor(s8_t tx_power_lvl)
 	return RADIO_TXPOWER_TXPOWER_Neg40dBm;
 }
 
-static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -483,7 +483,7 @@ static inline u32_t hal_radio_tx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -503,7 +503,7 @@ static inline u32_t hal_radio_rx_ready_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -523,7 +523,7 @@ static inline u32_t hal_radio_tx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_us_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -543,7 +543,7 @@ static inline u32_t hal_radio_rx_chain_delay_us_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -563,7 +563,7 @@ static inline u32_t hal_radio_tx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_ready_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -583,7 +583,7 @@ static inline u32_t hal_radio_rx_ready_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_tx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
@@ -603,7 +603,7 @@ static inline u32_t hal_radio_tx_chain_delay_ns_get(u8_t phy, u8_t flags)
 	}
 }
 
-static inline u32_t hal_radio_rx_chain_delay_ns_get(u8_t phy, u8_t flags)
+static inline uint32_t hal_radio_rx_chain_delay_ns_get(uint8_t phy, uint8_t flags)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
index d068e5ab8d..4d9641100d 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
@@ -9,17 +9,17 @@
 
 #include <nrfx/hal/nrf_ppi.h>
 
-static inline void hal_radio_nrf_ppi_channels_enable(u32_t mask)
+static inline void hal_radio_nrf_ppi_channels_enable(uint32_t mask)
 {
 	nrf_ppi_channels_enable(NRF_PPI, mask);
 }
 
-static inline void hal_radio_nrf_ppi_channels_disable(u32_t mask)
+static inline void hal_radio_nrf_ppi_channels_disable(uint32_t mask)
 {
 	nrf_ppi_channels_disable(NRF_PPI, mask);
 }
 
-static inline void hal_radio_nrf_ppi_group_disable(u32_t group)
+static inline void hal_radio_nrf_ppi_group_disable(uint32_t group)
 {
 	nrf_ppi_group_disable(NRF_PPI, group);
 }
@@ -44,7 +44,7 @@ static inline void hal_radio_nrf_ppi_group_disable(u32_t group)
  */
 #define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 21
 
-static inline void hal_radio_enable_on_tick_ppi_config_and_enable(u8_t trx)
+static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 {
 	/* No need to configure anything for the pre-programmed channels.
 	 * Just enable and disable them accordingly.
@@ -65,14 +65,14 @@ static inline void hal_radio_enable_on_tick_ppi_config_and_enable(u8_t trx)
 #define HAL_RADIO_ENABLE_TX_ON_TICK_PPI HAL_RADIO_ENABLE_ON_TICK_PPI
 #define HAL_RADIO_ENABLE_RX_ON_TICK_PPI HAL_RADIO_ENABLE_ON_TICK_PPI
 
-static inline void hal_radio_enable_on_tick_ppi_config_and_enable(u8_t trx)
+static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 {
-	u32_t event_address = (trx ? (u32_t)&(NRF_RADIO->TASKS_TXEN)
-				   : (u32_t)&(NRF_RADIO->TASKS_RXEN));
+	uint32_t event_address = (trx ? (uint32_t)&(NRF_RADIO->TASKS_TXEN)
+				   : (uint32_t)&(NRF_RADIO->TASKS_RXEN));
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_ENABLE_ON_TICK_PPI,
-		(u32_t)&(EVENT_TIMER->EVENTS_COMPARE[0]),
+		(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[0]),
 		event_address);
 	nrf_ppi_channels_enable(NRF_PPI, BIT(HAL_RADIO_ENABLE_ON_TICK_PPI));
 }
@@ -109,8 +109,8 @@ static inline void hal_radio_recv_timeout_cancel_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_ADDRESS),
-		(u32_t)&(EVENT_TIMER->TASKS_CAPTURE[1]));
+		(uint32_t)&(NRF_RADIO->EVENTS_ADDRESS),
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[1]));
 }
 
 #endif /* (EVENT_TIMER_ID == 0) */
@@ -145,8 +145,8 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_DISABLE_ON_HCTO_PPI,
-		(u32_t)&(EVENT_TIMER->EVENTS_COMPARE[1]),
-		(u32_t)&(NRF_RADIO->TASKS_DISABLE));
+		(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[1]),
+		(uint32_t)&(NRF_RADIO->TASKS_DISABLE));
 }
 
 #endif /* (EVENT_TIMER_ID == 0) */
@@ -181,8 +181,8 @@ static inline void hal_radio_end_time_capture_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_END_TIME_CAPTURE_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_END),
-		(u32_t)&(EVENT_TIMER->TASKS_CAPTURE[2]));
+		(uint32_t)&(NRF_RADIO->EVENTS_END),
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[2]));
 }
 
 #endif /* (EVENT_TIMER_ID == 0) */
@@ -198,8 +198,8 @@ static inline void hal_event_timer_start_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_EVENT_TIMER_START_PPI,
-		(u32_t)&(NRF_RTC0->EVENTS_COMPARE[2]),
-		(u32_t)&(EVENT_TIMER->TASKS_START));
+		(uint32_t)&(NRF_RTC0->EVENTS_COMPARE[2]),
+		(uint32_t)&(EVENT_TIMER->TASKS_START));
 }
 
 /*******************************************************************************
@@ -214,8 +214,8 @@ static inline void hal_radio_ready_time_capture_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_READY_TIME_CAPTURE_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_READY),
-		(u32_t)&(EVENT_TIMER->TASKS_CAPTURE[0]));
+		(uint32_t)&(NRF_RADIO->EVENTS_READY),
+		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[0]));
 }
 
 /*******************************************************************************
@@ -260,8 +260,8 @@ static inline void hal_trigger_rateoverride_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_TRIGGER_RATEOVERRIDE_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_RATEBOOST),
-		(u32_t)&(NRF_CCM->TASKS_RATEOVERRIDE));
+		(uint32_t)&(NRF_RADIO->EVENTS_RATEBOOST),
+		(uint32_t)&(NRF_CCM->TASKS_RATEOVERRIDE));
 }
 
 #endif /* CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
@@ -276,8 +276,8 @@ static inline void hal_enable_palna_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_ENABLE_PALNA_PPI,
-		(u32_t)&(EVENT_TIMER->EVENTS_COMPARE[2]),
-		(u32_t)&(NRF_GPIOTE->TASKS_OUT[
+		(uint32_t)&(EVENT_TIMER->EVENTS_COMPARE[2]),
+		(uint32_t)&(NRF_GPIOTE->TASKS_OUT[
 				CONFIG_BT_CTLR_PA_LNA_GPIOTE_CHAN]));
 }
 
@@ -288,8 +288,8 @@ static inline void hal_disable_palna_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_DISABLE_PALNA_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_DISABLED),
-		(u32_t)&(NRF_GPIOTE->TASKS_OUT[
+		(uint32_t)&(NRF_RADIO->EVENTS_DISABLED),
+		(uint32_t)&(NRF_GPIOTE->TASKS_OUT[
 				CONFIG_BT_CTLR_PA_LNA_GPIOTE_CHAN]));
 }
 
@@ -313,8 +313,8 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 	nrf_ppi_channel_endpoint_setup(
 		NRF_PPI,
 		HAL_SW_SWITCH_TIMER_CLEAR_PPI,
-		(u32_t)&(NRF_RADIO->EVENTS_END),
-		(u32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
+		(uint32_t)&(NRF_RADIO->EVENTS_END),
+		(uint32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
 }
 
 #else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
@@ -333,7 +333,7 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 	nrf_ppi_fork_endpoint_setup(
 		NRF_PPI,
 		HAL_RADIO_END_TIME_CAPTURE_PPI,
-		(u32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
+		(uint32_t)&(SW_SWITCH_TIMER->TASKS_CLEAR));
 }
 
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
@@ -369,20 +369,20 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 #define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_REGISTER_EVT(chan) \
 	NRF_PPI->CH[chan].EEP
 #define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_EVT(cc_offset) \
-	((u32_t)&(SW_SWITCH_TIMER->EVENTS_COMPARE[cc_offset]))
+	((uint32_t)&(SW_SWITCH_TIMER->EVENTS_COMPARE[cc_offset]))
 #define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_REGISTER_TASK(chan) \
 	NRF_PPI->CH[chan].TEP
 #define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_TASK(index) \
-	((u32_t)&(NRF_PPI->TASKS_CHG[SW_SWITCH_TIMER_TASK_GROUP(index)].DIS))
+	((uint32_t)&(NRF_PPI->TASKS_CHG[SW_SWITCH_TIMER_TASK_GROUP(index)].DIS))
 
 /* Wire the RADIO EVENTS_END event to one of the PPI GROUP TASK ENABLE task.
  * 2 adjacent PPI groups are used for this wiring. 'index' must be 0 or 1.
  */
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI 10
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_EVT \
-	((u32_t)&(NRF_RADIO->EVENTS_END))
+	((uint32_t)&(NRF_RADIO->EVENTS_END))
 #define HAL_SW_SWITCH_GROUP_TASK_ENABLE_PPI_TASK(index) \
-	((u32_t)&(NRF_PPI->TASKS_CHG[SW_SWITCH_TIMER_TASK_GROUP(index)].EN))
+	((uint32_t)&(NRF_PPI->TASKS_CHG[SW_SWITCH_TIMER_TASK_GROUP(index)].EN))
 
 /*Enable Radio at specific time-stamp:
  * wire the SW SWITCH TIMER EVENTS_COMPARE[<cc_offset>] event
@@ -404,18 +404,18 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 #define HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(chan) \
 	NRF_PPI->CH[chan].EEP
 #define HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(cc_offset) \
-	((u32_t)&(SW_SWITCH_TIMER->EVENTS_COMPARE[cc_offset]))
+	((uint32_t)&(SW_SWITCH_TIMER->EVENTS_COMPARE[cc_offset]))
 #define HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_TASK(chan) \
 	NRF_PPI->CH[chan].TEP
 #define HAL_SW_SWITCH_RADIO_ENABLE_PPI_TASK_TX \
-	((u32_t)&(NRF_RADIO->TASKS_TXEN))
+	((uint32_t)&(NRF_RADIO->TASKS_TXEN))
 #define HAL_SW_SWITCH_RADIO_ENABLE_PPI_TASK_RX \
-	((u32_t)&(NRF_RADIO->TASKS_RXEN))
+	((uint32_t)&(NRF_RADIO->TASKS_RXEN))
 
 static inline void hal_radio_sw_switch_setup(
-		u8_t compare_reg,
-		u8_t radio_enable_ppi,
-		u8_t ppi_group_index)
+		uint8_t compare_reg,
+		uint8_t radio_enable_ppi,
+		uint8_t ppi_group_index)
 {
 	/* Set up software switch mechanism for next Radio switch. */
 
@@ -440,7 +440,7 @@ static inline void hal_radio_sw_switch_setup(
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(compare_reg));
 }
 
-static inline void hal_radio_txen_on_sw_switch(u8_t ppi)
+static inline void hal_radio_txen_on_sw_switch(uint8_t ppi)
 {
 	nrf_ppi_task_endpoint_setup(
 		NRF_PPI,
@@ -448,7 +448,7 @@ static inline void hal_radio_txen_on_sw_switch(u8_t ppi)
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_TASK_TX);
 }
 
-static inline void hal_radio_rxen_on_sw_switch(u8_t ppi)
+static inline void hal_radio_rxen_on_sw_switch(uint8_t ppi)
 {
 	nrf_ppi_task_endpoint_setup(
 		NRF_PPI,
@@ -499,14 +499,14 @@ static inline void hal_radio_sw_switch_disable(void)
 #define HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_REGISTER_EVT \
 	NRF_PPI->CH[HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI].EEP
 #define HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_EVT \
-	((u32_t)&(NRF_RADIO->EVENTS_RATEBOOST))
+	((uint32_t)&(NRF_RADIO->EVENTS_RATEBOOST))
 #define HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_REGISTER_TASK \
 	NRF_PPI->CH[HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI].TEP
 #define HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_TASK(index) \
-	((u32_t)&(SW_SWITCH_TIMER->TASKS_CAPTURE[index]))
+	((uint32_t)&(SW_SWITCH_TIMER->TASKS_CAPTURE[index]))
 
-static inline void hal_radio_sw_switch_coded_tx_config_set(u8_t ppi_en,
-	u8_t ppi_dis, u8_t cc_s2, u8_t group_index)
+static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
+	uint8_t ppi_dis, uint8_t cc_s2, uint8_t group_index)
 {
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(ppi_en) =
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(cc_s2);
@@ -540,8 +540,8 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(u8_t ppi_en,
 		BIT(HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI));
 }
 
-static inline void hal_radio_sw_switch_coded_config_clear(u8_t ppi_en,
-	u8_t ppi_dis, u8_t cc_reg, u8_t group_index)
+static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
+	uint8_t ppi_dis, uint8_t cc_reg, uint8_t group_index)
 {
 	/* Invalidate PPI used when RXing on LE Coded PHY. */
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_EVT(
@@ -684,17 +684,17 @@ BUILD_ASSERT(
 
 #include <nrfx/hal/nrf_dppi.h>
 
-static inline void hal_radio_nrf_ppi_channels_enable(u32_t mask)
+static inline void hal_radio_nrf_ppi_channels_enable(uint32_t mask)
 {
 	nrf_dppi_channels_enable(NRF_DPPIC, mask);
 }
 
-static inline void hal_radio_nrf_ppi_channels_disable(u32_t mask)
+static inline void hal_radio_nrf_ppi_channels_disable(uint32_t mask)
 {
 	nrf_dppi_channels_disable(NRF_DPPIC, mask);
 }
 
-static inline void hal_radio_nrf_ppi_group_disable(u32_t group)
+static inline void hal_radio_nrf_ppi_group_disable(uint32_t group)
 {
 	nrf_dppi_group_disable(NRF_DPPIC, group);
 }
@@ -730,7 +730,7 @@ static inline void hal_radio_nrf_ppi_group_disable(u32_t group)
 	((RADIO_SUBSCRIBE_RXEN_EN_Enabled << RADIO_SUBSCRIBE_RXEN_EN_Pos) \
 		& RADIO_SUBSCRIBE_RXEN_EN_Msk))
 
-static inline void hal_radio_enable_on_tick_ppi_config_and_enable(u8_t trx)
+static inline void hal_radio_enable_on_tick_ppi_config_and_enable(uint8_t trx)
 {
 	HAL_RADIO_ENABLE_ON_TICK_PPI_REGISTER_EVT =
 		HAL_RADIO_ENABLE_ON_TICK_PPI_EVT;
@@ -1197,9 +1197,9 @@ static inline void hal_sw_switch_timer_clear_ppi_config(void)
 
 
 static inline void hal_radio_sw_switch_setup(
-		u8_t compare_reg,
-		u8_t radio_enable_ppi,
-		u8_t ppi_group_index)
+		uint8_t compare_reg,
+		uint8_t radio_enable_ppi,
+		uint8_t ppi_group_index)
 {
 	/* Set up software switch mechanism for next Radio switch. */
 
@@ -1255,13 +1255,13 @@ static inline void hal_radio_sw_switch_setup(
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_EVT(radio_enable_ppi);
 }
 
-static inline void hal_radio_txen_on_sw_switch(u8_t ppi)
+static inline void hal_radio_txen_on_sw_switch(uint8_t ppi)
 {
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_TASK_TX =
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_TASK_TX_SET(ppi);
 }
 
-static inline void hal_radio_rxen_on_sw_switch(u8_t ppi)
+static inline void hal_radio_rxen_on_sw_switch(uint8_t ppi)
 {
 	HAL_SW_SWITCH_RADIO_ENABLE_PPI_REGISTER_TASK_RX =
 		HAL_SW_SWITCH_RADIO_ENABLE_PPI_TASK_RX_SET(ppi);
@@ -1280,8 +1280,8 @@ static inline void hal_radio_sw_switch_disable(void)
 }
 
 
-static inline void hal_radio_sw_switch_coded_tx_config_set(u8_t ppi_en,
-	u8_t ppi_dis, u8_t cc_s2, u8_t group_index)
+static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en,
+	uint8_t ppi_dis, uint8_t cc_s2, uint8_t group_index)
 {
 	/* Publish the SW Switch Timer Compare event for S2 timing
 	 * to the PPI that will be used to trigger Radio enable.
@@ -1311,8 +1311,8 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(u8_t ppi_en,
 		BIT(HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI));
 }
 
-static inline void hal_radio_sw_switch_coded_config_clear(u8_t ppi_en,
-	u8_t ppi_dis, u8_t cc_reg, u8_t group_index)
+static inline void hal_radio_sw_switch_coded_config_clear(uint8_t ppi_en,
+	uint8_t ppi_dis, uint8_t cc_reg, uint8_t group_index)
 {
 	/* Invalidate subscription of S2 timer Compare used when
 	 * RXing on LE Coded PHY.
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
index e3c4a92c4f..764e6633f6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
@@ -28,7 +28,7 @@
 #define TICKER_MAYFLY_CALL_ID_WORKER  TICKER_USER_ID_ULL_HIGH
 #define TICKER_MAYFLY_CALL_ID_JOB     TICKER_USER_ID_ULL_LOW
 #define TICKER_MAYFLY_CALL_ID_PROGRAM TICKER_USER_ID_THREAD
-static u8_t const caller_id_lut[] = {
+static uint8_t const caller_id_lut[] = {
 	TICKER_CALL_ID_ISR,
 	TICKER_CALL_ID_WORKER,
 	TICKER_CALL_ID_JOB,
@@ -38,9 +38,9 @@ static u8_t const caller_id_lut[] = {
 #error Unknown LL variant.
 #endif
 
-u8_t hal_ticker_instance0_caller_id_get(u8_t user_id)
+uint8_t hal_ticker_instance0_caller_id_get(uint8_t user_id)
 {
-	u8_t caller_id;
+	uint8_t caller_id;
 
 	LL_ASSERT(user_id < sizeof(caller_id_lut));
 
@@ -50,7 +50,7 @@ u8_t hal_ticker_instance0_caller_id_get(u8_t user_id)
 	return caller_id;
 }
 
-void hal_ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain,
+void hal_ticker_instance0_sched(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 				void *instance)
 {
 	/* return value not checked as we allow multiple calls to schedule
@@ -198,7 +198,7 @@ void hal_ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain,
 	}
 }
 
-void hal_ticker_instance0_trigger_set(u32_t value)
+void hal_ticker_instance0_trigger_set(uint32_t value)
 {
 	cntr_cmp_set(0, value);
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.h
index 3d81231a35..6e5a4a7327 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.h
@@ -18,7 +18,7 @@
  */
 #define HAL_TICKER_US_TO_TICKS(x) \
 	( \
-		((u32_t)(((u64_t) (x) * 1000000000UL) / 30517578125UL)) \
+		((uint32_t)(((uint64_t) (x) * 1000000000UL) / 30517578125UL)) \
 		& HAL_TICKER_CNTR_MASK \
 	)
 
@@ -26,15 +26,15 @@
 #define HAL_TICKER_REMAINDER(x) \
 	( \
 		( \
-			((u64_t) (x) * 1000000000UL) \
-			- ((u64_t)HAL_TICKER_US_TO_TICKS(x) * 30517578125UL) \
+			((uint64_t) (x) * 1000000000UL) \
+			- ((uint64_t)HAL_TICKER_US_TO_TICKS(x) * 30517578125UL) \
 		) \
 		/ 1000UL \
 	)
 
 /* Macro to translate tick units to microseconds. */
 #define HAL_TICKER_TICKS_TO_US(x) \
-	((u32_t)(((u64_t)(x) * 30517578125UL) / 1000000000UL))
+	((uint32_t)(((uint64_t)(x) * 30517578125UL) / 1000000000UL))
 
 /* Macro defines the h/w supported most significant bit */
 #define HAL_TICKER_CNTR_MSBIT 23
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index 1e58161dcf..4ca263b824 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -54,18 +54,18 @@ static struct device *dev_entropy;
 static int init_reset(void);
 static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		   lll_prepare_cb_t prepare_cb, int prio,
-		   struct lll_prepare_param *prepare_param, u8_t is_resume);
+		   struct lll_prepare_param *prepare_param, uint8_t is_resume);
 static int resume_enqueue(lll_prepare_cb_t resume_cb, int resume_prio);
 
 #if !defined(CONFIG_BT_CTLR_LOW_LAT)
-static void ticker_start_op_cb(u32_t status, void *param);
+static void ticker_start_op_cb(uint32_t status, void *param);
 static void preempt_ticker_start(struct lll_prepare_param *prepare_param);
-static void preempt_ticker_cb(u32_t ticks_at_expire, u32_t remainder,
-			      u16_t lazy, void *param);
+static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
+			      uint16_t lazy, void *param);
 static void preempt(void *param);
 #else /* CONFIG_BT_CTLR_LOW_LAT */
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void ticker_op_job_disable(u32_t status, void *op_context);
+static void ticker_op_job_disable(uint32_t status, void *op_context);
 #endif
 #endif /* CONFIG_BT_CTLR_LOW_LAT */
 
@@ -176,7 +176,7 @@ int lll_init(void)
 	return 0;
 }
 
-u8_t lll_entropy_get(u8_t len, void *rand)
+uint8_t lll_entropy_get(uint8_t len, void *rand)
 {
 	return entropy_get_entropy_isr(dev_entropy, rand, len, 0);
 }
@@ -223,7 +223,7 @@ void lll_disable(void *param)
 	}
 	{
 		struct lll_event *next;
-		u8_t idx = UINT8_MAX;
+		uint8_t idx = UINT8_MAX;
 
 		next = ull_prepare_dequeue_iter(&idx);
 		while (next) {
@@ -243,7 +243,7 @@ int lll_prepare_done(void *param)
 {
 #if defined(CONFIG_BT_CTLR_LOW_LAT) && \
 	    (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-	u32_t ret;
+	uint32_t ret;
 
 	/* Ticker Job Silence */
 	ret = ticker_job_idle_get(TICKER_INSTANCE_ID_CTLR,
@@ -305,7 +305,7 @@ bool lll_is_done(void *param)
 	return !event.curr.abort_cb;
 }
 
-u32_t lll_evt_offset_get(struct evt_hdr *evt)
+uint32_t lll_evt_offset_get(struct evt_hdr *evt)
 {
 	if (0) {
 #if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
@@ -319,11 +319,11 @@ u32_t lll_evt_offset_get(struct evt_hdr *evt)
 	}
 }
 
-u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
-		       u32_t ticks_at_event)
+uint32_t lll_preempt_calc(struct evt_hdr *evt, uint8_t ticker_id,
+		       uint32_t ticks_at_event)
 {
-	u32_t ticks_now = ticker_ticks_now_get();
-	u32_t diff;
+	uint32_t ticks_now = ticker_ticks_now_get();
+	uint32_t diff;
 
 	diff = ticker_ticks_diff_get(ticks_now, ticks_at_event);
 	diff += HAL_TICKER_CNTR_CMP_OFFSET_MIN;
@@ -341,7 +341,7 @@ u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
 	return 0;
 }
 
-void lll_chan_set(u32_t chan)
+void lll_chan_set(uint32_t chan)
 {
 	switch (chan) {
 	case 37:
@@ -371,22 +371,22 @@ void lll_chan_set(u32_t chan)
 }
 
 
-u32_t lll_radio_is_idle(void)
+uint32_t lll_radio_is_idle(void)
 {
 	return radio_is_idle();
 }
 
-s8_t lll_radio_tx_pwr_min_get(void)
+int8_t lll_radio_tx_pwr_min_get(void)
 {
 	return radio_tx_power_min_get();
 }
 
-s8_t lll_radio_tx_pwr_max_get(void)
+int8_t lll_radio_tx_pwr_max_get(void)
 {
 	return radio_tx_power_max_get();
 }
 
-s8_t lll_radio_tx_pwr_floor(s8_t tx_pwr_lvl)
+int8_t lll_radio_tx_pwr_floor(int8_t tx_pwr_lvl)
 {
 	return radio_tx_power_floor(tx_pwr_lvl);
 }
@@ -398,9 +398,9 @@ static int init_reset(void)
 
 static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		   lll_prepare_cb_t prepare_cb, int prio,
-		   struct lll_prepare_param *prepare_param, u8_t is_resume)
+		   struct lll_prepare_param *prepare_param, uint8_t is_resume)
 {
-	u8_t idx = UINT8_MAX;
+	uint8_t idx = UINT8_MAX;
 	struct lll_event *p;
 	int ret, err;
 
@@ -495,7 +495,7 @@ static int resume_enqueue(lll_prepare_cb_t resume_cb, int resume_prio)
 }
 
 #if !defined(CONFIG_BT_CTLR_LOW_LAT)
-static void ticker_start_op_cb(u32_t status, void *param)
+static void ticker_start_op_cb(uint32_t status, void *param)
 {
 	/* NOTE: this callback is present only for addition of debug messages
 	 * when needed, else can be dispensed with.
@@ -508,9 +508,9 @@ static void ticker_start_op_cb(u32_t status, void *param)
 
 static void preempt_ticker_start(struct lll_prepare_param *prepare_param)
 {
-	u32_t preempt_anchor;
+	uint32_t preempt_anchor;
 	struct evt_hdr *evt;
-	u32_t preempt_to;
+	uint32_t preempt_to;
 	int ret;
 
 	/* Calc the preempt timeout */
@@ -537,12 +537,12 @@ static void preempt_ticker_start(struct lll_prepare_param *prepare_param)
 		  (ret == TICKER_STATUS_BUSY));
 }
 
-static void preempt_ticker_cb(u32_t ticks_at_expire, u32_t remainder,
-			       u16_t lazy, void *param)
+static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
+			       uint16_t lazy, void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, preempt};
-	u32_t ret;
+	uint32_t ret;
 
 	ret = mayfly_enqueue(TICKER_USER_ID_ULL_HIGH, TICKER_USER_ID_LLL,
 			     0, &mfy);
@@ -553,7 +553,7 @@ static void preempt(void *param)
 {
 	struct lll_event *next = ull_prepare_dequeue_get();
 	lll_prepare_cb_t resume_cb;
-	u8_t idx = UINT8_MAX;
+	uint8_t idx = UINT8_MAX;
 	int resume_prio;
 	int ret;
 
@@ -589,7 +589,7 @@ static void preempt(void *param)
 
 	if (ret == -EAGAIN) {
 		struct lll_event *iter;
-		u8_t iter_idx = UINT8_MAX;
+		uint8_t iter_idx = UINT8_MAX;
 
 		iter = ull_prepare_dequeue_iter(&iter_idx);
 		while (iter) {
@@ -622,7 +622,7 @@ preempt_next:
 #else /* CONFIG_BT_CTLR_LOW_LAT */
 
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void ticker_op_job_disable(u32_t status, void *op_context)
+static void ticker_op_job_disable(uint32_t status, void *op_context)
 {
 	ARG_UNUSED(status);
 	ARG_UNUSED(op_context);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
index 583d46c1e4..ab1b394ae7 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
@@ -56,24 +56,24 @@ static void isr_cleanup(void *param);
 static void isr_race(void *param);
 static void chan_prepare(struct lll_adv *lll);
 static inline int isr_rx_pdu(struct lll_adv *lll,
-			     u8_t devmatch_ok, u8_t devmatch_id,
-			     u8_t irkmatch_ok, u8_t irkmatch_id,
-			     u8_t rssi_ready);
+			     uint8_t devmatch_ok, uint8_t devmatch_id,
+			     uint8_t irkmatch_ok, uint8_t irkmatch_id,
+			     uint8_t rssi_ready);
 static inline bool isr_rx_sr_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *sr, u8_t devmatch_ok,
-				   u8_t *rl_idx);
+				   struct pdu_adv *sr, uint8_t devmatch_ok,
+				   uint8_t *rl_idx);
 static inline bool isr_rx_sr_adva_check(struct pdu_adv *adv,
 					struct pdu_adv *sr);
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
-				   u8_t rssi_ready);
+				   uint8_t rssi_ready);
 #endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */
 static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *ci, u8_t devmatch_ok,
-				   u8_t *rl_idx);
+				   struct pdu_adv *ci, uint8_t devmatch_ok,
+				   uint8_t *rl_idx);
 static inline bool isr_rx_ci_tgta_check(struct lll_adv *lll,
 					struct pdu_adv *adv, struct pdu_adv *ci,
-					u8_t rl_idx);
+					uint8_t rl_idx);
 static inline bool isr_rx_ci_adva_check(struct pdu_adv *adv,
 					struct pdu_adv *ci);
 
@@ -121,11 +121,11 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_adv *lll = prepare_param->param;
-	u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
+	uint32_t ticks_at_event, ticks_at_start;
 	struct evt_hdr *evt;
-	u32_t remainder_us;
-	u32_t remainder;
+	uint32_t remainder_us;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_A(1);
 
@@ -160,7 +160,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	radio_pkt_configure(8, PDU_AC_PAYLOAD_SIZE_MAX, 0);
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
-	radio_aa_set((u8_t *)&aa);
+	radio_aa_set((uint8_t *)&aa);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
 			    0x555555);
 
@@ -180,7 +180,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 		radio_filter_configure(filter->enable_bitmask,
 				       filter->addr_type_bitmask,
-				       (u8_t *)filter->bdaddr);
+				       (uint8_t *)filter->bdaddr);
 	} else
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
@@ -191,7 +191,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 		radio_filter_configure(wl->enable_bitmask,
 				       wl->addr_type_bitmask,
-				       (u8_t *)wl->bdaddr);
+				       (uint8_t *)wl->bdaddr);
 	}
 
 	ticks_at_event = prepare_param->ticks_at_expire;
@@ -227,7 +227,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
@@ -317,7 +317,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 
 static void isr_tx(void *param)
 {
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
@@ -350,7 +350,7 @@ static void isr_tx(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -397,13 +397,13 @@ static void isr_tx(void *param)
 
 static void isr_rx(void *param)
 {
-	u8_t trx_done;
-	u8_t crc_ok;
-	u8_t devmatch_ok;
-	u8_t devmatch_id;
-	u8_t irkmatch_ok;
-	u8_t irkmatch_id;
-	u8_t rssi_ready;
+	uint8_t trx_done;
+	uint8_t crc_ok;
+	uint8_t devmatch_ok;
+	uint8_t devmatch_id;
+	uint8_t irkmatch_ok;
+	uint8_t irkmatch_id;
+	uint8_t rssi_ready;
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_latency_capture();
@@ -492,7 +492,7 @@ static void isr_done(void *param)
 #endif /* CONFIG_BT_PERIPHERAL */
 
 	if (lll->chan_map_curr) {
-		u32_t start_us;
+		uint32_t start_us;
 
 		chan_prepare(lll);
 
@@ -523,7 +523,7 @@ static void isr_done(void *param)
 	{
 #if defined(CONFIG_BT_HCI_MESH_EXT)
 		if (_radio.advertiser.is_mesh) {
-			u32_t err;
+			uint32_t err;
 
 			err = isr_close_adv_mesh();
 			if (err) {
@@ -597,8 +597,8 @@ static void chan_prepare(struct lll_adv *lll)
 {
 	struct pdu_adv *pdu;
 	struct pdu_adv *scan_pdu;
-	u8_t chan;
-	u8_t upd = 0U;
+	uint8_t chan;
+	uint8_t upd = 0U;
 
 	pdu = lll_adv_data_latest_get(lll, &upd);
 	scan_pdu = lll_adv_scan_rsp_latest_get(lll, &upd);
@@ -638,18 +638,18 @@ static void chan_prepare(struct lll_adv *lll)
 }
 
 static inline int isr_rx_pdu(struct lll_adv *lll,
-			     u8_t devmatch_ok, u8_t devmatch_id,
-			     u8_t irkmatch_ok, u8_t irkmatch_id,
-			     u8_t rssi_ready)
+			     uint8_t devmatch_ok, uint8_t devmatch_id,
+			     uint8_t irkmatch_ok, uint8_t irkmatch_id,
+			     uint8_t rssi_ready)
 {
 	struct pdu_adv *pdu_rx, *pdu_adv;
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	/* An IRK match implies address resolution enabled */
-	u8_t rl_idx = irkmatch_ok ? ull_filter_lll_rl_irk_idx(irkmatch_id) :
+	uint8_t rl_idx = irkmatch_ok ? ull_filter_lll_rl_irk_idx(irkmatch_id) :
 				    FILTER_IDX_NONE;
 #else
-	u8_t rl_idx = FILTER_IDX_NONE;
+	uint8_t rl_idx = FILTER_IDX_NONE;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
 	pdu_rx = (void *)radio_pkt_scratch_get();
@@ -673,7 +673,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 		if (!IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) ||
 		    0 /* TODO: extended adv. scan req notification enabled */) {
-			u32_t err;
+			uint32_t err;
 
 			/* Generate the scan request event */
 			err = isr_rx_sr_report(pdu_rx, rssi_ready);
@@ -774,8 +774,8 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 }
 
 static inline bool isr_rx_sr_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *sr, u8_t devmatch_ok,
-				   u8_t *rl_idx)
+				   struct pdu_adv *sr, uint8_t devmatch_ok,
+				   uint8_t *rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	return ((((lll->filter_policy & 0x01) == 0) &&
@@ -800,11 +800,11 @@ static inline bool isr_rx_sr_adva_check(struct pdu_adv *adv,
 
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
-				   u8_t rssi_ready)
+				   uint8_t rssi_ready)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv;
-	u8_t pdu_len;
+	uint8_t pdu_len;
 
 	node_rx = ull_pdu_rx_alloc_peek(3);
 	if (!node_rx) {
@@ -834,8 +834,8 @@ static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
 #endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */
 
 static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *ci, u8_t devmatch_ok,
-				   u8_t *rl_idx)
+				   struct pdu_adv *ci, uint8_t devmatch_ok,
+				   uint8_t *rl_idx)
 {
 	/* LL 4.3.2: filter policy shall be ignored for directed adv */
 	if (adv->type == PDU_ADV_TYPE_DIRECT_IND) {
@@ -867,7 +867,7 @@ static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
 
 static inline bool isr_rx_ci_tgta_check(struct lll_adv *lll,
 					struct pdu_adv *adv, struct pdu_adv *ci,
-					u8_t rl_idx)
+					uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (rl_idx != FILTER_IDX_NONE) {
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.h b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.h
index 18439ca02f..4d12812411 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.h
@@ -5,12 +5,12 @@
  */
 
 struct lll_adv_pdu {
-	u8_t           first;
-	u8_t           last;
+	uint8_t           first;
+	uint8_t           last;
 	/* TODO: use,
 	 * struct pdu_adv *pdu[DOUBLE_BUFFER_SIZE];
 	 */
-	u8_t pdu[DOUBLE_BUFFER_SIZE][PDU_AC_SIZE_MAX];
+	uint8_t pdu[DOUBLE_BUFFER_SIZE][PDU_AC_SIZE_MAX];
 };
 
 struct lll_adv {
@@ -19,30 +19,30 @@ struct lll_adv {
 #if defined(CONFIG_BT_PERIPHERAL)
 	/* NOTE: conn context has to be after lll_hdr */
 	struct lll_conn *conn;
-	u8_t is_hdcd:1;
+	uint8_t is_hdcd:1;
 #endif /* CONFIG_BT_PERIPHERAL */
 
-	u8_t chan_map:3;
-	u8_t chan_map_curr:3;
-	u8_t filter_policy:2;
+	uint8_t chan_map:3;
+	uint8_t chan_map_curr:3;
+	uint8_t filter_policy:2;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	u8_t phy_p:3;
+	uint8_t phy_p:3;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-	u8_t is_mesh:1;
+	uint8_t is_mesh:1;
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  rl_idx;
+	uint8_t  rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
 	struct lll_adv_pdu adv_data;
 	struct lll_adv_pdu scan_rsp;
 
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
-	s8_t tx_pwr_lvl;
+	int8_t tx_pwr_lvl;
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
 };
 
@@ -52,9 +52,9 @@ int lll_adv_reset(void);
 void lll_adv_prepare(void *param);
 
 static inline struct pdu_adv *lll_adv_pdu_alloc(struct lll_adv_pdu *pdu,
-						u8_t *idx)
+						uint8_t *idx)
 {
-	u8_t last;
+	uint8_t last;
 
 	if (pdu->first == pdu->last) {
 		last = pdu->last + 1;
@@ -70,17 +70,17 @@ static inline struct pdu_adv *lll_adv_pdu_alloc(struct lll_adv_pdu *pdu,
 	return (void *)pdu->pdu[last];
 }
 
-static inline void lll_adv_pdu_enqueue(struct lll_adv_pdu *pdu, u8_t idx)
+static inline void lll_adv_pdu_enqueue(struct lll_adv_pdu *pdu, uint8_t idx)
 {
 	pdu->last = idx;
 }
 
-static inline struct pdu_adv *lll_adv_data_alloc(struct lll_adv *lll, u8_t *idx)
+static inline struct pdu_adv *lll_adv_data_alloc(struct lll_adv *lll, uint8_t *idx)
 {
 	return lll_adv_pdu_alloc(&lll->adv_data, idx);
 }
 
-static inline void lll_adv_data_enqueue(struct lll_adv *lll, u8_t idx)
+static inline void lll_adv_data_enqueue(struct lll_adv *lll, uint8_t idx)
 {
 	lll_adv_pdu_enqueue(&lll->adv_data, idx);
 }
@@ -91,12 +91,12 @@ static inline struct pdu_adv *lll_adv_data_peek(struct lll_adv *lll)
 }
 
 static inline struct pdu_adv *lll_adv_scan_rsp_alloc(struct lll_adv *lll,
-						     u8_t *idx)
+						     uint8_t *idx)
 {
 	return lll_adv_pdu_alloc(&lll->scan_rsp, idx);
 }
 
-static inline void lll_adv_scan_rsp_enqueue(struct lll_adv *lll, u8_t idx)
+static inline void lll_adv_scan_rsp_enqueue(struct lll_adv *lll, uint8_t idx)
 {
 	lll_adv_pdu_enqueue(&lll->scan_rsp, idx);
 }
@@ -106,4 +106,4 @@ static inline struct pdu_adv *lll_adv_scan_rsp_peek(struct lll_adv *lll)
 	return (void *)lll->scan_rsp.pdu[lll->scan_rsp.last];
 }
 
-extern u16_t ull_adv_lll_handle_get(struct lll_adv *lll);
+extern uint16_t ull_adv_lll_handle_get(struct lll_adv *lll);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_internal.h b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_internal.h
index 197fae8479..7978f54bdd 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_internal.h
@@ -5,9 +5,9 @@
  */
 
 static inline struct pdu_adv *lll_adv_pdu_latest_get(struct lll_adv_pdu *pdu,
-						     u8_t *is_modified)
+						     uint8_t *is_modified)
 {
-	u8_t first;
+	uint8_t first;
 
 	first = pdu->first;
 	if (first != pdu->last) {
@@ -23,13 +23,13 @@ static inline struct pdu_adv *lll_adv_pdu_latest_get(struct lll_adv_pdu *pdu,
 }
 
 static inline struct pdu_adv *lll_adv_data_latest_get(struct lll_adv *lll,
-						      u8_t *is_modified)
+						      uint8_t *is_modified)
 {
 	return lll_adv_pdu_latest_get(&lll->adv_data, is_modified);
 }
 
 static inline struct pdu_adv *lll_adv_scan_rsp_latest_get(struct lll_adv *lll,
-							  u8_t *is_modified)
+							  uint8_t *is_modified)
 {
 	return lll_adv_pdu_latest_get(&lll->scan_rsp, is_modified);
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 7547a85d05..87f85ffa22 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -40,16 +40,16 @@ static void isr_done(void *param);
 static void isr_cleanup(void *param);
 static void isr_race(void *param);
 static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
-		      struct node_tx **tx_release, u8_t *is_rx_enqueue);
+		      struct node_tx **tx_release, uint8_t *is_rx_enqueue);
 static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll);
 
-static u16_t const sca_ppm_lut[] = {500, 250, 150, 100, 75, 50, 30, 20};
-static u8_t crc_expire;
-static u8_t crc_valid;
-static u16_t trx_cnt;
+static uint16_t const sca_ppm_lut[] = {500, 250, 150, 100, 75, 50, 30, 20};
+static uint8_t crc_expire;
+static uint8_t crc_valid;
+static uint16_t trx_cnt;
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-static u8_t mic_state;
+static uint8_t mic_state;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 int lll_conn_init(void)
@@ -76,17 +76,17 @@ int lll_conn_reset(void)
 	return 0;
 }
 
-u8_t lll_conn_sca_local_get(void)
+uint8_t lll_conn_sca_local_get(void)
 {
 	return CLOCK_CONTROL_NRF_K32SRC_ACCURACY;
 }
 
-u32_t lll_conn_ppm_local_get(void)
+uint32_t lll_conn_ppm_local_get(void)
 {
 	return sca_ppm_lut[CLOCK_CONTROL_NRF_K32SRC_ACCURACY];
 }
 
-u32_t lll_conn_ppm_get(u8_t sca)
+uint32_t lll_conn_ppm_get(uint8_t sca)
 {
 	return sca_ppm_lut[sca];
 }
@@ -139,14 +139,14 @@ void lll_conn_isr_rx(void *param)
 	struct pdu_data *pdu_data_rx;
 	struct pdu_data *pdu_data_tx;
 	struct node_rx_pdu *node_rx;
-	u8_t is_empty_pdu_tx_retry;
-	u8_t is_crc_backoff = 0U;
-	u8_t is_rx_enqueue = 0U;
-	u8_t is_ull_rx = 0U;
-	u8_t rssi_ready;
-	u8_t trx_done;
-	u8_t is_done;
-	u8_t crc_ok;
+	uint8_t is_empty_pdu_tx_retry;
+	uint8_t is_crc_backoff = 0U;
+	uint8_t is_rx_enqueue = 0U;
+	uint8_t is_ull_rx = 0U;
+	uint8_t rssi_ready;
+	uint8_t trx_done;
+	uint8_t is_done;
+	uint8_t crc_ok;
 
 #if defined(CONFIG_BT_CTLR_PROFILE_ISR)
 	lll_prof_latency_capture();
@@ -186,7 +186,7 @@ void lll_conn_isr_rx(void *param)
 	pdu_data_rx = (void *)node_rx->pdu;
 
 	if (crc_ok) {
-		u32_t err;
+		uint32_t err;
 
 		err = isr_rx_pdu(lll, pdu_data_rx, &tx_release, &is_rx_enqueue);
 		if (err) {
@@ -313,9 +313,9 @@ lll_conn_isr_rx_exit:
 	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
 	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < (HAL_RADIO_PDU_LEN_MAX - 4)))
 		if (lll->enc_rx) {
-			u8_t *pkt_decrypt_data;
+			uint8_t *pkt_decrypt_data;
 
-			pkt_decrypt_data = (u8_t *)radio_pkt_decrypt_get() +
+			pkt_decrypt_data = (uint8_t *)radio_pkt_decrypt_get() +
 					   offsetof(struct pdu_data, lldata);
 			memcpy((void *)pdu_data_rx->lldata,
 			       (void *)pkt_decrypt_data, pdu_data_rx->len);
@@ -338,7 +338,7 @@ lll_conn_isr_rx_exit:
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)
 	/* Collect RSSI for connection */
 	if (rssi_ready) {
-		u8_t rssi = radio_rssi_get();
+		uint8_t rssi = radio_rssi_get();
 
 		lll->rssi_latest = rssi;
 
@@ -365,7 +365,7 @@ lll_conn_isr_rx_exit:
 void lll_conn_isr_tx(void *param)
 {
 	struct lll_conn *lll = (void *)param;
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	/* Clear radio status and events */
@@ -456,8 +456,8 @@ void lll_conn_isr_abort(void *param)
 void lll_conn_rx_pkt_set(struct lll_conn *lll)
 {
 	struct node_rx_pdu *node_rx;
-	u16_t max_rx_octets;
-	u8_t phy;
+	uint16_t max_rx_octets;
+	uint8_t phy;
 
 	node_rx = ull_pdu_rx_alloc_peek(1);
 	LL_ASSERT(node_rx);
@@ -500,8 +500,8 @@ void lll_conn_rx_pkt_set(struct lll_conn *lll)
 
 void lll_conn_tx_pkt_set(struct lll_conn *lll, struct pdu_data *pdu_data_tx)
 {
-	u16_t max_tx_octets;
-	u8_t phy, flags;
+	uint16_t max_tx_octets;
+	uint8_t phy, flags;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 	max_tx_octets = lll->max_tx_octets;
@@ -550,7 +550,7 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 	if (!link) {
 		p = empty_tx_enqueue(lll);
 	} else {
-		u16_t max_tx_octets;
+		uint16_t max_tx_octets;
 
 		p = (void *)(tx->pdu + lll->packet_tx_head_offset);
 
@@ -625,7 +625,7 @@ static void isr_done(void *param)
 		struct lll_conn *lll = param;
 
 		if (lll->role) {
-			u32_t preamble_to_addr_us;
+			uint32_t preamble_to_addr_us;
 
 #if defined(CONFIG_BT_CTLR_PHY)
 			preamble_to_addr_us =
@@ -674,7 +674,7 @@ static void isr_race(void *param)
 	radio_status_reset();
 }
 
-static inline bool ctrl_pdu_len_check(u8_t len)
+static inline bool ctrl_pdu_len_check(uint8_t len)
 {
 	return len <= (offsetof(struct pdu_data, llctrl) +
 		       sizeof(struct pdu_data_llctrl));
@@ -682,14 +682,14 @@ static inline bool ctrl_pdu_len_check(u8_t len)
 }
 
 static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
-		      struct node_tx **tx_release, u8_t *is_rx_enqueue)
+		      struct node_tx **tx_release, uint8_t *is_rx_enqueue)
 {
 #if defined(CONFIG_SOC_COMPATIBLE_NRF52832) && \
 	defined(CONFIG_BT_CTLR_LE_ENC) && \
 	(!defined(CONFIG_BT_CTLR_DATA_LENGTH_MAX) || \
 	 (CONFIG_BT_CTLR_DATA_LENGTH_MAX < (HAL_RADIO_PDU_LEN_MAX - 4)))
 	if (lll->enc_rx) {
-		u8_t *pkt_decrypt;
+		uint8_t *pkt_decrypt;
 
 		pkt_decrypt = radio_pkt_decrypt_get();
 		memcpy((void *)pdu_data_rx, (void *)pkt_decrypt,
@@ -724,8 +724,8 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 
 		if (link) {
 			struct pdu_data *pdu_data_tx;
-			u8_t pdu_data_tx_len;
-			u8_t offset;
+			uint8_t pdu_data_tx_len;
+			uint8_t offset;
 
 			pdu_data_tx = (void *)(tx->pdu +
 					       lll->packet_tx_head_offset);
@@ -775,7 +775,7 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 			/* If required, wait for CCM to finish
 			 */
 			if (lll->enc_rx) {
-				u32_t done;
+				uint32_t done;
 
 				done = radio_ccm_is_done();
 				LL_ASSERT(done);
@@ -847,7 +847,7 @@ static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll)
 	return p;
 }
 
-void lll_conn_flush(u16_t handle, struct lll_conn *lll)
+void lll_conn_flush(uint16_t handle, struct lll_conn *lll)
 {
 	/* Nothing to be flushed */
 }
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_internal.h b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_internal.h
index f8cd4e7cd6..31a137d921 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_internal.h
@@ -7,8 +7,8 @@
 int lll_prepare_done(void *param);
 int lll_done(void *param);
 bool lll_is_done(void *param);
-u32_t lll_evt_offset_get(struct evt_hdr *evt);
-u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
-		u32_t ticks_at_event);
-void lll_chan_set(u32_t chan);
-u8_t lll_entropy_get(u8_t len, void *rand);
+uint32_t lll_evt_offset_get(struct evt_hdr *evt);
+uint32_t lll_preempt_calc(struct evt_hdr *evt, uint8_t ticker_id,
+		uint32_t ticks_at_event);
+void lll_chan_set(uint32_t chan);
+uint8_t lll_entropy_get(uint8_t len, void *rand);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c
index 465337e580..5eec4835bb 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c
@@ -65,7 +65,7 @@ void lll_master_prepare(void *param)
 {
 	struct lll_prepare_param *p = param;
 	struct lll_conn *lll = p->param;
-	u16_t elapsed;
+	uint16_t elapsed;
 	int err;
 
 	err = lll_hfclock_on();
@@ -91,13 +91,13 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_conn *lll = prepare_param->param;
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t ticks_at_event, ticks_at_start;
 	struct pdu_data *pdu_data_tx;
 	struct evt_hdr *evt;
-	u16_t event_counter;
-	u32_t remainder_us;
-	u8_t data_chan_use;
-	u32_t remainder;
+	uint16_t event_counter;
+	uint32_t remainder_us;
+	uint8_t data_chan_use;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_M(1);
 
@@ -148,9 +148,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 	radio_aa_set(lll->access_addr);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
-			    (((u32_t)lll->crc_init[2] << 16) |
-			     ((u32_t)lll->crc_init[1] << 8) |
-			     ((u32_t)lll->crc_init[0])));
+			    (((uint32_t)lll->crc_init[2] << 16) |
+			     ((uint32_t)lll->crc_init[1] << 8) |
+			     ((uint32_t)lll->crc_init[0])));
 	lll_chan_set(data_chan_use);
 
 	/* setup the radio tx packet buffer */
@@ -206,7 +206,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
index 70a808d91e..8c897c4670 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
@@ -16,13 +16,13 @@
 
 #include "lll.h"
 
-static u8_t latency_min = (u8_t) -1;
-static u8_t latency_max;
-static u8_t latency_prev;
-static u8_t cputime_min = (u8_t) -1;
-static u8_t cputime_max;
-static u8_t cputime_prev;
-static u32_t timestamp_latency;
+static uint8_t latency_min = (uint8_t) -1;
+static uint8_t latency_max;
+static uint8_t latency_prev;
+static uint8_t cputime_min = (uint8_t) -1;
+static uint8_t cputime_max;
+static uint8_t cputime_prev;
+static uint32_t timestamp_latency;
 
 void lll_prof_latency_capture(void)
 {
@@ -33,9 +33,9 @@ void lll_prof_latency_capture(void)
 }
 
 #if defined(CONFIG_BT_CTLR_GPIO_PA_PIN)
-static u32_t timestamp_radio_end;
+static uint32_t timestamp_radio_end;
 
-u32_t lll_prof_radio_end_backup(void)
+uint32_t lll_prof_radio_end_backup(void)
 {
 	/* PA enable is overwriting packet end used in ISR profiling, hence
 	 * back it up for later use.
@@ -59,8 +59,8 @@ void lll_prof_cputime_capture(void)
 
 void lll_prof_send(void)
 {
-	u8_t latency, cputime, prev;
-	u8_t chg = 0U;
+	uint8_t latency, cputime, prev;
+	uint8_t chg = 0U;
 
 	/* calculate the elapsed time in us since on-air radio packet end
 	 * to ISR entry
@@ -82,7 +82,7 @@ void lll_prof_send(void)
 	}
 
 	/* check for +/- 1us change */
-	prev = ((u16_t)latency_prev + latency) >> 1;
+	prev = ((uint16_t)latency_prev + latency) >> 1;
 	if (prev != latency_prev) {
 		latency_prev = latency;
 		chg = 1U;
@@ -103,7 +103,7 @@ void lll_prof_send(void)
 	}
 
 	/* check for +/- 1us change */
-	prev = ((u16_t)cputime_prev + cputime) >> 1;
+	prev = ((uint16_t)cputime_prev + cputime) >> 1;
 	if (prev != cputime_prev) {
 		cputime_prev = cputime;
 		chg = 1U;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index a8189cb8a7..e7974a296e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -45,9 +45,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param);
 static int is_abort_cb(void *next, int prio, void *curr,
 		       lll_prepare_cb_t *resume_cb, int *resume_prio);
 static void abort_cb(struct lll_prepare_param *prepare_param, void *param);
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param);
-static void ticker_op_start_cb(u32_t status, void *param);
+static void ticker_op_start_cb(uint32_t status, void *param);
 static void isr_rx(void *param);
 static void isr_tx(void *param);
 static void isr_done(void *param);
@@ -56,24 +56,24 @@ static void isr_abort(void *param);
 static void isr_cleanup(void *param);
 static void isr_race(void *param);
 
-static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
-				     u8_t devmatch_ok, u8_t rl_idx);
-static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
-			       u8_t devmatch_id, u8_t irkmatch_ok,
-			       u8_t irkmatch_id, u8_t rl_idx, u8_t rssi_ready);
+static inline bool isr_rx_scan_check(struct lll_scan *lll, uint8_t irkmatch_ok,
+				     uint8_t devmatch_ok, uint8_t rl_idx);
+static inline uint32_t isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok,
+			       uint8_t devmatch_id, uint8_t irkmatch_ok,
+			       uint8_t irkmatch_id, uint8_t rl_idx, uint8_t rssi_ready);
 static inline bool isr_scan_init_check(struct lll_scan *lll,
-				       struct pdu_adv *pdu, u8_t rl_idx);
+				       struct pdu_adv *pdu, uint8_t rl_idx);
 static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
-					    struct pdu_adv *pdu, u8_t rl_idx);
+					    struct pdu_adv *pdu, uint8_t rl_idx);
 static inline bool isr_scan_tgta_check(struct lll_scan *lll, bool init,
-				       struct pdu_adv *pdu, u8_t rl_idx,
+				       struct pdu_adv *pdu, uint8_t rl_idx,
 				       bool *dir_report);
 static inline bool isr_scan_tgta_rpa_check(struct lll_scan *lll,
 					   struct pdu_adv *pdu,
 					   bool *dir_report);
 static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp);
-static u32_t isr_rx_scan_report(struct lll_scan *lll, u8_t rssi_ready,
-				u8_t rl_idx, bool dir_report);
+static uint32_t isr_rx_scan_report(struct lll_scan *lll, uint8_t rssi_ready,
+				uint8_t rl_idx, bool dir_report);
 
 
 int lll_scan_init(void)
@@ -120,12 +120,12 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_scan *lll = prepare_param->param;
-	u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
+	uint32_t ticks_at_event, ticks_at_start;
 	struct node_rx_pdu *node_rx;
 	struct evt_hdr *evt;
-	u32_t remainder_us;
-	u32_t remainder;
+	uint32_t remainder_us;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_O(1);
 
@@ -164,7 +164,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	LL_ASSERT(node_rx);
 	radio_pkt_rx_set(node_rx->pdu);
 
-	radio_aa_set((u8_t *)&aa);
+	radio_aa_set((uint8_t *)&aa);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
 			    0x555555);
 
@@ -180,11 +180,11 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	if (ull_filter_lll_rl_enabled()) {
 		struct lll_filter *filter =
 			ull_filter_lll_get(!!(lll->filter_policy & 0x1));
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_filter_configure(filter->enable_bitmask,
 				       filter->addr_type_bitmask,
-				       (u8_t *)filter->bdaddr);
+				       (uint8_t *)filter->bdaddr);
 
 		radio_ar_configure(count, irks);
 	} else
@@ -197,7 +197,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 		radio_filter_configure(wl->enable_bitmask,
 				       wl->addr_type_bitmask,
-				       (u8_t *)wl->bdaddr);
+				       (uint8_t *)wl->bdaddr);
 	}
 
 	ticks_at_event = prepare_param->ticks_at_expire;
@@ -238,7 +238,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		if (lll->ticks_window) {
 			/* start window close timeout */
@@ -338,14 +338,14 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll_done(param);
 }
 
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param)
 {
 	radio_isr_set(isr_cleanup, param);
 	radio_disable();
 }
 
-static void ticker_op_start_cb(u32_t status, void *param)
+static void ticker_op_start_cb(uint32_t status, void *param)
 {
 	ARG_UNUSED(param);
 
@@ -355,14 +355,14 @@ static void ticker_op_start_cb(u32_t status, void *param)
 static void isr_rx(void *param)
 {
 	struct lll_scan *lll = (void *)param;
-	u8_t trx_done;
-	u8_t crc_ok;
-	u8_t devmatch_ok;
-	u8_t devmatch_id;
-	u8_t irkmatch_ok;
-	u8_t irkmatch_id;
-	u8_t rssi_ready;
-	u8_t rl_idx;
+	uint8_t trx_done;
+	uint8_t crc_ok;
+	uint8_t devmatch_ok;
+	uint8_t devmatch_id;
+	uint8_t irkmatch_ok;
+	uint8_t irkmatch_id;
+	uint8_t rssi_ready;
+	uint8_t rl_idx;
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_latency_capture();
@@ -409,7 +409,7 @@ static void isr_rx(void *param)
 #endif
 	if (crc_ok && isr_rx_scan_check(lll, irkmatch_ok, devmatch_ok,
 					rl_idx)) {
-		u32_t err;
+		uint32_t err;
 
 		err = isr_rx_pdu(lll, devmatch_ok, devmatch_id, irkmatch_ok,
 				 irkmatch_id, rl_idx, rssi_ready);
@@ -430,7 +430,7 @@ isr_rx_do_close:
 static void isr_tx(void *param)
 {
 	struct node_rx_pdu *node_rx;
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	/* Clear radio status and events */
@@ -456,7 +456,7 @@ static void isr_tx(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -510,7 +510,7 @@ static void isr_common_done(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -523,7 +523,7 @@ static void isr_common_done(void *param)
 
 static void isr_done(void *param)
 {
-	u32_t start_us;
+	uint32_t start_us;
 
 	isr_common_done(param);
 
@@ -548,7 +548,7 @@ static void isr_done(void *param)
 
 static void isr_window(void *param)
 {
-	u32_t ticks_at_start, remainder_us;
+	uint32_t ticks_at_start, remainder_us;
 
 	isr_common_done(param);
 
@@ -655,8 +655,8 @@ static void isr_race(void *param)
 	radio_status_reset();
 }
 
-static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
-				     u8_t devmatch_ok, u8_t rl_idx)
+static inline bool isr_rx_scan_check(struct lll_scan *lll, uint8_t irkmatch_ok,
+				     uint8_t devmatch_ok, uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	return (((lll->filter_policy & 0x01) == 0) &&
@@ -670,9 +670,9 @@ static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 }
 
-static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
-			       u8_t devmatch_id, u8_t irkmatch_ok,
-			       u8_t irkmatch_id, u8_t rl_idx, u8_t rssi_ready)
+static inline uint32_t isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok,
+			       uint8_t devmatch_id, uint8_t irkmatch_ok,
+			       uint8_t irkmatch_id, uint8_t rl_idx, uint8_t rssi_ready)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv_rx;
@@ -692,11 +692,11 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		struct node_rx_ftr *ftr;
 		struct node_rx_pdu *rx;
 		struct pdu_adv *pdu_tx;
-		u32_t conn_interval_us;
-		u32_t conn_offset_us;
-		u32_t conn_space_us;
+		uint32_t conn_interval_us;
+		uint32_t conn_offset_us;
+		uint32_t conn_space_us;
 		struct evt_hdr *evt;
-		u32_t pdu_end_us;
+		uint32_t pdu_end_us;
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 		bt_addr_t *lrpa;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
@@ -714,7 +714,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 
 		pdu_end_us = radio_tmr_end_get();
 		if (!lll->ticks_window) {
-			u32_t scan_interval_us;
+			uint32_t scan_interval_us;
 
 			/* FIXME: is this correct for continuous scanning? */
 			scan_interval_us = lll->interval * 625U;
@@ -766,7 +766,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		       &lll_conn->crc_init[0], 3);
 		pdu_tx->connect_ind.win_size = 1;
 
-		conn_interval_us = (u32_t)lll_conn->interval * 1250U;
+		conn_interval_us = (uint32_t)lll_conn->interval * 1250U;
 		conn_offset_us = radio_tmr_end_get() + 502 + 1250;
 
 		if (!IS_ENABLED(CONFIG_BT_CTLR_SCHED_ADVANCED) ||
@@ -775,7 +775,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 			pdu_tx->connect_ind.win_offset = sys_cpu_to_le16(0);
 		} else {
 			conn_space_us = lll->conn_win_offset_us;
-			while ((conn_space_us & ((u32_t)1 << 31)) ||
+			while ((conn_space_us & ((uint32_t)1 << 31)) ||
 			       (conn_space_us < conn_offset_us)) {
 				conn_space_us += conn_interval_us;
 			}
@@ -845,7 +845,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		rx->hdr.type = NODE_RX_TYPE_CONNECTION;
 		rx->hdr.handle = 0xffff;
 
-		u8_t pdu_adv_rx_chan_sel = pdu_adv_rx->chan_sel;
+		uint8_t pdu_adv_rx_chan_sel = pdu_adv_rx->chan_sel;
 		memcpy(rx->pdu, pdu_tx, (offsetof(struct pdu_adv, connect_ind) +
 					  sizeof(struct pdu_adv_connect_ind)));
 
@@ -891,7 +891,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 		bt_addr_t *lrpa;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
-		u32_t err;
+		uint32_t err;
 
 		/* setup tIFS switching */
 		radio_tmr_tifs_set(EVENT_IFS_US);
@@ -986,7 +986,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 #else /* !CONFIG_BT_CENTRAL */
 		   1) {
 #endif /* !CONFIG_BT_CENTRAL */
-		u32_t err;
+		uint32_t err;
 
 		/* save the scan response packet */
 		err = isr_rx_scan_report(lll, rssi_ready,
@@ -1007,7 +1007,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 }
 
 static inline bool isr_scan_init_check(struct lll_scan *lll,
-				       struct pdu_adv *pdu, u8_t rl_idx)
+				       struct pdu_adv *pdu, uint8_t rl_idx)
 {
 	return ((((lll->filter_policy & 0x01) != 0U) ||
 		 isr_scan_init_adva_check(lll, pdu, rl_idx)) &&
@@ -1020,7 +1020,7 @@ static inline bool isr_scan_init_check(struct lll_scan *lll,
 }
 
 static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
-					    struct pdu_adv *pdu, u8_t rl_idx)
+					    struct pdu_adv *pdu, uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	/* Only applies to initiator with no whitelist */
@@ -1033,7 +1033,7 @@ static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
 }
 
 static inline bool isr_scan_tgta_check(struct lll_scan *lll, bool init,
-				       struct pdu_adv *pdu, u8_t rl_idx,
+				       struct pdu_adv *pdu, uint8_t rl_idx,
 				       bool *dir_report)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
@@ -1085,8 +1085,8 @@ static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp)
 			&srsp->scan_rsp.addr[0], BDADDR_SIZE) == 0));
 }
 
-static u32_t isr_rx_scan_report(struct lll_scan *lll, u8_t rssi_ready,
-				u8_t rl_idx, bool dir_report)
+static uint32_t isr_rx_scan_report(struct lll_scan *lll, uint8_t rssi_ready,
+				uint8_t rl_idx, bool dir_report)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv_rx;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.h b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.h
index e8d8330492..4149482513 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.h
@@ -10,36 +10,36 @@ struct lll_scan {
 #if defined(CONFIG_BT_CENTRAL)
 	/* NOTE: conn context has to be after lll_hdr */
 	struct lll_conn *conn;
-	u32_t conn_ticks_slot;
-	u32_t conn_win_offset_us;
-	u16_t conn_timeout;
+	uint32_t conn_ticks_slot;
+	uint32_t conn_win_offset_us;
+	uint16_t conn_timeout;
 #endif /* CONFIG_BT_CENTRAL */
 
-	u8_t  state:1;
-	u8_t  chan:2;
-	u8_t  filter_policy:2;
-	u8_t  adv_addr_type:1;
-	u8_t  init_addr_type:1;
-	u8_t  type:1;
+	uint8_t  state:1;
+	uint8_t  chan:2;
+	uint8_t  filter_policy:2;
+	uint8_t  adv_addr_type:1;
+	uint8_t  init_addr_type:1;
+	uint8_t  type:1;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	u8_t  phy:3;
+	uint8_t  phy:3;
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  rpa_gen:1;
+	uint8_t  rpa_gen:1;
 	/* initiator only */
-	u8_t rl_idx;
+	uint8_t rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
-	u8_t  init_addr[BDADDR_SIZE];
-	u8_t  adv_addr[BDADDR_SIZE];
+	uint8_t  init_addr[BDADDR_SIZE];
+	uint8_t  adv_addr[BDADDR_SIZE];
 
-	u16_t interval;
-	u32_t ticks_window;
+	uint16_t interval;
+	uint32_t ticks_window;
 
 #if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
-	s8_t tx_pwr_lvl;
+	int8_t tx_pwr_lvl;
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
 };
 
@@ -48,4 +48,4 @@ int lll_scan_reset(void);
 
 void lll_scan_prepare(void *param);
 
-extern u16_t ull_scan_lll_handle_get(struct lll_scan *lll);
+extern uint16_t ull_scan_lll_handle_get(struct lll_scan *lll);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c
index 3eb9940583..4963d989f9 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c
@@ -65,7 +65,7 @@ void lll_slave_prepare(void *param)
 {
 	struct lll_prepare_param *p = param;
 	struct lll_conn *lll = p->param;
-	u16_t elapsed;
+	uint16_t elapsed;
 	int err;
 
 	err = lll_hfclock_on();
@@ -100,13 +100,13 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_conn *lll = prepare_param->param;
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t ticks_at_event, ticks_at_start;
 	struct evt_hdr *evt;
-	u16_t event_counter;
-	u32_t remainder_us;
-	u8_t data_chan_use;
-	u32_t remainder;
-	u32_t hcto;
+	uint16_t event_counter;
+	uint32_t remainder_us;
+	uint8_t data_chan_use;
+	uint32_t remainder;
+	uint32_t hcto;
 
 	DEBUG_RADIO_START_S(1);
 
@@ -169,9 +169,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 	radio_aa_set(lll->access_addr);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
-			    (((u32_t)lll->crc_init[2] << 16) |
-			     ((u32_t)lll->crc_init[1] << 8) |
-			     ((u32_t)lll->crc_init[0])));
+			    (((uint32_t)lll->crc_init[2] << 16) |
+			     ((uint32_t)lll->crc_init[1] << 8) |
+			     ((uint32_t)lll->crc_init[0])));
 
 	lll_chan_set(data_chan_use);
 
@@ -248,7 +248,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
index f0cddd5436..20ba0275a6 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
@@ -32,10 +32,10 @@
 
 #define CNTR_MIN_DELTA 3
 
-static const u32_t test_sync_word = 0x71764129;
-static u8_t        test_phy;
-static u8_t        test_phy_flags;
-static u16_t       test_num_rx;
+static const uint32_t test_sync_word = 0x71764129;
+static uint8_t        test_phy;
+static uint8_t        test_phy_flags;
+static uint16_t       test_num_rx;
 static bool        started;
 
 /* NOTE: The PRBS9 sequence used as packet payload.
@@ -44,7 +44,7 @@ static bool        started;
  * is done to transmit MSbit first on air.
  */
 
-static const u8_t prbs9[] = {
+static const uint8_t prbs9[] = {
 	0xFF, 0xC1, 0xFB, 0xE8, 0x4C, 0x90, 0x72, 0x8B,
 	0xE7, 0xB3, 0x51, 0x89, 0x63, 0xAB, 0x23, 0x23,
 	0x02, 0x84, 0x18, 0x72, 0xAA, 0x61, 0x2F, 0x3B,
@@ -79,14 +79,14 @@ static const u8_t prbs9[] = {
 	0x8A, 0x84, 0x39, 0xF4, 0x36, 0x0B, 0xF7};
 
 /* TODO: fill correct prbs15 */
-static const u8_t prbs15[255] = { 0x00, };
+static const uint8_t prbs15[255] = { 0x00, };
 
-static u8_t tx_req;
-static u8_t volatile tx_ack;
+static uint8_t tx_req;
+static uint8_t volatile tx_ack;
 
 static void isr_tx(void *param)
 {
-	u32_t l, i, s, t;
+	uint32_t l, i, s, t;
 
 	/* Clear radio status and events */
 	radio_status_reset();
@@ -134,8 +134,8 @@ static void isr_tx(void *param)
 
 static void isr_rx(void *param)
 {
-	u8_t crc_ok = 0U;
-	u8_t trx_done;
+	uint8_t crc_ok = 0U;
+	uint8_t trx_done;
 
 	/* Read radio status and events */
 	trx_done = radio_is_done();
@@ -161,7 +161,7 @@ static void isr_rx(void *param)
 	}
 }
 
-static u32_t init(u8_t chan, u8_t phy, void (*isr)(void *))
+static uint32_t init(uint8_t chan, uint8_t phy, void (*isr)(void *))
 {
 	int err;
 
@@ -194,19 +194,19 @@ static u32_t init(u8_t chan, u8_t phy, void (*isr)(void *))
 	radio_tmr_tifs_set(150);
 	radio_tx_power_max_set();
 	radio_freq_chan_set((chan << 1) + 2);
-	radio_aa_set((u8_t *)&test_sync_word);
+	radio_aa_set((uint8_t *)&test_sync_word);
 	radio_crc_configure(0x65b, 0x555555);
 	radio_pkt_configure(8, 255, (test_phy << 1));
 
 	return 0;
 }
 
-u32_t ll_test_tx(u8_t chan, u8_t len, u8_t type, u8_t phy)
+uint32_t ll_test_tx(uint8_t chan, uint8_t len, uint8_t type, uint8_t phy)
 {
-	u32_t start_us;
-	u8_t *payload;
-	u8_t *pdu;
-	u32_t err;
+	uint32_t start_us;
+	uint8_t *payload;
+	uint8_t *pdu;
+	uint32_t err;
 
 	if ((type > 0x07) || !phy || (phy > 0x04)) {
 		return 1;
@@ -280,9 +280,9 @@ u32_t ll_test_tx(u8_t chan, u8_t len, u8_t type, u8_t phy)
 	return 0;
 }
 
-u32_t ll_test_rx(u8_t chan, u8_t phy, u8_t mod_idx)
+uint32_t ll_test_rx(uint8_t chan, uint8_t phy, uint8_t mod_idx)
 {
-	u32_t err;
+	uint32_t err;
 
 	if (!phy || (phy > 0x03)) {
 		return 1;
@@ -306,10 +306,10 @@ u32_t ll_test_rx(u8_t chan, u8_t phy, u8_t mod_idx)
 	return 0;
 }
 
-u32_t ll_test_end(u16_t *num_rx)
+uint32_t ll_test_end(uint16_t *num_rx)
 {
 	int err;
-	u8_t ack;
+	uint8_t ack;
 
 	if (!started) {
 		return 1;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_tim_internal.h b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_tim_internal.h
index f87f767140..eb1858ca1b 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_tim_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_tim_internal.h
@@ -12,7 +12,7 @@
 #define RANGE_DISTANCE 1000 /* meters */
 #define RANGE_DELAY_US (2 * RANGE_DISTANCE * 4 / 1000)
 
-static inline u32_t addr_us_get(u8_t phy)
+static inline uint32_t addr_us_get(uint8_t phy)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
index 7438089c2c..063165dba1 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
@@ -59,10 +59,10 @@ void cntr_init(void)
 	irq_enable(LL_RTC0_IRQn_2nd_lvl);
 }
 
-static u8_t refcount;
-static u32_t cnt_diff;
+static uint8_t refcount;
+static uint32_t cnt_diff;
 
-u32_t cntr_start(void)
+uint32_t cntr_start(void)
 {
 	if (refcount++) {
 		return 1;
@@ -74,7 +74,7 @@ u32_t cntr_start(void)
 	return 0;
 }
 
-u32_t cntr_stop(void)
+uint32_t cntr_stop(void)
 {
 	LL_ASSERT(refcount);
 
@@ -92,7 +92,7 @@ u32_t cntr_stop(void)
 	return 0;
 }
 
-u32_t cntr_cnt_get(void)
+uint32_t cntr_cnt_get(void)
 {
 	/*
 	 * On each read of the CNR,
@@ -102,7 +102,7 @@ u32_t cntr_cnt_get(void)
 	return (LPTMR1->CNR + cnt_diff);
 }
 
-void cntr_cmp_set(u8_t cmp, u32_t value)
+void cntr_cmp_set(uint8_t cmp, uint32_t value)
 {
 	/*
 	 * When the LPTMR is enabled, the first increment will take an
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
index 54394d2c5a..ea4f428bfd 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
@@ -19,10 +19,10 @@
 #include "hal/debug.h"
 #include "fsl_cau3_ble.h"
 
-void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
-		    u8_t *const cipher_text_be)
+void ecb_encrypt_be(uint8_t const *const key_be, uint8_t const *const clear_text_be,
+		    uint8_t *const cipher_text_be)
 {
-	u8_t keyAes[16] __aligned(4);
+	uint8_t keyAes[16] __aligned(4);
 	status_t status;
 
 	cau3_handle_t handle;
@@ -51,12 +51,12 @@ void ecb_encrypt_be(u8_t const *const key_be, u8_t const *const clear_text_be,
 	}
 }
 
-void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
-		 u8_t *const cipher_text_le, u8_t *const cipher_text_be)
+void ecb_encrypt(uint8_t const *const key_le, uint8_t const *const clear_text_le,
+		 uint8_t *const cipher_text_le, uint8_t *const cipher_text_be)
 {
-	u8_t keyAes[16] __aligned(4);
-	u8_t clear[16];
-	u8_t cipher[16];
+	uint8_t keyAes[16] __aligned(4);
+	uint8_t clear[16];
+	uint8_t cipher[16];
 	status_t status;
 
 	cau3_handle_t handle;
@@ -102,7 +102,7 @@ void ecb_encrypt(u8_t const *const key_le, u8_t const *const clear_text_le,
 	}
 }
 
-u32_t ecb_encrypt_nonblocking(struct ecb *ecb)
+uint32_t ecb_encrypt_nonblocking(struct ecb *ecb)
 {
 	return 0;
 }
@@ -121,7 +121,7 @@ void isr_ecb(void *param)
 		    &conn->llcp.encryption.skd[0], NULL,
 		    &lll->ccm_rx.key[0]);
  */
-u32_t ecb_ut(void)
+uint32_t ecb_ut(void)
 {
 	/*
 	 * LTK = 0x4C68384139F574D836BCF34E9DFB01BF (MSO to LSO)
@@ -134,21 +134,21 @@ u32_t ecb_ut(void)
 	 * :0x66:0xC6:0xC2:0x27:0x8E:0x3B:0x8E:0x05
 	 * :0x3E:0x7E:0xA3:0x26:0x52:0x1B:0xAD:0x99
 	 */
-	static const u8_t ltk_le[16] = {
+	static const uint8_t ltk_le[16] = {
 		0xbf, 0x01, 0xfb, 0x9d, 0x4e, 0xf3, 0xbc, 0x36,
 		0xd8, 0x74, 0xf5, 0x39, 0x41, 0x38, 0x68, 0x4c
 	};
-	static const u8_t skd_le[16] = {
+	static const uint8_t skd_le[16] = {
 		0x13, 0x02, 0xF1, 0xE0, 0xDF, 0xCE, 0xBD, 0xAC,
 		0x79, 0x68, 0x57, 0x46, 0x35, 0x24, 0x13, 0x02
 	};
-	u8_t key_le[16] = {};
-	u8_t key_ref_le[16] = {
+	uint8_t key_le[16] = {};
+	uint8_t key_ref_le[16] = {
 		0x66, 0xC6, 0xC2, 0x27, 0x8E, 0x3B, 0x8E, 0x05,
 		0x3E, 0x7E, 0xA3, 0x26, 0x52, 0x1B, 0xAD, 0x99
 	};
-	u32_t status = kStatus_Success;
-	u8_t *key;
+	uint32_t status = kStatus_Success;
+	uint8_t *key;
 
 	/* calc the Session Key and compare vs the ref_le in LSO format */
 	ecb_encrypt(ltk_le, skd_le, key = key_le, NULL);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/mayfly.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/mayfly.c
index d819809460..1f74b6427b 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/mayfly.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/mayfly.c
@@ -27,7 +27,7 @@
 #error Unknown LL variant.
 #endif
 
-void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable)
+void mayfly_enable_cb(uint8_t caller_id, uint8_t callee_id, uint8_t enable)
 {
 	(void)caller_id;
 
@@ -40,7 +40,7 @@ void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable)
 	}
 }
 
-u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id)
+uint32_t mayfly_is_enabled(uint8_t caller_id, uint8_t callee_id)
 {
 	(void)caller_id;
 
@@ -64,7 +64,7 @@ u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id)
 	return 0;
 }
 
-u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id)
+uint32_t mayfly_prio_is_equal(uint8_t caller_id, uint8_t callee_id)
 {
 	return (caller_id == callee_id) ||
 #if defined(CONFIG_BT_LL_SW_SPLIT)
@@ -90,7 +90,7 @@ u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id)
 	       0;
 }
 
-void mayfly_pend(u8_t caller_id, u8_t callee_id)
+void mayfly_pend(uint8_t caller_id, uint8_t callee_id)
 {
 	(void)caller_id;
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
index ac56fea3fe..fa142669aa 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
@@ -78,87 +78,87 @@ static void *isr_cb_param;
 		| RSIM_DSM_CONTROL_DSM_MAN_READY_MASK \
 		| RSIM_DSM_CONTROL_MAN_SLEEP_REQUEST_MASK) \
 
-static u32_t dsm_ref; /* DSM reference counter */
+static uint32_t dsm_ref; /* DSM reference counter */
 
-static u8_t delayed_radio_start;
-static u8_t delayed_trx;
-static u32_t delayed_ticks_start;
-static u32_t delayed_remainder;
-static u8_t delayed_radio_stop;
-static u32_t delayed_hcto;
+static uint8_t delayed_radio_start;
+static uint8_t delayed_trx;
+static uint32_t delayed_ticks_start;
+static uint32_t delayed_remainder;
+static uint8_t delayed_radio_stop;
+static uint32_t delayed_hcto;
 
-static u32_t rtc_start;
-static u32_t rtc_diff_start_us;
+static uint32_t rtc_start;
+static uint32_t rtc_diff_start_us;
 
-static u32_t tmr_aa;		/* AA (Access Address) timestamp saved value */
-static u32_t tmr_aa_save;	/* save AA timestamp */
-static u32_t tmr_ready;		/* radio ready for Tx/Rx timestamp */
-static u32_t tmr_end;		/* Tx/Rx end timestamp saved value */
-static u32_t tmr_end_save;	/* save Tx/Rx end timestamp */
-static u32_t tmr_tifs;
+static uint32_t tmr_aa;		/* AA (Access Address) timestamp saved value */
+static uint32_t tmr_aa_save;	/* save AA timestamp */
+static uint32_t tmr_ready;		/* radio ready for Tx/Rx timestamp */
+static uint32_t tmr_end;		/* Tx/Rx end timestamp saved value */
+static uint32_t tmr_end_save;	/* save Tx/Rx end timestamp */
+static uint32_t tmr_tifs;
 
-static u32_t rx_wu;
-static u32_t tx_wu;
+static uint32_t rx_wu;
+static uint32_t tx_wu;
 
-static u8_t phy_mode;		/* Current PHY mode (DR_1MBPS or DR_2MBPS) */
-static u8_t bits_per_usec;	/* This saves the # of bits per usec,
+static uint8_t phy_mode;		/* Current PHY mode (DR_1MBPS or DR_2MBPS) */
+static uint8_t bits_per_usec;	/* This saves the # of bits per usec,
 				 * depending on the PHY mode
 				 */
-static u8_t phy_aa_ovhd;	/* This saves the AA overhead, depending on the
+static uint8_t phy_aa_ovhd;	/* This saves the AA overhead, depending on the
 				 * PHY mode
 				 */
 
-static u32_t isr_tmr_aa;
-static u32_t isr_tmr_end;
-static u32_t isr_latency;
-static u32_t next_wu;
-static u32_t next_radio_cmd;
+static uint32_t isr_tmr_aa;
+static uint32_t isr_tmr_end;
+static uint32_t isr_latency;
+static uint32_t next_wu;
+static uint32_t next_radio_cmd;
 
-static u32_t radio_trx;
-static u32_t force_bad_crc;
-static u32_t skip_hcto;
+static uint32_t radio_trx;
+static uint32_t force_bad_crc;
+static uint32_t skip_hcto;
 
-static u8_t *rx_pkt_ptr;
-static u32_t payload_max_size;
+static uint8_t *rx_pkt_ptr;
+static uint32_t payload_max_size;
 
-static u8_t MALIGN(4) _pkt_empty[PDU_EM_SIZE_MAX];
-static u8_t MALIGN(4) _pkt_scratch[
+static uint8_t MALIGN(4) _pkt_empty[PDU_EM_SIZE_MAX];
+static uint8_t MALIGN(4) _pkt_scratch[
 			((RADIO_PDU_LEN_MAX + 3) > PDU_AC_SIZE_MAX) ?
 			(RADIO_PDU_LEN_MAX + 3) : PDU_AC_SIZE_MAX];
 
-static s8_t rssi;
+static int8_t rssi;
 
 static struct {
 	union {
-		u64_t counter;
-		u8_t bytes[CAU3_AES_BLOCK_SIZE - 1 - 2];
+		uint64_t counter;
+		uint8_t bytes[CAU3_AES_BLOCK_SIZE - 1 - 2];
 	} nonce;	/* used by the B0 format but not in-situ */
 	struct pdu_data *rx_pkt_out;
 	struct pdu_data *rx_pkt_in;
-	u8_t auth_mic_valid;
-	u8_t empty_pdu_rxed;
+	uint8_t auth_mic_valid;
+	uint8_t empty_pdu_rxed;
 } ctx_ccm;
 
 #define RPA_NO_IRK_MATCH 0xFF	/* No IRK match in AR table */
 
 static struct {
-	u8_t ar_enable;
-	u32_t irk_idx;
+	uint8_t ar_enable;
+	uint32_t irk_idx;
 } radio_ar_ctx = {0U, RPA_NO_IRK_MATCH};
 
 static void tmp_cb(void *param)
 {
-	u32_t tmr = GENFSK->EVENT_TMR & GENFSK_EVENT_TMR_EVENT_TMR_MASK;
-	u32_t t2 = GENFSK->T2_CMP & GENFSK_T2_CMP_T2_CMP_MASK;
+	uint32_t tmr = GENFSK->EVENT_TMR & GENFSK_EVENT_TMR_EVENT_TMR_MASK;
+	uint32_t t2 = GENFSK->T2_CMP & GENFSK_T2_CMP_T2_CMP_MASK;
 
 	isr_latency = (tmr - t2) & GENFSK_EVENT_TMR_EVENT_TMR_MASK; /* 24bit */
 	/* Mark as done */
-	*(u32_t *)param = 1;
+	*(uint32_t *)param = 1;
 }
 
 static void get_isr_latency(void)
 {
-	volatile u32_t tmp = 0;
+	volatile uint32_t tmp = 0;
 
 	radio_isr_set(tmp_cb, (void *)&tmp);
 
@@ -171,8 +171,8 @@ static void get_isr_latency(void)
 	irq_disable(LL_RADIO_IRQn_2nd_lvl);
 }
 
-static u32_t radio_tmr_start_hlp(u8_t trx, u32_t ticks_start, u32_t remainder);
-static void radio_tmr_hcto_configure_hlp(u32_t hcto);
+static uint32_t radio_tmr_start_hlp(uint8_t trx, uint32_t ticks_start, uint32_t remainder);
+static void radio_tmr_hcto_configure_hlp(uint32_t hcto);
 static void radio_config_after_wake(void)
 {
 	if (!delayed_radio_start) {
@@ -201,12 +201,12 @@ static void ar_execute(void *pkt)
 
 	/* Perform address resolution when TxAdd=1 and address is resolvable */
 	if (pdu_adv->tx_addr && BT_ADDR_IS_RPA(rpa)) {
-		u32_t *hash, *prand;
+		uint32_t *hash, *prand;
 		status_t status;
 
 		/* Use pointers to avoid breaking strict aliasing */
-		hash = (u32_t *)(&rpa->val[0]);
-		prand = (u32_t *)(&rpa->val[3]);
+		hash = (uint32_t *)(&rpa->val[0]);
+		prand = (uint32_t *)(&rpa->val[3]);
 
 		/* CAUv3 needs hash & prand in le format, right-justified */
 		status = CAU3_RPAtableSearch(CAU3, (*prand & 0xFFFFFF),
@@ -226,10 +226,10 @@ static void ar_execute(void *pkt)
 
 static void pkt_rx(void)
 {
-	u32_t len, idx;
-	u16_t *rxb = (u16_t *)rx_pkt_ptr, tmp;
-	volatile u16_t *pb = &GENFSK->PACKET_BUFFER[PB_RX_PDU];
-	volatile const u32_t *sts = &GENFSK->XCVR_STS;
+	uint32_t len, idx;
+	uint16_t *rxb = (uint16_t *)rx_pkt_ptr, tmp;
+	volatile uint16_t *pb = &GENFSK->PACKET_BUFFER[PB_RX_PDU];
+	volatile const uint32_t *sts = &GENFSK->XCVR_STS;
 
 	/* payload length */
 	len = (GENFSK->XCVR_CTRL & GENFSK_XCVR_CTRL_LENGTH_EXT_MASK) >>
@@ -271,7 +271,7 @@ static void pkt_rx(void)
 	}
 
 	if (ctx_ccm.rx_pkt_out) {
-		*(u16_t *)ctx_ccm.rx_pkt_out = pb[0];
+		*(uint16_t *)ctx_ccm.rx_pkt_out = pb[0];
 		if (len < CAU3_BLE_MIC_SIZE) {
 			ctx_ccm.rx_pkt_out = 0;
 			ctx_ccm.rx_pkt_in = 0;
@@ -287,7 +287,7 @@ static void pkt_rx(void)
 	/* Copy last byte */
 	if (len & 0x1) {
 		tmp = pb[len / 2];
-		rx_pkt_ptr[len - 1] =  ((u8_t *)&tmp)[0];
+		rx_pkt_ptr[len - 1] =  ((uint8_t *)&tmp)[0];
 	}
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
@@ -308,9 +308,9 @@ void isr_radio(void *arg)
 {
 	ARG_UNUSED(arg);
 
-	u32_t tmr = GENFSK->EVENT_TMR & GENFSK_EVENT_TMR_EVENT_TMR_MASK;
-	u32_t irq = GENFSK->IRQ_CTRL;
-	u32_t valid = 0;
+	uint32_t tmr = GENFSK->EVENT_TMR & GENFSK_EVENT_TMR_EVENT_TMR_MASK;
+	uint32_t irq = GENFSK->IRQ_CTRL;
+	uint32_t valid = 0;
 	/* We need to check for a valid IRQ source.
 	 * In theory, we could get to this ISR after the IRQ source was cleared.
 	 * This could happen due to the way LLL interacts with IRQs
@@ -403,7 +403,7 @@ void radio_isr_set(radio_isr_cb_t cb, void *param)
 
 	/* Clear pending interrupts */
 	GENFSK->IRQ_CTRL &= 0xffffffff;
-	EVENT_UNIT->INTPTPENDCLEAR = (u32_t)(1U << LL_RADIO_IRQn);
+	EVENT_UNIT->INTPTPENDCLEAR = (uint32_t)(1U << LL_RADIO_IRQn);
 
 	irq_enable(LL_RADIO_IRQn);
 	irq_enable(LL_RADIO_IRQn_2nd_lvl);
@@ -418,10 +418,10 @@ void radio_isr_set(radio_isr_cb_t cb, void *param)
 static void hpmcal_disable(void)
 {
 #ifdef USE_FIXED_HPMCAL
-	u32_t hpmcal = USE_FIXED_HPMCAL;
+	uint32_t hpmcal = USE_FIXED_HPMCAL;
 #else
-	u32_t hpmcal_vals[40];
-	u32_t hpmcal;
+	uint32_t hpmcal_vals[40];
+	uint32_t hpmcal;
 	int i;
 
 	GENFSK->TX_POWER = GENFSK_TX_POWER_TX_POWER(1);
@@ -557,7 +557,7 @@ void radio_reset(void)
 	/* Vega radio is never disabled therefore doesn't require resetting */
 }
 
-void radio_phy_set(u8_t phy, u8_t flags)
+void radio_phy_set(uint8_t phy, uint8_t flags)
 {
 	int err = 0;
 	ARG_UNUSED(flags);
@@ -605,7 +605,7 @@ void radio_phy_set(u8_t phy, u8_t flags)
 	}
 }
 
-void radio_tx_power_set(u32_t power)
+void radio_tx_power_set(uint32_t power)
 {
 	ARG_UNUSED(power);
 
@@ -617,7 +617,7 @@ void radio_tx_power_set(u32_t power)
 	 * Because of these inconsistencies for the moment this
 	 * function sets the power level to a known value.
 	 */
-	u32_t tx_power_level = 62;
+	uint32_t tx_power_level = 62;
 
 	GENFSK->TX_POWER = GENFSK_TX_POWER_TX_POWER(tx_power_level);
 }
@@ -627,7 +627,7 @@ void radio_tx_power_max_set(void)
 	printk("%s\n", __func__);
 }
 
-void radio_freq_chan_set(u32_t chan)
+void radio_freq_chan_set(uint32_t chan)
 {
 	/*
 	 * The channel number for vega radio is computed
@@ -644,7 +644,7 @@ void radio_freq_chan_set(u32_t chan)
 #define GENFSK_BLE_WHITEN_SIZE			7	/* poly order */
 #define GENFSK_BLE_WHITEN_POLY			0x04
 
-void radio_whiten_iv_set(u32_t iv)
+void radio_whiten_iv_set(uint32_t iv)
 {
 	GENFSK->WHITEN_CFG &= ~(GENFSK_WHITEN_CFG_WHITEN_START_MASK |
 				GENFSK_WHITEN_CFG_WHITEN_END_MASK |
@@ -678,10 +678,10 @@ void radio_whiten_iv_set(u32_t iv)
 	GENFSK->WHITEN_SZ_THR |= GENFSK_WHITEN_SZ_THR_WHITEN_SZ_THR(0);
 }
 
-void radio_aa_set(u8_t *aa)
+void radio_aa_set(uint8_t *aa)
 {
 	/* Configure Access Address detection using NETWORK ADDRESS 0 */
-	GENFSK->NTW_ADR_0 = *((u32_t *)aa);
+	GENFSK->NTW_ADR_0 = *((uint32_t *)aa);
 	GENFSK->NTW_ADR_CTRL &= ~(GENFSK_NTW_ADR_CTRL_NTW_ADR0_SZ_MASK |
 				  GENFSK_NTW_ADR_CTRL_NTW_ADR_THR0_MASK);
 	GENFSK->NTW_ADR_CTRL |= GENFSK_NTW_ADR_CTRL_NTW_ADR0_SZ(3) |
@@ -707,7 +707,7 @@ void radio_aa_set(u8_t *aa)
 						   */
 #define GENFSK_BLE_H0_SZ	8 /* 8 bits */
 
-void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags)
+void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags)
 {
 	ARG_UNUSED(flags);
 
@@ -757,31 +757,31 @@ void radio_pkt_tx_set(void *tx_packet)
 	 * before commanding a TX operation, and must not access the RAM during
 	 * the transmission.
 	 */
-	u16_t *pkt = tx_packet;
-	u32_t cnt = 0, pkt_len = (((u8_t *)tx_packet)[1] + 1) / 2 + 1;
-	volatile u16_t *pkt_buffer = &GENFSK->PACKET_BUFFER[PB_TX_PDU];
+	uint16_t *pkt = tx_packet;
+	uint32_t cnt = 0, pkt_len = (((uint8_t *)tx_packet)[1] + 1) / 2 + 1;
+	volatile uint16_t *pkt_buffer = &GENFSK->PACKET_BUFFER[PB_TX_PDU];
 
 	for (; cnt < pkt_len; cnt++) {
 		pkt_buffer[cnt] = pkt[cnt];
 	}
 }
 
-u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_tx_ready_delay_get(uint8_t phy, uint8_t flags)
 {
 	return tx_wu;
 }
 
-u32_t radio_tx_chain_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_tx_chain_delay_get(uint8_t phy, uint8_t flags)
 {
 	return 0;
 }
 
-u32_t radio_rx_ready_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_rx_ready_delay_get(uint8_t phy, uint8_t flags)
 {
 	return rx_wu;
 }
 
-u32_t radio_rx_chain_delay_get(u8_t phy, u8_t flags)
+uint32_t radio_rx_chain_delay_get(uint8_t phy, uint8_t flags)
 {
 	/* RX_WTMRK = AA + PDU header, but AA time is already accounted for */
 	/* PDU header (assume 2 bytes) => 16us, depends on PHY type */
@@ -830,13 +830,13 @@ void radio_disable(void)
 
 	/* Clear pending interrupts */
 	GENFSK->IRQ_CTRL &= 0xffffffff;
-	EVENT_UNIT->INTPTPENDCLEAR = (u32_t)(1U << LL_RADIO_IRQn);
+	EVENT_UNIT->INTPTPENDCLEAR = (uint32_t)(1U << LL_RADIO_IRQn);
 
 	next_radio_cmd = 0;
 	radio_trx = 0;
 
 	/* generate T2 interrupt to get into isr_radio() */
-	u32_t tmr = GENFSK->EVENT_TMR + RADIO_DISABLE_TMR;
+	uint32_t tmr = GENFSK->EVENT_TMR + RADIO_DISABLE_TMR;
 
 	GENFSK->T2_CMP = GENFSK_T2_CMP_T2_CMP(tmr) | GENFSK_T2_CMP_T2_CMP_EN(1);
 }
@@ -846,24 +846,24 @@ void radio_status_reset(void)
 	radio_trx = 0;
 }
 
-u32_t radio_is_ready(void)
+uint32_t radio_is_ready(void)
 {
 	/* Always false. LLL expects the radio not to be in idle/Tx/Rx state */
 	return 0;
 }
 
-u32_t radio_is_done(void)
+uint32_t radio_is_done(void)
 {
 	return radio_trx;
 }
 
-u32_t radio_has_disabled(void)
+uint32_t radio_has_disabled(void)
 {
 	/* Not used */
 	return 0;
 }
 
-u32_t radio_is_idle(void)
+uint32_t radio_is_idle(void)
 {
 	/* Vega radio is never disabled */
 	return 1;
@@ -872,7 +872,7 @@ u32_t radio_is_idle(void)
 #define GENFSK_BLE_CRC_START_BYTE	4 /* After Access Address */
 #define GENFSK_BLE_CRC_BYTE_ORD		0 /* LSB */
 
-void radio_crc_configure(u32_t polynomial, u32_t iv)
+void radio_crc_configure(uint32_t polynomial, uint32_t iv)
 {
 	/* printk("%s poly: %08x, iv: %08x\n", __func__, polynomial, iv); */
 
@@ -898,12 +898,12 @@ void radio_crc_configure(u32_t polynomial, u32_t iv)
 	GENFSK->XCVR_CFG &= ~GENFSK_XCVR_CFG_SW_CRC_EN_MASK;
 }
 
-u32_t radio_crc_is_valid(void)
+uint32_t radio_crc_is_valid(void)
 {
 	if (force_bad_crc)
 		return 0;
 
-	u32_t radio_crc = (GENFSK->XCVR_STS & GENFSK_XCVR_STS_CRC_VALID_MASK) >>
+	uint32_t radio_crc = (GENFSK->XCVR_STS & GENFSK_XCVR_STS_CRC_VALID_MASK) >>
 						GENFSK_XCVR_STS_CRC_VALID_SHIFT;
 	return radio_crc;
 }
@@ -918,7 +918,7 @@ void *radio_pkt_scratch_get(void)
 	return _pkt_scratch;
 }
 
-void radio_switch_complete_and_rx(u8_t phy_rx)
+void radio_switch_complete_and_rx(uint8_t phy_rx)
 {
 	/*  0b0110..RX Start @ T1 Timer Compare Match (EVENT_TMR = T1_CMP) */
 	next_radio_cmd = GENFSK_XCVR_CTRL_SEQCMD(0x6);
@@ -927,8 +927,8 @@ void radio_switch_complete_and_rx(u8_t phy_rx)
 	next_wu = rx_wu + RX_MARGIN;
 }
 
-void radio_switch_complete_and_tx(u8_t phy_rx, u8_t flags_rx, u8_t phy_tx,
-				  u8_t flags_tx)
+void radio_switch_complete_and_tx(uint8_t phy_rx, uint8_t flags_rx, uint8_t phy_tx,
+				  uint8_t flags_tx)
 {
 	/*  0b0010..TX Start @ T1 Timer Compare Match (EVENT_TMR = T1_CMP) */
 	next_radio_cmd = GENFSK_XCVR_CTRL_SEQCMD(0x2);
@@ -947,22 +947,22 @@ void radio_rssi_measure(void)
 	rssi = 0;
 }
 
-u32_t radio_rssi_get(void)
+uint32_t radio_rssi_get(void)
 {
-	return (u32_t)-rssi;
+	return (uint32_t)-rssi;
 }
 
 void radio_rssi_status_reset(void)
 {
 }
 
-u32_t radio_rssi_is_ready(void)
+uint32_t radio_rssi_is_ready(void)
 {
 	return (rssi != 0);
 }
 
-void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
-			    u8_t *bdaddr)
+void radio_filter_configure(uint8_t bitmask_enable, uint8_t bitmask_addr_type,
+			    uint8_t *bdaddr)
 {
 	/* printk("%s\n", __func__); */
 }
@@ -977,19 +977,19 @@ void radio_filter_status_reset(void)
 	/* printk("%s\n", __func__); */
 }
 
-u32_t radio_filter_has_match(void)
+uint32_t radio_filter_has_match(void)
 {
 	/* printk("%s\n", __func__); */
 	return 0;
 }
 
-u32_t radio_filter_match_get(void)
+uint32_t radio_filter_match_get(void)
 {
 	/* printk("%s\n", __func__); */
 	return 0;
 }
 
-void radio_bc_configure(u32_t n)
+void radio_bc_configure(uint32_t n)
 {
 	printk("%s\n", __func__);
 }
@@ -999,7 +999,7 @@ void radio_bc_status_reset(void)
 	printk("%s\n", __func__);
 }
 
-u32_t radio_bc_has_match(void)
+uint32_t radio_bc_has_match(void)
 {
 	printk("%s\n", __func__);
 	return 0;
@@ -1011,15 +1011,15 @@ void radio_tmr_status_reset(void)
 	tmr_end_save = 0;
 }
 
-void radio_tmr_tifs_set(u32_t tifs)
+void radio_tmr_tifs_set(uint32_t tifs)
 {
 	tmr_tifs = tifs;
 }
 
 /* Start the radio after ticks_start (ticks) + remainder (us) time */
-static u32_t radio_tmr_start_hlp(u8_t trx, u32_t ticks_start, u32_t remainder)
+static uint32_t radio_tmr_start_hlp(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 {
-	u32_t radio_start_now_cmd = 0;
+	uint32_t radio_start_now_cmd = 0;
 
 	/* Disable both comparators */
 	GENFSK->T1_CMP = 0;
@@ -1091,7 +1091,7 @@ static u32_t radio_tmr_start_hlp(u8_t trx, u32_t ticks_start, u32_t remainder)
 	return remainder;
 }
 
-u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder)
+uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 {
 	if ((!(remainder / 1000000UL)) || (remainder & 0x80000000)) {
 		ticks_start--;
@@ -1111,26 +1111,26 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder)
 	return radio_tmr_start_hlp(trx, ticks_start, remainder);
 }
 
-u32_t radio_tmr_start_tick(u8_t trx, u32_t tick)
+uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t tick)
 {
 	/* Setup compare event with min. 1 us offset */
-	u32_t remainder_us = 1;
+	uint32_t remainder_us = 1;
 
 	return radio_tmr_start_hlp(trx, tick, remainder_us);
 }
 
-void radio_tmr_start_us(u8_t trx, u32_t us)
+void radio_tmr_start_us(uint8_t trx, uint32_t us)
 {
 	printk("%s\n", __func__);
 }
 
-u32_t radio_tmr_start_now(u8_t trx)
+uint32_t radio_tmr_start_now(uint8_t trx)
 {
 	printk("%s\n", __func__);
 	return 0;
 }
 
-u32_t radio_tmr_start_get(void)
+uint32_t radio_tmr_start_get(void)
 {
 	return rtc_start;
 }
@@ -1139,7 +1139,7 @@ void radio_tmr_stop(void)
 {
 }
 
-static void radio_tmr_hcto_configure_hlp(u32_t hcto)
+static void radio_tmr_hcto_configure_hlp(uint32_t hcto)
 {
 	if (skip_hcto) {
 		skip_hcto = 0;
@@ -1154,7 +1154,7 @@ static void radio_tmr_hcto_configure_hlp(u32_t hcto)
 }
 
 /* Header completion time out */
-void radio_tmr_hcto_configure(u32_t hcto)
+void radio_tmr_hcto_configure(uint32_t hcto)
 {
 	if (delayed_radio_start) {
 		delayed_radio_stop = 1;
@@ -1171,24 +1171,24 @@ void radio_tmr_aa_capture(void)
 	tmr_aa_save = 1;
 }
 
-u32_t radio_tmr_aa_get(void)
+uint32_t radio_tmr_aa_get(void)
 {
 	return tmr_aa - rtc_diff_start_us;
 }
 
-static u32_t radio_tmr_aa;
+static uint32_t radio_tmr_aa;
 
-void radio_tmr_aa_save(u32_t aa)
+void radio_tmr_aa_save(uint32_t aa)
 {
 	radio_tmr_aa = aa;
 }
 
-u32_t radio_tmr_aa_restore(void)
+uint32_t radio_tmr_aa_restore(void)
 {
 	return radio_tmr_aa;
 }
 
-u32_t radio_tmr_ready_get(void)
+uint32_t radio_tmr_ready_get(void)
 {
 	return tmr_ready - rtc_diff_start_us;
 }
@@ -1198,12 +1198,12 @@ void radio_tmr_end_capture(void)
 	tmr_end_save = 1;
 }
 
-u32_t radio_tmr_end_get(void)
+uint32_t radio_tmr_end_get(void)
 {
 	return tmr_end - rtc_diff_start_us;
 }
 
-u32_t radio_tmr_tifs_base_get(void)
+uint32_t radio_tmr_tifs_base_get(void)
 {
 	return radio_tmr_end_get() + rtc_diff_start_us;
 }
@@ -1213,20 +1213,20 @@ void radio_tmr_sample(void)
 	printk("%s\n", __func__);
 }
 
-u32_t radio_tmr_sample_get(void)
+uint32_t radio_tmr_sample_get(void)
 {
 	printk("%s\n", __func__);
 	return 0;
 }
 
-void *radio_ccm_rx_pkt_set_ut(struct ccm *ccm, u8_t phy, void *pkt)
+void *radio_ccm_rx_pkt_set_ut(struct ccm *ccm, uint8_t phy, void *pkt)
 {
 	/* Saved by LL as MSO to LSO in the ccm->key
 	 * SK (LSO to MSO)
 	 * :0x66:0xC6:0xC2:0x27:0x8E:0x3B:0x8E:0x05
 	 * :0x3E:0x7E:0xA3:0x26:0x52:0x1B:0xAD:0x99
 	 */
-	u8_t key_local[16] __aligned(4) = {
+	uint8_t key_local[16] __aligned(4) = {
 		0x99, 0xad, 0x1b, 0x52, 0x26, 0xa3, 0x7e, 0x3e,
 		0x05, 0x8e, 0x3b, 0x8e, 0x27, 0xc2, 0xc6, 0x66
 	};
@@ -1259,7 +1259,7 @@ void *radio_ccm_rx_pkt_set_ut(struct ccm *ccm, u8_t phy, void *pkt)
 	result = radio_ccm_rx_pkt_set(ccm, phy, pkt);
 	radio_ccm_is_done();
 
-	if (ctx_ccm.auth_mic_valid == 1 && ((u8_t *)pkt)[2] == 0x06) {
+	if (ctx_ccm.auth_mic_valid == 1 && ((uint8_t *)pkt)[2] == 0x06) {
 		BT_INFO("Passed decrypt\n");
 	} else {
 		BT_INFO("Failed decrypt\n");
@@ -1268,9 +1268,9 @@ void *radio_ccm_rx_pkt_set_ut(struct ccm *ccm, u8_t phy, void *pkt)
 	return result;
 }
 
-void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
+void *radio_ccm_rx_pkt_set(struct ccm *ccm, uint8_t phy, void *pkt)
 {
-	u8_t key_local[16] __aligned(4);
+	uint8_t key_local[16] __aligned(4);
 	status_t status;
 	cau3_handle_t handle = {
 			.keySlot = kCAU3_KeySlot2,
@@ -1307,7 +1307,7 @@ void *radio_ccm_tx_pkt_set_ut(struct ccm *ccm, void *pkt)
 	 * 06 1b 17 00 37 36 35 34 33 32 31 30 41 42 43
 	 * 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51
 	 */
-	u8_t data_in[29] = {
+	uint8_t data_in[29] = {
 		0x06, 0x1b, 0x17, 0x00, 0x37, 0x36, 0x35, 0x34,
 		0x33, 0x32, 0x31, 0x30, 0x41, 0x42, 0x43, 0x44,
 		0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
@@ -1317,7 +1317,7 @@ void *radio_ccm_tx_pkt_set_ut(struct ccm *ccm, void *pkt)
 	 * 06 1f f3 88 81 e7 bd 94 c9 c3 69 b9 a6 68 46
 	 * dd 47 86 aa 8c 39 ce 54 0d 0d ae 3a dc df 89 b9 60 88
 	 */
-	u8_t data_ref_out[33] = {
+	uint8_t data_ref_out[33] = {
 		0x06, 0x1f, 0xf3, 0x88, 0x81, 0xe7, 0xbd, 0x94,
 		0xc9, 0xc3, 0x69, 0xb9, 0xa6, 0x68, 0x46, 0xdd,
 		0x47, 0x86, 0xaa, 0x8c, 0x39, 0xce, 0x54, 0x0d,
@@ -1329,7 +1329,7 @@ void *radio_ccm_tx_pkt_set_ut(struct ccm *ccm, void *pkt)
 	 * :0x66:0xC6:0xC2:0x27:0x8E:0x3B:0x8E:0x05
 	 * :0x3E:0x7E:0xA3:0x26:0x52:0x1B:0xAD:0x99
 	 */
-	u8_t key_local[16] __aligned(4) = {
+	uint8_t key_local[16] __aligned(4) = {
 		0x99, 0xad, 0x1b, 0x52, 0x26, 0xa3, 0x7e, 0x3e,
 		0x05, 0x8e, 0x3b, 0x8e, 0x27, 0xc2, 0xc6, 0x66
 	};
@@ -1366,9 +1366,9 @@ void *radio_ccm_tx_pkt_set_ut(struct ccm *ccm, void *pkt)
 
 void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 {
-	u8_t key_local[16] __aligned(4);
-	u8_t aad;
-	u8_t *auth_mic;
+	uint8_t key_local[16] __aligned(4);
+	uint8_t aad;
+	uint8_t *auth_mic;
 	status_t status;
 	cau3_handle_t handle = {
 			.keySlot = kCAU3_KeySlot2,
@@ -1397,10 +1397,10 @@ void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 	}
 
 	auth_mic = _pkt_scratch + 2 + ((struct pdu_data *)pkt)->len;
-	aad = *(u8_t *)pkt & RADIO_AESCCM_HDR_MASK;
+	aad = *(uint8_t *)pkt & RADIO_AESCCM_HDR_MASK;
 
 	status = CAU3_AES_CCM_EncryptTag(CAU3, &handle,
-				 (u8_t *)pkt + 2, ((struct pdu_data *)pkt)->len,
+				 (uint8_t *)pkt + 2, ((struct pdu_data *)pkt)->len,
 				 _pkt_scratch + 2,
 				 ctx_ccm.nonce.bytes, 13,
 				 &aad, 1, auth_mic, CAU3_BLE_MIC_SIZE);
@@ -1409,29 +1409,29 @@ void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
 		return 0;
 	}
 
-	_pkt_scratch[0] = *(u8_t *)pkt;
+	_pkt_scratch[0] = *(uint8_t *)pkt;
 	_pkt_scratch[1] = ((struct pdu_data *)pkt)->len + CAU3_BLE_MIC_SIZE;
 
 	return _pkt_scratch;
 }
 
-u32_t radio_ccm_is_done(void)
+uint32_t radio_ccm_is_done(void)
 {
 	status_t status;
-	u8_t *auth_mic;
-	u8_t aad;
+	uint8_t *auth_mic;
+	uint8_t aad;
 	cau3_handle_t handle = {
 			.keySlot = kCAU3_KeySlot2,
 			.taskDone = kCAU3_TaskDonePoll
 	};
 
 	if (ctx_ccm.rx_pkt_in->len > CAU3_BLE_MIC_SIZE) {
-		auth_mic = (u8_t *)ctx_ccm.rx_pkt_in + 2 +
+		auth_mic = (uint8_t *)ctx_ccm.rx_pkt_in + 2 +
 				ctx_ccm.rx_pkt_in->len - CAU3_BLE_MIC_SIZE;
-		aad = *(u8_t *)ctx_ccm.rx_pkt_in & RADIO_AESCCM_HDR_MASK;
+		aad = *(uint8_t *)ctx_ccm.rx_pkt_in & RADIO_AESCCM_HDR_MASK;
 		status = CAU3_AES_CCM_DecryptTag(CAU3, &handle,
-				(u8_t *)ctx_ccm.rx_pkt_in + 2,
-				(u8_t *)ctx_ccm.rx_pkt_out + 2,
+				(uint8_t *)ctx_ccm.rx_pkt_in + 2,
+				(uint8_t *)ctx_ccm.rx_pkt_out + 2,
 				ctx_ccm.rx_pkt_in->len - CAU3_BLE_MIC_SIZE,
 				ctx_ccm.nonce.bytes, 13,
 				&aad, 1, auth_mic, CAU3_BLE_MIC_SIZE);
@@ -1455,20 +1455,20 @@ u32_t radio_ccm_is_done(void)
 	return 1;
 }
 
-u32_t radio_ccm_mic_is_valid(void)
+uint32_t radio_ccm_mic_is_valid(void)
 {
 	return ctx_ccm.auth_mic_valid;
 }
 
-u32_t radio_ccm_is_available(void)
+uint32_t radio_ccm_is_available(void)
 {
 	return ctx_ccm.empty_pdu_rxed;
 }
 
-void radio_ar_configure(u32_t nirk, void *irk)
+void radio_ar_configure(uint32_t nirk, void *irk)
 {
 	status_t status;
-	u8_t pirk[16];
+	uint8_t pirk[16];
 
 	/* Initialize CAUv3 RPA table */
 	status = CAU3_RPAtableInit(CAU3, kCAU3_TaskDoneEvent);
@@ -1487,7 +1487,7 @@ void radio_ar_configure(u32_t nirk, void *irk)
 	/* Insert RPA keys(IRK) in table */
 	for (int i = 0; i < nirk; i++) {
 		/* CAUv3 needs IRK in le format */
-		sys_memcpy_swap(pirk, (u8_t *)irk + i * 16, 16);
+		sys_memcpy_swap(pirk, (uint8_t *)irk + i * 16, 16);
 		status = CAU3_RPAtableInsertKey(CAU3, (uint32_t *)&pirk,
 						kCAU3_TaskDoneEvent);
 		if (kStatus_Success != status) {
@@ -1500,7 +1500,7 @@ void radio_ar_configure(u32_t nirk, void *irk)
 	radio_ar_ctx.ar_enable = 1U;
 }
 
-u32_t radio_ar_match_get(void)
+uint32_t radio_ar_match_get(void)
 {
 	return radio_ar_ctx.irk_idx;
 }
@@ -1511,19 +1511,19 @@ void radio_ar_status_reset(void)
 	radio_ar_ctx.irk_idx = RPA_NO_IRK_MATCH;
 }
 
-u32_t radio_ar_has_match(void)
+uint32_t radio_ar_has_match(void)
 {
 	return (radio_ar_ctx.irk_idx != RPA_NO_IRK_MATCH);
 }
 
-u32_t radio_sleep(void)
+uint32_t radio_sleep(void)
 {
 
 	if (dsm_ref == 0) {
 		return -EALREADY;
 	}
 
-	u32_t localref = --dsm_ref;
+	uint32_t localref = --dsm_ref;
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_HIGH_PRIO) && \
 	(CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
 	/* TODO:
@@ -1537,7 +1537,7 @@ u32_t radio_sleep(void)
 #endif
 	if (localref == 0) {
 
-		u32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
+		uint32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
 
 		if (status) {
 			/* Already in sleep mode */
@@ -1548,7 +1548,7 @@ u32_t radio_sleep(void)
 		RSIM->DSM_CONTROL &= ~RSIM_DSM_CONTROL_DSM_TIMER_EN(1);
 
 		/* Get current DSM_TIMER value */
-		u32_t dsm_timer = RSIM->DSM_TIMER;
+		uint32_t dsm_timer = RSIM->DSM_TIMER;
 
 		/* Set Sleep time after DSM_ENTER_DELAY */
 		RSIM->MAN_SLEEP = RSIM_MAN_SLEEP_MAN_SLEEP_TIME(dsm_timer +
@@ -1570,9 +1570,9 @@ u32_t radio_sleep(void)
 	return 0;
 }
 
-u32_t radio_wake(void)
+uint32_t radio_wake(void)
 {
-	u32_t localref = ++dsm_ref;
+	uint32_t localref = ++dsm_ref;
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_HIGH_PRIO) && \
 	(CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
 	/* TODO:
@@ -1586,7 +1586,7 @@ u32_t radio_wake(void)
 #endif
 	if (localref == 1) {
 
-		u32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
+		uint32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
 
 		if (!status) {
 			/* Not in sleep mode */
@@ -1594,7 +1594,7 @@ u32_t radio_wake(void)
 		}
 
 		/* Get current DSM_TIMER value */
-		u32_t dsm_timer = RSIM->DSM_TIMER;
+		uint32_t dsm_timer = RSIM->DSM_TIMER;
 
 		/* Set Wake time after DSM_ENTER_DELAY */
 		RSIM->MAN_WAKE = RSIM_MAN_WAKE_MAN_WAKE_TIME(dsm_timer +
@@ -1604,9 +1604,9 @@ u32_t radio_wake(void)
 	return 0;
 }
 
-u32_t radio_is_off(void)
+uint32_t radio_is_off(void)
 {
-	u32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
+	uint32_t status = (RSIM->DSM_CONTROL & MAN_DSM_ON);
 
 	return status;
 }
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h
index c870c25df1..1168804bbd 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.h
@@ -15,94 +15,94 @@ void radio_isr_set(radio_isr_cb_t cb, void *param);
 
 void radio_setup(void);
 void radio_reset(void);
-void radio_phy_set(u8_t phy, u8_t flags);
-void radio_tx_power_set(u32_t power);
+void radio_phy_set(uint8_t phy, uint8_t flags);
+void radio_tx_power_set(uint32_t power);
 void radio_tx_power_max_set(void);
-void radio_freq_chan_set(u32_t chan);
-void radio_whiten_iv_set(u32_t iv);
-void radio_aa_set(u8_t *aa);
-void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags);
+void radio_freq_chan_set(uint32_t chan);
+void radio_whiten_iv_set(uint32_t iv);
+void radio_aa_set(uint8_t *aa);
+void radio_pkt_configure(uint8_t bits_len, uint8_t max_len, uint8_t flags);
 void radio_pkt_rx_set(void *rx_packet);
 void radio_pkt_tx_set(void *tx_packet);
-u32_t radio_tx_ready_delay_get(u8_t phy, u8_t flags);
-u32_t radio_tx_chain_delay_get(u8_t phy, u8_t flags);
-u32_t radio_rx_ready_delay_get(u8_t phy, u8_t flags);
-u32_t radio_rx_chain_delay_get(u8_t phy, u8_t flags);
+uint32_t radio_tx_ready_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_tx_chain_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_rx_ready_delay_get(uint8_t phy, uint8_t flags);
+uint32_t radio_rx_chain_delay_get(uint8_t phy, uint8_t flags);
 void radio_rx_enable(void);
 void radio_tx_enable(void);
 void radio_disable(void);
 
 void radio_status_reset(void);
-u32_t radio_is_ready(void);
-u32_t radio_is_done(void);
-u32_t radio_has_disabled(void);
-u32_t radio_is_idle(void);
+uint32_t radio_is_ready(void);
+uint32_t radio_is_done(void);
+uint32_t radio_has_disabled(void);
+uint32_t radio_is_idle(void);
 
-void radio_crc_configure(u32_t polynomial, u32_t iv);
-u32_t radio_crc_is_valid(void);
+void radio_crc_configure(uint32_t polynomial, uint32_t iv);
+uint32_t radio_crc_is_valid(void);
 
 void *radio_pkt_empty_get(void);
 void *radio_pkt_scratch_get(void);
 
-void radio_switch_complete_and_rx(u8_t phy_rx);
-void radio_switch_complete_and_tx(u8_t phy_rx, u8_t flags_rx, u8_t phy_tx,
-				  u8_t flags_tx);
+void radio_switch_complete_and_rx(uint8_t phy_rx);
+void radio_switch_complete_and_tx(uint8_t phy_rx, uint8_t flags_rx, uint8_t phy_tx,
+				  uint8_t flags_tx);
 void radio_switch_complete_and_disable(void);
 
 void radio_rssi_measure(void);
-u32_t radio_rssi_get(void);
+uint32_t radio_rssi_get(void);
 void radio_rssi_status_reset(void);
-u32_t radio_rssi_is_ready(void);
+uint32_t radio_rssi_is_ready(void);
 
-void radio_filter_configure(u8_t bitmask_enable, u8_t bitmask_addr_type,
-			    u8_t *bdaddr);
+void radio_filter_configure(uint8_t bitmask_enable, uint8_t bitmask_addr_type,
+			    uint8_t *bdaddr);
 void radio_filter_disable(void);
 void radio_filter_status_reset(void);
-u32_t radio_filter_has_match(void);
-u32_t radio_filter_match_get(void);
+uint32_t radio_filter_has_match(void);
+uint32_t radio_filter_match_get(void);
 
-void radio_bc_configure(u32_t n);
+void radio_bc_configure(uint32_t n);
 void radio_bc_status_reset(void);
-u32_t radio_bc_has_match(void);
+uint32_t radio_bc_has_match(void);
 
 void radio_tmr_status_reset(void);
-void radio_tmr_tifs_set(u32_t tifs);
-u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder);
-u32_t radio_tmr_start_tick(u8_t trx, u32_t tick);
-void radio_tmr_start_us(u8_t trx, u32_t us);
-u32_t radio_tmr_start_now(u8_t trx);
-u32_t radio_tmr_start_get(void);
+void radio_tmr_tifs_set(uint32_t tifs);
+uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder);
+uint32_t radio_tmr_start_tick(uint8_t trx, uint32_t tick);
+void radio_tmr_start_us(uint8_t trx, uint32_t us);
+uint32_t radio_tmr_start_now(uint8_t trx);
+uint32_t radio_tmr_start_get(void);
 void radio_tmr_stop(void);
-void radio_tmr_hcto_configure(u32_t hcto);
+void radio_tmr_hcto_configure(uint32_t hcto);
 void radio_tmr_aa_capture(void);
-u32_t radio_tmr_aa_get(void);
-void radio_tmr_aa_save(u32_t aa);
-u32_t radio_tmr_aa_restore(void);
-u32_t radio_tmr_ready_get(void);
+uint32_t radio_tmr_aa_get(void);
+void radio_tmr_aa_save(uint32_t aa);
+uint32_t radio_tmr_aa_restore(void);
+uint32_t radio_tmr_ready_get(void);
 void radio_tmr_end_capture(void);
-u32_t radio_tmr_end_get(void);
-u32_t radio_tmr_tifs_base_get(void);
+uint32_t radio_tmr_end_get(void);
+uint32_t radio_tmr_tifs_base_get(void);
 void radio_tmr_sample(void);
-u32_t radio_tmr_sample_get(void);
+uint32_t radio_tmr_sample_get(void);
 
 void radio_gpio_pa_setup(void);
 void radio_gpio_lna_setup(void);
 void radio_gpio_lna_on(void);
 void radio_gpio_lna_off(void);
-void radio_gpio_pa_lna_enable(u32_t trx_us);
+void radio_gpio_pa_lna_enable(uint32_t trx_us);
 void radio_gpio_pa_lna_disable(void);
 
-void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt);
+void *radio_ccm_rx_pkt_set(struct ccm *ccm, uint8_t phy, void *pkt);
 void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt);
-u32_t radio_ccm_is_done(void);
-u32_t radio_ccm_mic_is_valid(void);
-u32_t radio_ccm_is_available(void);
+uint32_t radio_ccm_is_done(void);
+uint32_t radio_ccm_mic_is_valid(void);
+uint32_t radio_ccm_is_available(void);
 
-void radio_ar_configure(u32_t nirk, void *irk);
-u32_t radio_ar_match_get(void);
+void radio_ar_configure(uint32_t nirk, void *irk);
+uint32_t radio_ar_match_get(void);
 void radio_ar_status_reset(void);
-u32_t radio_ar_has_match(void);
+uint32_t radio_ar_has_match(void);
 
-u32_t radio_sleep(void);
-u32_t radio_wake(void);
-u32_t radio_is_off(void);
+uint32_t radio_sleep(void);
+uint32_t radio_wake(void);
+uint32_t radio_is_off(void);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
index 0c3a828c0c..438afd17a7 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
@@ -27,7 +27,7 @@
 #define TICKER_MAYFLY_CALL_ID_WORKER  TICKER_USER_ID_ULL_HIGH
 #define TICKER_MAYFLY_CALL_ID_JOB     TICKER_USER_ID_ULL_LOW
 #define TICKER_MAYFLY_CALL_ID_PROGRAM TICKER_USER_ID_THREAD
-static u8_t const caller_id_lut[] = {
+static uint8_t const caller_id_lut[] = {
 	TICKER_CALL_ID_ISR,
 	TICKER_CALL_ID_WORKER,
 	TICKER_CALL_ID_JOB,
@@ -37,9 +37,9 @@ static u8_t const caller_id_lut[] = {
 #error Unknown LL variant.
 #endif
 
-u8_t hal_ticker_instance0_caller_id_get(u8_t user_id)
+uint8_t hal_ticker_instance0_caller_id_get(uint8_t user_id)
 {
-	u8_t caller_id;
+	uint8_t caller_id;
 
 	LL_ASSERT(user_id < sizeof(caller_id_lut));
 
@@ -49,7 +49,7 @@ u8_t hal_ticker_instance0_caller_id_get(u8_t user_id)
 	return caller_id;
 }
 
-void hal_ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain,
+void hal_ticker_instance0_sched(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 				void *instance)
 {
 	/* return value not checked as we allow multiple calls to schedule
@@ -197,7 +197,7 @@ void hal_ticker_instance0_sched(u8_t caller_id, u8_t callee_id, u8_t chain,
 	}
 }
 
-void hal_ticker_instance0_trigger_set(u32_t value)
+void hal_ticker_instance0_trigger_set(uint32_t value)
 {
 	cntr_cmp_set(0, value);
 }
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.h
index 2028554576..642ca1e608 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.h
@@ -17,21 +17,21 @@
 
 #define HAL_TICKER_US_TO_TICKS(x) \
 	( \
-		((u32_t)(((u64_t) (x) * 1000000000UL) / 30517578125UL)) \
+		((uint32_t)(((uint64_t) (x) * 1000000000UL) / 30517578125UL)) \
 		& HAL_TICKER_CNTR_MASK \
 	)
 
 #define HAL_TICKER_REMAINDER(x) \
 	( \
 		( \
-			((u64_t) (x) * 1000000000UL) \
-			- ((u64_t)HAL_TICKER_US_TO_TICKS(x) * 30517578125UL) \
+			((uint64_t) (x) * 1000000000UL) \
+			- ((uint64_t)HAL_TICKER_US_TO_TICKS(x) * 30517578125UL) \
 		) \
 		/ 1000UL \
 	)
 
 #define HAL_TICKER_TICKS_TO_US(x) \
-	((u32_t)(((u64_t)(x) * 30517578125UL) / 1000000000UL))
+	((uint32_t)(((uint64_t)(x) * 30517578125UL) / 1000000000UL))
 
 #define HAL_TICKER_CNTR_MSBIT 31
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
index daf3ae88d7..5b8e1589b9 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
@@ -51,18 +51,18 @@ static struct device *dev_entropy;
 static int init_reset(void);
 static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		   lll_prepare_cb_t prepare_cb, int prio,
-		   struct lll_prepare_param *prepare_param, u8_t is_resume);
+		   struct lll_prepare_param *prepare_param, uint8_t is_resume);
 static int resume_enqueue(lll_prepare_cb_t resume_cb, int resume_prio);
 
 #if !defined(CONFIG_BT_CTLR_LOW_LAT)
-static void ticker_start_op_cb(u32_t status, void *param);
+static void ticker_start_op_cb(uint32_t status, void *param);
 static void preempt_ticker_start(struct lll_prepare_param *prepare_param);
-static void preempt_ticker_cb(u32_t ticks_at_expire, u32_t remainder,
-			      u16_t lazy, void *param);
+static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
+			      uint16_t lazy, void *param);
 static void preempt(void *param);
 #else /* CONFIG_BT_CTLR_LOW_LAT */
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void ticker_op_job_disable(u32_t status, void *op_context);
+static void ticker_op_job_disable(uint32_t status, void *op_context);
 #endif
 #endif /* CONFIG_BT_CTLR_LOW_LAT */
 
@@ -163,7 +163,7 @@ int lll_init(void)
 	return 0;
 }
 
-u8_t lll_entropy_get(u8_t len, void *rand)
+uint8_t lll_entropy_get(uint8_t len, void *rand)
 {
 	/* entropy_get_entropy_isr(dev_entropy, rand, len, 0); */
 	return 0;
@@ -211,7 +211,7 @@ void lll_disable(void *param)
 	}
 	{
 		struct lll_event *next;
-		u8_t idx = UINT8_MAX;
+		uint8_t idx = UINT8_MAX;
 
 		next = ull_prepare_dequeue_iter(&idx);
 		while (next) {
@@ -231,7 +231,7 @@ int lll_prepare_done(void *param)
 {
 #if defined(CONFIG_BT_CTLR_LOW_LAT) && \
 	    (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-	u32_t ret;
+	uint32_t ret;
 
 	/* Ticker Job Silence */
 	ret = ticker_job_idle_get(TICKER_INSTANCE_ID_CTLR,
@@ -335,7 +335,7 @@ int lll_clk_off(void)
 	return err;
 }
 
-u32_t lll_evt_offset_get(struct evt_hdr *evt)
+uint32_t lll_evt_offset_get(struct evt_hdr *evt)
 {
 	if (0) {
 #if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
@@ -349,11 +349,11 @@ u32_t lll_evt_offset_get(struct evt_hdr *evt)
 	}
 }
 
-u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
-		       u32_t ticks_at_event)
+uint32_t lll_preempt_calc(struct evt_hdr *evt, uint8_t ticker_id,
+		       uint32_t ticks_at_event)
 {
-	u32_t ticks_now = ticker_ticks_now_get();
-	u32_t diff;
+	uint32_t ticks_now = ticker_ticks_now_get();
+	uint32_t diff;
 
 	diff = ticker_ticks_diff_get(ticks_now, ticks_at_event);
 	diff += HAL_TICKER_CNTR_CMP_OFFSET_MIN;
@@ -371,7 +371,7 @@ u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
 	return 0;
 }
 
-void lll_chan_set(u32_t chan)
+void lll_chan_set(uint32_t chan)
 {
 	switch (chan) {
 	case 37:
@@ -401,7 +401,7 @@ void lll_chan_set(u32_t chan)
 }
 
 
-u32_t lll_radio_is_idle(void)
+uint32_t lll_radio_is_idle(void)
 {
 	return radio_is_idle();
 }
@@ -414,9 +414,9 @@ static int init_reset(void)
 
 static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		   lll_prepare_cb_t prepare_cb, int prio,
-		   struct lll_prepare_param *prepare_param, u8_t is_resume)
+		   struct lll_prepare_param *prepare_param, uint8_t is_resume)
 {
-	u8_t idx = UINT8_MAX;
+	uint8_t idx = UINT8_MAX;
 	struct lll_event *p;
 	int ret, err;
 
@@ -511,7 +511,7 @@ static int resume_enqueue(lll_prepare_cb_t resume_cb, int resume_prio)
 }
 
 #if !defined(CONFIG_BT_CTLR_LOW_LAT)
-static void ticker_start_op_cb(u32_t status, void *param)
+static void ticker_start_op_cb(uint32_t status, void *param)
 {
 	/* NOTE: this callback is present only for addition debug messages
 	 * when needed, else can be dispensed with.
@@ -524,9 +524,9 @@ static void ticker_start_op_cb(u32_t status, void *param)
 
 static void preempt_ticker_start(struct lll_prepare_param *prepare_param)
 {
-	u32_t preempt_anchor;
+	uint32_t preempt_anchor;
 	struct evt_hdr *evt;
-	u32_t preempt_to;
+	uint32_t preempt_to;
 	int ret;
 
 	/* Calc the preempt timeout */
@@ -553,12 +553,12 @@ static void preempt_ticker_start(struct lll_prepare_param *prepare_param)
 		  (ret == TICKER_STATUS_BUSY));
 }
 
-static void preempt_ticker_cb(u32_t ticks_at_expire, u32_t remainder,
-			       u16_t lazy, void *param)
+static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
+			       uint16_t lazy, void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, preempt};
-	u32_t ret;
+	uint32_t ret;
 
 	ret = mayfly_enqueue(TICKER_USER_ID_ULL_HIGH, TICKER_USER_ID_LLL,
 			     0, &mfy);
@@ -569,7 +569,7 @@ static void preempt(void *param)
 {
 	struct lll_event *next = ull_prepare_dequeue_get();
 	lll_prepare_cb_t resume_cb;
-	u8_t idx = UINT8_MAX;
+	uint8_t idx = UINT8_MAX;
 	int resume_prio;
 	int ret;
 
@@ -605,7 +605,7 @@ static void preempt(void *param)
 
 	if (ret == -EAGAIN) {
 		struct lll_event *iter;
-		u8_t iter_idx = UINT8_MAX;
+		uint8_t iter_idx = UINT8_MAX;
 
 		iter = ull_prepare_dequeue_iter(&iter_idx);
 		while (iter) {
@@ -638,7 +638,7 @@ preempt_next:
 #else /* CONFIG_BT_CTLR_LOW_LAT */
 
 #if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
-static void ticker_op_job_disable(u32_t status, void *op_context)
+static void ticker_op_job_disable(uint32_t status, void *op_context)
 {
 	ARG_UNUSED(status);
 	ARG_UNUSED(op_context);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
index cd827c9736..40930924cd 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
@@ -54,24 +54,24 @@ static void isr_cleanup(void *param);
 static void isr_race(void *param);
 static void chan_prepare(struct lll_adv *lll);
 static inline int isr_rx_pdu(struct lll_adv *lll,
-			     u8_t devmatch_ok, u8_t devmatch_id,
-			     u8_t irkmatch_ok, u8_t irkmatch_id,
-			     u8_t rssi_ready);
+			     uint8_t devmatch_ok, uint8_t devmatch_id,
+			     uint8_t irkmatch_ok, uint8_t irkmatch_id,
+			     uint8_t rssi_ready);
 static inline bool isr_rx_sr_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *sr, u8_t devmatch_ok,
-				   u8_t *rl_idx);
+				   struct pdu_adv *sr, uint8_t devmatch_ok,
+				   uint8_t *rl_idx);
 static inline bool isr_rx_sr_adva_check(struct pdu_adv *adv,
 					struct pdu_adv *sr);
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
-				   u8_t rssi_ready);
+				   uint8_t rssi_ready);
 #endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */
 static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *ci, u8_t devmatch_ok,
-				   u8_t *rl_idx);
+				   struct pdu_adv *ci, uint8_t devmatch_ok,
+				   uint8_t *rl_idx);
 static inline bool isr_rx_ci_tgta_check(struct lll_adv *lll,
 					struct pdu_adv *adv, struct pdu_adv *ci,
-					u8_t rl_idx);
+					uint8_t rl_idx);
 static inline bool isr_rx_ci_adva_check(struct pdu_adv *adv,
 					struct pdu_adv *ci);
 
@@ -119,11 +119,11 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_adv *lll = prepare_param->param;
-	u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
+	uint32_t ticks_at_event, ticks_at_start;
 	struct evt_hdr *evt;
-	u32_t remainder_us;
-	u32_t remainder;
+	uint32_t remainder_us;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_A(1);
 
@@ -155,7 +155,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	radio_pkt_configure(8, PDU_AC_PAYLOAD_SIZE_MAX, 0);
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
-	radio_aa_set((u8_t *)&aa);
+	radio_aa_set((uint8_t *)&aa);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
 			    0x555555);
 
@@ -175,7 +175,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 		radio_filter_configure(filter->enable_bitmask,
 				       filter->addr_type_bitmask,
-				       (u8_t *)filter->bdaddr);
+				       (uint8_t *)filter->bdaddr);
 	} else
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
@@ -186,7 +186,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 			radio_filter_configure(wl->enable_bitmask,
 					       wl->addr_type_bitmask,
-					       (u8_t *)wl->bdaddr);
+					       (uint8_t *)wl->bdaddr);
 		}
 
 	ticks_at_event = prepare_param->ticks_at_expire;
@@ -222,7 +222,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
@@ -312,7 +312,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 
 static void isr_tx(void *param)
 {
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
@@ -345,7 +345,7 @@ static void isr_tx(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -392,13 +392,13 @@ static void isr_tx(void *param)
 
 static void isr_rx(void *param)
 {
-	u8_t trx_done;
-	u8_t crc_ok;
-	u8_t devmatch_ok;
-	u8_t devmatch_id;
-	u8_t irkmatch_ok;
-	u8_t irkmatch_id;
-	u8_t rssi_ready;
+	uint8_t trx_done;
+	uint8_t crc_ok;
+	uint8_t devmatch_ok;
+	uint8_t devmatch_id;
+	uint8_t irkmatch_ok;
+	uint8_t irkmatch_id;
+	uint8_t rssi_ready;
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_latency_capture();
@@ -486,7 +486,7 @@ static void isr_done(void *param)
 #endif /* CONFIG_BT_PERIPHERAL */
 
 	if (lll->chan_map_curr) {
-		u32_t start_us;
+		uint32_t start_us;
 
 		chan_prepare(lll);
 
@@ -517,7 +517,7 @@ static void isr_done(void *param)
 	{
 #if defined(CONFIG_BT_HCI_MESH_EXT)
 		if (_radio.advertiser.is_mesh) {
-			u32_t err;
+			uint32_t err;
 
 			err = isr_close_adv_mesh();
 			if (err) {
@@ -587,8 +587,8 @@ static void chan_prepare(struct lll_adv *lll)
 {
 	struct pdu_adv *pdu;
 	struct pdu_adv *scan_pdu;
-	u8_t chan;
-	u8_t upd = 0U;
+	uint8_t chan;
+	uint8_t upd = 0U;
 
 	pdu = lll_adv_data_latest_get(lll, &upd);
 	scan_pdu = lll_adv_scan_rsp_latest_get(lll, &upd);
@@ -628,18 +628,18 @@ static void chan_prepare(struct lll_adv *lll)
 }
 
 static inline int isr_rx_pdu(struct lll_adv *lll,
-			     u8_t devmatch_ok, u8_t devmatch_id,
-			     u8_t irkmatch_ok, u8_t irkmatch_id,
-			     u8_t rssi_ready)
+			     uint8_t devmatch_ok, uint8_t devmatch_id,
+			     uint8_t irkmatch_ok, uint8_t irkmatch_id,
+			     uint8_t rssi_ready)
 {
 	struct pdu_adv *pdu_rx, *pdu_adv;
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	/* An IRK match implies address resolution enabled */
-	u8_t rl_idx = irkmatch_ok ? ull_filter_lll_rl_irk_idx(irkmatch_id) :
+	uint8_t rl_idx = irkmatch_ok ? ull_filter_lll_rl_irk_idx(irkmatch_id) :
 				    FILTER_IDX_NONE;
 #else
-	u8_t rl_idx = FILTER_IDX_NONE;
+	uint8_t rl_idx = FILTER_IDX_NONE;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
 	pdu_rx = (void *)radio_pkt_scratch_get();
@@ -663,7 +663,7 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 		if (!IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) ||
 		    0 /* TODO: extended adv. scan req notification enabled */) {
-			u32_t err;
+			uint32_t err;
 
 			/* Generate the scan request event */
 			err = isr_rx_sr_report(pdu_rx, rssi_ready);
@@ -763,8 +763,8 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 }
 
 static inline bool isr_rx_sr_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *sr, u8_t devmatch_ok,
-				   u8_t *rl_idx)
+				   struct pdu_adv *sr, uint8_t devmatch_ok,
+				   uint8_t *rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	return ((((lll->filter_policy & 0x01) == 0) &&
@@ -789,11 +789,11 @@ static inline bool isr_rx_sr_adva_check(struct pdu_adv *adv,
 
 #if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
 static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
-				   u8_t rssi_ready)
+				   uint8_t rssi_ready)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv;
-	u8_t pdu_len;
+	uint8_t pdu_len;
 
 	node_rx = ull_pdu_rx_alloc_peek(3);
 	if (!node_rx) {
@@ -823,8 +823,8 @@ static inline int isr_rx_sr_report(struct pdu_adv *pdu_adv_rx,
 #endif /* CONFIG_BT_CTLR_SCAN_REQ_NOTIFY */
 
 static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
-				   struct pdu_adv *ci, u8_t devmatch_ok,
-				   u8_t *rl_idx)
+				   struct pdu_adv *ci, uint8_t devmatch_ok,
+				   uint8_t *rl_idx)
 {
 	/* LL 4.3.2: filter policy shall be ignored for directed adv */
 	if (adv->type == PDU_ADV_TYPE_DIRECT_IND) {
@@ -856,7 +856,7 @@ static inline bool isr_rx_ci_check(struct lll_adv *lll, struct pdu_adv *adv,
 
 static inline bool isr_rx_ci_tgta_check(struct lll_adv *lll,
 					struct pdu_adv *adv, struct pdu_adv *ci,
-					u8_t rl_idx)
+					uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (rl_idx != FILTER_IDX_NONE) {
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.h b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.h
index ba04eca58d..cf6074aaa7 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.h
@@ -5,12 +5,12 @@
  */
 
 struct lll_adv_pdu {
-	u8_t           first;
-	u8_t           last;
+	uint8_t           first;
+	uint8_t           last;
 	/* TODO: use,
 	 * struct pdu_adv *pdu[DOUBLE_BUFFER_SIZE];
 	 */
-	u8_t pdu[DOUBLE_BUFFER_SIZE][PDU_AC_SIZE_MAX];
+	uint8_t pdu[DOUBLE_BUFFER_SIZE][PDU_AC_SIZE_MAX];
 };
 
 struct lll_adv {
@@ -19,23 +19,23 @@ struct lll_adv {
 #if defined(CONFIG_BT_PERIPHERAL)
 	/* NOTE: conn context has to be after lll_hdr */
 	struct lll_conn *conn;
-	u8_t is_hdcd:1;
+	uint8_t is_hdcd:1;
 #endif /* CONFIG_BT_PERIPHERAL */
 
-	u8_t chan_map:3;
-	u8_t chan_map_curr:3;
-	u8_t filter_policy:2;
+	uint8_t chan_map:3;
+	uint8_t chan_map_curr:3;
+	uint8_t filter_policy:2;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	u8_t phy_p:3;
+	uint8_t phy_p:3;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-	u8_t is_mesh:1;
+	uint8_t is_mesh:1;
 #endif /* CONFIG_BT_HCI_MESH_EXT */
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  rl_idx;
+	uint8_t  rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
 	struct lll_adv_pdu adv_data;
@@ -48,9 +48,9 @@ int lll_adv_reset(void);
 void lll_adv_prepare(void *param);
 
 static inline struct pdu_adv *lll_adv_pdu_alloc(struct lll_adv_pdu *pdu,
-						u8_t *idx)
+						uint8_t *idx)
 {
-	u8_t last;
+	uint8_t last;
 
 	if (pdu->first == pdu->last) {
 		last = pdu->last + 1;
@@ -66,17 +66,17 @@ static inline struct pdu_adv *lll_adv_pdu_alloc(struct lll_adv_pdu *pdu,
 	return (void *)pdu->pdu[last];
 }
 
-static inline void lll_adv_pdu_enqueue(struct lll_adv_pdu *pdu, u8_t idx)
+static inline void lll_adv_pdu_enqueue(struct lll_adv_pdu *pdu, uint8_t idx)
 {
 	pdu->last = idx;
 }
 
-static inline struct pdu_adv *lll_adv_data_alloc(struct lll_adv *lll, u8_t *idx)
+static inline struct pdu_adv *lll_adv_data_alloc(struct lll_adv *lll, uint8_t *idx)
 {
 	return lll_adv_pdu_alloc(&lll->adv_data, idx);
 }
 
-static inline void lll_adv_data_enqueue(struct lll_adv *lll, u8_t idx)
+static inline void lll_adv_data_enqueue(struct lll_adv *lll, uint8_t idx)
 {
 	lll_adv_pdu_enqueue(&lll->adv_data, idx);
 }
@@ -87,12 +87,12 @@ static inline struct pdu_adv *lll_adv_data_peek(struct lll_adv *lll)
 }
 
 static inline struct pdu_adv *lll_adv_scan_rsp_alloc(struct lll_adv *lll,
-						     u8_t *idx)
+						     uint8_t *idx)
 {
 	return lll_adv_pdu_alloc(&lll->scan_rsp, idx);
 }
 
-static inline void lll_adv_scan_rsp_enqueue(struct lll_adv *lll, u8_t idx)
+static inline void lll_adv_scan_rsp_enqueue(struct lll_adv *lll, uint8_t idx)
 {
 	lll_adv_pdu_enqueue(&lll->scan_rsp, idx);
 }
@@ -102,4 +102,4 @@ static inline struct pdu_adv *lll_adv_scan_rsp_peek(struct lll_adv *lll)
 	return (void *)lll->scan_rsp.pdu[lll->scan_rsp.last];
 }
 
-extern u16_t ull_adv_lll_handle_get(struct lll_adv *lll);
+extern uint16_t ull_adv_lll_handle_get(struct lll_adv *lll);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv_internal.h b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv_internal.h
index 197fae8479..7978f54bdd 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv_internal.h
@@ -5,9 +5,9 @@
  */
 
 static inline struct pdu_adv *lll_adv_pdu_latest_get(struct lll_adv_pdu *pdu,
-						     u8_t *is_modified)
+						     uint8_t *is_modified)
 {
-	u8_t first;
+	uint8_t first;
 
 	first = pdu->first;
 	if (first != pdu->last) {
@@ -23,13 +23,13 @@ static inline struct pdu_adv *lll_adv_pdu_latest_get(struct lll_adv_pdu *pdu,
 }
 
 static inline struct pdu_adv *lll_adv_data_latest_get(struct lll_adv *lll,
-						      u8_t *is_modified)
+						      uint8_t *is_modified)
 {
 	return lll_adv_pdu_latest_get(&lll->adv_data, is_modified);
 }
 
 static inline struct pdu_adv *lll_adv_scan_rsp_latest_get(struct lll_adv *lll,
-							  u8_t *is_modified)
+							  uint8_t *is_modified)
 {
 	return lll_adv_pdu_latest_get(&lll->scan_rsp, is_modified);
 }
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
index 50ea477065..b85e422445 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
@@ -37,16 +37,16 @@ static void isr_done(void *param);
 static void isr_cleanup(void *param);
 static void isr_race(void *param);
 static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
-		      struct node_tx **tx_release, u8_t *is_rx_enqueue);
+		      struct node_tx **tx_release, uint8_t *is_rx_enqueue);
 static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll);
 
-static u16_t const sca_ppm_lut[] = {500, 250, 150, 100, 75, 50, 30, 20};
-static u8_t crc_expire;
-static u8_t crc_valid;
-static u16_t trx_cnt;
+static uint16_t const sca_ppm_lut[] = {500, 250, 150, 100, 75, 50, 30, 20};
+static uint8_t crc_expire;
+static uint8_t crc_valid;
+static uint16_t trx_cnt;
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-static u8_t mic_state;
+static uint8_t mic_state;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 int lll_conn_init(void)
@@ -73,17 +73,17 @@ int lll_conn_reset(void)
 	return 0;
 }
 
-u8_t lll_conn_sca_local_get(void)
+uint8_t lll_conn_sca_local_get(void)
 {
 	return 0;
 }
 
-u32_t lll_conn_ppm_local_get(void)
+uint32_t lll_conn_ppm_local_get(void)
 {
 	return sca_ppm_lut[0];
 }
 
-u32_t lll_conn_ppm_get(u8_t sca)
+uint32_t lll_conn_ppm_get(uint8_t sca)
 {
 	return sca_ppm_lut[sca];
 }
@@ -136,14 +136,14 @@ void lll_conn_isr_rx(void *param)
 	struct pdu_data *pdu_data_rx;
 	struct pdu_data *pdu_data_tx;
 	struct node_rx_pdu *node_rx;
-	u8_t is_empty_pdu_tx_retry;
-	u8_t is_crc_backoff = 0U;
-	u8_t is_rx_enqueue = 0U;
-	u8_t is_ull_rx = 0U;
-	u8_t rssi_ready;
-	u8_t trx_done;
-	u8_t is_done;
-	u8_t crc_ok;
+	uint8_t is_empty_pdu_tx_retry;
+	uint8_t is_crc_backoff = 0U;
+	uint8_t is_rx_enqueue = 0U;
+	uint8_t is_ull_rx = 0U;
+	uint8_t rssi_ready;
+	uint8_t trx_done;
+	uint8_t is_done;
+	uint8_t crc_ok;
 
 #if defined(CONFIG_BT_CTLR_PROFILE_ISR)
 	lll_prof_latency_capture();
@@ -183,7 +183,7 @@ void lll_conn_isr_rx(void *param)
 	pdu_data_rx = (void *)node_rx->pdu;
 
 	if (crc_ok) {
-		u32_t err;
+		uint32_t err;
 
 		err = isr_rx_pdu(lll, pdu_data_rx, &tx_release, &is_rx_enqueue);
 		if (err) {
@@ -321,7 +321,7 @@ lll_conn_isr_rx_exit:
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)
 	/* Collect RSSI for connection */
 	if (rssi_ready) {
-		u8_t rssi = radio_rssi_get();
+		uint8_t rssi = radio_rssi_get();
 
 		lll->rssi_latest = rssi;
 
@@ -346,7 +346,7 @@ lll_conn_isr_rx_exit:
 void lll_conn_isr_tx(void *param)
 {
 	struct lll_conn *lll = (void *)param;
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	/* Clear radio status and events */
@@ -437,8 +437,8 @@ void lll_conn_isr_abort(void *param)
 void lll_conn_rx_pkt_set(struct lll_conn *lll)
 {
 	struct node_rx_pdu *node_rx;
-	u16_t max_rx_octets;
-	u8_t phy;
+	uint16_t max_rx_octets;
+	uint8_t phy;
 
 	node_rx = ull_pdu_rx_alloc_peek(1);
 	LL_ASSERT(node_rx);
@@ -474,8 +474,8 @@ void lll_conn_rx_pkt_set(struct lll_conn *lll)
 
 void lll_conn_tx_pkt_set(struct lll_conn *lll, struct pdu_data *pdu_data_tx)
 {
-	u16_t max_tx_octets;
-	u8_t phy, flags;
+	uint16_t max_tx_octets;
+	uint8_t phy, flags;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 	max_tx_octets = lll->max_tx_octets;
@@ -532,7 +532,7 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 	if (!link) {
 		p = empty_tx_enqueue(lll);
 	} else {
-		u16_t max_tx_octets;
+		uint16_t max_tx_octets;
 
 		p = (void *)(tx->pdu + lll->packet_tx_head_offset);
 
@@ -609,7 +609,7 @@ static void isr_done(void *param)
 		struct lll_conn *lll = param;
 
 		if (lll->role) {
-			u32_t preamble_to_addr_us;
+			uint32_t preamble_to_addr_us;
 
 #if defined(CONFIG_BT_CTLR_PHY)
 			preamble_to_addr_us =
@@ -654,7 +654,7 @@ static void isr_race(void *param)
 	radio_status_reset();
 }
 
-static inline bool ctrl_pdu_len_check(u8_t len)
+static inline bool ctrl_pdu_len_check(uint8_t len)
 {
 	return len <= (offsetof(struct pdu_data, llctrl) +
 		       sizeof(struct pdu_data_llctrl));
@@ -662,7 +662,7 @@ static inline bool ctrl_pdu_len_check(u8_t len)
 }
 
 static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
-		      struct node_tx **tx_release, u8_t *is_rx_enqueue)
+		      struct node_tx **tx_release, uint8_t *is_rx_enqueue)
 {
 	/* Ack for tx-ed data */
 	if (pdu_data_rx->nesn != lll->sn) {
@@ -691,8 +691,8 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 
 		if (link) {
 			struct pdu_data *pdu_data_tx;
-			u8_t pdu_data_tx_len;
-			u8_t offset;
+			uint8_t pdu_data_tx_len;
+			uint8_t offset;
 
 			pdu_data_tx = (void *)(tx->pdu +
 					       lll->packet_tx_head_offset);
@@ -742,7 +742,7 @@ static int isr_rx_pdu(struct lll_conn *lll, struct pdu_data *pdu_data_rx,
 			/* If required, wait for CCM to finish
 			 */
 			if (lll->enc_rx) {
-				u32_t done;
+				uint32_t done;
 
 				done = radio_ccm_is_done();
 				LL_ASSERT(done);
@@ -814,7 +814,7 @@ static struct pdu_data *empty_tx_enqueue(struct lll_conn *lll)
 	return p;
 }
 
-void lll_conn_flush(u16_t handle, struct lll_conn *lll)
+void lll_conn_flush(uint16_t handle, struct lll_conn *lll)
 {
 	/* Nothing to be flushed */
 }
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_internal.h b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_internal.h
index a56e59c989..0792316387 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_internal.h
@@ -10,8 +10,8 @@ bool lll_is_done(void *param);
 int lll_clk_on(void);
 int lll_clk_on_wait(void);
 int lll_clk_off(void);
-u32_t lll_evt_offset_get(struct evt_hdr *evt);
-u32_t lll_preempt_calc(struct evt_hdr *evt, u8_t ticker_id,
-		u32_t ticks_at_event);
-void lll_chan_set(u32_t chan);
-u8_t lll_entropy_get(u8_t len, void *rand);
+uint32_t lll_evt_offset_get(struct evt_hdr *evt);
+uint32_t lll_preempt_calc(struct evt_hdr *evt, uint8_t ticker_id,
+		uint32_t ticks_at_event);
+void lll_chan_set(uint32_t chan);
+uint8_t lll_entropy_get(uint8_t len, void *rand);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_master.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_master.c
index 162090b040..96376f6e00 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_master.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_master.c
@@ -63,7 +63,7 @@ void lll_master_prepare(void *param)
 {
 	struct lll_prepare_param *p = param;
 	struct lll_conn *lll = p->param;
-	u16_t elapsed;
+	uint16_t elapsed;
 	int err;
 
 	err = lll_clk_on();
@@ -89,13 +89,13 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_conn *lll = prepare_param->param;
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t ticks_at_event, ticks_at_start;
 	struct pdu_data *pdu_data_tx;
 	struct evt_hdr *evt;
-	u16_t event_counter;
-	u32_t remainder_us;
-	u8_t data_chan_use;
-	u32_t remainder;
+	uint16_t event_counter;
+	uint32_t remainder_us;
+	uint8_t data_chan_use;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_M(1);
 
@@ -142,9 +142,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	radio_tx_power_set(RADIO_TXP_DEFAULT);
 	radio_aa_set(lll->access_addr);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
-			    (((u32_t)lll->crc_init[2] << 16) |
-			     ((u32_t)lll->crc_init[1] << 8) |
-			     ((u32_t)lll->crc_init[0])));
+			    (((uint32_t)lll->crc_init[2] << 16) |
+			     ((uint32_t)lll->crc_init[1] << 8) |
+			     ((uint32_t)lll->crc_init[0])));
 	lll_chan_set(data_chan_use);
 
 	/* setup the radio tx packet buffer */
@@ -200,7 +200,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
index 70a808d91e..8c897c4670 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
@@ -16,13 +16,13 @@
 
 #include "lll.h"
 
-static u8_t latency_min = (u8_t) -1;
-static u8_t latency_max;
-static u8_t latency_prev;
-static u8_t cputime_min = (u8_t) -1;
-static u8_t cputime_max;
-static u8_t cputime_prev;
-static u32_t timestamp_latency;
+static uint8_t latency_min = (uint8_t) -1;
+static uint8_t latency_max;
+static uint8_t latency_prev;
+static uint8_t cputime_min = (uint8_t) -1;
+static uint8_t cputime_max;
+static uint8_t cputime_prev;
+static uint32_t timestamp_latency;
 
 void lll_prof_latency_capture(void)
 {
@@ -33,9 +33,9 @@ void lll_prof_latency_capture(void)
 }
 
 #if defined(CONFIG_BT_CTLR_GPIO_PA_PIN)
-static u32_t timestamp_radio_end;
+static uint32_t timestamp_radio_end;
 
-u32_t lll_prof_radio_end_backup(void)
+uint32_t lll_prof_radio_end_backup(void)
 {
 	/* PA enable is overwriting packet end used in ISR profiling, hence
 	 * back it up for later use.
@@ -59,8 +59,8 @@ void lll_prof_cputime_capture(void)
 
 void lll_prof_send(void)
 {
-	u8_t latency, cputime, prev;
-	u8_t chg = 0U;
+	uint8_t latency, cputime, prev;
+	uint8_t chg = 0U;
 
 	/* calculate the elapsed time in us since on-air radio packet end
 	 * to ISR entry
@@ -82,7 +82,7 @@ void lll_prof_send(void)
 	}
 
 	/* check for +/- 1us change */
-	prev = ((u16_t)latency_prev + latency) >> 1;
+	prev = ((uint16_t)latency_prev + latency) >> 1;
 	if (prev != latency_prev) {
 		latency_prev = latency;
 		chg = 1U;
@@ -103,7 +103,7 @@ void lll_prof_send(void)
 	}
 
 	/* check for +/- 1us change */
-	prev = ((u16_t)cputime_prev + cputime) >> 1;
+	prev = ((uint16_t)cputime_prev + cputime) >> 1;
 	if (prev != cputime_prev) {
 		cputime_prev = cputime;
 		chg = 1U;
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
index 23a86d9169..78001c9035 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
@@ -43,9 +43,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param);
 static int is_abort_cb(void *next, int prio, void *curr,
 		       lll_prepare_cb_t *resume_cb, int *resume_prio);
 static void abort_cb(struct lll_prepare_param *prepare_param, void *param);
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param);
-static void ticker_op_start_cb(u32_t status, void *param);
+static void ticker_op_start_cb(uint32_t status, void *param);
 static void isr_rx(void *param);
 static void isr_tx(void *param);
 static void isr_done(void *param);
@@ -54,24 +54,24 @@ static void isr_abort(void *param);
 static void isr_cleanup(void *param);
 static void isr_race(void *param);
 
-static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
-				     u8_t devmatch_ok, u8_t rl_idx);
-static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
-			       u8_t devmatch_id, u8_t irkmatch_ok,
-			       u8_t irkmatch_id, u8_t rl_idx, u8_t rssi_ready);
+static inline bool isr_rx_scan_check(struct lll_scan *lll, uint8_t irkmatch_ok,
+				     uint8_t devmatch_ok, uint8_t rl_idx);
+static inline uint32_t isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok,
+			       uint8_t devmatch_id, uint8_t irkmatch_ok,
+			       uint8_t irkmatch_id, uint8_t rl_idx, uint8_t rssi_ready);
 static inline bool isr_scan_init_check(struct lll_scan *lll,
-				       struct pdu_adv *pdu, u8_t rl_idx);
+				       struct pdu_adv *pdu, uint8_t rl_idx);
 static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
-					    struct pdu_adv *pdu, u8_t rl_idx);
+					    struct pdu_adv *pdu, uint8_t rl_idx);
 static inline bool isr_scan_tgta_check(struct lll_scan *lll, bool init,
-				       struct pdu_adv *pdu, u8_t rl_idx,
+				       struct pdu_adv *pdu, uint8_t rl_idx,
 				       bool *dir_report);
 static inline bool isr_scan_tgta_rpa_check(struct lll_scan *lll,
 					   struct pdu_adv *pdu,
 					   bool *dir_report);
 static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp);
-static u32_t isr_rx_scan_report(struct lll_scan *lll, u8_t rssi_ready,
-				u8_t rl_idx, bool dir_report);
+static uint32_t isr_rx_scan_report(struct lll_scan *lll, uint8_t rssi_ready,
+				uint8_t rl_idx, bool dir_report);
 
 
 int lll_scan_init(void)
@@ -118,12 +118,12 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_scan *lll = prepare_param->param;
-	u32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t aa = sys_cpu_to_le32(PDU_AC_ACCESS_ADDR);
+	uint32_t ticks_at_event, ticks_at_start;
 	struct node_rx_pdu *node_rx;
 	struct evt_hdr *evt;
-	u32_t remainder_us;
-	u32_t remainder;
+	uint32_t remainder_us;
+	uint32_t remainder;
 
 	DEBUG_RADIO_START_O(1);
 
@@ -159,7 +159,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	LL_ASSERT(node_rx);
 	radio_pkt_rx_set(node_rx->pdu);
 
-	radio_aa_set((u8_t *)&aa);
+	radio_aa_set((uint8_t *)&aa);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
 			    0x555555);
 
@@ -175,11 +175,11 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	if (ull_filter_lll_rl_enabled()) {
 		struct lll_filter *filter =
 			ull_filter_lll_get(!!(lll->filter_policy & 0x1));
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_filter_configure(filter->enable_bitmask,
 				       filter->addr_type_bitmask,
-				       (u8_t *)filter->bdaddr);
+				       (uint8_t *)filter->bdaddr);
 
 		radio_ar_configure(count, irks);
 	} else
@@ -192,7 +192,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 			radio_filter_configure(wl->enable_bitmask,
 					       wl->addr_type_bitmask,
-					       (u8_t *)wl->bdaddr);
+					       (uint8_t *)wl->bdaddr);
 		}
 
 	ticks_at_event = prepare_param->ticks_at_expire;
@@ -233,7 +233,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		if (lll->ticks_window) {
 			/* start window close timeout */
@@ -327,14 +327,14 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 	lll_done(param);
 }
 
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param)
 {
 	radio_isr_set(isr_cleanup, param);
 	radio_disable();
 }
 
-static void ticker_op_start_cb(u32_t status, void *param)
+static void ticker_op_start_cb(uint32_t status, void *param)
 {
 	ARG_UNUSED(param);
 
@@ -344,14 +344,14 @@ static void ticker_op_start_cb(u32_t status, void *param)
 static void isr_rx(void *param)
 {
 	struct lll_scan *lll = (void *)param;
-	u8_t trx_done;
-	u8_t crc_ok;
-	u8_t devmatch_ok;
-	u8_t devmatch_id;
-	u8_t irkmatch_ok;
-	u8_t irkmatch_id;
-	u8_t rssi_ready;
-	u8_t rl_idx;
+	uint8_t trx_done;
+	uint8_t crc_ok;
+	uint8_t devmatch_ok;
+	uint8_t devmatch_id;
+	uint8_t irkmatch_ok;
+	uint8_t irkmatch_id;
+	uint8_t rssi_ready;
+	uint8_t rl_idx;
 
 	if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {
 		lll_prof_latency_capture();
@@ -398,7 +398,7 @@ static void isr_rx(void *param)
 #endif
 	if (crc_ok && isr_rx_scan_check(lll, irkmatch_ok, devmatch_ok,
 					rl_idx)) {
-		u32_t err;
+		uint32_t err;
 
 		err = isr_rx_pdu(lll, devmatch_ok, devmatch_id, irkmatch_ok,
 				 irkmatch_id, rl_idx, rssi_ready);
@@ -419,7 +419,7 @@ isr_rx_do_close:
 static void isr_tx(void *param)
 {
 	struct node_rx_pdu *node_rx;
-	u32_t hcto;
+	uint32_t hcto;
 
 	/* TODO: MOVE to a common interface, isr_lll_radio_status? */
 	/* Clear radio status and events */
@@ -445,7 +445,7 @@ static void isr_tx(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -499,7 +499,7 @@ static void isr_common_done(void *param)
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	if (ull_filter_lll_rl_enabled()) {
-		u8_t count, *irks = ull_filter_lll_irks_get(&count);
+		uint8_t count, *irks = ull_filter_lll_irks_get(&count);
 
 		radio_ar_configure(count, irks);
 	}
@@ -512,7 +512,7 @@ static void isr_common_done(void *param)
 
 static void isr_done(void *param)
 {
-	u32_t start_us;
+	uint32_t start_us;
 
 	isr_common_done(param);
 
@@ -537,7 +537,7 @@ static void isr_done(void *param)
 
 static void isr_window(void *param)
 {
-	u32_t ticks_at_start, remainder_us;
+	uint32_t ticks_at_start, remainder_us;
 
 	isr_common_done(param);
 
@@ -640,8 +640,8 @@ static void isr_race(void *param)
 	radio_status_reset();
 }
 
-static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
-				     u8_t devmatch_ok, u8_t rl_idx)
+static inline bool isr_rx_scan_check(struct lll_scan *lll, uint8_t irkmatch_ok,
+				     uint8_t devmatch_ok, uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	return (((lll->filter_policy & 0x01) == 0) &&
@@ -655,9 +655,9 @@ static inline bool isr_rx_scan_check(struct lll_scan *lll, u8_t irkmatch_ok,
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 }
 
-static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
-			       u8_t devmatch_id, u8_t irkmatch_ok,
-			       u8_t irkmatch_id, u8_t rl_idx, u8_t rssi_ready)
+static inline uint32_t isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok,
+			       uint8_t devmatch_id, uint8_t irkmatch_ok,
+			       uint8_t irkmatch_id, uint8_t rl_idx, uint8_t rssi_ready)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv_rx;
@@ -677,11 +677,11 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		struct node_rx_ftr *ftr;
 		struct node_rx_pdu *rx;
 		struct pdu_adv *pdu_tx;
-		u32_t conn_interval_us;
-		u32_t conn_offset_us;
-		u32_t conn_space_us;
+		uint32_t conn_interval_us;
+		uint32_t conn_offset_us;
+		uint32_t conn_space_us;
 		struct evt_hdr *evt;
-		u32_t pdu_end_us;
+		uint32_t pdu_end_us;
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 		bt_addr_t *lrpa;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
@@ -699,7 +699,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 
 		pdu_end_us = radio_tmr_end_get();
 		if (!lll->ticks_window) {
-			u32_t scan_interval_us;
+			uint32_t scan_interval_us;
 
 			/* FIXME: is this correct for continuous scanning? */
 			scan_interval_us = lll->interval * 625U;
@@ -751,7 +751,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		       &lll_conn->crc_init[0], 3);
 		pdu_tx->connect_ind.win_size = 1;
 
-		conn_interval_us = (u32_t)lll_conn->interval * 1250U;
+		conn_interval_us = (uint32_t)lll_conn->interval * 1250U;
 		conn_offset_us = radio_tmr_end_get() + 502 + 1250;
 
 		if (!IS_ENABLED(CONFIG_BT_CTLR_SCHED_ADVANCED) ||
@@ -760,7 +760,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 			pdu_tx->connect_ind.win_offset = sys_cpu_to_le16(0);
 		} else {
 			conn_space_us = lll->conn_win_offset_us;
-			while ((conn_space_us & ((u32_t)1 << 31)) ||
+			while ((conn_space_us & ((uint32_t)1 << 31)) ||
 			       (conn_space_us < conn_offset_us)) {
 				conn_space_us += conn_interval_us;
 			}
@@ -830,7 +830,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		rx->hdr.type = NODE_RX_TYPE_CONNECTION;
 		rx->hdr.handle = 0xffff;
 
-		u8_t pdu_adv_rx_chan_sel = pdu_adv_rx->chan_sel;
+		uint8_t pdu_adv_rx_chan_sel = pdu_adv_rx->chan_sel;
 
 		memcpy(rx->pdu, pdu_tx, (offsetof(struct pdu_adv, connect_ind) +
 					  sizeof(struct pdu_adv_connect_ind)));
@@ -878,7 +878,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 		bt_addr_t *lrpa;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
-		u32_t err;
+		uint32_t err;
 
 		/* setup tIFS switching */
 		radio_tmr_tifs_set(EVENT_IFS_US);
@@ -973,7 +973,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 #else /* !CONFIG_BT_CENTRAL */
 		   1) {
 #endif /* !CONFIG_BT_CENTRAL */
-		u32_t err;
+		uint32_t err;
 
 		/* save the scan response packet */
 		err = isr_rx_scan_report(lll, rssi_ready,
@@ -994,7 +994,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 }
 
 static inline bool isr_scan_init_check(struct lll_scan *lll,
-				       struct pdu_adv *pdu, u8_t rl_idx)
+				       struct pdu_adv *pdu, uint8_t rl_idx)
 {
 	return ((((lll->filter_policy & 0x01) != 0U) ||
 		 isr_scan_init_adva_check(lll, pdu, rl_idx)) &&
@@ -1007,7 +1007,7 @@ static inline bool isr_scan_init_check(struct lll_scan *lll,
 }
 
 static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
-					    struct pdu_adv *pdu, u8_t rl_idx)
+					    struct pdu_adv *pdu, uint8_t rl_idx)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
 	/* Only applies to initiator with no whitelist */
@@ -1020,7 +1020,7 @@ static inline bool isr_scan_init_adva_check(struct lll_scan *lll,
 }
 
 static inline bool isr_scan_tgta_check(struct lll_scan *lll, bool init,
-				       struct pdu_adv *pdu, u8_t rl_idx,
+				       struct pdu_adv *pdu, uint8_t rl_idx,
 				       bool *dir_report)
 {
 #if defined(CONFIG_BT_CTLR_PRIVACY)
@@ -1072,8 +1072,8 @@ static inline bool isr_scan_rsp_adva_matches(struct pdu_adv *srsp)
 			&srsp->scan_rsp.addr[0], BDADDR_SIZE) == 0));
 }
 
-static u32_t isr_rx_scan_report(struct lll_scan *lll, u8_t rssi_ready,
-				u8_t rl_idx, bool dir_report)
+static uint32_t isr_rx_scan_report(struct lll_scan *lll, uint8_t rssi_ready,
+				uint8_t rl_idx, bool dir_report)
 {
 	struct node_rx_pdu *node_rx;
 	struct pdu_adv *pdu_adv_rx;
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.h b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.h
index aac68ec15d..51856571c2 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.h
@@ -10,33 +10,33 @@ struct lll_scan {
 #if defined(CONFIG_BT_CENTRAL)
 	/* NOTE: conn context has to be after lll_hdr */
 	struct lll_conn *conn;
-	u32_t conn_ticks_slot;
-	u32_t conn_win_offset_us;
-	u16_t conn_timeout;
+	uint32_t conn_ticks_slot;
+	uint32_t conn_win_offset_us;
+	uint16_t conn_timeout;
 #endif /* CONFIG_BT_CENTRAL */
 
-	u8_t  state:1;
-	u8_t  chan:2;
-	u8_t  filter_policy:2;
-	u8_t  adv_addr_type:1;
-	u8_t  init_addr_type:1;
-	u8_t  type:1;
+	uint8_t  state:1;
+	uint8_t  chan:2;
+	uint8_t  filter_policy:2;
+	uint8_t  adv_addr_type:1;
+	uint8_t  init_addr_type:1;
+	uint8_t  type:1;
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	u8_t  phy:3;
+	uint8_t  phy:3;
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  rpa_gen:1;
+	uint8_t  rpa_gen:1;
 	/* initiator only */
-	u8_t rl_idx;
+	uint8_t rl_idx;
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 
-	u8_t  init_addr[BDADDR_SIZE];
-	u8_t  adv_addr[BDADDR_SIZE];
+	uint8_t  init_addr[BDADDR_SIZE];
+	uint8_t  adv_addr[BDADDR_SIZE];
 
-	u16_t interval;
-	u32_t ticks_window;
+	uint16_t interval;
+	uint32_t ticks_window;
 };
 
 int lll_scan_init(void);
@@ -44,4 +44,4 @@ int lll_scan_reset(void);
 
 void lll_scan_prepare(void *param);
 
-extern u16_t ull_scan_lll_handle_get(struct lll_scan *lll);
+extern uint16_t ull_scan_lll_handle_get(struct lll_scan *lll);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_slave.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_slave.c
index 9e99ce949b..d447a8cb8d 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_slave.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_slave.c
@@ -63,7 +63,7 @@ void lll_slave_prepare(void *param)
 {
 	struct lll_prepare_param *p = param;
 	struct lll_conn *lll = p->param;
-	u16_t elapsed;
+	uint16_t elapsed;
 	int err;
 
 	err = lll_clk_on();
@@ -98,13 +98,13 @@ static int init_reset(void)
 static int prepare_cb(struct lll_prepare_param *prepare_param)
 {
 	struct lll_conn *lll = prepare_param->param;
-	u32_t ticks_at_event, ticks_at_start;
+	uint32_t ticks_at_event, ticks_at_start;
 	struct evt_hdr *evt;
-	u16_t event_counter;
-	u32_t remainder_us;
-	u8_t data_chan_use;
-	u32_t remainder;
-	u32_t hcto;
+	uint16_t event_counter;
+	uint32_t remainder_us;
+	uint8_t data_chan_use;
+	uint32_t remainder;
+	uint32_t hcto;
 
 	DEBUG_RADIO_START_S(1);
 
@@ -164,9 +164,9 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 
 	radio_aa_set(lll->access_addr);
 	radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
-			    (((u32_t)lll->crc_init[2] << 16) |
-			     ((u32_t)lll->crc_init[1] << 8) |
-			     ((u32_t)lll->crc_init[0])));
+			    (((uint32_t)lll->crc_init[2] << 16) |
+			     ((uint32_t)lll->crc_init[1] << 8) |
+			     ((uint32_t)lll->crc_init[0])));
 
 	lll_chan_set(data_chan_use);
 
@@ -243,7 +243,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	} else
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 	{
-		u32_t ret;
+		uint32_t ret;
 
 		ret = lll_prepare_done(lll);
 		LL_ASSERT(!ret);
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
index 4a17e491d9..a3038d186f 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
@@ -29,10 +29,10 @@
 
 #define CNTR_MIN_DELTA 3
 
-static const u32_t test_sync_word = 0x71764129;
-static u8_t        test_phy;
-static u8_t        test_phy_flags;
-static u16_t       test_num_rx;
+static const uint32_t test_sync_word = 0x71764129;
+static uint8_t        test_phy;
+static uint8_t        test_phy_flags;
+static uint16_t       test_num_rx;
 static bool        started;
 
 /* NOTE: The PRBS9 sequence used as packet payload.
@@ -41,7 +41,7 @@ static bool        started;
  * is done to transmit MSbit first on air.
  */
 
-static const u8_t prbs9[] = {
+static const uint8_t prbs9[] = {
 	0xFF, 0xC1, 0xFB, 0xE8, 0x4C, 0x90, 0x72, 0x8B,
 	0xE7, 0xB3, 0x51, 0x89, 0x63, 0xAB, 0x23, 0x23,
 	0x02, 0x84, 0x18, 0x72, 0xAA, 0x61, 0x2F, 0x3B,
@@ -76,14 +76,14 @@ static const u8_t prbs9[] = {
 	0x8A, 0x84, 0x39, 0xF4, 0x36, 0x0B, 0xF7};
 
 /* TODO: fill correct prbs15 */
-static const u8_t prbs15[255] = { 0x00, };
+static const uint8_t prbs15[255] = { 0x00, };
 
-static u8_t tx_req;
-static u8_t volatile tx_ack;
+static uint8_t tx_req;
+static uint8_t volatile tx_ack;
 
 static void isr_tx(void *param)
 {
-	u32_t l, i, s, t;
+	uint32_t l, i, s, t;
 
 	/* Clear radio status and events */
 	radio_status_reset();
@@ -131,8 +131,8 @@ static void isr_tx(void *param)
 
 static void isr_rx(void *param)
 {
-	u8_t crc_ok = 0U;
-	u8_t trx_done;
+	uint8_t crc_ok = 0U;
+	uint8_t trx_done;
 
 	/* Read radio status and events */
 	trx_done = radio_is_done();
@@ -158,7 +158,7 @@ static void isr_rx(void *param)
 	}
 }
 
-static u32_t init(u8_t chan, u8_t phy, void (*isr)(void *))
+static uint32_t init(uint8_t chan, uint8_t phy, void (*isr)(void *))
 {
 	int err;
 
@@ -191,19 +191,19 @@ static u32_t init(u8_t chan, u8_t phy, void (*isr)(void *))
 	radio_tmr_tifs_set(150);
 	radio_tx_power_max_set();
 	radio_freq_chan_set((chan << 1) + 2);
-	radio_aa_set((u8_t *)&test_sync_word);
+	radio_aa_set((uint8_t *)&test_sync_word);
 	radio_crc_configure(0x65b, 0x555555);
 	radio_pkt_configure(8, 255, (test_phy << 1));
 
 	return 0;
 }
 
-u32_t ll_test_tx(u8_t chan, u8_t len, u8_t type, u8_t phy)
+uint32_t ll_test_tx(uint8_t chan, uint8_t len, uint8_t type, uint8_t phy)
 {
-	u32_t start_us;
-	u8_t *payload;
-	u8_t *pdu;
-	u32_t err;
+	uint32_t start_us;
+	uint8_t *payload;
+	uint8_t *pdu;
+	uint32_t err;
 
 	if ((type > 0x07) || !phy || (phy > 0x04)) {
 		return 1;
@@ -277,9 +277,9 @@ u32_t ll_test_tx(u8_t chan, u8_t len, u8_t type, u8_t phy)
 	return 0;
 }
 
-u32_t ll_test_rx(u8_t chan, u8_t phy, u8_t mod_idx)
+uint32_t ll_test_rx(uint8_t chan, uint8_t phy, uint8_t mod_idx)
 {
-	u32_t err;
+	uint32_t err;
 
 	if (!phy || (phy > 0x03)) {
 		return 1;
@@ -303,10 +303,10 @@ u32_t ll_test_rx(u8_t chan, u8_t phy, u8_t mod_idx)
 	return 0;
 }
 
-u32_t ll_test_end(u16_t *num_rx)
+uint32_t ll_test_end(uint16_t *num_rx)
 {
 	int err;
-	u8_t ack;
+	uint8_t ack;
 
 	if (!started) {
 		return 1;
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_tim_internal.h b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_tim_internal.h
index f87f767140..eb1858ca1b 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_tim_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_tim_internal.h
@@ -12,7 +12,7 @@
 #define RANGE_DISTANCE 1000 /* meters */
 #define RANGE_DELAY_US (2 * RANGE_DISTANCE * 4 / 1000)
 
-static inline u32_t addr_us_get(u8_t phy)
+static inline uint32_t addr_us_get(uint8_t phy)
 {
 	switch (phy) {
 	default:
diff --git a/subsys/bluetooth/controller/ll_sw/pdu.h b/subsys/bluetooth/controller/ll_sw/pdu.h
index 64899fa98c..52b8e73c82 100644
--- a/subsys/bluetooth/controller/ll_sw/pdu.h
+++ b/subsys/bluetooth/controller/ll_sw/pdu.h
@@ -78,43 +78,43 @@
 			   PDU_AC_SIZE_MESH)
 
 struct pdu_adv_adv_ind {
-	u8_t addr[BDADDR_SIZE];
-	u8_t data[31];
+	uint8_t addr[BDADDR_SIZE];
+	uint8_t data[31];
 } __packed;
 
 struct pdu_adv_direct_ind {
-	u8_t adv_addr[BDADDR_SIZE];
-	u8_t tgt_addr[BDADDR_SIZE];
+	uint8_t adv_addr[BDADDR_SIZE];
+	uint8_t tgt_addr[BDADDR_SIZE];
 } __packed;
 
 struct pdu_adv_scan_rsp {
-	u8_t addr[BDADDR_SIZE];
-	u8_t data[31];
+	uint8_t addr[BDADDR_SIZE];
+	uint8_t data[31];
 } __packed;
 
 struct pdu_adv_scan_req {
-	u8_t scan_addr[BDADDR_SIZE];
-	u8_t adv_addr[BDADDR_SIZE];
+	uint8_t scan_addr[BDADDR_SIZE];
+	uint8_t adv_addr[BDADDR_SIZE];
 } __packed;
 
 struct pdu_adv_connect_ind {
-	u8_t init_addr[BDADDR_SIZE];
-	u8_t adv_addr[BDADDR_SIZE];
+	uint8_t init_addr[BDADDR_SIZE];
+	uint8_t adv_addr[BDADDR_SIZE];
 	struct {
-		u8_t  access_addr[4];
-		u8_t  crc_init[3];
-		u8_t  win_size;
-		u16_t win_offset;
-		u16_t interval;
-		u16_t latency;
-		u16_t timeout;
-		u8_t  chan_map[5];
+		uint8_t  access_addr[4];
+		uint8_t  crc_init[3];
+		uint8_t  win_size;
+		uint16_t win_offset;
+		uint16_t interval;
+		uint16_t latency;
+		uint16_t timeout;
+		uint8_t  chan_map[5];
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-		u8_t  hop:5;
-		u8_t  sca:3;
+		uint8_t  hop:5;
+		uint8_t  sca:3;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-		u8_t  sca:3;
-		u8_t  hop:5;
+		uint8_t  sca:3;
+		uint8_t  hop:5;
 #else
 #error "Unsupported endianness"
 #endif
@@ -125,15 +125,15 @@ struct pdu_adv_connect_ind {
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 struct pdu_adv_com_ext_adv {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t ext_hdr_len:6;
-	u8_t adv_mode:2;
+	uint8_t ext_hdr_len:6;
+	uint8_t adv_mode:2;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t adv_mode:2;
-	u8_t ext_hdr_len:6;
+	uint8_t adv_mode:2;
+	uint8_t ext_hdr_len:6;
 #else
 #error "Unsupported endianness"
 #endif
-	u8_t ext_hdr_adi_adv_data[254];
+	uint8_t ext_hdr_adi_adv_data[254];
 } __packed;
 
 enum ext_adv_mode {
@@ -144,23 +144,23 @@ enum ext_adv_mode {
 
 struct ext_adv_hdr {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t adv_addr:1;
-	u8_t tgt_addr:1;
-	u8_t rfu0:1;
-	u8_t adi:1;
-	u8_t aux_ptr:1;
-	u8_t sync_info:1;
-	u8_t tx_pwr:1;
-	u8_t rfu1:1;
+	uint8_t adv_addr:1;
+	uint8_t tgt_addr:1;
+	uint8_t rfu0:1;
+	uint8_t adi:1;
+	uint8_t aux_ptr:1;
+	uint8_t sync_info:1;
+	uint8_t tx_pwr:1;
+	uint8_t rfu1:1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t rfu1:1;
-	u8_t tx_pwr:1;
-	u8_t sync_info:1;
-	u8_t aux_ptr:1;
-	u8_t adi:1;
-	u8_t rfu0:1;
-	u8_t tgt_addr:1;
-	u8_t adv_addr:1;
+	uint8_t rfu1:1;
+	uint8_t tx_pwr:1;
+	uint8_t sync_info:1;
+	uint8_t aux_ptr:1;
+	uint8_t adi:1;
+	uint8_t rfu0:1;
+	uint8_t tgt_addr:1;
+	uint8_t adv_addr:1;
 #else
 #error "Unsupported endianness"
 #endif
@@ -168,11 +168,11 @@ struct ext_adv_hdr {
 
 struct ext_adv_adi {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u16_t did:12;
-	u16_t sid:4;
+	uint16_t did:12;
+	uint16_t sid:4;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u16_t sid:4;
-	u16_t did:12;
+	uint16_t sid:4;
+	uint16_t did:12;
 #else
 #error "Unsupported endianness"
 #endif
@@ -180,17 +180,17 @@ struct ext_adv_adi {
 
 struct ext_adv_aux_ptr {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t  chan_idx:6;
-	u8_t  ca:1;
-	u8_t  offs_units:1;
-	u16_t offs:13;
-	u16_t phy:3;
+	uint8_t  chan_idx:6;
+	uint8_t  ca:1;
+	uint8_t  offs_units:1;
+	uint16_t offs:13;
+	uint16_t phy:3;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t  offs_units:1;
-	u8_t  ca:1;
-	u8_t  chan_idx:6;
-	u16_t phy:3;
-	u16_t offs:13;
+	uint8_t  offs_units:1;
+	uint8_t  ca:1;
+	uint8_t  chan_idx:6;
+	uint16_t phy:3;
+	uint16_t offs:13;
 #else
 #error "Unsupported endianness"
 #endif
@@ -214,21 +214,21 @@ enum ext_adv_aux_phy {
 
 struct ext_adv_sync_info {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u16_t sync_pkt_offs:13;
-	u16_t offs_units:1;
-	u16_t rfu:2;
+	uint16_t sync_pkt_offs:13;
+	uint16_t offs_units:1;
+	uint16_t rfu:2;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u16_t rfu:2;
-	u16_t offs_units:1;
-	u16_t sync_pkt_offs:13;
+	uint16_t rfu:2;
+	uint16_t offs_units:1;
+	uint16_t sync_pkt_offs:13;
 #else
 #error "Unsupported endianness"
 #endif
-	u16_t interval;
-	u8_t  sca_chm[5];
-	u32_t aa;
-	u8_t  crc_init[3];
-	u16_t evt_cntr;
+	uint16_t interval;
+	uint8_t  sca_chm[5];
+	uint32_t aa;
+	uint8_t  crc_init[3];
+	uint16_t evt_cntr;
 } __packed;
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
 
@@ -252,25 +252,25 @@ enum pdu_adv_type {
 
 struct pdu_adv {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t type:4;
-	u8_t rfu:1;
-	u8_t chan_sel:1;
-	u8_t tx_addr:1;
-	u8_t rx_addr:1;
+	uint8_t type:4;
+	uint8_t rfu:1;
+	uint8_t chan_sel:1;
+	uint8_t tx_addr:1;
+	uint8_t rx_addr:1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t rx_addr:1;
-	u8_t tx_addr:1;
-	u8_t chan_sel:1;
-	u8_t rfu:1;
-	u8_t type:4;
+	uint8_t rx_addr:1;
+	uint8_t tx_addr:1;
+	uint8_t chan_sel:1;
+	uint8_t rfu:1;
+	uint8_t type:4;
 #else
 #error "Unsupported endianness"
 #endif
 
-	u8_t len;
+	uint8_t len;
 
 	union {
-		u8_t   payload[0];
+		uint8_t   payload[0];
 		struct pdu_adv_adv_ind adv_ind;
 		struct pdu_adv_direct_ind direct_ind;
 		struct pdu_adv_scan_req scan_req;
@@ -320,33 +320,33 @@ enum pdu_data_llctrl_type {
 };
 
 struct pdu_data_llctrl_conn_update_ind {
-	u8_t  win_size;
-	u16_t win_offset;
-	u16_t interval;
-	u16_t latency;
-	u16_t timeout;
-	u16_t instant;
+	uint8_t  win_size;
+	uint16_t win_offset;
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
+	uint16_t instant;
 } __packed;
 
 struct pdu_data_llctrl_chan_map_ind {
-	u8_t  chm[5];
-	u16_t instant;
+	uint8_t  chm[5];
+	uint16_t instant;
 } __packed;
 
 struct pdu_data_llctrl_terminate_ind {
-	u8_t error_code;
+	uint8_t error_code;
 } __packed;
 
 struct pdu_data_llctrl_enc_req {
-	u8_t rand[8];
-	u8_t ediv[2];
-	u8_t skdm[8];
-	u8_t ivm[4];
+	uint8_t rand[8];
+	uint8_t ediv[2];
+	uint8_t skdm[8];
+	uint8_t ivm[4];
 } __packed;
 
 struct pdu_data_llctrl_enc_rsp {
-	u8_t skds[8];
-	u8_t ivs[4];
+	uint8_t skds[8];
+	uint8_t ivs[4];
 } __packed;
 
 struct pdu_data_llctrl_start_enc_req {
@@ -358,15 +358,15 @@ struct pdu_data_llctrl_start_enc_rsp {
 } __packed;
 
 struct pdu_data_llctrl_unknown_rsp {
-	u8_t type;
+	uint8_t type;
 } __packed;
 
 struct pdu_data_llctrl_feature_req {
-	u8_t features[8];
+	uint8_t features[8];
 } __packed;
 
 struct pdu_data_llctrl_feature_rsp {
-	u8_t features[8];
+	uint8_t features[8];
 } __packed;
 
 struct pdu_data_llctrl_pause_enc_req {
@@ -378,52 +378,52 @@ struct pdu_data_llctrl_pause_enc_rsp {
 } __packed;
 
 struct pdu_data_llctrl_version_ind {
-	u8_t  version_number;
-	u16_t company_id;
-	u16_t sub_version_number;
+	uint8_t  version_number;
+	uint16_t company_id;
+	uint16_t sub_version_number;
 } __packed;
 
 struct pdu_data_llctrl_reject_ind {
-	u8_t error_code;
+	uint8_t error_code;
 } __packed;
 
 struct pdu_data_llctrl_slave_feature_req {
-	u8_t features[8];
+	uint8_t features[8];
 } __packed;
 
 struct pdu_data_llctrl_conn_param_req {
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
-	u8_t  preferred_periodicity;
-	u16_t reference_conn_event_count;
-	u16_t offset0;
-	u16_t offset1;
-	u16_t offset2;
-	u16_t offset3;
-	u16_t offset4;
-	u16_t offset5;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
+	uint8_t  preferred_periodicity;
+	uint16_t reference_conn_event_count;
+	uint16_t offset0;
+	uint16_t offset1;
+	uint16_t offset2;
+	uint16_t offset3;
+	uint16_t offset4;
+	uint16_t offset5;
 } __packed;
 
 struct pdu_data_llctrl_conn_param_rsp {
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
-	u8_t  preferred_periodicity;
-	u16_t reference_conn_event_count;
-	u16_t offset0;
-	u16_t offset1;
-	u16_t offset2;
-	u16_t offset3;
-	u16_t offset4;
-	u16_t offset5;
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
+	uint8_t  preferred_periodicity;
+	uint16_t reference_conn_event_count;
+	uint16_t offset0;
+	uint16_t offset1;
+	uint16_t offset2;
+	uint16_t offset3;
+	uint16_t offset4;
+	uint16_t offset5;
 } __packed;
 
 struct pdu_data_llctrl_reject_ext_ind {
-	u8_t reject_opcode;
-	u8_t error_code;
+	uint8_t reject_opcode;
+	uint8_t error_code;
 } __packed;
 
 struct pdu_data_llctrl_ping_req {
@@ -435,42 +435,42 @@ struct pdu_data_llctrl_ping_rsp {
 } __packed;
 
 struct pdu_data_llctrl_length_req {
-	u16_t max_rx_octets;
-	u16_t max_rx_time;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
+	uint16_t max_rx_octets;
+	uint16_t max_rx_time;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
 } __packed;
 
 struct pdu_data_llctrl_length_rsp {
-	u16_t max_rx_octets;
-	u16_t max_rx_time;
-	u16_t max_tx_octets;
-	u16_t max_tx_time;
+	uint16_t max_rx_octets;
+	uint16_t max_rx_time;
+	uint16_t max_tx_octets;
+	uint16_t max_tx_time;
 } __packed;
 
 struct pdu_data_llctrl_phy_req {
-	u8_t tx_phys;
-	u8_t rx_phys;
+	uint8_t tx_phys;
+	uint8_t rx_phys;
 } __packed;
 
 struct pdu_data_llctrl_phy_rsp {
-	u8_t tx_phys;
-	u8_t rx_phys;
+	uint8_t tx_phys;
+	uint8_t rx_phys;
 } __packed;
 
 struct pdu_data_llctrl_phy_upd_ind {
-	u8_t  m_to_s_phy;
-	u8_t  s_to_m_phy;
-	u16_t instant;
+	uint8_t  m_to_s_phy;
+	uint8_t  s_to_m_phy;
+	uint16_t instant;
 } __packed;
 
 struct pdu_data_llctrl_min_used_chans_ind {
-	u8_t phys;
-	u8_t min_used_chans;
+	uint8_t phys;
+	uint8_t min_used_chans;
 } __packed;
 
 struct pdu_data_llctrl {
-	u8_t opcode;
+	uint8_t opcode;
 	union {
 		struct pdu_data_llctrl_conn_update_ind conn_update_ind;
 		struct pdu_data_llctrl_chan_map_ind chan_map_ind;
@@ -503,46 +503,46 @@ struct pdu_data_llctrl {
 
 #if defined(CONFIG_BT_CTLR_PROFILE_ISR)
 struct profile {
-	u8_t lcur;
-	u8_t lmin;
-	u8_t lmax;
-	u8_t cur;
-	u8_t min;
-	u8_t max;
+	uint8_t lcur;
+	uint8_t lmin;
+	uint8_t lmax;
+	uint8_t cur;
+	uint8_t min;
+	uint8_t max;
 } __packed;
 #endif /* CONFIG_BT_CTLR_PROFILE_ISR */
 
 struct pdu_data {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t ll_id:2;
-	u8_t nesn:1;
-	u8_t sn:1;
-	u8_t md:1;
-	u8_t rfu:3;
+	uint8_t ll_id:2;
+	uint8_t nesn:1;
+	uint8_t sn:1;
+	uint8_t md:1;
+	uint8_t rfu:3;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t rfu:3;
-	u8_t md:1;
-	u8_t sn:1;
-	u8_t nesn:1;
-	u8_t ll_id:2;
+	uint8_t rfu:3;
+	uint8_t md:1;
+	uint8_t sn:1;
+	uint8_t nesn:1;
+	uint8_t ll_id:2;
 #else
 #error "Unsupported endianness"
 #endif
 
-	u8_t len;
+	uint8_t len;
 
 #if !defined(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
 #if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
-	u8_t resv:8; /* TODO: remove nRF specific code */
+	uint8_t resv:8; /* TODO: remove nRF specific code */
 #endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
 #endif /* !CONFIG_SOC_OPENISA_RV32M1_RISCV32 */
 
 	union {
 		struct pdu_data_llctrl llctrl;
-		u8_t                   lldata[0];
+		uint8_t                   lldata[0];
 
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)
-		u8_t                   rssi;
+		uint8_t                   rssi;
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
 #if defined(CONFIG_BT_CTLR_PROFILE_ISR)
diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c
index 50ebd4db57..3ffe0e6db4 100644
--- a/subsys/bluetooth/controller/ll_sw/ull.c
+++ b/subsys/bluetooth/controller/ll_sw/ull.c
@@ -119,13 +119,13 @@
 				   FLASH_TICKER_USER_APP_OPS)
 
 /* Memory for ticker nodes/instances */
-static u8_t MALIGN(4) ticker_nodes[TICKER_NODES][TICKER_NODE_T_SIZE];
+static uint8_t MALIGN(4) ticker_nodes[TICKER_NODES][TICKER_NODE_T_SIZE];
 
 /* Memory for users/contexts operating on ticker module */
-static u8_t MALIGN(4) ticker_users[MAYFLY_CALLER_COUNT][TICKER_USER_T_SIZE];
+static uint8_t MALIGN(4) ticker_users[MAYFLY_CALLER_COUNT][TICKER_USER_T_SIZE];
 
 /* Memory for user/context simultaneous API operations */
-static u8_t MALIGN(4) ticker_user_ops[TICKER_USER_OPS][TICKER_USER_OP_T_SIZE];
+static uint8_t MALIGN(4) ticker_user_ops[TICKER_USER_OPS][TICKER_USER_OP_T_SIZE];
 
 /* Semaphire to wakeup thread on ticker API callback */
 static struct k_sem sem_ticker_api_cb;
@@ -147,12 +147,12 @@ static MFIFO_DEFINE(done, sizeof(struct node_rx_event_done *), EVENT_DONE_MAX);
 /* Backing storage for elements in mfifo_done */
 static struct {
 	void *free;
-	u8_t pool[sizeof(struct node_rx_event_done) * EVENT_DONE_MAX];
+	uint8_t pool[sizeof(struct node_rx_event_done) * EVENT_DONE_MAX];
 } mem_done;
 
 static struct {
 	void *free;
-	u8_t pool[sizeof(memq_link_t) * EVENT_DONE_MAX];
+	uint8_t pool[sizeof(memq_link_t) * EVENT_DONE_MAX];
 } mem_link_done;
 
 #if defined(CONFIG_BT_CTLR_PHY) && defined(CONFIG_BT_CTLR_DATA_LENGTH)
@@ -206,16 +206,16 @@ static MFIFO_DEFINE(pdu_rx_free, sizeof(void *), PDU_RX_CNT);
 
 static struct {
 	void *free;
-	u8_t pool[PDU_RX_POOL_SIZE];
+	uint8_t pool[PDU_RX_POOL_SIZE];
 } mem_pdu_rx;
 
 #define LINK_RX_POOL_SIZE (sizeof(memq_link_t) * (RX_CNT + 2 + \
 						  BT_CTLR_MAX_CONN))
 static struct {
-	u8_t quota_pdu; /* Number of un-utilized buffers */
+	uint8_t quota_pdu; /* Number of un-utilized buffers */
 
 	void *free;
-	u8_t pool[LINK_RX_POOL_SIZE];
+	uint8_t pool[LINK_RX_POOL_SIZE];
 } mem_link_rx;
 
 static MEMQ_DECLARE(ull_rx);
@@ -237,7 +237,7 @@ static inline void *mark_set(void **m, void *param);
 static inline void *mark_unset(void **m, void *param);
 static inline void *mark_get(void *m);
 static inline void done_alloc(void);
-static inline void rx_alloc(u8_t max);
+static inline void rx_alloc(uint8_t max);
 static void rx_demux(void *param);
 static inline int rx_demux_rx(memq_link_t *link, struct node_rx_hdr *rx);
 static inline void rx_demux_event_done(memq_link_t *link,
@@ -246,7 +246,7 @@ static inline void ll_rx_link_inc_quota(int8_t delta);
 static void disabled_cb(void *param);
 
 #if defined(CONFIG_BT_CONN)
-static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last);
+static uint8_t tx_cmplt_get(uint16_t *handle, uint8_t *first, uint8_t last);
 #endif /* CONFIG_BT_CONN */
 
 int ll_init(struct k_sem *sem_rx)
@@ -417,7 +417,7 @@ void ll_reset(void)
 		static memq_link_t link;
 		static struct mayfly mfy = {0, 0, &link, NULL,
 					    perform_lll_reset};
-		u32_t retval;
+		uint32_t retval;
 
 		/* NOTE: If Zero Latency Interrupt is used, then LLL context
 		 *       will be the highest priority IRQ in the system, hence
@@ -460,11 +460,11 @@ void ll_reset(void)
  * @param handle[out]    Connection handle
  * @return TX completed
  */
-u8_t ll_rx_get(void **node_rx, u16_t *handle)
+uint8_t ll_rx_get(void **node_rx, uint16_t *handle)
 {
 	struct node_rx_hdr *rx;
 	memq_link_t *link;
-	u8_t cmplt = 0U;
+	uint8_t cmplt = 0U;
 
 #if defined(CONFIG_BT_CONN)
 ll_rx_get_again:
@@ -477,8 +477,8 @@ ll_rx_get_again:
 #if defined(CONFIG_BT_CONN)
 		cmplt = tx_cmplt_get(handle, &mfifo_tx_ack.f, rx->ack_last);
 		if (!cmplt) {
-			u8_t f, cmplt_prev, cmplt_curr;
-			u16_t h;
+			uint8_t f, cmplt_prev, cmplt_curr;
+			uint16_t h;
 
 			cmplt_curr = 0U;
 			f = mfifo_tx_ack.f;
@@ -593,7 +593,7 @@ void ll_rx_dequeue(void)
 		}
 
 		if (IS_ENABLED(CONFIG_BT_CTLR_PRIVACY)) {
-			u8_t bm;
+			uint8_t bm;
 
 			bm = (IS_ENABLED(CONFIG_BT_OBSERVER) &&
 			      ull_scan_is_enabled(0) << 1) |
@@ -919,7 +919,7 @@ void ll_rx_sched(void)
 }
 
 #if defined(CONFIG_BT_CONN)
-void *ll_pdu_rx_alloc_peek(u8_t count)
+void *ll_pdu_rx_alloc_peek(uint8_t count)
 {
 	if (count > MFIFO_AVAIL_COUNT_GET(ll_pdu_rx_free)) {
 		return NULL;
@@ -933,10 +933,10 @@ void *ll_pdu_rx_alloc(void)
 	return MFIFO_DEQUEUE(ll_pdu_rx_free);
 }
 
-void ll_tx_ack_put(u16_t handle, struct node_tx *node_tx)
+void ll_tx_ack_put(uint16_t handle, struct node_tx *node_tx)
 {
 	struct lll_tx *tx;
-	u8_t idx;
+	uint8_t idx;
 
 	idx = MFIFO_ENQUEUE_GET(tx_ack, (void **)&tx);
 	LL_ASSERT(tx);
@@ -948,8 +948,8 @@ void ll_tx_ack_put(u16_t handle, struct node_tx *node_tx)
 }
 #endif /* CONFIG_BT_CONN */
 
-void ll_timeslice_ticker_id_get(u8_t * const instance_index,
-				u8_t * const user_id)
+void ll_timeslice_ticker_id_get(uint8_t * const instance_index,
+				uint8_t * const user_id)
 {
 	*instance_index = TICKER_INSTANCE_ID_CTLR;
 	*user_id = (TICKER_NODES - FLASH_TICKER_NODES);
@@ -959,26 +959,26 @@ void ll_radio_state_abort(void)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, lll_disable};
-	u32_t ret;
+	uint32_t ret;
 
 	ret = mayfly_enqueue(TICKER_USER_ID_ULL_HIGH, TICKER_USER_ID_LLL, 0,
 			     &mfy);
 	LL_ASSERT(!ret);
 }
 
-u32_t ll_radio_state_is_idle(void)
+uint32_t ll_radio_state_is_idle(void)
 {
 	return lll_radio_is_idle();
 }
 
-void ull_ticker_status_give(u32_t status, void *param)
+void ull_ticker_status_give(uint32_t status, void *param)
 {
-	*((u32_t volatile *)param) = status;
+	*((uint32_t volatile *)param) = status;
 
 	k_sem_give(&sem_ticker_api_cb);
 }
 
-u32_t ull_ticker_status_take(u32_t ret, u32_t volatile *ret_cb)
+uint32_t ull_ticker_status_take(uint32_t ret, uint32_t volatile *ret_cb)
 {
 	if (ret == TICKER_STATUS_BUSY) {
 		/* TODO: Enable ticker job in case of CONFIG_BT_CTLR_LOW_LAT */
@@ -1027,7 +1027,7 @@ int ull_disable(void *lll)
 	static struct mayfly mfy = {0, 0, &link, NULL, lll_disable};
 	struct ull_hdr *hdr;
 	struct k_sem sem;
-	u32_t ret;
+	uint32_t ret;
 
 	hdr = HDR_ULL(((struct lll_hdr *)lll)->parent);
 	if (!hdr) {
@@ -1051,7 +1051,7 @@ int ull_disable(void *lll)
 	return k_sem_take(&sem, K_FOREVER);
 }
 
-void *ull_pdu_rx_alloc_peek(u8_t count)
+void *ull_pdu_rx_alloc_peek(uint8_t count)
 {
 	if (count > MFIFO_AVAIL_COUNT_GET(pdu_rx_free)) {
 		return NULL;
@@ -1060,7 +1060,7 @@ void *ull_pdu_rx_alloc_peek(u8_t count)
 	return MFIFO_DEQUEUE_PEEK(pdu_rx_free);
 }
 
-void *ull_pdu_rx_alloc_peek_iter(u8_t *idx)
+void *ull_pdu_rx_alloc_peek_iter(uint8_t *idx)
 {
 	return *(void **)MFIFO_DEQUEUE_ITER_GET(pdu_rx_free, idx);
 }
@@ -1100,10 +1100,10 @@ int ull_prepare_enqueue(lll_is_abort_cb_t is_abort_cb,
 			lll_abort_cb_t abort_cb,
 			struct lll_prepare_param *prepare_param,
 			lll_prepare_cb_t prepare_cb, int prio,
-			u8_t is_resume)
+			uint8_t is_resume)
 {
 	struct lll_event *e;
-	u8_t idx;
+	uint8_t idx;
 
 	idx = MFIFO_ENQUEUE_GET(prep, (void **)&e);
 	if (!e) {
@@ -1128,7 +1128,7 @@ void *ull_prepare_dequeue_get(void)
 	return MFIFO_DEQUEUE_GET(prep);
 }
 
-void *ull_prepare_dequeue_iter(u8_t *idx)
+void *ull_prepare_dequeue_iter(uint8_t *idx)
 {
 	return MFIFO_DEQUEUE_ITER_GET(prep, idx);
 }
@@ -1283,7 +1283,7 @@ static inline void *mark_get(void *m)
  */
 static inline void done_alloc(void)
 {
-	u8_t idx;
+	uint8_t idx;
 
 	/* mfifo_done is a queue of pointers */
 	while (MFIFO_ENQUEUE_IDX_GET(done, &idx)) {
@@ -1310,7 +1310,7 @@ static inline void done_alloc(void)
 static inline void *done_release(memq_link_t *link,
 				 struct node_rx_event_done *done)
 {
-	u8_t idx;
+	uint8_t idx;
 
 	if (!MFIFO_ENQUEUE_IDX_GET(done, &idx)) {
 		return NULL;
@@ -1323,9 +1323,9 @@ static inline void *done_release(memq_link_t *link,
 	return done;
 }
 
-static inline void rx_alloc(u8_t max)
+static inline void rx_alloc(uint8_t max)
 {
-	u8_t idx;
+	uint8_t idx;
 
 #if defined(CONFIG_BT_CONN)
 	while (mem_link_rx.quota_pdu &&
@@ -1381,10 +1381,10 @@ static inline void rx_alloc(u8_t max)
 }
 
 #if defined(CONFIG_BT_CONN)
-static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last)
+static uint8_t tx_cmplt_get(uint16_t *handle, uint8_t *first, uint8_t last)
 {
 	struct lll_tx *tx;
-	u8_t cmplt;
+	uint8_t cmplt;
 
 	tx = mfifo_dequeue_iter_get(mfifo_tx_ack.m, mfifo_tx_ack.s,
 				    mfifo_tx_ack.n, mfifo_tx_ack.f, last,
@@ -1402,7 +1402,7 @@ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last)
 		node_tx = tx->node;
 		p = (void *)node_tx->pdu;
 		if (!node_tx || (node_tx == (void *)1) ||
-		    (((u32_t)node_tx & ~3) &&
+		    (((uint32_t)node_tx & ~3) &&
 		     (p->ll_id == PDU_DATA_LLID_DATA_START ||
 		      p->ll_id == PDU_DATA_LLID_DATA_CONTINUE))) {
 			/* data packet, hence count num cmplt */
@@ -1413,7 +1413,7 @@ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last)
 			tx->node = (void *)2;
 		}
 
-		if (((u32_t)node_tx & ~3)) {
+		if (((uint32_t)node_tx & ~3)) {
 			ll_tx_mem_release(node_tx);
 		}
 
@@ -1425,7 +1425,7 @@ static u8_t tx_cmplt_get(u16_t *handle, u8_t *first, u8_t last)
 	return cmplt;
 }
 
-static inline void rx_demux_conn_tx_ack(u8_t ack_last, u16_t handle,
+static inline void rx_demux_conn_tx_ack(uint8_t ack_last, uint16_t handle,
 					memq_link_t *link,
 					struct node_tx *node_tx)
 {
@@ -1482,7 +1482,7 @@ static void rx_demux(void *param)
 #if defined(CONFIG_BT_CONN)
 			struct node_tx *node_tx;
 			memq_link_t *link_tx;
-			u16_t handle; /* Handle to Ack TX */
+			uint16_t handle; /* Handle to Ack TX */
 #endif /* CONFIG_BT_CONN */
 			int nack = 0;
 
@@ -1513,8 +1513,8 @@ static void rx_demux(void *param)
 #if defined(CONFIG_BT_CONN)
 		} else {
 			struct node_tx *node_tx;
-			u8_t ack_last;
-			u16_t handle;
+			uint8_t ack_last;
+			uint16_t handle;
 
 			link = ull_conn_ack_peek(&ack_last, &handle, &node_tx);
 			if (link) {
@@ -1683,14 +1683,14 @@ static inline void rx_demux_event_done(memq_link_t *link,
 	/* dequeue prepare pipeline */
 	next = ull_prepare_dequeue_get();
 	while (next) {
-		u8_t is_aborted = next->is_aborted;
-		u8_t is_resume = next->is_resume;
+		uint8_t is_aborted = next->is_aborted;
+		uint8_t is_resume = next->is_resume;
 
 		if (!is_aborted) {
 			static memq_link_t link;
 			static struct mayfly mfy = {0, 0, &link, NULL,
 						    lll_resume};
-			u32_t ret;
+			uint32_t ret;
 
 			mfy.param = next;
 			ret = mayfly_enqueue(TICKER_USER_ID_ULL_HIGH,
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv.c b/subsys/bluetooth/controller/ll_sw/ull_adv.c
index 8f18676028..afcbd7bcfd 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv.c
@@ -52,24 +52,24 @@
 
 #define ULL_ADV_RANDOM_DELAY HAL_TICKER_US_TO_TICKS(10000)
 
-inline struct ll_adv_set *ull_adv_set_get(u16_t handle);
-inline u16_t ull_adv_handle_get(struct ll_adv_set *adv);
+inline struct ll_adv_set *ull_adv_set_get(uint16_t handle);
+inline uint16_t ull_adv_handle_get(struct ll_adv_set *adv);
 
 static int init_reset(void);
-static inline struct ll_adv_set *is_disabled_get(u16_t handle);
-static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static inline struct ll_adv_set *is_disabled_get(uint16_t handle);
+static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 		      void *param);
-static void ticker_op_update_cb(u32_t status, void *params);
+static void ticker_op_update_cb(uint32_t status, void *params);
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param);
-static void ticker_op_stop_cb(u32_t status, void *params);
+static void ticker_op_stop_cb(uint32_t status, void *params);
 static void disabled_cb(void *param);
 static void conn_release(struct ll_adv_set *adv);
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static inline u8_t disable(u16_t handle);
+static inline uint8_t disable(uint16_t handle);
 
 static struct ll_adv_set ll_adv[BT_CTLR_ADV_MAX];
 
@@ -78,30 +78,30 @@ static struct ticker_ext ll_adv_ticker_ext[BT_CTLR_ADV_MAX];
 #endif /* CONFIG_BT_TICKER_EXT */
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-u8_t ll_adv_params_set(u8_t handle, u16_t evt_prop, u32_t interval,
-		       u8_t adv_type, u8_t own_addr_type,
-		       u8_t direct_addr_type, u8_t const *const direct_addr,
-		       u8_t chan_map, u8_t filter_policy, u8_t *tx_pwr,
-		       u8_t phy_p, u8_t skip, u8_t phy_s, u8_t sid, u8_t sreq)
+uint8_t ll_adv_params_set(uint8_t handle, uint16_t evt_prop, uint32_t interval,
+		       uint8_t adv_type, uint8_t own_addr_type,
+		       uint8_t direct_addr_type, uint8_t const *const direct_addr,
+		       uint8_t chan_map, uint8_t filter_policy, uint8_t *tx_pwr,
+		       uint8_t phy_p, uint8_t skip, uint8_t phy_s, uint8_t sid, uint8_t sreq)
 {
-	u8_t const pdu_adv_type[] = {PDU_ADV_TYPE_ADV_IND,
+	uint8_t const pdu_adv_type[] = {PDU_ADV_TYPE_ADV_IND,
 				     PDU_ADV_TYPE_DIRECT_IND,
 				     PDU_ADV_TYPE_SCAN_IND,
 				     PDU_ADV_TYPE_NONCONN_IND,
 				     PDU_ADV_TYPE_DIRECT_IND,
 				     PDU_ADV_TYPE_EXT_IND};
 #else /* !CONFIG_BT_CTLR_ADV_EXT */
-u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
-		       u8_t own_addr_type, u8_t direct_addr_type,
-		       u8_t const *const direct_addr, u8_t chan_map,
-		       u8_t filter_policy)
+uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
+		       uint8_t own_addr_type, uint8_t direct_addr_type,
+		       uint8_t const *const direct_addr, uint8_t chan_map,
+		       uint8_t filter_policy)
 {
-	u8_t const pdu_adv_type[] = {PDU_ADV_TYPE_ADV_IND,
+	uint8_t const pdu_adv_type[] = {PDU_ADV_TYPE_ADV_IND,
 				     PDU_ADV_TYPE_DIRECT_IND,
 				     PDU_ADV_TYPE_SCAN_IND,
 				     PDU_ADV_TYPE_NONCONN_IND,
 				     PDU_ADV_TYPE_DIRECT_IND};
-	u16_t const handle = 0;
+	uint16_t const handle = 0;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
 	struct ll_adv_set *adv;
@@ -123,7 +123,7 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 	if (adv_type > 0x04) {
 		/* legacy */
 		if (evt_prop & BIT(4)) {
-			u8_t const leg_adv_type[] = { 0x03, 0x04, 0x02, 0x00};
+			uint8_t const leg_adv_type[] = { 0x03, 0x04, 0x02, 0x00};
 
 			adv_type = leg_adv_type[evt_prop & 0x03];
 
@@ -192,12 +192,12 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 	} else if (pdu->type == PDU_ADV_TYPE_EXT_IND) {
 		struct pdu_adv_com_ext_adv *p;
 		struct ext_adv_hdr _h, *h;
-		u8_t *_ptr, *ptr;
-		u8_t len;
+		uint8_t *_ptr, *ptr;
+		uint8_t len;
 
 		p = (void *)&pdu->adv_ext_ind;
 		h = (void *)p->ext_hdr_adi_adv_data;
-		ptr = (u8_t *)h + sizeof(*h);
+		ptr = (uint8_t *)h + sizeof(*h);
 		_ptr = ptr;
 
 		/* No ACAD and no AdvData */
@@ -205,8 +205,8 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 		p->adv_mode = evt_prop & 0x03;
 
 		/* Zero-init header flags */
-		*(u8_t *)&_h = *(u8_t *)h;
-		*(u8_t *)h = 0;
+		*(uint8_t *)&_h = *(uint8_t *)h;
+		*(uint8_t *)h = 0;
 
 		/* AdvA flag */
 		if (_h.adv_addr) {
@@ -246,7 +246,7 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 		}
 
 		/* Calc primary PDU len */
-		len = ptr - (u8_t *)p;
+		len = ptr - (uint8_t *)p;
 		if (len > (offsetof(struct pdu_adv_com_ext_adv,
 				    ext_hdr_adi_adv_data) + sizeof(*h))) {
 			p->ext_hdr_len = len -
@@ -266,7 +266,7 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 
 		/* Tx Power */
 		if (h->tx_pwr) {
-			u8_t _tx_pwr;
+			uint8_t _tx_pwr;
 
 			_tx_pwr = 0;
 			if (tx_pwr) {
@@ -332,17 +332,17 @@ u8_t ll_adv_params_set(u16_t interval, u8_t adv_type,
 }
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-u8_t ll_adv_data_set(u16_t handle, u8_t len, u8_t const *const data)
+uint8_t ll_adv_data_set(uint16_t handle, uint8_t len, uint8_t const *const data)
 {
 #else /* !CONFIG_BT_CTLR_ADV_EXT */
-u8_t ll_adv_data_set(u8_t len, u8_t const *const data)
+uint8_t ll_adv_data_set(uint8_t len, uint8_t const *const data)
 {
-	const u16_t handle = 0;
+	const uint16_t handle = 0;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 	struct ll_adv_set *adv;
 	struct pdu_adv *prev;
 	struct pdu_adv *pdu;
-	u8_t idx;
+	uint8_t idx;
 
 	adv = ull_adv_set_get(handle);
 	if (!adv) {
@@ -383,17 +383,17 @@ u8_t ll_adv_data_set(u8_t len, u8_t const *const data)
 }
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-u8_t ll_adv_scan_rsp_set(u16_t handle, u8_t len, u8_t const *const data)
+uint8_t ll_adv_scan_rsp_set(uint16_t handle, uint8_t len, uint8_t const *const data)
 {
 #else /* !CONFIG_BT_CTLR_ADV_EXT */
-u8_t ll_adv_scan_rsp_set(u8_t len, u8_t const *const data)
+uint8_t ll_adv_scan_rsp_set(uint8_t len, uint8_t const *const data)
 {
-	const u16_t handle = 0;
+	const uint16_t handle = 0;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 	struct ll_adv_set *adv;
 	struct pdu_adv *prev;
 	struct pdu_adv *pdu;
-	u8_t idx;
+	uint8_t idx;
 
 	adv = ull_adv_set_get(handle);
 	if (!adv) {
@@ -419,29 +419,29 @@ u8_t ll_adv_scan_rsp_set(u8_t len, u8_t const *const data)
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT) || defined(CONFIG_BT_HCI_MESH_EXT)
 #if defined(CONFIG_BT_HCI_MESH_EXT)
-u8_t ll_adv_enable(u16_t handle, u8_t enable,
-		   u8_t at_anchor, u32_t ticks_anchor, u8_t retry,
-		   u8_t scan_window, u8_t scan_delay)
+uint8_t ll_adv_enable(uint16_t handle, uint8_t enable,
+		   uint8_t at_anchor, uint32_t ticks_anchor, uint8_t retry,
+		   uint8_t scan_window, uint8_t scan_delay)
 {
 #else /* !CONFIG_BT_HCI_MESH_EXT */
-u8_t ll_adv_enable(u16_t handle, u8_t enable)
+uint8_t ll_adv_enable(uint16_t handle, uint8_t enable)
 {
-	u32_t ticks_anchor;
+	uint32_t ticks_anchor;
 #endif /* !CONFIG_BT_HCI_MESH_EXT */
 #else /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */
-u8_t ll_adv_enable(u8_t enable)
+uint8_t ll_adv_enable(uint8_t enable)
 {
-	u16_t const handle = 0;
-	u32_t ticks_anchor;
+	uint16_t const handle = 0;
+	uint32_t ticks_anchor;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */
-	volatile u32_t ret_cb = TICKER_STATUS_BUSY;
-	u32_t ticks_slot_overhead;
+	volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
+	uint32_t ticks_slot_overhead;
 	struct pdu_adv *pdu_scan;
 	struct pdu_adv *pdu_adv;
-	u32_t ticks_slot_offset;
+	uint32_t ticks_slot_offset;
 	struct ll_adv_set *adv;
 	struct lll_adv *lll;
-	u32_t ret;
+	uint32_t ret;
 
 	if (!enable) {
 		return disable(handle);
@@ -466,15 +466,15 @@ u8_t ll_adv_enable(u8_t enable)
 	} else if (pdu_adv->type == PDU_ADV_TYPE_EXT_IND) {
 		struct pdu_adv_com_ext_adv *p;
 		struct ext_adv_hdr *h;
-		u8_t *ptr;
+		uint8_t *ptr;
 
 		p = (void *)&pdu_adv->adv_ext_ind;
 		h = (void *)p->ext_hdr_adi_adv_data;
-		ptr = (u8_t *)h + sizeof(*h);
+		ptr = (uint8_t *)h + sizeof(*h);
 
 		/* AdvA, fill here at enable */
 		if (h->adv_addr) {
-			u8_t *tx_addr = ll_addr_get(pdu_adv->tx_addr, NULL);
+			uint8_t *tx_addr = ll_addr_get(pdu_adv->tx_addr, NULL);
 
 			/* TODO: Privacy check */
 			if (pdu_adv->tx_addr && !mem_nz(tx_addr, BDADDR_SIZE)) {
@@ -514,7 +514,7 @@ u8_t ll_adv_enable(u8_t enable)
 #endif /* !CONFIG_BT_CTLR_PRIVACY */
 
 		if (!priv) {
-			u8_t *tx_addr = ll_addr_get(pdu_adv->tx_addr, NULL);
+			uint8_t *tx_addr = ll_addr_get(pdu_adv->tx_addr, NULL);
 
 			memcpy(&pdu_adv->adv_ind.addr[0], tx_addr,
 			       BDADDR_SIZE);
@@ -719,16 +719,16 @@ u8_t ll_adv_enable(u8_t enable)
 #endif /* CONFIG_BT_PERIPHERAL */
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	const u8_t phy = lll->phy_p;
+	const uint8_t phy = lll->phy_p;
 #else
 	/* Legacy ADV only supports LE_1M PHY */
-	const u8_t phy = 1;
+	const uint8_t phy = 1;
 #endif
 
 	/* For now we adv on all channels enabled in channel map */
-	u8_t ch_map = lll->chan_map;
-	const u8_t adv_chn_cnt = util_ones_count_get(&ch_map, sizeof(ch_map));
-	u32_t slot_us	= EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
+	uint8_t ch_map = lll->chan_map;
+	const uint8_t adv_chn_cnt = util_ones_count_get(&ch_map, sizeof(ch_map));
+	uint32_t slot_us	= EVENT_OVERHEAD_START_US + EVENT_OVERHEAD_END_US;
 
 	if (adv_chn_cnt == 0) {
 		/* ADV needs at least one channel */
@@ -741,20 +741,20 @@ u8_t ll_adv_enable(u8_t enable)
 	} else
 #endif
 	{
-		const u8_t adv_data_len = pdu_adv->len;
-		const u8_t rsp_data_len = pdu_scan->len;
-		const u8_t ll_hdr_size  = LL_HEADER_SIZE(phy);
-		u32_t adv_size		= ll_hdr_size + ADVA_SIZE;
-		const u8_t ll_hdr_us	= BYTES2US(ll_hdr_size, phy);
-		const u8_t rx_to_us	= EVENT_RX_TO_US(phy);
-		const u8_t rxtx_turn_us = EVENT_RX_TX_TURNAROUND(phy);
-		const u16_t conn_ind_us = ll_hdr_us +
+		const uint8_t adv_data_len = pdu_adv->len;
+		const uint8_t rsp_data_len = pdu_scan->len;
+		const uint8_t ll_hdr_size  = LL_HEADER_SIZE(phy);
+		uint32_t adv_size		= ll_hdr_size + ADVA_SIZE;
+		const uint8_t ll_hdr_us	= BYTES2US(ll_hdr_size, phy);
+		const uint8_t rx_to_us	= EVENT_RX_TO_US(phy);
+		const uint8_t rxtx_turn_us = EVENT_RX_TX_TURNAROUND(phy);
+		const uint16_t conn_ind_us = ll_hdr_us +
 					  BYTES2US(INITA_SIZE + ADVA_SIZE +
 						   LLDATA_SIZE, phy);
-		const u8_t scan_req_us  = ll_hdr_us +
+		const uint8_t scan_req_us  = ll_hdr_us +
 					  BYTES2US(SCANA_SIZE + ADVA_SIZE, phy);
 		/* ll_header plus AdvA and scan response data */
-		const u16_t scan_rsp_us  = ll_hdr_us +
+		const uint16_t scan_rsp_us  = ll_hdr_us +
 					  BYTES2US(ADVA_SIZE + rsp_data_len,
 						   phy);
 
@@ -787,10 +787,10 @@ u8_t ll_adv_enable(u8_t enable)
 		}
 	}
 
-	u16_t interval = adv->interval;
+	uint16_t interval = adv->interval;
 #if defined(CONFIG_BT_HCI_MESH_EXT)
 	if (lll->is_mesh) {
-		u16_t interval_min_us;
+		uint16_t interval_min_us;
 
 		_radio.advertiser.retry = retry;
 		_radio.advertiser.scan_delay_ms = scan_delay;
@@ -879,7 +879,7 @@ u8_t ll_adv_enable(u8_t enable)
 	} else
 #endif /* CONFIG_BT_PERIPHERAL */
 	{
-		const u32_t ticks_slot = adv->evt.ticks_slot +
+		const uint32_t ticks_slot = adv->evt.ticks_slot +
 					 ticks_slot_overhead;
 #if defined(CONFIG_BT_TICKER_EXT)
 		ll_adv_ticker_ext[handle].ticks_slot_window =
@@ -893,7 +893,7 @@ u8_t ll_adv_enable(u8_t enable)
 				   TICKER_USER_ID_THREAD,
 				   (TICKER_ID_ADV_BASE + handle),
 				   ticks_anchor, 0,
-				   HAL_TICKER_US_TO_TICKS((u64_t)interval *
+				   HAL_TICKER_US_TO_TICKS((uint64_t)interval *
 							  625),
 				   TICKER_NULL_REMAINDER,
 #if !defined(CONFIG_BT_TICKER_COMPATIBILITY_MODE) && \
@@ -962,7 +962,7 @@ int ull_adv_init(void)
 
 int ull_adv_reset(void)
 {
-	u16_t handle;
+	uint16_t handle;
 	int err;
 
 	for (handle = 0U; handle < BT_CTLR_ADV_MAX; handle++) {
@@ -977,7 +977,7 @@ int ull_adv_reset(void)
 	return 0;
 }
 
-inline struct ll_adv_set *ull_adv_set_get(u16_t handle)
+inline struct ll_adv_set *ull_adv_set_get(uint16_t handle)
 {
 	if (handle >= BT_CTLR_ADV_MAX) {
 		return NULL;
@@ -986,17 +986,17 @@ inline struct ll_adv_set *ull_adv_set_get(u16_t handle)
 	return &ll_adv[handle];
 }
 
-inline u16_t ull_adv_handle_get(struct ll_adv_set *adv)
+inline uint16_t ull_adv_handle_get(struct ll_adv_set *adv)
 {
-	return ((u8_t *)adv - (u8_t *)ll_adv) / sizeof(*adv);
+	return ((uint8_t *)adv - (uint8_t *)ll_adv) / sizeof(*adv);
 }
 
-u16_t ull_adv_lll_handle_get(struct lll_adv *lll)
+uint16_t ull_adv_lll_handle_get(struct lll_adv *lll)
 {
 	return ull_adv_handle_get((void *)lll->hdr.parent);
 }
 
-inline struct ll_adv_set *ull_adv_is_enabled_get(u16_t handle)
+inline struct ll_adv_set *ull_adv_is_enabled_get(uint16_t handle)
 {
 	struct ll_adv_set *adv;
 
@@ -1008,7 +1008,7 @@ inline struct ll_adv_set *ull_adv_is_enabled_get(u16_t handle)
 	return adv;
 }
 
-u32_t ull_adv_is_enabled(u16_t handle)
+uint32_t ull_adv_is_enabled(uint16_t handle)
 {
 	struct ll_adv_set *adv;
 
@@ -1020,7 +1020,7 @@ u32_t ull_adv_is_enabled(u16_t handle)
 	return BIT(0);
 }
 
-u32_t ull_adv_filter_pol_get(u16_t handle)
+uint32_t ull_adv_filter_pol_get(uint16_t handle)
 {
 	struct ll_adv_set *adv;
 
@@ -1037,7 +1037,7 @@ static int init_reset(void)
 	return 0;
 }
 
-static inline struct ll_adv_set *is_disabled_get(u16_t handle)
+static inline struct ll_adv_set *is_disabled_get(uint16_t handle)
 {
 	struct ll_adv_set *adv;
 
@@ -1049,7 +1049,7 @@ static inline struct ll_adv_set *is_disabled_get(u16_t handle)
 	return adv;
 }
 
-static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 		      void *param)
 {
 	static memq_link_t link;
@@ -1057,8 +1057,8 @@ static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 	static struct lll_prepare_param p;
 	struct ll_adv_set *adv = param;
 	struct lll_adv *lll;
-	u32_t ret;
-	u8_t ref;
+	uint32_t ret;
+	uint8_t ref;
 
 	DEBUG_RADIO_PREPARE_A(1);
 
@@ -1088,8 +1088,8 @@ static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 	if (!lll->is_hdcd)
 #endif /* CONFIG_BT_PERIPHERAL */
 	{
-		u32_t random_delay;
-		u32_t ret;
+		uint32_t random_delay;
+		uint32_t ret;
 
 		lll_entropy_get(sizeof(random_delay), &random_delay);
 		random_delay %= ULL_ADV_RANDOM_DELAY;
@@ -1109,19 +1109,19 @@ static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 	DEBUG_RADIO_PREPARE_A(1);
 }
 
-static void ticker_op_update_cb(u32_t status, void *param)
+static void ticker_op_update_cb(uint32_t status, void *param)
 {
 	LL_ASSERT(status == TICKER_STATUS_SUCCESS ||
 		  param == ull_disable_mark_get());
 }
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			   void *param)
 {
 	struct ll_adv_set *adv = param;
-	u16_t handle;
-	u32_t ret;
+	uint16_t handle;
+	uint32_t ret;
 
 #if 0
 	/* NOTE: abort the event, so as to permit ticker_job execution, if
@@ -1148,13 +1148,13 @@ static void ticker_stop_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 		  (ret == TICKER_STATUS_BUSY));
 }
 
-static void ticker_op_stop_cb(u32_t status, void *param)
+static void ticker_op_stop_cb(uint32_t status, void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, NULL};
 	struct ll_adv_set *adv;
 	struct ull_hdr *hdr;
-	u32_t ret;
+	uint32_t ret;
 
 	/* Ignore if race between thread and ULL */
 	if (status != TICKER_STATUS_SUCCESS) {
@@ -1242,12 +1242,12 @@ static void conn_release(struct ll_adv_set *adv)
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static inline u8_t disable(u16_t handle)
+static inline uint8_t disable(uint16_t handle)
 {
-	volatile u32_t ret_cb = TICKER_STATUS_BUSY;
+	volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
 	struct ll_adv_set *adv;
 	void *mark;
-	u32_t ret;
+	uint32_t ret;
 
 	adv = ull_adv_is_enabled_get(handle);
 	if (!adv) {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
index f663c3e9fc..e7e6c0551f 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
@@ -22,27 +22,27 @@
 #include "ull_adv_types.h"
 #include "ull_adv_internal.h"
 
-u8_t ll_adv_aux_random_addr_set(u8_t handle, u8_t *addr)
+uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t *addr)
 {
 	/* TODO: store in adv set instance */
 	return 0;
 }
 
-u8_t *ll_adv_aux_random_addr_get(u8_t handle, u8_t *addr)
+uint8_t *ll_adv_aux_random_addr_get(uint8_t handle, uint8_t *addr)
 {
 	/* TODO: copy adv set instance addr into addr and/or return reference */
 	return NULL;
 }
 
-u8_t ll_adv_aux_ad_data_set(u8_t handle, u8_t op, u8_t frag_pref, u8_t len,
-			    u8_t *data)
+uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
+			    uint8_t *data)
 {
 	struct pdu_adv_com_ext_adv *p;
 	struct ll_adv_set *adv;
 	struct ext_adv_hdr *h;
 	struct pdu_adv *prev;
 	struct pdu_adv *pdu;
-	u8_t idx;
+	uint8_t idx;
 
 	/* TODO: */
 
@@ -72,32 +72,32 @@ u8_t ll_adv_aux_ad_data_set(u8_t handle, u8_t op, u8_t frag_pref, u8_t len,
 	return 0;
 }
 
-u8_t ll_adv_aux_sr_data_set(u8_t handle, u8_t op, u8_t frag_pref, u8_t len,
-			    u8_t *data)
+uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
+			    uint8_t *data)
 {
 	/* TODO: */
 	return 0;
 }
 
-u16_t ll_adv_aux_max_data_length_get(void)
+uint16_t ll_adv_aux_max_data_length_get(void)
 {
 	/* TODO: return a Kconfig value */
 	return 0;
 }
 
-u8_t ll_adv_aux_set_count_get(void)
+uint8_t ll_adv_aux_set_count_get(void)
 {
 	/*  TODO: return a Kconfig value */
 	return 0;
 }
 
-u8_t ll_adv_aux_set_remove(u8_t handle)
+uint8_t ll_adv_aux_set_remove(uint8_t handle)
 {
 	/* TODO: reset/release primary channel and Aux channel PDUs */
 	return 0;
 }
 
-u8_t ll_adv_aux_set_clear(void)
+uint8_t ll_adv_aux_set_clear(void)
 {
 	/* TODO: reset/release all adv set primary channel and  Aux channel
 	 * PDUs
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.h b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.h
index 360af6b3d7..553a08ae35 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.h
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-u8_t ll_adv_aux_random_addr_set(u8_t handle, u8_t *addr);
-u8_t *ll_adv_aux_random_addr_get(u8_t handle, u8_t *addr);
-u8_t ll_adv_aux_ad_data_set(u8_t handle, u8_t op, u8_t frag_pref, u8_t len,
-			    u8_t *data);
-u8_t ll_adv_aux_sr_data_set(u8_t handle, u8_t op, u8_t frag_pref, u8_t len,
-			    u8_t *data);
-u16_t ll_adv_aux_max_data_length_get(void);
-u8_t ll_adv_aux_set_count_get(void);
-u8_t ll_adv_aux_set_remove(u8_t handle);
-u8_t ll_adv_aux_set_clear(void);
+uint8_t ll_adv_aux_random_addr_set(uint8_t handle, uint8_t *addr);
+uint8_t *ll_adv_aux_random_addr_get(uint8_t handle, uint8_t *addr);
+uint8_t ll_adv_aux_ad_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
+			    uint8_t *data);
+uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, uint8_t len,
+			    uint8_t *data);
+uint16_t ll_adv_aux_max_data_length_get(void);
+uint8_t ll_adv_aux_set_count_get(void);
+uint8_t ll_adv_aux_set_remove(uint8_t handle);
+uint8_t ll_adv_aux_set_clear(void);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_internal.h b/subsys/bluetooth/controller/ll_sw/ull_adv_internal.h
index bf1e006ea6..e9d43a00c9 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_internal.h
@@ -8,16 +8,16 @@ int ull_adv_init(void);
 int ull_adv_reset(void);
 
 /* Return ll_adv_set context (unconditional) */
-struct ll_adv_set *ull_adv_set_get(u16_t handle);
+struct ll_adv_set *ull_adv_set_get(uint16_t handle);
 
 /* Return the adv set handle given the adv set instance */
-u16_t ull_adv_handle_get(struct ll_adv_set *adv);
+uint16_t ull_adv_handle_get(struct ll_adv_set *adv);
 
 /* Return ll_adv_set context if enabled */
-struct ll_adv_set *ull_adv_is_enabled_get(u16_t handle);
+struct ll_adv_set *ull_adv_is_enabled_get(uint16_t handle);
 
 /* Return flags, for now just: enabled */
-u32_t ull_adv_is_enabled(u16_t handle);
+uint32_t ull_adv_is_enabled(uint16_t handle);
 
 /* Return filter policy used */
-u32_t ull_adv_filter_pol_get(u16_t handle);
+uint32_t ull_adv_filter_pol_get(uint16_t handle);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_types.h b/subsys/bluetooth/controller/ll_sw/ull_adv_types.h
index bfd396428c..5c6b4d23b5 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_types.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_types.h
@@ -9,7 +9,7 @@ struct ll_adv_set {
 	struct ull_hdr ull;
 	struct lll_adv lll;
 
-	u8_t is_enabled:1;
+	uint8_t is_enabled:1;
 
 #if defined(CONFIG_BT_PERIPHERAL)
 	memq_link_t        *link_cc_free;
@@ -17,14 +17,14 @@ struct ll_adv_set {
 #endif /* CONFIG_BT_PERIPHERAL */
 
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	u32_t interval;
+	uint32_t interval;
 #else /* !CONFIG_BT_CTLR_ADV_EXT */
-	u16_t interval;
+	uint16_t interval;
 #endif /* !CONFIG_BT_CTLR_ADV_EXT */
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  own_addr_type:2;
-	u8_t  id_addr_type:1;
-	u8_t  id_addr[BDADDR_SIZE];
+	uint8_t  own_addr_type:2;
+	uint8_t  id_addr_type:1;
+	uint8_t  id_addr[BDADDR_SIZE];
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 };
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index ecb8d4f5b2..87df18b398 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -51,16 +51,16 @@
 static int init_reset(void);
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static void ticker_update_latency_cancel_op_cb(u32_t ticker_status,
+static void ticker_update_latency_cancel_op_cb(uint32_t ticker_status,
 					       void *params);
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static void ticker_update_conn_op_cb(u32_t status, void *param);
-static void ticker_stop_conn_op_cb(u32_t status, void *param);
-static void ticker_start_conn_op_cb(u32_t status, void *param);
+static void ticker_update_conn_op_cb(uint32_t status, void *param);
+static void ticker_stop_conn_op_cb(uint32_t status, void *param);
+static void ticker_start_conn_op_cb(uint32_t status, void *param);
 
-static inline void disable(u16_t handle);
-static void conn_cleanup(struct ll_conn *conn, u8_t reason);
+static inline void disable(uint16_t handle);
+static void conn_cleanup(struct ll_conn *conn, uint8_t reason);
 static void tx_ull_flush(struct ll_conn *conn);
 static void tx_lll_flush(void *param);
 
@@ -71,10 +71,10 @@ static int empty_data_start_release(struct ll_conn *conn, struct node_tx *tx);
 static inline void ctrl_tx_enqueue(struct ll_conn *conn, struct node_tx *tx);
 static inline void event_fex_prep(struct ll_conn *conn);
 static inline void event_vex_prep(struct ll_conn *conn);
-static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
-				      u32_t ticks_at_expire);
+static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
+				      uint32_t ticks_at_expire);
 static inline void event_ch_map_prep(struct ll_conn *conn,
-				     u16_t event_counter);
+				     uint16_t event_counter);
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
 static bool is_enc_req_pause_tx(struct ll_conn *conn);
@@ -82,13 +82,13 @@ static inline void event_enc_prep(struct ll_conn *conn);
 static int enc_rsp_send(struct ll_conn *conn);
 static int start_enc_rsp_send(struct ll_conn *conn,
 			      struct pdu_data *pdu_ctrl_tx);
-static inline bool ctrl_is_unexpected(struct ll_conn *conn, u8_t opcode);
+static inline bool ctrl_is_unexpected(struct ll_conn *conn, uint8_t opcode);
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
 static inline void event_conn_param_prep(struct ll_conn *conn,
-					 u16_t event_counter,
-					 u32_t ticks_at_expire);
+					 uint16_t event_counter,
+					 uint32_t ticks_at_expire);
 #endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
@@ -102,7 +102,7 @@ static inline void event_len_prep(struct ll_conn *conn);
 #if defined(CONFIG_BT_CTLR_PHY)
 static inline void event_phy_req_prep(struct ll_conn *conn);
 static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
-					  u16_t event_counter);
+					  uint16_t event_counter);
 #endif /* CONFIG_BT_CTLR_PHY */
 
 static inline void ctrl_tx_pre_ack(struct ll_conn *conn,
@@ -138,31 +138,31 @@ static MFIFO_DEFINE(conn_ack, sizeof(struct lll_tx),
 
 static struct {
 	void *free;
-	u8_t pool[CONN_TX_BUF_SIZE * CONFIG_BT_CTLR_TX_BUFFERS];
+	uint8_t pool[CONN_TX_BUF_SIZE * CONFIG_BT_CTLR_TX_BUFFERS];
 } mem_conn_tx;
 
 static struct {
 	void *free;
-	u8_t pool[CONN_TX_CTRL_BUF_SIZE * CONN_TX_CTRL_BUFFERS];
+	uint8_t pool[CONN_TX_CTRL_BUF_SIZE * CONN_TX_CTRL_BUFFERS];
 } mem_conn_tx_ctrl;
 
 static struct {
 	void *free;
-	u8_t pool[sizeof(memq_link_t) *
+	uint8_t pool[sizeof(memq_link_t) *
 		  (CONFIG_BT_CTLR_TX_BUFFERS + CONN_TX_CTRL_BUFFERS)];
 } mem_link_tx;
 
-static u8_t data_chan_map[5] = {0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
-static u8_t data_chan_count = 37U;
+static uint8_t data_chan_map[5] = {0xFF, 0xFF, 0xFF, 0xFF, 0x1F};
+static uint8_t data_chan_count = 37U;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-static u16_t default_tx_octets;
-static u16_t default_tx_time;
+static uint16_t default_tx_octets;
+static uint16_t default_tx_time;
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #if defined(CONFIG_BT_CTLR_PHY)
-static u8_t default_phy_tx;
-static u8_t default_phy_rx;
+static uint8_t default_phy_tx;
+static uint8_t default_phy_rx;
 #endif /* CONFIG_BT_CTLR_PHY */
 
 static struct ll_conn conn_pool[CONFIG_BT_MAX_CONN];
@@ -181,17 +181,17 @@ void ll_conn_release(struct ll_conn *conn)
 	mem_release(conn, &conn_free);
 }
 
-u16_t ll_conn_handle_get(struct ll_conn *conn)
+uint16_t ll_conn_handle_get(struct ll_conn *conn)
 {
 	return mem_index_get(conn, conn_pool, sizeof(struct ll_conn));
 }
 
-struct ll_conn *ll_conn_get(u16_t handle)
+struct ll_conn *ll_conn_get(uint16_t handle)
 {
 	return mem_get(conn_pool, sizeof(struct ll_conn), handle);
 }
 
-struct ll_conn *ll_connected_get(u16_t handle)
+struct ll_conn *ll_connected_get(uint16_t handle)
 {
 	struct ll_conn *conn;
 
@@ -217,11 +217,11 @@ void ll_tx_mem_release(void *tx)
 	mem_release(tx, &mem_conn_tx.free);
 }
 
-int ll_tx_mem_enqueue(u16_t handle, void *tx)
+int ll_tx_mem_enqueue(uint16_t handle, void *tx)
 {
 	struct lll_tx *lll_tx;
 	struct ll_conn *conn;
-	u8_t idx;
+	uint8_t idx;
 
 	conn = ll_connected_get(handle);
 	if (!conn) {
@@ -242,7 +242,7 @@ int ll_tx_mem_enqueue(u16_t handle, void *tx)
 	/* break slave latency */
 	if (conn->lll.role && conn->lll.latency_event &&
 	    !conn->slave.latency_cancel) {
-		u32_t ticker_status;
+		uint32_t ticker_status;
 
 		conn->slave.latency_cancel = 1U;
 
@@ -261,8 +261,8 @@ int ll_tx_mem_enqueue(u16_t handle, void *tx)
 	return 0;
 }
 
-u8_t ll_conn_update(u16_t handle, u8_t cmd, u8_t status, u16_t interval_min,
-		    u16_t interval_max, u16_t latency, u16_t timeout)
+uint8_t ll_conn_update(uint16_t handle, uint8_t cmd, uint8_t status, uint16_t interval_min,
+		    uint16_t interval_max, uint16_t latency, uint16_t timeout)
 {
 	struct ll_conn *conn;
 
@@ -342,7 +342,7 @@ u8_t ll_conn_update(u16_t handle, u8_t cmd, u8_t status, u16_t interval_min,
 	return 0;
 }
 
-u8_t ll_chm_get(u16_t handle, u8_t *chm)
+uint8_t ll_chm_get(uint16_t handle, uint8_t *chm)
 {
 	struct ll_conn *conn;
 
@@ -363,7 +363,7 @@ u8_t ll_chm_get(u16_t handle, u8_t *chm)
 	return 0;
 }
 
-u8_t ll_terminate_ind_send(u16_t handle, u8_t reason)
+uint8_t ll_terminate_ind_send(uint16_t handle, uint8_t reason)
 {
 	struct ll_conn *conn;
 
@@ -379,7 +379,7 @@ u8_t ll_terminate_ind_send(u16_t handle, u8_t reason)
 	return 0;
 }
 
-u8_t ll_feature_req_send(u16_t handle)
+uint8_t ll_feature_req_send(uint16_t handle)
 {
 	struct ll_conn *conn;
 
@@ -397,7 +397,7 @@ u8_t ll_feature_req_send(u16_t handle)
 	return 0;
 }
 
-u8_t ll_version_ind_send(u16_t handle)
+uint8_t ll_version_ind_send(uint16_t handle)
 {
 	struct ll_conn *conn;
 
@@ -416,7 +416,7 @@ u8_t ll_version_ind_send(u16_t handle)
 }
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time)
+uint32_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time)
 {
 	struct ll_conn *conn;
 
@@ -464,13 +464,13 @@ u32_t ll_length_req_send(u16_t handle, u16_t tx_octets, u16_t tx_time)
 	return 0;
 }
 
-void ll_length_default_get(u16_t *max_tx_octets, u16_t *max_tx_time)
+void ll_length_default_get(uint16_t *max_tx_octets, uint16_t *max_tx_time)
 {
 	*max_tx_octets = default_tx_octets;
 	*max_tx_time = default_tx_time;
 }
 
-u32_t ll_length_default_set(u16_t max_tx_octets, u16_t max_tx_time)
+uint32_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time)
 {
 	/* TODO: parameter check (for BT 5.0 compliance) */
 
@@ -480,8 +480,8 @@ u32_t ll_length_default_set(u16_t max_tx_octets, u16_t max_tx_time)
 	return 0;
 }
 
-void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time,
-		       u16_t *max_rx_octets, u16_t *max_rx_time)
+void ll_length_max_get(uint16_t *max_tx_octets, uint16_t *max_tx_time,
+		       uint16_t *max_rx_octets, uint16_t *max_rx_time)
 {
 	*max_tx_octets = LL_LENGTH_OCTETS_RX_MAX;
 	*max_rx_octets = LL_LENGTH_OCTETS_RX_MAX;
@@ -497,7 +497,7 @@ void ll_length_max_get(u16_t *max_tx_octets, u16_t *max_tx_time,
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #if defined(CONFIG_BT_CTLR_PHY)
-u8_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx)
+uint8_t ll_phy_get(uint16_t handle, uint8_t *tx, uint8_t *rx)
 {
 	struct ll_conn *conn;
 
@@ -513,7 +513,7 @@ u8_t ll_phy_get(u16_t handle, u8_t *tx, u8_t *rx)
 	return 0;
 }
 
-u8_t ll_phy_default_set(u8_t tx, u8_t rx)
+uint8_t ll_phy_default_set(uint8_t tx, uint8_t rx)
 {
 	/* TODO: validate against supported phy */
 
@@ -523,7 +523,7 @@ u8_t ll_phy_default_set(u8_t tx, u8_t rx)
 	return 0;
 }
 
-u8_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx)
+uint8_t ll_phy_req_send(uint16_t handle, uint8_t tx, uint8_t flags, uint8_t rx)
 {
 	struct ll_conn *conn;
 
@@ -557,7 +557,7 @@ u8_t ll_phy_req_send(u16_t handle, u8_t tx, u8_t flags, u8_t rx)
 #endif /* CONFIG_BT_CTLR_PHY */
 
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)
-u8_t ll_rssi_get(u16_t handle, u8_t *rssi)
+uint8_t ll_rssi_get(uint16_t handle, uint8_t *rssi)
 {
 	struct ll_conn *conn;
 
@@ -573,7 +573,7 @@ u8_t ll_rssi_get(u16_t handle, u8_t *rssi)
 #endif /* CONFIG_BT_CTLR_CONN_RSSI */
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
-u8_t ll_apto_get(u16_t handle, u16_t *apto)
+uint8_t ll_apto_get(uint16_t handle, uint16_t *apto)
 {
 	struct ll_conn *conn;
 
@@ -587,7 +587,7 @@ u8_t ll_apto_get(u16_t handle, u16_t *apto)
 	return 0;
 }
 
-u8_t ll_apto_set(u16_t handle, u16_t apto)
+uint8_t ll_apto_set(uint16_t handle, uint16_t apto)
 {
 	struct ll_conn *conn;
 
@@ -622,7 +622,7 @@ int ull_conn_init(void)
 
 int ull_conn_reset(void)
 {
-	u16_t handle;
+	uint16_t handle;
 	int err;
 
 	for (handle = 0U; handle < CONFIG_BT_MAX_CONN; handle++) {
@@ -654,14 +654,14 @@ int ull_conn_reset(void)
 	return 0;
 }
 
-u8_t ull_conn_chan_map_cpy(u8_t *chan_map)
+uint8_t ull_conn_chan_map_cpy(uint8_t *chan_map)
 {
 	memcpy(chan_map, data_chan_map, sizeof(data_chan_map));
 
 	return data_chan_count;
 }
 
-void ull_conn_chan_map_set(u8_t *chan_map)
+void ull_conn_chan_map_set(uint8_t *chan_map)
 {
 	memcpy(data_chan_map, chan_map, sizeof(data_chan_map));
 	data_chan_count = util_ones_count_get(data_chan_map,
@@ -669,13 +669,13 @@ void ull_conn_chan_map_set(u8_t *chan_map)
 }
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-u16_t ull_conn_default_tx_octets_get(void)
+uint16_t ull_conn_default_tx_octets_get(void)
 {
 	return default_tx_octets;
 }
 
 #if defined(CONFIG_BT_CTLR_PHY)
-u16_t ull_conn_default_tx_time_get(void)
+uint16_t ull_conn_default_tx_time_get(void)
 {
 	return default_tx_time;
 }
@@ -683,12 +683,12 @@ u16_t ull_conn_default_tx_time_get(void)
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 #if defined(CONFIG_BT_CTLR_PHY)
-u8_t ull_conn_default_phy_tx_get(void)
+uint8_t ull_conn_default_phy_tx_get(void)
 {
 	return default_phy_tx;
 }
 
-u8_t ull_conn_default_phy_rx_get(void)
+uint8_t ull_conn_default_phy_rx_get(void)
 {
 	return default_phy_rx;
 }
@@ -701,7 +701,7 @@ void ull_conn_setup(memq_link_t *link, struct node_rx_hdr *rx)
 
 	ftr = &(rx->rx_ftr);
 
-	lll = *((struct lll_conn **)((u8_t *)ftr->param +
+	lll = *((struct lll_conn **)((uint8_t *)ftr->param +
 				     sizeof(struct lll_hdr)));
 	switch (lll->role) {
 #if defined(CONFIG_BT_CENTRAL)
@@ -780,7 +780,7 @@ int ull_conn_rx(memq_link_t *link, struct node_rx_pdu **rx)
 	return 0;
 }
 
-int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
+int ull_conn_llcp(struct ll_conn *conn, uint32_t ticks_at_expire, uint16_t lazy)
 {
 	LL_ASSERT(conn->lll.handle != 0xFFFF);
 
@@ -817,7 +817,7 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
 		} else if (conn->llcp_conn_param.ack !=
 			   conn->llcp_conn_param.req) {
 			struct lll_conn *lll = &conn->lll;
-			u16_t event_counter;
+			uint16_t event_counter;
 
 			/* Calculate current event counter */
 			event_counter = lll->event_counter +
@@ -878,7 +878,7 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
 		case LLCP_CHAN_MAP:
 		{
 			struct lll_conn *lll = &conn->lll;
-			u16_t event_counter;
+			uint16_t event_counter;
 
 			/* Calculate current event counter */
 			event_counter = lll->event_counter +
@@ -904,7 +904,7 @@ int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy)
 		case LLCP_PHY_UPD:
 		{
 			struct lll_conn *lll = &conn->lll;
-			u16_t event_counter;
+			uint16_t event_counter;
 
 			/* Calculate current event counter */
 			event_counter = lll->event_counter +
@@ -967,13 +967,13 @@ void ull_conn_done(struct node_rx_event_done *done)
 {
 	struct lll_conn *lll = (void *)HDR_ULL2LLL(done->param);
 	struct ll_conn *conn = (void *)HDR_LLL2EVT(lll);
-	u32_t ticks_drift_minus;
-	u32_t ticks_drift_plus;
-	u16_t latency_event;
-	u16_t elapsed_event;
-	u8_t reason_peer;
-	u16_t lazy;
-	u8_t force;
+	uint32_t ticks_drift_minus;
+	uint32_t ticks_drift_plus;
+	uint16_t latency_event;
+	uint16_t elapsed_event;
+	uint8_t reason_peer;
+	uint16_t lazy;
+	uint8_t force;
 
 	/* Skip if connection terminated by local host */
 	if (lll->handle == 0xFFFF) {
@@ -986,7 +986,7 @@ void ull_conn_done(struct node_rx_event_done *done)
 	case LLL_CONN_MIC_NONE:
 #if defined(CONFIG_BT_CTLR_LE_PING)
 		if (lll->enc_rx || conn->llcp_enc.pause_rx) {
-			u16_t appto_reload_new;
+			uint16_t appto_reload_new;
 
 			/* check for change in apto */
 			appto_reload_new = (conn->apto_reload >
@@ -1243,9 +1243,9 @@ void ull_conn_done(struct node_rx_event_done *done)
 	/* update conn ticker */
 	if ((ticks_drift_plus != 0U) || (ticks_drift_minus != 0U) ||
 	    (lazy != 0U) || (force != 0U)) {
-		u8_t ticker_id = TICKER_ID_CONN_BASE + lll->handle;
+		uint8_t ticker_id = TICKER_ID_CONN_BASE + lll->handle;
 		struct ll_conn *conn = lll->hdr.parent;
-		u32_t ticker_status;
+		uint32_t ticker_status;
 
 		/* Call to ticker_update can fail under the race
 		 * condition where in the Slave role is being stopped but
@@ -1267,7 +1267,7 @@ void ull_conn_done(struct node_rx_event_done *done)
 	}
 }
 
-void ull_conn_tx_demux(u8_t count)
+void ull_conn_tx_demux(uint8_t count)
 {
 	do {
 		struct lll_tx *lll_tx;
@@ -1358,7 +1358,7 @@ static struct node_tx *tx_ull_dequeue(struct ll_conn *conn,
 	return tx;
 }
 
-void ull_conn_tx_lll_enqueue(struct ll_conn *conn, u8_t count)
+void ull_conn_tx_lll_enqueue(struct ll_conn *conn, uint8_t count)
 {
 	bool pause_tx = false;
 
@@ -1396,12 +1396,12 @@ void ull_conn_link_tx_release(void *link)
 	mem_release(link, &mem_link_tx.free);
 }
 
-u8_t ull_conn_ack_last_idx_get(void)
+uint8_t ull_conn_ack_last_idx_get(void)
 {
 	return mfifo_conn_ack.l;
 }
 
-memq_link_t *ull_conn_ack_peek(u8_t *ack_last, u16_t *handle,
+memq_link_t *ull_conn_ack_peek(uint8_t *ack_last, uint16_t *handle,
 			       struct node_tx **tx)
 {
 	struct lll_tx *lll_tx;
@@ -1419,7 +1419,7 @@ memq_link_t *ull_conn_ack_peek(u8_t *ack_last, u16_t *handle,
 	return (*tx)->link;
 }
 
-memq_link_t *ull_conn_ack_by_last_peek(u8_t last, u16_t *handle,
+memq_link_t *ull_conn_ack_by_last_peek(uint8_t last, uint16_t *handle,
 				       struct node_tx **tx)
 {
 	struct lll_tx *lll_tx;
@@ -1441,10 +1441,10 @@ void *ull_conn_ack_dequeue(void)
 	return MFIFO_DEQUEUE(conn_ack);
 }
 
-void ull_conn_lll_ack_enqueue(u16_t handle, struct node_tx *tx)
+void ull_conn_lll_ack_enqueue(uint16_t handle, struct node_tx *tx)
 {
 	struct lll_tx *lll_tx;
-	u8_t idx;
+	uint8_t idx;
 
 	idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&lll_tx);
 	LL_ASSERT(lll_tx);
@@ -1455,7 +1455,7 @@ void ull_conn_lll_ack_enqueue(u16_t handle, struct node_tx *tx)
 	MFIFO_ENQUEUE(conn_ack, idx);
 }
 
-struct ll_conn *ull_conn_tx_ack(u16_t handle, memq_link_t *link,
+struct ll_conn *ull_conn_tx_ack(uint16_t handle, memq_link_t *link,
 				struct node_tx *tx)
 {
 	struct ll_conn *conn = NULL;
@@ -1494,7 +1494,7 @@ struct ll_conn *ull_conn_tx_ack(u16_t handle, memq_link_t *link,
 	return conn;
 }
 
-u8_t ull_conn_llcp_req(void *conn)
+uint8_t ull_conn_llcp_req(void *conn)
 {
 	struct ll_conn * const conn_hdr = conn;
 	if (conn_hdr->llcp_req != conn_hdr->llcp_ack) {
@@ -1510,9 +1510,9 @@ u8_t ull_conn_llcp_req(void *conn)
 	return 0;
 }
 
-u16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll)
+uint16_t ull_conn_lll_max_tx_octets_get(struct lll_conn *lll)
 {
-	u16_t max_tx_octets;
+	uint16_t max_tx_octets;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 #if defined(CONFIG_BT_CTLR_PHY)
@@ -1625,7 +1625,7 @@ static int init_reset(void)
 }
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static void ticker_update_latency_cancel_op_cb(u32_t ticker_status,
+static void ticker_update_latency_cancel_op_cb(uint32_t ticker_status,
 					       void *params)
 {
 	struct ll_conn *conn = params;
@@ -1636,7 +1636,7 @@ static void ticker_update_latency_cancel_op_cb(u32_t ticker_status,
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static void ticker_update_conn_op_cb(u32_t status, void *param)
+static void ticker_update_conn_op_cb(uint32_t status, void *param)
 {
 	/* Slave drift compensation succeeds, or it fails in a race condition
 	 * when disconnecting or connection update (race between ticker_update
@@ -1647,7 +1647,7 @@ static void ticker_update_conn_op_cb(u32_t status, void *param)
 		  param == ull_disable_mark_get());
 }
 
-static void ticker_stop_conn_op_cb(u32_t status, void *param)
+static void ticker_stop_conn_op_cb(uint32_t status, void *param)
 {
 	LL_ASSERT(status == TICKER_STATUS_SUCCESS);
 
@@ -1656,7 +1656,7 @@ static void ticker_stop_conn_op_cb(u32_t status, void *param)
 	LL_ASSERT(p == param);
 }
 
-static void ticker_start_conn_op_cb(u32_t status, void *param)
+static void ticker_start_conn_op_cb(uint32_t status, void *param)
 {
 	LL_ASSERT(status == TICKER_STATUS_SUCCESS);
 
@@ -1665,9 +1665,9 @@ static void ticker_start_conn_op_cb(u32_t status, void *param)
 	LL_ASSERT(p == param);
 }
 
-static void ticker_op_stop_cb(u32_t status, void *param)
+static void ticker_op_stop_cb(uint32_t status, void *param)
 {
-	u32_t retval;
+	uint32_t retval;
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, tx_lll_flush};
 
@@ -1681,12 +1681,12 @@ static void ticker_op_stop_cb(u32_t status, void *param)
 	LL_ASSERT(!retval);
 }
 
-static inline void disable(u16_t handle)
+static inline void disable(uint16_t handle)
 {
-	volatile u32_t ret_cb = TICKER_STATUS_BUSY;
+	volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
 	struct ll_conn *conn;
 	void *mark;
-	u32_t ret;
+	uint32_t ret;
 
 	conn = ll_conn_get(handle);
 
@@ -1709,11 +1709,11 @@ static inline void disable(u16_t handle)
 	LL_ASSERT(mark == conn);
 }
 
-static void conn_cleanup(struct ll_conn *conn, u8_t reason)
+static void conn_cleanup(struct ll_conn *conn, uint8_t reason)
 {
 	struct lll_conn *lll = &conn->lll;
 	struct node_rx_pdu *rx;
-	u32_t ticker_status;
+	uint32_t ticker_status;
 
 	/* Only termination structure is populated here in ULL context
 	 * but the actual enqueue happens in the LLL context in
@@ -1724,7 +1724,7 @@ static void conn_cleanup(struct ll_conn *conn, u8_t reason)
 	rx = (void *)&conn->llcp_terminate.node_rx;
 	rx->hdr.handle = conn->lll.handle;
 	rx->hdr.type = NODE_RX_TYPE_TERMINATE;
-	*((u8_t *)rx->pdu) = reason;
+	*((uint8_t *)rx->pdu) = reason;
 
 	/* release any llcp reserved rx node */
 	rx = conn->llcp_rx;
@@ -1778,7 +1778,7 @@ static void tx_ull_flush(struct ll_conn *conn)
 static void tx_lll_flush(void *param)
 {
 	struct ll_conn *conn = (void *)HDR_LLL2EVT(param);
-	u16_t handle = ll_conn_handle_get(conn);
+	uint16_t handle = ll_conn_handle_get(conn);
 	struct lll_conn *lll = param;
 	struct node_rx_pdu *rx;
 	struct node_tx *tx;
@@ -1790,7 +1790,7 @@ static void tx_lll_flush(void *param)
 			    (void **)&tx);
 	while (link) {
 		struct lll_tx *lll_tx;
-		u8_t idx;
+		uint8_t idx;
 
 		idx = MFIFO_ENQUEUE_GET(conn_ack, (void **)&lll_tx);
 		LL_ASSERT(lll_tx);
@@ -2068,8 +2068,8 @@ static bool is_enc_req_pause_tx(struct ll_conn *conn)
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 static inline void event_conn_upd_init(struct ll_conn *conn,
-				       u16_t event_counter,
-				       u32_t ticks_at_expire,
+				       uint16_t event_counter,
+				       uint32_t ticks_at_expire,
 				       struct pdu_data *pdu_ctrl_tx,
 				       struct mayfly *mfy_sched_offset,
 				       void (*fp_mfy_select_or_use)(void *))
@@ -2099,7 +2099,7 @@ static inline void event_conn_upd_init(struct ll_conn *conn,
 
 #if defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
 	{
-		u32_t retval;
+		uint32_t retval;
 
 		/* calculate window offset that places the connection in the
 		 * next available slot after existing masters.
@@ -2108,7 +2108,7 @@ static inline void event_conn_upd_init(struct ll_conn *conn,
 
 #if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
 		if (conn->evt.ticks_xtal_to_start & XON_BITMASK) {
-			u32_t ticks_prepare_to_start =
+			uint32_t ticks_prepare_to_start =
 				MAX(conn->evt.ticks_active_to_start,
 				    conn->evt.ticks_preempt_to_start);
 
@@ -2118,7 +2118,7 @@ static inline void event_conn_upd_init(struct ll_conn *conn,
 		}
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 
-		conn->llcp.conn_upd.pdu_win_offset = (u16_t *)
+		conn->llcp.conn_upd.pdu_win_offset = (uint16_t *)
 			&pdu_ctrl_tx->llctrl.conn_update_ind.win_offset;
 
 		mfy_sched_offset->fp = fp_mfy_select_or_use;
@@ -2136,13 +2136,13 @@ static inline void event_conn_upd_init(struct ll_conn *conn,
 #endif /* !CONFIG_BT_CTLR_SCHED_ADVANCED */
 }
 
-static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
-				      u32_t ticks_at_expire)
+static inline int event_conn_upd_prep(struct ll_conn *conn, uint16_t lazy,
+				      uint32_t ticks_at_expire)
 {
 	struct lll_conn *lll = &conn->lll;
 	struct ll_conn *conn_upd;
-	u16_t instant_latency;
-	u16_t event_counter;
+	uint16_t instant_latency;
+	uint16_t event_counter;
 
 
 	conn_upd = conn_upd_curr;
@@ -2212,16 +2212,16 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
 		ctrl_tx_enqueue(conn, tx);
 
 	} else if (instant_latency <= 0x7FFF) {
-		u32_t ticks_win_offset = 0;
-		u32_t ticks_slot_overhead;
-		u16_t conn_interval_old;
-		u16_t conn_interval_new;
-		u32_t conn_interval_us;
+		uint32_t ticks_win_offset = 0;
+		uint32_t ticks_slot_overhead;
+		uint16_t conn_interval_old;
+		uint16_t conn_interval_new;
+		uint32_t conn_interval_us;
 		struct node_rx_pdu *rx;
-		u8_t ticker_id_conn;
-		u32_t ticker_status;
-		u32_t periodic_us;
-		u16_t latency;
+		uint8_t ticker_id_conn;
+		uint32_t ticker_status;
+		uint32_t periodic_us;
+		uint16_t latency;
 
 		/* procedure request acked */
 		conn->llcp_cu.ack = conn->llcp_cu.req;
@@ -2278,7 +2278,7 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
 #if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
 		/* restore to normal prepare */
 		if (conn->evt.ticks_xtal_to_start & XON_BITMASK) {
-			u32_t ticks_prepare_to_start =
+			uint32_t ticks_prepare_to_start =
 				MAX(conn->evt.ticks_active_to_start,
 				    conn->evt.ticks_preempt_to_start);
 
@@ -2396,7 +2396,7 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
 		/* disable ticker job, in order to chain stop and start
 		 * to avoid RTC being stopped if no tickers active.
 		 */
-		u32_t mayfly_was_enabled =
+		uint32_t mayfly_was_enabled =
 			mayfly_is_enabled(TICKER_USER_ID_ULL_HIGH,
 					  TICKER_USER_ID_ULL_LOW);
 		mayfly_enable(TICKER_USER_ID_ULL_HIGH, TICKER_USER_ID_ULL_LOW,
@@ -2454,7 +2454,7 @@ static inline int event_conn_upd_prep(struct ll_conn *conn, u16_t lazy,
 }
 
 static inline void event_ch_map_prep(struct ll_conn *conn,
-				     u16_t event_counter)
+				     uint16_t event_counter)
 {
 	if (conn->llcp.chan_map.initiate) {
 		struct node_tx *tx;
@@ -2552,7 +2552,7 @@ static inline void event_enc_prep(struct ll_conn *conn)
 		    (conn->llcp.encryption.state == LLCP_ENC_STATE_INIT)) {
 			struct node_rx_pdu *rx;
 			struct pdu_data *pdu;
-			u8_t err;
+			uint8_t err;
 
 			/* TODO BT Spec. text: may finalize the sending
 			 * of additional data channel PDUs queued in the
@@ -2798,8 +2798,8 @@ static inline void event_vex_prep(struct ll_conn *conn)
 		tx = mem_acquire(&mem_conn_tx_ctrl.free);
 		if (tx) {
 			struct pdu_data *pdu = (void *)tx->pdu;
-			u16_t cid;
-			u16_t svn;
+			uint16_t cid;
+			uint16_t svn;
 
 			/* procedure request acked, move to waiting state  */
 			conn->llcp_version.ack--;
@@ -2868,8 +2868,8 @@ static inline void event_vex_prep(struct ll_conn *conn)
 
 #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
 static inline void event_conn_param_req(struct ll_conn *conn,
-					u16_t event_counter,
-					u32_t ticks_at_expire)
+					uint16_t event_counter,
+					uint32_t ticks_at_expire)
 {
 	struct pdu_data_llctrl_conn_param_req *p;
 	struct pdu_data *pdu_ctrl_tx;
@@ -2918,13 +2918,13 @@ static inline void event_conn_param_req(struct ll_conn *conn,
 		static memq_link_t s_link;
 		static struct mayfly s_mfy_sched_offset = {0, 0, &s_link, NULL,
 			ull_sched_mfy_free_win_offset_calc};
-		u32_t retval;
+		uint32_t retval;
 
 		conn->llcp_conn_param.ticks_ref = ticks_at_expire;
 
 #if defined(CONFIG_BT_CTLR_XTAL_ADVANCED)
 		if (conn->evt.ticks_xtal_to_start & XON_BITMASK) {
-			u32_t ticks_prepare_to_start =
+			uint32_t ticks_prepare_to_start =
 				MAX(conn->evt.ticks_active_to_start,
 				    conn->evt.ticks_preempt_to_start);
 
@@ -2934,7 +2934,7 @@ static inline void event_conn_param_req(struct ll_conn *conn,
 		}
 #endif /* CONFIG_BT_CTLR_XTAL_ADVANCED */
 
-		conn->llcp_conn_param.pdu_win_offset0 = (u16_t *)&p->offset0;
+		conn->llcp_conn_param.pdu_win_offset0 = (uint16_t *)&p->offset0;
 
 		s_mfy_sched_offset.param = (void *)conn;
 
@@ -3101,8 +3101,8 @@ static inline void event_conn_param_app_req(struct ll_conn *conn)
 }
 
 static inline void event_conn_param_prep(struct ll_conn *conn,
-					 u16_t event_counter,
-					 u32_t ticks_at_expire)
+					 uint16_t event_counter,
+					 uint32_t ticks_at_expire)
 {
 	struct ll_conn *conn_upd;
 
@@ -3168,12 +3168,12 @@ static inline void event_ping_prep(struct ll_conn *conn)
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 static inline void dle_max_time_get(const struct ll_conn *conn,
-				    u16_t *max_rx_time, u16_t *max_tx_time)
+				    uint16_t *max_rx_time, uint16_t *max_tx_time)
 {
-	u32_t feature_coded_phy = 0;
-	u32_t feature_phy_2m = 0;
-	u16_t rx_time = 0;
-	u16_t tx_time = 0;
+	uint32_t feature_coded_phy = 0;
+	uint32_t feature_phy_2m = 0;
+	uint16_t rx_time = 0;
+	uint16_t tx_time = 0;
 
 #if defined(CONFIG_BT_CTLR_PHY)
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
@@ -3248,8 +3248,8 @@ static inline void event_len_prep(struct ll_conn *conn)
 		/*
 		 * initialize to 0 to eliminate compiler warnings
 		 */
-		u16_t rx_time = 0;
-		u16_t tx_time = 0;
+		uint16_t rx_time = 0;
+		uint16_t tx_time = 0;
 
 		tx = mem_acquire(&mem_conn_tx_ctrl.free);
 		if (!tx) {
@@ -3298,7 +3298,7 @@ static inline void event_len_prep(struct ll_conn *conn)
 		struct pdu_data *pdu_ctrl_rx;
 		struct node_rx_pdu *rx;
 		struct lll_conn *lll;
-		u16_t tx_octets;
+		uint16_t tx_octets;
 
 		lll = &conn->lll;
 
@@ -3313,7 +3313,7 @@ static inline void event_len_prep(struct ll_conn *conn)
 		lll->max_rx_time = conn->llcp_length.rx_time;
 
 		/* backup tx time */
-		u16_t tx_time = conn->llcp_length.tx_time;
+		uint16_t tx_time = conn->llcp_length.tx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 
 		/* switch states, to wait for ack, to request cached values or
@@ -3389,10 +3389,10 @@ static inline void event_len_prep(struct ll_conn *conn)
 }
 
 #if defined(CONFIG_BT_CTLR_PHY)
-static u16_t calc_eff_time(u8_t max_octets, u8_t phy, u16_t default_time)
+static uint16_t calc_eff_time(uint8_t max_octets, uint8_t phy, uint16_t default_time)
 {
-	u16_t time = PKT_US(max_octets, phy);
-	u16_t eff_time;
+	uint16_t time = PKT_US(max_octets, phy);
+	uint16_t eff_time;
 
 	eff_time = MAX(PDU_DC_PAYLOAD_TIME_MIN, time);
 	eff_time = MIN(eff_time, default_time);
@@ -3512,7 +3512,7 @@ static inline void event_phy_req_prep(struct ll_conn *conn)
 }
 
 static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
-					  u16_t event_counter)
+					  uint16_t event_counter)
 {
 	struct node_rx_pu *upd;
 
@@ -3606,7 +3606,7 @@ static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
 		    0xFFFF) <= 0x7FFF) {
 		struct lll_conn *lll = &conn->lll;
 		struct node_rx_pdu *rx;
-		u8_t old_tx, old_rx;
+		uint8_t old_tx, old_rx;
 
 		/* procedure request acked */
 		conn->llcp_ack = conn->llcp_req;
@@ -3616,9 +3616,9 @@ static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
 		old_rx = lll->phy_rx;
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-		u16_t eff_tx_time = lll->max_tx_time;
-		u16_t eff_rx_time = lll->max_rx_time;
-		u16_t max_rx_time, max_tx_time;
+		uint16_t eff_tx_time = lll->max_tx_time;
+		uint16_t eff_rx_time = lll->max_rx_time;
+		uint16_t max_rx_time, max_tx_time;
 
 		dle_max_time_get(conn, &max_rx_time, &max_tx_time);
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
@@ -3738,10 +3738,10 @@ static inline void event_phy_upd_ind_prep(struct ll_conn *conn,
 }
 #endif /* CONFIG_BT_CTLR_PHY */
 
-static u8_t conn_upd_recv(struct ll_conn *conn, memq_link_t *link,
+static uint8_t conn_upd_recv(struct ll_conn *conn, memq_link_t *link,
 			  struct node_rx_pdu **rx, struct pdu_data *pdu)
 {
-	u16_t instant;
+	uint16_t instant;
 
 	instant = sys_le16_to_cpu(pdu->llctrl.conn_update_ind.instant);
 	if (((instant - conn->lll.event_counter) & 0xFFFF) > 0x7FFF) {
@@ -3797,11 +3797,11 @@ static u8_t conn_upd_recv(struct ll_conn *conn, memq_link_t *link,
 	return 0;
 }
 
-static u8_t chan_map_upd_recv(struct ll_conn *conn, struct node_rx_pdu *rx,
+static uint8_t chan_map_upd_recv(struct ll_conn *conn, struct node_rx_pdu *rx,
 			      struct pdu_data *pdu)
 {
-	u8_t err = 0U;
-	u16_t instant;
+	uint8_t err = 0U;
+	uint16_t instant;
 
 	instant = sys_le16_to_cpu(pdu->llctrl.chan_map_ind.instant);
 	if (((instant - conn->lll.event_counter) & 0xffff) > 0x7fff) {
@@ -3949,7 +3949,7 @@ static int start_enc_rsp_send(struct ll_conn *conn,
 	return 0;
 }
 
-static inline bool ctrl_is_unexpected(struct ll_conn *conn, u8_t opcode)
+static inline bool ctrl_is_unexpected(struct ll_conn *conn, uint8_t opcode)
 {
 	return (!conn->lll.role &&
 		((!conn->llcp_enc.refresh &&
@@ -3985,7 +3985,7 @@ static inline bool ctrl_is_unexpected(struct ll_conn *conn, u8_t opcode)
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 static int unknown_rsp_send(struct ll_conn *conn, struct node_rx_pdu *rx,
-			    u8_t type)
+			    uint8_t type)
 {
 	struct node_tx *tx;
 	struct pdu_data *pdu;
@@ -4011,9 +4011,9 @@ static int unknown_rsp_send(struct ll_conn *conn, struct node_rx_pdu *rx,
 	return 0;
 }
 
-static inline u32_t feat_get(u8_t *features)
+static inline uint32_t feat_get(uint8_t *features)
 {
-	u32_t feat;
+	uint32_t feat;
 
 	feat = ~LL_FEAT_BIT_MASK_VALID | features[0] |
 	       (features[1] << 8) | (features[2] << 16);
@@ -4026,9 +4026,9 @@ static inline u32_t feat_get(u8_t *features)
  * Perform a logical and on octet0 and keep the remaining bits of the
  * first input parameter
  */
-static inline u32_t feat_land_octet0(u32_t feat_to_keep, u32_t feat_octet0)
+static inline uint32_t feat_land_octet0(uint32_t feat_to_keep, uint32_t feat_octet0)
 {
-	u32_t feat_result;
+	uint32_t feat_result;
 
 	feat_result = feat_to_keep & feat_octet0;
 	feat_result &= 0xFF;
@@ -4043,7 +4043,7 @@ static int feature_rsp_send(struct ll_conn *conn, struct node_rx_pdu *rx,
 	struct pdu_data_llctrl_feature_req *req;
 	struct node_tx *tx;
 	struct pdu_data *pdu_tx;
-	u32_t feat;
+	uint32_t feat;
 
 	/* acquire tx mem */
 	tx = mem_acquire(&mem_conn_tx_ctrl.free);
@@ -4114,7 +4114,7 @@ static void feature_rsp_recv(struct ll_conn *conn, struct pdu_data *pdu_rx)
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
 static int pause_enc_rsp_send(struct ll_conn *conn, struct node_rx_pdu *rx,
-			      u8_t req)
+			      uint8_t req)
 {
 	struct pdu_data *pdu_ctrl_tx;
 	struct node_tx *tx;
@@ -4223,7 +4223,7 @@ static int version_ind_send(struct ll_conn *conn, struct node_rx_pdu *rx,
 
 #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ) || defined(CONFIG_BT_CTLR_PHY)
 static int reject_ext_ind_send(struct ll_conn *conn, struct node_rx_pdu *rx,
-			       u8_t reject_opcode, u8_t error_code)
+			       uint8_t reject_opcode, uint8_t error_code)
 {
 	struct pdu_data *pdu_ctrl_tx;
 	struct node_tx *tx;
@@ -4479,11 +4479,11 @@ static inline void reject_ext_ind_recv(struct ll_conn *conn,
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 #if !defined(CONFIG_BT_CTLR_PHY)
 static void length_resp_send(struct ll_conn *conn, struct node_tx *tx,
-			     u16_t eff_rx_octets, u16_t eff_tx_octets)
+			     uint16_t eff_rx_octets, uint16_t eff_tx_octets)
 #else /* CONFIG_BT_CTLR_PHY */
 static void length_resp_send(struct ll_conn *conn, struct node_tx *tx,
-			     u16_t eff_rx_octets, u16_t eff_rx_time,
-			     u16_t eff_tx_octets, u16_t eff_tx_time)
+			     uint16_t eff_rx_octets, uint16_t eff_rx_time,
+			     uint16_t eff_tx_octets, uint16_t eff_tx_time)
 #endif /* CONFIG_BT_CTLR_PHY */
 {
 	struct pdu_data *pdu_tx;
@@ -4516,11 +4516,11 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link,
 				      struct pdu_data *pdu_rx)
 {
 	struct node_tx *tx = NULL;
-	u16_t eff_rx_octets;
-	u16_t eff_tx_octets;
+	uint16_t eff_rx_octets;
+	uint16_t eff_tx_octets;
 #if defined(CONFIG_BT_CTLR_PHY)
-	u16_t eff_rx_time;
-	u16_t eff_tx_time;
+	uint16_t eff_rx_time;
+	uint16_t eff_tx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 
 	/* Check for free ctrl tx PDU */
@@ -4557,8 +4557,8 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link,
 	       */
 	      (conn->llcp_length.state == LLCP_LENGTH_STATE_RSP_WAIT)))) {
 		struct pdu_data_llctrl_length_req *lr;
-		u16_t max_rx_octets;
-		u16_t max_tx_octets;
+		uint16_t max_rx_octets;
+		uint16_t max_tx_octets;
 
 		lr = &pdu_rx->llctrl.length_req;
 
@@ -4581,9 +4581,9 @@ static inline int length_req_rsp_recv(struct ll_conn *conn, memq_link_t *link,
 		}
 
 #if defined(CONFIG_BT_CTLR_PHY)
-		u16_t max_rx_time;
-		u16_t max_tx_time;
-		u16_t lr_rx_time, lr_tx_time;
+		uint16_t max_rx_time;
+		uint16_t max_tx_time;
+		uint16_t lr_rx_time, lr_tx_time;
 
 		dle_max_time_get(conn, &max_rx_time, &max_tx_time);
 
@@ -4836,12 +4836,12 @@ static int phy_rsp_send(struct ll_conn *conn, struct node_rx_pdu *rx,
 	return 0;
 }
 
-static inline u8_t phy_upd_ind_recv(struct ll_conn *conn, memq_link_t *link,
+static inline uint8_t phy_upd_ind_recv(struct ll_conn *conn, memq_link_t *link,
 				    struct node_rx_pdu **rx,
 				    struct pdu_data *pdu_rx)
 {
 	struct pdu_data_llctrl_phy_upd_ind *ind = &pdu_rx->llctrl.phy_upd_ind;
-	u16_t instant;
+	uint16_t instant;
 
 	/* Both tx and rx PHY unchanged */
 	if (!((ind->m_to_s_phy | ind->s_to_m_phy) & 0x07)) {
@@ -4979,7 +4979,7 @@ static inline void ctrl_tx_ack(struct ll_conn *conn, struct node_tx **tx,
 	switch (pdu_tx->llctrl.opcode) {
 	case PDU_DATA_LLCTRL_TYPE_TERMINATE_IND:
 	{
-		u8_t reason = (pdu_tx->llctrl.terminate_ind.error_code ==
+		uint8_t reason = (pdu_tx->llctrl.terminate_ind.error_code ==
 			       BT_HCI_ERR_REMOTE_USER_TERM_CONN) ?
 			      BT_HCI_ERR_LOCALHOST_TERM_CONN :
 			      pdu_tx->llctrl.terminate_ind.error_code;
@@ -5134,10 +5134,10 @@ static inline void ctrl_tx_ack(struct ll_conn *conn, struct node_tx **tx,
 			 * will be restricted to fit current
 			 * connEffectiveMaxTxTime.
 			 */
-			u8_t phy_tx_time[8] = {BIT(0), BIT(0), BIT(1), BIT(0),
+			uint8_t phy_tx_time[8] = {BIT(0), BIT(0), BIT(1), BIT(0),
 					       BIT(2), BIT(2), BIT(2), BIT(2)};
 			struct lll_conn *lll = &conn->lll;
-			u8_t phys;
+			uint8_t phys;
 
 			phys = conn->llcp_phy.tx | lll->phy_tx;
 			lll->phy_tx_time = phy_tx_time[phys];
@@ -5160,9 +5160,9 @@ static inline void ctrl_tx_ack(struct ll_conn *conn, struct node_tx **tx,
 	}
 }
 
-static inline bool pdu_len_cmp(u8_t opcode, u8_t len)
+static inline bool pdu_len_cmp(uint8_t opcode, uint8_t len)
 {
-	const u8_t ctrl_len_lut[] = {
+	const uint8_t ctrl_len_lut[] = {
 		(offsetof(struct pdu_data_llctrl, conn_update_ind) +
 		 sizeof(struct pdu_data_llctrl_conn_update_ind)),
 		(offsetof(struct pdu_data_llctrl, chan_map_ind) +
@@ -5224,7 +5224,7 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 			  struct pdu_data *pdu_rx, struct ll_conn *conn)
 {
 	int nack = 0;
-	u8_t opcode;
+	uint8_t opcode;
 
 	opcode = pdu_rx->llctrl.opcode;
 
@@ -5244,7 +5244,7 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 	switch (opcode) {
 	case PDU_DATA_LLCTRL_TYPE_CONN_UPDATE_IND:
 	{
-		u8_t err;
+		uint8_t err;
 
 		if (!conn->lll.role ||
 		    !pdu_len_cmp(PDU_DATA_LLCTRL_TYPE_CONN_UPDATE_IND,
@@ -5266,7 +5266,7 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 
 	case PDU_DATA_LLCTRL_TYPE_CHAN_MAP_IND:
 	{
-		u8_t err;
+		uint8_t err;
 
 		if (!conn->lll.role ||
 		    !pdu_len_cmp(PDU_DATA_LLCTRL_TYPE_CHAN_MAP_IND,
@@ -5572,15 +5572,15 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 				struct lll_conn *lll = &conn->lll;
 
 				/* Extract parameters */
-				u16_t interval_min =
+				uint16_t interval_min =
 					sys_le16_to_cpu(cpr->interval_min);
-				u16_t interval_max =
+				uint16_t interval_max =
 					sys_le16_to_cpu(cpr->interval_max);
-				u16_t latency =
+				uint16_t latency =
 					sys_le16_to_cpu(cpr->latency);
-				u16_t timeout =
+				uint16_t timeout =
 					sys_le16_to_cpu(cpr->timeout);
-				u16_t preferred_periodicity =
+				uint16_t preferred_periodicity =
 					cpr->preferred_periodicity;
 
 				/* Invalid parameters */
@@ -5681,11 +5681,11 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 			struct lll_conn *lll = &conn->lll;
 
 			/* Extract parameters */
-			u16_t interval_min = sys_le16_to_cpu(cpr->interval_min);
-			u16_t interval_max = sys_le16_to_cpu(cpr->interval_max);
-			u16_t latency = sys_le16_to_cpu(cpr->latency);
-			u16_t timeout = sys_le16_to_cpu(cpr->timeout);
-			u16_t preferred_periodicity =
+			uint16_t interval_min = sys_le16_to_cpu(cpr->interval_min);
+			uint16_t interval_max = sys_le16_to_cpu(cpr->interval_max);
+			uint16_t latency = sys_le16_to_cpu(cpr->latency);
+			uint16_t timeout = sys_le16_to_cpu(cpr->timeout);
+			uint16_t preferred_periodicity =
 				cpr->preferred_periodicity;
 
 			/* Invalid parameters */
@@ -5777,11 +5777,11 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 				&pdu_rx->llctrl.conn_param_req;
 
 			/* Extract parameters */
-			u16_t interval_min = sys_le16_to_cpu(cpr->interval_min);
-			u16_t interval_max = sys_le16_to_cpu(cpr->interval_max);
-			u16_t latency = sys_le16_to_cpu(cpr->latency);
-			u16_t timeout = sys_le16_to_cpu(cpr->timeout);
-			u16_t preferred_periodicity =
+			uint16_t interval_min = sys_le16_to_cpu(cpr->interval_min);
+			uint16_t interval_max = sys_le16_to_cpu(cpr->interval_max);
+			uint16_t latency = sys_le16_to_cpu(cpr->latency);
+			uint16_t timeout = sys_le16_to_cpu(cpr->timeout);
+			uint16_t preferred_periodicity =
 				cpr->preferred_periodicity;
 
 			/* Invalid parameters */
@@ -6146,7 +6146,7 @@ static inline int ctrl_rx(memq_link_t *link, struct node_rx_pdu **rx,
 
 	case PDU_DATA_LLCTRL_TYPE_PHY_UPD_IND:
 	{
-		u8_t err;
+		uint8_t err;
 
 		if (!conn->lll.role ||
 		    !pdu_len_cmp(PDU_DATA_LLCTRL_TYPE_PHY_UPD_IND,
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
index 85926c488c..5e45a8c1c9 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
@@ -5,7 +5,7 @@
  */
 
 /* Macro to convert time in us to connection interval units */
-#define RADIO_CONN_EVENTS(x, y) ((u16_t)(((x) + (y) - 1) / (y)))
+#define RADIO_CONN_EVENTS(x, y) ((uint16_t)(((x) + (y) - 1) / (y)))
 
 /*
  * Macros to return correct Data Channel PDU time
@@ -57,30 +57,30 @@
 
 struct ll_conn *ll_conn_acquire(void);
 void ll_conn_release(struct ll_conn *conn);
-u16_t ll_conn_handle_get(struct ll_conn *conn);
-struct ll_conn *ll_conn_get(u16_t handle);
-struct ll_conn *ll_connected_get(u16_t handle);
+uint16_t ll_conn_handle_get(struct ll_conn *conn);
+struct ll_conn *ll_conn_get(uint16_t handle);
+struct ll_conn *ll_connected_get(uint16_t handle);
 int ull_conn_init(void);
 int ull_conn_reset(void);
-u8_t ull_conn_chan_map_cpy(u8_t *chan_map);
-void ull_conn_chan_map_set(u8_t *chan_map);
-u16_t ull_conn_default_tx_octets_get(void);
-u16_t ull_conn_default_tx_time_get(void);
-u8_t ull_conn_default_phy_tx_get(void);
-u8_t ull_conn_default_phy_rx_get(void);
+uint8_t ull_conn_chan_map_cpy(uint8_t *chan_map);
+void ull_conn_chan_map_set(uint8_t *chan_map);
+uint16_t ull_conn_default_tx_octets_get(void);
+uint16_t ull_conn_default_tx_time_get(void);
+uint8_t ull_conn_default_phy_tx_get(void);
+uint8_t ull_conn_default_phy_rx_get(void);
 void ull_conn_setup(memq_link_t *link, struct node_rx_hdr *rx);
 int ull_conn_rx(memq_link_t *link, struct node_rx_pdu **rx);
-int ull_conn_llcp(struct ll_conn *conn, u32_t ticks_at_expire, u16_t lazy);
+int ull_conn_llcp(struct ll_conn *conn, uint32_t ticks_at_expire, uint16_t lazy);
 void ull_conn_done(struct node_rx_event_done *done);
-void ull_conn_tx_demux(u8_t count);
-void ull_conn_tx_lll_enqueue(struct ll_conn *conn, u8_t count);
+void ull_conn_tx_demux(uint8_t count);
+void ull_conn_tx_lll_enqueue(struct ll_conn *conn, uint8_t count);
 void ull_conn_link_tx_release(void *link);
-u8_t ull_conn_ack_last_idx_get(void);
-memq_link_t *ull_conn_ack_peek(u8_t *ack_last, u16_t *handle,
+uint8_t ull_conn_ack_last_idx_get(void);
+memq_link_t *ull_conn_ack_peek(uint8_t *ack_last, uint16_t *handle,
 			       struct node_tx **tx);
-memq_link_t *ull_conn_ack_by_last_peek(u8_t last, u16_t *handle,
+memq_link_t *ull_conn_ack_by_last_peek(uint8_t last, uint16_t *handle,
 				       struct node_tx **tx);
 void *ull_conn_ack_dequeue(void);
-struct ll_conn *ull_conn_tx_ack(u16_t handle, memq_link_t *link,
+struct ll_conn *ull_conn_tx_ack(uint16_t handle, memq_link_t *link,
 				struct node_tx *tx);
-u8_t ull_conn_llcp_req(void *conn);
+uint8_t ull_conn_llcp_req(void *conn);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_types.h b/subsys/bluetooth/controller/ll_sw/ull_conn_types.h
index a9fea8cc23..0c236886cb 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_types.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_types.h
@@ -35,74 +35,74 @@ struct ll_conn {
 	struct ull_hdr  ull;
 	struct lll_conn lll;
 
-	u16_t connect_expire;
-	u16_t supervision_reload;
-	u16_t supervision_expire;
-	u16_t procedure_reload;
-	u16_t procedure_expire;
+	uint16_t connect_expire;
+	uint16_t supervision_reload;
+	uint16_t supervision_expire;
+	uint16_t procedure_reload;
+	uint16_t procedure_expire;
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
-	u16_t appto_reload;
-	u16_t appto_expire;
-	u16_t apto_reload;
-	u16_t apto_expire;
+	uint16_t appto_reload;
+	uint16_t appto_expire;
+	uint16_t apto_reload;
+	uint16_t apto_expire;
 #endif /* CONFIG_BT_CTLR_LE_PING */
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-	u16_t default_tx_octets;
+	uint16_t default_tx_octets;
 
 #if defined(CONFIG_BT_CTLR_PHY)
-	u16_t default_tx_time;
+	uint16_t default_tx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 #endif /* CONFIG_BT_CTLR_DATA_LENGTH */
 
 	union {
 		struct {
-			u8_t fex_valid:1;
+			uint8_t fex_valid:1;
 		} common;
 
 #if defined(CONFIG_BT_PERIPHERAL)
 		struct {
-			u8_t  fex_valid:1;
-			u8_t  latency_cancel:1;
-			u8_t  sca:3;
-			u32_t force;
-			u32_t ticks_to_offset;
+			uint8_t  fex_valid:1;
+			uint8_t  latency_cancel:1;
+			uint8_t  sca:3;
+			uint32_t force;
+			uint32_t ticks_to_offset;
 		} slave;
 #endif /* CONFIG_BT_PERIPHERAL */
 
 #if defined(CONFIG_BT_CENTRAL)
 		struct {
-			u8_t fex_valid:1;
-			u8_t terminate_ack:1;
+			uint8_t fex_valid:1;
+			uint8_t terminate_ack:1;
 		} master;
 #endif /* CONFIG_BT_CENTRAL */
 	};
 
-	u8_t llcp_req;
-	u8_t llcp_ack;
-	u8_t llcp_type;
+	uint8_t llcp_req;
+	uint8_t llcp_ack;
+	uint8_t llcp_type;
 
 	union {
 		struct {
-			u16_t instant;
-			u16_t *pdu_win_offset;
-			u32_t ticks_anchor;
+			uint16_t instant;
+			uint16_t *pdu_win_offset;
+			uint32_t ticks_anchor;
 		} conn_upd;
 
 		struct {
-			u8_t  initiate:1;
-			u8_t  chm[5];
-			u16_t instant;
+			uint8_t  initiate:1;
+			uint8_t  chm[5];
+			uint16_t instant;
 		} chan_map;
 
 #if defined(CONFIG_BT_CTLR_PHY)
 		struct {
-			u8_t initiate:1;
-			u8_t cmd:1;
-			u8_t tx:3;
-			u8_t rx:3;
-			u16_t instant;
+			uint8_t initiate:1;
+			uint8_t cmd:1;
+			uint8_t tx:3;
+			uint8_t rx:3;
+			uint16_t instant;
 		} phy_upd_ind;
 #endif /* CONFIG_BT_CTLR_PHY */
 
@@ -113,8 +113,8 @@ struct ll_conn {
 				LLCP_ENC_STATE_INIT,
 				LLCP_ENC_STATE_LTK_WAIT,
 			} state:2 __packed;
-			u8_t  error_code;
-			u8_t  skd[16];
+			uint8_t  error_code;
+			uint8_t  skd[16];
 		} encryption;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 	} llcp;
@@ -122,66 +122,66 @@ struct ll_conn {
 	struct node_rx_pdu *llcp_rx;
 
 	struct {
-		u8_t  req;
-		u8_t  ack;
+		uint8_t  req;
+		uint8_t  ack;
 		enum {
 			LLCP_CUI_STATE_INPROG,
 			LLCP_CUI_STATE_USE,
 			LLCP_CUI_STATE_SELECT
 		} state:2 __packed;
-		u8_t  cmd:1;
-		u16_t interval;
-		u16_t latency;
-		u16_t timeout;
-		u32_t win_offset_us;
-		u8_t  win_size;
+		uint8_t  cmd:1;
+		uint16_t interval;
+		uint16_t latency;
+		uint16_t timeout;
+		uint32_t win_offset_us;
+		uint8_t  win_size;
 	} llcp_cu;
 
 	struct {
-		u8_t  req;
-		u8_t  ack;
-		u32_t features_conn;
-		u32_t features_peer;
+		uint8_t  req;
+		uint8_t  ack;
+		uint32_t features_conn;
+		uint32_t features_peer;
 	} llcp_feature;
 
 	struct {
-		u8_t  req;
-		u8_t  ack;
-		u8_t  tx:1;
-		u8_t  rx:1;
-		u8_t  version_number;
-		u16_t company_id;
-		u16_t sub_version_number;
+		uint8_t  req;
+		uint8_t  ack;
+		uint8_t  tx:1;
+		uint8_t  rx:1;
+		uint8_t  version_number;
+		uint16_t company_id;
+		uint16_t sub_version_number;
 	} llcp_version;
 
 	struct {
-		u8_t req;
-		u8_t ack;
-		u8_t reason_own;
-		u8_t reason_peer;
+		uint8_t req;
+		uint8_t ack;
+		uint8_t reason_own;
+		uint8_t reason_peer;
 		struct {
 			struct node_rx_hdr hdr;
-			u8_t reason;
+			uint8_t reason;
 		} node_rx;
 	} llcp_terminate;
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
 	struct {
-		u8_t req;
-		u8_t ack;
-		u8_t pause_rx:1;
-		u8_t pause_tx:1;
-		u8_t refresh:1;
-		u8_t ediv[2];
-		u8_t rand[8];
-		u8_t ltk[16];
+		uint8_t req;
+		uint8_t ack;
+		uint8_t pause_rx:1;
+		uint8_t pause_tx:1;
+		uint8_t refresh:1;
+		uint8_t ediv[2];
+		uint8_t rand[8];
+		uint8_t ltk[16];
 	} llcp_enc;
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 #if defined(CONFIG_BT_CTLR_CONN_PARAM_REQ)
 	struct {
-		u8_t  req;
-		u8_t  ack;
+		uint8_t  req;
+		uint8_t  ack;
 		enum {
 			LLCP_CPR_STATE_REQ,
 			LLCP_CPR_STATE_RSP,
@@ -190,32 +190,32 @@ struct ll_conn {
 			LLCP_CPR_STATE_RSP_WAIT,
 			LLCP_CPR_STATE_UPD
 		} state:3 __packed;
-		u8_t  cmd:1;
-		u8_t  disabled:1;
-		u8_t  status;
-		u16_t interval_min;
-		u16_t interval_max;
-		u16_t latency;
-		u16_t timeout;
-		u8_t  preferred_periodicity;
-		u16_t reference_conn_event_count;
-		u16_t offset0;
-		u16_t offset1;
-		u16_t offset2;
-		u16_t offset3;
-		u16_t offset4;
-		u16_t offset5;
-		u16_t *pdu_win_offset0;
-		u32_t ticks_ref;
-		u32_t ticks_to_offset_next;
+		uint8_t  cmd:1;
+		uint8_t  disabled:1;
+		uint8_t  status;
+		uint16_t interval_min;
+		uint16_t interval_max;
+		uint16_t latency;
+		uint16_t timeout;
+		uint8_t  preferred_periodicity;
+		uint16_t reference_conn_event_count;
+		uint16_t offset0;
+		uint16_t offset1;
+		uint16_t offset2;
+		uint16_t offset3;
+		uint16_t offset4;
+		uint16_t offset5;
+		uint16_t *pdu_win_offset0;
+		uint32_t ticks_ref;
+		uint32_t ticks_to_offset_next;
 	} llcp_conn_param;
 #endif /* CONFIG_BT_CTLR_CONN_PARAM_REQ */
 
 #if defined(CONFIG_BT_CTLR_DATA_LENGTH)
 	struct {
-		u8_t  req;
-		u8_t  ack;
-		u8_t  state:3;
+		uint8_t  req;
+		uint8_t  ack;
+		uint8_t  state:3;
 #define LLCP_LENGTH_STATE_REQ                 0
 #define LLCP_LENGTH_STATE_REQ_ACK_WAIT        1
 #define LLCP_LENGTH_STATE_RSP_WAIT            2
@@ -223,17 +223,17 @@ struct ll_conn {
 #define LLCP_LENGTH_STATE_RESIZE              4
 #define LLCP_LENGTH_STATE_RESIZE_RSP          5
 #define LLCP_LENGTH_STATE_RESIZE_RSP_ACK_WAIT 6
-		u8_t  disabled:1;
-		u16_t rx_octets;
-		u16_t tx_octets;
+		uint8_t  disabled:1;
+		uint16_t rx_octets;
+		uint16_t tx_octets;
 #if defined(CONFIG_BT_CTLR_PHY)
-		u16_t rx_time;
-		u16_t tx_time;
+		uint16_t rx_time;
+		uint16_t tx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 		struct {
-			u16_t tx_octets;
+			uint16_t tx_octets;
 #if defined(CONFIG_BT_CTLR_PHY)
-			u16_t tx_time;
+			uint16_t tx_time;
 #endif /* CONFIG_BT_CTLR_PHY */
 		} cache;
 	} llcp_length;
@@ -241,29 +241,29 @@ struct ll_conn {
 
 #if defined(CONFIG_BT_CTLR_PHY)
 	struct {
-		u8_t req;
-		u8_t ack;
-		u8_t state:2;
+		uint8_t req;
+		uint8_t ack;
+		uint8_t state:2;
 #define LLCP_PHY_STATE_REQ      0
 #define LLCP_PHY_STATE_ACK_WAIT 1
 #define LLCP_PHY_STATE_RSP_WAIT 2
 #define LLCP_PHY_STATE_UPD      3
-		u8_t tx:3;
-		u8_t rx:3;
-		u8_t pause_tx:1;
-		u8_t flags:1;
-		u8_t cmd:1;
-		u8_t disabled:1;
+		uint8_t tx:3;
+		uint8_t rx:3;
+		uint8_t pause_tx:1;
+		uint8_t flags:1;
+		uint8_t cmd:1;
+		uint8_t disabled:1;
 	} llcp_phy;
 
-	u8_t phy_pref_tx:3;
-	u8_t phy_pref_flags:1;
-	u8_t phy_pref_rx:3;
+	uint8_t phy_pref_tx:3;
+	uint8_t phy_pref_flags:1;
+	uint8_t phy_pref_rx:3;
 #endif /* CONFIG_BT_CTLR_PHY */
 
 #if defined(CONFIG_BT_CTLR_LLID_DATA_START_EMPTY)
 	/* Detect empty L2CAP start frame */
-	u8_t  start_empty:1;
+	uint8_t  start_empty:1;
 #endif /* CONFIG_BT_CTLR_LLID_DATA_START_EMPTY */
 
 	struct node_tx *tx_head;
@@ -272,37 +272,37 @@ struct ll_conn {
 	struct node_tx *tx_data;
 	struct node_tx *tx_data_last;
 
-	u8_t chm_updated;
+	uint8_t chm_updated;
 };
 
 struct node_rx_cc {
-	u8_t  status;
-	u8_t  role;
-	u8_t  peer_addr_type;
-	u8_t  peer_addr[BDADDR_SIZE];
+	uint8_t  status;
+	uint8_t  role;
+	uint8_t  peer_addr_type;
+	uint8_t  peer_addr[BDADDR_SIZE];
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t  peer_rpa[BDADDR_SIZE];
-	u8_t  local_rpa[BDADDR_SIZE];
+	uint8_t  peer_rpa[BDADDR_SIZE];
+	uint8_t  local_rpa[BDADDR_SIZE];
 #endif /* CONFIG_BT_CTLR_PRIVACY */
-	u16_t interval;
-	u16_t latency;
-	u16_t timeout;
-	u8_t  sca;
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
+	uint8_t  sca;
 };
 
 struct node_rx_cu {
-	u8_t  status;
-	u16_t interval;
-	u16_t latency;
-	u16_t timeout;
+	uint8_t  status;
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
 };
 
 struct node_rx_cs {
-	u8_t csa;
+	uint8_t csa;
 };
 
 struct node_rx_pu {
-	u8_t status;
-	u8_t tx;
-	u8_t rx;
+	uint8_t status;
+	uint8_t tx;
+	uint8_t rx;
 };
diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.c b/subsys/bluetooth/controller/ll_sw/ull_filter.c
index b0bddffb31..2762bb11ea 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_filter.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_filter.c
@@ -43,7 +43,7 @@
 
 /* Hardware whitelist */
 static struct lll_filter wl_filter;
-u8_t wl_anon;
+uint8_t wl_anon;
 
 #define IRK_SIZE 16
 
@@ -53,15 +53,15 @@ u8_t wl_anon;
 /* Whitelist peer list */
 static struct lll_whitelist wl[WL_SIZE];
 
-static u8_t rl_enable;
+static uint8_t rl_enable;
 
 static struct lll_resolvelist rl[CONFIG_BT_CTLR_RL_SIZE];
 
 #if defined(CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY)
 /* Cache of known unknown peer RPAs */
-static u8_t newest_prpa;
+static uint8_t newest_prpa;
 static struct prpa_cache_dev {
-	u8_t      taken:1;
+	uint8_t      taken:1;
 	bt_addr_t rpa;
 } prpa_cache[CONFIG_BT_CTLR_RPA_CACHE_SIZE];
 
@@ -74,14 +74,14 @@ struct prpa_resolve_work {
 struct target_resolve_work {
 	struct k_work target_work;
 	bt_addr_t rpa;
-	u8_t      idx;
+	uint8_t      idx;
 	resolve_callback_t cb;
 };
 #endif /* CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY */
 
-static u8_t peer_irks[CONFIG_BT_CTLR_RL_SIZE][IRK_SIZE];
-static u8_t peer_irk_rl_ids[CONFIG_BT_CTLR_RL_SIZE];
-static u8_t peer_irk_count;
+static uint8_t peer_irks[CONFIG_BT_CTLR_RL_SIZE][IRK_SIZE];
+static uint8_t peer_irk_rl_ids[CONFIG_BT_CTLR_RL_SIZE];
+static uint8_t peer_irk_count;
 
 static bt_addr_t local_rpas[CONFIG_BT_CTLR_RL_SIZE];
 
@@ -98,8 +98,8 @@ BUILD_ASSERT(ARRAY_SIZE(rl) < FILTER_IDX_NONE);
 static struct lll_filter rl_filter;
 
 #define DEFAULT_RPA_TIMEOUT_MS (900 * 1000)
-static u32_t rpa_timeout_ms;
-static s64_t rpa_last_ms;
+static uint32_t rpa_timeout_ms;
+static int64_t rpa_last_ms;
 
 static struct k_delayed_work rpa_work;
 
@@ -108,9 +108,9 @@ static struct k_delayed_work rpa_work;
 		    !memcmp(list[i].id_addr.val, addr, BDADDR_SIZE))
 
 static void wl_clear(void);
-static u8_t wl_find(u8_t addr_type, u8_t *addr, u8_t *free);
-static u32_t wl_add(bt_addr_le_t *id_addr);
-static u32_t wl_remove(bt_addr_le_t *id_addr);
+static uint8_t wl_find(uint8_t addr_type, uint8_t *addr, uint8_t *free);
+static uint32_t wl_add(bt_addr_le_t *id_addr);
+static uint32_t wl_remove(bt_addr_le_t *id_addr);
 static void wl_update(void);
 
 static void rl_clear(void);
@@ -124,31 +124,31 @@ static void rpa_timeout(struct k_work *work);
 static void rpa_refresh_start(void);
 static void rpa_refresh_stop(void);
 #else /* !CONFIG_BT_CTLR_PRIVACY */
-static u32_t filter_add(struct lll_filter *filter, u8_t addr_type,
-			u8_t *bdaddr);
-static u32_t filter_remove(struct lll_filter *filter, u8_t addr_type,
-			   u8_t *bdaddr);
+static uint32_t filter_add(struct lll_filter *filter, uint8_t addr_type,
+			uint8_t *bdaddr);
+static uint32_t filter_remove(struct lll_filter *filter, uint8_t addr_type,
+			   uint8_t *bdaddr);
 #endif /* !CONFIG_BT_CTLR_PRIVACY */
 
-static void filter_insert(struct lll_filter *filter, int index, u8_t addr_type,
-			   u8_t *bdaddr);
+static void filter_insert(struct lll_filter *filter, int index, uint8_t addr_type,
+			   uint8_t *bdaddr);
 static void filter_clear(struct lll_filter *filter);
 
 #if defined(CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY)
 static void prpa_cache_clear(void);
-static u8_t prpa_cache_find(bt_addr_t *prpa_cache_addr);
+static uint8_t prpa_cache_find(bt_addr_t *prpa_cache_addr);
 static void prpa_cache_add(bt_addr_t *prpa_cache_addr);
-static u8_t prpa_cache_try_resolve(bt_addr_t *rpa);
+static uint8_t prpa_cache_try_resolve(bt_addr_t *rpa);
 static void prpa_cache_resolve(struct k_work *work);
 static void target_resolve(struct k_work *work);
 #endif /* CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY */
 
-u8_t ll_wl_size_get(void)
+uint8_t ll_wl_size_get(void)
 {
 	return WL_SIZE;
 }
 
-u8_t ll_wl_clear(void)
+uint8_t ll_wl_clear(void)
 {
 #if defined(CONFIG_BT_BROADCASTER)
 	if (ull_adv_filter_pol_get(0)) {
@@ -173,7 +173,7 @@ u8_t ll_wl_clear(void)
 	return 0;
 }
 
-u8_t ll_wl_add(bt_addr_le_t *addr)
+uint8_t ll_wl_add(bt_addr_le_t *addr)
 {
 #if defined(CONFIG_BT_BROADCASTER)
 	if (ull_adv_filter_pol_get(0)) {
@@ -199,7 +199,7 @@ u8_t ll_wl_add(bt_addr_le_t *addr)
 #endif /* CONFIG_BT_CTLR_PRIVACY */
 }
 
-u8_t ll_wl_remove(bt_addr_le_t *addr)
+uint8_t ll_wl_remove(bt_addr_le_t *addr)
 {
 #if defined(CONFIG_BT_BROADCASTER)
 	if (ull_adv_filter_pol_get(0)) {
@@ -226,7 +226,7 @@ u8_t ll_wl_remove(bt_addr_le_t *addr)
 }
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-void ll_rl_id_addr_get(u8_t rl_idx, u8_t *id_addr_type, u8_t *id_addr)
+void ll_rl_id_addr_get(uint8_t rl_idx, uint8_t *id_addr_type, uint8_t *id_addr)
 {
 	LL_ASSERT(rl_idx < CONFIG_BT_CTLR_RL_SIZE);
 	LL_ASSERT(rl[rl_idx].taken);
@@ -235,12 +235,12 @@ void ll_rl_id_addr_get(u8_t rl_idx, u8_t *id_addr_type, u8_t *id_addr)
 	memcpy(id_addr, rl[rl_idx].id_addr.val, BDADDR_SIZE);
 }
 
-u8_t ll_rl_size_get(void)
+uint8_t ll_rl_size_get(void)
 {
 	return CONFIG_BT_CTLR_RL_SIZE;
 }
 
-u8_t ll_rl_clear(void)
+uint8_t ll_rl_clear(void)
 {
 	if (!rl_access_check(false)) {
 		return BT_HCI_ERR_CMD_DISALLOWED;
@@ -251,10 +251,10 @@ u8_t ll_rl_clear(void)
 	return 0;
 }
 
-u8_t ll_rl_add(bt_addr_le_t *id_addr, const u8_t pirk[IRK_SIZE],
-	       const u8_t lirk[IRK_SIZE])
+uint8_t ll_rl_add(bt_addr_le_t *id_addr, const uint8_t pirk[IRK_SIZE],
+	       const uint8_t lirk[IRK_SIZE])
 {
-	u8_t i, j;
+	uint8_t i, j;
 
 	if (!rl_access_check(false)) {
 		return BT_HCI_ERR_CMD_DISALLOWED;
@@ -274,8 +274,8 @@ u8_t ll_rl_add(bt_addr_le_t *id_addr, const u8_t pirk[IRK_SIZE],
 
 	bt_addr_copy(&rl[i].id_addr, &id_addr->a);
 	rl[i].id_addr_type = id_addr->type & 0x1;
-	rl[i].pirk = mem_nz((u8_t *)pirk, IRK_SIZE);
-	rl[i].lirk = mem_nz((u8_t *)lirk, IRK_SIZE);
+	rl[i].pirk = mem_nz((uint8_t *)pirk, IRK_SIZE);
+	rl[i].lirk = mem_nz((uint8_t *)lirk, IRK_SIZE);
 	if (rl[i].pirk) {
 		/* cross-reference */
 		rl[i].pirk_idx = peer_irk_count;
@@ -311,9 +311,9 @@ u8_t ll_rl_add(bt_addr_le_t *id_addr, const u8_t pirk[IRK_SIZE],
 	return 0;
 }
 
-u8_t ll_rl_remove(bt_addr_le_t *id_addr)
+uint8_t ll_rl_remove(bt_addr_le_t *id_addr)
 {
-	u8_t i;
+	uint8_t i;
 
 	if (!rl_access_check(false)) {
 		return BT_HCI_ERR_CMD_DISALLOWED;
@@ -322,11 +322,11 @@ u8_t ll_rl_remove(bt_addr_le_t *id_addr)
 	/* find the device and mark it as empty */
 	i = ull_filter_rl_find(id_addr->type, id_addr->a.val, NULL);
 	if (i < ARRAY_SIZE(rl)) {
-		u8_t j, k;
+		uint8_t j, k;
 
 		if (rl[i].pirk) {
 			/* Swap with last item */
-			u8_t pi = rl[i].pirk_idx, pj = peer_irk_count - 1;
+			uint8_t pi = rl[i].pirk_idx, pj = peer_irk_count - 1;
 
 			if (pj && pi != pj) {
 				memcpy(peer_irks[pi], peer_irks[pj], IRK_SIZE);
@@ -357,7 +357,7 @@ u8_t ll_rl_remove(bt_addr_le_t *id_addr)
 	return BT_HCI_ERR_UNKNOWN_CONN_ID;
 }
 
-void ll_rl_crpa_set(u8_t id_addr_type, u8_t *id_addr, u8_t rl_idx, u8_t *crpa)
+void ll_rl_crpa_set(uint8_t id_addr_type, uint8_t *id_addr, uint8_t rl_idx, uint8_t *crpa)
 {
 	if ((crpa[5] & 0xc0) == 0x40) {
 
@@ -373,9 +373,9 @@ void ll_rl_crpa_set(u8_t id_addr_type, u8_t *id_addr, u8_t rl_idx, u8_t *crpa)
 	}
 }
 
-u8_t ll_rl_crpa_get(bt_addr_le_t *id_addr, bt_addr_t *crpa)
+uint8_t ll_rl_crpa_get(bt_addr_le_t *id_addr, bt_addr_t *crpa)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* find the device and return its RPA */
 	i = ull_filter_rl_find(id_addr->type, id_addr->a.val, NULL);
@@ -388,9 +388,9 @@ u8_t ll_rl_crpa_get(bt_addr_le_t *id_addr, bt_addr_t *crpa)
 	return BT_HCI_ERR_UNKNOWN_CONN_ID;
 }
 
-u8_t ll_rl_lrpa_get(bt_addr_le_t *id_addr, bt_addr_t *lrpa)
+uint8_t ll_rl_lrpa_get(bt_addr_le_t *id_addr, bt_addr_t *lrpa)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* find the device and return the local RPA */
 	i = ull_filter_rl_find(id_addr->type, id_addr->a.val, NULL);
@@ -402,7 +402,7 @@ u8_t ll_rl_lrpa_get(bt_addr_le_t *id_addr, bt_addr_t *lrpa)
 	return BT_HCI_ERR_UNKNOWN_CONN_ID;
 }
 
-u8_t ll_rl_enable(u8_t enable)
+uint8_t ll_rl_enable(uint8_t enable)
 {
 	if (!rl_access_check(false)) {
 		return BT_HCI_ERR_CMD_DISALLOWED;
@@ -422,14 +422,14 @@ u8_t ll_rl_enable(u8_t enable)
 	return 0;
 }
 
-void ll_rl_timeout_set(u16_t timeout)
+void ll_rl_timeout_set(uint16_t timeout)
 {
 	rpa_timeout_ms = timeout * 1000U;
 }
 
-u8_t ll_priv_mode_set(bt_addr_le_t *id_addr, u8_t mode)
+uint8_t ll_priv_mode_set(bt_addr_le_t *id_addr, uint8_t mode)
 {
-	u8_t i;
+	uint8_t i;
 
 	if (!rl_access_check(false)) {
 		return BT_HCI_ERR_CMD_DISALLOWED;
@@ -455,7 +455,7 @@ u8_t ll_priv_mode_set(bt_addr_le_t *id_addr, u8_t mode)
 	return 0;
 }
 
-void ull_filter_adv_scan_state_cb(u8_t bm)
+void ull_filter_adv_scan_state_cb(uint8_t bm)
 {
 	if (bm) {
 		rpa_refresh_start();
@@ -464,7 +464,7 @@ void ull_filter_adv_scan_state_cb(u8_t bm)
 	}
 }
 
-void ull_filter_adv_update(u8_t adv_fp)
+void ull_filter_adv_update(uint8_t adv_fp)
 {
 	/* Clear before populating filter */
 	filter_clear(&wl_filter);
@@ -487,7 +487,7 @@ void ull_filter_adv_update(u8_t adv_fp)
 	}
 }
 
-void ull_filter_scan_update(u8_t scan_fp)
+void ull_filter_scan_update(uint8_t scan_fp)
 {
 	/* Clear before populating filter */
 	filter_clear(&wl_filter);
@@ -512,9 +512,9 @@ void ull_filter_scan_update(u8_t scan_fp)
 
 void ull_filter_rpa_update(bool timeout)
 {
-	u8_t i;
+	uint8_t i;
 	int err;
-	s64_t now = k_uptime_get();
+	int64_t now = k_uptime_get();
 	bool all = timeout || (rpa_last_ms == -1) ||
 		   (now - rpa_last_ms >= rpa_timeout_ms);
 	BT_DBG("");
@@ -523,7 +523,7 @@ void ull_filter_rpa_update(bool timeout)
 		if ((rl[i].taken) && (all || !rl[i].rpas_ready)) {
 
 			if (rl[i].pirk) {
-				u8_t irk[IRK_SIZE];
+				uint8_t irk[IRK_SIZE];
 
 				/* TODO: move this swap to the driver level */
 				sys_memcpy_swap(irk, peer_irks[rl[i].pirk_idx],
@@ -576,10 +576,10 @@ void ull_filter_rpa_update(bool timeout)
 #if defined(CONFIG_BT_BROADCASTER)
 void ull_filter_adv_pdu_update(struct ll_adv_set *adv, struct pdu_adv *pdu)
 {
-	u8_t *adva = pdu->type == PDU_ADV_TYPE_SCAN_RSP ?
+	uint8_t *adva = pdu->type == PDU_ADV_TYPE_SCAN_RSP ?
 				  &pdu->scan_rsp.addr[0] :
 				  &pdu->adv_ind.addr[0];
-	u8_t idx = adv->lll.rl_idx;
+	uint8_t idx = adv->lll.rl_idx;
 
 	/* AdvA */
 	if (idx < ARRAY_SIZE(rl) && rl[idx].lirk) {
@@ -606,9 +606,9 @@ void ull_filter_adv_pdu_update(struct ll_adv_set *adv, struct pdu_adv *pdu)
 }
 #endif /* CONFIG_BT_BROADCASTER */
 
-u8_t ull_filter_rl_find(u8_t id_addr_type, u8_t *id_addr, u8_t *free)
+uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t *id_addr, uint8_t *free)
 {
-	u8_t i;
+	uint8_t i;
 
 	if (free) {
 		*free = FILTER_IDX_NONE;
@@ -655,12 +655,12 @@ void ull_filter_reset(bool init)
 }
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-bool ull_filter_lll_lrpa_used(u8_t rl_idx)
+bool ull_filter_lll_lrpa_used(uint8_t rl_idx)
 {
 	return rl_idx < ARRAY_SIZE(rl) && rl[rl_idx].lirk;
 }
 
-bt_addr_t *ull_filter_lll_lrpa_get(u8_t rl_idx)
+bt_addr_t *ull_filter_lll_lrpa_get(uint8_t rl_idx)
 {
 	if ((rl_idx >= ARRAY_SIZE(rl)) || !rl[rl_idx].lirk ||
 	    !rl[rl_idx].rpas_ready) {
@@ -670,15 +670,15 @@ bt_addr_t *ull_filter_lll_lrpa_get(u8_t rl_idx)
 	return rl[rl_idx].local_rpa;
 }
 
-u8_t *ull_filter_lll_irks_get(u8_t *count)
+uint8_t *ull_filter_lll_irks_get(uint8_t *count)
 {
 	*count = peer_irk_count;
-	return (u8_t *)peer_irks;
+	return (uint8_t *)peer_irks;
 }
 
-u8_t ull_filter_lll_rl_idx(bool whitelist, u8_t devmatch_id)
+uint8_t ull_filter_lll_rl_idx(bool whitelist, uint8_t devmatch_id)
 {
-	u8_t i;
+	uint8_t i;
 
 	if (whitelist) {
 		LL_ASSERT(devmatch_id < ARRAY_SIZE(wl));
@@ -693,9 +693,9 @@ u8_t ull_filter_lll_rl_idx(bool whitelist, u8_t devmatch_id)
 	return i;
 }
 
-u8_t ull_filter_lll_rl_irk_idx(u8_t irkmatch_id)
+uint8_t ull_filter_lll_rl_irk_idx(uint8_t irkmatch_id)
 {
-	u8_t i;
+	uint8_t i;
 
 	LL_ASSERT(irkmatch_id < peer_irk_count);
 	i = peer_irk_rl_ids[irkmatch_id];
@@ -705,7 +705,7 @@ u8_t ull_filter_lll_rl_irk_idx(u8_t irkmatch_id)
 	return i;
 }
 
-bool ull_filter_lll_irk_whitelisted(u8_t rl_idx)
+bool ull_filter_lll_irk_whitelisted(uint8_t rl_idx)
 {
 	if (rl_idx >= ARRAY_SIZE(rl)) {
 		return false;
@@ -741,7 +741,7 @@ struct lll_resolvelist *ull_filter_lll_resolvelist_get(void)
 	return rl;
 }
 
-bool ull_filter_lll_rl_idx_allowed(u8_t irkmatch_ok, u8_t rl_idx)
+bool ull_filter_lll_rl_idx_allowed(uint8_t irkmatch_ok, uint8_t rl_idx)
 {
 	/* If AR is disabled or we don't know the device or we matched an IRK
 	 * then we're all set.
@@ -756,9 +756,9 @@ bool ull_filter_lll_rl_idx_allowed(u8_t irkmatch_ok, u8_t rl_idx)
 	return !rl[rl_idx].pirk || rl[rl_idx].dev;
 }
 
-bool ull_filter_lll_rl_addr_allowed(u8_t id_addr_type, u8_t *id_addr, u8_t *rl_idx)
+bool ull_filter_lll_rl_addr_allowed(uint8_t id_addr_type, uint8_t *id_addr, uint8_t *rl_idx)
 {
-	u8_t i, j;
+	uint8_t i, j;
 
 	/* If AR is disabled or we matched an IRK then we're all set. No hw
 	 * filters are used in this case.
@@ -769,7 +769,7 @@ bool ull_filter_lll_rl_addr_allowed(u8_t id_addr_type, u8_t *id_addr, u8_t *rl_i
 
 	for (i = 0U; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
 		if (rl[i].taken && (rl[i].id_addr_type == id_addr_type)) {
-			u8_t *addr = rl[i].id_addr.val;
+			uint8_t *addr = rl[i].id_addr.val;
 
 			for (j = 0U; j < BDADDR_SIZE; j++) {
 				if (addr[j] != id_addr[j]) {
@@ -787,7 +787,7 @@ bool ull_filter_lll_rl_addr_allowed(u8_t id_addr_type, u8_t *id_addr, u8_t *rl_i
 	return true;
 }
 
-bool ull_filter_lll_rl_addr_resolve(u8_t id_addr_type, u8_t *id_addr, u8_t rl_idx)
+bool ull_filter_lll_rl_addr_resolve(uint8_t id_addr_type, uint8_t *id_addr, uint8_t rl_idx)
 {
 	/* Unable to resolve if AR is disabled, no RL entry or no local IRK */
 	if (!rl_enable || rl_idx >= ARRAY_SIZE(rl) || !rl[rl_idx].lirk) {
@@ -808,7 +808,7 @@ bool ull_filter_lll_rl_enabled(void)
 }
 
 #if defined(CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY)
-u8_t ull_filter_deferred_resolve(bt_addr_t *rpa, resolve_callback_t cb)
+uint8_t ull_filter_deferred_resolve(bt_addr_t *rpa, resolve_callback_t cb)
 {
 	LL_ASSERT(rl_enable);
 
@@ -825,7 +825,7 @@ u8_t ull_filter_deferred_resolve(bt_addr_t *rpa, resolve_callback_t cb)
 	return 0;
 }
 
-u8_t ull_filter_deferred_targeta_resolve(bt_addr_t *rpa, u8_t rl_idx,
+uint8_t ull_filter_deferred_targeta_resolve(bt_addr_t *rpa, uint8_t rl_idx,
 					 resolve_callback_t cb)
 {
 	LL_ASSERT(rl_enable);
@@ -848,7 +848,7 @@ u8_t ull_filter_deferred_targeta_resolve(bt_addr_t *rpa, u8_t rl_idx,
 static void wl_clear(void)
 {
 	for (int i = 0; i < WL_SIZE; i++) {
-		u8_t j = wl[i].rl_idx;
+		uint8_t j = wl[i].rl_idx;
 
 		if (j < ARRAY_SIZE(rl)) {
 			rl[j].wl = 0U;
@@ -857,7 +857,7 @@ static void wl_clear(void)
 	}
 }
 
-static u8_t wl_find(u8_t addr_type, u8_t *addr, u8_t *free)
+static uint8_t wl_find(uint8_t addr_type, uint8_t *addr, uint8_t *free)
 {
 	int i;
 
@@ -876,9 +876,9 @@ static u8_t wl_find(u8_t addr_type, u8_t *addr, u8_t *free)
 	return FILTER_IDX_NONE;
 }
 
-static u32_t wl_add(bt_addr_le_t *id_addr)
+static uint32_t wl_add(bt_addr_le_t *id_addr)
 {
-	u8_t i, j;
+	uint8_t i, j;
 
 	i = wl_find(id_addr->type, id_addr->a.val, &j);
 
@@ -906,13 +906,13 @@ static u32_t wl_add(bt_addr_le_t *id_addr)
 	return 0;
 }
 
-static u32_t wl_remove(bt_addr_le_t *id_addr)
+static uint32_t wl_remove(bt_addr_le_t *id_addr)
 {
 	/* find the device and mark it as empty */
-	u8_t i = wl_find(id_addr->type, id_addr->a.val, NULL);
+	uint8_t i = wl_find(id_addr->type, id_addr->a.val, NULL);
 
 	if (i < ARRAY_SIZE(wl)) {
-		u8_t j = wl[i].rl_idx;
+		uint8_t j = wl[i].rl_idx;
 
 		if (j < ARRAY_SIZE(rl)) {
 			rl[j].wl = 0U;
@@ -926,11 +926,11 @@ static u32_t wl_remove(bt_addr_le_t *id_addr)
 
 static void wl_update(void)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* Populate filter from wl peers */
 	for (i = 0U; i < WL_SIZE; i++) {
-		u8_t j;
+		uint8_t j;
 
 		if (!wl[i].taken) {
 			continue;
@@ -948,7 +948,7 @@ static void wl_update(void)
 
 static void rl_update(void)
 {
-	u8_t i;
+	uint8_t i;
 
 	/* Populate filter from rl peers */
 	for (i = 0U; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
@@ -964,7 +964,7 @@ static void rpa_adv_refresh(struct ll_adv_set *adv)
 {
 	struct pdu_adv *prev;
 	struct pdu_adv *pdu;
-	u8_t idx;
+	uint8_t idx;
 
 	if (adv->own_addr_type != BT_ADDR_LE_PUBLIC_ID &&
 	    adv->own_addr_type != BT_ADDR_LE_RANDOM_ID) {
@@ -998,7 +998,7 @@ static void rpa_adv_refresh(struct ll_adv_set *adv)
 
 static void rl_clear(void)
 {
-	for (u8_t i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
+	for (uint8_t i = 0; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
 		rl[i].taken = 0U;
 	}
 
@@ -1038,8 +1038,8 @@ static void rpa_refresh_stop(void)
 
 #else /* !CONFIG_BT_CTLR_PRIVACY */
 
-static u32_t filter_add(struct lll_filter *filter, u8_t addr_type,
-			u8_t *bdaddr)
+static uint32_t filter_add(struct lll_filter *filter, uint8_t addr_type,
+			uint8_t *bdaddr)
 {
 	int index;
 
@@ -1056,8 +1056,8 @@ static u32_t filter_add(struct lll_filter *filter, u8_t addr_type,
 	return 0;
 }
 
-static u32_t filter_remove(struct lll_filter *filter, u8_t addr_type,
-			   u8_t *bdaddr)
+static uint32_t filter_remove(struct lll_filter *filter, uint8_t addr_type,
+			   uint8_t *bdaddr)
 {
 	int index;
 
@@ -1081,8 +1081,8 @@ static u32_t filter_remove(struct lll_filter *filter, u8_t addr_type,
 }
 #endif /* !CONFIG_BT_CTLR_PRIVACY */
 
-static void filter_insert(struct lll_filter *filter, int index, u8_t addr_type,
-			   u8_t *bdaddr)
+static void filter_insert(struct lll_filter *filter, int index, uint8_t addr_type,
+			   uint8_t *bdaddr)
 {
 	filter->enable_bitmask |= BIT(index);
 	filter->addr_type_bitmask |= ((addr_type & 0x01) << index);
@@ -1098,7 +1098,7 @@ static void filter_clear(struct lll_filter *filter)
 #if defined(CONFIG_BT_CTLR_SW_DEFERRED_PRIVACY)
 static void target_resolve(struct k_work *work)
 {
-	u8_t j, idx;
+	uint8_t j, idx;
 	bt_addr_t *search_rpa;
 	struct target_resolve_work *twork;
 	static memq_link_t link;
@@ -1135,12 +1135,12 @@ static void target_resolve(struct k_work *work)
 	}
 }
 
-static u8_t prpa_cache_try_resolve(bt_addr_t *rpa)
+static uint8_t prpa_cache_try_resolve(bt_addr_t *rpa)
 {
-	u8_t pi;
-	u8_t lpirk[IRK_SIZE];
+	uint8_t pi;
+	uint8_t lpirk[IRK_SIZE];
 
-	for (u8_t i = 0U; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
+	for (uint8_t i = 0U; i < CONFIG_BT_CTLR_RL_SIZE; i++) {
 		if (rl[i].taken && rl[i].pirk) {
 			pi = rl[i].pirk_idx;
 			sys_memcpy_swap(lpirk, peer_irks[pi], IRK_SIZE);
@@ -1155,7 +1155,7 @@ static u8_t prpa_cache_try_resolve(bt_addr_t *rpa)
 
 static void prpa_cache_resolve(struct k_work *work)
 {
-	u8_t i, j;
+	uint8_t i, j;
 	bt_addr_t *search_rpa;
 	struct prpa_resolve_work *rwork;
 	static memq_link_t link;
@@ -1212,7 +1212,7 @@ static void prpa_cache_clear(void)
 	 */
 	newest_prpa = 0U;
 
-	for (u8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
+	for (uint8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
 		prpa_cache[i].taken = 0U;
 	}
 }
@@ -1225,9 +1225,9 @@ static void prpa_cache_add(bt_addr_t *rpa)
 	prpa_cache[newest_prpa].taken = 1U;
 }
 
-static u8_t prpa_cache_find(bt_addr_t *rpa)
+static uint8_t prpa_cache_find(bt_addr_t *rpa)
 {
-	for (u8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
+	for (uint8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
 		if (prpa_cache[i].taken &&
 		    !bt_addr_cmp(&(prpa_cache[i].rpa), rpa)) {
 			return i;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.h b/subsys/bluetooth/controller/ll_sw/ull_filter.h
index e2a7480c2b..510d25d82e 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_filter.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_filter.h
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-void ull_filter_adv_scan_state_cb(u8_t bm);
-void ull_filter_adv_update(u8_t adv_fp);
-void ull_filter_scan_update(u8_t scan_fp);
+void ull_filter_adv_scan_state_cb(uint8_t bm);
+void ull_filter_adv_update(uint8_t adv_fp);
+void ull_filter_scan_update(uint8_t scan_fp);
 void ull_filter_rpa_update(bool timeout);
 void ull_filter_adv_pdu_update(struct ll_adv_set *adv, struct pdu_adv *pdu);
-u8_t ull_filter_rl_find(u8_t id_addr_type, u8_t *id_addr, u8_t *free);
+uint8_t ull_filter_rl_find(uint8_t id_addr_type, uint8_t *id_addr, uint8_t *free);
 void ull_filter_reset(bool init);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_internal.h b/subsys/bluetooth/controller/ll_sw/ull_internal.h
index 607d285886..4cb7b7470f 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_internal.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-static inline u8_t ull_ref_inc(struct ull_hdr *hdr)
+static inline uint8_t ull_ref_inc(struct ull_hdr *hdr)
 {
 	return ++hdr->ref;
 }
 
-static inline u8_t ull_ref_dec(struct ull_hdr *hdr)
+static inline uint8_t ull_ref_dec(struct ull_hdr *hdr)
 {
 	return hdr->ref--;
 }
@@ -23,13 +23,13 @@ void *ll_rx_link_alloc(void);
 void ll_rx_link_release(void *link);
 void *ll_rx_alloc(void);
 void ll_rx_release(void *node_rx);
-void *ll_pdu_rx_alloc_peek(u8_t count);
+void *ll_pdu_rx_alloc_peek(uint8_t count);
 void *ll_pdu_rx_alloc(void);
 void ll_rx_put(memq_link_t *link, void *rx);
 void ll_rx_sched(void);
-void ll_tx_ack_put(u16_t handle, struct node_tx *node_tx);
-void ull_ticker_status_give(u32_t status, void *param);
-u32_t ull_ticker_status_take(u32_t ret, u32_t volatile *ret_cb);
+void ll_tx_ack_put(uint16_t handle, struct node_tx *node_tx);
+void ull_ticker_status_give(uint32_t status, void *param);
+uint32_t ull_ticker_status_take(uint32_t ret, uint32_t volatile *ret_cb);
 void *ull_disable_mark(void *param);
 void *ull_disable_unmark(void *param);
 void *ull_disable_mark_get(void);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_master.c b/subsys/bluetooth/controller/ll_sw/ull_master.c
index 4f33180308..10c5759835 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_master.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_master.c
@@ -49,24 +49,24 @@
 #include <soc.h>
 #include "hal/debug.h"
 
-static void ticker_op_stop_scan_cb(u32_t status, void *params);
-static void ticker_op_cb(u32_t status, void *params);
-static inline void access_addr_get(u8_t access_addr[]);
+static void ticker_op_stop_scan_cb(uint32_t status, void *params);
+static void ticker_op_cb(uint32_t status, void *params);
+static inline void access_addr_get(uint8_t access_addr[]);
 static inline void conn_release(struct ll_scan_set *scan);
 
-u8_t ll_create_connection(u16_t scan_interval, u16_t scan_window,
-			  u8_t filter_policy, u8_t peer_addr_type,
-			  u8_t *peer_addr, u8_t own_addr_type,
-			  u16_t interval, u16_t latency, u16_t timeout)
+uint8_t ll_create_connection(uint16_t scan_interval, uint16_t scan_window,
+			  uint8_t filter_policy, uint8_t peer_addr_type,
+			  uint8_t *peer_addr, uint8_t own_addr_type,
+			  uint16_t interval, uint16_t latency, uint16_t timeout)
 {
 	struct lll_conn *conn_lll;
 	struct ll_scan_set *scan;
-	u32_t conn_interval_us;
+	uint32_t conn_interval_us;
 	struct lll_scan *lll;
 	struct ll_conn *conn;
 	memq_link_t *link;
-	u8_t access_addr[4];
-	u8_t hop;
+	uint8_t access_addr[4];
+	uint8_t hop;
 	int err;
 
 	scan = ull_scan_is_disabled_get(0);
@@ -160,7 +160,7 @@ u8_t ll_create_connection(u16_t scan_interval, u16_t scan_window,
 
 	conn_lll->data_chan_count =
 		ull_conn_chan_map_cpy(conn_lll->data_chan_map);
-	util_rand(&hop, sizeof(u8_t));
+	util_rand(&hop, sizeof(uint8_t));
 	conn_lll->data_chan_hop = 5 + (hop % 12);
 	conn_lll->data_chan_sel = 0;
 	conn_lll->data_chan_use = 0;
@@ -172,7 +172,7 @@ u8_t ll_create_connection(u16_t scan_interval, u16_t scan_window,
 
 	conn->connect_expire = 6U;
 	conn->supervision_expire = 0U;
-	conn_interval_us = (u32_t)interval * 1250U;
+	conn_interval_us = (uint32_t)interval * 1250U;
 	conn->supervision_reload = RADIO_CONN_EVENTS(timeout * 10000U,
 							 conn_interval_us);
 
@@ -286,11 +286,11 @@ u8_t ll_create_connection(u16_t scan_interval, u16_t scan_window,
 	return ull_scan_enable(scan);
 }
 
-u8_t ll_connect_disable(void **rx)
+uint8_t ll_connect_disable(void **rx)
 {
 	struct lll_conn *conn_lll;
 	struct ll_scan_set *scan;
-	u8_t status;
+	uint8_t status;
 
 	scan = ull_scan_is_enabled_get(0);
 	if (!scan) {
@@ -318,7 +318,7 @@ u8_t ll_connect_disable(void **rx)
 
 		cc->hdr.type = NODE_RX_TYPE_CONNECTION;
 		cc->hdr.handle = 0xffff;
-		*((u8_t *)cc->pdu) = BT_HCI_ERR_UNKNOWN_CONN_ID;
+		*((uint8_t *)cc->pdu) = BT_HCI_ERR_UNKNOWN_CONN_ID;
 
 		ftr = &(cc->hdr.rx_ftr);
 		ftr->param = &scan->lll;
@@ -329,10 +329,10 @@ u8_t ll_connect_disable(void **rx)
 	return status;
 }
 
-u8_t ll_chm_update(u8_t *chm)
+uint8_t ll_chm_update(uint8_t *chm)
 {
-	u16_t handle;
-	u8_t ret;
+	uint16_t handle;
+	uint8_t ret;
 
 	ull_conn_chan_map_set(chm);
 
@@ -363,7 +363,7 @@ u8_t ll_chm_update(u8_t *chm)
 }
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-u8_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk)
+uint8_t ll_enc_req_send(uint16_t handle, uint8_t *rand, uint8_t *ediv, uint8_t *ltk)
 {
 	struct ll_conn *conn;
 	struct node_tx *tx;
@@ -439,18 +439,18 @@ u8_t ll_enc_req_send(u16_t handle, u8_t *rand, u8_t *ediv, u8_t *ltk)
 void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		      struct node_rx_ftr *ftr, struct lll_conn *lll)
 {
-	u32_t conn_offset_us, conn_interval_us;
-	u8_t ticker_id_scan, ticker_id_conn;
-	u8_t peer_addr[BDADDR_SIZE];
-	u32_t ticks_slot_overhead;
-	u32_t ticks_slot_offset;
+	uint32_t conn_offset_us, conn_interval_us;
+	uint8_t ticker_id_scan, ticker_id_conn;
+	uint8_t peer_addr[BDADDR_SIZE];
+	uint32_t ticks_slot_overhead;
+	uint32_t ticks_slot_offset;
 	struct ll_scan_set *scan;
 	struct node_rx_cc *cc;
 	struct ll_conn *conn;
 	struct pdu_adv *pdu_tx;
-	u8_t peer_addr_type;
-	u32_t ticker_status;
-	u8_t chan_sel;
+	uint8_t peer_addr_type;
+	uint32_t ticker_status;
+	uint8_t chan_sel;
 
 	((struct lll_scan *)ftr->param)->conn = NULL;
 
@@ -470,7 +470,7 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 	cc->role = 0U;
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t rl_idx = ftr->rl_idx;
+	uint8_t rl_idx = ftr->rl_idx;
 
 	if (ftr->lrpa_used) {
 		memcpy(&cc->local_rpa[0], &pdu_tx->connect_ind.init_addr[0],
@@ -532,9 +532,9 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		cs = (void *)rx_csa->pdu;
 
 		if (chan_sel) {
-			u16_t aa_ls = ((u16_t)lll->access_addr[1] << 8) |
+			uint16_t aa_ls = ((uint16_t)lll->access_addr[1] << 8) |
 				      lll->access_addr[0];
-			u16_t aa_ms = ((u16_t)lll->access_addr[3] << 8) |
+			uint16_t aa_ms = ((uint16_t)lll->access_addr[3] << 8) |
 				      lll->access_addr[2];
 
 			lll->data_chan_sel = 1;
@@ -587,8 +587,8 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 	ticker_status = ticker_stop(TICKER_INSTANCE_ID_CTLR,
 				    TICKER_USER_ID_ULL_HIGH,
 				    ticker_id_scan, ticker_op_stop_scan_cb,
-				    (void *)(u32_t)ticker_id_scan);
-	ticker_op_stop_scan_cb(ticker_status, (void *)(u32_t)ticker_id_scan);
+				    (void *)(uint32_t)ticker_id_scan);
+	ticker_op_stop_scan_cb(ticker_status, (void *)(uint32_t)ticker_id_scan);
 
 	/* Scanner stop can expire while here in this ISR.
 	 * Deferred attempt to stop can fail as it would have
@@ -622,15 +622,15 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 #endif
 }
 
-void ull_master_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+void ull_master_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			  void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, lll_master_prepare};
 	static struct lll_prepare_param p;
 	struct ll_conn *conn = param;
-	u32_t err;
-	u8_t ref;
+	uint32_t err;
+	uint8_t ref;
 
 	DEBUG_RADIO_PREPARE_M(1);
 
@@ -679,12 +679,12 @@ void ull_master_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 	DEBUG_RADIO_PREPARE_M(1);
 }
 
-static void ticker_op_stop_scan_cb(u32_t status, void *params)
+static void ticker_op_stop_scan_cb(uint32_t status, void *params)
 {
 	/* TODO: */
 }
 
-static void ticker_op_cb(u32_t status, void *params)
+static void ticker_op_cb(uint32_t status, void *params)
 {
 	ARG_UNUSED(params);
 
@@ -707,19 +707,19 @@ static void ticker_op_cb(u32_t status, void *params)
  * - It shall have no more than eleven transitions in the least significant 16
  *   bits.
  */
-static inline void access_addr_get(u8_t access_addr[])
+static inline void access_addr_get(uint8_t access_addr[])
 {
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
-	u8_t transitions_lsb16;
-	u8_t ones_count_lsb8;
+	uint8_t transitions_lsb16;
+	uint8_t ones_count_lsb8;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
-	u8_t consecutive_cnt;
-	u8_t consecutive_bit;
-	u32_t adv_aa_check;
-	u32_t aa;
-	u8_t transitions;
-	u8_t bit_idx;
-	u8_t retry;
+	uint8_t consecutive_cnt;
+	uint8_t consecutive_bit;
+	uint32_t adv_aa_check;
+	uint32_t aa;
+	uint8_t transitions;
+	uint8_t bit_idx;
+	uint8_t retry;
 
 	retry = 3U;
 again:
@@ -739,11 +739,11 @@ again:
 	consecutive_bit = (aa >> bit_idx) & 0x01;
 	while (bit_idx--) {
 #if defined(CONFIG_BT_CTLR_PHY_CODED)
-		u8_t transitions_lsb16_prev = transitions_lsb16;
+		uint8_t transitions_lsb16_prev = transitions_lsb16;
 #endif /* CONFIG_BT_CTLR_PHY_CODED */
-		u8_t consecutive_cnt_prev = consecutive_cnt;
-		u8_t transitions_prev = transitions;
-		u8_t bit;
+		uint8_t consecutive_cnt_prev = consecutive_cnt;
+		uint8_t transitions_prev = transitions;
+		uint8_t bit;
 
 		bit = (aa >> bit_idx) & 0x01;
 		if (bit == consecutive_bit) {
@@ -845,7 +845,7 @@ again:
 	 * packets Access Address by only one bit.
 	 */
 	adv_aa_check = aa ^ PDU_AC_ACCESS_ADDR;
-	if (util_ones_count_get((u8_t *)&adv_aa_check,
+	if (util_ones_count_get((uint8_t *)&adv_aa_check,
 				sizeof(adv_aa_check)) <= 1) {
 		goto again;
 	}
diff --git a/subsys/bluetooth/controller/ll_sw/ull_master_internal.h b/subsys/bluetooth/controller/ll_sw/ull_master_internal.h
index eb2454fbb4..8c3547d9e2 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_master_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_master_internal.h
@@ -6,5 +6,5 @@
 
 void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		      struct node_rx_ftr *ftr, struct lll_conn *lll);
-void ull_master_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+void ull_master_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			  void *param);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c
index 8345b4519e..ac0a5d9119 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c
@@ -45,15 +45,15 @@
 #include "hal/debug.h"
 
 static int init_reset(void);
-static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 		      void *param);
-static u8_t disable(u16_t handle);
+static uint8_t disable(uint16_t handle);
 
 #define BT_CTLR_SCAN_MAX 1
 static struct ll_scan_set ll_scan[BT_CTLR_SCAN_MAX];
 
-u8_t ll_scan_params_set(u8_t type, u16_t interval, u16_t window,
-			u8_t own_addr_type, u8_t filter_policy)
+uint8_t ll_scan_params_set(uint8_t type, uint16_t interval, uint16_t window,
+			uint8_t own_addr_type, uint8_t filter_policy)
 {
 	struct ll_scan_set *scan;
 
@@ -69,7 +69,7 @@ u8_t ll_scan_params_set(u8_t type, u16_t interval, u16_t window,
 	return 0;
 }
 
-u8_t ll_scan_enable(u8_t enable)
+uint8_t ll_scan_enable(uint8_t enable)
 {
 	struct ll_scan_set *scan;
 
@@ -121,7 +121,7 @@ int ull_scan_init(void)
 
 int ull_scan_reset(void)
 {
-	u16_t handle;
+	uint16_t handle;
 	int err;
 
 	for (handle = 0U; handle < BT_CTLR_SCAN_MAX; handle++) {
@@ -136,8 +136,8 @@ int ull_scan_reset(void)
 	return 0;
 }
 
-void ull_scan_params_set(struct lll_scan *lll, u8_t type, u16_t interval,
-			 u16_t window, u8_t filter_policy)
+void ull_scan_params_set(struct lll_scan *lll, uint8_t type, uint16_t interval,
+			 uint16_t window, uint8_t filter_policy)
 {
 	/* type value:
 	 * 0000b - legacy 1M passive
@@ -159,18 +159,18 @@ void ull_scan_params_set(struct lll_scan *lll, u8_t type, u16_t interval,
 
 	lll->filter_policy = filter_policy;
 	lll->interval = interval;
-	lll->ticks_window = HAL_TICKER_US_TO_TICKS((u64_t)window * 625U);
+	lll->ticks_window = HAL_TICKER_US_TO_TICKS((uint64_t)window * 625U);
 }
 
-u8_t ull_scan_enable(struct ll_scan_set *scan)
+uint8_t ull_scan_enable(struct ll_scan_set *scan)
 {
-	volatile u32_t ret_cb = TICKER_STATUS_BUSY;
+	volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
 	struct lll_scan *lll = &scan->lll;
-	u32_t ticks_slot_overhead;
-	u32_t ticks_slot_offset;
-	u32_t ticks_interval;
-	u32_t ticks_anchor;
-	u32_t ret;
+	uint32_t ticks_slot_overhead;
+	uint32_t ticks_slot_offset;
+	uint32_t ticks_interval;
+	uint32_t ticks_anchor;
+	uint32_t ret;
 
 	lll->chan = 0;
 	lll->init_addr_type = scan->own_addr_type;
@@ -183,7 +183,7 @@ u8_t ull_scan_enable(struct ll_scan_set *scan)
 	ull_hdr_init(&scan->ull);
 	lll_hdr_init(lll, scan);
 
-	ticks_interval = HAL_TICKER_US_TO_TICKS((u64_t)lll->interval * 625U);
+	ticks_interval = HAL_TICKER_US_TO_TICKS((uint64_t)lll->interval * 625U);
 
 	/* TODO: active_to_start feature port */
 	scan->evt.ticks_active_to_start = 0U;
@@ -218,8 +218,8 @@ u8_t ull_scan_enable(struct ll_scan_set *scan)
 
 #if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_CTLR_SCHED_ADVANCED)
 	if (!lll->conn) {
-		u32_t ticks_ref = 0U;
-		u32_t offset_us = 0U;
+		uint32_t ticks_ref = 0U;
+		uint32_t offset_us = 0U;
 
 		ull_sched_after_mstr_slot_get(TICKER_USER_ID_THREAD,
 					      (ticks_slot_offset +
@@ -240,7 +240,7 @@ u8_t ull_scan_enable(struct ll_scan_set *scan)
 	ret = ticker_start(TICKER_INSTANCE_ID_CTLR,
 			   TICKER_USER_ID_THREAD, TICKER_ID_SCAN_BASE,
 			   ticks_anchor, 0, ticks_interval,
-			   HAL_TICKER_REMAINDER((u64_t)lll->interval * 625U),
+			   HAL_TICKER_REMAINDER((uint64_t)lll->interval * 625U),
 			   TICKER_NULL_LAZY,
 			   (scan->evt.ticks_slot + ticks_slot_overhead),
 			   ticker_cb, scan,
@@ -265,11 +265,11 @@ u8_t ull_scan_enable(struct ll_scan_set *scan)
 	return 0;
 }
 
-u8_t ull_scan_disable(u16_t handle, struct ll_scan_set *scan)
+uint8_t ull_scan_disable(uint16_t handle, struct ll_scan_set *scan)
 {
-	volatile u32_t ret_cb = TICKER_STATUS_BUSY;
+	volatile uint32_t ret_cb = TICKER_STATUS_BUSY;
 	void *mark;
-	u32_t ret;
+	uint32_t ret;
 
 	mark = ull_disable_mark(scan);
 	LL_ASSERT(mark == scan);
@@ -295,7 +295,7 @@ u8_t ull_scan_disable(u16_t handle, struct ll_scan_set *scan)
 	return 0;
 }
 
-struct ll_scan_set *ull_scan_set_get(u16_t handle)
+struct ll_scan_set *ull_scan_set_get(uint16_t handle)
 {
 	if (handle >= BT_CTLR_SCAN_MAX) {
 		return NULL;
@@ -304,17 +304,17 @@ struct ll_scan_set *ull_scan_set_get(u16_t handle)
 	return &ll_scan[handle];
 }
 
-u16_t ull_scan_handle_get(struct ll_scan_set *scan)
+uint16_t ull_scan_handle_get(struct ll_scan_set *scan)
 {
-	return ((u8_t *)scan - (u8_t *)ll_scan) / sizeof(*scan);
+	return ((uint8_t *)scan - (uint8_t *)ll_scan) / sizeof(*scan);
 }
 
-u16_t ull_scan_lll_handle_get(struct lll_scan *lll)
+uint16_t ull_scan_lll_handle_get(struct lll_scan *lll)
 {
 	return ull_scan_handle_get((void *)lll->hdr.parent);
 }
 
-struct ll_scan_set *ull_scan_is_enabled_get(u16_t handle)
+struct ll_scan_set *ull_scan_is_enabled_get(uint16_t handle)
 {
 	struct ll_scan_set *scan;
 
@@ -326,7 +326,7 @@ struct ll_scan_set *ull_scan_is_enabled_get(u16_t handle)
 	return scan;
 }
 
-struct ll_scan_set *ull_scan_is_disabled_get(u16_t handle)
+struct ll_scan_set *ull_scan_is_disabled_get(uint16_t handle)
 {
 	struct ll_scan_set *scan;
 
@@ -338,7 +338,7 @@ struct ll_scan_set *ull_scan_is_disabled_get(u16_t handle)
 	return scan;
 }
 
-u32_t ull_scan_is_enabled(u16_t handle)
+uint32_t ull_scan_is_enabled(uint16_t handle)
 {
 	struct ll_scan_set *scan;
 
@@ -351,14 +351,14 @@ u32_t ull_scan_is_enabled(u16_t handle)
 	 *       BIT(1) - active scanning enabled
 	 *       BIT(2) - initiator enabled
 	 */
-	return (((u32_t)scan->is_enabled << scan->lll.type) |
+	return (((uint32_t)scan->is_enabled << scan->lll.type) |
 #if defined(CONFIG_BT_CENTRAL)
 		(scan->lll.conn ? BIT(2) : 0) |
 #endif
 		0);
 }
 
-u32_t ull_scan_filter_pol_get(u16_t handle)
+uint32_t ull_scan_filter_pol_get(uint16_t handle)
 {
 	struct ll_scan_set *scan;
 
@@ -375,15 +375,15 @@ static int init_reset(void)
 	return 0;
 }
 
-static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 		      void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, lll_scan_prepare};
 	static struct lll_prepare_param p;
 	struct ll_scan_set *scan = param;
-	u32_t ret;
-	u8_t ref;
+	uint32_t ret;
+	uint8_t ref;
 
 	DEBUG_RADIO_PREPARE_O(1);
 
@@ -412,7 +412,7 @@ static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 		static struct mayfly s_mfy_sched_after_mstr_offset_get = {
 			0, 0, &s_link, NULL,
 			ull_sched_mfy_after_mstr_offset_get};
-		u32_t retval;
+		uint32_t retval;
 
 		s_mfy_sched_after_mstr_offset_get.param = (void *)scan;
 
@@ -426,10 +426,10 @@ static void ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 	DEBUG_RADIO_PREPARE_O(1);
 }
 
-static u8_t disable(u16_t handle)
+static uint8_t disable(uint16_t handle)
 {
 	struct ll_scan_set *scan;
-	u8_t ret;
+	uint8_t ret;
 
 	scan = ull_scan_is_enabled_get(handle);
 	if (!scan) {
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_internal.h b/subsys/bluetooth/controller/ll_sw/ull_scan_internal.h
index 92ccce5602..a6fb4af0a5 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_internal.h
@@ -10,29 +10,29 @@ int ull_scan_init(void);
 int ull_scan_reset(void);
 
 /* Set scan parameters */
-void ull_scan_params_set(struct lll_scan *lll, u8_t type, u16_t interval,
-			 u16_t window, u8_t filter_policy);
+void ull_scan_params_set(struct lll_scan *lll, uint8_t type, uint16_t interval,
+			 uint16_t window, uint8_t filter_policy);
 
 /* Enable and start scanning/initiating role */
-u8_t ull_scan_enable(struct ll_scan_set *scan);
+uint8_t ull_scan_enable(struct ll_scan_set *scan);
 
 /* Disable scanning/initiating role */
-u8_t ull_scan_disable(u16_t handle, struct ll_scan_set *scan);
+uint8_t ull_scan_disable(uint16_t handle, struct ll_scan_set *scan);
 
 /* Return ll_scan_set context (unconditional) */
-struct ll_scan_set *ull_scan_set_get(u16_t handle);
+struct ll_scan_set *ull_scan_set_get(uint16_t handle);
 
 /* Return the scan set handle given the scan set instance */
-u16_t ull_scan_handle_get(struct ll_scan_set *scan);
+uint16_t ull_scan_handle_get(struct ll_scan_set *scan);
 
 /* Return ll_scan_set context if enabled */
-struct ll_scan_set *ull_scan_is_enabled_get(u16_t handle);
+struct ll_scan_set *ull_scan_is_enabled_get(uint16_t handle);
 
 /* Return ll_scan_set contesst if disabled */
-struct ll_scan_set *ull_scan_is_disabled_get(u16_t handle);
+struct ll_scan_set *ull_scan_is_disabled_get(uint16_t handle);
 
 /* Return flags if enabled */
-u32_t ull_scan_is_enabled(u16_t handle);
+uint32_t ull_scan_is_enabled(uint16_t handle);
 
 /* Return filter policy used */
-u32_t ull_scan_filter_pol_get(u16_t handle);
+uint32_t ull_scan_filter_pol_get(uint16_t handle);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_types.h b/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
index 8a5495b02e..2f18c8cc25 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_types.h
@@ -9,6 +9,6 @@ struct ll_scan_set {
 	struct ull_hdr  ull;
 	struct lll_scan lll;
 
-	u8_t is_enabled:1;
-	u8_t own_addr_type:2;
+	uint8_t is_enabled:1;
+	uint8_t own_addr_type:2;
 };
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched.c b/subsys/bluetooth/controller/ll_sw/ull_sched.c
index 665853519b..1ac3517086 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sched.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sched.c
@@ -16,8 +16,8 @@
 
 #include "ull_scan_types.h"
 
-void ull_sched_after_mstr_slot_get(u8_t user_id, u32_t ticks_slot_abs,
-				   u32_t *ticks_anchor, u32_t *us_offset)
+void ull_sched_after_mstr_slot_get(uint8_t user_id, uint32_t ticks_slot_abs,
+				   uint32_t *ticks_anchor, uint32_t *us_offset)
 {
 	/* TODO: */
 }
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched_internal.h b/subsys/bluetooth/controller/ll_sw/ull_sched_internal.h
index bb452a049b..6f1ee432ff 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sched_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_sched_internal.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-void ull_sched_after_mstr_slot_get(u8_t user_id, u32_t ticks_slot_abs,
-				   u32_t *ticks_anchor, u32_t *us_offset);
+void ull_sched_after_mstr_slot_get(uint8_t user_id, uint32_t ticks_slot_abs,
+				   uint32_t *ticks_anchor, uint32_t *us_offset);
 void ull_sched_mfy_after_mstr_offset_get(void *param);
 void ull_sched_mfy_free_win_offset_calc(void *param);
 void ull_sched_mfy_win_offset_use(void *param);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_slave.c b/subsys/bluetooth/controller/ll_sw/ull_slave.c
index 284776cd13..807992cd9e 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_slave.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_slave.c
@@ -44,27 +44,27 @@
 #include <soc.h>
 #include "hal/debug.h"
 
-static void ticker_op_stop_adv_cb(u32_t status, void *param);
-static void ticker_op_cb(u32_t status, void *param);
+static void ticker_op_stop_adv_cb(uint32_t status, void *param);
+static void ticker_op_cb(uint32_t status, void *param);
 
 void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		     struct node_rx_ftr *ftr, struct lll_conn *lll)
 {
-	u32_t conn_offset_us, conn_interval_us;
-	u8_t ticker_id_adv, ticker_id_conn;
-	u8_t peer_addr[BDADDR_SIZE];
-	u32_t ticks_slot_overhead;
-	u32_t ticks_slot_offset;
+	uint32_t conn_offset_us, conn_interval_us;
+	uint8_t ticker_id_adv, ticker_id_conn;
+	uint8_t peer_addr[BDADDR_SIZE];
+	uint32_t ticks_slot_overhead;
+	uint32_t ticks_slot_offset;
 	struct pdu_adv *pdu_adv;
 	struct ll_adv_set *adv;
 	struct node_rx_cc *cc;
 	struct ll_conn *conn;
-	u32_t ticker_status;
-	u8_t peer_addr_type;
-	u16_t win_offset;
-	u16_t timeout;
-	u16_t interval;
-	u8_t chan_sel;
+	uint32_t ticker_status;
+	uint8_t peer_addr_type;
+	uint16_t win_offset;
+	uint16_t timeout;
+	uint16_t interval;
+	uint8_t chan_sel;
 
 	((struct lll_adv *)ftr->param)->conn = NULL;
 
@@ -136,7 +136,7 @@ void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 	cc->role = 1U;
 
 #if defined(CONFIG_BT_CTLR_PRIVACY)
-	u8_t rl_idx = ftr->rl_idx;
+	uint8_t rl_idx = ftr->rl_idx;
 
 	if (ull_filter_lll_lrpa_used(adv->lll.rl_idx)) {
 		memcpy(&cc->local_rpa[0], &pdu_adv->connect_ind.adv_addr[0],
@@ -199,9 +199,9 @@ void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		cs = (void *)rx_csa->pdu;
 
 		if (chan_sel) {
-			u16_t aa_ls = ((u16_t)lll->access_addr[1] << 8) |
+			uint16_t aa_ls = ((uint16_t)lll->access_addr[1] << 8) |
 				      lll->access_addr[0];
-			u16_t aa_ms = ((u16_t)lll->access_addr[3] << 8) |
+			uint16_t aa_ms = ((uint16_t)lll->access_addr[3] << 8) |
 				      lll->access_addr[2];
 
 			lll->data_chan_sel = 1;
@@ -239,7 +239,7 @@ void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 	conn_interval_us -= lll->slave.window_widening_periodic_us;
 
 	conn_offset_us = ftr->us_radio_end;
-	conn_offset_us += ((u64_t)win_offset + 1) * 1250U;
+	conn_offset_us += ((uint64_t)win_offset + 1) * 1250U;
 	conn_offset_us -= EVENT_OVERHEAD_START_US;
 	conn_offset_us -= EVENT_TICKER_RES_MARGIN_US;
 	conn_offset_us -= EVENT_JITTER_US;
@@ -305,13 +305,13 @@ void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
  * @param ticks_drift_plus[out]  Positive part of drift uncertainty window
  * @param ticks_drift_minus[out] Negative part of drift uncertainty window
  */
-void ull_slave_done(struct node_rx_event_done *done, u32_t *ticks_drift_plus,
-		    u32_t *ticks_drift_minus)
+void ull_slave_done(struct node_rx_event_done *done, uint32_t *ticks_drift_plus,
+		    uint32_t *ticks_drift_minus)
 {
-	u32_t start_to_address_expected_us;
-	u32_t start_to_address_actual_us;
-	u32_t window_widening_event_us;
-	u32_t preamble_to_addr_us;
+	uint32_t start_to_address_expected_us;
+	uint32_t start_to_address_actual_us;
+	uint32_t window_widening_event_us;
+	uint32_t preamble_to_addr_us;
 
 	start_to_address_actual_us =
 		done->extra.slave.start_to_address_actual_us;
@@ -341,15 +341,15 @@ void ull_slave_done(struct node_rx_event_done *done, u32_t *ticks_drift_plus,
 	}
 }
 
-void ull_slave_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+void ull_slave_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			 void *param)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, lll_slave_prepare};
 	static struct lll_prepare_param p;
 	struct ll_conn *conn = param;
-	u32_t err;
-	u8_t ref;
+	uint32_t err;
+	uint8_t ref;
 
 	DEBUG_RADIO_PREPARE_S(1);
 
@@ -393,8 +393,8 @@ void ull_slave_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
 }
 
 #if defined(CONFIG_BT_CTLR_LE_ENC)
-u8_t ll_start_enc_req_send(u16_t handle, u8_t error_code,
-			    u8_t const *const ltk)
+uint8_t ll_start_enc_req_send(uint16_t handle, uint8_t error_code,
+			    uint8_t const *const ltk)
 {
 	struct ll_conn *conn;
 
@@ -439,13 +439,13 @@ u8_t ll_start_enc_req_send(u16_t handle, u8_t error_code,
 }
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
-static void ticker_op_stop_adv_cb(u32_t status, void *param)
+static void ticker_op_stop_adv_cb(uint32_t status, void *param)
 {
 	LL_ASSERT(status != TICKER_STATUS_FAILURE ||
 		  param == ull_disable_mark_get());
 }
 
-static void ticker_op_cb(u32_t status, void *param)
+static void ticker_op_cb(uint32_t status, void *param)
 {
 	ARG_UNUSED(param);
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_slave_internal.h b/subsys/bluetooth/controller/ll_sw/ull_slave_internal.h
index ead5e20a8e..bef57b336d 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_slave_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_slave_internal.h
@@ -6,7 +6,7 @@
 
 void ull_slave_setup(memq_link_t *link, struct node_rx_hdr *rx,
 		     struct node_rx_ftr *ftr, struct lll_conn *lll);
-void ull_slave_done(struct node_rx_event_done *done, u32_t *ticks_drift_plus,
-		    u32_t *ticks_drift_minus);
-void ull_slave_ticker_cb(u32_t ticks_at_expire, u32_t remainder, u16_t lazy,
+void ull_slave_done(struct node_rx_event_done *done, uint32_t *ticks_drift_plus,
+		    uint32_t *ticks_drift_minus);
+void ull_slave_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
 			 void *param);
diff --git a/subsys/bluetooth/controller/ticker/ticker.c b/subsys/bluetooth/controller/ticker/ticker.c
index f18c53d22d..7d60411e6c 100644
--- a/subsys/bluetooth/controller/ticker/ticker.c
+++ b/subsys/bluetooth/controller/ticker/ticker.c
@@ -29,46 +29,46 @@
  ****************************************************************************/
 
 struct ticker_node {
-	u8_t  next;			 /* Next ticker node */
+	uint8_t  next;			 /* Next ticker node */
 
-	u8_t  req;			 /* Request counter */
-	u8_t  ack;			 /* Acknowledge counter. Imbalance
+	uint8_t  req;			 /* Request counter */
+	uint8_t  ack;			 /* Acknowledge counter. Imbalance
 					  * between req and ack indicates
 					  * ongoing operation
 					  */
-	u8_t  force;			 /* If non-zero, node timeout should
+	uint8_t  force;			 /* If non-zero, node timeout should
 					  * be forced at next expiration
 					  */
-	u32_t ticks_periodic;		 /* If non-zero, interval
+	uint32_t ticks_periodic;		 /* If non-zero, interval
 					  * between expirations
 					  */
-	u32_t ticks_to_expire;		 /* Ticks until expiration */
+	uint32_t ticks_to_expire;		 /* Ticks until expiration */
 	ticker_timeout_func timeout_func;/* User timeout function */
 	void  *context;			 /* Context delivered to timeout
 					  * function
 					  */
-	u32_t ticks_to_expire_minus;	 /* Negative drift correction */
-	u32_t ticks_slot;		 /* Air-time reservation for node */
-	u16_t lazy_periodic;		 /* Number of timeouts to allow
+	uint32_t ticks_to_expire_minus;	 /* Negative drift correction */
+	uint32_t ticks_slot;		 /* Air-time reservation for node */
+	uint16_t lazy_periodic;		 /* Number of timeouts to allow
 					  * skipping
 					  */
-	u16_t lazy_current;		 /* Current number of timeouts
+	uint16_t lazy_current;		 /* Current number of timeouts
 					  * skipped = slave latency
 					  */
-	u32_t remainder_periodic;	 /* Sub-microsecond tick remainder
+	uint32_t remainder_periodic;	 /* Sub-microsecond tick remainder
 					  * for each period
 					  */
-	u32_t remainder_current;	 /* Current sub-microsecond tick
+	uint32_t remainder_current;	 /* Current sub-microsecond tick
 					  * remainder
 					  */
 #if !defined(CONFIG_BT_TICKER_COMPATIBILITY_MODE)
 #if  defined(CONFIG_BT_TICKER_EXT)
 	struct ticker_ext *ext_data;	 /* Ticker extension data */
 #endif /* CONFIG_BT_TICKER_EXT */
-	u8_t  must_expire;		 /* Node must expire, even if it
+	uint8_t  must_expire;		 /* Node must expire, even if it
 					  * collides with other nodes
 					  */
-	s8_t  priority;			 /* Ticker node priority. 0 is default.
+	int8_t  priority;			 /* Ticker node priority. 0 is default.
 					  * Lower value is higher priority
 					  */
 #endif /* CONFIG_BT_TICKER_COMPATIBILITY_MODE */
@@ -103,14 +103,14 @@ struct ticker_node {
  * requests to ticker_job
  */
 struct ticker_user_op_start {
-	u32_t ticks_at_start;		/* Anchor ticks (absolute) */
-	u32_t ticks_first;		/* Initial timeout ticks */
-	u32_t ticks_periodic;		/* Ticker period ticks */
-	u32_t remainder_periodic;	/* Sub-microsecond tick remainder */
-	u16_t lazy;			/* Periodic latency in number of
+	uint32_t ticks_at_start;		/* Anchor ticks (absolute) */
+	uint32_t ticks_first;		/* Initial timeout ticks */
+	uint32_t ticks_periodic;		/* Ticker period ticks */
+	uint32_t remainder_periodic;	/* Sub-microsecond tick remainder */
+	uint16_t lazy;			/* Periodic latency in number of
 					 * periods
 					 */
-	u32_t ticks_slot;		/* Air-time reservation ticks */
+	uint32_t ticks_slot;		/* Air-time reservation ticks */
 	ticker_timeout_func fp_timeout_func; /* Timeout callback function */
 	void  *context;			/* Context passed in timeout callback */
 #if defined(CONFIG_BT_TICKER_EXT)
@@ -122,51 +122,51 @@ struct ticker_user_op_start {
  * requests to ticker_job
  */
 struct ticker_user_op_update {
-	u32_t ticks_drift_plus;		/* Requested positive drift in ticks */
-	u32_t ticks_drift_minus;	/* Requested negatice drift in ticks */
-	u32_t ticks_slot_plus;		/* Number of ticks to add to slot
+	uint32_t ticks_drift_plus;		/* Requested positive drift in ticks */
+	uint32_t ticks_drift_minus;	/* Requested negatice drift in ticks */
+	uint32_t ticks_slot_plus;		/* Number of ticks to add to slot
 					 * reservation (air-time)
 					 */
-	u32_t ticks_slot_minus;		/* Number of ticks to subtract from
+	uint32_t ticks_slot_minus;		/* Number of ticks to subtract from
 					 * slot reservation (air-time)
 					 */
-	u16_t lazy;			/* Slave latency:
+	uint16_t lazy;			/* Slave latency:
 					 *  0: Do nothing
 					 *  1: latency = 0
 					 * >1: latency = lazy - 1
 					 */
-	u8_t  force;			/* Force update */
+	uint8_t  force;			/* Force update */
 };
 
 /* User operation data structure for stop opcode. Used for passing stop
  * requests with absolute tick to ticker_job
  */
 struct ticker_user_op_stop {
-	u32_t ticks_at_stop;            /* Anchor ticks (absolute) */
+	uint32_t ticks_at_stop;            /* Anchor ticks (absolute) */
 };
 
 /* User operation data structure for slot_get opcode. Used for passing request
  * to get next ticker with slot ticks via ticker_job
  */
 struct ticker_user_op_slot_get {
-	u8_t  *ticker_id;
-	u32_t *ticks_current;
-	u32_t *ticks_to_expire;
+	uint8_t  *ticker_id;
+	uint32_t *ticks_current;
+	uint32_t *ticks_to_expire;
 };
 
 /* User operation data structure for priority_set opcode. Used for passing
  * request to set ticker node priority via ticker_job
  */
 struct ticker_user_op_priority_set {
-	s8_t priority;		   /* Node priority. Defaults to 0 */
+	int8_t priority;		   /* Node priority. Defaults to 0 */
 };
 
 /* User operation top level data structure. Used for passing requests to
  * ticker_job
  */
 struct ticker_user_op {
-	u8_t op;		   /* User operation */
-	u8_t id;		   /* Ticker node id */
+	uint8_t op;		   /* User operation */
+	uint8_t id;		   /* Ticker node id */
 	union {
 		struct ticker_user_op_start        start;
 		struct ticker_user_op_update       update;
@@ -174,7 +174,7 @@ struct ticker_user_op {
 		struct ticker_user_op_slot_get     slot_get;
 		struct ticker_user_op_priority_set priority_set;
 	} params;		   /* User operation parameters */
-	u32_t status;		   /* Operation result */
+	uint32_t status;		   /* Operation result */
 	ticker_op_func fp_op_func; /* Operation completion callback */
 	void  *op_context;	   /* Context passed in completion callback */
 };
@@ -182,13 +182,13 @@ struct ticker_user_op {
 /* User data structure for operations
  */
 struct ticker_user {
-	u8_t count_user_op;	   /* Number of user operation slots */
-	u8_t first;		   /* Slot index of first user operation */
-	u8_t middle;		   /* Slot index of last managed user op.
+	uint8_t count_user_op;	   /* Number of user operation slots */
+	uint8_t first;		   /* Slot index of first user operation */
+	uint8_t middle;		   /* Slot index of last managed user op.
 				    * Updated by ticker_job_list_manage
 				    * for use in ticker_job_list_insert
 				    */
-	u8_t last;		   /* Slot index of last user operation */
+	uint8_t last;		   /* Slot index of last user operation */
 	struct ticker_user_op *user_op; /* Pointer to user operation array */
 };
 
@@ -197,31 +197,31 @@ struct ticker_user {
 struct ticker_instance {
 	struct ticker_node *nodes; /* Pointer to ticker nodes */
 	struct ticker_user *users; /* Pointer to user nodes */
-	u8_t  count_node;	   /* Number of ticker nodes */
-	u8_t  count_user;	   /* Number of user nodes */
-	u8_t  ticks_elapsed_first; /* Index from which elapsed ticks count is
+	uint8_t  count_node;	   /* Number of ticker nodes */
+	uint8_t  count_user;	   /* Number of user nodes */
+	uint8_t  ticks_elapsed_first; /* Index from which elapsed ticks count is
 				    * pulled
 				    */
-	u8_t  ticks_elapsed_last;  /* Index to which elapsed ticks count is
+	uint8_t  ticks_elapsed_last;  /* Index to which elapsed ticks count is
 				    * pushed
 				    */
-	u32_t ticks_elapsed[DOUBLE_BUFFER_SIZE]; /* Buffer for elapsed ticks */
-	u32_t ticks_current;	   /* Absolute ticks elapsed at last
+	uint32_t ticks_elapsed[DOUBLE_BUFFER_SIZE]; /* Buffer for elapsed ticks */
+	uint32_t ticks_current;	   /* Absolute ticks elapsed at last
 				    * ticker_job
 				    */
-	u32_t ticks_slot_previous; /* Number of ticks previously reserved by a
+	uint32_t ticks_slot_previous; /* Number of ticks previously reserved by a
 				    * ticker node (active air-time)
 				    */
-	u8_t  ticker_id_slot_previous; /* Id of previous slot reserving ticker
+	uint8_t  ticker_id_slot_previous; /* Id of previous slot reserving ticker
 					* node
 					*/
-	u8_t  ticker_id_head;      /* Index of first ticker node (next to
+	uint8_t  ticker_id_head;      /* Index of first ticker node (next to
 				    * expire)
 				    */
-	u8_t  job_guard;	   /* Flag preventing ticker_worker from
+	uint8_t  job_guard;	   /* Flag preventing ticker_worker from
 				    * running if ticker_job is active
 				    */
-	u8_t  worker_trigger;	   /* Flag preventing ticker_job from starting
+	uint8_t  worker_trigger;	   /* Flag preventing ticker_job from starting
 				    * if ticker_worker was requested, and to
 				    * trigger ticker_worker at end of job, if
 				    * requested
@@ -262,9 +262,9 @@ static struct ticker_instance _instance[TICKER_INSTANCE_MAX];
  *
  * @internal
  */
-static inline void ticker_next_elapsed(u8_t *ticks_elapsed_index)
+static inline void ticker_next_elapsed(uint8_t *ticks_elapsed_index)
 {
-	u8_t idx = *ticks_elapsed_index + 1;
+	uint8_t idx = *ticks_elapsed_index + 1;
 
 	if (idx == DOUBLE_BUFFER_SIZE) {
 		idx = 0U;
@@ -286,12 +286,12 @@ static inline void ticker_next_elapsed(u8_t *ticks_elapsed_index)
  * @return Id of ticker expiring within slot or TICKER_NULL
  * @internal
  */
-static u8_t ticker_by_slot_get(struct ticker_node *node, u8_t ticker_id_head,
-			       u32_t ticks_slot)
+static uint8_t ticker_by_slot_get(struct ticker_node *node, uint8_t ticker_id_head,
+			       uint32_t ticks_slot)
 {
 	while (ticker_id_head != TICKER_NULL) {
 		struct ticker_node *ticker;
-		u32_t ticks_to_expire;
+		uint32_t ticks_to_expire;
 
 		ticker = &node[ticker_id_head];
 		ticks_to_expire = ticker->ticks_to_expire;
@@ -332,13 +332,13 @@ static u8_t ticker_by_slot_get(struct ticker_node *node, u8_t ticker_id_head,
  * @internal
  */
 static void ticker_by_next_slot_get(struct ticker_instance *instance,
-				    u8_t *ticker_id_head, u32_t *ticks_current,
-				    u32_t *ticks_to_expire)
+				    uint8_t *ticker_id_head, uint32_t *ticks_current,
+				    uint32_t *ticks_to_expire)
 {
 	struct ticker_node *ticker;
 	struct ticker_node *node;
-	u32_t _ticks_to_expire;
-	u8_t _ticker_id_head;
+	uint32_t _ticks_to_expire;
+	uint8_t _ticker_id_head;
 
 	node = instance->nodes;
 
@@ -386,15 +386,15 @@ static void ticker_by_next_slot_get(struct ticker_instance *instance,
  * @return Id of enqueued ticker node
  * @internal
  */
-static u8_t ticker_enqueue(struct ticker_instance *instance, u8_t id)
+static uint8_t ticker_enqueue(struct ticker_instance *instance, uint8_t id)
 {
 	struct ticker_node *ticker_current;
 	struct ticker_node *ticker_new;
-	u32_t ticks_to_expire_current;
+	uint32_t ticks_to_expire_current;
 	struct ticker_node *node;
-	u32_t ticks_to_expire;
-	u8_t previous;
-	u8_t current;
+	uint32_t ticks_to_expire;
+	uint8_t previous;
+	uint8_t current;
 
 	node = &instance->nodes[0];
 	ticker_new = &node[id];
@@ -459,18 +459,18 @@ static u8_t ticker_enqueue(struct ticker_instance *instance, u8_t id)
  * ticker node if new node was not enqueued
  * @internal
  */
-static u8_t ticker_enqueue(struct ticker_instance *instance, u8_t id)
+static uint8_t ticker_enqueue(struct ticker_instance *instance, uint8_t id)
 {
 	struct ticker_node *ticker_current;
 	struct ticker_node *ticker_new;
-	u32_t ticks_to_expire_current;
-	u8_t ticker_id_slot_previous;
-	u32_t ticks_slot_previous;
+	uint32_t ticks_to_expire_current;
+	uint8_t ticker_id_slot_previous;
+	uint32_t ticks_slot_previous;
 	struct ticker_node *node;
-	u32_t ticks_to_expire;
-	u8_t previous;
-	u8_t current;
-	u8_t collide;
+	uint32_t ticks_to_expire;
+	uint8_t previous;
+	uint8_t current;
+	uint8_t collide;
 
 	node = &instance->nodes[0];
 	ticker_new = &node[id];
@@ -555,14 +555,14 @@ static u8_t ticker_enqueue(struct ticker_instance *instance, u8_t id)
  * node was not found
  * @internal
  */
-static u32_t ticker_dequeue(struct ticker_instance *instance, u8_t id)
+static uint32_t ticker_dequeue(struct ticker_instance *instance, uint8_t id)
 {
 	struct ticker_node *ticker_current;
 	struct ticker_node *node;
-	u8_t previous;
-	u32_t timeout;
-	u8_t current;
-	u32_t total;
+	uint8_t previous;
+	uint32_t timeout;
+	uint8_t current;
+	uint32_t total;
 
 	/* Find the ticker's position in ticker node list while accumulating
 	 * ticks_to_expire
@@ -635,12 +635,12 @@ static u32_t ticker_dequeue(struct ticker_instance *instance, u8_t id)
  * with other ticker node of higher composite priority
  * @internal
  */
-static u8_t ticker_resolve_collision(struct ticker_node *nodes,
+static uint8_t ticker_resolve_collision(struct ticker_node *nodes,
 				     struct ticker_node *ticker)
 {
 	if ((ticker->priority != TICKER_PRIORITY_CRITICAL) &&
 	    (ticker->next != TICKER_NULL)) {
-		s32_t lazy_current = ticker->lazy_current;
+		int32_t lazy_current = ticker->lazy_current;
 
 		/* Check if this ticker node will starve next node which has
 		 * latency or higher priority
@@ -648,11 +648,11 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
 		if (lazy_current >= ticker->lazy_periodic) {
 			lazy_current -= ticker->lazy_periodic;
 		}
-		u8_t  id_head = ticker->next;
-		u32_t acc_ticks_to_expire = 0U;
+		uint8_t  id_head = ticker->next;
+		uint32_t acc_ticks_to_expire = 0U;
 
 		/* Age is time since last expiry */
-		u32_t current_age = ticker->ticks_periodic +
+		uint32_t current_age = ticker->ticks_periodic +
 				    (lazy_current * ticker->ticks_periodic);
 
 		while (id_head != TICKER_NULL) {
@@ -670,8 +670,8 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
 				continue;
 			}
 
-			s32_t lazy_next = ticker_next->lazy_current;
-			u8_t  lazy_next_periodic_skip =
+			int32_t lazy_next = ticker_next->lazy_current;
+			uint8_t  lazy_next_periodic_skip =
 				ticker_next->lazy_periodic > lazy_next;
 
 			if (!lazy_next_periodic_skip) {
@@ -679,11 +679,11 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
 			}
 
 			/* Is the current and next node equal in priority? */
-			u8_t equal_priority = ticker->priority ==
+			uint8_t equal_priority = ticker->priority ==
 				ticker_next->priority;
 
 			/* Age is time since last expiry */
-			u32_t next_age = (ticker_next->ticks_periodic == 0U ?
+			uint32_t next_age = (ticker_next->ticks_periodic == 0U ?
 					  0U :
 					 (ticker_next->ticks_periodic -
 					  ticker_next->ticks_to_expire)) +
@@ -691,23 +691,23 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
 					  ticker_next->ticks_periodic);
 
 			/* Was the current node scheduled earlier? */
-			u8_t current_is_older = current_age > next_age;
+			uint8_t current_is_older = current_age > next_age;
 			/* Was next node scheduled earlier (legacy priority)? */
-			u8_t next_is_older = next_age > current_age;
+			uint8_t next_is_older = next_age > current_age;
 
 			/* Is force requested for next node (e.g. update) -
 			 * more so than for current node?
 			 */
-			u8_t next_force = (ticker_next->force > ticker->force);
+			uint8_t next_force = (ticker_next->force > ticker->force);
 
 			/* Does next node have critical priority and should
 			 * always be scheduled?
 			 */
-			u8_t next_is_critical = ticker_next->priority ==
+			uint8_t next_is_critical = ticker_next->priority ==
 				TICKER_PRIORITY_CRITICAL;
 
 			/* Does next node have higher priority? */
-			u8_t next_has_priority =
+			uint8_t next_has_priority =
 				(lazy_next - ticker_next->priority) >
 				(lazy_current - ticker->priority);
 
@@ -747,9 +747,9 @@ void ticker_worker(void *param)
 {
 	struct ticker_instance *instance = param;
 	struct ticker_node *node;
-	u32_t ticks_elapsed;
-	u32_t ticks_expired;
-	u8_t ticker_id_head;
+	uint32_t ticks_elapsed;
+	uint32_t ticks_expired;
+	uint8_t ticker_id_head;
 
 	/* Defer worker if job running */
 	instance->worker_trigger = 1U;
@@ -777,7 +777,7 @@ void ticker_worker(void *param)
 	/* Check if the previous ticker node which had air-time, is still
 	 * active and has this time slot reserved
 	 */
-	u8_t slot_reserved = 0;
+	uint8_t slot_reserved = 0;
 
 	if (instance->ticker_id_slot_previous != TICKER_NULL) {
 		if (instance->ticks_slot_previous > ticks_elapsed) {
@@ -792,8 +792,8 @@ void ticker_worker(void *param)
 
 	while (ticker_id_head != TICKER_NULL) {
 		struct ticker_node *ticker;
-		u32_t ticks_to_expire;
-		u8_t must_expire_skip;
+		uint32_t ticks_to_expire;
+		uint8_t must_expire_skip;
 
 		ticker = &node[ticker_id_head];
 
@@ -867,7 +867,7 @@ void ticker_worker(void *param)
 		ticker->ack--;
 
 		if (ticker->timeout_func) {
-			u32_t ticks_at_expire;
+			uint32_t ticks_at_expire;
 
 			ticks_at_expire = (instance->ticks_current +
 					   ticks_expired -
@@ -924,10 +924,10 @@ void ticker_worker(void *param)
  * @internal
  */
 static void ticks_to_expire_prep(struct ticker_node *ticker,
-				 u32_t ticks_current, u32_t ticks_at_start)
+				 uint32_t ticks_current, uint32_t ticks_at_start)
 {
-	u32_t ticks_to_expire = ticker->ticks_to_expire;
-	u32_t ticks_to_expire_minus = ticker->ticks_to_expire_minus;
+	uint32_t ticks_to_expire = ticker->ticks_to_expire;
+	uint32_t ticks_to_expire_minus = ticker->ticks_to_expire_minus;
 
 	/* Calculate ticks to expire for this new node */
 	if (!((ticks_at_start - ticks_current) & BIT(HAL_TICKER_CNTR_MSBIT))) {
@@ -939,7 +939,7 @@ static void ticks_to_expire_prep(struct ticker_node *ticker,
 	} else {
 		/* ticks_current > ticks_at_start
 		 */
-		u32_t delta_current_start;
+		uint32_t delta_current_start;
 
 		delta_current_start = ticker_ticks_diff_get(ticks_current,
 							    ticks_at_start);
@@ -987,7 +987,7 @@ static void ticks_to_expire_prep(struct ticker_node *ticker,
  * @return Returns 1 to indicate increment is due, otherwise 0
  * @internal
  */
-static u8_t ticker_remainder_inc(struct ticker_node *ticker)
+static uint8_t ticker_remainder_inc(struct ticker_node *ticker)
 {
 #ifdef HAL_TICKER_REMAINDER_RANGE
 	ticker->remainder_current += ticker->remainder_periodic;
@@ -1015,10 +1015,10 @@ static u8_t ticker_remainder_inc(struct ticker_node *ticker)
  * @return Returns 1 to indicate decrement is due, otherwise 0
  * @internal
  */
-static u8_t ticker_remainder_dec(struct ticker_node *ticker)
+static uint8_t ticker_remainder_dec(struct ticker_node *ticker)
 {
 #ifdef HAL_TICKER_REMAINDER_RANGE
-	u8_t decrement = 0U;
+	uint8_t decrement = 0U;
 
 	if ((ticker->remainder_current >= BIT(31)) ||
 	    (ticker->remainder_current <= (HAL_TICKER_REMAINDER_RANGE >> 1))) {
@@ -1040,7 +1040,7 @@ static u8_t ticker_remainder_dec(struct ticker_node *ticker)
  *
  * @internal
  */
-static void ticker_job_op_cb(struct ticker_user_op *user_op, u32_t status)
+static void ticker_job_op_cb(struct ticker_user_op *user_op, uint32_t status)
 {
 	user_op->op = TICKER_USER_OP_TYPE_NONE;
 	user_op->status = status;
@@ -1065,12 +1065,12 @@ static void ticker_job_op_cb(struct ticker_user_op *user_op, u32_t status)
  */
 static inline void ticker_job_node_update(struct ticker_node *ticker,
 					  struct ticker_user_op *user_op,
-					  u32_t ticks_current,
-					  u32_t ticks_elapsed,
-					  u8_t *insert_head)
+					  uint32_t ticks_current,
+					  uint32_t ticks_elapsed,
+					  uint8_t *insert_head)
 {
-	u32_t ticks_to_expire = ticker->ticks_to_expire;
-	u32_t ticks_now;
+	uint32_t ticks_to_expire = ticker->ticks_to_expire;
+	uint32_t ticks_now;
 
 	ticks_now = cntr_cnt_get();
 	ticks_elapsed += ticker_ticks_diff_get(ticks_now, ticks_current);
@@ -1159,8 +1159,8 @@ static inline void ticker_job_node_update(struct ticker_node *ticker,
 static inline void ticker_job_node_manage(struct ticker_instance *instance,
 					  struct ticker_node *ticker,
 					  struct ticker_user_op *user_op,
-					  u32_t ticks_elapsed,
-					  u8_t *insert_head)
+					  uint32_t ticks_elapsed,
+					  uint8_t *insert_head)
 {
 	/* Remove ticker node from list */
 	ticker->ticks_to_expire = ticker_dequeue(instance, user_op->id);
@@ -1179,9 +1179,9 @@ static inline void ticker_job_node_manage(struct ticker_instance *instance,
 		ticker->req = ticker->ack;
 
 		if (instance->ticker_id_slot_previous == user_op->id) {
-			u32_t ticks_current;
-			u32_t ticks_at_stop;
-			u32_t ticks_used;
+			uint32_t ticks_current;
+			uint32_t ticks_at_stop;
+			uint32_t ticks_used;
 
 			instance->ticker_id_slot_previous = TICKER_NULL;
 
@@ -1237,14 +1237,14 @@ static inline void ticker_job_node_manage(struct ticker_instance *instance,
  * @return Returns 1 if operations is pending, 0 if all operations are done.
  * @internal
  */
-static inline u8_t ticker_job_list_manage(struct ticker_instance *instance,
-					  u32_t ticks_elapsed,
-					  u8_t *insert_head)
+static inline uint8_t ticker_job_list_manage(struct ticker_instance *instance,
+					  uint32_t ticks_elapsed,
+					  uint8_t *insert_head)
 {
-	u8_t pending;
+	uint8_t pending;
 	struct ticker_node *node;
 	struct ticker_user *users;
-	u8_t count_user;
+	uint8_t count_user;
 
 	pending = 0U;
 	node = &instance->nodes[0];
@@ -1265,9 +1265,9 @@ static inline u8_t ticker_job_list_manage(struct ticker_instance *instance,
 		while (user->middle != user->last) {
 			struct ticker_user_op *user_op;
 			struct ticker_node *ticker;
-			u8_t state;
-			u8_t prev;
-			u8_t middle;
+			uint8_t state;
+			uint8_t prev;
+			uint8_t middle;
 
 			user_op = &user_ops[user->middle];
 
@@ -1349,16 +1349,16 @@ static inline u8_t ticker_job_list_manage(struct ticker_instance *instance,
  * @internal
  */
 static inline void ticker_job_worker_bh(struct ticker_instance *instance,
-					u32_t ticks_previous,
-					u32_t ticks_elapsed,
-					u8_t *insert_head)
+					uint32_t ticks_previous,
+					uint32_t ticks_elapsed,
+					uint8_t *insert_head)
 {
 	struct ticker_node *node;
-	u32_t ticks_expired;
+	uint32_t ticks_expired;
 
 #if !defined(CONFIG_BT_TICKER_COMPATIBILITY_MODE)
-	u32_t ticks_latency;
-	u32_t ticks_now;
+	uint32_t ticks_latency;
+	uint32_t ticks_now;
 
 	ticks_now = cntr_cnt_get();
 	ticks_latency = ticker_ticks_diff_get(ticks_now, ticks_previous);
@@ -1367,10 +1367,10 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
 	node = &instance->nodes[0];
 	ticks_expired = 0U;
 	while (instance->ticker_id_head != TICKER_NULL) {
-		u8_t is_must_expire_skip = 0U;
+		uint8_t is_must_expire_skip = 0U;
 		struct ticker_node *ticker;
-		u32_t ticks_to_expire;
-		u8_t id_expired;
+		uint32_t ticks_to_expire;
+		uint8_t id_expired;
 
 		/* auto variable for current ticker node */
 		id_expired = instance->ticker_id_head;
@@ -1436,9 +1436,9 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
 				 */
 				ticker->req = ticker->ack;
 			} else {
-				u16_t lazy_periodic;
-				u32_t count;
-				u16_t lazy;
+				uint16_t lazy_periodic;
+				uint32_t count;
+				uint16_t lazy;
 
 				/* If not skipped, apply lazy_periodic */
 				if (!ticker->lazy_current) {
@@ -1490,7 +1490,7 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
 			ticks_to_expire_prep(ticker, instance->ticks_current,
 					     (ticks_previous + ticks_expired));
 #else /* !CONFIG_BT_TICKER_COMPATIBILITY_MODE */
-			u32_t count;
+			uint32_t count;
 
 			/* Prepare for next interval */
 			ticks_to_expire = 0U;
@@ -1534,7 +1534,7 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
  */
 static inline void ticker_job_op_start(struct ticker_node *ticker,
 				       struct ticker_user_op *user_op,
-				       u32_t ticks_current)
+				       uint32_t ticks_current)
 {
 	struct ticker_user_op_start *start = (void *)&user_op->params.start;
 
@@ -1580,10 +1580,10 @@ static inline void ticker_job_op_start(struct ticker_node *ticker,
  *		      are un-scheduled
  * @internal
  */
-static inline u32_t ticker_job_insert(struct ticker_instance *instance,
-				      u8_t id_insert,
+static inline uint32_t ticker_job_insert(struct ticker_instance *instance,
+				      uint8_t id_insert,
 				      struct ticker_node *ticker,
-				      u8_t *insert_head)
+				      uint8_t *insert_head)
 {
 	ARG_UNUSED(insert_head);
 
@@ -1616,26 +1616,26 @@ static inline u32_t ticker_job_insert(struct ticker_instance *instance,
  *
  * @internal
  */
-static u8_t ticker_job_reschedule_in_window(struct ticker_instance *instance,
-					    u32_t ticks_elapsed)
+static uint8_t ticker_job_reschedule_in_window(struct ticker_instance *instance,
+					    uint32_t ticks_elapsed)
 {
 	struct ticker_node *nodes;
 	struct ticker_node *ticker;
 	struct ticker_node *node;
 	struct ticker_ext  *ext_data;
 
-	u32_t window_start_ticks;
-	u32_t window_end_ticks;
-	u32_t ticks_to_expire;
-	u32_t ticks_start_offset;
-	u32_t ticks_slot_window = 0;
+	uint32_t window_start_ticks;
+	uint32_t window_end_ticks;
+	uint32_t ticks_to_expire;
+	uint32_t ticks_start_offset;
+	uint32_t ticks_slot_window = 0;
 
-	u8_t  ticker_id_head;
-	u8_t  ticker_id_iter;
-	u8_t  ticker_id_prev;
+	uint8_t  ticker_id_head;
+	uint8_t  ticker_id_iter;
+	uint8_t  ticker_id_prev;
 
-	u8_t  rescheduling = 1U;
-	u8_t  rescheduled = 0U;
+	uint8_t  rescheduling = 1U;
+	uint8_t  rescheduled = 0U;
 
 	nodes = &instance->nodes[0];
 
@@ -1829,14 +1829,14 @@ static u8_t ticker_job_reschedule_in_window(struct ticker_instance *instance,
  *		      are un-scheduled
  * @internal
  */
-static inline u32_t ticker_job_insert(struct ticker_instance *instance,
-				      u8_t id_insert,
+static inline uint32_t ticker_job_insert(struct ticker_instance *instance,
+				      uint8_t id_insert,
 				      struct ticker_node *ticker,
-				      u8_t *insert_head)
+				      uint8_t *insert_head)
 {
 	struct ticker_node *node = &instance->nodes[0];
-	u8_t id_collide;
-	u16_t skip;
+	uint8_t id_collide;
+	uint16_t skip;
 
 	/* Prepare to insert */
 	ticker->next = TICKER_NULL;
@@ -1855,7 +1855,7 @@ static inline u32_t ticker_job_insert(struct ticker_instance *instance,
 		/* Check for collision */
 		if (id_collide != TICKER_NULL) {
 			struct ticker_node *ticker_collide = &node[id_collide];
-			u16_t skip_collide;
+			uint16_t skip_collide;
 
 			/* No. of times colliding ticker has skipped its
 			 * interval.
@@ -1932,11 +1932,11 @@ static inline u32_t ticker_job_insert(struct ticker_instance *instance,
  * @internal
  */
 static inline void ticker_job_list_insert(struct ticker_instance *instance,
-					  u8_t insert_head)
+					  uint8_t insert_head)
 {
 	struct ticker_node *node;
 	struct ticker_user *users;
-	u8_t count_user;
+	uint8_t count_user;
 
 	node = &instance->nodes[0];
 	users = &instance->users[0];
@@ -1946,7 +1946,7 @@ static inline void ticker_job_list_insert(struct ticker_instance *instance,
 	while (count_user--) {
 		struct ticker_user_op *user_ops;
 		struct ticker_user *user;
-		u8_t user_ops_first;
+		uint8_t user_ops_first;
 
 		user = &users[count_user];
 		user_ops = (void *)&user->user_op[0];
@@ -1956,8 +1956,8 @@ static inline void ticker_job_list_insert(struct ticker_instance *instance,
 		       (user_ops_first != user->middle)) {
 			struct ticker_user_op *user_op;
 			struct ticker_node *ticker;
-			u8_t id_insert;
-			u32_t status;
+			uint8_t id_insert;
+			uint32_t status;
 
 			if (insert_head != TICKER_NULL) {
 				/* Prepare insert of ticker node specified by
@@ -1972,7 +1972,7 @@ static inline void ticker_job_list_insert(struct ticker_instance *instance,
 				/* Prepare insert of any ticker nodes requested
 				 * via user operation TICKER_USER_OP_TYPE_START
 				 */
-				u8_t first;
+				uint8_t first;
 
 				user_op = &user_ops[user_ops_first];
 				first = user_ops_first + 1;
@@ -2079,7 +2079,7 @@ static inline void ticker_job_op_inquire(struct ticker_instance *instance,
 static inline void ticker_job_list_inquire(struct ticker_instance *instance)
 {
 	struct ticker_user *users;
-	u8_t count_user;
+	uint8_t count_user;
 
 	users = &instance->users[0];
 	count_user = instance->count_user;
@@ -2091,7 +2091,7 @@ static inline void ticker_job_list_inquire(struct ticker_instance *instance)
 		user = &users[count_user];
 		user_op = &user->user_op[0];
 		while (user->first != user->last) {
-			u8_t first;
+			uint8_t first;
 
 			ticker_job_op_inquire(instance, &user_op[user->first]);
 
@@ -2118,14 +2118,14 @@ static inline void ticker_job_list_inquire(struct ticker_instance *instance)
  * @internal
  */
 static inline void ticker_job_compare_update(struct ticker_instance *instance,
-					     u8_t ticker_id_old_head)
+					     uint8_t ticker_id_old_head)
 {
 	struct ticker_node *ticker;
-	u32_t ticks_to_expire;
-	u32_t ctr_post;
-	u32_t ctr;
-	u32_t cc;
-	u32_t i;
+	uint32_t ticks_to_expire;
+	uint32_t ctr_post;
+	uint32_t ctr;
+	uint32_t cc;
+	uint32_t i;
 
 	if (instance->ticker_id_head == TICKER_NULL) {
 		if (cntr_stop() == 0) {
@@ -2137,7 +2137,7 @@ static inline void ticker_job_compare_update(struct ticker_instance *instance,
 
 	/* Check if this is the first update. If so, start the counter */
 	if (ticker_id_old_head == TICKER_NULL) {
-		u32_t ticks_current;
+		uint32_t ticks_current;
 
 		ticks_current = cntr_cnt_get();
 
@@ -2156,7 +2156,7 @@ static inline void ticker_job_compare_update(struct ticker_instance *instance,
 	 */
 	i = 10U;
 	do {
-		u32_t ticks_elapsed;
+		uint32_t ticks_elapsed;
 
 		LL_ASSERT(i);
 		i--;
@@ -2193,13 +2193,13 @@ static inline void ticker_job_compare_update(struct ticker_instance *instance,
 void ticker_job(void *param)
 {
 	struct ticker_instance *instance = param;
-	u8_t ticker_id_old_head;
-	u8_t insert_head;
-	u32_t ticks_elapsed;
-	u32_t ticks_previous;
-	u8_t flag_elapsed;
-	u8_t pending;
-	u8_t flag_compare_update;
+	uint8_t ticker_id_old_head;
+	uint8_t insert_head;
+	uint32_t ticks_elapsed;
+	uint32_t ticks_previous;
+	uint8_t flag_elapsed;
+	uint8_t pending;
+	uint8_t flag_compare_update;
 
 	DEBUG_TICKER_JOB(1);
 
@@ -2327,8 +2327,8 @@ void ticker_job(void *param)
  * @return TICKER_STATUS_SUCCESS if initialization was successful, otherwise
  * TICKER_STATUS_FAILURE
  */
-u32_t ticker_init(u8_t instance_index, u8_t count_node, void *node,
-		  u8_t count_user, void *user, u8_t count_op, void *user_op,
+uint32_t ticker_init(uint8_t instance_index, uint8_t count_node, void *node,
+		  uint8_t count_user, void *user, uint8_t count_op, void *user_op,
 		  ticker_caller_id_get_cb_t caller_id_get_cb,
 		  ticker_sched_cb_t sched_cb,
 		  ticker_trigger_set_cb_t trigger_set_cb)
@@ -2387,7 +2387,7 @@ u32_t ticker_init(u8_t instance_index, u8_t count_node, void *node,
  *
  * @return true if ticker instance is initialized, false otherwise
  */
-bool ticker_is_initialized(u8_t instance_index)
+bool ticker_is_initialized(uint8_t instance_index)
 {
 	return !!(_instance[instance_index].count_node);
 }
@@ -2400,7 +2400,7 @@ bool ticker_is_initialized(u8_t instance_index)
  *
  * @param instance_index Index of ticker instance
  */
-void ticker_trigger(u8_t instance_index)
+void ticker_trigger(uint8_t instance_index)
 {
 	struct ticker_instance *instance;
 
@@ -2449,9 +2449,9 @@ void ticker_trigger(u8_t instance_index)
  * run before exiting ticker_start
  */
 #if defined(CONFIG_BT_TICKER_EXT)
-u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		   u32_t ticks_anchor, u32_t ticks_first, u32_t ticks_periodic,
-		   u32_t remainder_periodic, u16_t lazy, u32_t ticks_slot,
+uint32_t ticker_start(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		   uint32_t ticks_anchor, uint32_t ticks_first, uint32_t ticks_periodic,
+		   uint32_t remainder_periodic, uint16_t lazy, uint32_t ticks_slot,
 		   ticker_timeout_func fp_timeout_func, void *context,
 		   ticker_op_func fp_op_func, void *op_context)
 {
@@ -2463,17 +2463,17 @@ u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
 				NULL);
 }
 
-u32_t ticker_start_ext(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		       u32_t ticks_anchor, u32_t ticks_first,
-		       u32_t ticks_periodic, u32_t remainder_periodic,
-		       u16_t lazy, u32_t ticks_slot,
+uint32_t ticker_start_ext(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		       uint32_t ticks_anchor, uint32_t ticks_first,
+		       uint32_t ticks_periodic, uint32_t remainder_periodic,
+		       uint16_t lazy, uint32_t ticks_slot,
 		       ticker_timeout_func fp_timeout_func, void *context,
 		       ticker_op_func fp_op_func, void *op_context,
 		       struct ticker_ext *ext_data)
 #else
-u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		   u32_t ticks_anchor, u32_t ticks_first, u32_t ticks_periodic,
-		   u32_t remainder_periodic, u16_t lazy, u32_t ticks_slot,
+uint32_t ticker_start(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		   uint32_t ticks_anchor, uint32_t ticks_first, uint32_t ticks_periodic,
+		   uint32_t remainder_periodic, uint16_t lazy, uint32_t ticks_slot,
 		   ticker_timeout_func fp_timeout_func, void *context,
 		   ticker_op_func fp_op_func, void *op_context)
 #endif
@@ -2481,7 +2481,7 @@ u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2550,15 +2550,15 @@ u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_update
  */
-u32_t ticker_update(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		    u32_t ticks_drift_plus, u32_t ticks_drift_minus,
-		    u32_t ticks_slot_plus, u32_t ticks_slot_minus, u16_t lazy,
-		    u8_t force, ticker_op_func fp_op_func, void *op_context)
+uint32_t ticker_update(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		    uint32_t ticks_drift_plus, uint32_t ticks_drift_minus,
+		    uint32_t ticks_slot_plus, uint32_t ticks_slot_minus, uint16_t lazy,
+		    uint8_t force, ticker_op_func fp_op_func, void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2610,13 +2610,13 @@ u32_t ticker_update(u8_t instance_index, u8_t user_id, u8_t ticker_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_stop
  */
-u32_t ticker_stop(u8_t instance_index, u8_t user_id, u8_t ticker_id,
+uint32_t ticker_stop(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
 		  ticker_op_func fp_op_func, void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2663,14 +2663,14 @@ u32_t ticker_stop(u8_t instance_index, u8_t user_id, u8_t ticker_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_stop
  */
-u32_t ticker_stop_abs(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		  u32_t ticks_at_stop, ticker_op_func fp_op_func,
+uint32_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		  uint32_t ticks_at_stop, ticker_op_func fp_op_func,
 		  void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2722,14 +2722,14 @@ u32_t ticker_stop_abs(u8_t instance_index, u8_t user_id, u8_t ticker_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_next_slot_get
  */
-u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id, u8_t *ticker_id,
-			   u32_t *ticks_current, u32_t *ticks_to_expire,
+uint32_t ticker_next_slot_get(uint8_t instance_index, uint8_t user_id, uint8_t *ticker_id,
+			   uint32_t *ticks_current, uint32_t *ticks_to_expire,
 			   ticker_op_func fp_op_func, void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2778,13 +2778,13 @@ u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id, u8_t *ticker_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_job_idle_get
  */
-u32_t ticker_job_idle_get(u8_t instance_index, u8_t user_id,
+uint32_t ticker_job_idle_get(uint8_t instance_index, uint8_t user_id,
 			  ticker_op_func fp_op_func, void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2834,14 +2834,14 @@ u32_t ticker_job_idle_get(u8_t instance_index, u8_t user_id,
  * available, and TICKER_STATUS_SUCCESS is returned if ticker_job gets to run
  * before exiting ticker_priority_set
  */
-u32_t ticker_priority_set(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-			  s8_t priority, ticker_op_func fp_op_func,
+uint32_t ticker_priority_set(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+			  int8_t priority, ticker_op_func fp_op_func,
 			  void *op_context)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
-	u8_t last;
+	uint8_t last;
 
 	user = &instance->users[user_id];
 
@@ -2877,7 +2877,7 @@ u32_t ticker_priority_set(u8_t instance_index, u8_t user_id, u8_t ticker_id,
  * @param instance_index Index of ticker instance
  * @param user_id	 Ticker user id. Maps to mayfly caller id
  */
-void ticker_job_sched(u8_t instance_index, u8_t user_id)
+void ticker_job_sched(uint8_t instance_index, uint8_t user_id)
 {
 	struct ticker_instance *instance = &_instance[instance_index];
 
@@ -2890,7 +2890,7 @@ void ticker_job_sched(u8_t instance_index, u8_t user_id)
  *
  * @return Absolute tick count
  */
-u32_t ticker_ticks_now_get(void)
+uint32_t ticker_ticks_now_get(void)
 {
 	return cntr_cnt_get();
 }
@@ -2904,7 +2904,7 @@ u32_t ticker_ticks_now_get(void)
  * @param ticks_now Highest tick count (now)
  * @param ticks_old Tick count to subtract from ticks_now
  */
-u32_t ticker_ticks_diff_get(u32_t ticks_now, u32_t ticks_old)
+uint32_t ticker_ticks_diff_get(uint32_t ticks_now, uint32_t ticks_old)
 {
 	return ((ticks_now - ticks_old) & HAL_TICKER_CNTR_MASK);
 }
diff --git a/subsys/bluetooth/controller/ticker/ticker.h b/subsys/bluetooth/controller/ticker/ticker.h
index a2f946e4a6..c1ebaa8bb1 100644
--- a/subsys/bluetooth/controller/ticker/ticker.h
+++ b/subsys/bluetooth/controller/ticker/ticker.h
@@ -24,7 +24,7 @@
  *
  * @{
  */
-#define TICKER_NULL             ((u8_t)((u8_t)0 - 1))
+#define TICKER_NULL             ((uint8_t)((uint8_t)0 - 1))
 #define TICKER_NULL_REMAINDER   0
 #define TICKER_NULL_PERIOD      0
 #define TICKER_NULL_SLOT        0
@@ -75,28 +75,28 @@
  */
 #define TICKER_PRIORITY_CRITICAL -128
 
-typedef u8_t (*ticker_caller_id_get_cb_t)(u8_t user_id);
-typedef void (*ticker_sched_cb_t)(u8_t caller_id, u8_t callee_id, u8_t chain,
+typedef uint8_t (*ticker_caller_id_get_cb_t)(uint8_t user_id);
+typedef void (*ticker_sched_cb_t)(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 				  void *instance);
-typedef void (*ticker_trigger_set_cb_t)(u32_t value);
+typedef void (*ticker_trigger_set_cb_t)(uint32_t value);
 
 /** \brief Timer timeout function type.
  */
-typedef void (*ticker_timeout_func) (u32_t ticks_at_expire, u32_t remainder,
-				     u16_t lazy, void *context);
+typedef void (*ticker_timeout_func) (uint32_t ticks_at_expire, uint32_t remainder,
+				     uint16_t lazy, void *context);
 
 /** \brief Timer operation complete function type.
  */
-typedef void (*ticker_op_func) (u32_t status, void *op_context);
+typedef void (*ticker_op_func) (uint32_t status, void *op_context);
 
 #if defined(CONFIG_BT_TICKER_EXT)
 struct ticker_ext {
-	u32_t ticks_slot_window; /* Window in which the slot
+	uint32_t ticks_slot_window; /* Window in which the slot
 				  * reservation may be re-scheduled
 				  * to avoid collision
 				  */
-	s32_t ticks_drift;	 /* Applied drift since last expiry */
-	u8_t  reschedule_state;	 /* State of re-scheduling of the
+	int32_t ticks_drift;	 /* Applied drift since last expiry */
+	uint8_t  reschedule_state;	 /* State of re-scheduling of the
 				  * node. See defines
 				  * TICKER_RESCHEDULE_STATE_XXX
 				  */
@@ -114,47 +114,47 @@ struct ticker_ext {
  * \param[in]  count_op
  * \param[in]  user_op
  */
-u32_t ticker_init(u8_t instance_index, u8_t count_node, void *node,
-		  u8_t count_user, void *user, u8_t count_op, void *user_op,
+uint32_t ticker_init(uint8_t instance_index, uint8_t count_node, void *node,
+		  uint8_t count_user, void *user, uint8_t count_op, void *user_op,
 		  ticker_caller_id_get_cb_t caller_id_get_cb,
 		  ticker_sched_cb_t sched_cb,
 		  ticker_trigger_set_cb_t trigger_set_cb);
-bool ticker_is_initialized(u8_t instance_index);
-void ticker_trigger(u8_t instance_index);
+bool ticker_is_initialized(uint8_t instance_index);
+void ticker_trigger(uint8_t instance_index);
 void ticker_worker(void *param);
 void ticker_job(void *param);
-u32_t ticker_start(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		   u32_t ticks_anchor, u32_t ticks_first, u32_t ticks_periodic,
-		   u32_t remainder_periodic, u16_t lazy, u32_t ticks_slot,
+uint32_t ticker_start(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		   uint32_t ticks_anchor, uint32_t ticks_first, uint32_t ticks_periodic,
+		   uint32_t remainder_periodic, uint16_t lazy, uint32_t ticks_slot,
 		   ticker_timeout_func fp_timeout_func, void *context,
 		   ticker_op_func fp_op_func, void *op_context);
-u32_t ticker_update(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		    u32_t ticks_drift_plus, u32_t ticks_drift_minus,
-		    u32_t ticks_slot_plus, u32_t ticks_slot_minus, u16_t lazy,
-		    u8_t force, ticker_op_func fp_op_func, void *op_context);
-u32_t ticker_stop(u8_t instance_index, u8_t user_id, u8_t ticker_id,
+uint32_t ticker_update(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		    uint32_t ticks_drift_plus, uint32_t ticks_drift_minus,
+		    uint32_t ticks_slot_plus, uint32_t ticks_slot_minus, uint16_t lazy,
+		    uint8_t force, ticker_op_func fp_op_func, void *op_context);
+uint32_t ticker_stop(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
 		  ticker_op_func fp_op_func, void *op_context);
-u32_t ticker_stop_abs(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		      u32_t ticks_at_stop, ticker_op_func fp_op_func,
+uint32_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		      uint32_t ticks_at_stop, ticker_op_func fp_op_func,
 		      void *op_context);
-u32_t ticker_next_slot_get(u8_t instance_index, u8_t user_id,
-			   u8_t *ticker_id_head, u32_t *ticks_current,
-			   u32_t *ticks_to_expire,
+uint32_t ticker_next_slot_get(uint8_t instance_index, uint8_t user_id,
+			   uint8_t *ticker_id_head, uint32_t *ticks_current,
+			   uint32_t *ticks_to_expire,
 			   ticker_op_func fp_op_func, void *op_context);
-u32_t ticker_job_idle_get(u8_t instance_index, u8_t user_id,
+uint32_t ticker_job_idle_get(uint8_t instance_index, uint8_t user_id,
 			  ticker_op_func fp_op_func, void *op_context);
-void ticker_job_sched(u8_t instance_index, u8_t user_id);
-u32_t ticker_ticks_now_get(void);
-u32_t ticker_ticks_diff_get(u32_t ticks_now, u32_t ticks_old);
+void ticker_job_sched(uint8_t instance_index, uint8_t user_id);
+uint32_t ticker_ticks_now_get(void);
+uint32_t ticker_ticks_diff_get(uint32_t ticks_now, uint32_t ticks_old);
 #if !defined(CONFIG_BT_TICKER_COMPATIBILITY_MODE)
-u32_t ticker_priority_set(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-			  s8_t priority, ticker_op_func fp_op_func,
+uint32_t ticker_priority_set(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+			  int8_t priority, ticker_op_func fp_op_func,
 			  void *op_context);
 #if defined(CONFIG_BT_TICKER_EXT)
-u32_t ticker_start_ext(u8_t instance_index, u8_t user_id, u8_t ticker_id,
-		       u32_t ticks_anchor, u32_t ticks_first,
-		       u32_t ticks_periodic, u32_t remainder_periodic,
-		       u16_t lazy, u32_t ticks_slot,
+uint32_t ticker_start_ext(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+		       uint32_t ticks_anchor, uint32_t ticks_first,
+		       uint32_t ticks_periodic, uint32_t remainder_periodic,
+		       uint16_t lazy, uint32_t ticks_slot,
 		       ticker_timeout_func fp_timeout_func, void *context,
 		       ticker_op_func fp_op_func, void *op_context,
 		       struct ticker_ext *ext_data);
diff --git a/subsys/bluetooth/controller/util/mayfly.c b/subsys/bluetooth/controller/util/mayfly.c
index eda08a6703..ede9451b9e 100644
--- a/subsys/bluetooth/controller/util/mayfly.c
+++ b/subsys/bluetooth/controller/util/mayfly.c
@@ -14,26 +14,26 @@
 static struct {
 	memq_link_t *head;
 	memq_link_t *tail;
-	u8_t        enable_req;
-	u8_t        enable_ack;
-	u8_t        disable_req;
-	u8_t        disable_ack;
+	uint8_t        enable_req;
+	uint8_t        enable_ack;
+	uint8_t        disable_req;
+	uint8_t        disable_ack;
 } mft[MAYFLY_CALLEE_COUNT][MAYFLY_CALLER_COUNT];
 
 static memq_link_t mfl[MAYFLY_CALLEE_COUNT][MAYFLY_CALLER_COUNT];
-static u8_t mfp[MAYFLY_CALLEE_COUNT];
+static uint8_t mfp[MAYFLY_CALLEE_COUNT];
 
 #if defined(MAYFLY_UT)
-static u8_t _state;
+static uint8_t _state;
 #endif /* MAYFLY_UT */
 
 void mayfly_init(void)
 {
-	u8_t callee_id;
+	uint8_t callee_id;
 
 	callee_id = MAYFLY_CALLEE_COUNT;
 	while (callee_id--) {
-		u8_t caller_id;
+		uint8_t caller_id;
 
 		caller_id = MAYFLY_CALLER_COUNT;
 		while (caller_id--) {
@@ -44,7 +44,7 @@ void mayfly_init(void)
 	}
 }
 
-void mayfly_enable(u8_t caller_id, u8_t callee_id, u8_t enable)
+void mayfly_enable(uint8_t caller_id, uint8_t callee_id, uint8_t enable)
 {
 	if (enable) {
 		if (mft[callee_id][caller_id].enable_req ==
@@ -67,11 +67,11 @@ void mayfly_enable(u8_t caller_id, u8_t callee_id, u8_t enable)
 	}
 }
 
-u32_t mayfly_enqueue(u8_t caller_id, u8_t callee_id, u8_t chain,
+uint32_t mayfly_enqueue(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 			struct mayfly *m)
 {
-	u8_t state;
-	u8_t ack;
+	uint8_t state;
+	uint8_t ack;
 
 	chain = chain || !mayfly_prio_is_equal(caller_id, callee_id) ||
 		!mayfly_is_enabled(caller_id, callee_id) ||
@@ -122,21 +122,21 @@ mayfly_enqueue_pend:
 	return 0;
 }
 
-static void dequeue(u8_t callee_id, u8_t caller_id, memq_link_t *link,
+static void dequeue(uint8_t callee_id, uint8_t caller_id, memq_link_t *link,
 		    struct mayfly *m)
 {
-	u8_t req;
+	uint8_t req;
 
 	req = m->_req;
 	if (((req - m->_ack) & 0x03) != 1U) {
-		u8_t ack;
+		uint8_t ack;
 
 #if defined(MAYFLY_UT)
-		u32_t mayfly_ut_run_test(void);
+		uint32_t mayfly_ut_run_test(void);
 		void mayfly_ut_mfy(void *param);
 
 		if (_state && m->fp == mayfly_ut_mfy) {
-			static u8_t single;
+			static uint8_t single;
 
 			if (!single) {
 				single = 1U;
@@ -169,11 +169,11 @@ static void dequeue(u8_t callee_id, u8_t caller_id, memq_link_t *link,
 	}
 }
 
-void mayfly_run(u8_t callee_id)
+void mayfly_run(uint8_t callee_id)
 {
-	u8_t disable = 0U;
-	u8_t enable = 0U;
-	u8_t caller_id;
+	uint8_t disable = 0U;
+	uint8_t enable = 0U;
+	uint8_t caller_id;
 
 	if (!mfp[callee_id]) {
 		return;
@@ -191,7 +191,7 @@ void mayfly_run(u8_t callee_id)
 				 mft[callee_id][caller_id].tail,
 				 (void **)&m);
 		while (link) {
-			u8_t state;
+			uint8_t state;
 
 #if defined(MAYFLY_UT)
 			_state = 0U;
@@ -281,15 +281,15 @@ void mayfly_ut_mfy(void *param)
 {
 	printk("%s: ran.\n", __func__);
 
-	(*((u32_t *)param))++;
+	(*((uint32_t *)param))++;
 }
 
 void mayfly_ut_test(void *param)
 {
-	static u32_t *count;
+	static uint32_t *count;
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, mayfly_ut_mfy};
-	u32_t err;
+	uint32_t err;
 
 	printk("%s: req= %u, ack= %u\n", __func__, mfy._req, mfy._ack);
 
@@ -308,11 +308,11 @@ void mayfly_ut_test(void *param)
 	}
 }
 
-u32_t mayfly_ut_run_test(void)
+uint32_t mayfly_ut_run_test(void)
 {
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, NULL, mayfly_ut_test};
-	u32_t err;
+	uint32_t err;
 
 	printk("%s: req= %u, ack= %u\n", __func__, mfy._req, mfy._ack);
 
@@ -329,12 +329,12 @@ u32_t mayfly_ut_run_test(void)
 	return 0;
 }
 
-u32_t mayfly_ut(void)
+uint32_t mayfly_ut(void)
 {
-	static u32_t count;
+	static uint32_t count;
 	static memq_link_t link;
 	static struct mayfly mfy = {0, 0, &link, &count, mayfly_ut_test};
-	u32_t err;
+	uint32_t err;
 
 	printk("%s: req= %u, ack= %u\n", __func__, mfy._req, mfy._ack);
 
diff --git a/subsys/bluetooth/controller/util/mayfly.h b/subsys/bluetooth/controller/util/mayfly.h
index 726fac39dd..ba2fb0b25d 100644
--- a/subsys/bluetooth/controller/util/mayfly.h
+++ b/subsys/bluetooth/controller/util/mayfly.h
@@ -13,20 +13,20 @@
 #define MAYFLY_CALLEE_COUNT    4
 
 struct mayfly {
-	u8_t volatile _req;
-	u8_t _ack;
+	uint8_t volatile _req;
+	uint8_t _ack;
 	memq_link_t *_link;
 	void *param;
 	void (*fp)(void *);
 };
 
 void mayfly_init(void);
-void mayfly_enable(u8_t caller_id, u8_t callee_id, u8_t enable);
-u32_t mayfly_enqueue(u8_t caller_id, u8_t callee_id, u8_t chain,
+void mayfly_enable(uint8_t caller_id, uint8_t callee_id, uint8_t enable);
+uint32_t mayfly_enqueue(uint8_t caller_id, uint8_t callee_id, uint8_t chain,
 		     struct mayfly *m);
-void mayfly_run(u8_t callee_id);
+void mayfly_run(uint8_t callee_id);
 
-extern void mayfly_enable_cb(u8_t caller_id, u8_t callee_id, u8_t enable);
-extern u32_t mayfly_is_enabled(u8_t caller_id, u8_t callee_id);
-extern u32_t mayfly_prio_is_equal(u8_t caller_id, u8_t callee_id);
-extern void mayfly_pend(u8_t caller_id, u8_t callee_id);
+extern void mayfly_enable_cb(uint8_t caller_id, uint8_t callee_id, uint8_t enable);
+extern uint32_t mayfly_is_enabled(uint8_t caller_id, uint8_t callee_id);
+extern uint32_t mayfly_prio_is_equal(uint8_t caller_id, uint8_t callee_id);
+extern void mayfly_pend(uint8_t caller_id, uint8_t callee_id);
diff --git a/subsys/bluetooth/controller/util/mem.c b/subsys/bluetooth/controller/util/mem.c
index 0c6a8f490b..d061a200be 100644
--- a/subsys/bluetooth/controller/util/mem.c
+++ b/subsys/bluetooth/controller/util/mem.c
@@ -12,7 +12,7 @@
 
 #include "mem.h"
 
-void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count,
+void mem_init(void *mem_pool, uint16_t mem_size, uint16_t mem_count,
 	      void **mem_head)
 {
 	*mem_head = mem_pool;
@@ -20,19 +20,19 @@ void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count,
 	/* Store free mem_count after the list's next pointer at an 32-bit
 	 * aligned memory location to ensure atomic read/write (in ARM for now).
 	 */
-	*((u16_t *)MROUND((u8_t *)mem_pool + sizeof(mem_pool))) = mem_count;
+	*((uint16_t *)MROUND((uint8_t *)mem_pool + sizeof(mem_pool))) = mem_count;
 
 	/* Initialize next pointers to form a free list,
 	 * next pointer is stored in the first 32-bit of each block
 	 */
-	(void)memset(((u8_t *)mem_pool + (mem_size * (--mem_count))), 0,
+	(void)memset(((uint8_t *)mem_pool + (mem_size * (--mem_count))), 0,
 		     sizeof(mem_pool));
 	while (mem_count--) {
-		u32_t next;
+		uint32_t next;
 
-		next = (u32_t)((u8_t *) mem_pool +
+		next = (uint32_t)((uint8_t *) mem_pool +
 			       (mem_size * (mem_count + 1)));
-		memcpy(((u8_t *)mem_pool + (mem_size * mem_count)),
+		memcpy(((uint8_t *)mem_pool + (mem_size * mem_count)),
 		       (void *)&next, sizeof(next));
 	}
 }
@@ -40,12 +40,12 @@ void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count,
 void *mem_acquire(void **mem_head)
 {
 	if (*mem_head) {
-		u16_t free_count;
+		uint16_t free_count;
 		void *head;
 		void *mem;
 
 		/* Get the free count from the list and decrement it */
-		free_count = *((u16_t *)MROUND((u8_t *)*mem_head +
+		free_count = *((uint16_t *)MROUND((uint8_t *)*mem_head +
 					       sizeof(mem_head)));
 		free_count--;
 
@@ -54,7 +54,7 @@ void *mem_acquire(void **mem_head)
 
 		/* Store free mem_count after the list's next pointer */
 		if (head) {
-			*((u16_t *)MROUND((u8_t *)head + sizeof(head))) =
+			*((uint16_t *)MROUND((uint8_t *)head + sizeof(head))) =
 				free_count;
 		}
 
@@ -67,11 +67,11 @@ void *mem_acquire(void **mem_head)
 
 void mem_release(void *mem, void **mem_head)
 {
-	u16_t free_count = 0U;
+	uint16_t free_count = 0U;
 
 	/* Get the free count from the list and increment it */
 	if (*mem_head) {
-		free_count = *((u16_t *)MROUND((u8_t *)*mem_head +
+		free_count = *((uint16_t *)MROUND((uint8_t *)*mem_head +
 					       sizeof(mem_head)));
 	}
 	free_count++;
@@ -79,39 +79,39 @@ void mem_release(void *mem, void **mem_head)
 	memcpy(mem, mem_head, sizeof(mem));
 
 	/* Store free mem_count after the list's next pointer */
-	*((u16_t *)MROUND((u8_t *)mem + sizeof(mem))) = free_count;
+	*((uint16_t *)MROUND((uint8_t *)mem + sizeof(mem))) = free_count;
 
 	*mem_head = mem;
 }
 
-u16_t mem_free_count_get(void *mem_head)
+uint16_t mem_free_count_get(void *mem_head)
 {
-	u16_t free_count = 0U;
+	uint16_t free_count = 0U;
 
 	/* Get the free count from the list */
 	if (mem_head) {
-		free_count = *((u16_t *)MROUND((u8_t *)mem_head +
+		free_count = *((uint16_t *)MROUND((uint8_t *)mem_head +
 					       sizeof(mem_head)));
 	}
 
 	return free_count;
 }
 
-void *mem_get(void *mem_pool, u16_t mem_size, u16_t index)
+void *mem_get(void *mem_pool, uint16_t mem_size, uint16_t index)
 {
-	return ((void *)((u8_t *)mem_pool + (mem_size * index)));
+	return ((void *)((uint8_t *)mem_pool + (mem_size * index)));
 }
 
-u16_t mem_index_get(void *mem, void *mem_pool, u16_t mem_size)
+uint16_t mem_index_get(void *mem, void *mem_pool, uint16_t mem_size)
 {
-	return ((u16_t)((u8_t *)mem - (u8_t *)mem_pool) / mem_size);
+	return ((uint16_t)((uint8_t *)mem - (uint8_t *)mem_pool) / mem_size);
 }
 
 /**
  * @brief  Copy bytes in reverse
  * @details Example: [ 0x11 0x22 0x33 ] -> [ 0x33 0x22 0x11 ]
  */
-void mem_rcopy(u8_t *dst, u8_t const *src, u16_t len)
+void mem_rcopy(uint8_t *dst, uint8_t const *src, uint16_t len)
 {
 	src += len;
 	while (len--) {
@@ -123,7 +123,7 @@ void mem_rcopy(u8_t *dst, u8_t const *src, u16_t len)
  * @brief Determine if src[0..len-1] contains one or more non-zero bytes
  * @return 0 if all bytes are zero; otherwise 1
  */
-u8_t mem_nz(u8_t *src, u16_t len)
+uint8_t mem_nz(uint8_t *src, uint16_t len)
 {
 	while (len--) {
 		if (*src++) {
@@ -137,14 +137,14 @@ u8_t mem_nz(u8_t *src, u16_t len)
 /**
  * @brief Unit test
  */
-u32_t mem_ut(void)
+uint32_t mem_ut(void)
 {
 #define BLOCK_SIZE  MROUND(10)
 #define BLOCK_COUNT 10
-	u8_t MALIGN(4) pool[BLOCK_COUNT][BLOCK_SIZE];
+	uint8_t MALIGN(4) pool[BLOCK_COUNT][BLOCK_SIZE];
 	void *mem_free;
 	void *mem_used;
-	u16_t mem_free_count;
+	uint16_t mem_free_count;
 	void *mem;
 
 	mem_init(pool, BLOCK_SIZE, BLOCK_COUNT, &mem_free);
@@ -156,7 +156,7 @@ u32_t mem_ut(void)
 
 	mem_used = 0;
 	while (mem_free_count--) {
-		u16_t mem_free_count_current;
+		uint16_t mem_free_count_current;
 
 		mem = mem_acquire(&mem_free);
 		mem_free_count_current = mem_free_count_get(mem_free);
@@ -174,7 +174,7 @@ u32_t mem_ut(void)
 	}
 
 	while (++mem_free_count < BLOCK_COUNT) {
-		u16_t mem_free_count_current;
+		uint16_t mem_free_count_current;
 
 		mem = mem_used;
 		memcpy(&mem_used, mem, sizeof(void *));
diff --git a/subsys/bluetooth/controller/util/mem.h b/subsys/bluetooth/controller/util/mem.h
index f78713af31..0a5befecf3 100644
--- a/subsys/bluetooth/controller/util/mem.h
+++ b/subsys/bluetooth/controller/util/mem.h
@@ -34,18 +34,18 @@
  *    MROUND( 9) = 12
  *    MROUND(13) = 16
  */
-#define MROUND(x) (((u32_t)(x)+3) & (~((u32_t)3)))
+#define MROUND(x) (((uint32_t)(x)+3) & (~((uint32_t)3)))
 #endif
 
-void mem_init(void *mem_pool, u16_t mem_size, u16_t mem_count, void **mem_head);
+void mem_init(void *mem_pool, uint16_t mem_size, uint16_t mem_count, void **mem_head);
 void *mem_acquire(void **mem_head);
 void mem_release(void *mem, void **mem_head);
 
-u16_t mem_free_count_get(void *mem_head);
-void *mem_get(void *mem_pool, u16_t mem_size, u16_t index);
-u16_t mem_index_get(void *mem, void *mem_pool, u16_t mem_size);
+uint16_t mem_free_count_get(void *mem_head);
+void *mem_get(void *mem_pool, uint16_t mem_size, uint16_t index);
+uint16_t mem_index_get(void *mem, void *mem_pool, uint16_t mem_size);
 
-void mem_rcopy(u8_t *dst, u8_t const *src, u16_t len);
-u8_t mem_nz(u8_t *src, u16_t len);
+void mem_rcopy(uint8_t *dst, uint8_t const *src, uint16_t len);
+uint8_t mem_nz(uint8_t *src, uint16_t len);
 
-u32_t mem_ut(void);
+uint32_t mem_ut(void);
diff --git a/subsys/bluetooth/controller/util/mfifo.h b/subsys/bluetooth/controller/util/mfifo.h
index 308b539d61..19695933d8 100644
--- a/subsys/bluetooth/controller/util/mfifo.h
+++ b/subsys/bluetooth/controller/util/mfifo.h
@@ -45,11 +45,11 @@
 		struct {                                                    \
 			/* TODO: const, optimise RAM use */                 \
 			/* TODO: Separate s,n,f,l out into common struct */ \
-			u8_t const s;         /* Stride between elements */ \
-			u8_t const n;         /* Number of buffers */       \
-			u8_t f;               /* First. Read index */       \
-			u8_t l;               /* Last. Write index */       \
-			u8_t MALIGN(4) m[MROUND(sz) * ((cnt) + 1)];         \
+			uint8_t const s;         /* Stride between elements */ \
+			uint8_t const n;         /* Number of buffers */       \
+			uint8_t f;               /* First. Read index */       \
+			uint8_t l;               /* Last. Write index */       \
+			uint8_t MALIGN(4) m[MROUND(sz) * ((cnt) + 1)];         \
 		} mfifo_##name = {                                          \
 			.n = ((cnt) + 1),                                   \
 			.s = MROUND(sz),                                    \
@@ -79,8 +79,8 @@
  * @param idx[out]  Index of newly allocated buffer
  * @return  True if buffer could be allocated; otherwise false
  */
-static inline bool mfifo_enqueue_idx_get(u8_t count, u8_t first, u8_t last,
-					 u8_t *idx)
+static inline bool mfifo_enqueue_idx_get(uint8_t count, uint8_t first, uint8_t last,
+					 uint8_t *idx)
 {
 	/* Non-destructive: Advance write-index modulo 'count' */
 	last = last + 1;
@@ -116,8 +116,8 @@ static inline bool mfifo_enqueue_idx_get(u8_t count, u8_t first, u8_t last,
  * @brief   Commit a previously allocated buffer (=void-ptr)
  * @details API 2
  */
-static inline void mfifo_by_idx_enqueue(u8_t *fifo, u8_t size, u8_t idx,
-					void *mem, u8_t *last)
+static inline void mfifo_by_idx_enqueue(uint8_t *fifo, uint8_t size, uint8_t idx,
+					void *mem, uint8_t *last)
 {
 	/* API 2: fifo is array of void-ptrs */
 	void **p = (void **)(fifo + (*last) * size); /* buffer preceding idx */
@@ -141,10 +141,10 @@ static inline void mfifo_by_idx_enqueue(u8_t *fifo, u8_t size, u8_t idx,
  *   To commit the enqueue process, mfifo_enqueue() must be called afterwards
  * @return  Index of newly allocated buffer; only valid if mem != NULL
  */
-static inline u8_t mfifo_enqueue_get(u8_t *fifo, u8_t size, u8_t count,
-				     u8_t first, u8_t last, void **mem)
+static inline uint8_t mfifo_enqueue_get(uint8_t *fifo, uint8_t size, uint8_t count,
+				     uint8_t first, uint8_t last, void **mem)
 {
-	u8_t idx;
+	uint8_t idx;
 
 	/* Attempt to allocate new buffer (idx) */
 	if (!mfifo_enqueue_idx_get(count, first, last, &idx)) {
@@ -187,7 +187,7 @@ static inline u8_t mfifo_enqueue_get(u8_t *fifo, u8_t size, u8_t count,
  * @param idx[in]   Index one-ahead of previously allocated buffer
  * @param last[out] Write-index
  */
-static inline void mfifo_enqueue(u8_t idx, u8_t *last)
+static inline void mfifo_enqueue(uint8_t idx, uint8_t *last)
 {
 	*last = idx; /* Commit: Update write index */
 }
@@ -206,7 +206,7 @@ static inline void mfifo_enqueue(u8_t idx, u8_t *last)
  * @details API 1 and 2
  *   Empty if first == last
  */
-static inline u8_t mfifo_avail_count_get(u8_t count, u8_t first, u8_t last)
+static inline uint8_t mfifo_avail_count_get(uint8_t count, uint8_t first, uint8_t last)
 {
 	if (last >= first) {
 		return last - first;
@@ -227,8 +227,8 @@ static inline u8_t mfifo_avail_count_get(u8_t count, u8_t first, u8_t last)
  * @brief Non-destructive peek
  * @details API 1
  */
-static inline void *mfifo_dequeue_get(u8_t *fifo, u8_t size, u8_t first,
-				      u8_t last)
+static inline void *mfifo_dequeue_get(uint8_t *fifo, uint8_t size, uint8_t first,
+				      uint8_t last)
 {
 	if (first == last) {
 		return NULL;
@@ -249,8 +249,8 @@ static inline void *mfifo_dequeue_get(u8_t *fifo, u8_t size, u8_t first,
  * @brief Non-destructive: Peek at head (oldest) buffer
  * @details API 2
  */
-static inline void *mfifo_dequeue_peek(u8_t *fifo, u8_t size, u8_t first,
-				       u8_t last)
+static inline void *mfifo_dequeue_peek(uint8_t *fifo, uint8_t size, uint8_t first,
+				       uint8_t last)
 {
 	if (first == last) {
 		return NULL; /* Queue is empty */
@@ -268,11 +268,11 @@ static inline void *mfifo_dequeue_peek(u8_t *fifo, u8_t size, u8_t first,
 		mfifo_dequeue_peek(mfifo_##name.m, mfifo_##name.s, \
 				   mfifo_##name.f, mfifo_##name.l)
 
-static inline void *mfifo_dequeue_iter_get(u8_t *fifo, u8_t size, u8_t count,
-					   u8_t first, u8_t last, u8_t *idx)
+static inline void *mfifo_dequeue_iter_get(uint8_t *fifo, uint8_t size, uint8_t count,
+					   uint8_t first, uint8_t last, uint8_t *idx)
 {
 	void *p;
-	u8_t i;
+	uint8_t i;
 
 	if (*idx >= count) {
 		*idx = first;
@@ -309,10 +309,10 @@ static inline void *mfifo_dequeue_iter_get(u8_t *fifo, u8_t size, u8_t count,
  * @param first[in,out] Head index, Span: [0 .. count-1]. Will be updated
  * @return              Head buffer; or NULL if queue was empty
  */
-static inline void *mfifo_dequeue(u8_t *fifo, u8_t size, u8_t count,
-				  u8_t last, u8_t *first)
+static inline void *mfifo_dequeue(uint8_t *fifo, uint8_t size, uint8_t count,
+				  uint8_t last, uint8_t *first)
 {
-	u8_t _first = *first; /* Copy read-index */
+	uint8_t _first = *first; /* Copy read-index */
 	void *mem;
 
 	/* Queue is empty if first == last */
diff --git a/subsys/bluetooth/controller/util/util.c b/subsys/bluetooth/controller/util/util.c
index e3a50e3288..fa0b43cff6 100644
--- a/subsys/bluetooth/controller/util/util.c
+++ b/subsys/bluetooth/controller/util/util.c
@@ -20,12 +20,12 @@
  *
  * @return popcnt of 'octets'
  */
-u8_t util_ones_count_get(u8_t *octets, u8_t octets_len)
+uint8_t util_ones_count_get(uint8_t *octets, uint8_t octets_len)
 {
-	u8_t one_count = 0U;
+	uint8_t one_count = 0U;
 
 	while (octets_len--) {
-		u8_t bite;
+		uint8_t bite;
 
 		bite = *octets;
 		while (bite) {
@@ -53,5 +53,5 @@ int util_rand(void *buf, size_t len)
 			DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	}
 
-	return entropy_get_entropy(dev, (u8_t *)buf, len);
+	return entropy_get_entropy(dev, (uint8_t *)buf, len);
 }
diff --git a/subsys/bluetooth/controller/util/util.h b/subsys/bluetooth/controller/util/util.h
index dddd80c221..c55bee5a75 100644
--- a/subsys/bluetooth/controller/util/util.h
+++ b/subsys/bluetooth/controller/util/util.h
@@ -15,6 +15,6 @@
 
 #include <stddef.h>
 
-u8_t util_ones_count_get(u8_t *octets, u8_t octets_len);
+uint8_t util_ones_count_get(uint8_t *octets, uint8_t octets_len);
 
 int util_rand(void *buf, size_t len);
diff --git a/subsys/bluetooth/host/a2dp.c b/subsys/bluetooth/host/a2dp.c
index 8429d5a188..13de1f3321 100644
--- a/subsys/bluetooth/host/a2dp.c
+++ b/subsys/bluetooth/host/a2dp.c
@@ -47,7 +47,7 @@ void a2d_reset(struct bt_a2dp *a2dp_conn)
 
 struct bt_a2dp *get_new_connection(struct bt_conn *conn)
 {
-	s8_t i, free;
+	int8_t i, free;
 
 	free = A2DP_NO_SPACE;
 
@@ -145,7 +145,7 @@ struct bt_a2dp *bt_a2dp_connect(struct bt_conn *conn)
 }
 
 int bt_a2dp_register_endpoint(struct bt_a2dp_endpoint *endpoint,
-			      u8_t media_type, u8_t role)
+			      uint8_t media_type, uint8_t role)
 {
 	int err;
 
diff --git a/subsys/bluetooth/host/aes_ccm.c b/subsys/bluetooth/host/aes_ccm.c
index f6e01c9b2e..29bafba718 100644
--- a/subsys/bluetooth/host/aes_ccm.c
+++ b/subsys/bluetooth/host/aes_ccm.c
@@ -15,7 +15,7 @@
 #define LOG_MODULE_NAME bt_aes_ccm
 #include "common/log.h"
 
-static inline void xor16(u8_t *dst, const u8_t *a, const u8_t *b)
+static inline void xor16(uint8_t *dst, const uint8_t *a, const uint8_t *b)
 {
 	dst[0] = a[0] ^ b[0];
 	dst[1] = a[1] ^ b[1];
@@ -36,9 +36,9 @@ static inline void xor16(u8_t *dst, const u8_t *a, const u8_t *b)
 }
 
 /* pmsg is assumed to have the nonce already present in bytes 1-13 */
-static int ccm_calculate_X0(const u8_t key[16], const u8_t *aad, u8_t aad_len,
-			    size_t mic_size, u8_t msg_len, u8_t b[16],
-			    u8_t X0[16])
+static int ccm_calculate_X0(const uint8_t key[16], const uint8_t *aad, uint8_t aad_len,
+			    size_t mic_size, uint8_t msg_len, uint8_t b[16],
+			    uint8_t X0[16])
 {
 	int i, j, err;
 
@@ -56,12 +56,12 @@ static int ccm_calculate_X0(const u8_t key[16], const u8_t *aad, u8_t aad_len,
 	if (aad_len) {
 		sys_put_be16(aad_len, b);
 
-		for (i = 0; i < sizeof(u16_t); i++) {
+		for (i = 0; i < sizeof(uint16_t); i++) {
 			b[i] = X0[i] ^ b[i];
 		}
 
 		j = 0;
-		aad_len += sizeof(u16_t);
+		aad_len += sizeof(uint16_t);
 		while (aad_len > 16) {
 			do {
 				b[i] = X0[i] ^ aad[j];
@@ -94,12 +94,12 @@ static int ccm_calculate_X0(const u8_t key[16], const u8_t *aad, u8_t aad_len,
 	return 0;
 }
 
-static int ccm_auth(const u8_t key[16], u8_t nonce[13],
-		    const u8_t *cleartext_msg, size_t msg_len, const u8_t *aad,
-		    size_t aad_len, u8_t *mic, size_t mic_size)
+static int ccm_auth(const uint8_t key[16], uint8_t nonce[13],
+		    const uint8_t *cleartext_msg, size_t msg_len, const uint8_t *aad,
+		    size_t aad_len, uint8_t *mic, size_t mic_size)
 {
-	u8_t b[16], Xn[16], s0[16];
-	u16_t blk_cnt, last_blk;
+	uint8_t b[16], Xn[16], s0[16];
+	uint16_t blk_cnt, last_blk;
 	int err, j, i;
 
 	last_blk = msg_len % 16;
@@ -147,11 +147,11 @@ static int ccm_auth(const u8_t key[16], u8_t nonce[13],
 	return 0;
 }
 
-static int ccm_crypt(const u8_t key[16], const u8_t nonce[13],
-		     const u8_t *in_msg, u8_t *out_msg, size_t msg_len)
+static int ccm_crypt(const uint8_t key[16], const uint8_t nonce[13],
+		     const uint8_t *in_msg, uint8_t *out_msg, size_t msg_len)
 {
-	u8_t a_i[16], s_i[16];
-	u16_t last_blk, blk_cnt;
+	uint8_t a_i[16], s_i[16];
+	uint16_t last_blk, blk_cnt;
 	size_t i, j;
 	int err;
 
@@ -186,11 +186,11 @@ static int ccm_crypt(const u8_t key[16], const u8_t nonce[13],
 	return 0;
 }
 
-int bt_ccm_decrypt(const u8_t key[16], u8_t nonce[13], const u8_t *enc_msg,
-		   size_t msg_len, const u8_t *aad, size_t aad_len,
-		   u8_t *out_msg, size_t mic_size)
+int bt_ccm_decrypt(const uint8_t key[16], uint8_t nonce[13], const uint8_t *enc_msg,
+		   size_t msg_len, const uint8_t *aad, size_t aad_len,
+		   uint8_t *out_msg, size_t mic_size)
 {
-	u8_t mic[16];
+	uint8_t mic[16];
 
 	if (aad_len >= 0xff00 || mic_size > sizeof(mic)) {
 		return -EINVAL;
@@ -207,11 +207,11 @@ int bt_ccm_decrypt(const u8_t key[16], u8_t nonce[13], const u8_t *enc_msg,
 	return 0;
 }
 
-int bt_ccm_encrypt(const u8_t key[16], u8_t nonce[13], const u8_t *msg,
-		   size_t msg_len, const u8_t *aad, size_t aad_len,
-		   u8_t *out_msg, size_t mic_size)
+int bt_ccm_encrypt(const uint8_t key[16], uint8_t nonce[13], const uint8_t *msg,
+		   size_t msg_len, const uint8_t *aad, size_t aad_len,
+		   uint8_t *out_msg, size_t mic_size)
 {
-	u8_t *mic = out_msg + msg_len;
+	uint8_t *mic = out_msg + msg_len;
 
 	BT_DBG("key %s", bt_hex(key, 16));
 	BT_DBG("nonce %s", bt_hex(nonce, 13));
diff --git a/subsys/bluetooth/host/at.c b/subsys/bluetooth/host/at.c
index 8bfd41b5a1..9b622b18df 100644
--- a/subsys/bluetooth/host/at.c
+++ b/subsys/bluetooth/host/at.c
@@ -43,9 +43,9 @@ static void skip_space(struct at_client *at)
 	}
 }
 
-int at_get_number(struct at_client *at, u32_t *val)
+int at_get_number(struct at_client *at, uint32_t *val)
 {
-	u32_t i;
+	uint32_t i;
 
 	skip_space(at);
 
@@ -93,7 +93,7 @@ static int get_cmd_value(struct at_client *at, struct net_buf *buf,
 			 char stop_byte, enum at_cmd_state cmd_state)
 {
 	int cmd_len = 0;
-	u8_t pos = at->pos;
+	uint8_t pos = at->pos;
 	const char *str = (char *)buf->data;
 
 	while (cmd_len < buf->len && at->pos != at->buf_max_len) {
@@ -123,7 +123,7 @@ static int get_response_string(struct at_client *at, struct net_buf *buf,
 			       char stop_byte, enum at_state state)
 {
 	int cmd_len = 0;
-	u8_t pos = at->pos;
+	uint8_t pos = at->pos;
 	const char *str = (char *)buf->data;
 
 	while (cmd_len < buf->len && at->pos != at->buf_max_len) {
@@ -269,7 +269,7 @@ static int at_state_process_result(struct at_client *at, struct net_buf *buf)
 int cme_handle(struct at_client *at)
 {
 	enum at_cme cme_err;
-	u32_t val;
+	uint32_t val;
 
 	if (!at_get_number(at, &val) && val <= CME_ERROR_NETWORK_NOT_ALLOWED) {
 		cme_err = val;
@@ -457,7 +457,7 @@ int at_close_list(struct at_client *at)
 	return 0;
 }
 
-int at_list_get_string(struct at_client *at, char *name, u8_t len)
+int at_list_get_string(struct at_client *at, char *name, uint8_t len)
 {
 	int i = 0;
 
@@ -492,9 +492,9 @@ int at_list_get_string(struct at_client *at, char *name, u8_t len)
 	return 0;
 }
 
-int at_list_get_range(struct at_client *at, u32_t *min, u32_t *max)
+int at_list_get_range(struct at_client *at, uint32_t *min, uint32_t *max)
 {
-	u32_t low, high;
+	uint32_t low, high;
 	int ret;
 
 	ret = at_get_number(at, &low);
diff --git a/subsys/bluetooth/host/at.h b/subsys/bluetooth/host/at.h
index 3d3ad0a4f4..ae2c7f95d8 100644
--- a/subsys/bluetooth/host/at.h
+++ b/subsys/bluetooth/host/at.h
@@ -90,10 +90,10 @@ typedef int (*handle_cmd_input_t)(struct at_client *at, struct net_buf *buf,
 
 struct at_client {
 	char *buf;
-	u8_t pos;
-	u8_t buf_max_len;
-	u8_t state;
-	u8_t cmd_state;
+	uint8_t pos;
+	uint8_t buf_max_len;
+	uint8_t state;
+	uint8_t cmd_state;
 	at_resp_cb_t resp;
 	at_resp_cb_t unsolicited;
 	at_finish_cb_t finish;
@@ -103,7 +103,7 @@ struct at_client {
 void at_register(struct at_client *at, at_resp_cb_t resp,
 		 at_finish_cb_t finish);
 void at_register_unsolicited(struct at_client *at, at_resp_cb_t unsolicited);
-int at_get_number(struct at_client *at, u32_t *val);
+int at_get_number(struct at_client *at, uint32_t *val);
 /* This parsing will only works for non-fragmented net_buf */
 int at_parse_input(struct at_client *at, struct net_buf *buf);
 /* This command parsing will only works for non-fragmented net_buf */
@@ -111,8 +111,8 @@ int at_parse_cmd_input(struct at_client *at, struct net_buf *buf,
 		       const char *prefix, parse_val_t func,
 		       enum at_cmd_type type);
 int at_check_byte(struct net_buf *buf, char check_byte);
-int at_list_get_range(struct at_client *at, u32_t *min, u32_t *max);
-int at_list_get_string(struct at_client *at, char *name, u8_t len);
+int at_list_get_range(struct at_client *at, uint32_t *min, uint32_t *max);
+int at_list_get_string(struct at_client *at, char *name, uint8_t len);
 int at_close_list(struct at_client *at);
 int at_open_list(struct at_client *at);
 int at_has_next_list(struct at_client *at);
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 06a7fd0daa..ef10da1d0e 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -52,12 +52,12 @@ typedef enum __packed {
 		ATT_UNKNOWN,
 } att_type_t;
 
-static att_type_t att_op_get_type(u8_t op);
+static att_type_t att_op_get_type(uint8_t op);
 
 #if CONFIG_BT_ATT_PREPARE_COUNT > 0
 struct bt_attr_data {
-	u16_t handle;
-	u16_t offset;
+	uint16_t handle;
+	uint16_t offset;
 };
 
 /* Pool for incoming ATT packets */
@@ -257,7 +257,7 @@ static bt_att_chan_sent_t chan_cb(struct net_buf *buf)
 	}
 }
 
-struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, u8_t op,
+struct net_buf *bt_att_chan_create_pdu(struct bt_att_chan *chan, uint8_t op,
 				       size_t len)
 {
 	struct bt_att_hdr *hdr;
@@ -316,8 +316,8 @@ static int bt_att_chan_send(struct bt_att_chan *chan, struct net_buf *buf,
 	return chan_send(chan, buf, cb);
 }
 
-static void send_err_rsp(struct bt_att_chan *chan, u8_t req, u16_t handle,
-			 u8_t err)
+static void send_err_rsp(struct bt_att_chan *chan, uint8_t req, uint16_t handle,
+			 uint8_t err)
 {
 	struct bt_att_error_rsp *rsp;
 	struct net_buf *buf;
@@ -340,13 +340,13 @@ static void send_err_rsp(struct bt_att_chan *chan, u8_t req, u16_t handle,
 	(void)bt_att_chan_send(chan, buf, chan_rsp_sent);
 }
 
-static u8_t att_mtu_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_mtu_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_conn *conn = chan->att->conn;
 	struct bt_att_exchange_mtu_req *req;
 	struct bt_att_exchange_mtu_rsp *rsp;
 	struct net_buf *pdu;
-	u16_t mtu_client, mtu_server;
+	uint16_t mtu_client, mtu_server;
 
 	/* Exchange MTU sub-procedure shall only be supported on the
 	 * LE Fixed Channel Unenhanced ATT bearer.
@@ -458,8 +458,8 @@ static void att_process(struct bt_att *att)
 	sys_slist_prepend(&att->reqs, node);
 }
 
-static u8_t att_handle_rsp(struct bt_att_chan *chan, void *pdu, u16_t len,
-			   u8_t err)
+static uint8_t att_handle_rsp(struct bt_att_chan *chan, void *pdu, uint16_t len,
+			   uint8_t err)
 {
 	bt_att_func_t func = NULL;
 	void *params;
@@ -507,10 +507,10 @@ process:
 }
 
 #if defined(CONFIG_BT_GATT_CLIENT)
-static u8_t att_mtu_rsp(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_mtu_rsp(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_exchange_mtu_rsp *rsp;
-	u16_t mtu;
+	uint16_t mtu;
 
 	rsp = (void *)buf->data;
 
@@ -538,7 +538,7 @@ static u8_t att_mtu_rsp(struct bt_att_chan *chan, struct net_buf *buf)
 }
 #endif /* CONFIG_BT_GATT_CLIENT */
 
-static bool range_is_valid(u16_t start, u16_t end, u16_t *err)
+static bool range_is_valid(uint16_t start, uint16_t end, uint16_t *err)
 {
 	/* Handle 0 is invalid */
 	if (!start || !end) {
@@ -569,7 +569,7 @@ struct find_info_data {
 	};
 };
 
-static u8_t find_info_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t find_info_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct find_info_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
@@ -620,8 +620,8 @@ static u8_t find_info_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_STOP;
 }
 
-static u8_t att_find_info_rsp(struct bt_att_chan *chan, u16_t start_handle,
-			      u16_t end_handle)
+static uint8_t att_find_info_rsp(struct bt_att_chan *chan, uint16_t start_handle,
+			      uint16_t end_handle)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct find_info_data data;
@@ -649,10 +649,10 @@ static u8_t att_find_info_rsp(struct bt_att_chan *chan, u16_t start_handle,
 	return 0;
 }
 
-static u8_t att_find_info_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_find_info_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_find_info_req *req;
-	u16_t start_handle, end_handle, err_handle;
+	uint16_t start_handle, end_handle, err_handle;
 
 	req = (void *)buf->data;
 
@@ -676,17 +676,17 @@ struct find_type_data {
 	struct net_buf *buf;
 	struct bt_att_handle_group *group;
 	const void *value;
-	u8_t value_len;
-	u8_t err;
+	uint8_t value_len;
+	uint8_t err;
 };
 
-static u8_t find_type_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t find_type_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct find_type_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
 	struct bt_conn *conn = chan->chan.chan.conn;
 	int read;
-	u8_t uuid[16];
+	uint8_t uuid[16];
 	struct net_buf *frag;
 	size_t len;
 
@@ -774,9 +774,9 @@ skip:
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_find_type_rsp(struct bt_att_chan *chan, u16_t start_handle,
-			      u16_t end_handle, const void *value,
-			      u8_t value_len)
+static uint8_t att_find_type_rsp(struct bt_att_chan *chan, uint16_t start_handle,
+			      uint16_t end_handle, const void *value,
+			      uint8_t value_len)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct find_type_data data;
@@ -812,11 +812,11 @@ static u8_t att_find_type_rsp(struct bt_att_chan *chan, u16_t start_handle,
 	return 0;
 }
 
-static u8_t att_find_type_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_find_type_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_find_type_req *req;
-	u16_t start_handle, end_handle, err_handle, type;
-	u8_t *value;
+	uint16_t start_handle, end_handle, err_handle, type;
+	uint8_t *value;
 
 	req = net_buf_pull_mem(buf, sizeof(*req));
 
@@ -849,7 +849,7 @@ static u8_t att_find_type_req(struct bt_att_chan *chan, struct net_buf *buf)
 				 buf->len);
 }
 
-static u8_t err_to_att(int err)
+static uint8_t err_to_att(int err)
 {
 	BT_DBG("%d", err);
 
@@ -866,7 +866,7 @@ struct read_type_data {
 	struct net_buf *buf;
 	struct bt_att_read_type_rsp *rsp;
 	struct bt_att_data *item;
-	u8_t err;
+	uint8_t err;
 };
 
 typedef bool (*attr_read_cb)(struct net_buf *buf, ssize_t read,
@@ -892,7 +892,7 @@ static bool attr_read_type_cb(struct net_buf *frag, ssize_t read,
 
 static ssize_t att_chan_read(struct bt_att_chan *chan,
 			     const struct bt_gatt_attr *attr,
-			     struct net_buf *buf, u16_t offset,
+			     struct net_buf *buf, uint16_t offset,
 			     attr_read_cb cb, void *user_data)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
@@ -948,7 +948,7 @@ static ssize_t att_chan_read(struct bt_att_chan *chan,
 	return total;
 }
 
-static u8_t read_type_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t read_type_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct read_type_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
@@ -1006,8 +1006,8 @@ static u8_t read_type_cb(const struct bt_gatt_attr *attr, void *user_data)
 	       data->rsp->len ? BT_GATT_ITER_CONTINUE : BT_GATT_ITER_STOP;
 }
 
-static u8_t att_read_type_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
-			      u16_t start_handle, u16_t end_handle)
+static uint8_t att_read_type_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
+			      uint16_t start_handle, uint16_t end_handle)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct read_type_data data;
@@ -1043,16 +1043,16 @@ static u8_t att_read_type_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
 	return 0;
 }
 
-static u8_t att_read_type_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_type_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_read_type_req *req;
-	u16_t start_handle, end_handle, err_handle;
+	uint16_t start_handle, end_handle, err_handle;
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
 		struct bt_uuid_128 u128;
 	} u;
-	u8_t uuid_len = buf->len - sizeof(*req);
+	uint8_t uuid_len = buf->len - sizeof(*req);
 
 	/* Type can only be UUID16 or UUID128 */
 	if (uuid_len != 2 && uuid_len != 16) {
@@ -1081,13 +1081,13 @@ static u8_t att_read_type_req(struct bt_att_chan *chan, struct net_buf *buf)
 
 struct read_data {
 	struct bt_att_chan *chan;
-	u16_t offset;
+	uint16_t offset;
 	struct net_buf *buf;
 	struct bt_att_read_rsp *rsp;
-	u8_t err;
+	uint8_t err;
 };
 
-static u8_t read_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t read_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct read_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
@@ -1120,8 +1120,8 @@ static u8_t read_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_read_rsp(struct bt_att_chan *chan, u8_t op, u8_t rsp,
-			 u16_t handle, u16_t offset)
+static uint8_t att_read_rsp(struct bt_att_chan *chan, uint8_t op, uint8_t rsp,
+			 uint16_t handle, uint16_t offset)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct read_data data;
@@ -1162,10 +1162,10 @@ static u8_t att_read_rsp(struct bt_att_chan *chan, u8_t op, u8_t rsp,
 	return 0;
 }
 
-static u8_t att_read_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_read_req *req;
-	u16_t handle;
+	uint16_t handle;
 
 	req = (void *)buf->data;
 
@@ -1177,10 +1177,10 @@ static u8_t att_read_req(struct bt_att_chan *chan, struct net_buf *buf)
 			    handle, 0);
 }
 
-static u8_t att_read_blob_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_blob_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_read_blob_req *req;
-	u16_t handle, offset;
+	uint16_t handle, offset;
 
 	req = (void *)buf->data;
 
@@ -1194,11 +1194,11 @@ static u8_t att_read_blob_req(struct bt_att_chan *chan, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_GATT_READ_MULTIPLE)
-static u8_t att_read_mult_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_mult_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct read_data data;
-	u16_t handle;
+	uint16_t handle;
 
 	(void)memset(&data, 0, sizeof(data));
 
@@ -1209,7 +1209,7 @@ static u8_t att_read_mult_req(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data.chan = chan;
 
-	while (buf->len >= sizeof(u16_t)) {
+	while (buf->len >= sizeof(uint16_t)) {
 		handle = net_buf_pull_le16(buf);
 
 		BT_DBG("handle 0x%04x ", handle);
@@ -1241,7 +1241,7 @@ static u8_t att_read_mult_req(struct bt_att_chan *chan, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_EATT)
-static u8_t read_vl_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t read_vl_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct read_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
@@ -1285,11 +1285,11 @@ static u8_t read_vl_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_read_mult_vl_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_mult_vl_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct read_data data;
-	u16_t handle;
+	uint16_t handle;
 
 	(void)memset(&data, 0, sizeof(data));
 
@@ -1300,7 +1300,7 @@ static u8_t att_read_mult_vl_req(struct bt_att_chan *chan, struct net_buf *buf)
 
 	data.chan = chan;
 
-	while (buf->len >= sizeof(u16_t)) {
+	while (buf->len >= sizeof(uint16_t)) {
 		handle = net_buf_pull_le16(buf);
 
 		BT_DBG("handle 0x%04x ", handle);
@@ -1355,7 +1355,7 @@ static bool attr_read_group_cb(struct net_buf *frag, ssize_t read,
 	return true;
 }
 
-static u8_t read_group_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t read_group_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct read_group_data *data = user_data;
 	struct bt_att_chan *chan = data->chan;
@@ -1408,8 +1408,8 @@ static u8_t read_group_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_read_group_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
-			       u16_t start_handle, u16_t end_handle)
+static uint8_t att_read_group_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
+			       uint16_t start_handle, uint16_t end_handle)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct read_group_data data;
@@ -1443,16 +1443,16 @@ static u8_t att_read_group_rsp(struct bt_att_chan *chan, struct bt_uuid *uuid,
 	return 0;
 }
 
-static u8_t att_read_group_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_read_group_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_read_group_req *req;
-	u16_t start_handle, end_handle, err_handle;
+	uint16_t start_handle, end_handle, err_handle;
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
 		struct bt_uuid_128 u128;
 	} u;
-	u8_t uuid_len = buf->len - sizeof(*req);
+	uint8_t uuid_len = buf->len - sizeof(*req);
 
 	/* Type can only be UUID16 or UUID128 */
 	if (uuid_len != 2 && uuid_len != 16) {
@@ -1497,18 +1497,18 @@ static u8_t att_read_group_req(struct bt_att_chan *chan, struct net_buf *buf)
 struct write_data {
 	struct bt_conn *conn;
 	struct net_buf *buf;
-	u8_t req;
+	uint8_t req;
 	const void *value;
-	u16_t len;
-	u16_t offset;
-	u8_t err;
+	uint16_t len;
+	uint16_t offset;
+	uint8_t err;
 };
 
-static u8_t write_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t write_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct write_data *data = user_data;
 	int write;
-	u8_t flags = 0U;
+	uint8_t flags = 0U;
 
 	BT_DBG("handle 0x%04x offset %u", attr->handle, data->offset);
 
@@ -1537,9 +1537,9 @@ static u8_t write_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_write_rsp(struct bt_att_chan *chan, u8_t req, u8_t rsp,
-			  u16_t handle, u16_t offset, const void *value,
-			  u16_t len)
+static uint8_t att_write_rsp(struct bt_att_chan *chan, uint8_t req, uint8_t rsp,
+			  uint16_t handle, uint16_t offset, const void *value,
+			  uint16_t len)
 {
 	struct write_data data;
 
@@ -1587,9 +1587,9 @@ static u8_t att_write_rsp(struct bt_att_chan *chan, u8_t req, u8_t rsp,
 	return 0;
 }
 
-static u8_t att_write_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_write_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
-	u16_t handle;
+	uint16_t handle;
 
 	handle = net_buf_pull_le16(buf);
 
@@ -1604,12 +1604,12 @@ struct prep_data {
 	struct bt_conn *conn;
 	struct net_buf *buf;
 	const void *value;
-	u16_t len;
-	u16_t offset;
-	u8_t err;
+	uint16_t len;
+	uint16_t offset;
+	uint8_t err;
 };
 
-static u8_t prep_write_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t prep_write_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct prep_data *data = user_data;
 	struct bt_attr_data *attr_data;
@@ -1656,8 +1656,8 @@ append:
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t att_prep_write_rsp(struct bt_att_chan *chan, u16_t handle,
-			       u16_t offset, const void *value, u8_t len)
+static uint8_t att_prep_write_rsp(struct bt_att_chan *chan, uint16_t handle,
+			       uint16_t offset, const void *value, uint8_t len)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct prep_data data;
@@ -1711,13 +1711,13 @@ static u8_t att_prep_write_rsp(struct bt_att_chan *chan, u16_t handle,
 }
 #endif /* CONFIG_BT_ATT_PREPARE_COUNT */
 
-static u8_t att_prepare_write_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_prepare_write_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 #if CONFIG_BT_ATT_PREPARE_COUNT == 0
 	return BT_ATT_ERR_NOT_SUPPORTED;
 #else
 	struct bt_att_prepare_write_req *req;
-	u16_t handle, offset;
+	uint16_t handle, offset;
 
 	req = net_buf_pull_mem(buf, sizeof(*req));
 
@@ -1731,11 +1731,11 @@ static u8_t att_prepare_write_req(struct bt_att_chan *chan, struct net_buf *buf)
 }
 
 #if CONFIG_BT_ATT_PREPARE_COUNT > 0
-static u8_t att_exec_write_rsp(struct bt_att_chan *chan, u8_t flags)
+static uint8_t att_exec_write_rsp(struct bt_att_chan *chan, uint8_t flags)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct net_buf *buf;
-	u8_t err = 0U;
+	uint8_t err = 0U;
 
 	while ((buf = net_buf_get(&chan->att->prep_queue, K_NO_WAIT))) {
 		struct bt_attr_data *data = net_buf_user_data(buf);
@@ -1775,7 +1775,7 @@ static u8_t att_exec_write_rsp(struct bt_att_chan *chan, u8_t flags)
 #endif /* CONFIG_BT_ATT_PREPARE_COUNT */
 
 
-static u8_t att_exec_write_req(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_exec_write_req(struct bt_att_chan *chan, struct net_buf *buf)
 {
 #if CONFIG_BT_ATT_PREPARE_COUNT == 0
 	return BT_ATT_ERR_NOT_SUPPORTED;
@@ -1790,9 +1790,9 @@ static u8_t att_exec_write_req(struct bt_att_chan *chan, struct net_buf *buf)
 #endif /* CONFIG_BT_ATT_PREPARE_COUNT */
 }
 
-static u8_t att_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
 {
-	u16_t handle;
+	uint16_t handle;
 
 	handle = net_buf_pull_le16(buf);
 
@@ -1802,11 +1802,11 @@ static u8_t att_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_SIGNING)
-static u8_t att_signed_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_signed_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_conn *conn = chan->chan.chan.conn;
 	struct bt_att_signed_write_cmd *req;
-	u16_t handle;
+	uint16_t handle;
 	int err;
 
 	req = (void *)buf->data;
@@ -1834,7 +1834,7 @@ static u8_t att_signed_write_cmd(struct bt_att_chan *chan, struct net_buf *buf)
 
 #if defined(CONFIG_BT_GATT_CLIENT)
 #if defined(CONFIG_BT_SMP)
-static int att_change_security(struct bt_conn *conn, u8_t err)
+static int att_change_security(struct bt_conn *conn, uint8_t err)
 {
 	bt_security_t sec;
 
@@ -1895,10 +1895,10 @@ static int att_change_security(struct bt_conn *conn, u8_t err)
 }
 #endif /* CONFIG_BT_SMP */
 
-static u8_t att_error_rsp(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_error_rsp(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	struct bt_att_error_rsp *rsp;
-	u8_t err;
+	uint8_t err;
 
 	rsp = (void *)buf->data;
 
@@ -1934,7 +1934,7 @@ done:
 	return att_handle_rsp(chan, NULL, 0, err);
 }
 
-static u8_t att_handle_find_info_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_find_info_rsp(struct bt_att_chan *chan,
 				     struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1942,7 +1942,7 @@ static u8_t att_handle_find_info_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_find_type_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_find_type_rsp(struct bt_att_chan *chan,
 				     struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1950,7 +1950,7 @@ static u8_t att_handle_find_type_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_read_type_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_type_rsp(struct bt_att_chan *chan,
 				     struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1958,7 +1958,7 @@ static u8_t att_handle_read_type_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_read_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_rsp(struct bt_att_chan *chan,
 				struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1966,7 +1966,7 @@ static u8_t att_handle_read_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_read_blob_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_blob_rsp(struct bt_att_chan *chan,
 				     struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1975,7 +1975,7 @@ static u8_t att_handle_read_blob_rsp(struct bt_att_chan *chan,
 }
 
 #if defined(CONFIG_BT_GATT_READ_MULTIPLE)
-static u8_t att_handle_read_mult_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_mult_rsp(struct bt_att_chan *chan,
 				     struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1984,7 +1984,7 @@ static u8_t att_handle_read_mult_rsp(struct bt_att_chan *chan,
 }
 
 #if defined(CONFIG_BT_EATT)
-static u8_t att_handle_read_mult_vl_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_mult_vl_rsp(struct bt_att_chan *chan,
 					struct net_buf *buf)
 {
 	BT_DBG("");
@@ -1994,7 +1994,7 @@ static u8_t att_handle_read_mult_vl_rsp(struct bt_att_chan *chan,
 #endif /* CONFIG_BT_EATT */
 #endif /* CONFIG_BT_GATT_READ_MULTIPLE */
 
-static u8_t att_handle_read_group_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_read_group_rsp(struct bt_att_chan *chan,
 				      struct net_buf *buf)
 {
 	BT_DBG("");
@@ -2002,7 +2002,7 @@ static u8_t att_handle_read_group_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_write_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_write_rsp(struct bt_att_chan *chan,
 				 struct net_buf *buf)
 {
 	BT_DBG("");
@@ -2010,7 +2010,7 @@ static u8_t att_handle_write_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_prepare_write_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_prepare_write_rsp(struct bt_att_chan *chan,
 					 struct net_buf *buf)
 {
 	BT_DBG("");
@@ -2018,7 +2018,7 @@ static u8_t att_handle_prepare_write_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_handle_exec_write_rsp(struct bt_att_chan *chan,
+static uint8_t att_handle_exec_write_rsp(struct bt_att_chan *chan,
 				      struct net_buf *buf)
 {
 	BT_DBG("");
@@ -2026,9 +2026,9 @@ static u8_t att_handle_exec_write_rsp(struct bt_att_chan *chan,
 	return att_handle_rsp(chan, buf->data, buf->len, 0);
 }
 
-static u8_t att_notify(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_notify(struct bt_att_chan *chan, struct net_buf *buf)
 {
-	u16_t handle;
+	uint16_t handle;
 
 	handle = net_buf_pull_le16(buf);
 
@@ -2039,9 +2039,9 @@ static u8_t att_notify(struct bt_att_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t att_indicate(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_indicate(struct bt_att_chan *chan, struct net_buf *buf)
 {
-	u16_t handle;
+	uint16_t handle;
 
 	handle = net_buf_pull_le16(buf);
 
@@ -2059,7 +2059,7 @@ static u8_t att_indicate(struct bt_att_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t att_notify_mult(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_notify_mult(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	BT_DBG("chan %p", chan);
 
@@ -2069,7 +2069,7 @@ static u8_t att_notify_mult(struct bt_att_chan *chan, struct net_buf *buf)
 }
 #endif /* CONFIG_BT_GATT_CLIENT */
 
-static u8_t att_confirm(struct bt_att_chan *chan, struct net_buf *buf)
+static uint8_t att_confirm(struct bt_att_chan *chan, struct net_buf *buf)
 {
 	BT_DBG("");
 
@@ -2077,10 +2077,10 @@ static u8_t att_confirm(struct bt_att_chan *chan, struct net_buf *buf)
 }
 
 static const struct att_handler {
-	u8_t       op;
-	u8_t       expect_len;
+	uint8_t       op;
+	uint8_t       expect_len;
 	att_type_t type;
-	u8_t       (*func)(struct bt_att_chan *chan, struct net_buf *buf);
+	uint8_t       (*func)(struct bt_att_chan *chan, struct net_buf *buf);
 } handlers[] = {
 	{ BT_ATT_OP_MTU_REQ,
 		sizeof(struct bt_att_exchange_mtu_req),
@@ -2221,7 +2221,7 @@ static const struct att_handler {
 #endif /* CONFIG_BT_GATT_CLIENT */
 };
 
-static att_type_t att_op_get_type(u8_t op)
+static att_type_t att_op_get_type(uint8_t op)
 {
 	switch (op) {
 	case BT_ATT_OP_MTU_REQ:
@@ -2272,7 +2272,7 @@ static int bt_att_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	struct bt_att_chan *att_chan = ATT_CHAN(chan);
 	struct bt_att_hdr *hdr;
 	const struct att_handler *handler;
-	u8_t err;
+	uint8_t err;
 	size_t i;
 
 	if (buf->len < sizeof(*hdr)) {
@@ -2353,7 +2353,7 @@ static struct bt_att *att_get(struct bt_conn *conn)
 	return att_chan->att;
 }
 
-struct net_buf *bt_att_create_pdu(struct bt_conn *conn, u8_t op, size_t len)
+struct net_buf *bt_att_create_pdu(struct bt_conn *conn, uint8_t op, size_t len)
 {
 	struct bt_att *att;
 	struct bt_att_chan *chan, *tmp;
@@ -2526,7 +2526,7 @@ static void bt_att_disconnected(struct bt_l2cap_chan *chan)
 
 #if defined(CONFIG_BT_SMP)
 static void bt_att_encrypt_change(struct bt_l2cap_chan *chan,
-				  u8_t hci_status)
+				  uint8_t hci_status)
 {
 	struct bt_att_chan *att_chan = ATT_CHAN(chan);
 	struct bt_l2cap_le_chan *ch = BT_L2CAP_LE_CHAN(chan);
@@ -2674,7 +2674,7 @@ static int bt_att_accept(struct bt_conn *conn, struct bt_l2cap_chan **ch)
 BT_L2CAP_CHANNEL_DEFINE(att_fixed_chan, BT_L2CAP_CID_ATT, bt_att_accept, NULL);
 
 #if defined(CONFIG_BT_EATT)
-int bt_eatt_connect(struct bt_conn *conn, u8_t num_channels)
+int bt_eatt_connect(struct bt_conn *conn, uint8_t num_channels)
 {
 	struct bt_att_chan *att_chan = att_get_fixed_chan(conn);
 	struct bt_att *att = att_chan->att;
@@ -2767,11 +2767,11 @@ void bt_att_init(void)
 	}
 }
 
-u16_t bt_att_get_mtu(struct bt_conn *conn)
+uint16_t bt_att_get_mtu(struct bt_conn *conn)
 {
 	struct bt_att_chan *chan, *tmp;
 	struct bt_att *att;
-	u16_t mtu = 0;
+	uint16_t mtu = 0;
 
 	att = att_get(conn);
 	if (!att) {
diff --git a/subsys/bluetooth/host/att_internal.h b/subsys/bluetooth/host/att_internal.h
index 18073b152e..0f6699921d 100644
--- a/subsys/bluetooth/host/att_internal.h
+++ b/subsys/bluetooth/host/att_internal.h
@@ -17,31 +17,31 @@
 #endif
 
 struct bt_att_hdr {
-	u8_t  code;
+	uint8_t  code;
 } __packed;
 
 #define BT_ATT_OP_ERROR_RSP			0x01
 struct bt_att_error_rsp {
-	u8_t  request;
-	u16_t handle;
-	u8_t  error;
+	uint8_t  request;
+	uint16_t handle;
+	uint8_t  error;
 } __packed;
 
 #define BT_ATT_OP_MTU_REQ			0x02
 struct bt_att_exchange_mtu_req {
-	u16_t mtu;
+	uint16_t mtu;
 } __packed;
 
 #define BT_ATT_OP_MTU_RSP			0x03
 struct bt_att_exchange_mtu_rsp {
-	u16_t mtu;
+	uint16_t mtu;
 } __packed;
 
 /* Find Information Request */
 #define BT_ATT_OP_FIND_INFO_REQ			0x04
 struct bt_att_find_info_req {
-	u16_t start_handle;
-	u16_t end_handle;
+	uint16_t start_handle;
+	uint16_t end_handle;
 } __packed;
 
 /* Format field values for BT_ATT_OP_FIND_INFO_RSP */
@@ -49,34 +49,34 @@ struct bt_att_find_info_req {
 #define BT_ATT_INFO_128				0x02
 
 struct bt_att_info_16 {
-	u16_t handle;
-	u16_t uuid;
+	uint16_t handle;
+	uint16_t uuid;
 } __packed;
 
 struct bt_att_info_128 {
-	u16_t handle;
-	u8_t  uuid[16];
+	uint16_t handle;
+	uint8_t  uuid[16];
 } __packed;
 
 /* Find Information Response */
 #define BT_ATT_OP_FIND_INFO_RSP			0x05
 struct bt_att_find_info_rsp {
-	u8_t  format;
-	u8_t  info[0];
+	uint8_t  format;
+	uint8_t  info[0];
 } __packed;
 
 /* Find By Type Value Request */
 #define BT_ATT_OP_FIND_TYPE_REQ			0x06
 struct bt_att_find_type_req {
-	u16_t start_handle;
-	u16_t end_handle;
-	u16_t type;
-	u8_t  value[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint16_t type;
+	uint8_t  value[0];
 } __packed;
 
 struct bt_att_handle_group {
-	u16_t start_handle;
-	u16_t end_handle;
+	uint16_t start_handle;
+	uint16_t end_handle;
 } __packed;
 
 /* Find By Type Value Response */
@@ -88,46 +88,46 @@ struct bt_att_find_type_rsp {
 /* Read By Type Request */
 #define BT_ATT_OP_READ_TYPE_REQ			0x08
 struct bt_att_read_type_req {
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t  uuid[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t  uuid[0];
 } __packed;
 
 struct bt_att_data {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Read By Type Response */
 #define BT_ATT_OP_READ_TYPE_RSP			0x09
 struct bt_att_read_type_rsp {
-	u8_t  len;
+	uint8_t  len;
 	struct bt_att_data data[0];
 } __packed;
 
 /* Read Request */
 #define BT_ATT_OP_READ_REQ			0x0a
 struct bt_att_read_req {
-	u16_t handle;
+	uint16_t handle;
 } __packed;
 
 /* Read Response */
 #define BT_ATT_OP_READ_RSP			0x0b
 struct bt_att_read_rsp {
-	u8_t  value[0];
+	uint8_t  value[0];
 } __packed;
 
 /* Read Blob Request */
 #define BT_ATT_OP_READ_BLOB_REQ			0x0c
 struct bt_att_read_blob_req {
-	u16_t handle;
-	u16_t offset;
+	uint16_t handle;
+	uint16_t offset;
 } __packed;
 
 /* Read Blob Response */
 #define BT_ATT_OP_READ_BLOB_RSP			0x0d
 struct bt_att_read_blob_rsp {
-	u8_t  value[0];
+	uint8_t  value[0];
 } __packed;
 
 /* Read Multiple Request */
@@ -135,41 +135,41 @@ struct bt_att_read_blob_rsp {
 
 #define BT_ATT_OP_READ_MULT_REQ			0x0e
 struct bt_att_read_mult_req {
-	u16_t handles[0];
+	uint16_t handles[0];
 } __packed;
 
 /* Read Multiple Respose */
 #define BT_ATT_OP_READ_MULT_RSP			0x0f
 struct bt_att_read_mult_rsp {
-	u8_t  value[0];
+	uint8_t  value[0];
 } __packed;
 
 /* Read by Group Type Request */
 #define BT_ATT_OP_READ_GROUP_REQ		0x10
 struct bt_att_read_group_req {
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t  uuid[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t  uuid[0];
 } __packed;
 
 struct bt_att_group_data {
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t  value[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Read by Group Type Response */
 #define BT_ATT_OP_READ_GROUP_RSP		0x11
 struct bt_att_read_group_rsp {
-	u8_t  len;
+	uint8_t  len;
 	struct bt_att_group_data data[0];
 } __packed;
 
 /* Write Request */
 #define BT_ATT_OP_WRITE_REQ			0x12
 struct bt_att_write_req {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Write Response */
@@ -178,17 +178,17 @@ struct bt_att_write_req {
 /* Prepare Write Request */
 #define BT_ATT_OP_PREPARE_WRITE_REQ		0x16
 struct bt_att_prepare_write_req {
-	u16_t handle;
-	u16_t offset;
-	u8_t  value[0];
+	uint16_t handle;
+	uint16_t offset;
+	uint8_t  value[0];
 } __packed;
 
 /* Prepare Write Respond */
 #define BT_ATT_OP_PREPARE_WRITE_RSP		0x17
 struct bt_att_prepare_write_rsp {
-	u16_t handle;
-	u16_t offset;
-	u8_t  value[0];
+	uint16_t handle;
+	uint16_t offset;
+	uint8_t  value[0];
 } __packed;
 
 /* Execute Write Request */
@@ -197,7 +197,7 @@ struct bt_att_prepare_write_rsp {
 
 #define BT_ATT_OP_EXEC_WRITE_REQ		0x18
 struct bt_att_exec_write_req {
-	u8_t  flags;
+	uint8_t  flags;
 } __packed;
 
 /* Execute Write Response */
@@ -206,60 +206,60 @@ struct bt_att_exec_write_req {
 /* Handle Value Notification */
 #define BT_ATT_OP_NOTIFY			0x1b
 struct bt_att_notify {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Handle Value Indication */
 #define BT_ATT_OP_INDICATE			0x1d
 struct bt_att_indicate {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Handle Value Confirm */
 #define BT_ATT_OP_CONFIRM			0x1e
 
 struct bt_att_signature {
-	u8_t  value[12];
+	uint8_t  value[12];
 } __packed;
 
 #define BT_ATT_OP_READ_MULT_VL_REQ		0x20
 struct bt_att_read_mult_vl_req {
-	u16_t handles[0];
+	uint16_t handles[0];
 } __packed;
 
 /* Read Multiple Respose */
 #define BT_ATT_OP_READ_MULT_VL_RSP		0x21
 struct bt_att_read_mult_vl_rsp {
-	u16_t len;
-	u8_t  value[0];
+	uint16_t len;
+	uint8_t  value[0];
 } __packed;
 
 /* Handle Multiple Value Notification */
 #define BT_ATT_OP_NOTIFY_MULT			0x23
 struct bt_att_notify_mult {
-	u16_t handle;
-	u16_t len;
-	u8_t  value[0];
+	uint16_t handle;
+	uint16_t len;
+	uint8_t  value[0];
 } __packed;
 
 /* Write Command */
 #define BT_ATT_OP_WRITE_CMD			0x52
 struct bt_att_write_cmd {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
 /* Signed Write Command */
 #define BT_ATT_OP_SIGNED_WRITE_CMD		0xd2
 struct bt_att_signed_write_cmd {
-	u16_t handle;
-	u8_t  value[0];
+	uint16_t handle;
+	uint8_t  value[0];
 } __packed;
 
-typedef void (*bt_att_func_t)(struct bt_conn *conn, u8_t err,
-			      const void *pdu, u16_t length,
+typedef void (*bt_att_func_t)(struct bt_conn *conn, uint8_t err,
+			      const void *pdu, uint16_t length,
 			      void *user_data);
 typedef void (*bt_att_destroy_t)(void *user_data);
 
@@ -279,8 +279,8 @@ struct bt_att_req {
 void att_sent(struct bt_conn *conn, void *user_data);
 
 void bt_att_init(void);
-u16_t bt_att_get_mtu(struct bt_conn *conn);
-struct net_buf *bt_att_create_pdu(struct bt_conn *conn, u8_t op,
+uint16_t bt_att_get_mtu(struct bt_conn *conn);
+struct net_buf *bt_att_create_pdu(struct bt_conn *conn, uint8_t op,
 				  size_t len);
 
 /* Allocate a new request */
@@ -300,7 +300,7 @@ int bt_att_req_send(struct bt_conn *conn, struct bt_att_req *req);
 void bt_att_req_cancel(struct bt_conn *conn, struct bt_att_req *req);
 
 /* Connect EATT channels */
-int bt_eatt_connect(struct bt_conn *conn, u8_t num_channels);
+int bt_eatt_connect(struct bt_conn *conn, uint8_t num_channels);
 
 /* Disconnect EATT channels */
 int bt_eatt_disconnect(struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/avdtp.c b/subsys/bluetooth/host/avdtp.c
index 5d0195eaef..7e9f1d9206 100644
--- a/subsys/bluetooth/host/avdtp.c
+++ b/subsys/bluetooth/host/avdtp.c
@@ -49,9 +49,9 @@ static struct bt_avdtp_seid_lsep *lseps;
 #define AVDTP_TIMEOUT K_SECONDS(6)
 
 static const struct {
-	u8_t sig_id;
+	uint8_t sig_id;
 	void (*func)(struct bt_avdtp *session, struct net_buf *buf,
-		     u8_t msg_type);
+		     uint8_t msg_type);
 } handler[] = {
 };
 
@@ -80,12 +80,12 @@ static int avdtp_send(struct bt_avdtp *session,
 	return result;
 }
 
-static struct net_buf *avdtp_create_pdu(u8_t msg_type,
-					u8_t pkt_type,
-					u8_t sig_id)
+static struct net_buf *avdtp_create_pdu(uint8_t msg_type,
+					uint8_t pkt_type,
+					uint8_t sig_id)
 {
 	struct net_buf *buf;
-	static u8_t tid;
+	static uint8_t tid;
 	struct bt_avdtp_single_sig_hdr *hdr;
 
 	BT_DBG("");
@@ -138,7 +138,7 @@ void bt_avdtp_l2cap_disconnected(struct bt_l2cap_chan *chan)
 	/* Clear the Pending req if set*/
 }
 
-void bt_avdtp_l2cap_encrypt_changed(struct bt_l2cap_chan *chan, u8_t status)
+void bt_avdtp_l2cap_encrypt_changed(struct bt_l2cap_chan *chan, uint8_t status)
 {
 	BT_DBG("");
 }
@@ -147,7 +147,7 @@ int bt_avdtp_l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_avdtp_single_sig_hdr *hdr;
 	struct bt_avdtp *session = AVDTP_CHAN(chan);
-	u8_t i, msgtype, sigid, tid;
+	uint8_t i, msgtype, sigid, tid;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Recvd Wrong AVDTP Header");
@@ -256,12 +256,12 @@ int bt_avdtp_register(struct bt_avdtp_event_cb *cb)
 	return 0;
 }
 
-int bt_avdtp_register_sep(u8_t media_type, u8_t role,
+int bt_avdtp_register_sep(uint8_t media_type, uint8_t role,
 			  struct bt_avdtp_seid_lsep *lsep)
 {
 	BT_DBG("");
 
-	static u8_t bt_avdtp_seid = BT_AVDTP_MIN_SEID;
+	static uint8_t bt_avdtp_seid = BT_AVDTP_MIN_SEID;
 
 	if (!lsep) {
 		return -EIO;
diff --git a/subsys/bluetooth/host/avdtp_internal.h b/subsys/bluetooth/host/avdtp_internal.h
index b382fab38c..92d424a803 100644
--- a/subsys/bluetooth/host/avdtp_internal.h
+++ b/subsys/bluetooth/host/avdtp_internal.h
@@ -94,15 +94,15 @@ typedef int (*bt_avdtp_func_t)(struct bt_avdtp *session,
 			       struct bt_avdtp_req *req);
 
 struct bt_avdtp_req {
-	u8_t sig;
-	u8_t tid;
+	uint8_t sig;
+	uint8_t tid;
 	bt_avdtp_func_t func;
 	struct k_delayed_work timeout_work;
 };
 
 struct bt_avdtp_single_sig_hdr {
-	u8_t hdr;
-	u8_t signal_id;
+	uint8_t hdr;
+	uint8_t signal_id;
 } __packed;
 
 #define BT_AVDTP_SIG_HDR_LEN sizeof(struct bt_avdtp_single_sig_hdr)
@@ -120,20 +120,20 @@ struct bt_avdtp_ind_cb {
 };
 
 struct bt_avdtp_cap {
-	u8_t cat;
-	u8_t len;
-	u8_t data[0];
+	uint8_t cat;
+	uint8_t len;
+	uint8_t data[0];
 };
 
 struct bt_avdtp_sep {
-	u8_t seid;
-	u8_t len;
+	uint8_t seid;
+	uint8_t len;
 	struct bt_avdtp_cap caps[0];
 };
 
 struct bt_avdtp_discover_params {
 	struct bt_avdtp_req req;
-	u8_t status;
+	uint8_t status;
 	struct bt_avdtp_sep *caps;
 };
 
@@ -162,7 +162,7 @@ int bt_avdtp_connect(struct bt_conn *conn, struct bt_avdtp *session);
 int bt_avdtp_disconnect(struct bt_avdtp *session);
 
 /* AVDTP SEP register function */
-int bt_avdtp_register_sep(u8_t media_type, u8_t role,
+int bt_avdtp_register_sep(uint8_t media_type, uint8_t role,
 				struct bt_avdtp_seid_lsep *sep);
 
 /* AVDTP Discover Request */
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 1e11f8674a..b9b9884ba9 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -86,7 +86,7 @@ enum pairing_method {
 };
 
 /* based on table 5.7, Core Spec 4.2, Vol.3 Part C, 5.2.2.6 */
-static const u8_t ssp_method[4 /* remote */][4 /* local */] = {
+static const uint8_t ssp_method[4 /* remote */][4 /* local */] = {
 	      { JUST_WORKS, JUST_WORKS, PASSKEY_INPUT, JUST_WORKS },
 	      { JUST_WORKS, PASSKEY_CONFIRM, PASSKEY_INPUT, JUST_WORKS },
 	      { PASSKEY_DISPLAY, PASSKEY_DISPLAY, PASSKEY_INPUT, JUST_WORKS },
@@ -683,7 +683,7 @@ static int pin_code_neg_reply(const bt_addr_t *bdaddr)
 	return bt_hci_cmd_send_sync(BT_HCI_OP_PIN_CODE_NEG_REPLY, buf, NULL);
 }
 
-static int pin_code_reply(struct bt_conn *conn, const char *pin, u8_t len)
+static int pin_code_reply(struct bt_conn *conn, const char *pin, uint8_t len)
 {
 	struct bt_hci_cp_pin_code_reply *cp;
 	struct net_buf *buf;
@@ -756,7 +756,7 @@ void bt_conn_pin_code_req(struct bt_conn *conn)
 	}
 }
 
-u8_t bt_conn_get_io_capa(void)
+uint8_t bt_conn_get_io_capa(void)
 {
 	if (!bt_auth) {
 		return BT_IO_NO_INPUT_OUTPUT;
@@ -777,12 +777,12 @@ u8_t bt_conn_get_io_capa(void)
 	return BT_IO_NO_INPUT_OUTPUT;
 }
 
-static u8_t ssp_pair_method(const struct bt_conn *conn)
+static uint8_t ssp_pair_method(const struct bt_conn *conn)
 {
 	return ssp_method[conn->br.remote_io_capa][bt_conn_get_io_capa()];
 }
 
-u8_t bt_conn_ssp_get_auth(const struct bt_conn *conn)
+uint8_t bt_conn_ssp_get_auth(const struct bt_conn *conn)
 {
 	/* Validate no bond auth request, and if valid use it. */
 	if ((conn->br.remote_auth == BT_HCI_NO_BONDING) ||
@@ -837,7 +837,7 @@ static int ssp_confirm_neg_reply(struct bt_conn *conn)
 				    NULL);
 }
 
-void bt_conn_ssp_auth_complete(struct bt_conn *conn, u8_t status)
+void bt_conn_ssp_auth_complete(struct bt_conn *conn, uint8_t status)
 {
 	if (!status) {
 		bool bond = !atomic_test_bit(conn->flags, BT_CONN_BR_NOBOND);
@@ -852,7 +852,7 @@ void bt_conn_ssp_auth_complete(struct bt_conn *conn, u8_t status)
 	}
 }
 
-void bt_conn_ssp_auth(struct bt_conn *conn, u32_t passkey)
+void bt_conn_ssp_auth(struct bt_conn *conn, uint32_t passkey)
 {
 	conn->br.pairing_method = ssp_pair_method(conn);
 
@@ -1007,8 +1007,8 @@ void bt_conn_identity_resolved(struct bt_conn *conn)
 	}
 }
 
-int bt_conn_le_start_encryption(struct bt_conn *conn, u8_t rand[8],
-				u8_t ediv[2], const u8_t *ltk, size_t len)
+int bt_conn_le_start_encryption(struct bt_conn *conn, uint8_t rand[8],
+				uint8_t ediv[2], const uint8_t *ltk, size_t len)
 {
 	struct bt_hci_cp_le_start_encryption *cp;
 	struct net_buf *buf;
@@ -1033,7 +1033,7 @@ int bt_conn_le_start_encryption(struct bt_conn *conn, u8_t rand[8],
 #endif /* CONFIG_BT_SMP */
 
 #if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR)
-u8_t bt_conn_enc_key_size(struct bt_conn *conn)
+uint8_t bt_conn_enc_key_size(struct bt_conn *conn)
 {
 	if (!conn->encrypt) {
 		return 0;
@@ -1045,7 +1045,7 @@ u8_t bt_conn_enc_key_size(struct bt_conn *conn)
 		struct bt_hci_rp_read_encryption_key_size *rp;
 		struct net_buf *buf;
 		struct net_buf *rsp;
-		u8_t key_size;
+		uint8_t key_size;
 
 		buf = bt_hci_cmd_create(BT_HCI_OP_READ_ENCRYPTION_KEY_SIZE,
 					sizeof(*cp));
@@ -1186,10 +1186,10 @@ static void bt_conn_reset_rx_state(struct bt_conn *conn)
 	conn->rx_len = 0U;
 }
 
-void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, u8_t flags)
+void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags)
 {
 	struct bt_l2cap_hdr *hdr;
-	u16_t len;
+	uint16_t len;
 
 	/* Make sure we notify any pending TX callbacks before processing
 	 * new data for this connection.
@@ -1347,12 +1347,12 @@ int bt_conn_send_cb(struct bt_conn *conn, struct net_buf *buf,
 	return 0;
 }
 
-static bool send_frag(struct bt_conn *conn, struct net_buf *buf, u8_t flags,
+static bool send_frag(struct bt_conn *conn, struct net_buf *buf, uint8_t flags,
 		      bool always_consume)
 {
 	struct bt_conn_tx *tx = tx_data(buf)->tx;
 	struct bt_hci_acl_hdr *hdr;
-	u32_t *pending_no_cb;
+	uint32_t *pending_no_cb;
 	unsigned int key;
 	int err;
 
@@ -1420,7 +1420,7 @@ fail:
 	return false;
 }
 
-static inline u16_t conn_mtu(struct bt_conn *conn)
+static inline uint16_t conn_mtu(struct bt_conn *conn)
 {
 #if defined(CONFIG_BT_BREDR)
 	if (conn->type == BT_CONN_TYPE_BR || !bt_dev.le.mtu) {
@@ -1434,7 +1434,7 @@ static inline u16_t conn_mtu(struct bt_conn *conn)
 static struct net_buf *create_frag(struct bt_conn *conn, struct net_buf *buf)
 {
 	struct net_buf *frag;
-	u16_t frag_len;
+	uint16_t frag_len;
 
 	frag = bt_conn_create_frag(0);
 
@@ -1577,7 +1577,7 @@ void bt_conn_process_tx(struct bt_conn *conn)
 	}
 }
 
-bool bt_conn_exists_le(u8_t id, const bt_addr_le_t *peer)
+bool bt_conn_exists_le(uint8_t id, const bt_addr_le_t *peer)
 {
 	struct bt_conn *conn = bt_conn_lookup_addr_le(id, peer);
 
@@ -1598,7 +1598,7 @@ bool bt_conn_exists_le(u8_t id, const bt_addr_le_t *peer)
 	return false;
 }
 
-struct bt_conn *bt_conn_add_le(u8_t id, const bt_addr_le_t *peer)
+struct bt_conn *bt_conn_add_le(uint8_t id, const bt_addr_le_t *peer)
 {
 	struct bt_conn *conn = conn_new();
 
@@ -1811,7 +1811,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 	}
 }
 
-struct bt_conn *bt_conn_lookup_handle(u16_t handle)
+struct bt_conn *bt_conn_lookup_handle(uint16_t handle)
 {
 	int i;
 
@@ -1852,7 +1852,7 @@ struct bt_conn *bt_conn_lookup_handle(u16_t handle)
 	return NULL;
 }
 
-bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, u8_t id,
+bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, uint8_t id,
 			     const bt_addr_le_t *peer)
 {
 	if (id != conn->id) {
@@ -1872,7 +1872,7 @@ bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, u8_t id,
 	return bt_addr_le_cmp(peer, &conn->le.init_addr) == 0;
 }
 
-struct bt_conn *bt_conn_lookup_addr_le(u8_t id, const bt_addr_le_t *peer)
+struct bt_conn *bt_conn_lookup_addr_le(uint8_t id, const bt_addr_le_t *peer)
 {
 	int i;
 
@@ -1893,7 +1893,7 @@ struct bt_conn *bt_conn_lookup_addr_le(u8_t id, const bt_addr_le_t *peer)
 	return NULL;
 }
 
-struct bt_conn *bt_conn_lookup_state_le(u8_t id, const bt_addr_le_t *peer,
+struct bt_conn *bt_conn_lookup_state_le(uint8_t id, const bt_addr_le_t *peer,
 					const bt_conn_state_t state)
 {
 	int i;
@@ -2044,7 +2044,7 @@ int bt_conn_get_remote_info(struct bt_conn *conn,
 	}
 }
 
-static int conn_disconnect(struct bt_conn *conn, u8_t reason)
+static int conn_disconnect(struct bt_conn *conn, uint8_t reason)
 {
 	int err;
 
@@ -2132,7 +2132,7 @@ int bt_conn_le_phy_update(struct bt_conn *conn,
 }
 #endif
 
-int bt_conn_disconnect(struct bt_conn *conn, u8_t reason)
+int bt_conn_disconnect(struct bt_conn *conn, uint8_t reason)
 {
 	/* Disconnection is initiated by us, so auto connection shall
 	 * be disabled. Otherwise the passive scan would be enabled
@@ -2202,7 +2202,7 @@ static bool create_param_validate(const struct bt_conn_le_create_param *param)
 {
 #if defined(CONFIG_BT_PRIVACY)
 	/* Initiation timeout cannot be greater than the RPA timeout */
-	const u32_t timeout_max = (MSEC_PER_SEC / 10) * CONFIG_BT_RPA_TIMEOUT;
+	const uint32_t timeout_max = (MSEC_PER_SEC / 10) * CONFIG_BT_RPA_TIMEOUT;
 
 	if (param->timeout > timeout_max) {
 		return false;
@@ -2714,15 +2714,15 @@ int bt_conn_auth_pairing_confirm(struct bt_conn *conn)
 }
 #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */
 
-u8_t bt_conn_index(struct bt_conn *conn)
+uint8_t bt_conn_index(struct bt_conn *conn)
 {
-	u8_t index = conn - conns;
+	uint8_t index = conn - conns;
 
 	__ASSERT(index < CONFIG_BT_MAX_CONN, "Invalid bt_conn pointer");
 	return index;
 }
 
-struct bt_conn *bt_conn_lookup_index(u8_t index)
+struct bt_conn *bt_conn_lookup_index(uint8_t index)
 {
 	struct bt_conn *conn;
 
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index a2a88a73a2..34613c5d5c 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -48,16 +48,16 @@ struct bt_conn_le {
 	bt_addr_le_t		init_addr;
 	bt_addr_le_t		resp_addr;
 
-	u16_t			interval;
-	u16_t			interval_min;
-	u16_t			interval_max;
+	uint16_t			interval;
+	uint16_t			interval_min;
+	uint16_t			interval_max;
 
-	u16_t			latency;
-	u16_t			timeout;
-	u16_t			pending_latency;
-	u16_t			pending_timeout;
+	uint16_t			latency;
+	uint16_t			timeout;
+	uint16_t			pending_latency;
+	uint16_t			pending_timeout;
 
-	u8_t			features[8];
+	uint8_t			features[8];
 
 	struct bt_keys		*keys;
 
@@ -76,11 +76,11 @@ struct bt_conn_le {
 
 struct bt_conn_br {
 	bt_addr_t		dst;
-	u8_t			remote_io_capa;
-	u8_t			remote_auth;
-	u8_t			pairing_method;
+	uint8_t			remote_io_capa;
+	uint8_t			remote_auth;
+	uint8_t			pairing_method;
 	/* remote LMP features pages per 8 bytes each */
-	u8_t			features[LMP_MAX_PAGES][8];
+	uint8_t			features[LMP_MAX_PAGES][8];
 
 	struct bt_keys_link_key	*link_key;
 };
@@ -88,7 +88,7 @@ struct bt_conn_br {
 struct bt_conn_sco {
 	/* Reference to ACL Connection */
 	struct bt_conn          *acl;
-	u16_t                pkt_type;
+	uint16_t                pkt_type;
 };
 #endif
 
@@ -101,31 +101,31 @@ struct bt_conn_tx {
 	void *user_data;
 
 	/* Number of pending packets without a callback after this one */
-	u32_t pending_no_cb;
+	uint32_t pending_no_cb;
 };
 
 struct bt_conn {
-	u16_t			handle;
-	u8_t			type;
-	u8_t			role;
+	uint16_t			handle;
+	uint8_t			type;
+	uint8_t			role;
 
 	ATOMIC_DEFINE(flags, BT_CONN_NUM_FLAGS);
 
 	/* Which local identity address this connection uses */
-	u8_t                    id;
+	uint8_t                    id;
 
 #if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR)
 	bt_security_t		sec_level;
 	bt_security_t		required_sec_level;
-	u8_t			encrypt;
+	uint8_t			encrypt;
 #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */
 
 	/* Connection error or reason for disconnect */
-	u8_t			err;
+	uint8_t			err;
 
 	bt_conn_state_t		state;
 
-	u16_t		        rx_len;
+	uint16_t		        rx_len;
 	struct net_buf		*rx;
 
 	/* Sent but not acknowledged TX packets with a callback */
@@ -133,7 +133,7 @@ struct bt_conn {
 	/* Sent but not acknowledged TX packets without a callback before
 	 * the next packet (if any) in tx_pending.
 	 */
-	u32_t                   pending_no_cb;
+	uint32_t                   pending_no_cb;
 
 	/* Completed TX for which we need to call the callback */
 	sys_slist_t		tx_complete;
@@ -161,15 +161,15 @@ struct bt_conn {
 
 #if defined(CONFIG_BT_REMOTE_VERSION)
 	struct bt_conn_rv {
-		u8_t  version;
-		u16_t manufacturer;
-		u16_t subversion;
+		uint8_t  version;
+		uint16_t manufacturer;
+		uint16_t subversion;
 	} rv;
 #endif
 };
 
 /* Process incoming data for a connection */
-void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, u8_t flags);
+void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, uint8_t flags);
 
 /* Send data over a connection */
 int bt_conn_send_cb(struct bt_conn *conn, struct net_buf *buf,
@@ -181,10 +181,10 @@ static inline int bt_conn_send(struct bt_conn *conn, struct net_buf *buf)
 }
 
 /* Check if a connection object with the peer already exists */
-bool bt_conn_exists_le(u8_t id, const bt_addr_le_t *peer);
+bool bt_conn_exists_le(uint8_t id, const bt_addr_le_t *peer);
 
 /* Add a new LE connection */
-struct bt_conn *bt_conn_add_le(u8_t id, const bt_addr_le_t *peer);
+struct bt_conn *bt_conn_add_le(uint8_t id, const bt_addr_le_t *peer);
 
 /* Add a new BR/EDR connection */
 struct bt_conn *bt_conn_add_br(const bt_addr_t *peer);
@@ -202,18 +202,18 @@ struct bt_conn *bt_conn_lookup_addr_sco(const bt_addr_t *peer);
 struct bt_conn *bt_conn_lookup_addr_br(const bt_addr_t *peer);
 
 void bt_conn_pin_code_req(struct bt_conn *conn);
-u8_t bt_conn_get_io_capa(void);
-u8_t bt_conn_ssp_get_auth(const struct bt_conn *conn);
-void bt_conn_ssp_auth(struct bt_conn *conn, u32_t passkey);
-void bt_conn_ssp_auth_complete(struct bt_conn *conn, u8_t status);
+uint8_t bt_conn_get_io_capa(void);
+uint8_t bt_conn_ssp_get_auth(const struct bt_conn *conn);
+void bt_conn_ssp_auth(struct bt_conn *conn, uint32_t passkey);
+void bt_conn_ssp_auth_complete(struct bt_conn *conn, uint8_t status);
 
-void bt_conn_disconnect_all(u8_t id);
+void bt_conn_disconnect_all(uint8_t id);
 
 /* Look up an existing connection */
-struct bt_conn *bt_conn_lookup_handle(u16_t handle);
+struct bt_conn *bt_conn_lookup_handle(uint16_t handle);
 
 /* Check if the connection is with the given peer. */
-bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, u8_t id,
+bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, uint8_t id,
 			     const bt_addr_le_t *peer);
 
 /* Helpers for identifying & looking up connections based on the the index to
@@ -221,12 +221,12 @@ bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, u8_t id,
  * e.g. as the handle since that's assigned to us by the controller.
  */
 #define BT_CONN_INDEX_INVALID 0xff
-struct bt_conn *bt_conn_lookup_index(u8_t index);
+struct bt_conn *bt_conn_lookup_index(uint8_t index);
 
 /* Look up a connection state. For BT_ADDR_LE_ANY, returns the first connection
  * with the specific state
  */
-struct bt_conn *bt_conn_lookup_state_le(u8_t id, const bt_addr_le_t *peer,
+struct bt_conn *bt_conn_lookup_state_le(uint8_t id, const bt_addr_le_t *peer,
 					const bt_conn_state_t state);
 
 /* Set connection object in certain state and perform action related to state */
@@ -247,8 +247,8 @@ bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param);
 
 #if defined(CONFIG_BT_SMP)
 /* rand and ediv should be in BT order */
-int bt_conn_le_start_encryption(struct bt_conn *conn, u8_t rand[8],
-				u8_t ediv[2], const u8_t *ltk, size_t len);
+int bt_conn_le_start_encryption(struct bt_conn *conn, uint8_t rand[8],
+				uint8_t ediv[2], const uint8_t *ltk, size_t len);
 
 /* Notify higher layers that RPA was resolved */
 void bt_conn_identity_resolved(struct bt_conn *conn);
diff --git a/subsys/bluetooth/host/crypto.c b/subsys/bluetooth/host/crypto.c
index 94e3e95dd1..0d29329b0d 100644
--- a/subsys/bluetooth/host/crypto.c
+++ b/subsys/bluetooth/host/crypto.c
@@ -31,8 +31,8 @@ static struct tc_hmac_prng_struct prng;
 
 static int prng_reseed(struct tc_hmac_prng_struct *h)
 {
-	u8_t seed[32];
-	s64_t extra;
+	uint8_t seed[32];
+	int64_t extra;
 	size_t i;
 	int ret;
 
@@ -53,7 +53,7 @@ static int prng_reseed(struct tc_hmac_prng_struct *h)
 
 	extra = k_uptime_get();
 
-	ret = tc_hmac_prng_reseed(h, seed, sizeof(seed), (u8_t *)&extra,
+	ret = tc_hmac_prng_reseed(h, seed, sizeof(seed), (uint8_t *)&extra,
 				  sizeof(extra));
 	if (ret == TC_CRYPTO_FAIL) {
 		BT_ERR("Failed to re-seed PRNG");
@@ -115,11 +115,11 @@ int bt_rand(void *buf, size_t len)
 	return -EIO;
 }
 
-int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16])
+int bt_encrypt_le(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16])
 {
 	struct tc_aes_key_sched_struct s;
-	u8_t tmp[16];
+	uint8_t tmp[16];
 
 	BT_DBG("key %s", bt_hex(key, 16));
 	BT_DBG("plaintext %s", bt_hex(plaintext, 16));
@@ -143,8 +143,8 @@ int bt_encrypt_le(const u8_t key[16], const u8_t plaintext[16],
 	return 0;
 }
 
-int bt_encrypt_be(const u8_t key[16], const u8_t plaintext[16],
-		  u8_t enc_data[16])
+int bt_encrypt_be(const uint8_t key[16], const uint8_t plaintext[16],
+		  uint8_t enc_data[16])
 {
 	struct tc_aes_key_sched_struct s;
 
diff --git a/subsys/bluetooth/host/ecc.h b/subsys/bluetooth/host/ecc.h
index 0553810153..418f0361b4 100644
--- a/subsys/bluetooth/host/ecc.h
+++ b/subsys/bluetooth/host/ecc.h
@@ -16,7 +16,7 @@ struct bt_pub_key_cb {
 	 *
 	 *  @param key The local public key, or NULL in case of no key.
 	 */
-	void (*func)(const u8_t key[64]);
+	void (*func)(const uint8_t key[64]);
 
 	struct bt_pub_key_cb *_next;
 };
@@ -40,7 +40,7 @@ int bt_pub_key_gen(struct bt_pub_key_cb *cb);
  *
  *  @return Current key, or NULL if not available.
  */
-const u8_t *bt_pub_key_get(void);
+const uint8_t *bt_pub_key_get(void);
 
 /*  @typedef bt_dh_key_cb_t
  *  @brief Callback type for DH Key calculation.
@@ -49,7 +49,7 @@ const u8_t *bt_pub_key_get(void);
  *
  *  @param key The DH Key, or NULL in case of failure.
  */
-typedef void (*bt_dh_key_cb_t)(const u8_t key[32]);
+typedef void (*bt_dh_key_cb_t)(const uint8_t key[32]);
 
 /*  @brief Calculate a DH Key from a remote Public Key.
  *
@@ -60,4 +60,4 @@ typedef void (*bt_dh_key_cb_t)(const u8_t key[32]);
  *
  *  @return Zero on success or negative error code otherwise
  */
-int bt_dh_key_gen(const u8_t remote_pk[64], bt_dh_key_cb_t cb);
+int bt_dh_key_gen(const uint8_t remote_pk[64], bt_dh_key_cb_t cb);
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 12d3d88542..14a07ddab4 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -50,16 +50,16 @@
 
 #define DB_HASH_TIMEOUT	K_MSEC(10)
 
-static u16_t last_static_handle;
+static uint16_t last_static_handle;
 
 /* Persistent storage format for GATT CCC */
 struct ccc_store {
-	u16_t handle;
-	u16_t value;
+	uint16_t handle;
+	uint16_t value;
 };
 
 struct gatt_sub {
-	u8_t id;
+	uint8_t id;
 	bt_addr_le_t peer;
 	sys_slist_t list;
 };
@@ -72,7 +72,7 @@ struct gatt_sub {
 
 static struct gatt_sub subscriptions[SUB_MAX];
 
-static const u16_t gap_appearance = CONFIG_BT_DEVICE_APPEARANCE;
+static const uint16_t gap_appearance = CONFIG_BT_DEVICE_APPEARANCE;
 
 #if defined(CONFIG_BT_GATT_DYNAMIC_DB)
 static sys_slist_t db;
@@ -81,7 +81,7 @@ static sys_slist_t db;
 static atomic_t init;
 
 static ssize_t read_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	const char *name = bt_get_name();
 
@@ -92,8 +92,8 @@ static ssize_t read_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 #if defined(CONFIG_BT_DEVICE_NAME_GATT_WRITABLE)
 
 static ssize_t write_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, u16_t len, u16_t offset,
-			 u8_t flags)
+			 const void *buf, uint16_t len, uint16_t offset,
+			 uint8_t flags)
 {
 	char value[CONFIG_BT_DEVICE_NAME_MAX] = {};
 
@@ -116,9 +116,9 @@ static ssize_t write_name(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 static ssize_t read_appearance(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	u16_t appearance = sys_cpu_to_le16(gap_appearance);
+	uint16_t appearance = sys_cpu_to_le16(gap_appearance);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &appearance,
 				 sizeof(appearance));
@@ -137,13 +137,13 @@ BUILD_ASSERT((CONFIG_BT_PERIPHERAL_PREF_MIN_INT == 0xffff) ||
 	     CONFIG_BT_PERIPHERAL_PREF_MAX_INT));
 
 static ssize_t read_ppcp(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	struct __packed {
-		u16_t min_int;
-		u16_t max_int;
-		u16_t latency;
-		u16_t timeout;
+		uint16_t min_int;
+		uint16_t max_int;
+		uint16_t latency;
+		uint16_t timeout;
 	} ppcp;
 
 	ppcp.min_int = sys_cpu_to_le16(CONFIG_BT_PERIPHERAL_PREF_MIN_INT);
@@ -159,9 +159,9 @@ static ssize_t read_ppcp(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 #if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_PRIVACY)
 static ssize_t read_central_addr_res(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr, void *buf,
-				     u16_t len, u16_t offset)
+				     uint16_t len, uint16_t offset)
 {
-	u8_t central_addr_res = BT_GATT_CENTRAL_ADDR_RES_SUPP;
+	uint8_t central_addr_res = BT_GATT_CENTRAL_ADDR_RES_SUPP;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset,
 				 &central_addr_res, sizeof(central_addr_res));
@@ -194,16 +194,16 @@ BT_GATT_SERVICE_DEFINE(_2_gap_svc,
 );
 
 struct sc_data {
-	u16_t start;
-	u16_t end;
+	uint16_t start;
+	uint16_t end;
 } __packed;
 
 struct gatt_sc_cfg {
-	u8_t		id;
+	uint8_t		id;
 	bt_addr_le_t	peer;
 	struct {
-		u16_t		start;
-		u16_t		end;
+		uint16_t		start;
+		uint16_t		end;
 	} data;
 };
 
@@ -211,7 +211,7 @@ struct gatt_sc_cfg {
 static struct gatt_sc_cfg sc_cfg[SC_CFG_MAX];
 BUILD_ASSERT(sizeof(struct sc_data) == sizeof(sc_cfg[0].data));
 
-static struct gatt_sc_cfg *find_sc_cfg(u8_t id, bt_addr_le_t *addr)
+static struct gatt_sc_cfg *find_sc_cfg(uint8_t id, bt_addr_le_t *addr)
 {
 	BT_DBG("id: %u, addr: %s", id, bt_addr_le_str(addr));
 
@@ -257,7 +257,7 @@ static void clear_sc_cfg(struct gatt_sc_cfg *cfg)
 	memset(cfg, 0, sizeof(*cfg));
 }
 
-static int bt_gatt_clear_sc(u8_t id, const bt_addr_le_t *addr)
+static int bt_gatt_clear_sc(uint8_t id, const bt_addr_le_t *addr)
 {
 
 	struct gatt_sc_cfg *cfg;
@@ -327,8 +327,8 @@ static void sc_reset(struct gatt_sc_cfg *cfg)
 	}
 }
 
-static bool update_range(u16_t *start, u16_t *end, u16_t new_start,
-			 u16_t new_end)
+static bool update_range(uint16_t *start, uint16_t *end, uint16_t new_start,
+			 uint16_t new_end)
 {
 	BT_DBG("start 0x%04x end 0x%04x new_start 0x%04x new_end 0x%04x",
 	       *start, *end, new_start, new_end);
@@ -350,7 +350,7 @@ static bool update_range(u16_t *start, u16_t *end, u16_t new_start,
 	return true;
 }
 
-static void sc_save(u8_t id, bt_addr_le_t *peer, u16_t start, u16_t end)
+static void sc_save(uint8_t id, bt_addr_le_t *peer, uint16_t start, uint16_t end)
 {
 	struct gatt_sc_cfg *cfg;
 	bool modified = false;
@@ -389,7 +389,7 @@ done:
 }
 
 static ssize_t sc_ccc_cfg_write(struct bt_conn *conn,
-				const struct bt_gatt_attr *attr, u16_t value)
+				const struct bt_gatt_attr *attr, uint16_t value)
 {
 	BT_DBG("value 0x%04x", value);
 
@@ -427,9 +427,9 @@ enum {
 #define CF_NOTIFY_MULTI(_cfg) (_cfg->data[0] & BIT(CF_BIT_NOTIFY_MULTI))
 
 struct gatt_cf_cfg {
-	u8_t                    id;
+	uint8_t                    id;
 	bt_addr_le_t		peer;
-	u8_t			data[1];
+	uint8_t			data[1];
 	ATOMIC_DEFINE(flags, CF_NUM_FLAGS);
 };
 
@@ -469,10 +469,10 @@ static struct gatt_cf_cfg *find_cf_cfg(struct bt_conn *conn)
 }
 
 static ssize_t cf_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-		       void *buf, u16_t len, u16_t offset)
+		       void *buf, uint16_t len, uint16_t offset)
 {
 	struct gatt_cf_cfg *cfg;
-	u8_t data[1] = {};
+	uint8_t data[1] = {};
 
 	cfg = find_cf_cfg(conn);
 	if (cfg) {
@@ -483,16 +483,16 @@ static ssize_t cf_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 sizeof(data));
 }
 
-static bool cf_set_value(struct gatt_cf_cfg *cfg, const u8_t *value, u16_t len)
+static bool cf_set_value(struct gatt_cf_cfg *cfg, const uint8_t *value, uint16_t len)
 {
-	u16_t i;
-	u8_t last_byte = CF_BYTE_LAST;
-	u8_t last_bit = CF_BIT_LAST;
+	uint16_t i;
+	uint8_t last_byte = CF_BYTE_LAST;
+	uint8_t last_bit = CF_BIT_LAST;
 
 	/* Validate the bits */
 	for (i = 0U; i < len && i <= last_byte; i++) {
-		u8_t chg_bits = value[i] ^ cfg->data[i];
-		u8_t bit;
+		uint8_t chg_bits = value[i] ^ cfg->data[i];
+		uint8_t bit;
 
 		for (bit = 0U; bit <= last_bit; bit++) {
 			/* A client shall never clear a bit it has set */
@@ -514,10 +514,10 @@ static bool cf_set_value(struct gatt_cf_cfg *cfg, const u8_t *value, u16_t len)
 }
 
 static ssize_t cf_write(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			const void *buf, u16_t len, u16_t offset, u8_t flags)
+			const void *buf, uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct gatt_cf_cfg *cfg;
-	const u8_t *value = buf;
+	const uint8_t *value = buf;
 
 	if (offset > sizeof(cfg->data)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -550,7 +550,7 @@ static ssize_t cf_write(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	return len;
 }
 
-static u8_t db_hash[16];
+static uint8_t db_hash[16];
 struct k_delayed_work db_hash_work;
 
 struct gen_hash_state {
@@ -558,13 +558,13 @@ struct gen_hash_state {
 	int err;
 };
 
-static u8_t gen_hash_m(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t gen_hash_m(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct gen_hash_state *state = user_data;
 	struct bt_uuid_16 *u16;
-	u8_t data[16];
+	uint8_t data[16];
 	ssize_t len;
-	u16_t value;
+	uint16_t value;
 
 	if (attr->uuid->type != BT_UUID_TYPE_16)
 		return BT_GATT_ITER_CONTINUE;
@@ -653,7 +653,7 @@ static void db_hash_store(void)
  */
 static void db_hash_gen(bool store)
 {
-	u8_t key[16] = {};
+	uint8_t key[16] = {};
 	struct tc_aes_key_sched_struct sched;
 	struct gen_hash_state state;
 
@@ -692,7 +692,7 @@ static void db_hash_process(struct k_work *work)
 
 static ssize_t db_hash_read(struct bt_conn *conn,
 			    const struct bt_gatt_attr *attr,
-			    void *buf, u16_t len, u16_t offset)
+			    void *buf, uint16_t len, uint16_t offset)
 {
 	int err;
 
@@ -745,9 +745,9 @@ static void remove_cf_cfg(struct bt_conn *conn)
 #define SF_BIT_LAST	SF_BIT_EATT
 
 static ssize_t sf_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-		       void *buf, u16_t len, u16_t offset)
+		       void *buf, uint16_t len, uint16_t offset)
 {
-	u8_t value = BIT(SF_BIT_EATT);
+	uint8_t value = BIT(SF_BIT_EATT);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &value,
 				 sizeof(value));
@@ -784,7 +784,7 @@ BT_GATT_SERVICE_DEFINE(_1_gatt_svc,
 );
 
 #if defined(CONFIG_BT_GATT_DYNAMIC_DB)
-static u8_t found_attr(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t found_attr(const struct bt_gatt_attr *attr, void *user_data)
 {
 	const struct bt_gatt_attr **found = user_data;
 
@@ -802,7 +802,7 @@ static const struct bt_gatt_attr *find_attr(uint16_t handle)
 	return attr;
 }
 
-static void gatt_insert(struct bt_gatt_service *svc, u16_t last_handle)
+static void gatt_insert(struct bt_gatt_service *svc, uint16_t last_handle)
 {
 	struct bt_gatt_service *tmp, *prev = NULL;
 
@@ -829,9 +829,9 @@ static void gatt_insert(struct bt_gatt_service *svc, u16_t last_handle)
 static int gatt_register(struct bt_gatt_service *svc)
 {
 	struct bt_gatt_service *last;
-	u16_t handle, last_handle;
+	uint16_t handle, last_handle;
 	struct bt_gatt_attr *attrs = svc->attrs;
-	u16_t count = svc->attr_count;
+	uint16_t count = svc->attr_count;
 
 	if (sys_slist_is_empty(&db)) {
 		handle = last_static_handle;
@@ -880,14 +880,14 @@ enum {
 
 static struct gatt_sc {
 	struct bt_gatt_indicate_params params;
-	u16_t start;
-	u16_t end;
+	uint16_t start;
+	uint16_t end;
 	struct k_delayed_work work;
 	ATOMIC_DEFINE(flags, SC_NUM_FLAGS);
 } gatt_sc;
 
 static void sc_indicate_rsp(struct bt_conn *conn,
-			    const struct bt_gatt_attr *attr, u8_t err)
+			    const struct bt_gatt_attr *attr, uint8_t err)
 {
 #if defined(CONFIG_BT_GATT_CACHING)
 	struct gatt_cf_cfg *cfg;
@@ -920,7 +920,7 @@ static void sc_indicate_rsp(struct bt_conn *conn,
 static void sc_process(struct k_work *work)
 {
 	struct gatt_sc *sc = CONTAINER_OF(work, struct gatt_sc, work);
-	u16_t sc_range[2];
+	uint16_t sc_range[2];
 
 	__ASSERT(!atomic_test_bit(sc->flags, SC_INDICATE_PENDING),
 		 "Indicate already pending");
@@ -960,7 +960,7 @@ static bool gatt_ccc_conn_is_queued(struct bt_conn *conn)
 
 static void gatt_ccc_conn_unqueue(struct bt_conn *conn)
 {
-	u8_t index = bt_conn_index(conn);
+	uint8_t index = bt_conn_index(conn);
 
 	if (gatt_ccc_store.conn_list[index] != NULL) {
 		bt_conn_unref(gatt_ccc_store.conn_list[index]);
@@ -1036,7 +1036,7 @@ void bt_gatt_init(void)
 
 #if defined(CONFIG_BT_GATT_DYNAMIC_DB) || \
     (defined(CONFIG_BT_GATT_CACHING) && defined(CONFIG_BT_SETTINGS))
-static void sc_indicate(u16_t start, u16_t end)
+static void sc_indicate(uint16_t start, uint16_t end)
 {
 	BT_DBG("start 0x%04x end 0x%04x", start, end);
 
@@ -1141,10 +1141,10 @@ int bt_gatt_service_unregister(struct bt_gatt_service *svc)
 #endif /* CONFIG_BT_GATT_DYNAMIC_DB */
 
 ssize_t bt_gatt_attr_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			  void *buf, u16_t buf_len, u16_t offset,
-			  const void *value, u16_t value_len)
+			  void *buf, uint16_t buf_len, uint16_t offset,
+			  const void *value, uint16_t value_len)
 {
-	u16_t len;
+	uint16_t len;
 
 	if (offset > value_len) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -1155,19 +1155,19 @@ ssize_t bt_gatt_attr_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	BT_DBG("handle 0x%04x offset %u length %u", attr->handle, offset,
 	       len);
 
-	memcpy(buf, (u8_t *)value + offset, len);
+	memcpy(buf, (uint8_t *)value + offset, len);
 
 	return len;
 }
 
 ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr,
-				  void *buf, u16_t len, u16_t offset)
+				  void *buf, uint16_t len, uint16_t offset)
 {
 	struct bt_uuid *uuid = attr->user_data;
 
 	if (uuid->type == BT_UUID_TYPE_16) {
-		u16_t uuid16 = sys_cpu_to_le16(BT_UUID_16(uuid)->val);
+		uint16_t uuid16 = sys_cpu_to_le16(BT_UUID_16(uuid)->val);
 
 		return bt_gatt_attr_read(conn, attr, buf, len, offset,
 					 &uuid16, 2);
@@ -1178,12 +1178,12 @@ ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
 }
 
 struct gatt_incl {
-	u16_t start_handle;
-	u16_t end_handle;
-	u16_t uuid16;
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint16_t uuid16;
 } __packed;
 
-static u8_t get_service_handles(const struct bt_gatt_attr *attr,
+static uint8_t get_service_handles(const struct bt_gatt_attr *attr,
 				   void *user_data)
 {
 	struct gatt_incl *include = user_data;
@@ -1199,9 +1199,9 @@ static u8_t get_service_handles(const struct bt_gatt_attr *attr,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u16_t find_static_attr(const struct bt_gatt_attr *attr)
+static uint16_t find_static_attr(const struct bt_gatt_attr *attr)
 {
-	u16_t handle = 1;
+	uint16_t handle = 1;
 
 	Z_STRUCT_SECTION_FOREACH(bt_gatt_service_static, static_svc) {
 		for (size_t i = 0; i < static_svc->attr_count; i++, handle++) {
@@ -1216,13 +1216,13 @@ static u16_t find_static_attr(const struct bt_gatt_attr *attr)
 
 ssize_t bt_gatt_attr_read_included(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr,
-				   void *buf, u16_t len, u16_t offset)
+				   void *buf, uint16_t len, uint16_t offset)
 {
 	struct bt_gatt_attr *incl = attr->user_data;
-	u16_t handle = incl->handle ? : find_static_attr(incl);
+	uint16_t handle = incl->handle ? : find_static_attr(incl);
 	struct bt_uuid *uuid = incl->user_data;
 	struct gatt_incl pdu;
-	u8_t value_len;
+	uint8_t value_len;
 
 	/* first attr points to the start handle */
 	pdu.start_handle = sys_cpu_to_le16(handle);
@@ -1245,17 +1245,17 @@ ssize_t bt_gatt_attr_read_included(struct bt_conn *conn,
 }
 
 struct gatt_chrc {
-	u8_t properties;
-	u16_t value_handle;
+	uint8_t properties;
+	uint16_t value_handle;
 	union {
-		u16_t uuid16;
-		u8_t  uuid[16];
+		uint16_t uuid16;
+		uint8_t  uuid[16];
 	};
 } __packed;
 
 uint16_t bt_gatt_attr_value_handle(const struct bt_gatt_attr *attr)
 {
-	u16_t handle = 0;
+	uint16_t handle = 0;
 
 	if ((attr != NULL)
 	    && (attr->read == bt_gatt_attr_read_chrc)) {
@@ -1273,11 +1273,11 @@ uint16_t bt_gatt_attr_value_handle(const struct bt_gatt_attr *attr)
 
 ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
 	struct bt_gatt_chrc *chrc = attr->user_data;
 	struct gatt_chrc pdu;
-	u8_t value_len;
+	uint8_t value_len;
 
 	pdu.properties = chrc->properties;
 	/* BLUETOOTH SPECIFICATION Version 4.2 [Vol 3, Part G] page 534:
@@ -1302,13 +1302,13 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &pdu, value_len);
 }
 
-static u8_t gatt_foreach_iter(const struct bt_gatt_attr *attr,
-			      u16_t start_handle, u16_t end_handle,
+static uint8_t gatt_foreach_iter(const struct bt_gatt_attr *attr,
+			      uint16_t start_handle, uint16_t end_handle,
 			      const struct bt_uuid *uuid,
 			      const void *attr_data, uint16_t *num_matches,
 			      bt_gatt_attr_func_t func, void *user_data)
 {
-	u8_t result;
+	uint8_t result;
 
 	/* Stop if over the requested range */
 	if (attr->handle > end_handle) {
@@ -1341,7 +1341,7 @@ static u8_t gatt_foreach_iter(const struct bt_gatt_attr *attr,
 	return result;
 }
 
-static void foreach_attr_type_dyndb(u16_t start_handle, u16_t end_handle,
+static void foreach_attr_type_dyndb(uint16_t start_handle, uint16_t end_handle,
 				    const struct bt_uuid *uuid,
 				    const void *attr_data, uint16_t num_matches,
 				    bt_gatt_attr_func_t func, void *user_data)
@@ -1378,7 +1378,7 @@ static void foreach_attr_type_dyndb(u16_t start_handle, u16_t end_handle,
 #endif /* CONFIG_BT_GATT_DYNAMIC_DB */
 }
 
-void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
+void bt_gatt_foreach_attr_type(uint16_t start_handle, uint16_t end_handle,
 			       const struct bt_uuid *uuid,
 			       const void *attr_data, uint16_t num_matches,
 			       bt_gatt_attr_func_t func, void *user_data)
@@ -1390,7 +1390,7 @@ void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
 	}
 
 	if (start_handle <= last_static_handle) {
-		u16_t handle = 1;
+		uint16_t handle = 1;
 
 		Z_STRUCT_SECTION_FOREACH(bt_gatt_service_static, static_svc) {
 			/* Skip ahead if start is not within service handles */
@@ -1423,7 +1423,7 @@ void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
 				num_matches, func, user_data);
 }
 
-static u8_t find_next(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t find_next(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct bt_gatt_attr **next = user_data;
 
@@ -1435,7 +1435,7 @@ static u8_t find_next(const struct bt_gatt_attr *attr, void *user_data)
 struct bt_gatt_attr *bt_gatt_attr_next(const struct bt_gatt_attr *attr)
 {
 	struct bt_gatt_attr *next = NULL;
-	u16_t handle = attr->handle ? : find_static_attr(attr);
+	uint16_t handle = attr->handle ? : find_static_attr(attr);
 
 	bt_gatt_foreach_attr(handle + 1, handle + 1, find_next, &next);
 
@@ -1470,11 +1470,11 @@ static struct bt_gatt_ccc_cfg *find_ccc_cfg(const struct bt_conn *conn,
 
 ssize_t bt_gatt_attr_read_ccc(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	struct _bt_gatt_ccc *ccc = attr->user_data;
 	const struct bt_gatt_ccc_cfg *cfg;
-	u16_t value;
+	uint16_t value;
 
 	cfg = find_ccc_cfg(conn, ccc);
 	if (cfg) {
@@ -1492,7 +1492,7 @@ static void gatt_ccc_changed(const struct bt_gatt_attr *attr,
 			     struct _bt_gatt_ccc *ccc)
 {
 	int i;
-	u16_t value = 0x0000;
+	uint16_t value = 0x0000;
 
 	for (i = 0; i < ARRAY_SIZE(ccc->cfg); i++) {
 		if (ccc->cfg[i].value > value) {
@@ -1512,22 +1512,22 @@ static void gatt_ccc_changed(const struct bt_gatt_attr *attr,
 
 ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
-			       u16_t len, u16_t offset, u8_t flags)
+			       uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct _bt_gatt_ccc *ccc = attr->user_data;
 	struct bt_gatt_ccc_cfg *cfg;
-	u16_t value;
+	uint16_t value;
 
 	if (offset) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	}
 
-	if (!len || len > sizeof(u16_t)) {
+	if (!len || len > sizeof(uint16_t)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 	}
 
-	if (len < sizeof(u16_t)) {
-		value = *(u8_t *)buf;
+	if (len < sizeof(uint16_t)) {
+		value = *(uint8_t *)buf;
 	} else {
 		value = sys_get_le16(buf);
 	}
@@ -1598,10 +1598,10 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
 
 ssize_t bt_gatt_attr_read_cep(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const struct bt_gatt_cep *value = attr->user_data;
-	u16_t props = sys_cpu_to_le16(value->properties);
+	uint16_t props = sys_cpu_to_le16(value->properties);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &props,
 				 sizeof(props));
@@ -1609,7 +1609,7 @@ ssize_t bt_gatt_attr_read_cep(struct bt_conn *conn,
 
 ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -1619,7 +1619,7 @@ ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
 
 ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const struct bt_gatt_cpf *value = attr->user_data;
 
@@ -1629,7 +1629,7 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
 
 struct notify_data {
 	int err;
-	u16_t type;
+	uint16_t type;
 	union {
 		struct bt_gatt_notify_params *nfy_params;
 		struct bt_gatt_indicate_params *ind_params;
@@ -1697,7 +1697,7 @@ static bool gatt_cf_notify_multi(struct bt_conn *conn)
 	return CF_NOTIFY_MULTI(cfg);
 }
 
-static int gatt_notify_mult(struct bt_conn *conn, u16_t handle,
+static int gatt_notify_mult(struct bt_conn *conn, uint16_t handle,
 			    struct bt_gatt_notify_params *params)
 {
 	struct net_buf **buf = &nfy_mult[bt_conn_index(conn)];
@@ -1743,7 +1743,7 @@ static int gatt_notify_mult(struct bt_conn *conn, u16_t handle,
 }
 #endif /* CONFIG_BT_GATT_NOTIFY_MULTIPLE */
 
-static int gatt_notify(struct bt_conn *conn, u16_t handle,
+static int gatt_notify(struct bt_conn *conn, uint16_t handle,
 		       struct bt_gatt_notify_params *params)
 {
 	struct net_buf *buf;
@@ -1784,8 +1784,8 @@ static int gatt_notify(struct bt_conn *conn, u16_t handle,
 	return bt_att_send(conn, buf, params->func, params->user_data);
 }
 
-static void gatt_indicate_rsp(struct bt_conn *conn, u8_t err,
-			      const void *pdu, u16_t length, void *user_data)
+static void gatt_indicate_rsp(struct bt_conn *conn, uint8_t err,
+			      const void *pdu, uint16_t length, void *user_data)
 {
 	struct bt_gatt_indicate_params *params = user_data;
 
@@ -1827,7 +1827,7 @@ static int gatt_send(struct bt_conn *conn, struct net_buf *buf,
 	return err;
 }
 
-static int gatt_indicate(struct bt_conn *conn, u16_t handle,
+static int gatt_indicate(struct bt_conn *conn, uint16_t handle,
 			 struct bt_gatt_indicate_params *params)
 {
 	struct net_buf *buf;
@@ -1868,7 +1868,7 @@ static int gatt_indicate(struct bt_conn *conn, u16_t handle,
 	return gatt_send(conn, buf, gatt_indicate_rsp, params, NULL);
 }
 
-static u8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct notify_data *data = user_data;
 	struct _bt_gatt_ccc *ccc;
@@ -1956,7 +1956,7 @@ static u8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t match_uuid(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t match_uuid(const struct bt_gatt_attr *attr, void *user_data)
 {
 	const struct bt_gatt_attr **found = user_data;
 
@@ -1970,7 +1970,7 @@ int bt_gatt_notify_cb(struct bt_conn *conn,
 {
 	struct notify_data data;
 	const struct bt_gatt_attr *attr;
-	u16_t handle;
+	uint16_t handle;
 
 	__ASSERT(params, "invalid parameters\n");
 	__ASSERT(params->attr, "invalid parameters\n");
@@ -2032,7 +2032,7 @@ int bt_gatt_notify_cb(struct bt_conn *conn,
 }
 
 #if defined(CONFIG_BT_GATT_NOTIFY_MULTIPLE)
-int bt_gatt_notify_multiple(struct bt_conn *conn, u16_t num_params,
+int bt_gatt_notify_multiple(struct bt_conn *conn, uint16_t num_params,
 			    struct bt_gatt_notify_params *params)
 {
 	int i, ret;
@@ -2057,7 +2057,7 @@ int bt_gatt_indicate(struct bt_conn *conn,
 {
 	struct notify_data data;
 	const struct bt_gatt_attr *attr;
-	u16_t handle;
+	uint16_t handle;
 
 	__ASSERT(params, "invalid parameters\n");
 	__ASSERT(params->attr, "invalid parameters\n");
@@ -2118,13 +2118,13 @@ int bt_gatt_indicate(struct bt_conn *conn,
 	return data.err;
 }
 
-u16_t bt_gatt_get_mtu(struct bt_conn *conn)
+uint16_t bt_gatt_get_mtu(struct bt_conn *conn)
 {
 	return bt_att_get_mtu(conn);
 }
 
-u8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			u8_t mask)
+uint8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
+			uint8_t mask)
 {
 	if ((mask & BT_GATT_PERM_READ) &&
 	    (!(attr->perm & BT_GATT_PERM_READ_MASK) || !attr->read)) {
@@ -2157,7 +2157,7 @@ u8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static void sc_restore_rsp(struct bt_conn *conn,
-			   const struct bt_gatt_attr *attr, u8_t err)
+			   const struct bt_gatt_attr *attr, uint8_t err)
 {
 #if defined(CONFIG_BT_GATT_CACHING)
 	struct gatt_cf_cfg *cfg;
@@ -2184,8 +2184,8 @@ static struct bt_gatt_indicate_params sc_restore_params[CONFIG_BT_MAX_CONN];
 static void sc_restore(struct bt_conn *conn)
 {
 	struct gatt_sc_cfg *cfg;
-	u16_t sc_range[2];
-	u8_t index;
+	uint16_t sc_range[2];
+	uint8_t index;
 
 	cfg = find_sc_cfg(conn->id, &conn->le.dst);
 	if (!cfg) {
@@ -2222,13 +2222,13 @@ struct conn_data {
 	bt_security_t sec;
 };
 
-static u8_t update_ccc(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t update_ccc(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct conn_data *data = user_data;
 	struct bt_conn *conn = data->conn;
 	struct _bt_gatt_ccc *ccc;
 	size_t i;
-	u8_t err;
+	uint8_t err;
 
 	/* Check attribute user_data must be of type struct _bt_gatt_ccc */
 	if (attr->write != bt_gatt_attr_write_ccc) {
@@ -2285,7 +2285,7 @@ static u8_t update_ccc(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct bt_conn *conn = user_data;
 	struct _bt_gatt_ccc *ccc;
@@ -2356,7 +2356,7 @@ static u8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data)
 }
 
 bool bt_gatt_is_subscribed(struct bt_conn *conn,
-			   const struct bt_gatt_attr *attr, u16_t ccc_value)
+			   const struct bt_gatt_attr *attr, uint16_t ccc_value)
 {
 	const struct _bt_gatt_ccc *ccc;
 
@@ -2467,8 +2467,8 @@ static struct gatt_sub *gatt_sub_add(struct bt_conn *conn)
 	return NULL;
 }
 
-void bt_gatt_notification(struct bt_conn *conn, u16_t handle,
-			  const void *data, u16_t length)
+void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,
+			  const void *data, uint16_t length)
 {
 	struct bt_gatt_subscribe_params *params, *tmp;
 	struct gatt_sub *sub;
@@ -2493,7 +2493,7 @@ void bt_gatt_notification(struct bt_conn *conn, u16_t handle,
 }
 
 void bt_gatt_mult_notification(struct bt_conn *conn, const void *data,
-			       u16_t length)
+			       uint16_t length)
 {
 	struct bt_gatt_subscribe_params *params, *tmp;
 	const struct bt_att_notify_mult *nfy;
@@ -2511,8 +2511,8 @@ void bt_gatt_mult_notification(struct bt_conn *conn, const void *data,
 	net_buf_simple_init_with_data(&buf, (void *)data, length);
 
 	while (buf.len > sizeof(*nfy)) {
-		u16_t handle;
-		u16_t len;
+		uint16_t handle;
+		uint16_t len;
 
 		nfy = net_buf_simple_pull_mem(&buf, sizeof(*nfy));
 		handle = sys_cpu_to_le16(nfy->handle);
@@ -2577,8 +2577,8 @@ static void remove_subscriptions(struct bt_conn *conn)
 	}
 }
 
-static void gatt_mtu_rsp(struct bt_conn *conn, u8_t err, const void *pdu,
-			 u16_t length, void *user_data)
+static void gatt_mtu_rsp(struct bt_conn *conn, uint8_t err, const void *pdu,
+			 uint16_t length, void *user_data)
 {
 	struct bt_gatt_exchange_params *params = user_data;
 
@@ -2590,7 +2590,7 @@ int bt_gatt_exchange_mtu(struct bt_conn *conn,
 {
 	struct bt_att_exchange_mtu_req *req;
 	struct net_buf *buf;
-	u16_t mtu;
+	uint16_t mtu;
 
 	__ASSERT(conn, "invalid parameter\n");
 	__ASSERT(params && params->func, "invalid parameters\n");
@@ -2614,7 +2614,7 @@ int bt_gatt_exchange_mtu(struct bt_conn *conn,
 	return gatt_send(conn, buf, gatt_mtu_rsp, params, NULL);
 }
 
-static void gatt_discover_next(struct bt_conn *conn, u16_t last_handle,
+static void gatt_discover_next(struct bt_conn *conn, uint16_t last_handle,
 			       struct bt_gatt_discover_params *params)
 {
 	/* Skip if last_handle is not set */
@@ -2644,14 +2644,14 @@ done:
 	params->func(conn, NULL, params);
 }
 
-static void gatt_find_type_rsp(struct bt_conn *conn, u8_t err,
-			       const void *pdu, u16_t length,
+static void gatt_find_type_rsp(struct bt_conn *conn, uint8_t err,
+			       const void *pdu, uint16_t length,
 			       void *user_data)
 {
 	const struct bt_att_find_type_rsp *rsp = pdu;
 	struct bt_gatt_discover_params *params = user_data;
-	u8_t i;
-	u16_t end_handle = 0U, start_handle;
+	uint8_t i;
+	uint16_t end_handle = 0U, start_handle;
 
 	BT_DBG("err 0x%02x", err);
 
@@ -2706,7 +2706,7 @@ done:
 static int gatt_find_type(struct bt_conn *conn,
 			 struct bt_gatt_discover_params *params)
 {
-	u16_t uuid_val;
+	uint16_t uuid_val;
 	struct net_buf *buf;
 	struct bt_att_find_type_req *req;
 
@@ -2747,8 +2747,8 @@ static int gatt_find_type(struct bt_conn *conn,
 	return gatt_send(conn, buf, gatt_find_type_rsp, params, NULL);
 }
 
-static void read_included_uuid_cb(struct bt_conn *conn, u8_t err,
-				  const void *pdu, u16_t length,
+static void read_included_uuid_cb(struct bt_conn *conn, uint8_t err,
+				  const void *pdu, uint16_t length,
 				  void *user_data)
 {
 	struct bt_gatt_discover_params *params = user_data;
@@ -2813,12 +2813,12 @@ static int read_included_uuid(struct bt_conn *conn,
 	return gatt_send(conn, buf, read_included_uuid_cb, params, NULL);
 }
 
-static u16_t parse_include(struct bt_conn *conn, const void *pdu,
+static uint16_t parse_include(struct bt_conn *conn, const void *pdu,
 			   struct bt_gatt_discover_params *params,
-			   u16_t length)
+			   uint16_t length)
 {
 	const struct bt_att_read_type_rsp *rsp = pdu;
-	u16_t handle = 0U;
+	uint16_t handle = 0U;
 	struct bt_gatt_include value;
 	union {
 		struct bt_uuid uuid;
@@ -2845,7 +2845,7 @@ static u16_t parse_include(struct bt_conn *conn, const void *pdu,
 
 	/* Parse include found */
 	for (length--, pdu = rsp->data; length >= rsp->len;
-	     length -= rsp->len, pdu = (const u8_t *)pdu + rsp->len) {
+	     length -= rsp->len, pdu = (const uint8_t *)pdu + rsp->len) {
 		struct bt_gatt_attr *attr;
 		const struct bt_att_data *data = pdu;
 		struct gatt_incl *incl = (void *)data->value;
@@ -2912,12 +2912,12 @@ done:
 						    .value_handle = _handle,  \
 						    .properties = _props, }))
 
-static u16_t parse_characteristic(struct bt_conn *conn, const void *pdu,
+static uint16_t parse_characteristic(struct bt_conn *conn, const void *pdu,
 				  struct bt_gatt_discover_params *params,
-				  u16_t length)
+				  uint16_t length)
 {
 	const struct bt_att_read_type_rsp *rsp = pdu;
-	u16_t handle = 0U;
+	uint16_t handle = 0U;
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
@@ -2939,7 +2939,7 @@ static u16_t parse_characteristic(struct bt_conn *conn, const void *pdu,
 
 	/* Parse characteristics found */
 	for (length--, pdu = rsp->data; length >= rsp->len;
-	     length -= rsp->len, pdu = (const u8_t *)pdu + rsp->len) {
+	     length -= rsp->len, pdu = (const uint8_t *)pdu + rsp->len) {
 		struct bt_gatt_attr *attr;
 		const struct bt_att_data *data = pdu;
 		struct gatt_chrc *chrc = (void *)data->value;
@@ -2987,12 +2987,12 @@ done:
 	return 0;
 }
 
-static void gatt_read_type_rsp(struct bt_conn *conn, u8_t err,
-			       const void *pdu, u16_t length,
+static void gatt_read_type_rsp(struct bt_conn *conn, uint8_t err,
+			       const void *pdu, uint16_t length,
 			       void *user_data)
 {
 	struct bt_gatt_discover_params *params = user_data;
-	u16_t handle;
+	uint16_t handle;
 
 	BT_DBG("err 0x%02x", err);
 
@@ -3041,12 +3041,12 @@ static int gatt_read_type(struct bt_conn *conn,
 	return gatt_send(conn, buf, gatt_read_type_rsp, params, NULL);
 }
 
-static u16_t parse_service(struct bt_conn *conn, const void *pdu,
+static uint16_t parse_service(struct bt_conn *conn, const void *pdu,
 				  struct bt_gatt_discover_params *params,
-				  u16_t length)
+				  uint16_t length)
 {
 	const struct bt_att_read_group_rsp *rsp = pdu;
-	u16_t start_handle, end_handle = 0U;
+	uint16_t start_handle, end_handle = 0U;
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
@@ -3068,7 +3068,7 @@ static u16_t parse_service(struct bt_conn *conn, const void *pdu,
 
 	/* Parse services found */
 	for (length--, pdu = rsp->data; length >= rsp->len;
-	     length -= rsp->len, pdu = (const u8_t *)pdu + rsp->len) {
+	     length -= rsp->len, pdu = (const uint8_t *)pdu + rsp->len) {
 		struct bt_uuid_16 uuid_svc;
 		struct bt_gatt_attr attr = {};
 		struct bt_gatt_service_val value;
@@ -3126,12 +3126,12 @@ done:
 	return 0;
 }
 
-static void gatt_read_group_rsp(struct bt_conn *conn, u8_t err,
-				const void *pdu, u16_t length,
+static void gatt_read_group_rsp(struct bt_conn *conn, uint8_t err,
+				const void *pdu, uint16_t length,
 				void *user_data)
 {
 	struct bt_gatt_discover_params *params = user_data;
-	u16_t handle;
+	uint16_t handle;
 
 	BT_DBG("err 0x%02x", err);
 
@@ -3175,14 +3175,14 @@ static int gatt_read_group(struct bt_conn *conn,
 	return gatt_send(conn, buf, gatt_read_group_rsp, params, NULL);
 }
 
-static void gatt_find_info_rsp(struct bt_conn *conn, u8_t err,
-			       const void *pdu, u16_t length,
+static void gatt_find_info_rsp(struct bt_conn *conn, uint8_t err,
+			       const void *pdu, uint16_t length,
 			       void *user_data)
 {
 	const struct bt_att_find_info_rsp *rsp = pdu;
 	struct bt_gatt_discover_params *params = user_data;
-	u16_t handle = 0U;
-	u16_t len;
+	uint16_t handle = 0U;
+	uint16_t len;
 	union {
 		const struct bt_att_info_16 *i16;
 		const struct bt_att_info_128 *i128;
@@ -3225,7 +3225,7 @@ static void gatt_find_info_rsp(struct bt_conn *conn, u8_t err,
 
 	/* Parse descriptors found */
 	for (i = length / len, pdu = rsp->info; i != 0;
-	     i--, pdu = (const u8_t *)pdu + len) {
+	     i--, pdu = (const uint8_t *)pdu + len) {
 		struct bt_gatt_attr *attr;
 
 		info.i16 = pdu;
@@ -3354,16 +3354,16 @@ int bt_gatt_discover(struct bt_conn *conn,
 
 static void parse_read_by_uuid(struct bt_conn *conn,
 			       struct bt_gatt_read_params *params,
-			       const void *pdu, u16_t length)
+			       const void *pdu, uint16_t length)
 {
 	const struct bt_att_read_type_rsp *rsp = pdu;
 
 	/* Parse values found */
 	for (length--, pdu = rsp->data; length;
-	     length -= rsp->len, pdu = (const u8_t *)pdu + rsp->len) {
+	     length -= rsp->len, pdu = (const uint8_t *)pdu + rsp->len) {
 		const struct bt_att_data *data = pdu;
-		u16_t handle;
-		u16_t len;
+		uint16_t handle;
+		uint16_t len;
 
 		handle = sys_le16_to_cpu(data->handle);
 
@@ -3405,8 +3405,8 @@ static void parse_read_by_uuid(struct bt_conn *conn,
 	}
 }
 
-static void gatt_read_rsp(struct bt_conn *conn, u8_t err, const void *pdu,
-			  u16_t length, void *user_data)
+static void gatt_read_rsp(struct bt_conn *conn, uint8_t err, const void *pdu,
+			  uint16_t length, void *user_data)
 {
 	struct bt_gatt_read_params *params = user_data;
 
@@ -3495,8 +3495,8 @@ static int gatt_read_uuid(struct bt_conn *conn,
 }
 
 #if defined(CONFIG_BT_GATT_READ_MULTIPLE)
-static void gatt_read_mult_rsp(struct bt_conn *conn, u8_t err, const void *pdu,
-			       u16_t length, void *user_data)
+static void gatt_read_mult_rsp(struct bt_conn *conn, uint8_t err, const void *pdu,
+			       uint16_t length, void *user_data)
 {
 	struct bt_gatt_read_params *params = user_data;
 
@@ -3517,10 +3517,10 @@ static int gatt_read_mult(struct bt_conn *conn,
 			  struct bt_gatt_read_params *params)
 {
 	struct net_buf *buf;
-	u8_t i;
+	uint8_t i;
 
 	buf = bt_att_create_pdu(conn, BT_ATT_OP_READ_MULT_REQ,
-				params->handle_count * sizeof(u16_t));
+				params->handle_count * sizeof(uint16_t));
 	if (!buf) {
 		return -ENOMEM;
 	}
@@ -3533,8 +3533,8 @@ static int gatt_read_mult(struct bt_conn *conn,
 }
 
 #if defined(CONFIG_BT_EATT)
-static void gatt_read_mult_vl_rsp(struct bt_conn *conn, u8_t err,
-				  const void *pdu, u16_t length,
+static void gatt_read_mult_vl_rsp(struct bt_conn *conn, uint8_t err,
+				  const void *pdu, uint16_t length,
 				  void *user_data)
 {
 	struct bt_gatt_read_params *params = user_data;
@@ -3554,7 +3554,7 @@ static void gatt_read_mult_vl_rsp(struct bt_conn *conn, u8_t err,
 	net_buf_simple_init_with_data(&buf, (void *)pdu, length);
 
 	while (buf.len >= sizeof(*rsp)) {
-		u16_t len;
+		uint16_t len;
 
 		rsp = net_buf_simple_pull_mem(&buf, sizeof(*rsp));
 		len = sys_le16_to_cpu(rsp->len);
@@ -3580,10 +3580,10 @@ static int gatt_read_mult_vl(struct bt_conn *conn,
 			      struct bt_gatt_read_params *params)
 {
 	struct net_buf *buf;
-	u8_t i;
+	uint8_t i;
 
 	buf = bt_att_create_pdu(conn, BT_ATT_OP_READ_MULT_VL_REQ,
-				params->handle_count * sizeof(u16_t));
+				params->handle_count * sizeof(uint16_t));
 	if (!buf) {
 		return -ENOMEM;
 	}
@@ -3651,8 +3651,8 @@ int bt_gatt_read(struct bt_conn *conn, struct bt_gatt_read_params *params)
 	return gatt_send(conn, buf, gatt_read_rsp, params, NULL);
 }
 
-static void gatt_write_rsp(struct bt_conn *conn, u8_t err, const void *pdu,
-			   u16_t length, void *user_data)
+static void gatt_write_rsp(struct bt_conn *conn, uint8_t err, const void *pdu,
+			   uint16_t length, void *user_data)
 {
 	struct bt_gatt_write_params *params = user_data;
 
@@ -3661,8 +3661,8 @@ static void gatt_write_rsp(struct bt_conn *conn, u8_t err, const void *pdu,
 	params->func(conn, err, params);
 }
 
-int bt_gatt_write_without_response_cb(struct bt_conn *conn, u16_t handle,
-				      const void *data, u16_t length, bool sign,
+int bt_gatt_write_without_response_cb(struct bt_conn *conn, uint16_t handle,
+				      const void *data, uint16_t length, bool sign,
 				      bt_gatt_complete_func_t func,
 				      void *user_data)
 {
@@ -3730,8 +3730,8 @@ static int gatt_exec_write(struct bt_conn *conn,
 	return gatt_send(conn, buf, gatt_write_rsp, params, NULL);
 }
 
-static void gatt_prepare_write_rsp(struct bt_conn *conn, u8_t err,
-				   const void *pdu, u16_t length,
+static void gatt_prepare_write_rsp(struct bt_conn *conn, uint8_t err,
+				   const void *pdu, uint16_t length,
 				   void *user_data)
 {
 	struct bt_gatt_write_params *params = user_data;
@@ -3760,7 +3760,7 @@ static int gatt_prepare_write(struct bt_conn *conn,
 {
 	struct net_buf *buf;
 	struct bt_att_prepare_write_req *req;
-	u16_t len;
+	uint16_t len;
 	size_t write;
 
 	len = MIN(params->length, bt_att_get_mtu(conn) - sizeof(*req) - 1);
@@ -3781,7 +3781,7 @@ static int gatt_prepare_write(struct bt_conn *conn,
 
 	/* Update params */
 	params->offset += write;
-	params->data = (const u8_t *)params->data + len;
+	params->data = (const uint8_t *)params->data + len;
 	params->length -= write;
 
 	BT_DBG("handle 0x%04x offset %u len %u", params->handle, params->offset,
@@ -3831,8 +3831,8 @@ int bt_gatt_write(struct bt_conn *conn, struct bt_gatt_write_params *params)
 	return gatt_send(conn, buf, gatt_write_rsp, params, NULL);
 }
 
-static void gatt_write_ccc_rsp(struct bt_conn *conn, u8_t err,
-			       const void *pdu, u16_t length,
+static void gatt_write_ccc_rsp(struct bt_conn *conn, uint8_t err,
+			       const void *pdu, uint16_t length,
 			       void *user_data)
 {
 	struct bt_gatt_subscribe_params *params = user_data;
@@ -3865,7 +3865,7 @@ static void gatt_write_ccc_rsp(struct bt_conn *conn, u8_t err,
 	}
 }
 
-static int gatt_write_ccc(struct bt_conn *conn, u16_t handle, u16_t value,
+static int gatt_write_ccc(struct bt_conn *conn, uint16_t handle, uint16_t value,
 			  bt_att_func_t func,
 			  struct bt_gatt_subscribe_params *params)
 {
@@ -3873,7 +3873,7 @@ static int gatt_write_ccc(struct bt_conn *conn, u16_t handle, u16_t value,
 	struct bt_att_write_req *req;
 
 	buf = bt_att_create_pdu(conn, BT_ATT_OP_WRITE_REQ,
-				sizeof(*req) + sizeof(u16_t));
+				sizeof(*req) + sizeof(uint16_t));
 	if (!buf) {
 		return -ENOMEM;
 	}
@@ -4038,7 +4038,7 @@ static void add_subscriptions(struct bt_conn *conn)
 
 static struct bt_gatt_ccc_cfg *ccc_find_cfg(struct _bt_gatt_ccc *ccc,
 					    const bt_addr_le_t *addr,
-					    u8_t id)
+					    uint8_t id)
 {
 	for (size_t i = 0; i < ARRAY_SIZE(ccc->cfg); i++) {
 		if (id == ccc->cfg[i].id &&
@@ -4052,7 +4052,7 @@ static struct bt_gatt_ccc_cfg *ccc_find_cfg(struct _bt_gatt_ccc *ccc,
 
 struct addr_with_id {
 	const bt_addr_le_t *addr;
-	u8_t id;
+	uint8_t id;
 };
 
 struct ccc_load {
@@ -4063,7 +4063,7 @@ struct ccc_load {
 
 static void ccc_clear(struct _bt_gatt_ccc *ccc,
 		      const bt_addr_le_t *addr,
-		      u8_t id)
+		      uint8_t id)
 {
 	struct bt_gatt_ccc_cfg *cfg;
 
@@ -4076,7 +4076,7 @@ static void ccc_clear(struct _bt_gatt_ccc *ccc,
 	clear_ccc_cfg(cfg);
 }
 
-static u8_t ccc_load(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t ccc_load(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct ccc_load *load = user_data;
 	struct _bt_gatt_ccc *ccc;
@@ -4403,7 +4403,7 @@ void bt_gatt_disconnected(struct bt_conn *conn)
 #endif
 }
 
-static struct gatt_cf_cfg *find_cf_cfg_by_addr(u8_t id,
+static struct gatt_cf_cfg *find_cf_cfg_by_addr(uint8_t id,
 					       const bt_addr_le_t *addr)
 {
 	if (IS_ENABLED(CONFIG_BT_GATT_CACHING)) {
@@ -4428,7 +4428,7 @@ struct ccc_save {
 	size_t count;
 };
 
-static u8_t ccc_save(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t ccc_save(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct ccc_save *save = user_data;
 	struct _bt_gatt_ccc *ccc;
@@ -4457,7 +4457,7 @@ static u8_t ccc_save(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr)
+int bt_gatt_store_ccc(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct ccc_save save;
 	char key[BT_SETTINGS_KEY_MAX];
@@ -4514,7 +4514,7 @@ static int sc_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 		  void *cb_arg)
 {
 	struct gatt_sc_cfg *cfg;
-	u8_t id;
+	uint8_t id;
 	bt_addr_le_t addr;
 	ssize_t len;
 	int err;
@@ -4596,7 +4596,7 @@ static int cf_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 	const char *next;
 	ssize_t len;
 	int err;
-	u8_t id;
+	uint8_t id;
 
 	if (!name) {
 		BT_ERR("Insufficient number of arguments");
@@ -4648,7 +4648,7 @@ static int cf_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 
 SETTINGS_STATIC_HANDLER_DEFINE(bt_cf, "bt/cf", NULL, cf_set, NULL, NULL);
 
-static u8_t stored_hash[16];
+static uint8_t stored_hash[16];
 
 static int db_hash_set(const char *name, size_t len_rd,
 		       settings_read_cb read_cb, void *cb_arg)
@@ -4706,7 +4706,7 @@ SETTINGS_STATIC_HANDLER_DEFINE(bt_hash, "bt/hash", NULL, db_hash_set,
 #endif /*CONFIG_BT_GATT_CACHING */
 #endif /* CONFIG_BT_SETTINGS */
 
-static u8_t remove_peer_from_attr(const struct bt_gatt_attr *attr,
+static uint8_t remove_peer_from_attr(const struct bt_gatt_attr *attr,
 				  void *user_data)
 {
 	const struct addr_with_id *addr_with_id = user_data;
@@ -4729,7 +4729,7 @@ static u8_t remove_peer_from_attr(const struct bt_gatt_attr *attr,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static int bt_gatt_clear_ccc(u8_t id, const bt_addr_le_t *addr)
+static int bt_gatt_clear_ccc(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct addr_with_id addr_with_id = {
 		.addr = addr,
@@ -4759,7 +4759,7 @@ static int bt_gatt_clear_ccc(u8_t id, const bt_addr_le_t *addr)
 	return 0;
 }
 
-static int bt_gatt_clear_cf(u8_t id, const bt_addr_le_t *addr)
+static int bt_gatt_clear_cf(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct gatt_cf_cfg *cfg;
 
@@ -4790,7 +4790,7 @@ static int bt_gatt_clear_cf(u8_t id, const bt_addr_le_t *addr)
 }
 
 
-static struct gatt_sub *find_gatt_sub(u8_t id, const bt_addr_le_t *addr)
+static struct gatt_sub *find_gatt_sub(uint8_t id, const bt_addr_le_t *addr)
 {
 	for (int i = 0; i < ARRAY_SIZE(subscriptions); i++) {
 		struct gatt_sub *sub = &subscriptions[i];
@@ -4804,7 +4804,7 @@ static struct gatt_sub *find_gatt_sub(u8_t id, const bt_addr_le_t *addr)
 	return NULL;
 }
 
-static void bt_gatt_clear_subscriptions(u8_t id, const bt_addr_le_t *addr)
+static void bt_gatt_clear_subscriptions(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct gatt_sub *sub;
 	struct bt_gatt_subscribe_params *params, *tmp;
@@ -4822,7 +4822,7 @@ static void bt_gatt_clear_subscriptions(u8_t id, const bt_addr_le_t *addr)
 	}
 }
 
-int bt_gatt_clear(u8_t id, const bt_addr_le_t *addr)
+int bt_gatt_clear(uint8_t id, const bt_addr_le_t *addr)
 {
 	int err;
 
diff --git a/subsys/bluetooth/host/gatt_internal.h b/subsys/bluetooth/host/gatt_internal.h
index d79de667d3..8354523419 100644
--- a/subsys/bluetooth/host/gatt_internal.h
+++ b/subsys/bluetooth/host/gatt_internal.h
@@ -29,24 +29,24 @@ void bt_gatt_disconnected(struct bt_conn *conn);
 
 bool bt_gatt_change_aware(struct bt_conn *conn, bool req);
 
-int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr);
+int bt_gatt_store_ccc(uint8_t id, const bt_addr_le_t *addr);
 
-int bt_gatt_clear(u8_t id, const bt_addr_le_t *addr);
+int bt_gatt_clear(uint8_t id, const bt_addr_le_t *addr);
 
 #if defined(CONFIG_BT_GATT_CLIENT)
-void bt_gatt_notification(struct bt_conn *conn, u16_t handle,
-			  const void *data, u16_t length);
+void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,
+			  const void *data, uint16_t length);
 
 void bt_gatt_mult_notification(struct bt_conn *conn, const void *data,
-			       u16_t length);
+			       uint16_t length);
 #else
-static inline void bt_gatt_notification(struct bt_conn *conn, u16_t handle,
-					const void *data, u16_t length)
+static inline void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,
+					const void *data, uint16_t length)
 {
 }
 
 static inline void bt_gatt_mult_notification(struct bt_conn *conn,
-					     const void *data, u16_t length)
+					     const void *data, uint16_t length)
 {
 }
 #endif /* CONFIG_BT_GATT_CLIENT */
@@ -54,5 +54,5 @@ static inline void bt_gatt_mult_notification(struct bt_conn *conn,
 struct bt_gatt_attr;
 
 /* Check attribute permission */
-u8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			u8_t mask);
+uint8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
+			uint8_t mask);
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index f1d0dd1654..552e98fc6e 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -90,7 +90,7 @@ static bt_ready_cb_t ready_cb;
 static bt_le_scan_cb_t *scan_dev_found_cb;
 
 #if defined(CONFIG_BT_OBSERVER)
-static int set_le_scan_enable(u8_t enable);
+static int set_le_scan_enable(uint8_t enable);
 static sys_slist_t scan_cbs = SYS_SLIST_STATIC_INIT(&scan_cbs);
 #endif /* defined(CONFIG_BT_OBSERVER) */
 
@@ -103,7 +103,7 @@ static bt_hci_vnd_evt_cb_t *hci_vnd_evt_cb;
 #endif /* CONFIG_BT_HCI_VS_EVT_USER */
 
 #if defined(CONFIG_BT_ECC)
-static u8_t pub_key[64];
+static uint8_t pub_key[64];
 static struct bt_pub_key_cb *pub_key_cb;
 static bt_dh_key_cb_t dh_key_cb;
 #endif /* CONFIG_BT_ECC */
@@ -131,10 +131,10 @@ void cmd_state_set_init(struct cmd_state_set *state, atomic_t *target, int bit,
 
 struct cmd_data {
 	/** HCI status of the command completion */
-	u8_t  status;
+	uint8_t  status;
 
 	/** The command OpCode that the buffer contains */
-	u16_t opcode;
+	uint16_t opcode;
 
 	/** The state to update when command completes with success. */
 	struct cmd_state_set *state;
@@ -145,13 +145,13 @@ struct cmd_data {
 
 struct acl_data {
 	/** BT_BUF_ACL_IN */
-	u8_t  type;
+	uint8_t  type;
 
 	/* Index into the bt_conn storage array */
-	u8_t  index;
+	uint8_t  index;
 
 	/** ACL connection handle */
-	u16_t handle;
+	uint16_t handle;
 };
 
 static struct cmd_data cmd_data[CONFIG_BT_HCI_CMD_COUNT];
@@ -189,8 +189,8 @@ NET_BUF_POOL_FIXED_DEFINE(discardable_pool, CONFIG_BT_DISCARDABLE_BUF_COUNT,
 #endif /* CONFIG_BT_DISCARDABLE_BUF_COUNT */
 
 struct event_handler {
-	u8_t event;
-	u8_t min_len;
+	uint8_t event;
+	uint8_t min_len;
 	void (*handler)(struct net_buf *buf);
 };
 
@@ -201,7 +201,7 @@ struct event_handler {
 	.min_len = _min_len, \
 }
 
-static inline void handle_event(u8_t event, struct net_buf *buf,
+static inline void handle_event(uint8_t event, struct net_buf *buf,
 				const struct event_handler *handlers,
 				size_t num_handlers)
 {
@@ -233,7 +233,7 @@ static void report_completed_packet(struct net_buf *buf)
 {
 
 	struct bt_hci_cp_host_num_completed_packets *cp;
-	u16_t handle = acl(buf)->handle;
+	uint16_t handle = acl(buf)->handle;
 	struct bt_hci_handle_count *hc;
 	struct bt_conn *conn;
 
@@ -284,7 +284,7 @@ NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BT_ACL_RX_COUNT, ACL_IN_SIZE,
 		    sizeof(struct acl_data), report_completed_packet);
 #endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
-struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len)
+struct net_buf *bt_hci_cmd_create(uint16_t opcode, uint8_t param_len)
 {
 	struct bt_hci_cmd_hdr *hdr;
 	struct net_buf *buf;
@@ -311,7 +311,7 @@ struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len)
 	return buf;
 }
 
-int bt_hci_cmd_send(u16_t opcode, struct net_buf *buf)
+int bt_hci_cmd_send(uint16_t opcode, struct net_buf *buf)
 {
 	if (!buf) {
 		buf = bt_hci_cmd_create(opcode, 0);
@@ -342,11 +342,11 @@ int bt_hci_cmd_send(u16_t opcode, struct net_buf *buf)
 	return 0;
 }
 
-int bt_hci_cmd_send_sync(u16_t opcode, struct net_buf *buf,
+int bt_hci_cmd_send_sync(uint16_t opcode, struct net_buf *buf,
 			 struct net_buf **rsp)
 {
 	struct k_sem sync_sem;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	if (!buf) {
@@ -394,7 +394,7 @@ int bt_hci_cmd_send_sync(u16_t opcode, struct net_buf *buf,
 }
 
 #if defined(CONFIG_BT_OBSERVER) || defined(CONFIG_BT_BROADCASTER)
-const bt_addr_le_t *bt_lookup_id_addr(u8_t id, const bt_addr_le_t *addr)
+const bt_addr_le_t *bt_lookup_id_addr(uint8_t id, const bt_addr_le_t *addr)
 {
 	if (IS_ENABLED(CONFIG_BT_SMP)) {
 		struct bt_keys *keys;
@@ -413,9 +413,9 @@ const bt_addr_le_t *bt_lookup_id_addr(u8_t id, const bt_addr_le_t *addr)
 #endif /* CONFIG_BT_OBSERVER || CONFIG_BT_CONN */
 
 #if defined(CONFIG_BT_EXT_ADV)
-u8_t bt_le_ext_adv_get_index(struct bt_le_ext_adv *adv)
+uint8_t bt_le_ext_adv_get_index(struct bt_le_ext_adv *adv)
 {
-	u8_t index = adv - adv_pool;
+	uint8_t index = adv - adv_pool;
 
 	__ASSERT(index < ARRAY_SIZE(adv_pool), "Invalid bt_adv pointer");
 	return index;
@@ -450,7 +450,7 @@ static void adv_delete(struct bt_le_ext_adv *adv)
 }
 
 #if defined(CONFIG_BT_BROADCASTER)
-static struct bt_le_ext_adv *bt_adv_lookup_handle(u8_t handle)
+static struct bt_le_ext_adv *bt_adv_lookup_handle(uint8_t handle)
 {
 	if (handle < ARRAY_SIZE(adv_pool) &&
 	    atomic_test_bit(adv_pool[handle].flags, BT_ADV_CREATED)) {
@@ -658,7 +658,7 @@ static int set_adv_random_address(struct bt_le_ext_adv *adv,
 int bt_addr_from_str(const char *str, bt_addr_t *addr)
 {
 	int i, j;
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (strlen(str) != 17U) {
 		return -EINVAL;
@@ -741,7 +741,7 @@ static void le_rpa_timeout_submit(void)
 }
 
 /* this function sets new RPA only if current one is no longer valid */
-static int le_set_private_addr(u8_t id)
+static int le_set_private_addr(uint8_t id)
 {
 	bt_addr_t rpa;
 	int err;
@@ -810,7 +810,7 @@ static int le_adv_set_private_addr(struct bt_le_ext_adv *adv)
 	return err;
 }
 #else
-static int le_set_private_addr(u8_t id)
+static int le_set_private_addr(uint8_t id)
 {
 	bt_addr_t nrpa;
 	int err;
@@ -864,7 +864,7 @@ static void le_update_private_addr(void)
 {
 	struct bt_le_ext_adv *adv;
 	bool adv_enabled = false;
-	u8_t id = BT_ID_DEFAULT;
+	uint8_t id = BT_ID_DEFAULT;
 	int err;
 
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV) &&
@@ -927,7 +927,7 @@ static void le_update_private_addr(void)
 }
 
 struct adv_id_check_data {
-	u8_t id;
+	uint8_t id;
 	bool adv_enabled;
 };
 
@@ -1140,7 +1140,7 @@ static bool bt_le_adv_random_addr_check(const struct bt_le_adv_param *param)
 
 
 #if defined(CONFIG_BT_OBSERVER)
-static int set_le_ext_scan_enable(u8_t enable, u16_t duration)
+static int set_le_ext_scan_enable(uint8_t enable, uint16_t duration)
 {
 	struct bt_hci_cp_le_set_ext_scan_enable *cp;
 	struct cmd_state_set state;
@@ -1177,7 +1177,7 @@ static int set_le_ext_scan_enable(u8_t enable, u16_t duration)
 	return 0;
 }
 
-static int set_le_scan_enable_legacy(u8_t enable)
+static int set_le_scan_enable_legacy(uint8_t enable)
 {
 	struct bt_hci_cp_le_set_scan_enable *cp;
 	struct cmd_state_set state;
@@ -1212,7 +1212,7 @@ static int set_le_scan_enable_legacy(u8_t enable)
 	return 0;
 }
 
-static int set_le_scan_enable(u8_t enable)
+static int set_le_scan_enable(uint8_t enable)
 {
 	if (IS_ENABLED(CONFIG_BT_EXT_ADV) &&
 	    BT_FEAT_LE_EXT_ADV(bt_dev.le.features)) {
@@ -1236,7 +1236,7 @@ static inline bool rpa_is_new(void)
 #endif
 }
 
-static int hci_le_read_max_data_len(u16_t *tx_octets, u16_t *tx_time)
+static int hci_le_read_max_data_len(uint16_t *tx_octets, uint16_t *tx_time)
 {
 	struct bt_hci_rp_le_read_max_data_len *rp;
 	struct net_buf *rsp;
@@ -1258,7 +1258,7 @@ static int hci_le_read_max_data_len(u16_t *tx_octets, u16_t *tx_time)
 
 #if (defined(CONFIG_BT_OBSERVER) && defined(CONFIG_BT_EXT_ADV)) \
 	|| defined(CONFIG_BT_USER_PHY_UPDATE)
-static u8_t get_phy(u8_t hci_phy)
+static uint8_t get_phy(uint8_t hci_phy)
 {
 	switch (hci_phy) {
 	case BT_HCI_LE_PHY_1M:
@@ -1277,9 +1277,9 @@ static u8_t get_phy(u8_t hci_phy)
 static void hci_acl(struct net_buf *buf)
 {
 	struct bt_hci_acl_hdr *hdr;
-	u16_t handle, len;
+	uint16_t handle, len;
 	struct bt_conn *conn;
-	u8_t flags;
+	uint8_t flags;
 
 	BT_DBG("buf %p", buf);
 
@@ -1329,7 +1329,7 @@ static void hci_num_completed_packets(struct net_buf *buf)
 	BT_DBG("num_handles %u", evt->num_handles);
 
 	for (i = 0; i < evt->num_handles; i++) {
-		u16_t handle, count;
+		uint16_t handle, count;
 		struct bt_conn *conn;
 		unsigned int key;
 
@@ -1398,7 +1398,7 @@ static inline bool rpa_timeout_valid_check(void)
 }
 
 #if defined(CONFIG_BT_CENTRAL)
-static int le_create_conn_set_random_addr(bool use_filter, u8_t *own_addr_type)
+static int le_create_conn_set_random_addr(bool use_filter, uint8_t *own_addr_type)
 {
 	int err;
 
@@ -1460,8 +1460,8 @@ int bt_le_create_conn_ext(const struct bt_conn *conn)
 	struct cmd_state_set state;
 	bool use_filter = false;
 	struct net_buf *buf;
-	u8_t own_addr_type;
-	u8_t num_phys;
+	uint8_t own_addr_type;
+	uint8_t num_phys;
 	int err;
 
 	if (IS_ENABLED(CONFIG_BT_WHITELIST)) {
@@ -1540,7 +1540,7 @@ int bt_le_create_conn_legacy(const struct bt_conn *conn)
 	struct cmd_state_set state;
 	bool use_filter = false;
 	struct net_buf *buf;
-	u8_t own_addr_type;
+	uint8_t own_addr_type;
 	int err;
 
 	if (IS_ENABLED(CONFIG_BT_WHITELIST)) {
@@ -1617,7 +1617,7 @@ int bt_le_create_conn_cancel(void)
 }
 #endif /* CONFIG_BT_CENTRAL */
 
-int bt_hci_disconnect(u16_t handle, u8_t reason)
+int bt_hci_disconnect(uint16_t handle, uint8_t reason)
 {
 	struct net_buf *buf;
 	struct bt_hci_cp_disconnect *disconn;
@@ -1637,7 +1637,7 @@ int bt_hci_disconnect(u16_t handle, u8_t reason)
 static void hci_disconn_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_disconn_complete *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	BT_DBG("status 0x%02x handle %u reason 0x%02x", evt->status, handle,
@@ -1740,7 +1740,7 @@ static int hci_read_remote_version(struct bt_conn *conn)
 /* LE Data Length Change Event is optional so this function just ignore
  * error and stack will continue to use default values.
  */
-int bt_le_set_data_len(struct bt_conn *conn, u16_t tx_octets, u16_t tx_time)
+int bt_le_set_data_len(struct bt_conn *conn, uint16_t tx_octets, uint16_t tx_time)
 {
 	struct bt_hci_cp_le_set_data_len *cp;
 	struct net_buf *buf;
@@ -1788,7 +1788,7 @@ static int hci_le_read_phy(struct bt_conn *conn)
 }
 #endif /* defined(CONFIG_BT_USER_PHY_UPDATE) */
 
-int bt_le_set_phy(struct bt_conn *conn, u8_t pref_tx_phy, u8_t pref_rx_phy)
+int bt_le_set_phy(struct bt_conn *conn, uint8_t pref_tx_phy, uint8_t pref_rx_phy)
 {
 	struct bt_hci_cp_le_set_phy *cp;
 	struct net_buf *buf;
@@ -1843,7 +1843,7 @@ static void pending_id_update(struct bt_keys *keys, void *data)
 	}
 }
 
-static void pending_id_keys_update_set(struct bt_keys *keys, u8_t flag)
+static void pending_id_keys_update_set(struct bt_keys *keys, uint8_t flag)
 {
 	atomic_set_bit(bt_dev.flags, BT_DEV_ID_PENDING);
 	keys->state |= flag;
@@ -1862,7 +1862,7 @@ static void pending_id_keys_update(void)
 }
 #endif /* defined(CONFIG_BT_SMP) */
 
-static struct bt_conn *find_pending_connect(u8_t role, bt_addr_le_t *peer_addr)
+static struct bt_conn *find_pending_connect(uint8_t role, bt_addr_le_t *peer_addr)
 {
 	struct bt_conn *conn;
 
@@ -1942,7 +1942,7 @@ static void conn_auto_initiate(struct bt_conn *conn)
 
 	if (IS_ENABLED(CONFIG_BT_AUTO_DATA_LEN_UPDATE) &&
 	    BT_FEAT_LE_DLE(bt_dev.le.features)) {
-		u16_t tx_octets, tx_time;
+		uint16_t tx_octets, tx_time;
 
 		err = hci_le_read_max_data_len(&tx_octets, &tx_time);
 		if (!err) {
@@ -2032,7 +2032,7 @@ static void le_conn_complete_adv_timeout(void)
 
 static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
 {
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	bt_addr_le_t peer_addr, id_addr;
 	struct bt_conn *conn;
 
@@ -2073,7 +2073,7 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
 		bt_addr_copy(&peer_addr.a, &evt->peer_rpa);
 		peer_addr.type = BT_ADDR_LE_RANDOM;
 	} else {
-		u8_t id = evt->role == BT_HCI_ROLE_SLAVE ? bt_dev.adv_conn_id :
+		uint8_t id = evt->role == BT_HCI_ROLE_SLAVE ? bt_dev.adv_conn_id :
 							   BT_ID_DEFAULT;
 
 		bt_addr_le_copy(&id_addr,
@@ -2272,7 +2272,7 @@ static void le_legacy_conn_complete(struct net_buf *buf)
 static void le_remote_feat_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_remote_feat_complete *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	conn = bt_conn_lookup_handle(handle);
@@ -2303,11 +2303,11 @@ static void le_remote_feat_complete(struct net_buf *buf)
 static void le_data_len_change(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_data_len_change *evt = (void *)buf->data;
-	u16_t max_tx_octets = sys_le16_to_cpu(evt->max_tx_octets);
-	u16_t max_rx_octets = sys_le16_to_cpu(evt->max_rx_octets);
-	u16_t max_tx_time = sys_le16_to_cpu(evt->max_tx_time);
-	u16_t max_rx_time = sys_le16_to_cpu(evt->max_rx_time);
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t max_tx_octets = sys_le16_to_cpu(evt->max_tx_octets);
+	uint16_t max_rx_octets = sys_le16_to_cpu(evt->max_rx_octets);
+	uint16_t max_tx_time = sys_le16_to_cpu(evt->max_tx_time);
+	uint16_t max_rx_time = sys_le16_to_cpu(evt->max_rx_time);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	conn = bt_conn_lookup_handle(handle);
@@ -2339,7 +2339,7 @@ static void le_data_len_change(struct net_buf *buf)
 static void le_phy_update_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_phy_update_complete *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	conn = bt_conn_lookup_handle(handle);
@@ -2391,7 +2391,7 @@ bool bt_le_conn_params_valid(const struct bt_le_conn_param *param)
 	return true;
 }
 
-static void le_conn_param_neg_reply(u16_t handle, u8_t reason)
+static void le_conn_param_neg_reply(uint16_t handle, uint8_t reason)
 {
 	struct bt_hci_cp_le_conn_param_req_neg_reply *cp;
 	struct net_buf *buf;
@@ -2410,7 +2410,7 @@ static void le_conn_param_neg_reply(u16_t handle, u8_t reason)
 	bt_hci_cmd_send(BT_HCI_OP_LE_CONN_PARAM_REQ_NEG_REPLY, buf);
 }
 
-static int le_conn_param_req_reply(u16_t handle,
+static int le_conn_param_req_reply(uint16_t handle,
 				   const struct bt_le_conn_param *param)
 {
 	struct bt_hci_cp_le_conn_param_req_reply *cp;
@@ -2438,7 +2438,7 @@ static void le_conn_param_req(struct net_buf *buf)
 	struct bt_hci_evt_le_conn_param_req *evt = (void *)buf->data;
 	struct bt_le_conn_param param;
 	struct bt_conn *conn;
-	u16_t handle;
+	uint16_t handle;
 
 	handle = sys_le16_to_cpu(evt->handle);
 	param.interval_min = sys_le16_to_cpu(evt->interval_min);
@@ -2466,7 +2466,7 @@ static void le_conn_update_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_conn_update_complete *evt = (void *)buf->data;
 	struct bt_conn *conn;
-	u16_t handle;
+	uint16_t handle;
 
 	handle = sys_le16_to_cpu(evt->handle);
 
@@ -2503,7 +2503,7 @@ static void le_conn_update_complete(struct net_buf *buf)
 
 #if defined(CONFIG_BT_CENTRAL)
 static void check_pending_conn(const bt_addr_le_t *id_addr,
-			       const bt_addr_le_t *addr, u8_t adv_props)
+			       const bt_addr_le_t *addr, uint8_t adv_props)
 {
 	struct bt_conn *conn;
 
@@ -2585,7 +2585,7 @@ static int set_flow_control(void)
 }
 #endif /* CONFIG_BT_HCI_ACL_FLOW_CONTROL */
 
-static void unpair(u8_t id, const bt_addr_le_t *addr)
+static void unpair(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct bt_keys *keys = NULL;
 	struct bt_conn *conn = bt_conn_lookup_addr_le(id, addr);
@@ -2625,12 +2625,12 @@ static void unpair(u8_t id, const bt_addr_le_t *addr)
 
 static void unpair_remote(const struct bt_bond_info *info, void *data)
 {
-	u8_t *id = (u8_t *) data;
+	uint8_t *id = (uint8_t *) data;
 
 	unpair(*id, &info->addr);
 }
 
-int bt_unpair(u8_t id, const bt_addr_le_t *addr)
+int bt_unpair(uint8_t id, const bt_addr_le_t *addr)
 {
 	if (id >= CONFIG_BT_ID_MAX) {
 		return -EINVAL;
@@ -2649,7 +2649,7 @@ int bt_unpair(u8_t id, const bt_addr_le_t *addr)
 #endif /* CONFIG_BT_CONN */
 
 #if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR)
-static enum bt_security_err security_err_get(u8_t hci_err)
+static enum bt_security_err security_err_get(uint8_t hci_err)
 {
 	switch (hci_err) {
 	case BT_HCI_ERR_SUCCESS:
@@ -2685,7 +2685,7 @@ static void reset_pairing(struct bt_conn *conn)
 #endif /* defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) */
 
 #if defined(CONFIG_BT_BREDR)
-static int reject_conn(const bt_addr_t *bdaddr, u8_t reason)
+static int reject_conn(const bt_addr_t *bdaddr, uint8_t reason)
 {
 	struct bt_hci_cp_reject_conn_req *cp;
 	struct net_buf *buf;
@@ -2812,7 +2812,7 @@ static bool br_sufficient_key_size(struct bt_conn *conn)
 	struct bt_hci_cp_read_encryption_key_size *cp;
 	struct bt_hci_rp_read_encryption_key_size *rp;
 	struct net_buf *buf, *rsp;
-	u8_t key_size;
+	uint8_t key_size;
 	int err;
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_READ_ENCRYPTION_KEY_SIZE,
@@ -2892,7 +2892,7 @@ static void synchronous_conn_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_sync_conn_complete *evt = (void *)buf->data;
 	struct bt_conn *sco_conn;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 
 	BT_DBG("status 0x%02x, handle %u, type 0x%02x", evt->status, handle,
 	       evt->link_type);
@@ -2920,7 +2920,7 @@ static void conn_complete(struct net_buf *buf)
 	struct bt_hci_evt_conn_complete *evt = (void *)buf->data;
 	struct bt_conn *conn;
 	struct bt_hci_cp_read_remote_features *cp;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 
 	BT_DBG("status 0x%02x, handle %u, type 0x%02x", evt->status, handle,
 	       evt->link_type);
@@ -3067,7 +3067,7 @@ static void link_key_neg_reply(const bt_addr_t *bdaddr)
 	bt_hci_cmd_send_sync(BT_HCI_OP_LINK_KEY_NEG_REPLY, buf, NULL);
 }
 
-static void link_key_reply(const bt_addr_t *bdaddr, const u8_t *lk)
+static void link_key_reply(const bt_addr_t *bdaddr, const uint8_t *lk)
 {
 	struct bt_hci_cp_link_key_reply *cp;
 	struct net_buf *buf;
@@ -3125,7 +3125,7 @@ static void link_key_req(struct net_buf *buf)
 	bt_conn_unref(conn);
 }
 
-static void io_capa_neg_reply(const bt_addr_t *bdaddr, const u8_t reason)
+static void io_capa_neg_reply(const bt_addr_t *bdaddr, const uint8_t reason)
 {
 	struct bt_hci_cp_io_capability_neg_reply *cp;
 	struct net_buf *resp_buf;
@@ -3183,7 +3183,7 @@ static void io_capa_req(struct net_buf *buf)
 	struct net_buf *resp_buf;
 	struct bt_conn *conn;
 	struct bt_hci_cp_io_capability_reply *cp;
-	u8_t auth;
+	uint8_t auth;
 
 	BT_DBG("");
 
@@ -3295,12 +3295,12 @@ static void user_passkey_req(struct net_buf *buf)
 }
 
 struct discovery_priv {
-	u16_t clock_offset;
-	u8_t pscan_rep_mode;
-	u8_t resolving;
+	uint16_t clock_offset;
+	uint8_t pscan_rep_mode;
+	uint8_t resolving;
 } __packed;
 
-static int request_name(const bt_addr_t *addr, u8_t pscan, u16_t offset)
+static int request_name(const bt_addr_t *addr, uint8_t pscan, uint16_t offset)
 {
 	struct bt_hci_cp_remote_name_request *cp;
 	struct net_buf *buf;
@@ -3323,7 +3323,7 @@ static int request_name(const bt_addr_t *addr, u8_t pscan, u16_t offset)
 #define EIR_SHORT_NAME		0x08
 #define EIR_COMPLETE_NAME	0x09
 
-static bool eir_has_name(const u8_t *eir)
+static bool eir_has_name(const uint8_t *eir)
 {
 	int len = 240;
 
@@ -3410,7 +3410,7 @@ static void inquiry_complete(struct net_buf *buf)
 }
 
 static struct bt_br_discovery_result *get_result_slot(const bt_addr_t *addr,
-						      s8_t rssi)
+						      int8_t rssi)
 {
 	struct bt_br_discovery_result *result = NULL;
 	size_t i;
@@ -3460,7 +3460,7 @@ static struct bt_br_discovery_result *get_result_slot(const bt_addr_t *addr,
 
 static void inquiry_result_with_rssi(struct net_buf *buf)
 {
-	u8_t num_reports = net_buf_pull_u8(buf);
+	uint8_t num_reports = net_buf_pull_u8(buf);
 
 	if (!atomic_test_bit(bt_dev.flags, BT_DEV_INQUIRY)) {
 		return;
@@ -3530,7 +3530,7 @@ static void remote_name_request_complete(struct net_buf *buf)
 	struct bt_br_discovery_result *result;
 	struct discovery_priv *priv;
 	int eir_len = 240;
-	u8_t *eir;
+	uint8_t *eir;
 	int i;
 
 	result = get_result_slot(&evt->bdaddr, 0xff);
@@ -3607,7 +3607,7 @@ check_names:
 	discovery_results_count = 0;
 }
 
-static void link_encr(const u16_t handle)
+static void link_encr(const uint16_t handle)
 {
 	struct bt_hci_cp_set_conn_encrypt *encr;
 	struct net_buf *buf;
@@ -3631,7 +3631,7 @@ static void auth_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_auth_complete *evt = (void *)buf->data;
 	struct bt_conn *conn;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 
 	BT_DBG("status 0x%02x, handle %u", evt->status, handle);
 
@@ -3660,7 +3660,7 @@ static void auth_complete(struct net_buf *buf)
 static void read_remote_features_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_remote_features *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_hci_cp_read_remote_ext_features *cp;
 	struct bt_conn *conn;
 
@@ -3702,7 +3702,7 @@ done:
 static void read_remote_ext_features_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_remote_ext_features *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	BT_DBG("status 0x%02x handle %u", evt->status, handle);
@@ -3750,7 +3750,7 @@ static void role_change(struct net_buf *buf)
 #endif /* CONFIG_BT_BREDR */
 
 #if defined(CONFIG_BT_SMP)
-static int le_set_privacy_mode(const bt_addr_le_t *addr, u8_t mode)
+static int le_set_privacy_mode(const bt_addr_le_t *addr, uint8_t mode)
 {
 	struct bt_hci_cp_le_set_privacy_mode cp;
 	struct net_buf *buf;
@@ -3782,7 +3782,7 @@ static int le_set_privacy_mode(const bt_addr_le_t *addr, u8_t mode)
 	return 0;
 }
 
-static int addr_res_enable(u8_t enable)
+static int addr_res_enable(uint8_t enable)
 {
 	struct net_buf *buf;
 
@@ -3799,7 +3799,7 @@ static int addr_res_enable(u8_t enable)
 				    buf, NULL);
 }
 
-static int hci_id_add(u8_t id, const bt_addr_le_t *addr, u8_t peer_irk[16])
+static int hci_id_add(uint8_t id, const bt_addr_le_t *addr, uint8_t peer_irk[16])
 {
 	struct bt_hci_cp_le_add_dev_to_rl *cp;
 	struct net_buf *buf;
@@ -4082,7 +4082,7 @@ static void update_sec_level(struct bt_conn *conn)
 static void hci_encrypt_change(struct net_buf *buf)
 {
 	struct bt_hci_evt_encrypt_change *evt = (void *)buf->data;
-	u16_t handle = sys_le16_to_cpu(evt->handle);
+	uint16_t handle = sys_le16_to_cpu(evt->handle);
 	struct bt_conn *conn;
 
 	BT_DBG("status 0x%02x handle %u encrypt 0x%02x", evt->status, handle,
@@ -4151,7 +4151,7 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_encrypt_key_refresh_complete *evt = (void *)buf->data;
 	struct bt_conn *conn;
-	u16_t handle;
+	uint16_t handle;
 
 	handle = sys_le16_to_cpu(evt->handle);
 
@@ -4233,7 +4233,7 @@ static void bt_hci_evt_read_remote_version_complete(struct net_buf *buf)
 #endif /* CONFIG_BT_REMOTE_VERSION */
 
 #if defined(CONFIG_BT_SMP)
-static void le_ltk_neg_reply(u16_t handle)
+static void le_ltk_neg_reply(uint16_t handle)
 {
 	struct bt_hci_cp_le_ltk_req_neg_reply *cp;
 	struct net_buf *buf;
@@ -4251,7 +4251,7 @@ static void le_ltk_neg_reply(u16_t handle)
 	bt_hci_cmd_send(BT_HCI_OP_LE_LTK_REQ_NEG_REPLY, buf);
 }
 
-static void le_ltk_reply(u16_t handle, u8_t *ltk)
+static void le_ltk_reply(uint16_t handle, uint8_t *ltk)
 {
 	struct bt_hci_cp_le_ltk_req_reply *cp;
 	struct net_buf *buf;
@@ -4274,8 +4274,8 @@ static void le_ltk_request(struct net_buf *buf)
 {
 	struct bt_hci_evt_le_ltk_request *evt = (void *)buf->data;
 	struct bt_conn *conn;
-	u16_t handle;
-	u8_t ltk[16];
+	uint16_t handle;
+	uint8_t ltk[16];
 
 	handle = sys_le16_to_cpu(evt->handle);
 
@@ -4334,7 +4334,7 @@ static void le_dhkey_complete(struct net_buf *buf)
 
 static void hci_reset_complete(struct net_buf *buf)
 {
-	u8_t status = buf->data[0];
+	uint8_t status = buf->data[0];
 	atomic_t flags;
 
 	BT_DBG("status 0x%02x", status);
@@ -4355,7 +4355,7 @@ static void hci_reset_complete(struct net_buf *buf)
 	atomic_set(bt_dev.flags, flags);
 }
 
-static void hci_cmd_done(u16_t opcode, u8_t status, struct net_buf *buf)
+static void hci_cmd_done(uint16_t opcode, uint8_t status, struct net_buf *buf)
 {
 	BT_DBG("opcode 0x%04x status 0x%02x buf %p", opcode, status, buf);
 
@@ -4387,8 +4387,8 @@ static void hci_cmd_done(u16_t opcode, u8_t status, struct net_buf *buf)
 static void hci_cmd_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_cmd_complete *evt;
-	u8_t status, ncmd;
-	u16_t opcode;
+	uint8_t status, ncmd;
+	uint16_t opcode;
 
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	ncmd = evt->ncmd;
@@ -4412,8 +4412,8 @@ static void hci_cmd_complete(struct net_buf *buf)
 static void hci_cmd_status(struct net_buf *buf)
 {
 	struct bt_hci_evt_cmd_status *evt;
-	u16_t opcode;
-	u8_t ncmd;
+	uint16_t opcode;
+	uint8_t ncmd;
 
 	evt = net_buf_pull_mem(buf, sizeof(*evt));
 	opcode = sys_le16_to_cpu(evt->opcode);
@@ -4430,7 +4430,7 @@ static void hci_cmd_status(struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_OBSERVER)
-static int le_scan_set_random_addr(bool active_scan, u8_t *own_addr_type)
+static int le_scan_set_random_addr(bool active_scan, uint8_t *own_addr_type)
 {
 	int err;
 
@@ -4483,11 +4483,11 @@ static int le_scan_set_random_addr(bool active_scan, u8_t *own_addr_type)
 
 static int start_le_scan_ext(struct bt_hci_ext_scan_phy *phy_1m,
 			     struct bt_hci_ext_scan_phy *phy_coded,
-			     u16_t duration)
+			     uint16_t duration)
 {
 	struct bt_hci_cp_le_set_ext_scan_param *set_param;
 	struct net_buf *buf;
-	u8_t own_addr_type;
+	uint8_t own_addr_type;
 	bool active_scan;
 	int err;
 
@@ -4554,7 +4554,7 @@ static int start_le_scan_ext(struct bt_hci_ext_scan_phy *phy_1m,
 	return 0;
 }
 
-static int start_le_scan_legacy(u8_t scan_type, u16_t interval, u16_t window)
+static int start_le_scan_legacy(uint8_t scan_type, uint16_t interval, uint16_t window)
 {
 	struct bt_hci_cp_le_set_scan_param set_param;
 	struct net_buf *buf;
@@ -4608,7 +4608,7 @@ static int start_le_scan_legacy(u8_t scan_type, u16_t interval, u16_t window)
 
 static int start_passive_scan(bool fast_scan)
 {
-	u16_t interval, window;
+	uint16_t interval, window;
 
 	if (fast_scan) {
 		interval = BT_GAP_SCAN_FAST_INTERVAL;
@@ -4680,7 +4680,7 @@ void bt_data_parse(struct net_buf_simple *ad,
 {
 	while (ad->len > 1) {
 		struct bt_data data;
-		u8_t len;
+		uint8_t len;
 
 		len = net_buf_simple_pull_u8(ad);
 		if (len == 0U) {
@@ -4706,7 +4706,7 @@ void bt_data_parse(struct net_buf_simple *ad,
 }
 
 /* Convert Legacy adv report evt_type field to adv props */
-static u8_t get_adv_props(u8_t evt_type)
+static uint8_t get_adv_props(uint8_t evt_type)
 {
 	switch (evt_type) {
 	case BT_GAP_ADV_TYPE_ADV_IND:
@@ -4737,7 +4737,7 @@ static u8_t get_adv_props(u8_t evt_type)
 }
 
 static void le_adv_recv(bt_addr_le_t *addr, struct bt_le_scan_recv_info *info,
-			struct net_buf *buf, u8_t len)
+			struct net_buf *buf, uint8_t len)
 {
 	struct bt_le_scan_cb *listener;
 	struct net_buf_simple_state state;
@@ -4813,7 +4813,7 @@ static void le_scan_timeout(struct net_buf *buf)
 }
 
 /* Convert Extended adv report evt_type field into adv type */
-static u8_t get_adv_type(u8_t evt_type)
+static uint8_t get_adv_type(uint8_t evt_type)
 {
 	switch (evt_type) {
 	case (BT_HCI_LE_ADV_EVT_TYPE_CONN |
@@ -4851,7 +4851,7 @@ static u8_t get_adv_type(u8_t evt_type)
 
 static void le_adv_ext_report(struct net_buf *buf)
 {
-	u8_t num_reports = net_buf_pull_u8(buf);
+	uint8_t num_reports = net_buf_pull_u8(buf);
 
 	BT_DBG("Adv number of reports %u",  num_reports);
 
@@ -4885,7 +4885,7 @@ static void le_adv_ext_report(struct net_buf *buf)
 
 static void le_adv_report(struct net_buf *buf)
 {
-	u8_t num_reports = net_buf_pull_u8(buf);
+	uint8_t num_reports = net_buf_pull_u8(buf);
 	struct bt_hci_evt_le_advertising_info *evt;
 
 	BT_DBG("Adv number of reports %u",  num_reports);
@@ -4916,7 +4916,7 @@ static void le_adv_report(struct net_buf *buf)
 }
 #endif /* CONFIG_BT_OBSERVER */
 
-static void le_adv_stop_free_conn(const struct bt_le_ext_adv *adv, u8_t status)
+static void le_adv_stop_free_conn(const struct bt_le_ext_adv *adv, uint8_t status)
 {
 	struct bt_conn *conn;
 
@@ -5052,7 +5052,7 @@ static void le_scan_req_received(struct net_buf *buf)
 #endif /* defined(CONFIG_BT_BROADCASTER) */
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 
-int bt_hci_get_conn_handle(const struct bt_conn *conn, u16_t *conn_handle)
+int bt_hci_get_conn_handle(const struct bt_conn *conn, uint16_t *conn_handle)
 {
 	if (conn->state != BT_CONN_CONNECTED) {
 		return -ENOTCONN;
@@ -5383,7 +5383,7 @@ static void read_le_features_complete(struct net_buf *buf)
 static void read_buffer_size_complete(struct net_buf *buf)
 {
 	struct bt_hci_rp_read_buffer_size *rp = (void *)buf->data;
-	u16_t pkts;
+	uint16_t pkts;
 
 	BT_DBG("status 0x%02x", rp->status);
 
@@ -5398,7 +5398,7 @@ static void read_buffer_size_complete(struct net_buf *buf)
 static void read_buffer_size_complete(struct net_buf *buf)
 {
 	struct bt_hci_rp_read_buffer_size *rp = (void *)buf->data;
-	u16_t pkts;
+	uint16_t pkts;
 
 	BT_DBG("status 0x%02x", rp->status);
 
@@ -5547,7 +5547,7 @@ static int le_set_event_mask(void)
 {
 	struct bt_hci_cp_le_set_event_mask *cp_mask;
 	struct net_buf *buf;
-	u64_t mask = 0U;
+	uint64_t mask = 0U;
 
 	/* Set LE event mask */
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_EVENT_MASK, sizeof(*cp_mask));
@@ -5689,7 +5689,7 @@ static int le_init(void)
 	    IS_ENABLED(CONFIG_BT_DATA_LEN_UPDATE) &&
 	    BT_FEAT_LE_DLE(bt_dev.le.features)) {
 		struct bt_hci_cp_le_write_default_data_len *cp;
-		u16_t tx_octets, tx_time;
+		uint16_t tx_octets, tx_time;
 
 		err = hci_le_read_max_data_len(&tx_octets, &tx_time);
 		if (err) {
@@ -5896,7 +5896,7 @@ static int br_init(void)
 	}
 
 	/* Set page timeout*/
-	buf = bt_hci_cmd_create(BT_HCI_OP_WRITE_PAGE_TIMEOUT, sizeof(u16_t));
+	buf = bt_hci_cmd_create(BT_HCI_OP_WRITE_PAGE_TIMEOUT, sizeof(uint16_t));
 	if (!buf) {
 		return -ENOBUFS;
 	}
@@ -5959,7 +5959,7 @@ static int set_event_mask(void)
 {
 	struct bt_hci_cp_set_event_mask *ev;
 	struct net_buf *buf;
-	u64_t mask = 0U;
+	uint64_t mask = 0U;
 
 	buf = bt_hci_cmd_create(BT_HCI_OP_SET_EVENT_MASK, sizeof(*ev));
 	if (!buf) {
@@ -6048,7 +6048,7 @@ int bt_addr_le_create_static(bt_addr_le_t *addr)
 	return 0;
 }
 
-static u8_t bt_read_public_addr(bt_addr_le_t *addr)
+static uint8_t bt_read_public_addr(bt_addr_le_t *addr)
 {
 	struct bt_hci_rp_read_bd_addr *rp;
 	struct net_buf *rsp;
@@ -6078,7 +6078,7 @@ static u8_t bt_read_public_addr(bt_addr_le_t *addr)
 }
 
 #if defined(CONFIG_BT_DEBUG)
-static const char *ver_str(u8_t ver)
+static const char *ver_str(uint8_t ver)
 {
 	const char * const str[] = {
 		"1.0b", "1.1", "1.2", "2.0", "2.1", "3.0", "4.0", "4.1", "4.2",
@@ -6119,7 +6119,7 @@ static inline void bt_dev_show_info(void)
 
 #if defined(CONFIG_BT_HCI_VS_EXT)
 #if defined(CONFIG_BT_DEBUG)
-static const char *vs_hw_platform(u16_t platform)
+static const char *vs_hw_platform(uint16_t platform)
 {
 	static const char * const plat_str[] = {
 		"reserved", "Intel Corporation", "Nordic Semiconductor",
@@ -6132,7 +6132,7 @@ static const char *vs_hw_platform(u16_t platform)
 	return "unknown";
 }
 
-static const char *vs_hw_variant(u16_t platform, u16_t variant)
+static const char *vs_hw_variant(uint16_t platform, uint16_t variant)
 {
 	static const char * const nordic_str[] = {
 		"reserved", "nRF51x", "nRF52x", "nRF53x"
@@ -6149,7 +6149,7 @@ static const char *vs_hw_variant(u16_t platform, u16_t variant)
 	return "unknown";
 }
 
-static const char *vs_fw_variant(u8_t variant)
+static const char *vs_fw_variant(uint8_t variant)
 {
 	static const char * const var_str[] = {
 		"Standard Bluetooth controller",
@@ -6580,17 +6580,17 @@ struct bt_ad {
 	size_t len;
 };
 
-static int set_data_add(u8_t *set_data, u8_t set_data_len_max,
-			const struct bt_ad *ad, size_t ad_len, u8_t *data_len)
+static int set_data_add(uint8_t *set_data, uint8_t set_data_len_max,
+			const struct bt_ad *ad, size_t ad_len, uint8_t *data_len)
 {
-	u8_t set_data_len = 0;
+	uint8_t set_data_len = 0;
 
 	for (size_t i = 0; i < ad_len; i++) {
 		const struct bt_data *data = ad[i].data;
 
 		for (size_t j = 0; j < ad[i].len; j++) {
 			size_t len = data[j].data_len;
-			u8_t type = data[j].type;
+			uint8_t type = data[j].type;
 
 			/* Check if ad fit in the remaining buffer */
 			if ((set_data_len + len + 2) > set_data_len_max) {
@@ -6616,7 +6616,7 @@ static int set_data_add(u8_t *set_data, u8_t set_data_len_max,
 	return 0;
 }
 
-static int hci_set_ad(u16_t hci_op, const struct bt_ad *ad, size_t ad_len)
+static int hci_set_ad(uint16_t hci_op, const struct bt_ad *ad, size_t ad_len)
 {
 	struct bt_hci_cp_le_set_adv_data *set_data;
 	struct net_buf *buf;
@@ -6641,7 +6641,7 @@ static int hci_set_ad(u16_t hci_op, const struct bt_ad *ad, size_t ad_len)
 }
 
 /* Set legacy data using Extended Advertising HCI commands */
-static int hci_set_ad_ext(struct bt_le_ext_adv *adv, u16_t hci_op,
+static int hci_set_ad_ext(struct bt_le_ext_adv *adv, uint16_t hci_op,
 			  const struct bt_ad *ad, size_t ad_len)
 {
 	struct bt_hci_cp_le_set_ext_adv_data *set_data;
@@ -6766,7 +6766,7 @@ void bt_id_get(bt_addr_le_t *addrs, size_t *count)
 
 static int id_find(const bt_addr_le_t *addr)
 {
-	u8_t id;
+	uint8_t id;
 
 	for (id = 0U; id < bt_dev.id_count; id++) {
 		if (!bt_addr_le_cmp(addr, &bt_dev.id_addr[id])) {
@@ -6777,7 +6777,7 @@ static int id_find(const bt_addr_le_t *addr)
 	return -ENOENT;
 }
 
-static void id_create(u8_t id, bt_addr_le_t *addr, u8_t *irk)
+static void id_create(uint8_t id, bt_addr_le_t *addr, uint8_t *irk)
 {
 	if (addr && bt_addr_le_cmp(addr, BT_ADDR_LE_ANY)) {
 		bt_addr_le_copy(&bt_dev.id_addr[id], addr);
@@ -6798,7 +6798,7 @@ static void id_create(u8_t id, bt_addr_le_t *addr, u8_t *irk)
 
 #if defined(CONFIG_BT_PRIVACY)
 	{
-		u8_t zero_irk[16] = { 0 };
+		uint8_t zero_irk[16] = { 0 };
 
 		if (irk && memcmp(irk, zero_irk, 16)) {
 			memcpy(&bt_dev.irk[id], irk, 16);
@@ -6820,7 +6820,7 @@ static void id_create(u8_t id, bt_addr_le_t *addr, u8_t *irk)
 	}
 }
 
-int bt_id_create(bt_addr_le_t *addr, u8_t *irk)
+int bt_id_create(bt_addr_le_t *addr, uint8_t *irk)
 {
 	int new_id;
 
@@ -6850,7 +6850,7 @@ int bt_id_create(bt_addr_le_t *addr, u8_t *irk)
 	return new_id;
 }
 
-int bt_id_reset(u8_t id, bt_addr_le_t *addr, u8_t *irk)
+int bt_id_reset(uint8_t id, bt_addr_le_t *addr, uint8_t *irk)
 {
 	struct adv_id_check_data check_data = {
 		.id = id,
@@ -6897,7 +6897,7 @@ int bt_id_reset(u8_t id, bt_addr_le_t *addr, u8_t *irk)
 	return id;
 }
 
-int bt_id_delete(u8_t id)
+int bt_id_delete(uint8_t id)
 {
 	struct adv_id_check_data check_data = {
 		.id = id,
@@ -6944,7 +6944,7 @@ int bt_id_delete(u8_t id)
 }
 
 #if defined(CONFIG_BT_PRIVACY)
-static void bt_read_identity_root(u8_t *ir)
+static void bt_read_identity_root(uint8_t *ir)
 {
 	/* Invalid IR */
 	memset(ir, 0, 16);
@@ -6983,7 +6983,7 @@ static void bt_read_identity_root(u8_t *ir)
 void bt_setup_public_id_addr(void)
 {
 	bt_addr_le_t addr;
-	u8_t *irk = NULL;
+	uint8_t *irk = NULL;
 
 	bt_dev.id_count = bt_read_public_addr(&addr);
 
@@ -6992,8 +6992,8 @@ void bt_setup_public_id_addr(void)
 	}
 
 #if defined(CONFIG_BT_PRIVACY)
-	u8_t ir_irk[16];
-	u8_t ir[16];
+	uint8_t ir_irk[16];
+	uint8_t ir[16];
 
 	bt_read_identity_root(ir);
 
@@ -7008,12 +7008,12 @@ void bt_setup_public_id_addr(void)
 }
 
 #if defined(CONFIG_BT_HCI_VS_EXT)
-u8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], u8_t size)
+uint8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], uint8_t size)
 {
 	struct bt_hci_rp_vs_read_static_addrs *rp;
 	struct net_buf *rsp;
 	int err, i;
-	u8_t cnt;
+	uint8_t cnt;
 
 	if (!BT_VS_CMD_READ_STATIC_ADDRS(bt_dev.vs_commands)) {
 		BT_WARN("Read Static Addresses command not available");
@@ -7070,11 +7070,11 @@ int bt_setup_random_id_addr(void)
 		bt_dev.id_count = bt_read_static_addr(addrs, CONFIG_BT_ID_MAX);
 
 		if (bt_dev.id_count) {
-			for (u8_t i = 0; i < bt_dev.id_count; i++) {
+			for (uint8_t i = 0; i < bt_dev.id_count; i++) {
 				bt_addr_le_t addr;
-				u8_t *irk = NULL;
+				uint8_t *irk = NULL;
 #if defined(CONFIG_BT_PRIVACY)
-				u8_t ir_irk[16];
+				uint8_t ir_irk[16];
 
 				if (!bt_smp_irk_get(addrs[i].ir, ir_irk)) {
 					irk = ir_irk;
@@ -7102,7 +7102,7 @@ int bt_setup_random_id_addr(void)
 	return bt_id_create(NULL, NULL);
 }
 
-bool bt_addr_le_is_bonded(u8_t id, const bt_addr_le_t *addr)
+bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr)
 {
 	if (IS_ENABLED(CONFIG_BT_SMP)) {
 		struct bt_keys *keys = bt_keys_find_addr(id, addr);
@@ -7276,7 +7276,7 @@ int bt_le_adv_update_data(const struct bt_data *ad, size_t ad_len,
 			     use_name);
 }
 
-static u8_t get_filter_policy(u8_t options)
+static uint8_t get_filter_policy(uint8_t options)
 {
 	if (!IS_ENABLED(CONFIG_BT_WHITELIST)) {
 		return BT_LE_ADV_FP_NO_WHITELIST;
@@ -7292,8 +7292,8 @@ static u8_t get_filter_policy(u8_t options)
 	}
 }
 
-static int le_adv_set_random_addr(struct bt_le_ext_adv *adv, u32_t options,
-				  bool dir_adv, u8_t *own_addr_type)
+static int le_adv_set_random_addr(struct bt_le_ext_adv *adv, uint32_t options,
+				  bool dir_adv, uint8_t *own_addr_type)
 {
 	const bt_addr_le_t *id_addr;
 	int err = 0;
@@ -8181,10 +8181,10 @@ int bt_le_scan_start(const struct bt_le_scan_param *param, bt_le_scan_cb_t cb)
 		}
 
 		if (param->options & BT_LE_SCAN_OPT_CODED) {
-			u16_t interval = param->interval_coded ?
+			uint16_t interval = param->interval_coded ?
 				param->interval_coded :
 				param->interval;
-			u16_t window = param->window_coded ?
+			uint16_t window = param->window_coded ?
 				param->window_coded :
 				param->window;
 
@@ -8315,7 +8315,7 @@ int bt_le_whitelist_clear(void)
 }
 #endif /* defined(CONFIG_BT_WHITELIST) */
 
-int bt_le_set_chan_map(u8_t chan_map[5])
+int bt_le_set_chan_map(uint8_t chan_map[5])
 {
 	struct bt_hci_cp_le_set_host_chan_classif *cp;
 	struct net_buf *buf;
@@ -8393,7 +8393,7 @@ struct net_buf *bt_buf_get_cmd_complete(k_timeout_t timeout)
 	return bt_buf_get_rx(BT_BUF_EVT, timeout);
 }
 
-struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, k_timeout_t timeout)
+struct net_buf *bt_buf_get_evt(uint8_t evt, bool discardable, k_timeout_t timeout)
 {
 	switch (evt) {
 #if defined(CONFIG_BT_CONN)
@@ -8435,7 +8435,7 @@ struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, k_timeout_t timeout)
 #if defined(CONFIG_BT_BREDR)
 static int br_start_inquiry(const struct bt_br_discovery_param *param)
 {
-	const u8_t iac[3] = { 0x33, 0x8b, 0x9e };
+	const uint8_t iac[3] = { 0x33, 0x8b, 0x9e };
 	struct bt_hci_op_inquiry *cp;
 	struct net_buf *buf;
 
@@ -8553,7 +8553,7 @@ int bt_br_discovery_stop(void)
 	return 0;
 }
 
-static int write_scan_enable(u8_t scan)
+static int write_scan_enable(uint8_t scan)
 {
 	struct net_buf *buf;
 	int err;
@@ -8656,7 +8656,7 @@ int bt_pub_key_gen(struct bt_pub_key_cb *new_cb)
 	return 0;
 }
 
-const u8_t *bt_pub_key_get(void)
+const uint8_t *bt_pub_key_get(void)
 {
 	if (atomic_test_bit(bt_dev.flags, BT_DEV_HAS_PUB_KEY)) {
 		return pub_key;
@@ -8665,7 +8665,7 @@ const u8_t *bt_pub_key_get(void)
 	return NULL;
 }
 
-int bt_dh_key_gen(const u8_t remote_pk[64], bt_dh_key_cb_t cb)
+int bt_dh_key_gen(const uint8_t remote_pk[64], bt_dh_key_cb_t cb)
 {
 	struct bt_hci_cp_le_generate_dhkey *cp;
 	struct net_buf *buf;
@@ -8709,7 +8709,7 @@ int bt_br_oob_get_local(struct bt_br_oob *oob)
 }
 #endif /* CONFIG_BT_BREDR */
 
-int bt_le_oob_get_local(u8_t id, struct bt_le_oob *oob)
+int bt_le_oob_get_local(uint8_t id, struct bt_le_oob *oob)
 {
 	struct bt_le_ext_adv *adv;
 	int err;
@@ -8840,7 +8840,7 @@ int bt_le_ext_adv_oob_get_local(struct bt_le_ext_adv *adv,
 
 #if defined(CONFIG_BT_SMP)
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-int bt_le_oob_set_legacy_tk(struct bt_conn *conn, const u8_t *tk)
+int bt_le_oob_set_legacy_tk(struct bt_conn *conn, const uint8_t *tk)
 {
 	return bt_smp_le_oob_set_tk(conn, tk);
 }
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 8ccf85179e..13bc5a42de 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -105,10 +105,10 @@ enum {
 
 struct bt_le_ext_adv {
 	/* ID Address used for advertising */
-	u8_t                    id;
+	uint8_t                    id;
 
 	/* Advertising handle */
-	u16_t			handle;
+	uint16_t			handle;
 
 	/* Current local Random Address */
 	bt_addr_le_t		random_addr;
@@ -122,38 +122,38 @@ struct bt_le_ext_adv {
 	const struct bt_le_ext_adv_cb *cb;
 
 	/* TX Power in use by the controller */
-	s8_t                    tx_power;
+	int8_t                    tx_power;
 #endif /* defined(CONFIG_BT_EXT_ADV) */
 };
 
 struct bt_dev_le {
 	/* LE features */
-	u8_t			features[8];
+	uint8_t			features[8];
 	/* LE states */
-	u64_t			states;
+	uint64_t			states;
 
 #if defined(CONFIG_BT_CONN)
 	/* Controller buffer information */
-	u16_t			mtu;
+	uint16_t			mtu;
 	struct k_sem		pkts;
 #endif /* CONFIG_BT_CONN */
 
 #if defined(CONFIG_BT_SMP)
 	/* Size of the the controller resolving list */
-	u8_t                    rl_size;
+	uint8_t                    rl_size;
 	/* Number of entries in the resolving list. rl_entries > rl_size
 	 * means that host-side resolving is used.
 	 */
-	u8_t                    rl_entries;
+	uint8_t                    rl_entries;
 #endif /* CONFIG_BT_SMP */
 };
 
 #if defined(CONFIG_BT_BREDR)
 struct bt_dev_br {
 	/* Max controller's acceptable ACL packet length */
-	u16_t         mtu;
+	uint16_t         mtu;
 	struct k_sem  pkts;
-	u16_t         esco_pkt_type;
+	uint16_t         esco_pkt_type;
 };
 #endif
 
@@ -169,7 +169,7 @@ struct bt_dev_br {
 struct bt_dev {
 	/* Local Identity Address(es) */
 	bt_addr_le_t            id_addr[CONFIG_BT_ID_MAX];
-	u8_t                    id_count;
+	uint8_t                    id_count;
 
 	struct bt_conn_le_create_param create_param;
 
@@ -182,25 +182,25 @@ struct bt_dev {
 #endif
 	/* Current local Random Address */
 	bt_addr_le_t            random_addr;
-	u8_t                    adv_conn_id;
+	uint8_t                    adv_conn_id;
 
 	/* Controller version & manufacturer information */
-	u8_t			hci_version;
-	u8_t			lmp_version;
-	u16_t			hci_revision;
-	u16_t			lmp_subversion;
-	u16_t			manufacturer;
+	uint8_t			hci_version;
+	uint8_t			lmp_version;
+	uint16_t			hci_revision;
+	uint16_t			lmp_subversion;
+	uint16_t			manufacturer;
 
 	/* LMP features (pages 0, 1, 2) */
-	u8_t			features[LMP_FEAT_PAGES_COUNT][8];
+	uint8_t			features[LMP_FEAT_PAGES_COUNT][8];
 
 	/* Supported commands */
-	u8_t			supported_commands[64];
+	uint8_t			supported_commands[64];
 
 #if defined(CONFIG_BT_HCI_VS_EXT)
 	/* Vendor HCI support */
-	u8_t                    vs_features[BT_DEV_VS_FEAT_MAX];
-	u8_t                    vs_commands[BT_DEV_VS_CMDS_MAX];
+	uint8_t                    vs_features[BT_DEV_VS_FEAT_MAX];
+	uint8_t                    vs_commands[BT_DEV_VS_CMDS_MAX];
 #endif
 
 	struct k_work           init;
@@ -234,7 +234,7 @@ struct bt_dev {
 
 #if defined(CONFIG_BT_PRIVACY)
 	/* Local Identity Resolving Key */
-	u8_t			irk[CONFIG_BT_ID_MAX][16];
+	uint8_t			irk[CONFIG_BT_ID_MAX][16];
 
 	/* Work used for RPA rotation */
 	struct k_delayed_work rpa_update;
@@ -251,19 +251,19 @@ extern struct bt_dev bt_dev;
 extern const struct bt_conn_auth_cb *bt_auth;
 #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */
 
-int bt_hci_disconnect(u16_t handle, u8_t reason);
+int bt_hci_disconnect(uint16_t handle, uint8_t reason);
 
 bool bt_le_conn_params_valid(const struct bt_le_conn_param *param);
-int bt_le_set_data_len(struct bt_conn *conn, u16_t tx_octets, u16_t tx_time);
-int bt_le_set_phy(struct bt_conn *conn, u8_t tx_phy, u8_t rx_phy);
+int bt_le_set_data_len(struct bt_conn *conn, uint16_t tx_octets, uint16_t tx_time);
+int bt_le_set_phy(struct bt_conn *conn, uint8_t tx_phy, uint8_t rx_phy);
 
 int bt_le_scan_update(bool fast_scan);
 
 int bt_le_create_conn(const struct bt_conn *conn);
 int bt_le_create_conn_cancel(void);
 
-bool bt_addr_le_is_bonded(u8_t id, const bt_addr_le_t *addr);
-const bt_addr_le_t *bt_lookup_id_addr(u8_t id, const bt_addr_le_t *addr);
+bool bt_addr_le_is_bonded(uint8_t id, const bt_addr_le_t *addr);
+const bt_addr_le_t *bt_lookup_id_addr(uint8_t id, const bt_addr_le_t *addr);
 
 int bt_send(struct net_buf *buf);
 
diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c
index ac36243ed6..84b10bbc17 100644
--- a/subsys/bluetooth/host/hci_ecc.c
+++ b/subsys/bluetooth/host/hci_ecc.c
@@ -39,13 +39,13 @@ static struct k_thread ecc_thread_data;
 static K_THREAD_STACK_DEFINE(ecc_thread_stack, CONFIG_BT_HCI_ECC_STACK_SIZE);
 
 /* based on Core Specification 4.2 Vol 3. Part H 2.3.5.6.1 */
-static const u32_t debug_private_key[8] = {
+static const uint32_t debug_private_key[8] = {
 	0xcd3c1abd, 0x5899b8a6, 0xeb40b799, 0x4aff607b, 0xd2103f50, 0x74c9b3e3,
 	0xa3c55f38, 0x3f49f6d4
 };
 
 #if defined(CONFIG_BT_USE_DEBUG_KEYS)
-static const u8_t debug_public_key[64] = {
+static const uint8_t debug_public_key[64] = {
 	0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc, 0xdb, 0xfd, 0xf4, 0xac,
 	0x11, 0x91, 0xf4, 0xef, 0xb9, 0xa5, 0xf9, 0xe9, 0xa7, 0x83, 0x2c, 0x5e,
 	0x2c, 0xbe, 0x97, 0xf2, 0xd2, 0x03, 0xb0, 0x20, 0x8b, 0xd2, 0x89, 0x15,
@@ -68,15 +68,15 @@ static ATOMIC_DEFINE(flags, NUM_FLAGS);
 static K_SEM_DEFINE(cmd_sem, 0, 1);
 
 static struct {
-	u8_t private_key[32];
+	uint8_t private_key[32];
 
 	union {
-		u8_t pk[64];
-		u8_t dhkey[32];
+		uint8_t pk[64];
+		uint8_t dhkey[32];
 	};
 } ecc;
 
-static void send_cmd_status(u16_t opcode, u8_t status)
+static void send_cmd_status(uint16_t opcode, uint8_t status)
 {
 	struct bt_hci_evt_cmd_status *evt;
 	struct bt_hci_evt_hdr *hdr;
@@ -99,7 +99,7 @@ static void send_cmd_status(u16_t opcode, u8_t status)
 	bt_recv_prio(buf);
 }
 
-static u8_t generate_keys(void)
+static uint8_t generate_keys(void)
 {
 #if !defined(CONFIG_BT_USE_DEBUG_KEYS)
 	do {
@@ -127,7 +127,7 @@ static void emulate_le_p256_public_key_cmd(void)
 	struct bt_hci_evt_le_meta_event *meta;
 	struct bt_hci_evt_hdr *hdr;
 	struct net_buf *buf;
-	u8_t status;
+	uint8_t status;
 
 	BT_DBG("");
 
@@ -236,7 +236,7 @@ static void clear_ecc_events(struct net_buf *buf)
 static void le_gen_dhkey(struct net_buf *buf)
 {
 	struct bt_hci_cp_le_generate_dhkey *cmd;
-	u8_t status;
+	uint8_t status;
 
 	if (atomic_test_bit(flags, PENDING_PUB_KEY)) {
 		status = BT_HCI_ERR_CMD_DISALLOWED;
@@ -269,7 +269,7 @@ send_status:
 
 static void le_p256_pub_key(struct net_buf *buf)
 {
-	u8_t status;
+	uint8_t status;
 
 	net_buf_unref(buf);
 
@@ -310,7 +310,7 @@ int bt_hci_ecc_send(struct net_buf *buf)
 	return bt_dev.drv->send(buf);
 }
 
-int default_CSPRNG(u8_t *dst, unsigned int len)
+int default_CSPRNG(uint8_t *dst, unsigned int len)
 {
 	return !bt_rand(dst, len);
 }
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index 33f8e1cf8f..2ef902deb0 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -30,9 +30,9 @@
 static struct k_fifo *raw_rx;
 
 #if defined(CONFIG_BT_HCI_RAW_H4_ENABLE)
-static u8_t raw_mode = BT_HCI_RAW_MODE_H4;
+static uint8_t raw_mode = BT_HCI_RAW_MODE_H4;
 #else
-static u8_t raw_mode;
+static uint8_t raw_mode;
 #endif
 
 NET_BUF_POOL_FIXED_DEFINE(hci_rx_pool, CONFIG_BT_RX_BUF_COUNT,
@@ -106,7 +106,7 @@ struct net_buf *bt_buf_get_tx(enum bt_buf_type type, k_timeout_t timeout,
 	case BT_BUF_H4:
 		if (IS_ENABLED(CONFIG_BT_HCI_RAW_H4) &&
 		    raw_mode == BT_HCI_RAW_MODE_H4) {
-			switch (((u8_t *)data)[0]) {
+			switch (((uint8_t *)data)[0]) {
 			case H4_CMD:
 				type = BT_BUF_CMD;
 				pool = &hci_cmd_pool;
@@ -121,7 +121,7 @@ struct net_buf *bt_buf_get_tx(enum bt_buf_type type, k_timeout_t timeout,
 			}
 
 			/* Adjust data pointer to discard the header */
-			data = (u8_t *)data + 1;
+			data = (uint8_t *)data + 1;
 			size--;
 			break;
 		}
@@ -151,7 +151,7 @@ struct net_buf *bt_buf_get_cmd_complete(k_timeout_t timeout)
 	return bt_buf_get_rx(BT_BUF_EVT, timeout);
 }
 
-struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, k_timeout_t timeout)
+struct net_buf *bt_buf_get_evt(uint8_t evt, bool discardable, k_timeout_t timeout)
 {
 	return bt_buf_get_rx(BT_BUF_EVT, timeout);
 }
@@ -188,7 +188,7 @@ int bt_recv_prio(struct net_buf *buf)
 	return bt_recv(buf);
 }
 
-static void bt_cmd_complete_ext(u16_t op, u8_t status)
+static void bt_cmd_complete_ext(uint16_t op, uint8_t status)
 {
 	struct net_buf *buf;
 	struct bt_hci_evt_cc_status *cc;
@@ -204,13 +204,13 @@ static void bt_cmd_complete_ext(u16_t op, u8_t status)
 	bt_recv(buf);
 }
 
-static u8_t bt_send_ext(struct net_buf *buf)
+static uint8_t bt_send_ext(struct net_buf *buf)
 {
 	struct bt_hci_cmd_hdr *hdr;
 	struct net_buf_simple_state state;
 	int i;
-	u16_t op;
-	u8_t status;
+	uint16_t op;
+	uint8_t status;
 
 	status = BT_HCI_ERR_SUCCESS;
 
@@ -265,7 +265,7 @@ int bt_send(struct net_buf *buf)
 
 	if (IS_ENABLED(CONFIG_BT_HCI_RAW_CMD_EXT) &&
 	    bt_buf_get_type(buf) == BT_BUF_CMD) {
-		u8_t status;
+		uint8_t status;
 
 		status = bt_send_ext(buf);
 		if (status) {
@@ -280,7 +280,7 @@ int bt_send(struct net_buf *buf)
 	return bt_dev.drv->send(buf);
 }
 
-int bt_hci_raw_set_mode(u8_t mode)
+int bt_hci_raw_set_mode(uint8_t mode)
 {
 	BT_DBG("mode %u", mode);
 
@@ -296,7 +296,7 @@ int bt_hci_raw_set_mode(u8_t mode)
 	return -EINVAL;
 }
 
-u8_t bt_hci_raw_get_mode(void)
+uint8_t bt_hci_raw_get_mode(void)
 {
 	if (IS_ENABLED(CONFIG_BT_HCI_RAW_H4)) {
 		return raw_mode;
diff --git a/subsys/bluetooth/host/hfp_hf.c b/subsys/bluetooth/host/hfp_hf.c
index 3e0ac09975..20b755a5f5 100644
--- a/subsys/bluetooth/host/hfp_hf.c
+++ b/subsys/bluetooth/host/hfp_hf.c
@@ -40,8 +40,8 @@ static struct bt_hfp_hf bt_hfp_hf_pool[CONFIG_BT_MAX_CONN];
 /* The order should follow the enum hfp_hf_ag_indicators */
 static const struct {
 	char *name;
-	u32_t min;
-	u32_t max;
+	uint32_t min;
+	uint32_t max;
 } ag_ind[] = {
 	{"service", 0, 1}, /* HF_SERVICE_IND */
 	{"call", 0, 1}, /* HF_CALL_IND */
@@ -103,7 +103,7 @@ int hfp_hf_send_cmd(struct bt_hfp_hf *hf, at_resp_cb_t resp,
 int brsf_handle(struct at_client *hf_at)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
-	u32_t val;
+	uint32_t val;
 	int ret;
 
 	ret = at_get_number(hf_at, &val);
@@ -136,8 +136,8 @@ int brsf_resp(struct at_client *hf_at, struct net_buf *buf)
 	return 0;
 }
 
-static void cind_handle_values(struct at_client *hf_at, u32_t index,
-			       char *name, u32_t min, u32_t max)
+static void cind_handle_values(struct at_client *hf_at, uint32_t index,
+			       char *name, uint32_t min, uint32_t max)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
 	int i;
@@ -159,12 +159,12 @@ static void cind_handle_values(struct at_client *hf_at, u32_t index,
 
 int cind_handle(struct at_client *hf_at)
 {
-	u32_t index = 0U;
+	uint32_t index = 0U;
 
 	/* Parsing Example: CIND: ("call",(0,1)) etc.. */
 	while (at_has_next_list(hf_at)) {
 		char name[MAX_IND_STR_LEN];
-		u32_t min, max;
+		uint32_t min, max;
 
 		if (at_open_list(hf_at) < 0) {
 			BT_ERR("Could not get open list");
@@ -221,8 +221,8 @@ int cind_resp(struct at_client *hf_at, struct net_buf *buf)
 	return 0;
 }
 
-void ag_indicator_handle_values(struct at_client *hf_at, u32_t index,
-				u32_t value)
+void ag_indicator_handle_values(struct at_client *hf_at, uint32_t index,
+				uint32_t value)
 {
 	struct bt_hfp_hf *hf = CONTAINER_OF(hf_at, struct bt_hfp_hf, at);
 	struct bt_conn *conn = hf->rfcomm_dlc.session->br_chan.chan.conn;
@@ -285,10 +285,10 @@ void ag_indicator_handle_values(struct at_client *hf_at, u32_t index,
 
 int cind_status_handle(struct at_client *hf_at)
 {
-	u32_t index = 0U;
+	uint32_t index = 0U;
 
 	while (at_has_next_list(hf_at)) {
-		u32_t value;
+		uint32_t value;
 		int ret;
 
 		ret = at_get_number(hf_at, &value);
@@ -321,7 +321,7 @@ int cind_status_resp(struct at_client *hf_at, struct net_buf *buf)
 
 int ciev_handle(struct at_client *hf_at)
 {
-	u32_t index, value;
+	uint32_t index, value;
 	int ret;
 
 	ret = at_get_number(hf_at, &index);
diff --git a/subsys/bluetooth/host/hfp_internal.h b/subsys/bluetooth/host/hfp_internal.h
index 921eabc1df..42448b4a84 100644
--- a/subsys/bluetooth/host/hfp_internal.h
+++ b/subsys/bluetooth/host/hfp_internal.h
@@ -48,9 +48,9 @@ struct bt_hfp_hf {
 	struct bt_rfcomm_dlc rfcomm_dlc;
 	char hf_buffer[HF_MAX_BUF_LEN];
 	struct at_client at;
-	u32_t hf_features;
-	u32_t ag_features;
-	s8_t ind_table[HF_MAX_AG_INDICATORS];
+	uint32_t hf_features;
+	uint32_t ag_features;
+	int8_t ind_table[HF_MAX_AG_INDICATORS];
 };
 
 enum hfp_hf_ag_indicators {
diff --git a/subsys/bluetooth/host/keys.c b/subsys/bluetooth/host/keys.c
index 732e12cc53..7560d722e7 100644
--- a/subsys/bluetooth/host/keys.c
+++ b/subsys/bluetooth/host/keys.c
@@ -34,11 +34,11 @@ static struct bt_keys key_pool[CONFIG_BT_MAX_PAIRED];
 #define BT_KEYS_STORAGE_LEN_COMPAT (BT_KEYS_STORAGE_LEN - sizeof(uint32_t))
 
 #if IS_ENABLED(CONFIG_BT_KEYS_OVERWRITE_OLDEST)
-static u32_t aging_counter_val;
+static uint32_t aging_counter_val;
 static struct bt_keys *last_keys_updated;
 #endif /* CONFIG_BT_KEYS_OVERWRITE_OLDEST */
 
-struct bt_keys *bt_keys_get_addr(u8_t id, const bt_addr_le_t *addr)
+struct bt_keys *bt_keys_get_addr(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct bt_keys *keys;
 	int i;
@@ -98,7 +98,7 @@ struct bt_keys *bt_keys_get_addr(u8_t id, const bt_addr_le_t *addr)
 	return NULL;
 }
 
-void bt_foreach_bond(u8_t id, void (*func)(const struct bt_bond_info *info,
+void bt_foreach_bond(uint8_t id, void (*func)(const struct bt_bond_info *info,
 					   void *user_data),
 		     void *user_data)
 {
@@ -128,7 +128,7 @@ void bt_keys_foreach(int type, void (*func)(struct bt_keys *keys, void *data),
 	}
 }
 
-struct bt_keys *bt_keys_find(int type, u8_t id, const bt_addr_le_t *addr)
+struct bt_keys *bt_keys_find(int type, uint8_t id, const bt_addr_le_t *addr)
 {
 	int i;
 
@@ -144,7 +144,7 @@ struct bt_keys *bt_keys_find(int type, u8_t id, const bt_addr_le_t *addr)
 	return NULL;
 }
 
-struct bt_keys *bt_keys_get_type(int type, u8_t id, const bt_addr_le_t *addr)
+struct bt_keys *bt_keys_get_type(int type, uint8_t id, const bt_addr_le_t *addr)
 {
 	struct bt_keys *keys;
 
@@ -165,7 +165,7 @@ struct bt_keys *bt_keys_get_type(int type, u8_t id, const bt_addr_le_t *addr)
 	return keys;
 }
 
-struct bt_keys *bt_keys_find_irk(u8_t id, const bt_addr_le_t *addr)
+struct bt_keys *bt_keys_find_irk(uint8_t id, const bt_addr_le_t *addr)
 {
 	int i;
 
@@ -214,7 +214,7 @@ struct bt_keys *bt_keys_find_irk(u8_t id, const bt_addr_le_t *addr)
 	return NULL;
 }
 
-struct bt_keys *bt_keys_find_addr(u8_t id, const bt_addr_le_t *addr)
+struct bt_keys *bt_keys_find_addr(uint8_t id, const bt_addr_le_t *addr)
 {
 	int i;
 
@@ -299,7 +299,7 @@ static int keys_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 {
 	struct bt_keys *keys;
 	bt_addr_le_t addr;
-	u8_t id;
+	uint8_t id;
 	ssize_t len;
 	int err;
 	char val[BT_KEYS_STORAGE_LEN];
@@ -411,7 +411,7 @@ SETTINGS_STATIC_HANDLER_DEFINE(bt_keys, "bt/keys", NULL, keys_set, keys_commit,
 #endif /* CONFIG_BT_SETTINGS */
 
 #if IS_ENABLED(CONFIG_BT_KEYS_OVERWRITE_OLDEST)
-void bt_keys_update_usage(u8_t id, const bt_addr_le_t *addr)
+void bt_keys_update_usage(uint8_t id, const bt_addr_le_t *addr)
 {
 	struct bt_keys *keys = bt_keys_find_addr(id, addr);
 
diff --git a/subsys/bluetooth/host/keys.h b/subsys/bluetooth/host/keys.h
index 3675ca8a24..8e4e32886e 100644
--- a/subsys/bluetooth/host/keys.h
+++ b/subsys/bluetooth/host/keys.h
@@ -33,29 +33,29 @@ enum {
 };
 
 struct bt_ltk {
-	u8_t                    rand[8];
-	u8_t                    ediv[2];
-	u8_t                    val[16];
+	uint8_t                    rand[8];
+	uint8_t                    ediv[2];
+	uint8_t                    val[16];
 };
 
 struct bt_irk {
-	u8_t                    val[16];
+	uint8_t                    val[16];
 	bt_addr_t               rpa;
 };
 
 struct bt_csrk {
-	u8_t                    val[16];
-	u32_t                   cnt;
+	uint8_t                    val[16];
+	uint32_t                   cnt;
 };
 
 struct bt_keys {
-	u8_t                    id;
+	uint8_t                    id;
 	bt_addr_le_t            addr;
-	u8_t                    state;
-	u8_t                    storage_start[0] __aligned(sizeof(void *));
-	u8_t                    enc_size;
-	u8_t                    flags;
-	u16_t                   keys;
+	uint8_t                    state;
+	uint8_t                    storage_start[0] __aligned(sizeof(void *));
+	uint8_t                    enc_size;
+	uint8_t                    flags;
+	uint16_t                   keys;
 	struct bt_ltk           ltk;
 	struct bt_irk           irk;
 #if defined(CONFIG_BT_SIGNING)
@@ -66,7 +66,7 @@ struct bt_keys {
 	struct bt_ltk           slave_ltk;
 #endif /* CONFIG_BT_SMP_SC_PAIR_ONLY */
 #if (defined(CONFIG_BT_KEYS_OVERWRITE_OLDEST))
-	u32_t                   aging_counter;
+	uint32_t                   aging_counter;
 #endif /* CONFIG_BT_KEYS_OVERWRITE_OLDEST */
 };
 
@@ -76,11 +76,11 @@ struct bt_keys {
 void bt_keys_foreach(int type, void (*func)(struct bt_keys *keys, void *data),
 		     void *data);
 
-struct bt_keys *bt_keys_get_addr(u8_t id, const bt_addr_le_t *addr);
-struct bt_keys *bt_keys_get_type(int type, u8_t id, const bt_addr_le_t *addr);
-struct bt_keys *bt_keys_find(int type, u8_t id, const bt_addr_le_t *addr);
-struct bt_keys *bt_keys_find_irk(u8_t id, const bt_addr_le_t *addr);
-struct bt_keys *bt_keys_find_addr(u8_t id, const bt_addr_le_t *addr);
+struct bt_keys *bt_keys_get_addr(uint8_t id, const bt_addr_le_t *addr);
+struct bt_keys *bt_keys_get_type(int type, uint8_t id, const bt_addr_le_t *addr);
+struct bt_keys *bt_keys_find(int type, uint8_t id, const bt_addr_le_t *addr);
+struct bt_keys *bt_keys_find_irk(uint8_t id, const bt_addr_le_t *addr);
+struct bt_keys *bt_keys_find_addr(uint8_t id, const bt_addr_le_t *addr);
 
 void bt_keys_add_type(struct bt_keys *keys, int type);
 void bt_keys_clear(struct bt_keys *keys);
@@ -102,8 +102,8 @@ enum {
 
 struct bt_keys_link_key {
 	bt_addr_t               addr;
-	u8_t                    flags;
-	u8_t                    val[16];
+	uint8_t                    flags;
+	uint8_t                    val[16];
 };
 
 struct bt_keys_link_key *bt_keys_get_link_key(const bt_addr_t *addr);
@@ -114,4 +114,4 @@ void bt_keys_link_key_clear_addr(const bt_addr_t *addr);
 /* This function is used to signal that the key has been used for paring */
 /* It updates the aging counter and saves it to flash if configuration option */
 /* BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING is enabled */
-void bt_keys_update_usage(u8_t id, const bt_addr_le_t *addr);
+void bt_keys_update_usage(uint8_t id, const bt_addr_le_t *addr);
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index d20718de2b..ca7c7129bd 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -74,7 +74,7 @@ NET_BUF_POOL_FIXED_DEFINE(disc_pool, 1,
 #define l2cap_remove_ident(conn, ident) __l2cap_lookup_ident(conn, ident, true)
 
 struct data_sent {
-	u16_t len;
+	uint16_t len;
 };
 
 #define data_sent(buf) ((struct data_sent *)net_buf_user_data(buf))
@@ -91,9 +91,9 @@ struct bt_l2cap {
 
 static struct bt_l2cap bt_l2cap_pool[CONFIG_BT_MAX_CONN];
 
-static u8_t get_ident(void)
+static uint8_t get_ident(void)
 {
-	static u8_t ident;
+	static uint8_t ident;
 
 	ident++;
 	/* handle integer overflow (0 is not valid) */
@@ -109,7 +109,7 @@ static struct bt_l2cap_le_chan *l2cap_chan_alloc_cid(struct bt_conn *conn,
 						     struct bt_l2cap_chan *chan)
 {
 	struct bt_l2cap_le_chan *ch = BT_L2CAP_LE_CHAN(chan);
-	u16_t cid;
+	uint16_t cid;
 
 	/*
 	 * No action needed if there's already a CID allocated, e.g. in
@@ -130,7 +130,7 @@ static struct bt_l2cap_le_chan *l2cap_chan_alloc_cid(struct bt_conn *conn,
 }
 
 static struct bt_l2cap_le_chan *
-__l2cap_lookup_ident(struct bt_conn *conn, u16_t ident, bool remove)
+__l2cap_lookup_ident(struct bt_conn *conn, uint16_t ident, bool remove)
 {
 	struct bt_l2cap_chan *chan;
 	sys_snode_t *prev = NULL;
@@ -398,8 +398,8 @@ void bt_l2cap_disconnected(struct bt_conn *conn)
 }
 
 static struct net_buf *l2cap_create_le_sig_pdu(struct net_buf *buf,
-					       u8_t code, u8_t ident,
-					       u16_t len)
+					       uint8_t code, uint8_t ident,
+					       uint16_t len)
 {
 	struct bt_l2cap_sig_hdr *hdr;
 	struct net_buf_pool *pool = NULL;
@@ -475,7 +475,7 @@ static int l2cap_ecred_conn_req(struct bt_l2cap_chan **chan, int channels)
 	struct bt_l2cap_ecred_conn_req *req;
 	struct bt_l2cap_le_chan *ch;
 	int i;
-	u8_t ident;
+	uint8_t ident;
 
 	if (!chan || !channels) {
 		return -EINVAL;
@@ -485,7 +485,7 @@ static int l2cap_ecred_conn_req(struct bt_l2cap_chan **chan, int channels)
 
 	buf = l2cap_create_le_sig_pdu(NULL, BT_L2CAP_ECRED_CONN_REQ, ident,
 				      sizeof(*req) +
-				      (channels * sizeof(u16_t)));
+				      (channels * sizeof(uint16_t)));
 
 	req = net_buf_add(buf, sizeof(*req));
 
@@ -510,7 +510,7 @@ static int l2cap_ecred_conn_req(struct bt_l2cap_chan **chan, int channels)
 	return 0;
 }
 
-static void l2cap_le_encrypt_change(struct bt_l2cap_chan *chan, u8_t status)
+static void l2cap_le_encrypt_change(struct bt_l2cap_chan *chan, uint8_t status)
 {
 	/* Skip channels that are not pending waiting for encryption */
 	if (!atomic_test_and_clear_bit(chan->status,
@@ -543,7 +543,7 @@ static void l2cap_le_encrypt_change(struct bt_l2cap_chan *chan, u8_t status)
 }
 #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
 
-void bt_l2cap_encrypt_change(struct bt_conn *conn, u8_t hci_status)
+void bt_l2cap_encrypt_change(struct bt_conn *conn, uint8_t hci_status)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -573,7 +573,7 @@ struct net_buf *bt_l2cap_create_pdu_timeout(struct net_buf_pool *pool,
 					  timeout);
 }
 
-int bt_l2cap_send_cb(struct bt_conn *conn, u16_t cid, struct net_buf *buf,
+int bt_l2cap_send_cb(struct bt_conn *conn, uint16_t cid, struct net_buf *buf,
 		     bt_conn_tx_cb_t cb, void *user_data)
 {
 	struct bt_l2cap_hdr *hdr;
@@ -587,8 +587,8 @@ int bt_l2cap_send_cb(struct bt_conn *conn, u16_t cid, struct net_buf *buf,
 	return bt_conn_send_cb(conn, buf, cb, user_data);
 }
 
-static void l2cap_send_reject(struct bt_conn *conn, u8_t ident,
-			      u16_t reason, void *data, u8_t data_len)
+static void l2cap_send_reject(struct bt_conn *conn, uint8_t ident,
+			      uint16_t reason, void *data, uint8_t data_len)
 {
 	struct bt_l2cap_cmd_reject *rej;
 	struct net_buf *buf;
@@ -621,7 +621,7 @@ static void le_conn_param_rsp(struct bt_l2cap *l2cap, struct net_buf *buf)
 	BT_DBG("LE conn param rsp result %u", sys_le16_to_cpu(rsp->result));
 }
 
-static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident,
+static void le_conn_param_update_req(struct bt_l2cap *l2cap, uint8_t ident,
 				     struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -673,7 +673,7 @@ static void le_conn_param_update_req(struct bt_l2cap *l2cap, u8_t ident,
 }
 
 struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn,
-						u16_t cid)
+						uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -687,7 +687,7 @@ struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn,
 }
 
 struct bt_l2cap_chan *bt_l2cap_le_lookup_rx_cid(struct bt_conn *conn,
-						u16_t cid)
+						uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -701,7 +701,7 @@ struct bt_l2cap_chan *bt_l2cap_le_lookup_rx_cid(struct bt_conn *conn,
 }
 
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-static struct bt_l2cap_server *l2cap_server_lookup_psm(u16_t psm)
+static struct bt_l2cap_server *l2cap_server_lookup_psm(uint16_t psm)
 {
 	struct bt_l2cap_server *server;
 
@@ -732,7 +732,7 @@ int bt_l2cap_server_register(struct bt_l2cap_server *server)
 			return -EADDRINUSE;
 		}
 	} else {
-		u16_t psm;
+		uint16_t psm;
 
 		for (psm = L2CAP_LE_PSM_DYN_START;
 		     psm <= L2CAP_LE_PSM_DYN_END; psm++) {
@@ -812,7 +812,7 @@ static struct net_buf *l2cap_chan_le_get_tx_buf(struct bt_l2cap_le_chan *ch)
 }
 
 static int l2cap_chan_le_send_sdu(struct bt_l2cap_le_chan *ch,
-				  struct net_buf **buf, u16_t sent);
+				  struct net_buf **buf, uint16_t sent);
 
 static void l2cap_chan_tx_process(struct k_work *work)
 {
@@ -848,7 +848,7 @@ static void l2cap_chan_tx_init(struct bt_l2cap_le_chan *chan)
 }
 
 static void l2cap_chan_tx_give_credits(struct bt_l2cap_le_chan *chan,
-				       u16_t credits)
+				       uint16_t credits)
 {
 	BT_DBG("chan %p credits %u", chan, credits);
 
@@ -861,7 +861,7 @@ static void l2cap_chan_tx_give_credits(struct bt_l2cap_le_chan *chan,
 }
 
 static void l2cap_chan_rx_give_credits(struct bt_l2cap_le_chan *chan,
-				       u16_t credits)
+				       uint16_t credits)
 {
 	BT_DBG("chan %p credits %u", chan, credits);
 
@@ -901,7 +901,7 @@ static void l2cap_chan_destroy(struct bt_l2cap_chan *chan)
 	}
 }
 
-static u16_t le_err_to_result(int err)
+static uint16_t le_err_to_result(int err)
 {
 	switch (err) {
 	case -ENOMEM:
@@ -921,9 +921,9 @@ static u16_t le_err_to_result(int err)
 	}
 }
 
-static u16_t l2cap_chan_accept(struct bt_conn *conn,
-			       struct bt_l2cap_server *server, u16_t scid,
-			       u16_t mtu, u16_t mps, u16_t credits,
+static uint16_t l2cap_chan_accept(struct bt_conn *conn,
+			       struct bt_l2cap_server *server, uint16_t scid,
+			       uint16_t mtu, uint16_t mps, uint16_t credits,
 			       struct bt_l2cap_chan **chan)
 {
 	struct bt_l2cap_le_chan *ch;
@@ -981,7 +981,7 @@ static u16_t l2cap_chan_accept(struct bt_conn *conn,
 	return BT_L2CAP_LE_SUCCESS;
 }
 
-static void le_conn_req(struct bt_l2cap *l2cap, u8_t ident,
+static void le_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
 			struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -990,8 +990,8 @@ static void le_conn_req(struct bt_l2cap *l2cap, u8_t ident,
 	struct bt_l2cap_server *server;
 	struct bt_l2cap_le_conn_req *req = (void *)buf->data;
 	struct bt_l2cap_le_conn_rsp *rsp;
-	u16_t psm, scid, mtu, mps, credits;
-	u16_t result;
+	uint16_t psm, scid, mtu, mps, credits;
+	uint16_t result;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small LE conn req packet size");
@@ -1054,7 +1054,7 @@ rsp:
 	bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf);
 }
 
-static void le_ecred_conn_req(struct bt_l2cap *l2cap, u8_t ident,
+static void le_ecred_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
 			      struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -1063,8 +1063,8 @@ static void le_ecred_conn_req(struct bt_l2cap *l2cap, u8_t ident,
 	struct bt_l2cap_server *server;
 	struct bt_l2cap_ecred_conn_req *req;
 	struct bt_l2cap_ecred_conn_rsp *rsp;
-	u16_t psm, mtu, mps, credits, result = BT_L2CAP_LE_ERR_INVALID_SCID;
-	u16_t scid, dcid[L2CAP_ECRED_CHAN_MAX];
+	uint16_t psm, mtu, mps, credits, result = BT_L2CAP_LE_ERR_INVALID_SCID;
+	uint16_t scid, dcid[L2CAP_ECRED_CHAN_MAX];
 	int i = 0;
 
 	if (buf->len < sizeof(*req)) {
@@ -1156,14 +1156,14 @@ response:
 	bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf);
 }
 
-static void le_ecred_reconf_req(struct bt_l2cap *l2cap, u8_t ident,
+static void le_ecred_reconf_req(struct bt_l2cap *l2cap, uint8_t ident,
 				struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_ecred_reconf_req *req;
 	struct bt_l2cap_ecred_reconf_rsp *rsp;
-	u16_t mtu, mps;
-	u16_t scid, result;
+	uint16_t mtu, mps;
+	uint16_t scid, result;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small ecred reconf req packet size");
@@ -1232,7 +1232,7 @@ response:
 }
 
 static struct bt_l2cap_le_chan *l2cap_remove_rx_cid(struct bt_conn *conn,
-						    u16_t cid)
+						    uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 	sys_snode_t *prev = NULL;
@@ -1254,14 +1254,14 @@ static struct bt_l2cap_le_chan *l2cap_remove_rx_cid(struct bt_conn *conn,
 	return NULL;
 }
 
-static void le_disconn_req(struct bt_l2cap *l2cap, u8_t ident,
+static void le_disconn_req(struct bt_l2cap *l2cap, uint8_t ident,
 			   struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_le_chan *chan;
 	struct bt_l2cap_disconn_req *req = (void *)buf->data;
 	struct bt_l2cap_disconn_rsp *rsp;
-	u16_t dcid;
+	uint16_t dcid;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small LE conn req packet size");
@@ -1299,7 +1299,7 @@ static void le_disconn_req(struct bt_l2cap *l2cap, u8_t ident,
 	bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf);
 }
 
-static int l2cap_change_security(struct bt_l2cap_le_chan *chan, u16_t err)
+static int l2cap_change_security(struct bt_l2cap_le_chan *chan, uint16_t err)
 {
 	int ret;
 
@@ -1341,13 +1341,13 @@ static int l2cap_change_security(struct bt_l2cap_le_chan *chan, u16_t err)
 	return 0;
 }
 
-static void le_ecred_conn_rsp(struct bt_l2cap *l2cap, u8_t ident,
+static void le_ecred_conn_rsp(struct bt_l2cap *l2cap, uint8_t ident,
 			      struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_le_chan *chan;
 	struct bt_l2cap_ecred_conn_rsp *rsp;
-	u16_t dcid, mtu, mps, credits, result;
+	uint16_t dcid, mtu, mps, credits, result;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small ecred conn rsp packet size");
@@ -1448,13 +1448,13 @@ static void le_ecred_conn_rsp(struct bt_l2cap *l2cap, u8_t ident,
 	}
 }
 
-static void le_conn_rsp(struct bt_l2cap *l2cap, u8_t ident,
+static void le_conn_rsp(struct bt_l2cap *l2cap, uint8_t ident,
 			struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_le_chan *chan;
 	struct bt_l2cap_le_conn_rsp *rsp = (void *)buf->data;
-	u16_t dcid, mtu, mps, credits, result;
+	uint16_t dcid, mtu, mps, credits, result;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small LE conn rsp packet size");
@@ -1520,13 +1520,13 @@ static void le_conn_rsp(struct bt_l2cap *l2cap, u8_t ident,
 	}
 }
 
-static void le_disconn_rsp(struct bt_l2cap *l2cap, u8_t ident,
+static void le_disconn_rsp(struct bt_l2cap *l2cap, uint8_t ident,
 			   struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_le_chan *chan;
 	struct bt_l2cap_disconn_rsp *rsp = (void *)buf->data;
-	u16_t scid;
+	uint16_t scid;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small LE disconn rsp packet size");
@@ -1566,8 +1566,8 @@ static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
 					     size_t sdu_hdr_len)
 {
 	struct net_buf *seg;
-	u16_t headroom;
-	u16_t len;
+	uint16_t headroom;
+	uint16_t len;
 
 	/* Segment if data (+ data headroom) is bigger than MPS */
 	if (buf->len + sdu_hdr_len > ch->tx.mps) {
@@ -1668,7 +1668,7 @@ static bool test_and_dec(atomic_t *target)
  * be sent later.
  */
 static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch,
-			      struct net_buf *buf, u16_t sdu_hdr_len)
+			      struct net_buf *buf, uint16_t sdu_hdr_len)
 {
 	struct net_buf *seg;
 	struct net_buf_simple_state state;
@@ -1731,7 +1731,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch,
 }
 
 static int l2cap_chan_le_send_sdu(struct bt_l2cap_le_chan *ch,
-				  struct net_buf **buf, u16_t sent)
+				  struct net_buf **buf, uint16_t sent)
 {
 	int ret, total_len;
 	struct net_buf *frag;
@@ -1787,14 +1787,14 @@ static int l2cap_chan_le_send_sdu(struct bt_l2cap_le_chan *ch,
 	return ret;
 }
 
-static void le_credits(struct bt_l2cap *l2cap, u8_t ident,
+static void le_credits(struct bt_l2cap *l2cap, uint8_t ident,
 		       struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_chan *chan;
 	struct bt_l2cap_le_credits *ev = (void *)buf->data;
 	struct bt_l2cap_le_chan *ch;
-	u16_t credits, cid;
+	uint16_t credits, cid;
 
 	if (buf->len < sizeof(*ev)) {
 		BT_ERR("Too small LE Credits packet size");
@@ -1827,7 +1827,7 @@ static void le_credits(struct bt_l2cap *l2cap, u8_t ident,
 	l2cap_chan_tx_resume(ch);
 }
 
-static void reject_cmd(struct bt_l2cap *l2cap, u8_t ident,
+static void reject_cmd(struct bt_l2cap *l2cap, uint8_t ident,
 		       struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -1847,7 +1847,7 @@ static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_l2cap *l2cap = CONTAINER_OF(chan, struct bt_l2cap, chan);
 	struct bt_l2cap_sig_hdr *hdr;
-	u16_t len;
+	uint16_t len;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small L2CAP signaling PDU");
@@ -1963,7 +1963,7 @@ static void l2cap_chan_shutdown(struct bt_l2cap_chan *chan)
 }
 
 static void l2cap_chan_send_credits(struct bt_l2cap_le_chan *chan,
-				    struct net_buf *buf, u16_t credits)
+				    struct net_buf *buf, uint16_t credits)
 {
 	struct bt_l2cap_le_credits *ev;
 
@@ -1997,7 +1997,7 @@ static void l2cap_chan_send_credits(struct bt_l2cap_le_chan *chan,
 static void l2cap_chan_update_credits(struct bt_l2cap_le_chan *chan,
 				      struct net_buf *buf)
 {
-	u16_t credits;
+	uint16_t credits;
 	atomic_val_t old_credits = atomic_get(&chan->rx.credits);
 
 	/* Restore enough credits to complete the sdu */
@@ -2017,7 +2017,7 @@ int bt_l2cap_chan_recv_complete(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_l2cap_le_chan *ch = BT_L2CAP_LE_CHAN(chan);
 	struct bt_conn *conn = chan->conn;
-	u16_t credits;
+	uint16_t credits;
 
 	__ASSERT_NO_MSG(chan);
 	__ASSERT_NO_MSG(buf);
@@ -2058,7 +2058,7 @@ static struct net_buf *l2cap_alloc_frag(k_timeout_t timeout, void *user_data)
 }
 
 static void l2cap_chan_le_recv_sdu(struct bt_l2cap_le_chan *chan,
-				   struct net_buf *buf, u16_t seg)
+				   struct net_buf *buf, uint16_t seg)
 {
 	int err;
 
@@ -2082,8 +2082,8 @@ static void l2cap_chan_le_recv_sdu(struct bt_l2cap_le_chan *chan,
 static void l2cap_chan_le_recv_seg(struct bt_l2cap_le_chan *chan,
 				   struct net_buf *buf)
 {
-	u16_t len;
-	u16_t seg = 0U;
+	uint16_t len;
+	uint16_t seg = 0U;
 
 	len = net_buf_frags_len(chan->_sdu);
 	if (len) {
@@ -2133,7 +2133,7 @@ static void l2cap_chan_le_recv_seg(struct bt_l2cap_le_chan *chan,
 static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 			       struct net_buf *buf)
 {
-	u16_t sdu_len;
+	uint16_t sdu_len;
 	int err;
 
 	if (!test_and_dec(&chan->rx.credits)) {
@@ -2230,7 +2230,7 @@ void bt_l2cap_recv(struct bt_conn *conn, struct net_buf *buf)
 {
 	struct bt_l2cap_hdr *hdr;
 	struct bt_l2cap_chan *chan;
-	u16_t cid;
+	uint16_t cid;
 
 	if (IS_ENABLED(CONFIG_BT_BREDR) &&
 	    conn->type == BT_CONN_TYPE_BR) {
@@ -2334,7 +2334,7 @@ void bt_l2cap_init(void)
 
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
 static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_le_chan *ch,
-			    u16_t psm)
+			    uint16_t psm)
 {
 	if (psm < L2CAP_LE_PSM_FIXED_START || psm > L2CAP_LE_PSM_DYN_END) {
 		return -EINVAL;
@@ -2353,7 +2353,7 @@ static int l2cap_le_connect(struct bt_conn *conn, struct bt_l2cap_le_chan *ch,
 }
 
 static int l2cap_ecred_init(struct bt_conn *conn,
-			       struct bt_l2cap_le_chan *ch, u16_t psm)
+			       struct bt_l2cap_le_chan *ch, uint16_t psm)
 {
 
 	if (psm < L2CAP_LE_PSM_FIXED_START || psm > L2CAP_LE_PSM_DYN_END) {
@@ -2376,7 +2376,7 @@ static int l2cap_ecred_init(struct bt_conn *conn,
 }
 
 int bt_l2cap_ecred_chan_connect(struct bt_conn *conn,
-				struct bt_l2cap_chan **chan, u16_t psm)
+				struct bt_l2cap_chan **chan, uint16_t psm)
 {
 	int i, err;
 
@@ -2414,7 +2414,7 @@ fail:
 }
 
 int bt_l2cap_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			  u16_t psm)
+			  uint16_t psm)
 {
 	BT_DBG("conn %p chan %p psm 0x%04x", conn, chan, psm);
 
diff --git a/subsys/bluetooth/host/l2cap_br.c b/subsys/bluetooth/host/l2cap_br.c
index 908780778d..939edf6eaf 100644
--- a/subsys/bluetooth/host/l2cap_br.c
+++ b/subsys/bluetooth/host/l2cap_br.c
@@ -88,15 +88,15 @@ NET_BUF_POOL_FIXED_DEFINE(br_sig_pool, CONFIG_BT_MAX_CONN,
 struct bt_l2cap_br {
 	/* The channel this context is associated with */
 	struct bt_l2cap_br_chan	chan;
-	u8_t			info_ident;
-	u8_t			info_fixed_chan;
-	u32_t			info_feat_mask;
+	uint8_t			info_ident;
+	uint8_t			info_fixed_chan;
+	uint32_t			info_feat_mask;
 };
 
 static struct bt_l2cap_br bt_l2cap_br_pool[CONFIG_BT_MAX_CONN];
 
 struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
-						u16_t cid)
+						uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -110,7 +110,7 @@ struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
 }
 
 struct bt_l2cap_chan *bt_l2cap_br_lookup_tx_cid(struct bt_conn *conn,
-						u16_t cid)
+						uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -127,7 +127,7 @@ static struct bt_l2cap_br_chan*
 l2cap_br_chan_alloc_cid(struct bt_conn *conn, struct bt_l2cap_chan *chan)
 {
 	struct bt_l2cap_br_chan *ch = BR_CHAN(chan);
-	u16_t cid;
+	uint16_t cid;
 
 	/*
 	 * No action needed if there's already a CID allocated, e.g. in
@@ -139,7 +139,7 @@ l2cap_br_chan_alloc_cid(struct bt_conn *conn, struct bt_l2cap_chan *chan)
 
 	/*
 	 * L2CAP_BR_CID_DYN_END is 0xffff so we don't check against it since
-	 * cid is u16_t, just check against u16_t overflow
+	 * cid is uint16_t, just check against uint16_t overflow
 	 */
 	for (cid = L2CAP_BR_CID_DYN_START; cid; cid++) {
 		if (!bt_l2cap_br_lookup_rx_cid(conn, cid)) {
@@ -212,9 +212,9 @@ static bool l2cap_br_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
 	return true;
 }
 
-static u8_t l2cap_br_get_ident(void)
+static uint8_t l2cap_br_get_ident(void)
 {
-	static u8_t ident;
+	static uint8_t ident;
 
 	ident++;
 	/* handle integer overflow (0 is not valid) */
@@ -242,7 +242,7 @@ static void l2cap_br_chan_send_req(struct bt_l2cap_br_chan *chan,
 	bt_l2cap_send(chan->chan.conn, BT_L2CAP_CID_BR_SIG, buf);
 }
 
-static void l2cap_br_get_info(struct bt_l2cap_br *l2cap, u16_t info_type)
+static void l2cap_br_get_info(struct bt_l2cap_br *l2cap, uint16_t info_type)
 {
 	struct bt_l2cap_info_req *info;
 	struct net_buf *buf;
@@ -304,11 +304,11 @@ static void connect_optional_fixed_channels(struct bt_l2cap_br *l2cap)
 	}
 }
 
-static int l2cap_br_info_rsp(struct bt_l2cap_br *l2cap, u8_t ident,
+static int l2cap_br_info_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
 			     struct net_buf *buf)
 {
 	struct bt_l2cap_info_rsp *rsp;
-	u16_t type, result;
+	uint16_t type, result;
 	int err = 0;
 
 	if (atomic_test_bit(l2cap->chan.flags, L2CAP_FLAG_SIG_INFO_DONE)) {
@@ -376,9 +376,9 @@ done:
 	return err;
 }
 
-static u8_t get_fixed_channels_mask(void)
+static uint8_t get_fixed_channels_mask(void)
 {
-	u8_t mask = 0U;
+	uint8_t mask = 0U;
 
 	/* this needs to be enhanced if AMP Test Manager support is added */
 	Z_STRUCT_SECTION_FOREACH(bt_l2cap_br_fixed_chan, fchan) {
@@ -388,7 +388,7 @@ static u8_t get_fixed_channels_mask(void)
 	return mask;
 }
 
-static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, u8_t ident,
+static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, uint8_t ident,
 			     struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -396,7 +396,7 @@ static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, u8_t ident,
 	struct bt_l2cap_info_rsp *rsp;
 	struct net_buf *rsp_buf;
 	struct bt_l2cap_sig_hdr *hdr_info;
-	u16_t type;
+	uint16_t type;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small info req packet size");
@@ -419,7 +419,7 @@ static int l2cap_br_info_req(struct bt_l2cap_br *l2cap, u8_t ident,
 		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FEAT_MASK);
 		rsp->result = sys_cpu_to_le16(BT_L2CAP_INFO_SUCCESS);
 		net_buf_add_le32(rsp_buf, L2CAP_FEAT_FIXED_CHAN_MASK);
-		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + sizeof(u32_t));
+		hdr_info->len = sys_cpu_to_le16(sizeof(*rsp) + sizeof(uint32_t));
 		break;
 	case BT_L2CAP_INFO_FIXED_CHAN:
 		rsp->type = sys_cpu_to_le16(BT_L2CAP_INFO_FIXED_CHAN);
@@ -481,7 +481,7 @@ void bt_l2cap_br_connected(struct bt_conn *conn)
 	}
 }
 
-static struct bt_l2cap_server *l2cap_br_server_lookup_psm(u16_t psm)
+static struct bt_l2cap_server *l2cap_br_server_lookup_psm(uint16_t psm)
 {
 	struct bt_l2cap_server *server;
 
@@ -494,7 +494,7 @@ static struct bt_l2cap_server *l2cap_br_server_lookup_psm(u16_t psm)
 	return NULL;
 }
 
-static void l2cap_br_conf_add_mtu(struct net_buf *buf, const u16_t mtu)
+static void l2cap_br_conf_add_mtu(struct net_buf *buf, const uint16_t mtu)
 {
 	net_buf_add_u8(buf, BT_L2CAP_CONF_OPT_MTU);
 	net_buf_add_u8(buf, sizeof(mtu));
@@ -554,7 +554,7 @@ enum l2cap_br_conn_security_result {
  */
 
 static enum l2cap_br_conn_security_result
-l2cap_br_conn_security(struct bt_l2cap_chan *chan, const u16_t psm)
+l2cap_br_conn_security(struct bt_l2cap_chan *chan, const uint16_t psm)
 {
 	int check;
 
@@ -620,8 +620,8 @@ l2cap_br_conn_security(struct bt_l2cap_chan *chan, const u16_t psm)
 	return L2CAP_CONN_SECURITY_REJECT;
 }
 
-static void l2cap_br_send_conn_rsp(struct bt_conn *conn, u16_t scid,
-				  u16_t dcid, u8_t ident, u16_t result)
+static void l2cap_br_send_conn_rsp(struct bt_conn *conn, uint16_t scid,
+				  uint16_t dcid, uint8_t ident, uint16_t result)
 {
 	struct net_buf *buf;
 	struct bt_l2cap_conn_rsp *rsp;
@@ -648,7 +648,7 @@ static void l2cap_br_send_conn_rsp(struct bt_conn *conn, u16_t scid,
 	bt_l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
 }
 
-static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, u16_t result)
+static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, uint16_t result)
 {
 	/* Send response to connection request only when in acceptor role */
 	if (!atomic_test_bit(BR_CHAN(chan)->flags, L2CAP_FLAG_CONN_ACCEPTOR)) {
@@ -662,14 +662,14 @@ static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, u16_t result)
 	return 0;
 }
 
-static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, u8_t ident,
+static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
 			      struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_chan *chan;
 	struct bt_l2cap_server *server;
 	struct bt_l2cap_conn_req *req = (void *)buf->data;
-	u16_t psm, scid, result;
+	uint16_t psm, scid, result;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small L2CAP conn req packet size");
@@ -768,13 +768,13 @@ no_chan:
 	l2cap_br_send_conn_rsp(conn, scid, 0, ident, result);
 }
 
-static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, u8_t ident,
-			      u16_t len, struct net_buf *buf)
+static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
+			      uint16_t len, struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_chan *chan;
 	struct bt_l2cap_conf_rsp *rsp = (void *)buf->data;
-	u16_t flags, scid, result, opt_len;
+	uint16_t flags, scid, result, opt_len;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small L2CAP conf rsp packet size");
@@ -857,8 +857,8 @@ int bt_l2cap_br_server_register(struct bt_l2cap_server *server)
 	return 0;
 }
 
-static void l2cap_br_send_reject(struct bt_conn *conn, u8_t ident,
-				 u16_t reason, void *data, u8_t data_len)
+static void l2cap_br_send_reject(struct bt_conn *conn, uint8_t ident,
+				 uint16_t reason, void *data, uint8_t data_len)
 {
 	struct bt_l2cap_cmd_reject *rej;
 	struct bt_l2cap_sig_hdr *hdr;
@@ -886,10 +886,10 @@ static void l2cap_br_send_reject(struct bt_conn *conn, u8_t ident,
 	bt_l2cap_send(conn, BT_L2CAP_CID_BR_SIG, buf);
 }
 
-static u16_t l2cap_br_conf_opt_mtu(struct bt_l2cap_chan *chan,
+static uint16_t l2cap_br_conf_opt_mtu(struct bt_l2cap_chan *chan,
 				   struct net_buf *buf, size_t len)
 {
-	u16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
+	uint16_t mtu, result = BT_L2CAP_CONF_SUCCESS;
 
 	/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
 	if (len != 2) {
@@ -913,8 +913,8 @@ done:
 	return result;
 }
 
-static void l2cap_br_conf_req(struct bt_l2cap_br *l2cap, u8_t ident,
-			      u16_t len, struct net_buf *buf)
+static void l2cap_br_conf_req(struct bt_l2cap_br *l2cap, uint8_t ident,
+			      uint16_t len, struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_chan *chan;
@@ -922,7 +922,7 @@ static void l2cap_br_conf_req(struct bt_l2cap_br *l2cap, u8_t ident,
 	struct bt_l2cap_sig_hdr *hdr;
 	struct bt_l2cap_conf_rsp *rsp;
 	struct bt_l2cap_conf_opt *opt;
-	u16_t flags, dcid, opt_len, hint, result = BT_L2CAP_CONF_SUCCESS;
+	uint16_t flags, dcid, opt_len, hint, result = BT_L2CAP_CONF_SUCCESS;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small L2CAP conf req packet size");
@@ -1034,7 +1034,7 @@ send_rsp:
 }
 
 static struct bt_l2cap_br_chan *l2cap_br_remove_tx_cid(struct bt_conn *conn,
-						       u16_t cid)
+						       uint16_t cid)
 {
 	struct bt_l2cap_chan *chan;
 	sys_snode_t *prev = NULL;
@@ -1056,7 +1056,7 @@ static struct bt_l2cap_br_chan *l2cap_br_remove_tx_cid(struct bt_conn *conn,
 	return NULL;
 }
 
-static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, u8_t ident,
+static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, uint8_t ident,
 				 struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
@@ -1064,7 +1064,7 @@ static void l2cap_br_disconn_req(struct bt_l2cap_br *l2cap, u8_t ident,
 	struct bt_l2cap_disconn_req *req = (void *)buf->data;
 	struct bt_l2cap_disconn_rsp *rsp;
 	struct bt_l2cap_sig_hdr *hdr;
-	u16_t scid, dcid;
+	uint16_t scid, dcid;
 
 	if (buf->len < sizeof(*req)) {
 		BT_ERR("Too small disconn req packet size");
@@ -1157,13 +1157,13 @@ int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan)
 	return 0;
 }
 
-static void l2cap_br_disconn_rsp(struct bt_l2cap_br *l2cap, u8_t ident,
+static void l2cap_br_disconn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
 				 struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_br_chan *chan;
 	struct bt_l2cap_disconn_rsp *rsp = (void *)buf->data;
-	u16_t dcid, scid;
+	uint16_t dcid, scid;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small disconn rsp packet size");
@@ -1185,7 +1185,7 @@ static void l2cap_br_disconn_rsp(struct bt_l2cap_br *l2cap, u8_t ident,
 }
 
 int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			     u16_t psm)
+			     uint16_t psm)
 {
 	struct net_buf *buf;
 	struct bt_l2cap_sig_hdr *hdr;
@@ -1264,13 +1264,13 @@ int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
 	return 0;
 }
 
-static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, u8_t ident,
+static void l2cap_br_conn_rsp(struct bt_l2cap_br *l2cap, uint8_t ident,
 			      struct net_buf *buf)
 {
 	struct bt_conn *conn = l2cap->chan.chan.conn;
 	struct bt_l2cap_chan *chan;
 	struct bt_l2cap_conn_rsp *rsp = (void *)buf->data;
-	u16_t dcid, scid, result, status;
+	uint16_t dcid, scid, result, status;
 
 	if (buf->len < sizeof(*rsp)) {
 		BT_ERR("Too small L2CAP conn rsp packet size");
@@ -1334,7 +1334,7 @@ static int l2cap_br_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_l2cap_br *l2cap = CONTAINER_OF(chan, struct bt_l2cap_br, chan);
 	struct bt_l2cap_sig_hdr *hdr;
-	u16_t len;
+	uint16_t len;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small L2CAP signaling PDU");
@@ -1392,7 +1392,7 @@ static int l2cap_br_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
-static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, u8_t status)
+static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, uint8_t status)
 {
 	struct net_buf *buf;
 	struct bt_l2cap_sig_hdr *hdr;
@@ -1454,7 +1454,7 @@ static void l2cap_br_conn_pend(struct bt_l2cap_chan *chan, u8_t status)
 	}
 }
 
-void l2cap_br_encrypt_change(struct bt_conn *conn, u8_t hci_status)
+void l2cap_br_encrypt_change(struct bt_conn *conn, uint8_t hci_status)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -1480,7 +1480,7 @@ void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf)
 {
 	struct bt_l2cap_hdr *hdr;
 	struct bt_l2cap_chan *chan;
-	u16_t cid;
+	uint16_t cid;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small L2CAP PDU received");
diff --git a/subsys/bluetooth/host/l2cap_internal.h b/subsys/bluetooth/host/l2cap_internal.h
index af9dd7db8b..f625a25d46 100644
--- a/subsys/bluetooth/host/l2cap_internal.h
+++ b/subsys/bluetooth/host/l2cap_internal.h
@@ -24,14 +24,14 @@ enum l2cap_conn_list_action {
 #define BT_L2CAP_PSM_RFCOMM             0x0003
 
 struct bt_l2cap_hdr {
-	u16_t len;
-	u16_t cid;
+	uint16_t len;
+	uint16_t cid;
 } __packed;
 
 struct bt_l2cap_sig_hdr {
-	u8_t  code;
-	u8_t  ident;
-	u16_t len;
+	uint8_t  code;
+	uint8_t  ident;
+	uint16_t len;
 } __packed;
 
 #define BT_L2CAP_REJ_NOT_UNDERSTOOD     0x0000
@@ -40,19 +40,19 @@ struct bt_l2cap_sig_hdr {
 
 #define BT_L2CAP_CMD_REJECT             0x01
 struct bt_l2cap_cmd_reject {
-	u16_t reason;
-	u8_t  data[0];
+	uint16_t reason;
+	uint8_t  data[0];
 } __packed;
 
 struct bt_l2cap_cmd_reject_cid_data {
-	u16_t scid;
-	u16_t dcid;
+	uint16_t scid;
+	uint16_t dcid;
 } __packed;
 
 #define BT_L2CAP_CONN_REQ               0x02
 struct bt_l2cap_conn_req {
-	u16_t psm;
-	u16_t scid;
+	uint16_t psm;
+	uint16_t scid;
 } __packed;
 
 /* command statuses in reposnse */
@@ -70,10 +70,10 @@ struct bt_l2cap_conn_req {
 
 #define BT_L2CAP_CONN_RSP               0x03
 struct bt_l2cap_conn_rsp {
-	u16_t dcid;
-	u16_t scid;
-	u16_t result;
-	u16_t status;
+	uint16_t dcid;
+	uint16_t scid;
+	uint16_t result;
+	uint16_t status;
 } __packed;
 
 #define BT_L2CAP_CONF_SUCCESS           0x0000
@@ -82,17 +82,17 @@ struct bt_l2cap_conn_rsp {
 
 #define BT_L2CAP_CONF_REQ               0x04
 struct bt_l2cap_conf_req {
-	u16_t dcid;
-	u16_t flags;
-	u8_t  data[0];
+	uint16_t dcid;
+	uint16_t flags;
+	uint8_t  data[0];
 } __packed;
 
 #define BT_L2CAP_CONF_RSP               0x05
 struct bt_l2cap_conf_rsp {
-	u16_t scid;
-	u16_t flags;
-	u16_t result;
-	u8_t  data[0];
+	uint16_t scid;
+	uint16_t flags;
+	uint16_t result;
+	uint8_t  data[0];
 } __packed;
 
 /* Option type used by MTU config request data */
@@ -102,21 +102,21 @@ struct bt_l2cap_conf_rsp {
 #define BT_L2CAP_CONF_MASK              0x7f
 
 struct bt_l2cap_conf_opt {
-	u8_t type;
-	u8_t len;
-	u8_t data[0];
+	uint8_t type;
+	uint8_t len;
+	uint8_t data[0];
 } __packed;
 
 #define BT_L2CAP_DISCONN_REQ            0x06
 struct bt_l2cap_disconn_req {
-	u16_t dcid;
-	u16_t scid;
+	uint16_t dcid;
+	uint16_t scid;
 } __packed;
 
 #define BT_L2CAP_DISCONN_RSP            0x07
 struct bt_l2cap_disconn_rsp {
-	u16_t dcid;
-	u16_t scid;
+	uint16_t dcid;
+	uint16_t scid;
 } __packed;
 
 #define BT_L2CAP_INFO_FEAT_MASK         0x0002
@@ -124,7 +124,7 @@ struct bt_l2cap_disconn_rsp {
 
 #define BT_L2CAP_INFO_REQ               0x0a
 struct bt_l2cap_info_req {
-	u16_t type;
+	uint16_t type;
 } __packed;
 
 /* info result */
@@ -133,17 +133,17 @@ struct bt_l2cap_info_req {
 
 #define BT_L2CAP_INFO_RSP               0x0b
 struct bt_l2cap_info_rsp {
-	u16_t type;
-	u16_t result;
-	u8_t  data[0];
+	uint16_t type;
+	uint16_t result;
+	uint8_t  data[0];
 } __packed;
 
 #define BT_L2CAP_CONN_PARAM_REQ         0x12
 struct bt_l2cap_conn_param_req {
-	u16_t min_interval;
-	u16_t max_interval;
-	u16_t latency;
-	u16_t timeout;
+	uint16_t min_interval;
+	uint16_t max_interval;
+	uint16_t latency;
+	uint16_t timeout;
 } __packed;
 
 #define BT_L2CAP_CONN_PARAM_ACCEPTED    0x0000
@@ -151,16 +151,16 @@ struct bt_l2cap_conn_param_req {
 
 #define BT_L2CAP_CONN_PARAM_RSP         0x13
 struct bt_l2cap_conn_param_rsp {
-	u16_t result;
+	uint16_t result;
 } __packed;
 
 #define BT_L2CAP_LE_CONN_REQ            0x14
 struct bt_l2cap_le_conn_req {
-	u16_t psm;
-	u16_t scid;
-	u16_t mtu;
-	u16_t mps;
-	u16_t credits;
+	uint16_t psm;
+	uint16_t scid;
+	uint16_t mtu;
+	uint16_t mps;
+	uint16_t credits;
 } __packed;
 
 /* valid results in conn response on LE */
@@ -178,42 +178,42 @@ struct bt_l2cap_le_conn_req {
 
 #define BT_L2CAP_LE_CONN_RSP            0x15
 struct bt_l2cap_le_conn_rsp {
-	u16_t dcid;
-	u16_t mtu;
-	u16_t mps;
-	u16_t credits;
-	u16_t result;
+	uint16_t dcid;
+	uint16_t mtu;
+	uint16_t mps;
+	uint16_t credits;
+	uint16_t result;
 } __packed;
 
 #define BT_L2CAP_LE_CREDITS             0x16
 struct bt_l2cap_le_credits {
-	u16_t cid;
-	u16_t credits;
+	uint16_t cid;
+	uint16_t credits;
 } __packed;
 
 #define BT_L2CAP_ECRED_CONN_REQ         0x17
 struct bt_l2cap_ecred_conn_req {
-	u16_t psm;
-	u16_t mtu;
-	u16_t mps;
-	u16_t credits;
-	u16_t scid[0];
+	uint16_t psm;
+	uint16_t mtu;
+	uint16_t mps;
+	uint16_t credits;
+	uint16_t scid[0];
 } __packed;
 
 #define BT_L2CAP_ECRED_CONN_RSP         0x18
 struct bt_l2cap_ecred_conn_rsp {
-	u16_t mtu;
-	u16_t mps;
-	u16_t credits;
-	u16_t result;
-	u16_t dcid[0];
+	uint16_t mtu;
+	uint16_t mps;
+	uint16_t credits;
+	uint16_t result;
+	uint16_t dcid[0];
 } __packed;
 
 #define BT_L2CAP_ECRED_RECONF_REQ       0x19
 struct bt_l2cap_ecred_reconf_req {
-	u16_t mtu;
-	u16_t mps;
-	u16_t scid[0];
+	uint16_t mtu;
+	uint16_t mps;
+	uint16_t scid[0];
 } __packed;
 
 #define BT_L2CAP_RECONF_SUCCESS         0x0000
@@ -222,7 +222,7 @@ struct bt_l2cap_ecred_reconf_req {
 
 #define BT_L2CAP_ECRED_RECONF_RSP       0x1a
 struct bt_l2cap_ecred_reconf_rsp {
-	u16_t result;
+	uint16_t result;
 } __packed;
 
 #define BT_L2CAP_SDU_HDR_LEN            2
@@ -235,7 +235,7 @@ struct bt_l2cap_ecred_reconf_rsp {
 #endif
 
 struct bt_l2cap_fixed_chan {
-	u16_t		cid;
+	uint16_t		cid;
 	int (*accept)(struct bt_conn *conn, struct bt_l2cap_chan **chan);
 	bt_l2cap_chan_destroy_t destroy;
 };
@@ -249,7 +249,7 @@ struct bt_l2cap_fixed_chan {
 
 /* Need a name different than bt_l2cap_fixed_chan for a different section */
 struct bt_l2cap_br_fixed_chan {
-	u16_t		cid;
+	uint16_t		cid;
 	int (*accept)(struct bt_conn *conn, struct bt_l2cap_chan **chan);
 };
 
@@ -292,7 +292,7 @@ void bt_l2cap_chan_set_state(struct bt_l2cap_chan *chan,
  * Notify L2CAP channels of a change in encryption state passing additionally
  * HCI status of performed security procedure.
  */
-void bt_l2cap_encrypt_change(struct bt_conn *conn, u8_t hci_status);
+void bt_l2cap_encrypt_change(struct bt_conn *conn, uint8_t hci_status);
 
 /* Prepare an L2CAP PDU to be sent over a connection */
 struct net_buf *bt_l2cap_create_pdu_timeout(struct net_buf_pool *pool,
@@ -313,10 +313,10 @@ struct net_buf *bt_l2cap_create_rsp(struct net_buf *buf, size_t reserve);
  * Calling this from RX thread is assumed to never fail so the return can be
  * ignored.
  */
-int bt_l2cap_send_cb(struct bt_conn *conn, u16_t cid, struct net_buf *buf,
+int bt_l2cap_send_cb(struct bt_conn *conn, uint16_t cid, struct net_buf *buf,
 		     bt_conn_tx_cb_t cb, void *user_data);
 
-static inline void bt_l2cap_send(struct bt_conn *conn, u16_t cid,
+static inline void bt_l2cap_send(struct bt_conn *conn, uint16_t cid,
 				 struct net_buf *buf)
 {
 	bt_l2cap_send_cb(conn, cid, buf, NULL, NULL);
@@ -334,11 +334,11 @@ void bt_l2cap_init(void);
 
 /* Lookup channel by Transmission CID */
 struct bt_l2cap_chan *bt_l2cap_le_lookup_tx_cid(struct bt_conn *conn,
-						u16_t cid);
+						uint16_t cid);
 
 /* Lookup channel by Receiver CID */
 struct bt_l2cap_chan *bt_l2cap_le_lookup_rx_cid(struct bt_conn *conn,
-						u16_t cid);
+						uint16_t cid);
 
 /* Initialize BR/EDR L2CAP signal layer */
 void bt_l2cap_br_init(void);
@@ -351,14 +351,14 @@ void bt_l2cap_br_connected(struct bt_conn *conn);
 
 /* Lookup BR/EDR L2CAP channel by Receiver CID */
 struct bt_l2cap_chan *bt_l2cap_br_lookup_rx_cid(struct bt_conn *conn,
-						u16_t cid);
+						uint16_t cid);
 
 /* Disconnects dynamic channel */
 int bt_l2cap_br_chan_disconnect(struct bt_l2cap_chan *chan);
 
 /* Make connection to peer psm server */
 int bt_l2cap_br_chan_connect(struct bt_conn *conn, struct bt_l2cap_chan *chan,
-			     u16_t psm);
+			     uint16_t psm);
 
 /* Send packet data to connected peer */
 int bt_l2cap_br_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf);
@@ -367,7 +367,7 @@ int bt_l2cap_br_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf);
  * Handle security level changed on link passing HCI status of performed
  * security procedure.
  */
-void l2cap_br_encrypt_change(struct bt_conn *conn, u8_t hci_status);
+void l2cap_br_encrypt_change(struct bt_conn *conn, uint8_t hci_status);
 
 /* Handle received data */
 void bt_l2cap_br_recv(struct bt_conn *conn, struct net_buf *buf);
diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index 5cea63ba29..a0a79c06ad 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -71,14 +71,14 @@ extern int z_prf(int (*func)(), void *dest,
 
 static void monitor_send(const void *data, size_t len)
 {
-	const u8_t *buf = data;
+	const uint8_t *buf = data;
 
 	while (len--) {
 		uart_poll_out(monitor_dev, *buf++);
 	}
 }
 
-static void encode_drops(struct bt_monitor_hdr *hdr, u8_t type,
+static void encode_drops(struct bt_monitor_hdr *hdr, uint8_t type,
 			 atomic_t *val)
 {
 	atomic_val_t count;
@@ -90,14 +90,14 @@ static void encode_drops(struct bt_monitor_hdr *hdr, u8_t type,
 	}
 }
 
-static u32_t monitor_ts_get(void)
+static uint32_t monitor_ts_get(void)
 {
 	return (k_cycle_get_32() /
 		(sys_clock_hw_cycles_per_sec() / MONITOR_TS_FREQ));
 }
 
-static inline void encode_hdr(struct bt_monitor_hdr *hdr, u32_t timestamp,
-			      u16_t opcode, u16_t len)
+static inline void encode_hdr(struct bt_monitor_hdr *hdr, uint32_t timestamp,
+			      uint16_t opcode, uint16_t len)
 {
 	struct bt_monitor_ts32 *ts;
 
@@ -122,7 +122,7 @@ static inline void encode_hdr(struct bt_monitor_hdr *hdr, u32_t timestamp,
 	hdr->data_len = sys_cpu_to_le16(4 + hdr->hdr_len + len);
 }
 
-static void drop_add(u16_t opcode)
+static void drop_add(uint16_t opcode)
 {
 	switch (opcode) {
 	case BT_MONITOR_COMMAND_PKT:
@@ -151,7 +151,7 @@ static void drop_add(u16_t opcode)
 	}
 }
 
-void bt_monitor_send(u16_t opcode, const void *data, size_t len)
+void bt_monitor_send(uint16_t opcode, const void *data, size_t len)
 {
 	struct bt_monitor_hdr hdr;
 
@@ -168,7 +168,7 @@ void bt_monitor_send(u16_t opcode, const void *data, size_t len)
 	atomic_clear_bit(&flags, BT_LOG_BUSY);
 }
 
-void bt_monitor_new_index(u8_t type, u8_t bus, bt_addr_t *addr,
+void bt_monitor_new_index(uint8_t type, uint8_t bus, bt_addr_t *addr,
 			  const char *name)
 {
 	struct bt_monitor_new_index pkt;
@@ -222,7 +222,7 @@ struct monitor_log_ctx {
 	char msg[MONITOR_MSG_MAX];
 };
 
-static int monitor_log_out(u8_t *data, size_t length, void *user_data)
+static int monitor_log_out(uint8_t *data, size_t length, void *user_data)
 {
 	struct monitor_log_ctx *ctx = user_data;
 	size_t i;
@@ -242,13 +242,13 @@ static int monitor_log_out(u8_t *data, size_t length, void *user_data)
 	return length;
 }
 
-static u8_t buf;
+static uint8_t buf;
 
 LOG_OUTPUT_DEFINE(monitor_log_output, monitor_log_out, &buf, 1);
 
-static inline u8_t monitor_priority_get(u8_t log_level)
+static inline uint8_t monitor_priority_get(uint8_t log_level)
 {
-	static const u8_t prios[] = {
+	static const uint8_t prios[] = {
 		[LOG_LEVEL_NONE]  = 0,
 		[LOG_LEVEL_ERR]   = BT_LOG_ERR,
 		[LOG_LEVEL_WRN]   = BT_LOG_WARN,
diff --git a/subsys/bluetooth/host/monitor.h b/subsys/bluetooth/host/monitor.h
index 1e80c1c6ee..fe47cdbc9b 100644
--- a/subsys/bluetooth/host/monitor.h
+++ b/subsys/bluetooth/host/monitor.h
@@ -48,32 +48,32 @@
 #endif
 
 struct bt_monitor_hdr {
-	u16_t  data_len;
-	u16_t  opcode;
-	u8_t   flags;
-	u8_t   hdr_len;
+	uint16_t  data_len;
+	uint16_t  opcode;
+	uint8_t   flags;
+	uint8_t   hdr_len;
 
-	u8_t   ext[BT_MONITOR_EXT_HDR_MAX];
+	uint8_t   ext[BT_MONITOR_EXT_HDR_MAX];
 } __packed;
 
 struct bt_monitor_ts32 {
-	u8_t   type;
-	u32_t  ts32;
+	uint8_t   type;
+	uint32_t  ts32;
 } __packed;
 
 struct bt_monitor_new_index {
-	u8_t  type;
-	u8_t  bus;
-	u8_t  bdaddr[6];
+	uint8_t  type;
+	uint8_t  bus;
+	uint8_t  bdaddr[6];
 	char  name[8];
 } __packed;
 
 struct bt_monitor_user_logging {
-	u8_t  priority;
-	u8_t  ident_len;
+	uint8_t  priority;
+	uint8_t  ident_len;
 } __packed;
 
-static inline u8_t bt_monitor_opcode(struct net_buf *buf)
+static inline uint8_t bt_monitor_opcode(struct net_buf *buf)
 {
 	switch (bt_buf_get_type(buf)) {
 	case BT_BUF_CMD:
@@ -89,9 +89,9 @@ static inline u8_t bt_monitor_opcode(struct net_buf *buf)
 	}
 }
 
-void bt_monitor_send(u16_t opcode, const void *data, size_t len);
+void bt_monitor_send(uint16_t opcode, const void *data, size_t len);
 
-void bt_monitor_new_index(u8_t type, u8_t bus, bt_addr_t *addr,
+void bt_monitor_new_index(uint8_t type, uint8_t bus, bt_addr_t *addr,
 			  const char *name);
 
 #else /* !CONFIG_BT_DEBUG_MONITOR */
diff --git a/subsys/bluetooth/host/rfcomm.c b/subsys/bluetooth/host/rfcomm.c
index 0bdb3211b0..30436fe375 100644
--- a/subsys/bluetooth/host/rfcomm.c
+++ b/subsys/bluetooth/host/rfcomm.c
@@ -65,7 +65,7 @@ NET_BUF_POOL_DEFINE(dummy_pool, CONFIG_BT_MAX_CONN, 0, 0, NULL);
 static struct bt_rfcomm_session bt_rfcomm_pool[CONFIG_BT_MAX_CONN];
 
 /* reversed, 8-bit, poly=0x07 */
-static const u8_t rfcomm_crc_table[256] = {
+static const uint8_t rfcomm_crc_table[256] = {
 	0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,
 	0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,
 	0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69,
@@ -107,9 +107,9 @@ static const u8_t rfcomm_crc_table[256] = {
 	0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf
 };
 
-static u8_t rfcomm_calc_fcs(u16_t len, const u8_t *data)
+static uint8_t rfcomm_calc_fcs(uint16_t len, const uint8_t *data)
 {
-	u8_t fcs = 0xff;
+	uint8_t fcs = 0xff;
 
 	while (len--) {
 		fcs = rfcomm_crc_table[fcs ^ *data++];
@@ -119,10 +119,10 @@ static u8_t rfcomm_calc_fcs(u16_t len, const u8_t *data)
 	return (0xff - fcs);
 }
 
-static bool rfcomm_check_fcs(u16_t len, const u8_t *data,
-			     u8_t recvd_fcs)
+static bool rfcomm_check_fcs(uint16_t len, const uint8_t *data,
+			     uint8_t recvd_fcs)
 {
-	u8_t fcs = 0xff;
+	uint8_t fcs = 0xff;
 
 	while (len--) {
 		fcs = rfcomm_crc_table[fcs ^ *data++];
@@ -136,7 +136,7 @@ static bool rfcomm_check_fcs(u16_t len, const u8_t *data,
 }
 
 static struct bt_rfcomm_dlc *rfcomm_dlcs_lookup_dlci(struct bt_rfcomm_dlc *dlcs,
-						     u8_t dlci)
+						     uint8_t dlci)
 {
 	for (; dlcs; dlcs = dlcs->_next) {
 		if (dlcs->dlci == dlci) {
@@ -148,7 +148,7 @@ static struct bt_rfcomm_dlc *rfcomm_dlcs_lookup_dlci(struct bt_rfcomm_dlc *dlcs,
 }
 
 static struct bt_rfcomm_dlc *rfcomm_dlcs_remove_dlci(struct bt_rfcomm_dlc *dlcs,
-						     u8_t dlci)
+						     uint8_t dlci)
 {
 	struct bt_rfcomm_dlc *tmp;
 
@@ -173,7 +173,7 @@ static struct bt_rfcomm_dlc *rfcomm_dlcs_remove_dlci(struct bt_rfcomm_dlc *dlcs,
 	return NULL;
 }
 
-static struct bt_rfcomm_server *rfcomm_server_lookup_channel(u8_t channel)
+static struct bt_rfcomm_server *rfcomm_server_lookup_channel(uint8_t channel)
 {
 	struct bt_rfcomm_server *server;
 
@@ -224,7 +224,7 @@ int bt_rfcomm_server_register(struct bt_rfcomm_server *server)
 }
 
 static void rfcomm_dlc_tx_give_credits(struct bt_rfcomm_dlc *dlc,
-				       u8_t credits)
+				       uint8_t credits)
 {
 	BT_DBG("dlc %p credits %u", dlc, credits);
 
@@ -251,7 +251,7 @@ static void rfcomm_dlc_destroy(struct bt_rfcomm_dlc *dlc)
 
 static void rfcomm_dlc_disconnect(struct bt_rfcomm_dlc *dlc)
 {
-	u8_t old_state = dlc->state;
+	uint8_t old_state = dlc->state;
 
 	BT_DBG("dlc %p", dlc);
 
@@ -317,11 +317,11 @@ struct net_buf *bt_rfcomm_create_pdu(struct net_buf_pool *pool)
 				  sizeof(struct bt_rfcomm_hdr) + 1);
 }
 
-static int rfcomm_send_sabm(struct bt_rfcomm_session *session, u8_t dlci)
+static int rfcomm_send_sabm(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct net_buf *buf;
-	u8_t cr, fcs;
+	uint8_t cr, fcs;
 
 	buf = bt_l2cap_create_pdu(NULL, 0);
 
@@ -337,11 +337,11 @@ static int rfcomm_send_sabm(struct bt_rfcomm_session *session, u8_t dlci)
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_disc(struct bt_rfcomm_session *session, u8_t dlci)
+static int rfcomm_send_disc(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct net_buf *buf;
-	u8_t fcs, cr;
+	uint8_t fcs, cr;
 
 	BT_DBG("dlci %d", dlci);
 
@@ -370,13 +370,13 @@ static void rfcomm_session_disconnect(struct bt_rfcomm_session *session)
 }
 
 static struct net_buf *rfcomm_make_uih_msg(struct bt_rfcomm_session *session,
-					   u8_t cr, u8_t type,
-					   u8_t len)
+					   uint8_t cr, uint8_t type,
+					   uint8_t len)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct bt_rfcomm_msg_hdr *msg_hdr;
 	struct net_buf *buf;
-	u8_t hdr_cr;
+	uint8_t hdr_cr;
 
 	buf = bt_l2cap_create_pdu(NULL, 0);
 
@@ -434,7 +434,7 @@ static void rfcomm_dlc_rtx_timeout(struct k_work *work)
 
 static void rfcomm_dlc_init(struct bt_rfcomm_dlc *dlc,
 			    struct bt_rfcomm_session *session,
-			    u8_t dlci,
+			    uint8_t dlci,
 			    bt_rfcomm_role_t role)
 {
 	BT_DBG("dlc %p", dlc);
@@ -454,11 +454,11 @@ static void rfcomm_dlc_init(struct bt_rfcomm_dlc *dlc,
 }
 
 static struct bt_rfcomm_dlc *rfcomm_dlc_accept(struct bt_rfcomm_session *session,
-					       u8_t dlci)
+					       uint8_t dlci)
 {
 	struct bt_rfcomm_server *server;
 	struct bt_rfcomm_dlc *dlc;
-	u8_t channel;
+	uint8_t channel;
 
 	channel = BT_RFCOMM_GET_CHANNEL(dlci);
 	server = rfcomm_server_lookup_channel(channel);
@@ -483,11 +483,11 @@ static struct bt_rfcomm_dlc *rfcomm_dlc_accept(struct bt_rfcomm_session *session
 	return dlc;
 }
 
-static int rfcomm_send_dm(struct bt_rfcomm_session *session, u8_t dlci)
+static int rfcomm_send_dm(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct net_buf *buf;
-	u8_t fcs, cr;
+	uint8_t fcs, cr;
 
 	BT_DBG("dlci %d", dlci);
 
@@ -591,11 +591,11 @@ static void rfcomm_dlc_tx_thread(void *p1, void *p2, void *p3)
 	BT_DBG("dlc %p exiting", dlc);
 }
 
-static int rfcomm_send_ua(struct bt_rfcomm_session *session, u8_t dlci)
+static int rfcomm_send_ua(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct net_buf *buf;
-	u8_t cr, fcs;
+	uint8_t cr, fcs;
 
 	buf = bt_l2cap_create_pdu(NULL, 0);
 
@@ -611,12 +611,12 @@ static int rfcomm_send_ua(struct bt_rfcomm_session *session, u8_t dlci)
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_msc(struct bt_rfcomm_dlc *dlc, u8_t cr,
-			   u8_t v24_signal)
+static int rfcomm_send_msc(struct bt_rfcomm_dlc *dlc, uint8_t cr,
+			   uint8_t v24_signal)
 {
 	struct bt_rfcomm_msc *msc;
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(dlc->session, cr, BT_RFCOMM_MSC,
 				  sizeof(*msc));
@@ -632,12 +632,12 @@ static int rfcomm_send_msc(struct bt_rfcomm_dlc *dlc, u8_t cr,
 	return bt_l2cap_chan_send(&dlc->session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_rls(struct bt_rfcomm_dlc *dlc, u8_t cr,
-			   u8_t line_status)
+static int rfcomm_send_rls(struct bt_rfcomm_dlc *dlc, uint8_t cr,
+			   uint8_t line_status)
 {
 	struct bt_rfcomm_rls *rls;
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(dlc->session, cr, BT_RFCOMM_RLS,
 				  sizeof(*rls));
@@ -653,11 +653,11 @@ static int rfcomm_send_rls(struct bt_rfcomm_dlc *dlc, u8_t cr,
 	return bt_l2cap_chan_send(&dlc->session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_rpn(struct bt_rfcomm_session *session, u8_t cr,
+static int rfcomm_send_rpn(struct bt_rfcomm_session *session, uint8_t cr,
 			   struct bt_rfcomm_rpn *rpn)
 {
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(session, cr, BT_RFCOMM_RPN, sizeof(*rpn));
 
@@ -669,11 +669,11 @@ static int rfcomm_send_rpn(struct bt_rfcomm_session *session, u8_t cr,
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_test(struct bt_rfcomm_session *session, u8_t cr,
-			    u8_t *pattern, u8_t len)
+static int rfcomm_send_test(struct bt_rfcomm_session *session, uint8_t cr,
+			    uint8_t *pattern, uint8_t len)
 {
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(session, cr, BT_RFCOMM_TEST, len);
 
@@ -685,10 +685,10 @@ static int rfcomm_send_test(struct bt_rfcomm_session *session, u8_t cr,
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_nsc(struct bt_rfcomm_session *session, u8_t cmd_type)
+static int rfcomm_send_nsc(struct bt_rfcomm_session *session, uint8_t cmd_type)
 {
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(session, BT_RFCOMM_MSG_RESP_CR,
 				  BT_RFCOMM_NSC, sizeof(cmd_type));
@@ -701,10 +701,10 @@ static int rfcomm_send_nsc(struct bt_rfcomm_session *session, u8_t cmd_type)
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_fcon(struct bt_rfcomm_session *session, u8_t cr)
+static int rfcomm_send_fcon(struct bt_rfcomm_session *session, uint8_t cr)
 {
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(session, cr, BT_RFCOMM_FCON, 0);
 
@@ -714,10 +714,10 @@ static int rfcomm_send_fcon(struct bt_rfcomm_session *session, u8_t cr)
 	return bt_l2cap_chan_send(&session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_fcoff(struct bt_rfcomm_session *session, u8_t cr)
+static int rfcomm_send_fcoff(struct bt_rfcomm_session *session, uint8_t cr)
 {
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(session, cr, BT_RFCOMM_FCOFF, 0);
 
@@ -844,7 +844,7 @@ static int rfcomm_dlc_close(struct bt_rfcomm_dlc *dlc)
 	return 0;
 }
 
-static void rfcomm_handle_sabm(struct bt_rfcomm_session *session, u8_t dlci)
+static void rfcomm_handle_sabm(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	if (!dlci) {
 		if (rfcomm_send_ua(session, dlci) < 0) {
@@ -890,11 +890,11 @@ static void rfcomm_handle_sabm(struct bt_rfcomm_session *session, u8_t dlci)
 	}
 }
 
-static int rfcomm_send_pn(struct bt_rfcomm_dlc *dlc, u8_t cr)
+static int rfcomm_send_pn(struct bt_rfcomm_dlc *dlc, uint8_t cr)
 {
 	struct bt_rfcomm_pn *pn;
 	struct net_buf *buf;
-	u8_t fcs;
+	uint8_t fcs;
 
 	buf = rfcomm_make_uih_msg(dlc->session, cr, BT_RFCOMM_PN, sizeof(*pn));
 
@@ -929,11 +929,11 @@ static int rfcomm_send_pn(struct bt_rfcomm_dlc *dlc, u8_t cr)
 	return bt_l2cap_chan_send(&dlc->session->br_chan.chan, buf);
 }
 
-static int rfcomm_send_credit(struct bt_rfcomm_dlc *dlc, u8_t credits)
+static int rfcomm_send_credit(struct bt_rfcomm_dlc *dlc, uint8_t credits)
 {
 	struct bt_rfcomm_hdr *hdr;
 	struct net_buf *buf;
-	u8_t fcs, cr;
+	uint8_t fcs, cr;
 
 	BT_DBG("Dlc %p credits %d", dlc, credits);
 
@@ -976,7 +976,7 @@ static int rfcomm_dlc_start(struct bt_rfcomm_dlc *dlc)
 	return 0;
 }
 
-static void rfcomm_handle_ua(struct bt_rfcomm_session *session, u8_t dlci)
+static void rfcomm_handle_ua(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_dlc *dlc, *next;
 	int err;
@@ -1029,7 +1029,7 @@ static void rfcomm_handle_ua(struct bt_rfcomm_session *session, u8_t dlci)
 	}
 }
 
-static void rfcomm_handle_dm(struct bt_rfcomm_session *session, u8_t dlci)
+static void rfcomm_handle_dm(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_dlc *dlc;
 
@@ -1045,11 +1045,11 @@ static void rfcomm_handle_dm(struct bt_rfcomm_session *session, u8_t dlci)
 }
 
 static void rfcomm_handle_msc(struct bt_rfcomm_session *session,
-			      struct net_buf *buf, u8_t cr)
+			      struct net_buf *buf, uint8_t cr)
 {
 	struct bt_rfcomm_msc *msc = (void *)buf->data;
 	struct bt_rfcomm_dlc *dlc;
-	u8_t dlci = BT_RFCOMM_GET_DLCI(msc->dlci);
+	uint8_t dlci = BT_RFCOMM_GET_DLCI(msc->dlci);
 
 	BT_DBG("dlci %d", dlci);
 
@@ -1085,10 +1085,10 @@ static void rfcomm_handle_msc(struct bt_rfcomm_session *session,
 }
 
 static void rfcomm_handle_rls(struct bt_rfcomm_session *session,
-			      struct net_buf *buf, u8_t cr)
+			      struct net_buf *buf, uint8_t cr)
 {
 	struct bt_rfcomm_rls *rls = (void *)buf->data;
-	u8_t dlci = BT_RFCOMM_GET_DLCI(rls->dlci);
+	uint8_t dlci = BT_RFCOMM_GET_DLCI(rls->dlci);
 	struct bt_rfcomm_dlc *dlc;
 
 	BT_DBG("dlci %d", dlci);
@@ -1108,13 +1108,13 @@ static void rfcomm_handle_rls(struct bt_rfcomm_session *session,
 }
 
 static void rfcomm_handle_rpn(struct bt_rfcomm_session *session,
-			      struct net_buf *buf, u8_t cr)
+			      struct net_buf *buf, uint8_t cr)
 {
 	struct bt_rfcomm_rpn default_rpn, *rpn = (void *)buf->data;
-	u8_t dlci = BT_RFCOMM_GET_DLCI(rpn->dlci);
-	u8_t data_bits, stop_bits, parity_bits;
+	uint8_t dlci = BT_RFCOMM_GET_DLCI(rpn->dlci);
+	uint8_t data_bits, stop_bits, parity_bits;
 	/* Exclude fcs to get number of value bytes */
-	u8_t value_len = buf->len - 1;
+	uint8_t value_len = buf->len - 1;
 
 	BT_DBG("dlci %d", dlci);
 
@@ -1154,7 +1154,7 @@ static void rfcomm_handle_rpn(struct bt_rfcomm_session *session,
 }
 
 static void rfcomm_handle_pn(struct bt_rfcomm_session *session,
-			     struct net_buf *buf, u8_t cr)
+			     struct net_buf *buf, uint8_t cr)
 {
 	struct bt_rfcomm_pn *pn = (void *)buf->data;
 	struct bt_rfcomm_dlc *dlc;
@@ -1228,7 +1228,7 @@ static void rfcomm_handle_pn(struct bt_rfcomm_session *session,
 	}
 }
 
-static void rfcomm_handle_disc(struct bt_rfcomm_session *session, u8_t dlci)
+static void rfcomm_handle_disc(struct bt_rfcomm_session *session, uint8_t dlci)
 {
 	struct bt_rfcomm_dlc *dlc;
 
@@ -1261,7 +1261,7 @@ static void rfcomm_handle_msg(struct bt_rfcomm_session *session,
 			      struct net_buf *buf)
 {
 	struct bt_rfcomm_msg_hdr *hdr;
-	u8_t msg_type, len, cr;
+	uint8_t msg_type, len, cr;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small RFCOMM message");
@@ -1339,7 +1339,7 @@ static void rfcomm_handle_msg(struct bt_rfcomm_session *session,
 
 static void rfcomm_dlc_update_credits(struct bt_rfcomm_dlc *dlc)
 {
-	u8_t credits;
+	uint8_t credits;
 
 	if (dlc->session->cfc == BT_RFCOMM_CFC_NOT_SUPPORTED) {
 		return;
@@ -1360,7 +1360,7 @@ static void rfcomm_dlc_update_credits(struct bt_rfcomm_dlc *dlc)
 }
 
 static void rfcomm_handle_data(struct bt_rfcomm_session *session,
-			       struct net_buf *buf, u8_t dlci, u8_t pf)
+			       struct net_buf *buf, uint8_t dlci, uint8_t pf)
 
 {
 	struct bt_rfcomm_dlc *dlc;
@@ -1406,7 +1406,7 @@ static void rfcomm_handle_data(struct bt_rfcomm_session *session,
 int bt_rfcomm_dlc_send(struct bt_rfcomm_dlc *dlc, struct net_buf *buf)
 {
 	struct bt_rfcomm_hdr *hdr;
-	u8_t fcs, cr;
+	uint8_t fcs, cr;
 
 	if (!buf) {
 		return -EINVAL;
@@ -1423,11 +1423,11 @@ int bt_rfcomm_dlc_send(struct bt_rfcomm_dlc *dlc, struct net_buf *buf)
 	}
 
 	if (buf->len > BT_RFCOMM_MAX_LEN_8) {
-		u16_t *len;
+		uint16_t *len;
 
 		/* Length is 2 byte */
 		hdr = net_buf_push(buf, sizeof(*hdr) + 1);
-		len = (u16_t *)&hdr->length;
+		len = (uint16_t *)&hdr->length;
 		*len = BT_RFCOMM_SET_LEN_16(sys_cpu_to_le16(buf->len -
 							    sizeof(*hdr) - 1));
 	} else {
@@ -1452,7 +1452,7 @@ static int rfcomm_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_rfcomm_session *session = RFCOMM_SESSION(chan);
 	struct bt_rfcomm_hdr *hdr = (void *)buf->data;
-	u8_t dlci, frame_type, fcs, fcs_len;
+	uint8_t dlci, frame_type, fcs, fcs_len;
 
 	/* Need to consider FCS also*/
 	if (buf->len < (sizeof(*hdr) + 1)) {
@@ -1510,7 +1510,7 @@ static int rfcomm_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 }
 
 static void rfcomm_encrypt_change(struct bt_l2cap_chan *chan,
-				  u8_t hci_status)
+				  uint8_t hci_status)
 {
 	struct bt_rfcomm_session *session = RFCOMM_SESSION(chan);
 	struct bt_conn *conn = chan->conn;
@@ -1597,11 +1597,11 @@ static struct bt_rfcomm_session *rfcomm_session_new(bt_rfcomm_role_t role)
 }
 
 int bt_rfcomm_dlc_connect(struct bt_conn *conn, struct bt_rfcomm_dlc *dlc,
-			  u8_t channel)
+			  uint8_t channel)
 {
 	struct bt_rfcomm_session *session;
 	struct bt_l2cap_chan *chan;
-	u8_t dlci;
+	uint8_t dlci;
 	int ret;
 
 	BT_DBG("conn %p dlc %p channel %d", conn, dlc, channel);
diff --git a/subsys/bluetooth/host/rfcomm_internal.h b/subsys/bluetooth/host/rfcomm_internal.h
index dc4bf0a521..0a23824f11 100644
--- a/subsys/bluetooth/host/rfcomm_internal.h
+++ b/subsys/bluetooth/host/rfcomm_internal.h
@@ -25,8 +25,8 @@ struct bt_rfcomm_session {
 	/* Binary sem for aggregate fc */
 	struct k_sem fc;
 	struct bt_rfcomm_dlc *dlcs;
-	u16_t mtu;
-	u8_t state;
+	uint16_t mtu;
+	uint8_t state;
 	bt_rfcomm_role_t role;
 	bt_rfcomm_cfc_t cfc;
 };
@@ -44,9 +44,9 @@ enum {
 };
 
 struct bt_rfcomm_hdr {
-	u8_t address;
-	u8_t control;
-	u8_t length;
+	uint8_t address;
+	uint8_t control;
+	uint8_t length;
 } __packed;
 
 #define BT_RFCOMM_SABM  0x2f
@@ -54,25 +54,25 @@ struct bt_rfcomm_hdr {
 #define BT_RFCOMM_UIH   0xef
 
 struct bt_rfcomm_msg_hdr {
-	u8_t type;
-	u8_t len;
+	uint8_t type;
+	uint8_t len;
 } __packed;
 
 #define BT_RFCOMM_PN    0x20
 struct bt_rfcomm_pn {
-	u8_t  dlci;
-	u8_t  flow_ctrl;
-	u8_t  priority;
-	u8_t  ack_timer;
-	u16_t mtu;
-	u8_t  max_retrans;
-	u8_t  credits;
+	uint8_t  dlci;
+	uint8_t  flow_ctrl;
+	uint8_t  priority;
+	uint8_t  ack_timer;
+	uint16_t mtu;
+	uint8_t  max_retrans;
+	uint8_t  credits;
 } __packed;
 
 #define BT_RFCOMM_MSC    0x38
 struct bt_rfcomm_msc {
-	u8_t  dlci;
-	u8_t  v24_signal;
+	uint8_t  dlci;
+	uint8_t  v24_signal;
 } __packed;
 
 #define BT_RFCOMM_DISC  0x43
@@ -80,19 +80,19 @@ struct bt_rfcomm_msc {
 
 #define BT_RFCOMM_RLS   0x14
 struct bt_rfcomm_rls {
-	u8_t  dlci;
-	u8_t  line_status;
+	uint8_t  dlci;
+	uint8_t  line_status;
 } __packed;
 
 #define BT_RFCOMM_RPN   0x24
 struct bt_rfcomm_rpn {
-	u8_t  dlci;
-	u8_t  baud_rate;
-	u8_t  line_settings;
-	u8_t  flow_control;
-	u8_t  xon_char;
-	u8_t  xoff_char;
-	u16_t param_mask;
+	uint8_t  dlci;
+	uint8_t  baud_rate;
+	uint8_t  line_settings;
+	uint8_t  flow_control;
+	uint8_t  xon_char;
+	uint8_t  xoff_char;
+	uint16_t param_mask;
 } __packed;
 
 #define BT_RFCOMM_TEST  0x08
diff --git a/subsys/bluetooth/host/sdp.c b/subsys/bluetooth/host/sdp.c
index 72144942b4..f1371b879c 100644
--- a/subsys/bluetooth/host/sdp.c
+++ b/subsys/bluetooth/host/sdp.c
@@ -63,7 +63,7 @@ struct bt_sdp {
 };
 
 static struct bt_sdp_record *db;
-static u8_t num_services;
+static uint8_t num_services;
 
 static struct bt_sdp bt_sdp_pool[CONFIG_BT_MAX_CONN];
 
@@ -80,7 +80,7 @@ struct bt_sdp_client {
 	/* list of waiting to be resolved UUID params */
 	sys_slist_t                          reqs;
 	/* required SDP transaction ID */
-	u16_t                                tid;
+	uint16_t                                tid;
 	/* UUID params holder being now resolved */
 	const struct bt_sdp_discover_params *param;
 	/* PDU continuation state object */
@@ -97,9 +97,9 @@ enum {
 };
 
 struct search_state {
-	u16_t att_list_size;
-	u8_t  current_svc;
-	u8_t  last_att;
+	uint16_t att_list_size;
+	uint8_t  current_svc;
+	uint8_t  last_att;
 	bool     pkt_full;
 };
 
@@ -109,11 +109,11 @@ struct select_attrs_data {
 	struct bt_sdp               *sdp;
 	struct bt_sdp_data_elem_seq *seq;
 	struct search_state         *state;
-	u32_t                       *filter;
-	u16_t                        max_att_len;
-	u16_t                        att_list_len;
-	u8_t                         cont_state_size;
-	u8_t                         num_filters;
+	uint32_t                       *filter;
+	uint16_t                        max_att_len;
+	uint16_t                        att_list_len;
+	uint8_t                         cont_state_size;
+	uint8_t                         num_filters;
 	bool                         new_service;
 };
 
@@ -127,8 +127,8 @@ struct select_attrs_data {
  *  @return BT_SDP_ITER_CONTINUE if should continue to the next attribute
  *  or BT_SDP_ITER_STOP to stop.
  */
-typedef u8_t (*bt_sdp_attr_func_t)(struct bt_sdp_attribute *attr,
-				   u8_t att_idx, void *user_data);
+typedef uint8_t (*bt_sdp_attr_func_t)(struct bt_sdp_attribute *attr,
+				   uint8_t att_idx, void *user_data);
 
 /* @typedef bt_sdp_svc_func_t
  * @brief SDP service record iterator callback.
@@ -139,7 +139,7 @@ typedef u8_t (*bt_sdp_attr_func_t)(struct bt_sdp_attribute *attr,
  * @return BT_SDP_ITER_CONTINUE if should continue to the next service record
  *  or BT_SDP_ITER_STOP to stop.
  */
-typedef u8_t (*bt_sdp_svc_func_t)(struct bt_sdp_record *rec,
+typedef uint8_t (*bt_sdp_svc_func_t)(struct bt_sdp_record *rec,
 				  void *user_data);
 
 /* @brief Callback for SDP connection
@@ -209,10 +209,10 @@ static struct net_buf *bt_sdp_create_pdu(void)
  *  @return None
  */
 static void bt_sdp_send(struct bt_l2cap_chan *chan, struct net_buf *buf,
-			u8_t op, u16_t tid)
+			uint8_t op, uint16_t tid)
 {
 	struct bt_sdp_hdr *hdr;
-	u16_t param_len = buf->len;
+	uint16_t param_len = buf->len;
 
 	hdr = net_buf_push(buf, sizeof(struct bt_sdp_hdr));
 	hdr->op_code = op;
@@ -232,8 +232,8 @@ static void bt_sdp_send(struct bt_l2cap_chan *chan, struct net_buf *buf,
  *
  *  @return None
  */
-static void send_err_rsp(struct bt_l2cap_chan *chan, u16_t err,
-			 u16_t tid)
+static void send_err_rsp(struct bt_l2cap_chan *chan, uint16_t err,
+			 uint16_t tid)
 {
 	struct net_buf *buf;
 
@@ -257,10 +257,10 @@ static void send_err_rsp(struct bt_l2cap_chan *chan, u16_t err,
  *
  * @return 0 for success, or relevant error code
  */
-static u16_t parse_data_elem(struct net_buf *buf,
+static uint16_t parse_data_elem(struct net_buf *buf,
 				struct bt_sdp_data_elem *data_elem)
 {
-	u8_t size_field_len = 0U; /* Space used to accommodate the size */
+	uint8_t size_field_len = 0U; /* Space used to accommodate the size */
 
 	if (buf->len < 1) {
 		BT_WARN("Malformed packet");
@@ -333,11 +333,11 @@ static u16_t parse_data_elem(struct net_buf *buf,
  * @return Size of the last data element that has been searched
  *  (used in recursion)
  */
-static u32_t search_uuid(struct bt_sdp_data_elem *elem, struct bt_uuid *uuid,
-			 bool *found, u8_t nest_level)
+static uint32_t search_uuid(struct bt_sdp_data_elem *elem, struct bt_uuid *uuid,
+			 bool *found, uint8_t nest_level)
 {
-	const u8_t *cur_elem;
-	u32_t seq_size, size;
+	const uint8_t *cur_elem;
+	uint32_t seq_size, size;
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
@@ -360,13 +360,13 @@ static u32_t search_uuid(struct bt_sdp_data_elem *elem, struct bt_uuid *uuid,
 	if ((elem->type & BT_SDP_TYPE_DESC_MASK) == BT_SDP_UUID_UNSPEC) {
 		if (seq_size == 2U) {
 			u.uuid.type = BT_UUID_TYPE_16;
-			u.u16.val = *((u16_t *)cur_elem);
+			u.u16.val = *((uint16_t *)cur_elem);
 			if (!bt_uuid_cmp(&u.uuid, uuid)) {
 				*found = true;
 			}
 		} else if (seq_size == 4U) {
 			u.uuid.type = BT_UUID_TYPE_32;
-			u.u32.val = *((u32_t *)cur_elem);
+			u.u32.val = *((uint32_t *)cur_elem);
 			if (!bt_uuid_cmp(&u.uuid, uuid)) {
 				*found = true;
 			}
@@ -433,7 +433,7 @@ static struct bt_sdp_record *bt_sdp_foreach_svc(bt_sdp_svc_func_t func,
  *
  * @return BT_SDP_ITER_CONTINUE to move on to the next record.
  */
-static u8_t insert_record(struct bt_sdp_record *rec, void *user_data)
+static uint8_t insert_record(struct bt_sdp_record *rec, void *user_data)
 {
 	struct bt_sdp_record **rec_list = user_data;
 
@@ -455,14 +455,14 @@ static u8_t insert_record(struct bt_sdp_record *rec, void *user_data)
  *
  * @return 0 for success, or relevant error code
  */
-static u16_t find_services(struct net_buf *buf,
+static uint16_t find_services(struct net_buf *buf,
 			      struct bt_sdp_record **matching_recs)
 {
 	struct bt_sdp_data_elem data_elem;
 	struct bt_sdp_record *record;
-	u32_t uuid_list_size;
-	u16_t res;
-	u8_t att_idx, rec_idx = 0U;
+	uint32_t uuid_list_size;
+	uint16_t res;
+	uint8_t att_idx, rec_idx = 0U;
 	bool found;
 	union {
 		struct bt_uuid uuid;
@@ -569,15 +569,15 @@ static u16_t find_services(struct net_buf *buf,
  *
  * @return 0 for success, or relevant error code
  */
-static u16_t sdp_svc_search_req(struct bt_sdp *sdp, struct net_buf *buf,
-				u16_t tid)
+static uint16_t sdp_svc_search_req(struct bt_sdp *sdp, struct net_buf *buf,
+				uint16_t tid)
 {
 	struct bt_sdp_svc_rsp *rsp;
 	struct net_buf *resp_buf;
 	struct bt_sdp_record *record;
 	struct bt_sdp_record *matching_recs[BT_SDP_MAX_SERVICES];
-	u16_t max_rec_count, total_recs = 0U, current_recs = 0U, res;
-	u8_t cont_state_size, cont_state = 0U, idx = 0U, count = 0U;
+	uint16_t max_rec_count, total_recs = 0U, current_recs = 0U, res;
+	uint8_t cont_state_size, cont_state = 0U, idx = 0U, count = 0U;
 	bool pkt_full = false;
 
 	res = find_services(buf, matching_recs);
@@ -705,11 +705,11 @@ static u16_t sdp_svc_search_req(struct bt_sdp *sdp, struct net_buf *buf,
  *  @return Size of the last data element that has been searched
  *  (used in recursion)
  */
-static u32_t copy_attribute(struct bt_sdp_data_elem *elem,
-			    struct net_buf *buf, u8_t nest_level)
+static uint32_t copy_attribute(struct bt_sdp_data_elem *elem,
+			    struct net_buf *buf, uint8_t nest_level)
 {
-	const u8_t *cur_elem;
-	u32_t size, seq_size, total_size;
+	const uint8_t *cur_elem;
+	uint32_t size, seq_size, total_size;
 
 	/* Limit recursion depth to avoid stack overflows */
 	if (nest_level == SDP_DATA_ELEM_NEST_LEVEL_MAX) {
@@ -750,11 +750,11 @@ static u32_t copy_attribute(struct bt_sdp_data_elem *elem,
 		   (elem->type & BT_SDP_TYPE_DESC_MASK) == BT_SDP_INT8 ||
 		   (elem->type & BT_SDP_TYPE_DESC_MASK) == BT_SDP_UUID_UNSPEC) {
 		if (seq_size == 1U) {
-			net_buf_add_u8(buf, *((u8_t *)elem->data));
+			net_buf_add_u8(buf, *((uint8_t *)elem->data));
 		} else if (seq_size == 2U) {
-			net_buf_add_be16(buf, *((u16_t *)elem->data));
+			net_buf_add_be16(buf, *((uint16_t *)elem->data));
 		} else if (seq_size == 4U) {
-			net_buf_add_be32(buf, *((u32_t *)elem->data));
+			net_buf_add_be32(buf, *((uint32_t *)elem->data));
 		} else {
 			/* TODO: Convert 32bit and 128bit values to big-endian*/
 			net_buf_add_mem(buf, elem->data, seq_size);
@@ -777,7 +777,7 @@ static u32_t copy_attribute(struct bt_sdp_data_elem *elem,
  *
  *  @return Index of the attribute where the iterator stopped
  */
-static u8_t bt_sdp_foreach_attr(struct bt_sdp_record *record, u8_t idx,
+static uint8_t bt_sdp_foreach_attr(struct bt_sdp_record *record, uint8_t idx,
 				bt_sdp_attr_func_t func, void *user_data)
 {
 	for (; idx < record->attr_count; idx++) {
@@ -803,13 +803,13 @@ static u8_t bt_sdp_foreach_attr(struct bt_sdp_record *record, u8_t idx,
  *  @return BT_SDP_ITER_CONTINUE if should continue to the next attribute
  *   or BT_SDP_ITER_STOP to stop.
  */
-static u8_t select_attrs(struct bt_sdp_attribute *attr, u8_t att_idx,
+static uint8_t select_attrs(struct bt_sdp_attribute *attr, uint8_t att_idx,
 			 void *user_data)
 {
 	struct select_attrs_data *sad = user_data;
-	u16_t att_id_lower, att_id_upper, att_id_cur, space;
-	u32_t attr_size, seq_size;
-	u8_t idx_filter;
+	uint16_t att_id_lower, att_id_upper, att_id_cur, space;
+	uint32_t attr_size, seq_size;
+	uint8_t idx_filter;
 
 	for (idx_filter = 0U; idx_filter < sad->num_filters; idx_filter++) {
 
@@ -933,14 +933,14 @@ static u8_t select_attrs(struct bt_sdp_attribute *attr, u8_t att_idx,
  *
  *  @return len Length of the attribute list created
  */
-static u16_t create_attr_list(struct bt_sdp *sdp, struct bt_sdp_record *record,
-			      u32_t *filter, u8_t num_filters,
-			      u16_t max_att_len, u8_t cont_state_size,
-			      u8_t next_att, struct search_state *state,
+static uint16_t create_attr_list(struct bt_sdp *sdp, struct bt_sdp_record *record,
+			      uint32_t *filter, uint8_t num_filters,
+			      uint16_t max_att_len, uint8_t cont_state_size,
+			      uint8_t next_att, struct search_state *state,
 			      struct net_buf *rsp_buf)
 {
 	struct select_attrs_data sad;
-	u8_t idx_att;
+	uint8_t idx_att;
 
 	sad.num_filters = num_filters;
 	sad.rec = record;
@@ -977,12 +977,12 @@ static u16_t create_attr_list(struct bt_sdp *sdp, struct bt_sdp_record *record,
  *
  *  @return 0 for success, or relevant error code
  */
-static u16_t get_att_search_list(struct net_buf *buf, u32_t *filter,
-				 u8_t *num_filters)
+static uint16_t get_att_search_list(struct net_buf *buf, uint32_t *filter,
+				 uint8_t *num_filters)
 {
 	struct bt_sdp_data_elem data_elem;
-	u16_t res;
-	u32_t size;
+	uint16_t res;
+	uint32_t size;
 
 	*num_filters = 0U;
 	res = parse_data_elem(buf, &data_elem);
@@ -1036,9 +1036,9 @@ static u16_t get_att_search_list(struct net_buf *buf, u32_t *filter,
  *  @return BT_SDP_ITER_CONTINUE if should continue to the next record
  *   or BT_SDP_ITER_STOP to stop.
  */
-static u8_t find_handle(struct bt_sdp_record *rec, void *user_data)
+static uint8_t find_handle(struct bt_sdp_record *rec, void *user_data)
 {
-	u32_t *svc_rec_hdl = user_data;
+	uint32_t *svc_rec_hdl = user_data;
 
 	if (rec->handle == *svc_rec_hdl) {
 		return BT_SDP_ITER_STOP;
@@ -1057,10 +1057,10 @@ static u8_t find_handle(struct bt_sdp_record *rec, void *user_data)
  *
  *  @return 0 for success, or relevant error code
  */
-static u16_t sdp_svc_att_req(struct bt_sdp *sdp, struct net_buf *buf,
-			     u16_t tid)
+static uint16_t sdp_svc_att_req(struct bt_sdp *sdp, struct net_buf *buf,
+			     uint16_t tid)
 {
-	u32_t filter[MAX_NUM_ATT_ID_FILTER];
+	uint32_t filter[MAX_NUM_ATT_ID_FILTER];
 	struct search_state state = {
 		.current_svc = SDP_INVALID,
 		.last_att = SDP_INVALID,
@@ -1069,9 +1069,9 @@ static u16_t sdp_svc_att_req(struct bt_sdp *sdp, struct net_buf *buf,
 	struct bt_sdp_record *record;
 	struct bt_sdp_att_rsp *rsp;
 	struct net_buf *rsp_buf;
-	u32_t svc_rec_hdl;
-	u16_t max_att_len, res, att_list_len;
-	u8_t num_filters, cont_state_size, next_att = 0U;
+	uint32_t svc_rec_hdl;
+	uint16_t max_att_len, res, att_list_len;
+	uint8_t num_filters, cont_state_size, next_att = 0U;
 
 	if (buf->len < 6) {
 		BT_WARN("Malformed packet");
@@ -1171,10 +1171,10 @@ static u16_t sdp_svc_att_req(struct bt_sdp *sdp, struct net_buf *buf,
  *
  *  @return 0 for success, or relevant error code
  */
-static u16_t sdp_svc_search_att_req(struct bt_sdp *sdp, struct net_buf *buf,
-				    u16_t tid)
+static uint16_t sdp_svc_search_att_req(struct bt_sdp *sdp, struct net_buf *buf,
+				    uint16_t tid)
 {
-	u32_t filter[MAX_NUM_ATT_ID_FILTER];
+	uint32_t filter[MAX_NUM_ATT_ID_FILTER];
 	struct bt_sdp_record *matching_recs[BT_SDP_MAX_SERVICES];
 	struct search_state state = {
 		.att_list_size = 0,
@@ -1186,8 +1186,8 @@ static u16_t sdp_svc_search_att_req(struct bt_sdp *sdp, struct net_buf *buf,
 	struct bt_sdp_record *record;
 	struct bt_sdp_att_rsp *rsp;
 	struct bt_sdp_data_elem_seq *seq = NULL;
-	u16_t max_att_len, res, att_list_len = 0U;
-	u8_t num_filters, cont_state_size, next_svc = 0U, next_att = 0U;
+	uint16_t max_att_len, res, att_list_len = 0U;
+	uint8_t num_filters, cont_state_size, next_svc = 0U, next_att = 0U;
 	bool dry_run = false;
 
 	res = find_services(buf, matching_recs);
@@ -1316,8 +1316,8 @@ static u16_t sdp_svc_search_att_req(struct bt_sdp *sdp, struct net_buf *buf,
 }
 
 static const struct {
-	u8_t  op_code;
-	u16_t  (*func)(struct bt_sdp *sdp, struct net_buf *buf, u16_t tid);
+	uint8_t  op_code;
+	uint16_t  (*func)(struct bt_sdp *sdp, struct net_buf *buf, uint16_t tid);
 } handlers[] = {
 	{ BT_SDP_SVC_SEARCH_REQ, sdp_svc_search_req },
 	{ BT_SDP_SVC_ATTR_REQ, sdp_svc_att_req },
@@ -1340,7 +1340,7 @@ static int bt_sdp_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 			struct bt_l2cap_br_chan, chan);
 	struct bt_sdp *sdp = CONTAINER_OF(ch, struct bt_sdp, chan);
 	struct bt_sdp_hdr *hdr;
-	u16_t err = BT_SDP_INVALID_SYNTAX;
+	uint16_t err = BT_SDP_INVALID_SYNTAX;
 	size_t i;
 
 	BT_DBG("chan %p, ch %p, cid 0x%04x", chan, ch, ch->tx.cid);
@@ -1434,7 +1434,7 @@ void bt_sdp_init(void)
 
 int bt_sdp_register_service(struct bt_sdp_record *service)
 {
-	u32_t handle = SDP_SERVICE_HANDLE_BASE;
+	uint32_t handle = SDP_SERVICE_HANDLE_BASE;
 
 	if (!service) {
 		BT_ERR("No service record specified");
@@ -1453,7 +1453,7 @@ int bt_sdp_register_service(struct bt_sdp_record *service)
 	service->next = db;
 	service->index = num_services++;
 	service->handle = handle;
-	*((u32_t *)(service->attrs[0].val.data)) = handle;
+	*((uint32_t *)(service->attrs[0].val.data)) = handle;
 	db = service;
 
 	BT_DBG("Service registered at %u", handle);
@@ -1591,11 +1591,11 @@ static void sdp_client_params_iterator(struct bt_sdp_client *session)
 	}
 }
 
-static u16_t sdp_client_get_total(struct bt_sdp_client *session,
-				  struct net_buf *buf, u16_t *total)
+static uint16_t sdp_client_get_total(struct bt_sdp_client *session,
+				  struct net_buf *buf, uint16_t *total)
 {
-	u16_t pulled;
-	u8_t seq;
+	uint16_t pulled;
+	uint8_t seq;
 
 	/*
 	 * Pull value of total octets of all attributes available to be
@@ -1631,10 +1631,10 @@ static u16_t sdp_client_get_total(struct bt_sdp_client *session,
 	return pulled;
 }
 
-static u16_t get_record_len(struct net_buf *buf)
+static uint16_t get_record_len(struct net_buf *buf)
 {
-	u16_t len;
-	u8_t seq;
+	uint16_t len;
+	uint8_t seq;
 
 	seq = net_buf_pull_u8(buf);
 
@@ -1666,8 +1666,8 @@ static void sdp_client_notify_result(struct bt_sdp_client *session,
 {
 	struct bt_conn *conn = session->chan.chan.conn;
 	struct bt_sdp_client_result result;
-	u16_t rec_len;
-	u8_t user_ret;
+	uint16_t rec_len;
+	uint8_t user_ret;
 
 	result.uuid = session->param->uuid;
 
@@ -1720,8 +1720,8 @@ static int sdp_client_receive(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	struct bt_sdp_client *session = SDP_CLIENT_CHAN(chan);
 	struct bt_sdp_hdr *hdr;
 	struct bt_sdp_pdu_cstate *cstate;
-	u16_t len, tid, frame_len;
-	u16_t total;
+	uint16_t len, tid, frame_len;
+	uint16_t total;
 
 	BT_DBG("session %p buf %p", session, buf);
 
@@ -1966,7 +1966,7 @@ int bt_sdp_discover(struct bt_conn *conn,
 }
 
 /* Helper getting length of data determined by DTD for integers */
-static inline ssize_t sdp_get_int_len(const u8_t *data, size_t len)
+static inline ssize_t sdp_get_int_len(const uint8_t *data, size_t len)
 {
 	BT_ASSERT(data);
 
@@ -2014,7 +2014,7 @@ static inline ssize_t sdp_get_int_len(const u8_t *data, size_t len)
 }
 
 /* Helper getting length of data determined by DTD for UUID */
-static inline ssize_t sdp_get_uuid_len(const u8_t *data, size_t len)
+static inline ssize_t sdp_get_uuid_len(const uint8_t *data, size_t len)
 {
 	BT_ASSERT(data);
 
@@ -2042,9 +2042,9 @@ static inline ssize_t sdp_get_uuid_len(const u8_t *data, size_t len)
 }
 
 /* Helper getting length of data determined by DTD for strings */
-static inline ssize_t sdp_get_str_len(const u8_t *data, size_t len)
+static inline ssize_t sdp_get_str_len(const uint8_t *data, size_t len)
 {
-	const u8_t *pnext;
+	const uint8_t *pnext;
 
 	BT_ASSERT(data);
 
@@ -2053,7 +2053,7 @@ static inline ssize_t sdp_get_str_len(const u8_t *data, size_t len)
 		goto err;
 	}
 
-	pnext = data + sizeof(u8_t);
+	pnext = data + sizeof(uint8_t);
 
 	switch (data[0]) {
 	case BT_SDP_TEXT_STR8:
@@ -2087,9 +2087,9 @@ err:
 }
 
 /* Helper getting length of data determined by DTD for sequences */
-static inline ssize_t sdp_get_seq_len(const u8_t *data, size_t len)
+static inline ssize_t sdp_get_seq_len(const uint8_t *data, size_t len)
 {
-	const u8_t *pnext;
+	const uint8_t *pnext;
 
 	BT_ASSERT(data);
 
@@ -2098,7 +2098,7 @@ static inline ssize_t sdp_get_seq_len(const u8_t *data, size_t len)
 		goto err;
 	}
 
-	pnext = data + sizeof(u8_t);
+	pnext = data + sizeof(uint8_t);
 
 	switch (data[0]) {
 	case BT_SDP_SEQ8:
@@ -2132,7 +2132,7 @@ err:
 }
 
 /* Helper getting length of attribute value data */
-static ssize_t sdp_get_attr_value_len(const u8_t *data, size_t len)
+static ssize_t sdp_get_attr_value_len(const uint8_t *data, size_t len)
 {
 	BT_ASSERT(data);
 
@@ -2183,28 +2183,28 @@ struct bt_sdp_uuid_desc {
 		struct bt_uuid_16 uuid16;
 		struct bt_uuid_32 uuid32;
 	      };
-	u16_t                     attr_id;
-	u8_t                     *params;
-	u16_t                     params_len;
+	uint16_t                     attr_id;
+	uint8_t                     *params;
+	uint16_t                     params_len;
 };
 
 /* Generic attribute item collector. */
 struct bt_sdp_attr_item {
 	/*  Attribute identifier. */
-	u16_t                  attr_id;
+	uint16_t                  attr_id;
 	/*  Address of beginning attribute value taken from original buffer
 	 *  holding response from server.
 	 */
-	u8_t                  *val;
+	uint8_t                  *val;
 	/*  Says about the length of attribute value. */
-	u16_t                  len;
+	uint16_t                  len;
 };
 
 static int bt_sdp_get_attr(const struct net_buf *buf,
-			   struct bt_sdp_attr_item *attr, u16_t attr_id)
+			   struct bt_sdp_attr_item *attr, uint16_t attr_id)
 {
-	u8_t *data;
-	u16_t id;
+	uint8_t *data;
+	uint16_t id;
 
 	data = buf->data;
 	while (data - buf->data < buf->len) {
@@ -2216,10 +2216,10 @@ static int bt_sdp_get_attr(const struct net_buf *buf,
 			return -EINVAL;
 		}
 
-		data += sizeof(u8_t);
+		data += sizeof(uint8_t);
 		id = sys_get_be16(data);
 		BT_DBG("Attribute ID 0x%04x", id);
-		data += sizeof(u16_t);
+		data += sizeof(uint16_t);
 
 		dlen = sdp_get_attr_value_len(data,
 					      buf->len - (data - buf->data));
@@ -2247,9 +2247,9 @@ static int bt_sdp_get_attr(const struct net_buf *buf,
 }
 
 /* reads SEQ item length, moves input buffer data reader forward */
-static ssize_t sdp_get_seq_len_item(u8_t **data, size_t len)
+static ssize_t sdp_get_seq_len_item(uint8_t **data, size_t len)
 {
-	const u8_t *pnext;
+	const uint8_t *pnext;
 
 	BT_ASSERT(data);
 	BT_ASSERT(*data);
@@ -2259,7 +2259,7 @@ static ssize_t sdp_get_seq_len_item(u8_t **data, size_t len)
 		goto err;
 	}
 
-	pnext = *data + sizeof(u8_t);
+	pnext = *data + sizeof(uint8_t);
 
 	switch (*data[0]) {
 	case BT_SDP_SEQ8:
@@ -2304,10 +2304,10 @@ err:
 
 static int sdp_get_uuid_data(const struct bt_sdp_attr_item *attr,
 			     struct bt_sdp_uuid_desc *pd,
-			     u16_t proto_profile)
+			     uint16_t proto_profile)
 {
 	/* get start address of attribute value */
-	u8_t *p = attr->val;
+	uint8_t *p = attr->val;
 	ssize_t slen;
 
 	BT_ASSERT(p);
@@ -2344,8 +2344,8 @@ static int sdp_get_uuid_data(const struct bt_sdp_attr_item *attr,
 			memcpy(&pd->uuid16,
 			       BT_UUID_DECLARE_16(sys_get_be16(++p)),
 			       sizeof(struct bt_uuid_16));
-			p += sizeof(u16_t);
-			left -= sizeof(u16_t);
+			p += sizeof(uint16_t);
+			left -= sizeof(uint16_t);
 			break;
 		case BT_SDP_UUID32:
 			/* check if valid UUID32 can be read safely */
@@ -2356,8 +2356,8 @@ static int sdp_get_uuid_data(const struct bt_sdp_attr_item *attr,
 			memcpy(&pd->uuid32,
 			       BT_UUID_DECLARE_32(sys_get_be32(++p)),
 			       sizeof(struct bt_uuid_32));
-			p += sizeof(u32_t);
-			left -= sizeof(u32_t);
+			p += sizeof(uint32_t);
+			left -= sizeof(uint32_t);
 			break;
 		default:
 			BT_ERR("Invalid/unhandled DTD 0x%02x\n", p[0]);
@@ -2392,9 +2392,9 @@ static int sdp_get_uuid_data(const struct bt_sdp_attr_item *attr,
  * Helper extracting specific parameters associated with UUID node given in
  * protocol descriptor list or profile descriptor list.
  */
-static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, u16_t *param)
+static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, uint16_t *param)
 {
-	const u8_t *p = pd_item->params;
+	const uint8_t *p = pd_item->params;
 	bool len_err = false;
 
 	BT_ASSERT(p);
@@ -2409,7 +2409,7 @@ static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, u16_t *param)
 			break;
 		}
 		*param = (++p)[0];
-		p += sizeof(u8_t);
+		p += sizeof(uint8_t);
 		break;
 	case BT_SDP_UINT16:
 		/* check if 16bits value can be read safely */
@@ -2418,7 +2418,7 @@ static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, u16_t *param)
 			break;
 		}
 		*param = sys_get_be16(++p);
-		p += sizeof(u16_t);
+		p += sizeof(uint16_t);
 		break;
 	case BT_SDP_UINT32:
 		/* check if 32bits value can be read safely */
@@ -2427,7 +2427,7 @@ static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, u16_t *param)
 			break;
 		}
 		*param = sys_get_be32(++p);
-		p += sizeof(u32_t);
+		p += sizeof(uint32_t);
 		break;
 	default:
 		BT_ERR("Invalid/unhandled DTD 0x%02x\n", p[0]);
@@ -2446,7 +2446,7 @@ static int sdp_get_param_item(struct bt_sdp_uuid_desc *pd_item, u16_t *param)
 }
 
 int bt_sdp_get_proto_param(const struct net_buf *buf, enum bt_sdp_proto proto,
-			   u16_t *param)
+			   uint16_t *param)
 {
 	struct bt_sdp_attr_item attr;
 	struct bt_sdp_uuid_desc pd;
@@ -2474,8 +2474,8 @@ int bt_sdp_get_proto_param(const struct net_buf *buf, enum bt_sdp_proto proto,
 	return sdp_get_param_item(&pd, param);
 }
 
-int bt_sdp_get_profile_version(const struct net_buf *buf, u16_t profile,
-			       u16_t *version)
+int bt_sdp_get_profile_version(const struct net_buf *buf, uint16_t profile,
+			       uint16_t *version)
 {
 	struct bt_sdp_attr_item attr;
 	struct bt_sdp_uuid_desc pd;
@@ -2497,10 +2497,10 @@ int bt_sdp_get_profile_version(const struct net_buf *buf, u16_t profile,
 	return sdp_get_param_item(&pd, version);
 }
 
-int bt_sdp_get_features(const struct net_buf *buf, u16_t *features)
+int bt_sdp_get_features(const struct net_buf *buf, uint16_t *features)
 {
 	struct bt_sdp_attr_item attr;
-	const u8_t *p;
+	const uint8_t *p;
 	int res;
 
 	res = bt_sdp_get_attr(buf, &attr, BT_SDP_ATTR_SUPPORTED_FEATURES);
@@ -2525,7 +2525,7 @@ int bt_sdp_get_features(const struct net_buf *buf, u16_t *features)
 	}
 
 	*features = sys_get_be16(++p);
-	p += sizeof(u16_t);
+	p += sizeof(uint16_t);
 
 	if (p - attr.val != attr.len) {
 		BT_ERR("Invalid data length %u", attr.len);
diff --git a/subsys/bluetooth/host/sdp_internal.h b/subsys/bluetooth/host/sdp_internal.h
index fe4b6cb66a..1524318c4a 100644
--- a/subsys/bluetooth/host/sdp_internal.h
+++ b/subsys/bluetooth/host/sdp_internal.h
@@ -40,23 +40,23 @@
 #define BT_SDP_MAX_SERVICES   10
 
 struct bt_sdp_data_elem_seq {
-	u8_t  type; /* Type: Will be data element sequence */
-	u16_t size; /* We only support 2 byte sizes for now */
+	uint8_t  type; /* Type: Will be data element sequence */
+	uint16_t size; /* We only support 2 byte sizes for now */
 } __packed;
 
 struct bt_sdp_hdr {
-	u8_t  op_code;
-	u16_t tid;
-	u16_t param_len;
+	uint8_t  op_code;
+	uint16_t tid;
+	uint16_t param_len;
 } __packed;
 
 struct bt_sdp_svc_rsp {
-	u16_t  total_recs;
-	u16_t  current_recs;
+	uint16_t  total_recs;
+	uint16_t  current_recs;
 } __packed;
 
 struct bt_sdp_att_rsp {
-	u16_t att_list_len;
+	uint16_t att_list_len;
 } __packed;
 
 /* Allowed attributes length in SSA Request PDU to be taken from server */
@@ -67,8 +67,8 @@ struct bt_sdp_att_rsp {
 
 /* Type mapping SDP PDU Continuation State */
 struct bt_sdp_pdu_cstate {
-	u8_t length;
-	u8_t data[BT_SDP_MAX_PDU_CSTATE_LEN];
+	uint8_t length;
+	uint8_t data[BT_SDP_MAX_PDU_CSTATE_LEN];
 } __packed;
 
 void bt_sdp_init(void);
diff --git a/subsys/bluetooth/host/settings.c b/subsys/bluetooth/host/settings.c
index 1e8e395942..14d52d7b55 100644
--- a/subsys/bluetooth/host/settings.c
+++ b/subsys/bluetooth/host/settings.c
@@ -58,7 +58,7 @@ void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
 			len++;
 		}
 
-		for (s8_t i = 5; i >= 0 && len < path_size; i--) {
+		for (int8_t i = 5; i >= 0 && len < path_size; i--) {
 			len += bin2hex(&addr->a.val[i], 1, &path[len],
 				       path_size - len);
 		}
@@ -104,7 +104,7 @@ int bt_settings_decode_key(const char *key, bt_addr_le_t *addr)
 		return -EINVAL;
 	}
 
-	for (u8_t i = 0; i < 6; i++) {
+	for (uint8_t i = 0; i < 6; i++) {
 		hex2bin(&key[i * 2], 2, &addr->a.val[5 - i], 1);
 	}
 
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index d775e48a22..6f4c0e2681 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -148,43 +148,43 @@ struct bt_smp {
 	ATOMIC_DEFINE(flags, SMP_NUM_FLAGS);
 
 	/* Type of method used for pairing */
-	u8_t				method;
+	uint8_t				method;
 
 	/* Pairing Request PDU */
-	u8_t				preq[7];
+	uint8_t				preq[7];
 
 	/* Pairing Response PDU */
-	u8_t				prsp[7];
+	uint8_t				prsp[7];
 
 	/* Pairing Confirm PDU */
-	u8_t				pcnf[16];
+	uint8_t				pcnf[16];
 
 	/* Local random number */
-	u8_t				prnd[16];
+	uint8_t				prnd[16];
 
 	/* Remote random number */
-	u8_t				rrnd[16];
+	uint8_t				rrnd[16];
 
 	/* Temporary key */
-	u8_t				tk[16];
+	uint8_t				tk[16];
 
 	/* Remote Public Key for LE SC */
-	u8_t				pkey[64];
+	uint8_t				pkey[64];
 
 	/* DHKey */
-	u8_t				dhkey[32];
+	uint8_t				dhkey[32];
 
 	/* Remote DHKey check */
-	u8_t				e[16];
+	uint8_t				e[16];
 
 	/* MacKey */
-	u8_t				mackey[16];
+	uint8_t				mackey[16];
 
 	/* LE SC passkey */
-	u32_t				passkey;
+	uint32_t				passkey;
 
 	/* LE SC passkey round */
-	u8_t				passkey_round;
+	uint8_t				passkey_round;
 
 	/* LE SC local OOB data */
 	const struct bt_le_oob_sc_data	*oobd_local;
@@ -193,10 +193,10 @@ struct bt_smp {
 	const struct bt_le_oob_sc_data	*oobd_remote;
 
 	/* Local key distribution */
-	u8_t				local_dist;
+	uint8_t				local_dist;
 
 	/* Remote key distribution */
-	u8_t				remote_dist;
+	uint8_t				remote_dist;
 
 	/* Delayed work for timeout handling */
 	struct k_delayed_work		work;
@@ -210,7 +210,7 @@ static unsigned int fixed_passkey = BT_PASSKEY_INVALID;
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 /* based on table 2.8 Core Spec 2.3.5.1 Vol. 3 Part H */
-static const u8_t gen_method_legacy[5 /* remote */][5 /* local */] = {
+static const uint8_t gen_method_legacy[5 /* remote */][5 /* local */] = {
 	{ JUST_WORKS, JUST_WORKS, PASSKEY_INPUT, JUST_WORKS, PASSKEY_INPUT },
 	{ JUST_WORKS, JUST_WORKS, PASSKEY_INPUT, JUST_WORKS, PASSKEY_INPUT },
 	{ PASSKEY_DISPLAY, PASSKEY_DISPLAY, PASSKEY_INPUT, JUST_WORKS,
@@ -223,7 +223,7 @@ static const u8_t gen_method_legacy[5 /* remote */][5 /* local */] = {
 
 #if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
 /* based on table 2.8 Core Spec 2.3.5.1 Vol. 3 Part H */
-static const u8_t gen_method_sc[5 /* remote */][5 /* local */] = {
+static const uint8_t gen_method_sc[5 /* remote */][5 /* local */] = {
 	{ JUST_WORKS, JUST_WORKS, PASSKEY_INPUT, JUST_WORKS, PASSKEY_INPUT },
 	{ JUST_WORKS, PASSKEY_CONFIRM, PASSKEY_INPUT, JUST_WORKS,
 	  PASSKEY_CONFIRM },
@@ -235,7 +235,7 @@ static const u8_t gen_method_sc[5 /* remote */][5 /* local */] = {
 };
 #endif /* !CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY */
 
-static const u8_t sc_debug_public_key[64] = {
+static const uint8_t sc_debug_public_key[64] = {
 	0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc, 0xdb, 0xfd, 0xf4, 0xac,
 	0x11, 0x91, 0xf4, 0xef, 0xb9, 0xa5, 0xf9, 0xe9, 0xa7, 0x83, 0x2c, 0x5e,
 	0x2c, 0xbe, 0x97, 0xf2, 0xd2, 0x03, 0xb0, 0x20, 0x8b, 0xd2, 0x89, 0x15,
@@ -257,13 +257,13 @@ struct bt_smp_br {
 	ATOMIC_DEFINE(flags, SMP_NUM_FLAGS);
 
 	/* Local key distribution */
-	u8_t			local_dist;
+	uint8_t			local_dist;
 
 	/* Remote key distribution */
-	u8_t			remote_dist;
+	uint8_t			remote_dist;
 
 	/* Encryption Key Size used for connection */
-	u8_t 			enc_key_size;
+	uint8_t 			enc_key_size;
 
 	/* Delayed work for timeout handling */
 	struct k_delayed_work 	work;
@@ -276,10 +276,10 @@ static struct bt_smp bt_smp_pool[CONFIG_BT_MAX_CONN];
 static bool bondable = IS_ENABLED(CONFIG_BT_BONDABLE);
 static bool oobd_present;
 static bool sc_supported;
-static const u8_t *sc_public_key;
+static const uint8_t *sc_public_key;
 static K_SEM_DEFINE(sc_local_pkey_ready, 0, 1);
 
-static u8_t get_io_capa(void)
+static uint8_t get_io_capa(void)
 {
 	if (!bt_auth) {
 		goto no_callbacks;
@@ -320,7 +320,7 @@ no_callbacks:
 }
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-static u8_t legacy_get_pair_method(struct bt_smp *smp, u8_t remote_io);
+static uint8_t legacy_get_pair_method(struct bt_smp *smp, uint8_t remote_io);
 #endif
 
 static bool smp_keys_check(struct bt_conn *conn)
@@ -359,7 +359,7 @@ static bool smp_keys_check(struct bt_conn *conn)
 	return true;
 }
 
-static u8_t get_pair_method(struct bt_smp *smp, u8_t remote_io)
+static uint8_t get_pair_method(struct bt_smp *smp, uint8_t remote_io)
 {
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 	if (!atomic_test_bit(smp->flags, SMP_FLAG_SC)) {
@@ -395,7 +395,7 @@ static u8_t get_pair_method(struct bt_smp *smp, u8_t remote_io)
 #endif
 }
 
-static enum bt_security_err auth_err_get(u8_t smp_err)
+static enum bt_security_err auth_err_get(uint8_t smp_err)
 {
 	switch (smp_err) {
 	case BT_SMP_ERR_PASSKEY_ENTRY_FAILED:
@@ -424,7 +424,7 @@ static enum bt_security_err auth_err_get(u8_t smp_err)
 }
 
 #if defined(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)
-static u8_t smp_err_get(enum bt_security_err auth_err)
+static uint8_t smp_err_get(enum bt_security_err auth_err)
 {
 	switch (auth_err) {
 	case BT_SECURITY_ERR_OOB_NOT_AVAILABLE:
@@ -450,7 +450,7 @@ static u8_t smp_err_get(enum bt_security_err auth_err)
 }
 #endif /* CONFIG_BT_SMP_APP_PAIRING_ACCEPT */
 
-static struct net_buf *smp_create_pdu(struct bt_smp *smp, u8_t op, size_t len)
+static struct net_buf *smp_create_pdu(struct bt_smp *smp, uint8_t op, size_t len)
 {
 	struct bt_smp_hdr *hdr;
 	struct net_buf *buf;
@@ -488,8 +488,8 @@ static struct net_buf *smp_create_pdu(struct bt_smp *smp, u8_t op, size_t len)
  *          : len    ( length of the message in octets )
  * Output   : out    ( message authentication code )
  */
-static int bt_smp_aes_cmac(const u8_t *key, const u8_t *in, size_t len,
-			   u8_t *out)
+static int bt_smp_aes_cmac(const uint8_t *key, const uint8_t *in, size_t len,
+			   uint8_t *out)
 {
 	struct tc_aes_key_sched_struct sched;
 	struct tc_cmac_struct state;
@@ -509,7 +509,7 @@ static int bt_smp_aes_cmac(const u8_t *key, const u8_t *in, size_t len,
 	return 0;
 }
 
-static int smp_d1(const u8_t *key, u16_t d, u16_t r, u8_t res[16])
+static int smp_d1(const uint8_t *key, uint16_t d, uint16_t r, uint8_t res[16])
 {
 	int err;
 
@@ -528,11 +528,11 @@ static int smp_d1(const u8_t *key, u16_t d, u16_t r, u8_t res[16])
 	return 0;
 }
 
-static int smp_f4(const u8_t *u, const u8_t *v, const u8_t *x,
-		  u8_t z, u8_t res[16])
+static int smp_f4(const uint8_t *u, const uint8_t *v, const uint8_t *x,
+		  uint8_t z, uint8_t res[16])
 {
-	u8_t xs[16];
-	u8_t m[65];
+	uint8_t xs[16];
+	uint8_t m[65];
 	int err;
 
 	BT_DBG("u %s", bt_hex(u, 32));
@@ -566,14 +566,14 @@ static int smp_f4(const u8_t *u, const u8_t *v, const u8_t *x,
 	return err;
 }
 
-static int smp_f5(const u8_t *w, const u8_t *n1, const u8_t *n2,
-		  const bt_addr_le_t *a1, const bt_addr_le_t *a2, u8_t *mackey,
-		  u8_t *ltk)
+static int smp_f5(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
+		  const bt_addr_le_t *a1, const bt_addr_le_t *a2, uint8_t *mackey,
+		  uint8_t *ltk)
 {
-	static const u8_t salt[16] = { 0x6c, 0x88, 0x83, 0x91, 0xaa, 0xf5,
+	static const uint8_t salt[16] = { 0x6c, 0x88, 0x83, 0x91, 0xaa, 0xf5,
 					  0xa5, 0x38, 0x60, 0x37, 0x0b, 0xdb,
 					  0x5a, 0x60, 0x83, 0xbe };
-	u8_t m[53] = { 0x00, /* counter */
+	uint8_t m[53] = { 0x00, /* counter */
 			  0x62, 0x74, 0x6c, 0x65, /* keyID */
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*n1*/
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -582,7 +582,7 @@ static int smp_f5(const u8_t *w, const u8_t *n1, const u8_t *n2,
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a1 */
 			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a2 */
 			  0x01, 0x00 /* length */ };
-	u8_t t[16], ws[32];
+	uint8_t t[16], ws[32];
 	int err;
 
 	BT_DBG("w %s", bt_hex(w, 32));
@@ -629,12 +629,12 @@ static int smp_f5(const u8_t *w, const u8_t *n1, const u8_t *n2,
 	return 0;
 }
 
-static int smp_f6(const u8_t *w, const u8_t *n1, const u8_t *n2,
-		  const u8_t *r, const u8_t *iocap, const bt_addr_le_t *a1,
-		  const bt_addr_le_t *a2, u8_t *check)
+static int smp_f6(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
+		  const uint8_t *r, const uint8_t *iocap, const bt_addr_le_t *a1,
+		  const bt_addr_le_t *a2, uint8_t *check)
 {
-	u8_t ws[16];
-	u8_t m[65];
+	uint8_t ws[16];
+	uint8_t m[65];
 	int err;
 
 	BT_DBG("w %s", bt_hex(w, 16));
@@ -672,10 +672,10 @@ static int smp_f6(const u8_t *w, const u8_t *n1, const u8_t *n2,
 	return 0;
 }
 
-static int smp_g2(const u8_t u[32], const u8_t v[32],
-		  const u8_t x[16], const u8_t y[16], u32_t *passkey)
+static int smp_g2(const uint8_t u[32], const uint8_t v[32],
+		  const uint8_t x[16], const uint8_t y[16], uint32_t *passkey)
 {
-	u8_t m[80], xs[16];
+	uint8_t m[80], xs[16];
 	int err;
 
 	BT_DBG("u %s", bt_hex(u, 32));
@@ -704,7 +704,7 @@ static int smp_g2(const u8_t u[32], const u8_t v[32],
 	return 0;
 }
 
-static u8_t get_encryption_key_size(struct bt_smp *smp)
+static uint8_t get_encryption_key_size(struct bt_smp *smp)
 {
 	struct bt_smp_pairing *req, *rsp;
 
@@ -792,12 +792,12 @@ static bool update_debug_keys_check(struct bt_smp *smp)
 #if defined(CONFIG_BT_PRIVACY) || defined(CONFIG_BT_SIGNING) || \
 	!defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 /* For TX callbacks */
-static void smp_pairing_complete(struct bt_smp *smp, u8_t status);
+static void smp_pairing_complete(struct bt_smp *smp, uint8_t status);
 #if defined(CONFIG_BT_BREDR)
-static void smp_pairing_br_complete(struct bt_smp_br *smp, u8_t status);
+static void smp_pairing_br_complete(struct bt_smp_br *smp, uint8_t status);
 #endif
 
-static void smp_check_complete(struct bt_conn *conn, u8_t dist_complete)
+static void smp_check_complete(struct bt_conn *conn, uint8_t dist_complete)
 {
 	struct bt_l2cap_chan *chan;
 
@@ -852,10 +852,10 @@ static void smp_sign_info_sent(struct bt_conn *conn, void *user_data)
 #endif /* CONFIG_BT_SIGNING */
 
 #if defined(CONFIG_BT_BREDR)
-static int smp_h6(const u8_t w[16], const u8_t key_id[4], u8_t res[16])
+static int smp_h6(const uint8_t w[16], const uint8_t key_id[4], uint8_t res[16])
 {
-	u8_t ws[16];
-	u8_t key_id_s[4];
+	uint8_t ws[16];
+	uint8_t key_id_s[4];
 	int err;
 
 	BT_DBG("w %s", bt_hex(w, 16));
@@ -876,10 +876,10 @@ static int smp_h6(const u8_t w[16], const u8_t key_id[4], u8_t res[16])
 	return 0;
 }
 
-static int smp_h7(const u8_t salt[16], const u8_t w[16], u8_t res[16])
+static int smp_h7(const uint8_t salt[16], const uint8_t w[16], uint8_t res[16])
 {
-	u8_t ws[16];
-	u8_t salt_s[16];
+	uint8_t ws[16];
+	uint8_t salt_s[16];
 	int err;
 
 	BT_DBG("w %s", bt_hex(w, 16));
@@ -903,10 +903,10 @@ static int smp_h7(const u8_t salt[16], const u8_t w[16], u8_t res[16])
 static void sc_derive_link_key(struct bt_smp *smp)
 {
 	/* constants as specified in Core Spec Vol.3 Part H 2.4.2.4 */
-	static const u8_t lebr[4] = { 0x72, 0x62, 0x65, 0x6c };
+	static const uint8_t lebr[4] = { 0x72, 0x62, 0x65, 0x6c };
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_keys_link_key *link_key;
-	u8_t ilk[16];
+	uint8_t ilk[16];
 
 	BT_DBG("");
 
@@ -923,7 +923,7 @@ static void sc_derive_link_key(struct bt_smp *smp)
 
 	if (atomic_test_bit(smp->flags, SMP_FLAG_CT2)) {
 		/* constants as specified in Core Spec Vol.3 Part H 2.4.2.4 */
-		static const u8_t salt[16] = { 0x31, 0x70, 0x6d, 0x74,
+		static const uint8_t salt[16] = { 0x31, 0x70, 0x6d, 0x74,
 					       0x00, 0x00, 0x00, 0x00,
 					       0x00, 0x00, 0x00, 0x00,
 					       0x00, 0x00, 0x00, 0x00 };
@@ -934,7 +934,7 @@ static void sc_derive_link_key(struct bt_smp *smp)
 		}
 	} else {
 		/* constants as specified in Core Spec Vol.3 Part H 2.4.2.4 */
-		static const u8_t tmp1[4] = { 0x31, 0x70, 0x6d, 0x74 };
+		static const uint8_t tmp1[4] = { 0x31, 0x70, 0x6d, 0x74 };
 
 		if (smp_h6(conn->le.keys->ltk.val, tmp1, ilk)) {
 			bt_keys_link_key_clear(link_key);
@@ -965,7 +965,7 @@ static void smp_br_reset(struct bt_smp_br *smp)
 	atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_REQ);
 }
 
-static void smp_pairing_br_complete(struct bt_smp_br *smp, u8_t status)
+static void smp_pairing_br_complete(struct bt_smp_br *smp, uint8_t status)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_keys *keys;
@@ -1056,7 +1056,7 @@ static void bt_smp_br_disconnected(struct bt_l2cap_chan *chan)
 static void smp_br_init(struct bt_smp_br *smp)
 {
 	/* Initialize SMP context without clearing L2CAP channel context */
-	(void)memset((u8_t *)smp + sizeof(smp->chan), 0,
+	(void)memset((uint8_t *)smp + sizeof(smp->chan), 0,
 		     sizeof(*smp) - (sizeof(smp->chan) + sizeof(smp->work)));
 
 	atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_FAIL);
@@ -1065,12 +1065,12 @@ static void smp_br_init(struct bt_smp_br *smp)
 static void smp_br_derive_ltk(struct bt_smp_br *smp)
 {
 	/* constants as specified in Core Spec Vol.3 Part H 2.4.2.5 */
-	static const u8_t brle[4] = { 0x65, 0x6c, 0x72, 0x62 };
+	static const uint8_t brle[4] = { 0x65, 0x6c, 0x72, 0x62 };
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_keys_link_key *link_key = conn->br.link_key;
 	struct bt_keys *keys;
 	bt_addr_le_t addr;
-	u8_t ilk[16];
+	uint8_t ilk[16];
 
 	BT_DBG("");
 
@@ -1097,7 +1097,7 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 
 	if (atomic_test_bit(smp->flags, SMP_FLAG_CT2)) {
 		/* constants as specified in Core Spec Vol.3 Part H 2.4.2.5 */
-		static const u8_t salt[16] = { 0x32, 0x70, 0x6d, 0x74,
+		static const uint8_t salt[16] = { 0x32, 0x70, 0x6d, 0x74,
 					       0x00, 0x00, 0x00, 0x00,
 					       0x00, 0x00, 0x00, 0x00,
 					       0x00, 0x00, 0x00, 0x00 };
@@ -1108,7 +1108,7 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 		}
 	} else {
 		/* constants as specified in Core Spec Vol.3 Part H 2.4.2.5 */
-		static const u8_t tmp2[4] = { 0x32, 0x70, 0x6d, 0x74 };
+		static const uint8_t tmp2[4] = { 0x32, 0x70, 0x6d, 0x74 };
 
 		if (smp_h6(link_key->val, tmp2, ilk)) {
 			bt_keys_clear(keys);
@@ -1134,7 +1134,7 @@ static void smp_br_derive_ltk(struct bt_smp_br *smp)
 	BT_DBG("LTK derived from LinkKey");
 }
 
-static struct net_buf *smp_br_create_pdu(struct bt_smp_br *smp, u8_t op,
+static struct net_buf *smp_br_create_pdu(struct bt_smp_br *smp, uint8_t op,
 					 size_t len)
 {
 	struct bt_smp_hdr *hdr;
@@ -1263,13 +1263,13 @@ static bool smp_br_pairing_allowed(struct bt_smp_br *smp)
 	return false;
 }
 
-static u8_t smp_br_pairing_req(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_pairing_req(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	struct bt_smp_pairing *req = (void *)buf->data;
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_pairing *rsp;
 	struct net_buf *rsp_buf;
-	u8_t max_key_size;
+	uint8_t max_key_size;
 
 	BT_DBG("");
 
@@ -1348,11 +1348,11 @@ static u8_t smp_br_pairing_req(struct bt_smp_br *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_br_pairing_rsp(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_pairing_rsp(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	struct bt_smp_pairing *rsp = (void *)buf->data;
 	struct bt_conn *conn = smp->chan.chan.conn;
-	u8_t max_key_size;
+	uint8_t max_key_size;
 
 	BT_DBG("");
 
@@ -1402,7 +1402,7 @@ static u8_t smp_br_pairing_rsp(struct bt_smp_br *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_br_pairing_failed(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_pairing_failed(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	struct bt_smp_pairing_fail *req = (void *)buf->data;
 
@@ -1415,7 +1415,7 @@ static u8_t smp_br_pairing_failed(struct bt_smp_br *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_br_ident_info(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_ident_info(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	struct bt_smp_ident_info *req = (void *)buf->data;
 	struct bt_conn *conn = smp->chan.chan.conn;
@@ -1446,7 +1446,7 @@ static u8_t smp_br_ident_info(struct bt_smp_br *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_br_ident_addr_info(struct bt_smp_br *smp,
+static uint8_t smp_br_ident_addr_info(struct bt_smp_br *smp,
 				      struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
@@ -1487,7 +1487,7 @@ static u8_t smp_br_ident_addr_info(struct bt_smp_br *smp,
 }
 
 #if defined(CONFIG_BT_SIGNING)
-static u8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	struct bt_smp_signing_info *req = (void *)buf->data;
 	struct bt_conn *conn = smp->chan.chan.conn;
@@ -1525,15 +1525,15 @@ static u8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf)
 	return 0;
 }
 #else
-static u8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf)
+static uint8_t smp_br_signing_info(struct bt_smp_br *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 #endif /* CONFIG_BT_SIGNING */
 
 static const struct {
-	u8_t  (*func)(struct bt_smp_br *smp, struct net_buf *buf);
-	u8_t  expect_len;
+	uint8_t  (*func)(struct bt_smp_br *smp, struct net_buf *buf);
+	uint8_t  expect_len;
 } br_handlers[] = {
 	{ }, /* No op-code defined for 0x00 */
 	{ smp_br_pairing_req,      sizeof(struct bt_smp_pairing) },
@@ -1551,7 +1551,7 @@ static const struct {
 	/* DHKey check not used over BR/EDR */
 };
 
-static int smp_br_error(struct bt_smp_br *smp, u8_t reason)
+static int smp_br_error(struct bt_smp_br *smp, uint8_t reason)
 {
 	struct bt_smp_pairing_fail *rsp;
 	struct net_buf *buf;
@@ -1580,7 +1580,7 @@ static int bt_smp_br_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_smp_br *smp = CONTAINER_OF(chan, struct bt_smp_br, chan);
 	struct bt_smp_hdr *hdr;
-	u8_t err;
+	uint8_t err;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small SMP PDU received");
@@ -1693,7 +1693,7 @@ int bt_smp_br_send_pairing_req(struct bt_conn *conn)
 {
 	struct bt_smp_pairing *req;
 	struct net_buf *req_buf;
-	u8_t max_key_size;
+	uint8_t max_key_size;
 	struct bt_smp_br *smp;
 
 	smp = smp_br_chan_get(conn);
@@ -1794,7 +1794,7 @@ static void smp_reset(struct bt_smp *smp)
 /* Note: This function not only does set the status but also calls smp_reset
  * at the end which clears any flags previously set.
  */
-static void smp_pairing_complete(struct bt_smp *smp, u8_t status)
+static void smp_pairing_complete(struct bt_smp *smp, uint8_t status)
 {
 	BT_DBG("status 0x%x", status);
 
@@ -1821,7 +1821,7 @@ static void smp_pairing_complete(struct bt_smp *smp, u8_t status)
 						  bond_flag);
 		}
 	} else {
-		u8_t auth_err = auth_err_get(status);
+		uint8_t auth_err = auth_err_get(status);
 
 		/* Clear the key pool entry in case of pairing failure if the
 		 * keys already existed before the pairing procedure or the
@@ -1867,7 +1867,7 @@ static void smp_send(struct bt_smp *smp, struct net_buf *buf,
 	k_delayed_work_submit(&smp->work, SMP_TIMEOUT);
 }
 
-static int smp_error(struct bt_smp *smp, u8_t reason)
+static int smp_error(struct bt_smp *smp, uint8_t reason)
 {
 	struct bt_smp_pairing_fail *rsp;
 	struct net_buf *buf;
@@ -1889,7 +1889,7 @@ static int smp_error(struct bt_smp *smp, u8_t reason)
 	return 0;
 }
 
-static u8_t smp_send_pairing_random(struct bt_smp *smp)
+static uint8_t smp_send_pairing_random(struct bt_smp *smp)
 {
 	struct bt_smp_pairing_random *req;
 	struct net_buf *rsp_buf;
@@ -1908,7 +1908,7 @@ static u8_t smp_send_pairing_random(struct bt_smp *smp)
 }
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-static void xor_128(const u8_t p[16], const u8_t q[16], u8_t r[16])
+static void xor_128(const uint8_t p[16], const uint8_t q[16], uint8_t r[16])
 {
 	size_t len = 16;
 
@@ -1917,12 +1917,12 @@ static void xor_128(const u8_t p[16], const u8_t q[16], u8_t r[16])
 	}
 }
 
-static int smp_c1(const u8_t k[16], const u8_t r[16],
-		  const u8_t preq[7], const u8_t pres[7],
+static int smp_c1(const uint8_t k[16], const uint8_t r[16],
+		  const uint8_t preq[7], const uint8_t pres[7],
 		  const bt_addr_le_t *ia, const bt_addr_le_t *ra,
-		  u8_t enc_data[16])
+		  uint8_t enc_data[16])
 {
-	u8_t p1[16], p2[16];
+	uint8_t p1[16], p2[16];
 	int err;
 
 	BT_DBG("k %s", bt_hex(k, 16));
@@ -1963,11 +1963,11 @@ static int smp_c1(const u8_t k[16], const u8_t r[16],
 }
 #endif /* !CONFIG_BT_SMP_SC_PAIR_ONLY */
 
-static u8_t smp_send_pairing_confirm(struct bt_smp *smp)
+static uint8_t smp_send_pairing_confirm(struct bt_smp *smp)
 {
 	struct bt_smp_pairing_confirm *req;
 	struct net_buf *buf;
-	u8_t r;
+	uint8_t r;
 
 	switch (smp->method) {
 	case PASSKEY_CONFIRM:
@@ -2026,9 +2026,9 @@ static void legacy_distribute_keys(struct bt_smp *smp)
 		struct net_buf *buf;
 		/* Use struct to get randomness in single call to bt_rand */
 		struct {
-			u8_t key[16];
-			u8_t rand[8];
-			u8_t ediv[2];
+			uint8_t key[16];
+			uint8_t rand[8];
+			uint8_t ediv[2];
 		} rand;
 
 		bt_rand((void *)&rand, sizeof(rand));
@@ -2078,7 +2078,7 @@ static void legacy_distribute_keys(struct bt_smp *smp)
 }
 #endif /* !CONFIG_BT_SMP_SC_PAIR_ONLY */
 
-static u8_t bt_smp_distribute_keys(struct bt_smp *smp)
+static uint8_t bt_smp_distribute_keys(struct bt_smp *smp)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_keys *keys = conn->le.keys;
@@ -2157,7 +2157,7 @@ static u8_t bt_smp_distribute_keys(struct bt_smp *smp)
 }
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static u8_t send_pairing_rsp(struct bt_smp *smp)
+static uint8_t send_pairing_rsp(struct bt_smp *smp)
 {
 	struct bt_smp_pairing *rsp;
 	struct net_buf *rsp_buf;
@@ -2176,7 +2176,7 @@ static u8_t send_pairing_rsp(struct bt_smp *smp)
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static u8_t smp_pairing_accept_query(struct bt_conn *conn,
+static uint8_t smp_pairing_accept_query(struct bt_conn *conn,
 				    struct bt_smp_pairing *pairing)
 {
 #if defined(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)
@@ -2197,8 +2197,8 @@ static u8_t smp_pairing_accept_query(struct bt_conn *conn,
 }
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-static int smp_s1(const u8_t k[16], const u8_t r1[16],
-		  const u8_t r2[16], u8_t out[16])
+static int smp_s1(const uint8_t k[16], const uint8_t r1[16],
+		  const uint8_t r2[16], uint8_t out[16])
 {
 	/* The most significant 64-bits of r1 are discarded to generate
 	 * r1' and the most significant 64-bits of r2 are discarded to
@@ -2215,10 +2215,10 @@ static int smp_s1(const u8_t k[16], const u8_t r1[16],
 	return bt_encrypt_le(k, out, out);
 }
 
-static u8_t legacy_get_pair_method(struct bt_smp *smp, u8_t remote_io)
+static uint8_t legacy_get_pair_method(struct bt_smp *smp, uint8_t remote_io)
 {
 	struct bt_smp_pairing *req, *rsp;
-	u8_t method;
+	uint8_t method;
 
 	if (remote_io > BT_SMP_IO_KEYBOARD_DISPLAY) {
 		return JUST_WORKS;
@@ -2253,11 +2253,11 @@ static u8_t legacy_get_pair_method(struct bt_smp *smp, u8_t remote_io)
 	return method;
 }
 
-static u8_t legacy_request_tk(struct bt_smp *smp)
+static uint8_t legacy_request_tk(struct bt_smp *smp)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_keys *keys;
-	u32_t passkey;
+	uint32_t passkey;
 
 	/*
 	 * Fail if we have keys that are stronger than keys that will be
@@ -2319,7 +2319,7 @@ static u8_t legacy_request_tk(struct bt_smp *smp)
 	return 0;
 }
 
-static u8_t legacy_send_pairing_confirm(struct bt_smp *smp)
+static uint8_t legacy_send_pairing_confirm(struct bt_smp *smp)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_pairing_confirm *req;
@@ -2346,9 +2346,9 @@ static u8_t legacy_send_pairing_confirm(struct bt_smp *smp)
 }
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static u8_t legacy_pairing_req(struct bt_smp *smp)
+static uint8_t legacy_pairing_req(struct bt_smp *smp)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	BT_DBG("");
 
@@ -2372,10 +2372,10 @@ static u8_t legacy_pairing_req(struct bt_smp *smp)
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static u8_t legacy_pairing_random(struct bt_smp *smp)
+static uint8_t legacy_pairing_random(struct bt_smp *smp)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
-	u8_t tmp[16];
+	uint8_t tmp[16];
 	int err;
 
 	BT_DBG("");
@@ -2396,7 +2396,7 @@ static u8_t legacy_pairing_random(struct bt_smp *smp)
 
 	if (IS_ENABLED(CONFIG_BT_CENTRAL) &&
 	    conn->role == BT_HCI_ROLE_MASTER) {
-		u8_t ediv[2], rand[8];
+		uint8_t ediv[2], rand[8];
 
 		/* No need to store master STK */
 		err = smp_s1(smp->tk, smp->rrnd, smp->prnd, tmp);
@@ -2448,7 +2448,7 @@ static u8_t legacy_pairing_random(struct bt_smp *smp)
 	return 0;
 }
 
-static u8_t legacy_pairing_confirm(struct bt_smp *smp)
+static uint8_t legacy_pairing_confirm(struct bt_smp *smp)
 {
 	BT_DBG("");
 
@@ -2502,7 +2502,7 @@ static void legacy_passkey_entry(struct bt_smp *smp, unsigned int passkey)
 	legacy_user_tk_entry(smp);
 }
 
-static u8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	BT_DBG("");
 
@@ -2526,10 +2526,10 @@ static u8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
-	u8_t err;
+	uint8_t err;
 
 	BT_DBG("");
 
@@ -2573,9 +2573,9 @@ static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_CENTRAL)
-static u8_t legacy_pairing_rsp(struct bt_smp *smp)
+static uint8_t legacy_pairing_rsp(struct bt_smp *smp)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	BT_DBG("");
 
@@ -2604,12 +2604,12 @@ static u8_t legacy_pairing_rsp(struct bt_smp *smp)
 }
 #endif /* CONFIG_BT_CENTRAL */
 #else
-static u8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_encrypt_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 
-static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
@@ -2618,7 +2618,7 @@ static u8_t smp_master_ident(struct bt_smp *smp, struct net_buf *buf)
 static int smp_init(struct bt_smp *smp)
 {
 	/* Initialize SMP context without clearing L2CAP channel context */
-	(void)memset((u8_t *)smp + sizeof(smp->chan), 0,
+	(void)memset((uint8_t *)smp + sizeof(smp->chan), 0,
 		     sizeof(*smp) - (sizeof(smp->chan) + sizeof(smp->work)));
 
 	/* Generate local random number */
@@ -2647,7 +2647,7 @@ void bt_set_oob_data_flag(bool enable)
 	oobd_present = enable;
 }
 
-static u8_t get_auth(struct bt_conn *conn, u8_t auth)
+static uint8_t get_auth(struct bt_conn *conn, uint8_t auth)
 {
 	if (sc_supported) {
 		auth &= BT_SMP_AUTH_MASK_SC;
@@ -2702,10 +2702,10 @@ static struct bt_smp *smp_chan_get(struct bt_conn *conn)
 	return CONTAINER_OF(chan, struct bt_smp, chan);
 }
 
-bool bt_smp_request_ltk(struct bt_conn *conn, u64_t rand, u16_t ediv, u8_t *ltk)
+bool bt_smp_request_ltk(struct bt_conn *conn, uint64_t rand, uint16_t ediv, uint8_t *ltk)
 {
 	struct bt_smp *smp;
-	u8_t enc_size;
+	uint8_t enc_size;
 
 	smp = smp_chan_get(conn);
 	if (!smp) {
@@ -2848,7 +2848,7 @@ static int smp_send_security_req(struct bt_conn *conn)
 	return 0;
 }
 
-static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_pairing *req = (void *)buf->data;
@@ -2932,7 +2932,7 @@ static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
 		return BT_SMP_ERR_AUTH_REQUIREMENTS;
 #else
 		if (IS_ENABLED(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)) {
-			u8_t err;
+			uint8_t err;
 
 			err = smp_pairing_accept_query(smp->chan.chan.conn,
 						      req);
@@ -2958,7 +2958,7 @@ static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)) {
-		u8_t err;
+		uint8_t err;
 
 		err = smp_pairing_accept_query(smp->chan.chan.conn, req);
 		if (err) {
@@ -2978,13 +2978,13 @@ static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
 	return send_pairing_rsp(smp);
 }
 #else
-static u8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static u8_t sc_send_public_key(struct bt_smp *smp)
+static uint8_t sc_send_public_key(struct bt_smp *smp)
 {
 	struct bt_smp_public_key *req;
 	struct net_buf *req_buf;
@@ -3084,7 +3084,7 @@ static int smp_send_pairing_req(struct bt_conn *conn)
 	return 0;
 }
 
-static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_pairing *rsp = (void *)buf->data;
@@ -3133,7 +3133,7 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
 		return BT_SMP_ERR_AUTH_REQUIREMENTS;
 #else
 		if (IS_ENABLED(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)) {
-			u8_t err;
+			uint8_t err;
 
 			err = smp_pairing_accept_query(smp->chan.chan.conn,
 						       rsp);
@@ -3162,7 +3162,7 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
 	smp->remote_dist &= RECV_KEYS_SC;
 
 	if (IS_ENABLED(CONFIG_BT_SMP_APP_PAIRING_ACCEPT)) {
-		u8_t err;
+		uint8_t err;
 
 		err = smp_pairing_accept_query(smp->chan.chan.conn, rsp);
 		if (err) {
@@ -3189,13 +3189,13 @@ static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
 	return sc_send_public_key(smp);
 }
 #else
-static u8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 #endif /* CONFIG_BT_CENTRAL */
 
-static u8_t smp_pairing_confirm(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_confirm(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_smp_pairing_confirm *req = (void *)buf->data;
 
@@ -3240,7 +3240,7 @@ static u8_t smp_pairing_confirm(struct bt_smp *smp, struct net_buf *buf)
 	}
 }
 
-static u8_t sc_smp_send_dhkey_check(struct bt_smp *smp, const u8_t *e)
+static uint8_t sc_smp_send_dhkey_check(struct bt_smp *smp, const uint8_t *e)
 {
 	struct bt_smp_dhkey_check *req;
 	struct net_buf *buf;
@@ -3261,9 +3261,9 @@ static u8_t sc_smp_send_dhkey_check(struct bt_smp *smp, const u8_t *e)
 }
 
 #if defined(CONFIG_BT_CENTRAL)
-static u8_t compute_and_send_master_dhcheck(struct bt_smp *smp)
+static uint8_t compute_and_send_master_dhcheck(struct bt_smp *smp)
 {
-	u8_t e[16], r[16];
+	uint8_t e[16], r[16];
 
 	(void)memset(r, 0, sizeof(r));
 
@@ -3304,10 +3304,10 @@ static u8_t compute_and_send_master_dhcheck(struct bt_smp *smp)
 #endif /* CONFIG_BT_CENTRAL */
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static u8_t compute_and_check_and_send_slave_dhcheck(struct bt_smp *smp)
+static uint8_t compute_and_check_and_send_slave_dhcheck(struct bt_smp *smp)
 {
-	u8_t re[16], e[16], r[16];
-	u8_t err;
+	uint8_t re[16], e[16], r[16];
+	uint8_t err;
 
 	(void)memset(r, 0, sizeof(r));
 
@@ -3374,7 +3374,7 @@ static u8_t compute_and_check_and_send_slave_dhcheck(struct bt_smp *smp)
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static void bt_smp_dhkey_ready(const u8_t *dhkey)
+static void bt_smp_dhkey_ready(const uint8_t *dhkey)
 {
 	struct bt_smp *smp = NULL;
 	int i;
@@ -3413,7 +3413,7 @@ static void bt_smp_dhkey_ready(const u8_t *dhkey)
 	}
 
 	if (atomic_test_bit(smp->flags, SMP_FLAG_DHKEY_SEND)) {
-		u8_t err;
+		uint8_t err;
 
 #if defined(CONFIG_BT_CENTRAL)
 		if (smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) {
@@ -3435,10 +3435,10 @@ static void bt_smp_dhkey_ready(const u8_t *dhkey)
 	}
 }
 
-static u8_t sc_smp_check_confirm(struct bt_smp *smp)
+static uint8_t sc_smp_check_confirm(struct bt_smp *smp)
 {
-	u8_t cfm[16];
-	u8_t r;
+	uint8_t cfm[16];
+	uint8_t r;
 
 	switch (smp->method) {
 	case LE_SC_OOB:
@@ -3522,11 +3522,11 @@ static void le_sc_oob_config_set(struct bt_smp *smp,
 	info->lesc.oob_config = oob_config;
 }
 
-static u8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_smp_pairing_random *req = (void *)buf->data;
-	u32_t passkey;
-	u8_t err;
+	uint32_t passkey;
+	uint8_t err;
 
 	BT_DBG("");
 
@@ -3664,7 +3664,7 @@ static u8_t smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
 #endif /* CONFIG_BT_PERIPHERAL */
 }
 
-static u8_t smp_pairing_failed(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_pairing_failed(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_pairing_fail *req = (void *)buf->data;
@@ -3684,7 +3684,7 @@ static u8_t smp_pairing_failed(struct bt_smp *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_ident_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_ident_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	BT_DBG("");
 
@@ -3708,11 +3708,11 @@ static u8_t smp_ident_info(struct bt_smp *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_ident_addr_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_ident_addr_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_ident_addr_info *req = (void *)buf->data;
-	u8_t err;
+	uint8_t err;
 
 	BT_DBG("identity %s", bt_addr_le_str(&req->addr));
 
@@ -3789,10 +3789,10 @@ static u8_t smp_ident_addr_info(struct bt_smp *smp, struct net_buf *buf)
 }
 
 #if defined(CONFIG_BT_SIGNING)
-static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
-	u8_t err;
+	uint8_t err;
 
 	BT_DBG("");
 
@@ -3830,18 +3830,18 @@ static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf)
 	return 0;
 }
 #else
-static u8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_signing_info(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 #endif /* CONFIG_BT_SIGNING */
 
 #if defined(CONFIG_BT_CENTRAL)
-static u8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_conn *conn = smp->chan.chan.conn;
 	struct bt_smp_security_request *req = (void *)buf->data;
-	u8_t auth;
+	uint8_t auth;
 
 	BT_DBG("");
 
@@ -3926,13 +3926,13 @@ pair:
 	return 0;
 }
 #else
-static u8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_security_request(struct bt_smp *smp, struct net_buf *buf)
 {
 	return BT_SMP_ERR_CMD_NOTSUPP;
 }
 #endif /* CONFIG_BT_CENTRAL */
 
-static u8_t generate_dhkey(struct bt_smp *smp)
+static uint8_t generate_dhkey(struct bt_smp *smp)
 {
 	if (IS_ENABLED(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)) {
 		return BT_SMP_ERR_UNSPECIFIED;
@@ -3946,7 +3946,7 @@ static u8_t generate_dhkey(struct bt_smp *smp)
 	return 0;
 }
 
-static u8_t display_passkey(struct bt_smp *smp)
+static uint8_t display_passkey(struct bt_smp *smp)
 {
 	if (IS_ENABLED(CONFIG_BT_FIXED_PASSKEY) &&
 	    fixed_passkey != BT_PASSKEY_INVALID) {
@@ -3972,9 +3972,9 @@ static u8_t display_passkey(struct bt_smp *smp)
 }
 
 #if defined(CONFIG_BT_PERIPHERAL)
-static u8_t smp_public_key_slave(struct bt_smp *smp)
+static uint8_t smp_public_key_slave(struct bt_smp *smp)
 {
-	u8_t err;
+	uint8_t err;
 
 	err = sc_send_public_key(smp);
 	if (err) {
@@ -4015,10 +4015,10 @@ static u8_t smp_public_key_slave(struct bt_smp *smp)
 }
 #endif /* CONFIG_BT_PERIPHERAL */
 
-static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_smp_public_key *req = (void *)buf->data;
-	u8_t err;
+	uint8_t err;
 
 	BT_DBG("");
 
@@ -4111,7 +4111,7 @@ static u8_t smp_public_key(struct bt_smp *smp, struct net_buf *buf)
 	return 0;
 }
 
-static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf)
+static uint8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf)
 {
 	struct bt_smp_dhkey_check *req = (void *)buf->data;
 
@@ -4119,8 +4119,8 @@ static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf)
 
 	if (IS_ENABLED(CONFIG_BT_CENTRAL) &&
 	    smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) {
-		u8_t e[16], r[16], enc_size;
-		u8_t ediv[2], rand[8];
+		uint8_t e[16], r[16], enc_size;
+		uint8_t ediv[2], rand[8];
 
 		(void)memset(r, 0, sizeof(r));
 
@@ -4202,8 +4202,8 @@ static u8_t smp_dhkey_check(struct bt_smp *smp, struct net_buf *buf)
 }
 
 static const struct {
-	u8_t  (*func)(struct bt_smp *smp, struct net_buf *buf);
-	u8_t  expect_len;
+	uint8_t  (*func)(struct bt_smp *smp, struct net_buf *buf);
+	uint8_t  expect_len;
 } handlers[] = {
 	{ }, /* No op-code defined for 0x00 */
 	{ smp_pairing_req,         sizeof(struct bt_smp_pairing) },
@@ -4225,7 +4225,7 @@ static int bt_smp_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
 	struct bt_smp *smp = CONTAINER_OF(chan, struct bt_smp, chan);
 	struct bt_smp_hdr *hdr;
-	u8_t err;
+	uint8_t err;
 
 	if (buf->len < sizeof(*hdr)) {
 		BT_ERR("Too small SMP PDU received");
@@ -4275,7 +4275,7 @@ static int bt_smp_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
 	return 0;
 }
 
-static void bt_smp_pkey_ready(const u8_t *pkey)
+static void bt_smp_pkey_ready(const uint8_t *pkey)
 {
 	int i;
 
@@ -4292,7 +4292,7 @@ static void bt_smp_pkey_ready(const u8_t *pkey)
 
 	for (i = 0; i < ARRAY_SIZE(bt_smp_pool); i++) {
 		struct bt_smp *smp = &bt_smp_pool[i];
-		u8_t err;
+		uint8_t err;
 
 		if (!atomic_test_bit(smp->flags, SMP_FLAG_PKEY_SEND)) {
 			continue;
@@ -4355,7 +4355,7 @@ static void bt_smp_disconnected(struct bt_l2cap_chan *chan)
 }
 
 static void bt_smp_encrypt_change(struct bt_l2cap_chan *chan,
-				  u8_t hci_status)
+				  uint8_t hci_status)
 {
 	struct bt_smp *smp = CONTAINER_OF(chan, struct bt_smp, chan);
 	struct bt_conn *conn = chan->conn;
@@ -4450,12 +4450,12 @@ static void bt_smp_encrypt_change(struct bt_l2cap_chan *chan,
  * so total buffer size is len + 4 + 8 octets.
  * API is Little Endian to make it suitable for Bluetooth.
  */
-static int smp_sign_buf(const u8_t *key, u8_t *msg, u16_t len)
+static int smp_sign_buf(const uint8_t *key, uint8_t *msg, uint16_t len)
 {
-	u8_t *m = msg;
-	u32_t cnt = UNALIGNED_GET((u32_t *)&msg[len]);
-	u8_t *sig = msg + len;
-	u8_t key_s[16], tmp[16];
+	uint8_t *m = msg;
+	uint32_t cnt = UNALIGNED_GET((uint32_t *)&msg[len]);
+	uint8_t *sig = msg + len;
+	uint8_t key_s[16], tmp[16];
 	int err;
 
 	BT_DBG("Signing msg %s len %u key %s", bt_hex(msg, len), len,
@@ -4488,8 +4488,8 @@ static int smp_sign_buf(const u8_t *key, u8_t *msg, u16_t len)
 int bt_smp_sign_verify(struct bt_conn *conn, struct net_buf *buf)
 {
 	struct bt_keys *keys;
-	u8_t sig[12];
-	u32_t cnt;
+	uint8_t sig[12];
+	uint32_t cnt;
 	int err;
 
 	/* Store signature incl. count */
@@ -4531,7 +4531,7 @@ int bt_smp_sign_verify(struct bt_conn *conn, struct net_buf *buf)
 int bt_smp_sign(struct bt_conn *conn, struct net_buf *buf)
 {
 	struct bt_keys *keys;
-	u32_t cnt;
+	uint32_t cnt;
 	int err;
 
 	keys = bt_keys_find(BT_KEYS_LOCAL_CSRK, conn->id, &conn->le.dst);
@@ -4574,9 +4574,9 @@ int bt_smp_sign(struct bt_conn *conn, struct net_buf *buf)
 }
 #endif /* CONFIG_BT_SIGNING */
 
-int bt_smp_irk_get(u8_t *ir, u8_t *irk)
+int bt_smp_irk_get(uint8_t *ir, uint8_t *irk)
 {
-	u8_t invalid_ir[16] = { 0 };
+	uint8_t invalid_ir[16] = { 0 };
 
 	if (!memcmp(ir, invalid_ir, 16)) {
 		return -EINVAL;
@@ -4590,12 +4590,12 @@ int bt_smp_irk_get(u8_t *ir, u8_t *irk)
  * https://tools.ietf.org/html/rfc4493
  * Same mentioned in the Bluetooth Spec.
  */
-static const u8_t key[] = {
+static const uint8_t key[] = {
 	0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
 	0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c
 };
 
-static const u8_t M[] = {
+static const uint8_t M[] = {
 	0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
 	0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
 	0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
@@ -4606,10 +4606,10 @@ static const u8_t M[] = {
 	0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10
 };
 
-static int aes_test(const char *prefix, const u8_t *key, const u8_t *m,
-		    u16_t len, const u8_t *mac)
+static int aes_test(const char *prefix, const uint8_t *key, const uint8_t *m,
+		    uint16_t len, const uint8_t *mac)
 {
-	u8_t out[16];
+	uint8_t out[16];
 
 	BT_DBG("%s: AES CMAC of message with len %u", prefix, len);
 
@@ -4626,19 +4626,19 @@ static int aes_test(const char *prefix, const u8_t *key, const u8_t *m,
 
 static int smp_aes_cmac_test(void)
 {
-	u8_t mac1[] = {
+	uint8_t mac1[] = {
 		0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28,
 		0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46
 	};
-	u8_t mac2[] = {
+	uint8_t mac2[] = {
 		0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44,
 		0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c
 	};
-	u8_t mac3[] = {
+	uint8_t mac3[] = {
 		0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30,
 		0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27
 	};
-	u8_t mac4[] = {
+	uint8_t mac4[] = {
 		0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92,
 		0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe
 	};
@@ -4667,19 +4667,19 @@ static int smp_aes_cmac_test(void)
 	return 0;
 }
 
-static int sign_test(const char *prefix, const u8_t *key, const u8_t *m,
-		     u16_t len, const u8_t *sig)
+static int sign_test(const char *prefix, const uint8_t *key, const uint8_t *m,
+		     uint16_t len, const uint8_t *sig)
 {
-	u8_t msg[len + sizeof(u32_t) + 8];
-	u8_t orig[len + sizeof(u32_t) + 8];
-	u8_t *out = msg + len;
+	uint8_t msg[len + sizeof(uint32_t) + 8];
+	uint8_t orig[len + sizeof(uint32_t) + 8];
+	uint8_t *out = msg + len;
 	int err;
 
 	BT_DBG("%s: Sign message with len %u", prefix, len);
 
 	(void)memset(msg, 0, sizeof(msg));
 	memcpy(msg, m, len);
-	(void)memset(msg + len, 0, sizeof(u32_t));
+	(void)memset(msg + len, 0, sizeof(uint32_t));
 
 	memcpy(orig, msg, sizeof(msg));
 
@@ -4689,7 +4689,7 @@ static int sign_test(const char *prefix, const u8_t *key, const u8_t *m,
 	}
 
 	/* Check original message */
-	if (!memcmp(msg, orig, len + sizeof(u32_t))) {
+	if (!memcmp(msg, orig, len + sizeof(uint32_t))) {
 		BT_DBG("%s: Original message intact", prefix);
 	} else {
 		BT_ERR("%s: Original message modified", prefix);
@@ -4710,23 +4710,23 @@ static int sign_test(const char *prefix, const u8_t *key, const u8_t *m,
 
 static int smp_sign_test(void)
 {
-	const u8_t sig1[] = {
+	const uint8_t sig1[] = {
 		0x00, 0x00, 0x00, 0x00, 0xb3, 0xa8, 0x59, 0x41,
 		0x27, 0xeb, 0xc2, 0xc0
 	};
-	const u8_t sig2[] = {
+	const uint8_t sig2[] = {
 		0x00, 0x00, 0x00, 0x00, 0x27, 0x39, 0x74, 0xf4,
 		0x39, 0x2a, 0x23, 0x2a
 	};
-	const u8_t sig3[] = {
+	const uint8_t sig3[] = {
 		0x00, 0x00, 0x00, 0x00, 0xb7, 0xca, 0x94, 0xab,
 		0x87, 0xc7, 0x82, 0x18
 	};
-	const u8_t sig4[] = {
+	const uint8_t sig4[] = {
 		0x00, 0x00, 0x00, 0x00, 0x44, 0xe1, 0xe6, 0xce,
 		0x1d, 0xf5, 0x13, 0x68
 	};
-	u8_t key_s[16];
+	uint8_t key_s[16];
 	int err;
 
 	/* Use the same key as aes-cmac but swap bytes */
@@ -4757,20 +4757,20 @@ static int smp_sign_test(void)
 
 static int smp_f4_test(void)
 {
-	u8_t u[32] = { 0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc,
+	uint8_t u[32] = { 0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc,
 			  0xdb, 0xfd, 0xf4, 0xac, 0x11, 0x91, 0xf4, 0xef,
 			  0xb9, 0xa5, 0xf9, 0xe9, 0xa7, 0x83, 0x2c, 0x5e,
 			  0x2c, 0xbe, 0x97, 0xf2, 0xd2, 0x03, 0xb0, 0x20 };
-	u8_t v[32] = { 0xfd, 0xc5, 0x7f, 0xf4, 0x49, 0xdd, 0x4f, 0x6b,
+	uint8_t v[32] = { 0xfd, 0xc5, 0x7f, 0xf4, 0x49, 0xdd, 0x4f, 0x6b,
 			  0xfb, 0x7c, 0x9d, 0xf1, 0xc2, 0x9a, 0xcb, 0x59,
 			  0x2a, 0xe7, 0xd4, 0xee, 0xfb, 0xfc, 0x0a, 0x90,
 			  0x9a, 0xbb, 0xf6, 0x32, 0x3d, 0x8b, 0x18, 0x55 };
-	u8_t x[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
+	uint8_t x[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
 			  0x3e, 0x73, 0x77, 0xd1, 0x54, 0x84, 0xcb, 0xd5 };
-	u8_t z = 0x00;
-	u8_t exp[16] = { 0x2d, 0x87, 0x74, 0xa9, 0xbe, 0xa1, 0xed, 0xf1,
+	uint8_t z = 0x00;
+	uint8_t exp[16] = { 0x2d, 0x87, 0x74, 0xa9, 0xbe, 0xa1, 0xed, 0xf1,
 			    0x1c, 0xbd, 0xa9, 0x07, 0xf1, 0x16, 0xc9, 0xf2 };
-	u8_t res[16];
+	uint8_t res[16];
 	int err;
 
 	err = smp_f4(u, v, x, z, res);
@@ -4787,25 +4787,25 @@ static int smp_f4_test(void)
 
 static int smp_f5_test(void)
 {
-	u8_t w[32] = { 0x98, 0xa6, 0xbf, 0x73, 0xf3, 0x34, 0x8d, 0x86,
+	uint8_t w[32] = { 0x98, 0xa6, 0xbf, 0x73, 0xf3, 0x34, 0x8d, 0x86,
 			  0xf1, 0x66, 0xf8, 0xb4, 0x13, 0x6b, 0x79, 0x99,
 			  0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
 			  0x05, 0xad, 0xc8, 0x57, 0xa3, 0x34, 0x02, 0xec };
-	u8_t n1[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
+	uint8_t n1[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
 			   0x3e, 0x73, 0x77, 0xd1, 0x54, 0x84, 0xcb, 0xd5 };
-	u8_t n2[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
+	uint8_t n2[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
 			   0x6e, 0x5f, 0xa7, 0x25, 0xcc, 0xe7, 0xe8, 0xa6 };
 	bt_addr_le_t a1 = { .type = 0x00,
 			    .a.val = { 0xce, 0xbf, 0x37, 0x37, 0x12, 0x56 } };
 	bt_addr_le_t a2 = { .type = 0x00,
 			    .a.val = {0xc1, 0xcf, 0x2d, 0x70, 0x13, 0xa7 } };
-	u8_t exp_ltk[16] = { 0x38, 0x0a, 0x75, 0x94, 0xb5, 0x22, 0x05,
+	uint8_t exp_ltk[16] = { 0x38, 0x0a, 0x75, 0x94, 0xb5, 0x22, 0x05,
 				0x98, 0x23, 0xcd, 0xd7, 0x69, 0x11, 0x79,
 				0x86, 0x69 };
-	u8_t exp_mackey[16] = { 0x20, 0x6e, 0x63, 0xce, 0x20, 0x6a, 0x3f,
+	uint8_t exp_mackey[16] = { 0x20, 0x6e, 0x63, 0xce, 0x20, 0x6a, 0x3f,
 				   0xfd, 0x02, 0x4a, 0x08, 0xa1, 0x76, 0xf1,
 				   0x65, 0x29 };
-	u8_t mackey[16], ltk[16];
+	uint8_t mackey[16], ltk[16];
 	int err;
 
 	err = smp_f5(w, n1, n2, &a1, &a2, mackey, ltk);
@@ -4822,22 +4822,22 @@ static int smp_f5_test(void)
 
 static int smp_f6_test(void)
 {
-	u8_t w[16] = { 0x20, 0x6e, 0x63, 0xce, 0x20, 0x6a, 0x3f, 0xfd,
+	uint8_t w[16] = { 0x20, 0x6e, 0x63, 0xce, 0x20, 0x6a, 0x3f, 0xfd,
 			  0x02, 0x4a, 0x08, 0xa1, 0x76, 0xf1, 0x65, 0x29 };
-	u8_t n1[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
+	uint8_t n1[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
 			   0x3e, 0x73, 0x77, 0xd1, 0x54, 0x84, 0xcb, 0xd5 };
-	u8_t n2[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
+	uint8_t n2[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
 			   0x6e, 0x5f, 0xa7, 0x25, 0xcc, 0xe7, 0xe8, 0xa6 };
-	u8_t r[16] = { 0xc8, 0x0f, 0x2d, 0x0c, 0xd2, 0x42, 0xda, 0x08,
+	uint8_t r[16] = { 0xc8, 0x0f, 0x2d, 0x0c, 0xd2, 0x42, 0xda, 0x08,
 			  0x54, 0xbb, 0x53, 0xb4, 0x3b, 0x34, 0xa3, 0x12 };
-	u8_t io_cap[3] = { 0x02, 0x01, 0x01 };
+	uint8_t io_cap[3] = { 0x02, 0x01, 0x01 };
 	bt_addr_le_t a1 = { .type = 0x00,
 			    .a.val = { 0xce, 0xbf, 0x37, 0x37, 0x12, 0x56 } };
 	bt_addr_le_t a2 = { .type = 0x00,
 			    .a.val = {0xc1, 0xcf, 0x2d, 0x70, 0x13, 0xa7 } };
-	u8_t exp[16] = { 0x61, 0x8f, 0x95, 0xda, 0x09, 0x0b, 0x6c, 0xd2,
+	uint8_t exp[16] = { 0x61, 0x8f, 0x95, 0xda, 0x09, 0x0b, 0x6c, 0xd2,
 			    0xc5, 0xe8, 0xd0, 0x9c, 0x98, 0x73, 0xc4, 0xe3 };
-	u8_t res[16];
+	uint8_t res[16];
 	int err;
 
 	err = smp_f6(w, n1, n2, r, io_cap, &a1, &a2, res);
@@ -4852,20 +4852,20 @@ static int smp_f6_test(void)
 
 static int smp_g2_test(void)
 {
-	u8_t u[32] = { 0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc,
+	uint8_t u[32] = { 0xe6, 0x9d, 0x35, 0x0e, 0x48, 0x01, 0x03, 0xcc,
 			  0xdb, 0xfd, 0xf4, 0xac, 0x11, 0x91, 0xf4, 0xef,
 			  0xb9, 0xa5, 0xf9, 0xe9, 0xa7, 0x83, 0x2c, 0x5e,
 			  0x2c, 0xbe, 0x97, 0xf2, 0xd2, 0x03, 0xb0, 0x20 };
-	u8_t v[32] = { 0xfd, 0xc5, 0x7f, 0xf4, 0x49, 0xdd, 0x4f, 0x6b,
+	uint8_t v[32] = { 0xfd, 0xc5, 0x7f, 0xf4, 0x49, 0xdd, 0x4f, 0x6b,
 			  0xfb, 0x7c, 0x9d, 0xf1, 0xc2, 0x9a, 0xcb, 0x59,
 			  0x2a, 0xe7, 0xd4, 0xee, 0xfb, 0xfc, 0x0a, 0x90,
 			  0x9a, 0xbb, 0xf6, 0x32, 0x3d, 0x8b, 0x18, 0x55 };
-	u8_t x[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
+	uint8_t x[16] = { 0xab, 0xae, 0x2b, 0x71, 0xec, 0xb2, 0xff, 0xff,
 			  0x3e, 0x73, 0x77, 0xd1, 0x54, 0x84, 0xcb, 0xd5 };
-	u8_t y[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
+	uint8_t y[16] = { 0xcf, 0xc4, 0x3d, 0xff, 0xf7, 0x83, 0x65, 0x21,
 			  0x6e, 0x5f, 0xa7, 0x25, 0xcc, 0xe7, 0xe8, 0xa6 };
-	u32_t exp_val = 0x2f9ed5ba % 1000000;
-	u32_t val;
+	uint32_t exp_val = 0x2f9ed5ba % 1000000;
+	uint32_t val;
 	int err;
 
 	err = smp_g2(u, v, x, y, &val);
@@ -4883,12 +4883,12 @@ static int smp_g2_test(void)
 #if defined(CONFIG_BT_BREDR)
 static int smp_h6_test(void)
 {
-	u8_t w[16] = { 0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
+	uint8_t w[16] = { 0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
 			  0x05, 0xad, 0xc8, 0x57, 0xa3, 0x34, 0x02, 0xec };
-	u8_t key_id[4] = { 0x72, 0x62, 0x65, 0x6c };
-	u8_t exp_res[16] = { 0x99, 0x63, 0xb1, 0x80, 0xe2, 0xa9, 0xd3, 0xe8,
+	uint8_t key_id[4] = { 0x72, 0x62, 0x65, 0x6c };
+	uint8_t exp_res[16] = { 0x99, 0x63, 0xb1, 0x80, 0xe2, 0xa9, 0xd3, 0xe8,
 				0x1c, 0xc9, 0x6d, 0xe7, 0x02, 0xe1, 0x9a, 0x2d};
-	u8_t res[16];
+	uint8_t res[16];
 	int err;
 
 	err = smp_h6(w, key_id, res);
@@ -4905,13 +4905,13 @@ static int smp_h6_test(void)
 
 static int smp_h7_test(void)
 {
-	u8_t salt[16] = { 0x31, 0x70, 0x6d, 0x74, 0x00, 0x00, 0x00, 0x00,
+	uint8_t salt[16] = { 0x31, 0x70, 0x6d, 0x74, 0x00, 0x00, 0x00, 0x00,
 			     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	u8_t w[16] = { 0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
+	uint8_t w[16] = { 0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
 			  0x05, 0xad, 0xc8, 0x57, 0xa3, 0x34, 0x02, 0xec };
-	u8_t exp_res[16] = { 0x11, 0x70, 0xa5, 0x75, 0x2a, 0x8c, 0x99, 0xd2,
+	uint8_t exp_res[16] = { 0x11, 0x70, 0xa5, 0x75, 0x2a, 0x8c, 0x99, 0xd2,
 				0xec, 0xc0, 0xa3, 0xc6, 0x97, 0x35, 0x17, 0xfb};
-	u8_t res[16];
+	uint8_t res[16];
 	int err;
 
 	err = smp_h7(salt, w, res);
@@ -4993,7 +4993,7 @@ static inline int smp_self_test(void)
 int bt_smp_auth_passkey_entry(struct bt_conn *conn, unsigned int passkey)
 {
 	struct bt_smp *smp;
-	u8_t err;
+	uint8_t err;
 
 	smp = smp_chan_get(conn);
 	if (!smp) {
@@ -5063,7 +5063,7 @@ int bt_smp_auth_passkey_confirm(struct bt_conn *conn)
 	}
 
 	if (atomic_test_bit(smp->flags, SMP_FLAG_DHKEY_SEND)) {
-		u8_t err;
+		uint8_t err;
 
 #if defined(CONFIG_BT_CENTRAL)
 		if (smp->chan.chan.conn->role == BT_HCI_ROLE_MASTER) {
@@ -5087,7 +5087,7 @@ int bt_smp_auth_passkey_confirm(struct bt_conn *conn)
 }
 
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
-int bt_smp_le_oob_set_tk(struct bt_conn *conn, const u8_t *tk)
+int bt_smp_le_oob_set_tk(struct bt_conn *conn, const uint8_t *tk)
 {
 	struct bt_smp *smp;
 
@@ -5102,7 +5102,7 @@ int bt_smp_le_oob_set_tk(struct bt_conn *conn, const u8_t *tk)
 		return -EINVAL;
 	}
 
-	memcpy(smp->tk, tk, 16*sizeof(u8_t));
+	memcpy(smp->tk, tk, 16*sizeof(uint8_t));
 
 	legacy_user_tk_entry(smp);
 
@@ -5123,7 +5123,7 @@ int bt_smp_le_oob_generate_sc_data(struct bt_le_oob_sc_data *le_sc_oob)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_OOB_DATA_FIXED)) {
-		u8_t rand_num[] = {
+		uint8_t rand_num[] = {
 			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
 			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
 		};
@@ -5173,7 +5173,7 @@ static int le_sc_oob_pairing_continue(struct bt_smp *smp)
 {
 	if (smp->oobd_remote) {
 		int err;
-		u8_t c[16];
+		uint8_t c[16];
 
 		err = smp_f4(smp->pkey, smp->pkey, smp->oobd_remote->r, 0, c);
 		if (err) {
diff --git a/subsys/bluetooth/host/smp.h b/subsys/bluetooth/host/smp.h
index a4aeff3d42..0be6c9a811 100644
--- a/subsys/bluetooth/host/smp.h
+++ b/subsys/bluetooth/host/smp.h
@@ -10,7 +10,7 @@
  */
 
 struct bt_smp_hdr {
-	u8_t  code;
+	uint8_t  code;
 } __packed;
 
 #define BT_SMP_ERR_PASSKEY_ENTRY_FAILED		0x01
@@ -58,43 +58,43 @@ struct bt_smp_hdr {
 #define BT_SMP_CMD_PAIRING_REQ			0x01
 #define BT_SMP_CMD_PAIRING_RSP			0x02
 struct bt_smp_pairing {
-	u8_t  io_capability;
-	u8_t  oob_flag;
-	u8_t  auth_req;
-	u8_t  max_key_size;
-	u8_t  init_key_dist;
-	u8_t  resp_key_dist;
+	uint8_t  io_capability;
+	uint8_t  oob_flag;
+	uint8_t  auth_req;
+	uint8_t  max_key_size;
+	uint8_t  init_key_dist;
+	uint8_t  resp_key_dist;
 } __packed;
 
 #define BT_SMP_CMD_PAIRING_CONFIRM		0x03
 struct bt_smp_pairing_confirm {
-	u8_t  val[16];
+	uint8_t  val[16];
 } __packed;
 
 #define BT_SMP_CMD_PAIRING_RANDOM		0x04
 struct bt_smp_pairing_random {
-	u8_t  val[16];
+	uint8_t  val[16];
 } __packed;
 
 #define BT_SMP_CMD_PAIRING_FAIL			0x05
 struct bt_smp_pairing_fail {
-	u8_t  reason;
+	uint8_t  reason;
 } __packed;
 
 #define BT_SMP_CMD_ENCRYPT_INFO			0x06
 struct bt_smp_encrypt_info {
-	u8_t  ltk[16];
+	uint8_t  ltk[16];
 } __packed;
 
 #define BT_SMP_CMD_MASTER_IDENT			0x07
 struct bt_smp_master_ident {
-	u8_t ediv[2];
-	u8_t rand[8];
+	uint8_t ediv[2];
+	uint8_t rand[8];
 } __packed;
 
 #define BT_SMP_CMD_IDENT_INFO			0x08
 struct bt_smp_ident_info {
-	u8_t  irk[16];
+	uint8_t  irk[16];
 } __packed;
 
 #define BT_SMP_CMD_IDENT_ADDR_INFO		0x09
@@ -104,28 +104,28 @@ struct bt_smp_ident_addr_info {
 
 #define BT_SMP_CMD_SIGNING_INFO			0x0a
 struct bt_smp_signing_info {
-	u8_t csrk[16];
+	uint8_t csrk[16];
 } __packed;
 
 #define BT_SMP_CMD_SECURITY_REQUEST		0x0b
 struct bt_smp_security_request {
-	u8_t  auth_req;
+	uint8_t  auth_req;
 } __packed;
 
 #define BT_SMP_CMD_PUBLIC_KEY			0x0c
 struct bt_smp_public_key {
-	u8_t x[32];
-	u8_t y[32];
+	uint8_t x[32];
+	uint8_t y[32];
 } __packed;
 
 #define BT_SMP_DHKEY_CHECK			0x0d
 struct bt_smp_dhkey_check {
-	u8_t e[16];
+	uint8_t e[16];
 } __packed;
 
 int bt_smp_start_security(struct bt_conn *conn);
-bool bt_smp_request_ltk(struct bt_conn *conn, u64_t rand, u16_t ediv,
-			u8_t *ltk);
+bool bt_smp_request_ltk(struct bt_conn *conn, uint64_t rand, uint16_t ediv,
+			uint8_t *ltk);
 
 void bt_smp_update_keys(struct bt_conn *conn);
 
@@ -138,7 +138,7 @@ int bt_smp_auth_passkey_confirm(struct bt_conn *conn);
 int bt_smp_auth_pairing_confirm(struct bt_conn *conn);
 int bt_smp_auth_cancel(struct bt_conn *conn);
 
-int bt_smp_le_oob_set_tk(struct bt_conn *conn, const u8_t *tk);
+int bt_smp_le_oob_set_tk(struct bt_conn *conn, const uint8_t *tk);
 int bt_smp_le_oob_generate_sc_data(struct bt_le_oob_sc_data *le_sc_oob);
 int bt_smp_le_oob_set_sc_data(struct bt_conn *conn,
 			      const struct bt_le_oob_sc_data *oobd_local,
@@ -166,4 +166,4 @@ int bt_smp_sign_verify(struct bt_conn *conn, struct net_buf *buf);
 int bt_smp_sign(struct bt_conn *conn, struct net_buf *buf);
 
 /** Generate IRK from Identity Root (IR) */
-int bt_smp_irk_get(u8_t *ir, u8_t *irk);
+int bt_smp_irk_get(uint8_t *ir, uint8_t *irk);
diff --git a/subsys/bluetooth/host/testing.c b/subsys/bluetooth/host/testing.c
index f940f19cf5..fb582312b5 100644
--- a/subsys/bluetooth/host/testing.c
+++ b/subsys/bluetooth/host/testing.c
@@ -30,7 +30,7 @@ void bt_test_cb_unregister(struct bt_test_cb *cb)
 }
 
 #if defined(CONFIG_BT_MESH)
-void bt_test_mesh_net_recv(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
+void bt_test_mesh_net_recv(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst,
 			   const void *payload, size_t payload_len)
 {
 	struct bt_test_cb *cb;
@@ -43,8 +43,8 @@ void bt_test_mesh_net_recv(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
 	}
 }
 
-void bt_test_mesh_model_bound(u16_t addr, struct bt_mesh_model *model,
-			      u16_t key_idx)
+void bt_test_mesh_model_bound(uint16_t addr, struct bt_mesh_model *model,
+			      uint16_t key_idx)
 {
 	struct bt_test_cb *cb;
 
@@ -55,8 +55,8 @@ void bt_test_mesh_model_bound(u16_t addr, struct bt_mesh_model *model,
 	}
 }
 
-void bt_test_mesh_model_unbound(u16_t addr, struct bt_mesh_model *model,
-				u16_t key_idx)
+void bt_test_mesh_model_unbound(uint16_t addr, struct bt_mesh_model *model,
+				uint16_t key_idx)
 {
 	struct bt_test_cb *cb;
 
@@ -67,7 +67,7 @@ void bt_test_mesh_model_unbound(u16_t addr, struct bt_mesh_model *model,
 	}
 }
 
-void bt_test_mesh_prov_invalid_bearer(u8_t opcode)
+void bt_test_mesh_prov_invalid_bearer(uint8_t opcode)
 {
 	struct bt_test_cb *cb;
 
@@ -89,14 +89,14 @@ void bt_test_mesh_trans_incomp_timer_exp(void)
 	}
 }
 
-int bt_test_mesh_lpn_group_add(u16_t group)
+int bt_test_mesh_lpn_group_add(uint16_t group)
 {
 	bt_mesh_lpn_group_add(group);
 
 	return 0;
 }
 
-int bt_test_mesh_lpn_group_remove(u16_t *groups, size_t groups_count)
+int bt_test_mesh_lpn_group_remove(uint16_t *groups, size_t groups_count)
 {
 	bt_mesh_lpn_group_del(groups, groups_count);
 
diff --git a/subsys/bluetooth/host/testing.h b/subsys/bluetooth/host/testing.h
index bdbbeb5650..43eb6d52ce 100644
--- a/subsys/bluetooth/host/testing.h
+++ b/subsys/bluetooth/host/testing.h
@@ -10,12 +10,12 @@
  */
 
 #if defined(CONFIG_BT_MESH)
-void bt_test_mesh_net_recv(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
+void bt_test_mesh_net_recv(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst,
 			   const void *payload, size_t payload_len);
-void bt_test_mesh_model_bound(u16_t addr, struct bt_mesh_model *model,
-			      u16_t key_idx);
-void bt_test_mesh_model_unbound(u16_t addr, struct bt_mesh_model *model,
-				u16_t key_idx);
-void bt_test_mesh_prov_invalid_bearer(u8_t opcode);
+void bt_test_mesh_model_bound(uint16_t addr, struct bt_mesh_model *model,
+			      uint16_t key_idx);
+void bt_test_mesh_model_unbound(uint16_t addr, struct bt_mesh_model *model,
+				uint16_t key_idx);
+void bt_test_mesh_prov_invalid_bearer(uint8_t opcode);
 void bt_test_mesh_trans_incomp_timer_exp(void);
 #endif /* CONFIG_BT_MESH */
diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c
index 36048381df..a643653667 100644
--- a/subsys/bluetooth/host/uuid.c
+++ b/subsys/bluetooth/host/uuid.c
@@ -76,7 +76,7 @@ int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2)
 	return -EINVAL;
 }
 
-bool bt_uuid_create(struct bt_uuid *uuid, const u8_t *data, u8_t data_len)
+bool bt_uuid_create(struct bt_uuid *uuid, const uint8_t *data, uint8_t data_len)
 {
 	/* Copy UUID from packet data/internal variable to internal bt_uuid */
 	switch (data_len) {
@@ -100,8 +100,8 @@ bool bt_uuid_create(struct bt_uuid *uuid, const u8_t *data, u8_t data_len)
 
 void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len)
 {
-	u32_t tmp1, tmp5;
-	u16_t tmp0, tmp2, tmp3, tmp4;
+	uint32_t tmp1, tmp5;
+	uint16_t tmp0, tmp2, tmp3, tmp4;
 
 	switch (uuid->type) {
 	case BT_UUID_TYPE_16:
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 4112c4c664..8beb9df366 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -28,7 +28,7 @@
 #include "foundation.h"
 
 static const struct bt_mesh_comp *dev_comp;
-static u16_t dev_primary_addr;
+static uint16_t dev_primary_addr;
 
 void bt_mesh_model_foreach(void (*func)(struct bt_mesh_model *mod,
 					struct bt_mesh_elem *elem,
@@ -55,9 +55,9 @@ void bt_mesh_model_foreach(void (*func)(struct bt_mesh_model *mod,
 	}
 }
 
-s32_t bt_mesh_model_pub_period_get(struct bt_mesh_model *mod)
+int32_t bt_mesh_model_pub_period_get(struct bt_mesh_model *mod)
 {
-	s32_t period;
+	int32_t period;
 
 	if (!mod->pub) {
 		return 0;
@@ -91,10 +91,10 @@ s32_t bt_mesh_model_pub_period_get(struct bt_mesh_model *mod)
 	}
 }
 
-static s32_t next_period(struct bt_mesh_model *mod)
+static int32_t next_period(struct bt_mesh_model *mod)
 {
 	struct bt_mesh_model_pub *pub = mod->pub;
-	u32_t elapsed, period;
+	uint32_t elapsed, period;
 
 	period = bt_mesh_model_pub_period_get(mod);
 	if (!period) {
@@ -117,7 +117,7 @@ static s32_t next_period(struct bt_mesh_model *mod)
 static void publish_sent(int err, void *user_data)
 {
 	struct bt_mesh_model *mod = user_data;
-	s32_t delay;
+	int32_t delay;
 
 	BT_DBG("err %d", err);
 
@@ -133,7 +133,7 @@ static void publish_sent(int err, void *user_data)
 	}
 }
 
-static void publish_start(u16_t duration, int err, void *user_data)
+static void publish_start(uint16_t duration, int err, void *user_data)
 {
 	struct bt_mesh_model *mod = user_data;
 	struct bt_mesh_model_pub *pub = mod->pub;
@@ -200,7 +200,7 @@ static void mod_publish(struct k_work *work)
 	struct bt_mesh_model_pub *pub = CONTAINER_OF(work,
 						     struct bt_mesh_model_pub,
 						     timer.work);
-	s32_t period_ms;
+	int32_t period_ms;
 	int err;
 
 	BT_DBG("");
@@ -251,7 +251,7 @@ struct bt_mesh_elem *bt_mesh_model_elem(struct bt_mesh_model *mod)
 	return &dev_comp->elem[mod->elem_idx];
 }
 
-struct bt_mesh_model *bt_mesh_model_get(bool vnd, u8_t elem_idx, u8_t mod_idx)
+struct bt_mesh_model *bt_mesh_model_get(bool vnd, uint8_t elem_idx, uint8_t mod_idx)
 {
 	struct bt_mesh_elem *elem;
 
@@ -327,7 +327,7 @@ int bt_mesh_comp_register(const struct bt_mesh_comp *comp)
 	return err;
 }
 
-void bt_mesh_comp_provision(u16_t addr)
+void bt_mesh_comp_provision(uint16_t addr)
 {
 	int i;
 
@@ -352,12 +352,12 @@ void bt_mesh_comp_unprovision(void)
 	dev_primary_addr = BT_MESH_ADDR_UNASSIGNED;
 }
 
-u16_t bt_mesh_primary_addr(void)
+uint16_t bt_mesh_primary_addr(void)
 {
 	return dev_primary_addr;
 }
 
-static u16_t *model_group_get(struct bt_mesh_model *mod, u16_t addr)
+static uint16_t *model_group_get(struct bt_mesh_model *mod, uint16_t addr)
 {
 	int i;
 
@@ -371,13 +371,13 @@ static u16_t *model_group_get(struct bt_mesh_model *mod, u16_t addr)
 }
 
 struct find_group_visitor_ctx {
-	u16_t *entry;
+	uint16_t *entry;
 	struct bt_mesh_model *mod;
-	u16_t addr;
+	uint16_t addr;
 };
 
 static enum bt_mesh_walk find_group_mod_visitor(struct bt_mesh_model *mod,
-						u32_t depth, void *user_data)
+						uint32_t depth, void *user_data)
 {
 	struct find_group_visitor_ctx *ctx = user_data;
 
@@ -394,7 +394,7 @@ static enum bt_mesh_walk find_group_mod_visitor(struct bt_mesh_model *mod,
 	return BT_MESH_WALK_CONTINUE;
 }
 
-u16_t *bt_mesh_model_find_group(struct bt_mesh_model **mod, u16_t addr)
+uint16_t *bt_mesh_model_find_group(struct bt_mesh_model **mod, uint16_t addr)
 {
 	struct find_group_visitor_ctx ctx = {
 		.mod = *mod,
@@ -410,10 +410,10 @@ u16_t *bt_mesh_model_find_group(struct bt_mesh_model **mod, u16_t addr)
 }
 
 static struct bt_mesh_model *bt_mesh_elem_find_group(struct bt_mesh_elem *elem,
-						     u16_t group_addr)
+						     uint16_t group_addr)
 {
 	struct bt_mesh_model *model;
-	u16_t *match;
+	uint16_t *match;
 	int i;
 
 	for (i = 0; i < elem->model_count; i++) {
@@ -437,9 +437,9 @@ static struct bt_mesh_model *bt_mesh_elem_find_group(struct bt_mesh_elem *elem,
 	return NULL;
 }
 
-struct bt_mesh_elem *bt_mesh_elem_find(u16_t addr)
+struct bt_mesh_elem *bt_mesh_elem_find(uint16_t addr)
 {
-	u16_t index;
+	uint16_t index;
 
 	if (BT_MESH_ADDR_IS_UNICAST(addr)) {
 		index = (addr - dev_comp->elem[0].addr);
@@ -461,12 +461,12 @@ struct bt_mesh_elem *bt_mesh_elem_find(u16_t addr)
 	return NULL;
 }
 
-u8_t bt_mesh_elem_count(void)
+uint8_t bt_mesh_elem_count(void)
 {
 	return dev_comp->elem_count;
 }
 
-static bool model_has_key(struct bt_mesh_model *mod, u16_t key)
+static bool model_has_key(struct bt_mesh_model *mod, uint16_t key)
 {
 	int i;
 
@@ -481,7 +481,7 @@ static bool model_has_key(struct bt_mesh_model *mod, u16_t key)
 	return false;
 }
 
-static bool model_has_dst(struct bt_mesh_model *mod, u16_t dst)
+static bool model_has_dst(struct bt_mesh_model *mod, uint16_t dst)
 {
 	if (BT_MESH_ADDR_IS_UNICAST(dst)) {
 		return (dev_comp->elem[mod->elem_idx].addr == dst);
@@ -493,10 +493,10 @@ static bool model_has_dst(struct bt_mesh_model *mod, u16_t dst)
 }
 
 static const struct bt_mesh_model_op *find_op(struct bt_mesh_model *models,
-					      u8_t model_count, u32_t opcode,
+					      uint8_t model_count, uint32_t opcode,
 					      struct bt_mesh_model **model)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < model_count; i++) {
 		const struct bt_mesh_model_op *op;
@@ -514,7 +514,7 @@ static const struct bt_mesh_model_op *find_op(struct bt_mesh_model *models,
 	return NULL;
 }
 
-static int get_opcode(struct net_buf_simple *buf, u32_t *opcode)
+static int get_opcode(struct net_buf_simple *buf, uint32_t *opcode)
 {
 	switch (buf->data[0] >> 6) {
 	case 0x00:
@@ -552,7 +552,7 @@ static int get_opcode(struct net_buf_simple *buf, u32_t *opcode)
 	CODE_UNREACHABLE;
 }
 
-bool bt_mesh_fixed_group_match(u16_t addr)
+bool bt_mesh_fixed_group_match(uint16_t addr)
 {
 	/* Check for fixed group addresses */
 	switch (addr) {
@@ -573,8 +573,8 @@ void bt_mesh_model_recv(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 {
 	struct bt_mesh_model *models, *model;
 	const struct bt_mesh_model_op *op;
-	u32_t opcode;
-	u8_t count;
+	uint32_t opcode;
+	uint8_t count;
 	int i;
 
 	BT_DBG("app_idx 0x%04x src 0x%04x dst 0x%04x", rx->ctx.app_idx,
@@ -633,7 +633,7 @@ void bt_mesh_model_recv(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 	}
 }
 
-void bt_mesh_model_msg_init(struct net_buf_simple *msg, u32_t opcode)
+void bt_mesh_model_msg_init(struct net_buf_simple *msg, uint32_t opcode)
 {
 	net_buf_simple_init(msg, 0);
 
@@ -783,9 +783,9 @@ int bt_mesh_model_publish(struct bt_mesh_model *model)
 }
 
 struct bt_mesh_model *bt_mesh_model_find_vnd(const struct bt_mesh_elem *elem,
-					     u16_t company, u16_t id)
+					     uint16_t company, uint16_t id)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < elem->vnd_model_count; i++) {
 		if (elem->vnd_models[i].vnd.company == company &&
@@ -798,9 +798,9 @@ struct bt_mesh_model *bt_mesh_model_find_vnd(const struct bt_mesh_elem *elem,
 }
 
 struct bt_mesh_model *bt_mesh_model_find(const struct bt_mesh_elem *elem,
-					 u16_t id)
+					 uint16_t id)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < elem->model_count; i++) {
 		if (elem->models[i].id == id) {
@@ -828,12 +828,12 @@ struct bt_mesh_model *bt_mesh_model_root(struct bt_mesh_model *mod)
 
 void bt_mesh_model_tree_walk(struct bt_mesh_model *root,
 			     enum bt_mesh_walk (*cb)(struct bt_mesh_model *mod,
-						     u32_t depth,
+						     uint32_t depth,
 						     void *user_data),
 			     void *user_data)
 {
 	struct bt_mesh_model *m = root;
-	u32_t depth = 0;
+	uint32_t depth = 0;
 
 	do {
 		if (cb(m, depth, user_data) == BT_MESH_WALK_STOP) {
diff --git a/subsys/bluetooth/mesh/access.h b/subsys/bluetooth/mesh/access.h
index e13b778986..4ddc6685d2 100644
--- a/subsys/bluetooth/mesh/access.h
+++ b/subsys/bluetooth/mesh/access.h
@@ -21,23 +21,23 @@ enum bt_mesh_walk {
 	BT_MESH_WALK_CONTINUE,
 };
 
-void bt_mesh_elem_register(struct bt_mesh_elem *elem, u8_t count);
+void bt_mesh_elem_register(struct bt_mesh_elem *elem, uint8_t count);
 
-u8_t bt_mesh_elem_count(void);
+uint8_t bt_mesh_elem_count(void);
 
 /* Find local element based on unicast or group address */
-struct bt_mesh_elem *bt_mesh_elem_find(u16_t addr);
+struct bt_mesh_elem *bt_mesh_elem_find(uint16_t addr);
 
 struct bt_mesh_model *bt_mesh_model_root(struct bt_mesh_model *mod);
 void bt_mesh_model_tree_walk(struct bt_mesh_model *root,
 			     enum bt_mesh_walk (*cb)(struct bt_mesh_model *mod,
-						     u32_t depth,
+						     uint32_t depth,
 						     void *user_data),
 			     void *user_data);
 
-u16_t *bt_mesh_model_find_group(struct bt_mesh_model **mod, u16_t addr);
+uint16_t *bt_mesh_model_find_group(struct bt_mesh_model **mod, uint16_t addr);
 
-bool bt_mesh_fixed_group_match(u16_t addr);
+bool bt_mesh_fixed_group_match(uint16_t addr);
 
 void bt_mesh_model_foreach(void (*func)(struct bt_mesh_model *mod,
 					struct bt_mesh_elem *elem,
@@ -45,16 +45,16 @@ void bt_mesh_model_foreach(void (*func)(struct bt_mesh_model *mod,
 					void *user_data),
 			   void *user_data);
 
-s32_t bt_mesh_model_pub_period_get(struct bt_mesh_model *mod);
+int32_t bt_mesh_model_pub_period_get(struct bt_mesh_model *mod);
 
-void bt_mesh_comp_provision(u16_t addr);
+void bt_mesh_comp_provision(uint16_t addr);
 void bt_mesh_comp_unprovision(void);
 
-u16_t bt_mesh_primary_addr(void);
+uint16_t bt_mesh_primary_addr(void);
 
 const struct bt_mesh_comp *bt_mesh_comp_get(void);
 
-struct bt_mesh_model *bt_mesh_model_get(bool vnd, u8_t elem_idx, u8_t mod_idx);
+struct bt_mesh_model *bt_mesh_model_get(bool vnd, uint8_t elem_idx, uint8_t mod_idx);
 
 void bt_mesh_model_recv(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf);
 
diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
index ddaa0d5e54..3b98ebb8fc 100644
--- a/subsys/bluetooth/mesh/adv.c
+++ b/subsys/bluetooth/mesh/adv.c
@@ -65,7 +65,7 @@ static struct bt_mesh_adv *adv_alloc(int id)
 	return &adv_pool[id];
 }
 
-static inline void adv_send_start(u16_t duration, int err,
+static inline void adv_send_start(uint16_t duration, int err,
 				  const struct bt_mesh_send_cb *cb,
 				  void *cb_data)
 {
@@ -84,18 +84,18 @@ static inline void adv_send_end(int err, const struct bt_mesh_send_cb *cb,
 
 static inline void adv_send(struct net_buf *buf)
 {
-	static const u8_t adv_type[] = {
+	static const uint8_t adv_type[] = {
 		[BT_MESH_ADV_PROV]   = BT_DATA_MESH_PROV,
 		[BT_MESH_ADV_DATA]   = BT_DATA_MESH_MESSAGE,
 		[BT_MESH_ADV_BEACON] = BT_DATA_MESH_BEACON,
 		[BT_MESH_ADV_URI]    = BT_DATA_URI,
 	};
-	const s32_t adv_int_min = ((bt_dev.hci_version >= BT_HCI_VERSION_5_0) ?
+	const int32_t adv_int_min = ((bt_dev.hci_version >= BT_HCI_VERSION_5_0) ?
 				   ADV_INT_FAST_MS : ADV_INT_DEFAULT_MS);
 	const struct bt_mesh_send_cb *cb = BT_MESH_ADV(buf)->cb;
 	void *cb_data = BT_MESH_ADV(buf)->cb_data;
 	struct bt_le_adv_param param = {};
-	u16_t duration, adv_int;
+	uint16_t duration, adv_int;
 	struct bt_data ad;
 	int err;
 
@@ -196,7 +196,7 @@ void bt_mesh_adv_update(void)
 struct net_buf *bt_mesh_adv_create_from_pool(struct net_buf_pool *pool,
 					     bt_mesh_adv_alloc_t get_id,
 					     enum bt_mesh_adv_type type,
-					     u8_t xmit, k_timeout_t timeout)
+					     uint8_t xmit, k_timeout_t timeout)
 {
 	struct bt_mesh_adv *adv;
 	struct net_buf *buf;
@@ -222,7 +222,7 @@ struct net_buf *bt_mesh_adv_create_from_pool(struct net_buf_pool *pool,
 	return buf;
 }
 
-struct net_buf *bt_mesh_adv_create(enum bt_mesh_adv_type type, u8_t xmit,
+struct net_buf *bt_mesh_adv_create(enum bt_mesh_adv_type type, uint8_t xmit,
 				   k_timeout_t timeout)
 {
 	return bt_mesh_adv_create_from_pool(&adv_buf_pool, adv_alloc, type,
@@ -242,8 +242,8 @@ void bt_mesh_adv_send(struct net_buf *buf, const struct bt_mesh_send_cb *cb,
 	net_buf_put(&adv_queue, net_buf_ref(buf));
 }
 
-static void bt_mesh_scan_cb(const bt_addr_le_t *addr, s8_t rssi,
-			    u8_t adv_type, struct net_buf_simple *buf)
+static void bt_mesh_scan_cb(const bt_addr_le_t *addr, int8_t rssi,
+			    uint8_t adv_type, struct net_buf_simple *buf)
 {
 	if (adv_type != BT_GAP_ADV_TYPE_ADV_NONCONN_IND) {
 		return;
@@ -253,7 +253,7 @@ static void bt_mesh_scan_cb(const bt_addr_le_t *addr, s8_t rssi,
 
 	while (buf->len > 1) {
 		struct net_buf_simple_state state;
-		u8_t len, type;
+		uint8_t len, type;
 
 		len = net_buf_simple_pull_u8(buf);
 		/* Check for early termination */
diff --git a/subsys/bluetooth/mesh/adv.h b/subsys/bluetooth/mesh/adv.h
index 9432a60a71..94af6ad707 100644
--- a/subsys/bluetooth/mesh/adv.h
+++ b/subsys/bluetooth/mesh/adv.h
@@ -21,28 +21,28 @@ enum bt_mesh_adv_type {
 	BT_MESH_ADV_URI,
 };
 
-typedef void (*bt_mesh_adv_func_t)(struct net_buf *buf, u16_t duration,
+typedef void (*bt_mesh_adv_func_t)(struct net_buf *buf, uint16_t duration,
 				   int err, void *user_data);
 
 struct bt_mesh_adv {
 	const struct bt_mesh_send_cb *cb;
 	void *cb_data;
 
-	u8_t      type:2,
+	uint8_t      type:2,
 		  busy:1;
-	u8_t      xmit;
+	uint8_t      xmit;
 };
 
 typedef struct bt_mesh_adv *(*bt_mesh_adv_alloc_t)(int id);
 
 /* xmit_count: Number of retransmissions, i.e. 0 == 1 transmission */
-struct net_buf *bt_mesh_adv_create(enum bt_mesh_adv_type type, u8_t xmit,
+struct net_buf *bt_mesh_adv_create(enum bt_mesh_adv_type type, uint8_t xmit,
 				   k_timeout_t timeout);
 
 struct net_buf *bt_mesh_adv_create_from_pool(struct net_buf_pool *pool,
 					     bt_mesh_adv_alloc_t get_id,
 					     enum bt_mesh_adv_type type,
-					     u8_t xmit, k_timeout_t timeout);
+					     uint8_t xmit, k_timeout_t timeout);
 
 void bt_mesh_adv_send(struct net_buf *buf, const struct bt_mesh_send_cb *cb,
 		      void *cb_data);
diff --git a/subsys/bluetooth/mesh/beacon.c b/subsys/bluetooth/mesh/beacon.c
index 96dd557625..605d120e26 100644
--- a/subsys/bluetooth/mesh/beacon.c
+++ b/subsys/bluetooth/mesh/beacon.c
@@ -41,7 +41,7 @@
 
 static struct k_delayed_work beacon_timer;
 
-static struct bt_mesh_subnet *cache_check(u8_t data[21])
+static struct bt_mesh_subnet *cache_check(uint8_t data[21])
 {
 	int i;
 
@@ -60,7 +60,7 @@ static struct bt_mesh_subnet *cache_check(u8_t data[21])
 	return NULL;
 }
 
-static void cache_add(u8_t data[21], struct bt_mesh_subnet *sub)
+static void cache_add(uint8_t data[21], struct bt_mesh_subnet *sub)
 {
 	memcpy(sub->beacon_cache, data, 21);
 }
@@ -77,7 +77,7 @@ static void beacon_complete(int err, void *user_data)
 void bt_mesh_beacon_create(struct bt_mesh_subnet *sub,
 			   struct net_buf_simple *buf)
 {
-	u8_t flags = bt_mesh_net_flags(sub);
+	uint8_t flags = bt_mesh_net_flags(sub);
 	struct bt_mesh_subnet_keys *keys;
 
 	net_buf_simple_add_u8(buf, BEACON_TYPE_SECURE);
@@ -113,7 +113,7 @@ static int secure_beacon_send(void)
 	static const struct bt_mesh_send_cb send_cb = {
 		.end = beacon_complete,
 	};
-	u32_t now = k_uptime_get_32();
+	uint32_t now = k_uptime_get_32();
 	int i;
 
 	BT_DBG("");
@@ -121,7 +121,7 @@ static int secure_beacon_send(void)
 	for (i = 0; i < ARRAY_SIZE(bt_mesh.sub); i++) {
 		struct bt_mesh_subnet *sub = &bt_mesh.sub[i];
 		struct net_buf *buf;
-		u32_t time_diff;
+		uint32_t time_diff;
 
 		if (sub->net_idx == BT_MESH_KEY_UNUSED) {
 			continue;
@@ -152,9 +152,9 @@ static int secure_beacon_send(void)
 static int unprovisioned_beacon_send(void)
 {
 	const struct bt_mesh_prov *prov;
-	u8_t uri_hash[16] = { 0 };
+	uint8_t uri_hash[16] = { 0 };
 	struct net_buf *buf;
-	u16_t oob_info;
+	uint16_t oob_info;
 
 	BT_DBG("");
 
@@ -209,10 +209,10 @@ static void unprovisioned_beacon_recv(struct net_buf_simple *buf)
 {
 #if defined(CONFIG_BT_MESH_PB_ADV)
 	const struct bt_mesh_prov *prov;
-	u8_t *uuid;
-	u16_t oob_info;
-	u32_t uri_hash_val;
-	u32_t *uri_hash = NULL;
+	uint8_t *uuid;
+	uint16_t oob_info;
+	uint32_t uri_hash_val;
+	uint32_t *uri_hash = NULL;
 
 	if (buf->len != 18 && buf->len != 22) {
 		BT_ERR("Invalid unprovisioned beacon length (%u)", buf->len);
@@ -293,11 +293,11 @@ static void beacon_send(struct k_work *work)
 
 static void secure_beacon_recv(struct net_buf_simple *buf)
 {
-	u8_t *data, *net_id, *auth;
+	uint8_t *data, *net_id, *auth;
 	struct bt_mesh_subnet *sub;
-	u32_t iv_index;
+	uint32_t iv_index;
 	bool new_key, kr_change, iv_change;
-	u8_t flags;
+	uint8_t flags;
 
 	if (buf->len < 21) {
 		BT_ERR("Too short secure beacon (len %u)", buf->len);
@@ -374,7 +374,7 @@ update_stats:
 
 void bt_mesh_beacon_recv(struct net_buf_simple *buf)
 {
-	u8_t type;
+	uint8_t type;
 
 	BT_DBG("%u bytes: %s", buf->len, bt_hex(buf->data, buf->len));
 
diff --git a/subsys/bluetooth/mesh/cdb.c b/subsys/bluetooth/mesh/cdb.c
index b857931f4d..551aa1bccb 100644
--- a/subsys/bluetooth/mesh/cdb.c
+++ b/subsys/bluetooth/mesh/cdb.c
@@ -40,10 +40,10 @@ struct bt_mesh_cdb bt_mesh_cdb = {
  * free for use. When a conflict is found, next will be set to the next address
  * available after the conflicting range and -EAGAIN will be returned.
  */
-static int addr_is_free(u16_t addr_start, u8_t num_elem, u16_t *next)
+static int addr_is_free(uint16_t addr_start, uint8_t num_elem, uint16_t *next)
 {
-	u16_t addr_end = addr_start + num_elem - 1;
-	u16_t other_start, other_end;
+	uint16_t addr_end = addr_start + num_elem - 1;
+	uint16_t other_start, other_end;
 	int i;
 
 	if (!BT_MESH_ADDR_IS_UNICAST(addr_start) ||
@@ -83,9 +83,9 @@ static int addr_is_free(u16_t addr_start, u8_t num_elem, u16_t *next)
  *       through the array of nodes N+2 times. A more effective algorithm
  *       could be used if the nodes were stored in a sorted list.
  */
-static u16_t find_lowest_free_addr(u8_t num_elem)
+static uint16_t find_lowest_free_addr(uint8_t num_elem)
 {
-	u16_t addr = 1, next;
+	uint16_t addr = 1, next;
 	int err, i;
 
 	/*
@@ -108,7 +108,7 @@ static u16_t find_lowest_free_addr(u8_t num_elem)
 	return addr;
 }
 
-int bt_mesh_cdb_create(const u8_t key[16])
+int bt_mesh_cdb_create(const uint8_t key[16])
 {
 	struct bt_mesh_cdb_subnet *sub;
 
@@ -162,7 +162,7 @@ void bt_mesh_cdb_clear(void)
 	}
 }
 
-void bt_mesh_cdb_iv_update(u32_t iv_index, bool iv_update)
+void bt_mesh_cdb_iv_update(uint32_t iv_index, bool iv_update)
 {
 	BT_DBG("Updating IV index to %d\n", iv_index);
 
@@ -176,7 +176,7 @@ void bt_mesh_cdb_iv_update(u32_t iv_index, bool iv_update)
 	}
 }
 
-struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_alloc(u16_t net_idx)
+struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_alloc(uint16_t net_idx)
 {
 	struct bt_mesh_cdb_subnet *sub;
 	int i;
@@ -212,7 +212,7 @@ void bt_mesh_cdb_subnet_del(struct bt_mesh_cdb_subnet *sub, bool store)
 	memset(sub->keys, 0, sizeof(sub->keys));
 }
 
-struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_get(u16_t net_idx)
+struct bt_mesh_cdb_subnet *bt_mesh_cdb_subnet_get(uint16_t net_idx)
 {
 	int i;
 
@@ -230,9 +230,9 @@ void bt_mesh_cdb_subnet_store(const struct bt_mesh_cdb_subnet *sub)
 	bt_mesh_store_cdb_subnet(sub);
 }
 
-u8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub)
+uint8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub)
 {
-	u8_t flags = 0x00;
+	uint8_t flags = 0x00;
 
 	if (sub && sub->kr_flag) {
 		flags |= BT_MESH_NET_FLAG_KR;
@@ -245,8 +245,8 @@ u8_t bt_mesh_cdb_subnet_flags(const struct bt_mesh_cdb_subnet *sub)
 	return flags;
 }
 
-struct bt_mesh_cdb_node *bt_mesh_cdb_node_alloc(const u8_t uuid[16], u16_t addr,
-						u8_t num_elem, u16_t net_idx)
+struct bt_mesh_cdb_node *bt_mesh_cdb_node_alloc(const uint8_t uuid[16], uint16_t addr,
+						uint8_t num_elem, uint16_t net_idx)
 {
 	int i;
 
@@ -289,7 +289,7 @@ void bt_mesh_cdb_node_del(struct bt_mesh_cdb_node *node, bool store)
 	memset(node->dev_key, 0, sizeof(node->dev_key));
 }
 
-struct bt_mesh_cdb_node *bt_mesh_cdb_node_get(u16_t addr)
+struct bt_mesh_cdb_node *bt_mesh_cdb_node_get(uint16_t addr)
 {
 	int i;
 
@@ -326,8 +326,8 @@ void bt_mesh_cdb_node_foreach(bt_mesh_cdb_node_func_t func, void *user_data)
 	}
 }
 
-struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_alloc(u16_t net_idx,
-						      u16_t app_idx)
+struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_alloc(uint16_t net_idx,
+						      uint16_t app_idx)
 {
 	struct bt_mesh_cdb_app_key *key;
 	int i;
@@ -360,7 +360,7 @@ void bt_mesh_cdb_app_key_del(struct bt_mesh_cdb_app_key *key, bool store)
 	memset(key->keys, 0, sizeof(key->keys));
 }
 
-struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_get(u16_t app_idx)
+struct bt_mesh_cdb_app_key *bt_mesh_cdb_app_key_get(uint16_t app_idx)
 {
 	int i;
 
diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index 7e5537fad3..09ffea83a2 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -31,11 +31,11 @@
 #define DUMMY_2_BYTE_OP	BT_MESH_MODEL_OP_2(0xff, 0xff)
 
 struct comp_data {
-	u8_t *status;
+	uint8_t *status;
 	struct net_buf_simple *comp;
 };
 
-static s32_t msg_timeout;
+static int32_t msg_timeout;
 
 static struct bt_mesh_cfg_cli *cli;
 
@@ -67,9 +67,9 @@ static void comp_data_status(struct bt_mesh_model *model,
 static void state_status_u8(struct bt_mesh_model *model,
 			    struct bt_mesh_msg_ctx *ctx,
 			    struct net_buf_simple *buf,
-			    u32_t expect_status)
+			    uint32_t expect_status)
 {
-	u8_t *status;
+	uint8_t *status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -116,8 +116,8 @@ static void gatt_proxy_status(struct bt_mesh_model *model,
 }
 
 struct relay_param {
-	u8_t *status;
-	u8_t *transmit;
+	uint8_t *status;
+	uint8_t *transmit;
 };
 
 static void relay_status(struct bt_mesh_model *model,
@@ -143,8 +143,8 @@ static void relay_status(struct bt_mesh_model *model,
 }
 
 struct net_key_param {
-	u8_t *status;
-	u16_t net_idx;
+	uint8_t *status;
+	uint16_t net_idx;
 };
 
 static void net_key_status(struct bt_mesh_model *model,
@@ -152,8 +152,8 @@ static void net_key_status(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	struct net_key_param *param;
-	u16_t net_idx;
-	u8_t status;
+	uint16_t net_idx;
+	uint8_t status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -181,7 +181,7 @@ static void net_key_status(struct bt_mesh_model *model,
 }
 
 struct net_key_list_param {
-	u16_t *keys;
+	uint16_t *keys;
 	size_t *key_cnt;
 };
 
@@ -217,9 +217,9 @@ static void net_key_list(struct bt_mesh_model *model,
 }
 
 struct app_key_param {
-	u8_t *status;
-	u16_t net_idx;
-	u16_t app_idx;
+	uint8_t *status;
+	uint16_t net_idx;
+	uint16_t app_idx;
 };
 
 static void app_key_status(struct bt_mesh_model *model,
@@ -227,8 +227,8 @@ static void app_key_status(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	struct app_key_param *param;
-	u16_t net_idx, app_idx;
-	u8_t status;
+	uint16_t net_idx, app_idx;
+	uint8_t status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -256,9 +256,9 @@ static void app_key_status(struct bt_mesh_model *model,
 }
 
 struct app_key_list_param {
-	u16_t net_idx;
-	u8_t *status;
-	u16_t *keys;
+	uint16_t net_idx;
+	uint8_t *status;
+	uint16_t *keys;
 	size_t *key_cnt;
 };
 
@@ -267,8 +267,8 @@ static void app_key_list(struct bt_mesh_model *model,
 			 struct net_buf_simple *buf)
 {
 	struct app_key_list_param *param;
-	u16_t net_idx;
-	u8_t status;
+	uint16_t net_idx;
+	uint8_t status;
 	int i;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
@@ -306,20 +306,20 @@ static void app_key_list(struct bt_mesh_model *model,
 }
 
 struct mod_app_param {
-	u8_t *status;
-	u16_t elem_addr;
-	u16_t mod_app_idx;
-	u16_t mod_id;
-	u16_t cid;
+	uint8_t *status;
+	uint16_t elem_addr;
+	uint16_t mod_app_idx;
+	uint16_t mod_id;
+	uint16_t cid;
 };
 
 static void mod_app_status(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u16_t elem_addr, mod_app_idx, mod_id, cid;
+	uint16_t elem_addr, mod_app_idx, mod_id, cid;
 	struct mod_app_param *param;
-	u8_t status;
+	uint8_t status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -358,11 +358,11 @@ static void mod_app_status(struct bt_mesh_model *model,
 }
 
 struct mod_member_list_param {
-	u8_t *status;
-	u16_t elem_addr;
-	u16_t mod_id;
-	u16_t cid;
-	u16_t *members;
+	uint8_t *status;
+	uint16_t elem_addr;
+	uint16_t mod_id;
+	uint16_t cid;
+	uint16_t *members;
 	size_t *member_cnt;
 };
 
@@ -370,8 +370,8 @@ static void mod_member_list_handle(struct bt_mesh_msg_ctx *ctx,
 				   struct net_buf_simple *buf, bool vnd)
 {
 	struct mod_member_list_param *param;
-	u16_t elem_addr, mod_id, cid;
-	u8_t status;
+	uint16_t elem_addr, mod_id, cid;
+	uint8_t status;
 	int i;
 
 	status = net_buf_simple_pull_u8(buf);
@@ -439,10 +439,10 @@ static void mod_app_list_vnd(struct bt_mesh_model *model,
 }
 
 struct mod_pub_param {
-	u16_t                       mod_id;
-	u16_t                       cid;
-	u16_t                       elem_addr;
-	u8_t                       *status;
+	uint16_t                       mod_id;
+	uint16_t                       cid;
+	uint16_t                       elem_addr;
+	uint8_t                       *status;
 	struct bt_mesh_cfg_mod_pub *pub;
 };
 
@@ -450,9 +450,9 @@ static void mod_pub_status(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u16_t mod_id, cid, elem_addr;
+	uint16_t mod_id, cid, elem_addr;
 	struct mod_pub_param *param;
-	u8_t status;
+	uint8_t status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -514,21 +514,21 @@ static void mod_pub_status(struct bt_mesh_model *model,
 }
 
 struct mod_sub_param {
-	u8_t *status;
-	u16_t elem_addr;
-	u16_t *sub_addr;
-	u16_t *expect_sub;
-	u16_t mod_id;
-	u16_t cid;
+	uint8_t *status;
+	uint16_t elem_addr;
+	uint16_t *sub_addr;
+	uint16_t *expect_sub;
+	uint16_t mod_id;
+	uint16_t cid;
 };
 
 static void mod_sub_status(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr, mod_id, cid;
+	uint16_t elem_addr, sub_addr, mod_id, cid;
 	struct mod_sub_param *param;
-	u8_t status;
+	uint8_t status;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -603,7 +603,7 @@ static void mod_sub_list_vnd(struct bt_mesh_model *model,
 }
 
 struct hb_sub_param {
-	u8_t *status;
+	uint8_t *status;
 	struct bt_mesh_cfg_hb_sub *sub;
 };
 
@@ -637,7 +637,7 @@ static void hb_sub_status(struct bt_mesh_model *model,
 }
 
 struct hb_pub_param {
-	u8_t *status;
+	uint8_t *status;
 	struct bt_mesh_cfg_hb_pub *pub;
 };
 
@@ -726,7 +726,7 @@ const struct bt_mesh_model_cb bt_mesh_cfg_cli_cb = {
 	.init = cfg_cli_init,
 };
 
-static int cli_prepare(void *param, u32_t op)
+static int cli_prepare(void *param, uint32_t op)
 {
 	if (!cli) {
 		BT_ERR("No available Configuration Client context!");
@@ -761,8 +761,8 @@ static int cli_wait(void)
 	return err;
 }
 
-int bt_mesh_cfg_comp_data_get(u16_t net_idx, u16_t addr, u8_t page,
-			      u8_t *status, struct net_buf_simple *comp)
+int bt_mesh_cfg_comp_data_get(uint16_t net_idx, uint16_t addr, uint8_t page,
+			      uint8_t *status, struct net_buf_simple *comp)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_DEV_COMP_DATA_GET, 1);
 	struct bt_mesh_msg_ctx ctx = {
@@ -795,8 +795,8 @@ int bt_mesh_cfg_comp_data_get(u16_t net_idx, u16_t addr, u8_t page,
 	return cli_wait();
 }
 
-static int get_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
-			u8_t *val)
+static int get_state_u8(uint16_t net_idx, uint16_t addr, uint32_t op, uint32_t rsp,
+			uint8_t *val)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, DUMMY_2_BYTE_OP, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -824,8 +824,8 @@ static int get_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
 	return cli_wait();
 }
 
-static int set_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
-			u8_t new_val, u8_t *val)
+static int set_state_u8(uint16_t net_idx, uint16_t addr, uint32_t op, uint32_t rsp,
+			uint8_t new_val, uint8_t *val)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, DUMMY_2_BYTE_OP, 1);
 	struct bt_mesh_msg_ctx ctx = {
@@ -854,57 +854,57 @@ static int set_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
+int bt_mesh_cfg_beacon_get(uint16_t net_idx, uint16_t addr, uint8_t *status)
 {
 	return get_state_u8(net_idx, addr, OP_BEACON_GET, OP_BEACON_STATUS,
 			    status);
 }
 
-int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
+int bt_mesh_cfg_beacon_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *status)
 {
 	return set_state_u8(net_idx, addr, OP_BEACON_SET, OP_BEACON_STATUS,
 			    val, status);
 }
 
-int bt_mesh_cfg_ttl_get(u16_t net_idx, u16_t addr, u8_t *ttl)
+int bt_mesh_cfg_ttl_get(uint16_t net_idx, uint16_t addr, uint8_t *ttl)
 {
 	return get_state_u8(net_idx, addr, OP_DEFAULT_TTL_GET,
 			    OP_DEFAULT_TTL_STATUS, ttl);
 }
 
-int bt_mesh_cfg_ttl_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *ttl)
+int bt_mesh_cfg_ttl_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *ttl)
 {
 	return set_state_u8(net_idx, addr, OP_DEFAULT_TTL_SET,
 			    OP_DEFAULT_TTL_STATUS, val, ttl);
 }
 
-int bt_mesh_cfg_friend_get(u16_t net_idx, u16_t addr, u8_t *status)
+int bt_mesh_cfg_friend_get(uint16_t net_idx, uint16_t addr, uint8_t *status)
 {
 	return get_state_u8(net_idx, addr, OP_FRIEND_GET,
 			    OP_FRIEND_STATUS, status);
 }
 
-int bt_mesh_cfg_friend_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
+int bt_mesh_cfg_friend_set(uint16_t net_idx, uint16_t addr, uint8_t val, uint8_t *status)
 {
 	return set_state_u8(net_idx, addr, OP_FRIEND_SET, OP_FRIEND_STATUS,
 			    val, status);
 }
 
-int bt_mesh_cfg_gatt_proxy_get(u16_t net_idx, u16_t addr, u8_t *status)
+int bt_mesh_cfg_gatt_proxy_get(uint16_t net_idx, uint16_t addr, uint8_t *status)
 {
 	return get_state_u8(net_idx, addr, OP_GATT_PROXY_GET,
 			    OP_GATT_PROXY_STATUS, status);
 }
 
-int bt_mesh_cfg_gatt_proxy_set(u16_t net_idx, u16_t addr, u8_t val,
-			       u8_t *status)
+int bt_mesh_cfg_gatt_proxy_set(uint16_t net_idx, uint16_t addr, uint8_t val,
+			       uint8_t *status)
 {
 	return set_state_u8(net_idx, addr, OP_GATT_PROXY_SET,
 			    OP_GATT_PROXY_STATUS, val, status);
 }
 
-int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
-			  u8_t *transmit)
+int bt_mesh_cfg_relay_get(uint16_t net_idx, uint16_t addr, uint8_t *status,
+			  uint8_t *transmit)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_RELAY_GET, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -936,8 +936,8 @@ int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
-			  u8_t new_transmit, u8_t *status, u8_t *transmit)
+int bt_mesh_cfg_relay_set(uint16_t net_idx, uint16_t addr, uint8_t new_relay,
+			  uint8_t new_transmit, uint8_t *status, uint8_t *transmit)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_RELAY_SET, 2);
 	struct bt_mesh_msg_ctx ctx = {
@@ -971,8 +971,8 @@ int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_net_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			    const u8_t net_key[16], u8_t *status)
+int bt_mesh_cfg_net_key_add(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			    const uint8_t net_key[16], uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NET_KEY_ADD, 18);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1011,7 +1011,7 @@ int bt_mesh_cfg_net_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_net_key_get(u16_t net_idx, u16_t addr, u16_t *keys,
+int bt_mesh_cfg_net_key_get(uint16_t net_idx, uint16_t addr, uint16_t *keys,
 			     size_t *key_cnt)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NET_KEY_GET, 0);
@@ -1044,9 +1044,9 @@ int bt_mesh_cfg_net_key_get(u16_t net_idx, u16_t addr, u16_t *keys,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_app_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			    u16_t key_app_idx, const u8_t app_key[16],
-			    u8_t *status)
+int bt_mesh_cfg_app_key_add(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			    uint16_t key_app_idx, const uint8_t app_key[16],
+			    uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_ADD, 19);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1086,8 +1086,8 @@ int bt_mesh_cfg_app_key_add(u16_t net_idx, u16_t addr, u16_t key_net_idx,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_app_key_get(u16_t net_idx, u16_t addr, u16_t key_net_idx,
-			     u8_t *status, u16_t *keys, size_t *key_cnt)
+int bt_mesh_cfg_app_key_get(uint16_t net_idx, uint16_t addr, uint16_t key_net_idx,
+			     uint8_t *status, uint16_t *keys, size_t *key_cnt)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_GET, 2);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1122,9 +1122,9 @@ int bt_mesh_cfg_app_key_get(u16_t net_idx, u16_t addr, u16_t key_net_idx,
 	return cli_wait();
 }
 
-static int mod_app_bind(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			u16_t mod_app_idx, u16_t mod_id, u16_t cid,
-			u8_t *status)
+static int mod_app_bind(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			uint16_t mod_app_idx, uint16_t mod_id, uint16_t cid,
+			uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_APP_BIND, 8);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1172,16 +1172,16 @@ static int mod_app_bind(u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_app_bind(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			     u16_t mod_app_idx, u16_t mod_id, u8_t *status)
+int bt_mesh_cfg_mod_app_bind(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			     uint16_t mod_app_idx, uint16_t mod_id, uint8_t *status)
 {
 	return mod_app_bind(net_idx, addr, elem_addr, mod_app_idx, mod_id,
 			    CID_NVAL, status);
 }
 
-int bt_mesh_cfg_mod_app_bind_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t mod_app_idx, u16_t mod_id, u16_t cid,
-				 u8_t *status)
+int bt_mesh_cfg_mod_app_bind_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t mod_app_idx, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1191,9 +1191,9 @@ int bt_mesh_cfg_mod_app_bind_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 			    status);
 }
 
-static int mod_member_list_get(u32_t op, u32_t expect_op, u16_t net_idx,
-			       u16_t addr, u16_t elem_addr, u16_t mod_id,
-			       u16_t cid, u8_t *status, u16_t *apps,
+static int mod_member_list_get(uint32_t op, uint32_t expect_op, uint16_t net_idx,
+			       uint16_t addr, uint16_t elem_addr, uint16_t mod_id,
+			       uint16_t cid, uint8_t *status, uint16_t *apps,
 			       size_t *app_cnt)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, DUMMY_2_BYTE_OP, 6);
@@ -1241,8 +1241,8 @@ static int mod_member_list_get(u32_t op, u32_t expect_op, u16_t net_idx,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_app_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, u8_t *status, u16_t *apps,
+int bt_mesh_cfg_mod_app_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, uint8_t *status, uint16_t *apps,
 			    size_t *app_cnt)
 {
 	return mod_member_list_get(OP_SIG_MOD_APP_GET, OP_SIG_MOD_APP_LIST,
@@ -1250,9 +1250,9 @@ int bt_mesh_cfg_mod_app_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
 				   status, apps, app_cnt);
 }
 
-int bt_mesh_cfg_mod_app_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid, u8_t *status,
-				u16_t *apps, size_t *app_cnt)
+int bt_mesh_cfg_mod_app_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid, uint8_t *status,
+				uint16_t *apps, size_t *app_cnt)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1263,8 +1263,8 @@ int bt_mesh_cfg_mod_app_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 				   status, apps, app_cnt);
 }
 
-static int mod_sub(u32_t op, u16_t net_idx, u16_t addr, u16_t elem_addr,
-		   u16_t sub_addr, u16_t mod_id, u16_t cid, u8_t *status)
+static int mod_sub(uint32_t op, uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+		   uint16_t sub_addr, uint16_t mod_id, uint16_t cid, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, DUMMY_2_BYTE_OP, 8);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1307,16 +1307,16 @@ static int mod_sub(u32_t op, u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t sub_addr, u16_t mod_id, u8_t *status)
+int bt_mesh_cfg_mod_sub_add(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t sub_addr, uint16_t mod_id, uint8_t *status)
 {
 	return mod_sub(OP_MOD_SUB_ADD, net_idx, addr, elem_addr, sub_addr,
 		       mod_id, CID_NVAL, status);
 }
 
-int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t sub_addr, u16_t mod_id, u16_t cid,
-				 u8_t *status)
+int bt_mesh_cfg_mod_sub_add_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t sub_addr, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1326,16 +1326,16 @@ int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 		       mod_id, cid, status);
 }
 
-int bt_mesh_cfg_mod_sub_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t sub_addr, u16_t mod_id, u8_t *status)
+int bt_mesh_cfg_mod_sub_del(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t sub_addr, uint16_t mod_id, uint8_t *status)
 {
 	return mod_sub(OP_MOD_SUB_DEL, net_idx, addr, elem_addr, sub_addr,
 		       mod_id, CID_NVAL, status);
 }
 
-int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				 u16_t sub_addr, u16_t mod_id, u16_t cid,
-				 u8_t *status)
+int bt_mesh_cfg_mod_sub_del_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				 uint16_t sub_addr, uint16_t mod_id, uint16_t cid,
+				 uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1345,16 +1345,16 @@ int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 		       mod_id, cid, status);
 }
 
-int bt_mesh_cfg_mod_sub_overwrite(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				  u16_t sub_addr, u16_t mod_id, u8_t *status)
+int bt_mesh_cfg_mod_sub_overwrite(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				  uint16_t sub_addr, uint16_t mod_id, uint8_t *status)
 {
 	return mod_sub(OP_MOD_SUB_OVERWRITE, net_idx, addr, elem_addr,
 		       sub_addr, mod_id, CID_NVAL, status);
 }
 
-int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
-				      u16_t elem_addr, u16_t sub_addr,
-				      u16_t mod_id, u16_t cid, u8_t *status)
+int bt_mesh_cfg_mod_sub_overwrite_vnd(uint16_t net_idx, uint16_t addr,
+				      uint16_t elem_addr, uint16_t sub_addr,
+				      uint16_t mod_id, uint16_t cid, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1364,9 +1364,9 @@ int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
 		       sub_addr, mod_id, cid, status);
 }
 
-static int mod_sub_va(u32_t op, u16_t net_idx, u16_t addr, u16_t elem_addr,
-		      const u8_t label[16], u16_t mod_id, u16_t cid,
-		      u16_t *virt_addr, u8_t *status)
+static int mod_sub_va(uint32_t op, uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+		      const uint8_t label[16], uint16_t mod_id, uint16_t cid,
+		      uint16_t *virt_addr, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, DUMMY_2_BYTE_OP, 22);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1418,17 +1418,17 @@ static int mod_sub_va(u32_t op, u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_sub_va_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			       const u8_t label[16], u16_t mod_id,
-			       u16_t *virt_addr, u8_t *status)
+int bt_mesh_cfg_mod_sub_va_add(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			       const uint8_t label[16], uint16_t mod_id,
+			       uint16_t *virt_addr, uint8_t *status)
 {
 	return mod_sub_va(OP_MOD_SUB_VA_ADD, net_idx, addr, elem_addr, label,
 			  mod_id, CID_NVAL, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_va_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				   const u8_t label[16], u16_t mod_id,
-				   u16_t cid, u16_t *virt_addr, u8_t *status)
+int bt_mesh_cfg_mod_sub_va_add_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				   const uint8_t label[16], uint16_t mod_id,
+				   uint16_t cid, uint16_t *virt_addr, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1438,17 +1438,17 @@ int bt_mesh_cfg_mod_sub_va_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 			  mod_id, cid, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_va_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			       const u8_t label[16], u16_t mod_id,
-			       u16_t *virt_addr, u8_t *status)
+int bt_mesh_cfg_mod_sub_va_del(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			       const uint8_t label[16], uint16_t mod_id,
+			       uint16_t *virt_addr, uint8_t *status)
 {
 	return mod_sub_va(OP_MOD_SUB_VA_DEL, net_idx, addr, elem_addr, label,
 			  mod_id, CID_NVAL, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_va_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				   const u8_t label[16], u16_t mod_id,
-				   u16_t cid, u16_t *virt_addr, u8_t *status)
+int bt_mesh_cfg_mod_sub_va_del_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				   const uint8_t label[16], uint16_t mod_id,
+				   uint16_t cid, uint16_t *virt_addr, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1458,19 +1458,19 @@ int bt_mesh_cfg_mod_sub_va_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 			  mod_id, cid, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_va_overwrite(u16_t net_idx, u16_t addr,
-				     u16_t elem_addr, const u8_t label[16],
-				     u16_t mod_id, u16_t *virt_addr,
-				     u8_t *status)
+int bt_mesh_cfg_mod_sub_va_overwrite(uint16_t net_idx, uint16_t addr,
+				     uint16_t elem_addr, const uint8_t label[16],
+				     uint16_t mod_id, uint16_t *virt_addr,
+				     uint8_t *status)
 {
 	return mod_sub_va(OP_MOD_SUB_VA_OVERWRITE, net_idx, addr, elem_addr,
 			  label, mod_id, CID_NVAL, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_va_overwrite_vnd(u16_t net_idx, u16_t addr,
-					 u16_t elem_addr, const u8_t label[16],
-					 u16_t mod_id, u16_t cid,
-					 u16_t *virt_addr, u8_t *status)
+int bt_mesh_cfg_mod_sub_va_overwrite_vnd(uint16_t net_idx, uint16_t addr,
+					 uint16_t elem_addr, const uint8_t label[16],
+					 uint16_t mod_id, uint16_t cid,
+					 uint16_t *virt_addr, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1480,8 +1480,8 @@ int bt_mesh_cfg_mod_sub_va_overwrite_vnd(u16_t net_idx, u16_t addr,
 			  label, mod_id, cid, virt_addr, status);
 }
 
-int bt_mesh_cfg_mod_sub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, u8_t *status, u16_t *subs,
+int bt_mesh_cfg_mod_sub_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, uint8_t *status, uint16_t *subs,
 			    size_t *sub_cnt)
 {
 	return mod_member_list_get(OP_MOD_SUB_GET, OP_MOD_SUB_LIST, net_idx,
@@ -1489,9 +1489,9 @@ int bt_mesh_cfg_mod_sub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
 				   subs, sub_cnt);
 }
 
-int bt_mesh_cfg_mod_sub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid, u8_t *status,
-				u16_t *subs, size_t *sub_cnt)
+int bt_mesh_cfg_mod_sub_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid, uint8_t *status,
+				uint16_t *subs, size_t *sub_cnt)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1502,9 +1502,9 @@ int bt_mesh_cfg_mod_sub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 				   status, subs, sub_cnt);
 }
 
-static int mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-		       u16_t mod_id, u16_t cid,
-		       struct bt_mesh_cfg_mod_pub *pub, u8_t *status)
+static int mod_pub_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+		       uint16_t mod_id, uint16_t cid,
+		       struct bt_mesh_cfg_mod_pub *pub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_PUB_GET, 6);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1552,17 +1552,17 @@ static int mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
-			    u8_t *status)
+int bt_mesh_cfg_mod_pub_get(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
+			    uint8_t *status)
 {
 	return mod_pub_get(net_idx, addr, elem_addr, mod_id, CID_NVAL,
 			   pub, status);
 }
 
-int bt_mesh_cfg_mod_pub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid,
-				struct bt_mesh_cfg_mod_pub *pub, u8_t *status)
+int bt_mesh_cfg_mod_pub_get_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid,
+				struct bt_mesh_cfg_mod_pub *pub, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1571,9 +1571,9 @@ int bt_mesh_cfg_mod_pub_get_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return mod_pub_get(net_idx, addr, elem_addr, mod_id, cid, pub, status);
 }
 
-static int mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
-		       u16_t mod_id, u16_t cid,
-		       struct bt_mesh_cfg_mod_pub *pub, u8_t *status)
+static int mod_pub_set(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+		       uint16_t mod_id, uint16_t cid,
+		       struct bt_mesh_cfg_mod_pub *pub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_PUB_SET, 13);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1626,17 +1626,17 @@ static int mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_mod_pub_set(u16_t net_idx, u16_t addr, u16_t elem_addr,
-			    u16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
-			    u8_t *status)
+int bt_mesh_cfg_mod_pub_set(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+			    uint16_t mod_id, struct bt_mesh_cfg_mod_pub *pub,
+			    uint8_t *status)
 {
 	return mod_pub_set(net_idx, addr, elem_addr, mod_id, CID_NVAL,
 			   pub, status);
 }
 
-int bt_mesh_cfg_mod_pub_set_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
-				u16_t mod_id, u16_t cid,
-				struct bt_mesh_cfg_mod_pub *pub, u8_t *status)
+int bt_mesh_cfg_mod_pub_set_vnd(uint16_t net_idx, uint16_t addr, uint16_t elem_addr,
+				uint16_t mod_id, uint16_t cid,
+				struct bt_mesh_cfg_mod_pub *pub, uint8_t *status)
 {
 	if (cid == CID_NVAL) {
 		return -EINVAL;
@@ -1645,8 +1645,8 @@ int bt_mesh_cfg_mod_pub_set_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
 	return mod_pub_set(net_idx, addr, elem_addr, mod_id, cid, pub, status);
 }
 
-int bt_mesh_cfg_hb_sub_set(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_sub *sub, u8_t *status)
+int bt_mesh_cfg_hb_sub_set(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_sub *sub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_SUB_SET, 5);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1686,8 +1686,8 @@ int bt_mesh_cfg_hb_sub_set(u16_t net_idx, u16_t addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_hb_sub_get(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_sub *sub, u8_t *status)
+int bt_mesh_cfg_hb_sub_get(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_sub *sub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_SUB_GET, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1724,8 +1724,8 @@ int bt_mesh_cfg_hb_sub_get(u16_t net_idx, u16_t addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_hb_pub_set(u16_t net_idx, u16_t addr,
-			   const struct bt_mesh_cfg_hb_pub *pub, u8_t *status)
+int bt_mesh_cfg_hb_pub_set(uint16_t net_idx, uint16_t addr,
+			   const struct bt_mesh_cfg_hb_pub *pub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_PUB_SET, 9);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1767,8 +1767,8 @@ int bt_mesh_cfg_hb_pub_set(u16_t net_idx, u16_t addr,
 	return cli_wait();
 }
 
-int bt_mesh_cfg_hb_pub_get(u16_t net_idx, u16_t addr,
-			   struct bt_mesh_cfg_hb_pub *pub, u8_t *status)
+int bt_mesh_cfg_hb_pub_get(uint16_t net_idx, uint16_t addr,
+			   struct bt_mesh_cfg_hb_pub *pub, uint8_t *status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_PUB_GET, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -1805,12 +1805,12 @@ int bt_mesh_cfg_hb_pub_get(u16_t net_idx, u16_t addr,
 	return cli_wait();
 }
 
-s32_t bt_mesh_cfg_cli_timeout_get(void)
+int32_t bt_mesh_cfg_cli_timeout_get(void)
 {
 	return msg_timeout;
 }
 
-void bt_mesh_cfg_cli_timeout_set(s32_t timeout)
+void bt_mesh_cfg_cli_timeout_set(int32_t timeout)
 {
 	msg_timeout = timeout;
 }
diff --git a/subsys/bluetooth/mesh/cfg_srv.c b/subsys/bluetooth/mesh/cfg_srv.c
index 674366a531..feaaae3e7a 100644
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@@ -76,7 +76,7 @@ static int comp_add_elem(struct net_buf_simple *buf, struct bt_mesh_elem *elem,
 
 static int comp_get_page_0(struct net_buf_simple *buf)
 {
-	u16_t feat = 0U;
+	uint16_t feat = 0U;
 	const struct bt_mesh_comp *comp;
 	int i;
 
@@ -121,7 +121,7 @@ static void dev_comp_data_get(struct bt_mesh_model *model,
 			      struct net_buf_simple *buf)
 {
 	NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
-	u8_t page;
+	uint8_t page;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -150,7 +150,7 @@ static struct bt_mesh_model *get_model(struct bt_mesh_elem *elem,
 				       struct net_buf_simple *buf, bool *vnd)
 {
 	if (buf->len < 4) {
-		u16_t id;
+		uint16_t id;
 
 		id = net_buf_simple_pull_le16(buf);
 
@@ -160,7 +160,7 @@ static struct bt_mesh_model *get_model(struct bt_mesh_elem *elem,
 
 		return bt_mesh_model_find(elem, id);
 	} else {
-		u16_t company, id;
+		uint16_t company, id;
 
 		company = net_buf_simple_pull_le16(buf);
 		id = net_buf_simple_pull_le16(buf);
@@ -174,7 +174,7 @@ static struct bt_mesh_model *get_model(struct bt_mesh_elem *elem,
 	}
 }
 
-static bool app_key_is_valid(u16_t app_idx)
+static bool app_key_is_valid(uint16_t app_idx)
 {
 	int i;
 
@@ -190,9 +190,9 @@ static bool app_key_is_valid(u16_t app_idx)
 	return false;
 }
 
-static u8_t _mod_pub_set(struct bt_mesh_model *model, u16_t pub_addr,
-			 u16_t app_idx, u8_t cred_flag, u8_t ttl, u8_t period,
-			 u8_t retransmit, bool store)
+static uint8_t _mod_pub_set(struct bt_mesh_model *model, uint16_t pub_addr,
+			 uint16_t app_idx, uint8_t cred_flag, uint8_t ttl, uint8_t period,
+			 uint8_t retransmit, bool store)
 {
 	if (!model->pub) {
 		return STATUS_NVAL_PUB_PARAM;
@@ -242,7 +242,7 @@ static u8_t _mod_pub_set(struct bt_mesh_model *model, u16_t pub_addr,
 	model->pub->retransmit = retransmit;
 
 	if (model->pub->update) {
-		s32_t period_ms;
+		int32_t period_ms;
 
 		period_ms = bt_mesh_model_pub_period_get(model);
 		BT_DBG("period %u ms", period_ms);
@@ -262,7 +262,7 @@ static u8_t _mod_pub_set(struct bt_mesh_model *model, u16_t pub_addr,
 	return STATUS_SUCCESS;
 }
 
-static u8_t mod_bind(struct bt_mesh_model *model, u16_t key_idx)
+static uint8_t mod_bind(struct bt_mesh_model *model, uint16_t key_idx)
 {
 	int i;
 
@@ -294,7 +294,7 @@ static u8_t mod_bind(struct bt_mesh_model *model, u16_t key_idx)
 	return STATUS_INSUFF_RESOURCES;
 }
 
-static u8_t mod_unbind(struct bt_mesh_model *model, u16_t key_idx, bool store)
+static uint8_t mod_unbind(struct bt_mesh_model *model, uint16_t key_idx, bool store)
 {
 	int i;
 
@@ -324,7 +324,7 @@ static u8_t mod_unbind(struct bt_mesh_model *model, u16_t key_idx, bool store)
 	return STATUS_SUCCESS;
 }
 
-struct bt_mesh_app_key *bt_mesh_app_key_alloc(u16_t app_idx)
+struct bt_mesh_app_key *bt_mesh_app_key_alloc(uint16_t app_idx)
 {
 	int i;
 
@@ -339,7 +339,7 @@ struct bt_mesh_app_key *bt_mesh_app_key_alloc(u16_t app_idx)
 	return NULL;
 }
 
-static u8_t app_key_set(u16_t net_idx, u16_t app_idx, const u8_t val[16],
+static uint8_t app_key_set(uint16_t net_idx, uint16_t app_idx, const uint8_t val[16],
 			bool update)
 {
 	struct bt_mesh_app_keys *keys;
@@ -433,8 +433,8 @@ static void app_key_add(struct bt_mesh_model *model,
 			struct net_buf_simple *buf)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_STATUS, 4);
-	u16_t key_net_idx, key_app_idx;
-	u8_t status;
+	uint16_t key_net_idx, key_app_idx;
+	uint8_t status;
 
 	key_idx_unpack(buf, &key_net_idx, &key_app_idx);
 
@@ -458,8 +458,8 @@ static void app_key_update(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_STATUS, 4);
-	u16_t key_net_idx, key_app_idx;
-	u8_t status;
+	uint16_t key_net_idx, key_app_idx;
+	uint8_t status;
 
 	key_idx_unpack(buf, &key_net_idx, &key_app_idx);
 
@@ -479,7 +479,7 @@ static void app_key_update(struct bt_mesh_model *model,
 }
 
 struct unbind_data {
-	u16_t app_idx;
+	uint16_t app_idx;
 	bool store;
 };
 
@@ -512,9 +512,9 @@ static void app_key_del(struct bt_mesh_model *model,
 			struct net_buf_simple *buf)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_STATUS, 4);
-	u16_t key_net_idx, key_app_idx;
+	uint16_t key_net_idx, key_app_idx;
 	struct bt_mesh_app_key *key;
-	u8_t status;
+	uint8_t status;
 
 	key_idx_unpack(buf, &key_net_idx, &key_app_idx);
 
@@ -563,8 +563,8 @@ static void app_key_get(struct bt_mesh_model *model,
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_APP_KEY_LIST,
 				 3 + IDX_LEN(CONFIG_BT_MESH_APP_KEY_COUNT));
-	u16_t get_idx, i, prev;
-	u8_t status;
+	uint16_t get_idx, i, prev;
+	uint8_t status;
 
 	get_idx = net_buf_simple_pull_le16(buf);
 	if (get_idx > 0xfff) {
@@ -903,9 +903,9 @@ static void relay_set(struct bt_mesh_model *model,
 
 static void send_mod_pub_status(struct bt_mesh_model *cfg_mod,
 				struct bt_mesh_msg_ctx *ctx,
-				u16_t elem_addr, u16_t pub_addr,
+				uint16_t elem_addr, uint16_t pub_addr,
 				bool vnd, struct bt_mesh_model *mod,
-				u8_t status, u8_t *mod_id)
+				uint8_t status, uint8_t *mod_id)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_PUB_STATUS, 14);
 
@@ -917,11 +917,11 @@ static void send_mod_pub_status(struct bt_mesh_model *cfg_mod,
 	if (status != STATUS_SUCCESS) {
 		(void)memset(net_buf_simple_add(&msg, 7), 0, 7);
 	} else {
-		u16_t idx_cred;
+		uint16_t idx_cred;
 
 		net_buf_simple_add_le16(&msg, pub_addr);
 
-		idx_cred = mod->pub->key | (u16_t)mod->pub->cred << 12;
+		idx_cred = mod->pub->key | (uint16_t)mod->pub->cred << 12;
 		net_buf_simple_add_le16(&msg, idx_cred);
 		net_buf_simple_add_u8(&msg, mod->pub->ttl);
 		net_buf_simple_add_u8(&msg, mod->pub->period);
@@ -943,10 +943,10 @@ static void mod_pub_get(struct bt_mesh_model *model,
 			struct bt_mesh_msg_ctx *ctx,
 			struct net_buf_simple *buf)
 {
-	u16_t elem_addr, pub_addr = 0U;
+	uint16_t elem_addr, pub_addr = 0U;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id, status;
+	uint8_t *mod_id, status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -990,11 +990,11 @@ static void mod_pub_set(struct bt_mesh_model *model,
 			struct bt_mesh_msg_ctx *ctx,
 			struct net_buf_simple *buf)
 {
-	u8_t retransmit, status, pub_ttl, pub_period, cred_flag;
-	u16_t elem_addr, pub_addr, pub_app_idx;
+	uint8_t retransmit, status, pub_ttl, pub_period, cred_flag;
+	uint16_t elem_addr, pub_addr, pub_app_idx;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id;
+	uint8_t *mod_id;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1048,7 +1048,7 @@ send_status:
 			    status, mod_id);
 }
 
-struct label *get_label(u16_t index)
+struct label *get_label(uint16_t index)
 {
 	if (index >= ARRAY_SIZE(labels)) {
 		return NULL;
@@ -1066,7 +1066,7 @@ static inline void va_store(struct label *store)
 	}
 }
 
-static struct label *va_find(const u8_t *label_uuid,
+static struct label *va_find(const uint8_t *label_uuid,
 				struct label **free_slot)
 {
 	struct label *match = NULL;
@@ -1092,7 +1092,7 @@ static struct label *va_find(const u8_t *label_uuid,
 	return match;
 }
 
-static u8_t va_add(u8_t *label_uuid, u16_t *addr)
+static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
 {
 	struct label *update, *free_slot = NULL;
 
@@ -1119,7 +1119,7 @@ static u8_t va_add(u8_t *label_uuid, u16_t *addr)
 	return STATUS_SUCCESS;
 }
 
-static u8_t va_del(u8_t *label_uuid, u16_t *addr)
+static uint8_t va_del(uint8_t *label_uuid, uint16_t *addr)
 {
 	struct label *update;
 
@@ -1144,7 +1144,7 @@ static u8_t va_del(u8_t *label_uuid, u16_t *addr)
 
 static size_t mod_sub_list_clear(struct bt_mesh_model *mod)
 {
-	u8_t *label_uuid;
+	uint8_t *label_uuid;
 	size_t clear_count;
 	int i;
 
@@ -1178,12 +1178,12 @@ static void mod_pub_va_set(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u8_t retransmit, status, pub_ttl, pub_period, cred_flag;
-	u16_t elem_addr, pub_addr, pub_app_idx;
+	uint8_t retransmit, status, pub_ttl, pub_period, cred_flag;
+	uint16_t elem_addr, pub_addr, pub_app_idx;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *label_uuid;
-	u8_t *mod_id;
+	uint8_t *label_uuid;
+	uint8_t *mod_id;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1263,10 +1263,10 @@ static void mod_pub_va_set(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u8_t *mod_id, status;
+	uint8_t *mod_id, status;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u16_t elem_addr, pub_addr = 0U;
+	uint16_t elem_addr, pub_addr = 0U;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1309,8 +1309,8 @@ send_status:
 #endif /* CONFIG_BT_MESH_LABEL_COUNT > 0 */
 
 static void send_mod_sub_status(struct bt_mesh_model *model,
-				struct bt_mesh_msg_ctx *ctx, u8_t status,
-				u16_t elem_addr, u16_t sub_addr, u8_t *mod_id,
+				struct bt_mesh_msg_ctx *ctx, uint8_t status,
+				uint16_t elem_addr, uint16_t sub_addr, uint8_t *mod_id,
 				bool vnd)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_SUB_STATUS, 9);
@@ -1339,12 +1339,12 @@ static void mod_sub_add(struct bt_mesh_model *model,
 			struct bt_mesh_msg_ctx *ctx,
 			struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr;
+	uint16_t elem_addr, sub_addr;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id;
-	u8_t status;
-	u16_t *entry;
+	uint8_t *mod_id;
+	uint8_t status;
+	uint16_t *entry;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1412,12 +1412,12 @@ static void mod_sub_del(struct bt_mesh_model *model,
 			struct bt_mesh_msg_ctx *ctx,
 			struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr;
+	uint16_t elem_addr, sub_addr;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id;
-	u16_t *match;
-	u8_t status;
+	uint8_t *mod_id;
+	uint16_t *match;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1475,7 +1475,7 @@ send_status:
 }
 
 static enum bt_mesh_walk mod_sub_clear_visitor(struct bt_mesh_model *mod,
-					       u32_t depth, void *user_data)
+					       uint32_t depth, void *user_data)
 {
 	if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) {
 		bt_mesh_lpn_group_del(mod->groups, ARRAY_SIZE(mod->groups));
@@ -1490,11 +1490,11 @@ static void mod_sub_overwrite(struct bt_mesh_model *model,
 			      struct bt_mesh_msg_ctx *ctx,
 			      struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr;
+	uint16_t elem_addr, sub_addr;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id;
-	u8_t status;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1559,9 +1559,9 @@ static void mod_sub_del_all(struct bt_mesh_model *model,
 {
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u16_t elem_addr;
-	u8_t *mod_id;
-	u8_t status;
+	uint16_t elem_addr;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1603,12 +1603,12 @@ send_status:
 }
 
 struct mod_sub_list_ctx {
-	u16_t elem_idx;
+	uint16_t elem_idx;
 	struct net_buf_simple *msg;
 };
 
 static enum bt_mesh_walk mod_sub_list_visitor(struct bt_mesh_model *mod,
-					      u32_t depth, void *ctx)
+					      uint32_t depth, void *ctx)
 {
 	struct mod_sub_list_ctx *visit = ctx;
 	int count = 0;
@@ -1647,7 +1647,7 @@ static void mod_sub_get(struct bt_mesh_model *model,
 	struct mod_sub_list_ctx visit_ctx;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u16_t addr, id;
+	uint16_t addr, id;
 
 	addr = net_buf_simple_pull_le16(buf);
 	if (!BT_MESH_ADDR_IS_UNICAST(addr)) {
@@ -1700,7 +1700,7 @@ static void mod_sub_get_vnd(struct bt_mesh_model *model,
 	NET_BUF_SIMPLE_DEFINE(msg, BT_MESH_TX_SDU_MAX);
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u16_t company, addr, id;
+	uint16_t company, addr, id;
 
 	addr = net_buf_simple_pull_le16(buf);
 	if (!BT_MESH_ADDR_IS_UNICAST(addr)) {
@@ -1753,13 +1753,13 @@ static void mod_sub_va_add(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr;
+	uint16_t elem_addr, sub_addr;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *label_uuid;
-	u8_t *mod_id;
-	u16_t *entry;
-	u8_t status;
+	uint8_t *label_uuid;
+	uint8_t *mod_id;
+	uint16_t *entry;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1828,13 +1828,13 @@ static void mod_sub_va_del(struct bt_mesh_model *model,
 			   struct bt_mesh_msg_ctx *ctx,
 			   struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr;
+	uint16_t elem_addr, sub_addr;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *label_uuid;
-	u8_t *mod_id;
-	u16_t *match;
-	u8_t status;
+	uint8_t *label_uuid;
+	uint8_t *mod_id;
+	uint16_t *match;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1896,12 +1896,12 @@ static void mod_sub_va_overwrite(struct bt_mesh_model *model,
 				 struct bt_mesh_msg_ctx *ctx,
 				 struct net_buf_simple *buf)
 {
-	u16_t elem_addr, sub_addr = BT_MESH_ADDR_UNASSIGNED;
+	uint16_t elem_addr, sub_addr = BT_MESH_ADDR_UNASSIGNED;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *label_uuid;
-	u8_t *mod_id;
-	u8_t status;
+	uint8_t *label_uuid;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -1962,9 +1962,9 @@ static void mod_sub_va_add(struct bt_mesh_model *model,
 {
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u16_t elem_addr;
-	u8_t *mod_id;
-	u8_t status;
+	uint16_t elem_addr;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2003,9 +2003,9 @@ static void mod_sub_va_del(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	struct bt_mesh_elem *elem;
-	u16_t elem_addr;
-	u8_t *mod_id;
-	u8_t status;
+	uint16_t elem_addr;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2042,9 +2042,9 @@ static void mod_sub_va_overwrite(struct bt_mesh_model *model,
 				 struct net_buf_simple *buf)
 {
 	struct bt_mesh_elem *elem;
-	u16_t elem_addr;
-	u8_t *mod_id;
-	u8_t status;
+	uint16_t elem_addr;
+	uint8_t *mod_id;
+	uint8_t status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2079,7 +2079,7 @@ send_status:
 
 static void send_net_key_status(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
-				u16_t idx, u8_t status)
+				uint16_t idx, uint8_t status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NET_KEY_STATUS, 3);
 
@@ -2098,7 +2098,7 @@ static void net_key_add(struct bt_mesh_model *model,
 			struct net_buf_simple *buf)
 {
 	struct bt_mesh_subnet *sub;
-	u16_t idx;
+	uint16_t idx;
 	int err;
 
 	idx = net_buf_simple_pull_le16(buf);
@@ -2129,7 +2129,7 @@ static void net_key_add(struct bt_mesh_model *model,
 
 	/* Check for already existing subnet */
 	if (sub->net_idx == idx) {
-		u8_t status;
+		uint8_t status;
 
 		if (memcmp(buf->data, sub->keys[0].net, 16)) {
 			status = STATUS_IDX_ALREADY_STORED;
@@ -2173,7 +2173,7 @@ static void net_key_update(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	struct bt_mesh_subnet *sub;
-	u16_t idx;
+	uint16_t idx;
 	int err;
 
 	idx = net_buf_simple_pull_le16(buf);
@@ -2254,8 +2254,8 @@ static void net_key_del(struct bt_mesh_model *model,
 			struct net_buf_simple *buf)
 {
 	struct bt_mesh_subnet *sub;
-	u16_t del_idx;
-	u8_t status;
+	uint16_t del_idx;
+	uint8_t status;
 
 	del_idx = net_buf_simple_pull_le16(buf);
 	if (del_idx > 0xfff) {
@@ -2295,7 +2295,7 @@ static void net_key_get(struct bt_mesh_model *model,
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NET_KEY_LIST,
 				 IDX_LEN(CONFIG_BT_MESH_SUBNET_COUNT));
-	u16_t prev, i;
+	uint16_t prev, i;
 
 	bt_mesh_model_msg_init(&msg, OP_NET_KEY_LIST);
 
@@ -2331,8 +2331,8 @@ static void node_identity_get(struct bt_mesh_model *model,
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NODE_IDENTITY_STATUS, 4);
 	struct bt_mesh_subnet *sub;
-	u8_t node_id;
-	u16_t idx;
+	uint8_t node_id;
+	uint16_t idx;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -2369,8 +2369,8 @@ static void node_identity_set(struct bt_mesh_model *model,
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_NODE_IDENTITY_STATUS, 4);
 	struct bt_mesh_subnet *sub;
-	u8_t node_id;
-	u16_t idx;
+	uint8_t node_id;
+	uint16_t idx;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -2418,8 +2418,8 @@ static void node_identity_set(struct bt_mesh_model *model,
 
 static void create_mod_app_status(struct net_buf_simple *msg,
 				  struct bt_mesh_model *mod, bool vnd,
-				  u16_t elem_addr, u16_t app_idx,
-				  u8_t status, u8_t *mod_id)
+				  uint16_t elem_addr, uint16_t app_idx,
+				  uint8_t status, uint8_t *mod_id)
 {
 	bt_mesh_model_msg_init(msg, OP_MOD_APP_STATUS);
 
@@ -2439,10 +2439,10 @@ static void mod_app_bind(struct bt_mesh_model *model,
 			 struct net_buf_simple *buf)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_APP_STATUS, 9);
-	u16_t elem_addr, key_app_idx;
+	uint16_t elem_addr, key_app_idx;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id, status;
+	uint8_t *mod_id, status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2496,10 +2496,10 @@ static void mod_app_unbind(struct bt_mesh_model *model,
 			   struct net_buf_simple *buf)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_MOD_APP_STATUS, 9);
-	u16_t elem_addr, key_app_idx;
+	uint16_t elem_addr, key_app_idx;
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id, status;
+	uint8_t *mod_id, status;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2554,8 +2554,8 @@ static void mod_app_get(struct bt_mesh_model *model,
 							9 + KEY_LIST_LEN)));
 	struct bt_mesh_model *mod;
 	struct bt_mesh_elem *elem;
-	u8_t *mod_id, status;
-	u16_t elem_addr;
+	uint8_t *mod_id, status;
+	uint16_t elem_addr;
 	bool vnd;
 
 	elem_addr = net_buf_simple_pull_le16(buf);
@@ -2710,8 +2710,8 @@ static void lpn_timeout_get(struct bt_mesh_model *model,
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_LPN_TIMEOUT_STATUS, 5);
 	struct bt_mesh_friend *frnd;
-	u16_t lpn_addr;
-	s32_t timeout_ms;
+	uint16_t lpn_addr;
+	int32_t timeout_ms;
 
 	lpn_addr = net_buf_simple_pull_le16(buf);
 
@@ -2749,7 +2749,7 @@ send_rsp:
 
 static void send_krp_status(struct bt_mesh_model *model,
 			    struct bt_mesh_msg_ctx *ctx,
-			    u16_t idx, u8_t phase, u8_t status)
+			    uint16_t idx, uint8_t phase, uint8_t status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_KRP_STATUS, 4);
 
@@ -2768,7 +2768,7 @@ static void krp_get(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 		    struct net_buf_simple *buf)
 {
 	struct bt_mesh_subnet *sub;
-	u16_t idx;
+	uint16_t idx;
 
 	idx = net_buf_simple_pull_le16(buf);
 	if (idx > 0xfff) {
@@ -2791,8 +2791,8 @@ static void krp_set(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 		    struct net_buf_simple *buf)
 {
 	struct bt_mesh_subnet *sub;
-	u8_t phase;
-	u16_t idx;
+	uint8_t phase;
+	uint16_t idx;
 
 	idx = net_buf_simple_pull_le16(buf);
 	phase = net_buf_simple_pull_u8(buf);
@@ -2840,7 +2840,7 @@ static void krp_set(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
 	send_krp_status(model, ctx, idx, sub->kr_phase, STATUS_SUCCESS);
 }
 
-static u8_t hb_log(u16_t val)
+static uint8_t hb_log(uint16_t val)
 {
 	if (!val) {
 		return 0x00;
@@ -2851,7 +2851,7 @@ static u8_t hb_log(u16_t val)
 	}
 }
 
-static u8_t hb_pub_count_log(u16_t val)
+static uint8_t hb_pub_count_log(uint16_t val)
 {
 	if (!val) {
 		return 0x00;
@@ -2864,7 +2864,7 @@ static u8_t hb_pub_count_log(u16_t val)
 	}
 }
 
-static u16_t hb_pwr2(u8_t val, u8_t sub)
+static uint16_t hb_pwr2(uint8_t val, uint8_t sub)
 {
 	if (!val) {
 		return 0x0000;
@@ -2876,16 +2876,16 @@ static u16_t hb_pwr2(u8_t val, u8_t sub)
 }
 
 struct hb_pub_param {
-	u16_t dst;
-	u8_t  count_log;
-	u8_t  period_log;
-	u8_t  ttl;
-	u16_t feat;
-	u16_t net_idx;
+	uint16_t dst;
+	uint8_t  count_log;
+	uint8_t  period_log;
+	uint8_t  ttl;
+	uint16_t feat;
+	uint16_t net_idx;
 } __packed;
 
 static void hb_pub_send_status(struct bt_mesh_model *model,
-			       struct bt_mesh_msg_ctx *ctx, u8_t status,
+			       struct bt_mesh_msg_ctx *ctx, uint8_t status,
 			       struct hb_pub_param *orig_msg)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_PUB_STATUS, 10);
@@ -2931,8 +2931,8 @@ static void heartbeat_pub_set(struct bt_mesh_model *model,
 {
 	struct hb_pub_param *param = (void *)buf->data;
 	struct bt_mesh_cfg_srv *cfg = model->user_data;
-	u16_t dst, feat, idx;
-	u8_t status;
+	uint16_t dst, feat, idx;
+	uint8_t status;
 
 	BT_DBG("src 0x%04x", ctx->addr);
 
@@ -3009,12 +3009,12 @@ failed:
 }
 
 static void hb_sub_send_status(struct bt_mesh_model *model,
-			       struct bt_mesh_msg_ctx *ctx, u8_t status)
+			       struct bt_mesh_msg_ctx *ctx, uint8_t status)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEARTBEAT_SUB_STATUS, 9);
 	struct bt_mesh_cfg_srv *cfg = model->user_data;
-	u16_t period;
-	s64_t uptime;
+	uint16_t period;
+	int64_t uptime;
 
 	BT_DBG("src 0x%04x status 0x%02x", ctx->addr, status);
 
@@ -3054,9 +3054,9 @@ static void heartbeat_sub_set(struct bt_mesh_model *model,
 			      struct net_buf_simple *buf)
 {
 	struct bt_mesh_cfg_srv *cfg = model->user_data;
-	u16_t sub_src, sub_dst;
-	u8_t sub_period;
-	s32_t period_ms;
+	uint16_t sub_src, sub_dst;
+	uint8_t sub_period;
+	int32_t period_ms;
 
 	BT_DBG("src 0x%04x", ctx->addr);
 
@@ -3189,7 +3189,7 @@ static void hb_publish(struct k_work *work)
 						   struct bt_mesh_cfg_srv,
 						   hb_pub.timer.work);
 	struct bt_mesh_subnet *sub;
-	u16_t period_ms;
+	uint16_t period_ms;
 
 	BT_DBG("hb_pub.count: %u", cfg->hb_pub.count);
 
@@ -3349,7 +3349,7 @@ void bt_mesh_cfg_reset(void)
 	(void)memset(labels, 0, sizeof(labels));
 }
 
-void bt_mesh_heartbeat(u16_t src, u16_t dst, u8_t hops, u16_t feat)
+void bt_mesh_heartbeat(uint16_t src, uint16_t dst, uint8_t hops, uint16_t feat)
 {
 	struct bt_mesh_cfg_srv *cfg = conf;
 
@@ -3379,7 +3379,7 @@ void bt_mesh_heartbeat(u16_t src, u16_t dst, u8_t hops, u16_t feat)
 	}
 }
 
-u8_t bt_mesh_net_transmit_get(void)
+uint8_t bt_mesh_net_transmit_get(void)
 {
 	if (conf) {
 		return conf->net_transmit;
@@ -3388,7 +3388,7 @@ u8_t bt_mesh_net_transmit_get(void)
 	return 0;
 }
 
-u8_t bt_mesh_relay_get(void)
+uint8_t bt_mesh_relay_get(void)
 {
 	if (conf) {
 		return conf->relay;
@@ -3397,7 +3397,7 @@ u8_t bt_mesh_relay_get(void)
 	return BT_MESH_RELAY_NOT_SUPPORTED;
 }
 
-u8_t bt_mesh_friend_get(void)
+uint8_t bt_mesh_friend_get(void)
 {
 	if (conf) {
 		BT_DBG("conf %p conf->frnd 0x%02x", conf, conf->frnd);
@@ -3407,7 +3407,7 @@ u8_t bt_mesh_friend_get(void)
 	return BT_MESH_FRIEND_NOT_SUPPORTED;
 }
 
-u8_t bt_mesh_relay_retransmit_get(void)
+uint8_t bt_mesh_relay_retransmit_get(void)
 {
 	if (conf) {
 		return conf->relay_retransmit;
@@ -3416,7 +3416,7 @@ u8_t bt_mesh_relay_retransmit_get(void)
 	return 0;
 }
 
-u8_t bt_mesh_beacon_get(void)
+uint8_t bt_mesh_beacon_get(void)
 {
 	if (conf) {
 		return conf->beacon;
@@ -3425,7 +3425,7 @@ u8_t bt_mesh_beacon_get(void)
 	return BT_MESH_BEACON_DISABLED;
 }
 
-u8_t bt_mesh_gatt_proxy_get(void)
+uint8_t bt_mesh_gatt_proxy_get(void)
 {
 	if (conf) {
 		return conf->gatt_proxy;
@@ -3434,7 +3434,7 @@ u8_t bt_mesh_gatt_proxy_get(void)
 	return BT_MESH_GATT_PROXY_NOT_SUPPORTED;
 }
 
-u8_t bt_mesh_default_ttl_get(void)
+uint8_t bt_mesh_default_ttl_get(void)
 {
 	if (conf) {
 		return conf->default_ttl;
@@ -3443,7 +3443,7 @@ u8_t bt_mesh_default_ttl_get(void)
 	return DEFAULT_TTL;
 }
 
-u8_t *bt_mesh_label_uuid_get(u16_t addr)
+uint8_t *bt_mesh_label_uuid_get(uint16_t addr)
 {
 	int i;
 
diff --git a/subsys/bluetooth/mesh/crypto.c b/subsys/bluetooth/mesh/crypto.c
index ba565bc435..cf7ceb9876 100644
--- a/subsys/bluetooth/mesh/crypto.c
+++ b/subsys/bluetooth/mesh/crypto.c
@@ -33,8 +33,8 @@
 #define NET_MIC_LEN(pdu) (((pdu)[1] & 0x80) ? 8 : 4)
 #define APP_MIC_LEN(aszmic) ((aszmic) ? 8 : 4)
 
-int bt_mesh_aes_cmac(const u8_t key[16], struct bt_mesh_sg *sg,
-		     size_t sg_len, u8_t mac[16])
+int bt_mesh_aes_cmac(const uint8_t key[16], struct bt_mesh_sg *sg,
+		     size_t sg_len, uint8_t mac[16])
 {
 	struct tc_aes_key_sched_struct sched;
 	struct tc_cmac_struct state;
@@ -57,8 +57,8 @@ int bt_mesh_aes_cmac(const u8_t key[16], struct bt_mesh_sg *sg,
 	return 0;
 }
 
-int bt_mesh_k1(const u8_t *ikm, size_t ikm_len, const u8_t salt[16],
-	       const char *info, u8_t okm[16])
+int bt_mesh_k1(const uint8_t *ikm, size_t ikm_len, const uint8_t salt[16],
+	       const char *info, uint8_t okm[16])
 {
 	int err;
 
@@ -70,14 +70,14 @@ int bt_mesh_k1(const u8_t *ikm, size_t ikm_len, const u8_t salt[16],
 	return bt_mesh_aes_cmac_one(okm, info, strlen(info), okm);
 }
 
-int bt_mesh_k2(const u8_t n[16], const u8_t *p, size_t p_len,
-	       u8_t net_id[1], u8_t enc_key[16], u8_t priv_key[16])
+int bt_mesh_k2(const uint8_t n[16], const uint8_t *p, size_t p_len,
+	       uint8_t net_id[1], uint8_t enc_key[16], uint8_t priv_key[16])
 {
 	struct bt_mesh_sg sg[3];
-	u8_t salt[16];
-	u8_t out[16];
-	u8_t t[16];
-	u8_t pad;
+	uint8_t salt[16];
+	uint8_t out[16];
+	uint8_t t[16];
+	uint8_t pad;
 	int err;
 
 	BT_DBG("n %s", bt_hex(n, 16));
@@ -135,11 +135,11 @@ int bt_mesh_k2(const u8_t n[16], const u8_t *p, size_t p_len,
 	return 0;
 }
 
-int bt_mesh_k3(const u8_t n[16], u8_t out[8])
+int bt_mesh_k3(const uint8_t n[16], uint8_t out[8])
 {
-	u8_t id64[] = { 'i', 'd', '6', '4', 0x01 };
-	u8_t tmp[16];
-	u8_t t[16];
+	uint8_t id64[] = { 'i', 'd', '6', '4', 0x01 };
+	uint8_t tmp[16];
+	uint8_t t[16];
 	int err;
 
 	err = bt_mesh_s1("smk3", tmp);
@@ -162,11 +162,11 @@ int bt_mesh_k3(const u8_t n[16], u8_t out[8])
 	return 0;
 }
 
-int bt_mesh_k4(const u8_t n[16], u8_t out[1])
+int bt_mesh_k4(const uint8_t n[16], uint8_t out[1])
 {
-	u8_t id6[] = { 'i', 'd', '6', 0x01 };
-	u8_t tmp[16];
-	u8_t t[16];
+	uint8_t id6[] = { 'i', 'd', '6', 0x01 };
+	uint8_t tmp[16];
+	uint8_t t[16];
 	int err;
 
 	err = bt_mesh_s1("smk4", tmp);
@@ -189,10 +189,10 @@ int bt_mesh_k4(const u8_t n[16], u8_t out[1])
 	return 0;
 }
 
-int bt_mesh_id128(const u8_t n[16], const char *s, u8_t out[16])
+int bt_mesh_id128(const uint8_t n[16], const char *s, uint8_t out[16])
 {
 	const char *id128 = "id128\x01";
-	u8_t salt[16];
+	uint8_t salt[16];
 	int err;
 
 	err = bt_mesh_s1(s, salt);
@@ -203,8 +203,8 @@ int bt_mesh_id128(const u8_t n[16], const char *s, u8_t out[16])
 	return bt_mesh_k1(n, 16, salt, id128, out);
 }
 
-static void create_proxy_nonce(u8_t nonce[13], const u8_t *pdu,
-			       u32_t iv_index)
+static void create_proxy_nonce(uint8_t nonce[13], const uint8_t *pdu,
+			       uint32_t iv_index)
 {
 	/* Nonce Type */
 	nonce[0] = 0x03;
@@ -229,8 +229,8 @@ static void create_proxy_nonce(u8_t nonce[13], const u8_t *pdu,
 	sys_put_be32(iv_index, &nonce[9]);
 }
 
-static void create_net_nonce(u8_t nonce[13], const u8_t *pdu,
-			     u32_t iv_index)
+static void create_net_nonce(uint8_t nonce[13], const uint8_t *pdu,
+			     uint32_t iv_index)
 {
 	/* Nonce Type */
 	nonce[0] = 0x00;
@@ -255,11 +255,11 @@ static void create_net_nonce(u8_t nonce[13], const u8_t *pdu,
 	sys_put_be32(iv_index, &nonce[9]);
 }
 
-int bt_mesh_net_obfuscate(u8_t *pdu, u32_t iv_index,
-			  const u8_t privacy_key[16])
+int bt_mesh_net_obfuscate(uint8_t *pdu, uint32_t iv_index,
+			  const uint8_t privacy_key[16])
 {
-	u8_t priv_rand[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, };
-	u8_t tmp[16];
+	uint8_t priv_rand[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, };
+	uint8_t tmp[16];
 	int err, i;
 
 	BT_DBG("IVIndex %u, PrivacyKey %s", iv_index, bt_hex(privacy_key, 16));
@@ -281,11 +281,11 @@ int bt_mesh_net_obfuscate(u8_t *pdu, u32_t iv_index,
 	return 0;
 }
 
-int bt_mesh_net_encrypt(const u8_t key[16], struct net_buf_simple *buf,
-			u32_t iv_index, bool proxy)
+int bt_mesh_net_encrypt(const uint8_t key[16], struct net_buf_simple *buf,
+			uint32_t iv_index, bool proxy)
 {
-	u8_t mic_len = NET_MIC_LEN(buf->data);
-	u8_t nonce[13];
+	uint8_t mic_len = NET_MIC_LEN(buf->data);
+	uint8_t nonce[13];
 	int err;
 
 	BT_DBG("IVIndex %u EncKey %s mic_len %u", iv_index, bt_hex(key, 16),
@@ -309,11 +309,11 @@ int bt_mesh_net_encrypt(const u8_t key[16], struct net_buf_simple *buf,
 	return err;
 }
 
-int bt_mesh_net_decrypt(const u8_t key[16], struct net_buf_simple *buf,
-			u32_t iv_index, bool proxy)
+int bt_mesh_net_decrypt(const uint8_t key[16], struct net_buf_simple *buf,
+			uint32_t iv_index, bool proxy)
 {
-	u8_t mic_len = NET_MIC_LEN(buf->data);
-	u8_t nonce[13];
+	uint8_t mic_len = NET_MIC_LEN(buf->data);
+	uint8_t nonce[13];
 
 	BT_DBG("PDU (%u bytes) %s", buf->len, bt_hex(buf->data, buf->len));
 	BT_DBG("iv_index %u, key %s mic_len %u", iv_index, bt_hex(key, 16),
@@ -333,9 +333,9 @@ int bt_mesh_net_decrypt(const u8_t key[16], struct net_buf_simple *buf,
 			      &buf->data[7], mic_len);
 }
 
-static void create_app_nonce(u8_t nonce[13], bool dev_key, u8_t aszmic,
-			     u16_t src, u16_t dst, u32_t seq_num,
-			     u32_t iv_index)
+static void create_app_nonce(uint8_t nonce[13], bool dev_key, uint8_t aszmic,
+			     uint16_t src, uint16_t dst, uint32_t seq_num,
+			     uint32_t iv_index)
 {
 	if (dev_key) {
 		nonce[0] = 0x02;
@@ -343,7 +343,7 @@ static void create_app_nonce(u8_t nonce[13], bool dev_key, u8_t aszmic,
 		nonce[0] = 0x01;
 	}
 
-	sys_put_be32((seq_num | ((u32_t)aszmic << 31)), &nonce[1]);
+	sys_put_be32((seq_num | ((uint32_t)aszmic << 31)), &nonce[1]);
 
 	sys_put_be16(src, &nonce[5]);
 	sys_put_be16(dst, &nonce[7]);
@@ -351,11 +351,11 @@ static void create_app_nonce(u8_t nonce[13], bool dev_key, u8_t aszmic,
 	sys_put_be32(iv_index, &nonce[9]);
 }
 
-int bt_mesh_app_encrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
-			struct net_buf_simple *buf, const u8_t *ad,
-			u16_t src, u16_t dst, u32_t seq_num, u32_t iv_index)
+int bt_mesh_app_encrypt(const uint8_t key[16], bool dev_key, uint8_t aszmic,
+			struct net_buf_simple *buf, const uint8_t *ad,
+			uint16_t src, uint16_t dst, uint32_t seq_num, uint32_t iv_index)
 {
-	u8_t nonce[13];
+	uint8_t nonce[13];
 	int err;
 
 	BT_DBG("AppKey %s", bt_hex(key, 16));
@@ -377,12 +377,12 @@ int bt_mesh_app_encrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
 	return err;
 }
 
-int bt_mesh_app_decrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
+int bt_mesh_app_decrypt(const uint8_t key[16], bool dev_key, uint8_t aszmic,
 			struct net_buf_simple *buf, struct net_buf_simple *out,
-			const u8_t *ad, u16_t src, u16_t dst, u32_t seq_num,
-			u32_t iv_index)
+			const uint8_t *ad, uint16_t src, uint16_t dst, uint32_t seq_num,
+			uint32_t iv_index)
 {
-	u8_t nonce[13];
+	uint8_t nonce[13];
 	int err;
 
 	BT_DBG("EncData (len %u) %s", buf->len, bt_hex(buf->data, buf->len));
@@ -402,7 +402,7 @@ int bt_mesh_app_decrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
 }
 
 /* reversed, 8-bit, poly=0x07 */
-static const u8_t crc_table[256] = {
+static const uint8_t crc_table[256] = {
 	0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75,
 	0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b,
 	0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69,
@@ -444,9 +444,9 @@ static const u8_t crc_table[256] = {
 	0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf
 };
 
-u8_t bt_mesh_fcs_calc(const u8_t *data, u8_t data_len)
+uint8_t bt_mesh_fcs_calc(const uint8_t *data, uint8_t data_len)
 {
-	u8_t fcs = 0xff;
+	uint8_t fcs = 0xff;
 
 	while (data_len--) {
 		fcs = crc_table[fcs ^ *data++];
@@ -457,11 +457,11 @@ u8_t bt_mesh_fcs_calc(const u8_t *data, u8_t data_len)
 	return 0xff - fcs;
 }
 
-bool bt_mesh_fcs_check(struct net_buf_simple *buf, u8_t received_fcs)
+bool bt_mesh_fcs_check(struct net_buf_simple *buf, uint8_t received_fcs)
 {
-	const u8_t *data = buf->data;
-	u16_t data_len = buf->len;
-	u8_t fcs = 0xff;
+	const uint8_t *data = buf->data;
+	uint16_t data_len = buf->len;
+	uint8_t fcs = 0xff;
 
 	while (data_len--) {
 		fcs = crc_table[fcs ^ *data++];
@@ -470,10 +470,10 @@ bool bt_mesh_fcs_check(struct net_buf_simple *buf, u8_t received_fcs)
 	return crc_table[fcs ^ received_fcs] == 0xcf;
 }
 
-int bt_mesh_virtual_addr(const u8_t virtual_label[16], u16_t *addr)
+int bt_mesh_virtual_addr(const uint8_t virtual_label[16], uint16_t *addr)
 {
-	u8_t salt[16];
-	u8_t tmp[16];
+	uint8_t salt[16];
+	uint8_t tmp[16];
 	int err;
 
 	err = bt_mesh_s1("vtad", salt);
@@ -491,21 +491,21 @@ int bt_mesh_virtual_addr(const u8_t virtual_label[16], u16_t *addr)
 	return 0;
 }
 
-int bt_mesh_prov_conf_salt(const u8_t conf_inputs[145], u8_t salt[16])
+int bt_mesh_prov_conf_salt(const uint8_t conf_inputs[145], uint8_t salt[16])
 {
-	const u8_t conf_salt_key[16] = { 0 };
+	const uint8_t conf_salt_key[16] = { 0 };
 
 	return bt_mesh_aes_cmac_one(conf_salt_key, conf_inputs, 145, salt);
 }
 
-int bt_mesh_prov_conf_key(const u8_t dhkey[32], const u8_t conf_salt[16],
-			  u8_t conf_key[16])
+int bt_mesh_prov_conf_key(const uint8_t dhkey[32], const uint8_t conf_salt[16],
+			  uint8_t conf_key[16])
 {
 	return bt_mesh_k1(dhkey, 32, conf_salt, "prck", conf_key);
 }
 
-int bt_mesh_prov_conf(const u8_t conf_key[16], const u8_t rand[16],
-		      const u8_t auth[16], u8_t conf[16])
+int bt_mesh_prov_conf(const uint8_t conf_key[16], const uint8_t rand[16],
+		      const uint8_t auth[16], uint8_t conf[16])
 {
 	struct bt_mesh_sg sg[] = { { rand, 16 }, { auth, 16 } };
 
@@ -516,23 +516,23 @@ int bt_mesh_prov_conf(const u8_t conf_key[16], const u8_t rand[16],
 	return bt_mesh_aes_cmac(conf_key, sg, ARRAY_SIZE(sg), conf);
 }
 
-int bt_mesh_prov_decrypt(const u8_t key[16], u8_t nonce[13],
-			 const u8_t data[25 + 8], u8_t out[25])
+int bt_mesh_prov_decrypt(const uint8_t key[16], uint8_t nonce[13],
+			 const uint8_t data[25 + 8], uint8_t out[25])
 {
 	return bt_ccm_decrypt(key, nonce, data, 25, NULL, 0, out, 8);
 }
 
-int bt_mesh_prov_encrypt(const u8_t key[16], u8_t nonce[13],
-			 const u8_t data[25], u8_t out[25 + 8])
+int bt_mesh_prov_encrypt(const uint8_t key[16], uint8_t nonce[13],
+			 const uint8_t data[25], uint8_t out[25 + 8])
 {
 	return bt_ccm_encrypt(key, nonce, data, 25, NULL, 0, out, 8);
 }
 
-int bt_mesh_beacon_auth(const u8_t beacon_key[16], u8_t flags,
-			const u8_t net_id[8], u32_t iv_index,
-			u8_t auth[8])
+int bt_mesh_beacon_auth(const uint8_t beacon_key[16], uint8_t flags,
+			const uint8_t net_id[8], uint32_t iv_index,
+			uint8_t auth[8])
 {
-	u8_t msg[13], tmp[16];
+	uint8_t msg[13], tmp[16];
 	int err;
 
 	BT_DBG("BeaconKey %s", bt_hex(beacon_key, 16));
diff --git a/subsys/bluetooth/mesh/crypto.h b/subsys/bluetooth/mesh/crypto.h
index 414d34e78d..f2c28cf4ed 100644
--- a/subsys/bluetooth/mesh/crypto.h
+++ b/subsys/bluetooth/mesh/crypto.h
@@ -11,81 +11,81 @@ struct bt_mesh_sg {
 	size_t len;
 };
 
-int bt_mesh_aes_cmac(const u8_t key[16], struct bt_mesh_sg *sg,
-		     size_t sg_len, u8_t mac[16]);
+int bt_mesh_aes_cmac(const uint8_t key[16], struct bt_mesh_sg *sg,
+		     size_t sg_len, uint8_t mac[16]);
 
-static inline int bt_mesh_aes_cmac_one(const u8_t key[16], const void *m,
-				       size_t len, u8_t mac[16])
+static inline int bt_mesh_aes_cmac_one(const uint8_t key[16], const void *m,
+				       size_t len, uint8_t mac[16])
 {
 	struct bt_mesh_sg sg = { m, len };
 
 	return bt_mesh_aes_cmac(key, &sg, 1, mac);
 }
 
-static inline bool bt_mesh_s1(const char *m, u8_t salt[16])
+static inline bool bt_mesh_s1(const char *m, uint8_t salt[16])
 {
-	const u8_t zero[16] = { 0 };
+	const uint8_t zero[16] = { 0 };
 
 	return bt_mesh_aes_cmac_one(zero, m, strlen(m), salt);
 }
 
-int bt_mesh_k1(const u8_t *ikm, size_t ikm_len, const u8_t salt[16],
-	       const char *info, u8_t okm[16]);
+int bt_mesh_k1(const uint8_t *ikm, size_t ikm_len, const uint8_t salt[16],
+	       const char *info, uint8_t okm[16]);
 
 #define bt_mesh_k1_str(ikm, ikm_len, salt_str, info, okm) \
 ({ \
-	const u8_t salt[16] = salt_str; \
+	const uint8_t salt[16] = salt_str; \
 	bt_mesh_k1(ikm, ikm_len, salt, info, okm); \
 })
 
-int bt_mesh_k2(const u8_t n[16], const u8_t *p, size_t p_len,
-	       u8_t net_id[1], u8_t enc_key[16], u8_t priv_key[16]);
+int bt_mesh_k2(const uint8_t n[16], const uint8_t *p, size_t p_len,
+	       uint8_t net_id[1], uint8_t enc_key[16], uint8_t priv_key[16]);
 
-int bt_mesh_k3(const u8_t n[16], u8_t out[8]);
+int bt_mesh_k3(const uint8_t n[16], uint8_t out[8]);
 
-int bt_mesh_k4(const u8_t n[16], u8_t out[1]);
+int bt_mesh_k4(const uint8_t n[16], uint8_t out[1]);
 
-int bt_mesh_id128(const u8_t n[16], const char *s, u8_t out[16]);
+int bt_mesh_id128(const uint8_t n[16], const char *s, uint8_t out[16]);
 
-static inline int bt_mesh_id_resolving_key(const u8_t net_key[16],
-					   u8_t resolving_key[16])
+static inline int bt_mesh_id_resolving_key(const uint8_t net_key[16],
+					   uint8_t resolving_key[16])
 {
 	return bt_mesh_k1_str(net_key, 16, "smbt", "smbi", resolving_key);
 }
 
-static inline int bt_mesh_identity_key(const u8_t net_key[16],
-				       u8_t identity_key[16])
+static inline int bt_mesh_identity_key(const uint8_t net_key[16],
+				       uint8_t identity_key[16])
 {
 	return bt_mesh_id128(net_key, "nkik", identity_key);
 }
 
-static inline int bt_mesh_beacon_key(const u8_t net_key[16],
-				     u8_t beacon_key[16])
+static inline int bt_mesh_beacon_key(const uint8_t net_key[16],
+				     uint8_t beacon_key[16])
 {
 	return bt_mesh_id128(net_key, "nkbk", beacon_key);
 }
 
-int bt_mesh_beacon_auth(const u8_t beacon_key[16], u8_t flags,
-			const u8_t net_id[16], u32_t iv_index,
-			u8_t auth[8]);
+int bt_mesh_beacon_auth(const uint8_t beacon_key[16], uint8_t flags,
+			const uint8_t net_id[16], uint32_t iv_index,
+			uint8_t auth[8]);
 
-static inline int bt_mesh_app_id(const u8_t app_key[16], u8_t app_id[1])
+static inline int bt_mesh_app_id(const uint8_t app_key[16], uint8_t app_id[1])
 {
 	return bt_mesh_k4(app_key, app_id);
 }
 
-static inline int bt_mesh_session_key(const u8_t dhkey[32],
-				      const u8_t prov_salt[16],
-				      u8_t session_key[16])
+static inline int bt_mesh_session_key(const uint8_t dhkey[32],
+				      const uint8_t prov_salt[16],
+				      uint8_t session_key[16])
 {
 	return bt_mesh_k1(dhkey, 32, prov_salt, "prsk", session_key);
 }
 
-static inline int bt_mesh_prov_nonce(const u8_t dhkey[32],
-				      const u8_t prov_salt[16],
-				      u8_t nonce[13])
+static inline int bt_mesh_prov_nonce(const uint8_t dhkey[32],
+				      const uint8_t prov_salt[16],
+				      uint8_t nonce[13])
 {
-	u8_t tmp[16];
+	uint8_t tmp[16];
 	int err;
 
 	err = bt_mesh_k1(dhkey, 32, prov_salt, "prsn", tmp);
@@ -96,19 +96,19 @@ static inline int bt_mesh_prov_nonce(const u8_t dhkey[32],
 	return err;
 }
 
-static inline int bt_mesh_dev_key(const u8_t dhkey[32],
-				  const u8_t prov_salt[16],
-				  u8_t dev_key[16])
+static inline int bt_mesh_dev_key(const uint8_t dhkey[32],
+				  const uint8_t prov_salt[16],
+				  uint8_t dev_key[16])
 {
 	return bt_mesh_k1(dhkey, 32, prov_salt, "prdk", dev_key);
 }
 
-static inline int bt_mesh_prov_salt(const u8_t conf_salt[16],
-				    const u8_t prov_rand[16],
-				    const u8_t dev_rand[16],
-				    u8_t prov_salt[16])
+static inline int bt_mesh_prov_salt(const uint8_t conf_salt[16],
+				    const uint8_t prov_rand[16],
+				    const uint8_t dev_rand[16],
+				    uint8_t prov_salt[16])
 {
-	const u8_t prov_salt_key[16] = { 0 };
+	const uint8_t prov_salt_key[16] = { 0 };
 	struct bt_mesh_sg sg[] = {
 		{ conf_salt, 16 },
 		{ prov_rand, 16 },
@@ -118,40 +118,40 @@ static inline int bt_mesh_prov_salt(const u8_t conf_salt[16],
 	return bt_mesh_aes_cmac(prov_salt_key, sg, ARRAY_SIZE(sg), prov_salt);
 }
 
-int bt_mesh_net_obfuscate(u8_t *pdu, u32_t iv_index,
-			  const u8_t privacy_key[16]);
+int bt_mesh_net_obfuscate(uint8_t *pdu, uint32_t iv_index,
+			  const uint8_t privacy_key[16]);
 
-int bt_mesh_net_encrypt(const u8_t key[16], struct net_buf_simple *buf,
-			u32_t iv_index, bool proxy);
+int bt_mesh_net_encrypt(const uint8_t key[16], struct net_buf_simple *buf,
+			uint32_t iv_index, bool proxy);
 
-int bt_mesh_net_decrypt(const u8_t key[16], struct net_buf_simple *buf,
-			u32_t iv_index, bool proxy);
+int bt_mesh_net_decrypt(const uint8_t key[16], struct net_buf_simple *buf,
+			uint32_t iv_index, bool proxy);
 
-int bt_mesh_app_encrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
-			struct net_buf_simple *buf, const u8_t *ad,
-			u16_t src, u16_t dst, u32_t seq_num, u32_t iv_index);
+int bt_mesh_app_encrypt(const uint8_t key[16], bool dev_key, uint8_t aszmic,
+			struct net_buf_simple *buf, const uint8_t *ad,
+			uint16_t src, uint16_t dst, uint32_t seq_num, uint32_t iv_index);
 
-int bt_mesh_app_decrypt(const u8_t key[16], bool dev_key, u8_t aszmic,
+int bt_mesh_app_decrypt(const uint8_t key[16], bool dev_key, uint8_t aszmic,
 			struct net_buf_simple *buf, struct net_buf_simple *out,
-			const u8_t *ad, u16_t src, u16_t dst, u32_t seq_num,
-			u32_t iv_index);
+			const uint8_t *ad, uint16_t src, uint16_t dst, uint32_t seq_num,
+			uint32_t iv_index);
 
-u8_t bt_mesh_fcs_calc(const u8_t *data, u8_t data_len);
+uint8_t bt_mesh_fcs_calc(const uint8_t *data, uint8_t data_len);
 
-bool bt_mesh_fcs_check(struct net_buf_simple *buf, u8_t received_fcs);
+bool bt_mesh_fcs_check(struct net_buf_simple *buf, uint8_t received_fcs);
 
-int bt_mesh_virtual_addr(const u8_t virtual_label[16], u16_t *addr);
+int bt_mesh_virtual_addr(const uint8_t virtual_label[16], uint16_t *addr);
 
-int bt_mesh_prov_conf_salt(const u8_t conf_inputs[145], u8_t salt[16]);
+int bt_mesh_prov_conf_salt(const uint8_t conf_inputs[145], uint8_t salt[16]);
 
-int bt_mesh_prov_conf_key(const u8_t dhkey[32], const u8_t conf_salt[16],
-			  u8_t conf_key[16]);
+int bt_mesh_prov_conf_key(const uint8_t dhkey[32], const uint8_t conf_salt[16],
+			  uint8_t conf_key[16]);
 
-int bt_mesh_prov_conf(const u8_t conf_key[16], const u8_t rand[16],
-		      const u8_t auth[16], u8_t conf[16]);
+int bt_mesh_prov_conf(const uint8_t conf_key[16], const uint8_t rand[16],
+		      const uint8_t auth[16], uint8_t conf[16]);
 
-int bt_mesh_prov_decrypt(const u8_t key[16], u8_t nonce[13],
-			 const u8_t data[25 + 8], u8_t out[25]);
+int bt_mesh_prov_decrypt(const uint8_t key[16], uint8_t nonce[13],
+			 const uint8_t data[25 + 8], uint8_t out[25]);
 
-int bt_mesh_prov_encrypt(const u8_t key[16], u8_t nonce[13],
-			 const u8_t data[25], u8_t out[25 + 8]);
+int bt_mesh_prov_encrypt(const uint8_t key[16], uint8_t nonce[13],
+			 const uint8_t data[25], uint8_t out[25 + 8]);
diff --git a/subsys/bluetooth/mesh/foundation.h b/subsys/bluetooth/mesh/foundation.h
index 3d337e2088..8afadd24d4 100644
--- a/subsys/bluetooth/mesh/foundation.h
+++ b/subsys/bluetooth/mesh/foundation.h
@@ -117,50 +117,50 @@ enum {
 };
 
 struct label {
-	u16_t ref;
-	u16_t addr;
-	u8_t  uuid[16];
+	uint16_t ref;
+	uint16_t addr;
+	uint8_t  uuid[16];
 	atomic_t flags[1];
 };
 
 void bt_mesh_cfg_reset(void);
 
-void bt_mesh_heartbeat(u16_t src, u16_t dst, u8_t hops, u16_t feat);
+void bt_mesh_heartbeat(uint16_t src, uint16_t dst, uint8_t hops, uint16_t feat);
 
-void bt_mesh_attention(struct bt_mesh_model *model, u8_t time);
+void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time);
 
-struct label *get_label(u16_t index);
+struct label *get_label(uint16_t index);
 
-u8_t *bt_mesh_label_uuid_get(u16_t addr);
+uint8_t *bt_mesh_label_uuid_get(uint16_t addr);
 
 struct bt_mesh_hb_pub *bt_mesh_hb_pub_get(void);
 void bt_mesh_hb_pub_disable(void);
 struct bt_mesh_cfg_srv *bt_mesh_cfg_get(void);
 
-u8_t bt_mesh_net_transmit_get(void);
-u8_t bt_mesh_relay_get(void);
-u8_t bt_mesh_friend_get(void);
-u8_t bt_mesh_relay_retransmit_get(void);
-u8_t bt_mesh_beacon_get(void);
-u8_t bt_mesh_gatt_proxy_get(void);
-u8_t bt_mesh_default_ttl_get(void);
+uint8_t bt_mesh_net_transmit_get(void);
+uint8_t bt_mesh_relay_get(void);
+uint8_t bt_mesh_friend_get(void);
+uint8_t bt_mesh_relay_retransmit_get(void);
+uint8_t bt_mesh_beacon_get(void);
+uint8_t bt_mesh_gatt_proxy_get(void);
+uint8_t bt_mesh_default_ttl_get(void);
 
 void bt_mesh_subnet_del(struct bt_mesh_subnet *sub, bool store);
 
-struct bt_mesh_app_key *bt_mesh_app_key_alloc(u16_t app_idx);
+struct bt_mesh_app_key *bt_mesh_app_key_alloc(uint16_t app_idx);
 void bt_mesh_app_key_del(struct bt_mesh_app_key *key, bool store);
 
 #include <sys/byteorder.h>
 
 static inline void key_idx_pack(struct net_buf_simple *buf,
-				u16_t idx1, u16_t idx2)
+				uint16_t idx1, uint16_t idx2)
 {
 	net_buf_simple_add_le16(buf, idx1 | ((idx2 & 0x00f) << 12));
 	net_buf_simple_add_u8(buf, idx2 >> 4);
 }
 
 static inline void key_idx_unpack(struct net_buf_simple *buf,
-				  u16_t *idx1, u16_t *idx2)
+				  uint16_t *idx1, uint16_t *idx2)
 {
 	*idx1 = sys_get_le16(&buf->data[0]) & 0xfff;
 	*idx2 = sys_get_le16(&buf->data[1]) >> 4;
diff --git a/subsys/bluetooth/mesh/friend.c b/subsys/bluetooth/mesh/friend.c
index f9a7eacd87..32994e3349 100644
--- a/subsys/bluetooth/mesh/friend.c
+++ b/subsys/bluetooth/mesh/friend.c
@@ -41,15 +41,15 @@
 #define FRIEND_XMIT         BT_MESH_TRANSMIT(0, 20)
 
 struct friend_pdu_info {
-	u16_t  src;
-	u16_t  dst;
+	uint16_t  src;
+	uint16_t  dst;
 
-	u8_t   seq[3];
+	uint8_t   seq[3];
 
-	u8_t   ttl:7,
+	uint8_t   ttl:7,
 	       ctl:1;
 
-	u32_t  iv_index;
+	uint32_t  iv_index;
 };
 
 NET_BUF_POOL_FIXED_DEFINE(friend_buf_pool, FRIEND_BUF_COUNT,
@@ -57,7 +57,7 @@ NET_BUF_POOL_FIXED_DEFINE(friend_buf_pool, FRIEND_BUF_COUNT,
 
 static struct friend_adv {
 	struct bt_mesh_adv adv;
-	u16_t app_idx;
+	uint16_t app_idx;
 } adv_pool[FRIEND_BUF_COUNT];
 
 static struct bt_mesh_adv *adv_alloc(int id)
@@ -66,7 +66,7 @@ static struct bt_mesh_adv *adv_alloc(int id)
 	return &adv_pool[id].adv;
 }
 
-static bool is_lpn_unicast(struct bt_mesh_friend *frnd, u16_t addr)
+static bool is_lpn_unicast(struct bt_mesh_friend *frnd, uint16_t addr)
 {
 	if (frnd->lpn == BT_MESH_ADDR_UNASSIGNED) {
 		return false;
@@ -75,7 +75,7 @@ static bool is_lpn_unicast(struct bt_mesh_friend *frnd, u16_t addr)
 	return (addr >= frnd->lpn && addr < (frnd->lpn + frnd->num_elem));
 }
 
-struct bt_mesh_friend *bt_mesh_friend_find(u16_t net_idx, u16_t lpn_addr,
+struct bt_mesh_friend *bt_mesh_friend_find(uint16_t net_idx, uint16_t lpn_addr,
 					   bool valid, bool established)
 {
 	int i;
@@ -124,10 +124,10 @@ static void purge_buffers(sys_slist_t *list)
  * like the PTS, where the receiver might not have sufficiently compensated
  * for internal latencies required to start scanning.
  */
-static s32_t recv_delay(struct bt_mesh_friend *frnd)
+static int32_t recv_delay(struct bt_mesh_friend *frnd)
 {
 #if CONFIG_BT_MESH_FRIEND_RECV_WIN > 50
-	return (s32_t)frnd->recv_delay + (CONFIG_BT_MESH_FRIEND_RECV_WIN / 5);
+	return (int32_t)frnd->recv_delay + (CONFIG_BT_MESH_FRIEND_RECV_WIN / 5);
 #else
 	return frnd->recv_delay;
 #endif
@@ -171,7 +171,7 @@ static void friend_clear(struct bt_mesh_friend *frnd)
 	(void)memset(frnd->sub_list, 0, sizeof(frnd->sub_list));
 }
 
-void bt_mesh_friend_clear_net_idx(u16_t net_idx)
+void bt_mesh_friend_clear_net_idx(uint16_t net_idx)
 {
 	int i;
 
@@ -190,9 +190,9 @@ void bt_mesh_friend_clear_net_idx(u16_t net_idx)
 	}
 }
 
-static void enqueue_update(struct bt_mesh_friend *frnd, u8_t md);
+static void enqueue_update(struct bt_mesh_friend *frnd, uint8_t md);
 
-void bt_mesh_friend_sec_update(u16_t net_idx)
+void bt_mesh_friend_sec_update(uint16_t net_idx)
 {
 	int i;
 
@@ -215,7 +215,7 @@ int bt_mesh_friend_clear(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 {
 	struct bt_mesh_ctl_friend_clear *msg = (void *)buf->data;
 	struct bt_mesh_friend *frnd;
-	u16_t lpn_addr, lpn_counter;
+	uint16_t lpn_addr, lpn_counter;
 	struct bt_mesh_net_tx tx = {
 		.sub  = rx->sub,
 		.ctx  = &rx->ctx,
@@ -265,7 +265,7 @@ int bt_mesh_friend_clear(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 	return 0;
 }
 
-static void friend_sub_add(struct bt_mesh_friend *frnd, u16_t addr)
+static void friend_sub_add(struct bt_mesh_friend *frnd, uint16_t addr)
 {
 	int i;
 
@@ -279,7 +279,7 @@ static void friend_sub_add(struct bt_mesh_friend *frnd, u16_t addr)
 	BT_WARN("No space in friend subscription list");
 }
 
-static void friend_sub_rem(struct bt_mesh_friend *frnd, u16_t addr)
+static void friend_sub_rem(struct bt_mesh_friend *frnd, uint16_t addr)
 {
 	int i;
 
@@ -324,18 +324,18 @@ static struct net_buf *create_friend_pdu(struct bt_mesh_friend *frnd,
 
 struct unseg_app_sdu_meta {
 	struct bt_mesh_net_rx net;
-	const u8_t *key;
+	const uint8_t *key;
 	struct bt_mesh_subnet *subnet;
 	bool is_dev_key;
-	u8_t aid;
-	u8_t *ad;
+	uint8_t aid;
+	uint8_t *ad;
 };
 
 static int unseg_app_sdu_unpack(struct bt_mesh_friend *frnd,
 				struct net_buf *buf,
 				struct unseg_app_sdu_meta *meta)
 {
-	u16_t app_idx = FRIEND_ADV(buf)->app_idx;
+	uint16_t app_idx = FRIEND_ADV(buf)->app_idx;
 	int err;
 
 	meta->subnet = bt_mesh_subnet_get(frnd->net_idx);
@@ -431,10 +431,10 @@ static int encrypt_friend_pdu(struct bt_mesh_friend *frnd, struct net_buf *buf,
 			      bool master_cred)
 {
 	struct bt_mesh_subnet *sub = bt_mesh_subnet_get(frnd->net_idx);
-	const u8_t *enc, *priv;
-	u32_t iv_index;
-	u16_t src;
-	u8_t nid;
+	const uint8_t *enc, *priv;
+	uint32_t iv_index;
+	uint16_t src;
+	uint8_t nid;
 	int err;
 
 	if (master_cred) {
@@ -451,7 +451,7 @@ static int encrypt_friend_pdu(struct bt_mesh_friend *frnd, struct net_buf *buf,
 	src = sys_get_be16(&buf->data[5]);
 
 	if (bt_mesh_elem_find(src)) {
-		u32_t seq;
+		uint32_t seq;
 
 		if (FRIEND_ADV(buf)->app_idx != BT_MESH_KEY_UNUSED) {
 			err = unseg_app_sdu_prepare(frnd, buf);
@@ -466,7 +466,7 @@ static int encrypt_friend_pdu(struct bt_mesh_friend *frnd, struct net_buf *buf,
 		iv_index = BT_MESH_NET_IVI_TX;
 		FRIEND_ADV(buf)->app_idx = BT_MESH_KEY_UNUSED;
 	} else {
-		u8_t ivi = (buf->data[0] >> 7);
+		uint8_t ivi = (buf->data[0] >> 7);
 		iv_index = (bt_mesh.iv_index - ((bt_mesh.iv_index & 1) != ivi));
 	}
 
@@ -486,7 +486,7 @@ static int encrypt_friend_pdu(struct bt_mesh_friend *frnd, struct net_buf *buf,
 }
 
 static struct net_buf *encode_friend_ctl(struct bt_mesh_friend *frnd,
-					 u8_t ctl_op,
+					 uint8_t ctl_op,
 					 struct net_buf_simple *sdu)
 {
 	struct friend_pdu_info info;
@@ -508,7 +508,7 @@ static struct net_buf *encode_friend_ctl(struct bt_mesh_friend *frnd,
 	return create_friend_pdu(frnd, &info, sdu);
 }
 
-static struct net_buf *encode_update(struct bt_mesh_friend *frnd, u8_t md)
+static struct net_buf *encode_update(struct bt_mesh_friend *frnd, uint8_t md)
 {
 	struct bt_mesh_ctl_friend_update *upd;
 	NET_BUF_SIMPLE_DEFINE(sdu, 1 + sizeof(*upd));
@@ -528,7 +528,7 @@ static struct net_buf *encode_update(struct bt_mesh_friend *frnd, u8_t md)
 	return encode_friend_ctl(frnd, TRANS_CTL_OP_FRIEND_UPDATE, &sdu);
 }
 
-static void enqueue_sub_cfm(struct bt_mesh_friend *frnd, u8_t xact)
+static void enqueue_sub_cfm(struct bt_mesh_friend *frnd, uint8_t xact)
 {
 	struct bt_mesh_ctl_friend_sub_confirm *cfm;
 	NET_BUF_SIMPLE_DEFINE(sdu, 1 + sizeof(*cfm));
@@ -571,7 +571,7 @@ int bt_mesh_friend_sub_add(struct bt_mesh_net_rx *rx,
 			   struct net_buf_simple *buf)
 {
 	struct bt_mesh_friend *frnd;
-	u8_t xact;
+	uint8_t xact;
 
 	if (buf->len < BT_MESH_FRIEND_SUB_MIN_LEN) {
 		BT_WARN("Too short Friend Subscription Add");
@@ -606,7 +606,7 @@ int bt_mesh_friend_sub_rem(struct bt_mesh_net_rx *rx,
 			   struct net_buf_simple *buf)
 {
 	struct bt_mesh_friend *frnd;
-	u8_t xact;
+	uint8_t xact;
 
 	if (buf->len < BT_MESH_FRIEND_SUB_MIN_LEN) {
 		BT_WARN("Too short Friend Subscription Remove");
@@ -643,7 +643,7 @@ static void enqueue_buf(struct bt_mesh_friend *frnd, struct net_buf *buf)
 	frnd->queue_size++;
 }
 
-static void enqueue_update(struct bt_mesh_friend *frnd, u8_t md)
+static void enqueue_update(struct bt_mesh_friend *frnd, uint8_t md)
 {
 	struct net_buf *buf;
 
@@ -711,7 +711,7 @@ int bt_mesh_friend_poll(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 	return 0;
 }
 
-static struct bt_mesh_friend *find_clear(u16_t prev_friend)
+static struct bt_mesh_friend *find_clear(uint16_t prev_friend)
 {
 	int i;
 
@@ -768,7 +768,7 @@ static void clear_timeout(struct k_work *work)
 {
 	struct bt_mesh_friend *frnd = CONTAINER_OF(work, struct bt_mesh_friend,
 						   clear.timer.work);
-	u32_t duration;
+	uint32_t duration;
 
 	BT_DBG("LPN 0x%04x (old) Friend 0x%04x", frnd->lpn, frnd->clear.frnd);
 
@@ -797,7 +797,7 @@ int bt_mesh_friend_clear_cfm(struct bt_mesh_net_rx *rx,
 {
 	struct bt_mesh_ctl_friend_clear_confirm *msg = (void *)buf->data;
 	struct bt_mesh_friend *frnd;
-	u16_t lpn_addr, lpn_counter;
+	uint16_t lpn_addr, lpn_counter;
 
 	BT_DBG("");
 
@@ -832,7 +832,7 @@ int bt_mesh_friend_clear_cfm(struct bt_mesh_net_rx *rx,
 	return 0;
 }
 
-static void enqueue_offer(struct bt_mesh_friend *frnd, s8_t rssi)
+static void enqueue_offer(struct bt_mesh_friend *frnd, int8_t rssi)
 {
 	struct bt_mesh_ctl_friend_offer *off;
 	NET_BUF_SIMPLE_DEFINE(sdu, 1 + sizeof(*off));
@@ -871,26 +871,26 @@ static void enqueue_offer(struct bt_mesh_friend *frnd, s8_t rssi)
 }
 
 #define RECV_WIN                  CONFIG_BT_MESH_FRIEND_RECV_WIN
-#define RSSI_FACT(crit)           (((crit) >> 5) & (u8_t)BIT_MASK(2))
-#define RECV_WIN_FACT(crit)       (((crit) >> 3) & (u8_t)BIT_MASK(2))
-#define MIN_QUEUE_SIZE_LOG(crit)  ((crit) & (u8_t)BIT_MASK(3))
-#define MIN_QUEUE_SIZE(crit)      ((u32_t)BIT(MIN_QUEUE_SIZE_LOG(crit)))
+#define RSSI_FACT(crit)           (((crit) >> 5) & (uint8_t)BIT_MASK(2))
+#define RECV_WIN_FACT(crit)       (((crit) >> 3) & (uint8_t)BIT_MASK(2))
+#define MIN_QUEUE_SIZE_LOG(crit)  ((crit) & (uint8_t)BIT_MASK(3))
+#define MIN_QUEUE_SIZE(crit)      ((uint32_t)BIT(MIN_QUEUE_SIZE_LOG(crit)))
 
-static s32_t offer_delay(struct bt_mesh_friend *frnd, s8_t rssi, u8_t crit)
+static int32_t offer_delay(struct bt_mesh_friend *frnd, int8_t rssi, uint8_t crit)
 {
 	/* Scaling factors. The actual values are 1, 1.5, 2 & 2.5, but we
 	 * want to avoid floating-point arithmetic.
 	 */
-	static const u8_t fact[] = { 10, 15, 20, 25 };
-	s32_t delay;
+	static const uint8_t fact[] = { 10, 15, 20, 25 };
+	int32_t delay;
 
 	BT_DBG("ReceiveWindowFactor %u ReceiveWindow %u RSSIFactor %u RSSI %d",
 	       fact[RECV_WIN_FACT(crit)], RECV_WIN,
 	       fact[RSSI_FACT(crit)], rssi);
 
 	/* Delay = ReceiveWindowFactor * ReceiveWindow - RSSIFactor * RSSI */
-	delay = (s32_t)fact[RECV_WIN_FACT(crit)] * RECV_WIN;
-	delay -= (s32_t)fact[RSSI_FACT(crit)] * rssi;
+	delay = (int32_t)fact[RECV_WIN_FACT(crit)] * RECV_WIN;
+	delay -= (int32_t)fact[RSSI_FACT(crit)] * rssi;
 	delay /= 10;
 
 	BT_DBG("Local Delay calculated as %d ms", delay);
@@ -902,7 +902,7 @@ int bt_mesh_friend_req(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf)
 {
 	struct bt_mesh_ctl_friend_req *msg = (void *)buf->data;
 	struct bt_mesh_friend *frnd = NULL;
-	u32_t poll_to;
+	uint32_t poll_to;
 	int i;
 
 	if (buf->len < sizeof(*msg)) {
@@ -993,12 +993,12 @@ init_friend:
 	return 0;
 }
 
-static bool is_seg(struct bt_mesh_friend_seg *seg, u16_t src, u16_t seq_zero)
+static bool is_seg(struct bt_mesh_friend_seg *seg, uint16_t src, uint16_t seq_zero)
 {
 	struct net_buf *buf = (void *)sys_slist_peek_head(&seg->queue);
 	struct net_buf_simple_state state;
-	u16_t buf_seq_zero;
-	u16_t buf_src;
+	uint16_t buf_seq_zero;
+	uint16_t buf_src;
 
 	if (!buf) {
 		return false;
@@ -1015,8 +1015,8 @@ static bool is_seg(struct bt_mesh_friend_seg *seg, u16_t src, u16_t seq_zero)
 }
 
 static struct bt_mesh_friend_seg *get_seg(struct bt_mesh_friend *frnd,
-					  u16_t src, u16_t seq_zero,
-					  u8_t seg_count)
+					  uint16_t src, uint16_t seq_zero,
+					  uint8_t seg_count)
 {
 	struct bt_mesh_friend_seg *unassigned = NULL;
 	int i;
@@ -1042,7 +1042,7 @@ static struct bt_mesh_friend_seg *get_seg(struct bt_mesh_friend *frnd,
 
 static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
 			       enum bt_mesh_friend_pdu_type type,
-			       u16_t src, u8_t seg_count,
+			       uint16_t src, uint8_t seg_count,
 			       struct net_buf *buf)
 {
 	struct bt_mesh_friend_seg *seg;
@@ -1054,7 +1054,7 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
 		return;
 	}
 
-	u16_t seq_zero = (((buf->data[10] << 8 | buf->data[11]) >> 2) & TRANS_SEQ_ZERO_MASK);
+	uint16_t seq_zero = (((buf->data[10] << 8 | buf->data[11]) >> 2) & TRANS_SEQ_ZERO_MASK);
 
 	seg = get_seg(frnd, src, seq_zero, seg_count);
 	if (!seg) {
@@ -1076,7 +1076,7 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
 	}
 }
 
-static void buf_send_start(u16_t duration, int err, void *user_data)
+static void buf_send_start(uint16_t duration, int err, void *user_data)
 {
 	struct bt_mesh_friend *frnd = user_data;
 
@@ -1112,7 +1112,7 @@ static void buf_send_end(int err, void *user_data)
 	}
 }
 
-static void update_overwrite(struct net_buf *buf, u8_t md)
+static void update_overwrite(struct net_buf *buf, uint8_t md)
 {
 	struct net_buf_simple_state state;
 	struct bt_mesh_ctl_friend_update *upd;
@@ -1131,7 +1131,7 @@ static void update_overwrite(struct net_buf *buf, u8_t md)
 
 	net_buf_skip(buf, 7); /* skip seqnum src dec*/
 
-	if (TRANS_CTL_OP((u8_t *) net_buf_pull_mem(buf, 1))
+	if (TRANS_CTL_OP((uint8_t *) net_buf_pull_mem(buf, 1))
 			!= TRANS_CTL_OP_FRIEND_UPDATE) {
 		goto end;
 	}
@@ -1153,7 +1153,7 @@ static void friend_timeout(struct k_work *work)
 		.end = buf_send_end,
 	};
 
-	u8_t md;
+	uint8_t md;
 
 	__ASSERT_NO_MSG(frnd->pending_buf == 0U);
 
@@ -1180,7 +1180,7 @@ static void friend_timeout(struct k_work *work)
 		return;
 	}
 
-	md = (u8_t)(sys_slist_peek_head(&frnd->queue) != NULL);
+	md = (uint8_t)(sys_slist_peek_head(&frnd->queue) != NULL);
 
 	update_overwrite(frnd->last, md);
 
@@ -1225,7 +1225,7 @@ int bt_mesh_friend_init(void)
 	return 0;
 }
 
-static bool is_segack(struct net_buf *buf, const u64_t *seqauth, u16_t src)
+static bool is_segack(struct net_buf *buf, const uint64_t *seqauth, uint16_t src)
 {
 	struct net_buf_simple_state state;
 	bool found = false;
@@ -1250,7 +1250,7 @@ static bool is_segack(struct net_buf *buf, const u64_t *seqauth, u16_t src)
 
 	net_buf_skip(buf, 2); /* skip dst */
 
-	if (TRANS_CTL_OP((u8_t *) net_buf_pull_mem(buf, 1)) != TRANS_CTL_OP_ACK) {
+	if (TRANS_CTL_OP((uint8_t *) net_buf_pull_mem(buf, 1)) != TRANS_CTL_OP_ACK) {
 		goto end;
 	}
 
@@ -1262,7 +1262,7 @@ end:
 }
 
 static void friend_purge_old_ack(struct bt_mesh_friend *frnd,
-				 const u64_t *seq_auth, u16_t src)
+				 const uint64_t *seq_auth, uint16_t src)
 {
 	sys_snode_t *cur, *prev = NULL;
 
@@ -1289,7 +1289,7 @@ static void friend_purge_old_ack(struct bt_mesh_friend *frnd,
 static void friend_lpn_enqueue_rx(struct bt_mesh_friend *frnd,
 				  struct bt_mesh_net_rx *rx,
 				  enum bt_mesh_friend_pdu_type type,
-				  const u64_t *seq_auth, u8_t seg_count,
+				  const uint64_t *seq_auth, uint8_t seg_count,
 				  struct net_buf_simple *sbuf)
 {
 	struct friend_pdu_info info;
@@ -1339,7 +1339,7 @@ static void friend_lpn_enqueue_rx(struct bt_mesh_friend *frnd,
 static void friend_lpn_enqueue_tx(struct bt_mesh_friend *frnd,
 				  struct bt_mesh_net_tx *tx,
 				  enum bt_mesh_friend_pdu_type type,
-				  const u64_t *seq_auth, u8_t seg_count,
+				  const uint64_t *seq_auth, uint8_t seg_count,
 				  struct net_buf_simple *sbuf)
 {
 	struct friend_pdu_info info;
@@ -1380,8 +1380,8 @@ static void friend_lpn_enqueue_tx(struct bt_mesh_friend *frnd,
 	BT_DBG("Queued message for LPN 0x%04x", frnd->lpn);
 }
 
-static bool friend_lpn_matches(struct bt_mesh_friend *frnd, u16_t net_idx,
-			       u16_t addr)
+static bool friend_lpn_matches(struct bt_mesh_friend *frnd, uint16_t net_idx,
+			       uint16_t addr)
 {
 	int i;
 
@@ -1406,7 +1406,7 @@ static bool friend_lpn_matches(struct bt_mesh_friend *frnd, u16_t net_idx,
 	return false;
 }
 
-bool bt_mesh_friend_match(u16_t net_idx, u16_t addr)
+bool bt_mesh_friend_match(uint16_t net_idx, uint16_t addr)
 {
 	int i;
 
@@ -1425,10 +1425,10 @@ bool bt_mesh_friend_match(u16_t net_idx, u16_t addr)
 	return false;
 }
 
-static bool friend_queue_has_space(struct bt_mesh_friend *frnd, u16_t addr,
-				   const u64_t *seq_auth, u8_t seg_count)
+static bool friend_queue_has_space(struct bt_mesh_friend *frnd, uint16_t addr,
+				   const uint64_t *seq_auth, uint8_t seg_count)
 {
-	u32_t total = 0;
+	uint32_t total = 0;
 	int i;
 
 	if (seg_count > CONFIG_BT_MESH_FRIEND_QUEUE_SIZE) {
@@ -1456,8 +1456,8 @@ static bool friend_queue_has_space(struct bt_mesh_friend *frnd, u16_t addr,
 	return (CONFIG_BT_MESH_FRIEND_QUEUE_SIZE - total) > seg_count;
 }
 
-bool bt_mesh_friend_queue_has_space(u16_t net_idx, u16_t src, u16_t dst,
-				    u64_t *seq_auth, u8_t seg_count)
+bool bt_mesh_friend_queue_has_space(uint16_t net_idx, uint16_t src, uint16_t dst,
+				    uint64_t *seq_auth, uint8_t seg_count)
 {
 	bool someone_has_space = false, friend_match = false;
 	int i;
@@ -1491,11 +1491,11 @@ bool bt_mesh_friend_queue_has_space(u16_t net_idx, u16_t src, u16_t dst,
 	return someone_has_space;
 }
 
-static bool friend_queue_prepare_space(struct bt_mesh_friend *frnd, u16_t addr,
-				       const u64_t *seq_auth, u8_t seg_count)
+static bool friend_queue_prepare_space(struct bt_mesh_friend *frnd, uint16_t addr,
+				       const uint64_t *seq_auth, uint8_t seg_count)
 {
 	bool pending_segments;
-	u8_t avail_space;
+	uint8_t avail_space;
 
 	if (!friend_queue_has_space(frnd, addr, seq_auth, seg_count)) {
 		return false;
@@ -1529,7 +1529,7 @@ static bool friend_queue_prepare_space(struct bt_mesh_friend *frnd, u16_t addr,
 
 void bt_mesh_friend_enqueue_rx(struct bt_mesh_net_rx *rx,
 			       enum bt_mesh_friend_pdu_type type,
-			       const u64_t *seq_auth, u8_t seg_count,
+			       const uint64_t *seq_auth, uint8_t seg_count,
 			       struct net_buf_simple *sbuf)
 {
 	int i;
@@ -1564,7 +1564,7 @@ void bt_mesh_friend_enqueue_rx(struct bt_mesh_net_rx *rx,
 
 bool bt_mesh_friend_enqueue_tx(struct bt_mesh_net_tx *tx,
 			       enum bt_mesh_friend_pdu_type type,
-			       const u64_t *seq_auth, u8_t seg_count,
+			       const uint64_t *seq_auth, uint8_t seg_count,
 			       struct net_buf_simple *sbuf)
 {
 	bool matched = false;
@@ -1599,8 +1599,8 @@ bool bt_mesh_friend_enqueue_tx(struct bt_mesh_net_tx *tx,
 	return matched;
 }
 
-void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, u16_t src,
-				     u16_t dst, u64_t *seq_auth)
+void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, uint16_t src,
+				     uint16_t dst, uint64_t *seq_auth)
 {
 	int i;
 
diff --git a/subsys/bluetooth/mesh/friend.h b/subsys/bluetooth/mesh/friend.h
index 4439ef27bb..6ea397d54b 100644
--- a/subsys/bluetooth/mesh/friend.h
+++ b/subsys/bluetooth/mesh/friend.h
@@ -12,29 +12,29 @@ enum bt_mesh_friend_pdu_type {
 	BT_MESH_FRIEND_PDU_COMPLETE,
 };
 
-bool bt_mesh_friend_match(u16_t net_idx, u16_t addr);
+bool bt_mesh_friend_match(uint16_t net_idx, uint16_t addr);
 
-struct bt_mesh_friend *bt_mesh_friend_find(u16_t net_idx, u16_t lpn_addr,
+struct bt_mesh_friend *bt_mesh_friend_find(uint16_t net_idx, uint16_t lpn_addr,
 					   bool valid, bool established);
 
-bool bt_mesh_friend_queue_has_space(u16_t net_idx, u16_t src, u16_t dst,
-				    u64_t *seq_auth, u8_t seg_count);
+bool bt_mesh_friend_queue_has_space(uint16_t net_idx, uint16_t src, uint16_t dst,
+				    uint64_t *seq_auth, uint8_t seg_count);
 
 void bt_mesh_friend_enqueue_rx(struct bt_mesh_net_rx *rx,
 			       enum bt_mesh_friend_pdu_type type,
-			       const u64_t *seq_auth, u8_t seg_count,
+			       const uint64_t *seq_auth, uint8_t seg_count,
 			       struct net_buf_simple *sbuf);
 bool bt_mesh_friend_enqueue_tx(struct bt_mesh_net_tx *tx,
 			       enum bt_mesh_friend_pdu_type type,
-			       const u64_t *seq_auth, u8_t seg_count,
+			       const uint64_t *seq_auth, uint8_t seg_count,
 			       struct net_buf_simple *sbuf);
 
-void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, u16_t src,
-				     u16_t dst, u64_t *seq_auth);
+void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, uint16_t src,
+				     uint16_t dst, uint64_t *seq_auth);
 
-void bt_mesh_friend_sec_update(u16_t net_idx);
+void bt_mesh_friend_sec_update(uint16_t net_idx);
 
-void bt_mesh_friend_clear_net_idx(u16_t net_idx);
+void bt_mesh_friend_clear_net_idx(uint16_t net_idx);
 
 int bt_mesh_friend_poll(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf);
 int bt_mesh_friend_req(struct bt_mesh_net_rx *rx, struct net_buf_simple *buf);
diff --git a/subsys/bluetooth/mesh/health_cli.c b/subsys/bluetooth/mesh/health_cli.c
index 791b2109af..8a83238305 100644
--- a/subsys/bluetooth/mesh/health_cli.c
+++ b/subsys/bluetooth/mesh/health_cli.c
@@ -25,15 +25,15 @@
 #include "net.h"
 #include "foundation.h"
 
-static s32_t msg_timeout;
+static int32_t msg_timeout;
 
 static struct bt_mesh_health_cli *health_cli;
 
 struct health_fault_param {
-	u16_t   cid;
-	u8_t   *expect_test_id;
-	u8_t   *test_id;
-	u8_t   *faults;
+	uint16_t   cid;
+	uint8_t   *expect_test_id;
+	uint8_t   *test_id;
+	uint8_t   *faults;
 	size_t *fault_count;
 };
 
@@ -42,8 +42,8 @@ static void health_fault_status(struct bt_mesh_model *model,
 				struct net_buf_simple *buf)
 {
 	struct health_fault_param *param;
-	u8_t test_id;
-	u16_t cid;
+	uint8_t test_id;
+	uint16_t cid;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -88,8 +88,8 @@ static void health_current_status(struct bt_mesh_model *model,
 				  struct net_buf_simple *buf)
 {
 	struct bt_mesh_health_cli *cli = model->user_data;
-	u8_t test_id;
-	u16_t cid;
+	uint8_t test_id;
+	uint16_t cid;
 
 	BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
 	       ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
@@ -110,7 +110,7 @@ static void health_current_status(struct bt_mesh_model *model,
 }
 
 struct health_period_param {
-	u8_t *divisor;
+	uint8_t *divisor;
 };
 
 static void health_period_status(struct bt_mesh_model *model,
@@ -136,7 +136,7 @@ static void health_period_status(struct bt_mesh_model *model,
 }
 
 struct health_attention_param {
-	u8_t *attention;
+	uint8_t *attention;
 };
 
 static void health_attention_status(struct bt_mesh_model *model,
@@ -171,7 +171,7 @@ const struct bt_mesh_model_op bt_mesh_health_cli_op[] = {
 	BT_MESH_MODEL_OP_END,
 };
 
-static int cli_prepare(void *param, u32_t op)
+static int cli_prepare(void *param, uint32_t op)
 {
 	if (!health_cli) {
 		BT_ERR("No available Health Client context!");
@@ -206,7 +206,7 @@ static int cli_wait(void)
 	return err;
 }
 
-int bt_mesh_health_attention_get(u16_t addr, u16_t app_idx, u8_t *attention)
+int bt_mesh_health_attention_get(uint16_t addr, uint16_t app_idx, uint8_t *attention)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_ATTENTION_GET, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -236,8 +236,8 @@ int bt_mesh_health_attention_get(u16_t addr, u16_t app_idx, u8_t *attention)
 	return cli_wait();
 }
 
-int bt_mesh_health_attention_set(u16_t addr, u16_t app_idx, u8_t attention,
-				 u8_t *updated_attention)
+int bt_mesh_health_attention_set(uint16_t addr, uint16_t app_idx, uint8_t attention,
+				 uint8_t *updated_attention)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_ATTENTION_SET, 1);
 	struct bt_mesh_msg_ctx ctx = {
@@ -278,7 +278,7 @@ int bt_mesh_health_attention_set(u16_t addr, u16_t app_idx, u8_t attention,
 	return cli_wait();
 }
 
-int bt_mesh_health_period_get(u16_t addr, u16_t app_idx, u8_t *divisor)
+int bt_mesh_health_period_get(uint16_t addr, uint16_t app_idx, uint8_t *divisor)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEALTH_PERIOD_GET, 0);
 	struct bt_mesh_msg_ctx ctx = {
@@ -308,8 +308,8 @@ int bt_mesh_health_period_get(u16_t addr, u16_t app_idx, u8_t *divisor)
 	return cli_wait();
 }
 
-int bt_mesh_health_period_set(u16_t addr, u16_t app_idx, u8_t divisor,
-				 u8_t *updated_divisor)
+int bt_mesh_health_period_set(uint16_t addr, uint16_t app_idx, uint8_t divisor,
+				 uint8_t *updated_divisor)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEALTH_PERIOD_SET, 1);
 	struct bt_mesh_msg_ctx ctx = {
@@ -350,8 +350,8 @@ int bt_mesh_health_period_set(u16_t addr, u16_t app_idx, u8_t divisor,
 	return cli_wait();
 }
 
-int bt_mesh_health_fault_test(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t test_id, u8_t *faults,
+int bt_mesh_health_fault_test(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t test_id, uint8_t *faults,
 				 size_t *fault_count)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEALTH_FAULT_TEST, 3);
@@ -397,8 +397,8 @@ int bt_mesh_health_fault_test(u16_t addr, u16_t app_idx, u16_t cid,
 	return cli_wait();
 }
 
-int bt_mesh_health_fault_clear(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t *test_id, u8_t *faults,
+int bt_mesh_health_fault_clear(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t *test_id, uint8_t *faults,
 				 size_t *fault_count)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEALTH_FAULT_CLEAR, 2);
@@ -443,8 +443,8 @@ int bt_mesh_health_fault_clear(u16_t addr, u16_t app_idx, u16_t cid,
 	return cli_wait();
 }
 
-int bt_mesh_health_fault_get(u16_t addr, u16_t app_idx, u16_t cid,
-				 u8_t *test_id, u8_t *faults,
+int bt_mesh_health_fault_get(uint16_t addr, uint16_t app_idx, uint16_t cid,
+				 uint8_t *test_id, uint8_t *faults,
 				 size_t *fault_count)
 {
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_HEALTH_FAULT_GET, 2);
@@ -479,12 +479,12 @@ int bt_mesh_health_fault_get(u16_t addr, u16_t app_idx, u16_t cid,
 	return cli_wait();
 }
 
-s32_t bt_mesh_health_cli_timeout_get(void)
+int32_t bt_mesh_health_cli_timeout_get(void)
 {
 	return msg_timeout;
 }
 
-void bt_mesh_health_cli_timeout_set(s32_t timeout)
+void bt_mesh_health_cli_timeout_set(int32_t timeout)
 {
 	msg_timeout = timeout;
 }
diff --git a/subsys/bluetooth/mesh/health_srv.c b/subsys/bluetooth/mesh/health_srv.c
index a52ce829ed..cb0998ce00 100644
--- a/subsys/bluetooth/mesh/health_srv.c
+++ b/subsys/bluetooth/mesh/health_srv.c
@@ -34,11 +34,11 @@
 struct bt_mesh_health_srv *health_srv;
 
 static void health_get_registered(struct bt_mesh_model *mod,
-				  u16_t company_id,
+				  uint16_t company_id,
 				  struct net_buf_simple *msg)
 {
 	struct bt_mesh_health_srv *srv = mod->user_data;
-	u8_t *test_id;
+	uint8_t *test_id;
 
 	BT_DBG("Company ID 0x%04x", company_id);
 
@@ -48,7 +48,7 @@ static void health_get_registered(struct bt_mesh_model *mod,
 	net_buf_simple_add_le16(msg, company_id);
 
 	if (srv->cb && srv->cb->fault_get_reg) {
-		u8_t fault_count = net_buf_simple_tailroom(msg) - 4;
+		uint8_t fault_count = net_buf_simple_tailroom(msg) - 4;
 		int err;
 
 		err = srv->cb->fault_get_reg(mod, company_id, test_id,
@@ -71,9 +71,9 @@ static size_t health_get_current(struct bt_mesh_model *mod,
 {
 	struct bt_mesh_health_srv *srv = mod->user_data;
 	const struct bt_mesh_comp *comp;
-	u8_t *test_id, *company_ptr;
-	u16_t company_id;
-	u8_t fault_count;
+	uint8_t *test_id, *company_ptr;
+	uint16_t company_id;
+	uint8_t fault_count;
 	int err;
 
 	bt_mesh_model_msg_init(msg, OP_HEALTH_CURRENT_STATUS);
@@ -111,7 +111,7 @@ static void health_fault_get(struct bt_mesh_model *model,
 			     struct net_buf_simple *buf)
 {
 	NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
-	u16_t company_id;
+	uint16_t company_id;
 
 	company_id = net_buf_simple_pull_le16(buf);
 
@@ -129,7 +129,7 @@ static void health_fault_clear_unrel(struct bt_mesh_model *model,
 				     struct net_buf_simple *buf)
 {
 	struct bt_mesh_health_srv *srv = model->user_data;
-	u16_t company_id;
+	uint16_t company_id;
 
 	company_id = net_buf_simple_pull_le16(buf);
 
@@ -146,7 +146,7 @@ static void health_fault_clear(struct bt_mesh_model *model,
 {
 	NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
 	struct bt_mesh_health_srv *srv = model->user_data;
-	u16_t company_id;
+	uint16_t company_id;
 
 	company_id = net_buf_simple_pull_le16(buf);
 
@@ -168,8 +168,8 @@ static void health_fault_test_unrel(struct bt_mesh_model *model,
 				    struct net_buf_simple *buf)
 {
 	struct bt_mesh_health_srv *srv = model->user_data;
-	u16_t company_id;
-	u8_t test_id;
+	uint16_t company_id;
+	uint8_t test_id;
 
 	test_id = net_buf_simple_pull_u8(buf);
 	company_id = net_buf_simple_pull_le16(buf);
@@ -187,8 +187,8 @@ static void health_fault_test(struct bt_mesh_model *model,
 {
 	NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
 	struct bt_mesh_health_srv *srv = model->user_data;
-	u16_t company_id;
-	u8_t test_id;
+	uint16_t company_id;
+	uint8_t test_id;
 
 	BT_DBG("");
 
@@ -220,7 +220,7 @@ static void send_attention_status(struct bt_mesh_model *model,
 	/* Needed size: opcode (2 bytes) + msg + MIC */
 	BT_MESH_MODEL_BUF_DEFINE(msg, OP_ATTENTION_STATUS, 1);
 	struct bt_mesh_health_srv *srv = model->user_data;
-	u8_t time;
+	uint8_t time;
 
 	time = k_delayed_work_remaining_get(&srv->attn_timer) / 1000;
 	BT_DBG("%u second%s", time, (time == 1U) ? "" : "s");
@@ -247,7 +247,7 @@ static void attention_set_unrel(struct bt_mesh_model *model,
 				struct bt_mesh_msg_ctx *ctx,
 				struct net_buf_simple *buf)
 {
-	u8_t time;
+	uint8_t time;
 
 	time = net_buf_simple_pull_u8(buf);
 
@@ -295,7 +295,7 @@ static void health_period_set_unrel(struct bt_mesh_model *model,
 				    struct bt_mesh_msg_ctx *ctx,
 				    struct net_buf_simple *buf)
 {
-	u8_t period;
+	uint8_t period;
 
 	period = net_buf_simple_pull_u8(buf);
 	if (period > 15) {
@@ -415,7 +415,7 @@ const struct bt_mesh_model_cb bt_mesh_health_srv_cb = {
 	.init = health_srv_init,
 };
 
-void bt_mesh_attention(struct bt_mesh_model *model, u8_t time)
+void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time)
 {
 	struct bt_mesh_health_srv *srv;
 
diff --git a/subsys/bluetooth/mesh/lpn.c b/subsys/bluetooth/mesh/lpn.c
index 63e96b4a0a..0aa9979b0f 100644
--- a/subsys/bluetooth/mesh/lpn.c
+++ b/subsys/bluetooth/mesh/lpn.c
@@ -64,13 +64,13 @@
 		      (CONFIG_BT_MESH_LPN_RSSI_FACTOR << 3) | \
 		      (CONFIG_BT_MESH_LPN_RECV_WIN_FACTOR << 5))
 
-#define POLL_TO(to) { (u8_t)((to) >> 16), (u8_t)((to) >> 8), (u8_t)(to) }
+#define POLL_TO(to) { (uint8_t)((to) >> 16), (uint8_t)((to) >> 8), (uint8_t)(to) }
 #define LPN_POLL_TO POLL_TO(CONFIG_BT_MESH_LPN_POLL_TIMEOUT)
 
 /* 2 transmissions, 20ms interval */
 #define POLL_XMIT BT_MESH_TRANSMIT(1, 20)
 
-static void (*lpn_cb)(u16_t friend_addr, bool established);
+static void (*lpn_cb)(uint16_t friend_addr, bool established);
 
 #if defined(CONFIG_BT_MESH_DEBUG_LOW_POWER)
 static const char *state2str(int state)
@@ -260,7 +260,7 @@ static void clear_friendship(bool force, bool disable)
 	k_delayed_work_submit(&lpn->timer, FRIEND_REQ_RETRY_TIMEOUT);
 }
 
-static void friend_req_sent(u16_t duration, int err, void *user_data)
+static void friend_req_sent(uint16_t duration, int err, void *user_data)
 {
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 
@@ -315,7 +315,7 @@ static int send_friend_req(struct bt_mesh_lpn *lpn)
 				sizeof(req), &friend_req_sent_cb, NULL);
 }
 
-static void req_sent(u16_t duration, int err, void *user_data)
+static void req_sent(uint16_t duration, int err, void *user_data)
 {
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 
@@ -368,7 +368,7 @@ static int send_friend_poll(void)
 		.friend_cred = true,
 	};
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
-	u8_t fsn = lpn->fsn;
+	uint8_t fsn = lpn->fsn;
 	int err;
 
 	BT_DBG("lpn->sent_req 0x%02x", lpn->sent_req);
@@ -489,7 +489,7 @@ int bt_mesh_lpn_friend_offer(struct bt_mesh_net_rx *rx,
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 	struct bt_mesh_subnet *sub = rx->sub;
 	struct friend_cred *cred;
-	u16_t frnd_counter;
+	uint16_t frnd_counter;
 	int err;
 
 	if (buf->len < sizeof(*msg)) {
@@ -547,7 +547,7 @@ int bt_mesh_lpn_friend_clear_cfm(struct bt_mesh_net_rx *rx,
 {
 	struct bt_mesh_ctl_friend_clear_confirm *msg = (void *)buf->data;
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
-	u16_t addr, counter;
+	uint16_t addr, counter;
 
 	if (buf->len < sizeof(*msg)) {
 		BT_WARN("Too short Friend Clear Confirm");
@@ -575,10 +575,10 @@ int bt_mesh_lpn_friend_clear_cfm(struct bt_mesh_net_rx *rx,
 	return 0;
 }
 
-static void lpn_group_add(u16_t group)
+static void lpn_group_add(uint16_t group)
 {
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
-	u16_t *free_slot = NULL;
+	uint16_t *free_slot = NULL;
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(lpn->groups); i++) {
@@ -601,7 +601,7 @@ static void lpn_group_add(u16_t group)
 	lpn->groups_changed = 1U;
 }
 
-static void lpn_group_del(u16_t group)
+static void lpn_group_del(uint16_t group)
 {
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 	int i;
@@ -632,7 +632,7 @@ static inline int group_popcount(atomic_t *target)
 #endif
 }
 
-static bool sub_update(u8_t op)
+static bool sub_update(uint8_t op)
 {
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 	int added_count = group_popcount(lpn->added);
@@ -771,7 +771,7 @@ static void lpn_timeout(struct k_work *work)
 		break;
 	case BT_MESH_LPN_ESTABLISHED:
 		if (lpn->req_attempts < REQ_ATTEMPTS(lpn)) {
-			u8_t req = lpn->sent_req;
+			uint8_t req = lpn->sent_req;
 
 			lpn->sent_req = 0U;
 
@@ -805,7 +805,7 @@ static void lpn_timeout(struct k_work *work)
 	}
 }
 
-void bt_mesh_lpn_group_add(u16_t group)
+void bt_mesh_lpn_group_add(uint16_t group)
 {
 	BT_DBG("group 0x%04x", group);
 
@@ -818,7 +818,7 @@ void bt_mesh_lpn_group_add(u16_t group)
 	sub_update(TRANS_CTL_OP_FRIEND_SUB_ADD);
 }
 
-void bt_mesh_lpn_group_del(u16_t *groups, size_t group_count)
+void bt_mesh_lpn_group_del(uint16_t *groups, size_t group_count)
 {
 	int i;
 
@@ -836,7 +836,7 @@ void bt_mesh_lpn_group_del(u16_t *groups, size_t group_count)
 	sub_update(TRANS_CTL_OP_FRIEND_SUB_REM);
 }
 
-static s32_t poll_timeout(struct bt_mesh_lpn *lpn)
+static int32_t poll_timeout(struct bt_mesh_lpn *lpn)
 {
 	/* If we're waiting for segment acks keep polling at high freq */
 	if (bt_mesh_tx_in_progress()) {
@@ -925,7 +925,7 @@ int bt_mesh_lpn_friend_update(struct bt_mesh_net_rx *rx,
 	struct bt_mesh_ctl_friend_update *msg = (void *)buf->data;
 	struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
 	struct bt_mesh_subnet *sub = rx->sub;
-	u32_t iv_index;
+	uint32_t iv_index;
 
 	if (buf->len < sizeof(*msg)) {
 		BT_WARN("Too short Friend Update");
@@ -1024,7 +1024,7 @@ int bt_mesh_lpn_poll(void)
 	return send_friend_poll();
 }
 
-void bt_mesh_lpn_set_cb(void (*cb)(u16_t friend_addr, bool established))
+void bt_mesh_lpn_set_cb(void (*cb)(uint16_t friend_addr, bool established))
 {
 	lpn_cb = cb;
 }
diff --git a/subsys/bluetooth/mesh/lpn.h b/subsys/bluetooth/mesh/lpn.h
index 839dafc129..52d1479c0f 100644
--- a/subsys/bluetooth/mesh/lpn.h
+++ b/subsys/bluetooth/mesh/lpn.h
@@ -24,7 +24,7 @@ static inline bool bt_mesh_lpn_established(void)
 #endif
 }
 
-static inline bool bt_mesh_lpn_match(u16_t addr)
+static inline bool bt_mesh_lpn_match(uint16_t addr)
 {
 #if defined(CONFIG_BT_MESH_LOW_POWER)
 	if (bt_mesh_lpn_established()) {
@@ -54,8 +54,8 @@ static inline bool bt_mesh_lpn_timer(void)
 
 void bt_mesh_lpn_msg_received(struct bt_mesh_net_rx *rx);
 
-void bt_mesh_lpn_group_add(u16_t group);
-void bt_mesh_lpn_group_del(u16_t *groups, size_t group_count);
+void bt_mesh_lpn_group_add(uint16_t group);
+void bt_mesh_lpn_group_del(uint16_t *groups, size_t group_count);
 
 void bt_mesh_lpn_disable(bool force);
 
diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index 64a474d490..bfd963213d 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -34,9 +34,9 @@
 #include "settings.h"
 #include "mesh.h"
 
-int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
-		      u8_t flags, u32_t iv_index, u16_t addr,
-		      const u8_t dev_key[16])
+int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
+		      uint8_t flags, uint32_t iv_index, uint16_t addr,
+		      const uint8_t dev_key[16])
 {
 	bool pb_gatt_enabled;
 	int err;
@@ -140,8 +140,8 @@ int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
 	return 0;
 }
 
-int bt_mesh_provision_adv(const u8_t uuid[16], u16_t net_idx, u16_t addr,
-			  u8_t attention_duration)
+int bt_mesh_provision_adv(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
+			  uint8_t attention_duration)
 {
 	if (!atomic_test_bit(bt_mesh.flags, BT_MESH_VALID)) {
 		return -EINVAL;
@@ -180,7 +180,7 @@ void bt_mesh_reset(void)
 
 	if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) {
 		if (IS_ENABLED(CONFIG_BT_MESH_LPN_SUB_ALL_NODES_ADDR)) {
-			u16_t group = BT_MESH_ADDR_ALL_NODES;
+			uint16_t group = BT_MESH_ADDR_ALL_NODES;
 
 			bt_mesh_lpn_group_del(&group, 1);
 		}
@@ -260,7 +260,7 @@ static void model_resume(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,
 			  bool vnd, bool primary, void *user_data)
 {
 	if (mod->pub && mod->pub->update) {
-		s32_t period_ms = bt_mesh_model_pub_period_get(mod);
+		int32_t period_ms = bt_mesh_model_pub_period_get(mod);
 
 		if (period_ms) {
 			k_delayed_work_submit(&mod->pub->timer,
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index a176d2b7d9..5594439997 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -68,10 +68,10 @@
 static struct friend_cred friend_cred[FRIEND_CRED_COUNT];
 
 static struct {
-	u32_t src : 15, /* MSb of source is always 0 */
+	uint32_t src : 15, /* MSb of source is always 0 */
 	      seq : 17;
 } msg_cache[CONFIG_BT_MESH_MSG_CACHE_SIZE];
-static u16_t msg_cache_next;
+static uint16_t msg_cache_next;
 
 /* Singleton network context (the implementation only supports one) */
 struct bt_mesh_net bt_mesh = {
@@ -88,13 +88,13 @@ struct bt_mesh_net bt_mesh = {
 	},
 };
 
-static u32_t dup_cache[4];
+static uint32_t dup_cache[4];
 static int   dup_cache_next;
 
 static bool check_dup(struct net_buf_simple *data)
 {
-	const u8_t *tail = net_buf_simple_tail(data);
-	u32_t val;
+	const uint8_t *tail = net_buf_simple_tail(data);
+	uint32_t val;
 	int i;
 
 	val = sys_get_be32(tail - 4) ^ sys_get_be32(tail - 8);
@@ -114,7 +114,7 @@ static bool check_dup(struct net_buf_simple *data)
 static bool msg_cache_match(struct bt_mesh_net_rx *rx,
 			    struct net_buf_simple *pdu)
 {
-	u16_t i;
+	uint16_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(msg_cache); i++) {
 		if (msg_cache[i].src == SRC(pdu->data) &&
@@ -134,7 +134,7 @@ static void msg_cache_add(struct bt_mesh_net_rx *rx)
 	msg_cache_next %= ARRAY_SIZE(msg_cache);
 }
 
-struct bt_mesh_subnet *bt_mesh_subnet_get(u16_t net_idx)
+struct bt_mesh_subnet *bt_mesh_subnet_get(uint16_t net_idx)
 {
 	int i;
 
@@ -152,10 +152,10 @@ struct bt_mesh_subnet *bt_mesh_subnet_get(u16_t net_idx)
 }
 
 int bt_mesh_net_keys_create(struct bt_mesh_subnet_keys *keys,
-			    const u8_t key[16])
+			    const uint8_t key[16])
 {
-	u8_t p[] = { 0 };
-	u8_t nid;
+	uint8_t p[] = { 0 };
+	uint8_t nid;
 	int err;
 
 	err = bt_mesh_k2(key, p, sizeof(p), &nid, keys->enc, keys->privacy);
@@ -200,11 +200,11 @@ int bt_mesh_net_keys_create(struct bt_mesh_subnet_keys *keys,
 	return 0;
 }
 
-int friend_cred_set(struct friend_cred *cred, u8_t idx, const u8_t net_key[16])
+int friend_cred_set(struct friend_cred *cred, uint8_t idx, const uint8_t net_key[16])
 {
-	u16_t lpn_addr, frnd_addr;
+	uint16_t lpn_addr, frnd_addr;
 	int err;
-	u8_t p[9];
+	uint8_t p[9];
 
 #if defined(CONFIG_BT_MESH_LOW_POWER)
 	if (cred->addr == bt_mesh.lpn.frnd) {
@@ -243,7 +243,7 @@ int friend_cred_set(struct friend_cred *cred, u8_t idx, const u8_t net_key[16])
 	return 0;
 }
 
-void friend_cred_refresh(u16_t net_idx)
+void friend_cred_refresh(uint16_t net_idx)
 {
 	int i;
 
@@ -281,8 +281,8 @@ int friend_cred_update(struct bt_mesh_subnet *sub)
 	return 0;
 }
 
-struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, u16_t addr,
-				       u16_t lpn_counter, u16_t frnd_counter)
+struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, uint16_t addr,
+				       uint16_t lpn_counter, uint16_t frnd_counter)
 {
 	struct friend_cred *cred;
 	int i, err;
@@ -334,7 +334,7 @@ void friend_cred_clear(struct friend_cred *cred)
 	(void)memset(cred->cred, 0, sizeof(cred->cred));
 }
 
-int friend_cred_del(u16_t net_idx, u16_t addr)
+int friend_cred_del(uint16_t net_idx, uint16_t addr)
 {
 	int i;
 
@@ -350,8 +350,8 @@ int friend_cred_del(u16_t net_idx, u16_t addr)
 	return -ENOENT;
 }
 
-int friend_cred_get(struct bt_mesh_subnet *sub, u16_t addr, u8_t *nid,
-		    const u8_t **enc, const u8_t **priv)
+int friend_cred_get(struct bt_mesh_subnet *sub, uint16_t addr, uint8_t *nid,
+		    const uint8_t **enc, const uint8_t **priv)
 {
 	int i;
 
@@ -386,9 +386,9 @@ int friend_cred_get(struct bt_mesh_subnet *sub, u16_t addr, u8_t *nid,
 	return -ENOENT;
 }
 
-u8_t bt_mesh_net_flags(struct bt_mesh_subnet *sub)
+uint8_t bt_mesh_net_flags(struct bt_mesh_subnet *sub)
 {
-	u8_t flags = 0x00;
+	uint8_t flags = 0x00;
 
 	if (sub && sub->kr_flag) {
 		flags |= BT_MESH_NET_FLAG_KR;
@@ -403,7 +403,7 @@ u8_t bt_mesh_net_flags(struct bt_mesh_subnet *sub)
 
 int bt_mesh_net_beacon_update(struct bt_mesh_subnet *sub)
 {
-	u8_t flags = bt_mesh_net_flags(sub);
+	uint8_t flags = bt_mesh_net_flags(sub);
 	struct bt_mesh_subnet_keys *keys;
 
 	if (sub->kr_flag) {
@@ -420,8 +420,8 @@ int bt_mesh_net_beacon_update(struct bt_mesh_subnet *sub)
 				   bt_mesh.iv_index, sub->auth);
 }
 
-int bt_mesh_net_create(u16_t idx, u8_t flags, const u8_t key[16],
-		       u32_t iv_index)
+int bt_mesh_net_create(uint16_t idx, uint8_t flags, const uint8_t key[16],
+		       uint32_t iv_index)
 {
 	struct bt_mesh_subnet *sub;
 	int err;
@@ -502,7 +502,7 @@ void bt_mesh_net_revoke_keys(struct bt_mesh_subnet *sub)
 	}
 }
 
-bool bt_mesh_kr_update(struct bt_mesh_subnet *sub, u8_t new_kr, bool new_key)
+bool bt_mesh_kr_update(struct bt_mesh_subnet *sub, uint8_t new_kr, bool new_key)
 {
 	if (new_kr != sub->kr_flag && sub->kr_phase == BT_MESH_KR_NORMAL) {
 		BT_WARN("KR change in normal operation. Are we blacklisted?");
@@ -606,7 +606,7 @@ void bt_mesh_net_sec_update(struct bt_mesh_subnet *sub)
 	}
 }
 
-bool bt_mesh_net_iv_update(u32_t iv_index, bool iv_update)
+bool bt_mesh_net_iv_update(uint32_t iv_index, bool iv_update)
 {
 	int i;
 
@@ -708,9 +708,9 @@ do_update:
 	return true;
 }
 
-u32_t bt_mesh_next_seq(void)
+uint32_t bt_mesh_next_seq(void)
 {
-	u32_t seq = bt_mesh.seq++;
+	uint32_t seq = bt_mesh.seq++;
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
 		bt_mesh_store_seq();
@@ -742,8 +742,8 @@ int bt_mesh_net_encode(struct bt_mesh_net_tx *tx, struct net_buf_simple *buf,
 		       bool proxy)
 {
 	const bool ctl = (tx->ctx->app_idx == BT_MESH_KEY_UNUSED);
-	u8_t nid;
-	const u8_t *enc, *priv;
+	uint8_t nid;
+	const uint8_t *enc, *priv;
 	int err;
 
 	if (ctl && net_buf_simple_tailroom(buf) < 8) {
@@ -859,10 +859,10 @@ done:
 }
 
 static bool auth_match(struct bt_mesh_subnet_keys *keys,
-		       const u8_t net_id[8], u8_t flags,
-		       u32_t iv_index, const u8_t auth[8])
+		       const uint8_t net_id[8], uint8_t flags,
+		       uint32_t iv_index, const uint8_t auth[8])
 {
-	u8_t net_auth[8];
+	uint8_t net_auth[8];
 
 	if (memcmp(net_id, keys->net_id, 8)) {
 		return false;
@@ -880,8 +880,8 @@ static bool auth_match(struct bt_mesh_subnet_keys *keys,
 	return true;
 }
 
-struct bt_mesh_subnet *bt_mesh_subnet_find(const u8_t net_id[8], u8_t flags,
-					   u32_t iv_index, const u8_t auth[8],
+struct bt_mesh_subnet *bt_mesh_subnet_find(const uint8_t net_id[8], uint8_t flags,
+					   uint32_t iv_index, const uint8_t auth[8],
 					   bool *new_key)
 {
 	int i;
@@ -911,8 +911,8 @@ struct bt_mesh_subnet *bt_mesh_subnet_find(const u8_t net_id[8], u8_t flags,
 	return NULL;
 }
 
-static int net_decrypt(struct bt_mesh_subnet *sub, const u8_t *enc,
-		       const u8_t *priv, const u8_t *data,
+static int net_decrypt(struct bt_mesh_subnet *sub, const uint8_t *enc,
+		       const uint8_t *priv, const uint8_t *data,
 		       size_t data_len, struct bt_mesh_net_rx *rx,
 		       struct net_buf_simple *buf)
 {
@@ -950,7 +950,7 @@ static int net_decrypt(struct bt_mesh_subnet *sub, const u8_t *enc,
 	return bt_mesh_net_decrypt(enc, buf, BT_MESH_NET_IVI_RX(rx), false);
 }
 
-static int friend_decrypt(struct bt_mesh_subnet *sub, const u8_t *data,
+static int friend_decrypt(struct bt_mesh_subnet *sub, const uint8_t *data,
 			  size_t data_len, struct bt_mesh_net_rx *rx,
 			  struct net_buf_simple *buf)
 {
@@ -986,7 +986,7 @@ static int friend_decrypt(struct bt_mesh_subnet *sub, const u8_t *data,
 	return -ENOENT;
 }
 
-static bool net_find_and_decrypt(const u8_t *data, size_t data_len,
+static bool net_find_and_decrypt(const uint8_t *data, size_t data_len,
 				 struct bt_mesh_net_rx *rx,
 				 struct net_buf_simple *buf)
 {
@@ -1057,9 +1057,9 @@ static bool relay_to_adv(enum bt_mesh_net_if net_if)
 static void bt_mesh_net_relay(struct net_buf_simple *sbuf,
 			      struct bt_mesh_net_rx *rx)
 {
-	const u8_t *enc, *priv;
+	const uint8_t *enc, *priv;
 	struct net_buf *buf;
-	u8_t nid, transmit;
+	uint8_t nid, transmit;
 
 	if (rx->net_if == BT_MESH_NET_IF_LOCAL) {
 		/* Locally originated PDUs with TTL=1 will only be delivered
@@ -1233,7 +1233,7 @@ int bt_mesh_net_decode(struct net_buf_simple *data, enum bt_mesh_net_if net_if,
 	return 0;
 }
 
-void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi,
+void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
 		      enum bt_mesh_net_if net_if)
 {
 	NET_BUF_SIMPLE_DEFINE(buf, 29);
@@ -1342,8 +1342,8 @@ void bt_mesh_net_start(void)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PROV)) {
-		u16_t net_idx = bt_mesh.sub[0].net_idx;
-		u16_t addr = bt_mesh_primary_addr();
+		uint16_t net_idx = bt_mesh.sub[0].net_idx;
+		uint16_t addr = bt_mesh_primary_addr();
 
 		bt_mesh_prov_complete(net_idx, addr);
 	}
diff --git a/subsys/bluetooth/mesh/net.h b/subsys/bluetooth/mesh/net.h
index d7b6371adc..5294b91ad8 100644
--- a/subsys/bluetooth/mesh/net.h
+++ b/subsys/bluetooth/mesh/net.h
@@ -24,63 +24,63 @@
 #define BT_MESH_IVU_TIMEOUT        K_HOURS(BT_MESH_IVU_HOURS)
 
 struct bt_mesh_app_key {
-	u16_t net_idx;
-	u16_t app_idx;
+	uint16_t net_idx;
+	uint16_t app_idx;
 	bool  updated;
 	struct bt_mesh_app_keys {
-		u8_t id;
-		u8_t val[16];
+		uint8_t id;
+		uint8_t val[16];
 	} keys[2];
 };
 
 struct bt_mesh_node {
-	u16_t addr;
-	u16_t net_idx;
-	u8_t  dev_key[16];
-	u8_t  num_elem;
+	uint16_t addr;
+	uint16_t net_idx;
+	uint8_t  dev_key[16];
+	uint8_t  num_elem;
 };
 
 struct bt_mesh_subnet {
-	u32_t beacon_sent;        /* Timestamp of last sent beacon */
-	u8_t  beacons_last;       /* Number of beacons during last
+	uint32_t beacon_sent;        /* Timestamp of last sent beacon */
+	uint8_t  beacons_last;       /* Number of beacons during last
 				   * observation window
 				   */
-	u8_t  beacons_cur;        /* Number of beaconds observed during
+	uint8_t  beacons_cur;        /* Number of beaconds observed during
 				   * currently ongoing window.
 				   */
 
-	u8_t  beacon_cache[21];   /* Cached last authenticated beacon */
+	uint8_t  beacon_cache[21];   /* Cached last authenticated beacon */
 
-	u16_t net_idx;            /* NetKeyIndex */
+	uint16_t net_idx;            /* NetKeyIndex */
 
 	bool  kr_flag;            /* Key Refresh Flag */
-	u8_t  kr_phase;           /* Key Refresh Phase */
+	uint8_t  kr_phase;           /* Key Refresh Phase */
 
-	u8_t  node_id;            /* Node Identity State */
-	u32_t node_id_start;      /* Node Identity started timestamp */
+	uint8_t  node_id;            /* Node Identity State */
+	uint32_t node_id_start;      /* Node Identity started timestamp */
 
-	u8_t  auth[8];            /* Beacon Authentication Value */
+	uint8_t  auth[8];            /* Beacon Authentication Value */
 
 	struct bt_mesh_subnet_keys {
-		u8_t net[16];       /* NetKey */
-		u8_t nid;           /* NID */
-		u8_t enc[16];       /* EncKey */
-		u8_t net_id[8];     /* Network ID */
+		uint8_t net[16];       /* NetKey */
+		uint8_t nid;           /* NID */
+		uint8_t enc[16];       /* EncKey */
+		uint8_t net_id[8];     /* Network ID */
 #if defined(CONFIG_BT_MESH_GATT_PROXY)
-		u8_t identity[16];  /* IdentityKey */
+		uint8_t identity[16];  /* IdentityKey */
 #endif
-		u8_t privacy[16];   /* PrivacyKey */
-		u8_t beacon[16];    /* BeaconKey */
+		uint8_t privacy[16];   /* PrivacyKey */
+		uint8_t beacon[16];    /* BeaconKey */
 	} keys[2];
 };
 
 struct bt_mesh_rpl {
-	u16_t src;
+	uint16_t src;
 	bool  old_iv;
 #if defined(CONFIG_BT_SETTINGS)
 	bool  store;
 #endif
-	u32_t seq;
+	uint32_t seq;
 };
 
 #if defined(CONFIG_BT_MESH_FRIEND)
@@ -92,22 +92,22 @@ struct bt_mesh_rpl {
 #endif
 
 struct bt_mesh_friend {
-	u16_t lpn;
-	u8_t  recv_delay;
-	u8_t  fsn:1,
+	uint16_t lpn;
+	uint8_t  recv_delay;
+	uint8_t  fsn:1,
 	      send_last:1,
 	      pending_req:1,
 	      pending_buf:1,
 	      valid:1,
 	      established:1;
-	s32_t poll_to;
-	u8_t  num_elem;
-	u16_t lpn_counter;
-	u16_t counter;
+	int32_t poll_to;
+	uint8_t  num_elem;
+	uint16_t lpn_counter;
+	uint16_t counter;
 
-	u16_t net_idx;
+	uint16_t net_idx;
 
-	u16_t sub_list[FRIEND_SUB_LIST_SIZE];
+	uint16_t sub_list[FRIEND_SUB_LIST_SIZE];
 
 	struct k_delayed_work timer;
 
@@ -118,19 +118,19 @@ struct bt_mesh_friend {
 		 * the current number of segments, in the queue. This is
 		 * used for Friend Queue free space calculations.
 		 */
-		u8_t        seg_count;
+		uint8_t        seg_count;
 	} seg[FRIEND_SEG_RX];
 
 	struct net_buf *last;
 
 	sys_slist_t queue;
-	u32_t queue_size;
+	uint32_t queue_size;
 
 	/* Friend Clear Procedure */
 	struct {
-		u32_t start;                  /* Clear Procedure start */
-		u16_t frnd;                   /* Previous Friend's address */
-		u16_t repeat_sec;             /* Repeat timeout in seconds */
+		uint32_t start;                  /* Clear Procedure start */
+		uint16_t frnd;                   /* Previous Friend's address */
+		uint16_t repeat_sec;             /* Repeat timeout in seconds */
 		struct k_delayed_work timer;  /* Repeat timer */
 	} clear;
 };
@@ -156,23 +156,23 @@ struct bt_mesh_lpn {
 	} state;
 
 	/* Transaction Number (used for subscription list) */
-	u8_t xact_next;
-	u8_t xact_pending;
-	u8_t sent_req;
+	uint8_t xact_next;
+	uint8_t xact_pending;
+	uint8_t sent_req;
 
 	/* Address of our Friend when we're a LPN. Unassigned if we don't
 	 * have a friend yet.
 	 */
-	u16_t frnd;
+	uint16_t frnd;
 
 	/* Value from the friend offer */
-	u8_t  recv_win;
+	uint8_t  recv_win;
 
-	u8_t  req_attempts;     /* Number of Request attempts */
+	uint8_t  req_attempts;     /* Number of Request attempts */
 
-	s32_t poll_timeout;
+	int32_t poll_timeout;
 
-	u8_t  groups_changed:1, /* Friend Subscription List needs updating */
+	uint8_t  groups_changed:1, /* Friend Subscription List needs updating */
 	      pending_poll:1,   /* Poll to be sent after subscription */
 	      disable:1,        /* Disable LPN after clearing */
 	      fsn:1,            /* Friend Sequence Number */
@@ -180,22 +180,22 @@ struct bt_mesh_lpn {
 	      clear_success:1;  /* Friend Clear Confirm received */
 
 	/* Friend Queue Size */
-	u8_t  queue_size;
+	uint8_t  queue_size;
 
 	/* LPNCounter */
-	u16_t counter;
+	uint16_t counter;
 
 	/* Previous Friend of this LPN */
-	u16_t old_friend;
+	uint16_t old_friend;
 
 	/* Duration reported for last advertising packet */
-	u16_t adv_duration;
+	uint16_t adv_duration;
 
 	/* Next LPN related action timer */
 	struct k_delayed_work timer;
 
 	/* Subscribed groups */
-	u16_t groups[LPN_GROUPS];
+	uint16_t groups[LPN_GROUPS];
 
 	/* Bit fields for tracking which groups the Friend knows about */
 	ATOMIC_DEFINE(added, LPN_GROUPS);
@@ -228,8 +228,8 @@ enum {
 };
 
 struct bt_mesh_net {
-	u32_t iv_index; /* Current IV Index */
-	u32_t seq;      /* Next outgoing sequence number (24 bits) */
+	uint32_t iv_index; /* Current IV Index */
+	uint32_t seq;      /* Next outgoing sequence number (24 bits) */
 
 	ATOMIC_DEFINE(flags, BT_MESH_FLAG_COUNT);
 
@@ -247,12 +247,12 @@ struct bt_mesh_net {
 #endif
 
 	/* Number of hours in current IV Update state */
-	u8_t  ivu_duration;
+	uint8_t  ivu_duration;
 
 	/* Timer to track duration in current IV Update state */
 	struct k_delayed_work ivu_timer;
 
-	u8_t dev_key[16];
+	uint8_t dev_key[16];
 
 	struct bt_mesh_app_key app_keys[CONFIG_BT_MESH_APP_KEY_COUNT];
 
@@ -273,24 +273,24 @@ enum bt_mesh_net_if {
 struct bt_mesh_net_rx {
 	struct bt_mesh_subnet *sub;
 	struct bt_mesh_msg_ctx ctx;
-	u32_t  seq;            /* Sequence Number */
-	u8_t   old_iv:1,       /* iv_index - 1 was used */
+	uint32_t  seq;            /* Sequence Number */
+	uint8_t   old_iv:1,       /* iv_index - 1 was used */
 	       new_key:1,      /* Data was encrypted with updated key */
 	       friend_cred:1,  /* Data was encrypted with friend cred */
 	       ctl:1,          /* Network Control */
 	       net_if:2,       /* Network interface */
 	       local_match:1,  /* Matched a local element */
 	       friend_match:1; /* Matched an LPN we're friends for */
-	u16_t  msg_cache_idx;  /* Index of entry in message cache */
+	uint16_t  msg_cache_idx;  /* Index of entry in message cache */
 };
 
 /* Encoding context for Network/Transport data */
 struct bt_mesh_net_tx {
 	struct bt_mesh_subnet *sub;
 	struct bt_mesh_msg_ctx *ctx;
-	u16_t src;
-	u8_t  xmit;
-	u8_t  friend_cred:1,
+	uint16_t src;
+	uint8_t  xmit;
+	uint8_t  friend_cred:1,
 	      aszmic:1,
 	      aid:6;
 };
@@ -305,14 +305,14 @@ extern struct bt_mesh_net bt_mesh;
 #define BT_MESH_NET_HDR_LEN 9
 
 int bt_mesh_net_keys_create(struct bt_mesh_subnet_keys *keys,
-			    const u8_t key[16]);
+			    const uint8_t key[16]);
 
-int bt_mesh_net_create(u16_t idx, u8_t flags, const u8_t key[16],
-		       u32_t iv_index);
+int bt_mesh_net_create(uint16_t idx, uint8_t flags, const uint8_t key[16],
+		       uint32_t iv_index);
 
-u8_t bt_mesh_net_flags(struct bt_mesh_subnet *sub);
+uint8_t bt_mesh_net_flags(struct bt_mesh_subnet *sub);
 
-bool bt_mesh_kr_update(struct bt_mesh_subnet *sub, u8_t new_kr, bool new_key);
+bool bt_mesh_kr_update(struct bt_mesh_subnet *sub, uint8_t new_kr, bool new_key);
 
 void bt_mesh_net_revoke_keys(struct bt_mesh_subnet *sub);
 
@@ -320,14 +320,14 @@ int bt_mesh_net_beacon_update(struct bt_mesh_subnet *sub);
 
 void bt_mesh_rpl_reset(void);
 
-bool bt_mesh_net_iv_update(u32_t iv_index, bool iv_update);
+bool bt_mesh_net_iv_update(uint32_t iv_index, bool iv_update);
 
 void bt_mesh_net_sec_update(struct bt_mesh_subnet *sub);
 
-struct bt_mesh_subnet *bt_mesh_subnet_get(u16_t net_idx);
+struct bt_mesh_subnet *bt_mesh_subnet_get(uint16_t net_idx);
 
-struct bt_mesh_subnet *bt_mesh_subnet_find(const u8_t net_id[8], u8_t flags,
-					   u32_t iv_index, const u8_t auth[8],
+struct bt_mesh_subnet *bt_mesh_subnet_find(const uint8_t net_id[8], uint8_t flags,
+					   uint32_t iv_index, const uint8_t auth[8],
 					   bool *new_key);
 
 int bt_mesh_net_encode(struct bt_mesh_net_tx *tx, struct net_buf_simple *buf,
@@ -339,10 +339,10 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf,
 int bt_mesh_net_decode(struct net_buf_simple *data, enum bt_mesh_net_if net_if,
 		       struct bt_mesh_net_rx *rx, struct net_buf_simple *buf);
 
-void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi,
+void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
 		      enum bt_mesh_net_if net_if);
 
-u32_t bt_mesh_next_seq(void);
+uint32_t bt_mesh_next_seq(void);
 
 void bt_mesh_net_start(void);
 
@@ -352,28 +352,28 @@ void bt_mesh_net_header_parse(struct net_buf_simple *buf,
 
 /* Friendship Credential Management */
 struct friend_cred {
-	u16_t net_idx;
-	u16_t addr;
+	uint16_t net_idx;
+	uint16_t addr;
 
-	u16_t lpn_counter;
-	u16_t frnd_counter;
+	uint16_t lpn_counter;
+	uint16_t frnd_counter;
 
 	struct {
-		u8_t nid;         /* NID */
-		u8_t enc[16];     /* EncKey */
-		u8_t privacy[16]; /* PrivacyKey */
+		uint8_t nid;         /* NID */
+		uint8_t enc[16];     /* EncKey */
+		uint8_t privacy[16]; /* PrivacyKey */
 	} cred[2];
 };
 
-int friend_cred_get(struct bt_mesh_subnet *sub, u16_t addr, u8_t *nid,
-			    const u8_t **enc, const u8_t **priv);
-int friend_cred_set(struct friend_cred *cred, u8_t idx, const u8_t net_key[16]);
-void friend_cred_refresh(u16_t net_idx);
+int friend_cred_get(struct bt_mesh_subnet *sub, uint16_t addr, uint8_t *nid,
+			    const uint8_t **enc, const uint8_t **priv);
+int friend_cred_set(struct friend_cred *cred, uint8_t idx, const uint8_t net_key[16]);
+void friend_cred_refresh(uint16_t net_idx);
 int friend_cred_update(struct bt_mesh_subnet *sub);
-struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, u16_t addr,
-				       u16_t lpn_counter, u16_t frnd_counter);
+struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, uint16_t addr,
+				       uint16_t lpn_counter, uint16_t frnd_counter);
 void friend_cred_clear(struct friend_cred *cred);
-int friend_cred_del(u16_t net_idx, u16_t addr);
+int friend_cred_del(uint16_t net_idx, uint16_t addr);
 
 static inline void send_cb_finalize(const struct bt_mesh_send_cb *cb,
 				    void *cb_data)
diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index 939339ae69..f4e3979310 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -70,7 +70,7 @@ enum {
 };
 
 struct pb_adv {
-	u32_t id; /* Link ID */
+	uint32_t id; /* Link ID */
 
 	ATOMIC_DEFINE(flags, NUM_FLAGS);
 
@@ -78,22 +78,22 @@ struct pb_adv {
 	void *cb_data;
 
 	struct {
-		u8_t id;       /* Most recent transaction ID */
-		u8_t seg;      /* Bit-field of unreceived segments */
-		u8_t last_seg; /* Last segment (to check length) */
-		u8_t fcs;      /* Expected FCS value */
+		uint8_t id;       /* Most recent transaction ID */
+		uint8_t seg;      /* Bit-field of unreceived segments */
+		uint8_t last_seg; /* Last segment (to check length) */
+		uint8_t fcs;      /* Expected FCS value */
 		struct net_buf_simple *buf;
 	} rx;
 
 	struct {
 		/* Start timestamp of the transaction */
-		s64_t start;
+		int64_t start;
 
 		/* Transaction id */
-		u8_t id;
+		uint8_t id;
 
 		/* Current ack id */
-		u8_t pending_ack;
+		uint8_t pending_ack;
 
 		/* Pending outgoing buffer(s) */
 		struct net_buf *buf[3];
@@ -111,16 +111,16 @@ struct pb_adv {
 };
 
 struct prov_rx {
-	u32_t link_id;
-	u8_t xact_id;
-	u8_t gpc;
+	uint32_t link_id;
+	uint8_t xact_id;
+	uint8_t gpc;
 };
 
 NET_BUF_SIMPLE_DEFINE_STATIC(rx_buf, 65);
 
 static struct pb_adv link = { .rx = { .buf = &rx_buf } };
 
-static void gen_prov_ack_send(u8_t xact_id);
+static void gen_prov_ack_send(uint8_t xact_id);
 static void link_open(struct prov_rx *rx, struct net_buf_simple *buf);
 static void link_ack(struct prov_rx *rx, struct net_buf_simple *buf);
 static void link_close(struct prov_rx *rx, struct net_buf_simple *buf);
@@ -138,7 +138,7 @@ static struct bt_mesh_send_cb buf_sent_cb = {
 	.end = buf_sent,
 };
 
-static u8_t last_seg(u8_t len)
+static uint8_t last_seg(uint8_t len)
 {
 	if (len <= START_PAYLOAD_MAX) {
 		return 0;
@@ -167,7 +167,7 @@ static void free_segments(void)
 	}
 }
 
-static u8_t next_transaction_id(u8_t id)
+static uint8_t next_transaction_id(uint8_t id)
 {
 	return (((id + 1) & 0x7f) | (id & 0x80));
 }
@@ -207,7 +207,7 @@ static void close_link(enum prov_bearer_link_status reason)
 	cb->link_closed(&pb_adv, cb_data, reason);
 }
 
-static struct net_buf *adv_buf_create(u8_t retransmits)
+static struct net_buf *adv_buf_create(uint8_t retransmits)
 {
 	struct net_buf *buf;
 
@@ -222,9 +222,9 @@ static struct net_buf *adv_buf_create(u8_t retransmits)
 	return buf;
 }
 
-static void ack_complete(u16_t duration, int err, void *user_data)
+static void ack_complete(uint16_t duration, int err, void *user_data)
 {
-	BT_DBG("xact 0x%x complete", (u8_t)link.tx.pending_ack);
+	BT_DBG("xact 0x%x complete", (uint8_t)link.tx.pending_ack);
 	atomic_clear_bit(link.flags, ACK_PENDING);
 }
 
@@ -233,7 +233,7 @@ static bool ack_pending(void)
 	return atomic_test_bit(link.flags, ACK_PENDING);
 }
 
-static void prov_failed(u8_t err)
+static void prov_failed(uint8_t err)
 {
 	BT_DBG("%u", err);
 	link.cb->error(&pb_adv, link.cb_data, err);
@@ -272,7 +272,7 @@ static void protocol_timeout(struct k_work *work)
  * Generic provisioning
  ******************************************************************************/
 
-static void gen_prov_ack_send(u8_t xact_id)
+static void gen_prov_ack_send(uint8_t xact_id)
 {
 	static const struct bt_mesh_send_cb cb = {
 		.start = ack_complete,
@@ -311,7 +311,7 @@ static void gen_prov_ack_send(u8_t xact_id)
 
 static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 {
-	u8_t seg = CONT_SEG_INDEX(rx->gpc);
+	uint8_t seg = CONT_SEG_INDEX(rx->gpc);
 
 	BT_DBG("len %u, seg_index %u", buf->len, seg);
 
@@ -335,7 +335,7 @@ static void gen_prov_cont(struct prov_rx *rx, struct net_buf_simple *buf)
 		prov_failed(PROV_ERR_NVAL_FMT);
 		return;
 	} else if (seg == link.rx.last_seg) {
-		u8_t expect_len;
+		uint8_t expect_len;
 
 		expect_len = (link.rx.buf->len - 20U -
 			      ((link.rx.last_seg - 1) * 23U));
@@ -382,7 +382,7 @@ static void gen_prov_ack(struct prov_rx *rx, struct net_buf_simple *buf)
 
 static void gen_prov_start(struct prov_rx *rx, struct net_buf_simple *buf)
 {
-	u8_t expected_id = next_transaction_id(link.rx.id);
+	uint8_t expected_id = next_transaction_id(link.rx.id);
 
 	if (link.rx.seg) {
 		if (rx->xact_id != link.rx.id) {
@@ -483,7 +483,7 @@ static void gen_prov_ctl(struct prov_rx *rx, struct net_buf_simple *buf)
 static const struct {
 	void (*func)(struct prov_rx *rx, struct net_buf_simple *buf);
 	bool require_link;
-	u8_t min_len;
+	uint8_t min_len;
 } gen_prov[] = {
 	{ gen_prov_start, true, 3 },
 	{ gen_prov_ack, true, 0 },
@@ -534,7 +534,7 @@ static void send_reliable(void)
 
 static void prov_retransmit(struct k_work *work)
 {
-	s32_t timeout_ms;
+	int32_t timeout_ms;
 	int i;
 
 	BT_DBG("");
@@ -587,7 +587,7 @@ static void prov_retransmit(struct k_work *work)
 	}
 }
 
-static int bearer_ctl_send(u8_t op, const void *data, u8_t data_len,
+static int bearer_ctl_send(uint8_t op, const void *data, uint8_t data_len,
 			   bool reliable)
 {
 	struct net_buf *buf;
@@ -622,7 +622,7 @@ static int prov_send_adv(struct net_buf_simple *msg,
 			 prov_bearer_send_complete_t cb, void *cb_data)
 {
 	struct net_buf *start, *buf;
-	u8_t seg_len, seg_id;
+	uint8_t seg_len, seg_id;
 
 	prov_clear_tx();
 	k_delayed_work_submit(&link.prot_timer, PROTOCOL_TIMEOUT);
@@ -779,7 +779,7 @@ void bt_mesh_pb_adv_recv(struct net_buf_simple *buf)
 	gen_prov_recv(&rx, buf);
 }
 
-static int prov_link_open(const u8_t uuid[16], k_timeout_t timeout,
+static int prov_link_open(const uint8_t uuid[16], k_timeout_t timeout,
 			  const struct prov_bearer_cb *cb, void *cb_data)
 {
 	BT_DBG("uuid %s", bt_hex(uuid, 16));
diff --git a/subsys/bluetooth/mesh/prov.c b/subsys/bluetooth/mesh/prov.c
index 08e85beb8d..a52e3dae1f 100644
--- a/subsys/bluetooth/mesh/prov.c
+++ b/subsys/bluetooth/mesh/prov.c
@@ -91,31 +91,31 @@ enum {
 
 struct provisioner_link {
 	struct bt_mesh_cdb_node *node;
-	u16_t addr;
-	u16_t net_idx;
-	u8_t  attention_duration;
-	u8_t  uuid[16];
+	uint16_t addr;
+	uint16_t net_idx;
+	uint8_t  attention_duration;
+	uint8_t  uuid[16];
 };
 
 struct prov_link {
 	ATOMIC_DEFINE(flags, NUM_FLAGS);
 	struct provisioner_link provisioner[PROVISIONER_LINK];
 
-	u8_t  dhkey[32];         /* Calculated DHKey */
-	u8_t  expect;            /* Next expected PDU */
+	uint8_t  dhkey[32];         /* Calculated DHKey */
+	uint8_t  expect;            /* Next expected PDU */
 
-	u8_t  oob_method;
-	u8_t  oob_action;
-	u8_t  oob_size;
+	uint8_t  oob_method;
+	uint8_t  oob_action;
+	uint8_t  oob_size;
 
-	u8_t  conf[16];          /* Remote Confirmation */
-	u8_t  rand[16];          /* Local Random */
-	u8_t  auth[16];          /* Authentication Value */
+	uint8_t  conf[16];          /* Remote Confirmation */
+	uint8_t  rand[16];          /* Local Random */
+	uint8_t  auth[16];          /* Authentication Value */
 
-	u8_t  conf_salt[16];     /* ConfirmationSalt */
-	u8_t  conf_key[16];      /* ConfirmationKey */
-	u8_t  conf_inputs[145];  /* ConfirmationInputs */
-	u8_t  prov_salt[16];     /* Provisioning Salt */
+	uint8_t  conf_salt[16];     /* ConfirmationSalt */
+	uint8_t  conf_key[16];      /* ConfirmationKey */
+	uint8_t  conf_inputs[145];  /* ConfirmationInputs */
+	uint8_t  prov_salt[16];     /* Provisioning Salt */
 
 	const struct prov_bearer *bearer;
 };
@@ -128,7 +128,7 @@ static struct prov_link link;
 static const struct bt_mesh_prov *prov;
 
 static void send_pub_key(void);
-static void pub_key_ready(const u8_t *pkey);
+static void pub_key_ready(const uint8_t *pkey);
 static void start_sent(int err, void *cb_data);
 
 static int reset_state(void)
@@ -165,7 +165,7 @@ static inline int prov_send(struct net_buf_simple *buf,
 	return link.bearer->send(buf, cb, NULL);
 }
 
-static void prov_buf_init(struct net_buf_simple *buf, u8_t type)
+static void prov_buf_init(struct net_buf_simple *buf, uint8_t type)
 {
 	net_buf_simple_reserve(buf, PROV_BEARER_BUF_HEADROOM);
 	net_buf_simple_add_u8(buf, type);
@@ -179,7 +179,7 @@ static void prov_link_close(enum prov_bearer_link_status status)
 	link.bearer->link_close(status);
 }
 
-static void prov_send_fail_msg(u8_t err)
+static void prov_send_fail_msg(uint8_t err)
 {
 	PROV_BUF(buf, 2);
 
@@ -195,7 +195,7 @@ static void prov_send_fail_msg(u8_t err)
 	}
 }
 
-static void prov_fail(u8_t reason)
+static void prov_fail(uint8_t reason)
 {
 	/* According to Bluetooth Mesh Specification v1.0.1, Section 5.4.4, the
 	 * provisioner just closes the link when something fails, while the
@@ -209,7 +209,7 @@ static void prov_fail(u8_t reason)
 	}
 }
 
-static void prov_invite(const u8_t *data)
+static void prov_invite(const uint8_t *data)
 {
 	PROV_BUF(buf, 12);
 
@@ -311,9 +311,9 @@ static void start_sent(int err, void *cb_data)
 	}
 }
 
-static void prov_capabilities(const u8_t *data)
+static void prov_capabilities(const uint8_t *data)
 {
-	u16_t algorithms, output_action, input_action;
+	uint16_t algorithms, output_action, input_action;
 
 	if (!IS_ENABLED(CONFIG_BT_MESH_PROVISIONER)) {
 		return;
@@ -357,7 +357,7 @@ static void prov_capabilities(const u8_t *data)
 	send_start();
 }
 
-static bt_mesh_output_action_t output_action(u8_t action)
+static bt_mesh_output_action_t output_action(uint8_t action)
 {
 	switch (action) {
 	case OUTPUT_OOB_BLINK:
@@ -375,7 +375,7 @@ static bt_mesh_output_action_t output_action(u8_t action)
 	}
 }
 
-static bt_mesh_input_action_t input_action(u8_t action)
+static bt_mesh_input_action_t input_action(uint8_t action)
 {
 	switch (action) {
 	case INPUT_OOB_PUSH:
@@ -391,7 +391,7 @@ static bt_mesh_input_action_t input_action(u8_t action)
 	}
 }
 
-static int prov_auth(u8_t method, u8_t action, u8_t size)
+static int prov_auth(uint8_t method, uint8_t action, uint8_t size)
 {
 	bt_mesh_output_action_t output;
 	bt_mesh_input_action_t input;
@@ -433,7 +433,7 @@ static int prov_auth(u8_t method, u8_t action, u8_t size)
 
 		if (output == BT_MESH_DISPLAY_STRING) {
 			unsigned char str[9];
-			u8_t i;
+			uint8_t i;
 
 			bt_rand(str, size);
 
@@ -454,9 +454,9 @@ static int prov_auth(u8_t method, u8_t action, u8_t size)
 
 			return prov->output_string((char *)str);
 		} else {
-			u32_t div[8] = { 10, 100, 1000, 10000, 100000,
+			uint32_t div[8] = { 10, 100, 1000, 10000, 100000,
 					    1000000, 10000000, 100000000 };
-			u32_t num;
+			uint32_t num;
 
 			bt_rand(&num, sizeof(num));
 			num %= div[size - 1];
@@ -494,7 +494,7 @@ static int prov_auth(u8_t method, u8_t action, u8_t size)
 	}
 }
 
-static void prov_start(const u8_t *data)
+static void prov_start(const uint8_t *data)
 {
 	BT_DBG("Algorithm:   0x%02x", data[0]);
 	BT_DBG("Public Key:  0x%02x", data[1]);
@@ -590,7 +590,7 @@ static void send_input_complete(void)
 	link.expect = PROV_CONFIRM;
 }
 
-int bt_mesh_input_number(u32_t num)
+int bt_mesh_input_number(uint32_t num)
 {
 	BT_DBG("%u", num);
 
@@ -623,7 +623,7 @@ int bt_mesh_input_string(const char *str)
 static void send_pub_key(void)
 {
 	PROV_BUF(buf, 65);
-	const u8_t *key;
+	const uint8_t *key;
 
 	key = bt_pub_key_get();
 	if (!key) {
@@ -665,7 +665,7 @@ static void send_pub_key(void)
 	}
 }
 
-static void prov_dh_key_cb(const u8_t dhkey[32])
+static void prov_dh_key_cb(const uint8_t dhkey[32])
 {
 	BT_DBG("%p", dhkey);
 
@@ -688,7 +688,7 @@ static void prov_dh_key_cb(const u8_t dhkey[32])
 
 static void prov_dh_key_gen(void)
 {
-	u8_t remote_pk_le[64], *remote_pk;
+	uint8_t remote_pk_le[64], *remote_pk;
 
 	if (atomic_test_bit(link.flags, PROVISIONER)) {
 		remote_pk = &link.conf_inputs[81];
@@ -709,7 +709,7 @@ static void prov_dh_key_gen(void)
 	}
 }
 
-static void prov_pub_key(const u8_t *data)
+static void prov_pub_key(const uint8_t *data)
 {
 	BT_DBG("Remote Public Key: %s", bt_hex(data, 64));
 
@@ -733,7 +733,7 @@ static void prov_pub_key(const u8_t *data)
 	prov_dh_key_gen();
 }
 
-static void pub_key_ready(const u8_t *pkey)
+static void pub_key_ready(const uint8_t *pkey)
 {
 	if (!pkey) {
 		BT_WARN("Public key not available");
@@ -759,7 +759,7 @@ static void notify_input_complete(void)
 	}
 }
 
-static void prov_input_complete(const u8_t *data)
+static void prov_input_complete(const uint8_t *data)
 {
 	BT_DBG("");
 	notify_input_complete();
@@ -769,8 +769,8 @@ static void send_prov_data(void)
 {
 	PROV_BUF(pdu, 34);
 	struct bt_mesh_cdb_subnet *sub;
-	u8_t session_key[16];
-	u8_t nonce[13];
+	uint8_t session_key[16];
+	uint8_t nonce[13];
 	int err;
 
 	err = bt_mesh_session_key(link.dhkey, link.prov_salt, session_key);
@@ -837,7 +837,7 @@ static void send_prov_data(void)
 	link.expect = PROV_COMPLETE;
 }
 
-static void prov_complete(const u8_t *data)
+static void prov_complete(const uint8_t *data)
 {
 	if (!IS_ENABLED(CONFIG_BT_MESH_PROVISIONER)) {
 		return;
@@ -881,10 +881,10 @@ static void send_random(void)
 	}
 }
 
-static void prov_random(const u8_t *data)
+static void prov_random(const uint8_t *data)
 {
-	u8_t conf_verify[16];
-	const u8_t *prov_rand, *dev_rand;
+	uint8_t conf_verify[16];
+	const uint8_t *prov_rand, *dev_rand;
 
 	BT_DBG("Remote Random: %s", bt_hex(data, 16));
 
@@ -927,7 +927,7 @@ static void prov_random(const u8_t *data)
 	}
 }
 
-static void prov_confirm(const u8_t *data)
+static void prov_confirm(const uint8_t *data)
 {
 	BT_DBG("Remote Confirm: %s", bt_hex(data, 16));
 
@@ -947,17 +947,17 @@ static inline bool is_pb_gatt(void)
 	return link.bearer && link.bearer->type == BT_MESH_PROV_GATT;
 }
 
-static void prov_data(const u8_t *data)
+static void prov_data(const uint8_t *data)
 {
 	PROV_BUF(msg, 1);
-	u8_t session_key[16];
-	u8_t nonce[13];
-	u8_t dev_key[16];
-	u8_t pdu[25];
-	u8_t flags;
-	u32_t iv_index;
-	u16_t addr;
-	u16_t net_idx;
+	uint8_t session_key[16];
+	uint8_t nonce[13];
+	uint8_t dev_key[16];
+	uint8_t pdu[25];
+	uint8_t flags;
+	uint32_t iv_index;
+	uint16_t addr;
+	uint16_t net_idx;
 	int err;
 	bool identity_enable;
 
@@ -1035,15 +1035,15 @@ static void prov_data(const u8_t *data)
 	}
 }
 
-static void prov_failed(const u8_t *data)
+static void prov_failed(const uint8_t *data)
 {
 	BT_WARN("Error: 0x%02x", data[0]);
 	reset_state();
 }
 
 static const struct {
-	void (*func)(const u8_t *data);
-	u16_t len;
+	void (*func)(const uint8_t *data);
+	uint16_t len;
 } prov_handlers[] = {
 	{ prov_invite, 1 },
 	{ prov_capabilities, 11 },
@@ -1060,7 +1060,7 @@ static const struct {
 static void prov_recv(const struct prov_bearer *bearer, void *cb_data,
 		      struct net_buf_simple *buf)
 {
-	u8_t type = buf->data[0];
+	uint8_t type = buf->data[0];
 
 	BT_DBG("type 0x%02x len %u", type, buf->len);
 
@@ -1118,7 +1118,7 @@ static void prov_link_closed(const struct prov_bearer *bearer, void *cb_data,
 }
 
 static void prov_bearer_error(const struct prov_bearer *bearer, void *cb_data,
-			      u8_t err)
+			      uint8_t err)
 {
 	prov_fail(err);
 }
@@ -1131,8 +1131,8 @@ static const struct prov_bearer_cb prov_bearer_cb = {
 };
 
 #if defined(CONFIG_BT_MESH_PB_ADV)
-int bt_mesh_pb_adv_open(const u8_t uuid[16], u16_t net_idx, u16_t addr,
-			u8_t attention_duration)
+int bt_mesh_pb_adv_open(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
+			uint8_t attention_duration)
 {
 	int err;
 
@@ -1238,7 +1238,7 @@ int bt_mesh_prov_disable(bt_mesh_prov_bearer_t bearers)
 	return 0;
 }
 
-void bt_mesh_prov_complete(u16_t net_idx, u16_t addr)
+void bt_mesh_prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	if (prov->complete) {
 		prov->complete(net_idx, addr);
diff --git a/subsys/bluetooth/mesh/prov.h b/subsys/bluetooth/mesh/prov.h
index e8d8d12b46..ccddbf583b 100644
--- a/subsys/bluetooth/mesh/prov.h
+++ b/subsys/bluetooth/mesh/prov.h
@@ -16,8 +16,8 @@
 #define PROV_ERR_UNEXP_ERR     0x07
 #define PROV_ERR_ADDR          0x08
 
-int bt_mesh_pb_adv_open(const u8_t uuid[16], u16_t net_idx, u16_t addr,
-			u8_t attention_duration);
+int bt_mesh_pb_adv_open(const uint8_t uuid[16], uint16_t net_idx, uint16_t addr,
+			uint8_t attention_duration);
 
 void bt_mesh_pb_adv_recv(struct net_buf_simple *buf);
 
@@ -31,6 +31,6 @@ const struct bt_mesh_prov *bt_mesh_prov_get(void);
 
 int bt_mesh_prov_init(const struct bt_mesh_prov *prov);
 
-void bt_mesh_prov_complete(u16_t net_idx, u16_t addr);
-void bt_mesh_prov_node_added(u16_t net_idx, u16_t addr, u8_t num_elem);
+void bt_mesh_prov_complete(uint16_t net_idx, uint16_t addr);
+void bt_mesh_prov_node_added(uint16_t net_idx, uint16_t addr, uint8_t num_elem);
 void bt_mesh_prov_reset(void);
diff --git a/subsys/bluetooth/mesh/prov_bearer.h b/subsys/bluetooth/mesh/prov_bearer.h
index a453320dd4..22fe335123 100644
--- a/subsys/bluetooth/mesh/prov_bearer.h
+++ b/subsys/bluetooth/mesh/prov_bearer.h
@@ -35,7 +35,7 @@ struct prov_bearer_cb {
 			    enum prov_bearer_link_status reason);
 
 	void (*error)(const struct prov_bearer *bearer, void *cb_data,
-		      u8_t err);
+		      uint8_t err);
 
 	void (*recv)(const struct prov_bearer *bearer, void *cb_data,
 		     struct net_buf_simple *buf);
@@ -93,7 +93,7 @@ struct prov_bearer {
 	 *
 	 *  @return Zero on success, or (negative) error code otherwise.
 	 */
-	int (*link_open)(const u8_t uuid[16], k_timeout_t timeout,
+	int (*link_open)(const uint8_t uuid[16], k_timeout_t timeout,
 			 const struct prov_bearer_cb *cb, void *cb_data);
 
 	/** @brief Close the current link.
diff --git a/subsys/bluetooth/mesh/proxy.c b/subsys/bluetooth/mesh/proxy.c
index 0edb503e41..5ba610f06c 100644
--- a/subsys/bluetooth/mesh/proxy.c
+++ b/subsys/bluetooth/mesh/proxy.c
@@ -82,14 +82,14 @@ static bool prov_fast_adv;
 
 static struct bt_mesh_proxy_client {
 	struct bt_conn *conn;
-	u16_t filter[CONFIG_BT_MESH_PROXY_FILTER_SIZE];
+	uint16_t filter[CONFIG_BT_MESH_PROXY_FILTER_SIZE];
 	enum __packed {
 		NONE,
 		WHITELIST,
 		BLACKLIST,
 		PROV,
 	} filter_type;
-	u8_t msg_type;
+	uint8_t msg_type;
 #if defined(CONFIG_BT_MESH_GATT_PROXY)
 	struct k_work send_beacons;
 #endif
@@ -103,7 +103,7 @@ static struct bt_mesh_proxy_client {
 	},
 };
 
-static u8_t __noinit client_buf_data[CLIENT_BUF_SIZE * CONFIG_BT_MAX_CONN];
+static uint8_t __noinit client_buf_data[CLIENT_BUF_SIZE * CONFIG_BT_MAX_CONN];
 
 /* Track which service is enabled */
 static enum {
@@ -142,13 +142,13 @@ static void proxy_sar_timeout(struct k_work *work)
 /* Next subnet in queue to be advertised */
 static int next_idx;
 
-static int proxy_segment_and_send(struct bt_conn *conn, u8_t type,
+static int proxy_segment_and_send(struct bt_conn *conn, uint8_t type,
 				  struct net_buf_simple *msg);
 
 static int filter_set(struct bt_mesh_proxy_client *client,
 		      struct net_buf_simple *buf)
 {
-	u8_t type;
+	uint8_t type;
 
 	if (buf->len < 1) {
 		BT_WARN("Too short Filter Set message");
@@ -175,7 +175,7 @@ static int filter_set(struct bt_mesh_proxy_client *client,
 	return 0;
 }
 
-static void filter_add(struct bt_mesh_proxy_client *client, u16_t addr)
+static void filter_add(struct bt_mesh_proxy_client *client, uint16_t addr)
 {
 	int i;
 
@@ -199,7 +199,7 @@ static void filter_add(struct bt_mesh_proxy_client *client, u16_t addr)
 	}
 }
 
-static void filter_remove(struct bt_mesh_proxy_client *client, u16_t addr)
+static void filter_remove(struct bt_mesh_proxy_client *client, uint16_t addr)
 {
 	int i;
 
@@ -226,7 +226,7 @@ static void send_filter_status(struct bt_mesh_proxy_client *client,
 		.ctx = &rx->ctx,
 		.src = bt_mesh_primary_addr(),
 	};
-	u16_t filter_size;
+	uint16_t filter_size;
 	int i, err;
 
 	/* Configuration messages always have dst unassigned */
@@ -269,7 +269,7 @@ static void proxy_cfg(struct bt_mesh_proxy_client *client)
 {
 	NET_BUF_SIMPLE_DEFINE(buf, 29);
 	struct bt_mesh_net_rx rx;
-	u8_t opcode;
+	uint8_t opcode;
 	int err;
 
 	err = bt_mesh_net_decode(&client->buf, BT_MESH_NET_IF_PROXY_CFG,
@@ -297,7 +297,7 @@ static void proxy_cfg(struct bt_mesh_proxy_client *client)
 		break;
 	case CFG_FILTER_ADD:
 		while (buf.len >= 2) {
-			u16_t addr;
+			uint16_t addr;
 
 			addr = net_buf_simple_pull_be16(&buf);
 			filter_add(client, addr);
@@ -306,7 +306,7 @@ static void proxy_cfg(struct bt_mesh_proxy_client *client)
 		break;
 	case CFG_FILTER_REMOVE:
 		while (buf.len >= 2) {
-			u16_t addr;
+			uint16_t addr;
 
 			addr = net_buf_simple_pull_be16(&buf);
 			filter_remove(client, addr);
@@ -451,10 +451,10 @@ static void proxy_complete_pdu(struct bt_mesh_proxy_client *client)
 
 static ssize_t proxy_recv(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr, const void *buf,
-			  u16_t len, u16_t offset, u8_t flags)
+			  uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct bt_mesh_proxy_client *client = find_client(conn);
-	const u8_t *data = buf;
+	const uint8_t *data = buf;
 
 	if (!client) {
 		return -ENOTCONN;
@@ -535,7 +535,7 @@ static ssize_t proxy_recv(struct bt_conn *conn,
 
 static int conn_count;
 
-static void proxy_connected(struct bt_conn *conn, u8_t err)
+static void proxy_connected(struct bt_conn *conn, uint8_t err)
 {
 	struct bt_mesh_proxy_client *client;
 	int i;
@@ -570,7 +570,7 @@ static void proxy_connected(struct bt_conn *conn, u8_t err)
 	net_buf_simple_reset(&client->buf);
 }
 
-static void proxy_disconnected(struct bt_conn *conn, u8_t reason)
+static void proxy_disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	int i;
 
@@ -607,13 +607,13 @@ struct net_buf_simple *bt_mesh_proxy_get_buf(void)
 }
 
 #if defined(CONFIG_BT_MESH_PB_GATT)
-static void prov_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void prov_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	BT_DBG("value 0x%04x", value);
 }
 
 static ssize_t prov_ccc_write(struct bt_conn *conn,
-			   const struct bt_gatt_attr *attr, u16_t value)
+			   const struct bt_gatt_attr *attr, uint16_t value)
 {
 	struct bt_mesh_proxy_client *client;
 
@@ -726,13 +726,13 @@ int bt_mesh_proxy_prov_disable(bool disconnect)
 #endif /* CONFIG_BT_MESH_PB_GATT */
 
 #if defined(CONFIG_BT_MESH_GATT_PROXY)
-static void proxy_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void proxy_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	BT_DBG("value 0x%04x", value);
 }
 
 static ssize_t proxy_ccc_write(struct bt_conn *conn,
-			       const struct bt_gatt_attr *attr, u16_t value)
+			       const struct bt_gatt_attr *attr, uint16_t value)
 {
 	struct bt_mesh_proxy_client *client;
 
@@ -841,7 +841,7 @@ int bt_mesh_proxy_gatt_disable(void)
 	return 0;
 }
 
-void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, u16_t addr)
+void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, uint16_t addr)
 {
 	struct bt_mesh_proxy_client *client =
 		CONTAINER_OF(buf, struct bt_mesh_proxy_client, buf);
@@ -856,7 +856,7 @@ void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, u16_t addr)
 }
 
 static bool client_filter_match(struct bt_mesh_proxy_client *client,
-				u16_t addr)
+				uint16_t addr)
 {
 	int i;
 
@@ -887,7 +887,7 @@ static bool client_filter_match(struct bt_mesh_proxy_client *client,
 	return false;
 }
 
-bool bt_mesh_proxy_relay(struct net_buf_simple *buf, u16_t dst)
+bool bt_mesh_proxy_relay(struct net_buf_simple *buf, uint16_t dst)
 {
 	bool relayed = false;
 	int i;
@@ -921,7 +921,7 @@ bool bt_mesh_proxy_relay(struct net_buf_simple *buf, u16_t dst)
 
 #endif /* CONFIG_BT_MESH_GATT_PROXY */
 
-static int proxy_send(struct bt_conn *conn, const void *data, u16_t len)
+static int proxy_send(struct bt_conn *conn, const void *data, uint16_t len)
 {
 	BT_DBG("%u bytes: %s", len, bt_hex(data, len));
 
@@ -940,10 +940,10 @@ static int proxy_send(struct bt_conn *conn, const void *data, u16_t len)
 	return 0;
 }
 
-static int proxy_segment_and_send(struct bt_conn *conn, u8_t type,
+static int proxy_segment_and_send(struct bt_conn *conn, uint8_t type,
 				  struct net_buf_simple *msg)
 {
-	u16_t mtu;
+	uint16_t mtu;
 
 	BT_DBG("conn %p type 0x%02x len %u: %s", conn, type, msg->len,
 	       bt_hex(msg->data, msg->len));
@@ -974,7 +974,7 @@ static int proxy_segment_and_send(struct bt_conn *conn, u8_t type,
 	return 0;
 }
 
-int bt_mesh_proxy_send(struct bt_conn *conn, u8_t type,
+int bt_mesh_proxy_send(struct bt_conn *conn, uint8_t type,
 		       struct net_buf_simple *msg)
 {
 	struct bt_mesh_proxy_client *client = find_client(conn);
@@ -993,7 +993,7 @@ int bt_mesh_proxy_send(struct bt_conn *conn, u8_t type,
 }
 
 #if defined(CONFIG_BT_MESH_PB_GATT)
-static u8_t prov_svc_data[20] = { 0x27, 0x18, };
+static uint8_t prov_svc_data[20] = { 0x27, 0x18, };
 
 static const struct bt_data prov_ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
@@ -1012,7 +1012,7 @@ static const struct bt_data prov_ad[] = {
 
 #define NODE_ID_TIMEOUT (CONFIG_BT_MESH_NODE_ID_TIMEOUT * MSEC_PER_SEC)
 
-static u8_t proxy_svc_data[NODE_ID_LEN] = { 0x28, 0x18, };
+static uint8_t proxy_svc_data[NODE_ID_LEN] = { 0x28, 0x18, };
 
 static const struct bt_data node_id_ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
@@ -1028,7 +1028,7 @@ static const struct bt_data net_id_ad[] = {
 
 static int node_id_adv(struct bt_mesh_subnet *sub)
 {
-	u8_t tmp[16];
+	uint8_t tmp[16];
 	int err;
 
 	BT_DBG("");
@@ -1132,7 +1132,7 @@ static int sub_count(void)
 
 static k_timeout_t gatt_proxy_advertise(struct bt_mesh_subnet *sub)
 {
-	s32_t remaining = SYS_FOREVER_MS;
+	int32_t remaining = SYS_FOREVER_MS;
 	int subnet_count;
 
 	BT_DBG("");
@@ -1148,7 +1148,7 @@ static k_timeout_t gatt_proxy_advertise(struct bt_mesh_subnet *sub)
 	}
 
 	if (sub->node_id == BT_MESH_NODE_IDENTITY_RUNNING) {
-		u32_t active = k_uptime_get_32() - sub->node_id_start;
+		uint32_t active = k_uptime_get_32() - sub->node_id_start;
 
 		if (active < NODE_ID_TIMEOUT) {
 			remaining = NODE_ID_TIMEOUT - active;
@@ -1168,7 +1168,7 @@ static k_timeout_t gatt_proxy_advertise(struct bt_mesh_subnet *sub)
 	subnet_count = sub_count();
 	BT_DBG("sub_count %u", subnet_count);
 	if (subnet_count > 1) {
-		s32_t max_timeout;
+		int32_t max_timeout;
 
 		/* We use NODE_ID_TIMEOUT as a starting point since it may
 		 * be less than 60 seconds. Divide this period into at least
diff --git a/subsys/bluetooth/mesh/proxy.h b/subsys/bluetooth/mesh/proxy.h
index 5a5e9232b3..6bc0124123 100644
--- a/subsys/bluetooth/mesh/proxy.h
+++ b/subsys/bluetooth/mesh/proxy.h
@@ -11,7 +11,7 @@
 #define BT_MESH_PROXY_CONFIG    0x02
 #define BT_MESH_PROXY_PROV      0x03
 
-int bt_mesh_proxy_send(struct bt_conn *conn, u8_t type,
+int bt_mesh_proxy_send(struct bt_conn *conn, uint8_t type,
 		       struct net_buf_simple *msg);
 
 int bt_mesh_proxy_prov_enable(void);
@@ -31,7 +31,7 @@ void bt_mesh_proxy_adv_stop(void);
 void bt_mesh_proxy_identity_start(struct bt_mesh_subnet *sub);
 void bt_mesh_proxy_identity_stop(struct bt_mesh_subnet *sub);
 
-bool bt_mesh_proxy_relay(struct net_buf_simple *buf, u16_t dst);
-void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, u16_t addr);
+bool bt_mesh_proxy_relay(struct net_buf_simple *buf, uint16_t dst);
+void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, uint16_t addr);
 
 int bt_mesh_proxy_init(void);
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 637888daaa..9e6e73abd9 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -40,7 +40,7 @@
  * gets deleted its struct becomes invalid and may be reused for other keys.
  */
 struct key_update {
-	u16_t key_idx:12,    /* AppKey or NetKey Index */
+	uint16_t key_idx:12,    /* AppKey or NetKey Index */
 	      valid:1,       /* 1 if this entry is valid, 0 if not */
 	      app_key:1,     /* 1 if this is an AppKey, 0 if a NetKey */
 	      clear:1;       /* 1 if key needs clearing, 0 if storing */
@@ -53,97 +53,97 @@ static struct k_delayed_work pending_store;
 
 /* Mesh network storage information */
 struct net_val {
-	u16_t primary_addr;
-	u8_t  dev_key[16];
+	uint16_t primary_addr;
+	uint8_t  dev_key[16];
 } __packed;
 
 /* Sequence number storage */
 struct seq_val {
-	u8_t val[3];
+	uint8_t val[3];
 } __packed;
 
 /* Heartbeat Publication storage */
 struct hb_pub_val {
-	u16_t dst;
-	u8_t  period;
-	u8_t  ttl;
-	u16_t feat;
-	u16_t net_idx:12,
+	uint16_t dst;
+	uint8_t  period;
+	uint8_t  ttl;
+	uint16_t feat;
+	uint16_t net_idx:12,
 	      indefinite:1;
 };
 
 /* Miscellaneous configuration server model states */
 struct cfg_val {
-	u8_t net_transmit;
-	u8_t relay;
-	u8_t relay_retransmit;
-	u8_t beacon;
-	u8_t gatt_proxy;
-	u8_t frnd;
-	u8_t default_ttl;
+	uint8_t net_transmit;
+	uint8_t relay;
+	uint8_t relay_retransmit;
+	uint8_t beacon;
+	uint8_t gatt_proxy;
+	uint8_t frnd;
+	uint8_t default_ttl;
 };
 
 /* IV Index & IV Update storage */
 struct iv_val {
-	u32_t iv_index;
-	u8_t  iv_update:1,
+	uint32_t iv_index;
+	uint8_t  iv_update:1,
 	      iv_duration:7;
 } __packed;
 
 /* Replay Protection List storage */
 struct rpl_val {
-	u32_t seq:24,
+	uint32_t seq:24,
 	      old_iv:1;
 };
 
 /* NetKey storage information */
 struct net_key_val {
-	u8_t kr_flag:1,
+	uint8_t kr_flag:1,
 	     kr_phase:7;
-	u8_t val[2][16];
+	uint8_t val[2][16];
 } __packed;
 
 /* AppKey storage information */
 struct app_key_val {
-	u16_t net_idx;
+	uint16_t net_idx;
 	bool  updated;
-	u8_t  val[2][16];
+	uint8_t  val[2][16];
 } __packed;
 
 struct mod_pub_val {
-	u16_t addr;
-	u16_t key;
-	u8_t  ttl;
-	u8_t  retransmit;
-	u8_t  period;
-	u8_t  period_div:4,
+	uint16_t addr;
+	uint16_t key;
+	uint8_t  ttl;
+	uint8_t  retransmit;
+	uint8_t  period;
+	uint8_t  period_div:4,
 	      cred:1;
 };
 
 /* Virtual Address information */
 struct va_val {
-	u16_t ref;
-	u16_t addr;
-	u8_t uuid[16];
+	uint16_t ref;
+	uint16_t addr;
+	uint8_t uuid[16];
 } __packed;
 
 struct cdb_net_val {
-	u32_t iv_index;
+	uint32_t iv_index;
 	bool  iv_update;
 } __packed;
 
 /* Node storage information */
 struct node_val {
-	u16_t net_idx;
-	u8_t  num_elem;
-	u8_t  flags;
+	uint16_t net_idx;
+	uint8_t  num_elem;
+	uint8_t  flags;
 #define F_NODE_CONFIGURED 0x01
-	u8_t  uuid[16];
-	u8_t  dev_key[16];
+	uint8_t  uuid[16];
+	uint8_t  dev_key[16];
 } __packed;
 
 struct node_update {
-	u16_t addr;
+	uint16_t addr;
 	bool clear;
 };
 
@@ -280,7 +280,7 @@ static int seq_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 	return 0;
 }
 
-static struct bt_mesh_rpl *rpl_find(u16_t src)
+static struct bt_mesh_rpl *rpl_find(uint16_t src)
 {
 	int i;
 
@@ -293,7 +293,7 @@ static struct bt_mesh_rpl *rpl_find(u16_t src)
 	return NULL;
 }
 
-static struct bt_mesh_rpl *rpl_alloc(u16_t src)
+static struct bt_mesh_rpl *rpl_alloc(uint16_t src)
 {
 	int i;
 
@@ -313,7 +313,7 @@ static int rpl_set(const char *name, size_t len_rd,
 	struct bt_mesh_rpl *entry;
 	struct rpl_val rpl;
 	int err;
-	u16_t src;
+	uint16_t src;
 
 	if (!name) {
 		BT_ERR("Insufficient number of arguments");
@@ -363,7 +363,7 @@ static int net_key_set(const char *name, size_t len_rd,
 	struct bt_mesh_subnet *sub;
 	struct net_key_val key;
 	int i, err;
-	u16_t net_idx;
+	uint16_t net_idx;
 
 	if (!name) {
 		BT_ERR("Insufficient number of arguments");
@@ -430,7 +430,7 @@ static int app_key_set(const char *name, size_t len_rd,
 {
 	struct bt_mesh_app_key *app;
 	struct app_key_val key;
-	u16_t app_idx;
+	uint16_t app_idx;
 	int err;
 
 	if (!name) {
@@ -656,8 +656,8 @@ static int mod_set(bool vnd, const char *name, size_t len_rd,
 		   settings_read_cb read_cb, void *cb_arg)
 {
 	struct bt_mesh_model *mod;
-	u8_t elem_idx, mod_idx;
-	u16_t mod_key;
+	uint8_t elem_idx, mod_idx;
+	uint16_t mod_key;
 	int len;
 	const char *next;
 
@@ -729,7 +729,7 @@ static int va_set(const char *name, size_t len_rd,
 {
 	struct va_val va;
 	struct label *lab;
-	u16_t index;
+	uint16_t index;
 	int err;
 
 	if (!name) {
@@ -806,7 +806,7 @@ static int cdb_node_set(const char *name, size_t len_rd,
 {
 	struct bt_mesh_cdb_node *node;
 	struct node_val val;
-	u16_t addr;
+	uint16_t addr;
 	int err;
 
 	if (!name) {
@@ -862,7 +862,7 @@ static int cdb_subnet_set(const char *name, size_t len_rd,
 {
 	struct bt_mesh_cdb_subnet *sub;
 	struct net_key_val key;
-	u16_t net_idx;
+	uint16_t net_idx;
 	int err;
 
 	if (!name) {
@@ -923,7 +923,7 @@ static int cdb_app_key_set(const char *name, size_t len_rd,
 {
 	struct bt_mesh_cdb_app_key *app;
 	struct app_key_val key;
-	u16_t app_idx;
+	uint16_t app_idx;
 	int err;
 
 	if (!name) {
@@ -1092,7 +1092,7 @@ static void commit_mod(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,
 {
 	if (mod->pub && mod->pub->update &&
 	    mod->pub->addr != BT_MESH_ADDR_UNASSIGNED) {
-		s32_t ms = bt_mesh_model_pub_period_get(mod);
+		int32_t ms = bt_mesh_model_pub_period_get(mod);
 
 		if (ms > 0) {
 			BT_DBG("Starting publish timer (period %u ms)", ms);
@@ -1189,7 +1189,7 @@ SETTINGS_STATIC_HANDLER_DEFINE(bt_mesh, "bt/mesh", NULL, mesh_set, mesh_commit,
 
 static void schedule_store(int flag)
 {
-	s32_t timeout_ms, remaining;
+	int32_t timeout_ms, remaining;
 
 	atomic_set_bit(bt_mesh.flags, flag);
 
@@ -1448,7 +1448,7 @@ static void clear_cfg(void)
 	}
 }
 
-static void clear_app_key(u16_t app_idx)
+static void clear_app_key(uint16_t app_idx)
 {
 	char path[20];
 	int err;
@@ -1462,7 +1462,7 @@ static void clear_app_key(u16_t app_idx)
 	}
 }
 
-static void clear_net_key(u16_t net_idx)
+static void clear_net_key(uint16_t net_idx)
 {
 	char path[20];
 	int err;
@@ -1627,7 +1627,7 @@ static void store_cdb_node(const struct bt_mesh_cdb_node *node)
 	}
 }
 
-static void clear_cdb_node(u16_t addr)
+static void clear_cdb_node(uint16_t addr)
 {
 	char path[30];
 	int err;
@@ -1697,7 +1697,7 @@ static void store_cdb_subnet(const struct bt_mesh_cdb_subnet *sub)
 	}
 }
 
-static void clear_cdb_subnet(u16_t net_idx)
+static void clear_cdb_subnet(uint16_t net_idx)
 {
 	char path[30];
 	int err;
@@ -1734,7 +1734,7 @@ static void store_cdb_app_key(const struct bt_mesh_cdb_app_key *app)
 	}
 }
 
-static void clear_cdb_app_key(u16_t app_idx)
+static void clear_cdb_app_key(uint16_t app_idx)
 {
 	char path[30];
 	int err;
@@ -1793,7 +1793,7 @@ static void store_pending_cdb_keys(void)
 	}
 }
 
-static struct node_update *cdb_node_update_find(u16_t addr,
+static struct node_update *cdb_node_update_find(uint16_t addr,
 					       struct node_update **free_slot)
 {
 	struct node_update *match;
@@ -1821,7 +1821,7 @@ static struct node_update *cdb_node_update_find(u16_t addr,
 static void encode_mod_path(struct bt_mesh_model *mod, bool vnd,
 			    const char *key, char *path, size_t path_len)
 {
-	u16_t mod_key = (((u16_t)mod->elem_idx << 8) | mod->mod_idx);
+	uint16_t mod_key = (((uint16_t)mod->elem_idx << 8) | mod->mod_idx);
 
 	if (vnd) {
 		snprintk(path, path_len, "bt/mesh/v/%x/%s", mod_key, key);
@@ -1832,7 +1832,7 @@ static void encode_mod_path(struct bt_mesh_model *mod, bool vnd,
 
 static void store_pending_mod_bind(struct bt_mesh_model *mod, bool vnd)
 {
-	u16_t keys[CONFIG_BT_MESH_MODEL_KEY_COUNT];
+	uint16_t keys[CONFIG_BT_MESH_MODEL_KEY_COUNT];
 	char path[20];
 	int i, count, err;
 
@@ -1860,7 +1860,7 @@ static void store_pending_mod_bind(struct bt_mesh_model *mod, bool vnd)
 
 static void store_pending_mod_sub(struct bt_mesh_model *mod, bool vnd)
 {
-	u16_t groups[CONFIG_BT_MESH_MODEL_GROUP_COUNT];
+	uint16_t groups[CONFIG_BT_MESH_MODEL_GROUP_COUNT];
 	char path[20];
 	int i, count, err;
 
@@ -1945,7 +1945,7 @@ static void store_pending_va(void)
 	struct label *lab;
 	struct va_val va;
 	char path[18];
-	u16_t i;
+	uint16_t i;
 	int err;
 
 	for (i = 0; (lab = get_label(i)) != NULL; i++) {
@@ -2063,7 +2063,7 @@ void bt_mesh_store_rpl(struct bt_mesh_rpl *entry)
 	schedule_store(BT_MESH_RPL_PENDING);
 }
 
-static struct key_update *key_update_find(bool app_key, u16_t key_idx,
+static struct key_update *key_update_find(bool app_key, uint16_t key_idx,
 					  struct key_update **free_slot)
 {
 	struct key_update *match;
@@ -2302,7 +2302,7 @@ void bt_mesh_clear_cdb_node(struct bt_mesh_cdb_node *node)
 }
 
 /* TODO: Could be shared with key_update_find? */
-static struct key_update *cdb_key_update_find(bool app_key, u16_t key_idx,
+static struct key_update *cdb_key_update_find(bool app_key, uint16_t key_idx,
 					     struct key_update **free_slot)
 {
 	struct key_update *match;
diff --git a/subsys/bluetooth/mesh/shell.c b/subsys/bluetooth/mesh/shell.c
index 26e9871b27..9f2703b76b 100644
--- a/subsys/bluetooth/mesh/shell.c
+++ b/subsys/bluetooth/mesh/shell.c
@@ -33,16 +33,16 @@
 static const struct shell *ctx_shell;
 
 /* Default net, app & dev key values, unless otherwise specified */
-static const u8_t default_key[16] = {
+static const uint8_t default_key[16] = {
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 	0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
 };
 
 static struct {
-	u16_t local;
-	u16_t dst;
-	u16_t net_idx;
-	u16_t app_idx;
+	uint16_t local;
+	uint16_t dst;
+	uint16_t net_idx;
+	uint16_t app_idx;
 } net = {
 	.local = BT_MESH_ADDR_UNASSIGNED,
 	.dst = BT_MESH_ADDR_UNASSIGNED,
@@ -71,12 +71,12 @@ static struct bt_mesh_cfg_srv cfg_srv = {
 
 #define CUR_FAULTS_MAX 4
 
-static u8_t cur_faults[CUR_FAULTS_MAX];
-static u8_t reg_faults[CUR_FAULTS_MAX * 2];
+static uint8_t cur_faults[CUR_FAULTS_MAX];
+static uint8_t reg_faults[CUR_FAULTS_MAX * 2];
 
-static void get_faults(u8_t *faults, u8_t faults_size, u8_t *dst, u8_t *count)
+static void get_faults(uint8_t *faults, uint8_t faults_size, uint8_t *dst, uint8_t *count)
 {
-	u8_t i, limit = *count;
+	uint8_t i, limit = *count;
 
 	for (i = 0U, *count = 0U; i < faults_size && *count < limit; i++) {
 		if (faults[i]) {
@@ -86,8 +86,8 @@ static void get_faults(u8_t *faults, u8_t faults_size, u8_t *dst, u8_t *count)
 	}
 }
 
-static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
-			 u16_t *company_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_cur(struct bt_mesh_model *model, uint8_t *test_id,
+			 uint16_t *company_id, uint8_t *faults, uint8_t *fault_count)
 {
 	shell_print(ctx_shell, "Sending current faults");
 
@@ -99,8 +99,8 @@ static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
 	return 0;
 }
 
-static int fault_get_reg(struct bt_mesh_model *model, u16_t cid,
-			 u8_t *test_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_reg(struct bt_mesh_model *model, uint16_t cid,
+			 uint8_t *test_id, uint8_t *faults, uint8_t *fault_count)
 {
 	if (cid != BT_COMP_ID_LF) {
 		shell_print(ctx_shell, "Faults requested for unknown Company ID"
@@ -158,7 +158,7 @@ BT_MESH_HEALTH_PUB_DEFINE(health_pub, CUR_FAULTS_MAX);
 static struct bt_mesh_cfg_cli cfg_cli = {
 };
 
-void show_faults(u8_t test_id, u16_t cid, u8_t *faults, size_t fault_count)
+void show_faults(uint8_t test_id, uint16_t cid, uint8_t *faults, size_t fault_count)
 {
 	size_t i;
 
@@ -176,8 +176,8 @@ void show_faults(u8_t test_id, u16_t cid, u8_t *faults, size_t fault_count)
 	}
 }
 
-static void health_current_status(struct bt_mesh_health_cli *cli, u16_t addr,
-				  u8_t test_id, u16_t cid, u8_t *faults,
+static void health_current_status(struct bt_mesh_health_cli *cli, uint16_t addr,
+				  uint8_t test_id, uint16_t cid, uint8_t *faults,
 				  size_t fault_count)
 {
 	shell_print(ctx_shell, "Health Current Status from 0x%04x", addr);
@@ -188,7 +188,7 @@ static struct bt_mesh_health_cli health_cli = {
 	.current_status = health_current_status,
 };
 
-static u8_t dev_uuid[16] = { 0xdd, 0xdd };
+static uint8_t dev_uuid[16] = { 0xdd, 0xdd };
 
 static struct bt_mesh_model root_models[] = {
 	BT_MESH_MODEL_CFG_SRV(&cfg_srv),
@@ -207,7 +207,7 @@ static const struct bt_mesh_comp comp = {
 	.elem_count = ARRAY_SIZE(elements),
 };
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 
 	shell_print(ctx_shell, "Local node provisioned, net_idx 0x%04x address "
@@ -218,8 +218,8 @@ static void prov_complete(u16_t net_idx, u16_t addr)
 	net.dst = addr;
 }
 
-static void prov_node_added(u16_t net_idx, u8_t uuid[16], u16_t addr,
-			    u8_t num_elem)
+static void prov_node_added(uint16_t net_idx, uint8_t uuid[16], uint16_t addr,
+			    uint8_t num_elem)
 {
 	shell_print(ctx_shell, "Node provisioned, net_idx 0x%04x address "
 		    "0x%04x elements %d", net_idx, addr, num_elem);
@@ -239,7 +239,7 @@ static void prov_reset(void)
 		    "reprovisioning");
 }
 
-static int output_number(bt_mesh_output_action_t action, u32_t number)
+static int output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	shell_print(ctx_shell, "OOB Number: %u", number);
 	return 0;
@@ -252,7 +252,7 @@ static int output_string(const char *str)
 }
 
 static bt_mesh_input_action_t input_act;
-static u8_t input_size;
+static uint8_t input_size;
 
 static int cmd_input_num(const struct shell *shell, size_t argc, char *argv[])
 {
@@ -312,7 +312,7 @@ static int cmd_input_str(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static int input(bt_mesh_input_action_t act, u8_t size)
+static int input(bt_mesh_input_action_t act, uint8_t size)
 {
 	switch (act) {
 	case BT_MESH_ENTER_NUMBER:
@@ -358,7 +358,7 @@ static void link_close(bt_mesh_prov_bearer_t bearer)
 		    bearer2str(bearer));
 }
 
-static u8_t static_val[16];
+static uint8_t static_val[16];
 
 static struct bt_mesh_prov prov = {
 	.uuid = dev_uuid,
@@ -406,7 +406,7 @@ static int cmd_static_oob(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_uuid(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t uuid[16];
+	uint8_t uuid[16];
 	size_t len;
 
 	if (argc < 2) {
@@ -433,7 +433,7 @@ static int cmd_reset(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static u8_t str2u8(const char *str)
+static uint8_t str2u8(const char *str)
 {
 	if (isdigit((unsigned char)str[0])) {
 		return strtoul(str, NULL, 0);
@@ -499,7 +499,7 @@ static int cmd_poll(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static void lpn_cb(u16_t friend_addr, bool established)
+static void lpn_cb(uint16_t friend_addr, bool established)
 {
 	if (established) {
 		shell_print(ctx_shell, "Friendship (as LPN) established to "
@@ -569,7 +569,7 @@ static int cmd_ident(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_get_comp(const struct shell *shell, size_t argc, char *argv[])
 {
 	NET_BUF_SIMPLE_DEFINE(comp, 32);
-	u8_t status, page = 0x00;
+	uint8_t status, page = 0x00;
 	int err;
 
 	if (argc > 1) {
@@ -601,8 +601,8 @@ static int cmd_get_comp(const struct shell *shell, size_t argc, char *argv[])
 		    net_buf_simple_pull_le16(&comp));
 
 	while (comp.len > 4) {
-		u8_t sig, vnd;
-		u16_t loc;
+		uint8_t sig, vnd;
+		uint16_t loc;
 		int i;
 
 		loc = net_buf_simple_pull_le16(&comp);
@@ -623,7 +623,7 @@ static int cmd_get_comp(const struct shell *shell, size_t argc, char *argv[])
 		}
 
 		for (i = 0; i < sig; i++) {
-			u16_t mod_id = net_buf_simple_pull_le16(&comp);
+			uint16_t mod_id = net_buf_simple_pull_le16(&comp);
 
 			shell_print(shell, "\t\t\t0x%04x", mod_id);
 		}
@@ -635,8 +635,8 @@ static int cmd_get_comp(const struct shell *shell, size_t argc, char *argv[])
 		}
 
 		for (i = 0; i < vnd; i++) {
-			u16_t cid = net_buf_simple_pull_le16(&comp);
-			u16_t mod_id = net_buf_simple_pull_le16(&comp);
+			uint16_t cid = net_buf_simple_pull_le16(&comp);
+			uint16_t mod_id = net_buf_simple_pull_le16(&comp);
 
 			shell_print(shell, "\t\t\tCompany 0x%04x: 0x%04x", cid,
 				    mod_id);
@@ -775,13 +775,13 @@ static int cmd_rpl_clear(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_beacon(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	if (argc < 2) {
 		err = bt_mesh_cfg_beacon_get(net.net_idx, net.dst, &status);
 	} else {
-		u8_t val = str2u8(argv[1]);
+		uint8_t val = str2u8(argv[1]);
 
 		err = bt_mesh_cfg_beacon_set(net.net_idx, net.dst, val,
 					     &status);
@@ -798,9 +798,9 @@ static int cmd_beacon(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static void print_unprovisioned_beacon(u8_t uuid[16],
+static void print_unprovisioned_beacon(uint8_t uuid[16],
 				       bt_mesh_prov_oob_info_t oob_info,
-				       u32_t *uri_hash)
+				       uint32_t *uri_hash)
 {
 	char uuid_hex_str[32 + 1];
 
@@ -814,7 +814,7 @@ static void print_unprovisioned_beacon(u8_t uuid[16],
 static int cmd_beacon_listen(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
-	u8_t val = str2u8(argv[1]);
+	uint8_t val = str2u8(argv[1]);
 
 	if (val) {
 		prov.unprovisioned_beacon = print_unprovisioned_beacon;
@@ -827,13 +827,13 @@ static int cmd_beacon_listen(const struct shell *shell, size_t argc,
 
 static int cmd_ttl(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t ttl;
+	uint8_t ttl;
 	int err;
 
 	if (argc < 2) {
 		err = bt_mesh_cfg_ttl_get(net.net_idx, net.dst, &ttl);
 	} else {
-		u8_t val = strtoul(argv[1], NULL, 0);
+		uint8_t val = strtoul(argv[1], NULL, 0);
 
 		err = bt_mesh_cfg_ttl_set(net.net_idx, net.dst, val, &ttl);
 	}
@@ -851,13 +851,13 @@ static int cmd_ttl(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_friend(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t frnd;
+	uint8_t frnd;
 	int err;
 
 	if (argc < 2) {
 		err = bt_mesh_cfg_friend_get(net.net_idx, net.dst, &frnd);
 	} else {
-		u8_t val = str2u8(argv[1]);
+		uint8_t val = str2u8(argv[1]);
 
 		err = bt_mesh_cfg_friend_set(net.net_idx, net.dst, val, &frnd);
 	}
@@ -875,13 +875,13 @@ static int cmd_friend(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_gatt_proxy(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t proxy;
+	uint8_t proxy;
 	int err;
 
 	if (argc < 2) {
 		err = bt_mesh_cfg_gatt_proxy_get(net.net_idx, net.dst, &proxy);
 	} else {
-		u8_t val = str2u8(argv[1]);
+		uint8_t val = str2u8(argv[1]);
 
 		err = bt_mesh_cfg_gatt_proxy_set(net.net_idx, net.dst, val,
 						 &proxy);
@@ -900,15 +900,15 @@ static int cmd_gatt_proxy(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_relay(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t relay, transmit;
+	uint8_t relay, transmit;
 	int err;
 
 	if (argc < 2) {
 		err = bt_mesh_cfg_relay_get(net.net_idx, net.dst, &relay,
 					    &transmit);
 	} else {
-		u8_t val = str2u8(argv[1]);
-		u8_t count, interval, new_transmit;
+		uint8_t val = str2u8(argv[1]);
+		uint8_t count, interval, new_transmit;
 
 		if (val) {
 			if (argc > 2) {
@@ -948,9 +948,9 @@ static int cmd_relay(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_net_key_add(const struct shell *shell, size_t argc, char *argv[])
 {
 	bool has_key_val = (argc > 2);
-	u8_t key_val[16];
-	u16_t key_net_idx;
-	u8_t status;
+	uint8_t key_val[16];
+	uint16_t key_net_idx;
+	uint8_t status;
 	int err;
 
 	if (argc < 2) {
@@ -1015,7 +1015,7 @@ static int cmd_net_key_add(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_net_key_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t keys[16];
+	uint16_t keys[16];
 	size_t cnt;
 	int err, i;
 
@@ -1037,10 +1037,10 @@ static int cmd_net_key_get(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_app_key_add(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t key_val[16];
-	u16_t key_net_idx, key_app_idx;
+	uint8_t key_val[16];
+	uint16_t key_net_idx, key_app_idx;
 	bool has_key_val = (argc > 3);
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	if (argc < 3) {
@@ -1108,10 +1108,10 @@ static int cmd_app_key_add(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_app_key_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t net_idx;
-	u16_t keys[16];
+	uint16_t net_idx;
+	uint16_t keys[16];
 	size_t cnt;
-	u8_t status;
+	uint8_t status;
 	int err, i;
 
 	net_idx = strtoul(argv[1], NULL, 0);
@@ -1143,8 +1143,8 @@ static int cmd_app_key_get(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_mod_app_bind(const struct shell *shell, size_t argc,
 			    char *argv[])
 {
-	u16_t elem_addr, mod_app_idx, mod_id, cid;
-	u8_t status;
+	uint16_t elem_addr, mod_app_idx, mod_id, cid;
+	uint8_t status;
 	int err;
 
 	if (argc < 4) {
@@ -1184,9 +1184,9 @@ static int cmd_mod_app_bind(const struct shell *shell, size_t argc,
 static int cmd_mod_app_get(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
-	u16_t elem_addr, mod_id, cid;
-	u16_t apps[16];
-	u8_t status;
+	uint16_t elem_addr, mod_id, cid;
+	uint16_t apps[16];
+	uint8_t status;
 	size_t cnt;
 	int err, i;
 
@@ -1233,8 +1233,8 @@ static int cmd_mod_app_get(const struct shell *shell, size_t argc,
 
 static int cmd_mod_sub_add(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t elem_addr, sub_addr, mod_id, cid;
-	u8_t status;
+	uint16_t elem_addr, sub_addr, mod_id, cid;
+	uint8_t status;
 	int err;
 
 	if (argc < 4) {
@@ -1273,8 +1273,8 @@ static int cmd_mod_sub_add(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_mod_sub_del(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t elem_addr, sub_addr, mod_id, cid;
-	u8_t status;
+	uint16_t elem_addr, sub_addr, mod_id, cid;
+	uint8_t status;
 	int err;
 
 	if (argc < 4) {
@@ -1314,9 +1314,9 @@ static int cmd_mod_sub_del(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_mod_sub_add_va(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
-	u16_t elem_addr, sub_addr, mod_id, cid;
-	u8_t label[16];
-	u8_t status;
+	uint16_t elem_addr, sub_addr, mod_id, cid;
+	uint8_t label[16];
+	uint8_t status;
 	size_t len;
 	int err;
 
@@ -1362,9 +1362,9 @@ static int cmd_mod_sub_add_va(const struct shell *shell, size_t argc,
 static int cmd_mod_sub_del_va(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
-	u16_t elem_addr, sub_addr, mod_id, cid;
-	u8_t label[16];
-	u8_t status;
+	uint16_t elem_addr, sub_addr, mod_id, cid;
+	uint8_t label[16];
+	uint8_t status;
 	size_t len;
 	int err;
 
@@ -1410,9 +1410,9 @@ static int cmd_mod_sub_del_va(const struct shell *shell, size_t argc,
 static int cmd_mod_sub_get(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
-	u16_t elem_addr, mod_id, cid;
-	u16_t subs[16];
-	u8_t status;
+	uint16_t elem_addr, mod_id, cid;
+	uint16_t subs[16];
+	uint8_t status;
 	size_t cnt;
 	int err, i;
 
@@ -1458,11 +1458,11 @@ static int cmd_mod_sub_get(const struct shell *shell, size_t argc,
 	return 0;
 }
 
-static int mod_pub_get(const struct shell *shell, u16_t addr, u16_t mod_id,
-		       u16_t cid)
+static int mod_pub_get(const struct shell *shell, uint16_t addr, uint16_t mod_id,
+		       uint16_t cid)
 {
 	struct bt_mesh_cfg_mod_pub pub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	if (cid == CID_NVAL) {
@@ -1500,12 +1500,12 @@ static int mod_pub_get(const struct shell *shell, u16_t addr, u16_t mod_id,
 	return 0;
 }
 
-static int mod_pub_set(const struct shell *shell, u16_t addr, u16_t mod_id,
-		       u16_t cid, char *argv[])
+static int mod_pub_set(const struct shell *shell, uint16_t addr, uint16_t mod_id,
+		       uint16_t cid, char *argv[])
 {
 	struct bt_mesh_cfg_mod_pub pub;
-	u8_t status, count;
-	u16_t interval;
+	uint8_t status, count;
+	uint16_t interval;
 	int err;
 
 	pub.addr = strtoul(argv[0], NULL, 0);
@@ -1554,7 +1554,7 @@ static int mod_pub_set(const struct shell *shell, u16_t addr, u16_t mod_id,
 
 static int cmd_mod_pub(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t addr, mod_id, cid;
+	uint16_t addr, mod_id, cid;
 
 	if (argc < 3) {
 		return -EINVAL;
@@ -1602,7 +1602,7 @@ static void hb_sub_print(const struct shell *shell,
 static int hb_sub_get(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_mesh_cfg_hb_sub sub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	err = bt_mesh_cfg_hb_sub_get(net.net_idx, net.dst, &sub, &status);
@@ -1625,7 +1625,7 @@ static int hb_sub_get(const struct shell *shell, size_t argc, char *argv[])
 static int hb_sub_set(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_mesh_cfg_hb_sub sub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	sub.src = strtoul(argv[1], NULL, 0);
@@ -1665,7 +1665,7 @@ static int cmd_hb_sub(const struct shell *shell, size_t argc, char *argv[])
 static int hb_pub_get(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_mesh_cfg_hb_pub pub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	err = bt_mesh_cfg_hb_pub_get(net.net_idx, net.dst, &pub, &status);
@@ -1693,7 +1693,7 @@ static int hb_pub_get(const struct shell *shell, size_t argc, char *argv[])
 static int hb_pub_set(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_mesh_cfg_hb_pub pub;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	pub.dst = strtoul(argv[1], NULL, 0);
@@ -1775,10 +1775,10 @@ static int cmd_pb_adv(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_provision_adv(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
-	u8_t uuid[16];
-	u8_t attention_duration;
-	u16_t net_idx;
-	u16_t addr;
+	uint8_t uuid[16];
+	uint8_t attention_duration;
+	uint16_t net_idx;
+	uint16_t addr;
 	size_t len;
 	int err;
 
@@ -1809,9 +1809,9 @@ static int cmd_pb_gatt(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_provision(const struct shell *shell, size_t argc, char *argv[])
 {
-	const u8_t *net_key = default_key;
-	u16_t net_idx, addr;
-	u32_t iv_index;
+	const uint8_t *net_key = default_key;
+	uint16_t net_idx, addr;
+	uint32_t iv_index;
 	int err;
 
 	if (argc < 3) {
@@ -1851,10 +1851,10 @@ static int cmd_provision(const struct shell *shell, size_t argc, char *argv[])
 
 int cmd_timeout(const struct shell *shell, size_t argc, char *argv[])
 {
-	s32_t timeout_ms;
+	int32_t timeout_ms;
 
 	if (argc == 2) {
-		s32_t timeout_s;
+		int32_t timeout_s;
 
 		timeout_s = strtol(argv[1], NULL, 0);
 		if (timeout_s < 0 || timeout_s > (INT32_MAX / 1000)) {
@@ -1879,10 +1879,10 @@ int cmd_timeout(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_fault_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t faults[32];
+	uint8_t faults[32];
 	size_t fault_count;
-	u8_t test_id;
-	u16_t cid;
+	uint8_t test_id;
+	uint16_t cid;
 	int err;
 
 	cid = strtoul(argv[1], NULL, 0);
@@ -1903,10 +1903,10 @@ static int cmd_fault_get(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_fault_clear(const struct shell *shell, size_t argc,
 			   char *argv[])
 {
-	u8_t faults[32];
+	uint8_t faults[32];
 	size_t fault_count;
-	u8_t test_id;
-	u16_t cid;
+	uint8_t test_id;
+	uint16_t cid;
 	int err;
 
 	if (argc < 2) {
@@ -1931,7 +1931,7 @@ static int cmd_fault_clear(const struct shell *shell, size_t argc,
 static int cmd_fault_clear_unack(const struct shell *shell, size_t argc,
 				 char *argv[])
 {
-	u16_t cid;
+	uint16_t cid;
 	int err;
 
 	if (argc < 2) {
@@ -1952,10 +1952,10 @@ static int cmd_fault_clear_unack(const struct shell *shell, size_t argc,
 
 static int cmd_fault_test(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t faults[32];
+	uint8_t faults[32];
 	size_t fault_count;
-	u8_t test_id;
-	u16_t cid;
+	uint8_t test_id;
+	uint16_t cid;
 	int err;
 
 	if (argc < 3) {
@@ -1981,8 +1981,8 @@ static int cmd_fault_test(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_fault_test_unack(const struct shell *shell, size_t argc,
 				char *argv[])
 {
-	u16_t cid;
-	u8_t test_id;
+	uint16_t cid;
+	uint8_t test_id;
 	int err;
 
 	if (argc < 3) {
@@ -2004,7 +2004,7 @@ static int cmd_fault_test_unack(const struct shell *shell, size_t argc,
 
 static int cmd_period_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t divisor;
+	uint8_t divisor;
 	int err;
 
 	err = bt_mesh_health_period_get(net.dst, net.app_idx, &divisor);
@@ -2020,7 +2020,7 @@ static int cmd_period_get(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_period_set(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t divisor, updated_divisor;
+	uint8_t divisor, updated_divisor;
 	int err;
 
 	if (argc < 2) {
@@ -2045,7 +2045,7 @@ static int cmd_period_set(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_period_set_unack(const struct shell *shell, size_t argc,
 				char *argv[])
 {
-	u8_t divisor;
+	uint8_t divisor;
 	int err;
 
 	if (argc < 2) {
@@ -2066,7 +2066,7 @@ static int cmd_period_set_unack(const struct shell *shell, size_t argc,
 static int cmd_attention_get(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
-	u8_t attention;
+	uint8_t attention;
 	int err;
 
 	err = bt_mesh_health_attention_get(net.dst, net.app_idx,
@@ -2084,7 +2084,7 @@ static int cmd_attention_get(const struct shell *shell, size_t argc,
 static int cmd_attention_set(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
-	u8_t attention, updated_attention;
+	uint8_t attention, updated_attention;
 	int err;
 
 	if (argc < 2) {
@@ -2109,7 +2109,7 @@ static int cmd_attention_set(const struct shell *shell, size_t argc,
 static int cmd_attention_set_unack(const struct shell *shell, size_t argc,
 				   char *argv[])
 {
-	u8_t attention;
+	uint8_t attention;
 	int err;
 
 	if (argc < 2) {
@@ -2130,8 +2130,8 @@ static int cmd_attention_set_unack(const struct shell *shell, size_t argc,
 
 static int cmd_add_fault(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t fault_id;
-	u8_t i;
+	uint8_t fault_id;
+	uint8_t i;
 
 	if (argc < 2) {
 		return -EINVAL;
@@ -2174,8 +2174,8 @@ static int cmd_add_fault(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_del_fault(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t fault_id;
-	u8_t i;
+	uint8_t fault_id;
+	uint8_t i;
 
 	if (argc < 2) {
 		(void)memset(cur_faults, 0, sizeof(cur_faults));
@@ -2206,7 +2206,7 @@ static int cmd_del_fault(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_cdb_create(const struct shell *shell, size_t argc,
 			  char *argv[])
 {
-	u8_t net_key[16];
+	uint8_t net_key[16];
 	size_t len;
 	int err;
 
@@ -2337,9 +2337,9 @@ static int cmd_cdb_node_add(const struct shell *shell, size_t argc,
 			    char *argv[])
 {
 	struct bt_mesh_cdb_node *node;
-	u8_t uuid[16], dev_key[16];
-	u16_t addr, net_idx;
-	u8_t num_elem;
+	uint8_t uuid[16], dev_key[16];
+	uint16_t addr, net_idx;
+	uint8_t num_elem;
 	size_t len;
 
 	len = hex2bin(argv[1], strlen(argv[1]), uuid, sizeof(uuid));
@@ -2378,7 +2378,7 @@ static int cmd_cdb_node_del(const struct shell *shell, size_t argc,
 			    char *argv[])
 {
 	struct bt_mesh_cdb_node *node;
-	u16_t addr;
+	uint16_t addr;
 
 	addr = strtoul(argv[1], NULL, 0);
 
@@ -2399,8 +2399,8 @@ static int cmd_cdb_subnet_add(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
 	struct bt_mesh_cdb_subnet *sub;
-	u8_t net_key[16];
-	u16_t net_idx;
+	uint8_t net_key[16];
+	uint16_t net_idx;
 	size_t len;
 
 	net_idx = strtoul(argv[1], NULL, 0);
@@ -2434,7 +2434,7 @@ static int cmd_cdb_subnet_del(const struct shell *shell, size_t argc,
 			     char *argv[])
 {
 	struct bt_mesh_cdb_subnet *sub;
-	u16_t net_idx;
+	uint16_t net_idx;
 
 	net_idx = strtoul(argv[1], NULL, 0);
 
@@ -2455,8 +2455,8 @@ static int cmd_cdb_app_key_add(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
 	struct bt_mesh_cdb_app_key *key;
-	u16_t net_idx, app_idx;
-	u8_t app_key[16];
+	uint16_t net_idx, app_idx;
+	uint8_t app_key[16];
 	size_t len;
 
 	net_idx = strtoul(argv[1], NULL, 0);
@@ -2491,7 +2491,7 @@ static int cmd_cdb_app_key_del(const struct shell *shell, size_t argc,
 			      char *argv[])
 {
 	struct bt_mesh_cdb_app_key *key;
-	u16_t app_idx;
+	uint16_t app_idx;
 
 	app_idx = strtoul(argv[1], NULL, 0);
 
diff --git a/subsys/bluetooth/mesh/transport.c b/subsys/bluetooth/mesh/transport.c
index 9113b78441..5fad6e4176 100644
--- a/subsys/bluetooth/mesh/transport.c
+++ b/subsys/bluetooth/mesh/transport.c
@@ -35,7 +35,7 @@
 #include "settings.h"
 #include "transport.h"
 
-#define AID_MASK                    ((u8_t)(BIT_MASK(6)))
+#define AID_MASK                    ((uint8_t)(BIT_MASK(6)))
 
 #define SEG(data)                   ((data)[0] >> 7)
 #define AKF(data)                   (((data)[0] >> 6) & 0x01)
@@ -47,9 +47,9 @@
 #define UNSEG_HDR(akf, aid)         ((akf << 6) | (aid & AID_MASK))
 #define SEG_HDR(akf, aid)           (UNSEG_HDR(akf, aid) | 0x80)
 
-#define BLOCK_COMPLETE(seg_n)       (u32_t)(((u64_t)1 << (seg_n + 1)) - 1)
+#define BLOCK_COMPLETE(seg_n)       (uint32_t)(((uint64_t)1 << (seg_n + 1)) - 1)
 
-#define SEQ_AUTH(iv_index, seq)     (((u64_t)iv_index) << 24 | (u64_t)seq)
+#define SEQ_AUTH(iv_index, seq)     (((uint64_t)iv_index) << 24 | (uint64_t)seq)
 
 /* Number of retransmit attempts (after the initial transmit) per segment */
 #define SEG_RETRANSMIT_ATTEMPTS     4
@@ -75,22 +75,22 @@
 static struct seg_tx {
 	struct bt_mesh_subnet   *sub;
 	void                    *seg[CONFIG_BT_MESH_TX_SEG_MAX];
-	u64_t                    seq_auth;
-	u16_t                    src;
-	u16_t                    dst;
-	u16_t                    len;
-	u8_t                     hdr;
-	u8_t                     xmit;
-	u8_t                     seg_n:5,       /* Last segment index */
+	uint64_t                    seq_auth;
+	uint16_t                    src;
+	uint16_t                    dst;
+	uint16_t                    len;
+	uint8_t                     hdr;
+	uint8_t                     xmit;
+	uint8_t                     seg_n:5,       /* Last segment index */
 				 ctl:1,
 				 aszmic:1,
 				 friend_cred:1;
-	u8_t                     seg_o;         /* Segment being sent. */
-	u8_t                     nack_count;    /* Number of unacked segs */
-	u8_t                     ttl;
-	u8_t                     seg_pending;   /* Number of segments pending */
-	u8_t			 attempts;      /* Transmit attempts */
-	u8_t			 started:1,     /* Start cb called */
+	uint8_t                     seg_o;         /* Segment being sent. */
+	uint8_t                     nack_count;    /* Number of unacked segs */
+	uint8_t                     ttl;
+	uint8_t                     seg_pending;   /* Number of segments pending */
+	uint8_t			 attempts;      /* Transmit attempts */
+	uint8_t			 started:1,     /* Start cb called */
 				 sending:1,     /* Sending is in progress */
 				 blocked:1;     /* Blocked by ongoing tx */
 	const struct bt_mesh_send_cb *cb;
@@ -101,33 +101,33 @@ static struct seg_tx {
 static struct seg_rx {
 	struct bt_mesh_subnet   *sub;
 	void                    *seg[CONFIG_BT_MESH_RX_SEG_MAX];
-	u64_t                    seq_auth;
-	u16_t                    src;
-	u16_t                    dst;
-	u16_t                    len;
-	u8_t                     hdr;
-	u8_t                     seg_n:5,
+	uint64_t                    seq_auth;
+	uint16_t                    src;
+	uint16_t                    dst;
+	uint16_t                    len;
+	uint8_t                     hdr;
+	uint8_t                     seg_n:5,
 				 ctl:1,
 				 in_use:1,
 				 obo:1;
-	u8_t                     ttl;
-	u32_t                    block;
-	u32_t                    last;
+	uint8_t                     ttl;
+	uint32_t                    block;
+	uint32_t                    last;
 	struct k_delayed_work    ack;
 } seg_rx[CONFIG_BT_MESH_RX_SEG_MSG_COUNT];
 
 K_MEM_SLAB_DEFINE(segs, BT_MESH_APP_SEG_SDU_MAX, CONFIG_BT_MESH_SEG_BUFS, 4);
 
-static u16_t hb_sub_dst = BT_MESH_ADDR_UNASSIGNED;
+static uint16_t hb_sub_dst = BT_MESH_ADDR_UNASSIGNED;
 
-void bt_mesh_set_hb_sub_dst(u16_t addr)
+void bt_mesh_set_hb_sub_dst(uint16_t addr)
 {
 	hb_sub_dst = addr;
 }
 
 static int send_unseg(struct bt_mesh_net_tx *tx, struct net_buf_simple *sdu,
 		      const struct bt_mesh_send_cb *cb, void *cb_data,
-		      const u8_t *ctl_op)
+		      const uint8_t *ctl_op)
 {
 	struct net_buf *buf;
 
@@ -179,7 +179,7 @@ send:
 	return bt_mesh_net_send(tx, buf, cb, cb_data);
 }
 
-static inline u8_t seg_len(bool ctl)
+static inline uint8_t seg_len(bool ctl)
 {
 	if (ctl) {
 		return BT_MESH_CTL_SEG_SDU_MAX;
@@ -201,14 +201,14 @@ bool bt_mesh_tx_in_progress(void)
 	return false;
 }
 
-static void seg_tx_done(struct seg_tx *tx, u8_t seg_idx)
+static void seg_tx_done(struct seg_tx *tx, uint8_t seg_idx)
 {
 	k_mem_slab_free(&segs, (void **)&tx->seg[seg_idx]);
 	tx->seg[seg_idx] = NULL;
 	tx->nack_count--;
 }
 
-static bool seg_tx_blocks(struct seg_tx *tx, u16_t src, u16_t dst)
+static bool seg_tx_blocks(struct seg_tx *tx, uint16_t src, uint16_t dst)
 {
 	return (tx->src == src) && (tx->dst == dst);
 }
@@ -230,7 +230,7 @@ static void seg_tx_unblock_check(struct seg_tx *tx)
 
 	if (blocked) {
 		BT_DBG("Unblocked 0x%04x",
-		       (u16_t)(blocked->seq_auth & TRANS_SEQ_ZERO_MASK));
+		       (uint16_t)(blocked->seq_auth & TRANS_SEQ_ZERO_MASK));
 		blocked->blocked = false;
 		k_delayed_work_submit(&blocked->retransmit, K_NO_WAIT);
 	}
@@ -321,7 +321,7 @@ static void schedule_retransmit(struct seg_tx *tx)
 				      K_NO_WAIT);
 }
 
-static void seg_send_start(u16_t duration, int err, void *user_data)
+static void seg_send_start(uint16_t duration, int err, void *user_data)
 {
 	struct seg_tx *tx = user_data;
 
@@ -351,11 +351,11 @@ static const struct bt_mesh_send_cb seg_sent_cb = {
 	.end = seg_sent,
 };
 
-static void seg_tx_buf_build(struct seg_tx *tx, u8_t seg_o,
+static void seg_tx_buf_build(struct seg_tx *tx, uint8_t seg_o,
 			     struct net_buf_simple *buf)
 {
-	u16_t seq_zero = tx->seq_auth & TRANS_SEQ_ZERO_MASK;
-	u8_t len = MIN(seg_len(tx->ctl), tx->len - (seg_len(tx->ctl) * seg_o));
+	uint16_t seq_zero = tx->seq_auth & TRANS_SEQ_ZERO_MASK;
+	uint8_t len = MIN(seg_len(tx->ctl), tx->len - (seg_len(tx->ctl) * seg_o));
 
 	net_buf_simple_add_u8(buf, tx->hdr);
 	net_buf_simple_add_u8(buf, (tx->aszmic << 7) | seq_zero >> 6);
@@ -390,7 +390,7 @@ static void seg_tx_send_unacked(struct seg_tx *tx)
 	}
 
 	BT_DBG("SeqZero: 0x%04x Attempts: %u",
-	       (u16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK), tx->attempts);
+	       (uint16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK), tx->attempts);
 
 	tx->sending = 1U;
 
@@ -445,11 +445,11 @@ static void seg_retransmit(struct k_work *work)
 
 static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
 		    const struct bt_mesh_send_cb *cb, void *cb_data,
-		    u8_t *ctl_op)
+		    uint8_t *ctl_op)
 {
 	bool blocked = false;
 	struct seg_tx *tx;
-	u8_t seg_o;
+	uint8_t seg_o;
 	int i;
 
 	BT_DBG("src 0x%04x dst 0x%04x app_idx 0x%04x aszmic %u sdu_len %u",
@@ -504,7 +504,7 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
 	}
 
 	BT_DBG("SeqZero 0x%04x (segs: %u)",
-	       (u16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK), tx->nack_count);
+	       (uint16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK), tx->nack_count);
 
 	if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) &&
 	    !bt_mesh_friend_queue_has_space(tx->sub->net_idx, net_tx->src,
@@ -519,7 +519,7 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
 
 	for (seg_o = 0U; sdu->len; seg_o++) {
 		void *buf;
-		u16_t len;
+		uint16_t len;
 		int err;
 
 		err = k_mem_slab_alloc(&segs, &buf, BUF_TIMEOUT);
@@ -593,7 +593,7 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
 	return 0;
 }
 
-struct bt_mesh_app_key *bt_mesh_app_key_find(u16_t app_idx)
+struct bt_mesh_app_key *bt_mesh_app_key_find(uint16_t app_idx)
 {
 	int i;
 
@@ -612,9 +612,9 @@ struct bt_mesh_app_key *bt_mesh_app_key_find(u16_t app_idx)
 int bt_mesh_trans_send(struct bt_mesh_net_tx *tx, struct net_buf_simple *msg,
 		       const struct bt_mesh_send_cb *cb, void *cb_data)
 {
-	const u8_t *key;
-	u8_t *ad;
-	u8_t aid;
+	const uint8_t *key;
+	uint8_t *ad;
+	uint8_t aid;
 	int err;
 
 	if (msg->len < 1) {
@@ -746,7 +746,7 @@ static bool is_replay(struct bt_mesh_net_rx *rx, struct bt_mesh_rpl **match)
 }
 
 static void seg_rx_assemble(struct seg_rx *rx, struct net_buf_simple *buf,
-			    u8_t aszmic)
+			    uint8_t aszmic)
 {
 	int i;
 
@@ -764,8 +764,8 @@ static void seg_rx_assemble(struct seg_rx *rx, struct net_buf_simple *buf,
 	}
 }
 
-static int remote_devkey_decrypt(struct bt_mesh_net_rx *rx, u32_t seq, u8_t *ad,
-				 u8_t aszmic, struct net_buf_simple *buf,
+static int remote_devkey_decrypt(struct bt_mesh_net_rx *rx, uint32_t seq, uint8_t *ad,
+				 uint8_t aszmic, struct net_buf_simple *buf,
 				 struct net_buf_simple *sdu)
 {
 	struct bt_mesh_cdb_node *node;
@@ -803,8 +803,8 @@ static int remote_devkey_decrypt(struct bt_mesh_net_rx *rx, u32_t seq, u8_t *ad,
 }
 
 static int app_key_decrypt(struct bt_mesh_net_rx *rx,
-			   struct bt_mesh_app_key *key, u32_t seq, u8_t *ad,
-			   u8_t hdr, u8_t aszmic, struct net_buf_simple *buf,
+			   struct bt_mesh_app_key *key, uint32_t seq, uint8_t *ad,
+			   uint8_t hdr, uint8_t aszmic, struct net_buf_simple *buf,
 			   struct net_buf_simple *sdu)
 {
 	struct bt_mesh_app_keys *keys;
@@ -836,12 +836,12 @@ static int app_key_decrypt(struct bt_mesh_net_rx *rx,
 	return err;
 }
 
-static int sdu_recv_unseg(struct bt_mesh_net_rx *rx, u8_t hdr,
+static int sdu_recv_unseg(struct bt_mesh_net_rx *rx, uint8_t hdr,
 			  struct net_buf_simple *buf)
 {
 	NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_SDU_UNSEG_MAX);
-	u8_t *ad;
-	u16_t i;
+	uint8_t *ad;
+	uint16_t i;
 	int err;
 
 	BT_DBG("AKF %u AID 0x%02x", AKF(&hdr), AID(&hdr));
@@ -918,14 +918,14 @@ static int sdu_recv_unseg(struct bt_mesh_net_rx *rx, u8_t hdr,
 	return 0;
 }
 
-static int sdu_recv_seg(struct seg_rx *seg, u8_t hdr, u8_t aszmic,
+static int sdu_recv_seg(struct seg_rx *seg, uint8_t hdr, uint8_t aszmic,
 			struct bt_mesh_net_rx *rx)
 {
 	NET_BUF_SIMPLE_DEFINE(buf, BT_MESH_RX_SDU_MAX);
 	struct net_buf_simple sdu;
-	u32_t seq = (seg->seq_auth & 0xffffff);
-	u8_t *ad;
-	u16_t i;
+	uint32_t seq = (seg->seq_auth & 0xffffff);
+	uint8_t *ad;
+	uint16_t i;
 	int err;
 
 	BT_DBG("ASZMIC %u AKF %u AID 0x%02x", aszmic, AKF(&hdr), AID(&hdr));
@@ -1014,7 +1014,7 @@ static int sdu_recv_seg(struct seg_rx *seg, u8_t hdr, u8_t aszmic,
 	return 0;
 }
 
-static struct seg_tx *seg_tx_lookup(u16_t seq_zero, u8_t obo, u16_t addr)
+static struct seg_tx *seg_tx_lookup(uint16_t seq_zero, uint8_t obo, uint16_t addr)
 {
 	struct seg_tx *tx;
 	int i;
@@ -1044,14 +1044,14 @@ static struct seg_tx *seg_tx_lookup(u16_t seq_zero, u8_t obo, u16_t addr)
 	return NULL;
 }
 
-static int trans_ack(struct bt_mesh_net_rx *rx, u8_t hdr,
-		     struct net_buf_simple *buf, u64_t *seq_auth)
+static int trans_ack(struct bt_mesh_net_rx *rx, uint8_t hdr,
+		     struct net_buf_simple *buf, uint64_t *seq_auth)
 {
 	struct seg_tx *tx;
 	unsigned int bit;
-	u32_t ack;
-	u16_t seq_zero;
-	u8_t obo;
+	uint32_t ack;
+	uint16_t seq_zero;
+	uint8_t obo;
 
 	if (buf->len < 6) {
 		BT_ERR("Too short ack message");
@@ -1121,8 +1121,8 @@ static int trans_ack(struct bt_mesh_net_rx *rx, u8_t hdr,
 static int trans_heartbeat(struct bt_mesh_net_rx *rx,
 			   struct net_buf_simple *buf)
 {
-	u8_t init_ttl, hops;
-	u16_t feat;
+	uint8_t init_ttl, hops;
+	uint16_t feat;
 
 	if (buf->len < 3) {
 		BT_ERR("Too short heartbeat message");
@@ -1148,10 +1148,10 @@ static int trans_heartbeat(struct bt_mesh_net_rx *rx,
 	return 0;
 }
 
-static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr,
-		    struct net_buf_simple *buf, u64_t *seq_auth)
+static int ctl_recv(struct bt_mesh_net_rx *rx, uint8_t hdr,
+		    struct net_buf_simple *buf, uint64_t *seq_auth)
 {
-	u8_t ctl_op = TRANS_CTL_OP(&hdr);
+	uint8_t ctl_op = TRANS_CTL_OP(&hdr);
 
 	BT_DBG("OpCode 0x%02x len %u", ctl_op, buf->len);
 
@@ -1214,9 +1214,9 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr,
 }
 
 static int trans_unseg(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx,
-		       u64_t *seq_auth)
+		       uint64_t *seq_auth)
 {
-	u8_t hdr;
+	uint8_t hdr;
 
 	BT_DBG("AFK %u AID 0x%02x", AKF(buf->data), AID(buf->data));
 
@@ -1245,10 +1245,10 @@ static int trans_unseg(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx,
 	}
 }
 
-static inline s32_t ack_timeout(struct seg_rx *rx)
+static inline int32_t ack_timeout(struct seg_rx *rx)
 {
-	s32_t to;
-	u8_t ttl;
+	int32_t to;
+	uint8_t ttl;
 
 	if (rx->ttl == BT_MESH_TTL_DEFAULT) {
 		ttl = bt_mesh_default_ttl_get();
@@ -1270,7 +1270,7 @@ static inline s32_t ack_timeout(struct seg_rx *rx)
 	return MAX(to, 400);
 }
 
-int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, u8_t ctl_op, void *data,
+int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, uint8_t ctl_op, void *data,
 		     size_t data_len,
 		     const struct bt_mesh_send_cb *cb, void *cb_data)
 {
@@ -1295,8 +1295,8 @@ int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, u8_t ctl_op, void *data,
 	}
 }
 
-static int send_ack(struct bt_mesh_subnet *sub, u16_t src, u16_t dst,
-		    u8_t ttl, u64_t *seq_auth, u32_t block, u8_t obo)
+static int send_ack(struct bt_mesh_subnet *sub, uint16_t src, uint16_t dst,
+		    uint8_t ttl, uint64_t *seq_auth, uint32_t block, uint8_t obo)
 {
 	struct bt_mesh_msg_ctx ctx = {
 		.net_idx = sub->net_idx,
@@ -1310,8 +1310,8 @@ static int send_ack(struct bt_mesh_subnet *sub, u16_t src, u16_t dst,
 		.src = obo ? bt_mesh_primary_addr() : src,
 		.xmit = bt_mesh_net_transmit_get(),
 	};
-	u16_t seq_zero = *seq_auth & TRANS_SEQ_ZERO_MASK;
-	u8_t buf[6];
+	uint16_t seq_zero = *seq_auth & TRANS_SEQ_ZERO_MASK;
+	uint8_t buf[6];
 
 	BT_DBG("SeqZero 0x%04x Block 0x%08x OBO %u", seq_zero, block, obo);
 
@@ -1396,13 +1396,13 @@ static void seg_ack(struct k_work *work)
 	k_delayed_work_submit(&rx->ack, K_MSEC(ack_timeout(rx)));
 }
 
-static inline bool sdu_len_is_ok(bool ctl, u8_t seg_n)
+static inline bool sdu_len_is_ok(bool ctl, uint8_t seg_n)
 {
 	return (seg_n < CONFIG_BT_MESH_RX_SEG_MAX);
 }
 
 static struct seg_rx *seg_rx_find(struct bt_mesh_net_rx *net_rx,
-				  const u64_t *seq_auth)
+				  const uint64_t *seq_auth)
 {
 	int i;
 
@@ -1439,7 +1439,7 @@ static struct seg_rx *seg_rx_find(struct bt_mesh_net_rx *net_rx,
 }
 
 static bool seg_rx_is_valid(struct seg_rx *rx, struct bt_mesh_net_rx *net_rx,
-			    const u8_t *hdr, u8_t seg_n)
+			    const uint8_t *hdr, uint8_t seg_n)
 {
 	if (rx->hdr != *hdr || rx->seg_n != seg_n) {
 		BT_ERR("Invalid segment for ongoing session");
@@ -1460,8 +1460,8 @@ static bool seg_rx_is_valid(struct seg_rx *rx, struct bt_mesh_net_rx *net_rx,
 }
 
 static struct seg_rx *seg_rx_alloc(struct bt_mesh_net_rx *net_rx,
-				   const u8_t *hdr, const u64_t *seq_auth,
-				   u8_t seg_n)
+				   const uint8_t *hdr, const uint64_t *seq_auth,
+				   uint8_t seg_n)
 {
 	int i;
 
@@ -1501,15 +1501,15 @@ static struct seg_rx *seg_rx_alloc(struct bt_mesh_net_rx *net_rx,
 }
 
 static int trans_seg(struct net_buf_simple *buf, struct bt_mesh_net_rx *net_rx,
-		     enum bt_mesh_friend_pdu_type *pdu_type, u64_t *seq_auth,
-		     u8_t *seg_count)
+		     enum bt_mesh_friend_pdu_type *pdu_type, uint64_t *seq_auth,
+		     uint8_t *seg_count)
 {
 	struct bt_mesh_rpl *rpl = NULL;
 	struct seg_rx *rx;
-	u8_t *hdr = buf->data;
-	u16_t seq_zero;
-	u8_t seg_n;
-	u8_t seg_o;
+	uint8_t *hdr = buf->data;
+	uint16_t seq_zero;
+	uint8_t seg_n;
+	uint8_t seg_o;
 	int err;
 
 	if (buf->len < 5) {
@@ -1724,10 +1724,10 @@ found_rx:
 
 int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx)
 {
-	u64_t seq_auth = TRANS_SEQ_AUTH_NVAL;
+	uint64_t seq_auth = TRANS_SEQ_AUTH_NVAL;
 	enum bt_mesh_friend_pdu_type pdu_type = BT_MESH_FRIEND_PDU_SINGLE;
 	struct net_buf_simple_state state;
-	u8_t seg_count = 0;
+	uint8_t seg_count = 0;
 	int err;
 
 	if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
@@ -1862,10 +1862,10 @@ void bt_mesh_rpl_clear(void)
 void bt_mesh_heartbeat_send(void)
 {
 	struct bt_mesh_cfg_srv *cfg = bt_mesh_cfg_get();
-	u16_t feat = 0U;
+	uint16_t feat = 0U;
 	struct __packed {
-		u8_t  init_ttl;
-		u16_t feat;
+		uint8_t  init_ttl;
+		uint16_t feat;
 	} hb;
 	struct bt_mesh_msg_ctx ctx = {
 		.net_idx = cfg->hb_pub.net_idx,
@@ -1911,8 +1911,8 @@ void bt_mesh_heartbeat_send(void)
 			 NULL, NULL);
 }
 
-int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, u16_t app_idx,
-			u16_t addr, const u8_t **key, u8_t *aid)
+int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, uint16_t app_idx,
+			uint16_t addr, const uint8_t **key, uint8_t *aid)
 {
 	struct bt_mesh_app_key *app_key;
 
diff --git a/subsys/bluetooth/mesh/transport.h b/subsys/bluetooth/mesh/transport.h
index c28e66415b..422ae95777 100644
--- a/subsys/bluetooth/mesh/transport.h
+++ b/subsys/bluetooth/mesh/transport.h
@@ -15,8 +15,8 @@
 #define BT_MESH_RX_SDU_MAX (CONFIG_BT_MESH_RX_SEG_MAX * BT_MESH_APP_SEG_SDU_MAX)
 #define BT_MESH_RX_CTL_MAX (CONFIG_BT_MESH_RX_SEG_MAX * BT_MESH_CTL_SEG_SDU_MAX)
 
-#define TRANS_SEQ_ZERO_MASK            ((u16_t)BIT_MASK(13))
-#define TRANS_CTL_OP_MASK              ((u8_t)BIT_MASK(7))
+#define TRANS_SEQ_ZERO_MASK            ((uint16_t)BIT_MASK(13))
+#define TRANS_CTL_OP_MASK              ((uint8_t)BIT_MASK(7))
 #define TRANS_CTL_OP(data)             ((data)[0] & TRANS_CTL_OP_MASK)
 #define TRANS_CTL_HDR(op, seg)         ((op & TRANS_CTL_OP_MASK) | (seg << 7))
 
@@ -33,62 +33,62 @@
 #define TRANS_CTL_OP_HEARTBEAT         0x0a
 
 struct bt_mesh_ctl_friend_poll {
-	u8_t  fsn;
+	uint8_t  fsn;
 } __packed;
 
 struct bt_mesh_ctl_friend_update {
-	u8_t  flags;
-	u32_t iv_index;
-	u8_t  md;
+	uint8_t  flags;
+	uint32_t iv_index;
+	uint8_t  md;
 } __packed;
 
 struct bt_mesh_ctl_friend_req {
-	u8_t  criteria;
-	u8_t  recv_delay;
-	u8_t  poll_to[3];
-	u16_t prev_addr;
-	u8_t  num_elem;
-	u16_t lpn_counter;
+	uint8_t  criteria;
+	uint8_t  recv_delay;
+	uint8_t  poll_to[3];
+	uint16_t prev_addr;
+	uint8_t  num_elem;
+	uint16_t lpn_counter;
 } __packed;
 
 struct bt_mesh_ctl_friend_offer {
-	u8_t  recv_win;
-	u8_t  queue_size;
-	u8_t  sub_list_size;
-	s8_t  rssi;
-	u16_t frnd_counter;
+	uint8_t  recv_win;
+	uint8_t  queue_size;
+	uint8_t  sub_list_size;
+	int8_t  rssi;
+	uint16_t frnd_counter;
 } __packed;
 
 struct bt_mesh_ctl_friend_clear {
-	u16_t lpn_addr;
-	u16_t lpn_counter;
+	uint16_t lpn_addr;
+	uint16_t lpn_counter;
 } __packed;
 
 struct bt_mesh_ctl_friend_clear_confirm {
-	u16_t lpn_addr;
-	u16_t lpn_counter;
+	uint16_t lpn_addr;
+	uint16_t lpn_counter;
 } __packed;
 
 #define BT_MESH_FRIEND_SUB_MIN_LEN (1 + 2)
 struct bt_mesh_ctl_friend_sub {
-	u8_t  xact;
-	u16_t addr_list[5];
+	uint8_t  xact;
+	uint16_t addr_list[5];
 } __packed;
 
 struct bt_mesh_ctl_friend_sub_confirm {
-	u8_t xact;
+	uint8_t xact;
 } __packed;
 
-void bt_mesh_set_hb_sub_dst(u16_t addr);
+void bt_mesh_set_hb_sub_dst(uint16_t addr);
 
-struct bt_mesh_app_key *bt_mesh_app_key_find(u16_t app_idx);
+struct bt_mesh_app_key *bt_mesh_app_key_find(uint16_t app_idx);
 
 bool bt_mesh_tx_in_progress(void);
 
 void bt_mesh_rx_reset(void);
 void bt_mesh_tx_reset(void);
 
-int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, u8_t ctl_op, void *data,
+int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, uint8_t ctl_op, void *data,
 		     size_t data_len, const struct bt_mesh_send_cb *cb,
 		     void *cb_data);
 
@@ -103,5 +103,5 @@ void bt_mesh_rpl_clear(void);
 
 void bt_mesh_heartbeat_send(void);
 
-int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, u16_t app_idx,
-			u16_t addr, const u8_t **key, u8_t *aid);
+int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, uint16_t app_idx,
+			uint16_t addr, const uint8_t **key, uint8_t *aid);
diff --git a/subsys/bluetooth/services/bas.c b/subsys/bluetooth/services/bas.c
index 585da309fc..60220920a4 100644
--- a/subsys/bluetooth/services/bas.c
+++ b/subsys/bluetooth/services/bas.c
@@ -25,10 +25,10 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(bas);
 
-static u8_t battery_level = 100U;
+static uint8_t battery_level = 100U;
 
 static void blvl_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				       u16_t value)
+				       uint16_t value)
 {
 	ARG_UNUSED(attr);
 
@@ -39,9 +39,9 @@ static void blvl_ccc_cfg_changed(const struct bt_gatt_attr *attr,
 
 static ssize_t read_blvl(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	u8_t lvl8 = battery_level;
+	uint8_t lvl8 = battery_level;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &lvl8,
 				 sizeof(lvl8));
@@ -64,12 +64,12 @@ static int bas_init(struct device *dev)
 	return 0;
 }
 
-u8_t bt_gatt_bas_get_battery_level(void)
+uint8_t bt_gatt_bas_get_battery_level(void)
 {
 	return battery_level;
 }
 
-int bt_gatt_bas_set_battery_level(u8_t level)
+int bt_gatt_bas_set_battery_level(uint8_t level)
 {
 	int rc;
 
diff --git a/subsys/bluetooth/services/dis.c b/subsys/bluetooth/services/dis.c
index b5a038c4c7..affdfa75c6 100644
--- a/subsys/bluetooth/services/dis.c
+++ b/subsys/bluetooth/services/dis.c
@@ -31,10 +31,10 @@
 
 #if CONFIG_BT_GATT_DIS_PNP
 struct dis_pnp {
-	u8_t pnp_vid_src;
-	u16_t pnp_vid;
-	u16_t pnp_pid;
-	u16_t pnp_ver;
+	uint8_t pnp_vid_src;
+	uint16_t pnp_vid;
+	uint16_t pnp_pid;
+	uint16_t pnp_ver;
 } __packed;
 
 static struct dis_pnp dis_pnp_id = {
@@ -46,22 +46,22 @@ static struct dis_pnp dis_pnp_id = {
 #endif
 
 #if defined(CONFIG_BT_GATT_DIS_SETTINGS)
-static u8_t dis_model[CONFIG_BT_GATT_DIS_STR_MAX] = CONFIG_BT_GATT_DIS_MODEL;
-static u8_t dis_manuf[CONFIG_BT_GATT_DIS_STR_MAX] = CONFIG_BT_GATT_DIS_MANUF;
+static uint8_t dis_model[CONFIG_BT_GATT_DIS_STR_MAX] = CONFIG_BT_GATT_DIS_MODEL;
+static uint8_t dis_manuf[CONFIG_BT_GATT_DIS_STR_MAX] = CONFIG_BT_GATT_DIS_MANUF;
 #if defined(CONFIG_BT_GATT_DIS_SERIAL_NUMBER)
-static u8_t dis_serial_number[CONFIG_BT_GATT_DIS_STR_MAX] =
+static uint8_t dis_serial_number[CONFIG_BT_GATT_DIS_STR_MAX] =
 	CONFIG_BT_GATT_DIS_SERIAL_NUMBER_STR;
 #endif
 #if defined(CONFIG_BT_GATT_DIS_FW_REV)
-static u8_t dis_fw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
+static uint8_t dis_fw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
 	CONFIG_BT_GATT_DIS_FW_REV_STR;
 #endif
 #if defined(CONFIG_BT_GATT_DIS_HW_REV)
-static u8_t dis_hw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
+static uint8_t dis_hw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
 	CONFIG_BT_GATT_DIS_HW_REV_STR;
 #endif
 #if defined(CONFIG_BT_GATT_DIS_SW_REV)
-static u8_t dis_sw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
+static uint8_t dis_sw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
 	CONFIG_BT_GATT_DIS_SW_REV_STR;
 #endif
 
@@ -85,7 +85,7 @@ static u8_t dis_sw_rev[CONFIG_BT_GATT_DIS_STR_MAX] =
 
 static ssize_t read_str(struct bt_conn *conn,
 			  const struct bt_gatt_attr *attr, void *buf,
-			  u16_t len, u16_t offset)
+			  uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, attr->user_data,
 				 strlen(attr->user_data));
@@ -94,7 +94,7 @@ static ssize_t read_str(struct bt_conn *conn,
 #if CONFIG_BT_GATT_DIS_PNP
 static ssize_t read_pnp_id(struct bt_conn *conn,
 			   const struct bt_gatt_attr *attr, void *buf,
-			   u16_t len, u16_t offset)
+			   uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &dis_pnp_id,
 				 sizeof(dis_pnp_id));
diff --git a/subsys/bluetooth/services/hrs.c b/subsys/bluetooth/services/hrs.c
index 6b3cd09d87..ebefe3b73f 100644
--- a/subsys/bluetooth/services/hrs.c
+++ b/subsys/bluetooth/services/hrs.c
@@ -25,9 +25,9 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(hrs);
 
-static u8_t hrs_blsc;
+static uint8_t hrs_blsc;
 
-static void hrmc_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void hrmc_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	ARG_UNUSED(attr);
 
@@ -37,7 +37,7 @@ static void hrmc_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
 }
 
 static ssize_t read_blsc(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 void *buf, u16_t len, u16_t offset)
+			 void *buf, uint16_t len, uint16_t offset)
 {
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &hrs_blsc,
 				 sizeof(hrs_blsc));
@@ -65,10 +65,10 @@ static int hrs_init(struct device *dev)
 	return 0;
 }
 
-int bt_gatt_hrs_notify(u16_t heartrate)
+int bt_gatt_hrs_notify(uint16_t heartrate)
 {
 	int rc;
-	static u8_t hrm[2];
+	static uint8_t hrm[2];
 
 	hrm[0] = 0x06; /* uint8, sensor contact */
 	hrm[1] = heartrate;
diff --git a/subsys/bluetooth/shell/bredr.c b/subsys/bluetooth/shell/bredr.c
index 1252bc9066..da6369bdf4 100644
--- a/subsys/bluetooth/shell/bredr.c
+++ b/subsys/bluetooth/shell/bredr.c
@@ -48,7 +48,7 @@ static int cmd_auth_pincode(const struct shell *shell,
 			    size_t argc, char *argv[])
 {
 	struct bt_conn *conn;
-	u8_t max = 16U;
+	uint8_t max = 16U;
 
 	if (default_conn) {
 		conn = default_conn;
@@ -102,8 +102,8 @@ static int cmd_connect(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static void br_device_found(const bt_addr_t *addr, s8_t rssi,
-				  const u8_t cod[3], const u8_t eir[240])
+static void br_device_found(const bt_addr_t *addr, int8_t rssi,
+				  const uint8_t cod[3], const uint8_t eir[240])
 {
 	char br_addr[BT_ADDR_STR_LEN];
 	char name[239];
@@ -357,12 +357,12 @@ static int cmd_oob(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static u8_t sdp_hfp_ag_user(struct bt_conn *conn,
+static uint8_t sdp_hfp_ag_user(struct bt_conn *conn,
 			       struct bt_sdp_client_result *result)
 {
 	char addr[BT_ADDR_STR_LEN];
-	u16_t param, version;
-	u16_t features;
+	uint16_t param, version;
+	uint16_t features;
 	int res;
 
 	conn_addr_str(conn, addr, sizeof(addr));
@@ -416,12 +416,12 @@ done:
 	return BT_SDP_DISCOVER_UUID_CONTINUE;
 }
 
-static u8_t sdp_a2src_user(struct bt_conn *conn,
+static uint8_t sdp_a2src_user(struct bt_conn *conn,
 			   struct bt_sdp_client_result *result)
 {
 	char addr[BT_ADDR_STR_LEN];
-	u16_t param, version;
-	u16_t features;
+	uint16_t param, version;
+	uint16_t features;
 	int res;
 
 	conn_addr_str(conn, addr, sizeof(addr));
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 5952c9838c..7b7f240347 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -39,7 +39,7 @@
 #define DEVICE_NAME		CONFIG_BT_DEVICE_NAME
 #define DEVICE_NAME_LEN		(sizeof(DEVICE_NAME) - 1)
 
-static u8_t selected_id = BT_ID_DEFAULT;
+static uint8_t selected_id = BT_ID_DEFAULT;
 const struct shell *ctx_shell;
 
 #if defined(CONFIG_BT_CONN)
@@ -57,7 +57,7 @@ static struct bt_le_oob oob_remote;
 #define KEY_STR_LEN 33
 
 #if defined(CONFIG_BT_EXT_ADV)
-static u8_t selected_adv;
+static uint8_t selected_adv;
 struct bt_le_ext_adv *adv_sets[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
 #endif
 
@@ -76,7 +76,7 @@ static bool data_cb(struct bt_data *data, void *user_data)
 	}
 }
 
-static const char *phy2str(u8_t phy)
+static const char *phy2str(uint8_t phy)
 {
 	switch (phy) {
 	case 0: return "No packets";
@@ -217,7 +217,7 @@ static void print_le_oob(const struct shell *shell, struct bt_le_oob *oob)
 	shell_print(shell, "%29s %32s %32s", addr, r, c);
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
@@ -243,7 +243,7 @@ done:
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 
@@ -265,8 +265,8 @@ static bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param)
 	return true;
 }
 
-static void le_param_updated(struct bt_conn *conn, u16_t interval,
-			     u16_t latency, u16_t timeout)
+static void le_param_updated(struct bt_conn *conn, uint16_t interval,
+			     uint16_t latency, uint16_t timeout)
 {
 	shell_print(ctx_shell, "LE conn param updated: int 0x%04x lat %d "
 		     "to %d", interval, latency, timeout);
@@ -306,7 +306,7 @@ static void security_changed(struct bt_conn *conn, bt_security_t level,
 #endif
 
 #if defined(CONFIG_BT_REMOTE_INFO)
-static const char *ver_str(u8_t ver)
+static const char *ver_str(uint8_t ver)
 {
 	const char * const str[] = {
 		"1.0b", "1.1", "1.2", "2.0", "2.1", "3.0", "4.0", "4.1", "4.2",
@@ -336,7 +336,7 @@ static void remote_info_available(struct bt_conn *conn,
 	}
 
 	if (info.type == BT_CONN_TYPE_LE) {
-		u8_t features[8];
+		uint8_t features[8];
 		char features_str[2 * sizeof(features) +  1];
 
 		sys_memcpy_swap(features, remote_info->le.features,
@@ -451,8 +451,8 @@ static int cmd_init(const struct shell *shell, size_t argc, char *argv[])
 #if defined(CONFIG_BT_HCI)
 static int cmd_hci_cmd(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t ogf;
-	u16_t ocf;
+	uint8_t ogf;
+	uint16_t ocf;
 	struct net_buf *buf = NULL, *rsp;
 	int err;
 
@@ -531,7 +531,7 @@ static int cmd_id_reset(const struct shell *shell, size_t argc, char *argv[])
 {
 	char addr_str[BT_ADDR_LE_STR_LEN];
 	bt_addr_le_t addr;
-	u8_t id;
+	uint8_t id;
 	int err;
 
 	if (argc < 2) {
@@ -565,7 +565,7 @@ static int cmd_id_reset(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_id_delete(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t id;
+	uint8_t id;
 	int err;
 
 	if (argc < 2) {
@@ -609,7 +609,7 @@ static int cmd_id_select(const struct shell *shell, size_t argc, char *argv[])
 	char addr_str[BT_ADDR_LE_STR_LEN];
 	bt_addr_le_t addrs[CONFIG_BT_ID_MAX];
 	size_t count = CONFIG_BT_ID_MAX;
-	u8_t id;
+	uint8_t id;
 
 	id = strtol(argv[1], NULL, 10);
 
@@ -627,8 +627,8 @@ static int cmd_id_select(const struct shell *shell, size_t argc, char *argv[])
 }
 
 #if defined(CONFIG_BT_OBSERVER)
-static int cmd_active_scan_on(const struct shell *shell, u32_t options,
-			      u16_t timeout)
+static int cmd_active_scan_on(const struct shell *shell, uint32_t options,
+			      uint16_t timeout)
 {
 	int err;
 	struct bt_le_scan_param param = {
@@ -652,8 +652,8 @@ static int cmd_active_scan_on(const struct shell *shell, u32_t options,
 	return 0;
 }
 
-static int cmd_passive_scan_on(const struct shell *shell, u32_t options,
-			       u16_t timeout)
+static int cmd_passive_scan_on(const struct shell *shell, uint32_t options,
+			       uint16_t timeout)
 {
 	struct bt_le_scan_param param = {
 			.type       = BT_LE_SCAN_TYPE_PASSIVE,
@@ -695,8 +695,8 @@ static int cmd_scan_off(const struct shell *shell)
 static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
 {
 	const char *action;
-	u32_t options = 0;
-	u16_t timeout = 0;
+	uint32_t options = 0;
+	uint16_t timeout = 0;
 
 	/* Parse duplicate filtering data */
 	for (size_t argn = 2; argn < argc; argn++) {
@@ -943,7 +943,7 @@ static int cmd_adv_create(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_le_adv_param param;
 	struct bt_le_ext_adv *adv;
-	u8_t adv_index;
+	uint8_t adv_index;
 	int err;
 
 	if (!adv_param_parse(argc, argv, &param)) {
@@ -987,9 +987,9 @@ static int cmd_adv_param(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_adv_data(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t discov_data = (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR);
+	uint8_t discov_data = (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR);
 	struct bt_le_ext_adv *adv = adv_sets[selected_adv];
-	static u8_t hex_data[1650];
+	static uint8_t hex_data[1650];
 	struct bt_data *data;
 	struct bt_data ad[8];
 	struct bt_data sd[8];
@@ -1068,8 +1068,8 @@ static int cmd_adv_start(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_le_ext_adv *adv = adv_sets[selected_adv];
 	struct bt_le_ext_adv_start_param param;
-	u8_t num_events = 0;
-	s32_t timeout = 0;
+	uint8_t num_events = 0;
+	int32_t timeout = 0;
 	int err;
 
 	if (!adv) {
@@ -1157,7 +1157,7 @@ static int cmd_adv_delete(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_adv_select(const struct shell *shell, size_t argc, char *argv[])
 {
 	if (argc == 2) {
-		u8_t id = strtol(argv[1], NULL, 10);
+		uint8_t id = strtol(argv[1], NULL, 10);
 
 		if (!(id < ARRAY_SIZE(adv_sets))) {
 			return -EINVAL;
@@ -1227,7 +1227,7 @@ static int cmd_connect_le(const struct shell *shell, size_t argc, char *argv[])
 	int err;
 	bt_addr_le_t addr;
 	struct bt_conn *conn;
-	u32_t options = 0;
+	uint32_t options = 0;
 
 	err = bt_addr_le_from_str(argv[1], argv[2], &addr);
 	if (err) {
@@ -1367,7 +1367,7 @@ static int cmd_select(const struct shell *shell, size_t argc, char *argv[])
 	return 0;
 }
 
-static const char *get_conn_type_str(u8_t type)
+static const char *get_conn_type_str(uint8_t type)
 {
 	switch (type) {
 	case BT_CONN_TYPE_LE: return "LE";
@@ -1377,7 +1377,7 @@ static const char *get_conn_type_str(u8_t type)
 	}
 }
 
-static const char *get_conn_role_str(u8_t role)
+static const char *get_conn_role_str(uint8_t role)
 {
 	switch (role) {
 	case BT_CONN_ROLE_MASTER: return "master";
@@ -1501,10 +1501,10 @@ static int cmd_conn_update(const struct shell *shell, size_t argc, char *argv[])
 }
 
 #if defined(CONFIG_BT_USER_DATA_LEN_UPDATE)
-static u16_t tx_time_calc(u8_t phy, u16_t max_len)
+static uint16_t tx_time_calc(uint8_t phy, uint16_t max_len)
 {
 	/* Access address + header + payload + MIC + CRC */
-	u16_t total_len = 4 + 2 + max_len + 4 + 3;
+	uint16_t total_len = 4 + 2 + max_len + 4 + 3;
 
 	switch (phy) {
 	case BT_GAP_LE_PHY_1M:
@@ -1533,7 +1533,7 @@ static int cmd_conn_data_len_update(const struct shell *shell, size_t argc,
 		param.tx_max_time = strtoul(argv[2], NULL, 10);
 	} else {
 		/* Assume 1M if not able to retrieve PHY */
-		u8_t phy = BT_GAP_LE_PHY_1M;
+		uint8_t phy = BT_GAP_LE_PHY_1M;
 
 #if defined(CONFIG_BT_USER_PHY_UPDATE)
 		struct bt_conn_info info;
@@ -1588,7 +1588,7 @@ static int cmd_conn_phy_update(const struct shell *shell, size_t argc,
 #if defined(CONFIG_BT_CENTRAL)
 static int cmd_chan_map(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t chan_map[5] = {};
+	uint8_t chan_map[5] = {};
 	int err;
 
 	if (hex2bin(argv[1], strlen(argv[1]), chan_map, 5) == 0) {
@@ -2237,7 +2237,7 @@ static int cmd_wl_connect(const struct shell *shell, size_t argc, char *argv[])
 {
 	int err;
 	const char *action = argv[1];
-	u32_t options = 0;
+	uint32_t options = 0;
 
 #if defined(CONFIG_BT_EXT_ADV)
 	for (size_t argn = 2; argn < argc; argn++) {
@@ -2337,7 +2337,7 @@ static int cmd_auth_passkey(const struct shell *shell,
 #if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
 static int cmd_auth_oob_tk(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t tk[16];
+	uint8_t tk[16];
 	size_t len;
 	int err;
 
diff --git a/subsys/bluetooth/shell/gatt.c b/subsys/bluetooth/shell/gatt.c
index 872e64e2c6..1f6640f104 100644
--- a/subsys/bluetooth/shell/gatt.c
+++ b/subsys/bluetooth/shell/gatt.c
@@ -28,7 +28,7 @@
 #define CHAR_SIZE_MAX           512
 
 #if defined(CONFIG_BT_GATT_CLIENT)
-static void exchange_func(struct bt_conn *conn, u8_t err,
+static void exchange_func(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_exchange_params *params)
 {
 	shell_print(ctx_shell, "Exchange %s", err == 0U ? "successful" :
@@ -69,7 +69,7 @@ static int cmd_exchange_mtu(const struct shell *shell,
 static struct bt_gatt_discover_params discover_params;
 static struct bt_uuid_16 uuid = BT_UUID_INIT_16(0);
 
-static void print_chrc_props(const struct shell *shell, u8_t properties)
+static void print_chrc_props(const struct shell *shell, uint8_t properties)
 {
 	shell_print(shell, "Properties: ");
 
@@ -108,7 +108,7 @@ static void print_chrc_props(const struct shell *shell, u8_t properties)
 	shell_print(shell, "");
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
 			     struct bt_gatt_discover_params *params)
 {
@@ -216,9 +216,9 @@ static int cmd_discover(const struct shell *shell, size_t argc, char *argv[])
 
 static struct bt_gatt_read_params read_params;
 
-static u8_t read_func(struct bt_conn *conn, u8_t err,
+static uint8_t read_func(struct bt_conn *conn, uint8_t err,
 			 struct bt_gatt_read_params *params,
-			 const void *data, u16_t length)
+			 const void *data, uint16_t length)
 {
 	shell_print(ctx_shell, "Read complete: err 0x%02x length %u", err, length);
 
@@ -265,7 +265,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_mread(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t h[8];
+	uint16_t h[8];
 	size_t i;
 	int err;
 
@@ -347,9 +347,9 @@ static int cmd_read_uuid(const struct shell *shell, size_t argc, char *argv[])
 }
 
 static struct bt_gatt_write_params write_params;
-static u8_t gatt_write_buf[CHAR_SIZE_MAX];
+static uint8_t gatt_write_buf[CHAR_SIZE_MAX];
 
-static void write_func(struct bt_conn *conn, u8_t err,
+static void write_func(struct bt_conn *conn, uint8_t err,
 		       struct bt_gatt_write_params *params)
 {
 	shell_print(ctx_shell, "Write complete: err 0x%02x", err);
@@ -360,7 +360,7 @@ static void write_func(struct bt_conn *conn, u8_t err,
 static int cmd_write(const struct shell *shell, size_t argc, char *argv[])
 {
 	int err;
-	u16_t handle, offset;
+	uint16_t handle, offset;
 
 	if (!default_conn) {
 		shell_error(shell, "Not connected");
@@ -412,10 +412,10 @@ static void write_without_rsp_cb(struct bt_conn *conn, void *user_data)
 static int cmd_write_without_rsp(const struct shell *shell,
 				 size_t argc, char *argv[])
 {
-	u16_t handle;
-	u16_t repeat;
+	uint16_t handle;
+	uint16_t repeat;
 	int err;
-	u16_t len;
+	uint16_t len;
 	bool sign;
 	bt_gatt_complete_func_t func = NULL;
 
@@ -470,9 +470,9 @@ static int cmd_write_without_rsp(const struct shell *shell,
 
 static struct bt_gatt_subscribe_params subscribe_params;
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			struct bt_gatt_subscribe_params *params,
-			const void *data, u16_t length)
+			const void *data, uint16_t length)
 {
 	if (!data) {
 		shell_print(ctx_shell, "Unsubscribed");
@@ -547,13 +547,13 @@ static int cmd_unsubscribe(const struct shell *shell,
 #endif /* CONFIG_BT_GATT_CLIENT */
 
 static struct db_stats {
-	u16_t svc_count;
-	u16_t attr_count;
-	u16_t chrc_count;
-	u16_t ccc_count;
+	uint16_t svc_count;
+	uint16_t attr_count;
+	uint16_t chrc_count;
+	uint16_t ccc_count;
 } stats;
 
-static u8_t print_attr(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t print_attr(const struct bt_gatt_attr *attr, void *user_data)
 {
 	const struct shell *shell = user_data;
 	char str[BT_UUID_STR_LEN];
@@ -589,7 +589,7 @@ static int cmd_show_db(const struct shell *shell, size_t argc, char *argv[])
 	memset(&stats, 0, sizeof(stats));
 
 	if (argc > 1) {
-		u16_t num_matches = 0;
+		uint16_t num_matches = 0;
 
 		uuid.uuid.type = BT_UUID_TYPE_16;
 		uuid.val = strtoul(argv[1], NULL, 16);
@@ -638,7 +638,7 @@ static const struct bt_uuid_128 vnd_long_uuid2 = BT_UUID_INIT_128(
 	0xde, 0xad, 0xfa, 0xce, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t vnd_value[] = { 'V', 'e', 'n', 'd', 'o', 'r' };
+static uint8_t vnd_value[] = { 'V', 'e', 'n', 'd', 'o', 'r' };
 
 static struct bt_uuid_128 vnd1_uuid = BT_UUID_INIT_128(
 	0xf4, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
@@ -648,16 +648,16 @@ static const struct bt_uuid_128 vnd1_echo_uuid = BT_UUID_INIT_128(
 	0xf5, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t echo_enabled;
+static uint8_t echo_enabled;
 
-static void vnd1_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void vnd1_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	echo_enabled = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
 
 static ssize_t write_vnd1(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			  const void *buf, u16_t len, u16_t offset,
-			  u8_t flags)
+			  const void *buf, uint16_t len, uint16_t offset,
+			  uint8_t flags)
 {
 	if (echo_enabled) {
 		shell_print(ctx_shell, "Echo attr len %u", len);
@@ -668,7 +668,7 @@ static ssize_t write_vnd1(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t read_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -677,10 +677,10 @@ static ssize_t read_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t write_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, u16_t len, u16_t offset,
-			 u8_t flags)
+			 const void *buf, uint16_t len, uint16_t offset,
+			 uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(vnd_value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -692,14 +692,14 @@ static ssize_t write_vnd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 #define MAX_DATA 30
-static u8_t vnd_long_value1[MAX_DATA] = { 'V', 'e', 'n', 'd', 'o', 'r' };
-static u8_t vnd_long_value2[MAX_DATA] = { 'S', 't', 'r', 'i', 'n', 'g' };
+static uint8_t vnd_long_value1[MAX_DATA] = { 'V', 'e', 'n', 'd', 'o', 'r' };
+static uint8_t vnd_long_value2[MAX_DATA] = { 'S', 't', 'r', 'i', 'n', 'g' };
 
 static ssize_t read_long_vnd(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(vnd_long_value1));
@@ -707,9 +707,9 @@ static ssize_t read_long_vnd(struct bt_conn *conn,
 
 static ssize_t write_long_vnd(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (flags & BT_GATT_WRITE_FLAG_PREPARE) {
 		return 0;
@@ -796,7 +796,7 @@ static void notify_cb(struct bt_conn *conn, void *user_data)
 static int cmd_notify(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct bt_gatt_notify_params params;
-	u8_t data = 0;
+	uint8_t data = 0;
 
 	if (!echo_enabled) {
 		shell_error(shell, "Nofication not enabled");
@@ -829,14 +829,14 @@ static const struct bt_uuid_128 met_char_uuid = BT_UUID_INIT_128(
 	0x02, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t met_char_value[CHAR_SIZE_MAX] = {
+static uint8_t met_char_value[CHAR_SIZE_MAX] = {
 	'M', 'e', 't', 'r', 'i', 'c', 's' };
 
 static ssize_t read_met(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
-	u16_t value_len;
+	uint16_t value_len;
 
 	value_len = MIN(strlen(value), CHAR_SIZE_MAX);
 
@@ -844,17 +844,17 @@ static ssize_t read_met(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 value_len);
 }
 
-static u32_t write_count;
-static u32_t write_len;
-static u32_t write_rate;
+static uint32_t write_count;
+static uint32_t write_len;
+static uint32_t write_rate;
 
 static ssize_t write_met(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, u16_t len, u16_t offset,
-			 u8_t flags)
+			 const void *buf, uint16_t len, uint16_t offset,
+			 uint8_t flags)
 {
-	u8_t *value = attr->user_data;
-	static u32_t cycle_stamp;
-	u32_t delta;
+	uint8_t *value = attr->user_data;
+	static uint32_t cycle_stamp;
+	uint32_t delta;
 
 	if (offset + len > sizeof(met_char_value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -863,7 +863,7 @@ static ssize_t write_met(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	memcpy(value + offset, buf, len);
 
 	delta = k_cycle_get_32() - cycle_stamp;
-	delta = (u32_t)k_cyc_to_ns_floor64(delta);
+	delta = (uint32_t)k_cyc_to_ns_floor64(delta);
 
 	/* if last data rx-ed was greater than 1 second in the past,
 	 * reset the metrics.
@@ -876,7 +876,7 @@ static ssize_t write_met(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	} else {
 		write_count++;
 		write_len += len;
-		write_rate = ((u64_t)write_len << 3) * 1000000000U / delta;
+		write_rate = ((uint64_t)write_len << 3) * 1000000000U / delta;
 	}
 
 	return len;
@@ -924,10 +924,10 @@ static int cmd_metrics(const struct shell *shell, size_t argc, char *argv[])
 }
 #endif /* CONFIG_BT_GATT_DYNAMIC_DB */
 
-static u8_t get_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t get_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct shell *shell = user_data;
-	u8_t buf[256];
+	uint8_t buf[256];
 	ssize_t ret;
 	char str[BT_UUID_STR_LEN];
 
@@ -952,7 +952,7 @@ static u8_t get_cb(const struct bt_gatt_attr *attr, void *user_data)
 
 static int cmd_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t start, end;
+	uint16_t start, end;
 
 	start = strtoul(argv[1], NULL, 16);
 	end = start;
@@ -973,10 +973,10 @@ struct set_data {
 	int err;
 };
 
-static u8_t set_cb(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t set_cb(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct set_data *data = user_data;
-	u8_t buf[256];
+	uint8_t buf[256];
 	size_t i;
 	ssize_t ret;
 
@@ -1002,7 +1002,7 @@ static u8_t set_cb(const struct bt_gatt_attr *attr, void *user_data)
 
 static int cmd_set(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t handle;
+	uint16_t handle;
 	struct set_data data;
 
 	handle = strtoul(argv[1], NULL, 16);
diff --git a/subsys/bluetooth/shell/l2cap.c b/subsys/bluetooth/shell/l2cap.c
index bd0982e768..9c50534fd8 100644
--- a/subsys/bluetooth/shell/l2cap.c
+++ b/subsys/bluetooth/shell/l2cap.c
@@ -41,11 +41,11 @@
 NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1, DATA_MTU, NULL);
 NET_BUF_POOL_FIXED_DEFINE(data_rx_pool, 1, DATA_MTU, NULL);
 
-static u8_t l2cap_policy;
+static uint8_t l2cap_policy;
 static struct bt_conn *l2cap_whitelist[CONFIG_BT_MAX_CONN];
 
-static u32_t l2cap_rate;
-static u32_t l2cap_recv_delay_ms;
+static uint32_t l2cap_rate;
+static uint32_t l2cap_recv_delay_ms;
 static K_FIFO_DEFINE(l2cap_recv_fifo);
 struct l2ch {
 	struct k_delayed_work recv_work;
@@ -59,12 +59,12 @@ static bool metrics;
 
 static int l2cap_recv_metrics(struct bt_l2cap_chan *chan, struct net_buf *buf)
 {
-	static u32_t len;
-	static u32_t cycle_stamp;
-	u32_t delta;
+	static uint32_t len;
+	static uint32_t cycle_stamp;
+	uint32_t delta;
 
 	delta = k_cycle_get_32() - cycle_stamp;
-	delta = (u32_t)k_cyc_to_ns_floor64(delta);
+	delta = (uint32_t)k_cyc_to_ns_floor64(delta);
 
 	/* if last data rx-ed was greater than 1 second in the past,
 	 * reset the metrics.
@@ -75,7 +75,7 @@ static int l2cap_recv_metrics(struct bt_l2cap_chan *chan, struct net_buf *buf)
 		cycle_stamp = k_cycle_get_32();
 	} else {
 		len += buf->len;
-		l2cap_rate = ((u64_t)len << 3) * 1000000000U / delta;
+		l2cap_rate = ((uint64_t)len << 3) * 1000000000U / delta;
 	}
 
 	return 0;
@@ -170,7 +170,7 @@ static struct l2ch l2ch_chan = {
 	.ch.rx.mtu	= DATA_MTU,
 };
 
-static void l2cap_whitelist_remove(struct bt_conn *conn, u8_t reason)
+static void l2cap_whitelist_remove(struct bt_conn *conn, uint8_t reason)
 {
 	int i;
 
@@ -191,7 +191,7 @@ static int l2cap_accept_policy(struct bt_conn *conn)
 	int i;
 
 	if (l2cap_policy == L2CAP_POLICY_16BYTE_KEY) {
-		u8_t enc_key_size = bt_conn_enc_key_size(conn);
+		uint8_t enc_key_size = bt_conn_enc_key_size(conn);
 
 		if (enc_key_size && enc_key_size < BT_ENC_KEY_SIZE_MAX) {
 			return -EPERM;
@@ -277,7 +277,7 @@ static int cmd_register(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_connect(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t psm;
+	uint16_t psm;
 	int err;
 
 	if (!default_conn) {
@@ -317,7 +317,7 @@ static int cmd_disconnect(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_send(const struct shell *shell, size_t argc, char *argv[])
 {
-	static u8_t buf_data[DATA_MTU] = { [0 ... (DATA_MTU - 1)] = 0xff };
+	static uint8_t buf_data[DATA_MTU] = { [0 ... (DATA_MTU - 1)] = 0xff };
 	int ret, len, count = 1;
 	struct net_buf *buf;
 
diff --git a/subsys/bluetooth/shell/ll.c b/subsys/bluetooth/shell/ll.c
index dced7a2e2c..bdc83162ae 100644
--- a/subsys/bluetooth/shell/ll.c
+++ b/subsys/bluetooth/shell/ll.c
@@ -26,7 +26,7 @@
 
 int cmd_ll_addr_get(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t addr_type;
+	uint8_t addr_type;
 	const char *str_type;
 	bt_addr_t addr;
 	char str_addr[BT_ADDR_STR_LEN];
@@ -57,8 +57,8 @@ int cmd_ll_addr_get(const struct shell *shell, size_t argc, char *argv[])
 
 int cmd_test_tx(const struct shell *shell, size_t  argc, char *argv[])
 {
-	u8_t chan, len, type, phy;
-	u32_t err;
+	uint8_t chan, len, type, phy;
+	uint32_t err;
 
 	if (argc < 5) {
 		return -EINVAL;
@@ -81,8 +81,8 @@ int cmd_test_tx(const struct shell *shell, size_t  argc, char *argv[])
 
 int cmd_test_rx(const struct shell *shell, size_t  argc, char *argv[])
 {
-	u8_t chan, phy, mod_idx;
-	u32_t err;
+	uint8_t chan, phy, mod_idx;
+	uint32_t err;
 
 	if (argc < 4) {
 		return -EINVAL;
@@ -104,8 +104,8 @@ int cmd_test_rx(const struct shell *shell, size_t  argc, char *argv[])
 
 int cmd_test_end(const struct shell *shell, size_t  argc, char *argv[])
 {
-	u16_t num_rx;
-	u32_t err;
+	uint16_t num_rx;
+	uint32_t err;
 
 	err = ll_test_end(&num_rx);
 	if (err) {
@@ -146,13 +146,13 @@ int cmd_test_end(const struct shell *shell, size_t  argc, char *argv[])
 #if defined(CONFIG_BT_BROADCASTER)
 int cmd_advx(const struct shell *shell, size_t argc, char *argv[])
 {
-	u16_t adv_interval = 0x20;
-	u16_t handle = 0U;
-	u16_t evt_prop = 0U;
-	u8_t adv_type;
-	u8_t enable;
-	u8_t phy_p;
-	s32_t err;
+	uint16_t adv_interval = 0x20;
+	uint16_t handle = 0U;
+	uint16_t evt_prop = 0U;
+	uint8_t adv_type;
+	uint8_t enable;
+	uint8_t phy_p;
+	int32_t err;
 
 	if (argc < 2) {
 		return -EINVAL;
@@ -284,9 +284,9 @@ exit:
 #if defined(CONFIG_BT_OBSERVER)
 int cmd_scanx(const struct shell *shell, size_t  argc, char *argv[])
 {
-	u8_t type = 0U;
-	u8_t enable;
-	s32_t err;
+	uint8_t type = 0U;
+	uint8_t enable;
+	int32_t err;
 
 	if (argc < 2) {
 		return -EINVAL;
diff --git a/subsys/bluetooth/shell/rfcomm.c b/subsys/bluetooth/shell/rfcomm.c
index cf094d57c0..b7683cf685 100644
--- a/subsys/bluetooth/shell/rfcomm.c
+++ b/subsys/bluetooth/shell/rfcomm.c
@@ -170,7 +170,7 @@ static int cmd_register(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_connect(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t channel;
+	uint8_t channel;
 	int err;
 
 	if (!default_conn) {
@@ -193,7 +193,7 @@ static int cmd_connect(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_send(const struct shell *shell, size_t argc, char *argv[])
 {
-	u8_t buf_data[DATA_MTU] = { [0 ... (DATA_MTU - 1)] = 0xff };
+	uint8_t buf_data[DATA_MTU] = { [0 ... (DATA_MTU - 1)] = 0xff };
 	int ret, len, count = 1;
 	struct net_buf *buf;
 
diff --git a/subsys/bluetooth/shell/ticker.c b/subsys/bluetooth/shell/ticker.c
index 579634e439..557de48daf 100644
--- a/subsys/bluetooth/shell/ticker.c
+++ b/subsys/bluetooth/shell/ticker.c
@@ -29,23 +29,23 @@
 
 #include "bt.h"
 
-static void ticker_op_done(u32_t err, void *context)
+static void ticker_op_done(uint32_t err, void *context)
 {
-	*((u32_t volatile *)context) = err;
+	*((uint32_t volatile *)context) = err;
 }
 
 int cmd_ticker_info(const struct shell *shell, size_t argc, char *argv[])
 {
 	struct {
-		u8_t id;
-		u32_t ticks_to_expire;
+		uint8_t id;
+		uint32_t ticks_to_expire;
 	} tickers[TICKERS_MAX];
-	u32_t ticks_to_expire;
-	u32_t ticks_current;
-	u8_t tickers_count;
-	u8_t ticker_id;
-	u8_t retry;
-	u8_t i;
+	uint32_t ticks_to_expire;
+	uint32_t ticks_current;
+	uint8_t tickers_count;
+	uint8_t ticker_id;
+	uint8_t retry;
+	uint8_t i;
 
 	ticker_id = TICKER_NULL;
 	ticks_to_expire = 0U;
@@ -53,9 +53,9 @@ int cmd_ticker_info(const struct shell *shell, size_t argc, char *argv[])
 	tickers_count = 0U;
 	retry = 4U;
 	do {
-		u32_t volatile err_cb = TICKER_STATUS_BUSY;
-		u32_t ticks_previous;
-		u32_t err;
+		uint32_t volatile err_cb = TICKER_STATUS_BUSY;
+		uint32_t ticks_previous;
+		uint32_t err;
 
 		ticks_previous = ticks_current;
 
diff --git a/subsys/canbus/canopen/CO_driver.c b/subsys/canbus/canopen/CO_driver.c
index 7a101cbace..405caf0d83 100644
--- a/subsys/canbus/canopen/CO_driver.c
+++ b/subsys/canbus/canopen/CO_driver.c
@@ -65,7 +65,7 @@ inline void canopen_od_unlock(void)
 
 static void canopen_detach_all_rx_filters(CO_CANmodule_t *CANmodule)
 {
-	u16_t i;
+	uint16_t i;
 
 	if (!CANmodule || !CANmodule->rx_array || !CANmodule->configured) {
 		return;
@@ -96,7 +96,7 @@ static void canopen_rx_isr_callback(struct zcan_frame *msg, void *arg)
 	buffer->pFunct(buffer->object, &rxMsg);
 }
 
-static void canopen_tx_isr_callback(u32_t error_flags, void *arg)
+static void canopen_tx_isr_callback(uint32_t error_flags, void *arg)
 {
 	CO_CANmodule_t *CANmodule = arg;
 
@@ -120,7 +120,7 @@ static void canopen_tx_retry(struct k_work *item)
 	struct zcan_frame msg;
 	CO_CANtx_t *buffer;
 	int err;
-	u16_t i;
+	uint16_t i;
 
 	CO_LOCK_CAN_SEND();
 
@@ -165,11 +165,11 @@ void CO_CANsetNormalMode(CO_CANmodule_t *CANmodule)
 
 CO_ReturnError_t CO_CANmodule_init(CO_CANmodule_t *CANmodule,
 				   void *CANdriverState,
-				   CO_CANrx_t rxArray[], u16_t rxSize,
-				   CO_CANtx_t txArray[], u16_t txSize,
-				   u16_t CANbitRate)
+				   CO_CANrx_t rxArray[], uint16_t rxSize,
+				   CO_CANtx_t txArray[], uint16_t txSize,
+				   uint16_t CANbitRate)
 {
-	u16_t i;
+	uint16_t i;
 	int err;
 
 	LOG_DBG("rxSize = %d, txSize = %d", rxSize, txSize);
@@ -240,13 +240,13 @@ void CO_CANmodule_disable(CO_CANmodule_t *CANmodule)
 	}
 }
 
-u16_t CO_CANrxMsg_readIdent(const CO_CANrxMsg_t *rxMsg)
+uint16_t CO_CANrxMsg_readIdent(const CO_CANrxMsg_t *rxMsg)
 {
 	return rxMsg->ident;
 }
 
-CO_ReturnError_t CO_CANrxBufferInit(CO_CANmodule_t *CANmodule, u16_t index,
-				u16_t ident, u16_t mask, bool_t rtr,
+CO_ReturnError_t CO_CANrxBufferInit(CO_CANmodule_t *CANmodule, uint16_t index,
+				uint16_t ident, uint16_t mask, bool_t rtr,
 				void *object,
 				CO_CANrxBufferCallback_t pFunct)
 {
@@ -291,8 +291,8 @@ CO_ReturnError_t CO_CANrxBufferInit(CO_CANmodule_t *CANmodule, u16_t index,
 	return CO_ERROR_NO;
 }
 
-CO_CANtx_t *CO_CANtxBufferInit(CO_CANmodule_t *CANmodule, u16_t index,
-			       u16_t ident, bool_t rtr, u8_t noOfBytes,
+CO_CANtx_t *CO_CANtxBufferInit(CO_CANmodule_t *CANmodule, uint16_t index,
+			       uint16_t ident, bool_t rtr, uint8_t noOfBytes,
 			       bool_t syncFlag)
 {
 	CO_CANtx_t *buffer;
@@ -365,7 +365,7 @@ void CO_CANclearPendingSyncPDOs(CO_CANmodule_t *CANmodule)
 {
 	bool_t tpdoDeleted = false;
 	CO_CANtx_t *buffer;
-	u16_t i;
+	uint16_t i;
 
 	if (!CANmodule) {
 		return;
@@ -394,8 +394,8 @@ void CO_CANverifyErrors(CO_CANmodule_t *CANmodule)
 	CO_EM_t *em = (CO_EM_t *)CANmodule->em;
 	struct can_bus_err_cnt err_cnt;
 	enum can_state state;
-	u8_t rx_overflows;
-	u32_t errors;
+	uint8_t rx_overflows;
+	uint32_t errors;
 
 	/*
 	 * TODO: Zephyr lacks an API for reading the rx mailbox
@@ -405,8 +405,8 @@ void CO_CANverifyErrors(CO_CANmodule_t *CANmodule)
 
 	state = can_get_state(CANmodule->dev, &err_cnt);
 
-	errors = ((u32_t)err_cnt.tx_err_cnt << 16) |
-		 ((u32_t)err_cnt.rx_err_cnt << 8) |
+	errors = ((uint32_t)err_cnt.tx_err_cnt << 16) |
+		 ((uint32_t)err_cnt.rx_err_cnt << 8) |
 		 rx_overflows;
 
 	if (errors != CANmodule->errors) {
diff --git a/subsys/canbus/canopen/CO_driver_target.h b/subsys/canbus/canopen/CO_driver_target.h
index a1f9c44384..686c6bec4e 100644
--- a/subsys/canbus/canopen/CO_driver_target.h
+++ b/subsys/canbus/canopen/CO_driver_target.h
@@ -55,9 +55,9 @@ typedef unsigned char oChar_t;
 typedef unsigned char domain_t;
 
 typedef struct canopen_rx_msg {
-	u8_t data[8];
-	u16_t ident;
-	u8_t DLC;
+	uint8_t data[8];
+	uint16_t ident;
+	uint8_t DLC;
 } CO_CANrxMsg_t;
 
 typedef void (*CO_CANrxBufferCallback_t)(void *object,
@@ -67,13 +67,13 @@ typedef struct canopen_rx {
 	int filter_id;
 	void *object;
 	CO_CANrxBufferCallback_t pFunct;
-	u16_t ident;
+	uint16_t ident;
 } CO_CANrx_t;
 
 typedef struct canopen_tx {
-	u8_t data[8];
-	u16_t ident;
-	u8_t DLC;
+	uint8_t data[8];
+	uint16_t ident;
+	uint8_t DLC;
 	bool_t rtr : 1;
 	bool_t bufferFull : 1;
 	bool_t syncFlag : 1;
@@ -83,9 +83,9 @@ typedef struct canopen_module {
 	struct device *dev;
 	CO_CANrx_t *rx_array;
 	CO_CANtx_t *tx_array;
-	u16_t rx_size;
-	u16_t tx_size;
-	u32_t errors;
+	uint16_t rx_size;
+	uint16_t tx_size;
+	uint32_t errors;
 	void *em;
 	bool_t configured : 1;
 	bool_t CANnormal : 1;
diff --git a/subsys/canbus/canopen/canopen_program.c b/subsys/canbus/canopen/canopen_program.c
index f319bb610e..68aa7c85cf 100644
--- a/subsys/canbus/canopen/canopen_program.c
+++ b/subsys/canbus/canopen/canopen_program.c
@@ -44,23 +44,23 @@ LOG_MODULE_REGISTER(canopen_program);
 #define FLASH_STATUS_UNSPECIFIED_ERROR   (63U << 1)
 
 struct canopen_program_context {
-	u32_t flash_status;
+	uint32_t flash_status;
 	size_t total;
 	CO_NMT_t *nmt;
 	CO_EM_t *em;
 	struct flash_img_context flash_img_ctx;
-	u8_t program_status;
+	uint8_t program_status;
 	bool flash_written;
 };
 
 static struct canopen_program_context ctx;
 
-static void canopen_program_set_status(u32_t status)
+static void canopen_program_set_status(uint32_t status)
 {
 	ctx.program_status = status;
 }
 
-static u32_t canopen_program_get_status(void)
+static uint32_t canopen_program_get_status(void)
 {
 	/*
 	 * Non-confirmed boot image takes precedence over other
@@ -229,7 +229,7 @@ static inline CO_SDO_abortCode_t canopen_program_cmd_confirm(void)
 static CO_SDO_abortCode_t canopen_odf_1f51(CO_ODF_arg_t *odf_arg)
 {
 	CO_SDO_abortCode_t ab;
-	u8_t cmd;
+	uint8_t cmd;
 
 	if (odf_arg->subIndex != 1U) {
 		return CO_SDO_AB_NONE;
@@ -247,7 +247,7 @@ static CO_SDO_abortCode_t canopen_odf_1f51(CO_ODF_arg_t *odf_arg)
 
 	/* Preserve old value */
 	cmd = odf_arg->data[0];
-	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u8_t));
+	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint8_t));
 
 	LOG_DBG("program status = %d, cmd = %d", canopen_program_get_status(),
 		cmd);
@@ -281,11 +281,11 @@ static CO_SDO_abortCode_t canopen_odf_1f56(CO_ODF_arg_t *odf_arg)
 	const struct flash_area *flash_area;
 	struct mcuboot_img_header header;
 	off_t offset = 0;
-	u32_t crc = 0;
+	uint32_t crc = 0;
 	size_t size;
-	u8_t fa_id;
-	u32_t data;
-	u32_t len;
+	uint8_t fa_id;
+	uint32_t data;
+	uint32_t len;
 	int err;
 
 	if (odf_arg->subIndex != 1U) {
@@ -294,7 +294,7 @@ static CO_SDO_abortCode_t canopen_odf_1f56(CO_ODF_arg_t *odf_arg)
 
 	if (!odf_arg->reading) {
 		/* Preserve old value */
-		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u32_t));
+		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint32_t));
 		return CO_SDO_AB_READONLY;
 	}
 
@@ -342,7 +342,7 @@ static CO_SDO_abortCode_t canopen_odf_1f56(CO_ODF_arg_t *odf_arg)
 			return CO_SDO_AB_HW;
 		}
 
-		crc = crc32_ieee_update(crc, (u8_t *)&data, size);
+		crc = crc32_ieee_update(crc, (uint8_t *)&data, size);
 		len -= size;
 		offset += size;
 	}
@@ -363,7 +363,7 @@ static CO_SDO_abortCode_t canopen_odf_1f57(CO_ODF_arg_t *odf_arg)
 
 	if (!odf_arg->reading) {
 		/* Preserve old value */
-		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u32_t));
+		memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint32_t));
 		return CO_SDO_AB_READONLY;
 	}
 
diff --git a/subsys/canbus/canopen/canopen_storage.c b/subsys/canbus/canopen/canopen_storage.c
index 2812fd06fc..2df537b2ad 100644
--- a/subsys/canbus/canopen/canopen_storage.c
+++ b/subsys/canbus/canopen/canopen_storage.c
@@ -29,7 +29,7 @@ static int canopen_storage_eeprom_error;
 static CO_SDO_abortCode_t canopen_odf_1010(CO_ODF_arg_t *odf_arg)
 {
 	CO_EM_t *em = odf_arg->object;
-	u32_t value;
+	uint32_t value;
 	int err;
 
 	value = CO_getUint32(odf_arg->data);
@@ -39,7 +39,7 @@ static CO_SDO_abortCode_t canopen_odf_1010(CO_ODF_arg_t *odf_arg)
 	}
 
 	/* Preserve old value */
-	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u32_t));
+	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint32_t));
 
 	if (odf_arg->subIndex != 1U) {
 		return CO_SDO_AB_NONE;
@@ -67,7 +67,7 @@ static CO_SDO_abortCode_t canopen_odf_1011(CO_ODF_arg_t *odf_arg)
 {
 	CO_EM_t *em = odf_arg->object;
 	bool failed = false;
-	u32_t value;
+	uint32_t value;
 	int err;
 
 	value = CO_getUint32(odf_arg->data);
@@ -77,7 +77,7 @@ static CO_SDO_abortCode_t canopen_odf_1011(CO_ODF_arg_t *odf_arg)
 	}
 
 	/* Preserve old value */
-	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(u32_t));
+	memcpy(odf_arg->data, odf_arg->ODdataStorage, sizeof(uint32_t));
 
 	if (odf_arg->subIndex < 1U) {
 		return CO_SDO_AB_NONE;
diff --git a/subsys/canbus/canopen/canopen_sync.c b/subsys/canbus/canopen/canopen_sync.c
index d5e2e80cbb..a01de7f190 100644
--- a/subsys/canbus/canopen/canopen_sync.c
+++ b/subsys/canbus/canopen/canopen_sync.c
@@ -18,10 +18,10 @@
  */
 static void canopen_sync_thread(void *p1, void *p2, void *p3)
 {
-	u32_t start; /* cycles */
-	u32_t stop;  /* cycles */
-	u32_t delta; /* cycles */
-	u32_t elapsed = 0; /* microseconds */
+	uint32_t start; /* cycles */
+	uint32_t stop;  /* cycles */
+	uint32_t delta; /* cycles */
+	uint32_t elapsed = 0; /* microseconds */
 	bool sync;
 
 	ARG_UNUSED(p1);
@@ -41,7 +41,7 @@ static void canopen_sync_thread(void *p1, void *p2, void *p3)
 		k_sleep(K_MSEC(1));
 		stop = k_cycle_get_32();
 		delta = stop - start;
-		elapsed = (u32_t)k_cyc_to_ns_floor64(delta) / NSEC_PER_USEC;
+		elapsed = (uint32_t)k_cyc_to_ns_floor64(delta) / NSEC_PER_USEC;
 	}
 }
 
diff --git a/subsys/canbus/isotp/isotp.c b/subsys/canbus/isotp/isotp.c
index 77822a859e..8a044867eb 100644
--- a/subsys/canbus/isotp/isotp.c
+++ b/subsys/canbus/isotp/isotp.c
@@ -23,11 +23,11 @@ static void receive_pool_free(struct net_buf *buf);
 static void receive_ff_sf_pool_free(struct net_buf *buf);
 
 NET_BUF_POOL_DEFINE(isotp_rx_pool, CONFIG_ISOTP_RX_BUF_COUNT,
-		    CONFIG_ISOTP_RX_BUF_SIZE, sizeof(u32_t),
+		    CONFIG_ISOTP_RX_BUF_SIZE, sizeof(uint32_t),
 		    receive_pool_free);
 
 NET_BUF_POOL_DEFINE(isotp_rx_sf_ff_pool, CONFIG_ISOTP_RX_SF_FF_BUF_COUNT,
-		    ISOTP_CAN_DL, sizeof(u32_t), receive_ff_sf_pool_free);
+		    ISOTP_CAN_DL, sizeof(uint32_t), receive_ff_sf_pool_free);
 
 static struct isotp_global_ctx global_ctx = {
 	.alloc_list = SYS_SLIST_STATIC_INIT(&global_ctx.alloc_list),
@@ -90,7 +90,7 @@ static inline void receive_report_error(struct isotp_recv_ctx *ctx, int err)
 	ctx->error_nr = err;
 }
 
-void receive_can_tx_isr(u32_t err_flags, void *arg)
+void receive_can_tx_isr(uint32_t err_flags, void *arg)
 {
 	struct isotp_recv_ctx *ctx = (struct isotp_recv_ctx *)arg;
 
@@ -101,10 +101,10 @@ void receive_can_tx_isr(u32_t err_flags, void *arg)
 	}
 }
 
-static inline u32_t receive_get_ff_length(struct net_buf *buf)
+static inline uint32_t receive_get_ff_length(struct net_buf *buf)
 {
-	u32_t len;
-	u8_t pci = net_buf_pull_u8(buf);
+	uint32_t len;
+	uint8_t pci = net_buf_pull_u8(buf);
 
 	len = ((pci & ISOTP_PCI_FF_DL_UPPER_MASK) << 8) | net_buf_pull_u8(buf);
 
@@ -116,9 +116,9 @@ static inline u32_t receive_get_ff_length(struct net_buf *buf)
 	return len;
 }
 
-static inline u32_t receive_get_sf_length(struct net_buf *buf)
+static inline uint32_t receive_get_sf_length(struct net_buf *buf)
 {
-	u8_t len = net_buf_pull_u8(buf) & ISOTP_PCI_SF_DL_MASK;
+	uint8_t len = net_buf_pull_u8(buf) & ISOTP_PCI_SF_DL_MASK;
 
 	/* Single frames > 16 bytes (CAN-FD only) */
 	if (IS_ENABLED(ISOTP_USE_CAN_FD) && !len) {
@@ -128,14 +128,14 @@ static inline u32_t receive_get_sf_length(struct net_buf *buf)
 	return len;
 }
 
-static void receive_send_fc(struct isotp_recv_ctx *ctx, u8_t fs)
+static void receive_send_fc(struct isotp_recv_ctx *ctx, uint8_t fs)
 {
 	struct zcan_frame frame = {
 		.id_type = ctx->tx_addr.id_type,
 		.rtr = CAN_DATAFRAME,
 		.ext_id = ctx->tx_addr.ext_id
 	};
-	u8_t *data = frame.data;
+	uint8_t *data = frame.data;
 	int ret;
 
 	__ASSERT_NO_MSG(!(fs & ISOTP_PCI_TYPE_MASK));
@@ -158,10 +158,10 @@ static void receive_send_fc(struct isotp_recv_ctx *ctx, u8_t fs)
 	}
 }
 
-static inline struct net_buf *receive_alloc_buffer_chain(u32_t len)
+static inline struct net_buf *receive_alloc_buffer_chain(uint32_t len)
 {
 	struct net_buf *buf, *frag, *last;
-	u32_t remaining_len;
+	uint32_t remaining_len;
 
 	LOG_DBG("Allocate %d bytes ", len);
 	buf = net_buf_alloc_fixed(&isotp_rx_pool, K_NO_WAIT);
@@ -260,7 +260,7 @@ static int receive_alloc_buffer(struct isotp_recv_ctx *ctx)
 static void receive_state_machine(struct isotp_recv_ctx *ctx)
 {
 	int ret;
-	u32_t *ud_rem_len;
+	uint32_t *ud_rem_len;
 
 	switch (ctx->state) {
 	case ISOTP_RX_STATE_PROCESS_SF:
@@ -418,7 +418,7 @@ static void process_ff_sf(struct isotp_recv_ctx *ctx, struct zcan_frame *frame)
 	net_buf_add_mem(ctx->buf, &frame->data[index], frame->dlc - index);
 }
 
-static inline void receive_add_mem(struct isotp_recv_ctx *ctx, u8_t *data,
+static inline void receive_add_mem(struct isotp_recv_ctx *ctx, uint8_t *data,
 				   size_t len)
 {
 	size_t tailroom = net_buf_tailroom(ctx->act_frag);
@@ -442,7 +442,7 @@ static inline void receive_add_mem(struct isotp_recv_ctx *ctx, u8_t *data,
 
 static void process_cf(struct isotp_recv_ctx *ctx, struct zcan_frame *frame)
 {
-	u32_t *ud_rem_len = (u32_t *)net_buf_user_data(ctx->buf);
+	uint32_t *ud_rem_len = (uint32_t *)net_buf_user_data(ctx->buf);
 	int index = 0;
 
 	if (ctx->rx_addr.use_ext_addr) {
@@ -641,7 +641,7 @@ int isotp_recv_net(struct isotp_recv_ctx *ctx, struct net_buf **buffer,
 
 	*buffer = buf;
 
-	return *(u32_t *)net_buf_user_data(buf);
+	return *(uint32_t *)net_buf_user_data(buf);
 }
 
 static inline void pull_frags(struct k_fifo *fifo, struct net_buf *buf,
@@ -666,7 +666,7 @@ static inline void pull_frags(struct k_fifo *fifo, struct net_buf *buf,
 	net_buf_unref(buf);
 }
 
-int isotp_recv(struct isotp_recv_ctx *ctx, u8_t *data, size_t len,
+int isotp_recv(struct isotp_recv_ctx *ctx, uint8_t *data, size_t len,
 	       k_timeout_t timeout)
 {
 	size_t num_copied, frags_len;
@@ -702,13 +702,13 @@ int isotp_recv(struct isotp_recv_ctx *ctx, u8_t *data, size_t len,
 	return num_copied;
 }
 
-static inline void send_report_error(struct isotp_send_ctx *ctx, u32_t err)
+static inline void send_report_error(struct isotp_send_ctx *ctx, uint32_t err)
 {
 	ctx->state = ISOTP_TX_ERR;
 	ctx->error_nr = err;
 }
 
-static void send_can_tx_isr(u32_t err_flags, void *arg)
+static void send_can_tx_isr(uint32_t err_flags, void *arg)
 {
 	struct isotp_send_ctx *ctx = (struct isotp_send_ctx *)arg;
 
@@ -741,7 +741,7 @@ static void send_timeout_handler(struct _timeout *to)
 static void send_process_fc(struct isotp_send_ctx *ctx,
 			    struct zcan_frame *frame)
 {
-	u8_t *data = frame->data;
+	uint8_t *data = frame->data;
 
 	if (ctx->rx_addr.use_ext_addr) {
 		if (ctx->rx_addr.ext_addr != *data++) {
@@ -810,7 +810,7 @@ static size_t get_ctx_data_length(struct isotp_send_ctx *ctx)
 	return ctx->is_net_buf ? net_buf_frags_len(ctx->buf) : ctx->len;
 }
 
-static const u8_t *get_data_ctx(struct isotp_send_ctx *ctx)
+static const uint8_t *get_data_ctx(struct isotp_send_ctx *ctx)
 {
 	if (ctx->is_net_buf) {
 		return ctx->buf->data;
@@ -839,7 +839,7 @@ static inline int send_sf(struct isotp_send_ctx *ctx)
 	size_t len = get_ctx_data_length(ctx);
 	int index = 0;
 	int ret;
-	const u8_t *data;
+	const uint8_t *data;
 
 	data = get_data_ctx(ctx);
 	pull_data_ctx(ctx, len);
@@ -872,7 +872,7 @@ static inline int send_ff(struct isotp_send_ctx *ctx)
 	int index = 0;
 	size_t len = get_ctx_data_length(ctx);
 	int ret;
-	const u8_t *data;
+	const uint8_t *data;
 
 	if (ctx->tx_addr.use_ext_addr) {
 		frame.data[index++] = ctx->tx_addr.ext_addr;
@@ -914,7 +914,7 @@ static inline int send_cf(struct isotp_send_ctx *ctx)
 	int ret;
 	int len;
 	int rem_len;
-	const u8_t *data;
+	const uint8_t *data;
 
 	if (ctx->tx_addr.use_ext_addr) {
 		frame.data[index++] = ctx->tx_addr.ext_addr;
@@ -973,7 +973,7 @@ static int alloc_ctx(struct isotp_send_ctx **ctx, k_timeout_t timeout)
 #define free_send_ctx(x)
 #endif /*CONFIG_ISOTP_ENABLE_CONTEXT_BUFFERS*/
 
-static k_timeout_t stmin_to_ticks(u8_t stmin)
+static k_timeout_t stmin_to_ticks(uint8_t stmin)
 {
 	/* According to ISO 15765-2 stmin should be 127ms if value is corrupt */
 	if (stmin > ISOTP_STMIN_MAX ||
@@ -1160,7 +1160,7 @@ static int send(struct isotp_send_ctx *ctx, struct device *can_dev,
 }
 
 int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev,
-	       const u8_t *data, size_t len,
+	       const uint8_t *data, size_t len,
 	       const struct isotp_msg_id *tx_addr,
 	       const struct isotp_msg_id *rx_addr,
 	       isotp_tx_callback_t complete_cb, void *cb_arg)
@@ -1176,7 +1176,7 @@ int isotp_send(struct isotp_send_ctx *ctx, struct device *can_dev,
 #ifdef CONFIG_ISOTP_ENABLE_CONTEXT_BUFFERS
 
 int isotp_send_ctx_buf(struct device *can_dev,
-		       const u8_t *data, size_t len,
+		       const uint8_t *data, size_t len,
 		       const struct isotp_msg_id *tx_addr,
 		       const struct isotp_msg_id *rx_addr,
 		       isotp_tx_callback_t complete_cb, void *cb_arg,
@@ -1224,7 +1224,7 @@ int isotp_send_net_ctx_buf(struct device *can_dev,
 
 #ifdef CONFIG_ISOTP_USE_TX_BUF
 int isotp_send_buf(struct device *can_dev,
-		   const u8_t *data, size_t len,
+		   const uint8_t *data, size_t len,
 		   const struct isotp_msg_id *tx_addr,
 		   const struct isotp_msg_id *rx_addr,
 		   isotp_tx_callback_t complete_cb, void *cb_arg,
diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c
index 130b47fffa..f2e866cc4b 100644
--- a/subsys/console/getchar.c
+++ b/subsys/console/getchar.c
@@ -12,8 +12,8 @@
 
 static struct tty_serial console_serial;
 
-static u8_t console_rxbuf[CONFIG_CONSOLE_GETCHAR_BUFSIZE];
-static u8_t console_txbuf[CONFIG_CONSOLE_PUTCHAR_BUFSIZE];
+static uint8_t console_rxbuf[CONFIG_CONSOLE_GETCHAR_BUFSIZE];
+static uint8_t console_txbuf[CONFIG_CONSOLE_PUTCHAR_BUFSIZE];
 
 ssize_t console_write(void *dummy, const void *buf, size_t size)
 {
@@ -36,7 +36,7 @@ int console_putchar(char c)
 
 int console_getchar(void)
 {
-	u8_t c;
+	uint8_t c;
 	int res;
 
 	res = tty_read(&console_serial, &c, 1);
diff --git a/subsys/console/tty.c b/subsys/console/tty.c
index 0927573c7a..fabdd3b76c 100644
--- a/subsys/console/tty.c
+++ b/subsys/console/tty.c
@@ -9,8 +9,8 @@
 #include <sys/printk.h>
 #include <console/tty.h>
 
-static int tty_irq_input_hook(struct tty_serial *tty, u8_t c);
-static int tty_putchar(struct tty_serial *tty, u8_t c);
+static int tty_irq_input_hook(struct tty_serial *tty, uint8_t c);
+static int tty_putchar(struct tty_serial *tty, uint8_t c);
 
 static void tty_uart_isr(void *user_data)
 {
@@ -20,7 +20,7 @@ static void tty_uart_isr(void *user_data)
 	uart_irq_update(dev);
 
 	if (uart_irq_rx_ready(dev)) {
-		u8_t c;
+		uint8_t c;
 
 		while (1) {
 			if (uart_fifo_read(dev, &c, 1) == 0) {
@@ -46,7 +46,7 @@ static void tty_uart_isr(void *user_data)
 	}
 }
 
-static int tty_irq_input_hook(struct tty_serial *tty, u8_t c)
+static int tty_irq_input_hook(struct tty_serial *tty, uint8_t c)
 {
 	int rx_next = tty->rx_put + 1;
 
@@ -67,7 +67,7 @@ static int tty_irq_input_hook(struct tty_serial *tty, u8_t c)
 	return 1;
 }
 
-static int tty_putchar(struct tty_serial *tty, u8_t c)
+static int tty_putchar(struct tty_serial *tty, uint8_t c)
 {
 	unsigned int key;
 	int tx_next;
@@ -98,7 +98,7 @@ static int tty_putchar(struct tty_serial *tty, u8_t c)
 
 ssize_t tty_write(struct tty_serial *tty, const void *buf, size_t size)
 {
-	const u8_t *p = buf;
+	const uint8_t *p = buf;
 	size_t out_size = 0;
 	int res = 0;
 
@@ -140,7 +140,7 @@ ssize_t tty_write(struct tty_serial *tty, const void *buf, size_t size)
 static int tty_getchar(struct tty_serial *tty)
 {
 	unsigned int key;
-	u8_t c;
+	uint8_t c;
 	int res;
 
 	res = k_sem_take(&tty->rx_sem, SYS_TIMEOUT_MS(tty->rx_timeout));
@@ -160,13 +160,13 @@ static int tty_getchar(struct tty_serial *tty)
 
 static ssize_t tty_read_unbuf(struct tty_serial *tty, void *buf, size_t size)
 {
-	u8_t *p = buf;
+	uint8_t *p = buf;
 	size_t out_size = 0;
 	int res = 0;
-	u32_t timeout = tty->rx_timeout;
+	uint32_t timeout = tty->rx_timeout;
 
 	while (size) {
-		u8_t c;
+		uint8_t c;
 		res = uart_poll_in(tty->uart_dev, &c);
 		if (res <= -2) {
 			/* Error occurred, best we can do is to return
@@ -204,7 +204,7 @@ static ssize_t tty_read_unbuf(struct tty_serial *tty, void *buf, size_t size)
 
 ssize_t tty_read(struct tty_serial *tty, void *buf, size_t size)
 {
-	u8_t *p = buf;
+	uint8_t *p = buf;
 	size_t out_size = 0;
 	int res = 0;
 
@@ -230,7 +230,7 @@ ssize_t tty_read(struct tty_serial *tty, void *buf, size_t size)
 			return out_size;
 		}
 
-		*p++ = (u8_t)res;
+		*p++ = (uint8_t)res;
 		out_size++;
 	}
 
diff --git a/subsys/debug/openocd.c b/subsys/debug/openocd.c
index 4cae96affd..0e7d8801d9 100644
--- a/subsys/debug/openocd.c
+++ b/subsys/debug/openocd.c
@@ -107,5 +107,5 @@ __attribute__((used, section(".openocd_dbg")))
 size_t _kernel_openocd_num_offsets = ARRAY_SIZE(_kernel_openocd_offsets);
 
 __attribute__((used, section(".openocd_dbg")))
-u8_t _kernel_openocd_size_t_size = (u8_t)sizeof(size_t);
+uint8_t _kernel_openocd_size_t_size = (uint8_t)sizeof(size_t);
 #endif
diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index df642f1dfd..3e5800064c 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -41,19 +41,19 @@
  * Raw (on-flash) representation of the v1 image header.
  */
 struct mcuboot_v1_raw_header {
-	u32_t header_magic;
-	u32_t image_load_address;
-	u16_t header_size;
-	u16_t pad;
-	u32_t image_size;
-	u32_t image_flags;
+	uint32_t header_magic;
+	uint32_t image_load_address;
+	uint16_t header_size;
+	uint16_t pad;
+	uint32_t image_size;
+	uint32_t image_flags;
 	struct {
-		u8_t major;
-		u8_t minor;
-		u16_t revision;
-		u32_t build_num;
+		uint8_t major;
+		uint8_t minor;
+		uint16_t revision;
+		uint32_t build_num;
 	} version;
-	u32_t pad2;
+	uint32_t pad2;
 } __packed;
 
 /*
@@ -97,7 +97,7 @@ struct mcuboot_v1_raw_header {
 				  BOOT_MAX_ALIGN)
 #define MAGIC_OFFS(bank_area) ((bank_area)->fa_size - BOOT_MAGIC_SZ)
 
-static const u32_t boot_img_magic[4] = {
+static const uint32_t boot_img_magic[4] = {
 	0xf395c277,
 	0x7fefd260,
 	0x0f505235,
@@ -108,21 +108,21 @@ static const u32_t boot_img_magic[4] = {
 
 struct boot_swap_table {
 	/** For each field, a value of 0 means "any". */
-	u8_t magic_primary_slot;
-	u8_t magic_secondary_slot;
-	u8_t image_ok_primary_slot;
-	u8_t image_ok_secondary_slot;
-	u8_t copy_done_primary_slot;
+	uint8_t magic_primary_slot;
+	uint8_t magic_secondary_slot;
+	uint8_t image_ok_primary_slot;
+	uint8_t image_ok_secondary_slot;
+	uint8_t copy_done_primary_slot;
 
-	u8_t swap_type;
+	uint8_t swap_type;
 };
 
 /** Represents the management state of a single image slot. */
 struct boot_swap_state {
-	u8_t magic;     /* One of the BOOT_MAGIC_[...] values. */
-	u8_t swap_type; /* One of the BOOT_SWAP_TYPE_[...] values. */
-	u8_t copy_done; /* One of the BOOT_FLAG_[...] values. */
-	u8_t image_ok;  /* One of the BOOT_FLAG_[...] values. */
+	uint8_t magic;     /* One of the BOOT_MAGIC_[...] values. */
+	uint8_t swap_type; /* One of the BOOT_SWAP_TYPE_[...] values. */
+	uint8_t copy_done; /* One of the BOOT_FLAG_[...] values. */
+	uint8_t image_ok;  /* One of the BOOT_FLAG_[...] values. */
 };
 
 /**
@@ -188,7 +188,7 @@ static const struct boot_swap_table boot_swap_tables[] = {
 };
 #define BOOT_SWAP_TABLES_COUNT (ARRAY_SIZE(boot_swap_tables))
 
-static int boot_magic_decode(const u32_t *magic)
+static int boot_magic_decode(const uint32_t *magic)
 {
 	if (memcmp(magic, boot_img_magic, BOOT_MAGIC_SZ) == 0) {
 		return BOOT_MAGIC_GOOD;
@@ -197,7 +197,7 @@ static int boot_magic_decode(const u32_t *magic)
 	return BOOT_MAGIC_BAD;
 }
 
-static int boot_flag_decode(u8_t flag)
+static int boot_flag_decode(uint8_t flag)
 {
 	if (flag != BOOT_FLAG_SET) {
 		return BOOT_FLAG_BAD;
@@ -219,9 +219,9 @@ uint8_t flash_area_erased_val(const struct flash_area *fa)
 int flash_area_read_is_empty(const struct flash_area *fa, uint32_t off,
 	void *dst, uint32_t len)
 {
-	const u8_t erase_val = flash_area_erased_val(fa);
-	u8_t *u8dst;
-	u8_t i;
+	const uint8_t erase_val = flash_area_erased_val(fa);
+	uint8_t *u8dst;
+	uint8_t i;
 	int rc;
 
 	rc = flash_area_read(fa, off, dst, len);
@@ -238,7 +238,7 @@ int flash_area_read_is_empty(const struct flash_area *fa, uint32_t off,
 	return 1;
 }
 
-static int erased_flag_val(u8_t bank_id)
+static int erased_flag_val(uint8_t bank_id)
 {
 	const struct flash_area *fa;
 	int rc;
@@ -261,7 +261,7 @@ static int erased_flag_val(u8_t bank_id)
  * @return                      1 if the two values are compatible;
  *                              0 otherwise.
  */
-int boot_magic_compatible_check(u8_t tbl_val, u8_t val)
+int boot_magic_compatible_check(uint8_t tbl_val, uint8_t val)
 {
 	switch (tbl_val) {
 	case BOOT_MAGIC_ANY:
@@ -275,7 +275,7 @@ int boot_magic_compatible_check(u8_t tbl_val, u8_t val)
 	}
 }
 
-static int boot_flag_offs(int flag, const struct flash_area *fa, u32_t *offs)
+static int boot_flag_offs(int flag, const struct flash_area *fa, uint32_t *offs)
 {
 	switch (flag) {
 	case BOOT_FLAG_COPY_DONE:
@@ -289,12 +289,12 @@ static int boot_flag_offs(int flag, const struct flash_area *fa, u32_t *offs)
 	}
 }
 
-static int boot_write_trailer_byte(const struct flash_area *fa, u32_t off,
-				   u8_t val)
+static int boot_write_trailer_byte(const struct flash_area *fa, uint32_t off,
+				   uint8_t val)
 {
-	u8_t buf[BOOT_MAX_ALIGN];
-	u8_t align;
-	u8_t erased_val;
+	uint8_t buf[BOOT_MAX_ALIGN];
+	uint8_t align;
+	uint8_t erased_val;
 	int rc;
 
 	align = flash_area_align(fa);
@@ -311,10 +311,10 @@ static int boot_write_trailer_byte(const struct flash_area *fa, u32_t off,
 	return 0;
 }
 
-static int boot_flag_write(int flag, u8_t bank_id)
+static int boot_flag_write(int flag, uint8_t bank_id)
 {
 	const struct flash_area *fa;
-	u32_t offs;
+	uint32_t offs;
 	int rc;
 
 	rc = flash_area_open(bank_id, &fa);
@@ -334,12 +334,12 @@ static int boot_flag_write(int flag, u8_t bank_id)
 	return rc;
 }
 
-static int boot_flag_read(int flag, u8_t bank_id)
+static int boot_flag_read(int flag, uint8_t bank_id)
 {
 	const struct flash_area *fa;
-	u32_t offs;
+	uint32_t offs;
 	int rc;
-	u8_t flag_val;
+	uint8_t flag_val;
 
 	rc = flash_area_open(bank_id, &fa);
 	if (rc) {
@@ -360,20 +360,20 @@ static int boot_flag_read(int flag, u8_t bank_id)
 	return flag_val;
 }
 
-static int boot_image_ok_read(u8_t bank_id)
+static int boot_image_ok_read(uint8_t bank_id)
 {
 	return boot_flag_read(BOOT_FLAG_IMAGE_OK, bank_id);
 }
 
-static int boot_image_ok_write(u8_t bank_id)
+static int boot_image_ok_write(uint8_t bank_id)
 {
 	return boot_flag_write(BOOT_FLAG_IMAGE_OK, bank_id);
 }
 
-static int boot_magic_write(u8_t bank_id)
+static int boot_magic_write(uint8_t bank_id)
 {
 	const struct flash_area *fa;
-	u32_t offs;
+	uint32_t offs;
 	int rc;
 
 	rc = flash_area_open(bank_id, &fa);
@@ -390,10 +390,10 @@ static int boot_magic_write(u8_t bank_id)
 }
 
 #ifdef CONFIG_MCUBOOT_TRAILER_SWAP_TYPE
-static int boot_swap_type_write(u8_t bank_id, u8_t swap_type)
+static int boot_swap_type_write(uint8_t bank_id, uint8_t swap_type)
 {
 	const struct flash_area *fa;
-	u32_t offs;
+	uint32_t offs;
 	int rc;
 
 	rc = flash_area_open(bank_id, &fa);
@@ -410,7 +410,7 @@ static int boot_swap_type_write(u8_t bank_id, u8_t swap_type)
 }
 #endif
 
-static int boot_read_v1_header(u8_t area_id,
+static int boot_read_v1_header(uint8_t area_id,
 			       struct mcuboot_v1_raw_header *v1_raw)
 {
 	const struct flash_area *fa;
@@ -456,14 +456,14 @@ static int boot_read_v1_header(u8_t area_id,
 	return 0;
 }
 
-int boot_read_bank_header(u8_t area_id,
+int boot_read_bank_header(uint8_t area_id,
 			  struct mcuboot_img_header *header,
 			  size_t header_size)
 {
 	int rc;
 	struct mcuboot_v1_raw_header v1_raw;
 	struct mcuboot_img_sem_ver *sem_ver;
-	size_t v1_min_size = (sizeof(u32_t) +
+	size_t v1_min_size = (sizeof(uint32_t) +
 			      sizeof(struct mcuboot_img_header_v1));
 
 	/*
@@ -500,8 +500,8 @@ int boot_read_bank_header(u8_t area_id,
 static int boot_read_swap_state(const struct flash_area *fa,
 				struct boot_swap_state *state)
 {
-	u32_t magic[BOOT_MAGIC_ARR_SZ];
-	u32_t off;
+	uint32_t magic[BOOT_MAGIC_ARR_SZ];
+	uint32_t off;
 	int rc;
 
 	off = MAGIC_OFFS(fa);
@@ -653,7 +653,7 @@ int mcuboot_swap_type(void)
 int boot_request_upgrade(int permanent)
 {
 #ifdef CONFIG_MCUBOOT_TRAILER_SWAP_TYPE
-	u8_t swap_type;
+	uint8_t swap_type;
 #endif
 	int rc;
 
@@ -703,7 +703,7 @@ int boot_write_img_confirmed(void)
 	return rc;
 }
 
-int boot_erase_img_bank(u8_t area_id)
+int boot_erase_img_bank(uint8_t area_id)
 {
 	const struct flash_area *fa;
 	int rc;
diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c
index 88a47f3daf..f0c5cefaa9 100644
--- a/subsys/dfu/img_util/flash_img.c
+++ b/subsys/dfu/img_util/flash_img.c
@@ -31,7 +31,7 @@ BUILD_ASSERT((CONFIG_IMG_BLOCK_BUF_SIZE % FLASH_WRITE_BLOCK_SIZE == 0),
 	     "CONFIG_IMG_BLOCK_BUF_SIZE is not a multiple of "
 	     "FLASH_WRITE_BLOCK_SIZE");
 
-int flash_img_buffered_write(struct flash_img_context *ctx, u8_t *data,
+int flash_img_buffered_write(struct flash_img_context *ctx, uint8_t *data,
 			     size_t len, bool flush)
 {
 	int rc;
@@ -61,7 +61,7 @@ size_t flash_img_bytes_written(struct flash_img_context *ctx)
 	return stream_flash_bytes_written(&ctx->stream);
 }
 
-int flash_img_init_id(struct flash_img_context *ctx, u8_t area_id)
+int flash_img_init_id(struct flash_img_context *ctx, uint8_t area_id)
 {
 	int rc;
 	struct device *flash_dev;
diff --git a/subsys/disk/disk_access.c b/subsys/disk/disk_access.c
index 5277488e80..3d11908888 100644
--- a/subsys/disk/disk_access.c
+++ b/subsys/disk/disk_access.c
@@ -79,8 +79,8 @@ int disk_access_status(const char *pdrv)
 	return rc;
 }
 
-int disk_access_read(const char *pdrv, u8_t *data_buf,
-		     u32_t start_sector, u32_t num_sector)
+int disk_access_read(const char *pdrv, uint8_t *data_buf,
+		     uint32_t start_sector, uint32_t num_sector)
 {
 	struct disk_info *disk = disk_access_get_di(pdrv);
 	int rc = -EINVAL;
@@ -93,8 +93,8 @@ int disk_access_read(const char *pdrv, u8_t *data_buf,
 	return rc;
 }
 
-int disk_access_write(const char *pdrv, const u8_t *data_buf,
-		      u32_t start_sector, u32_t num_sector)
+int disk_access_write(const char *pdrv, const uint8_t *data_buf,
+		      uint32_t start_sector, uint32_t num_sector)
 {
 	struct disk_info *disk = disk_access_get_di(pdrv);
 	int rc = -EINVAL;
@@ -107,7 +107,7 @@ int disk_access_write(const char *pdrv, const u8_t *data_buf,
 	return rc;
 }
 
-int disk_access_ioctl(const char *pdrv, u8_t cmd, void *buf)
+int disk_access_ioctl(const char *pdrv, uint8_t cmd, void *buf)
 {
 	struct disk_info *disk = disk_access_get_di(pdrv);
 	int rc = -EINVAL;
diff --git a/subsys/disk/disk_access_flash.c b/subsys/disk/disk_access_flash.c
index d58c7a8e9d..b89237e3a5 100644
--- a/subsys/disk/disk_access_flash.c
+++ b/subsys/disk/disk_access_flash.c
@@ -19,8 +19,8 @@
 static struct device *flash_dev;
 
 /* flash read-copy-erase-write operation */
-static u8_t __aligned(4) read_copy_buf[CONFIG_DISK_ERASE_BLOCK_SIZE];
-static u8_t *fs_buff = read_copy_buf;
+static uint8_t __aligned(4) read_copy_buf[CONFIG_DISK_ERASE_BLOCK_SIZE];
+static uint8_t *fs_buff = read_copy_buf;
 
 /* calculate number of blocks required for a given size */
 #define GET_NUM_BLOCK(total_size, block_size) \
@@ -29,7 +29,7 @@ static u8_t *fs_buff = read_copy_buf;
 #define GET_SIZE_TO_BOUNDARY(start, block_size) \
 	(block_size - (start & (block_size - 1)))
 
-static off_t lba_to_address(u32_t sector_num)
+static off_t lba_to_address(uint32_t sector_num)
 {
 	off_t flash_addr;
 
@@ -64,13 +64,13 @@ static int disk_flash_access_init(struct disk_info *disk)
 	return 0;
 }
 
-static int disk_flash_access_read(struct disk_info *disk, u8_t *buff,
-				u32_t start_sector, u32_t sector_count)
+static int disk_flash_access_read(struct disk_info *disk, uint8_t *buff,
+				uint32_t start_sector, uint32_t sector_count)
 {
 	off_t fl_addr;
-	u32_t remaining;
-	u32_t len;
-	u32_t num_read;
+	uint32_t remaining;
+	uint32_t len;
+	uint32_t num_read;
 
 	fl_addr = lba_to_address(start_sector);
 	remaining = (sector_count * SECTOR_SIZE);
@@ -78,7 +78,7 @@ static int disk_flash_access_read(struct disk_info *disk, u8_t *buff,
 
 	num_read = GET_NUM_BLOCK(remaining, CONFIG_DISK_FLASH_MAX_RW_SIZE);
 
-	for (u32_t i = 0; i < num_read; i++) {
+	for (uint32_t i = 0; i < num_read; i++) {
 		if (remaining < CONFIG_DISK_FLASH_MAX_RW_SIZE) {
 			len = remaining;
 		}
@@ -96,13 +96,13 @@ static int disk_flash_access_read(struct disk_info *disk, u8_t *buff,
 }
 
 /* This performs read-copy into an output buffer */
-static int read_copy_flash_block(off_t start_addr, u32_t size,
+static int read_copy_flash_block(off_t start_addr, uint32_t size,
 				 const void *src_buff,
-				 u8_t *dest_buff)
+				 uint8_t *dest_buff)
 {
 	off_t fl_addr;
-	u32_t num_read;
-	u32_t offset = 0U;
+	uint32_t num_read;
+	uint32_t offset = 0U;
 
 	/* adjust offset if starting address is not erase-aligned address */
 	if (start_addr & (CONFIG_DISK_FLASH_ERASE_ALIGNMENT - 1)) {
@@ -116,7 +116,7 @@ static int read_copy_flash_block(off_t start_addr, u32_t size,
 				 CONFIG_DISK_FLASH_MAX_RW_SIZE);
 
 	/* read one block from flash */
-	for (u32_t i = 0; i < num_read; i++) {
+	for (uint32_t i = 0; i < num_read; i++) {
 		int rc;
 
 		rc = flash_read(flash_dev,
@@ -137,11 +137,11 @@ static int read_copy_flash_block(off_t start_addr, u32_t size,
 /* input size is either less or equal to a block size,
  * CONFIG_DISK_ERASE_BLOCK_SIZE.
  */
-static int update_flash_block(off_t start_addr, u32_t size, const void *buff)
+static int update_flash_block(off_t start_addr, uint32_t size, const void *buff)
 {
 	off_t fl_addr;
-	u8_t *src = (u8_t *)buff;
-	u32_t num_write;
+	uint8_t *src = (uint8_t *)buff;
+	uint32_t num_write;
 
 	/* if size is a partial block, perform read-copy with user data */
 	if (size < CONFIG_DISK_ERASE_BLOCK_SIZE) {
@@ -153,7 +153,7 @@ static int update_flash_block(off_t start_addr, u32_t size, const void *buff)
 		}
 
 		/* now use the local buffer as the source */
-		src = (u8_t *)fs_buff;
+		src = (uint8_t *)fs_buff;
 	}
 
 	/* always align starting address for flash write operation */
@@ -170,7 +170,7 @@ static int update_flash_block(off_t start_addr, u32_t size, const void *buff)
 	num_write = GET_NUM_BLOCK(CONFIG_DISK_ERASE_BLOCK_SIZE,
 				  CONFIG_DISK_FLASH_MAX_RW_SIZE);
 
-	for (u32_t i = 0; i < num_write; i++) {
+	for (uint32_t i = 0; i < num_write; i++) {
 		/* flash_write reenabled write-protection so disable it again */
 		flash_write_protection_set(flash_dev, false);
 
@@ -186,12 +186,12 @@ static int update_flash_block(off_t start_addr, u32_t size, const void *buff)
 	return 0;
 }
 
-static int disk_flash_access_write(struct disk_info *disk, const u8_t *buff,
-				 u32_t start_sector, u32_t sector_count)
+static int disk_flash_access_write(struct disk_info *disk, const uint8_t *buff,
+				 uint32_t start_sector, uint32_t sector_count)
 {
 	off_t fl_addr;
-	u32_t remaining;
-	u32_t size;
+	uint32_t remaining;
+	uint32_t size;
 
 	fl_addr = lba_to_address(start_sector);
 	remaining = (sector_count * SECTOR_SIZE);
@@ -255,19 +255,19 @@ static int disk_flash_access_write(struct disk_info *disk, const u8_t *buff,
 	return 0;
 }
 
-static int disk_flash_access_ioctl(struct disk_info *disk, u8_t cmd, void *buff)
+static int disk_flash_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
 {
 	switch (cmd) {
 	case DISK_IOCTL_CTRL_SYNC:
 		return 0;
 	case DISK_IOCTL_GET_SECTOR_COUNT:
-		*(u32_t *)buff = CONFIG_DISK_VOLUME_SIZE / SECTOR_SIZE;
+		*(uint32_t *)buff = CONFIG_DISK_VOLUME_SIZE / SECTOR_SIZE;
 		return 0;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
-		*(u32_t *) buff = SECTOR_SIZE;
+		*(uint32_t *) buff = SECTOR_SIZE;
 		return 0;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ: /* in sectors */
-		*(u32_t *)buff = CONFIG_DISK_ERASE_BLOCK_SIZE / SECTOR_SIZE;
+		*(uint32_t *)buff = CONFIG_DISK_ERASE_BLOCK_SIZE / SECTOR_SIZE;
 		return 0;
 	default:
 		break;
diff --git a/subsys/disk/disk_access_ram.c b/subsys/disk/disk_access_ram.c
index 5943ea362a..d3a056015b 100644
--- a/subsys/disk/disk_access_ram.c
+++ b/subsys/disk/disk_access_ram.c
@@ -24,10 +24,10 @@
  * target's RAM limits).
  */
 #define RAMDISK_VOLUME_SIZE (CONFIG_DISK_RAM_VOLUME_SIZE * 1024)
-static u8_t ramdisk_buf[RAMDISK_VOLUME_SIZE];
+static uint8_t ramdisk_buf[RAMDISK_VOLUME_SIZE];
 #endif
 
-static void *lba_to_address(u32_t lba)
+static void *lba_to_address(uint32_t lba)
 {
 	__ASSERT(((lba * RAMDISK_SECTOR_SIZE) < RAMDISK_VOLUME_SIZE),
 		 "FS bound error");
@@ -45,35 +45,35 @@ static int disk_ram_access_init(struct disk_info *disk)
 	return 0;
 }
 
-static int disk_ram_access_read(struct disk_info *disk, u8_t *buff,
-				u32_t sector, u32_t count)
+static int disk_ram_access_read(struct disk_info *disk, uint8_t *buff,
+				uint32_t sector, uint32_t count)
 {
 	memcpy(buff, lba_to_address(sector), count * RAMDISK_SECTOR_SIZE);
 
 	return 0;
 }
 
-static int disk_ram_access_write(struct disk_info *disk, const u8_t *buff,
-				 u32_t sector, u32_t count)
+static int disk_ram_access_write(struct disk_info *disk, const uint8_t *buff,
+				 uint32_t sector, uint32_t count)
 {
 	memcpy(lba_to_address(sector), buff, count * RAMDISK_SECTOR_SIZE);
 
 	return 0;
 }
 
-static int disk_ram_access_ioctl(struct disk_info *disk, u8_t cmd, void *buff)
+static int disk_ram_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
 {
 	switch (cmd) {
 	case DISK_IOCTL_CTRL_SYNC:
 		break;
 	case DISK_IOCTL_GET_SECTOR_COUNT:
-		*(u32_t *)buff = RAMDISK_VOLUME_SIZE / RAMDISK_SECTOR_SIZE;
+		*(uint32_t *)buff = RAMDISK_VOLUME_SIZE / RAMDISK_SECTOR_SIZE;
 		break;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
-		*(u32_t *)buff = RAMDISK_SECTOR_SIZE;
+		*(uint32_t *)buff = RAMDISK_SECTOR_SIZE;
 		break;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
-		*(u32_t *)buff  = 1U;
+		*(uint32_t *)buff  = 1U;
 		break;
 	default:
 		return -EINVAL;
diff --git a/subsys/disk/disk_access_sdhc.h b/subsys/disk/disk_access_sdhc.h
index 7387bedc6e..133e449220 100644
--- a/subsys/disk/disk_access_sdhc.h
+++ b/subsys/disk/disk_access_sdhc.h
@@ -224,76 +224,76 @@ enum sd_ocr_flag {
 #define SD_PRODUCT_NAME_BYTES (5U)
 
 struct sd_cid {
-	u8_t manufacturer;
+	uint8_t manufacturer;
 	/*!< Manufacturer ID [127:120] */
-	u16_t application;
+	uint16_t application;
 	/*!< OEM/Application ID [119:104] */
-	u8_t name[SD_PRODUCT_NAME_BYTES];
+	uint8_t name[SD_PRODUCT_NAME_BYTES];
 	/*!< Product name [103:64] */
-	u8_t version;
+	uint8_t version;
 	/*!< Product revision [63:56] */
-	u32_t ser_num;
+	uint32_t ser_num;
 	/*!< Product serial number [55:24] */
-	u16_t date;
+	uint16_t date;
 	/*!< Manufacturing date [19:8] */
 };
 
 struct sd_csd {
-	u8_t csd_structure;
+	uint8_t csd_structure;
 	/*!< CSD structure [127:126] */
-	u8_t read_time1;
+	uint8_t read_time1;
 	/*!< Data read access-time-1 [119:112] */
-	u8_t read_time2;
+	uint8_t read_time2;
 	/*!< Data read access-time-2 in clock cycles (NSAC*100) [111:104] */
-	u8_t xfer_rate;
+	uint8_t xfer_rate;
 	/*!< Maximum data transfer rate [103:96] */
-	u16_t cmd_class;
+	uint16_t cmd_class;
 	/*!< Card command classes [95:84] */
-	u8_t read_blk_len;
+	uint8_t read_blk_len;
 	/*!< Maximum read data block length [83:80] */
-	u16_t flags;
+	uint16_t flags;
 	/*!< Flags in _sd_csd_flag */
-	u32_t device_size;
+	uint32_t device_size;
 	/*!< Device size [73:62] */
-	u8_t read_current_min;
+	uint8_t read_current_min;
 	/*!< Maximum read current at VDD min [61:59] */
-	u8_t read_current_max;
+	uint8_t read_current_max;
 	/*!< Maximum read current at VDD max [58:56] */
-	u8_t write_current_min;
+	uint8_t write_current_min;
 	/*!< Maximum write current at VDD min [55:53] */
-	u8_t write_current_max;
+	uint8_t write_current_max;
 	/*!< Maximum write current at VDD max [52:50] */
-	u8_t dev_size_mul;
+	uint8_t dev_size_mul;
 	/*!< Device size multiplier [49:47] */
 
-	u8_t erase_size;
+	uint8_t erase_size;
 	/*!< Erase sector size [45:39] */
-	u8_t write_prtect_size;
+	uint8_t write_prtect_size;
 	/*!< Write protect group size [38:32] */
-	u8_t write_speed_factor;
+	uint8_t write_speed_factor;
 	/*!< Write speed factor [28:26] */
-	u8_t write_blk_len;
+	uint8_t write_blk_len;
 	/*!< Maximum write data block length [25:22] */
-	u8_t file_fmt;
+	uint8_t file_fmt;
 	/*!< File format [11:10] */
 };
 
 struct sd_scr {
-	u8_t scr_structure;
+	uint8_t scr_structure;
 	/*!< SCR Structure [63:60] */
-	u8_t sd_spec;
+	uint8_t sd_spec;
 	/*!< SD memory card specification version [59:56] */
-	u16_t flags;
+	uint16_t flags;
 	/*!< SCR flags in _sd_scr_flag */
-	u8_t sd_sec;
+	uint8_t sd_sec;
 	/*!< Security specification supported [54:52] */
-	u8_t sd_width;
+	uint8_t sd_width;
 	/*!< Data bus widths supported [51:48] */
-	u8_t sd_ext_sec;
+	uint8_t sd_ext_sec;
 	/*!< Extended security support [46:43] */
-	u8_t cmd_support;
+	uint8_t cmd_support;
 	/*!< Command support bits [33:32] 33-support CMD23, 32-support cmd20*/
-	u32_t rsvd;
+	uint32_t rsvd;
 	/*!< reserved for manufacturer usage [31:0] */
 };
 
@@ -336,10 +336,10 @@ enum sd_voltage {
 #define SDMMC_DEFAULT_BLOCK_SIZE (512U)
 
 struct sd_data_op {
-	u32_t start_block;
-	u32_t block_size;
-	u32_t block_count;
-	u32_t *buf;
+	uint32_t start_block;
+	uint32_t block_size;
+	uint32_t block_count;
+	uint32_t *buf;
 };
 
 enum sd_switch_arg {
@@ -436,20 +436,20 @@ enum sd_command_class {
 };
 
 struct sdhc_retry {
-	u32_t end;
-	s16_t tries;
-	u16_t sleep;
+	uint32_t end;
+	int16_t tries;
+	uint16_t sleep;
 };
 
 struct sdhc_flag_map {
-	u8_t mask;
-	u8_t err;
+	uint8_t mask;
+	uint8_t err;
 };
 
 /* The SD protocol requires sending ones while reading but Zephyr
  * defaults to writing zeros.
  */
-static const u8_t sdhc_ones[] = {
+static const uint8_t sdhc_ones[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -550,8 +550,8 @@ static inline int sdhc_map_data_status(int status)
 }
 
 /* Initialises a retry helper */
-static inline void sdhc_retry_init(struct sdhc_retry *retry, u32_t timeout,
-			    u16_t sleep)
+static inline void sdhc_retry_init(struct sdhc_retry *retry, uint32_t timeout,
+			    uint16_t sleep)
 {
 	retry->end = k_uptime_get_32() + timeout;
 	retry->tries = 0;
@@ -563,7 +563,7 @@ static inline void sdhc_retry_init(struct sdhc_retry *retry, u32_t timeout,
  */
 static inline bool sdhc_retry_ok(struct sdhc_retry *retry)
 {
-	s32_t remain = retry->end - k_uptime_get_32();
+	int32_t remain = retry->end - k_uptime_get_32();
 
 	if (retry->tries < SDHC_MIN_TRIES) {
 		retry->tries++;
@@ -588,21 +588,21 @@ static inline bool sdhc_retry_ok(struct sdhc_retry *retry)
 }
 
 static inline void sdhc_decode_csd(struct sd_csd *csd,
-	u32_t *raw_csd, u32_t *blk_cout, u32_t *blk_size)
+	uint32_t *raw_csd, uint32_t *blk_cout, uint32_t *blk_size)
 {
-	u32_t tmp_blk_cout, tmp_blk_size;
+	uint32_t tmp_blk_cout, tmp_blk_size;
 
-	csd->csd_structure = (u8_t)((raw_csd[3U] &
+	csd->csd_structure = (uint8_t)((raw_csd[3U] &
 		0xC0000000U) >> 30U);
-	csd->read_time1 = (u8_t)((raw_csd[3U] &
+	csd->read_time1 = (uint8_t)((raw_csd[3U] &
 		0xFF0000U) >> 16U);
-	csd->read_time2 = (u8_t)((raw_csd[3U] &
+	csd->read_time2 = (uint8_t)((raw_csd[3U] &
 		0xFF00U) >> 8U);
-	csd->xfer_rate = (u8_t)(raw_csd[3U] &
+	csd->xfer_rate = (uint8_t)(raw_csd[3U] &
 		0xFFU);
-	csd->cmd_class = (u16_t)((raw_csd[2U] &
+	csd->cmd_class = (uint16_t)((raw_csd[2U] &
 		0xFFF00000U) >> 20U);
-	csd->read_blk_len = (u8_t)((raw_csd[2U] &
+	csd->read_blk_len = (uint8_t)((raw_csd[2U] &
 		0xF0000U) >> 16U);
 	if (raw_csd[2U] & 0x8000U)
 		csd->flags |= SD_CSD_READ_BLK_PARTIAL_FLAG;
@@ -615,19 +615,19 @@ static inline void sdhc_decode_csd(struct sd_csd *csd,
 
 	switch (csd->csd_structure) {
 	case 0:
-		csd->device_size = (u32_t)((raw_csd[2U] &
+		csd->device_size = (uint32_t)((raw_csd[2U] &
 			0x3FFU) << 2U);
-		csd->device_size |= (u32_t)((raw_csd[1U] &
+		csd->device_size |= (uint32_t)((raw_csd[1U] &
 			0xC0000000U) >> 30U);
-		csd->read_current_min = (u8_t)((raw_csd[1U] &
+		csd->read_current_min = (uint8_t)((raw_csd[1U] &
 			0x38000000U) >> 27U);
-		csd->read_current_max = (u8_t)((raw_csd[1U] &
+		csd->read_current_max = (uint8_t)((raw_csd[1U] &
 			0x7000000U) >> 24U);
-		csd->write_current_min = (u8_t)((raw_csd[1U] &
+		csd->write_current_min = (uint8_t)((raw_csd[1U] &
 			0xE00000U) >> 20U);
-		csd->write_current_max = (u8_t)((raw_csd[1U] &
+		csd->write_current_max = (uint8_t)((raw_csd[1U] &
 			0x1C0000U) >> 18U);
-		csd->dev_size_mul = (u8_t)((raw_csd[1U] &
+		csd->dev_size_mul = (uint8_t)((raw_csd[1U] &
 			0x38000U) >> 15U);
 
 		/* Get card total block count and block size. */
@@ -647,9 +647,9 @@ static inline void sdhc_decode_csd(struct sd_csd *csd,
 	case 1:
 		tmp_blk_size = SDMMC_DEFAULT_BLOCK_SIZE;
 
-		csd->device_size = (u32_t)((raw_csd[2U] &
+		csd->device_size = (uint32_t)((raw_csd[2U] &
 			0x3FU) << 16U);
-		csd->device_size |= (u32_t)((raw_csd[1U] &
+		csd->device_size |= (uint32_t)((raw_csd[1U] &
 			0xFFFF0000U) >> 16U);
 
 		tmp_blk_cout = ((csd->device_size + 1U) * 1024U);
@@ -662,46 +662,46 @@ static inline void sdhc_decode_csd(struct sd_csd *csd,
 		break;
 	}
 
-	if ((u8_t)((raw_csd[1U] & 0x4000U) >> 14U))
+	if ((uint8_t)((raw_csd[1U] & 0x4000U) >> 14U))
 		csd->flags |= SD_CSD_ERASE_BLK_EN_FLAG;
-	csd->erase_size = (u8_t)((raw_csd[1U] &
+	csd->erase_size = (uint8_t)((raw_csd[1U] &
 		0x3F80U) >> 7U);
-	csd->write_prtect_size = (u8_t)(raw_csd[1U] &
+	csd->write_prtect_size = (uint8_t)(raw_csd[1U] &
 		0x7FU);
-	csd->write_speed_factor = (u8_t)((raw_csd[0U] &
+	csd->write_speed_factor = (uint8_t)((raw_csd[0U] &
 		0x1C000000U) >> 26U);
-	csd->write_blk_len = (u8_t)((raw_csd[0U] &
+	csd->write_blk_len = (uint8_t)((raw_csd[0U] &
 		0x3C00000U) >> 22U);
-	if ((u8_t)((raw_csd[0U] & 0x200000U) >> 21U))
+	if ((uint8_t)((raw_csd[0U] & 0x200000U) >> 21U))
 		csd->flags |= SD_CSD_WRITE_BLK_PARTIAL_FLAG;
-	if ((u8_t)((raw_csd[0U] & 0x8000U) >> 15U))
+	if ((uint8_t)((raw_csd[0U] & 0x8000U) >> 15U))
 		csd->flags |= SD_CSD_FILE_FMT_GRP_FLAG;
-	if ((u8_t)((raw_csd[0U] & 0x4000U) >> 14U))
+	if ((uint8_t)((raw_csd[0U] & 0x4000U) >> 14U))
 		csd->flags |= SD_CSD_COPY_FLAG;
-	if ((u8_t)((raw_csd[0U] & 0x2000U) >> 13U))
+	if ((uint8_t)((raw_csd[0U] & 0x2000U) >> 13U))
 		csd->flags |=
 			SD_CSD_PERMANENT_WRITE_PROTECT_FLAG;
-	if ((u8_t)((raw_csd[0U] & 0x1000U) >> 12U))
+	if ((uint8_t)((raw_csd[0U] & 0x1000U) >> 12U))
 		csd->flags |=
 			SD_CSD_TMP_WRITE_PROTECT_FLAG;
-	csd->file_fmt = (u8_t)((raw_csd[0U] & 0xC00U) >> 10U);
+	csd->file_fmt = (uint8_t)((raw_csd[0U] & 0xC00U) >> 10U);
 }
 
 static inline void sdhc_decode_scr(struct sd_scr *scr,
-	u32_t *raw_scr, u32_t *version)
+	uint32_t *raw_scr, uint32_t *version)
 {
-	u32_t tmp_version = 0;
+	uint32_t tmp_version = 0;
 
-	scr->scr_structure = (u8_t)((raw_scr[0U] & 0xF0000000U) >> 28U);
-	scr->sd_spec = (u8_t)((raw_scr[0U] & 0xF000000U) >> 24U);
-	if ((u8_t)((raw_scr[0U] & 0x800000U) >> 23U))
+	scr->scr_structure = (uint8_t)((raw_scr[0U] & 0xF0000000U) >> 28U);
+	scr->sd_spec = (uint8_t)((raw_scr[0U] & 0xF000000U) >> 24U);
+	if ((uint8_t)((raw_scr[0U] & 0x800000U) >> 23U))
 		scr->flags |= SD_SCR_DATA_STATUS_AFTER_ERASE;
-	scr->sd_sec = (u8_t)((raw_scr[0U] & 0x700000U) >> 20U);
-	scr->sd_width = (u8_t)((raw_scr[0U] & 0xF0000U) >> 16U);
-	if ((u8_t)((raw_scr[0U] & 0x8000U) >> 15U))
+	scr->sd_sec = (uint8_t)((raw_scr[0U] & 0x700000U) >> 20U);
+	scr->sd_width = (uint8_t)((raw_scr[0U] & 0xF0000U) >> 16U);
+	if ((uint8_t)((raw_scr[0U] & 0x8000U) >> 15U))
 		scr->flags |= SD_SCR_SPEC3;
-	scr->sd_ext_sec = (u8_t)((raw_scr[0U] & 0x7800U) >> 10U);
-	scr->cmd_support = (u8_t)(raw_scr[0U] & 0x3U);
+	scr->sd_ext_sec = (uint8_t)((raw_scr[0U] & 0x7800U) >> 10U);
+	scr->cmd_support = (uint8_t)(raw_scr[0U] & 0x3U);
 	scr->rsvd = raw_scr[1U];
 	/* Get specification version. */
 	switch (scr->sd_spec) {
@@ -726,23 +726,23 @@ static inline void sdhc_decode_scr(struct sd_scr *scr,
 }
 
 static inline void sdhc_decode_cid(struct sd_cid *cid,
-	u32_t *raw_cid)
+	uint32_t *raw_cid)
 {
-	cid->manufacturer = (u8_t)((raw_cid[3U] & 0xFF000000U) >> 24U);
-	cid->application = (u16_t)((raw_cid[3U] & 0xFFFF00U) >> 8U);
+	cid->manufacturer = (uint8_t)((raw_cid[3U] & 0xFF000000U) >> 24U);
+	cid->application = (uint16_t)((raw_cid[3U] & 0xFFFF00U) >> 8U);
 
-	cid->name[0U] = (u8_t)((raw_cid[3U] & 0xFFU));
-	cid->name[1U] = (u8_t)((raw_cid[2U] & 0xFF000000U) >> 24U);
-	cid->name[2U] = (u8_t)((raw_cid[2U] & 0xFF0000U) >> 16U);
-	cid->name[3U] = (u8_t)((raw_cid[2U] & 0xFF00U) >> 8U);
-	cid->name[4U] = (u8_t)((raw_cid[2U] & 0xFFU));
+	cid->name[0U] = (uint8_t)((raw_cid[3U] & 0xFFU));
+	cid->name[1U] = (uint8_t)((raw_cid[2U] & 0xFF000000U) >> 24U);
+	cid->name[2U] = (uint8_t)((raw_cid[2U] & 0xFF0000U) >> 16U);
+	cid->name[3U] = (uint8_t)((raw_cid[2U] & 0xFF00U) >> 8U);
+	cid->name[4U] = (uint8_t)((raw_cid[2U] & 0xFFU));
 
-	cid->version = (u8_t)((raw_cid[1U] & 0xFF000000U) >> 24U);
+	cid->version = (uint8_t)((raw_cid[1U] & 0xFF000000U) >> 24U);
 
-	cid->ser_num = (u32_t)((raw_cid[1U] & 0xFFFFFFU) << 8U);
-	cid->ser_num |= (u32_t)((raw_cid[0U] & 0xFF000000U) >> 24U);
+	cid->ser_num = (uint32_t)((raw_cid[1U] & 0xFFFFFFU) << 8U);
+	cid->ser_num |= (uint32_t)((raw_cid[0U] & 0xFF000000U) >> 24U);
 
-	cid->date = (u16_t)((raw_cid[0U] & 0xFFF00U) >> 8U);
+	cid->date = (uint16_t)((raw_cid[0U] & 0xFFF00U) >> 8U);
 }
 
 #endif /*ZEPHYR_INCLUDE_DISK_ACCESS_SDHC_H_*/
diff --git a/subsys/disk/disk_access_spi_sdhc.c b/subsys/disk/disk_access_spi_sdhc.c
index f416215e03..2873924b52 100644
--- a/subsys/disk/disk_access_spi_sdhc.c
+++ b/subsys/disk/disk_access_spi_sdhc.c
@@ -27,12 +27,12 @@ struct sdhc_spi_data {
 	struct device *spi;
 	struct spi_config cfg;
 	struct device *cs;
-	u32_t pin;
+	uint32_t pin;
 	gpio_dt_flags_t flags;
 
 	bool high_capacity;
-	u32_t sector_count;
-	u8_t status;
+	uint32_t sector_count;
+	uint8_t status;
 #if LOG_LEVEL >= LOG_LEVEL_DBG
 	int trace_dir;
 #endif
@@ -42,7 +42,7 @@ DEVICE_DECLARE(sdhc_spi_0);
 
 /* Traces card traffic for LOG_LEVEL_DBG */
 static int sdhc_spi_trace(struct sdhc_spi_data *data, int dir, int err,
-		      const u8_t *buf, int len)
+		      const uint8_t *buf, int len)
 {
 #if LOG_LEVEL >= LOG_LEVEL_DBG
 	if (err != 0) {
@@ -76,11 +76,11 @@ static void sdhc_spi_set_cs(struct sdhc_spi_data *data, int value)
 }
 
 /* Receives a fixed number of bytes */
-static int sdhc_spi_rx_bytes(struct sdhc_spi_data *data, u8_t *buf, int len)
+static int sdhc_spi_rx_bytes(struct sdhc_spi_data *data, uint8_t *buf, int len)
 {
 	struct spi_buf tx_bufs[] = {
 		{
-			.buf = (u8_t *)sdhc_ones,
+			.buf = (uint8_t *)sdhc_ones,
 			.len = len
 		}
 	};
@@ -110,7 +110,7 @@ static int sdhc_spi_rx_bytes(struct sdhc_spi_data *data, u8_t *buf, int len)
 /* Receives and returns a single byte */
 static int sdhc_spi_rx_u8(struct sdhc_spi_data *data)
 {
-	u8_t buf[1];
+	uint8_t buf[1];
 	int err = sdhc_spi_rx_bytes(data, buf, sizeof(buf));
 
 	if (err != 0) {
@@ -121,11 +121,11 @@ static int sdhc_spi_rx_u8(struct sdhc_spi_data *data)
 }
 
 /* Transmits a block of bytes */
-static int sdhc_spi_tx(struct sdhc_spi_data *data, const u8_t *buf, int len)
+static int sdhc_spi_tx(struct sdhc_spi_data *data, const uint8_t *buf, int len)
 {
 	struct spi_buf spi_bufs[] = {
 		{
-			.buf = (u8_t *)buf,
+			.buf = (uint8_t *)buf,
 			.len = len
 		}
 	};
@@ -141,9 +141,9 @@ static int sdhc_spi_tx(struct sdhc_spi_data *data, const u8_t *buf, int len)
 }
 
 /* Transmits the command and payload */
-static int sdhc_spi_tx_cmd(struct sdhc_spi_data *data, u8_t cmd, u32_t payload)
+static int sdhc_spi_tx_cmd(struct sdhc_spi_data *data, uint8_t cmd, uint32_t payload)
 {
-	u8_t buf[SDHC_CMD_SIZE];
+	uint8_t buf[SDHC_CMD_SIZE];
 
 	LOG_DBG("cmd%d payload=%u", cmd, payload);
 	sdhc_spi_trace(data, 0, 0, NULL, 0);
@@ -241,7 +241,7 @@ static int sdhc_spi_skip_until_ready(struct sdhc_spi_data *data)
 
 /* Sends a command and returns the received R1 status code */
 static int sdhc_spi_cmd_r1_raw(struct sdhc_spi_data *data,
-	u8_t cmd, u32_t payload)
+	uint8_t cmd, uint32_t payload)
 {
 	int err;
 
@@ -264,13 +264,13 @@ static int sdhc_spi_cmd_r1_raw(struct sdhc_spi_data *data,
 
 /* Sends a command and returns the mapped error code */
 static int sdhc_spi_cmd_r1(struct sdhc_spi_data *data,
-	u8_t cmd, uint32_t payload)
+	uint8_t cmd, uint32_t payload)
 {
 	return sdhc_map_r1_status(sdhc_spi_cmd_r1_raw(data, cmd, payload));
 }
 
 /* Sends a command in idle mode returns the mapped error code */
-static int sdhc_spi_cmd_r1_idle(struct sdhc_spi_data *data, u8_t cmd,
+static int sdhc_spi_cmd_r1_idle(struct sdhc_spi_data *data, uint8_t cmd,
 			    uint32_t payload)
 {
 	return sdhc_map_r1_idle_status(sdhc_spi_cmd_r1_raw(data, cmd, payload));
@@ -278,7 +278,7 @@ static int sdhc_spi_cmd_r1_idle(struct sdhc_spi_data *data, u8_t cmd,
 
 /* Sends a command and returns the received multi-byte R2 status code */
 static int sdhc_spi_cmd_r2(struct sdhc_spi_data *data,
-	u8_t cmd, uint32_t payload)
+	uint8_t cmd, uint32_t payload)
 {
 	int err;
 	int r1;
@@ -305,11 +305,11 @@ static int sdhc_spi_cmd_r2(struct sdhc_spi_data *data,
 
 /* Sends a command and returns the received multi-byte status code */
 static int sdhc_spi_cmd_r37_raw(struct sdhc_spi_data *data,
-	u8_t cmd, u32_t payload, u32_t *reply)
+	uint8_t cmd, uint32_t payload, uint32_t *reply)
 {
 	int err;
 	int status;
-	u8_t buf[sizeof(*reply)];
+	uint8_t buf[sizeof(*reply)];
 
 	err = sdhc_spi_tx_cmd(data, cmd, payload);
 	if (err != 0) {
@@ -334,7 +334,7 @@ static int sdhc_spi_cmd_r37_raw(struct sdhc_spi_data *data,
 
 /* Sends a command in idle mode returns the mapped error code */
 static int sdhc_spi_cmd_r7_idle(struct sdhc_spi_data *data,
-	u8_t cmd, u32_t payload, u32_t *reply)
+	uint8_t cmd, uint32_t payload, uint32_t *reply)
 {
 	return sdhc_map_r1_idle_status(
 		sdhc_spi_cmd_r37_raw(data, cmd, payload, reply));
@@ -342,7 +342,7 @@ static int sdhc_spi_cmd_r7_idle(struct sdhc_spi_data *data,
 
 /* Sends a command and returns the received multi-byte R3 error code */
 static int sdhc_spi_cmd_r3(struct sdhc_spi_data *data,
-	u8_t cmd, uint32_t payload, u32_t *reply)
+	uint8_t cmd, uint32_t payload, uint32_t *reply)
 {
 	return sdhc_map_r1_status(
 		sdhc_spi_cmd_r37_raw(data, cmd, payload, reply));
@@ -350,7 +350,7 @@ static int sdhc_spi_cmd_r3(struct sdhc_spi_data *data,
 
 /* Receives a SDHC data block */
 static int sdhc_spi_rx_block(struct sdhc_spi_data *data,
-	u8_t *buf, int len)
+	uint8_t *buf, int len)
 {
 	int err;
 	int token;
@@ -358,7 +358,7 @@ static int sdhc_spi_rx_block(struct sdhc_spi_data *data,
 	/* Note the one extra byte to ensure there's an idle byte
 	 * between commands.
 	 */
-	u8_t crc[SDHC_CRC16_SIZE + 1];
+	uint8_t crc[SDHC_CRC16_SIZE + 1];
 
 	token = sdhc_spi_skip(data, 0xFF);
 	if (token < 0) {
@@ -376,7 +376,7 @@ static int sdhc_spi_rx_block(struct sdhc_spi_data *data,
 
 		struct spi_buf tx_bufs[] = {
 			{
-				.buf = (u8_t *)sdhc_ones,
+				.buf = (uint8_t *)sdhc_ones,
 				.len = remain
 			}
 		};
@@ -422,9 +422,9 @@ static int sdhc_spi_rx_block(struct sdhc_spi_data *data,
 
 /* Transmits a SDHC data block */
 static int sdhc_spi_tx_block(struct sdhc_spi_data *data,
-	u8_t *send, int len)
+	uint8_t *send, int len)
 {
-	u8_t buf[SDHC_CRC16_SIZE];
+	uint8_t buf[SDHC_CRC16_SIZE];
 	int err;
 
 	/* Start the block */
@@ -473,7 +473,7 @@ static int sdhc_spi_go_idle(struct sdhc_spi_data *data)
 /* Checks the supported host voltage and basic protocol of a SDHC card */
 static int sdhc_spi_check_interface(struct sdhc_spi_data *data)
 {
-	u32_t cond;
+	uint32_t cond;
 	int err;
 
 	/* Check that the current voltage is supported */
@@ -500,13 +500,13 @@ static int sdhc_spi_check_interface(struct sdhc_spi_data *data)
 static int sdhc_spi_detect(struct sdhc_spi_data *data)
 {
 	int err;
-	u32_t ocr;
+	uint32_t ocr;
 	struct sdhc_retry retry;
-	u8_t structure;
-	u8_t readbllen;
-	u32_t csize;
-	u8_t csizemult;
-	u8_t buf[SDHC_CSD_SIZE];
+	uint8_t structure;
+	uint8_t readbllen;
+	uint32_t csize;
+	uint8_t csizemult;
+	uint8_t buf[SDHC_CSD_SIZE];
 	bool is_v2;
 
 	data->cfg.frequency = SDHC_SPI_INITIAL_SPEED;
@@ -608,7 +608,7 @@ static int sdhc_spi_detect(struct sdhc_spi_data *data)
 		 * blocks.
 		 */
 		csize = (sys_get_be32(&buf[6]) >> 14) & ((1 << 12) - 1);
-		csizemult = (u8_t) ((sys_get_be16(&buf[9]) >> 7) & ((1 << 3) - 1));
+		csizemult = (uint8_t) ((sys_get_be16(&buf[9]) >> 7) & ((1 << 3) - 1));
 		data->sector_count = ((csize + 1) << (csizemult + 2 + readbllen - 9));
 		break;
 	case SDHC_CSD_V2:
@@ -654,10 +654,10 @@ static int sdhc_spi_detect(struct sdhc_spi_data *data)
 }
 
 static int sdhc_spi_read(struct sdhc_spi_data *data,
-	u8_t *buf, u32_t sector, u32_t count)
+	uint8_t *buf, uint32_t sector, uint32_t count)
 {
 	int err;
-	u32_t addr;
+	uint32_t addr;
 
 	err = sdhc_map_disk_status(data->status);
 	if (err != 0) {
@@ -704,10 +704,10 @@ error:
 }
 
 static int sdhc_spi_write(struct sdhc_spi_data *data,
-	const u8_t *buf, u32_t sector, u32_t count)
+	const uint8_t *buf, uint32_t sector, uint32_t count)
 {
 	int err;
-	u32_t addr;
+	uint32_t addr;
 
 	err = sdhc_map_disk_status(data->status);
 	if (err != 0) {
@@ -732,7 +732,7 @@ static int sdhc_spi_write(struct sdhc_spi_data *data,
 			goto error;
 		}
 
-		err = sdhc_spi_tx_block(data, (u8_t *)buf,
+		err = sdhc_spi_tx_block(data, (uint8_t *)buf,
 			SDMMC_DEFAULT_BLOCK_SIZE);
 		if (err != 0) {
 			goto error;
@@ -793,7 +793,7 @@ static int disk_spi_sdhc_access_status(struct disk_info *disk)
 }
 
 static int disk_spi_sdhc_access_read(struct disk_info *disk,
-	u8_t *buf, u32_t sector, u32_t count)
+	uint8_t *buf, uint32_t sector, uint32_t count)
 {
 	struct device *dev = disk->dev;
 	struct sdhc_spi_data *data = dev->driver_data;
@@ -811,7 +811,7 @@ static int disk_spi_sdhc_access_read(struct disk_info *disk,
 }
 
 static int disk_spi_sdhc_access_write(struct disk_info *disk,
-	const u8_t *buf, u32_t sector, u32_t count)
+	const uint8_t *buf, uint32_t sector, uint32_t count)
 {
 	struct device *dev = disk->dev;
 	struct sdhc_spi_data *data = dev->driver_data;
@@ -829,7 +829,7 @@ static int disk_spi_sdhc_access_write(struct disk_info *disk,
 }
 
 static int disk_spi_sdhc_access_ioctl(struct disk_info *disk,
-	u8_t cmd, void *buf)
+	uint8_t cmd, void *buf)
 {
 	struct device *dev = disk->dev;
 	struct sdhc_spi_data *data = dev->driver_data;
@@ -844,13 +844,13 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk,
 	case DISK_IOCTL_CTRL_SYNC:
 		break;
 	case DISK_IOCTL_GET_SECTOR_COUNT:
-		*(u32_t *)buf = data->sector_count;
+		*(uint32_t *)buf = data->sector_count;
 		break;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
-		*(u32_t *)buf = SDMMC_DEFAULT_BLOCK_SIZE;
+		*(uint32_t *)buf = SDMMC_DEFAULT_BLOCK_SIZE;
 		break;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
-		*(u32_t *)buf = SDMMC_DEFAULT_BLOCK_SIZE;
+		*(uint32_t *)buf = SDMMC_DEFAULT_BLOCK_SIZE;
 		break;
 	default:
 		return -EINVAL;
diff --git a/subsys/disk/disk_access_stm32_sdmmc.c b/subsys/disk/disk_access_stm32_sdmmc.c
index c55a402396..187a2923d6 100644
--- a/subsys/disk/disk_access_stm32_sdmmc.c
+++ b/subsys/disk/disk_access_stm32_sdmmc.c
@@ -126,8 +126,8 @@ static int stm32_sdmmc_access_status(struct disk_info *disk)
 	return priv->status;
 }
 
-static int stm32_sdmmc_access_read(struct disk_info *disk, u8_t *data_buf,
-				   u32_t start_sector, u32_t num_sector)
+static int stm32_sdmmc_access_read(struct disk_info *disk, uint8_t *data_buf,
+				   uint32_t start_sector, uint32_t num_sector)
 {
 	struct device *dev = disk->dev;
 	struct stm32_sdmmc_priv *priv = dev->driver_data;
@@ -147,14 +147,14 @@ static int stm32_sdmmc_access_read(struct disk_info *disk, u8_t *data_buf,
 }
 
 static int stm32_sdmmc_access_write(struct disk_info *disk,
-				    const u8_t *data_buf,
-				    u32_t start_sector, u32_t num_sector)
+				    const uint8_t *data_buf,
+				    uint32_t start_sector, uint32_t num_sector)
 {
 	struct device *dev = disk->dev;
 	struct stm32_sdmmc_priv *priv = dev->driver_data;
 	int err;
 
-	err = HAL_SD_WriteBlocks(&priv->hsd, (u8_t *)data_buf, start_sector,
+	err = HAL_SD_WriteBlocks(&priv->hsd, (uint8_t *)data_buf, start_sector,
 				 num_sector, 30000);
 	if (err != HAL_OK) {
 		LOG_ERR("sd write block failed %d", err);
@@ -166,7 +166,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
 	return 0;
 }
 
-static int stm32_sdmmc_access_ioctl(struct disk_info *disk, u8_t cmd,
+static int stm32_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd,
 				    void *buff)
 {
 	struct device *dev = disk->dev;
@@ -180,17 +180,17 @@ static int stm32_sdmmc_access_ioctl(struct disk_info *disk, u8_t cmd,
 		if (err != HAL_OK) {
 			return -EIO;
 		}
-		*(u32_t *)buff = info.LogBlockNbr;
+		*(uint32_t *)buff = info.LogBlockNbr;
 		break;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
 		err = HAL_SD_GetCardInfo(&priv->hsd, &info);
 		if (err != HAL_OK) {
 			return -EIO;
 		}
-		*(u32_t *)buff = info.LogBlockSize;
+		*(uint32_t *)buff = info.LogBlockSize;
 		break;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
-		*(u32_t *)buff = 1;
+		*(uint32_t *)buff = 1;
 		break;
 	case DISK_IOCTL_CTRL_SYNC:
 		/* we use a blocking API, so nothing to do for sync */
@@ -253,7 +253,7 @@ static void stm32_sdmmc_cd_handler(struct k_work *item)
 
 static void stm32_sdmmc_cd_callback(struct device *gpiodev,
 				    struct gpio_callback *cb,
-				    u32_t pin)
+				    uint32_t pin)
 {
 	struct stm32_sdmmc_priv *priv = CONTAINER_OF(cb,
 						     struct stm32_sdmmc_priv,
diff --git a/subsys/disk/disk_access_usdhc.c b/subsys/disk/disk_access_usdhc.c
index 5b3aa8a002..677a55be3b 100644
--- a/subsys/disk/disk_access_usdhc.c
+++ b/subsys/disk/disk_access_usdhc.c
@@ -273,13 +273,13 @@ enum usdhc_data_bus_width {
 	USDHC_BLK_ATT_BLKCNT_SHIFT)
 
 struct usdhc_cmd {
-	u32_t index;	/*cmd idx*/
-	u32_t argument;	/*cmd arg*/
+	uint32_t index;	/*cmd idx*/
+	uint32_t argument;	/*cmd arg*/
 	enum usdhc_cmd_type cmd_type;
 	enum sdhc_rsp_type rsp_type;
-	u32_t response[4U];
-	u32_t rsp_err_flags;
-	u32_t flags;
+	uint32_t response[4U];
+	uint32_t rsp_err_flags;
+	uint32_t flags;
 };
 
 struct usdhc_data {
@@ -292,20 +292,20 @@ struct usdhc_data {
 	 * to read/write all the data
 	 */
 	bool data_enable;
-	u8_t data_type;
+	uint8_t data_type;
 	/* this is used to distinguish
 	 * the normal/tuning/boot data
 	 */
-	u32_t block_size;
+	uint32_t block_size;
 	/* Block size
 	 */
-	u32_t block_count;
+	uint32_t block_count;
 	/* Block count
 	 */
-	u32_t *rx_data;
+	uint32_t *rx_data;
 	/* Buffer to save data read
 	 */
-	const u32_t *tx_data;
+	const uint32_t *tx_data;
 	/* Data buffer to write
 	 */
 };
@@ -344,11 +344,11 @@ struct usdhc_adma_config {
 	enum usdhc_burst_len burst_len;
 	/* burst len config
 	 */
-	u32_t *adma_table;
+	uint32_t *adma_table;
 	/* ADMA table address,
 	 * can't be null if transfer way is ADMA1/ADMA2
 	 */
-	u32_t adma_table_words;
+	uint32_t adma_table_words;
 	/* ADMA table length united as words,
 	 * can't be 0 if transfer way is ADMA1/ADMA2
 	 */
@@ -375,33 +375,33 @@ enum usdhc_endian_mode {
 
 struct usdhc_config {
 	USDHC_Type *base;
-	u32_t data_timeout;
+	uint32_t data_timeout;
 	/* Data timeout value
 	 */
 	enum usdhc_endian_mode endian;
 	/* Endian mode
 	 */
-	u8_t read_watermark;
+	uint8_t read_watermark;
 	/* Watermark level for DMA read operation.
 	 * Available range is 1 ~ 128.
 	 */
-	u8_t write_watermark;
+	uint8_t write_watermark;
 	/* Watermark level for DMA write operation.
 	 * Available range is 1 ~ 128.
 	 */
-	u8_t read_burst_len;
+	uint8_t read_burst_len;
 	/* Read burst len
 	 */
-	u8_t write_burst_len;
+	uint8_t write_burst_len;
 	/* Write burst len
 	 */
-	u32_t src_clk_hz;
+	uint32_t src_clk_hz;
 };
 
 struct usdhc_capability {
-	u32_t max_blk_len;
-	u32_t max_blk_cnt;
-	u32_t host_flags;
+	uint32_t max_blk_len;
+	uint32_t max_blk_cnt;
+	uint32_t host_flags;
 };
 
 enum host_detect_type {
@@ -417,19 +417,19 @@ enum host_detect_type {
 };
 
 struct usdhc_client_info {
-	u32_t busclk_hz;
-	u32_t relative_addr;
-	u32_t version;
-	u32_t card_flags;
-	u32_t raw_cid[4U];
-	u32_t raw_csd[4U];
-	u32_t raw_scr[2U];
-	u32_t raw_ocr;
+	uint32_t busclk_hz;
+	uint32_t relative_addr;
+	uint32_t version;
+	uint32_t card_flags;
+	uint32_t raw_cid[4U];
+	uint32_t raw_csd[4U];
+	uint32_t raw_scr[2U];
+	uint32_t raw_ocr;
 	struct sd_cid cid;
 	struct sd_csd csd;
 	struct sd_scr scr;
-	u32_t sd_block_count;
-	u32_t sd_block_size;
+	uint32_t sd_block_count;
+	uint32_t sd_block_size;
 	enum sd_timing_mode sd_timing;
 	enum sd_driver_strength driver_strength;
 	enum sd_max_current max_current;
@@ -438,19 +438,19 @@ struct usdhc_client_info {
 
 struct usdhc_board_config {
 	struct device *pwr_gpio;
-	u32_t pwr_pin;
+	uint32_t pwr_pin;
 	gpio_dt_flags_t pwr_flags;
 
 	struct device *detect_gpio;
-	u32_t detect_pin;
+	uint32_t detect_pin;
 	gpio_dt_flags_t detect_flags;
 	struct gpio_callback detect_cb;
 };
 
 struct usdhc_priv {
 	bool host_ready;
-	u8_t status;
-	u8_t nusdhc;
+	uint8_t status;
+	uint8_t nusdhc;
 
 	struct usdhc_board_config board_cfg;
 
@@ -557,9 +557,9 @@ enum usdhc_adma2_descriptor_flag {
 };
 
 struct usdhc_adma2_descriptor {
-	u32_t attribute;
+	uint32_t attribute;
 	/*!< The control and status field */
-	const u32_t *address;
+	const uint32_t *address;
 	/*!< The address field */
 };
 
@@ -721,28 +721,28 @@ static void usdhc_millsec_delay(unsigned int cycles_to_wait)
 		;
 }
 
-u32_t g_usdhc_boot_dummy __aligned(64);
-u32_t g_usdhc_rx_dummy[2048] __aligned(64);
+uint32_t g_usdhc_boot_dummy __aligned(64);
+uint32_t g_usdhc_rx_dummy[2048] __aligned(64);
 
 static int usdhc_adma2_descriptor_cfg(
-	u32_t *adma_table, u32_t adma_table_words,
-	const u32_t *data_addr, u32_t data_size, u32_t flags)
+	uint32_t *adma_table, uint32_t adma_table_words,
+	const uint32_t *data_addr, uint32_t data_size, uint32_t flags)
 {
-	u32_t min_entries, start_entry = 0U;
-	u32_t max_entries = (adma_table_words * sizeof(u32_t)) /
+	uint32_t min_entries, start_entry = 0U;
+	uint32_t max_entries = (adma_table_words * sizeof(uint32_t)) /
 		sizeof(struct usdhc_adma2_descriptor);
 	struct usdhc_adma2_descriptor *adma2_addr =
 		(struct usdhc_adma2_descriptor *)(adma_table);
-	u32_t i, dma_buf_len = 0U;
+	uint32_t i, dma_buf_len = 0U;
 
-	if ((u32_t)data_addr % USDHC_ADMA2_ADDRESS_ALIGN) {
+	if ((uint32_t)data_addr % USDHC_ADMA2_ADDRESS_ALIGN) {
 		return -EIO;
 	}
 	/* Add non aligned access support.
 	 */
-	if (data_size % sizeof(u32_t)) {
+	if (data_size % sizeof(uint32_t)) {
 		/* make the data length as word-aligned */
-		data_size += sizeof(u32_t) - (data_size % sizeof(u32_t));
+		data_size += sizeof(uint32_t) - (data_size % sizeof(uint32_t));
 	}
 
 	/* Check if ADMA descriptor's number is enough. */
@@ -776,7 +776,7 @@ static int usdhc_adma2_descriptor_cfg(
 			dma_buf_len =
 				USDHC_ADMA2_DESCRIPTOR_MAX_LENGTH_PER_ENTRY;
 		} else {
-			dma_buf_len = (data_size == 0U ? sizeof(u32_t) :
+			dma_buf_len = (data_size == 0U ? sizeof(uint32_t) :
 				data_size);
 			/* adma don't support 0 data length transfer
 			 * descriptor
@@ -791,7 +791,7 @@ static int usdhc_adma2_descriptor_cfg(
 		adma2_addr[i].attribute |=
 			(data_size == 0U) ? 0U :
 				(USDHC_ADMA2_XFER_FLAG | USDHC_ADMA2_INT_FLAG);
-		data_addr += (dma_buf_len / sizeof(u32_t));
+		data_addr += (dma_buf_len / sizeof(uint32_t));
 
 		if (data_size != 0U)
 			data_size -= dma_buf_len;
@@ -813,14 +813,14 @@ static int usdhc_adma2_descriptor_cfg(
 
 static int usdhc_Internal_dma_cfg(struct usdhc_priv *priv,
 	struct usdhc_adma_config *dma_cfg,
-	const u32_t *data_addr)
+	const uint32_t *data_addr)
 {
 	USDHC_Type *base = priv->host_config.base;
 	bool cmd23 = priv->op_context.data.cmd23;
 
 	if (dma_cfg->dma_mode == USDHC_DMA_SIMPLE) {
 		/* check DMA data buffer address align or not */
-		if (((u32_t)data_addr % USDHC_ADMA2_ADDRESS_ALIGN) != 0U) {
+		if (((uint32_t)data_addr % USDHC_ADMA2_ADDRESS_ALIGN) != 0U) {
 			return -EIO;
 		}
 		/* in simple DMA mode if use auto CMD23,
@@ -828,13 +828,13 @@ static int usdhc_Internal_dma_cfg(struct usdhc_priv *priv,
 		 * and block count should load to DS_ADDR
 		 */
 		if (cmd23)
-			base->ADMA_SYS_ADDR = (u32_t)data_addr;
+			base->ADMA_SYS_ADDR = (uint32_t)data_addr;
 		else
-			base->DS_ADDR = (u32_t)data_addr;
+			base->DS_ADDR = (uint32_t)data_addr;
 	} else {
 		/* When use ADMA, disable simple DMA */
 		base->DS_ADDR = 0U;
-		base->ADMA_SYS_ADDR = (u32_t)(dma_cfg->adma_table);
+		base->ADMA_SYS_ADDR = (uint32_t)(dma_cfg->adma_table);
 	}
 
 	/* select DMA mode and config the burst length */
@@ -849,16 +849,16 @@ static int usdhc_Internal_dma_cfg(struct usdhc_priv *priv,
 }
 
 
-static int usdhc_adma_table_cfg(struct usdhc_priv *priv, u32_t flags)
+static int usdhc_adma_table_cfg(struct usdhc_priv *priv, uint32_t flags)
 {
 	int error = -EIO;
 	struct usdhc_data *data = &priv->op_context.data;
 	struct usdhc_adma_config *dma_cfg = &priv->op_context.dma_cfg;
-	u32_t boot_dummy_off = data->data_type == USDHC_XFER_BOOT_CONTINUOUS ?
-		sizeof(u32_t) : 0U;
-	const u32_t *data_addr = (const u32_t *)((u32_t)((!data->rx_data) ?
+	uint32_t boot_dummy_off = data->data_type == USDHC_XFER_BOOT_CONTINUOUS ?
+		sizeof(uint32_t) : 0U;
+	const uint32_t *data_addr = (const uint32_t *)((uint32_t)((!data->rx_data) ?
 		data->tx_data : data->rx_data) + boot_dummy_off);
-	u32_t data_size = data->block_size * data->block_count - boot_dummy_off;
+	uint32_t data_size = data->block_size * data->block_count - boot_dummy_off;
 
 	switch (dma_cfg->dma_mode) {
 	case USDHC_DMA_SIMPLE:
@@ -892,9 +892,9 @@ static int usdhc_data_xfer_cfg(struct usdhc_priv *priv,
 	bool en_dma)
 {
 	USDHC_Type *base = priv->host_config.base;
-	u32_t mix_ctrl = base->MIX_CTRL;
+	uint32_t mix_ctrl = base->MIX_CTRL;
 	struct usdhc_data *data = NULL;
-	u32_t *flag = &priv->op_context.cmd.flags;
+	uint32_t *flag = &priv->op_context.cmd.flags;
 
 	if (!priv->op_context.cmd_only)
 		data = &priv->op_context.data;
@@ -1004,8 +1004,8 @@ static int usdhc_data_xfer_cfg(struct usdhc_priv *priv,
 
 static void usdhc_send_cmd(USDHC_Type *base, struct usdhc_cmd *command)
 {
-	u32_t xfer_type = base->CMD_XFR_TYP;
-	u32_t flags = command->flags;
+	uint32_t xfer_type = base->CMD_XFR_TYP;
+	uint32_t flags = command->flags;
 
 	if (!(base->PRES_STATE & USDHC_CMD_INHIBIT_FLAG)
 		&& (command->cmd_type != USDHC_CMD_TYPE_EMPTY)) {
@@ -1076,7 +1076,7 @@ static void usdhc_send_cmd(USDHC_Type *base, struct usdhc_cmd *command)
 
 static int usdhc_cmd_rsp(struct usdhc_priv *priv)
 {
-	u32_t i;
+	uint32_t i;
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
 
@@ -1121,7 +1121,7 @@ static int usdhc_wait_cmd_done(struct usdhc_priv *priv,
 	bool poll_cmd)
 {
 	int error = 0;
-	u32_t int_status = 0U;
+	uint32_t int_status = 0U;
 	USDHC_Type *base = priv->host_config.base;
 
 	/* check if need polling command done or not */
@@ -1152,38 +1152,38 @@ static int usdhc_wait_cmd_done(struct usdhc_priv *priv,
 	return error;
 }
 
-static inline void usdhc_write_data(USDHC_Type *base, u32_t data)
+static inline void usdhc_write_data(USDHC_Type *base, uint32_t data)
 {
 	base->DATA_BUFF_ACC_PORT = data;
 }
 
-static inline u32_t usdhc_read_data(USDHC_Type *base)
+static inline uint32_t usdhc_read_data(USDHC_Type *base)
 {
 	return base->DATA_BUFF_ACC_PORT;
 }
 
-static u32_t usdhc_read_data_port(struct usdhc_priv *priv,
-	u32_t xfered_words)
+static uint32_t usdhc_read_data_port(struct usdhc_priv *priv,
+	uint32_t xfered_words)
 {
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_data *data = &priv->op_context.data;
-	u32_t i, total_words, remaing_words;
+	uint32_t i, total_words, remaing_words;
 	/* The words can be read at this time. */
-	u32_t watermark = ((base->WTMK_LVL & USDHC_WTMK_LVL_RD_WML_MASK) >>
+	uint32_t watermark = ((base->WTMK_LVL & USDHC_WTMK_LVL_RD_WML_MASK) >>
 		USDHC_WTMK_LVL_RD_WML_SHIFT);
 
 	/* If DMA is enable, do not need to polling data port */
 	if (!(base->MIX_CTRL & USDHC_MIX_CTRL_DMAEN_MASK)) {
 		/*Add non aligned access support.*/
-		if (data->block_size % sizeof(u32_t)) {
+		if (data->block_size % sizeof(uint32_t)) {
 			data->block_size +=
-				sizeof(u32_t) -
-				(data->block_size % sizeof(u32_t));
+				sizeof(uint32_t) -
+				(data->block_size % sizeof(uint32_t));
 			/* make the block size as word-aligned */
 		}
 
 		total_words = ((data->block_count * data->block_size) /
-			sizeof(u32_t));
+			sizeof(uint32_t));
 
 		if (watermark >= total_words) {
 			remaing_words = total_words;
@@ -1208,19 +1208,19 @@ static int usdhc_read_data_port_sync(struct usdhc_priv *priv)
 {
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_data *data = &priv->op_context.data;
-	u32_t total_words;
-	u32_t xfered_words = 0U, int_status = 0U;
+	uint32_t total_words;
+	uint32_t xfered_words = 0U, int_status = 0U;
 	int error = 0;
 
-	if (data->block_size % sizeof(u32_t)) {
+	if (data->block_size % sizeof(uint32_t)) {
 		data->block_size +=
-			sizeof(u32_t) -
-			(data->block_size % sizeof(u32_t));
+			sizeof(uint32_t) -
+			(data->block_size % sizeof(uint32_t));
 	}
 
 	total_words =
 		((data->block_count * data->block_size) /
-		sizeof(u32_t));
+		sizeof(uint32_t));
 
 	while ((!error) && (xfered_words < total_words)) {
 		while (!(int_status & (USDHC_INT_BUF_READ_READY_FLAG |
@@ -1262,27 +1262,27 @@ static int usdhc_read_data_port_sync(struct usdhc_priv *priv)
 	return error;
 }
 
-static u32_t usdhc_write_data_port(struct usdhc_priv *priv,
-	u32_t xfered_words)
+static uint32_t usdhc_write_data_port(struct usdhc_priv *priv,
+	uint32_t xfered_words)
 {
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_data *data = &priv->op_context.data;
-	u32_t i, total_words, remaing_words;
+	uint32_t i, total_words, remaing_words;
 	/* Words can be wrote at this time. */
-	u32_t watermark = ((base->WTMK_LVL & USDHC_WTMK_LVL_WR_WML_MASK) >>
+	uint32_t watermark = ((base->WTMK_LVL & USDHC_WTMK_LVL_WR_WML_MASK) >>
 		USDHC_WTMK_LVL_WR_WML_SHIFT);
 
 	/* If DMA is enable, do not need to polling data port */
 	if (!(base->MIX_CTRL & USDHC_MIX_CTRL_DMAEN_MASK)) {
-		if (data->block_size % sizeof(u32_t)) {
+		if (data->block_size % sizeof(uint32_t)) {
 			data->block_size +=
-				sizeof(u32_t) -
-				(data->block_size % sizeof(u32_t));
+				sizeof(uint32_t) -
+				(data->block_size % sizeof(uint32_t));
 		}
 
 		total_words =
 			((data->block_count * data->block_size) /
-			sizeof(u32_t));
+			sizeof(uint32_t));
 
 		if (watermark >= total_words) {
 			remaing_words = total_words;
@@ -1307,16 +1307,16 @@ static status_t usdhc_write_data_port_sync(struct usdhc_priv *priv)
 {
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_data *data = &priv->op_context.data;
-	u32_t total_words;
-	u32_t xfered_words = 0U, int_status = 0U;
+	uint32_t total_words;
+	uint32_t xfered_words = 0U, int_status = 0U;
 	int error = 0;
 
-	if (data->block_size % sizeof(u32_t)) {
+	if (data->block_size % sizeof(uint32_t)) {
 		data->block_size +=
-			sizeof(u32_t) - (data->block_size % sizeof(u32_t));
+			sizeof(uint32_t) - (data->block_size % sizeof(uint32_t));
 	}
 
-	total_words = (data->block_count * data->block_size) / sizeof(u32_t);
+	total_words = (data->block_count * data->block_size) / sizeof(uint32_t);
 
 	while ((!error) && (xfered_words < total_words)) {
 		while (!(int_status & (USDHC_INT_BUF_WRITE_READY_FLAG |
@@ -1366,7 +1366,7 @@ static status_t usdhc_write_data_port_sync(struct usdhc_priv *priv)
 static int usdhc_data_sync_xfer(struct usdhc_priv *priv, bool en_dma)
 {
 	int error = 0;
-	u32_t int_status = 0U;
+	uint32_t int_status = 0U;
 	USDHC_Type *base = priv->host_config.base;
 	struct usdhc_data *data = &priv->op_context.data;
 
@@ -1480,9 +1480,9 @@ static inline void usdhc_force_clk_on(USDHC_Type *base, bool on)
 		base->VEND_SPEC &= ~USDHC_VEND_SPEC_FRC_SDCLK_ON_MASK;
 }
 
-static void usdhc_tuning(USDHC_Type *base, u32_t start, u32_t step, bool enable)
+static void usdhc_tuning(USDHC_Type *base, uint32_t start, uint32_t step, bool enable)
 {
-	u32_t tuning_ctrl = 0U;
+	uint32_t tuning_ctrl = 0U;
 
 	if (enable) {
 		/* feedback clock */
@@ -1510,9 +1510,9 @@ static void usdhc_tuning(USDHC_Type *base, u32_t start, u32_t step, bool enable)
 	}
 }
 
-int usdhc_adjust_tuning_timing(USDHC_Type *base, u32_t delay)
+int usdhc_adjust_tuning_timing(USDHC_Type *base, uint32_t delay)
 {
-	u32_t clk_tune_ctrl = 0U;
+	uint32_t clk_tune_ctrl = 0U;
 
 	clk_tune_ctrl = base->CLK_TUNE_CTRL_STATUS;
 
@@ -1531,7 +1531,7 @@ int usdhc_adjust_tuning_timing(USDHC_Type *base, u32_t delay)
 	return 0;
 }
 
-static inline void usdhc_set_retuning_timer(USDHC_Type *base, u32_t counter)
+static inline void usdhc_set_retuning_timer(USDHC_Type *base, uint32_t counter)
 {
 	base->HOST_CTRL_CAP &= ~USDHC_HOST_CTRL_CAP_TIME_COUNT_RETUNING_MASK;
 	base->HOST_CTRL_CAP |= USDHC_HOST_CTRL_CAP_TIME_COUNT_RETUNING(counter);
@@ -1638,7 +1638,7 @@ static int usdhc_vol_switch(struct usdhc_priv *priv)
 }
 
 static inline void usdhc_op_ctx_init(struct usdhc_priv *priv,
-	bool cmd_only, u8_t cmd_idx, u32_t arg, enum sdhc_rsp_type rsp_type)
+	bool cmd_only, uint8_t cmd_idx, uint32_t arg, enum sdhc_rsp_type rsp_type)
 {
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
 	struct usdhc_data *data = &priv->op_context.data;
@@ -1654,11 +1654,11 @@ static inline void usdhc_op_ctx_init(struct usdhc_priv *priv,
 }
 
 static int usdhc_select_fun(struct usdhc_priv *priv,
-	u32_t group, u32_t function)
+	uint32_t group, uint32_t function)
 {
-	u32_t *fun_status;
-	u16_t fun_grp_info[6U] = {0};
-	u32_t current_fun_status = 0U, arg;
+	uint32_t *fun_status;
+	uint16_t fun_grp_info[6U] = {0};
+	uint32_t current_fun_status = 0U, arg;
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
 	struct usdhc_data *data = &priv->op_context.data;
 	int ret;
@@ -1671,7 +1671,7 @@ static int usdhc_select_fun(struct usdhc_priv *priv,
 
 	/* Check if card support high speed mode. */
 	arg = (SD_SWITCH_CHECK << 31U | 0x00FFFFFFU);
-	arg &= ~((u32_t)(0xFU) << (group * 4U));
+	arg &= ~((uint32_t)(0xFU) << (group * 4U));
 	arg |= (function << (group * 4U));
 	usdhc_op_ctx_init(priv, 0, SDHC_SWITCH, arg, SDHC_RSP_TYPE_R1);
 
@@ -1708,12 +1708,12 @@ static int usdhc_select_fun(struct usdhc_priv *priv,
 		return -ENOTSUP;
 	}
 
-	fun_grp_info[5U] = (u16_t)fun_status[0U];
-	fun_grp_info[4U] = (u16_t)(fun_status[1U] >> 16U);
-	fun_grp_info[3U] = (u16_t)(fun_status[1U]);
-	fun_grp_info[2U] = (u16_t)(fun_status[2U] >> 16U);
-	fun_grp_info[1U] = (u16_t)(fun_status[2U]);
-	fun_grp_info[0U] = (u16_t)(fun_status[3U] >> 16U);
+	fun_grp_info[5U] = (uint16_t)fun_status[0U];
+	fun_grp_info[4U] = (uint16_t)(fun_status[1U] >> 16U);
+	fun_grp_info[3U] = (uint16_t)(fun_status[1U]);
+	fun_grp_info[2U] = (uint16_t)(fun_status[2U] >> 16U);
+	fun_grp_info[1U] = (uint16_t)(fun_status[2U]);
+	fun_grp_info[0U] = (uint16_t)(fun_status[3U] >> 16U);
 	current_fun_status = ((fun_status[3U] & 0xFFU) << 8U) |
 		(fun_status[4U] >> 24U);
 
@@ -1732,7 +1732,7 @@ static int usdhc_select_fun(struct usdhc_priv *priv,
 	data->rx_data = &g_usdhc_rx_dummy[0];
 
 	cmd->argument = (SD_SWITCH_SET << 31U | 0x00FFFFFFU);
-	cmd->argument &= ~((u32_t)(0xFU) << (group * 4U));
+	cmd->argument &= ~((uint32_t)(0xFU) << (group * 4U));
 	cmd->argument |= (function << (group * 4U));
 
 	ret = usdhc_xfer(priv);
@@ -1771,13 +1771,13 @@ static int usdhc_select_fun(struct usdhc_priv *priv,
 	return 0;
 }
 
-u32_t usdhc_set_sd_clk(USDHC_Type *base, u32_t src_clk_hz, u32_t sd_clk_hz)
+uint32_t usdhc_set_sd_clk(USDHC_Type *base, uint32_t src_clk_hz, uint32_t sd_clk_hz)
 {
-	u32_t total_div = 0U;
-	u32_t divisor = 0U;
-	u32_t prescaler = 0U;
-	u32_t sysctl = 0U;
-	u32_t nearest_freq = 0U;
+	uint32_t total_div = 0U;
+	uint32_t divisor = 0U;
+	uint32_t prescaler = 0U;
+	uint32_t sysctl = 0U;
+	uint32_t nearest_freq = 0U;
 
 	assert(src_clk_hz != 0U);
 	assert((sd_clk_hz != 0U) && (sd_clk_hz <= src_clk_hz));
@@ -1870,9 +1870,9 @@ u32_t usdhc_set_sd_clk(USDHC_Type *base, u32_t src_clk_hz, u32_t sd_clk_hz)
 }
 
 static void usdhc_enable_ddr_mode(USDHC_Type *base,
-	bool enable, u32_t nibble_pos)
+	bool enable, uint32_t nibble_pos)
 {
-	u32_t prescaler = (base->SYS_CTRL & USDHC_SYS_CTRL_SDCLKFS_MASK) >>
+	uint32_t prescaler = (base->SYS_CTRL & USDHC_SYS_CTRL_SDCLKFS_MASK) >>
 		USDHC_SYS_CTRL_SDCLKFS_SHIFT;
 
 	if (enable) {
@@ -2044,8 +2044,8 @@ static int usdhc_select_bus_timing(struct usdhc_priv *priv)
 	return error;
 }
 
-static int usdhc_write_sector(void *bus_data, const u8_t *buf, u32_t sector,
-		     u32_t count)
+static int usdhc_write_sector(void *bus_data, const uint8_t *buf, uint32_t sector,
+		     uint32_t count)
 {
 	struct usdhc_priv *priv = bus_data;
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
@@ -2058,7 +2058,7 @@ static int usdhc_write_sector(void *bus_data, const u8_t *buf, u32_t sector,
 	cmd->index = SDHC_WRITE_MULTIPLE_BLOCK;
 	data->block_size = priv->card_info.sd_block_size;
 	data->block_count = count;
-	data->tx_data = (const u32_t *)buf;
+	data->tx_data = (const uint32_t *)buf;
 	data->cmd12 = true;
 	if (data->block_count == 1U) {
 		cmd->index = SDHC_WRITE_BLOCK;
@@ -2073,8 +2073,8 @@ static int usdhc_write_sector(void *bus_data, const u8_t *buf, u32_t sector,
 	return usdhc_xfer(priv);
 }
 
-static int usdhc_read_sector(void *bus_data, u8_t *buf, u32_t sector,
-		     u32_t count)
+static int usdhc_read_sector(void *bus_data, uint8_t *buf, uint32_t sector,
+		     uint32_t count)
 {
 	struct usdhc_priv *priv = bus_data;
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
@@ -2087,7 +2087,7 @@ static int usdhc_read_sector(void *bus_data, u8_t *buf, u32_t sector,
 	cmd->index = SDHC_READ_MULTIPLE_BLOCK;
 	data->block_size = priv->card_info.sd_block_size;
 	data->block_count = count;
-	data->rx_data = (u32_t *)buf;
+	data->rx_data = (uint32_t *)buf;
 	data->cmd12 = true;
 
 	if (data->block_count == 1U) {
@@ -2107,7 +2107,7 @@ static int usdhc_read_sector(void *bus_data, u8_t *buf, u32_t sector,
 
 static bool usdhc_set_sd_active(USDHC_Type *base)
 {
-	u32_t timeout = 0xffff;
+	uint32_t timeout = 0xffff;
 
 	base->SYS_CTRL |= USDHC_SYS_CTRL_INITA_MASK;
 	/* Delay some time to wait card become active state. */
@@ -2125,8 +2125,8 @@ static bool usdhc_set_sd_active(USDHC_Type *base)
 static void usdhc_get_host_capability(USDHC_Type *base,
 	struct usdhc_capability *capability)
 {
-	u32_t host_cap;
-	u32_t max_blk_len;
+	uint32_t host_cap;
+	uint32_t max_blk_len;
 
 	host_cap = base->HOST_CTRL_CAP;
 
@@ -2150,7 +2150,7 @@ static void usdhc_get_host_capability(USDHC_Type *base,
 		USDHC_SUPPORT_8BIT_FLAG);
 }
 
-static bool usdhc_hw_reset(USDHC_Type *base, u32_t mask, u32_t timeout)
+static bool usdhc_hw_reset(USDHC_Type *base, uint32_t mask, uint32_t timeout)
 {
 	base->SYS_CTRL |= (mask & (USDHC_SYS_CTRL_RSTA_MASK |
 		USDHC_SYS_CTRL_RSTC_MASK | USDHC_SYS_CTRL_RSTD_MASK));
@@ -2168,8 +2168,8 @@ static bool usdhc_hw_reset(USDHC_Type *base, u32_t mask, u32_t timeout)
 static void usdhc_host_hw_init(USDHC_Type *base,
 	const struct usdhc_config *config)
 {
-	u32_t proctl, sysctl, wml;
-	u32_t int_mask;
+	uint32_t proctl, sysctl, wml;
+	uint32_t int_mask;
 
 	assert(config);
 	assert((config->write_watermark >= 1U) &&
@@ -2220,7 +2220,7 @@ static void usdhc_host_hw_init(USDHC_Type *base,
 }
 
 static void usdhc_cd_gpio_cb(struct device *dev,
-				  struct gpio_callback *cb, u32_t pins)
+				  struct gpio_callback *cb, uint32_t pins)
 {
 	struct usdhc_board_config *board_cfg =
 		CONTAINER_OF(cb, struct usdhc_board_config, detect_cb);
@@ -2230,7 +2230,7 @@ static void usdhc_cd_gpio_cb(struct device *dev,
 }
 
 static int usdhc_cd_gpio_init(struct device *detect_gpio,
-	u32_t pin, gpio_dt_flags_t flags,
+	uint32_t pin, gpio_dt_flags_t flags,
 	struct gpio_callback *callback)
 {
 	int ret;
@@ -2259,7 +2259,7 @@ static void usdhc_host_reset(struct usdhc_priv *priv)
 }
 
 static int usdhc_app_host_cmd(struct usdhc_priv *priv, int retry,
-	u32_t arg, u8_t app_cmd, u32_t app_arg, enum sdhc_rsp_type rsp_type,
+	uint32_t arg, uint8_t app_cmd, uint32_t app_arg, enum sdhc_rsp_type rsp_type,
 	enum sdhc_rsp_type app_rsp_type, bool app_cmd_only)
 {
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
@@ -2291,7 +2291,7 @@ APP_CMD_XFER_AGAIN:
 static int usdhc_sd_init(struct usdhc_priv *priv)
 {
 	USDHC_Type *base = priv->host_config.base;
-	u32_t app_cmd_41_arg = 0U;
+	uint32_t app_cmd_41_arg = 0U;
 	int ret, retry;
 	struct usdhc_cmd *cmd = &priv->op_context.cmd;
 	struct usdhc_data *data = &priv->op_context.data;
@@ -2567,7 +2567,7 @@ APP_SEND_OP_COND_AGAIN:
 	retry = 10;
 	ret = -EIO;
 	while (ret && retry >= 0) {
-		ret = usdhc_read_sector(priv, (u8_t *)g_usdhc_rx_dummy, 0, 1);
+		ret = usdhc_read_sector(priv, (uint8_t *)g_usdhc_rx_dummy, 0, 1);
 		if (!ret) {
 			break;
 		}
@@ -2590,7 +2590,7 @@ static K_MUTEX_DEFINE(z_usdhc_init_lock);
 static int usdhc_board_access_init(struct usdhc_priv *priv)
 {
 	int ret;
-	u32_t gpio_level;
+	uint32_t gpio_level;
 
 	if (priv->nusdhc == 0) {
 #if DT_NODE_HAS_PROP(DT_INST(0, nxp_imx_usdhc), pwr_gpios)
@@ -2785,8 +2785,8 @@ static int disk_usdhc_access_status(struct disk_info *disk)
 	return priv->status;
 }
 
-static int disk_usdhc_access_read(struct disk_info *disk, u8_t *buf,
-				 u32_t sector, u32_t count)
+static int disk_usdhc_access_read(struct disk_info *disk, uint8_t *buf,
+				 uint32_t sector, uint32_t count)
 {
 	struct device *dev = disk->dev;
 	struct usdhc_priv *priv = dev->driver_data;
@@ -2796,8 +2796,8 @@ static int disk_usdhc_access_read(struct disk_info *disk, u8_t *buf,
 	return usdhc_read_sector(priv, buf, sector, count);
 }
 
-static int disk_usdhc_access_write(struct disk_info *disk, const u8_t *buf,
-				  u32_t sector, u32_t count)
+static int disk_usdhc_access_write(struct disk_info *disk, const uint8_t *buf,
+				  uint32_t sector, uint32_t count)
 {
 	struct device *dev = disk->dev;
 	struct usdhc_priv *priv = dev->driver_data;
@@ -2807,7 +2807,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const u8_t *buf,
 	return usdhc_write_sector(priv, buf, sector, count);
 }
 
-static int disk_usdhc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buf)
+static int disk_usdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buf)
 {
 	struct device *dev = disk->dev;
 	struct usdhc_priv *priv = dev->driver_data;
@@ -2822,13 +2822,13 @@ static int disk_usdhc_access_ioctl(struct disk_info *disk, u8_t cmd, void *buf)
 	case DISK_IOCTL_CTRL_SYNC:
 		break;
 	case DISK_IOCTL_GET_SECTOR_COUNT:
-		*(u32_t *)buf = priv->card_info.sd_block_count;
+		*(uint32_t *)buf = priv->card_info.sd_block_count;
 		break;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
-		*(u32_t *)buf = priv->card_info.sd_block_size;
+		*(uint32_t *)buf = priv->card_info.sd_block_size;
 		break;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
-		*(u32_t *)buf = priv->card_info.sd_block_size;
+		*(uint32_t *)buf = priv->card_info.sd_block_size;
 		break;
 	default:
 		return -EINVAL;
diff --git a/subsys/disk/fat12_ramdisk.h b/subsys/disk/fat12_ramdisk.h
index c470ce5af4..36a14d61c0 100644
--- a/subsys/disk/fat12_ramdisk.h
+++ b/subsys/disk/fat12_ramdisk.h
@@ -17,7 +17,7 @@
  * fat table (1,  2), directory table (3) and file(readme) contents (4).
  */
 
-static u8_t ramdisk_buf[RAMDISK_VOLUME_SIZE] = {
+static uint8_t ramdisk_buf[RAMDISK_VOLUME_SIZE] = {
 0xEB, 0x3C, 0x90, 0x4D, 0x53, 0x44, 0x4F, 0x53,
 0x35, 0x2E, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00,
 0x01, 0x10, 0x00, 0x20, 0x00, 0xF8, 0x02, 0x00,
diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c
index a8b733ccf7..87e8295725 100644
--- a/subsys/fb/cfb.c
+++ b/subsys/fb/cfb.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(cfb);
 extern const struct cfb_font __font_entry_start[];
 extern const struct cfb_font __font_entry_end[];
 
-static inline u8_t byte_reverse(u8_t b)
+static inline uint8_t byte_reverse(uint8_t b)
 {
 	b = (b & 0xf0) >> 4 | (b & 0x0f) << 4;
 	b = (b & 0xcc) >> 2 | (b & 0x33) << 2;
@@ -25,10 +25,10 @@ static inline u8_t byte_reverse(u8_t b)
 
 struct char_framebuffer {
 	/** Pointer to a buffer in RAM */
-	u8_t *buf;
+	uint8_t *buf;
 
 	/** Size of the framebuffer */
-	u32_t size;
+	uint32_t size;
 
 	/** Pointer to the font entry array */
 	const struct cfb_font *fonts;
@@ -40,22 +40,22 @@ struct char_framebuffer {
 	enum display_screen_info screen_info;
 
 	/** Resolution of a framebuffer in pixels in X direction */
-	u16_t x_res;
+	uint16_t x_res;
 
 	/** Resolution of a framebuffer in pixels in Y direction */
-	u16_t y_res;
+	uint16_t y_res;
 
 	/** Number of pixels per tile, typically 8 */
-	u8_t ppt;
+	uint8_t ppt;
 
 	/** Number of available fonts */
-	u8_t numof_fonts;
+	uint8_t numof_fonts;
 
 	/** Current font index */
-	u8_t font_idx;
+	uint8_t font_idx;
 
 	/** Font kerning */
-	s8_t kerning;
+	int8_t kerning;
 
 	/** Invertedj*/
 	bool inverted;
@@ -63,10 +63,10 @@ struct char_framebuffer {
 
 static struct char_framebuffer char_fb;
 
-static inline u8_t *get_glyph_ptr(const struct cfb_font *fptr, char c)
+static inline uint8_t *get_glyph_ptr(const struct cfb_font *fptr, char c)
 {
 	if (fptr->caps & CFB_FONT_MONO_VPACKED) {
-		return (u8_t *)fptr->data +
+		return (uint8_t *)fptr->data +
 		       (c - fptr->first_char) *
 		       (fptr->width * fptr->height / 8U);
 	}
@@ -78,11 +78,11 @@ static inline u8_t *get_glyph_ptr(const struct cfb_font *fptr, char c)
  * Draw the monochrome character in the monochrome tiled framebuffer,
  * a byte is interpreted as 8 pixels ordered vertically among each other.
  */
-static u8_t draw_char_vtmono(const struct char_framebuffer *fb,
-			     char c, u16_t x, u16_t y)
+static uint8_t draw_char_vtmono(const struct char_framebuffer *fb,
+			     char c, uint16_t x, uint16_t y)
 {
 	const struct cfb_font *fptr = &(fb->fonts[fb->font_idx]);
-	u8_t *glyph_ptr;
+	uint8_t *glyph_ptr;
 	bool need_reverse = (((fb->screen_info & SCREEN_INFO_MONO_MSB_FIRST) != 0)
 			     != ((fptr->caps & CFB_FONT_MSB_FIRST) != 0));
 
@@ -96,11 +96,11 @@ static u8_t draw_char_vtmono(const struct char_framebuffer *fb,
 	}
 
 	for (size_t g_x = 0; g_x < fptr->width; g_x++) {
-		u32_t y_segment = y / 8U;
+		uint32_t y_segment = y / 8U;
 
 		for (size_t g_y = 0; g_y < fptr->height / 8U; g_y++) {
-			u32_t fb_y = (y_segment + g_y) * fb->x_res;
-			u8_t byte;
+			uint32_t fb_y = (y_segment + g_y) * fb->x_res;
+			uint8_t byte;
 
 			if ((fb_y + x + g_x) >= fb->size) {
 				return 0;
@@ -119,7 +119,7 @@ static u8_t draw_char_vtmono(const struct char_framebuffer *fb,
 	return fptr->width;
 }
 
-int cfb_print(struct device *dev, char *str, u16_t x, u16_t y)
+int cfb_print(struct device *dev, char *str, uint16_t x, uint16_t y)
 {
 	const struct char_framebuffer *fb = &char_fb;
 	const struct cfb_font *fptr;
@@ -239,7 +239,7 @@ int cfb_get_display_parameter(struct device *dev,
 	return 0;
 }
 
-int cfb_framebuffer_set_font(struct device *dev, u8_t idx)
+int cfb_framebuffer_set_font(struct device *dev, uint8_t idx)
 {
 	struct char_framebuffer *fb = &char_fb;
 
@@ -252,7 +252,7 @@ int cfb_framebuffer_set_font(struct device *dev, u8_t idx)
 	return 0;
 }
 
-int cfb_get_font_size(struct device *dev, u8_t idx, u8_t *width, u8_t *height)
+int cfb_get_font_size(struct device *dev, uint8_t idx, uint8_t *width, uint8_t *height)
 {
 	const struct char_framebuffer *fb = &char_fb;
 
diff --git a/subsys/fb/cfb_fonts.c b/subsys/fb/cfb_fonts.c
index 4123221b8d..6f22d7b947 100644
--- a/subsys/fb/cfb_fonts.c
+++ b/subsys/fb/cfb_fonts.c
@@ -14,7 +14,7 @@
 #define CFB_FONTS_FIRST_CHAR	32
 #define CFB_FONTS_LAST_CHAR	126
 
-const u8_t cfb_font_1016[95][20] = {
+const uint8_t cfb_font_1016[95][20] = {
 	/*   */
 	{
 		0x00, 0x00,
@@ -1252,7 +1252,7 @@ const u8_t cfb_font_1016[95][20] = {
 	},
 };
 
-const u8_t cfb_font_1524[95][45] = {
+const uint8_t cfb_font_1524[95][45] = {
 	/*   */
 	{
 		0x00, 0x00, 0x00,
@@ -2965,7 +2965,7 @@ const u8_t cfb_font_1524[95][45] = {
 	},
 };
 
-const u8_t cfb_font_2032[95][80] = {
+const uint8_t cfb_font_2032[95][80] = {
 	/*   */
 	{
 		0x00, 0x00, 0x00, 0x00,
diff --git a/subsys/fb/cfb_shell.c b/subsys/fb/cfb_shell.c
index a82038f799..54bf492070 100644
--- a/subsys/fb/cfb_shell.c
+++ b/subsys/fb/cfb_shell.c
@@ -58,7 +58,7 @@ static int cmd_clear(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_cfb_print(const struct shell *shell, int col, int row, char *str)
 {
 	int err;
-	u8_t ppt;
+	uint8_t ppt;
 
 	if (!dev) {
 		shell_error(shell, HELP_INIT);
@@ -208,8 +208,8 @@ static int cmd_set_font(const struct shell *shell, size_t argc, char *argv[])
 {
 	int err;
 	int idx;
-	u8_t height;
-	u8_t width;
+	uint8_t height;
+	uint8_t width;
 
 	if (!dev) {
 		shell_error(shell, HELP_INIT);
@@ -265,8 +265,8 @@ static int cmd_invert(const struct shell *shell, size_t argc, char *argv[])
 static int cmd_get_fonts(const struct shell *shell, size_t argc, char *argv[])
 {
 	int err = 0;
-	u8_t font_height;
-	u8_t font_width;
+	uint8_t font_height;
+	uint8_t font_width;
 
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c
index aed0dc117a..3a7a0622df 100644
--- a/subsys/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
@@ -66,7 +66,7 @@ static int translate_error(int error)
 static int fatfs_open(struct fs_file_t *zfp, const char *file_name)
 {
 	FRESULT res;
-	u8_t fs_mode;
+	uint8_t fs_mode;
 	void *ptr;
 
 	if (k_mem_slab_alloc(&fatfs_filep_pool, &ptr, K_NO_WAIT) == 0) {
@@ -214,7 +214,7 @@ static int fatfs_truncate(struct fs_file_t *zfp, off_t length)
 		 * optimization.
 		 */
 		unsigned int bw;
-		u8_t c = 0U;
+		uint8_t c = 0U;
 
 		for (int i = cur_length; i < length; i++) {
 			res = f_write(zfp->filep, &c, 1, &bw);
@@ -340,7 +340,7 @@ static int fatfs_mount(struct fs_mount_t *mountp)
 
 	/* If no file system found then create one */
 	if (res == FR_NO_FILESYSTEM) {
-		u8_t work[_MAX_SS];
+		uint8_t work[_MAX_SS];
 
 		res = f_mkfs(&mountp->mnt_point[1],
 				(FM_FAT | FM_SFD), 0, work, sizeof(work));
diff --git a/subsys/fs/fcb/fcb.c b/subsys/fs/fcb/fcb.c
index 14e18a1703..aac60d8cc7 100644
--- a/subsys/fs/fcb/fcb.c
+++ b/subsys/fs/fcb/fcb.c
@@ -13,10 +13,10 @@
 #include "string.h"
 #include <errno.h>
 
-u8_t
+uint8_t
 fcb_get_align(const struct fcb *fcb)
 {
-	u8_t align;
+	uint8_t align;
 
 	if (fcb->fap == NULL) {
 		return 0;
@@ -95,7 +95,7 @@ fcb_init(int f_area_id, struct fcb *fcb)
 	struct flash_sector *sector;
 	int rc;
 	int i;
-	u8_t align;
+	uint8_t align;
 	int oldest = -1, newest = -1;
 	struct flash_sector *oldest_sector = NULL, *newest_sector = NULL;
 	struct fcb_disk_area fda;
@@ -196,7 +196,7 @@ fcb_is_empty(struct fcb *fcb)
  * 1 byte for lengths < 128 bytes, and 2 bytes for < 16384.
  */
 int
-fcb_put_len(u8_t *buf, u16_t len)
+fcb_put_len(uint8_t *buf, uint16_t len)
 {
 	if (len < 0x80) {
 		buf[0] = len;
@@ -211,7 +211,7 @@ fcb_put_len(u8_t *buf, u16_t len)
 }
 
 int
-fcb_get_len(u8_t *buf, u16_t *len)
+fcb_get_len(uint8_t *buf, uint16_t *len)
 {
 	int rc;
 
@@ -232,7 +232,7 @@ fcb_get_len(u8_t *buf, u16_t *len)
  * Initialize erased sector for use.
  */
 int
-fcb_sector_hdr_init(struct fcb *fcb, struct flash_sector *sector, u16_t id)
+fcb_sector_hdr_init(struct fcb *fcb, struct flash_sector *sector, uint16_t id)
 {
 	struct fcb_disk_area fda;
 	int rc;
@@ -285,7 +285,7 @@ int fcb_sector_hdr_read(struct fcb *fcb, struct flash_sector *sector,
  * @return 0 on there are any fcbs aviable; -ENOENT otherwise
  */
 int
-fcb_offset_last_n(struct fcb *fcb, u8_t entries,
+fcb_offset_last_n(struct fcb *fcb, uint8_t entries,
 		struct fcb_entry *last_n_entry)
 {
 	struct fcb_entry loc;
diff --git a/subsys/fs/fcb/fcb_append.c b/subsys/fs/fcb/fcb_append.c
index b224160496..d7a90241a5 100644
--- a/subsys/fs/fcb/fcb_append.c
+++ b/subsys/fs/fcb/fcb_append.c
@@ -57,13 +57,13 @@ fcb_append_to_scratch(struct fcb *fcb)
 }
 
 int
-fcb_append(struct fcb *fcb, u16_t len, struct fcb_entry *append_loc)
+fcb_append(struct fcb *fcb, uint16_t len, struct fcb_entry *append_loc)
 {
 	struct flash_sector *sector;
 	struct fcb_entry *active;
 	int cnt;
 	int rc;
-	u8_t tmp_str[8];
+	uint8_t tmp_str[8];
 
 	cnt = fcb_put_len(tmp_str, len);
 	if (cnt < 0) {
@@ -118,7 +118,7 @@ int
 fcb_append_finish(struct fcb *fcb, struct fcb_entry *loc)
 {
 	int rc;
-	u8_t crc8[fcb->f_align];
+	uint8_t crc8[fcb->f_align];
 	off_t off;
 
 	(void)memset(crc8, 0xFF, sizeof(crc8));
diff --git a/subsys/fs/fcb/fcb_elem_info.c b/subsys/fs/fcb/fcb_elem_info.c
index 66bb26a325..9aff6fe7b2 100644
--- a/subsys/fs/fcb/fcb_elem_info.c
+++ b/subsys/fs/fcb/fcb_elem_info.c
@@ -15,15 +15,15 @@
  * the data.
  */
 int
-fcb_elem_crc8(struct fcb *fcb, struct fcb_entry *loc, u8_t *c8p)
+fcb_elem_crc8(struct fcb *fcb, struct fcb_entry *loc, uint8_t *c8p)
 {
-	u8_t tmp_str[FCB_TMP_BUF_SZ];
+	uint8_t tmp_str[FCB_TMP_BUF_SZ];
 	int cnt;
 	int blk_sz;
-	u8_t crc8;
-	u16_t len;
-	u32_t off;
-	u32_t end;
+	uint8_t crc8;
+	uint16_t len;
+	uint32_t off;
+	uint32_t end;
 	int rc;
 
 	if (loc->fe_elem_off + 2 > loc->fe_sector->fs_size) {
@@ -66,8 +66,8 @@ fcb_elem_crc8(struct fcb *fcb, struct fcb_entry *loc, u8_t *c8p)
 int fcb_elem_info(struct fcb *fcb, struct fcb_entry *loc)
 {
 	int rc;
-	u8_t crc8;
-	u8_t fl_crc8;
+	uint8_t crc8;
+	uint8_t fl_crc8;
 	off_t off;
 
 	rc = fcb_elem_crc8(fcb, loc, &crc8);
diff --git a/subsys/fs/fcb/fcb_priv.h b/subsys/fs/fcb/fcb_priv.h
index bfd4de05c2..59b0321172 100644
--- a/subsys/fs/fcb/fcb_priv.h
+++ b/subsys/fs/fcb/fcb_priv.h
@@ -12,22 +12,22 @@
 extern "C" {
 #endif
 
-#define FCB_CRC_SZ	sizeof(u8_t)
+#define FCB_CRC_SZ	sizeof(uint8_t)
 #define FCB_TMP_BUF_SZ	32
 
 #define FCB_ID_GT(a, b) (((int16_t)(a) - (int16_t)(b)) > 0)
 
 struct fcb_disk_area {
-	u32_t fd_magic;
-	u8_t fd_ver;
-	u8_t _pad;
-	u16_t fd_id;
+	uint32_t fd_magic;
+	uint8_t fd_ver;
+	uint8_t _pad;
+	uint16_t fd_id;
 };
 
-int fcb_put_len(u8_t *buf, u16_t len);
-int fcb_get_len(u8_t *buf, u16_t *len);
+int fcb_put_len(uint8_t *buf, uint16_t len);
+int fcb_get_len(uint8_t *buf, uint16_t *len);
 
-static inline int fcb_len_in_flash(struct fcb *fcb, u16_t len)
+static inline int fcb_len_in_flash(struct fcb *fcb, uint16_t len)
 {
 	if (fcb->f_align <= 1U) {
 		return len;
@@ -36,7 +36,7 @@ static inline int fcb_len_in_flash(struct fcb *fcb, u16_t len)
 }
 
 const struct flash_area *fcb_open_flash(const struct fcb *fcb);
-u8_t fcb_get_align(const struct fcb *fcb);
+uint8_t fcb_get_align(const struct fcb *fcb);
 int fcb_erase_sector(const struct fcb *fcb, const struct flash_sector *sector);
 
 int fcb_getnext_in_sector(struct fcb *fcb, struct fcb_entry *loc);
@@ -45,9 +45,9 @@ struct flash_sector *fcb_getnext_sector(struct fcb *fcb,
 int fcb_getnext_nolock(struct fcb *fcb, struct fcb_entry *loc);
 
 int fcb_elem_info(struct fcb *fcb, struct fcb_entry *loc);
-int fcb_elem_crc8(struct fcb *fcb, struct fcb_entry *loc, u8_t *crc8p);
+int fcb_elem_crc8(struct fcb *fcb, struct fcb_entry *loc, uint8_t *crc8p);
 
-int fcb_sector_hdr_init(struct fcb *fcb, struct flash_sector *sector, u16_t id);
+int fcb_sector_hdr_init(struct fcb *fcb, struct flash_sector *sector, uint16_t id);
 int fcb_sector_hdr_read(struct fcb *fcb, struct flash_sector *sector,
 			struct fcb_disk_area *fdap);
 
diff --git a/subsys/fs/fuse_fs_access.c b/subsys/fs/fuse_fs_access.c
index 7fb1802cc4..28c5c7c902 100644
--- a/subsys/fs/fuse_fs_access.c
+++ b/subsys/fs/fuse_fs_access.c
@@ -33,7 +33,7 @@
 #define DIR_END '\0'
 
 static struct fs_file_t files[NUMBER_OF_OPEN_FILES];
-static u8_t file_handles[NUMBER_OF_OPEN_FILES];
+static uint8_t file_handles[NUMBER_OF_OPEN_FILES];
 
 static pthread_t fuse_thread;
 
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index a91727557e..71f28015cb 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -555,8 +555,8 @@ static int littlefs_mount(struct fs_mount_t *mountp)
 		goto out;
 	}
 	LOG_DBG("FS area %u at 0x%x for %u bytes",
-		area_id, (u32_t)fs->area->fa_off,
-		(u32_t)fs->area->fa_size);
+		area_id, (uint32_t)fs->area->fa_off,
+		(uint32_t)fs->area->fa_size);
 
 	dev = flash_area_get_device(fs->area);
 	if (dev == NULL) {
@@ -601,7 +601,7 @@ static int littlefs_mount(struct fs_mount_t *mountp)
 		goto out;
 	}
 
-	s32_t block_cycles = lcp->block_cycles;
+	int32_t block_cycles = lcp->block_cycles;
 
 	if (block_cycles == 0) {
 		block_cycles = CONFIG_FS_LITTLEFS_BLOCK_CYCLES;
@@ -628,7 +628,7 @@ static int littlefs_mount(struct fs_mount_t *mountp)
 	lfs_size_t block_count = fs->area->fa_size / block_size;
 
 	LOG_INF("FS at %s:0x%x is %u 0x%x-byte blocks with %u cycle",
-		dev->name, (u32_t)fs->area->fa_off,
+		dev->name, (uint32_t)fs->area->fa_off,
 		block_count, block_size, block_cycles);
 	LOG_INF("sizes: rd %u ; pr %u ; ca %u ; la %u",
 		read_size, prog_size, cache_size, lookahead_size);
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index dcf21acc40..d03142b7d7 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -30,14 +30,14 @@ static inline size_t nvs_al_size(struct nvs_fs *fs, size_t len)
 
 /* flash routines */
 /* basic aligned flash write to nvs address */
-static int nvs_flash_al_wrt(struct nvs_fs *fs, u32_t addr, const void *data,
+static int nvs_flash_al_wrt(struct nvs_fs *fs, uint32_t addr, const void *data,
 			     size_t len)
 {
-	const u8_t *data8 = (const u8_t *)data;
+	const uint8_t *data8 = (const uint8_t *)data;
 	int rc = 0;
 	off_t offset;
 	size_t blen;
-	u8_t buf[NVS_BLOCK_SIZE];
+	uint8_t buf[NVS_BLOCK_SIZE];
 
 	if (!len) {
 		/* Nothing to write, avoid changing the flash protection */
@@ -81,7 +81,7 @@ end:
 }
 
 /* basic flash read from nvs address */
-static int nvs_flash_rd(struct nvs_fs *fs, u32_t addr, void *data,
+static int nvs_flash_rd(struct nvs_fs *fs, uint32_t addr, void *data,
 			 size_t len)
 {
 	int rc;
@@ -120,7 +120,7 @@ static int nvs_flash_data_wrt(struct nvs_fs *fs, const void *data, size_t len)
 }
 
 /* flash ate read */
-static int nvs_flash_ate_rd(struct nvs_fs *fs, u32_t addr,
+static int nvs_flash_ate_rd(struct nvs_fs *fs, uint32_t addr,
 			     struct nvs_ate *entry)
 {
 	return nvs_flash_rd(fs, addr, entry, sizeof(struct nvs_ate));
@@ -134,13 +134,13 @@ static int nvs_flash_ate_rd(struct nvs_fs *fs, u32_t addr,
  * in blocks of size NVS_BLOCK_SIZE aligned to fs->write_block_size
  * returns 0 if equal, 1 if not equal, errcode if error
  */
-static int nvs_flash_block_cmp(struct nvs_fs *fs, u32_t addr, const void *data,
+static int nvs_flash_block_cmp(struct nvs_fs *fs, uint32_t addr, const void *data,
 				size_t len)
 {
-	const u8_t *data8 = (const u8_t *)data;
+	const uint8_t *data8 = (const uint8_t *)data;
 	int rc;
 	size_t bytes_to_cmp, block_size;
-	u8_t buf[NVS_BLOCK_SIZE];
+	uint8_t buf[NVS_BLOCK_SIZE];
 
 	block_size = NVS_BLOCK_SIZE & ~(fs->write_block_size - 1U);
 	while (len) {
@@ -164,12 +164,12 @@ static int nvs_flash_block_cmp(struct nvs_fs *fs, u32_t addr, const void *data,
  * value. returns 0 if all data in flash is equal to value, 1 if not equal,
  * errcode if error
  */
-static int nvs_flash_cmp_const(struct nvs_fs *fs, u32_t addr, u8_t value,
+static int nvs_flash_cmp_const(struct nvs_fs *fs, uint32_t addr, uint8_t value,
 				size_t len)
 {
 	int rc;
 	size_t bytes_to_cmp, block_size;
-	u8_t cmp[NVS_BLOCK_SIZE];
+	uint8_t cmp[NVS_BLOCK_SIZE];
 
 	block_size = NVS_BLOCK_SIZE & ~(fs->write_block_size - 1U);
 	(void)memset(cmp, value, block_size);
@@ -188,11 +188,11 @@ static int nvs_flash_cmp_const(struct nvs_fs *fs, u32_t addr, u8_t value,
 /* flash block move: move a block at addr to the current data write location
  * and updates the data write location.
  */
-static int nvs_flash_block_move(struct nvs_fs *fs, u32_t addr, size_t len)
+static int nvs_flash_block_move(struct nvs_fs *fs, uint32_t addr, size_t len)
 {
 	int rc;
 	size_t bytes_to_copy, block_size;
-	u8_t buf[NVS_BLOCK_SIZE];
+	uint8_t buf[NVS_BLOCK_SIZE];
 
 	block_size = NVS_BLOCK_SIZE & ~(fs->write_block_size - 1U);
 
@@ -215,7 +215,7 @@ static int nvs_flash_block_move(struct nvs_fs *fs, u32_t addr, size_t len)
 /* erase a sector by first checking it is used and then erasing if required
  * return 0 if OK, errorcode on error.
  */
-static int nvs_flash_erase_sector(struct nvs_fs *fs, u32_t addr)
+static int nvs_flash_erase_sector(struct nvs_fs *fs, uint32_t addr)
 {
 	int rc;
 	off_t offset;
@@ -249,7 +249,7 @@ static int nvs_flash_erase_sector(struct nvs_fs *fs, u32_t addr)
 /* crc update on allocation entry */
 static void nvs_ate_crc8_update(struct nvs_ate *entry)
 {
-	u8_t crc8;
+	uint8_t crc8;
 
 	crc8 = crc8_ccitt(0xff, entry, offsetof(struct nvs_ate, crc8));
 	entry->crc8 = crc8;
@@ -260,7 +260,7 @@ static void nvs_ate_crc8_update(struct nvs_ate *entry)
  */
 static int nvs_ate_crc8_check(const struct nvs_ate *entry)
 {
-	u8_t crc8;
+	uint8_t crc8;
 
 	crc8 = crc8_ccitt(0xff, entry, offsetof(struct nvs_ate, crc8));
 	if (crc8 == entry->crc8) {
@@ -273,9 +273,9 @@ static int nvs_ate_crc8_check(const struct nvs_ate *entry)
  * the whole ATE is equal to value, 1 if not equal.
  */
 
-static int nvs_ate_cmp_const(const struct nvs_ate *entry, u8_t value)
+static int nvs_ate_cmp_const(const struct nvs_ate *entry, uint8_t value)
 {
-	const u8_t *data8 = (const u8_t *)entry;
+	const uint8_t *data8 = (const uint8_t *)entry;
 	int i;
 
 	for (i = 0; i < sizeof(struct nvs_ate); i++) {
@@ -288,7 +288,7 @@ static int nvs_ate_cmp_const(const struct nvs_ate *entry, u8_t value)
 }
 
 /* store an entry in flash */
-static int nvs_flash_wrt_entry(struct nvs_fs *fs, u16_t id, const void *data,
+static int nvs_flash_wrt_entry(struct nvs_fs *fs, uint16_t id, const void *data,
 				size_t len)
 {
 	int rc;
@@ -298,8 +298,8 @@ static int nvs_flash_wrt_entry(struct nvs_fs *fs, u16_t id, const void *data,
 	ate_size = nvs_al_size(fs, sizeof(struct nvs_ate));
 
 	entry.id = id;
-	entry.offset = (u16_t)(fs->data_wra & ADDR_OFFS_MASK);
-	entry.len = (u16_t)len;
+	entry.offset = (uint16_t)(fs->data_wra & ADDR_OFFS_MASK);
+	entry.len = (uint16_t)len;
 	entry.part = 0xff;
 
 	nvs_ate_crc8_update(&entry);
@@ -320,11 +320,11 @@ static int nvs_flash_wrt_entry(struct nvs_fs *fs, u16_t id, const void *data,
 /* walking through allocation entry list, from newest to oldest entries
  * read ate from addr, modify addr to the previous ate
  */
-static int nvs_prev_ate(struct nvs_fs *fs, u32_t *addr, struct nvs_ate *ate)
+static int nvs_prev_ate(struct nvs_fs *fs, uint32_t *addr, struct nvs_ate *ate)
 {
 	int rc;
 	struct nvs_ate close_ate, end_ate;
-	u32_t data_end_addr, ate_end_addr;
+	uint32_t data_end_addr, ate_end_addr;
 	size_t ate_size;
 
 	ate_size = nvs_al_size(fs, sizeof(struct nvs_ate));
@@ -397,7 +397,7 @@ static int nvs_prev_ate(struct nvs_fs *fs, u32_t *addr, struct nvs_ate *ate)
 	return 0;
 }
 
-static void nvs_sector_advance(struct nvs_fs *fs, u32_t *addr)
+static void nvs_sector_advance(struct nvs_fs *fs, uint32_t *addr)
 {
 	*addr += (1 << ADDR_SECT_SHIFT);
 	if ((*addr >> ADDR_SECT_SHIFT) == fs->sector_count) {
@@ -418,7 +418,7 @@ static int nvs_sector_close(struct nvs_fs *fs)
 
 	close_ate.id = 0xFFFF;
 	close_ate.len = 0U;
-	close_ate.offset = (u16_t)((fs->ate_wra + ate_size) & ADDR_OFFS_MASK);
+	close_ate.offset = (uint16_t)((fs->ate_wra + ate_size) & ADDR_OFFS_MASK);
 
 	fs->ate_wra &= ADDR_SECT_MASK;
 	fs->ate_wra += (fs->sector_size - ate_size);
@@ -443,7 +443,7 @@ static int nvs_gc(struct nvs_fs *fs)
 {
 	int rc;
 	struct nvs_ate close_ate, gc_ate, wlk_ate;
-	u32_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr,
+	uint32_t sec_addr, gc_addr, gc_prev_addr, wlk_addr, wlk_prev_addr,
 	      data_addr, stop_addr;
 	size_t ate_size;
 
@@ -507,7 +507,7 @@ static int nvs_gc(struct nvs_fs *fs)
 			data_addr = (gc_prev_addr & ADDR_SECT_MASK);
 			data_addr += gc_ate.offset;
 
-			gc_ate.offset = (u16_t)(fs->data_wra & ADDR_OFFS_MASK);
+			gc_ate.offset = (uint16_t)(fs->data_wra & ADDR_OFFS_MASK);
 			nvs_ate_crc8_update(&gc_ate);
 
 			rc = nvs_flash_block_move(fs, data_addr, gc_ate.len);
@@ -543,8 +543,8 @@ static int nvs_startup(struct nvs_fs *fs)
 	 * should never happen as this is verified in nvs_init() but both
 	 * Coverity and GCC believe the contrary.
 	 */
-	u32_t addr = 0U;
-	u16_t i, closed_sectors = 0;
+	uint32_t addr = 0U;
+	uint16_t i, closed_sectors = 0;
 
 	k_mutex_lock(&fs->nvs_lock, K_FOREVER);
 
@@ -554,7 +554,7 @@ static int nvs_startup(struct nvs_fs *fs)
 	 */
 	for (i = 0; i < fs->sector_count; i++) {
 		addr = (i << ADDR_SECT_SHIFT) +
-		       (u16_t)(fs->sector_size - ate_size);
+		       (uint16_t)(fs->sector_size - ate_size);
 		rc = nvs_flash_cmp_const(fs, addr, 0xff,
 					  sizeof(struct nvs_ate));
 		if (rc) {
@@ -674,14 +674,14 @@ end:
 int nvs_clear(struct nvs_fs *fs)
 {
 	int rc;
-	u32_t addr;
+	uint32_t addr;
 
 	if (!fs->ready) {
 		LOG_ERR("NVS not initialized");
 		return -EACCES;
 	}
 
-	for (u16_t i = 0; i < fs->sector_count; i++) {
+	for (uint16_t i = 0; i < fs->sector_count; i++) {
 		addr = i << ADDR_SECT_SHIFT;
 		rc = nvs_flash_erase_sector(fs, addr);
 		if (rc) {
@@ -749,13 +749,13 @@ int nvs_init(struct nvs_fs *fs, const char *dev_name)
 	return 0;
 }
 
-ssize_t nvs_write(struct nvs_fs *fs, u16_t id, const void *data, size_t len)
+ssize_t nvs_write(struct nvs_fs *fs, uint16_t id, const void *data, size_t len)
 {
 	int rc, gc_count;
 	size_t ate_size, data_size;
 	struct nvs_ate wlk_ate;
-	u32_t wlk_addr, rd_addr;
-	u16_t required_space = 0U; /* no space, appropriate for delete ate */
+	uint32_t wlk_addr, rd_addr;
+	uint16_t required_space = 0U; /* no space, appropriate for delete ate */
 	bool prev_found = false;
 
 	if (!fs->ready) {
@@ -867,17 +867,17 @@ end:
 	return rc;
 }
 
-int nvs_delete(struct nvs_fs *fs, u16_t id)
+int nvs_delete(struct nvs_fs *fs, uint16_t id)
 {
 	return nvs_write(fs, id, NULL, 0);
 }
 
-ssize_t nvs_read_hist(struct nvs_fs *fs, u16_t id, void *data, size_t len,
-		      u16_t cnt)
+ssize_t nvs_read_hist(struct nvs_fs *fs, uint16_t id, void *data, size_t len,
+		      uint16_t cnt)
 {
 	int rc;
-	u32_t wlk_addr, rd_addr;
-	u16_t cnt_his;
+	uint32_t wlk_addr, rd_addr;
+	uint16_t cnt_his;
 	struct nvs_ate wlk_ate;
 	size_t ate_size;
 
@@ -929,7 +929,7 @@ err:
 	return rc;
 }
 
-ssize_t nvs_read(struct nvs_fs *fs, u16_t id, void *data, size_t len)
+ssize_t nvs_read(struct nvs_fs *fs, uint16_t id, void *data, size_t len)
 {
 	int rc;
 
@@ -942,7 +942,7 @@ ssize_t nvs_calc_free_space(struct nvs_fs *fs)
 
 	int rc;
 	struct nvs_ate step_ate, wlk_ate;
-	u32_t step_addr, wlk_addr;
+	uint32_t step_addr, wlk_addr;
 	size_t ate_size, free_space;
 
 	if (!fs->ready) {
@@ -953,7 +953,7 @@ ssize_t nvs_calc_free_space(struct nvs_fs *fs)
 	ate_size = nvs_al_size(fs, sizeof(struct nvs_ate));
 
 	free_space = 0;
-	for (u16_t i = 1; i < fs->sector_count; i++) {
+	for (uint16_t i = 1; i < fs->sector_count; i++) {
 		free_space += (fs->sector_size - ate_size);
 	}
 
diff --git a/subsys/fs/nvs/nvs_priv.h b/subsys/fs/nvs/nvs_priv.h
index 75376c0165..2f80b0d183 100644
--- a/subsys/fs/nvs/nvs_priv.h
+++ b/subsys/fs/nvs/nvs_priv.h
@@ -13,7 +13,7 @@ extern "C" {
 
 /*
  * MASKS AND SHIFT FOR ADDRESSES
- * an address in nvs is an u32_t where:
+ * an address in nvs is an uint32_t where:
  *   high 2 bytes represent the sector number
  *   low 2 bytes represent the offset in a sector
  */
@@ -30,15 +30,15 @@ extern "C" {
 
 /* Allocation Table Entry */
 struct nvs_ate {
-	u16_t id;	/* data id */
-	u16_t offset;	/* data offset within sector */
-	u16_t len;	/* data len within sector */
-	u8_t part;	/* part of a multipart data - future extension */
-	u8_t crc8;	/* crc8 check of the entry */
+	uint16_t id;	/* data id */
+	uint16_t offset;	/* data offset within sector */
+	uint16_t len;	/* data len within sector */
+	uint8_t part;	/* part of a multipart data - future extension */
+	uint8_t crc8;	/* crc8 check of the entry */
 } __packed;
 
 BUILD_ASSERT(offsetof(struct nvs_ate, crc8) ==
-		 sizeof(struct nvs_ate) - sizeof(u8_t),
+		 sizeof(struct nvs_ate) - sizeof(uint8_t),
 		 "crc8 must be the last member");
 
 #ifdef __cplusplus
diff --git a/subsys/fs/shell.c b/subsys/fs/shell.c
index 55d4cb1697..19ea26a7e0 100644
--- a/subsys/fs/shell.c
+++ b/subsys/fs/shell.c
@@ -295,7 +295,7 @@ static int cmd_read(const struct shell *shell, size_t argc, char **argv)
 
 	while (count > 0) {
 		ssize_t read;
-		u8_t buf[16];
+		uint8_t buf[16];
 		int i;
 
 		read = fs_read(&file, buf, MIN(count, sizeof(buf)));
@@ -354,8 +354,8 @@ static int cmd_statvfs(const struct shell *shell, size_t argc, char **argv)
 static int cmd_write(const struct shell *shell, size_t argc, char **argv)
 {
 	char path[MAX_PATH_LEN];
-	u8_t buf[BUF_CNT];
-	u8_t buf_len;
+	uint8_t buf[BUF_CNT];
+	uint8_t buf_len;
 	int arg_offset;
 	struct fs_file_t file;
 	off_t offset = -1;
diff --git a/subsys/jwt/jwt.c b/subsys/jwt/jwt.c
index fed7b53851..b8a7a33143 100644
--- a/subsys/jwt/jwt.c
+++ b/subsys/jwt/jwt.c
@@ -138,8 +138,8 @@ static struct json_obj_descr jwt_header_desc[] = {
 };
 
 struct jwt_payload {
-	s32_t exp;
-	s32_t iat;
+	int32_t exp;
+	int32_t iat;
 	const char *aud;
 };
 
@@ -174,8 +174,8 @@ static void jwt_add_header(struct jwt_builder *builder)
 }
 
 int jwt_add_payload(struct jwt_builder *builder,
-		     s32_t exp,
-		     s32_t iat,
+		     int32_t exp,
+		     int32_t iat,
 		     const char *aud)
 {
 	struct jwt_payload payload = {
@@ -209,7 +209,7 @@ int jwt_sign(struct jwt_builder *builder,
 		return res;
 	}
 
-	u8_t hash[32], sig[256];
+	uint8_t hash[32], sig[256];
 	size_t sig_len = sizeof(sig);
 
 	/*
@@ -248,10 +248,10 @@ static int setup_prng(void)
 	}
 	prng_init = true;
 
-	u8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
+	uint8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
 
-	for (int i = 0; i < sizeof(entropy); i += sizeof(u32_t)) {
-		u32_t rv = sys_rand32_get();
+	for (int i = 0; i < sizeof(entropy); i += sizeof(uint32_t)) {
+		uint32_t rv = sys_rand32_get();
 
 		memcpy(entropy + i, &rv, sizeof(uint32_t));
 	}
@@ -264,7 +264,7 @@ static int setup_prng(void)
 	return res == TC_CRYPTO_SUCCESS ? 0 : -EINVAL;
 }
 
-int default_CSPRNG(u8_t *dest, unsigned int size)
+int default_CSPRNG(uint8_t *dest, unsigned int size)
 {
 	int res = tc_ctr_prng_generate(&prng_state, NULL, 0, dest, size);
 	return res;
@@ -275,7 +275,7 @@ int jwt_sign(struct jwt_builder *builder,
 	     size_t der_key_len)
 {
 	struct tc_sha256_state_struct ctx;
-	u8_t hash[32], sig[64];
+	uint8_t hash[32], sig[64];
 	int res;
 
 	tc_sha256_init(&ctx);
diff --git a/subsys/logging/log_backend_native_posix.c b/subsys/logging/log_backend_native_posix.c
index 106fa82fb7..6b4a0ba2b9 100644
--- a/subsys/logging/log_backend_native_posix.c
+++ b/subsys/logging/log_backend_native_posix.c
@@ -44,9 +44,9 @@ static void preprint_char(int c)
 	}
 }
 
-static u8_t buf[_STDOUT_BUF_SIZE];
+static uint8_t buf[_STDOUT_BUF_SIZE];
 
-static int char_out(u8_t *data, size_t length, void *ctx)
+static int char_out(uint8_t *data, size_t length, void *ctx)
 {
 	for (size_t i = 0; i < length; i++) {
 		preprint_char(data[i]);
@@ -62,7 +62,7 @@ static void put(const struct log_backend *const backend,
 {
 	log_msg_get(msg);
 
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
 		if (posix_trace_over_tty(0)) {
@@ -85,7 +85,7 @@ static void panic(struct log_backend const *const backend)
 	log_output_flush(&log_output);
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -93,11 +93,11 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void sync_string(const struct log_backend *const backend,
-		     struct log_msg_ids src_level, u32_t timestamp,
+		     struct log_msg_ids src_level, uint32_t timestamp,
 		     const char *fmt, va_list ap)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
-	u32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
+	uint32_t key;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
 		flags |= LOG_OUTPUT_FLAG_COLORS;
@@ -113,11 +113,11 @@ static void sync_string(const struct log_backend *const backend,
 }
 
 static void sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
-	u32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
+	uint32_t key;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
 		flags |= LOG_OUTPUT_FLAG_COLORS;
diff --git a/subsys/logging/log_backend_net.c b/subsys/logging/log_backend_net.c
index f04502563d..3ef74715e7 100644
--- a/subsys/logging/log_backend_net.c
+++ b/subsys/logging/log_backend_net.c
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(log_backend_net, CONFIG_LOG_DEFAULT_LEVEL);
 
 static char hostname[MAX_HOSTNAME_LEN + 1];
 
-static u8_t output_buf[CONFIG_LOG_BACKEND_NET_MAX_BUF_SIZE];
+static uint8_t output_buf[CONFIG_LOG_BACKEND_NET_MAX_BUF_SIZE];
 static bool net_init_done;
 struct sockaddr server_addr;
 static bool panic_mode;
@@ -54,7 +54,7 @@ struct net_buf_pool *get_data_pool(void)
 	return &syslog_tx_bufs;
 }
 
-static int line_out(u8_t *data, size_t length, void *output_ctx)
+static int line_out(uint8_t *data, size_t length, void *output_ctx)
 {
 	struct net_context *ctx = (struct net_context *)output_ctx;
 	int ret = -ENOMEM;
@@ -215,14 +215,14 @@ static void panic(struct log_backend const *const backend)
 }
 
 static void sync_string(const struct log_backend *const backend,
-		     struct log_msg_ids src_level, u32_t timestamp,
+		     struct log_msg_ids src_level, uint32_t timestamp,
 		     const char *fmt, va_list ap)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_FORMAT_SYSLOG |
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_FORMAT_SYSLOG |
 		LOG_OUTPUT_FLAG_TIMESTAMP |
 		(IS_ENABLED(CONFIG_LOG_BACKEND_NET_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0);
-	u32_t key;
+	uint32_t key;
 
 	if (!net_init_done && do_net_init() == 0) {
 		net_init_done = true;
diff --git a/subsys/logging/log_backend_rb.c b/subsys/logging/log_backend_rb.c
index bed4320174..2b590c049d 100644
--- a/subsys/logging/log_backend_rb.c
+++ b/subsys/logging/log_backend_rb.c
@@ -34,17 +34,17 @@ static void init(void)
 		      (void *)CONFIG_LOG_BACKEND_RB_MEM_BASE);
 }
 
-static void trace(const u8_t *data, size_t length)
+static void trace(const uint8_t *data, size_t length)
 {
-	const u16_t magic = 0x55aa;
-	static u16_t log_id;
-	volatile u8_t *t, *region;
+	const uint16_t magic = 0x55aa;
+	static uint16_t log_id;
+	volatile uint8_t *t, *region;
 	int space;
 	int i;
 
 	space = ring_buf_space_get(&ringbuf);
 	if (space < CONFIG_LOG_BACKEND_RB_SLOT_SIZE) {
-		u8_t *dummy;
+		uint8_t *dummy;
 
 		/* Remove oldest entry */
 		ring_buf_get_claim(&ringbuf, &dummy,
@@ -52,16 +52,16 @@ static void trace(const u8_t *data, size_t length)
 		ring_buf_get_finish(&ringbuf, CONFIG_LOG_BACKEND_RB_SLOT_SIZE);
 	}
 
-	ring_buf_put_claim(&ringbuf, (u8_t **)&t,
+	ring_buf_put_claim(&ringbuf, (uint8_t **)&t,
 			   CONFIG_LOG_BACKEND_RB_SLOT_SIZE);
 	region = t;
 
 	/* Add magic number at the beginning of the slot */
-	*(u16_t *)t = magic;
+	*(uint16_t *)t = magic;
 	t += 2;
 
 	/* Add log id */
-	*(u16_t *)t = log_id++;
+	*(uint16_t *)t = log_id++;
 	t += 2;
 
 	for (i = 0; i < MIN(length, CONFIG_LOG_BACKEND_RB_SLOT_SIZE - 4); i++) {
@@ -73,7 +73,7 @@ static void trace(const u8_t *data, size_t length)
 	ring_buf_put_finish(&ringbuf, CONFIG_LOG_BACKEND_RB_SLOT_SIZE);
 }
 
-static int char_out(u8_t *data, size_t length, void *ctx)
+static int char_out(uint8_t *data, size_t length, void *ctx)
 {
 	trace(data, length);
 
@@ -81,7 +81,7 @@ static int char_out(u8_t *data, size_t length, void *ctx)
 }
 
 /* magic and log id takes space */
-static u8_t buf[CONFIG_LOG_BACKEND_RB_SLOT_SIZE - 4];
+static uint8_t buf[CONFIG_LOG_BACKEND_RB_SLOT_SIZE - 4];
 
 LOG_OUTPUT_DEFINE(log_output, char_out, buf, sizeof(buf));
 
@@ -90,7 +90,7 @@ static void put(const struct log_backend *const backend,
 {
 	log_msg_get(msg);
 
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
 		flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
@@ -106,7 +106,7 @@ static void panic(struct log_backend const *const backend)
 	log_output_flush(&log_output);
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -114,11 +114,11 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void sync_string(const struct log_backend *const backend,
-			struct log_msg_ids src_level, u32_t timestamp,
+			struct log_msg_ids src_level, uint32_t timestamp,
 			const char *fmt, va_list ap)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL;
-	u32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL;
+	uint32_t key;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
 		flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
@@ -130,11 +130,11 @@ static void sync_string(const struct log_backend *const backend,
 }
 
 static void sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
-	u32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
+	uint32_t key;
 
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
 		flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
diff --git a/subsys/logging/log_backend_rtt.c b/subsys/logging/log_backend_rtt.c
index 53a8300307..65bcc7ee3d 100644
--- a/subsys/logging/log_backend_rtt.c
+++ b/subsys/logging/log_backend_rtt.c
@@ -58,19 +58,19 @@
 
 
 static const char *drop_msg = DROP_MSG;
-static u8_t rtt_buf[RTT_BUFFER_SIZE];
-static u8_t line_buf[MESSAGE_SIZE + DROP_MSG_LEN];
-static u8_t *line_pos;
-static u8_t char_buf[CHAR_BUF_SIZE];
+static uint8_t rtt_buf[RTT_BUFFER_SIZE];
+static uint8_t line_buf[MESSAGE_SIZE + DROP_MSG_LEN];
+static uint8_t *line_pos;
+static uint8_t char_buf[CHAR_BUF_SIZE];
 static int drop_cnt;
 static int drop_warn;
 static bool panic_mode;
 static bool host_present;
 
-static int data_out_block_mode(u8_t *data, size_t length, void *ctx);
-static int data_out_drop_mode(u8_t *data, size_t length, void *ctx);
+static int data_out_block_mode(uint8_t *data, size_t length, void *ctx);
+static int data_out_drop_mode(uint8_t *data, size_t length, void *ctx);
 
-static int char_out_drop_mode(u8_t data);
+static int char_out_drop_mode(uint8_t data);
 static int line_out_drop_mode(void);
 
 static inline bool is_sync_mode(void)
@@ -83,10 +83,10 @@ static inline bool is_panic_mode(void)
 	return panic_mode;
 }
 
-static int data_out_drop_mode(u8_t *data, size_t length, void *ctx)
+static int data_out_drop_mode(uint8_t *data, size_t length, void *ctx)
 {
 	(void) ctx;
-	u8_t *pos;
+	uint8_t *pos;
 
 	if (is_sync_mode()) {
 		return data_out_block_mode(data, length, ctx);
@@ -101,7 +101,7 @@ static int data_out_drop_mode(u8_t *data, size_t length, void *ctx)
 	return (int) (pos - data);
 }
 
-static int char_out_drop_mode(u8_t data)
+static int char_out_drop_mode(uint8_t data)
 {
 	if (data == '\n') {
 		if (line_out_drop_mode()) {
@@ -145,11 +145,11 @@ static int line_out_drop_mode(void)
 
 		if (cnt < 10) {
 			line_buf[DROP_MSG_LEN - 2] = ' ';
-			line_buf[DROP_MSG_LEN - 3] = (u8_t) ('0' + cnt);
+			line_buf[DROP_MSG_LEN - 3] = (uint8_t) ('0' + cnt);
 			line_buf[DROP_MSG_LEN - 4] = ' ';
 		} else {
-			line_buf[DROP_MSG_LEN - 2] = (u8_t) ('0' + cnt % 10);
-			line_buf[DROP_MSG_LEN - 3] = (u8_t) ('0' + cnt / 10);
+			line_buf[DROP_MSG_LEN - 2] = (uint8_t) ('0' + cnt % 10);
+			line_buf[DROP_MSG_LEN - 3] = (uint8_t) ('0' + cnt / 10);
 			line_buf[DROP_MSG_LEN - 4] = '>';
 		}
 	}
@@ -198,7 +198,7 @@ static void on_write(int retry_cnt)
 
 }
 
-static int data_out_block_mode(u8_t *data, size_t length, void *ctx)
+static int data_out_block_mode(uint8_t *data, size_t length, void *ctx)
 {
 	int ret = 0;
 	int retry_cnt = CONFIG_LOG_BACKEND_RTT_RETRY_CNT;
@@ -232,7 +232,7 @@ LOG_OUTPUT_DEFINE(log_output, IS_ENABLED(CONFIG_LOG_BACKEND_RTT_MODE_BLOCK) ?
 static void put(const struct log_backend *const backend,
 		struct log_msg *msg)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_put(&log_output, flag, msg);
@@ -261,7 +261,7 @@ static void panic(struct log_backend const *const backend)
 	log_backend_std_panic(&log_output);
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -269,10 +269,10 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void sync_string(const struct log_backend *const backend,
-		     struct log_msg_ids src_level, u32_t timestamp,
+		     struct log_msg_ids src_level, uint32_t timestamp,
 		     const char *fmt, va_list ap)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_string(&log_output, flag, src_level,
@@ -280,10 +280,10 @@ static void sync_string(const struct log_backend *const backend,
 }
 
 static void sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_RTT_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_hexdump(&log_output, flag, src_level,
diff --git a/subsys/logging/log_backend_std.h b/subsys/logging/log_backend_std.h
index a184a7ab87..bc5c122415 100644
--- a/subsys/logging/log_backend_std.h
+++ b/subsys/logging/log_backend_std.h
@@ -21,7 +21,7 @@ extern "C" {
  * @param msg		Log message.
  */
 static inline void
-log_backend_std_put(const struct log_output *const log_output, u32_t flags,
+log_backend_std_put(const struct log_output *const log_output, uint32_t flags,
 		    struct log_msg *msg)
 {
 	log_msg_get(msg);
@@ -57,7 +57,7 @@ log_backend_std_panic(const struct log_output *const log_output)
  * @param cnt		Number of dropped messages.
  */
 static inline void
-log_backend_std_dropped(const struct log_output *const log_output, u32_t cnt)
+log_backend_std_dropped(const struct log_output *const log_output, uint32_t cnt)
 {
 	log_output_dropped_process(log_output, cnt);
 }
@@ -73,8 +73,8 @@ log_backend_std_dropped(const struct log_output *const log_output, u32_t cnt)
  */
 static inline void
 log_backend_std_sync_string(const struct log_output *const log_output,
-			    u32_t flags, struct log_msg_ids src_level,
-			    u32_t timestamp, const char *fmt, va_list ap)
+			    uint32_t flags, struct log_msg_ids src_level,
+			    uint32_t timestamp, const char *fmt, va_list ap)
 {
 	int key;
 
@@ -115,9 +115,9 @@ log_backend_std_sync_string(const struct log_output *const log_output,
  */
 static inline void
 log_backend_std_sync_hexdump(const struct log_output *const log_output,
-			     u32_t flags, struct log_msg_ids src_level,
-			     u32_t timestamp, const char *metadata,
-			     const u8_t *data, u32_t length)
+			     uint32_t flags, struct log_msg_ids src_level,
+			     uint32_t timestamp, const char *metadata,
+			     const uint8_t *data, uint32_t length)
 {
 	int key;
 
diff --git a/subsys/logging/log_backend_swo.c b/subsys/logging/log_backend_swo.c
index 936ca71314..637da48b08 100644
--- a/subsys/logging/log_backend_swo.c
+++ b/subsys/logging/log_backend_swo.c
@@ -50,9 +50,9 @@
 #endif
 #endif
 
-static u8_t buf[1];
+static uint8_t buf[1];
 
-static int char_out(u8_t *data, size_t length, void *ctx)
+static int char_out(uint8_t *data, size_t length, void *ctx)
 {
 	ARG_UNUSED(ctx);
 
@@ -68,7 +68,7 @@ LOG_OUTPUT_DEFINE(log_output, char_out, buf, sizeof(buf));
 static void log_backend_swo_put(const struct log_backend *const backend,
 		struct log_msg *msg)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_put(&log_output, flag, msg);
@@ -104,7 +104,7 @@ static void log_backend_swo_panic(struct log_backend const *const backend)
 {
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -112,10 +112,10 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void log_backend_swo_sync_string(const struct log_backend *const backend,
-		struct log_msg_ids src_level, u32_t timestamp,
+		struct log_msg_ids src_level, uint32_t timestamp,
 		const char *fmt, va_list ap)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_string(&log_output, flag, src_level,
@@ -124,10 +124,10 @@ static void log_backend_swo_sync_string(const struct log_backend *const backend,
 
 static void log_backend_swo_sync_hexdump(
 		const struct log_backend *const backend,
-		struct log_msg_ids src_level, u32_t timestamp,
-		const char *metadata, const u8_t *data, u32_t length)
+		struct log_msg_ids src_level, uint32_t timestamp,
+		const char *metadata, const uint8_t *data, uint32_t length)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_SWO_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_hexdump(&log_output, flag, src_level,
diff --git a/subsys/logging/log_backend_uart.c b/subsys/logging/log_backend_uart.c
index a57fdb5f03..883e57efe7 100644
--- a/subsys/logging/log_backend_uart.c
+++ b/subsys/logging/log_backend_uart.c
@@ -13,7 +13,7 @@
 #include <drivers/uart.h>
 #include <assert.h>
 
-static int char_out(u8_t *data, size_t length, void *ctx)
+static int char_out(uint8_t *data, size_t length, void *ctx)
 {
 	struct device *dev = (struct device *)ctx;
 
@@ -24,14 +24,14 @@ static int char_out(u8_t *data, size_t length, void *ctx)
 	return length;
 }
 
-static u8_t buf;
+static uint8_t buf;
 
 LOG_OUTPUT_DEFINE(log_output, char_out, &buf, 1);
 
 static void put(const struct log_backend *const backend,
 		struct log_msg *msg)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_put(&log_output, flag, msg);
@@ -52,7 +52,7 @@ static void panic(struct log_backend const *const backend)
 	log_backend_std_panic(&log_output);
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -60,10 +60,10 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void sync_string(const struct log_backend *const backend,
-		     struct log_msg_ids src_level, u32_t timestamp,
+		     struct log_msg_ids src_level, uint32_t timestamp,
 		     const char *fmt, va_list ap)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_string(&log_output, flag, src_level,
@@ -71,10 +71,10 @@ static void sync_string(const struct log_backend *const backend,
 }
 
 static void sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
-	u32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
+	uint32_t flag = IS_ENABLED(CONFIG_LOG_BACKEND_UART_SYST_ENABLE) ?
 		LOG_OUTPUT_FLAG_FORMAT_SYST : 0;
 
 	log_backend_std_sync_hexdump(&log_output, flag, src_level,
diff --git a/subsys/logging/log_backend_xtensa_sim.c b/subsys/logging/log_backend_xtensa_sim.c
index 3a7779c4f4..ef95736b29 100644
--- a/subsys/logging/log_backend_xtensa_sim.c
+++ b/subsys/logging/log_backend_xtensa_sim.c
@@ -18,9 +18,9 @@
 #define CHAR_BUF_SIZE (IS_ENABLED(CONFIG_LOG_IMMEDIATE) ? \
 		1 : CONFIG_LOG_BACKEND_XTENSA_OUTPUT_BUFFER_SIZE)
 
-static u8_t buf[CHAR_BUF_SIZE];
+static uint8_t buf[CHAR_BUF_SIZE];
 
-static int char_out(u8_t *data, size_t length, void *ctx)
+static int char_out(uint8_t *data, size_t length, void *ctx)
 {
 	register int a2 __asm__ ("a2") = SYS_write;
 	register int a3 __asm__ ("a3") = 1;
@@ -48,7 +48,7 @@ static void panic(struct log_backend const *const backend)
 	log_backend_std_panic(&log_output);
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	ARG_UNUSED(backend);
 
@@ -56,7 +56,7 @@ static void dropped(const struct log_backend *const backend, u32_t cnt)
 }
 
 static void sync_string(const struct log_backend *const backend,
-		     struct log_msg_ids src_level, u32_t timestamp,
+		     struct log_msg_ids src_level, uint32_t timestamp,
 		     const char *fmt, va_list ap)
 {
 	log_backend_std_sync_string(&log_output, 0, src_level,
@@ -64,8 +64,8 @@ static void sync_string(const struct log_backend *const backend,
 }
 
 static void sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
 	log_backend_std_sync_hexdump(&log_output, 0, src_level,
 				     timestamp, metadata, data, length);
diff --git a/subsys/logging/log_cmds.c b/subsys/logging/log_cmds.c
index 4f5ccc5894..2d53d3415e 100644
--- a/subsys/logging/log_cmds.c
+++ b/subsys/logging/log_cmds.c
@@ -92,10 +92,10 @@ static int log_status(const struct shell *shell,
 		      const struct log_backend *backend,
 		      size_t argc, char **argv)
 {
-	u32_t modules_cnt = log_sources_count();
-	u32_t dynamic_lvl;
-	u32_t compiled_lvl;
-	u32_t i;
+	uint32_t modules_cnt = log_sources_count();
+	uint32_t dynamic_lvl;
+	uint32_t compiled_lvl;
+	uint32_t i;
 
 
 	if (!log_backend_is_active(backend)) {
@@ -142,9 +142,9 @@ static int cmd_log_backend_status(const struct shell *shell,
 
 static int module_id_get(const char *name)
 {
-	u32_t modules_cnt = log_sources_count();
+	uint32_t modules_cnt = log_sources_count();
 	const char *tmp_name;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < modules_cnt; i++) {
 		tmp_name = log_source_name_get(CONFIG_LOG_DOMAIN_ID, i);
@@ -158,7 +158,7 @@ static int module_id_get(const char *name)
 
 static void filters_set(const struct shell *shell,
 			const struct log_backend *backend,
-			size_t argc, char **argv, u32_t level)
+			size_t argc, char **argv, uint32_t level)
 {
 	int i;
 	int id;
@@ -172,7 +172,7 @@ static void filters_set(const struct shell *shell,
 	for (i = 0; i < cnt; i++) {
 		id = all ? i : module_id_get(argv[i]);
 		if (id >= 0) {
-			u32_t set_lvl = log_filter_set(backend,
+			uint32_t set_lvl = log_filter_set(backend,
 						       CONFIG_LOG_DOMAIN_ID,
 						       id, level);
 
@@ -378,9 +378,9 @@ static int cmd_log_strdup_utilization(const struct shell *shell,
 	#define CONFIG_LOG_STRDUP_MAX_STRING 0
 	#endif
 
-	u32_t buf_cnt = log_get_strdup_pool_utilization();
-	u32_t buf_size = log_get_strdup_longest_string();
-	u32_t percent = CONFIG_LOG_STRDUP_BUF_COUNT ?
+	uint32_t buf_cnt = log_get_strdup_pool_utilization();
+	uint32_t buf_size = log_get_strdup_longest_string();
+	uint32_t percent = CONFIG_LOG_STRDUP_BUF_COUNT ?
 			100 * buf_cnt / CONFIG_LOG_STRDUP_BUF_COUNT : 0;
 
 	shell_print(shell,
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
index 8e81037d06..42ee425f03 100644
--- a/subsys/logging/log_core.c
+++ b/subsys/logging/log_core.c
@@ -55,7 +55,7 @@ K_SEM_DEFINE(log_process_thread_sem, 0, 1);
 
 static const char *log_strdup_fail_msg = "<log_strdup alloc failed>";
 struct k_mem_slab log_strdup_pool;
-static u8_t __noinit __aligned(sizeof(void *))
+static uint8_t __noinit __aligned(sizeof(void *))
 		log_strdup_pool_buf[LOG_STRDUP_POOL_BUFFER_SIZE];
 
 static struct log_list_t list;
@@ -65,28 +65,28 @@ static bool backend_attached;
 static atomic_t buffered_cnt;
 static atomic_t dropped_cnt;
 static k_tid_t proc_tid;
-static u32_t log_strdup_in_use;
-static u32_t log_strdup_max;
-static u32_t log_strdup_longest;
+static uint32_t log_strdup_in_use;
+static uint32_t log_strdup_max;
+static uint32_t log_strdup_longest;
 static struct k_timer log_process_thread_timer;
 
-static u32_t dummy_timestamp(void);
+static uint32_t dummy_timestamp(void);
 static timestamp_get_t timestamp_func = dummy_timestamp;
 
 
 bool log_is_strdup(const void *buf);
 
-static u32_t dummy_timestamp(void)
+static uint32_t dummy_timestamp(void)
 {
 	return 0;
 }
 
-u32_t z_log_get_s_mask(const char *str, u32_t nargs)
+uint32_t z_log_get_s_mask(const char *str, uint32_t nargs)
 {
 	char curr;
 	bool arm = false;
-	u32_t arg = 0;
-	u32_t mask = 0;
+	uint32_t arg = 0;
+	uint32_t mask = 0;
 
 	__ASSERT_NO_MSG(nargs <= 8*sizeof(mask));
 
@@ -148,10 +148,10 @@ static void detect_missed_strdup(struct log_msg *msg)
 {
 #define ERR_MSG	"argument %d in source %s log message \"%s\" missing" \
 		"log_strdup()."
-	u32_t idx;
+	uint32_t idx;
 	const char *str;
 	const char *msg_str;
-	u32_t mask;
+	uint32_t mask;
 
 	if (!log_msg_is_std(msg)) {
 		return;
@@ -282,7 +282,7 @@ void log_3(const char *str,
 
 void log_n(const char *str,
 	   log_arg_t *args,
-	   u32_t narg,
+	   uint32_t narg,
 	   struct log_msg_ids src_level)
 {
 	if (IS_ENABLED(CONFIG_LOG_FRONTEND)) {
@@ -298,15 +298,15 @@ void log_n(const char *str,
 	}
 }
 
-void log_hexdump(const char *str, const void *data, u32_t length,
+void log_hexdump(const char *str, const void *data, uint32_t length,
 		 struct log_msg_ids src_level)
 {
 	if (IS_ENABLED(CONFIG_LOG_FRONTEND)) {
-		log_frontend_hexdump(str, (const u8_t *)data, length,
+		log_frontend_hexdump(str, (const uint8_t *)data, length,
 				     src_level);
 	} else {
 		struct log_msg *msg =
-			log_msg_hexdump_create(str, (const u8_t *)data, length);
+			log_msg_hexdump_create(str, (const uint8_t *)data, length);
 
 		if (msg == NULL) {
 			return;
@@ -321,7 +321,7 @@ void log_printk(const char *fmt, va_list ap)
 	if (IS_ENABLED(CONFIG_LOG_PRINTK)) {
 		union {
 			struct log_msg_ids structure;
-			u32_t value;
+			uint32_t value;
 		} src_level_union = {
 			{
 				.level = LOG_LEVEL_INTERNAL_RAW_STRING
@@ -329,7 +329,7 @@ void log_printk(const char *fmt, va_list ap)
 		};
 
 		if (_is_user_context()) {
-			u8_t str[CONFIG_LOG_PRINTK_MAX_STRING_LENGTH + 1];
+			uint8_t str[CONFIG_LOG_PRINTK_MAX_STRING_LENGTH + 1];
 
 			vsnprintk(str, sizeof(str), fmt, ap);
 
@@ -337,7 +337,7 @@ void log_printk(const char *fmt, va_list ap)
 		} else if (IS_ENABLED(CONFIG_LOG_IMMEDIATE)) {
 			log_generic(src_level_union.structure, fmt, ap);
 		} else {
-			u8_t str[CONFIG_LOG_PRINTK_MAX_STRING_LENGTH + 1];
+			uint8_t str[CONFIG_LOG_PRINTK_MAX_STRING_LENGTH + 1];
 			struct log_msg *msg;
 			int length;
 
@@ -358,9 +358,9 @@ void log_printk(const char *fmt, va_list ap)
  *
  * Function counts number of '%' not followed by '%'.
  */
-static u32_t count_args(const char *fmt)
+static uint32_t count_args(const char *fmt)
 {
-	u32_t args = 0U;
+	uint32_t args = 0U;
 	bool prev = false; /* if previous char was a modificator. */
 
 	while (*fmt != '\0') {
@@ -383,7 +383,7 @@ void log_generic(struct log_msg_ids src_level, const char *fmt, va_list ap)
 	} else  if (IS_ENABLED(CONFIG_LOG_IMMEDIATE) &&
 	    (!IS_ENABLED(CONFIG_LOG_FRONTEND))) {
 		struct log_backend const *backend;
-		u32_t timestamp = timestamp_func();
+		uint32_t timestamp = timestamp_func();
 
 		for (int i = 0; i < log_backend_count_get(); i++) {
 			backend = log_backend_get(i);
@@ -395,7 +395,7 @@ void log_generic(struct log_msg_ids src_level, const char *fmt, va_list ap)
 		}
 	} else {
 		log_arg_t args[LOG_MAX_NARGS];
-		u32_t nargs = count_args(fmt);
+		uint32_t nargs = count_args(fmt);
 
 		__ASSERT_NO_MSG(nargs < LOG_MAX_NARGS);
 		for (int i = 0; i < nargs; i++) {
@@ -418,14 +418,14 @@ void log_string_sync(struct log_msg_ids src_level, const char *fmt, ...)
 }
 
 void log_hexdump_sync(struct log_msg_ids src_level, const char *metadata,
-		      const void *data, u32_t len)
+		      const void *data, uint32_t len)
 {
 	if (IS_ENABLED(CONFIG_LOG_FRONTEND)) {
-		log_frontend_hexdump(metadata, (const u8_t *)data, len,
+		log_frontend_hexdump(metadata, (const uint8_t *)data, len,
 				     src_level);
 	} else {
 		struct log_backend const *backend;
-		u32_t timestamp = timestamp_func();
+		uint32_t timestamp = timestamp_func();
 
 		for (int i = 0; i < log_backend_count_get(); i++) {
 			backend = log_backend_get(i);
@@ -433,13 +433,13 @@ void log_hexdump_sync(struct log_msg_ids src_level, const char *metadata,
 			if (log_backend_is_active(backend)) {
 				log_backend_put_sync_hexdump(
 					backend, src_level, timestamp, metadata,
-					(const u8_t *)data, len);
+					(const uint8_t *)data, len);
 			}
 		}
 	}
 }
 
-static u32_t k_cycle_get_32_wrapper(void)
+static uint32_t k_cycle_get_32_wrapper(void)
 {
 	/*
 	 * The k_cycle_get_32() is a define which cannot be referenced
@@ -450,7 +450,7 @@ static u32_t k_cycle_get_32_wrapper(void)
 
 void log_core_init(void)
 {
-	u32_t freq;
+	uint32_t freq;
 
 	if (!IS_ENABLED(CONFIG_LOG_IMMEDIATE)) {
 		log_msg_pool_init();
@@ -483,8 +483,8 @@ void log_core_init(void)
 	 */
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) {
 		for (int i = 0; i < log_sources_count(); i++) {
-			u32_t *filters = log_dynamic_filters_get(i);
-			u8_t level = log_compiled_level_get(i);
+			uint32_t *filters = log_dynamic_filters_get(i);
+			uint8_t level = log_compiled_level_get(i);
 
 			LOG_FILTER_SLOT_SET(filters,
 					    LOG_FILTER_AGGR_SLOT_IDX,
@@ -544,7 +544,7 @@ void log_thread_set(k_tid_t process_tid)
 	}
 }
 
-int log_set_timestamp_func(timestamp_get_t timestamp_getter, u32_t freq)
+int log_set_timestamp_func(timestamp_get_t timestamp_getter, uint32_t freq)
 {
 	if (!timestamp_getter) {
 		return -EINVAL;
@@ -598,8 +598,8 @@ static bool msg_filter_check(struct log_backend const *backend,
 			     struct log_msg *msg)
 {
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) {
-		u32_t backend_level;
-		u32_t msg_level;
+		uint32_t backend_level;
+		uint32_t msg_level;
 
 		backend_level = log_filter_get(backend,
 					       log_msg_domain_id_get(msg),
@@ -638,7 +638,7 @@ static void msg_process(struct log_msg *msg, bool bypass)
 
 void dropped_notify(void)
 {
-	u32_t dropped = atomic_set(&dropped_cnt, 0);
+	uint32_t dropped = atomic_set(&dropped_cnt, 0);
 
 	for (int i = 0; i < log_backend_count_get(); i++) {
 		struct log_backend const *backend = log_backend_get(i);
@@ -681,13 +681,13 @@ bool z_vrfy_log_process(bool bypass)
 #include <syscalls/log_process_mrsh.c>
 #endif
 
-u32_t z_impl_log_buffered_cnt(void)
+uint32_t z_impl_log_buffered_cnt(void)
 {
 	return buffered_cnt;
 }
 
 #ifdef CONFIG_USERSPACE
-u32_t z_vrfy_log_buffered_cnt(void)
+uint32_t z_vrfy_log_buffered_cnt(void)
 {
 	return z_impl_log_buffered_cnt();
 }
@@ -699,24 +699,24 @@ void log_dropped(void)
 	atomic_inc(&dropped_cnt);
 }
 
-u32_t log_src_cnt_get(u32_t domain_id)
+uint32_t log_src_cnt_get(uint32_t domain_id)
 {
 	return log_sources_count();
 }
 
-const char *log_source_name_get(u32_t domain_id, u32_t src_id)
+const char *log_source_name_get(uint32_t domain_id, uint32_t src_id)
 {
 	return src_id < log_sources_count() ? log_name_get(src_id) : NULL;
 }
 
-static u32_t max_filter_get(u32_t filters)
+static uint32_t max_filter_get(uint32_t filters)
 {
-	u32_t max_filter = LOG_LEVEL_NONE;
+	uint32_t max_filter = LOG_LEVEL_NONE;
 	int first_slot = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
 	int i;
 
 	for (i = first_slot; i < LOG_FILTERS_NUM_OF_SLOTS; i++) {
-		u32_t tmp_filter = LOG_FILTER_SLOT_GET(&filters, i);
+		uint32_t tmp_filter = LOG_FILTER_SLOT_GET(&filters, i);
 
 		if (tmp_filter > max_filter) {
 			max_filter = tmp_filter;
@@ -726,22 +726,22 @@ static u32_t max_filter_get(u32_t filters)
 	return max_filter;
 }
 
-u32_t z_impl_log_filter_set(struct log_backend const *const backend,
-			    u32_t domain_id,
-			    u32_t src_id,
-			    u32_t level)
+uint32_t z_impl_log_filter_set(struct log_backend const *const backend,
+			    uint32_t domain_id,
+			    uint32_t src_id,
+			    uint32_t level)
 {
 	assert(src_id < log_sources_count());
 
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) {
-		u32_t new_aggr_filter;
+		uint32_t new_aggr_filter;
 
-		u32_t *filters = log_dynamic_filters_get(src_id);
+		uint32_t *filters = log_dynamic_filters_get(src_id);
 
 		if (backend == NULL) {
 			struct log_backend const *backend;
-			u32_t max = 0U;
-			u32_t current;
+			uint32_t max = 0U;
+			uint32_t current;
 
 			for (int i = 0; i < log_backend_count_get(); i++) {
 				backend = log_backend_get(i);
@@ -752,7 +752,7 @@ u32_t z_impl_log_filter_set(struct log_backend const *const backend,
 
 			level = max;
 		} else {
-			u32_t max = log_filter_get(backend, domain_id,
+			uint32_t max = log_filter_get(backend, domain_id,
 						   src_id, false);
 
 			level = MIN(level, max);
@@ -776,10 +776,10 @@ u32_t z_impl_log_filter_set(struct log_backend const *const backend,
 }
 
 #ifdef CONFIG_USERSPACE
-u32_t z_vrfy_log_filter_set(struct log_backend const *const backend,
-			    u32_t domain_id,
-			    u32_t src_id,
-			    u32_t level)
+uint32_t z_vrfy_log_filter_set(struct log_backend const *const backend,
+			    uint32_t domain_id,
+			    uint32_t src_id,
+			    uint32_t level)
 {
 	Z_OOPS(Z_SYSCALL_VERIFY_MSG(backend == 0,
 		"Setting per-backend filters from user mode is not supported"));
@@ -797,7 +797,7 @@ u32_t z_vrfy_log_filter_set(struct log_backend const *const backend,
 #endif
 
 static void backend_filter_set(struct log_backend const *const backend,
-			       u32_t level)
+			       uint32_t level)
 {
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) {
 		for (int i = 0; i < log_sources_count(); i++) {
@@ -808,10 +808,10 @@ static void backend_filter_set(struct log_backend const *const backend,
 
 void log_backend_enable(struct log_backend const *const backend,
 			void *ctx,
-			u32_t level)
+			uint32_t level)
 {
 	/* As first slot in filtering mask is reserved, backend ID has offset.*/
-	u32_t id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
+	uint32_t id = LOG_FILTER_FIRST_BACKEND_SLOT_IDX;
 
 	id += backend - log_backend_get(0);
 
@@ -835,15 +835,15 @@ void log_backend_disable(struct log_backend const *const backend)
 	backend_filter_set(backend, LOG_LEVEL_NONE);
 }
 
-u32_t log_filter_get(struct log_backend const *const backend,
-		     u32_t domain_id,
-		     u32_t src_id,
+uint32_t log_filter_get(struct log_backend const *const backend,
+		     uint32_t domain_id,
+		     uint32_t src_id,
 		     bool runtime)
 {
 	assert(src_id < log_sources_count());
 
 	if (IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING) && runtime) {
-		u32_t *filters = log_dynamic_filters_get(src_id);
+		uint32_t *filters = log_dynamic_filters_get(src_id);
 
 		return LOG_FILTER_SLOT_GET(filters,
 					   log_backend_id_get(backend));
@@ -890,13 +890,13 @@ char *log_strdup(const char *str)
 	return dup->buf;
 }
 
-u32_t log_get_strdup_pool_utilization(void)
+uint32_t log_get_strdup_pool_utilization(void)
 {
 	return IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING) ?
 			log_strdup_max : 0;
 }
 
-u32_t log_get_strdup_longest_string(void)
+uint32_t log_get_strdup_longest_string(void)
 {
 	return IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING) ?
 			log_strdup_longest : 0;
@@ -904,7 +904,7 @@ u32_t log_get_strdup_longest_string(void)
 
 bool log_is_strdup(const void *buf)
 {
-	return PART_OF_ARRAY(log_strdup_pool_buf, (u8_t *)buf);
+	return PART_OF_ARRAY(log_strdup_pool_buf, (uint8_t *)buf);
 
 }
 
@@ -922,7 +922,7 @@ void log_free(void *str)
 }
 
 #if defined(CONFIG_USERSPACE)
-void z_impl_z_log_string_from_user(u32_t src_level_val, const char *str)
+void z_impl_z_log_string_from_user(uint32_t src_level_val, const char *str)
 {
 	ARG_UNUSED(src_level_val);
 	ARG_UNUSED(str);
@@ -930,12 +930,12 @@ void z_impl_z_log_string_from_user(u32_t src_level_val, const char *str)
 	__ASSERT(false, "This function can be called from user mode only.");
 }
 
-void z_vrfy_z_log_string_from_user(u32_t src_level_val, const char *str)
+void z_vrfy_z_log_string_from_user(uint32_t src_level_val, const char *str)
 {
-	u8_t level, domain_id, source_id;
+	uint8_t level, domain_id, source_id;
 	union {
 		struct log_msg_ids structure;
-		u32_t value;
+		uint32_t value;
 	} src_level_union;
 	size_t len;
 	int err;
@@ -997,12 +997,12 @@ void log_generic_from_user(struct log_msg_ids src_level,
 	char buffer[CONFIG_LOG_STRDUP_MAX_STRING + 1];
 	union {
 		struct log_msg_ids structure;
-		u32_t value;
+		uint32_t value;
 	} src_level_union;
 
 	vsnprintk(buffer, sizeof(buffer), fmt, ap);
 
-	__ASSERT_NO_MSG(sizeof(src_level) <= sizeof(u32_t));
+	__ASSERT_NO_MSG(sizeof(src_level) <= sizeof(uint32_t));
 	src_level_union.structure = src_level;
 	z_log_string_from_user(src_level_union.value, buffer);
 }
@@ -1016,8 +1016,8 @@ void log_from_user(struct log_msg_ids src_level, const char *fmt, ...)
 	va_end(ap);
 }
 
-void z_impl_z_log_hexdump_from_user(u32_t src_level_val, const char *metadata,
-				    const u8_t *data, u32_t len)
+void z_impl_z_log_hexdump_from_user(uint32_t src_level_val, const char *metadata,
+				    const uint8_t *data, uint32_t len)
 {
 	ARG_UNUSED(src_level_val);
 	ARG_UNUSED(metadata);
@@ -1027,12 +1027,12 @@ void z_impl_z_log_hexdump_from_user(u32_t src_level_val, const char *metadata,
 	__ASSERT(false, "This function can be called from user mode only.");
 }
 
-void z_vrfy_z_log_hexdump_from_user(u32_t src_level_val, const char *metadata,
-				    const u8_t *data, u32_t len)
+void z_vrfy_z_log_hexdump_from_user(uint32_t src_level_val, const char *metadata,
+				    const uint8_t *data, uint32_t len)
 {
 	union {
 		struct log_msg_ids structure;
-		u32_t value;
+		uint32_t value;
 	} src_level_union;
 	size_t mlen;
 	int err;
@@ -1079,20 +1079,20 @@ void z_vrfy_z_log_hexdump_from_user(u32_t src_level_val, const char *metadata,
 #include <syscalls/z_log_hexdump_from_user_mrsh.c>
 
 void log_hexdump_from_user(struct log_msg_ids src_level, const char *metadata,
-			   const void *data, u32_t len)
+			   const void *data, uint32_t len)
 {
 	union {
 		struct log_msg_ids structure;
-		u32_t value;
+		uint32_t value;
 	} src_level_union;
 
-	__ASSERT_NO_MSG(sizeof(src_level) <= sizeof(u32_t));
+	__ASSERT_NO_MSG(sizeof(src_level) <= sizeof(uint32_t));
 	src_level_union.structure = src_level;
 	z_log_hexdump_from_user(src_level_union.value, metadata,
-				(const u8_t *)data, len);
+				(const uint8_t *)data, len);
 }
 #else
-void z_impl_z_log_string_from_user(u32_t src_level_val, const char *str)
+void z_impl_z_log_string_from_user(uint32_t src_level_val, const char *str)
 {
 	ARG_UNUSED(src_level_val);
 	ARG_UNUSED(str);
@@ -1100,8 +1100,8 @@ void z_impl_z_log_string_from_user(u32_t src_level_val, const char *str)
 	__ASSERT_NO_MSG(false);
 }
 
-void z_vrfy_z_log_hexdump_from_user(u32_t src_level_val, const char *metadata,
-				    const u8_t *data, u32_t len)
+void z_vrfy_z_log_hexdump_from_user(uint32_t src_level_val, const char *metadata,
+				    const uint8_t *data, uint32_t len)
 {
 	ARG_UNUSED(src_level_val);
 	ARG_UNUSED(metadata);
@@ -1130,7 +1130,7 @@ void log_generic_from_user(struct log_msg_ids src_level,
 }
 
 void log_hexdump_from_user(struct log_msg_ids src_level, const char *metadata,
-			   const void *data, u32_t len)
+			   const void *data, uint32_t len)
 {
 	ARG_UNUSED(src_level);
 	ARG_UNUSED(metadata);
diff --git a/subsys/logging/log_msg.c b/subsys/logging/log_msg.c
index 2e3c5339d0..9a0839d7c1 100644
--- a/subsys/logging/log_msg.c
+++ b/subsys/logging/log_msg.c
@@ -11,16 +11,16 @@
 #include <string.h>
 #include <assert.h>
 
-BUILD_ASSERT((sizeof(struct log_msg_ids) == sizeof(u16_t)),
+BUILD_ASSERT((sizeof(struct log_msg_ids) == sizeof(uint16_t)),
 	     "Structure must fit in 2 bytes");
 
-BUILD_ASSERT((sizeof(struct log_msg_generic_hdr) == sizeof(u16_t)),
+BUILD_ASSERT((sizeof(struct log_msg_generic_hdr) == sizeof(uint16_t)),
 	     "Structure must fit in 2 bytes");
 
-BUILD_ASSERT((sizeof(struct log_msg_std_hdr) == sizeof(u16_t)),
+BUILD_ASSERT((sizeof(struct log_msg_std_hdr) == sizeof(uint16_t)),
 	     "Structure must fit in 2 bytes");
 
-BUILD_ASSERT((sizeof(struct log_msg_hexdump_hdr) == sizeof(u16_t)),
+BUILD_ASSERT((sizeof(struct log_msg_hexdump_hdr) == sizeof(uint16_t)),
 	     "Structure must fit in 2 bytes");
 
 BUILD_ASSERT((sizeof(union log_msg_head_data) ==
@@ -41,7 +41,7 @@ BUILD_ASSERT((sizeof(union log_msg_head_data) ==
 #define NUM_OF_MSGS (CONFIG_LOG_BUFFER_SIZE / MSG_SIZE)
 
 struct k_mem_slab log_msg_pool;
-static u8_t __noinit __aligned(sizeof(void *))
+static uint8_t __noinit __aligned(sizeof(void *))
 		log_msg_pool_buf[CONFIG_LOG_BUFFER_SIZE];
 
 void log_msg_pool_init(void)
@@ -104,12 +104,12 @@ static void cont_free(struct log_msg_cont *cont)
 
 static void msg_free(struct log_msg *msg)
 {
-	u32_t nargs = log_msg_nargs_get(msg);
+	uint32_t nargs = log_msg_nargs_get(msg);
 
 	/* Free any transient string found in arguments. */
 	if (log_msg_is_std(msg) && nargs) {
-		u32_t i;
-		u32_t smask = 0;
+		uint32_t i;
+		uint32_t smask = 0;
 
 		for (i = 0; i < nargs; i++) {
 			void *buf = (void *)log_msg_arg_get(msg, i);
@@ -187,12 +187,12 @@ void log_msg_put(struct log_msg *msg)
 	}
 }
 
-u32_t log_msg_nargs_get(struct log_msg *msg)
+uint32_t log_msg_nargs_get(struct log_msg *msg)
 {
 	return msg->hdr.params.std.nargs;
 }
 
-static log_arg_t cont_arg_get(struct log_msg *msg, u32_t arg_idx)
+static log_arg_t cont_arg_get(struct log_msg *msg, uint32_t arg_idx)
 {
 	struct log_msg_cont *cont;
 
@@ -212,7 +212,7 @@ static log_arg_t cont_arg_get(struct log_msg *msg, u32_t arg_idx)
 	return cont->payload.args[arg_idx];
 }
 
-log_arg_t log_msg_arg_get(struct log_msg *msg, u32_t arg_idx)
+log_arg_t log_msg_arg_get(struct log_msg *msg, uint32_t arg_idx)
 {
 	log_arg_t arg;
 
@@ -245,7 +245,7 @@ const char *log_msg_str_get(struct log_msg *msg)
  *
  *  @return Allocated chunk of NULL.
  */
-static struct log_msg *msg_alloc(u32_t nargs)
+static struct log_msg *msg_alloc(uint32_t nargs)
 {
 	struct log_msg_cont *cont;
 	struct log_msg_cont **next;
@@ -279,7 +279,7 @@ static struct log_msg *msg_alloc(u32_t nargs)
 	return msg;
 }
 
-static void copy_args_to_msg(struct  log_msg *msg, log_arg_t *args, u32_t nargs)
+static void copy_args_to_msg(struct  log_msg *msg, log_arg_t *args, uint32_t nargs)
 {
 	struct log_msg_cont *cont = msg->payload.ext.next;
 
@@ -295,7 +295,7 @@ static void copy_args_to_msg(struct  log_msg *msg, log_arg_t *args, u32_t nargs)
 	}
 
 	while (nargs != 0U) {
-		u32_t cpy_args = MIN(nargs, ARGS_CONT_MSG);
+		uint32_t cpy_args = MIN(nargs, ARGS_CONT_MSG);
 
 		(void)memcpy(cont->payload.args, args,
 			     cpy_args * sizeof(log_arg_t));
@@ -305,7 +305,7 @@ static void copy_args_to_msg(struct  log_msg *msg, log_arg_t *args, u32_t nargs)
 	}
 }
 
-struct log_msg *log_msg_create_n(const char *str, log_arg_t *args, u32_t nargs)
+struct log_msg *log_msg_create_n(const char *str, log_arg_t *args, uint32_t nargs)
 {
 	__ASSERT_NO_MSG(nargs < LOG_MAX_NARGS);
 
@@ -323,13 +323,13 @@ struct log_msg *log_msg_create_n(const char *str, log_arg_t *args, u32_t nargs)
 }
 
 struct log_msg *log_msg_hexdump_create(const char *str,
-				       const u8_t *data,
-				       u32_t length)
+				       const uint8_t *data,
+				       uint32_t length)
 {
 	struct log_msg_cont **prev_cont;
 	struct log_msg_cont *cont;
 	struct log_msg *msg;
-	u32_t chunk_length;
+	uint32_t chunk_length;
 
 	/* Saturate length. */
 	length = (length > LOG_MSG_HEXDUMP_MAX_LENGTH) ?
@@ -387,17 +387,17 @@ struct log_msg *log_msg_hexdump_create(const char *str,
 }
 
 static void log_msg_hexdump_data_op(struct log_msg *msg,
-				    u8_t *data,
+				    uint8_t *data,
 				    size_t *length,
 				    size_t offset,
 				    bool put_op)
 {
-	u32_t available_len = msg->hdr.params.hexdump.length;
+	uint32_t available_len = msg->hdr.params.hexdump.length;
 	struct log_msg_cont *cont = NULL;
-	u8_t *head_data;
-	u32_t chunk_len;
-	u32_t req_len;
-	u32_t cpy_len;
+	uint8_t *head_data;
+	uint32_t chunk_len;
+	uint32_t req_len;
+	uint32_t cpy_len;
 
 	if (offset >= available_len) {
 		*length = 0;
@@ -464,7 +464,7 @@ static void log_msg_hexdump_data_op(struct log_msg *msg,
 }
 
 void log_msg_hexdump_data_put(struct log_msg *msg,
-			      u8_t *data,
+			      uint8_t *data,
 			      size_t *length,
 			      size_t offset)
 {
@@ -472,7 +472,7 @@ void log_msg_hexdump_data_put(struct log_msg *msg,
 }
 
 void log_msg_hexdump_data_get(struct log_msg *msg,
-			      u8_t *data,
+			      uint8_t *data,
 			      size_t *length,
 			      size_t offset)
 {
diff --git a/subsys/logging/log_output.c b/subsys/logging/log_output.c
index a3062e2c7a..1fafc6d6ea 100644
--- a/subsys/logging/log_output.c
+++ b/subsys/logging/log_output.c
@@ -41,8 +41,8 @@ static const char *const colors[] = {
 	NULL                    /* dbg */
 };
 
-static u32_t freq;
-static u32_t timestamp_div;
+static uint32_t freq;
+static uint32_t timestamp_div;
 
 typedef int (*out_func_t)(int c, void *ctx);
 
@@ -50,13 +50,13 @@ extern int z_prf(int (*func)(), void *dest, char *format, va_list vargs);
 extern void z_vprintk(out_func_t out, void *log_output,
 		     const char *fmt, va_list ap);
 extern void log_output_msg_syst_process(const struct log_output *log_output,
-				struct log_msg *msg, u32_t flag);
+				struct log_msg *msg, uint32_t flag);
 extern void log_output_string_syst_process(const struct log_output *log_output,
 				struct log_msg_ids src_level,
-				const char *fmt, va_list ap, u32_t flag);
+				const char *fmt, va_list ap, uint32_t flag);
 extern void log_output_hexdump_syst_process(const struct log_output *log_output,
 				struct log_msg_ids src_level,
-				const u8_t *data, u32_t length, u32_t flag);
+				const uint8_t *data, uint32_t length, uint32_t flag);
 
 /* The RFC 5424 allows very flexible mapping and suggest the value 0 being the
  * highest severity and 7 to be the lowest (debugging level) severity.
@@ -70,9 +70,9 @@ extern void log_output_hexdump_syst_process(const struct log_output *log_output,
  *    6   Informational  Informational messages
  *    7   Debug          Debug-level messages
  */
-static int level_to_rfc5424_severity(u32_t level)
+static int level_to_rfc5424_severity(uint32_t level)
 {
-	u8_t ret;
+	uint8_t ret;
 
 	switch (level) {
 	case LOG_LEVEL_NONE:
@@ -106,7 +106,7 @@ static int out_func(int c, void *ctx)
 
 	if (IS_ENABLED(CONFIG_LOG_IMMEDIATE)) {
 		/* Backend must be thread safe in synchronous operation. */
-		out_ctx->func((u8_t *)&c, 1, out_ctx->control_block->ctx);
+		out_ctx->func((uint8_t *)&c, 1, out_ctx->control_block->ctx);
 		return 0;
 	}
 
@@ -115,7 +115,7 @@ static int out_func(int c, void *ctx)
 	}
 
 	idx = atomic_inc(&out_ctx->control_block->offset);
-	out_ctx->buf[idx] = (u8_t)c;
+	out_ctx->buf[idx] = (uint8_t)c;
 
 	__ASSERT_NO_MSG(out_ctx->control_block->offset <= out_ctx->size);
 
@@ -140,7 +140,7 @@ static int print_formatted(const struct log_output *log_output,
 	return length;
 }
 
-static void buffer_write(log_output_func_t outf, u8_t *buf, size_t len,
+static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
 			 void *ctx)
 {
 	int processed;
@@ -163,7 +163,7 @@ void log_output_flush(const struct log_output *log_output)
 }
 
 static int timestamp_print(const struct log_output *log_output,
-			   u32_t flags, u32_t timestamp)
+			   uint32_t flags, uint32_t timestamp)
 {
 	int length;
 	bool format =
@@ -174,12 +174,12 @@ static int timestamp_print(const struct log_output *log_output,
 	if (!format) {
 		length = print_formatted(log_output, "[%08lu] ", timestamp);
 	} else if (freq != 0U) {
-		u32_t remainder;
-		u32_t seconds;
-		u32_t hours;
-		u32_t mins;
-		u32_t ms;
-		u32_t us;
+		uint32_t remainder;
+		uint32_t seconds;
+		uint32_t hours;
+		uint32_t mins;
+		uint32_t ms;
+		uint32_t us;
 
 		timestamp /= timestamp_div;
 		seconds = timestamp / freq;
@@ -224,7 +224,7 @@ static int timestamp_print(const struct log_output *log_output,
 }
 
 static void color_print(const struct log_output *log_output,
-			bool color, bool start, u32_t level)
+			bool color, bool start, uint32_t level)
 {
 	if (color) {
 		const char *color = start && (colors[level] != NULL) ?
@@ -234,20 +234,20 @@ static void color_print(const struct log_output *log_output,
 }
 
 static void color_prefix(const struct log_output *log_output,
-			 bool color, u32_t level)
+			 bool color, uint32_t level)
 {
 	color_print(log_output, color, true, level);
 }
 
 static void color_postfix(const struct log_output *log_output,
-			  bool color, u32_t level)
+			  bool color, uint32_t level)
 {
 	color_print(log_output, color, false, level);
 }
 
 
 static int ids_print(const struct log_output *log_output, bool level_on,
-		    bool func_on, u32_t domain_id, u32_t source_id, u32_t level)
+		    bool func_on, uint32_t domain_id, uint32_t source_id, uint32_t level)
 {
 	int total = 0;
 
@@ -264,7 +264,7 @@ static int ids_print(const struct log_output *log_output, bool level_on,
 	return total;
 }
 
-static void newline_print(const struct log_output *ctx, u32_t flags)
+static void newline_print(const struct log_output *ctx, uint32_t flags)
 {
 	if (IS_ENABLED(CONFIG_LOG_BACKEND_NET) &&
 	    flags & LOG_OUTPUT_FLAG_FORMAT_SYSLOG) {
@@ -286,8 +286,8 @@ static void std_print(struct log_msg *msg,
 		      const struct log_output *log_output)
 {
 	const char *str = log_msg_str_get(msg);
-	u32_t nargs = log_msg_nargs_get(msg);
-	u32_t *args = alloca(sizeof(u32_t)*nargs);
+	uint32_t nargs = log_msg_nargs_get(msg);
+	uint32_t *args = alloca(sizeof(uint32_t)*nargs);
 	int i;
 
 	for (i = 0; i < nargs; i++) {
@@ -372,8 +372,8 @@ static void std_print(struct log_msg *msg,
 }
 
 static void hexdump_line_print(const struct log_output *log_output,
-			       const u8_t *data, u32_t length,
-			       int prefix_offset, u32_t flags)
+			       const uint8_t *data, uint32_t length,
+			       int prefix_offset, uint32_t flags)
 {
 	newline_print(log_output, flags);
 
@@ -413,10 +413,10 @@ static void hexdump_line_print(const struct log_output *log_output,
 
 static void hexdump_print(struct log_msg *msg,
 			  const struct log_output *log_output,
-			  int prefix_offset, u32_t flags)
+			  int prefix_offset, uint32_t flags)
 {
-	u32_t offset = 0U;
-	u8_t buf[HEXDUMP_BYTES_IN_LINE];
+	uint32_t offset = 0U;
+	uint8_t buf[HEXDUMP_BYTES_IN_LINE];
 	size_t length;
 
 	print_formatted(log_output, "%s", log_msg_str_get(msg));
@@ -463,11 +463,11 @@ static void raw_string_print(struct log_msg *msg,
 	}
 }
 
-static u32_t prefix_print(const struct log_output *log_output,
-			 u32_t flags, bool func_on, u32_t timestamp, u8_t level,
-			 u8_t domain_id, u16_t source_id)
+static uint32_t prefix_print(const struct log_output *log_output,
+			 uint32_t flags, bool func_on, uint32_t timestamp, uint8_t level,
+			 uint8_t domain_id, uint16_t source_id)
 {
-	u32_t length = 0U;
+	uint32_t length = 0U;
 
 	bool stamp = flags & LOG_OUTPUT_FLAG_TIMESTAMP;
 	bool colors_on = flags & LOG_OUTPUT_FLAG_COLORS;
@@ -511,7 +511,7 @@ static u32_t prefix_print(const struct log_output *log_output,
 }
 
 static void postfix_print(const struct log_output *log_output,
-			  u32_t flags, u8_t level)
+			  uint32_t flags, uint8_t level)
 {
 	color_postfix(log_output, (flags & LOG_OUTPUT_FLAG_COLORS),
 			      level);
@@ -520,13 +520,13 @@ static void postfix_print(const struct log_output *log_output,
 
 void log_output_msg_process(const struct log_output *log_output,
 			    struct log_msg *msg,
-			    u32_t flags)
+			    uint32_t flags)
 {
 	bool std_msg = log_msg_is_std(msg);
-	u32_t timestamp = log_msg_timestamp_get(msg);
-	u8_t level = (u8_t)log_msg_level_get(msg);
-	u8_t domain_id = (u8_t)log_msg_domain_id_get(msg);
-	u16_t source_id = (u16_t)log_msg_source_id_get(msg);
+	uint32_t timestamp = log_msg_timestamp_get(msg);
+	uint8_t level = (uint8_t)log_msg_level_get(msg);
+	uint8_t domain_id = (uint8_t)log_msg_domain_id_get(msg);
+	uint16_t source_id = (uint16_t)log_msg_source_id_get(msg);
 	bool raw_string = (level == LOG_LEVEL_INTERNAL_RAW_STRING);
 	int prefix_offset;
 
@@ -568,13 +568,13 @@ static bool ends_with_newline(const char *fmt)
 }
 
 void log_output_string(const struct log_output *log_output,
-		       struct log_msg_ids src_level, u32_t timestamp,
-		       const char *fmt, va_list ap, u32_t flags)
+		       struct log_msg_ids src_level, uint32_t timestamp,
+		       const char *fmt, va_list ap, uint32_t flags)
 {
 	int length;
-	u8_t level = (u8_t)src_level.level;
-	u8_t domain_id = (u8_t)src_level.domain_id;
-	u16_t source_id = (u16_t)src_level.source_id;
+	uint8_t level = (uint8_t)src_level.level;
+	uint8_t domain_id = (uint8_t)src_level.domain_id;
+	uint16_t source_id = (uint16_t)src_level.source_id;
 	bool raw_string = (level == LOG_LEVEL_INTERNAL_RAW_STRING);
 
 	if (IS_ENABLED(CONFIG_LOG_MIPI_SYST_ENABLE) &&
@@ -611,14 +611,14 @@ void log_output_string(const struct log_output *log_output,
 }
 
 void log_output_hexdump(const struct log_output *log_output,
-			     struct log_msg_ids src_level, u32_t timestamp,
-			     const char *metadata, const u8_t *data,
-			     u32_t length, u32_t flags)
+			     struct log_msg_ids src_level, uint32_t timestamp,
+			     const char *metadata, const uint8_t *data,
+			     uint32_t length, uint32_t flags)
 {
-	u32_t prefix_offset;
-	u8_t level = (u8_t)src_level.level;
-	u8_t domain_id = (u8_t)src_level.domain_id;
-	u16_t source_id = (u16_t)src_level.source_id;
+	uint32_t prefix_offset;
+	uint8_t level = (uint8_t)src_level.level;
+	uint8_t domain_id = (uint8_t)src_level.domain_id;
+	uint16_t source_id = (uint16_t)src_level.source_id;
 
 	if (IS_ENABLED(CONFIG_LOG_MIPI_SYST_ENABLE) &&
 	    flags & LOG_OUTPUT_FLAG_FORMAT_SYST) {
@@ -634,7 +634,7 @@ void log_output_hexdump(const struct log_output *log_output,
 	print_formatted(log_output, "%s", metadata);
 
 	while (length) {
-		u32_t part_len = length > HEXDUMP_BYTES_IN_LINE ?
+		uint32_t part_len = length > HEXDUMP_BYTES_IN_LINE ?
 				HEXDUMP_BYTES_IN_LINE : length;
 
 		hexdump_line_print(log_output, data, part_len,
@@ -648,7 +648,7 @@ void log_output_hexdump(const struct log_output *log_output,
 	log_output_flush(log_output);
 }
 
-void log_output_dropped_process(const struct log_output *log_output, u32_t cnt)
+void log_output_dropped_process(const struct log_output *log_output, uint32_t cnt)
 {
 	char buf[5];
 	int len;
@@ -661,12 +661,12 @@ void log_output_dropped_process(const struct log_output *log_output, u32_t cnt)
 	cnt = MIN(cnt, 9999);
 	len = snprintk(buf, sizeof(buf), "%d", cnt);
 
-	buffer_write(outf, (u8_t *)prefix, sizeof(prefix) - 1, dev);
+	buffer_write(outf, (uint8_t *)prefix, sizeof(prefix) - 1, dev);
 	buffer_write(outf, buf, len, dev);
-	buffer_write(outf, (u8_t *)postfix, sizeof(postfix) - 1, dev);
+	buffer_write(outf, (uint8_t *)postfix, sizeof(postfix) - 1, dev);
 }
 
-void log_output_timestamp_freq_set(u32_t frequency)
+void log_output_timestamp_freq_set(uint32_t frequency)
 {
 	timestamp_div = 1U;
 	/* There is no point to have frequency higher than 1MHz (ns are not
diff --git a/subsys/logging/log_output_syst.c b/subsys/logging/log_output_syst.c
index d4cd6fbde6..c530e3eef7 100644
--- a/subsys/logging/log_output_syst.c
+++ b/subsys/logging/log_output_syst.c
@@ -25,7 +25,7 @@ static int out_func(int c, void *ctx)
 {
 	const struct log_output *out_ctx = (const struct log_output *)ctx;
 
-	out_ctx->buf[out_ctx->control_block->offset] = (u8_t)c;
+	out_ctx->buf[out_ctx->control_block->offset] = (uint8_t)c;
 	out_ctx->control_block->offset++;
 
 	__ASSERT_NO_MSG(out_ctx->control_block->offset <= out_ctx->size);
@@ -40,42 +40,42 @@ static int out_func(int c, void *ctx)
 static void write_raw(struct mipi_syst_handle *systh, const void *p, int n)
 {
 	int i;
-	u8_t c;
+	uint8_t c;
 
 #if defined(MIPI_SYST_BIG_ENDIAN)
 	for (i = n - 1; i >= 0; --i) {
 #else
 	for (i = 0; i < n; ++i) {
 #endif
-		c = ((const u8_t *)p)[i];
+		c = ((const uint8_t *)p)[i];
 		out_func(valToHex[c >> 0x4], systh->systh_platform.log_output);
 		out_func(valToHex[c & 0xF], systh->systh_platform.log_output);
 	}
 }
 
-static void write_d8(struct mipi_syst_handle *systh, u8_t v)
+static void write_d8(struct mipi_syst_handle *systh, uint8_t v)
 {
 	write_raw(systh, &v, sizeof(v));
 }
 
-static void write_d16(struct mipi_syst_handle *systh, u16_t v)
+static void write_d16(struct mipi_syst_handle *systh, uint16_t v)
 {
 	write_raw(systh, &v, sizeof(v));
 }
 
-static void write_d32(struct mipi_syst_handle *systh, u32_t v)
+static void write_d32(struct mipi_syst_handle *systh, uint32_t v)
 {
 	write_raw(systh, &v, sizeof(v));
 }
 
 #if defined(MIPI_SYST_PCFG_ENABLE_64BIT_IO)
-static void write_d64(struct mipi_syst_handle *systh, u64_t v)
+static void write_d64(struct mipi_syst_handle *systh, uint64_t v)
 {
 	write_raw(systh, &v, sizeof(v));
 }
 #endif
 
-static void write_d32ts(struct mipi_syst_handle *systh, u32_t v)
+static void write_d32ts(struct mipi_syst_handle *systh, uint32_t v)
 {
 	for (int i = 0; i < strlen(pattern); i++) {
 		out_func(pattern[i], systh->systh_platform.log_output);
@@ -86,7 +86,7 @@ static void write_d32ts(struct mipi_syst_handle *systh, u32_t v)
 
 static void write_flag(struct mipi_syst_handle *systh)
 {
-	u32_t flag = systh->systh_platform.flag;
+	uint32_t flag = systh->systh_platform.flag;
 
 	if ((flag & LOG_OUTPUT_FLAG_CRLF_NONE) != 0U) {
 		return;
@@ -110,7 +110,7 @@ mipi_syst_u64 mipi_syst_get_epoch(void)
 
 static void update_systh_platform_data(struct mipi_syst_handle *handle,
 				       const struct log_output *log_output,
-				       u32_t flag)
+				       uint32_t flag)
 {
 #if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_STATE_DATA)
 	handle->systh_platform.flag = (mipi_syst_u32)flag;
@@ -177,9 +177,9 @@ static void mipi_syst_platform_init(struct mipi_syst_header *systh,
  *    6   MIPI_SYST_SEVERITY_USER2    user defined level 6
  *    7   MIPI_SYST_SEVERITY_DEBUG    debug information level
  */
-static u32_t level_to_syst_severity(u32_t level)
+static uint32_t level_to_syst_severity(uint32_t level)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	switch (level) {
 	case LOG_LEVEL_NONE:
@@ -209,9 +209,9 @@ static void std_print(struct log_msg *msg,
 		const struct log_output *log_output)
 {
 	const char *str = log_msg_str_get(msg);
-	u32_t nargs = log_msg_nargs_get(msg);
-	u32_t *args = alloca(sizeof(u32_t)*nargs);
-	u32_t severity = level_to_syst_severity(log_msg_level_get(msg));
+	uint32_t nargs = log_msg_nargs_get(msg);
+	uint32_t *args = alloca(sizeof(uint32_t)*nargs);
+	uint32_t severity = level_to_syst_severity(log_msg_level_get(msg));
 
 	for (int i = 0; i < nargs; i++) {
 		args[i] = log_msg_arg_get(msg, i);
@@ -305,7 +305,7 @@ static void raw_string_print(struct log_msg *msg,
 {
 	char buf[CONFIG_LOG_STRDUP_MAX_STRING + 1];
 	size_t length = CONFIG_LOG_STRDUP_MAX_STRING;
-	u32_t severity = level_to_syst_severity(log_msg_level_get(msg));
+	uint32_t severity = level_to_syst_severity(log_msg_level_get(msg));
 
 	log_msg_hexdump_data_get(msg, buf, &length, 0);
 
@@ -319,7 +319,7 @@ static void hexdump_print(struct log_msg *msg,
 {
 	char buf[CONFIG_LOG_STRDUP_MAX_STRING + 1];
 	size_t length = CONFIG_LOG_STRDUP_MAX_STRING;
-	u32_t severity = level_to_syst_severity(log_msg_level_get(msg));
+	uint32_t severity = level_to_syst_severity(log_msg_level_get(msg));
 
 	log_msg_hexdump_data_get(msg, buf, &length, 0);
 
@@ -327,9 +327,9 @@ static void hexdump_print(struct log_msg *msg,
 }
 
 void log_output_msg_syst_process(const struct log_output *log_output,
-				struct log_msg *msg, u32_t flag)
+				struct log_msg *msg, uint32_t flag)
 {
-	u8_t level = (u8_t)log_msg_level_get(msg);
+	uint8_t level = (uint8_t)log_msg_level_get(msg);
 	bool raw_string = (level == LOG_LEVEL_INTERNAL_RAW_STRING);
 
 	update_systh_platform_data(&log_syst_handle, log_output, flag);
@@ -345,11 +345,11 @@ void log_output_msg_syst_process(const struct log_output *log_output,
 
 void log_output_string_syst_process(const struct log_output *log_output,
 				struct log_msg_ids src_level,
-				const char *fmt, va_list ap, u32_t flag)
+				const char *fmt, va_list ap, uint32_t flag)
 {
-	u8_t str[CONFIG_LOG_STRDUP_MAX_STRING];
+	uint8_t str[CONFIG_LOG_STRDUP_MAX_STRING];
 	size_t length = CONFIG_LOG_STRDUP_MAX_STRING;
-	u32_t severity = level_to_syst_severity((u32_t)src_level.level);
+	uint32_t severity = level_to_syst_severity((uint32_t)src_level.level);
 
 	length = vsnprintk(str, length, fmt, ap);
 	str[length] = '\0';
@@ -361,9 +361,9 @@ void log_output_string_syst_process(const struct log_output *log_output,
 
 void log_output_hexdump_syst_process(const struct log_output *log_output,
 				struct log_msg_ids src_level,
-				const u8_t *data, u32_t length, u32_t flag)
+				const uint8_t *data, uint32_t length, uint32_t flag)
 {
-	u32_t severity = level_to_syst_severity((u32_t)src_level.level);
+	uint32_t severity = level_to_syst_severity((uint32_t)src_level.level);
 
 	update_systh_platform_data(&log_syst_handle, log_output, flag);
 
diff --git a/subsys/mgmt/serial_util.c b/subsys/mgmt/serial_util.c
index 06ce0ac684..23aef5b232 100644
--- a/subsys/mgmt/serial_util.c
+++ b/subsys/mgmt/serial_util.c
@@ -23,14 +23,14 @@ static void mcumgr_serial_free_rx_ctxt(struct mcumgr_serial_rx_ctxt *rx_ctxt)
 	}
 }
 
-static u16_t mcumgr_serial_calc_crc(const u8_t *data, int len)
+static uint16_t mcumgr_serial_calc_crc(const uint8_t *data, int len)
 {
 	return crc16(data, len, 0x1021, 0, true);
 }
 
-static int mcumgr_serial_parse_op(const u8_t *buf, int len)
+static int mcumgr_serial_parse_op(const uint8_t *buf, int len)
 {
-	u16_t op;
+	uint16_t op;
 
 	if (len < sizeof(op)) {
 		return -EINVAL;
@@ -57,7 +57,7 @@ static int mcumgr_serial_extract_len(struct mcumgr_serial_rx_ctxt *rx_ctxt)
 }
 
 static int mcumgr_serial_decode_frag(struct mcumgr_serial_rx_ctxt *rx_ctxt,
-				     const u8_t *frag, int frag_len)
+				     const uint8_t *frag, int frag_len)
 {
 	size_t dec_len;
 	int rc;
@@ -83,11 +83,11 @@ static int mcumgr_serial_decode_frag(struct mcumgr_serial_rx_ctxt *rx_ctxt,
  */
 struct net_buf *mcumgr_serial_process_frag(
 	struct mcumgr_serial_rx_ctxt *rx_ctxt,
-	const u8_t *frag, int frag_len)
+	const uint8_t *frag, int frag_len)
 {
 	struct net_buf *nb;
-	u16_t crc;
-	u16_t op;
+	uint16_t crc;
+	uint16_t op;
 	int rc;
 
 	if (rx_ctxt->nb == NULL) {
@@ -162,7 +162,7 @@ struct net_buf *mcumgr_serial_process_frag(
 static int mcumgr_serial_tx_small(const void *data, int len,
 				  mcumgr_serial_tx_cb cb, void *arg)
 {
-	u8_t b64[4 + 1]; /* +1 required for null terminator. */
+	uint8_t b64[4 + 1]; /* +1 required for null terminator. */
 	size_t dst_len;
 	int rc;
 
@@ -190,12 +190,12 @@ static int mcumgr_serial_tx_small(const void *data, int len,
  *
  * @return                      0 on success; negative error code on failure.
  */
-int mcumgr_serial_tx_frame(const u8_t *data, bool first, int len,
-			   u16_t crc, mcumgr_serial_tx_cb cb, void *arg,
+int mcumgr_serial_tx_frame(const uint8_t *data, bool first, int len,
+			   uint16_t crc, mcumgr_serial_tx_cb cb, void *arg,
 			   int *out_data_bytes_txed)
 {
-	u8_t raw[3];
-	u16_t u16;
+	uint8_t raw[3];
+	uint16_t u16;
 	int dst_off;
 	int src_off;
 	int rem;
@@ -302,10 +302,10 @@ int mcumgr_serial_tx_frame(const u8_t *data, bool first, int len,
 	return 0;
 }
 
-int mcumgr_serial_tx_pkt(const u8_t *data, int len, mcumgr_serial_tx_cb cb,
+int mcumgr_serial_tx_pkt(const uint8_t *data, int len, mcumgr_serial_tx_cb cb,
 			 void *arg)
 {
-	u16_t crc;
+	uint16_t crc;
 	int data_bytes_txed;
 	int src_off;
 	int rc;
diff --git a/subsys/mgmt/smp.c b/subsys/mgmt/smp.c
index 233f11c010..492afe7628 100644
--- a/subsys/mgmt/smp.c
+++ b/subsys/mgmt/smp.c
@@ -105,7 +105,7 @@ zephyr_smp_trim_front(void *buf, size_t len, void *arg)
  *                              NULL on failure.
  */
 static struct net_buf *
-zephyr_smp_split_frag(struct net_buf **nb, void *arg, u16_t mtu)
+zephyr_smp_split_frag(struct net_buf **nb, void *arg, uint16_t mtu)
 {
 	struct net_buf *frag;
 	struct net_buf *src;
@@ -167,7 +167,7 @@ zephyr_smp_tx_rsp(struct smp_streamer *ns, void *rsp, void *arg)
 	struct zephyr_smp_transport *zst;
 	struct net_buf *frag;
 	struct net_buf *nb;
-	u16_t mtu;
+	uint16_t mtu;
 	int rc;
 	int i;
 
diff --git a/subsys/mgmt/smp_bt.c b/subsys/mgmt/smp_bt.c
index d76de20b28..8cb33e0251 100644
--- a/subsys/mgmt/smp_bt.c
+++ b/subsys/mgmt/smp_bt.c
@@ -48,8 +48,8 @@ static struct bt_uuid_128 smp_bt_chr_uuid = BT_UUID_INIT_128(
  */
 static ssize_t smp_bt_chr_write(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	struct smp_bt_user_data *ud;
 	struct net_buf *nb;
@@ -65,7 +65,7 @@ static ssize_t smp_bt_chr_write(struct bt_conn *conn,
 	return len;
 }
 
-static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void smp_bt_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 }
 
@@ -96,7 +96,7 @@ static struct bt_gatt_service smp_bt_svc = BT_GATT_SERVICE(smp_bt_attrs);
 /**
  * Transmits an SMP response over the specified Bluetooth connection.
  */
-static int smp_bt_tx_rsp(struct bt_conn *conn, const void *data, u16_t len)
+static int smp_bt_tx_rsp(struct bt_conn *conn, const void *data, uint16_t len)
 {
 	return bt_gatt_notify(conn, smp_bt_attrs + 2, data, len);
 }
@@ -119,10 +119,10 @@ static struct bt_conn *smp_bt_conn_from_pkt(const struct net_buf *nb)
  * Calculates the maximum fragment size to use when sending the specified
  * response packet.
  */
-static u16_t smp_bt_get_mtu(const struct net_buf *nb)
+static uint16_t smp_bt_get_mtu(const struct net_buf *nb)
 {
 	struct bt_conn *conn;
-	u16_t mtu;
+	uint16_t mtu;
 
 	conn = smp_bt_conn_from_pkt(nb);
 	if (conn == NULL) {
diff --git a/subsys/mgmt/smp_shell.c b/subsys/mgmt/smp_shell.c
index 3b2b3fd380..3b69368153 100644
--- a/subsys/mgmt/smp_shell.c
+++ b/subsys/mgmt/smp_shell.c
@@ -37,7 +37,7 @@ enum smp_shell_mcumgr_state {
 	SMP_SHELL_MCUMGR_STATE_PAYLOAD
 };
 
-static int read_mcumgr_byte(struct smp_shell_data *data, u8_t byte)
+static int read_mcumgr_byte(struct smp_shell_data *data, uint8_t byte)
 {
 	bool frag_1;
 	bool frag_2;
@@ -132,7 +132,7 @@ void smp_shell_process(struct smp_shell_data *data)
 	}
 }
 
-static u16_t smp_shell_get_mtu(const struct net_buf *nb)
+static uint16_t smp_shell_get_mtu(const struct net_buf *nb)
 {
 	return CONFIG_MCUMGR_SMP_SHELL_MTU;
 }
diff --git a/subsys/mgmt/smp_uart.c b/subsys/mgmt/smp_uart.c
index 0e496056c2..2262ccf277 100644
--- a/subsys/mgmt/smp_uart.c
+++ b/subsys/mgmt/smp_uart.c
@@ -71,7 +71,7 @@ static void smp_uart_rx_frag(struct uart_mcumgr_rx_buf *rx_buf)
 	k_work_submit(&smp_uart_work);
 }
 
-static u16_t smp_uart_get_mtu(const struct net_buf *nb)
+static uint16_t smp_uart_get_mtu(const struct net_buf *nb)
 {
 	return CONFIG_MCUMGR_SMP_UART_MTU;
 }
diff --git a/subsys/net/buf.c b/subsys/net/buf.c
index 5530d6e614..7f15c79761 100644
--- a/subsys/net/buf.c
+++ b/subsys/net/buf.c
@@ -63,7 +63,7 @@ int net_buf_id(struct net_buf *buf)
 }
 
 static inline struct net_buf *pool_get_uninit(struct net_buf_pool *pool,
-					      u16_t uninit_count)
+					      uint16_t uninit_count)
 {
 	struct net_buf *buf;
 
@@ -82,9 +82,9 @@ void net_buf_reset(struct net_buf *buf)
 	net_buf_simple_reset(&buf->b);
 }
 
-static u8_t *generic_data_ref(struct net_buf *buf, u8_t *data)
+static uint8_t *generic_data_ref(struct net_buf *buf, uint8_t *data)
 {
-	u8_t *ref_count;
+	uint8_t *ref_count;
 
 	ref_count = data - 1;
 	(*ref_count)++;
@@ -92,15 +92,15 @@ static u8_t *generic_data_ref(struct net_buf *buf, u8_t *data)
 	return data;
 }
 
-static u8_t *mem_pool_data_alloc(struct net_buf *buf, size_t *size,
+static uint8_t *mem_pool_data_alloc(struct net_buf *buf, size_t *size,
 				 k_timeout_t timeout)
 {
 	struct net_buf_pool *buf_pool = net_buf_pool_get(buf->pool_id);
 	struct k_mem_pool *pool = buf_pool->alloc->alloc_data;
 	struct k_mem_block block;
-	u8_t *ref_count;
+	uint8_t *ref_count;
 
-	/* Reserve extra space for k_mem_block_id and ref-count (u8_t) */
+	/* Reserve extra space for k_mem_block_id and ref-count (uint8_t) */
 	if (k_mem_pool_alloc(pool, &block,
 			     sizeof(struct k_mem_block_id) + 1 + *size,
 			     timeout)) {
@@ -110,17 +110,17 @@ static u8_t *mem_pool_data_alloc(struct net_buf *buf, size_t *size,
 	/* save the block descriptor info at the start of the actual block */
 	memcpy(block.data, &block.id, sizeof(block.id));
 
-	ref_count = (u8_t *)block.data + sizeof(block.id);
+	ref_count = (uint8_t *)block.data + sizeof(block.id);
 	*ref_count = 1U;
 
 	/* Return pointer to the byte following the ref count */
 	return ref_count + 1;
 }
 
-static void mem_pool_data_unref(struct net_buf *buf, u8_t *data)
+static void mem_pool_data_unref(struct net_buf *buf, uint8_t *data)
 {
 	struct k_mem_block_id id;
-	u8_t *ref_count;
+	uint8_t *ref_count;
 
 	ref_count = data - 1;
 	if (--(*ref_count)) {
@@ -138,7 +138,7 @@ const struct net_buf_data_cb net_buf_var_cb = {
 	.unref = mem_pool_data_unref,
 };
 
-static u8_t *fixed_data_alloc(struct net_buf *buf, size_t *size,
+static uint8_t *fixed_data_alloc(struct net_buf *buf, size_t *size,
 			      k_timeout_t timeout)
 {
 	struct net_buf_pool *pool = net_buf_pool_get(buf->pool_id);
@@ -149,7 +149,7 @@ static u8_t *fixed_data_alloc(struct net_buf *buf, size_t *size,
 	return fixed->data_pool + fixed->data_size * net_buf_id(buf);
 }
 
-static void fixed_data_unref(struct net_buf *buf, u8_t *data)
+static void fixed_data_unref(struct net_buf *buf, uint8_t *data)
 {
 	/* Nothing needed for fixed-size data pools */
 }
@@ -161,10 +161,10 @@ const struct net_buf_data_cb net_buf_fixed_cb = {
 
 #if (CONFIG_HEAP_MEM_POOL_SIZE > 0)
 
-static u8_t *heap_data_alloc(struct net_buf *buf, size_t *size,
+static uint8_t *heap_data_alloc(struct net_buf *buf, size_t *size,
 			     k_timeout_t timeout)
 {
-	u8_t *ref_count;
+	uint8_t *ref_count;
 
 	ref_count = k_malloc(1 + *size);
 	if (!ref_count) {
@@ -176,9 +176,9 @@ static u8_t *heap_data_alloc(struct net_buf *buf, size_t *size,
 	return ref_count + 1;
 }
 
-static void heap_data_unref(struct net_buf *buf, u8_t *data)
+static void heap_data_unref(struct net_buf *buf, uint8_t *data)
 {
-	u8_t *ref_count;
+	uint8_t *ref_count;
 
 	ref_count = data - 1;
 	if (--(*ref_count)) {
@@ -200,21 +200,21 @@ const struct net_buf_data_alloc net_buf_heap_alloc = {
 
 #endif /* CONFIG_HEAP_MEM_POOL_SIZE > 0 */
 
-static u8_t *data_alloc(struct net_buf *buf, size_t *size, k_timeout_t timeout)
+static uint8_t *data_alloc(struct net_buf *buf, size_t *size, k_timeout_t timeout)
 {
 	struct net_buf_pool *pool = net_buf_pool_get(buf->pool_id);
 
 	return pool->alloc->cb->alloc(buf, size, timeout);
 }
 
-static u8_t *data_ref(struct net_buf *buf, u8_t *data)
+static uint8_t *data_ref(struct net_buf *buf, uint8_t *data)
 {
 	struct net_buf_pool *pool = net_buf_pool_get(buf->pool_id);
 
 	return pool->alloc->cb->ref(buf, data);
 }
 
-static void data_unref(struct net_buf *buf, u8_t *data)
+static void data_unref(struct net_buf *buf, uint8_t *data)
 {
 	struct net_buf_pool *pool = net_buf_pool_get(buf->pool_id);
 
@@ -234,7 +234,7 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 				  k_timeout_t timeout)
 #endif
 {
-	u64_t end = z_timeout_end_calc(timeout);
+	uint64_t end = z_timeout_end_calc(timeout);
 	struct net_buf *buf;
 	unsigned int key;
 
@@ -251,7 +251,7 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 	 * with the allocation one way or another.
 	 */
 	if (pool->uninit_count) {
-		u16_t uninit_count;
+		uint16_t uninit_count;
 
 		/* If this is not the first access to the pool, we can
 		 * be opportunistic and try to fetch a previously used
@@ -276,7 +276,7 @@ struct net_buf *net_buf_alloc_len(struct net_buf_pool *pool, size_t size,
 
 #if defined(CONFIG_NET_BUF_LOG) && (CONFIG_NET_BUF_LOG_LEVEL >= LOG_LEVEL_WRN)
 	if (K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		u32_t ref = k_uptime_get_32();
+		uint32_t ref = k_uptime_get_32();
 		buf = k_lifo_get(&pool->free, K_NO_WAIT);
 		while (!buf) {
 #if defined(CONFIG_NET_BUF_POOL_USAGE)
@@ -317,7 +317,7 @@ success:
 #endif
 		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 		    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			s64_t remaining = end - z_tick_get();
+			int64_t remaining = end - z_tick_get();
 
 			if (remaining <= 0) {
 				timeout = K_NO_WAIT;
@@ -578,7 +578,7 @@ struct net_buf *net_buf_ref(struct net_buf *buf)
 
 struct net_buf *net_buf_clone(struct net_buf *buf, k_timeout_t timeout)
 {
-	s64_t end = z_timeout_end_calc(timeout);
+	int64_t end = z_timeout_end_calc(timeout);
 	struct net_buf_pool *pool;
 	struct net_buf *clone;
 
@@ -604,7 +604,7 @@ struct net_buf *net_buf_clone(struct net_buf *buf, k_timeout_t timeout)
 
 		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 		    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			s64_t remaining = end - z_tick_get();
+			int64_t remaining = end - z_tick_get();
 
 			if (remaining <= 0) {
 				timeout = K_NO_WAIT;
@@ -715,7 +715,7 @@ size_t net_buf_linearize(void *dst, size_t dst_len, struct net_buf *src,
 	copied = 0;
 	while (frag && len > 0) {
 		to_copy = MIN(len, frag->len - offset);
-		memcpy((u8_t *)dst + copied, frag->data + offset, to_copy);
+		memcpy((uint8_t *)dst + copied, frag->data + offset, to_copy);
 
 		copied += to_copy;
 
@@ -740,10 +740,10 @@ size_t net_buf_append_bytes(struct net_buf *buf, size_t len,
 {
 	struct net_buf *frag = net_buf_frag_last(buf);
 	size_t added_len = 0;
-	const u8_t *value8 = value;
+	const uint8_t *value8 = value;
 
 	do {
-		u16_t count = MIN(len, net_buf_tailroom(frag));
+		uint16_t count = MIN(len, net_buf_tailroom(frag));
 
 		net_buf_add_mem(frag, value8, count);
 		len -= count;
@@ -786,7 +786,7 @@ void net_buf_simple_clone(const struct net_buf_simple *original,
 
 void *net_buf_simple_add(struct net_buf_simple *buf, size_t len)
 {
-	u8_t *tail = net_buf_simple_tail(buf);
+	uint8_t *tail = net_buf_simple_tail(buf);
 
 	NET_BUF_SIMPLE_DBG("buf %p len %zu", buf, len);
 
@@ -804,9 +804,9 @@ void *net_buf_simple_add_mem(struct net_buf_simple *buf, const void *mem,
 	return memcpy(net_buf_simple_add(buf, len), mem, len);
 }
 
-u8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, u8_t val)
+uint8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, uint8_t val)
 {
-	u8_t *u8;
+	uint8_t *u8;
 
 	NET_BUF_SIMPLE_DBG("buf %p val 0x%02x", buf, val);
 
@@ -816,70 +816,70 @@ u8_t *net_buf_simple_add_u8(struct net_buf_simple *buf, u8_t val)
 	return u8;
 }
 
-void net_buf_simple_add_le16(struct net_buf_simple *buf, u16_t val)
+void net_buf_simple_add_le16(struct net_buf_simple *buf, uint16_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le16(val, net_buf_simple_add(buf, sizeof(val)));
 }
 
-void net_buf_simple_add_be16(struct net_buf_simple *buf, u16_t val)
+void net_buf_simple_add_be16(struct net_buf_simple *buf, uint16_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be16(val, net_buf_simple_add(buf, sizeof(val)));
 }
 
-void net_buf_simple_add_le24(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_add_le24(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le24(val, net_buf_simple_add(buf, 3));
 }
 
-void net_buf_simple_add_be24(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_add_be24(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be24(val, net_buf_simple_add(buf, 3));
 }
 
-void net_buf_simple_add_le32(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_add_le32(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le32(val, net_buf_simple_add(buf, sizeof(val)));
 }
 
-void net_buf_simple_add_be32(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_add_be32(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be32(val, net_buf_simple_add(buf, sizeof(val)));
 }
 
-void net_buf_simple_add_le48(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_add_le48(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_le48(val, net_buf_simple_add(buf, 6));
 }
 
-void net_buf_simple_add_be48(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_add_be48(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_be48(val, net_buf_simple_add(buf, 6));
 }
 
-void net_buf_simple_add_le64(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_add_le64(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_le64(val, net_buf_simple_add(buf, sizeof(val)));
 }
 
-void net_buf_simple_add_be64(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_add_be64(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
@@ -897,77 +897,77 @@ void *net_buf_simple_push(struct net_buf_simple *buf, size_t len)
 	return buf->data;
 }
 
-void net_buf_simple_push_le16(struct net_buf_simple *buf, u16_t val)
+void net_buf_simple_push_le16(struct net_buf_simple *buf, uint16_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le16(val, net_buf_simple_push(buf, sizeof(val)));
 }
 
-void net_buf_simple_push_be16(struct net_buf_simple *buf, u16_t val)
+void net_buf_simple_push_be16(struct net_buf_simple *buf, uint16_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be16(val, net_buf_simple_push(buf, sizeof(val)));
 }
 
-void net_buf_simple_push_u8(struct net_buf_simple *buf, u8_t val)
+void net_buf_simple_push_u8(struct net_buf_simple *buf, uint8_t val)
 {
-	u8_t *data = net_buf_simple_push(buf, 1);
+	uint8_t *data = net_buf_simple_push(buf, 1);
 
 	*data = val;
 }
 
-void net_buf_simple_push_le24(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_push_le24(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le24(val, net_buf_simple_push(buf, 3));
 }
 
-void net_buf_simple_push_be24(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_push_be24(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be24(val, net_buf_simple_push(buf, 3));
 }
 
-void net_buf_simple_push_le32(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_push_le32(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_le32(val, net_buf_simple_push(buf, sizeof(val)));
 }
 
-void net_buf_simple_push_be32(struct net_buf_simple *buf, u32_t val)
+void net_buf_simple_push_be32(struct net_buf_simple *buf, uint32_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %u", buf, val);
 
 	sys_put_be32(val, net_buf_simple_push(buf, sizeof(val)));
 }
 
-void net_buf_simple_push_le48(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_push_le48(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_le48(val, net_buf_simple_push(buf, 6));
 }
 
-void net_buf_simple_push_be48(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_push_be48(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_be48(val, net_buf_simple_push(buf, 6));
 }
 
-void net_buf_simple_push_le64(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_push_le64(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
 	sys_put_le64(val, net_buf_simple_push(buf, sizeof(val)));
 }
 
-void net_buf_simple_push_be64(struct net_buf_simple *buf, u64_t val)
+void net_buf_simple_push_be64(struct net_buf_simple *buf, uint64_t val)
 {
 	NET_BUF_SIMPLE_DBG("buf %p val %" PRIu64, buf, val);
 
@@ -998,9 +998,9 @@ void *net_buf_simple_pull_mem(struct net_buf_simple *buf, size_t len)
 	return data;
 }
 
-u8_t net_buf_simple_pull_u8(struct net_buf_simple *buf)
+uint8_t net_buf_simple_pull_u8(struct net_buf_simple *buf)
 {
-	u8_t val;
+	uint8_t val;
 
 	val = buf->data[0];
 	net_buf_simple_pull(buf, 1);
@@ -1008,30 +1008,30 @@ u8_t net_buf_simple_pull_u8(struct net_buf_simple *buf)
 	return val;
 }
 
-u16_t net_buf_simple_pull_le16(struct net_buf_simple *buf)
+uint16_t net_buf_simple_pull_le16(struct net_buf_simple *buf)
 {
-	u16_t val;
+	uint16_t val;
 
-	val = UNALIGNED_GET((u16_t *)buf->data);
+	val = UNALIGNED_GET((uint16_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_le16_to_cpu(val);
 }
 
-u16_t net_buf_simple_pull_be16(struct net_buf_simple *buf)
+uint16_t net_buf_simple_pull_be16(struct net_buf_simple *buf)
 {
-	u16_t val;
+	uint16_t val;
 
-	val = UNALIGNED_GET((u16_t *)buf->data);
+	val = UNALIGNED_GET((uint16_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_be16_to_cpu(val);
 }
 
-u32_t net_buf_simple_pull_le24(struct net_buf_simple *buf)
+uint32_t net_buf_simple_pull_le24(struct net_buf_simple *buf)
 {
 	struct uint24 {
-		u32_t u24:24;
+		uint32_t u24:24;
 	} __packed val;
 
 	val = UNALIGNED_GET((struct uint24 *)buf->data);
@@ -1040,10 +1040,10 @@ u32_t net_buf_simple_pull_le24(struct net_buf_simple *buf)
 	return sys_le24_to_cpu(val.u24);
 }
 
-u32_t net_buf_simple_pull_be24(struct net_buf_simple *buf)
+uint32_t net_buf_simple_pull_be24(struct net_buf_simple *buf)
 {
 	struct uint24 {
-		u32_t u24:24;
+		uint32_t u24:24;
 	} __packed val;
 
 	val = UNALIGNED_GET((struct uint24 *)buf->data);
@@ -1052,30 +1052,30 @@ u32_t net_buf_simple_pull_be24(struct net_buf_simple *buf)
 	return sys_be24_to_cpu(val.u24);
 }
 
-u32_t net_buf_simple_pull_le32(struct net_buf_simple *buf)
+uint32_t net_buf_simple_pull_le32(struct net_buf_simple *buf)
 {
-	u32_t val;
+	uint32_t val;
 
-	val = UNALIGNED_GET((u32_t *)buf->data);
+	val = UNALIGNED_GET((uint32_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_le32_to_cpu(val);
 }
 
-u32_t net_buf_simple_pull_be32(struct net_buf_simple *buf)
+uint32_t net_buf_simple_pull_be32(struct net_buf_simple *buf)
 {
-	u32_t val;
+	uint32_t val;
 
-	val = UNALIGNED_GET((u32_t *)buf->data);
+	val = UNALIGNED_GET((uint32_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_be32_to_cpu(val);
 }
 
-u64_t net_buf_simple_pull_le48(struct net_buf_simple *buf)
+uint64_t net_buf_simple_pull_le48(struct net_buf_simple *buf)
 {
 	struct uint48 {
-		u64_t u48:48;
+		uint64_t u48:48;
 	} __packed val;
 
 	val = UNALIGNED_GET((struct uint48 *)buf->data);
@@ -1084,10 +1084,10 @@ u64_t net_buf_simple_pull_le48(struct net_buf_simple *buf)
 	return sys_le48_to_cpu(val.u48);
 }
 
-u64_t net_buf_simple_pull_be48(struct net_buf_simple *buf)
+uint64_t net_buf_simple_pull_be48(struct net_buf_simple *buf)
 {
 	struct uint48 {
-		u64_t u48:48;
+		uint64_t u48:48;
 	} __packed val;
 
 	val = UNALIGNED_GET((struct uint48 *)buf->data);
@@ -1096,21 +1096,21 @@ u64_t net_buf_simple_pull_be48(struct net_buf_simple *buf)
 	return sys_be48_to_cpu(val.u48);
 }
 
-u64_t net_buf_simple_pull_le64(struct net_buf_simple *buf)
+uint64_t net_buf_simple_pull_le64(struct net_buf_simple *buf)
 {
-	u64_t val;
+	uint64_t val;
 
-	val = UNALIGNED_GET((u64_t *)buf->data);
+	val = UNALIGNED_GET((uint64_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_le64_to_cpu(val);
 }
 
-u64_t net_buf_simple_pull_be64(struct net_buf_simple *buf)
+uint64_t net_buf_simple_pull_be64(struct net_buf_simple *buf)
 {
-	u64_t val;
+	uint64_t val;
 
-	val = UNALIGNED_GET((u64_t *)buf->data);
+	val = UNALIGNED_GET((uint64_t *)buf->data);
 	net_buf_simple_pull(buf, sizeof(val));
 
 	return sys_be64_to_cpu(val);
diff --git a/subsys/net/hostname.c b/subsys/net/hostname.c
index cb3014407a..373b8d0f74 100644
--- a/subsys/net/hostname.c
+++ b/subsys/net/hostname.c
@@ -30,7 +30,7 @@ const char *net_hostname_get(void)
 }
 
 #if defined(CONFIG_NET_HOSTNAME_UNIQUE)
-int net_hostname_set_postfix(const u8_t *hostname_postfix,
+int net_hostname_set_postfix(const uint8_t *hostname_postfix,
 			     int postfix_len)
 {
 	static bool postfix_set;
diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c
index cb2973adc0..736cf05839 100644
--- a/subsys/net/ip/6lo.c
+++ b/subsys/net/ip/6lo.c
@@ -26,19 +26,19 @@ LOG_MODULE_REGISTER(net_6lo, CONFIG_NET_6LO_LOG_LEVEL);
 struct net_6lo_context {
 	struct in6_addr prefix;
 	struct net_if *iface;
-	u16_t lifetime;
-	u8_t is_used		: 1;
-	u8_t compress	: 1;
-	u8_t cid		: 4;
-	u8_t unused		: 2;
+	uint16_t lifetime;
+	uint8_t is_used		: 1;
+	uint8_t compress	: 1;
+	uint8_t cid		: 4;
+	uint8_t unused		: 2;
 } __packed;
 
-static inline u8_t get_6co_compress(struct net_icmpv6_nd_opt_6co *opt)
+static inline uint8_t get_6co_compress(struct net_icmpv6_nd_opt_6co *opt)
 {
 	return (opt->flag & 0x10) >> 4;
 }
 
-static inline u8_t get_6co_cid(struct net_icmpv6_nd_opt_6co *opt)
+static inline uint8_t get_6co_cid(struct net_icmpv6_nd_opt_6co *opt)
 {
 	return opt->flag & 0x0F;
 }
@@ -46,20 +46,20 @@ static inline u8_t get_6co_cid(struct net_icmpv6_nd_opt_6co *opt)
 static struct net_6lo_context ctx_6co[CONFIG_NET_MAX_6LO_CONTEXTS];
 #endif
 
-static const u8_t udp_nhc_inline_size_table[] = {4, 3, 3, 1};
+static const uint8_t udp_nhc_inline_size_table[] = {4, 3, 3, 1};
 
-static const u8_t tf_inline_size_table[] = {4, 3, 1, 0};
+static const uint8_t tf_inline_size_table[] = {4, 3, 1, 0};
 /* The first bit of the index is SAC        |  SAC=0   |  SAC=1   |*/
-static const u8_t sa_inline_size_table[] = {16, 8, 2, 0, 0, 8, 2, 0};
+static const uint8_t sa_inline_size_table[] = {16, 8, 2, 0, 0, 8, 2, 0};
 
 /* The first bit is M, the second DAC
  *	| M=0 DAC=0 | M=0 DAC=1 | M=1 DAC=0  | M=1 DAC=1 (DAM always 00)
  */
-static const u8_t da_inline_size_table[] = {
+static const uint8_t da_inline_size_table[] = {
 	16, 8, 2, 0, 0, 8, 2, 0, 16, 6, 4, 1, 6
 	};
 
-static int get_udp_nhc_inlined_size(u8_t nhc)
+static int get_udp_nhc_inlined_size(uint8_t nhc)
 {
 	int size = 0;
 
@@ -79,7 +79,7 @@ static int get_udp_nhc_inlined_size(u8_t nhc)
 	return size;
 }
 
-static int get_ihpc_inlined_size(u16_t iphc)
+static int get_ihpc_inlined_size(uint16_t iphc)
 {
 	int size = 0;
 
@@ -157,7 +157,7 @@ static inline bool net_6lo_maddr_48_bit_compressible(struct in6_addr *addr)
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
 /* RFC 6775, 4.2, 5.4.2, 5.4.3 and 7.2*/
-static inline void set_6lo_context(struct net_if *iface, u8_t index,
+static inline void set_6lo_context(struct net_if *iface, uint8_t index,
 				   struct net_icmpv6_nd_opt_6co *context)
 
 {
@@ -176,7 +176,7 @@ void net_6lo_set_context(struct net_if *iface,
 			 struct net_icmpv6_nd_opt_6co *context)
 {
 	int unused = -1;
-	u8_t i;
+	uint8_t i;
 
 	/* If the context information already exists, update or remove
 	 * as per data.
@@ -212,9 +212,9 @@ void net_6lo_set_context(struct net_if *iface,
 
 /* Get the context by matching cid */
 static inline struct net_6lo_context *
-get_6lo_context_by_cid(struct net_if *iface, u8_t cid)
+get_6lo_context_by_cid(struct net_if *iface, uint8_t cid)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < CONFIG_NET_MAX_6LO_CONTEXTS; i++) {
 		if (!ctx_6co[i].is_used) {
@@ -233,7 +233,7 @@ get_6lo_context_by_cid(struct net_if *iface, u8_t cid)
 static inline struct net_6lo_context *
 get_6lo_context_by_addr(struct net_if *iface, struct in6_addr *addr)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < CONFIG_NET_MAX_6LO_CONTEXTS; i++) {
 		if (!ctx_6co[i].is_used) {
@@ -265,10 +265,10 @@ get_6lo_context_by_addr(struct net_if *iface, struct in6_addr *addr)
  * IPv6 traffic class format is DSCP, ECN.
  * DSCP(6), ECN(2).
  */
-static u8_t *compress_tfl(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			  u16_t *iphc)
+static uint8_t *compress_tfl(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			  uint16_t *iphc)
 {
-	u8_t tcl;
+	uint8_t tcl;
 
 	tcl = ((ipv6->vtc & 0x0F) << 4) | ((ipv6->tcflow & 0xF0) >> 4);
 	tcl = (tcl << 6) | (tcl >> 2);   /* ECN(2), DSCP(6) */
@@ -298,7 +298,7 @@ static u8_t *compress_tfl(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 			inline_ptr -= sizeof(ipv6->flow);
 			memmove(inline_ptr, &ipv6->flow, sizeof(ipv6->flow));
 
-			inline_ptr -= sizeof(u8_t);
+			inline_ptr -= sizeof(uint8_t);
 			*inline_ptr = (tcl & 0xC0) | (ipv6->tcflow & 0x0F);
 		} else {
 			NET_DBG("ECN + DSCP + 4-bit Pad + Flow Label");
@@ -309,7 +309,7 @@ static u8_t *compress_tfl(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 			inline_ptr -= sizeof(ipv6->flow);
 			memmove(inline_ptr, &ipv6->flow, sizeof(ipv6->flow));
 
-			inline_ptr -= sizeof(u8_t);
+			inline_ptr -= sizeof(uint8_t);
 			*inline_ptr = ipv6->tcflow & 0x0F;
 			inline_ptr -= sizeof(tcl);
 			*inline_ptr = tcl;
@@ -320,8 +320,8 @@ static u8_t *compress_tfl(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 }
 
 /* Helper to compress Hop limit */
-static u8_t *compress_hoplimit(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			       u16_t *iphc)
+static uint8_t *compress_hoplimit(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			       uint16_t *iphc)
 {
 	/* Hop Limit */
 	switch (ipv6->hop_limit) {
@@ -347,8 +347,8 @@ static u8_t *compress_hoplimit(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 }
 
 /* Helper to compress Next header */
-static u8_t *compress_nh(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			 u16_t *iphc)
+static uint8_t *compress_nh(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			 uint16_t *iphc)
 {
 	/* Next header */
 	if (ipv6->nexthdr == IPPROTO_UDP) {
@@ -362,8 +362,8 @@ static u8_t *compress_nh(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 }
 
 /* Helpers to compress Source Address */
-static u8_t *compress_sa(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
-			 u8_t *inline_ptr, u16_t *iphc)
+static uint8_t *compress_sa(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
+			 uint8_t *inline_ptr, uint16_t *iphc)
 {
 	NET_ASSERT(net_pkt_lladdr_src(pkt)->addr);
 
@@ -380,8 +380,8 @@ static u8_t *compress_sa(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 		NET_DBG("SAM_10 src addr 16 bit compressible");
 		*iphc |= NET_6LO_IPHC_SAM_10;
 
-		inline_ptr -= sizeof(u16_t);
-		memmove(inline_ptr, &ipv6->src.s6_addr[14], sizeof(u16_t));
+		inline_ptr -= sizeof(uint16_t);
+		memmove(inline_ptr, &ipv6->src.s6_addr[14], sizeof(uint16_t));
 
 		return inline_ptr;
 	}
@@ -396,8 +396,8 @@ static u8_t *compress_sa(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 	return inline_ptr;
 }
 
-static u8_t *set_sa_inline(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			   u16_t *iphc)
+static uint8_t *set_sa_inline(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			   uint16_t *iphc)
 {
 	*iphc |= NET_6LO_IPHC_SAM_00;
 	inline_ptr -= 16U;
@@ -406,8 +406,8 @@ static u8_t *set_sa_inline(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 }
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
-static u8_t *compress_sa_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			     struct net_pkt *pkt, u16_t *iphc,
+static uint8_t *compress_sa_ctx(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			     struct net_pkt *pkt, uint16_t *iphc,
 			     struct net_6lo_context *src)
 {
 	NET_ASSERT(net_pkt_lladdr_src(pkt)->addr);
@@ -429,8 +429,8 @@ static u8_t *compress_sa_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 
 		*iphc |= NET_6LO_IPHC_SAM_10;
 
-		inline_ptr -= sizeof(u16_t);
-		memmove(inline_ptr, &ipv6->src.s6_addr[14], sizeof(u16_t));
+		inline_ptr -= sizeof(uint16_t);
+		memmove(inline_ptr, &ipv6->src.s6_addr[14], sizeof(uint16_t));
 		return inline_ptr;
 	}
 
@@ -447,8 +447,8 @@ static u8_t *compress_sa_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 #endif
 
 /* Helpers to compress Destination Address */
-static u8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			       u16_t *iphc)
+static uint8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			       uint16_t *iphc)
 {
 	*iphc |= NET_6LO_IPHC_M_1;
 
@@ -460,8 +460,8 @@ static u8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 		/* last byte */
 		*iphc |= NET_6LO_IPHC_DAM_11;
 
-		inline_ptr -= sizeof(u8_t);
-		memmove(inline_ptr, &ipv6->dst.s6_addr[15], sizeof(u8_t));
+		inline_ptr -= sizeof(uint8_t);
+		memmove(inline_ptr, &ipv6->dst.s6_addr[15], sizeof(uint8_t));
 
 		return inline_ptr;
 	}
@@ -475,8 +475,8 @@ static u8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 		inline_ptr -= 3U;
 		memmove(inline_ptr, &ipv6->dst.s6_addr[13], 3U);
 
-		inline_ptr -= sizeof(u8_t);
-		memmove(inline_ptr, &ipv6->dst.s6_addr[1], sizeof(u8_t));
+		inline_ptr -= sizeof(uint8_t);
+		memmove(inline_ptr, &ipv6->dst.s6_addr[1], sizeof(uint8_t));
 
 		return inline_ptr;
 	}
@@ -490,8 +490,8 @@ static u8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 		inline_ptr -= 5U;
 		memmove(inline_ptr, &ipv6->dst.s6_addr[11], 5U);
 
-		inline_ptr -= sizeof(u8_t);
-		memmove(inline_ptr, &ipv6->dst.s6_addr[1], sizeof(u8_t));
+		inline_ptr -= sizeof(uint8_t);
+		memmove(inline_ptr, &ipv6->dst.s6_addr[1], sizeof(uint8_t));
 
 		return inline_ptr;
 	}
@@ -505,8 +505,8 @@ static u8_t *compress_da_mcast(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 	return inline_ptr;
 }
 
-static u8_t *compress_da(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
-			 u8_t *inline_ptr, u16_t *iphc)
+static uint8_t *compress_da(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
+			 uint8_t *inline_ptr, uint16_t *iphc)
 {
 	NET_ASSERT(net_pkt_lladdr_dst(pkt)->addr);
 	/* Address is fully elided */
@@ -523,8 +523,8 @@ static u8_t *compress_da(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 
 		*iphc |= NET_6LO_IPHC_DAM_10;
 
-		inline_ptr -= sizeof(u16_t);
-		memmove(inline_ptr, &ipv6->dst.s6_addr[14], sizeof(u16_t));
+		inline_ptr -= sizeof(uint16_t);
+		memmove(inline_ptr, &ipv6->dst.s6_addr[14], sizeof(uint16_t));
 		return inline_ptr;
 	}
 
@@ -539,8 +539,8 @@ static u8_t *compress_da(struct net_ipv6_hdr *ipv6, struct net_pkt *pkt,
 	return inline_ptr;
 }
 
-static u8_t *set_da_inline(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			   u16_t *iphc)
+static uint8_t *set_da_inline(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			   uint16_t *iphc)
 {
 	*iphc |= NET_6LO_IPHC_DAM_00;
 	inline_ptr -= 16U;
@@ -549,8 +549,8 @@ static u8_t *set_da_inline(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 }
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
-static u8_t *compress_da_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
-			     struct net_pkt *pkt, u16_t *iphc,
+static uint8_t *compress_da_ctx(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr,
+			     struct net_pkt *pkt, uint16_t *iphc,
 			     struct net_6lo_context *dst)
 {
 	*iphc |= NET_6LO_IPHC_DAC_1;
@@ -567,8 +567,8 @@ static u8_t *compress_da_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 		NET_DBG("DAM_10 dst addr 16 bit compressible");
 
 		*iphc |= NET_6LO_IPHC_DAM_10;
-		inline_ptr -= sizeof(u16_t);
-		memmove(inline_ptr, &ipv6->dst.s6_addr[14], sizeof(u16_t));
+		inline_ptr -= sizeof(uint16_t);
+		memmove(inline_ptr, &ipv6->dst.s6_addr[14], sizeof(uint16_t));
 		return inline_ptr;
 	}
 
@@ -585,12 +585,12 @@ static u8_t *compress_da_ctx(struct net_ipv6_hdr *ipv6, u8_t *inline_ptr,
 #endif
 
 /* Helper to compress Next header UDP */
-static inline u8_t *compress_nh_udp(struct net_udp_hdr *udp, u8_t *inline_ptr,
+static inline uint8_t *compress_nh_udp(struct net_udp_hdr *udp, uint8_t *inline_ptr,
 				    bool compress_checksum)
 {
-	u8_t nhc = NET_6LO_NHC_UDP_BARE;
-	u8_t *inline_ptr_udp = inline_ptr;
-	u8_t tmp;
+	uint8_t nhc = NET_6LO_NHC_UDP_BARE;
+	uint8_t *inline_ptr_udp = inline_ptr;
+	uint8_t tmp;
 
 	/* 4.3.3 UDP LOWPAN_NHC Format
 	 *   0   1   2   3   4   5   6   7
@@ -627,10 +627,10 @@ static inline u8_t *compress_nh_udp(struct net_udp_hdr *udp, u8_t *inline_ptr,
 		  */
 		nhc |= NET_6LO_NHC_UDP_PORT_11;
 
-		tmp = (u8_t)(htons(udp->src_port));
+		tmp = (uint8_t)(htons(udp->src_port));
 		tmp = tmp << 4;
 
-		tmp |= (((u8_t)(htons(udp->dst_port))) & 0x0F);
+		tmp |= (((uint8_t)(htons(udp->dst_port))) & 0x0F);
 		inline_ptr_udp -= sizeof(tmp);
 		*inline_ptr_udp = tmp;
 
@@ -643,8 +643,8 @@ static inline u8_t *compress_nh_udp(struct net_udp_hdr *udp, u8_t *inline_ptr,
 		 */
 		nhc |= NET_6LO_NHC_UDP_PORT_01;
 
-		inline_ptr_udp -= sizeof(u8_t);
-		*inline_ptr_udp = (u8_t)(htons(udp->dst_port));
+		inline_ptr_udp -= sizeof(uint8_t);
+		*inline_ptr_udp = (uint8_t)(htons(udp->dst_port));
 
 		inline_ptr_udp -= sizeof(udp->src_port);
 		memmove(inline_ptr_udp, &udp->src_port, sizeof(udp->src_port));
@@ -661,8 +661,8 @@ static inline u8_t *compress_nh_udp(struct net_udp_hdr *udp, u8_t *inline_ptr,
 		inline_ptr_udp -= sizeof(udp->dst_port);
 		memmove(inline_ptr_udp, &udp->dst_port, sizeof(udp->dst_port));
 
-		inline_ptr_udp -= sizeof(u8_t);
-		*inline_ptr_udp = (u8_t)(htons(udp->src_port));
+		inline_ptr_udp -= sizeof(uint8_t);
+		*inline_ptr_udp = (uint8_t)(htons(udp->src_port));
 
 	} else {
 		NET_DBG("Can not compress ports, ports are inlined");
@@ -724,11 +724,11 @@ static inline int compress_IPHC_header(struct net_pkt *pkt)
 	struct net_6lo_context *src_ctx = NULL;
 	struct net_6lo_context *dst_ctx = NULL;
 #endif
-	u8_t compressed = 0;
-	u16_t iphc = (NET_6LO_DISPATCH_IPHC << 8);
+	uint8_t compressed = 0;
+	uint16_t iphc = (NET_6LO_DISPATCH_IPHC << 8);
 	struct net_ipv6_hdr *ipv6 = NET_IPV6_HDR(pkt);
 	struct net_udp_hdr *udp;
-	u8_t *inline_pos;
+	uint8_t *inline_pos;
 
 	if (pkt->frags->len < NET_IPV6H_LEN) {
 		NET_ERR("Invalid length %d, min %d",
@@ -806,7 +806,7 @@ sa_end:
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
 	if (iphc & NET_6LO_IPHC_CID_1) {
-		inline_pos -= sizeof(u8_t);
+		inline_pos -= sizeof(uint8_t);
 		*inline_pos = 0;
 
 		if (src_ctx) {
@@ -831,10 +831,10 @@ sa_end:
 }
 
 /* Helper to uncompress Traffic class and Flow label */
-static inline u8_t *uncompress_tfl(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_tfl(uint16_t iphc, uint8_t *cursor,
 				  struct net_ipv6_hdr *ipv6)
 {
-	u8_t tcl;
+	uint8_t tcl;
 
 	/* Uncompress tcl and flow label */
 	switch (iphc & NET_6LO_IPHC_TF_11) {
@@ -888,7 +888,7 @@ static inline u8_t *uncompress_tfl(u16_t iphc, u8_t *cursor,
 }
 
 /* Helper to uncompress Hoplimit */
-static inline u8_t *uncompress_hoplimit(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_hoplimit(uint16_t iphc, uint8_t *cursor,
 				       struct net_ipv6_hdr *ipv6)
 {
 	switch (iphc & NET_6LO_IPHC_HLIM_MASK) {
@@ -915,7 +915,7 @@ static inline u8_t *uncompress_hoplimit(u16_t iphc, u8_t *cursor,
 }
 
 /* Helper to uncompress Source Address */
-static inline u8_t *uncompress_sa(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_sa(uint16_t iphc, uint8_t *cursor,
 				 struct net_ipv6_hdr *ipv6,
 				 struct net_pkt *pkt)
 {
@@ -970,7 +970,7 @@ static inline u8_t *uncompress_sa(u16_t iphc, u8_t *cursor,
 }
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
-static inline u8_t *uncompress_sa_ctx(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_sa_ctx(uint16_t iphc, uint8_t *cursor,
 				     struct net_ipv6_hdr *ipv6,
 				     struct net_6lo_context *ctx,
 				     struct net_pkt *pkt)
@@ -1026,7 +1026,7 @@ static inline u8_t *uncompress_sa_ctx(u16_t iphc, u8_t *cursor,
 #endif
 
 /* Helpers to uncompress Destination Address */
-static inline u8_t *uncompress_da_mcast(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_da_mcast(uint16_t iphc, uint8_t *cursor,
 				       struct net_ipv6_hdr *ipv6)
 {
 	NET_DBG("Dst is multicast");
@@ -1104,7 +1104,7 @@ static inline u8_t *uncompress_da_mcast(u16_t iphc, u8_t *cursor,
 }
 
 /* Helper to uncompress Destination Address */
-static inline u8_t *uncompress_da(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_da(uint16_t iphc, uint8_t *cursor,
 				 struct net_ipv6_hdr *ipv6,
 				 struct net_pkt *pkt)
 {
@@ -1161,7 +1161,7 @@ static inline u8_t *uncompress_da(u16_t iphc, u8_t *cursor,
 }
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
-static inline u8_t *uncompress_da_ctx(u16_t iphc, u8_t *cursor,
+static inline uint8_t *uncompress_da_ctx(uint16_t iphc, uint8_t *cursor,
 				     struct net_ipv6_hdr *ipv6,
 				     struct net_6lo_context *ctx,
 				     struct net_pkt *pkt)
@@ -1220,7 +1220,7 @@ static inline u8_t *uncompress_da_ctx(u16_t iphc, u8_t *cursor,
 #endif
 
 /* Helper to uncompress NH UDP */
-static u8_t *uncompress_nh_udp(u8_t nhc, u8_t *cursor,
+static uint8_t *uncompress_nh_udp(uint8_t nhc, uint8_t *cursor,
 				      struct net_udp_hdr *udp)
 {
 
@@ -1247,7 +1247,7 @@ static u8_t *uncompress_nh_udp(u8_t nhc, u8_t *cursor,
 
 		memmove(&udp->src_port, cursor, sizeof(udp->src_port));
 		cursor += sizeof(udp->src_port);
-		udp->dst_port = htons(((u16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) |
+		udp->dst_port = htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) |
 				*cursor);
 		cursor++;
 
@@ -1255,7 +1255,7 @@ static u8_t *uncompress_nh_udp(u8_t nhc, u8_t *cursor,
 	case NET_6LO_NHC_UDP_PORT_10:
 		NET_DBG("src 8 bits, dst full inlined");
 
-		udp->src_port = htons(((u16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) |
+		udp->src_port = htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) |
 				*cursor);
 		cursor++;
 		memmove(&udp->dst_port, cursor, sizeof(udp->dst_port));
@@ -1285,11 +1285,11 @@ static u8_t *uncompress_nh_udp(u8_t nhc, u8_t *cursor,
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
 /* Helper function to uncompress src and dst contexts */
-static inline void uncompress_cid(struct net_pkt *pkt, u8_t cid,
+static inline void uncompress_cid(struct net_pkt *pkt, uint8_t cid,
 				  struct net_6lo_context **src,
 				  struct net_6lo_context **dst)
 {
-	u8_t cid_tmp;
+	uint8_t cid_tmp;
 
 	/* Extract source and destination Context Index,
 	 * Either src or dest address is context based or both.
@@ -1312,20 +1312,20 @@ static bool uncompress_IPHC_header(struct net_pkt *pkt)
 {
 	struct net_udp_hdr *udp = NULL;
 	struct net_buf *frag = NULL;
-	u8_t nhc = 0;
+	uint8_t nhc = 0;
 	int nhc_inline_size = 0;
 	struct net_ipv6_hdr *ipv6;
-	u16_t len;
-	u16_t iphc;
+	uint16_t len;
+	uint16_t iphc;
 	int inline_size, compressed_hdr_size;
 	size_t diff;
-	u8_t *cursor;
+	uint8_t *cursor;
 #if defined(CONFIG_NET_6LO_CONTEXT)
 	struct net_6lo_context *src = NULL;
 	struct net_6lo_context *dst = NULL;
 #endif
 
-	iphc = ntohs(UNALIGNED_GET((u16_t *)pkt->buffer->data));
+	iphc = ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data));
 
 	inline_size = get_ihpc_inlined_size(iphc);
 	if (inline_size < 0) {
@@ -1343,8 +1343,8 @@ static bool uncompress_IPHC_header(struct net_pkt *pkt)
 		}
 
 		nhc_inline_size = get_udp_nhc_inlined_size(nhc);
-		compressed_hdr_size += sizeof(u8_t) + nhc_inline_size;
-		diff += sizeof(struct net_udp_hdr) - sizeof(u8_t) -
+		compressed_hdr_size += sizeof(uint8_t) + nhc_inline_size;
+		diff += sizeof(struct net_udp_hdr) - sizeof(uint8_t) -
 			nhc_inline_size;
 	}
 
@@ -1555,8 +1555,8 @@ bool net_6lo_uncompress(struct net_pkt *pkt)
 int net_6lo_uncompress_hdr_diff(struct net_pkt *pkt)
 {
 	int inline_size, compressed_hdr_size, nhc_inline_size, diff;
-	u16_t iphc;
-	u8_t nhc;
+	uint16_t iphc;
+	uint8_t nhc;
 
 	if (pkt->frags->data[0] == NET_6LO_DISPATCH_IPV6) {
 		return -1;
@@ -1567,7 +1567,7 @@ int net_6lo_uncompress_hdr_diff(struct net_pkt *pkt)
 		return 0;
 	}
 
-	iphc = ntohs(UNALIGNED_GET((u16_t *)pkt->buffer->data));
+	iphc = ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data));
 
 	inline_size = get_ihpc_inlined_size(iphc);
 	if (inline_size < 0) {
@@ -1585,8 +1585,8 @@ int net_6lo_uncompress_hdr_diff(struct net_pkt *pkt)
 		}
 
 		nhc_inline_size = get_udp_nhc_inlined_size(nhc);
-		compressed_hdr_size += sizeof(u8_t) + nhc_inline_size;
-		diff += sizeof(struct net_udp_hdr) - sizeof(u8_t) -
+		compressed_hdr_size += sizeof(uint8_t) + nhc_inline_size;
+		diff += sizeof(struct net_udp_hdr) - sizeof(uint8_t) -
 			nhc_inline_size;
 	}
 
diff --git a/subsys/net/ip/connection.c b/subsys/net/ip/connection.c
index 81308a6275..82245d4c4e 100644
--- a/subsys/net/ip/connection.c
+++ b/subsys/net/ip/connection.c
@@ -62,7 +62,7 @@ static sys_slist_t conn_used;
 #if (CONFIG_NET_CONN_LOG_LEVEL >= LOG_LEVEL_DBG)
 static inline
 void conn_register_debug(struct net_conn *conn,
-			 u16_t remote_port, u16_t local_port)
+			 uint16_t remote_port, uint16_t local_port)
 {
 	char dst[NET_IPV6_ADDR_LEN];
 	char src[NET_IPV6_ADDR_LEN];
@@ -142,11 +142,11 @@ static void conn_set_unused(struct net_conn *conn)
 }
 
 /* Check if we already have identical connection handler installed. */
-static struct net_conn *conn_find_handler(u16_t proto, u8_t family,
+static struct net_conn *conn_find_handler(uint16_t proto, uint8_t family,
 					  const struct sockaddr *remote_addr,
 					  const struct sockaddr *local_addr,
-					  u16_t remote_port,
-					  u16_t local_port)
+					  uint16_t remote_port,
+					  uint16_t local_port)
 {
 	struct net_conn *conn;
 
@@ -239,17 +239,17 @@ static struct net_conn *conn_find_handler(u16_t proto, u8_t family,
 	return NULL;
 }
 
-int net_conn_register(u16_t proto, u8_t family,
+int net_conn_register(uint16_t proto, uint8_t family,
 		      const struct sockaddr *remote_addr,
 		      const struct sockaddr *local_addr,
-		      u16_t remote_port,
-		      u16_t local_port,
+		      uint16_t remote_port,
+		      uint16_t local_port,
 		      net_conn_cb_t cb,
 		      void *user_data,
 		      struct net_conn_handle **handle)
 {
 	struct net_conn *conn;
-	u8_t flags = 0U;
+	uint8_t flags = 0U;
 
 	conn = conn_find_handler(proto, family, remote_addr, local_addr,
 				 remote_port, local_port);
@@ -470,8 +470,8 @@ static inline void conn_send_icmp_error(struct net_pkt *pkt)
 
 static bool conn_are_end_points_valid(struct net_pkt *pkt,
 				      union net_ip_header *ip_hdr,
-				      u16_t src_port,
-				      u16_t dst_port)
+				      uint16_t src_port,
+				      uint16_t dst_port)
 {
 	bool my_src_addr = false;
 
@@ -506,16 +506,16 @@ static bool conn_are_end_points_valid(struct net_pkt *pkt,
 
 enum net_verdict net_conn_input(struct net_pkt *pkt,
 				union net_ip_header *ip_hdr,
-				u8_t proto,
+				uint8_t proto,
 				union net_proto_header *proto_hdr)
 {
 	struct net_if *pkt_iface = net_pkt_iface(pkt);
 	struct net_conn *best_match = NULL;
 	bool is_mcast_pkt = false, mcast_pkt_delivered = false;
-	s16_t best_rank = -1;
+	int16_t best_rank = -1;
 	struct net_conn *conn;
-	u16_t src_port;
-	u16_t dst_port;
+	uint16_t src_port;
+	uint16_t dst_port;
 
 	if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) {
 		src_port = proto_hdr->udp->src_port;
diff --git a/subsys/net/ip/connection.h b/subsys/net/ip/connection.h
index 31004fb90b..4cb30f42df 100644
--- a/subsys/net/ip/connection.h
+++ b/subsys/net/ip/connection.h
@@ -63,13 +63,13 @@ struct net_conn {
 	void *user_data;
 
 	/** Connection protocol */
-	u16_t proto;
+	uint16_t proto;
 
 	/** Protocol family */
-	u8_t family;
+	uint8_t family;
 
 	/** Flags for the connection */
-	u8_t flags;
+	uint8_t flags;
 };
 
 /**
@@ -89,20 +89,20 @@ struct net_conn {
  * @return Return 0 if the registration succeed, <0 otherwise.
  */
 #if defined(CONFIG_NET_NATIVE)
-int net_conn_register(u16_t proto, u8_t family,
+int net_conn_register(uint16_t proto, uint8_t family,
 		      const struct sockaddr *remote_addr,
 		      const struct sockaddr *local_addr,
-		      u16_t remote_port,
-		      u16_t local_port,
+		      uint16_t remote_port,
+		      uint16_t local_port,
 		      net_conn_cb_t cb,
 		      void *user_data,
 		      struct net_conn_handle **handle);
 #else
-static inline int net_conn_register(u16_t proto, u8_t family,
+static inline int net_conn_register(uint16_t proto, uint8_t family,
 				    const struct sockaddr *remote_addr,
 				    const struct sockaddr *local_addr,
-				    u16_t remote_port,
-				    u16_t local_port,
+				    uint16_t remote_port,
+				    uint16_t local_port,
 				    net_conn_cb_t cb,
 				    void *user_data,
 				    struct net_conn_handle **handle)
@@ -167,12 +167,12 @@ int net_conn_change_callback(struct net_conn_handle *handle,
 	defined(CONFIG_NET_SOCKETS_PACKET) || defined(CONFIG_NET_SOCKETS_CAN)
 enum net_verdict net_conn_input(struct net_pkt *pkt,
 				union net_ip_header *ip_hdr,
-				u8_t proto,
+				uint8_t proto,
 				union net_proto_header *proto_hdr);
 #else
 static inline enum net_verdict net_conn_input(struct net_pkt *pkt,
 					      union net_ip_header *ip_hdr,
-					      u8_t proto,
+					      uint8_t proto,
 					      union net_proto_header *proto_hdr)
 {
 	return NET_DROP;
diff --git a/subsys/net/ip/dhcpv4.c b/subsys/net/ip/dhcpv4.c
index 58268662aa..54ff9bea2f 100644
--- a/subsys/net/ip/dhcpv4.c
+++ b/subsys/net/ip/dhcpv4.c
@@ -37,7 +37,7 @@ static struct k_delayed_work timeout_work;
 static struct net_mgmt_event_callback mgmt4_cb;
 
 /* RFC 1497 [17] */
-static const u8_t magic_cookie[4] = { 0x63, 0x82, 0x53, 0x63 };
+static const uint8_t magic_cookie[4] = { 0x63, 0x82, 0x53, 0x63 };
 
 static const char *dhcpv4_msg_type_name(enum dhcpv4_msg_type msg_type)
 	__attribute__((unused));
@@ -71,8 +71,8 @@ static inline bool dhcpv4_add_cookie(struct net_pkt *pkt)
 }
 
 /* Add a an option with the form OPTION LENGTH VALUE.  */
-static bool dhcpv4_add_option_length_value(struct net_pkt *pkt, u8_t option,
-					   u8_t size, const void *value)
+static bool dhcpv4_add_option_length_value(struct net_pkt *pkt, uint8_t option,
+					   uint8_t size, const void *value)
 {
 	if (net_pkt_write_u8(pkt, option) ||
 	    net_pkt_write_u8(pkt, size) ||
@@ -84,7 +84,7 @@ static bool dhcpv4_add_option_length_value(struct net_pkt *pkt, u8_t option,
 }
 
 /* Add DHCPv4 message type */
-static bool dhcpv4_add_msg_type(struct net_pkt *pkt, u8_t type)
+static bool dhcpv4_add_msg_type(struct net_pkt *pkt, uint8_t type)
 {
 	return dhcpv4_add_option_length_value(pkt, DHCPV4_OPTIONS_MSG_TYPE,
 					      1, &type);
@@ -95,7 +95,7 @@ static bool dhcpv4_add_msg_type(struct net_pkt *pkt, u8_t type)
  */
 static bool dhcpv4_add_req_options(struct net_pkt *pkt)
 {
-	static u8_t data[3] = { DHCPV4_OPTIONS_SUBNET_MASK,
+	static uint8_t data[3] = { DHCPV4_OPTIONS_SUBNET_MASK,
 				DHCPV4_OPTIONS_ROUTER,
 				DHCPV4_OPTIONS_DNS_SERVER };
 
@@ -157,7 +157,7 @@ static inline bool dhcpv4_add_sname(struct net_pkt *pkt)
 }
 
 /* Create DHCPv4 message and add options as per message type */
-static struct net_pkt *dhcpv4_create_message(struct net_if *iface, u8_t type,
+static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type,
 					     const struct in_addr *ciaddr,
 					     const struct in_addr *src_addr,
 					     const struct in_addr *server_addr,
@@ -276,7 +276,7 @@ fail:
 }
 
 /* Prepare DHCPv4 Message request and send it to peer */
-static u32_t dhcpv4_send_request(struct net_if *iface)
+static uint32_t dhcpv4_send_request(struct net_if *iface)
 {
 	const struct in_addr *server_addr = net_ipv4_broadcast_address();
 	const struct in_addr *ciaddr = NULL;
@@ -284,7 +284,7 @@ static u32_t dhcpv4_send_request(struct net_if *iface)
 	bool with_server_id = false;
 	bool with_requested_ip = false;
 	struct net_pkt *pkt;
-	u32_t timeout;
+	uint32_t timeout;
 
 	iface->config.dhcpv4.xid++;
 
@@ -361,10 +361,10 @@ fail:
 }
 
 /* Prepare DHCPv4 Discover message and broadcast it */
-static u32_t dhcpv4_send_discover(struct net_if *iface)
+static uint32_t dhcpv4_send_discover(struct net_if *iface)
 {
 	struct net_pkt *pkt;
-	u32_t timeout;
+	uint32_t timeout;
 
 	iface->config.dhcpv4.xid++;
 
@@ -402,7 +402,7 @@ fail:
 			DHCPV4_INITIAL_DELAY_MIN;
 }
 
-static void dhcpv4_update_timeout_work(u32_t timeout)
+static void dhcpv4_update_timeout_work(uint32_t timeout)
 {
 	if (!k_delayed_work_remaining_get(&timeout_work) ||
 	    (MSEC_PER_SEC * timeout) <
@@ -425,7 +425,7 @@ static void dhcpv4_enter_selecting(struct net_if *iface)
 		net_dhcpv4_state_name(iface->config.dhcpv4.state));
 }
 
-static bool dhcpv4_check_timeout(s64_t start, u32_t time, s64_t timeout)
+static bool dhcpv4_check_timeout(int64_t start, uint32_t time, int64_t timeout)
 {
 	start += MSEC_PER_SEC * time;
 	if (start < 0) {
@@ -439,14 +439,14 @@ static bool dhcpv4_check_timeout(s64_t start, u32_t time, s64_t timeout)
 	return true;
 }
 
-static bool dhcpv4_request_timedout(struct net_if *iface, s64_t timeout)
+static bool dhcpv4_request_timedout(struct net_if *iface, int64_t timeout)
 {
 	return dhcpv4_check_timeout(iface->config.dhcpv4.timer_start,
 				    iface->config.dhcpv4.request_time,
 				    timeout);
 }
 
-static bool dhcpv4_renewal_timedout(struct net_if *iface, s64_t timeout)
+static bool dhcpv4_renewal_timedout(struct net_if *iface, int64_t timeout)
 {
 	if (!dhcpv4_check_timeout(iface->config.dhcpv4.timer_start,
 				  iface->config.dhcpv4.renewal_time,
@@ -462,7 +462,7 @@ static bool dhcpv4_renewal_timedout(struct net_if *iface, s64_t timeout)
 	return true;
 }
 
-static bool dhcpv4_rebinding_timedout(struct net_if *iface, s64_t timeout)
+static bool dhcpv4_rebinding_timedout(struct net_if *iface, int64_t timeout)
 {
 	if (!dhcpv4_check_timeout(iface->config.dhcpv4.timer_start,
 				  iface->config.dhcpv4.rebinding_time,
@@ -490,8 +490,8 @@ static void dhcpv4_enter_requesting(struct net_if *iface)
 
 static void dhcpv4_enter_bound(struct net_if *iface)
 {
-	u32_t renewal_time;
-	u32_t rebinding_time;
+	uint32_t renewal_time;
+	uint32_t rebinding_time;
 
 	renewal_time = iface->config.dhcpv4.renewal_time;
 	if (!renewal_time) {
@@ -518,7 +518,7 @@ static void dhcpv4_enter_bound(struct net_if *iface)
 	dhcpv4_update_timeout_work(iface->config.dhcpv4.request_time);
 }
 
-static u32_t dhcph4_manage_timers(struct net_if *iface, s64_t timeout)
+static uint32_t dhcph4_manage_timers(struct net_if *iface, int64_t timeout)
 {
 	NET_DBG("iface %p state=%s", iface,
 		net_dhcpv4_state_name(iface->config.dhcpv4.state));
@@ -582,8 +582,8 @@ static u32_t dhcph4_manage_timers(struct net_if *iface, s64_t timeout)
 
 static void dhcpv4_timeout(struct k_work *work)
 {
-	u32_t timeout_update = UINT32_MAX - 1;
-	s64_t timeout = k_uptime_get();
+	uint32_t timeout_update = UINT32_MAX - 1;
+	int64_t timeout = k_uptime_get();
 	struct net_if_dhcpv4 *current, *next;
 
 	ARG_UNUSED(work);
@@ -592,7 +592,7 @@ static void dhcpv4_timeout(struct k_work *work)
 		struct net_if *iface = CONTAINER_OF(
 			CONTAINER_OF(current, struct net_if_config, dhcpv4),
 			struct net_if, config);
-		u32_t next_timeout;
+		uint32_t next_timeout;
 
 		next_timeout = dhcph4_manage_timers(iface, timeout);
 		if (next_timeout < timeout_update) {
@@ -615,9 +615,9 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt,
 				 struct net_if *iface,
 				 enum dhcpv4_msg_type *msg_type)
 {
-	u8_t cookie[4];
-	u8_t length;
-	u8_t type;
+	uint8_t cookie[4];
+	uint8_t length;
+	uint8_t type;
 
 	if (net_pkt_read(pkt, cookie, sizeof(cookie)) ||
 	    memcmp(magic_cookie, cookie, sizeof(magic_cookie))) {
@@ -806,7 +806,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt,
 				return false;
 			}
 
-			if (net_pkt_read_u8(pkt, (u8_t *)msg_type)) {
+			if (net_pkt_read_u8(pkt, (uint8_t *)msg_type)) {
 				NET_DBG("options_msg_type, read err");
 				return false;
 			}
@@ -1013,7 +1013,7 @@ static enum net_verdict net_dhcpv4_input(struct net_conn *conn,
 }
 
 static void dhcpv4_iface_event_handler(struct net_mgmt_event_callback *cb,
-				       u32_t mgmt_event, struct net_if *iface)
+				       uint32_t mgmt_event, struct net_if *iface)
 {
 	sys_snode_t *node = NULL;
 
@@ -1070,8 +1070,8 @@ const char *net_dhcpv4_state_name(enum net_dhcpv4_state state)
 
 void net_dhcpv4_start(struct net_if *iface)
 {
-	u32_t timeout;
-	u32_t entropy;
+	uint32_t timeout;
+	uint32_t entropy;
 
 	switch (iface->config.dhcpv4.state) {
 	case NET_DHCPV4_DISABLED:
diff --git a/subsys/net/ip/dhcpv4.h b/subsys/net/ip/dhcpv4.h
index 1828b14297..c4bd43b587 100644
--- a/subsys/net/ip/dhcpv4.h
+++ b/subsys/net/ip/dhcpv4.h
@@ -16,24 +16,24 @@
 #define __INTERNAL_DHCPV4_H
 
 struct dhcp_msg {
-	u8_t op;		/* Message type, 1:BOOTREQUEST, 2:BOOTREPLY */
-	u8_t htype;		/* Hardware Address Type */
-	u8_t hlen;		/* Hardware Address length */
-	u8_t hops;		/* used by relay agents when booting via relay
+	uint8_t op;		/* Message type, 1:BOOTREQUEST, 2:BOOTREPLY */
+	uint8_t htype;		/* Hardware Address Type */
+	uint8_t hlen;		/* Hardware Address length */
+	uint8_t hops;		/* used by relay agents when booting via relay
 				 * agent, client sets zero
 				 */
-	u32_t xid;		/* Transaction ID, random number */
-	u16_t secs;		/* Seconds elapsed since client began address
+	uint32_t xid;		/* Transaction ID, random number */
+	uint16_t secs;		/* Seconds elapsed since client began address
 				 * acquisition or renewal process
 				 */
-	u16_t flags;		/* Broadcast or Unicast */
-	u8_t ciaddr[4];		/* Client IP Address */
-	u8_t yiaddr[4];		/* your (client) IP address */
-	u8_t siaddr[4];		/* IP address of next server to use in bootstrap
+	uint16_t flags;		/* Broadcast or Unicast */
+	uint8_t ciaddr[4];		/* Client IP Address */
+	uint8_t yiaddr[4];		/* your (client) IP address */
+	uint8_t siaddr[4];		/* IP address of next server to use in bootstrap
 				 * returned in DHCPOFFER, DHCPACK by server
 				 */
-	u8_t giaddr[4];		/* Relat agent IP address */
-	u8_t chaddr[16];	/* Client hardware address */
+	uint8_t giaddr[4];		/* Relat agent IP address */
+	uint8_t chaddr[16];	/* Client hardware address */
 } __packed;
 
 #define SIZE_OF_SNAME		64
diff --git a/subsys/net/ip/icmpv4.c b/subsys/net/ip/icmpv4.c
index bc6ad388bd..06cf3d13ee 100644
--- a/subsys/net/ip/icmpv4.c
+++ b/subsys/net/ip/icmpv4.c
@@ -30,7 +30,7 @@ struct net_icmpv4_hdr_opts_data {
 	const struct in_addr *src;
 };
 
-static int icmpv4_create(struct net_pkt *pkt, u8_t icmp_type, u8_t icmp_code)
+static int icmpv4_create(struct net_pkt *pkt, uint8_t icmp_type, uint8_t icmp_code)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmpv4_access,
 					      struct net_icmp_hdr);
@@ -75,17 +75,17 @@ int net_icmpv4_finalize(struct net_pkt *pkt)
 /* Parse Record Route and add our own IP address based on
  * free entries.
  */
-static int icmpv4_update_record_route(u8_t *opt_data,
-				      u8_t opt_len,
+static int icmpv4_update_record_route(uint8_t *opt_data,
+				      uint8_t opt_len,
 				      struct net_pkt *reply,
 				      const struct in_addr *src)
 {
-	u8_t len = net_pkt_ipv4_opts_len(reply);
-	u8_t addr_len = sizeof(struct in_addr);
-	u8_t ptr_offset = 4U;
-	u8_t offset = 0U;
-	u8_t skip;
-	u8_t ptr;
+	uint8_t len = net_pkt_ipv4_opts_len(reply);
+	uint8_t addr_len = sizeof(struct in_addr);
+	uint8_t ptr_offset = 4U;
+	uint8_t offset = 0U;
+	uint8_t skip;
+	uint8_t ptr;
 
 	if (net_pkt_write_u8(reply, NET_IPV4_OPTS_RR)) {
 		goto drop;
@@ -183,20 +183,20 @@ drop:
  * Internet Timestamp. Timestamp value : 32-bit timestamp
  * in milliseconds since midnight UT.
  */
-static int icmpv4_update_time_stamp(u8_t *opt_data,
-				   u8_t opt_len,
+static int icmpv4_update_time_stamp(uint8_t *opt_data,
+				   uint8_t opt_len,
 				   struct net_pkt *reply,
 				   const struct in_addr *src)
 {
-	u8_t len = net_pkt_ipv4_opts_len(reply);
-	u8_t addr_len = sizeof(struct in_addr);
-	u8_t ptr_offset = 5U;
-	u8_t offset = 0U;
-	u8_t new_entry_len;
-	u8_t overflow;
-	u8_t flag;
-	u8_t skip;
-	u8_t ptr;
+	uint8_t len = net_pkt_ipv4_opts_len(reply);
+	uint8_t addr_len = sizeof(struct in_addr);
+	uint8_t ptr_offset = 5U;
+	uint8_t offset = 0U;
+	uint8_t new_entry_len;
+	uint8_t overflow;
+	uint8_t flag;
+	uint8_t skip;
+	uint8_t ptr;
 
 	if (net_pkt_write_u8(reply, NET_IPV4_OPTS_TS)) {
 		goto drop;
@@ -264,10 +264,10 @@ static int icmpv4_update_time_stamp(u8_t *opt_data,
 
 	switch (flag) {
 	case NET_IPV4_TS_OPT_TS_ONLY:
-		new_entry_len = sizeof(u32_t);
+		new_entry_len = sizeof(uint32_t);
 		break;
 	case NET_IPV4_TS_OPT_TS_ADDR:
-		new_entry_len = addr_len + sizeof(u32_t);
+		new_entry_len = addr_len + sizeof(uint32_t);
 		break;
 	case NET_IPV4_TS_OPT_TS_PRES: /* TODO */
 	default:
@@ -304,9 +304,9 @@ static int icmpv4_update_time_stamp(u8_t *opt_data,
 			goto drop;
 		}
 
-		len += sizeof(u32_t);
+		len += sizeof(uint32_t);
 
-		offset += sizeof(u32_t);
+		offset += sizeof(uint32_t);
 
 		break;
 	case NET_IPV4_TS_OPT_TS_ADDR:
@@ -320,9 +320,9 @@ static int icmpv4_update_time_stamp(u8_t *opt_data,
 			goto drop;
 		}
 
-		len += sizeof(u32_t);
+		len += sizeof(uint32_t);
 
-		offset += (addr_len + sizeof(u32_t));
+		offset += (addr_len + sizeof(uint32_t));
 
 		break;
 	}
@@ -343,9 +343,9 @@ drop:
 	return -EINVAL;
 }
 
-static int icmpv4_reply_to_options(u8_t opt_type,
-				   u8_t *opt_data,
-				   u8_t opt_len,
+static int icmpv4_reply_to_options(uint8_t opt_type,
+				   uint8_t *opt_data,
+				   uint8_t opt_len,
 				   void *user_data)
 {
 	struct net_icmpv4_hdr_opts_data *ud =
@@ -367,7 +367,7 @@ static int icmpv4_handle_header_options(struct net_pkt *pkt,
 					const struct in_addr *src)
 {
 	struct net_icmpv4_hdr_opts_data ud;
-	u8_t len;
+	uint8_t len;
 
 	ud.reply = reply;
 	ud.src = src;
@@ -380,7 +380,7 @@ static int icmpv4_handle_header_options(struct net_pkt *pkt,
 
 	/* IPv4 optional header part should ends in 32 bit boundary */
 	if (len % 4U != 0U) {
-		u8_t i = 4U - (len % 4U);
+		uint8_t i = 4U - (len % 4U);
 
 		if (net_pkt_memset(reply, NET_IPV4_OPTS_NOP, i)) {
 			return -EINVAL;
@@ -413,7 +413,7 @@ static enum net_verdict icmpv4_handle_echo_request(struct net_pkt *pkt,
 {
 	struct net_pkt *reply = NULL;
 	const struct in_addr *src;
-	s16_t payload_len;
+	int16_t payload_len;
 
 	/* If interface can not select src address based on dst addr
 	 * and src address is unspecified, drop the echo request.
@@ -496,8 +496,8 @@ drop:
 
 int net_icmpv4_send_echo_request(struct net_if *iface,
 				 struct in_addr *dst,
-				 u16_t identifier,
-				 u16_t sequence,
+				 uint16_t identifier,
+				 uint16_t sequence,
 				 const void *data,
 				 size_t data_size)
 {
@@ -569,7 +569,7 @@ drop:
 	return ret;
 }
 
-int net_icmpv4_send_error(struct net_pkt *orig, u8_t type, u8_t code)
+int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr);
 	int err = -EIO;
diff --git a/subsys/net/ip/icmpv4.h b/subsys/net/ip/icmpv4.h
index dae89c8fc5..44e54e2ae8 100644
--- a/subsys/net/ip/icmpv4.h
+++ b/subsys/net/ip/icmpv4.h
@@ -28,8 +28,8 @@
 #define NET_ICMPV4_UNUSED_LEN 4
 
 struct net_icmpv4_echo_req {
-	u16_t identifier;
-	u16_t sequence;
+	uint16_t identifier;
+	uint16_t sequence;
 } __packed;
 
 typedef enum net_verdict (*icmpv4_callback_handler_t)(
@@ -40,8 +40,8 @@ typedef enum net_verdict (*icmpv4_callback_handler_t)(
 struct net_icmpv4_handler {
 	sys_snode_t node;
 	icmpv4_callback_handler_t handler;
-	u8_t type;
-	u8_t code;
+	uint8_t type;
+	uint8_t code;
 };
 
 /**
@@ -51,7 +51,7 @@ struct net_icmpv4_handler {
  * @param code Code of the type of the error message.
  * @return Return 0 if the sending succeed, <0 otherwise.
  */
-int net_icmpv4_send_error(struct net_pkt *pkt, u8_t type, u8_t code);
+int net_icmpv4_send_error(struct net_pkt *pkt, uint8_t type, uint8_t code);
 
 /**
  * @brief Send ICMPv4 echo request message.
@@ -71,15 +71,15 @@ int net_icmpv4_send_error(struct net_pkt *pkt, u8_t type, u8_t code);
 #if defined(CONFIG_NET_NATIVE_IPV4)
 int net_icmpv4_send_echo_request(struct net_if *iface,
 				 struct in_addr *dst,
-				 u16_t identifier,
-				 u16_t sequence,
+				 uint16_t identifier,
+				 uint16_t sequence,
 				 const void *data,
 				 size_t data_size);
 #else
 static inline int net_icmpv4_send_echo_request(struct net_if *iface,
 					       struct in_addr *dst,
-					       u16_t identifier,
-					       u16_t sequence,
+					       uint16_t identifier,
+					       uint16_t sequence,
 					       const void *data,
 					       size_t data_size)
 {
diff --git a/subsys/net/ip/icmpv6.c b/subsys/net/ip/icmpv6.c
index 9464a3ed39..06ec320251 100644
--- a/subsys/net/ip/icmpv6.c
+++ b/subsys/net/ip/icmpv6.c
@@ -84,7 +84,7 @@ int net_icmpv6_finalize(struct net_pkt *pkt)
 	return net_pkt_set_data(pkt, &icmp_access);
 }
 
-int net_icmpv6_create(struct net_pkt *pkt, u8_t icmp_type, u8_t icmp_code)
+int net_icmpv6_create(struct net_pkt *pkt, uint8_t icmp_type, uint8_t icmp_code)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmp_access,
 					      struct net_icmp_hdr);
@@ -109,7 +109,7 @@ enum net_verdict icmpv6_handle_echo_request(struct net_pkt *pkt,
 {
 	struct net_pkt *reply = NULL;
 	const struct in6_addr *src;
-	s16_t payload_len;
+	int16_t payload_len;
 
 	ARG_UNUSED(icmp_hdr);
 
@@ -184,8 +184,8 @@ drop:
 	return NET_DROP;
 }
 
-int net_icmpv6_send_error(struct net_pkt *orig, u8_t type, u8_t code,
-			  u32_t param)
+int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code,
+			  uint32_t param)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr);
 	int err = -EIO;
@@ -296,8 +296,8 @@ drop_no_pkt:
 
 int net_icmpv6_send_echo_request(struct net_if *iface,
 				 struct in6_addr *dst,
-				 u16_t identifier,
-				 u16_t sequence,
+				 uint16_t identifier,
+				 uint16_t sequence,
 				 const void *data,
 				 size_t data_size)
 {
diff --git a/subsys/net/ip/icmpv6.h b/subsys/net/ip/icmpv6.h
index 02bf4d186d..8b1069f41a 100644
--- a/subsys/net/ip/icmpv6.h
+++ b/subsys/net/ip/icmpv6.h
@@ -20,72 +20,72 @@
 #include <net/net_pkt.h>
 
 struct net_icmpv6_ns_hdr {
-	u32_t reserved;
+	uint32_t reserved;
 	struct in6_addr tgt;
 } __packed;
 
 struct net_icmpv6_nd_opt_hdr {
-	u8_t type;
-	u8_t len;
+	uint8_t type;
+	uint8_t len;
 } __packed;
 
 struct net_icmpv6_na_hdr {
-	u8_t flags;
-	u8_t reserved[3];
+	uint8_t flags;
+	uint8_t reserved[3];
 	struct in6_addr tgt;
 } __packed;
 
 struct net_icmpv6_rs_hdr {
-	u32_t reserved;
+	uint32_t reserved;
 } __packed;
 
 struct net_icmpv6_ra_hdr {
-	u8_t cur_hop_limit;
-	u8_t flags;
-	u16_t router_lifetime;
-	u32_t reachable_time;
-	u32_t retrans_timer;
+	uint8_t cur_hop_limit;
+	uint8_t flags;
+	uint16_t router_lifetime;
+	uint32_t reachable_time;
+	uint32_t retrans_timer;
 } __packed;
 
 struct net_icmpv6_nd_opt_mtu {
-	u16_t reserved;
-	u32_t mtu;
+	uint16_t reserved;
+	uint32_t mtu;
 } __packed;
 
 struct net_icmpv6_nd_opt_prefix_info {
-	u8_t prefix_len;
-	u8_t flags;
-	u32_t valid_lifetime;
-	u32_t preferred_lifetime;
-	u32_t reserved;
+	uint8_t prefix_len;
+	uint8_t flags;
+	uint32_t valid_lifetime;
+	uint32_t preferred_lifetime;
+	uint32_t reserved;
 	struct in6_addr prefix;
 } __packed;
 
 struct net_icmpv6_nd_opt_6co {
-	u8_t context_len;
-	u8_t flag; /*res:3,c:1,cid:4 */
-	u16_t reserved;
-	u16_t lifetime;
+	uint8_t context_len;
+	uint8_t flag; /*res:3,c:1,cid:4 */
+	uint16_t reserved;
+	uint16_t lifetime;
 	struct in6_addr prefix;
 } __packed;
 
 struct net_icmpv6_echo_req {
-	u16_t identifier;
-	u16_t sequence;
+	uint16_t identifier;
+	uint16_t sequence;
 } __packed;
 
 struct net_icmpv6_mld_query {
-	u16_t max_response_code;
-	u16_t reserved;
+	uint16_t max_response_code;
+	uint16_t reserved;
 	struct in6_addr mcast_address;
-	u16_t flagg; /*S, QRV & QQIC */
-	u16_t num_sources;
+	uint16_t flagg; /*S, QRV & QQIC */
+	uint16_t num_sources;
 } __packed;
 
 struct net_icmpv6_mld_mcast_record {
-	u8_t record_type;
-	u8_t aux_data_len;
-	u16_t num_sources;
+	uint8_t record_type;
+	uint8_t aux_data_len;
+	uint16_t num_sources;
 	struct in6_addr mcast_address;
 } __packed;
 
@@ -152,8 +152,8 @@ const char *net_icmpv6_type2str(int icmpv6_type);
 struct net_icmpv6_handler {
 	sys_snode_t node;
 	icmpv6_callback_handler_t handler;
-	u8_t type;
-	u8_t code;
+	uint8_t type;
+	uint8_t code;
 };
 
 /**
@@ -166,8 +166,8 @@ struct net_icmpv6_handler {
  * what value to use.
  * @return Return 0 if the sending succeed, <0 otherwise.
  */
-int net_icmpv6_send_error(struct net_pkt *pkt, u8_t type, u8_t code,
-			  u32_t param);
+int net_icmpv6_send_error(struct net_pkt *pkt, uint8_t type, uint8_t code,
+			  uint32_t param);
 
 /**
  * @brief Send ICMPv6 echo request message.
@@ -187,15 +187,15 @@ int net_icmpv6_send_error(struct net_pkt *pkt, u8_t type, u8_t code,
 #if defined(CONFIG_NET_NATIVE_IPV6)
 int net_icmpv6_send_echo_request(struct net_if *iface,
 				 struct in6_addr *dst,
-				 u16_t identifier,
-				 u16_t sequence,
+				 uint16_t identifier,
+				 uint16_t sequence,
 				 const void *data,
 				 size_t data_size);
 #else
 static inline int net_icmpv6_send_echo_request(struct net_if *iface,
 					       struct in6_addr *dst,
-					       u16_t identifier,
-					       u16_t sequence,
+					       uint16_t identifier,
+					       uint16_t sequence,
 					       const void *data,
 					       size_t data_size)
 {
@@ -216,7 +216,7 @@ void net_icmpv6_unregister_handler(struct net_icmpv6_handler *handler);
 enum net_verdict net_icmpv6_input(struct net_pkt *pkt,
 				  struct net_ipv6_hdr *ip_hdr);
 
-int net_icmpv6_create(struct net_pkt *pkt, u8_t icmp_type, u8_t icmp_code);
+int net_icmpv6_create(struct net_pkt *pkt, uint8_t icmp_type, uint8_t icmp_code);
 int net_icmpv6_finalize(struct net_pkt *pkt);
 
 void net_icmpv6_init(void);
diff --git a/subsys/net/ip/ipv4.c b/subsys/net/ip/ipv4.c
index cfc41bedc4..877a30a3ae 100644
--- a/subsys/net/ip/ipv4.c
+++ b/subsys/net/ip/ipv4.c
@@ -63,7 +63,7 @@ int net_ipv4_create(struct net_pkt *pkt,
 	return net_pkt_set_data(pkt, &ipv4_access);
 }
 
-int net_ipv4_finalize(struct net_pkt *pkt, u8_t next_header_proto)
+int net_ipv4_finalize(struct net_pkt *pkt, uint8_t next_header_proto)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr);
 	struct net_ipv4_hdr *ipv4_hdr;
@@ -111,8 +111,8 @@ int net_ipv4_parse_hdr_options(struct net_pkt *pkt,
 			       void *user_data)
 {
 	struct net_pkt_cursor cur;
-	u8_t opt_data[NET_IPV4_HDR_OPTNS_MAX_LEN];
-	u8_t total_opts_len;
+	uint8_t opt_data[NET_IPV4_HDR_OPTNS_MAX_LEN];
+	uint8_t total_opts_len;
 
 	if (!cb) {
 		return -EINVAL;
@@ -128,8 +128,8 @@ int net_ipv4_parse_hdr_options(struct net_pkt *pkt,
 	total_opts_len = net_pkt_ipv4_opts_len(pkt);
 
 	while (total_opts_len) {
-		u8_t opt_len = 0U;
-		u8_t opt_type;
+		uint8_t opt_len = 0U;
+		uint8_t opt_type;
 
 		if (net_pkt_read_u8(pkt, &opt_type)) {
 			return -EINVAL;
@@ -206,8 +206,8 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt)
 	union net_proto_header proto_hdr;
 	struct net_ipv4_hdr *hdr;
 	union net_ip_header ip;
-	u8_t hdr_len;
-	u8_t opts_len;
+	uint8_t hdr_len;
+	uint8_t opts_len;
 	int pkt_len;
 
 	net_stats_update_ipv4_recv(net_pkt_iface(pkt));
diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h
index 5d91863da4..1640a861fa 100644
--- a/subsys/net/ip/ipv4.h
+++ b/subsys/net/ip/ipv4.h
@@ -73,10 +73,10 @@ static inline int net_ipv4_create(struct net_pkt *pkt,
  * @return 0 on success, negative errno otherwise.
  */
 #if defined(CONFIG_NET_NATIVE_IPV4)
-int net_ipv4_finalize(struct net_pkt *pkt, u8_t next_header_proto);
+int net_ipv4_finalize(struct net_pkt *pkt, uint8_t next_header_proto);
 #else
 static inline int net_ipv4_finalize(struct net_pkt *pkt,
-				    u8_t next_header_proto)
+				    uint8_t next_header_proto)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(next_header_proto);
@@ -99,9 +99,9 @@ static inline int net_ipv4_finalize(struct net_pkt *pkt,
  *
  * @return 0 on success, negative otherwise.
  */
-typedef int (*net_ipv4_parse_hdr_options_cb_t)(u8_t opt_type,
-					       u8_t *opt_data,
-					       u8_t opt_len,
+typedef int (*net_ipv4_parse_hdr_options_cb_t)(uint8_t opt_type,
+					       uint8_t *opt_data,
+					       uint8_t opt_len,
 					       void *user_data);
 
 /**
diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c
index a94ae17c7d..0b3f166602 100644
--- a/subsys/net/ip/ipv4_autoconf.c
+++ b/subsys/net/ip/ipv4_autoconf.c
@@ -124,7 +124,7 @@ enum net_verdict net_ipv4_autoconf_input(struct net_if *iface,
 	}
 
 	NET_DBG("Conflict detected from %s for %s, state %d",
-		log_strdup(net_sprint_ll_addr((u8_t *)&arp_hdr->src_hwaddr,
+		log_strdup(net_sprint_ll_addr((uint8_t *)&arp_hdr->src_hwaddr,
 					      arp_hdr->hwlen)),
 		log_strdup(net_sprint_ipv4_addr(&arp_hdr->dst_ipaddr)),
 		cfg->ipv4auto.state);
@@ -220,7 +220,7 @@ static void ipv4_autoconf_send(struct net_if_ipv4_autoconf *ipv4auto)
 	}
 }
 
-static u32_t ipv4_autoconf_get_timeout(struct net_if_ipv4_autoconf *ipv4auto)
+static uint32_t ipv4_autoconf_get_timeout(struct net_if_ipv4_autoconf *ipv4auto)
 {
 	switch (ipv4auto->state) {
 	case NET_IPV4_AUTOCONF_PROBE:
@@ -245,7 +245,7 @@ static u32_t ipv4_autoconf_get_timeout(struct net_if_ipv4_autoconf *ipv4auto)
 	return 0;
 }
 
-static void ipv4_autoconf_submit_work(u32_t timeout)
+static void ipv4_autoconf_submit_work(uint32_t timeout)
 {
 	if (!k_delayed_work_remaining_get(&ipv4auto_timer) ||
 	    timeout < k_delayed_work_remaining_get(&ipv4auto_timer)) {
@@ -257,7 +257,7 @@ static void ipv4_autoconf_submit_work(u32_t timeout)
 	}
 }
 
-static bool ipv4_autoconf_check_timeout(s64_t start, u32_t time, s64_t timeout)
+static bool ipv4_autoconf_check_timeout(int64_t start, uint32_t time, int64_t timeout)
 {
 	start += time;
 	if (start < 0) {
@@ -272,16 +272,16 @@ static bool ipv4_autoconf_check_timeout(s64_t start, u32_t time, s64_t timeout)
 }
 
 static bool ipv4_autoconf_timedout(struct net_if_ipv4_autoconf *ipv4auto,
-				   s64_t timeout)
+				   int64_t timeout)
 {
 	return ipv4_autoconf_check_timeout(ipv4auto->timer_start,
 					   ipv4auto->timer_timeout,
 					   timeout);
 }
 
-static u32_t ipv4_autoconf_manage_timeouts(
+static uint32_t ipv4_autoconf_manage_timeouts(
 	struct net_if_ipv4_autoconf *ipv4auto,
-	s64_t timeout)
+	int64_t timeout)
 {
 	if (ipv4_autoconf_timedout(ipv4auto, timeout)) {
 		ipv4_autoconf_send(ipv4auto);
@@ -294,15 +294,15 @@ static u32_t ipv4_autoconf_manage_timeouts(
 
 static void ipv4_autoconf_timeout(struct k_work *work)
 {
-	u32_t timeout_update = UINT32_MAX - 1;
-	s64_t timeout = k_uptime_get();
+	uint32_t timeout_update = UINT32_MAX - 1;
+	int64_t timeout = k_uptime_get();
 	struct net_if_ipv4_autoconf *current, *next;
 
 	ARG_UNUSED(work);
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&ipv4auto_ifaces, current, next,
 					  node) {
-		u32_t next_timeout;
+		uint32_t next_timeout;
 
 		next_timeout = ipv4_autoconf_manage_timeouts(current, timeout);
 		if (next_timeout < timeout_update) {
diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c
index 55cc65f714..fc54fa2e57 100644
--- a/subsys/net/ip/ipv6.c
+++ b/subsys/net/ip/ipv6.c
@@ -81,7 +81,7 @@ int net_ipv6_create(struct net_pkt *pkt,
 	return net_pkt_set_data(pkt, &ipv6_access);
 }
 
-int net_ipv6_finalize(struct net_pkt *pkt, u8_t next_header_proto)
+int net_ipv6_finalize(struct net_pkt *pkt, uint8_t next_header_proto)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr);
 	struct net_ipv6_hdr *ipv6_hdr;
@@ -124,8 +124,8 @@ int net_ipv6_finalize(struct net_pkt *pkt, u8_t next_header_proto)
 
 static inline bool ipv6_drop_on_unknown_option(struct net_pkt *pkt,
 					       struct net_ipv6_hdr *hdr,
-					       u8_t opt_type,
-					       u16_t length)
+					       uint8_t opt_type,
+					       uint16_t length)
 {
 	/* RFC 2460 chapter 4.2 tells how to handle the unknown
 	 * options by the two highest order bits of the option:
@@ -158,7 +158,7 @@ static inline bool ipv6_drop_on_unknown_option(struct net_pkt *pkt,
 	case 0x80:
 		net_icmpv6_send_error(pkt, NET_ICMPV6_PARAM_PROBLEM,
 				      NET_ICMPV6_PARAM_PROB_OPTION,
-				      (u32_t)length);
+				      (uint32_t)length);
 		break;
 	}
 
@@ -167,12 +167,12 @@ static inline bool ipv6_drop_on_unknown_option(struct net_pkt *pkt,
 
 static inline int ipv6_handle_ext_hdr_options(struct net_pkt *pkt,
 					      struct net_ipv6_hdr *hdr,
-					      u16_t pkt_len)
+					      uint16_t pkt_len)
 {
-	u16_t exthdr_len = 0U;
-	u16_t length = 0U;
+	uint16_t exthdr_len = 0U;
+	uint16_t length = 0U;
 
-	if (net_pkt_read_u8(pkt, (u8_t *)&exthdr_len)) {
+	if (net_pkt_read_u8(pkt, (uint8_t *)&exthdr_len)) {
 		return -ENOBUFS;
 	}
 
@@ -186,7 +186,7 @@ static inline int ipv6_handle_ext_hdr_options(struct net_pkt *pkt,
 	length += 2U;
 
 	while (length < exthdr_len) {
-		u8_t opt_type, opt_len;
+		uint8_t opt_type, opt_len;
 
 		/* Each extension option has type and length */
 		if (net_pkt_read_u8(pkt, &opt_type)) {
@@ -240,7 +240,7 @@ static inline int ipv6_handle_ext_hdr_options(struct net_pkt *pkt,
 #if defined(CONFIG_NET_ROUTE)
 static struct net_route_entry *add_route(struct net_if *iface,
 					 struct in6_addr *addr,
-					 u8_t prefix_len)
+					 uint8_t prefix_len)
 {
 	struct net_route_entry *route;
 
@@ -369,9 +369,9 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback)
 	NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
 	enum net_verdict verdict = NET_DROP;
 	int real_len = net_pkt_get_len(pkt);
-	u8_t ext_bitmap = 0U;
-	u16_t ext_len = 0U;
-	u8_t nexthdr, next_nexthdr, prev_hdr_offset;
+	uint8_t ext_bitmap = 0U;
+	uint16_t ext_len = 0U;
+	uint8_t nexthdr, next_nexthdr, prev_hdr_offset;
 	union net_proto_header proto_hdr;
 	struct net_ipv6_hdr *hdr;
 	union net_ip_header ip;
@@ -459,7 +459,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt, bool is_loopback)
 	net_pkt_acknowledge_data(pkt, &ipv6_access);
 
 	nexthdr = hdr->nexthdr;
-	prev_hdr_offset = (u8_t *)&hdr->nexthdr - (u8_t *)hdr;
+	prev_hdr_offset = (uint8_t *)&hdr->nexthdr - (uint8_t *)hdr;
 
 	while (!net_ipv6_is_nexthdr_upper_layer(nexthdr)) {
 		int exthdr_len;
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 843777a868..ded349c3d8 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -87,22 +87,22 @@ struct net_ipv6_nbr_data {
 	struct in6_addr addr;
 
 	/** Reachable timer. */
-	s64_t reachable;
+	int64_t reachable;
 
 	/** Reachable timeout */
-	s32_t reachable_timeout;
+	int32_t reachable_timeout;
 
 	/** Neighbor Solicitation reply timer */
-	s64_t send_ns;
+	int64_t send_ns;
 
 	/** State of the neighbor discovery */
 	enum net_ipv6_nbr_state state;
 
 	/** Link metric for the neighbor */
-	u16_t link_metric;
+	uint16_t link_metric;
 
 	/** How many times we have sent NS */
-	u8_t ns_count;
+	uint8_t ns_count;
 
 	/** Is the neighbor a router */
 	bool is_router;
@@ -111,7 +111,7 @@ struct net_ipv6_nbr_data {
 	/** Stale counter used to removed oldest nbr in STALE state,
 	 *  when table is full.
 	 */
-	u32_t stale_counter;
+	uint32_t stale_counter;
 #endif
 };
 
@@ -133,10 +133,10 @@ int net_ipv6_start_rs(struct net_if *iface);
 
 int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src,
 		     const struct in6_addr *dst, const struct in6_addr *tgt,
-		     u8_t flags);
+		     uint8_t flags);
 
 
-static inline bool net_ipv6_is_nexthdr_upper_layer(u8_t nexthdr)
+static inline bool net_ipv6_is_nexthdr_upper_layer(uint8_t nexthdr)
 {
 	return (nexthdr == IPPROTO_ICMPV6 || nexthdr == IPPROTO_UDP ||
 		nexthdr == IPPROTO_TCP);
@@ -180,10 +180,10 @@ static inline int net_ipv6_create(struct net_pkt *pkt,
  * @return 0 on success, negative errno otherwise.
  */
 #if defined(CONFIG_NET_NATIVE_IPV6)
-int net_ipv6_finalize(struct net_pkt *pkt, u8_t next_header_proto);
+int net_ipv6_finalize(struct net_pkt *pkt, uint8_t next_header_proto);
 #else
 static inline int net_ipv6_finalize(struct net_pkt *pkt,
-				    u8_t next_header_proto)
+				    uint8_t next_header_proto)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(next_header_proto);
@@ -278,7 +278,7 @@ static inline struct net_nbr *net_ipv6_nbr_lookup(struct net_if *iface,
  *
  * @return A valid pointer on a neighbor on success, NULL otherwise
  */
-struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, u8_t idx);
+struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, uint8_t idx);
 
 /**
  * @brief Look for a neighbor from it's link local address index
@@ -291,11 +291,11 @@ struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, u8_t idx);
  */
 #if defined(CONFIG_NET_IPV6_NBR_CACHE) && defined(CONFIG_NET_NATIVE_IPV6)
 struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface,
-					      u8_t idx);
+					      uint8_t idx);
 #else
 static inline
 struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface,
-					      u8_t idx)
+					      uint8_t idx)
 {
 	return NULL;
 }
@@ -408,7 +408,7 @@ struct net_ipv6_reassembly {
 	struct net_pkt *pkt[NET_IPV6_FRAGMENTS_MAX_PKT];
 
 	/** IPv6 fragment identification */
-	u32_t id;
+	uint32_t id;
 };
 
 /**
@@ -440,8 +440,8 @@ void net_ipv6_frag_foreach(net_ipv6_frag_cb_t cb, void *user_data);
  *
  * @return 0 on success, a negative errno otherwise.
  */
-int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, u16_t *next_hdr_off,
-			       u16_t *last_hdr_off);
+int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, uint16_t *next_hdr_off,
+			       uint16_t *last_hdr_off);
 
 /**
  * @brief Handles IPv6 fragmented packets.
@@ -455,12 +455,12 @@ int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, u16_t *next_hdr_off,
 #if defined(CONFIG_NET_IPV6_FRAGMENT) && defined(CONFIG_NET_NATIVE_IPV6)
 enum net_verdict net_ipv6_handle_fragment_hdr(struct net_pkt *pkt,
 					      struct net_ipv6_hdr *hdr,
-					      u8_t nexthdr);
+					      uint8_t nexthdr);
 #else
 static inline
 enum net_verdict net_ipv6_handle_fragment_hdr(struct net_pkt *pkt,
 					      struct net_ipv6_hdr *hdr,
-					      u8_t nexthdr)
+					      uint8_t nexthdr)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(hdr);
diff --git a/subsys/net/ip/ipv6_fragment.c b/subsys/net/ip/ipv6_fragment.c
index d86f5c3fea..59d963016b 100644
--- a/subsys/net/ip/ipv6_fragment.c
+++ b/subsys/net/ip/ipv6_fragment.c
@@ -45,14 +45,14 @@ static bool reassembly_init_done;
 static struct net_ipv6_reassembly
 reassembly[CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT];
 
-int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, u16_t *next_hdr_off,
-			       u16_t *last_hdr_off)
+int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, uint16_t *next_hdr_off,
+			       uint16_t *last_hdr_off)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr);
 	struct net_ipv6_hdr *hdr;
-	u8_t next_nexthdr;
-	u8_t nexthdr;
-	u16_t length;
+	uint8_t next_nexthdr;
+	uint8_t nexthdr;
+	uint16_t length;
 
 	if (!pkt || !pkt->frags || !next_hdr_off || !last_hdr_off) {
 		return -EINVAL;
@@ -84,7 +84,7 @@ int net_ipv6_find_last_ext_hdr(struct net_pkt *pkt, u16_t *next_hdr_off,
 		case NET_IPV6_NEXTHDR_DESTO:
 			length = 0U;
 
-			if (net_pkt_read_u8(pkt, (u8_t *)&length)) {
+			if (net_pkt_read_u8(pkt, (uint8_t *)&length)) {
 				goto fail;
 			}
 
@@ -119,7 +119,7 @@ fail:
 	return -EINVAL;
 }
 
-static struct net_ipv6_reassembly *reassembly_get(u32_t id,
+static struct net_ipv6_reassembly *reassembly_get(uint32_t id,
 						  struct in6_addr *src,
 						  struct in6_addr *dst)
 {
@@ -158,7 +158,7 @@ static struct net_ipv6_reassembly *reassembly_get(u32_t id,
 	return &reassembly[avail];
 }
 
-static bool reassembly_cancel(u32_t id,
+static bool reassembly_cancel(uint32_t id,
 			      struct in6_addr *src,
 			      struct in6_addr *dst)
 {
@@ -167,7 +167,7 @@ static bool reassembly_cancel(u32_t id,
 	NET_DBG("Cancel 0x%x", id);
 
 	for (i = 0; i < CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT; i++) {
-		s32_t remaining;
+		int32_t remaining;
 
 		if (reassembly[i].id != id ||
 		    !net_ipv6_addr_cmp(src, &reassembly[i].src) ||
@@ -233,7 +233,7 @@ static void reassemble_packet(struct net_ipv6_reassembly *reass)
 
 	struct net_pkt *pkt;
 	struct net_buf *last;
-	u8_t next_hdr;
+	uint8_t next_hdr;
 	int i, len;
 
 	k_delayed_work_cancel(&reass->timer);
@@ -365,7 +365,7 @@ void net_ipv6_frag_foreach(net_ipv6_frag_cb_t cb, void *user_data)
  */
 static bool fragment_verify(struct net_ipv6_reassembly *reass)
 {
-	u16_t offset;
+	uint16_t offset;
 	int i, prev_len;
 
 	prev_len = net_pkt_get_len(reass->pkt[0]);
@@ -425,13 +425,13 @@ static int shift_packets(struct net_ipv6_reassembly *reass, int pos)
 
 enum net_verdict net_ipv6_handle_fragment_hdr(struct net_pkt *pkt,
 					      struct net_ipv6_hdr *hdr,
-					      u8_t nexthdr)
+					      uint8_t nexthdr)
 {
 	struct net_ipv6_reassembly *reass = NULL;
-	u16_t flag;
+	uint16_t flag;
 	bool found;
-	u8_t more;
-	u32_t id;
+	uint8_t more;
+	uint32_t id;
 	int i;
 
 	if (!reassembly_init_done) {
@@ -562,14 +562,14 @@ drop:
 #define BUF_ALLOC_TIMEOUT K_MSEC(100)
 
 static int send_ipv6_fragment(struct net_pkt *pkt,
-			      u16_t fit_len,
-			      u16_t frag_offset,
-			      u16_t next_hdr_off,
-			      u8_t next_hdr,
+			      uint16_t fit_len,
+			      uint16_t frag_offset,
+			      uint16_t next_hdr_off,
+			      uint8_t next_hdr,
 			      bool final)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(frag_access, struct net_ipv6_frag_hdr);
-	u8_t frag_pkt_next_hdr = NET_IPV6_NEXTHDR_HBHO;
+	uint8_t frag_pkt_next_hdr = NET_IPV6_NEXTHDR_HBHO;
 	int ret = -ENOBUFS;
 	struct net_ipv6_frag_hdr *frag_hdr;
 	struct net_pkt *frag_pkt;
@@ -654,14 +654,14 @@ fail:
 }
 
 int net_ipv6_send_fragmented_pkt(struct net_if *iface, struct net_pkt *pkt,
-				 u16_t pkt_len)
+				 uint16_t pkt_len)
 {
-	u16_t next_hdr_off;
-	u16_t last_hdr_off;
-	u16_t frag_offset;
+	uint16_t next_hdr_off;
+	uint16_t last_hdr_off;
+	uint16_t frag_offset;
 	size_t length;
-	u8_t next_hdr;
-	u8_t last_hdr;
+	uint8_t next_hdr;
+	uint8_t last_hdr;
 	int fit_len;
 	int ret;
 
diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c
index c5be553bf7..48bd3d9c05 100644
--- a/subsys/net/ip/ipv6_mld.c
+++ b/subsys/net/ip/ipv6_mld.c
@@ -38,8 +38,8 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 static int mld_create(struct net_pkt *pkt,
 		      const struct in6_addr *addr,
-		      u8_t record_type,
-		      u16_t num_sources)
+		      uint8_t record_type,
+		      uint16_t num_sources)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(mld_access,
 				   struct net_icmpv6_mld_mcast_record);
@@ -73,7 +73,7 @@ static int mld_create(struct net_pkt *pkt,
 	return 0;
 }
 
-static int mld_create_packet(struct net_pkt *pkt, u16_t count)
+static int mld_create_packet(struct net_pkt *pkt, uint16_t count)
 {
 	struct in6_addr dst;
 
@@ -143,7 +143,7 @@ static int mld_send(struct net_pkt *pkt)
 
 static int mld_send_generic(struct net_if *iface,
 			    const struct in6_addr *addr,
-			    u8_t mode)
+			    uint8_t mode)
 {
 	struct net_pkt *pkt;
 	int ret;
@@ -302,9 +302,9 @@ static enum net_verdict handle_mld_query(struct net_pkt *pkt,
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(mld_access,
 					      struct net_icmpv6_mld_query);
-	u16_t length = net_pkt_get_len(pkt);
+	uint16_t length = net_pkt_get_len(pkt);
 	struct net_icmpv6_mld_query *mld_query;
-	u16_t pkt_len;
+	uint16_t pkt_len;
 
 	mld_query = (struct net_icmpv6_mld_query *)
 				net_pkt_get_data(pkt, &mld_access);
diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c
index 55ad4f7a6f..15a26a9dfd 100644
--- a/subsys/net/ip/ipv6_nbr.c
+++ b/subsys/net/ip/ipv6_nbr.c
@@ -61,7 +61,7 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
  * state will be removed from the table and new entry will be
  * added.
  */
-static u32_t stale_counter;
+static uint32_t stale_counter;
 
 static struct k_sem nbr_lock;
 #endif
@@ -69,7 +69,7 @@ static struct k_sem nbr_lock;
 #if defined(CONFIG_NET_IPV6_ND)
 static struct k_delayed_work ipv6_nd_reachable_timer;
 static void ipv6_nd_reachable_timeout(struct k_work *work);
-static void ipv6_nd_restart_reachable_timer(struct net_nbr *nbr, s64_t time);
+static void ipv6_nd_restart_reachable_timer(struct net_nbr *nbr, int64_t time);
 #endif
 
 #if defined(CONFIG_NET_IPV6_NBR_CACHE)
@@ -129,7 +129,7 @@ static inline struct net_nbr *get_nbr_from_data(struct net_ipv6_nbr_data *data)
 	for (i = 0; i < CONFIG_NET_IPV6_MAX_NEIGHBORS; i++) {
 		struct net_nbr *nbr = get_nbr(i);
 
-		if (nbr->data == (u8_t *)data) {
+		if (nbr->data == (uint8_t *)data) {
 			return nbr;
 		}
 	}
@@ -337,7 +337,7 @@ bool net_ipv6_nbr_rm(struct net_if *iface, struct in6_addr *addr)
 
 static void ipv6_ns_reply_timeout(struct k_work *work)
 {
-	s64_t current = k_uptime_get();
+	int64_t current = k_uptime_get();
 	struct net_nbr *nbr = NULL;
 	struct net_ipv6_nbr_data *data;
 	int i;
@@ -345,7 +345,7 @@ static void ipv6_ns_reply_timeout(struct k_work *work)
 	ARG_UNUSED(work);
 
 	for (i = 0; i < CONFIG_NET_IPV6_MAX_NEIGHBORS; i++) {
-		s64_t remaining;
+		int64_t remaining;
 		nbr = get_nbr(i);
 
 		if (!nbr || !nbr->ref) {
@@ -454,7 +454,7 @@ static void dbg_update_neighbor_lladdr(const struct net_linkaddr *new_lladdr,
 		log_strdup(out));
 }
 
-static void dbg_update_neighbor_lladdr_raw(u8_t *new_lladdr,
+static void dbg_update_neighbor_lladdr_raw(uint8_t *new_lladdr,
 				       struct net_linkaddr_storage *old_lladdr,
 				       struct in6_addr *addr)
 {
@@ -505,7 +505,7 @@ static void ipv6_nd_remove_old_stale_nbr(void)
 	struct net_nbr *nbr = NULL;
 	struct net_ipv6_nbr_data *data = NULL;
 	int nbr_idx = -1;
-	u32_t oldest = UINT32_MAX;
+	uint32_t oldest = UINT32_MAX;
 	int i;
 
 	k_sem_take(&nbr_lock, K_FOREVER);
@@ -662,7 +662,7 @@ void net_neighbor_table_clear(struct net_nbr_table *table)
 }
 
 struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface,
-					      u8_t idx)
+					      uint8_t idx)
 {
 	int i;
 
@@ -790,7 +790,7 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt)
 	 * contain a proper value and we can skip other checks.
 	 */
 	if (net_pkt_ipv6_fragment_id(pkt) == 0U) {
-		u16_t mtu = net_if_get_mtu(net_pkt_iface(pkt));
+		uint16_t mtu = net_if_get_mtu(net_pkt_iface(pkt));
 		size_t pkt_len = net_pkt_get_len(pkt);
 
 		mtu = MAX(NET_IPV6_MTU, mtu);
@@ -959,7 +959,7 @@ struct net_nbr *net_ipv6_nbr_lookup(struct net_if *iface,
 	return nbr_lookup(&net_neighbor.table, iface, addr);
 }
 
-struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, u8_t idx)
+struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, uint8_t idx)
 {
 	int i;
 
@@ -984,9 +984,9 @@ struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, u8_t idx)
 	return NULL;
 }
 
-static inline u8_t get_llao_len(struct net_if *iface)
+static inline uint8_t get_llao_len(struct net_if *iface)
 {
-	u8_t total_len = net_if_get_link_addr(iface)->len +
+	uint8_t total_len = net_if_get_link_addr(iface)->len +
 			 sizeof(struct net_icmpv6_nd_opt_hdr);
 
 	return ROUND_UP(total_len, 8U);
@@ -994,7 +994,7 @@ static inline u8_t get_llao_len(struct net_if *iface)
 
 static inline bool set_llao(struct net_pkt *pkt,
 			    struct net_linkaddr *lladdr,
-			    u8_t llao_len, u8_t type)
+			    uint8_t llao_len, uint8_t type)
 {
 	struct net_icmpv6_nd_opt_hdr opt_hdr = {
 		.type = type,
@@ -1012,10 +1012,10 @@ static inline bool set_llao(struct net_pkt *pkt,
 }
 
 static bool read_llao(struct net_pkt *pkt,
-		      u8_t len,
+		      uint8_t len,
 		      struct net_linkaddr_storage *llstorage)
 {
-	u8_t padding;
+	uint8_t padding;
 
 	llstorage->len = NET_LINK_ADDR_MAX_LENGTH;
 	if (net_pkt_lladdr_src(pkt)->len < llstorage->len) {
@@ -1038,14 +1038,14 @@ static bool read_llao(struct net_pkt *pkt,
 
 int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src,
 		     const struct in6_addr *dst, const struct in6_addr *tgt,
-		     u8_t flags)
+		     uint8_t flags)
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(na_access,
 					      struct net_icmpv6_na_hdr);
 	int ret = -ENOBUFS;
 	struct net_icmpv6_na_hdr *na_hdr;
 	struct net_pkt *pkt;
-	u8_t llao_len;
+	uint8_t llao_len;
 
 	llao_len = get_llao_len(iface);
 
@@ -1140,8 +1140,8 @@ static enum net_verdict handle_ns_input(struct net_pkt *pkt,
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ns_access,
 					      struct net_icmpv6_ns_hdr);
 	NET_PKT_DATA_ACCESS_DEFINE(nd_access, struct net_icmpv6_nd_opt_hdr);
-	u16_t length = net_pkt_get_len(pkt);
-	u8_t flags = 0U;
+	uint16_t length = net_pkt_get_len(pkt);
+	uint8_t flags = 0U;
 	bool routing = false;
 	struct net_icmpv6_nd_opt_hdr *nd_opt_hdr;
 	struct net_icmpv6_ns_hdr *ns_hdr;
@@ -1183,7 +1183,7 @@ static enum net_verdict handle_ns_input(struct net_pkt *pkt,
 
 	while (nd_opt_hdr && nd_opt_hdr->len > 0 &&
 	       net_pkt_ipv6_ext_opt_len(pkt) < length) {
-		u8_t prev_opt_len;
+		uint8_t prev_opt_len;
 
 		net_pkt_acknowledge_data(pkt, &nd_access);
 
@@ -1384,9 +1384,9 @@ drop:
 #endif /* CONFIG_NET_IPV6_NBR_CACHE */
 
 #if defined(CONFIG_NET_IPV6_ND)
-static void ipv6_nd_restart_reachable_timer(struct net_nbr *nbr, s64_t time)
+static void ipv6_nd_restart_reachable_timer(struct net_nbr *nbr, int64_t time)
 {
-	s64_t remaining;
+	int64_t remaining;
 
 	if (nbr) {
 		net_ipv6_nbr_data(nbr)->reachable = k_uptime_get();
@@ -1401,14 +1401,14 @@ static void ipv6_nd_restart_reachable_timer(struct net_nbr *nbr, s64_t time)
 
 static void ipv6_nd_reachable_timeout(struct k_work *work)
 {
-	s64_t current = k_uptime_get();
+	int64_t current = k_uptime_get();
 	struct net_nbr *nbr = NULL;
 	struct net_ipv6_nbr_data *data = NULL;
 	int ret;
 	int i;
 
 	for (i = 0; i < CONFIG_NET_IPV6_MAX_NEIGHBORS; i++) {
-		s64_t remaining;
+		int64_t remaining;
 
 		nbr = get_nbr(i);
 		if (!nbr || !nbr->ref) {
@@ -1509,7 +1509,7 @@ static void ipv6_nd_reachable_timeout(struct k_work *work)
 void net_ipv6_nbr_set_reachable_timer(struct net_if *iface,
 				      struct net_nbr *nbr)
 {
-	u32_t time;
+	uint32_t time;
 
 	time = net_if_ipv6_get_reachable_time(iface);
 
@@ -1525,7 +1525,7 @@ void net_ipv6_nbr_set_reachable_timer(struct net_if *iface,
 #if defined(CONFIG_NET_IPV6_NBR_CACHE)
 static inline bool handle_na_neighbor(struct net_pkt *pkt,
 				      struct net_icmpv6_na_hdr *na_hdr,
-				      u16_t tllao_offset)
+				      uint16_t tllao_offset)
 {
 	struct net_linkaddr_storage lladdr = { 0 };
 	bool lladdr_changed = false;
@@ -1706,8 +1706,8 @@ static enum net_verdict handle_na_input(struct net_pkt *pkt,
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(na_access,
 					      struct net_icmpv6_na_hdr);
 	NET_PKT_DATA_ACCESS_DEFINE(nd_access, struct net_icmpv6_nd_opt_hdr);
-	u16_t length = net_pkt_get_len(pkt);
-	u16_t tllao_offset = 0U;
+	uint16_t length = net_pkt_get_len(pkt);
+	uint16_t tllao_offset = 0U;
 	struct net_icmpv6_nd_opt_hdr *nd_opt_hdr;
 	struct net_icmpv6_na_hdr *na_hdr;
 	struct net_if_addr *ifaddr;
@@ -1745,7 +1745,7 @@ static enum net_verdict handle_na_input(struct net_pkt *pkt,
 
 	while (nd_opt_hdr && nd_opt_hdr->len &&
 	       net_pkt_ipv6_ext_opt_len(pkt) < length) {
-		u8_t prev_opt_len;
+		uint8_t prev_opt_len;
 
 		switch (nd_opt_hdr->type) {
 		case NET_ICMPV6_ND_OPT_TLLAO:
@@ -1823,7 +1823,7 @@ int net_ipv6_send_ns(struct net_if *iface,
 	struct net_icmpv6_ns_hdr *ns_hdr;
 	struct in6_addr node_dst;
 	struct net_nbr *nbr;
-	u8_t llao_len;
+	uint8_t llao_len;
 
 	if (!dst) {
 		net_ipv6_addr_create_solicited_node(tgt, &node_dst);
@@ -1953,7 +1953,7 @@ drop:
 #if defined(CONFIG_NET_IPV6_ND)
 int net_ipv6_send_rs(struct net_if *iface)
 {
-	u8_t llao_len = 0U;
+	uint8_t llao_len = 0U;
 	int ret = -ENOBUFS;
 	const struct in6_addr *src;
 	struct in6_addr dst;
@@ -2017,7 +2017,7 @@ int net_ipv6_start_rs(struct net_if *iface)
 	return net_ipv6_send_rs(iface);
 }
 
-static inline struct net_nbr *handle_ra_neighbor(struct net_pkt *pkt, u8_t len)
+static inline struct net_nbr *handle_ra_neighbor(struct net_pkt *pkt, uint8_t len)
 {
 	struct net_linkaddr lladdr;
 	struct net_linkaddr_storage llstorage;
@@ -2112,26 +2112,26 @@ static inline void handle_prefix_onlink(struct net_pkt *pkt,
 
 #define TWO_HOURS (2 * 60 * 60)
 
-static u32_t time_diff(u32_t time1, u32_t time2)
+static uint32_t time_diff(uint32_t time1, uint32_t time2)
 {
-	return (u32_t)abs((s32_t)time1 - (s32_t)time2);
+	return (uint32_t)abs((int32_t)time1 - (int32_t)time2);
 }
 
-static inline u32_t remaining_lifetime(struct net_if_addr *ifaddr)
+static inline uint32_t remaining_lifetime(struct net_if_addr *ifaddr)
 {
-	u64_t remaining;
+	uint64_t remaining;
 
 	if (ifaddr->lifetime.timer_timeout == 0) {
 		return 0;
 	}
 
-	remaining = (u64_t)ifaddr->lifetime.timer_timeout +
-		(u64_t)ifaddr->lifetime.wrap_counter *
-		(u64_t)NET_TIMEOUT_MAX_VALUE -
-		(u64_t)time_diff(k_uptime_get_32(),
+	remaining = (uint64_t)ifaddr->lifetime.timer_timeout +
+		(uint64_t)ifaddr->lifetime.wrap_counter *
+		(uint64_t)NET_TIMEOUT_MAX_VALUE -
+		(uint64_t)time_diff(k_uptime_get_32(),
 				 ifaddr->lifetime.timer_start);
 
-	return (u32_t)(remaining / MSEC_PER_SEC);
+	return (uint32_t)(remaining / MSEC_PER_SEC);
 }
 
 static inline void handle_prefix_autonomous(struct net_pkt *pkt,
@@ -2195,7 +2195,7 @@ static inline bool handle_ra_prefix(struct net_pkt *pkt)
 	NET_PKT_DATA_ACCESS_DEFINE(rapfx_access,
 				   struct net_icmpv6_nd_opt_prefix_info);
 	struct net_icmpv6_nd_opt_prefix_info *pfx_info;
-	u32_t valid_lifetime, preferred_lifetime;
+	uint32_t valid_lifetime, preferred_lifetime;
 
 	pfx_info = (struct net_icmpv6_nd_opt_prefix_info *)
 				net_pkt_get_data(pkt, &rapfx_access);
@@ -2226,7 +2226,7 @@ static inline bool handle_ra_prefix(struct net_pkt *pkt)
 
 #if defined(CONFIG_NET_6LO_CONTEXT)
 /* 6lowpan Context Option RFC 6775, 4.2 */
-static inline bool handle_ra_6co(struct net_pkt *pkt, u8_t len)
+static inline bool handle_ra_6co(struct net_pkt *pkt, uint8_t len)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(ctx_access, struct net_icmpv6_nd_opt_6co);
 	struct net_icmpv6_nd_opt_6co *context;
@@ -2272,13 +2272,13 @@ static enum net_verdict handle_ra_input(struct net_pkt *pkt,
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ra_access,
 					      struct net_icmpv6_ra_hdr);
 	NET_PKT_DATA_ACCESS_DEFINE(nd_access, struct net_icmpv6_nd_opt_hdr);
-	u16_t length = net_pkt_get_len(pkt);
+	uint16_t length = net_pkt_get_len(pkt);
 	struct net_nbr *nbr = NULL;
 	struct net_icmpv6_nd_opt_hdr *nd_opt_hdr;
 	struct net_icmpv6_ra_hdr *ra_hdr;
 	struct net_if_router *router;
-	u32_t mtu, reachable_time, retrans_timer;
-	u16_t router_lifetime;
+	uint32_t mtu, reachable_time, retrans_timer;
+	uint16_t router_lifetime;
 
 	ra_hdr = (struct net_icmpv6_ra_hdr *)net_pkt_get_data(pkt, &ra_access);
 	if (!ra_hdr) {
diff --git a/subsys/net/ip/nbr.c b/subsys/net/ip/nbr.c
index 59f998cb4a..02fca8ea58 100644
--- a/subsys/net/ip/nbr.c
+++ b/subsys/net/ip/nbr.c
@@ -61,7 +61,7 @@ static inline struct net_nbr *get_nbr(struct net_nbr *start, int idx)
 {
 	NET_ASSERT(idx < CONFIG_NET_IPV6_MAX_NEIGHBORS);
 
-	return (struct net_nbr *)((u8_t *)start +
+	return (struct net_nbr *)((uint8_t *)start +
 			((sizeof(struct net_nbr) +
 			  start->size + start->extra_data_size) * idx));
 }
@@ -177,7 +177,7 @@ struct net_nbr *net_nbr_lookup(struct net_nbr_table *table,
 	return NULL;
 }
 
-struct net_linkaddr_storage *net_nbr_get_lladdr(u8_t idx)
+struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx)
 {
 	NET_ASSERT(idx < CONFIG_NET_IPV6_MAX_NEIGHBORS,
 		   "idx %d >= max %d", idx,
diff --git a/subsys/net/ip/nbr.h b/subsys/net/ip/nbr.h
index 971877c383..8c6f1a78d8 100644
--- a/subsys/net/ip/nbr.h
+++ b/subsys/net/ip/nbr.h
@@ -31,7 +31,7 @@ struct net_nbr_lladdr {
 	struct net_linkaddr_storage lladdr;
 
 	/** Reference count. */
-	u8_t ref;
+	uint8_t ref;
 };
 
 #define NET_NBR_LLADDR_INIT(_name, _count)	\
@@ -45,25 +45,25 @@ struct net_nbr_lladdr {
  */
 struct net_nbr {
 	/** Reference count. */
-	u8_t ref;
+	uint8_t ref;
 
 	/** Link to ll address. This is the index into lladdr array.
 	 * The value NET_NBR_LLADDR_UNKNOWN tells that this neighbor
 	 * does not yet have lladdr linked to it.
 	 */
-	u8_t idx;
+	uint8_t idx;
 
 	/** Amount of data that this neighbor buffer can store. */
-	const u16_t size;
+	const uint16_t size;
 
 	/** Extra data size associated with this neighbor */
-	const u16_t extra_data_size;
+	const uint16_t extra_data_size;
 
 	/** Interface this neighbor is found */
 	struct net_if *iface;
 
 	/** Pointer to the start of data in the neighbor table. */
-	u8_t *data;
+	uint8_t *data;
 
 	/** Function to be called when the neighbor is removed. */
 	void (*const remove)(struct net_nbr *nbr);
@@ -71,15 +71,15 @@ struct net_nbr {
 	/** Start of the data storage. Not to be accessed directly
 	 *  (the data pointer should be used instead).
 	 */
-	u8_t __nbr[0] __net_nbr_align;
+	uint8_t __nbr[0] __net_nbr_align;
 };
 
 /* This is an array of struct net_nbr + some additional data */
 #define NET_NBR_POOL_INIT(_name, _count, _size, _remove, _extra_size)	\
 	struct {							\
 		struct net_nbr nbr;					\
-		u8_t data[ROUND_UP(_size, 4)] __net_nbr_align;	\
-		u8_t extra[ROUND_UP(_extra_size, 4)] __net_nbr_align;\
+		uint8_t data[ROUND_UP(_size, 4)] __net_nbr_align;	\
+		uint8_t extra[ROUND_UP(_extra_size, 4)] __net_nbr_align;\
 	} _name[_count] = {						\
 		[0 ... (_count - 1)] = { .nbr = {			\
 			.idx = NET_NBR_LLADDR_UNKNOWN,			\
@@ -96,7 +96,7 @@ struct net_nbr_table {
 	void (*const clear)(struct net_nbr_table *table);
 
 	/** Max number of neighbors in the pool */
-	const u16_t nbr_count;
+	const uint16_t nbr_count;
 };
 
 #define NET_NBR_LOCAL static
@@ -194,9 +194,9 @@ int net_nbr_unlink(struct net_nbr *nbr, struct net_linkaddr *lladdr);
  * @return Pointer to link layer address storage, NULL if not found
  */
 #if defined(CONFIG_NET_NATIVE)
-struct net_linkaddr_storage *net_nbr_get_lladdr(u8_t idx);
+struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx);
 #else
-static inline struct net_linkaddr_storage *net_nbr_get_lladdr(u8_t idx)
+static inline struct net_linkaddr_storage *net_nbr_get_lladdr(uint8_t idx)
 {
 	ARG_UNUSED(idx);
 
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index e24604c72c..836b03b0bb 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -59,7 +59,7 @@ static struct k_sem contexts_lock;
 
 #if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_TCP)
 static int check_used_port(enum net_ip_protocol ip_proto,
-			   u16_t local_port,
+			   uint16_t local_port,
 			   const struct sockaddr *local_addr)
 
 {
@@ -100,10 +100,10 @@ static int check_used_port(enum net_ip_protocol ip_proto,
 	return 0;
 }
 
-static u16_t find_available_port(struct net_context *context,
+static uint16_t find_available_port(struct net_context *context,
 				    const struct sockaddr *addr)
 {
-	u16_t local_port;
+	uint16_t local_port;
 
 	do {
 		local_port = sys_rand32_get() | 0x8000;
@@ -123,7 +123,7 @@ static u16_t find_available_port(struct net_context *context,
 
 int net_context_get(sa_family_t family,
 		    enum net_sock_type type,
-		    u16_t ip_proto,
+		    uint16_t ip_proto,
 		    struct net_context **context)
 {
 	int i, ret = -ENOENT;
@@ -884,7 +884,7 @@ int net_context_connect(struct net_context *context,
 {
 	struct sockaddr *laddr = NULL;
 	struct sockaddr local_addr __unused;
-	u16_t lport, rport;
+	uint16_t lport, rport;
 	int ret;
 
 	NET_ASSERT(addr);
@@ -1103,10 +1103,10 @@ static int get_context_priority(struct net_context *context,
 				void *value, size_t *len)
 {
 #if defined(CONFIG_NET_CONTEXT_PRIORITY)
-	*((u8_t *)value) = context->options.priority;
+	*((uint8_t *)value) = context->options.priority;
 
 	if (len) {
-		*len = sizeof(u8_t);
+		*len = sizeof(uint8_t);
 	}
 
 	return 0;
@@ -1222,7 +1222,7 @@ static int context_setup_udp_packet(struct net_context *context,
 				    socklen_t addrlen)
 {
 	int ret = -EINVAL;
-	u16_t dst_port = 0U;
+	uint16_t dst_port = 0U;
 
 	if (IS_ENABLED(CONFIG_NET_IPV6) &&
 	    net_context_get_family(context) == AF_INET6) {
@@ -1328,10 +1328,10 @@ static void set_pkt_txtime(struct net_pkt *pkt, const struct msghdr *msghdr)
 
 	for (cmsg = CMSG_FIRSTHDR(msghdr); cmsg != NULL;
 	     cmsg = CMSG_NXTHDR(msghdr, cmsg)) {
-		if (cmsg->cmsg_len == CMSG_LEN(sizeof(u64_t)) &&
+		if (cmsg->cmsg_len == CMSG_LEN(sizeof(uint64_t)) &&
 		    cmsg->cmsg_level == SOL_SOCKET &&
 		    cmsg->cmsg_type == SCM_TXTIME) {
-			u64_t txtime = *(u64_t *)CMSG_DATA(cmsg);
+			uint64_t txtime = *(uint64_t *)CMSG_DATA(cmsg);
 
 			net_pkt_set_txtime(pkt, txtime);
 			break;
@@ -1496,7 +1496,7 @@ static int context_sendto(struct net_context *context,
 	context->user_data = user_data;
 
 	if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
-		u8_t priority;
+		uint8_t priority;
 
 		get_context_priority(context, &priority, NULL);
 		net_pkt_set_priority(pkt, priority);
@@ -1763,7 +1763,7 @@ static int recv_udp(struct net_context *context,
 		.sa_family = net_context_get_family(context),
 	};
 	struct sockaddr *laddr = NULL;
-	u16_t lport = 0U;
+	uint16_t lport = 0U;
 	int ret;
 
 	ARG_UNUSED(timeout);
@@ -1984,7 +1984,7 @@ unlock:
 }
 
 int net_context_update_recv_wnd(struct net_context *context,
-				s32_t delta)
+				int32_t delta)
 {
 	int ret;
 
@@ -2006,11 +2006,11 @@ static int set_context_priority(struct net_context *context,
 				const void *value, size_t len)
 {
 #if defined(CONFIG_NET_CONTEXT_PRIORITY)
-	if (len > sizeof(u8_t)) {
+	if (len > sizeof(uint8_t)) {
 		return -EINVAL;
 	}
 
-	context->options.priority = *((u8_t *)value);
+	context->options.priority = *((uint8_t *)value);
 
 	return 0;
 #else
diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c
index bb50b254f7..dc6732f03f 100644
--- a/subsys/net/ip/net_core.c
+++ b/subsys/net/ip/net_core.c
@@ -355,8 +355,8 @@ static void process_rx_packet(struct k_work *work)
 
 static void net_queue_rx(struct net_if *iface, struct net_pkt *pkt)
 {
-	u8_t prio = net_pkt_priority(pkt);
-	u8_t tc = net_rx_priority2tc(prio);
+	uint8_t prio = net_pkt_priority(pkt);
+	uint8_t tc = net_rx_priority2tc(prio);
 
 	k_work_init(net_pkt_work(pkt), process_rx_packet);
 
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 1462e34628..6ba7a66cc5 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -156,10 +156,10 @@ static bool net_if_tx(struct net_if *iface, struct net_pkt *pkt)
 
 	/* Timestamp of the current network packet sent if enabled */
 	struct net_ptp_time start_timestamp;
-	u32_t curr_time = 0;
+	uint32_t curr_time = 0;
 
 	/* We collect send statistics for each socket priority if enabled */
-	u8_t pkt_priority;
+	uint8_t pkt_priority;
 
 	if (!pkt) {
 		return false;
@@ -276,8 +276,8 @@ static void process_tx_packet(struct k_work *work)
 
 void net_if_queue_tx(struct net_if *iface, struct net_pkt *pkt)
 {
-	u8_t prio = net_pkt_priority(pkt);
-	u8_t tc = net_tx_priority2tc(prio);
+	uint8_t prio = net_pkt_priority(pkt);
+	uint8_t tc = net_tx_priority2tc(prio);
 
 	k_work_init(net_pkt_work(pkt), process_tx_packet);
 
@@ -513,10 +513,10 @@ static enum net_l2_flags l2_flags_get(struct net_if *iface)
 
 #if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)
 /* Return how many bits are shared between two IP addresses */
-static u8_t get_ipaddr_diff(const u8_t *src, const u8_t *dst, int addr_len)
+static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_len)
 {
-	u8_t j, k, xor;
-	u8_t len = 0U;
+	uint8_t j, k, xor;
+	uint8_t len = 0U;
 
 	for (j = 0U; j < addr_len; j++) {
 		if (src[j] == dst[j]) {
@@ -539,7 +539,7 @@ static u8_t get_ipaddr_diff(const u8_t *src, const u8_t *dst, int addr_len)
 }
 
 static struct net_if_router *iface_router_lookup(struct net_if *iface,
-						 u8_t family, void *addr)
+						 uint8_t family, void *addr)
 {
 	int i;
 
@@ -592,10 +592,10 @@ static void iface_router_notify_deletion(struct net_if_router *router,
 }
 
 
-static void iface_router_run_timer(u32_t current_time)
+static void iface_router_run_timer(uint32_t current_time)
 {
 	struct net_if_router *router, *next;
-	u32_t new_timer = UINT_MAX;
+	uint32_t new_timer = UINT_MAX;
 
 	if (k_delayed_work_remaining_get(&router_timer)) {
 		k_delayed_work_cancel(&router_timer);
@@ -603,7 +603,7 @@ static void iface_router_run_timer(u32_t current_time)
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&active_router_timers,
 					 router, next, node) {
-		u32_t current_timer = router->life_start +
+		uint32_t current_timer = router->life_start +
 			(MSEC_PER_SEC * router->lifetime) - current_time;
 
 		new_timer = MIN(current_timer, new_timer);
@@ -616,7 +616,7 @@ static void iface_router_run_timer(u32_t current_time)
 
 static void iface_router_expired(struct k_work *work)
 {
-	u32_t current_time = k_uptime_get_32();
+	uint32_t current_time = k_uptime_get_32();
 	struct net_if_router *router, *next;
 	sys_snode_t *prev_node = NULL;
 
@@ -625,7 +625,7 @@ static void iface_router_expired(struct k_work *work)
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&active_router_timers,
 					  router, next, node) {
 
-		if ((s32_t)(router->life_start +
+		if ((int32_t)(router->life_start +
 			    (MSEC_PER_SEC * router->lifetime) -
 			    current_time) > 0) {
 			/* We have to loop on all active routers as their
@@ -645,9 +645,9 @@ static void iface_router_expired(struct k_work *work)
 }
 
 static struct net_if_router *iface_router_add(struct net_if *iface,
-					      u8_t family, void *addr,
+					      uint8_t family, void *addr,
 					      bool is_default,
-					      u16_t lifetime)
+					      uint16_t lifetime)
 {
 	int i;
 
@@ -731,7 +731,7 @@ static bool iface_router_rm(struct net_if_router *router)
 }
 
 static struct net_if_router *iface_router_find_default(struct net_if *iface,
-						       u8_t family, void *addr)
+						       uint8_t family, void *addr)
 {
 	int i;
 
@@ -892,7 +892,7 @@ static void join_mcast_nodes(struct net_if *iface, struct in6_addr *addr)
 
 static void dad_timeout(struct k_work *work)
 {
-	u32_t current_time = k_uptime_get_32();
+	uint32_t current_time = k_uptime_get_32();
 	struct net_if_addr *ifaddr, *next;
 
 	ARG_UNUSED(work);
@@ -902,7 +902,7 @@ static void dad_timeout(struct k_work *work)
 		struct net_if_addr *tmp;
 		struct net_if *iface;
 
-		if ((s32_t)(ifaddr->dad_start +
+		if ((int32_t)(ifaddr->dad_start +
 			    DAD_TIMEOUT - current_time) > 0) {
 			break;
 		}
@@ -1059,7 +1059,7 @@ static inline void net_if_ipv6_start_dad(struct net_if *iface,
 
 static void rs_timeout(struct k_work *work)
 {
-	u32_t current_time = k_uptime_get_32();
+	uint32_t current_time = k_uptime_get_32();
 	struct net_if_ipv6 *ipv6, *next;
 
 	ARG_UNUSED(work);
@@ -1068,7 +1068,7 @@ static void rs_timeout(struct k_work *work)
 					  ipv6, next, rs_node) {
 		struct net_if *iface;
 
-		if ((s32_t)(ipv6->rs_start + RS_TIMEOUT - current_time) > 0) {
+		if ((int32_t)(ipv6->rs_start + RS_TIMEOUT - current_time) > 0) {
 			break;
 		}
 
@@ -1238,14 +1238,14 @@ static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index(
 #include <syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
 #endif
 
-static bool check_timeout(u32_t start, s32_t timeout, u32_t counter,
-			  u32_t current_time)
+static bool check_timeout(uint32_t start, int32_t timeout, uint32_t counter,
+			  uint32_t current_time)
 {
 	if (counter > 0) {
 		return false;
 	}
 
-	if ((s32_t)((start + (u32_t)timeout) - current_time) > 0) {
+	if ((int32_t)((start + (uint32_t)timeout) - current_time) > 0) {
 		return false;
 	}
 
@@ -1266,7 +1266,7 @@ static void address_expired(struct net_if_addr *ifaddr)
 }
 
 static bool address_manage_timeout(struct net_if_addr *ifaddr,
-				   u32_t current_time, u32_t *next_wakeup)
+				   uint32_t current_time, uint32_t *next_wakeup)
 {
 	if (check_timeout(ifaddr->lifetime.timer_start,
 			  ifaddr->lifetime.timer_timeout,
@@ -1292,8 +1292,8 @@ static bool address_manage_timeout(struct net_if_addr *ifaddr,
 
 static void address_lifetime_timeout(struct k_work *work)
 {
-	u64_t timeout_update = UINT64_MAX;
-	u32_t current_time = k_uptime_get_32();
+	uint64_t timeout_update = UINT64_MAX;
+	uint32_t current_time = k_uptime_get_32();
 	bool found = false;
 	struct net_if_addr *current, *next;
 
@@ -1301,7 +1301,7 @@ static void address_lifetime_timeout(struct k_work *work)
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&active_address_lifetime_timers,
 					  current, next, lifetime.node) {
-		u32_t next_timeout;
+		uint32_t next_timeout;
 		bool is_timeout;
 
 		is_timeout = address_manage_timeout(current, current_time,
@@ -1319,14 +1319,14 @@ static void address_lifetime_timeout(struct k_work *work)
 	}
 
 	if (found) {
-		/* If we are near upper limit of s32_t timeout, then lower it
+		/* If we are near upper limit of int32_t timeout, then lower it
 		 * a bit so that kernel timeout variable will not overflow.
 		 */
 		if (timeout_update >= NET_TIMEOUT_MAX_VALUE) {
 			timeout_update = NET_TIMEOUT_MAX_VALUE;
 		}
 
-		NET_DBG("Waiting for %d ms", (s32_t)timeout_update);
+		NET_DBG("Waiting for %d ms", (int32_t)timeout_update);
 
 		k_delayed_work_submit(&address_lifetime_timer,
 				      K_MSEC(timeout_update));
@@ -1342,7 +1342,7 @@ void net_address_lifetime_timeout(void)
 
 static void address_submit_work(struct net_if_addr *ifaddr)
 {
-	s32_t remaining;
+	int32_t remaining;
 
 	remaining = k_delayed_work_remaining_get(&address_lifetime_timer);
 	if (!remaining || (ifaddr->lifetime.wrap_counter == 0 &&
@@ -1362,25 +1362,25 @@ static void address_submit_work(struct net_if_addr *ifaddr)
 	}
 }
 
-static void address_start_timer(struct net_if_addr *ifaddr, u32_t vlifetime)
+static void address_start_timer(struct net_if_addr *ifaddr, uint32_t vlifetime)
 {
-	u64_t expire_timeout = (u64_t)MSEC_PER_SEC * (u64_t)vlifetime;
+	uint64_t expire_timeout = (uint64_t)MSEC_PER_SEC * (uint64_t)vlifetime;
 
 	sys_slist_append(&active_address_lifetime_timers,
 			 &ifaddr->lifetime.node);
 
 	ifaddr->lifetime.timer_start = k_uptime_get_32();
 	ifaddr->lifetime.wrap_counter = expire_timeout /
-		(u64_t)NET_TIMEOUT_MAX_VALUE;
+		(uint64_t)NET_TIMEOUT_MAX_VALUE;
 	ifaddr->lifetime.timer_timeout = expire_timeout -
-		(u64_t)NET_TIMEOUT_MAX_VALUE *
-		(u64_t)ifaddr->lifetime.wrap_counter;
+		(uint64_t)NET_TIMEOUT_MAX_VALUE *
+		(uint64_t)ifaddr->lifetime.wrap_counter;
 
 	address_submit_work(ifaddr);
 }
 
 void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr,
-				      u32_t vlifetime)
+				      uint32_t vlifetime)
 {
 	NET_DBG("Updating expire time of %s by %u secs",
 		log_strdup(net_sprint_ipv6_addr(&ifaddr->address.in6_addr)),
@@ -1415,7 +1415,7 @@ static struct net_if_addr *ipv6_addr_find(struct net_if *iface,
 static inline void net_if_addr_init(struct net_if_addr *ifaddr,
 				    struct in6_addr *addr,
 				    enum net_addr_type addr_type,
-				    u32_t vlifetime)
+				    uint32_t vlifetime)
 {
 	ifaddr->is_used = true;
 	ifaddr->address.family = AF_INET6;
@@ -1440,7 +1440,7 @@ static inline void net_if_addr_init(struct net_if_addr *ifaddr,
 struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,
 					 struct in6_addr *addr,
 					 enum net_addr_type addr_type,
-					 u32_t vlifetime)
+					 uint32_t vlifetime)
 {
 	struct net_if_addr *ifaddr;
 	struct net_if_ipv6 *ipv6;
@@ -1558,7 +1558,7 @@ bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr)
 bool z_impl_net_if_ipv6_addr_add_by_index(int index,
 					  struct in6_addr *addr,
 					  enum net_addr_type addr_type,
-					  u32_t vlifetime)
+					  uint32_t vlifetime)
 {
 	struct net_if *iface;
 
@@ -1575,7 +1575,7 @@ bool z_impl_net_if_ipv6_addr_add_by_index(int index,
 bool z_vrfy_net_if_ipv6_addr_add_by_index(int index,
 					  struct in6_addr *addr,
 					  enum net_addr_type addr_type,
-					  u32_t vlifetime)
+					  uint32_t vlifetime)
 {
 #if defined(CONFIG_NET_IF_USERSPACE_ACCESS)
 	struct in6_addr addr_v6;
@@ -1769,7 +1769,7 @@ void net_if_mcast_monitor(struct net_if *iface,
 static void remove_prefix_addresses(struct net_if *iface,
 				    struct net_if_ipv6 *ipv6,
 				    struct in6_addr *addr,
-				    u8_t len)
+				    uint8_t len)
 {
 	int i;
 
@@ -1828,7 +1828,7 @@ static void prefix_timer_remove(struct net_if_ipv6_prefix *ifprefix)
 }
 
 static bool prefix_manage_timeout(struct net_if_ipv6_prefix *ifprefix,
-				  u32_t current_time, u32_t *next_wakeup)
+				  uint32_t current_time, uint32_t *next_wakeup)
 {
 	if (check_timeout(ifprefix->lifetime.timer_start,
 			  ifprefix->lifetime.timer_timeout,
@@ -1853,8 +1853,8 @@ static bool prefix_manage_timeout(struct net_if_ipv6_prefix *ifprefix,
 
 static void prefix_lifetime_timeout(struct k_work *work)
 {
-	u64_t timeout_update = UINT64_MAX;
-	u32_t current_time = k_uptime_get_32();
+	uint64_t timeout_update = UINT64_MAX;
+	uint32_t current_time = k_uptime_get_32();
 	bool found = false;
 	struct net_if_ipv6_prefix *current, *next;
 
@@ -1862,7 +1862,7 @@ static void prefix_lifetime_timeout(struct k_work *work)
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&active_prefix_lifetime_timers,
 					  current, next, lifetime.node) {
-		u32_t next_timeout;
+		uint32_t next_timeout;
 		bool is_timeout;
 
 		is_timeout = prefix_manage_timeout(current, current_time,
@@ -1880,14 +1880,14 @@ static void prefix_lifetime_timeout(struct k_work *work)
 	}
 
 	if (found) {
-		/* If we are near upper limit of s32_t timeout, then lower it
+		/* If we are near upper limit of int32_t timeout, then lower it
 		 * a bit so that kernel timeout will not overflow.
 		 */
 		if (timeout_update >= NET_TIMEOUT_MAX_VALUE) {
 			timeout_update = NET_TIMEOUT_MAX_VALUE;
 		}
 
-		NET_DBG("Waiting for %d ms", (u32_t)timeout_update);
+		NET_DBG("Waiting for %d ms", (uint32_t)timeout_update);
 
 		k_delayed_work_submit(&prefix_lifetime_timer,
 				      K_MSEC(timeout_update));
@@ -1896,7 +1896,7 @@ static void prefix_lifetime_timeout(struct k_work *work)
 
 static void prefix_submit_work(struct net_if_ipv6_prefix *ifprefix)
 {
-	s32_t remaining;
+	int32_t remaining;
 
 	remaining = k_delayed_work_remaining_get(&prefix_lifetime_timer);
 	if (!remaining || (ifprefix->lifetime.wrap_counter == 0 &&
@@ -1917,9 +1917,9 @@ static void prefix_submit_work(struct net_if_ipv6_prefix *ifprefix)
 }
 
 static void prefix_start_timer(struct net_if_ipv6_prefix *ifprefix,
-			       u32_t lifetime)
+			       uint32_t lifetime)
 {
-	u64_t expire_timeout = (u64_t)MSEC_PER_SEC * (u64_t)lifetime;
+	uint64_t expire_timeout = (uint64_t)MSEC_PER_SEC * (uint64_t)lifetime;
 
 	(void)sys_slist_find_and_remove(&active_prefix_lifetime_timers,
 					&ifprefix->lifetime.node);
@@ -1928,17 +1928,17 @@ static void prefix_start_timer(struct net_if_ipv6_prefix *ifprefix,
 
 	ifprefix->lifetime.timer_start = k_uptime_get_32();
 	ifprefix->lifetime.wrap_counter = expire_timeout /
-		(u64_t)NET_TIMEOUT_MAX_VALUE;
+		(uint64_t)NET_TIMEOUT_MAX_VALUE;
 	ifprefix->lifetime.timer_timeout = expire_timeout -
-		(u64_t)NET_TIMEOUT_MAX_VALUE *
-		(u64_t)ifprefix->lifetime.wrap_counter;
+		(uint64_t)NET_TIMEOUT_MAX_VALUE *
+		(uint64_t)ifprefix->lifetime.wrap_counter;
 
 	prefix_submit_work(ifprefix);
 }
 
 static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface,
 						   struct in6_addr *prefix,
-						   u8_t prefix_len)
+						   uint8_t prefix_len)
 {
 	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
 	int i;
@@ -1963,8 +1963,8 @@ static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface,
 
 static void net_if_ipv6_prefix_init(struct net_if *iface,
 				    struct net_if_ipv6_prefix *ifprefix,
-				    struct in6_addr *addr, u8_t len,
-				    u32_t lifetime)
+				    struct in6_addr *addr, uint8_t len,
+				    uint32_t lifetime)
 {
 	ifprefix->is_used = true;
 	ifprefix->len = len;
@@ -1980,8 +1980,8 @@ static void net_if_ipv6_prefix_init(struct net_if *iface,
 
 struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,
 						  struct in6_addr *prefix,
-						  u8_t len,
-						  u32_t lifetime)
+						  uint8_t len,
+						  uint32_t lifetime)
 {
 	struct net_if_ipv6_prefix *ifprefix;
 	struct net_if_ipv6 *ipv6;
@@ -2022,7 +2022,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,
 }
 
 bool net_if_ipv6_prefix_rm(struct net_if *iface, struct in6_addr *addr,
-			   u8_t len)
+			   uint8_t len)
 {
 	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
 	int i;
@@ -2095,7 +2095,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface,
 
 struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface,
 						     struct in6_addr *addr,
-						     u8_t len)
+						     uint8_t len)
 {
 	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
 	int i;
@@ -2152,7 +2152,7 @@ bool net_if_ipv6_addr_onlink(struct net_if **iface, struct in6_addr *addr)
 }
 
 void net_if_ipv6_prefix_set_timer(struct net_if_ipv6_prefix *prefix,
-				  u32_t lifetime)
+				  uint32_t lifetime)
 {
 	/* No need to set a timer for infinite timeout */
 	if (lifetime == 0xffffffff) {
@@ -2186,7 +2186,7 @@ struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface,
 }
 
 void net_if_ipv6_router_update_lifetime(struct net_if_router *router,
-					u16_t lifetime)
+					uint16_t lifetime)
 {
 	NET_DBG("Updating expire time of %s by %u secs",
 		log_strdup(net_sprint_ipv6_addr(&router->address.in6_addr)),
@@ -2200,7 +2200,7 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router,
 
 struct net_if_router *net_if_ipv6_router_add(struct net_if *iface,
 					     struct in6_addr *addr,
-					     u16_t lifetime)
+					     uint16_t lifetime)
 {
 	return iface_router_add(iface, AF_INET6, addr, false, lifetime);
 }
@@ -2307,10 +2307,10 @@ struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state,
 	return NULL;
 }
 
-static u8_t get_diff_ipv6(const struct in6_addr *src,
+static uint8_t get_diff_ipv6(const struct in6_addr *src,
 			  const struct in6_addr *dst)
 {
-	return get_ipaddr_diff((const u8_t *)src, (const u8_t *)dst, 16);
+	return get_ipaddr_diff((const uint8_t *)src, (const uint8_t *)dst, 16);
 }
 
 static inline bool is_proper_ipv6_address(struct net_if_addr *addr)
@@ -2326,11 +2326,11 @@ static inline bool is_proper_ipv6_address(struct net_if_addr *addr)
 
 static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface,
 						   const struct in6_addr *dst,
-						   u8_t *best_so_far)
+						   uint8_t *best_so_far)
 {
 	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
 	struct in6_addr *src = NULL;
-	u8_t len;
+	uint8_t len;
 	int i;
 
 	if (!ipv6) {
@@ -2363,7 +2363,7 @@ const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface,
 						   const struct in6_addr *dst)
 {
 	struct in6_addr *src = NULL;
-	u8_t best_match = 0U;
+	uint8_t best_match = 0U;
 	struct net_if *iface;
 
 	if (!net_ipv6_is_ll_addr(dst) && !net_ipv6_is_addr_mcast(dst)) {
@@ -2428,9 +2428,9 @@ struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst)
 	return iface;
 }
 
-u32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6)
+uint32_t net_if_ipv6_calc_reachable_time(struct net_if_ipv6 *ipv6)
 {
-	u32_t min_reachable, max_reachable;
+	uint32_t min_reachable, max_reachable;
 
 	min_reachable = (MIN_RANDOM_NUMER * ipv6->base_reachable_time)
 			/ MIN_RANDOM_DENOM;
@@ -2588,7 +2588,7 @@ struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,
 struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,
 					     struct in_addr *addr,
 					     bool is_default,
-					     u16_t lifetime)
+					     uint16_t lifetime)
 {
 	return iface_router_add(iface, AF_INET, addr, is_default, lifetime);
 }
@@ -2602,7 +2602,7 @@ bool net_if_ipv4_addr_mask_cmp(struct net_if *iface,
 			       const struct in_addr *addr)
 {
 	struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4;
-	u32_t subnet;
+	uint32_t subnet;
 	int i;
 
 	if (!ipv4) {
@@ -2682,10 +2682,10 @@ struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst)
 	return net_if_get_default();
 }
 
-static u8_t get_diff_ipv4(const struct in_addr *src,
+static uint8_t get_diff_ipv4(const struct in_addr *src,
 			  const struct in_addr *dst)
 {
-	return get_ipaddr_diff((const u8_t *)src, (const u8_t *)dst, 4);
+	return get_ipaddr_diff((const uint8_t *)src, (const uint8_t *)dst, 4);
 }
 
 static inline bool is_proper_ipv4_address(struct net_if_addr *addr)
@@ -2701,11 +2701,11 @@ static inline bool is_proper_ipv4_address(struct net_if_addr *addr)
 
 static struct in_addr *net_if_ipv4_get_best_match(struct net_if *iface,
 						  const struct in_addr *dst,
-						  u8_t *best_so_far)
+						  uint8_t *best_so_far)
 {
 	struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4;
 	struct in_addr *src = NULL;
-	u8_t len;
+	uint8_t len;
 	int i;
 
 	if (!ipv4) {
@@ -2782,7 +2782,7 @@ const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface,
 						  const struct in_addr *dst)
 {
 	struct in_addr *src = NULL;
-	u8_t best_match = 0U;
+	uint8_t best_match = 0U;
 	struct net_if *iface;
 
 	if (!net_ipv4_is_ll_addr(dst) && !net_ipv4_is_addr_mcast(dst)) {
@@ -3011,7 +3011,7 @@ static struct net_if_addr *ipv4_addr_find(struct net_if *iface,
 struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,
 					 struct in_addr *addr,
 					 enum net_addr_type addr_type,
-					 u32_t vlifetime)
+					 uint32_t vlifetime)
 {
 	struct net_if_addr *ifaddr;
 	struct net_if_ipv4 *ipv4;
@@ -3114,7 +3114,7 @@ bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr)
 bool z_impl_net_if_ipv4_addr_add_by_index(int index,
 					  struct in_addr *addr,
 					  enum net_addr_type addr_type,
-					  u32_t vlifetime)
+					  uint32_t vlifetime)
 {
 	struct net_if *iface;
 	struct net_if_addr *if_addr;
@@ -3132,7 +3132,7 @@ bool z_impl_net_if_ipv4_addr_add_by_index(int index,
 bool z_vrfy_net_if_ipv4_addr_add_by_index(int index,
 					  struct in_addr *addr,
 					  enum net_addr_type addr_type,
-					  u32_t vlifetime)
+					  uint32_t vlifetime)
 {
 #if defined(CONFIG_NET_IF_USERSPACE_ACCESS)
 	struct in_addr addr_v4;
diff --git a/subsys/net/ip/net_mgmt.c b/subsys/net/ip/net_mgmt.c
index 249c0a90e1..5a0acb6fd6 100644
--- a/subsys/net/ip/net_mgmt.c
+++ b/subsys/net/ip/net_mgmt.c
@@ -19,11 +19,11 @@ LOG_MODULE_REGISTER(net_mgmt, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 #include "net_private.h"
 
 struct mgmt_event_entry {
-	u32_t event;
+	uint32_t event;
 	struct net_if *iface;
 
 #ifdef CONFIG_NET_MGMT_EVENT_INFO
-	u8_t info[NET_EVENT_INFO_MAX_SIZE];
+	uint8_t info[NET_EVENT_INFO_MAX_SIZE];
 	size_t info_length;
 #endif /* CONFIG_NET_MGMT_EVENT_INFO */
 };
@@ -39,15 +39,15 @@ static K_SEM_DEFINE(net_mgmt_lock, 1, 1);
 K_THREAD_STACK_DEFINE(mgmt_stack, CONFIG_NET_MGMT_EVENT_STACK_SIZE);
 static struct k_thread mgmt_thread_data;
 static struct mgmt_event_entry events[CONFIG_NET_MGMT_EVENT_QUEUE_SIZE];
-static u32_t global_event_mask;
+static uint32_t global_event_mask;
 static sys_slist_t event_callbacks;
-static s16_t in_event;
-static s16_t out_event;
+static int16_t in_event;
+static int16_t out_event;
 
-static inline void mgmt_push_event(u32_t mgmt_event, struct net_if *iface,
+static inline void mgmt_push_event(uint32_t mgmt_event, struct net_if *iface,
 				   void *info, size_t length)
 {
-	s16_t i_idx;
+	int16_t i_idx;
 
 #ifndef CONFIG_NET_MGMT_EVENT_INFO
 	ARG_UNUSED(info);
@@ -82,7 +82,7 @@ static inline void mgmt_push_event(u32_t mgmt_event, struct net_if *iface,
 	events[i_idx].iface = iface;
 
 	if (i_idx == out_event) {
-		u16_t o_idx = out_event + 1;
+		uint16_t o_idx = out_event + 1;
 
 		if (o_idx == CONFIG_NET_MGMT_EVENT_QUEUE_SIZE) {
 			o_idx = 0U;
@@ -102,7 +102,7 @@ static inline void mgmt_push_event(u32_t mgmt_event, struct net_if *iface,
 
 static inline struct mgmt_event_entry *mgmt_pop_event(void)
 {
-	s16_t o_idx;
+	int16_t o_idx;
 
 	if (out_event < 0 || !events[out_event].event) {
 		return NULL;
@@ -127,7 +127,7 @@ static inline void mgmt_clean_event(struct mgmt_event_entry *mgmt_event)
 	mgmt_event->iface = NULL;
 }
 
-static inline void mgmt_add_event_mask(u32_t event_mask)
+static inline void mgmt_add_event_mask(uint32_t event_mask)
 {
 	global_event_mask |= event_mask;
 }
@@ -143,7 +143,7 @@ static inline void mgmt_rebuild_global_event_mask(void)
 	}
 }
 
-static inline bool mgmt_is_event_handled(u32_t mgmt_event)
+static inline bool mgmt_is_event_handled(uint32_t mgmt_event)
 {
 	return (((NET_MGMT_GET_LAYER(mgmt_event) &
 		  NET_MGMT_GET_LAYER(global_event_mask)) ==
@@ -256,8 +256,8 @@ static void mgmt_thread(void)
 }
 
 static int mgmt_event_wait_call(struct net_if *iface,
-				u32_t mgmt_event_mask,
-				u32_t *raised_event,
+				uint32_t mgmt_event_mask,
+				uint32_t *raised_event,
 				struct net_if **event_iface,
 				const void **info,
 				size_t *info_length,
@@ -334,7 +334,7 @@ void net_mgmt_del_event_callback(struct net_mgmt_event_callback *cb)
 	k_sem_give(&net_mgmt_lock);
 }
 
-void net_mgmt_event_notify_with_info(u32_t mgmt_event, struct net_if *iface,
+void net_mgmt_event_notify_with_info(uint32_t mgmt_event, struct net_if *iface,
 				     void *info, size_t length)
 {
 	if (mgmt_is_event_handled(mgmt_event)) {
@@ -348,8 +348,8 @@ void net_mgmt_event_notify_with_info(u32_t mgmt_event, struct net_if *iface,
 	}
 }
 
-int net_mgmt_event_wait(u32_t mgmt_event_mask,
-			u32_t *raised_event,
+int net_mgmt_event_wait(uint32_t mgmt_event_mask,
+			uint32_t *raised_event,
 			struct net_if **iface,
 			const void **info,
 			size_t *info_length,
@@ -361,8 +361,8 @@ int net_mgmt_event_wait(u32_t mgmt_event_mask,
 }
 
 int net_mgmt_event_wait_on_iface(struct net_if *iface,
-				 u32_t mgmt_event_mask,
-				 u32_t *raised_event,
+				 uint32_t mgmt_event_mask,
+				 uint32_t *raised_event,
 				 const void **info,
 				 size_t *info_length,
 				 k_timeout_t timeout)
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
index 6cddf55c98..f825e0b96d 100644
--- a/subsys/net/ip/net_pkt.c
+++ b/subsys/net/ip/net_pkt.c
@@ -138,9 +138,9 @@ struct net_pkt_alloc {
 	};
 	const char *func_alloc;
 	const char *func_free;
-	u16_t line_alloc;
-	u16_t line_free;
-	u8_t in_use;
+	uint16_t line_alloc;
+	uint16_t line_free;
+	uint8_t in_use;
 	bool is_pkt;
 };
 
@@ -283,7 +283,7 @@ const char *net_pkt_pool2str(struct net_buf_pool *pool)
 
 #if defined(CONFIG_NET_DEBUG_NET_PKT_ALLOC) || \
 	CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
-static inline s16_t get_frees(struct net_buf_pool *pool)
+static inline int16_t get_frees(struct net_buf_pool *pool)
 {
 #if defined(CONFIG_NET_BUF_POOL_USAGE)
 	return pool->avail_count;
@@ -303,7 +303,7 @@ static inline const char *get_name(struct net_buf_pool *pool)
 #endif
 }
 
-static inline s16_t get_size(struct net_buf_pool *pool)
+static inline int16_t get_size(struct net_buf_pool *pool)
 {
 #if defined(CONFIG_NET_BUF_POOL_USAGE)
 	return pool->pool_size;
@@ -857,7 +857,7 @@ static struct net_buf *pkt_alloc_buffer(struct net_buf_pool *pool,
 					size_t size, k_timeout_t timeout)
 #endif
 {
-	u64_t end = z_timeout_end_calc(timeout);
+	uint64_t end = z_timeout_end_calc(timeout);
 	struct net_buf *first = NULL;
 	struct net_buf *current = NULL;
 
@@ -884,7 +884,7 @@ static struct net_buf *pkt_alloc_buffer(struct net_buf_pool *pool,
 
 		if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 		    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-			s64_t remaining = end - z_tick_get();
+			int64_t remaining = end - z_tick_get();
 
 			if (remaining <= 0) {
 				break;
@@ -1103,7 +1103,7 @@ int net_pkt_alloc_buffer(struct net_pkt *pkt,
 			 k_timeout_t timeout)
 #endif
 {
-	u64_t end = z_timeout_end_calc(timeout);
+	uint64_t end = z_timeout_end_calc(timeout);
 	struct net_buf_pool *pool = NULL;
 	size_t alloc_len = 0;
 	size_t hdr_len = 0;
@@ -1144,7 +1144,7 @@ int net_pkt_alloc_buffer(struct net_pkt *pkt,
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 	    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		s64_t remaining = end - z_tick_get();
+		int64_t remaining = end - z_tick_get();
 
 		if (remaining <= 0) {
 			timeout = K_NO_WAIT;
@@ -1363,7 +1363,7 @@ pkt_alloc_with_buffer(struct k_mem_slab *slab,
 		      k_timeout_t timeout)
 #endif
 {
-	u64_t end = z_timeout_end_calc(timeout);
+	uint64_t end = z_timeout_end_calc(timeout);
 	struct net_pkt *pkt;
 	int ret;
 
@@ -1383,7 +1383,7 @@ pkt_alloc_with_buffer(struct k_mem_slab *slab,
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 	    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		s64_t remaining = end - z_tick_get();
+		int64_t remaining = end - z_tick_get();
 
 		if (remaining <= 0) {
 			timeout = K_NO_WAIT;
@@ -1581,7 +1581,7 @@ static int net_pkt_cursor_operate(struct net_pkt *pkt,
 		pkt_cursor_update(pkt, len, write);
 
 		if (copy && data) {
-			data = (u8_t *) data + len;
+			data = (uint8_t *) data + len;
 		}
 
 		length -= len;
@@ -1616,36 +1616,36 @@ int net_pkt_read(struct net_pkt *pkt, void *data, size_t length)
 	return net_pkt_cursor_operate(pkt, data, length, true, false);
 }
 
-int net_pkt_read_be16(struct net_pkt *pkt, u16_t *data)
+int net_pkt_read_be16(struct net_pkt *pkt, uint16_t *data)
 {
-	u8_t d16[2];
+	uint8_t d16[2];
 	int ret;
 
-	ret = net_pkt_read(pkt, d16, sizeof(u16_t));
+	ret = net_pkt_read(pkt, d16, sizeof(uint16_t));
 
 	*data = d16[0] << 8 | d16[1];
 
 	return ret;
 }
 
-int net_pkt_read_le16(struct net_pkt *pkt, u16_t *data)
+int net_pkt_read_le16(struct net_pkt *pkt, uint16_t *data)
 {
-	u8_t d16[2];
+	uint8_t d16[2];
 	int ret;
 
-	ret = net_pkt_read(pkt, d16, sizeof(u16_t));
+	ret = net_pkt_read(pkt, d16, sizeof(uint16_t));
 
 	*data = d16[1] << 8 | d16[0];
 
 	return ret;
 }
 
-int net_pkt_read_be32(struct net_pkt *pkt, u32_t *data)
+int net_pkt_read_be32(struct net_pkt *pkt, uint32_t *data)
 {
-	u8_t d32[4];
+	uint8_t d32[4];
 	int ret;
 
-	ret = net_pkt_read(pkt, d32, sizeof(u32_t));
+	ret = net_pkt_read(pkt, d32, sizeof(uint32_t));
 
 	*data = d32[0] << 24 | d32[1] << 16 | d32[2] << 8 | d32[3];
 
@@ -1921,10 +1921,10 @@ int net_pkt_pull(struct net_pkt *pkt, size_t length)
 	return 0;
 }
 
-u16_t net_pkt_get_current_offset(struct net_pkt *pkt)
+uint16_t net_pkt_get_current_offset(struct net_pkt *pkt)
 {
 	struct net_buf *buf = pkt->buffer;
-	u16_t offset;
+	uint16_t offset;
 
 	if (!pkt->cursor.buf || !pkt->cursor.pos) {
 		return 0;
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index 121d28c41f..034792f205 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -76,8 +76,8 @@ static inline enum net_verdict net_ipv6_input(struct net_pkt *pkt,
 	return NET_CONTINUE;
 }
 #endif
-extern bool net_tc_submit_to_tx_queue(u8_t tc, struct net_pkt *pkt);
-extern void net_tc_submit_to_rx_queue(u8_t tc, struct net_pkt *pkt);
+extern bool net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt);
+extern void net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt);
 extern enum net_verdict net_promisc_mode_input(struct net_pkt *pkt);
 
 char *net_sprint_addr(sa_family_t af, const void *addr);
@@ -140,14 +140,14 @@ enum net_verdict net_gptp_recv(struct net_if *iface, struct net_pkt *pkt);
 
 #if defined(CONFIG_NET_IPV6_FRAGMENT)
 int net_ipv6_send_fragmented_pkt(struct net_if *iface, struct net_pkt *pkt,
-				 u16_t pkt_len);
+				 uint16_t pkt_len);
 #endif
 
 extern const char *net_proto2str(int family, int proto);
-extern char *net_byte_to_hex(char *ptr, u8_t byte, char base, bool pad);
-extern char *net_sprint_ll_addr_buf(const u8_t *ll, u8_t ll_len,
+extern char *net_byte_to_hex(char *ptr, uint8_t byte, char base, bool pad);
+extern char *net_sprint_ll_addr_buf(const uint8_t *ll, uint8_t ll_len,
 				    char *buf, int buflen);
-extern u16_t net_calc_chksum(struct net_pkt *pkt, u8_t proto);
+extern uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto);
 
 /**
  * @brief Deliver the incoming packet through the recv_cb of the net_context
@@ -169,37 +169,37 @@ enum net_verdict net_context_packet_received(struct net_conn *conn,
 					     void *user_data);
 
 #if defined(CONFIG_NET_IPV4)
-extern u16_t net_calc_chksum_ipv4(struct net_pkt *pkt);
+extern uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt);
 #endif /* CONFIG_NET_IPV4 */
 
-static inline u16_t net_calc_chksum_icmpv6(struct net_pkt *pkt)
+static inline uint16_t net_calc_chksum_icmpv6(struct net_pkt *pkt)
 {
 	return net_calc_chksum(pkt, IPPROTO_ICMPV6);
 }
 
-static inline u16_t net_calc_chksum_icmpv4(struct net_pkt *pkt)
+static inline uint16_t net_calc_chksum_icmpv4(struct net_pkt *pkt)
 {
 	return net_calc_chksum(pkt, IPPROTO_ICMP);
 }
 
-static inline u16_t net_calc_chksum_udp(struct net_pkt *pkt)
+static inline uint16_t net_calc_chksum_udp(struct net_pkt *pkt)
 {
-	u16_t chksum = net_calc_chksum(pkt, IPPROTO_UDP);
+	uint16_t chksum = net_calc_chksum(pkt, IPPROTO_UDP);
 
 	return chksum == 0U ? 0xffff : chksum;
 }
 
-static inline u16_t net_calc_verify_chksum_udp(struct net_pkt *pkt)
+static inline uint16_t net_calc_verify_chksum_udp(struct net_pkt *pkt)
 {
 	return net_calc_chksum(pkt, IPPROTO_UDP);
 }
 
-static inline u16_t net_calc_chksum_tcp(struct net_pkt *pkt)
+static inline uint16_t net_calc_chksum_tcp(struct net_pkt *pkt)
 {
 	return net_calc_chksum(pkt, IPPROTO_TCP);
 }
 
-static inline char *net_sprint_ll_addr(const u8_t *ll, u8_t ll_len)
+static inline char *net_sprint_ll_addr(const uint8_t *ll, uint8_t ll_len)
 {
 	static char buf[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
 
@@ -207,7 +207,7 @@ static inline char *net_sprint_ll_addr(const u8_t *ll, u8_t ll_len)
 }
 
 static inline void net_hexdump(const char *str,
-			       const u8_t *packet, size_t length)
+			       const uint8_t *packet, size_t length)
 {
 	if (!length) {
 		LOG_DBG("%s zero-length packet", str);
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
index 3c73d1e097..e08d10df5f 100644
--- a/subsys/net/ip/net_shell.c
+++ b/subsys/net/ip/net_shell.c
@@ -758,9 +758,9 @@ static void print_tc_tx_stats(const struct shell *shell, struct net_if *iface)
 			   GET_STAT(iface, tc.sent[i].priority),
 			   GET_STAT(iface, tc.sent[i].pkts),
 			   GET_STAT(iface, tc.sent[i].bytes),
-			   (u32_t)(GET_STAT(iface,
+			   (uint32_t)(GET_STAT(iface,
 					    tc.sent[i].tx_time.sum) /
-				   (u64_t)count));
+				   (uint64_t)count));
 		}
 	}
 #else
@@ -782,7 +782,7 @@ static void print_tc_tx_stats(const struct shell *shell, struct net_if *iface)
 
 	if (count != 0) {
 		PR("Avg %s net_pkt (%u) time %lu us\n", "TX", count,
-		   (u32_t)(GET_STAT(iface, tx_time.sum) / (u64_t)count));
+		   (uint32_t)(GET_STAT(iface, tx_time.sum) / (uint64_t)count));
 	}
 #else
 	ARG_UNUSED(iface);
@@ -815,9 +815,9 @@ static void print_tc_rx_stats(const struct shell *shell, struct net_if *iface)
 			   GET_STAT(iface, tc.recv[i].priority),
 			   GET_STAT(iface, tc.recv[i].pkts),
 			   GET_STAT(iface, tc.recv[i].bytes),
-			   (u32_t)(GET_STAT(iface,
+			   (uint32_t)(GET_STAT(iface,
 					    tc.recv[i].rx_time.sum) /
-				   (u64_t)count));
+				   (uint64_t)count));
 		}
 	}
 #else
@@ -839,7 +839,7 @@ static void print_tc_rx_stats(const struct shell *shell, struct net_if *iface)
 
 	if (count != 0) {
 		PR("Avg %s net_pkt (%u) time %lu us\n", "RX", count,
-		   (u32_t)(GET_STAT(iface, rx_time.sum) / (u64_t)count));
+		   (uint32_t)(GET_STAT(iface, rx_time.sum) / (uint64_t)count));
 	}
 #else
 	ARG_UNUSED(iface);
@@ -855,7 +855,7 @@ static void print_net_pm_stats(const struct shell *shell, struct net_if *iface)
 	PR("\tLast time     : %u ms\n",
 	   GET_STAT(iface, pm.last_suspend_time));
 	PR("\tAverage time  : %u ms\n",
-	   (u32_t)(GET_STAT(iface, pm.overall_suspend_time) /
+	   (uint32_t)(GET_STAT(iface, pm.overall_suspend_time) /
 		   GET_STAT(iface, pm.suspend_count)));
 	PR("\tTotal time    : %llu ms\n",
 	   GET_STAT(iface, pm.overall_suspend_time));
@@ -963,8 +963,8 @@ static void net_shell_print_statistics(struct net_if *iface, void *user_data)
 #if defined(CONFIG_NET_CONTEXT_TIMESTAMP) && defined(CONFIG_NET_NATIVE)
 	if (GET_STAT(iface, tx_time.count) > 0) {
 		PR("Network pkt TX time %lu us\n",
-		   (u32_t)(GET_STAT(iface, tx_time.sum) /
-			   (u64_t)GET_STAT(iface, tx_time.count)));
+		   (uint32_t)(GET_STAT(iface, tx_time.sum) /
+			   (uint64_t)GET_STAT(iface, tx_time.count)));
 	}
 #endif
 
@@ -1152,7 +1152,7 @@ static void tcp_cb(struct net_tcp *tcp, void *user_data)
 	struct net_shell_user_data *data = user_data;
 	const struct shell *shell = data->shell;
 	int *count = data->user_data;
-	u16_t recv_mss = net_tcp_get_recv_mss(tcp);
+	uint16_t recv_mss = net_tcp_get_recv_mss(tcp);
 
 	PR("%p %p   %5u    %5u %10u %10u %5u   %s\n",
 	   tcp, tcp->context,
@@ -1575,7 +1575,7 @@ static void print_dns_info(const struct shell *shell,
 	PR("Pending queries:\n");
 
 	for (i = 0; i < CONFIG_DNS_NUM_CONCUR_QUERIES; i++) {
-		s32_t remaining;
+		int32_t remaining;
 
 		if (!ctx->queries[i].cb) {
 			continue;
@@ -2006,12 +2006,12 @@ static void gptp_print_port_info(const struct shell *shell, int port)
 	   ": %s\n", port_ds->is_measuring_delay ? "yes" : "no");
 	PR("One way propagation time on %s    : %u ns\n",
 	   "the link attached to this port",
-	   (u32_t)port_ds->neighbor_prop_delay);
+	   (uint32_t)port_ds->neighbor_prop_delay);
 	PR("Propagation time threshold for %s : %u ns\n",
 	   "the link attached to this port",
-	   (u32_t)port_ds->neighbor_prop_delay_thresh);
+	   (uint32_t)port_ds->neighbor_prop_delay_thresh);
 	PR("Estimate of the ratio of the frequency with the peer          "
-	   ": %u\n", (u32_t)port_ds->neighbor_rate_ratio);
+	   ": %u\n", (uint32_t)port_ds->neighbor_rate_ratio);
 	PR("Asymmetry on the link relative to the grand master time base  "
 	   ": %lld\n", port_ds->delay_asymmetry);
 	PR("Maximum interval between sync %s                        "
@@ -2406,9 +2406,9 @@ static int cmd_net_iface_down(const struct shell *shell, size_t argc,
 }
 
 #if defined(CONFIG_NET_NATIVE_IPV6)
-static u32_t time_diff(u32_t time1, u32_t time2)
+static uint32_t time_diff(uint32_t time1, uint32_t time2)
 {
-	return (u32_t)abs((s32_t)time1 - (s32_t)time2);
+	return (uint32_t)abs((int32_t)time1 - (int32_t)time2);
 }
 
 static void address_lifetime_cb(struct net_if *iface, void *user_data)
@@ -2435,18 +2435,18 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 	for (i = 0; i < NET_IF_MAX_IPV6_ADDR; i++) {
 		struct net_if_ipv6_prefix *prefix;
 		char remaining_str[sizeof("01234567890")];
-		u64_t remaining;
-		u8_t prefix_len;
+		uint64_t remaining;
+		uint8_t prefix_len;
 
 		if (!ipv6->unicast[i].is_used ||
 		    ipv6->unicast[i].address.family != AF_INET6) {
 			continue;
 		}
 
-		remaining = (u64_t)ipv6->unicast[i].lifetime.timer_timeout +
-			(u64_t)ipv6->unicast[i].lifetime.wrap_counter *
-			(u64_t)NET_TIMEOUT_MAX_VALUE -
-			(u64_t)time_diff(k_uptime_get_32(),
+		remaining = (uint64_t)ipv6->unicast[i].lifetime.timer_timeout +
+			(uint64_t)ipv6->unicast[i].lifetime.wrap_counter *
+			(uint64_t)NET_TIMEOUT_MAX_VALUE -
+			(uint64_t)time_diff(k_uptime_get_32(),
 				ipv6->unicast[i].lifetime.timer_start);
 
 		prefix = net_if_ipv6_prefix_get(iface,
@@ -2462,7 +2462,7 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data)
 				 "infinite");
 		} else {
 			snprintk(remaining_str, sizeof(remaining_str) - 1,
-				 "%u", (u32_t)(remaining / 1000U));
+				 "%u", (uint32_t)(remaining / 1000U));
 		}
 
 		PR("%s  \t%s\t%s    \t%s/%d\n",
@@ -2769,7 +2769,7 @@ static void nbr_cb(struct net_nbr *nbr, void *user_data)
 	char *state_pad = "";
 	const char *state_str;
 #if defined(CONFIG_NET_IPV6_ND)
-	s64_t remaining;
+	int64_t remaining;
 #endif
 
 #if defined(CONFIG_NET_L2_IEEE802154)
@@ -2876,7 +2876,7 @@ static enum net_verdict handle_ipv6_echo_reply(struct net_pkt *pkt,
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmp_access,
 					      struct net_icmpv6_echo_req);
 	struct net_icmpv6_echo_req *icmp_echo;
-	u32_t cycles;
+	uint32_t cycles;
 
 	icmp_echo = (struct net_icmpv6_echo_req *)net_pkt_get_data(pkt,
 								&icmp_access);
@@ -2910,9 +2910,9 @@ static enum net_verdict handle_ipv6_echo_reply(struct net_pkt *pkt,
 		 net_pkt_ieee802154_rssi(pkt),
 #endif
 #ifdef CONFIG_FPU
-		 ((u32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
+		 ((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
 #else
-		 ((u32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
+		 ((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
 #endif
 	k_sem_give(&ping_timeout);
 
@@ -2958,7 +2958,7 @@ static int ping_ipv6(const struct shell *shell,
 	PR("PING %s\n", host);
 
 	for (int i = 0; i < count; ++i) {
-		u32_t time_stamp = htonl(k_cycle_get_32());
+		uint32_t time_stamp = htonl(k_cycle_get_32());
 
 		ret = net_icmpv6_send_echo_request(iface,
 						   &ipv6_target,
@@ -3005,7 +3005,7 @@ static enum net_verdict handle_ipv4_echo_reply(struct net_pkt *pkt,
 {
 	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmp_access,
 					      struct net_icmpv4_echo_req);
-	u32_t cycles;
+	uint32_t cycles;
 	struct net_icmpv4_echo_req *icmp_echo;
 
 	icmp_echo = (struct net_icmpv4_echo_req *)net_pkt_get_data(pkt,
@@ -3034,9 +3034,9 @@ static enum net_verdict handle_ipv4_echo_reply(struct net_pkt *pkt,
 		 ntohs(icmp_echo->sequence),
 		 ip_hdr->ttl,
 #ifdef CONFIG_FPU
-		 ((u32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
+		 ((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000.f));
 #else
-		 ((u32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
+		 ((uint32_t)k_cyc_to_ns_floor64(cycles) / 1000000));
 #endif
 	k_sem_give(&ping_timeout);
 
@@ -3063,7 +3063,7 @@ static int ping_ipv4(const struct shell *shell,
 	PR("PING %s\n", host);
 
 	for (int i = 0; i < count; ++i) {
-		u32_t time_stamp = htonl(k_cycle_get_32());
+		uint32_t time_stamp = htonl(k_cycle_get_32());
 
 		ret = net_icmpv4_send_echo_request(iface,
 						   &ipv4_target,
@@ -3204,7 +3204,7 @@ wait_reply:
 
 static struct net_pkt *get_net_pkt(const char *ptr_str)
 {
-	u8_t buf[sizeof(intptr_t)];
+	uint8_t buf[sizeof(intptr_t)];
 	intptr_t ptr = 0;
 	size_t len;
 	int i;
@@ -3618,7 +3618,7 @@ static void print_connect_info(const struct shell *shell,
 	}
 }
 
-static void tcp_connect(const struct shell *shell, char *host, u16_t port,
+static void tcp_connect(const struct shell *shell, char *host, uint16_t port,
 			struct net_context **ctx)
 {
 	struct net_if *iface = net_if_get_default();
@@ -3737,7 +3737,7 @@ static int cmd_net_tcp_connect(const struct shell *shell, size_t argc,
 	/* tcp connect <ip> port */
 	char *endptr;
 	char *ip;
-	u16_t port;
+	uint16_t port;
 
 	/* tcp connect <ip> port */
 	if (tcp_ctx && net_context_is_used(tcp_ctx)) {
@@ -3793,7 +3793,7 @@ static int cmd_net_tcp_send(const struct shell *shell, size_t argc,
 
 	user_data.shell = shell;
 
-	ret = net_context_send(tcp_ctx, (u8_t *)argv[arg],
+	ret = net_context_send(tcp_ctx, (uint8_t *)argv[arg],
 			       strlen(argv[arg]), tcp_sent_cb,
 			       TCP_TIMEOUT, &user_data);
 	if (ret < 0) {
@@ -3850,7 +3850,7 @@ static void iface_vlan_del_cb(struct net_if *iface, void *user_data)
 {
 	struct net_shell_user_data *data = user_data;
 	const struct shell *shell = data->shell;
-	u16_t vlan_tag = POINTER_TO_UINT(data->user_data);
+	uint16_t vlan_tag = POINTER_TO_UINT(data->user_data);
 	int ret;
 
 	ret = net_eth_vlan_disable(iface, vlan_tag);
@@ -3934,10 +3934,10 @@ static int cmd_net_vlan_add(const struct shell *shell, size_t argc,
 #if defined(CONFIG_NET_VLAN)
 	int arg = 0;
 	int ret;
-	u16_t tag;
+	uint16_t tag;
 	struct net_if *iface;
 	char *endptr;
-	u32_t iface_idx;
+	uint32_t iface_idx;
 #endif
 
 #if defined(CONFIG_NET_VLAN)
@@ -4009,7 +4009,7 @@ static int cmd_net_vlan_del(const struct shell *shell, size_t argc,
 	int arg = 0;
 	struct net_shell_user_data user_data;
 	char *endptr;
-	u16_t tag;
+	uint16_t tag;
 #endif
 
 #if defined(CONFIG_NET_VLAN)
@@ -4026,7 +4026,7 @@ static int cmd_net_vlan_del(const struct shell *shell, size_t argc,
 	}
 
 	user_data.shell = shell;
-	user_data.user_data = UINT_TO_POINTER((u32_t)tag);
+	user_data.user_data = UINT_TO_POINTER((uint32_t)tag);
 
 	net_if_foreach(iface_vlan_del_cb, &user_data);
 
diff --git a/subsys/net/ip/net_stats.c b/subsys/net/ip/net_stats.c
index c1190b2382..273d7ef2e3 100644
--- a/subsys/net/ip/net_stats.c
+++ b/subsys/net/ip/net_stats.c
@@ -59,16 +59,16 @@ static const char *priority2str(enum net_priority priority)
 }
 #endif
 
-static inline s64_t cmp_val(u64_t val1, u64_t val2)
+static inline int64_t cmp_val(uint64_t val1, uint64_t val2)
 {
-	return (s64_t)(val1 - val2);
+	return (int64_t)(val1 - val2);
 }
 
 static inline void stats(struct net_if *iface)
 {
-	static u64_t next_print;
-	u64_t curr = k_uptime_get();
-	s64_t cmp = cmp_val(curr, next_print);
+	static uint64_t next_print;
+	uint64_t curr = k_uptime_get();
+	int64_t cmp = cmp_val(curr, next_print);
 	int i;
 
 	if (!next_print || (abs(cmp) > PRINT_STATISTICS_INTERVAL)) {
@@ -198,7 +198,7 @@ static inline void stats(struct net_if *iface)
 		NET_INFO("Got suspended %d times",
 			 GET_STAT(iface, pm.suspend_count));
 		NET_INFO("Average suspend time: %u ms",
-			 (u32_t)(GET_STAT(iface, pm.overall_suspend_time) /
+			 (uint32_t)(GET_STAT(iface, pm.overall_suspend_time) /
 				 GET_STAT(iface, pm.suspend_count)));
 		NET_INFO("Total suspended time: %llu ms",
 			 GET_STAT(iface, pm.overall_suspend_time));
@@ -234,7 +234,7 @@ void net_print_statistics(void)
 
 #if defined(CONFIG_NET_STATISTICS_USER_API)
 
-static int net_stats_get(u32_t mgmt_request, struct net_if *iface,
+static int net_stats_get(uint32_t mgmt_request, struct net_if *iface,
 			 void *data, size_t len)
 {
 	size_t len_chk = 0;
diff --git a/subsys/net/ip/net_stats.h b/subsys/net/ip/net_stats.h
index 5e5da39fa1..090a7bdc3d 100644
--- a/subsys/net/ip/net_stats.h
+++ b/subsys/net/ip/net_stats.h
@@ -49,13 +49,13 @@ static inline void net_stats_update_ip_errors_vhlerr(struct net_if *iface)
 }
 
 static inline void net_stats_update_bytes_recv(struct net_if *iface,
-					       u32_t bytes)
+					       uint32_t bytes)
 {
 	UPDATE_STAT(iface, stats.bytes.received += bytes);
 }
 
 static inline void net_stats_update_bytes_sent(struct net_if *iface,
-					       u32_t bytes)
+					       uint32_t bytes)
 {
 	UPDATE_STAT(iface, stats.bytes.sent += bytes);
 }
@@ -188,18 +188,18 @@ static inline void net_stats_update_udp_chkerr(struct net_if *iface)
 
 #if defined(CONFIG_NET_STATISTICS_TCP) && defined(CONFIG_NET_NATIVE_TCP)
 /* TCP stats */
-static inline void net_stats_update_tcp_sent(struct net_if *iface, u32_t bytes)
+static inline void net_stats_update_tcp_sent(struct net_if *iface, uint32_t bytes)
 {
 	UPDATE_STAT(iface, stats.tcp.bytes.sent += bytes);
 }
 
-static inline void net_stats_update_tcp_recv(struct net_if *iface, u32_t bytes)
+static inline void net_stats_update_tcp_recv(struct net_if *iface, uint32_t bytes)
 {
 	UPDATE_STAT(iface, stats.tcp.bytes.received += bytes);
 }
 
 static inline void net_stats_update_tcp_resent(struct net_if *iface,
-					       u32_t bytes)
+					       uint32_t bytes)
 {
 	UPDATE_STAT(iface, stats.tcp.resent += bytes);
 }
@@ -321,10 +321,10 @@ static inline void net_stats_update_ipv6_mld_drop(struct net_if *iface)
 #if (defined(CONFIG_NET_CONTEXT_TIMESTAMP) || \
 	defined(CONFIG_NET_PKT_TXTIME_STATS)) && defined(CONFIG_NET_STATISTICS)
 static inline void net_stats_update_tx_time(struct net_if *iface,
-					    u32_t start_time,
-					    u32_t end_time)
+					    uint32_t start_time,
+					    uint32_t end_time)
 {
-	u32_t diff = end_time - start_time;
+	uint32_t diff = end_time - start_time;
 
 	UPDATE_STAT(iface, stats.tx_time.sum +=
 		    k_cyc_to_ns_floor64(diff) / 1000);
@@ -336,10 +336,10 @@ static inline void net_stats_update_tx_time(struct net_if *iface,
 
 #if defined(CONFIG_NET_PKT_RXTIME_STATS) && defined(CONFIG_NET_STATISTICS)
 static inline void net_stats_update_rx_time(struct net_if *iface,
-					    u32_t start_time,
-					    u32_t end_time)
+					    uint32_t start_time,
+					    uint32_t end_time)
 {
-	u32_t diff = end_time - start_time;
+	uint32_t diff = end_time - start_time;
 
 	UPDATE_STAT(iface, stats.rx_time.sum +=
 		    k_cyc_to_ns_floor64(diff) / 1000);
@@ -351,19 +351,19 @@ static inline void net_stats_update_rx_time(struct net_if *iface,
 
 #if (NET_TC_COUNT > 1) && defined(CONFIG_NET_STATISTICS) \
 	&& defined(CONFIG_NET_NATIVE)
-static inline void net_stats_update_tc_sent_pkt(struct net_if *iface, u8_t tc)
+static inline void net_stats_update_tc_sent_pkt(struct net_if *iface, uint8_t tc)
 {
 	UPDATE_STAT(iface, stats.tc.sent[tc].pkts++);
 }
 
 static inline void net_stats_update_tc_sent_bytes(struct net_if *iface,
-						  u8_t tc, size_t bytes)
+						  uint8_t tc, size_t bytes)
 {
 	UPDATE_STAT(iface, stats.tc.sent[tc].bytes += bytes);
 }
 
 static inline void net_stats_update_tc_sent_priority(struct net_if *iface,
-						     u8_t tc, u8_t priority)
+						     uint8_t tc, uint8_t priority)
 {
 	UPDATE_STAT(iface, stats.tc.sent[tc].priority = priority);
 }
@@ -372,11 +372,11 @@ static inline void net_stats_update_tc_sent_priority(struct net_if *iface,
 	defined(CONFIG_NET_PKT_TXTIME_STATS)) && \
 	defined(CONFIG_NET_STATISTICS) && defined(CONFIG_NET_NATIVE)
 static inline void net_stats_update_tc_tx_time(struct net_if *iface,
-					       u8_t tc,
-					       u32_t start_time,
-					       u32_t end_time)
+					       uint8_t tc,
+					       uint32_t start_time,
+					       uint32_t end_time)
 {
-	u32_t diff = end_time - start_time;
+	uint32_t diff = end_time - start_time;
 
 	UPDATE_STAT(iface, stats.tc.sent[tc].tx_time.sum +=
 		    k_cyc_to_ns_floor64(diff) / 1000);
@@ -391,11 +391,11 @@ static inline void net_stats_update_tc_tx_time(struct net_if *iface,
 #if defined(CONFIG_NET_PKT_RXTIME_STATS) && defined(CONFIG_NET_STATISTICS) \
 	&& defined(CONFIG_NET_NATIVE)
 static inline void net_stats_update_tc_rx_time(struct net_if *iface,
-					       u8_t tc,
-					       u32_t start_time,
-					       u32_t end_time)
+					       uint8_t tc,
+					       uint32_t start_time,
+					       uint32_t end_time)
 {
-	u32_t diff = end_time - start_time;
+	uint32_t diff = end_time - start_time;
 
 	UPDATE_STAT(iface, stats.tc.recv[tc].rx_time.sum +=
 		    k_cyc_to_ns_floor64(diff) / 1000);
@@ -407,19 +407,19 @@ static inline void net_stats_update_tc_rx_time(struct net_if *iface,
 #define net_stats_update_tc_rx_time(iface, tc, start_time, end_time)
 #endif /* NET_PKT_RXTIME_STATS && NET_STATISTICS */
 
-static inline void net_stats_update_tc_recv_pkt(struct net_if *iface, u8_t tc)
+static inline void net_stats_update_tc_recv_pkt(struct net_if *iface, uint8_t tc)
 {
 	UPDATE_STAT(iface, stats.tc.recv[tc].pkts++);
 }
 
 static inline void net_stats_update_tc_recv_bytes(struct net_if *iface,
-						  u8_t tc, size_t bytes)
+						  uint8_t tc, size_t bytes)
 {
 	UPDATE_STAT(iface, stats.tc.recv[tc].bytes += bytes);
 }
 
 static inline void net_stats_update_tc_recv_priority(struct net_if *iface,
-						     u8_t tc, u8_t priority)
+						     uint8_t tc, uint8_t priority)
 {
 	UPDATE_STAT(iface, stats.tc.recv[tc].priority = priority);
 }
@@ -435,9 +435,9 @@ static inline void net_stats_update_tc_recv_priority(struct net_if *iface,
 	defined(CONFIG_NET_PKT_TXTIME_STATS)) && \
 	defined(CONFIG_NET_STATISTICS) && defined(CONFIG_NET_NATIVE)
 static inline void net_stats_update_tc_tx_time(struct net_if *iface,
-					       u8_t pkt_priority,
-					       u32_t start_time,
-					       u32_t end_time)
+					       uint8_t pkt_priority,
+					       uint32_t start_time,
+					       uint32_t end_time)
 {
 	ARG_UNUSED(pkt_priority);
 
@@ -450,9 +450,9 @@ static inline void net_stats_update_tc_tx_time(struct net_if *iface,
 #if defined(CONFIG_NET_PKT_RXTIME_STATS) && defined(CONFIG_NET_STATISTICS) \
 	&& defined(CONFIG_NET_NATIVE)
 static inline void net_stats_update_tc_rx_time(struct net_if *iface,
-					       u8_t pkt_priority,
-					       u32_t start_time,
-					       u32_t end_time)
+					       uint8_t pkt_priority,
+					       uint32_t start_time,
+					       uint32_t end_time)
 {
 	ARG_UNUSED(pkt_priority);
 
@@ -466,15 +466,15 @@ static inline void net_stats_update_tc_rx_time(struct net_if *iface,
 #if defined(CONFIG_NET_STATISTICS_POWER_MANAGEMENT)	\
 	&& defined(CONFIG_NET_STATISTICS) && defined(CONFIG_NET_NATIVE)
 static inline void net_stats_add_suspend_start_time(struct net_if *iface,
-						    u32_t time)
+						    uint32_t time)
 {
 	UPDATE_STAT(iface, stats.pm.start_time = time);
 }
 
 static inline void net_stats_add_suspend_end_time(struct net_if *iface,
-						  u32_t time)
+						  uint32_t time)
 {
-	u32_t diff_time =
+	uint32_t diff_time =
 		k_cyc_to_ms_floor32(time - GET_STAT(iface, pm.start_time));
 
 	UPDATE_STAT(iface, stats.pm.start_time = 0);
diff --git a/subsys/net/ip/net_tc.c b/subsys/net/ip/net_tc.c
index 977ff7ac58..25d44a78b6 100644
--- a/subsys/net/ip/net_tc.c
+++ b/subsys/net/ip/net_tc.c
@@ -29,7 +29,7 @@ K_THREAD_STACK_ARRAY_DEFINE(rx_stack, NET_TC_RX_COUNT,
 static struct net_traffic_class tx_classes[NET_TC_TX_COUNT];
 static struct net_traffic_class rx_classes[NET_TC_RX_COUNT];
 
-bool net_tc_submit_to_tx_queue(u8_t tc, struct net_pkt *pkt)
+bool net_tc_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt)
 {
 	if (k_work_pending(net_pkt_work(pkt))) {
 		return false;
@@ -40,7 +40,7 @@ bool net_tc_submit_to_tx_queue(u8_t tc, struct net_pkt *pkt)
 	return true;
 }
 
-void net_tc_submit_to_rx_queue(u8_t tc, struct net_pkt *pkt)
+void net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt)
 {
 	k_work_submit_to_queue(&rx_classes[tc].work_q, net_pkt_work(pkt));
 }
@@ -66,7 +66,7 @@ int net_rx_priority2tc(enum net_priority prio)
 }
 
 /* Convert traffic class to thread priority */
-static u8_t tx_tc2thread(u8_t tc)
+static uint8_t tx_tc2thread(uint8_t tc)
 {
 	/* Initial implementation just maps the traffic class to certain queue.
 	 * If there are less queues than classes, then map them into
@@ -83,7 +83,7 @@ static u8_t tx_tc2thread(u8_t tc)
 	 * that thread_priorities[7] value should contain the highest priority
 	 * for the TX queue handling thread.
 	 */
-	static const u8_t thread_priorities[] = {
+	static const uint8_t thread_priorities[] = {
 #if NET_TC_TX_COUNT == 1
 		7
 #endif
@@ -119,7 +119,7 @@ static u8_t tx_tc2thread(u8_t tc)
 }
 
 /* Convert traffic class to thread priority */
-static u8_t rx_tc2thread(u8_t tc)
+static uint8_t rx_tc2thread(uint8_t tc)
 {
 	/* Initial implementation just maps the traffic class to certain queue.
 	 * If there are less queues than classes, then map them into
@@ -136,7 +136,7 @@ static u8_t rx_tc2thread(u8_t tc)
 	 * that thread_priorities[7] value should contain the highest priority
 	 * for the RX queue handling thread.
 	 */
-	static const u8_t thread_priorities[] = {
+	static const uint8_t thread_priorities[] = {
 #if NET_TC_RX_COUNT == 1
 		7
 #endif
@@ -227,7 +227,7 @@ void net_tc_tx_init(void)
 #endif
 
 	for (i = 0; i < NET_TC_TX_COUNT; i++) {
-		u8_t thread_priority;
+		uint8_t thread_priority;
 
 		thread_priority = tx_tc2thread(i);
 		tx_classes[i].tc = thread_priority;
@@ -257,7 +257,7 @@ void net_tc_rx_init(void)
 #endif
 
 	for (i = 0; i < NET_TC_RX_COUNT; i++) {
-		u8_t thread_priority;
+		uint8_t thread_priority;
 
 		thread_priority = rx_tc2thread(i);
 		rx_classes[i].tc = thread_priority;
diff --git a/subsys/net/ip/net_tc_mapping.h b/subsys/net/ip/net_tc_mapping.h
index 62712e988d..0ef7adfa41 100644
--- a/subsys/net/ip/net_tc_mapping.h
+++ b/subsys/net/ip/net_tc_mapping.h
@@ -42,32 +42,32 @@
  */
 
 #if NET_TC_TX_COUNT == 1 || NET_TC_RX_COUNT == 1
-static const u8_t priority2tc_strict_1[] = {0, 0, 0, 0, 0, 0, 0, 0};
+static const uint8_t priority2tc_strict_1[] = {0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 #if NET_TC_TX_COUNT == 2 || NET_TC_RX_COUNT == 2
-static const u8_t priority2tc_strict_2[] = {0, 0, 0, 0, 1, 1, 1, 1};
+static const uint8_t priority2tc_strict_2[] = {0, 0, 0, 0, 1, 1, 1, 1};
 #endif
 #if NET_TC_TX_COUNT == 3 || NET_TC_RX_COUNT == 3
-static const u8_t priority2tc_strict_3[] = {0, 0, 0, 0, 1, 1, 2, 2};
+static const uint8_t priority2tc_strict_3[] = {0, 0, 0, 0, 1, 1, 2, 2};
 #endif
 #if NET_TC_TX_COUNT == 4 || NET_TC_RX_COUNT == 4
-static const u8_t priority2tc_strict_4[] = {0, 0, 1, 1, 2, 2, 3, 3};
+static const uint8_t priority2tc_strict_4[] = {0, 0, 1, 1, 2, 2, 3, 3};
 #endif
 #if NET_TC_TX_COUNT == 5 || NET_TC_RX_COUNT == 5
-static const u8_t priority2tc_strict_5[] = {0, 0, 1, 1, 2, 2, 3, 4};
+static const uint8_t priority2tc_strict_5[] = {0, 0, 1, 1, 2, 2, 3, 4};
 #endif
 #if NET_TC_TX_COUNT == 6 || NET_TC_RX_COUNT == 6
-static const u8_t priority2tc_strict_6[] = {1, 0, 2, 2, 3, 3, 4, 5};
+static const uint8_t priority2tc_strict_6[] = {1, 0, 2, 2, 3, 3, 4, 5};
 #endif
 #if NET_TC_TX_COUNT == 7 || NET_TC_RX_COUNT == 7
-static const u8_t priority2tc_strict_7[] = {1, 0, 2, 3, 4, 4, 5, 6};
+static const uint8_t priority2tc_strict_7[] = {1, 0, 2, 3, 4, 4, 5, 6};
 #endif
 #if NET_TC_TX_COUNT == 8 || NET_TC_RX_COUNT == 8
-static const u8_t priority2tc_strict_8[] = {1, 0, 2, 3, 4, 5, 6, 7};
+static const uint8_t priority2tc_strict_8[] = {1, 0, 2, 3, 4, 5, 6, 7};
 #endif
 
-static const u8_t *tx_prio2tc_map = PRIORITY2TC_GEN(strict, NET_TC_TX_COUNT);
-static const u8_t *rx_prio2tc_map = PRIORITY2TC_GEN(strict, NET_TC_RX_COUNT);
+static const uint8_t *tx_prio2tc_map = PRIORITY2TC_GEN(strict, NET_TC_TX_COUNT);
+static const uint8_t *rx_prio2tc_map = PRIORITY2TC_GEN(strict, NET_TC_RX_COUNT);
 
 #elif defined(CONFIG_NET_TC_MAPPING_SR_CLASS_A_AND_B)
 
@@ -77,29 +77,29 @@ static const u8_t *rx_prio2tc_map = PRIORITY2TC_GEN(strict, NET_TC_RX_COUNT);
  */
 
 #if NET_TC_TX_COUNT == 2 || NET_TC_RX_COUNT == 2
-static const u8_t priority2tc_sr_ab_2[] = {0, 0, 1, 1, 0, 0, 0, 0};
+static const uint8_t priority2tc_sr_ab_2[] = {0, 0, 1, 1, 0, 0, 0, 0};
 #endif
 #if NET_TC_TX_COUNT == 3 || NET_TC_RX_COUNT == 3
-static const u8_t priority2tc_sr_ab_3[] = {0, 0, 1, 2, 0, 0, 0, 0};
+static const uint8_t priority2tc_sr_ab_3[] = {0, 0, 1, 2, 0, 0, 0, 0};
 #endif
 #if NET_TC_TX_COUNT == 4 || NET_TC_RX_COUNT == 4
-static const u8_t priority2tc_sr_ab_4[] = {0, 0, 2, 3, 1, 1, 1, 1};
+static const uint8_t priority2tc_sr_ab_4[] = {0, 0, 2, 3, 1, 1, 1, 1};
 #endif
 #if NET_TC_TX_COUNT == 5 || NET_TC_RX_COUNT == 5
-static const u8_t priority2tc_sr_ab_5[] = {0, 0, 3, 4, 1, 1, 2, 2};
+static const uint8_t priority2tc_sr_ab_5[] = {0, 0, 3, 4, 1, 1, 2, 2};
 #endif
 #if NET_TC_TX_COUNT == 6 || NET_TC_RX_COUNT == 6
-static const u8_t priority2tc_sr_ab_6[] = {0, 0, 4, 5, 1, 1, 2, 3};
+static const uint8_t priority2tc_sr_ab_6[] = {0, 0, 4, 5, 1, 1, 2, 3};
 #endif
 #if NET_TC_TX_COUNT == 7 || NET_TC_RX_COUNT == 7
-static const u8_t priority2tc_sr_ab_7[] = {0, 0, 5, 6, 1, 2, 3, 4};
+static const uint8_t priority2tc_sr_ab_7[] = {0, 0, 5, 6, 1, 2, 3, 4};
 #endif
 #if NET_TC_TX_COUNT == 8 || NET_TC_RX_COUNT == 8
-static const u8_t priority2tc_sr_ab_8[] = {1, 0, 6, 7, 2, 3, 4, 5};
+static const uint8_t priority2tc_sr_ab_8[] = {1, 0, 6, 7, 2, 3, 4, 5};
 #endif
 
-static const u8_t *tx_prio2tc_map = PRIORITY2TC_GEN(sr_ab, NET_TC_TX_COUNT);
-static const u8_t *rx_prio2tc_map = PRIORITY2TC_GEN(sr_ab, NET_TC_RX_COUNT);
+static const uint8_t *tx_prio2tc_map = PRIORITY2TC_GEN(sr_ab, NET_TC_TX_COUNT);
+static const uint8_t *rx_prio2tc_map = PRIORITY2TC_GEN(sr_ab, NET_TC_RX_COUNT);
 
 #elif defined(CONFIG_NET_TC_MAPPING_SR_CLASS_B_ONLY)
 
@@ -109,29 +109,29 @@ static const u8_t *rx_prio2tc_map = PRIORITY2TC_GEN(sr_ab, NET_TC_RX_COUNT);
  */
 
 #if NET_TC_TX_COUNT == 2 || NET_TC_RX_COUNT == 2
-static const u8_t priority2tc_sr_b_2[] = {0, 0, 1, 0, 0, 0, 0, 0};
+static const uint8_t priority2tc_sr_b_2[] = {0, 0, 1, 0, 0, 0, 0, 0};
 #endif
 #if NET_TC_TX_COUNT == 3 || NET_TC_RX_COUNT == 3
-static const u8_t priority2tc_sr_b_3[] = {0, 0, 2, 0, 1, 1, 1, 1};
+static const uint8_t priority2tc_sr_b_3[] = {0, 0, 2, 0, 1, 1, 1, 1};
 #endif
 #if NET_TC_TX_COUNT == 4 || NET_TC_RX_COUNT == 4
-static const u8_t priority2tc_sr_b_4[] = {0, 0, 3, 0, 1, 1, 2, 2};
+static const uint8_t priority2tc_sr_b_4[] = {0, 0, 3, 0, 1, 1, 2, 2};
 #endif
 #if NET_TC_TX_COUNT == 5 || NET_TC_RX_COUNT == 5
-static const u8_t priority2tc_sr_b_5[] = {0, 0, 4, 1, 2, 2, 3, 3};
+static const uint8_t priority2tc_sr_b_5[] = {0, 0, 4, 1, 2, 2, 3, 3};
 #endif
 #if NET_TC_TX_COUNT == 6 || NET_TC_RX_COUNT == 6
-static const u8_t priority2tc_sr_b_6[] = {0, 0, 5, 1, 2, 2, 3, 4};
+static const uint8_t priority2tc_sr_b_6[] = {0, 0, 5, 1, 2, 2, 3, 4};
 #endif
 #if NET_TC_TX_COUNT == 7 || NET_TC_RX_COUNT == 7
-static const u8_t priority2tc_sr_b_7[] = {1, 0, 6, 2, 3, 3, 4, 5};
+static const uint8_t priority2tc_sr_b_7[] = {1, 0, 6, 2, 3, 3, 4, 5};
 #endif
 #if NET_TC_TX_COUNT == 8 || NET_TC_RX_COUNT == 8
-static const u8_t priority2tc_sr_b_8[] = {1, 0, 7, 2, 3, 4, 5, 6};
+static const uint8_t priority2tc_sr_b_8[] = {1, 0, 7, 2, 3, 4, 5, 6};
 #endif
 
-static const u8_t *tx_prio2tc_map = PRIORITY2TC_GEN(sr_b, NET_TC_TX_COUNT);
-static const u8_t *rx_prio2tc_map = PRIORITY2TC_GEN(sr_b, NET_TC_RX_COUNT);
+static const uint8_t *tx_prio2tc_map = PRIORITY2TC_GEN(sr_b, NET_TC_TX_COUNT);
+static const uint8_t *rx_prio2tc_map = PRIORITY2TC_GEN(sr_b, NET_TC_RX_COUNT);
 
 #endif
 
diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c
index 188d1ed3f0..f1a946e7e1 100644
--- a/subsys/net/ip/route.c
+++ b/subsys/net/ip/route.c
@@ -62,7 +62,7 @@ static inline struct net_nbr *get_nexthop_nbr(struct net_nbr *start, int idx)
 	NET_ASSERT(idx < CONFIG_NET_MAX_NEXTHOPS, "idx %d >= max %d",
 		   idx, CONFIG_NET_MAX_NEXTHOPS);
 
-	return (struct net_nbr *)((u8_t *)start +
+	return (struct net_nbr *)((uint8_t *)start +
 			((sizeof(struct net_nbr) + start->size) * idx));
 }
 
@@ -131,7 +131,7 @@ struct net_nbr *net_route_get_nbr(struct net_route_entry *route)
 			continue;
 		}
 
-		if (nbr->data == (u8_t *)route) {
+		if (nbr->data == (uint8_t *)route) {
 			if (!nbr->ref) {
 				return NULL;
 			}
@@ -177,7 +177,7 @@ static inline void nbr_free(struct net_nbr *nbr)
 
 static struct net_nbr *nbr_new(struct net_if *iface,
 			       struct in6_addr *addr,
-			       u8_t prefix_len)
+			       uint8_t prefix_len)
 {
 	struct net_nbr *nbr = net_nbr_get(&net_nbr_routes.table);
 
@@ -261,7 +261,7 @@ struct net_route_entry *net_route_lookup(struct net_if *iface,
 					 struct in6_addr *dst)
 {
 	struct net_route_entry *route, *found = NULL;
-	u8_t longest_match = 0U;
+	uint8_t longest_match = 0U;
 	int i;
 
 	for (i = 0; i < CONFIG_NET_MAX_ROUTES && longest_match < 128; i++) {
@@ -278,8 +278,8 @@ struct net_route_entry *net_route_lookup(struct net_if *iface,
 		route = net_route_data(nbr);
 
 		if (route->prefix_len >= longest_match &&
-		    net_ipv6_is_prefix((u8_t *)dst,
-				       (u8_t *)&route->addr,
+		    net_ipv6_is_prefix((uint8_t *)dst,
+				       (uint8_t *)&route->addr,
 				       route->prefix_len)) {
 			found = route;
 			longest_match = route->prefix_len;
@@ -297,7 +297,7 @@ struct net_route_entry *net_route_lookup(struct net_if *iface,
 
 struct net_route_entry *net_route_add(struct net_if *iface,
 				      struct in6_addr *addr,
-				      u8_t prefix_len,
+				      uint8_t prefix_len,
 				      struct in6_addr *nexthop)
 {
 	struct net_linkaddr_storage *nexthop_lladdr;
diff --git a/subsys/net/ip/route.h b/subsys/net/ip/route.h
index 4da00db691..1bd54def94 100644
--- a/subsys/net/ip/route.h
+++ b/subsys/net/ip/route.h
@@ -58,7 +58,7 @@ struct net_route_entry {
 	struct in6_addr addr;
 
 	/** IPv6 address/prefix length. */
-	u8_t prefix_len;
+	uint8_t prefix_len;
 };
 
 /**
@@ -96,7 +96,7 @@ static inline struct net_route_entry *net_route_lookup(struct net_if *iface,
  */
 struct net_route_entry *net_route_add(struct net_if *iface,
 				      struct in6_addr *addr,
-				      u8_t prefix_len,
+				      uint8_t prefix_len,
 				      struct in6_addr *nexthop);
 
 /**
@@ -184,7 +184,7 @@ struct net_route_entry_mcast {
 	struct in6_addr group;
 
 	/** Routing entry lifetime in seconds. */
-	u32_t lifetime;
+	uint32_t lifetime;
 
 	/** Is this entry in user or not */
 	bool is_used;
diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index 0cc1d8b40a..f2406f2f82 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -47,11 +47,11 @@ static struct net_tcp tcp_context[NET_MAX_TCP_CONTEXT];
 
 static struct tcp_backlog_entry {
 	struct net_tcp *tcp;
-	u32_t send_seq;
-	u32_t send_ack;
+	uint32_t send_seq;
+	uint32_t send_ack;
 	struct k_delayed_work ack_timer;
 	struct sockaddr remote;
-	u16_t send_mss;
+	uint16_t send_mss;
 } tcp_backlog[CONFIG_NET_TCP_BACKLOG_SIZE];
 
 #if defined(CONFIG_NET_TCP_ACK_TIMEOUT)
@@ -99,11 +99,11 @@ static struct tcp_backlog_entry {
 
 
 struct tcp_segment {
-	u32_t seq;
-	u32_t ack;
-	u16_t wnd;
-	u8_t flags;
-	u8_t optlen;
+	uint32_t seq;
+	uint32_t ack;
+	uint16_t wnd;
+	uint8_t flags;
+	uint8_t optlen;
 	void *options;
 	struct sockaddr_ptr *src_addr;
 	const struct sockaddr *dst_addr;
@@ -122,8 +122,8 @@ static void net_tcp_trace(struct net_pkt *pkt,
 			  struct net_tcp *tcp,
 			  struct net_tcp_hdr *tcp_hdr)
 {
-	u32_t rel_ack, ack;
-	u8_t flags;
+	uint32_t rel_ack, ack;
+	uint8_t flags;
 
 	if (CONFIG_NET_TCP_LOG_LEVEL < LOG_LEVEL_DBG) {
 		return;
@@ -166,7 +166,7 @@ static void net_tcp_trace(struct net_pkt *pkt,
 
 static inline k_timeout_t retry_timeout(const struct net_tcp *tcp)
 {
-	return K_MSEC(((u32_t)1 << tcp->retry_timeout_shift) *
+	return K_MSEC(((uint32_t)1 << tcp->retry_timeout_shift) *
 		      CONFIG_NET_TCP_INIT_RETRANSMISSION_TIMEOUT);
 }
 
@@ -424,9 +424,9 @@ static int prepare_segment(struct net_tcp *tcp,
 	struct net_context *context = tcp->context;
 	struct net_buf *tail = NULL;
 	struct net_tcp_hdr *tcp_hdr;
-	u16_t dst_port, src_port;
+	uint16_t dst_port, src_port;
 	bool pkt_allocated;
-	u8_t optlen = 0U;
+	uint8_t optlen = 0U;
 	int status;
 
 	NET_ASSERT(context);
@@ -559,20 +559,20 @@ fail:
 	return status;
 }
 
-u32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp)
+uint32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp)
 {
 	return tcp->recv_wnd;
 }
 
-int net_tcp_prepare_segment(struct net_tcp *tcp, u8_t flags,
+int net_tcp_prepare_segment(struct net_tcp *tcp, uint8_t flags,
 			    void *options, size_t optlen,
 			    const struct sockaddr_ptr *local,
 			    const struct sockaddr *remote,
 			    struct net_pkt **send_pkt)
 {
 	struct tcp_segment segment = { 0 };
-	u32_t seq;
-	u16_t wnd;
+	uint32_t seq;
+	uint16_t wnd;
 	int status;
 
 	if (!local) {
@@ -638,9 +638,9 @@ int net_tcp_prepare_segment(struct net_tcp *tcp, u8_t flags,
 	return 0;
 }
 
-static inline u32_t get_size(u32_t pos1, u32_t pos2)
+static inline uint32_t get_size(uint32_t pos1, uint32_t pos2)
 {
-	u32_t size;
+	uint32_t size;
 
 	if (pos1 <= pos2) {
 		size = pos2 - pos1;
@@ -669,7 +669,7 @@ static inline size_t ip_max_packet_len(struct in_addr *dest_ip)
 #define ip_max_packet_len(...) 0
 #endif /* CONFIG_NET_IPV4 */
 
-u16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
+uint16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
 {
 	sa_family_t family = net_context_get_family(tcp->context);
 
@@ -710,10 +710,10 @@ u16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
 	return 0;
 }
 
-static void net_tcp_set_syn_opt(struct net_tcp *tcp, u8_t *options,
-				u8_t *optionlen)
+static void net_tcp_set_syn_opt(struct net_tcp *tcp, uint8_t *options,
+				uint8_t *optionlen)
 {
-	u32_t recv_mss;
+	uint32_t recv_mss;
 
 	*optionlen = 0U;
 
@@ -726,7 +726,7 @@ static void net_tcp_set_syn_opt(struct net_tcp *tcp, u8_t *options,
 
 	recv_mss |= (NET_TCP_MSS_OPT << 24) | (NET_TCP_MSS_SIZE << 16);
 	UNALIGNED_PUT(htonl(recv_mss),
-		      (u32_t *)(options + *optionlen));
+		      (uint32_t *)(options + *optionlen));
 
 	*optionlen += NET_TCP_MSS_SIZE;
 }
@@ -734,8 +734,8 @@ static void net_tcp_set_syn_opt(struct net_tcp *tcp, u8_t *options,
 int net_tcp_prepare_ack(struct net_tcp *tcp, const struct sockaddr *remote,
 			struct net_pkt **pkt)
 {
-	u8_t options[NET_TCP_MAX_OPT_SIZE];
-	u8_t optionlen;
+	uint8_t options[NET_TCP_MAX_OPT_SIZE];
+	uint8_t optionlen;
 
 	switch (net_tcp_get_state(tcp)) {
 	case NET_TCP_SYN_RCVD:
@@ -1124,7 +1124,7 @@ int net_tcp_send_data(struct net_context *context, net_context_send_cb_t cb,
 	return 0;
 }
 
-bool net_tcp_ack_received(struct net_context *ctx, u32_t ack)
+bool net_tcp_ack_received(struct net_context *ctx, uint32_t ack)
 {
 	struct net_tcp *tcp = ctx->tcp;
 	sys_slist_t *list = &ctx->tcp->sent_list;
@@ -1145,8 +1145,8 @@ bool net_tcp_ack_received(struct net_context *ctx, u32_t ack)
 	while (!sys_slist_is_empty(list)) {
 		NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr);
 		struct net_tcp_hdr *tcp_hdr;
-		u32_t last_seq;
-		u32_t seq_len;
+		uint32_t last_seq;
+		uint32_t seq_len;
 
 		head = sys_slist_peek_head(list);
 		pkt = CONTAINER_OF(head, struct net_pkt, sent_list);
@@ -1249,7 +1249,7 @@ void net_tcp_init(void)
 static void validate_state_transition(enum net_tcp_state current,
 				      enum net_tcp_state new)
 {
-	static const u16_t valid_transitions[] = {
+	static const uint16_t valid_transitions[] = {
 		[NET_TCP_CLOSED] = 1 << NET_TCP_LISTEN |
 			1 << NET_TCP_SYN_SENT |
 			/* Initial transition from closed->established when
@@ -1394,7 +1394,7 @@ int net_tcp_finalize(struct net_pkt *pkt)
 int net_tcp_parse_opts(struct net_pkt *pkt, int opt_totlen,
 		       struct net_tcp_options *opts)
 {
-	u8_t opt, optlen;
+	uint8_t opt, optlen;
 
 	while (opt_totlen) {
 		if (net_pkt_read_u8(pkt, &opt)) {
@@ -1542,9 +1542,9 @@ int net_tcp_listen(struct net_context *context)
 	return -EOPNOTSUPP;
 }
 
-int net_tcp_update_recv_wnd(struct net_context *context, s32_t delta)
+int net_tcp_update_recv_wnd(struct net_context *context, int32_t delta)
 {
-	s32_t new_win;
+	int32_t new_win;
 
 	if (!context->tcp) {
 		NET_ERR("context->tcp == NULL");
@@ -1587,7 +1587,7 @@ static void tcp_copy_ip_addr_from_hdr(sa_family_t family,
 				      struct sockaddr *addr,
 				      bool is_src_addr)
 {
-	u16_t port;
+	uint16_t port;
 
 	if (is_src_addr) {
 		port = tcp_hdr->src_port;
@@ -1679,7 +1679,7 @@ static int tcp_backlog_syn(struct net_pkt *pkt,
 			   union net_ip_header *ip_hdr,
 			   struct net_tcp_hdr *tcp_hdr,
 			   struct net_context *context,
-			   u16_t send_mss)
+			   uint16_t send_mss)
 {
 	int empty_slot = -1;
 
@@ -1887,7 +1887,7 @@ static void print_send_info(struct net_pkt *pkt,
 			    const char *msg, const struct sockaddr *remote)
 {
 	if (CONFIG_NET_TCP_LOG_LEVEL >= LOG_LEVEL_DBG) {
-		u16_t port = 0U;
+		uint16_t port = 0U;
 
 		if (IS_ENABLED(CONFIG_NET_IPV4) &&
 		    net_pkt_family(pkt) == AF_INET) {
@@ -1915,8 +1915,8 @@ static inline int send_syn_segment(struct net_context *context,
 {
 	struct net_pkt *pkt = NULL;
 	int ret;
-	u8_t options[NET_TCP_MAX_OPT_SIZE];
-	u8_t optionlen = 0U;
+	uint8_t options[NET_TCP_MAX_OPT_SIZE];
+	uint8_t optionlen = 0U;
 
 	if (flags == NET_TCP_SYN) {
 		net_tcp_set_syn_opt(context->tcp, options, &optionlen);
@@ -2010,10 +2010,10 @@ static int send_reset(struct net_context *context,
 	return ret;
 }
 
-static u16_t adjust_data_len(struct net_pkt *pkt, struct net_tcp_hdr *tcp_hdr,
-			     u16_t data_len)
+static uint16_t adjust_data_len(struct net_pkt *pkt, struct net_tcp_hdr *tcp_hdr,
+			     uint16_t data_len)
 {
-	u8_t offset = tcp_hdr->offset >> 4;
+	uint8_t offset = tcp_hdr->offset >> 4;
 
 	/* We need to adjust the length of the data part if there
 	 * are TCP options.
@@ -2044,8 +2044,8 @@ NET_CONN_CB(tcp_established)
 	struct net_tcp_hdr *tcp_hdr = proto_hdr->tcp;
 	enum net_verdict ret = NET_OK;
 	bool do_not_send_ack = false;
-	u8_t tcp_flags;
-	u16_t data_len;
+	uint8_t tcp_flags;
+	uint16_t data_len;
 
 	k_mutex_lock(&context->lock, K_FOREVER);
 
@@ -2606,7 +2606,7 @@ int net_tcp_accept(struct net_context *context,
 {
 	struct sockaddr local_addr;
 	struct sockaddr *laddr = NULL;
-	u16_t lport = 0U;
+	uint16_t lport = 0U;
 	int ret;
 
 	NET_ASSERT(context->tcp);
@@ -2681,8 +2681,8 @@ int net_tcp_accept(struct net_context *context,
 int net_tcp_connect(struct net_context *context,
 		    const struct sockaddr *addr,
 		    struct sockaddr *laddr,
-		    u16_t rport,
-		    u16_t lport,
+		    uint16_t rport,
+		    uint16_t lport,
 		    k_timeout_t timeout,
 		    net_context_connect_cb_t cb,
 		    void *user_data)
diff --git a/subsys/net/ip/tcp2.c b/subsys/net/ip/tcp2.c
index a68b9a8f55..133eeca6a5 100644
--- a/subsys/net/ip/tcp2.c
+++ b/subsys/net/ip/tcp2.c
@@ -168,7 +168,7 @@ static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt,
 	return ret;
 }
 
-static const char *tcp_flags(u8_t flags)
+static const char *tcp_flags(uint8_t flags)
 {
 #define BUF_SIZE 25 /* 6 * 4 + 1 */
 	static char buf[BUF_SIZE];
@@ -223,7 +223,7 @@ static const char *tcp_th(struct net_pkt *pkt)
 
 	if (th->th_off < 5) {
 		len += snprintk(buf + len, BUF_SIZE - len,
-				"bogus th_off: %hu", (u16_t)th->th_off);
+				"bogus th_off: %hu", (uint16_t)th->th_off);
 		goto end;
 	}
 
@@ -358,7 +358,7 @@ static void tcp_send_process(struct k_work *work)
 			conn = NULL;
 		}
 	} else {
-		u8_t fl = th_get(pkt)->th_flags;
+		uint8_t fl = th_get(pkt)->th_flags;
 		bool forget = ACK == fl || PSH == fl || (ACK | PSH) == fl ||
 			RST & fl;
 
@@ -440,9 +440,9 @@ static const char *tcp_conn_state(struct tcp *conn, struct net_pkt *pkt)
 	return buf;
 }
 
-static u8_t *tcp_options_get(struct net_pkt *pkt, int tcp_options_len)
+static uint8_t *tcp_options_get(struct net_pkt *pkt, int tcp_options_len)
 {
-	static u8_t options[40]; /* TCP header max options size is 40 */
+	static uint8_t options[40]; /* TCP header max options size is 40 */
 	struct net_pkt_cursor backup;
 
 	net_pkt_cursor_backup(pkt, &backup);
@@ -459,8 +459,8 @@ static bool tcp_options_check(struct tcp_options *recv_options,
 			      struct net_pkt *pkt, ssize_t len)
 {
 	bool result = len > 0 && ((len % 4) == 0) ? true : false;
-	u8_t *options = tcp_options_get(pkt, len);
-	u8_t opt, opt_len;
+	uint8_t *options = tcp_options_get(pkt, len);
+	uint8_t opt, opt_len;
 
 	NET_DBG("len=%zd", len);
 
@@ -484,7 +484,7 @@ static bool tcp_options_check(struct tcp_options *recv_options,
 			}
 			opt_len = options[1];
 		}
-		NET_DBG("opt: %hu, opt_len: %hu", (u16_t)opt, (u16_t)opt_len);
+		NET_DBG("opt: %hu, opt_len: %hu", (uint16_t)opt, (uint16_t)opt_len);
 
 		if (opt_len < 2 || opt_len > len) {
 			result = false;
@@ -498,7 +498,7 @@ static bool tcp_options_check(struct tcp_options *recv_options,
 				goto end;
 			}
 
-			recv_options->mss = ntohs(*((u16_t *)(options + 2)));
+			recv_options->mss = ntohs(*((uint16_t *)(options + 2)));
 			recv_options->mss_found = true;
 			NET_DBG("MSS=%hu", recv_options->mss);
 			break;
@@ -571,8 +571,8 @@ static int tcp_finalize_pkt(struct net_pkt *pkt)
 	return -EINVAL;
 }
 
-static int tcp_header_add(struct tcp *conn, struct net_pkt *pkt, u8_t flags,
-			  u32_t seq)
+static int tcp_header_add(struct tcp *conn, struct net_pkt *pkt, uint8_t flags,
+			  uint32_t seq)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct tcphdr);
 	struct tcphdr *th;
@@ -616,8 +616,8 @@ static int ip_header_add(struct tcp *conn, struct net_pkt *pkt)
 	return -EINVAL;
 }
 
-static void tcp_out_ext(struct tcp *conn, u8_t flags, struct net_pkt *data,
-			u32_t seq)
+static void tcp_out_ext(struct tcp *conn, uint8_t flags, struct net_pkt *data,
+			uint32_t seq)
 {
 	struct net_pkt *pkt;
 	int ret;
@@ -666,7 +666,7 @@ out:
 	return;
 }
 
-static void tcp_out(struct tcp *conn, u8_t flags)
+static void tcp_out(struct tcp *conn, uint8_t flags)
 {
 	tcp_out_ext(conn, flags, NULL /* no data */, conn->seq);
 }
@@ -1063,7 +1063,7 @@ err:
 static void tcp_in(struct tcp *conn, struct net_pkt *pkt)
 {
 	struct tcphdr *th = pkt ? th_get(pkt) : NULL;
-	u8_t next = 0, fl = th ? th->th_flags : 0;
+	uint8_t next = 0, fl = th ? th->th_flags : 0;
 	size_t tcp_options_len = th ? (th->th_off - 5) * 4 : 0;
 	size_t len;
 
@@ -1160,7 +1160,7 @@ next_state:
 		}
 
 		if (th && net_tcp_seq_cmp(th_ack(th), conn->seq) > 0) {
-			u32_t len_acked = th_ack(th) - conn->seq;
+			uint32_t len_acked = th_ack(th) - conn->seq;
 
 			NET_DBG("conn: %p len_acked=%u", conn, len_acked);
 
@@ -1307,7 +1307,7 @@ int net_tcp_listen(struct net_context *context)
 	return 0;
 }
 
-int net_tcp_update_recv_wnd(struct net_context *context, s32_t delta)
+int net_tcp_update_recv_wnd(struct net_context *context, int32_t delta)
 {
 	ARG_UNUSED(context);
 	ARG_UNUSED(delta);
@@ -1368,7 +1368,7 @@ int net_tcp_send_data(struct net_context *context, net_context_send_cb_t cb,
 int net_tcp_connect(struct net_context *context,
 		    const struct sockaddr *remote_addr,
 		    struct sockaddr *local_addr,
-		    u16_t remote_port, u16_t local_port,
+		    uint16_t remote_port, uint16_t local_port,
 		    k_timeout_t timeout, net_context_connect_cb_t cb,
 		    void *user_data)
 {
@@ -1467,7 +1467,7 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb,
 {
 	struct tcp *conn = context->tcp;
 	struct sockaddr local_addr = { };
-	u16_t local_port, remote_port;
+	uint16_t local_port, remote_port;
 
 	if (!conn) {
 		return -EINVAL;
@@ -1817,8 +1817,8 @@ enum net_verdict tp_input(struct net_conn *net_conn,
 	return NET_DROP;
 }
 
-static void test_cb_register(sa_family_t family, u8_t proto, u16_t remote_port,
-			     u16_t local_port, net_conn_cb_t cb)
+static void test_cb_register(sa_family_t family, uint8_t proto, uint16_t remote_port,
+			     uint16_t local_port, net_conn_cb_t cb)
 {
 	struct net_conn_handle *conn_handle = NULL;
 	const struct sockaddr addr = { .sa_family = family, };
diff --git a/subsys/net/ip/tcp2.h b/subsys/net/ip/tcp2.h
index be5381f8f6..09a1ff6b8c 100644
--- a/subsys/net/ip/tcp2.h
+++ b/subsys/net/ip/tcp2.h
@@ -118,7 +118,7 @@ struct net_tcp_hdr *net_tcp_input(struct net_pkt *pkt,
 /* No ops, provided for compatibility with the old TCP */
 
 void net_tcp_init(void);
-int net_tcp_update_recv_wnd(struct net_context *context, s32_t delta);
+int net_tcp_update_recv_wnd(struct net_context *context, int32_t delta);
 int net_tcp_queue_data(struct net_context *context, struct net_pkt *pkt);
 int net_tcp_finalize(struct net_pkt *pkt);
 
diff --git a/subsys/net/ip/tcp2_priv.h b/subsys/net/ip/tcp2_priv.h
index db2dbfaab2..a7de670522 100644
--- a/subsys/net/ip/tcp2_priv.h
+++ b/subsys/net/ip/tcp2_priv.h
@@ -117,22 +117,22 @@ enum pkt_addr {
 };
 
 struct tcphdr {
-	u16_t th_sport;
-	u16_t th_dport;
-	u32_t th_seq;
-	u32_t th_ack;
+	uint16_t th_sport;
+	uint16_t th_dport;
+	uint32_t th_seq;
+	uint32_t th_ack;
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t th_x2:4;	/* unused */
-	u8_t th_off:4;	/* data offset */
+	uint8_t th_x2:4;	/* unused */
+	uint8_t th_off:4;	/* data offset */
 #endif
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t th_off:4;
-	u8_t th_x2:4;
+	uint8_t th_off:4;
+	uint8_t th_x2:4;
 #endif
-	u8_t th_flags;
-	u16_t th_win;
-	u16_t th_sum;
-	u16_t th_urp;
+	uint8_t th_flags;
+	uint16_t th_win;
+	uint16_t th_sum;
+	uint16_t th_urp;
 };
 
 enum th_flags {
@@ -170,8 +170,8 @@ union tcp_endpoint {
 };
 
 struct tcp_options {
-	u16_t mss;
-	u16_t window;
+	uint16_t mss;
+	uint16_t window;
 	bool mss_found : 1;
 	bool wnd_found : 1;
 };
@@ -182,19 +182,19 @@ struct tcp { /* TCP connection */
 	struct k_mutex lock;
 	void *recv_user_data;
 	enum tcp_state state;
-	u32_t seq;
-	u32_t ack;
+	uint32_t seq;
+	uint32_t ack;
 	union tcp_endpoint src;
 	union tcp_endpoint dst;
-	u16_t recv_win;
-	u16_t send_win;
+	uint16_t recv_win;
+	uint16_t send_win;
 	struct tcp_options recv_options;
 	struct k_delayed_work send_timer;
 	sys_slist_t send_queue;
 	struct k_delayed_work send_data_timer;
 	struct net_pkt *send_data;
 	size_t send_data_total;
-	u8_t send_data_retries;
+	uint8_t send_data_retries;
 	int unacked_len;
 	enum tcp_data_mode data_mode;
 	bool in_retransmission;
diff --git a/subsys/net/ip/tcp_internal.h b/subsys/net/ip/tcp_internal.h
index 655bbde348..0d25669385 100644
--- a/subsys/net/ip/tcp_internal.h
+++ b/subsys/net/ip/tcp_internal.h
@@ -99,7 +99,7 @@ enum net_tcp_state {
 
 /** Parsed TCP option values for net_tcp_parse_opts()  */
 struct net_tcp_options {
-	u16_t mss;
+	uint16_t mss;
 };
 
 /* Max received bytes to buffer internally */
@@ -133,13 +133,13 @@ struct net_tcp {
 	sys_slist_t sent_list;
 
 	/** Current sequence number. */
-	u32_t send_seq;
+	uint32_t send_seq;
 
 	/** Acknowledgment number to send in next packet. */
-	u32_t send_ack;
+	uint32_t send_ack;
 
 	/** Last ACK value sent */
-	u32_t sent_ack;
+	uint32_t sent_ack;
 
 	/** Accept callback to be called when the connection has been
 	 * established.
@@ -154,25 +154,25 @@ struct net_tcp {
 	/**
 	 * Current TCP receive window for our side
 	 */
-	u16_t recv_wnd;
+	uint16_t recv_wnd;
 
 	/**
 	 * Send MSS for the peer
 	 */
-	u16_t send_mss;
+	uint16_t send_mss;
 
 	/** Current retransmit period */
-	u32_t retry_timeout_shift : 5;
+	uint32_t retry_timeout_shift : 5;
 	/** Flags for the TCP */
-	u32_t flags : 8;
+	uint32_t flags : 8;
 	/** Current TCP state */
-	u32_t state : 4;
+	uint32_t state : 4;
 	/* An outbound FIN packet has been sent */
-	u32_t fin_sent : 1;
+	uint32_t fin_sent : 1;
 	/* An inbound FIN packet has been received */
-	u32_t fin_rcvd : 1;
-	/** Remaining bits in this u32_t */
-	u32_t _padding : 13;
+	uint32_t fin_rcvd : 1;
+	/** Remaining bits in this uint32_t */
+	uint32_t _padding : 13;
 };
 
 typedef void (*net_tcp_cb_t)(struct net_tcp *tcp, void *user_data);
@@ -199,11 +199,11 @@ static inline bool net_tcp_is_used(struct net_tcp *tcp)
  *
  * @return Return 0 if the registration succeed, <0 otherwise.
  */
-static inline int net_tcp_register(u8_t family,
+static inline int net_tcp_register(uint8_t family,
 				   const struct sockaddr *remote_addr,
 				   const struct sockaddr *local_addr,
-				   u16_t remote_port,
-				   u16_t local_port,
+				   uint16_t remote_port,
+				   uint16_t local_port,
 				   net_conn_cb_t cb,
 				   void *user_data,
 				   struct net_conn_handle **handle)
@@ -230,7 +230,7 @@ static inline int net_tcp_unregister(struct net_conn_handle *handle)
  *
  * @return Return a random TCP sequence number
  */
-static inline u32_t tcp_init_isn(void)
+static inline uint32_t tcp_init_isn(void)
 {
 	/* Randomise initial seq number */
 	return sys_rand32_get();
@@ -297,13 +297,13 @@ static inline int net_tcp_release(struct net_tcp *tcp)
  * @return 0 if ok, < 0 if error
  */
 #if defined(CONFIG_NET_NATIVE_TCP)
-int net_tcp_prepare_segment(struct net_tcp *tcp, u8_t flags,
+int net_tcp_prepare_segment(struct net_tcp *tcp, uint8_t flags,
 			    void *options, size_t optlen,
 			    const struct sockaddr_ptr *local,
 			    const struct sockaddr *remote,
 			    struct net_pkt **send_pkt);
 #else
-static inline int net_tcp_prepare_segment(struct net_tcp *tcp, u8_t flags,
+static inline int net_tcp_prepare_segment(struct net_tcp *tcp, uint8_t flags,
 					  void *options, size_t optlen,
 					  const struct sockaddr_ptr *local,
 					  const struct sockaddr *remote,
@@ -457,9 +457,9 @@ static inline int net_tcp_send_pkt(struct net_pkt *pkt)
  * @return False if ACK sequence number is invalid, true otherwise
  */
 #if defined(CONFIG_NET_NATIVE_TCP)
-bool net_tcp_ack_received(struct net_context *ctx, u32_t ack);
+bool net_tcp_ack_received(struct net_context *ctx, uint32_t ack);
 #else
-static inline bool net_tcp_ack_received(struct net_context *ctx, u32_t ack)
+static inline bool net_tcp_ack_received(struct net_context *ctx, uint32_t ack)
 {
 	ARG_UNUSED(ctx);
 	ARG_UNUSED(ack);
@@ -475,9 +475,9 @@ static inline bool net_tcp_ack_received(struct net_context *ctx, u32_t ack)
  * @return Maximum Segment Size
  */
 #if defined(CONFIG_NET_NATIVE_TCP)
-u16_t net_tcp_get_recv_mss(const struct net_tcp *tcp);
+uint16_t net_tcp_get_recv_mss(const struct net_tcp *tcp);
 #else
-static inline u16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
+static inline uint16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
 {
 	ARG_UNUSED(tcp);
 	return 0;
@@ -492,9 +492,9 @@ static inline u16_t net_tcp_get_recv_mss(const struct net_tcp *tcp)
  * @return Current TCP receive window
  */
 #if defined(CONFIG_NET_NATIVE_TCP)
-u32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp);
+uint32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp);
 #else
-static inline u32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp)
+static inline uint32_t net_tcp_get_recv_wnd(const struct net_tcp *tcp)
 {
 	ARG_UNUSED(tcp);
 	return 0;
@@ -648,10 +648,10 @@ static inline int net_tcp_listen(struct net_context *context)
  *         if TCP is not supported
  */
 #if defined(CONFIG_NET_NATIVE_TCP)
-int net_tcp_update_recv_wnd(struct net_context *context, s32_t delta);
+int net_tcp_update_recv_wnd(struct net_context *context, int32_t delta);
 #else
 static inline int net_tcp_update_recv_wnd(struct net_context *context,
-					  s32_t delta)
+					  int32_t delta)
 {
 	ARG_UNUSED(context);
 	ARG_UNUSED(delta);
@@ -738,8 +738,8 @@ static inline int net_tcp_accept(struct net_context *context,
 int net_tcp_connect(struct net_context *context,
 		    const struct sockaddr *addr,
 		    struct sockaddr *laddr,
-		    u16_t rport,
-		    u16_t lport,
+		    uint16_t rport,
+		    uint16_t lport,
 		    k_timeout_t timeout,
 		    net_context_connect_cb_t cb,
 		    void *user_data);
@@ -747,7 +747,7 @@ int net_tcp_connect(struct net_context *context,
 static inline int net_tcp_connect(struct net_context *context,
 				  const struct sockaddr *addr,
 				  struct sockaddr *laddr,
-				  u16_t rport, u16_t lport, k_timeout_t timeout,
+				  uint16_t rport, uint16_t lport, k_timeout_t timeout,
 				  net_context_connect_cb_t cb, void *user_data)
 {
 	ARG_UNUSED(context);
diff --git a/subsys/net/ip/tp.c b/subsys/net/ip/tp.c
index 7af47bd8ff..3dedf06a3a 100644
--- a/subsys/net/ip/tp.c
+++ b/subsys/net/ip/tp.c
@@ -35,9 +35,9 @@ size_t tp_str_to_hex(void *buf, size_t bufsize, const char *s)
 
 	for (i = 0, j = 0; i < len; i += 2, j++) {
 
-		u8_t byte = (s[i] - '0') << 4 | (s[i + 1] - '0');
+		uint8_t byte = (s[i] - '0') << 4 | (s[i + 1] - '0');
 
-		((u8_t *) buf)[j] = byte;
+		((uint8_t *) buf)[j] = byte;
 	}
 
 	return j;
@@ -56,7 +56,7 @@ void *tp_malloc(size_t size, const char *file, int line, const char *func)
 
 	mem->header = TP_MEM_HEADER_COOKIE;
 
-	mem->footer = (void *) ((u8_t *) &mem->mem + size);
+	mem->footer = (void *) ((uint8_t *) &mem->mem + size);
 	*mem->footer = TP_MEM_FOOTER_COOKIE;
 
 	sys_slist_append(&tp_mem, (sys_snode_t *) mem);
@@ -66,7 +66,7 @@ void *tp_malloc(size_t size, const char *file, int line, const char *func)
 
 static void dump(void *data, size_t len)
 {
-	u8_t *buf = data;
+	uint8_t *buf = data;
 	size_t i, width = 8;
 
 	for (i = 0; i < len; i++) {
@@ -109,7 +109,7 @@ void tp_mem_chk(struct tp_mem *mem)
 
 void tp_free(void *ptr, const char *file, int line, const char *func)
 {
-	struct tp_mem *mem = (void *)((u8_t *) ptr - sizeof(struct tp_mem));
+	struct tp_mem *mem = (void *)((uint8_t *) ptr - sizeof(struct tp_mem));
 
 	tp_mem_chk(mem);
 
@@ -285,7 +285,7 @@ void tp_pkt_stat(void)
 		(_seq)->of ? "OF" : "");				\
 }
 
-u32_t tp_seq_track(int kind, u32_t *pvalue, int req,
+uint32_t tp_seq_track(int kind, uint32_t *pvalue, int req,
 			const char *file, int line, const char *func)
 {
 	struct tp_seq *seq = k_calloc(1, sizeof(struct tp_seq));
@@ -582,7 +582,7 @@ void tp_out(sa_family_t af, struct net_if *iface, const char *msg,
 {
 	if (tp_trace) {
 		size_t json_len;
-		static u8_t buf[128]; /* TODO: Merge all static buffers and
+		static uint8_t buf[128]; /* TODO: Merge all static buffers and
 				       * eventually drop them
 				       */
 		struct tp_new tp = {
diff --git a/subsys/net/ip/tp.h b/subsys/net/ip/tp.h
index 661d2e80d9..3539ef4b54 100644
--- a/subsys/net/ip/tp.h
+++ b/subsys/net/ip/tp.h
@@ -146,7 +146,7 @@ struct net_pkt *tp_pkt_clone(struct net_pkt *pkt, const char *file, int line);
 void tp_pkt_unref(struct net_pkt *pkt, const char *file, int line);
 void tp_pkt_stat(void);
 
-u32_t tp_seq_track(int kind, u32_t *pvalue, int req,
+uint32_t tp_seq_track(int kind, uint32_t *pvalue, int req,
 			const char *file, int line, const char *func);
 void tp_seq_stat(void);
 
diff --git a/subsys/net/ip/tp_priv.h b/subsys/net/ip/tp_priv.h
index 1ab65deddd..66617703f7 100644
--- a/subsys/net/ip/tp_priv.h
+++ b/subsys/net/ip/tp_priv.h
@@ -42,9 +42,9 @@ struct tp_mem {
 	int line;
 	const char *func;
 	size_t size;
-	u32_t *footer;
-	u32_t header;
-	u8_t mem[];
+	uint32_t *footer;
+	uint32_t header;
+	uint8_t mem[];
 };
 
 struct tp_nbuf {
@@ -68,8 +68,8 @@ struct tp_seq {
 	const char *func;
 	int kind;
 	int req;
-	u32_t value;
-	u32_t old_value;
+	uint32_t value;
+	uint32_t old_value;
 	int of;
 };
 
diff --git a/subsys/net/ip/trickle.c b/subsys/net/ip/trickle.c
index c0095915a3..6737c9a52a 100644
--- a/subsys/net/ip/trickle.c
+++ b/subsys/net/ip/trickle.c
@@ -34,13 +34,13 @@ static inline bool is_tx_allowed(struct net_trickle *trickle)
 		(trickle->c < trickle->k);
 }
 
-static inline u32_t get_end(struct net_trickle *trickle)
+static inline uint32_t get_end(struct net_trickle *trickle)
 {
 	return trickle->Istart + trickle->I;
 }
 
 /* Returns a random time point t in [I/2 , I) */
-static u32_t get_t(u32_t I)
+static uint32_t get_t(uint32_t I)
 {
 	I >>= 1;
 
@@ -54,8 +54,8 @@ static void double_interval_timeout(struct k_work *work)
 	struct net_trickle *trickle = CONTAINER_OF(work,
 						   struct net_trickle,
 						   timer);
-	u32_t rand_time;
-	u32_t last_end = get_end(trickle);
+	uint32_t rand_time;
+	uint32_t last_end = get_end(trickle);
 
 	trickle->c = 0U;
 
@@ -88,13 +88,13 @@ static void double_interval_timeout(struct k_work *work)
 
 static inline void reschedule(struct net_trickle *trickle)
 {
-	u32_t now = k_uptime_get_32();
-	u32_t diff = get_end(trickle) - now;
+	uint32_t now = k_uptime_get_32();
+	uint32_t diff = get_end(trickle) - now;
 
 	NET_DBG("now %d end in %d", now, diff);
 
 	/* Did the clock wrap */
-	if ((s32_t)diff < 0) {
+	if ((int32_t)diff < 0) {
 		diff = 0U;
 		NET_DBG("Clock wrap");
 	}
@@ -126,7 +126,7 @@ static void trickle_timeout(struct k_work *work)
 
 static void setup_new_interval(struct net_trickle *trickle)
 {
-	u32_t t;
+	uint32_t t;
 
 	trickle->c = 0U;
 
@@ -147,9 +147,9 @@ static void setup_new_interval(struct net_trickle *trickle)
 	((Imin < 2) || (Imin > (TICK_MAX >> 1)))
 
 int net_trickle_create(struct net_trickle *trickle,
-		       u32_t Imin,
-		       u8_t Imax,
-		       u8_t k)
+		       uint32_t Imin,
+		       uint8_t Imax,
+		       uint8_t k)
 {
 	NET_ASSERT(trickle && Imax > 0 && k > 0 && !CHECK_IMIN(Imin));
 
diff --git a/subsys/net/ip/udp.c b/subsys/net/ip/udp.c
index 8476ba802b..71b541007d 100644
--- a/subsys/net/ip/udp.c
+++ b/subsys/net/ip/udp.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(net_udp, CONFIG_NET_UDP_LOG_LEVEL);
 
 #define PKT_WAIT_TIME K_SECONDS(1)
 
-int net_udp_create(struct net_pkt *pkt, u16_t src_port, u16_t dst_port)
+int net_udp_create(struct net_pkt *pkt, uint16_t src_port, uint16_t dst_port)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
 	struct net_udp_hdr *udp_hdr;
@@ -39,7 +39,7 @@ int net_udp_finalize(struct net_pkt *pkt)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
 	struct net_udp_hdr *udp_hdr;
-	u16_t length = 0;
+	uint16_t length = 0;
 
 	udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt, &udp_access);
 	if (!udp_hdr) {
@@ -124,11 +124,11 @@ out:
 	return udp_hdr == NULL ? NULL : hdr;
 }
 
-int net_udp_register(u8_t family,
+int net_udp_register(uint8_t family,
 		     const struct sockaddr *remote_addr,
 		     const struct sockaddr *local_addr,
-		     u16_t remote_port,
-		     u16_t local_port,
+		     uint16_t remote_port,
+		     uint16_t local_port,
 		     net_conn_cb_t cb,
 		     void *user_data,
 		     struct net_conn_handle **handle)
diff --git a/subsys/net/ip/udp_internal.h b/subsys/net/ip/udp_internal.h
index 7159a69246..106d50fdfb 100644
--- a/subsys/net/ip/udp_internal.h
+++ b/subsys/net/ip/udp_internal.h
@@ -40,10 +40,10 @@ extern "C" {
  * @return 0 on success, negative errno otherwise.
  */
 #if defined(CONFIG_NET_NATIVE_UDP)
-int net_udp_create(struct net_pkt *pkt, u16_t src_port, u16_t dst_port);
+int net_udp_create(struct net_pkt *pkt, uint16_t src_port, uint16_t dst_port);
 #else
 static inline int net_udp_create(struct net_pkt *pkt,
-				 u16_t src_port, u16_t dst_port)
+				 uint16_t src_port, uint16_t dst_port)
 {
 	ARG_UNUSED(pkt);
 	ARG_UNUSED(src_port);
@@ -111,11 +111,11 @@ struct net_udp_hdr *net_udp_input(struct net_pkt *pkt,
  *
  * @return Return 0 if the registration succeed, <0 otherwise.
  */
-int net_udp_register(u8_t family,
+int net_udp_register(uint8_t family,
 		     const struct sockaddr *remote_addr,
 		     const struct sockaddr *local_addr,
-		     u16_t remote_port,
-		     u16_t local_port,
+		     uint16_t remote_port,
+		     uint16_t local_port,
 		     net_conn_cb_t cb,
 		     void *user_data,
 		     struct net_conn_handle **handle);
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index 08e606711b..8a82743673 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -62,7 +62,7 @@ const char *net_proto2str(int family, int proto)
 	return "UNK_PROTO";
 }
 
-char *net_byte_to_hex(char *ptr, u8_t byte, char base, bool pad)
+char *net_byte_to_hex(char *ptr, uint8_t byte, char base, bool pad)
 {
 	int i, val;
 
@@ -82,10 +82,10 @@ char *net_byte_to_hex(char *ptr, u8_t byte, char base, bool pad)
 	return ptr;
 }
 
-char *net_sprint_ll_addr_buf(const u8_t *ll, u8_t ll_len,
+char *net_sprint_ll_addr_buf(const uint8_t *ll, uint8_t ll_len,
 			     char *buf, int buflen)
 {
-	u8_t i, len, blen;
+	uint8_t i, len, blen;
 	char *ptr = buf;
 
 	switch (ll_len) {
@@ -117,9 +117,9 @@ char *net_sprint_ll_addr_buf(const u8_t *ll, u8_t ll_len,
 	return buf;
 }
 
-static int net_value_to_udec(char *buf, u32_t value, int precision)
+static int net_value_to_udec(char *buf, uint32_t value, int precision)
 {
-	u32_t divisor;
+	uint32_t divisor;
 	int i;
 	int temp;
 	char *start = buf;
@@ -147,23 +147,23 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src,
 {
 	struct in_addr *addr;
 	struct in6_addr *addr6;
-	u16_t *w;
-	u8_t i, bl, bh, longest = 1U;
-	s8_t pos = -1;
+	uint16_t *w;
+	uint8_t i, bl, bh, longest = 1U;
+	int8_t pos = -1;
 	char delim = ':';
 	unsigned char zeros[8] = { 0 };
 	char *ptr = dst;
 	int len = -1;
-	u16_t value;
+	uint16_t value;
 	bool needcolon = false;
 
 	if (family == AF_INET6) {
 		addr6 = (struct in6_addr *)src;
-		w = (u16_t *)addr6->s6_addr16;
+		w = (uint16_t *)addr6->s6_addr16;
 		len = 8;
 
 		for (i = 0U; i < 8; i++) {
-			u8_t j;
+			uint8_t j;
 
 			for (j = i; j < 8; j++) {
 				if (UNALIGNED_GET(&w[j]) != 0) {
@@ -196,9 +196,9 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src,
 	for (i = 0U; i < len; i++) {
 		/* IPv4 address a.b.c.d */
 		if (len == 4) {
-			u8_t l;
+			uint8_t l;
 
-			value = (u32_t)addr->s4_addr[i];
+			value = (uint32_t)addr->s4_addr[i];
 
 			/* net_byte_to_udec() eats 0 */
 			if (value == 0U) {
@@ -233,7 +233,7 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src,
 			needcolon = false;
 		}
 
-		value = (u32_t)sys_be16_to_cpu(UNALIGNED_GET(&w[i]));
+		value = (uint32_t)sys_be16_to_cpu(UNALIGNED_GET(&w[i]));
 		bh = value >> 8;
 		bl = value & 0xff;
 
@@ -489,10 +489,10 @@ int z_vrfy_net_addr_pton(sa_family_t family, const char *src,
 #include <syscalls/net_addr_pton_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
-static u16_t calc_chksum(u16_t sum, const u8_t *data, size_t len)
+static uint16_t calc_chksum(uint16_t sum, const uint8_t *data, size_t len)
 {
-	const u8_t *end;
-	u16_t tmp;
+	const uint8_t *end;
+	uint16_t tmp;
 
 	end = data + len - 1;
 
@@ -517,7 +517,7 @@ static u16_t calc_chksum(u16_t sum, const u8_t *data, size_t len)
 	return sum;
 }
 
-static inline u16_t pkt_calc_chksum(struct net_pkt *pkt, u16_t sum)
+static inline uint16_t pkt_calc_chksum(struct net_pkt *pkt, uint16_t sum)
 {
 	struct net_pkt_cursor *cur = &pkt->cursor;
 	size_t len;
@@ -554,10 +554,10 @@ static inline u16_t pkt_calc_chksum(struct net_pkt *pkt, u16_t sum)
 	return sum;
 }
 
-u16_t net_calc_chksum(struct net_pkt *pkt, u8_t proto)
+uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 {
 	size_t len = 0U;
-	u16_t sum = 0U;
+	uint16_t sum = 0U;
 	struct net_pkt_cursor backup;
 	bool ow;
 
@@ -603,9 +603,9 @@ u16_t net_calc_chksum(struct net_pkt *pkt, u8_t proto)
 }
 
 #if defined(CONFIG_NET_IPV4)
-u16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
+uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 {
-	u16_t sum;
+	uint16_t sum;
 
 	sum = calc_chksum(0, pkt->buffer->data,
 			  net_pkt_ip_hdr_len(pkt) +
@@ -618,7 +618,7 @@ u16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 #endif /* CONFIG_NET_IPV4 */
 
 #if defined(CONFIG_NET_IPV6) || defined(CONFIG_NET_IPV4)
-static bool convert_port(const char *buf, u16_t *port)
+static bool convert_port(const char *buf, uint16_t *port)
 {
 	unsigned long tmp;
 	char *endptr;
@@ -644,7 +644,7 @@ static bool parse_ipv6(const char *str, size_t str_len,
 	struct in6_addr *addr6;
 	char ipaddr[INET6_ADDRSTRLEN + 1];
 	int end, len, ret, i;
-	u16_t port;
+	uint16_t port;
 
 	len = MIN(INET6_ADDRSTRLEN, str_len);
 
@@ -738,7 +738,7 @@ static bool parse_ipv4(const char *str, size_t str_len,
 	char ipaddr[NET_IPV4_ADDR_LEN + 1];
 	struct in_addr *addr4;
 	int end, len, ret, i;
-	u16_t port;
+	uint16_t port;
 
 	len = MIN(NET_IPV4_ADDR_LEN, str_len);
 
@@ -846,7 +846,7 @@ bool net_ipaddr_parse(const char *str, size_t str_len, struct sockaddr *addr)
 	return false;
 }
 
-int net_bytes_from_str(u8_t *buf, int buf_len, const char *src)
+int net_bytes_from_str(uint8_t *buf, int buf_len, const char *src)
 {
 	unsigned int i;
 	char *endptr;
diff --git a/subsys/net/l2/bluetooth/bluetooth.c b/subsys/net/l2/bluetooth/bluetooth.c
index c89fe00760..6c1225079c 100644
--- a/subsys/net/l2/bluetooth/bluetooth.c
+++ b/subsys/net/l2/bluetooth/bluetooth.c
@@ -355,7 +355,7 @@ static const struct bt_data sd[] = {
 	BT_DATA(BT_DATA_NAME_COMPLETE, DEVICE_NAME, DEVICE_NAME_LEN),
 };
 
-static int bt_advertise(u32_t mgmt_request, struct net_if *iface, void *data,
+static int bt_advertise(uint32_t mgmt_request, struct net_if *iface, void *data,
 		      size_t len)
 {
 	if (!strcmp(data, "on")) {
@@ -370,7 +370,7 @@ static int bt_advertise(u32_t mgmt_request, struct net_if *iface, void *data,
 	return 0;
 }
 
-static int bt_connect(u32_t mgmt_request, struct net_if *iface, void *data,
+static int bt_connect(uint32_t mgmt_request, struct net_if *iface, void *data,
 		      size_t len)
 {
 	struct bt_if_conn *conn = net_bt_get_conn(iface);
@@ -396,7 +396,7 @@ static int bt_connect(u32_t mgmt_request, struct net_if *iface, void *data,
 				 BT_LE_CONN_PARAM_DEFAULT, &default_conn);
 }
 
-static bool eir_found(u8_t type, const u8_t *data, u8_t data_len,
+static bool eir_found(uint8_t type, const uint8_t *data, uint8_t data_len,
 		      void *user_data)
 {
 	int i;
@@ -405,14 +405,14 @@ static bool eir_found(u8_t type, const u8_t *data, u8_t data_len,
 		return false;
 	}
 
-	if (data_len % sizeof(u16_t) != 0U) {
+	if (data_len % sizeof(uint16_t) != 0U) {
 		NET_ERR("AD malformed\n");
 		return false;
 	}
 
-	for (i = 0; i < data_len; i += sizeof(u16_t)) {
+	for (i = 0; i < data_len; i += sizeof(uint16_t)) {
 		struct bt_uuid *uuid;
-		u16_t u16;
+		uint16_t u16;
 
 		memcpy(&u16, &data[i], sizeof(u16));
 		uuid = BT_UUID_DECLARE_16(sys_le16_to_cpu(u16));
@@ -439,13 +439,13 @@ static bool eir_found(u8_t type, const u8_t *data, u8_t data_len,
 }
 
 static bool ad_parse(struct net_buf_simple *ad,
-		     bool (*func)(u8_t type, const u8_t *data,
-				  u8_t data_len, void *user_data),
+		     bool (*func)(uint8_t type, const uint8_t *data,
+				  uint8_t data_len, void *user_data),
 		     void *user_data)
 {
 	while (ad->len > 1) {
-		u8_t len = net_buf_simple_pull_u8(ad);
-		u8_t type;
+		uint8_t len = net_buf_simple_pull_u8(ad);
+		uint8_t type;
 
 		/* Check for early termination */
 		if (len == 0U) {
@@ -469,7 +469,7 @@ static bool ad_parse(struct net_buf_simple *ad,
 	return false;
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 			 struct net_buf_simple *ad)
 {
 	/* We're only interested in connectable events */
@@ -509,7 +509,7 @@ static void bt_scan_off(void)
 	}
 }
 
-static int bt_scan(u32_t mgmt_request, struct net_if *iface, void *data,
+static int bt_scan(uint32_t mgmt_request, struct net_if *iface, void *data,
 		   size_t len)
 {
 	if (!strcmp(data, "on") || !strcmp(data, "active")) {
@@ -525,7 +525,7 @@ static int bt_scan(u32_t mgmt_request, struct net_if *iface, void *data,
 	return 0;
 }
 
-static int bt_disconnect(u32_t mgmt_request, struct net_if *iface,
+static int bt_disconnect(uint32_t mgmt_request, struct net_if *iface,
 			 void *data, size_t len)
 {
 	struct bt_if_conn *conn = net_bt_get_conn(iface);
@@ -544,7 +544,7 @@ static int bt_disconnect(u32_t mgmt_request, struct net_if *iface,
 	return bt_l2cap_chan_disconnect(&conn->ipsp_chan.chan);
 }
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	int i;
 
@@ -577,7 +577,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	if (conn != default_conn) {
 		return;
diff --git a/subsys/net/l2/canbus/6locan.c b/subsys/net/l2/canbus/6locan.c
index 78e224194c..2af451415c 100644
--- a/subsys/net/l2/canbus/6locan.c
+++ b/subsys/net/l2/canbus/6locan.c
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(net_l2_canbus, CONFIG_NET_L2_CANBUS_LOG_LEVEL);
 #define NET_CAN_DAD_SEND_RETRY 5
 #define NET_CAN_DAD_TIMEOUT K_MSEC(100)
 
-extern u16_t net_calc_chksum(struct net_pkt *pkt, u8_t proto);
+extern uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto);
 
 static struct canbus_l2_ctx l2_ctx;
 
@@ -43,9 +43,9 @@ char *net_sprint_addr(sa_family_t af, const void *addr);
 #if CONFIG_NET_L2_CANBUS_LOG_LEVEL >= LOG_LEVEL_DBG
 static void canbus_print_ip_hdr(struct net_ipv6_hdr *ip_hdr)
 {
-	u8_t version = (ip_hdr->vtc >> 4);
-	u8_t tc = ((ip_hdr->vtc & 0x0F) << 4) | ((ip_hdr->tcflow & 0xF0 >> 4));
-	u32_t flow = ((ip_hdr->tcflow & 0x0F) << 16) | ip_hdr->flow;
+	uint8_t version = (ip_hdr->vtc >> 4);
+	uint8_t tc = ((ip_hdr->vtc & 0x0F) << 4) | ((ip_hdr->tcflow & 0xF0 >> 4));
+	uint32_t flow = ((ip_hdr->tcflow & 0x0F) << 16) | ip_hdr->flow;
 
 	NET_DBG("IP header: Version: 0x%x, TC: 0x%x, Flow Label: 0x%x, "
 		"Payload Length: %u, Next Header: 0x%x, Hop Limit: %u, "
@@ -145,7 +145,7 @@ static void canbus_st_min_timeout(struct _timeout *t)
 	k_work_submit_to_queue(&net_canbus_workq, &ctx->pkt->work);
 }
 
-static k_timeout_t canbus_stmin_to_ticks(u8_t stmin)
+static k_timeout_t canbus_stmin_to_ticks(uint8_t stmin)
 {
 	/* According to ISO 15765-2 stmin should be 127ms if value is corrupt */
 	if (stmin > NET_CAN_STMIN_MAX ||
@@ -158,21 +158,21 @@ static k_timeout_t canbus_stmin_to_ticks(u8_t stmin)
 	return K_MSEC(stmin);
 }
 
-static u16_t canbus_get_lladdr(struct net_linkaddr *net_lladdr)
+static uint16_t canbus_get_lladdr(struct net_linkaddr *net_lladdr)
 {
-	NET_ASSERT(net_lladdr->len == sizeof(u16_t));
+	NET_ASSERT(net_lladdr->len == sizeof(uint16_t));
 
-	return sys_be16_to_cpu(UNALIGNED_GET((u16_t *)net_lladdr->addr));
+	return sys_be16_to_cpu(UNALIGNED_GET((uint16_t *)net_lladdr->addr));
 }
 
-static u16_t canbus_get_src_lladdr(struct net_pkt *pkt)
+static uint16_t canbus_get_src_lladdr(struct net_pkt *pkt)
 {
 	return net_pkt_lladdr_src(pkt)->type == NET_LINK_CANBUS ?
 	       canbus_get_lladdr(net_pkt_lladdr_src(pkt)) :
 	       NET_CAN_ETH_TRANSLATOR_ADDR;
 }
 
-static u16_t canbus_get_dest_lladdr(struct net_pkt *pkt)
+static uint16_t canbus_get_dest_lladdr(struct net_pkt *pkt)
 {
 	return net_pkt_lladdr_dst(pkt)->type == NET_LINK_CANBUS &&
 	       net_pkt_lladdr_dst(pkt)->len == sizeof(struct net_canbus_lladdr) ?
@@ -182,7 +182,7 @@ static u16_t canbus_get_dest_lladdr(struct net_pkt *pkt)
 
 static inline bool canbus_dest_is_mcast(struct net_pkt *pkt)
 {
-	u16_t lladdr_be = UNALIGNED_GET((u16_t *)net_pkt_lladdr_dst(pkt)->addr);
+	uint16_t lladdr_be = UNALIGNED_GET((uint16_t *)net_pkt_lladdr_dst(pkt)->addr);
 
 	return (sys_be16_to_cpu(lladdr_be) & CAN_NET_IF_IS_MCAST_BIT);
 }
@@ -261,8 +261,8 @@ static inline void canbus_cpy_lladdr(struct net_pkt *dst, struct net_pkt *src)
 }
 
 
-static struct canbus_isotp_rx_ctx *canbus_get_rx_ctx(u8_t state,
-						     u16_t src_addr)
+static struct canbus_isotp_rx_ctx *canbus_get_rx_ctx(uint8_t state,
+						     uint16_t src_addr)
 {
 	int i;
 	struct canbus_isotp_rx_ctx *ret = NULL;
@@ -290,8 +290,8 @@ static struct canbus_isotp_rx_ctx *canbus_get_rx_ctx(u8_t state,
 	return ret;
 }
 
-static struct canbus_isotp_tx_ctx *canbus_get_tx_ctx(u8_t state,
-						     u16_t dest_addr)
+static struct canbus_isotp_tx_ctx *canbus_get_tx_ctx(uint8_t state,
+						     uint16_t dest_addr)
 {
 	int i;
 	struct canbus_isotp_tx_ctx *ret = NULL;
@@ -319,9 +319,9 @@ static struct canbus_isotp_tx_ctx *canbus_get_tx_ctx(u8_t state,
 	return ret;
 }
 
-static inline u16_t canbus_receive_get_ff_length(struct net_pkt *pkt)
+static inline uint16_t canbus_receive_get_ff_length(struct net_pkt *pkt)
 {
-	u16_t len;
+	uint16_t len;
 	int ret;
 
 	ret = net_pkt_read_be16(pkt, &len);
@@ -343,7 +343,7 @@ static inline size_t canbus_get_sf_length(struct net_pkt *pkt)
 }
 
 static inline void canbus_set_frame_datalength(struct zcan_frame *frame,
-					       u8_t length)
+					       uint8_t length)
 {
 	/* TODO: Needs update when CAN FD support is added */
 	NET_ASSERT(length <= NET_CAN_DL);
@@ -380,7 +380,7 @@ static enum net_verdict canbus_finish_pkt(struct net_pkt *pkt)
 	return NET_CONTINUE;
 }
 
-static inline u32_t canbus_addr_to_id(u16_t dest, u16_t src)
+static inline uint32_t canbus_addr_to_id(uint16_t dest, uint16_t src)
 {
 	return (dest << CAN_NET_IF_ADDR_DEST_POS) |
 	       (src << CAN_NET_IF_ADDR_SRC_POS);
@@ -418,7 +418,7 @@ static void canbus_set_frame_addr_pkt(struct zcan_frame *frame,
 	canbus_set_frame_addr(frame, dest_addr, &src_addr, mcast);
 }
 
-static void canbus_fc_send_cb(u32_t err_flags, void *arg)
+static void canbus_fc_send_cb(uint32_t err_flags, void *arg)
 {
 	if (err_flags) {
 		NET_ERR("Sending FC frame failed: %d", err_flags);
@@ -427,7 +427,7 @@ static void canbus_fc_send_cb(u32_t err_flags, void *arg)
 
 static int canbus_send_fc(struct device *net_can_dev,
 			  struct net_canbus_lladdr *dest,
-			  struct net_canbus_lladdr *src, u8_t fs)
+			  struct net_canbus_lladdr *src, uint8_t fs)
 {
 	const struct net_can_api *api = net_can_dev->driver_api;
 	struct zcan_frame frame = {
@@ -456,7 +456,7 @@ static int canbus_process_cf_data(struct net_pkt *frag_pkt,
 {
 	struct net_pkt *pkt = ctx->pkt;
 	size_t data_len = net_pkt_get_len(frag_pkt) - 1;
-	u8_t pci;
+	uint8_t pci;
 	int ret;
 
 	pci = net_buf_pull_u8(frag_pkt->frags);
@@ -561,9 +561,9 @@ static enum net_verdict canbus_process_ff(struct net_pkt *pkt)
 	struct net_pkt *new_pkt = NULL;
 	int ret;
 	struct net_canbus_lladdr src, dest;
-	u16_t msg_len;
+	uint16_t msg_len;
 	size_t new_pkt_len;
-	u8_t data_len;
+	uint8_t data_len;
 	bool mcast;
 
 	mcast = canbus_dest_is_mcast(pkt);
@@ -676,7 +676,7 @@ static enum net_verdict canbus_process_sf(struct net_pkt *pkt)
 	return canbus_finish_pkt(pkt);
 }
 
-static void canbus_tx_frame_isr(u32_t err_flags, void *arg)
+static void canbus_tx_frame_isr(uint32_t err_flags, void *arg)
 {
 	struct net_pkt *pkt = (struct net_pkt *)arg;
 	struct canbus_isotp_tx_ctx *ctx = pkt->canbus_tx_ctx;
@@ -801,7 +801,7 @@ static enum net_verdict canbus_process_fc_data(struct canbus_isotp_tx_ctx *ctx,
 					       struct net_pkt *pkt)
 {
 	struct net_buf *buf = pkt->frags;
-	u8_t pci;
+	uint8_t pci;
 
 	pci = net_buf_pull_u8(buf);
 
@@ -851,7 +851,7 @@ static enum net_verdict canbus_process_fc_data(struct canbus_isotp_tx_ctx *ctx,
 static enum net_verdict canbus_process_fc(struct net_pkt *pkt)
 {
 	struct canbus_isotp_tx_ctx *tx_ctx;
-	u16_t src_addr = canbus_get_src_lladdr(pkt);
+	uint16_t src_addr = canbus_get_src_lladdr(pkt);
 	enum net_verdict ret;
 
 	tx_ctx = canbus_get_tx_ctx(NET_CAN_TX_STATE_WAIT_FC, src_addr);
@@ -1035,9 +1035,9 @@ static void canbus_ipv6_mcast_to_dest(struct net_pkt *pkt,
 		sys_be16_to_cpu(UNALIGNED_GET(&NET_IPV6_HDR(pkt)->dst.s6_addr16[7]));
 }
 
-static inline u16_t canbus_eth_to_can_addr(struct net_linkaddr *lladdr)
+static inline uint16_t canbus_eth_to_can_addr(struct net_linkaddr *lladdr)
 {
-	return (sys_be16_to_cpu(UNALIGNED_GET((u16_t *)&lladdr->addr[4])) &
+	return (sys_be16_to_cpu(UNALIGNED_GET((uint16_t *)&lladdr->addr[4])) &
 		CAN_NET_IF_ADDR_MASK);
 }
 
@@ -1104,7 +1104,7 @@ static int canbus_send(struct net_if *iface, struct net_pkt *pkt)
 static enum net_verdict canbus_process_frame(struct net_pkt *pkt)
 {
 	enum net_verdict ret = NET_DROP;
-	u8_t pci_type;
+	uint8_t pci_type;
 
 	net_pkt_cursor_init(pkt);
 	ret = net_pkt_read_u8(pkt, &pci_type);
@@ -1143,7 +1143,7 @@ static void forward_eth_frame(struct net_pkt *pkt, struct net_if *canbus_iface)
 
 static struct net_ipv6_hdr *get_ip_hdr_from_eth_frame(struct net_pkt *pkt)
 {
-	return (struct net_ipv6_hdr *)((u8_t *)net_pkt_data(pkt) +
+	return (struct net_ipv6_hdr *)((uint8_t *)net_pkt_data(pkt) +
 				       sizeof(struct net_eth_hdr));
 }
 
@@ -1245,7 +1245,7 @@ static void extend_llao(struct net_pkt *pkt, struct net_linkaddr *mac_addr)
 	struct net_pkt_cursor cursor_backup;
 	struct net_icmp_hdr *icmp_hdr;
 	struct net_icmpv6_nd_opt_hdr *icmp_opt_hdr;
-	u8_t *llao, llao_backup[2];
+	uint8_t *llao, llao_backup[2];
 	int ret;
 
 	net_pkt_cursor_backup(pkt, &cursor_backup);
@@ -1314,7 +1314,7 @@ static void extend_llao(struct net_pkt *pkt, struct net_linkaddr *mac_addr)
 		goto done;
 	}
 
-	llao = (u8_t *)net_pkt_get_data(pkt, &llao_access);
+	llao = (uint8_t *)net_pkt_get_data(pkt, &llao_access);
 	if (!llao) {
 		NET_ERR("Can't read LLAO");
 		goto done;
@@ -1368,7 +1368,7 @@ static void swap_scr_lladdr(struct net_pkt *pkt, struct net_pkt *pkt_clone)
 static void can_to_eth_lladdr(struct net_pkt *pkt, struct net_if *eth_iface,
 			      bool bcast)
 {
-	u16_t src_can_addr = canbus_get_src_lladdr(pkt);
+	uint16_t src_can_addr = canbus_get_src_lladdr(pkt);
 	struct net_linkaddr *lladdr_src = net_pkt_lladdr_src(pkt);
 	struct net_linkaddr *lladdr_dst;
 
@@ -1376,7 +1376,7 @@ static void can_to_eth_lladdr(struct net_pkt *pkt, struct net_if *eth_iface,
 		lladdr_dst = net_pkt_lladdr_dst(pkt);
 		lladdr_dst->len = sizeof(struct net_eth_addr);
 		lladdr_dst->type = NET_LINK_ETHERNET;
-		lladdr_dst->addr = (u8_t *)net_eth_broadcast_addr()->addr;
+		lladdr_dst->addr = (uint8_t *)net_eth_broadcast_addr()->addr;
 	}
 
 	lladdr_src->addr = net_pkt_lladdr_src(pkt)->addr -
@@ -1517,9 +1517,9 @@ static inline int canbus_send_dad_request(struct device *net_can_dev,
 	return 0;
 }
 
-static void canbus_send_dad_resp_cb(u32_t err_flags, void *cb_arg)
+static void canbus_send_dad_resp_cb(uint32_t err_flags, void *cb_arg)
 {
-	static u8_t fail_cnt;
+	static uint8_t fail_cnt;
 	struct k_work *work = (struct k_work *)cb_arg;
 
 	if (err_flags) {
@@ -1550,7 +1550,7 @@ static inline void canbus_send_dad_response(struct k_work *item)
 	frame.rtr = CAN_DATAFRAME;
 	frame.id_type = CAN_EXTENDED_IDENTIFIER;
 	frame.ext_id = canbus_addr_to_id(NET_CAN_DAD_ADDR,
-					 ntohs(UNALIGNED_GET((u16_t *) ll_addr->addr)));
+					 ntohs(UNALIGNED_GET((uint16_t *) ll_addr->addr)));
 
 	ret = api->send(net_can_dev, &frame, canbus_send_dad_resp_cb, item,
 			K_FOREVER);
@@ -1651,7 +1651,7 @@ static inline int canbus_init_ll_addr(struct net_if *iface)
 
 	/* Add address early for DAD response */
 	ctx->ll_addr = sys_cpu_to_be16(ll_addr.addr);
-	net_if_set_link_addr(iface, (u8_t *)&ctx->ll_addr, sizeof(ll_addr),
+	net_if_set_link_addr(iface, (uint8_t *)&ctx->ll_addr, sizeof(ll_addr),
 			     NET_LINK_CANBUS);
 
 	dad_resp_filter_id = canbus_attach_dad_resp_filter(net_can_dev, &ll_addr,
@@ -1707,7 +1707,7 @@ dad_err:
 void net_6locan_init(struct net_if *iface)
 {
 	struct canbus_net_ctx *ctx = net_if_l2_data(iface);
-	u8_t thread_priority;
+	uint8_t thread_priority;
 	int i;
 
 	NET_DBG("Init CAN net interface");
diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c
index 1da8bfe305..bb577daaa0 100644
--- a/subsys/net/l2/ethernet/arp.c
+++ b/subsys/net/l2/ethernet/arp.c
@@ -179,14 +179,14 @@ static void arp_entry_register_pending(struct arp_entry *entry)
 
 static void arp_request_timeout(struct k_work *work)
 {
-	u32_t current = k_uptime_get_32();
+	uint32_t current = k_uptime_get_32();
 	struct arp_entry *entry, *next;
 
 	ARG_UNUSED(work);
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&arp_pending_entries,
 					  entry, next, node) {
-		if ((s32_t)(entry->req_start +
+		if ((int32_t)(entry->req_start +
 			    ARP_REQUEST_TIMEOUT - current) > 0) {
 			break;
 		}
@@ -272,17 +272,17 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface,
 		net_ipaddr_copy(&entry->ip, next_addr);
 
 		net_pkt_lladdr_src(pkt)->addr =
-			(u8_t *)net_if_get_link_addr(entry->iface)->addr;
+			(uint8_t *)net_if_get_link_addr(entry->iface)->addr;
 
 		arp_entry_register_pending(entry);
 	} else {
 		net_pkt_lladdr_src(pkt)->addr =
-			(u8_t *)net_if_get_link_addr(iface)->addr;
+			(uint8_t *)net_if_get_link_addr(iface)->addr;
 	}
 
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
 
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)net_eth_broadcast_addr();
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)net_eth_broadcast_addr();
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
 	hdr->hwtype = htons(NET_ARP_HTYPE_ETH);
@@ -381,10 +381,10 @@ struct net_pkt *net_arp_prepare(struct net_pkt *pkt,
 	}
 
 	net_pkt_lladdr_src(pkt)->addr =
-		(u8_t *)net_if_get_link_addr(entry->iface)->addr;
+		(uint8_t *)net_if_get_link_addr(entry->iface)->addr;
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
 
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)&entry->eth;
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&entry->eth;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
 	NET_DBG("ARP using ll %s for IP %s",
@@ -406,10 +406,10 @@ static void arp_gratuitous(struct net_if *iface,
 	if (entry) {
 		NET_DBG("Gratuitous ARP hwaddr %s -> %s",
 			log_strdup(net_sprint_ll_addr(
-					   (const u8_t *)&entry->eth,
+					   (const uint8_t *)&entry->eth,
 					   sizeof(struct net_eth_addr))),
 			log_strdup(net_sprint_ll_addr(
-					   (const u8_t *)hwaddr,
+					   (const uint8_t *)hwaddr,
 					   sizeof(struct net_eth_addr))));
 
 		memcpy(&entry->eth, hwaddr, sizeof(struct net_eth_addr));
@@ -467,7 +467,7 @@ static void arp_update(struct net_if *iface,
 	/* Set the dst in the pending packet */
 	net_pkt_lladdr_dst(entry->pending)->len = sizeof(struct net_eth_addr);
 	net_pkt_lladdr_dst(entry->pending)->addr =
-		(u8_t *) &NET_ETH_HDR(entry->pending)->dst.addr;
+		(uint8_t *) &NET_ETH_HDR(entry->pending)->dst.addr;
 
 	NET_DBG("dst %s pending %p frag %p",
 		log_strdup(net_sprint_ipv4_addr(&entry->ip)),
@@ -522,7 +522,7 @@ static inline struct net_pkt *arp_prepare_reply(struct net_if *iface,
 	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(iface)->addr;
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
 
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)&hdr->dst_hwaddr.addr;
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&hdr->dst_hwaddr.addr;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
 	return pkt;
@@ -551,10 +551,10 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 	struct in_addr *addr;
 
 	if (net_pkt_get_len(pkt) < (sizeof(struct net_arp_hdr) -
-				    (net_pkt_ip_data(pkt) - (u8_t *)eth_hdr))) {
+				    (net_pkt_ip_data(pkt) - (uint8_t *)eth_hdr))) {
 		NET_DBG("Invalid ARP header (len %zu, min %zu bytes) %p",
 			net_pkt_get_len(pkt), sizeof(struct net_arp_hdr) -
-			(net_pkt_ip_data(pkt) - (u8_t *)eth_hdr), pkt);
+			(net_pkt_ip_data(pkt) - (uint8_t *)eth_hdr), pkt);
 		return NET_DROP;
 	}
 
@@ -614,7 +614,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 		NET_DBG("ARP request from %s [%s] for %s",
 			log_strdup(net_sprint_ipv4_addr(&arp_hdr->src_ipaddr)),
 			log_strdup(net_sprint_ll_addr(
-					   (u8_t *)&arp_hdr->src_hwaddr,
+					   (uint8_t *)&arp_hdr->src_hwaddr,
 					   arp_hdr->hwlen)),
 			log_strdup(net_sprint_ipv4_addr(
 					   &arp_hdr->dst_ipaddr)));
@@ -628,7 +628,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 				log_strdup(net_sprint_ipv4_addr(
 						 &arp_hdr->src_ipaddr)),
 				log_strdup(net_sprint_ll_addr(
-						 (u8_t *)&arp_hdr->src_hwaddr,
+						 (uint8_t *)&arp_hdr->src_hwaddr,
 						 arp_hdr->hwlen)));
 
 			arp_update(net_pkt_iface(pkt),
diff --git a/subsys/net/l2/ethernet/arp.h b/subsys/net/l2/ethernet/arp.h
index 4d7f32a3e7..b11622f3e0 100644
--- a/subsys/net/l2/ethernet/arp.h
+++ b/subsys/net/l2/ethernet/arp.h
@@ -26,11 +26,11 @@ extern "C" {
 #define NET_ARP_HDR(pkt) ((struct net_arp_hdr *)net_pkt_data(pkt))
 
 struct net_arp_hdr {
-	u16_t hwtype;		/* HTYPE */
-	u16_t protocol;		/* PTYPE */
-	u8_t hwlen;			/* HLEN */
-	u8_t protolen;		/* PLEN */
-	u16_t opcode;
+	uint16_t hwtype;		/* HTYPE */
+	uint16_t protocol;		/* PTYPE */
+	uint8_t hwlen;			/* HLEN */
+	uint8_t protolen;		/* PLEN */
+	uint16_t opcode;
 	struct net_eth_addr src_hwaddr;	/* SHA */
 	struct in_addr src_ipaddr;	/* SPA */
 	struct net_eth_addr dst_hwaddr;	/* THA */
@@ -51,7 +51,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt,
 
 struct arp_entry {
 	sys_snode_t node;
-	u32_t req_start;
+	uint32_t req_start;
 	struct net_if *iface;
 	struct in_addr ip;
 	union {
diff --git a/subsys/net/l2/ethernet/eth_stats.h b/subsys/net/l2/ethernet/eth_stats.h
index 4498bcabf1..cade00fc60 100644
--- a/subsys/net/l2/ethernet/eth_stats.h
+++ b/subsys/net/l2/ethernet/eth_stats.h
@@ -14,7 +14,7 @@
 #include <net/net_if.h>
 
 static inline void eth_stats_update_bytes_rx(struct net_if *iface,
-					     u32_t bytes)
+					     uint32_t bytes)
 {
 	const struct ethernet_api *api = (const struct ethernet_api *)
 		net_if_get_device(iface)->driver_api;
@@ -33,7 +33,7 @@ static inline void eth_stats_update_bytes_rx(struct net_if *iface,
 }
 
 static inline void eth_stats_update_bytes_tx(struct net_if *iface,
-					     u32_t bytes)
+					     uint32_t bytes)
 {
 	const struct ethernet_api *api = (const struct ethernet_api *)
 		net_if_get_device(iface)->driver_api;
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index f1b451cf4a..430b87cd35 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -97,7 +97,7 @@ void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr,
 static inline void ethernet_update_length(struct net_if *iface,
 					  struct net_pkt *pkt)
 {
-	u16_t len;
+	uint16_t len;
 
 	/* Let's check IP payload's length. If it's smaller than 46 bytes,
 	 * i.e. smaller than minimal Ethernet frame size minus ethernet
@@ -172,8 +172,8 @@ static enum net_verdict ethernet_recv(struct net_if *iface,
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	struct net_eth_hdr *hdr = NET_ETH_HDR(pkt);
-	u8_t hdr_len = sizeof(struct net_eth_hdr);
-	u16_t type = ntohs(hdr->type);
+	uint8_t hdr_len = sizeof(struct net_eth_hdr);
+	uint16_t type = ntohs(hdr->type);
 	struct net_linkaddr *lladdr;
 	sa_family_t family;
 
@@ -281,7 +281,7 @@ static enum net_verdict ethernet_recv(struct net_if *iface,
 	    family == AF_INET && type == NET_ETH_PTYPE_ARP) {
 		NET_DBG("ARP packet from %s received",
 			log_strdup(net_sprint_ll_addr(
-					   (u8_t *)hdr->src.addr,
+					   (uint8_t *)hdr->src.addr,
 					   sizeof(struct net_eth_addr))));
 
 		if (IS_ENABLED(CONFIG_NET_IPV4_AUTO) &&
@@ -377,10 +377,10 @@ static bool ethernet_fill_in_dst_on_ipv6_mcast(struct net_pkt *pkt,
 {
 	if (net_pkt_family(pkt) == AF_INET6 &&
 	    net_ipv6_is_addr_mcast(&NET_IPV6_HDR(pkt)->dst)) {
-		memcpy(dst, (u8_t *)multicast_eth_addr.addr,
+		memcpy(dst, (uint8_t *)multicast_eth_addr.addr,
 		       sizeof(struct net_eth_addr) - 4);
-		memcpy((u8_t *)dst + 2,
-		       (u8_t *)(&NET_IPV6_HDR(pkt)->dst) + 12,
+		memcpy((uint8_t *)dst + 2,
+		       (uint8_t *)(&NET_IPV6_HDR(pkt)->dst) + 12,
 		       sizeof(struct net_eth_addr) - 2);
 
 		return true;
@@ -454,7 +454,7 @@ static enum net_verdict set_vlan_tag(struct ethernet_context *ctx,
 static void set_vlan_priority(struct ethernet_context *ctx,
 			      struct net_pkt *pkt)
 {
-	u8_t vlan_priority;
+	uint8_t vlan_priority;
 
 	vlan_priority = net_priority2vlan(net_pkt_priority(pkt));
 	net_pkt_set_vlan_priority(pkt, vlan_priority);
@@ -466,7 +466,7 @@ static void set_vlan_priority(struct ethernet_context *ctx,
 
 static struct net_buf *ethernet_fill_header(struct ethernet_context *ctx,
 					    struct net_pkt *pkt,
-					    u32_t ptype)
+					    uint32_t ptype)
 {
 	struct net_buf *hdr_frag;
 	struct net_eth_hdr *hdr;
@@ -558,7 +558,7 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
 {
 	const struct ethernet_api *api = net_if_get_device(iface)->driver_api;
 	struct ethernet_context *ctx = net_if_l2_data(iface);
-	u16_t ptype;
+	uint16_t ptype;
 	int ret;
 
 	if (!api) {
@@ -613,7 +613,7 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
 	 * it might detect this should be multicast and act accordingly.
 	 */
 	if (!net_pkt_lladdr_dst(pkt)->addr) {
-		net_pkt_lladdr_dst(pkt)->addr = (u8_t *)broadcast_eth_addr.addr;
+		net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)broadcast_eth_addr.addr;
 		net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 	}
 
@@ -686,7 +686,7 @@ enum net_l2_flags ethernet_flags(struct net_if *iface)
 }
 
 #if defined(CONFIG_NET_VLAN)
-struct net_if *net_eth_get_vlan_iface(struct net_if *iface, u16_t tag)
+struct net_if *net_eth_get_vlan_iface(struct net_if *iface, uint16_t tag)
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	struct net_if *first_non_vlan_iface = NULL;
@@ -773,7 +773,7 @@ bool net_eth_is_vlan_enabled(struct ethernet_context *ctx,
 	return false;
 }
 
-u16_t net_eth_get_vlan_tag(struct net_if *iface)
+uint16_t net_eth_get_vlan_tag(struct net_if *iface)
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	int i;
@@ -801,7 +801,7 @@ bool net_eth_get_vlan_status(struct net_if *iface)
 
 static struct ethernet_vlan *get_vlan(struct ethernet_context *ctx,
 				      struct net_if *iface,
-				      u16_t vlan_tag)
+				      uint16_t vlan_tag)
 {
 	int i;
 
@@ -820,8 +820,8 @@ static void setup_ipv6_link_local_addr(struct net_if *iface)
 	struct net_linkaddr link_addr;
 	struct net_if_addr *ifaddr;
 	struct in6_addr addr;
-	u32_t entropy;
-	u8_t mac_addr[6];
+	uint32_t entropy;
+	uint8_t mac_addr[6];
 
 	entropy = sys_rand32_get();
 	mac_addr[0] = entropy >> 0;
@@ -848,7 +848,7 @@ static void setup_ipv6_link_local_addr(struct net_if *iface)
 	}
 }
 
-int net_eth_vlan_enable(struct net_if *iface, u16_t tag)
+int net_eth_vlan_enable(struct net_if *iface, uint16_t tag)
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	const struct ethernet_api *eth =
@@ -921,7 +921,7 @@ int net_eth_vlan_enable(struct net_if *iface, u16_t tag)
 	return -ENOSPC;
 }
 
-int net_eth_vlan_disable(struct net_if *iface, u16_t tag)
+int net_eth_vlan_disable(struct net_if *iface, uint16_t tag)
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	const struct ethernet_api *eth =
diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c
index 11ba443bf4..1bb06d4d77 100644
--- a/subsys/net/l2/ethernet/ethernet_mgmt.c
+++ b/subsys/net/l2/ethernet/ethernet_mgmt.c
@@ -25,7 +25,7 @@ static inline bool is_hw_caps_supported(struct device *dev,
 	return !!(api->get_capabilities(dev) & caps);
 }
 
-static int ethernet_set_config(u32_t mgmt_request,
+static int ethernet_set_config(uint32_t mgmt_request,
 			       struct net_if *iface,
 			       void *data, size_t len)
 {
@@ -171,7 +171,7 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QAV_PARAM,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_PROMISC_MODE,
 				  ethernet_set_config);
 
-static int ethernet_get_config(u32_t mgmt_request,
+static int ethernet_get_config(uint32_t mgmt_request,
 			       struct net_if *iface,
 			       void *data, size_t len)
 {
@@ -267,7 +267,7 @@ void ethernet_mgmt_raise_carrier_off_event(struct net_if *iface)
 	net_mgmt_event_notify(NET_EVENT_ETHERNET_CARRIER_OFF, iface);
 }
 
-void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface, u16_t tag)
+void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface, uint16_t tag)
 {
 #if defined(CONFIG_NET_MGMT_EVENT_INFO)
 	net_mgmt_event_notify_with_info(NET_EVENT_ETHERNET_VLAN_TAG_ENABLED,
@@ -278,7 +278,7 @@ void ethernet_mgmt_raise_vlan_enabled_event(struct net_if *iface, u16_t tag)
 #endif
 }
 
-void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface, u16_t tag)
+void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface, uint16_t tag)
 {
 #if defined(CONFIG_NET_MGMT_EVENT_INFO)
 	net_mgmt_event_notify_with_info(NET_EVENT_ETHERNET_VLAN_TAG_DISABLED,
diff --git a/subsys/net/l2/ethernet/ethernet_stats.c b/subsys/net/l2/ethernet/ethernet_stats.c
index 73b82f14d6..c26aa5c1b9 100644
--- a/subsys/net/l2/ethernet/ethernet_stats.c
+++ b/subsys/net/l2/ethernet/ethernet_stats.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(net_ethernet_stats, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 
 #if defined(CONFIG_NET_STATISTICS_USER_API)
 
-static int eth_stats_get(u32_t mgmt_request, struct net_if *iface,
+static int eth_stats_get(uint32_t mgmt_request, struct net_if *iface,
 			 void *data, size_t len)
 {
 	size_t len_chk = 0;
diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c
index 1f89167085..c6d500ddc2 100644
--- a/subsys/net/l2/ethernet/gptp/gptp.c
+++ b/subsys/net/l2/ethernet/gptp/gptp.c
@@ -487,10 +487,10 @@ static void gptp_init_port_ds(int port)
 	port_ds->compute_neighbor_prop_delay = true;
 
 	/* Random Sequence Numbers. */
-	port_ds->sync_seq_id = (u16_t)sys_rand32_get();
-	port_ds->pdelay_req_seq_id = (u16_t)sys_rand32_get();
-	port_ds->announce_seq_id = (u16_t)sys_rand32_get();
-	port_ds->signaling_seq_id = (u16_t)sys_rand32_get();
+	port_ds->sync_seq_id = (uint16_t)sys_rand32_get();
+	port_ds->pdelay_req_seq_id = (uint16_t)sys_rand32_get();
+	port_ds->announce_seq_id = (uint16_t)sys_rand32_get();
+	port_ds->signaling_seq_id = (uint16_t)sys_rand32_get();
 
 #if defined(CONFIG_NET_GPTP_STATISTICS)
 	/* Initialize stats data set. */
@@ -592,8 +592,8 @@ static void gptp_add_port(struct net_if *iface, void *user_data)
 }
 
 void gptp_set_time_itv(struct gptp_uscaled_ns *interval,
-		       u16_t seconds,
-		       s8_t log_msg_interval)
+		       uint16_t seconds,
+		       int8_t log_msg_interval)
 {
 	int i;
 
@@ -618,7 +618,7 @@ void gptp_set_time_itv(struct gptp_uscaled_ns *interval,
 	/* NSEC_PER_SEC is between 2^30 and 2^31, seconds is less thant 2^16,
 	 * thus the computation will be less than 2^63.
 	 */
-	interval->low =	(seconds * (u64_t)NSEC_PER_SEC) << 16;
+	interval->low =	(seconds * (uint64_t)NSEC_PER_SEC) << 16;
 
 	if (log_msg_interval <= 0) {
 		interval->low >>= -log_msg_interval;
@@ -651,9 +651,9 @@ void gptp_set_time_itv(struct gptp_uscaled_ns *interval,
 	}
 }
 
-s32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns)
+int32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns)
 {
-	u64_t tmp;
+	uint64_t tmp;
 
 	if (usns->high) {
 		/* Do not calculate, it reaches max value. */
@@ -674,10 +674,10 @@ s32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns)
 
 }
 
-static s32_t timer_get_remaining_and_stop(struct k_timer *timer)
+static int32_t timer_get_remaining_and_stop(struct k_timer *timer)
 {
 	unsigned int key;
-	s32_t timer_value;
+	int32_t timer_value;
 
 	key = irq_lock();
 	timer_value = k_timer_remaining_get(timer);
@@ -689,11 +689,11 @@ static s32_t timer_get_remaining_and_stop(struct k_timer *timer)
 	return timer_value;
 }
 
-static s32_t update_itv(struct gptp_uscaled_ns *itv,
-			 s8_t *cur_log_itv,
-			 s8_t *ini_log_itv,
-			 s8_t new_log_itv,
-			 s8_t correction_log_itv)
+static int32_t update_itv(struct gptp_uscaled_ns *itv,
+			 int8_t *cur_log_itv,
+			 int8_t *ini_log_itv,
+			 int8_t new_log_itv,
+			 int8_t correction_log_itv)
 {
 	switch (new_log_itv) {
 	case GPTP_ITV_KEEP:
@@ -712,10 +712,10 @@ static s32_t update_itv(struct gptp_uscaled_ns *itv,
 	return gptp_uscaled_ns_to_timer_ms(itv);
 }
 
-void gptp_update_pdelay_req_interval(int port, s8_t log_val)
+void gptp_update_pdelay_req_interval(int port, int8_t log_val)
 {
-	s32_t remaining;
-	s32_t new_itv, old_itv;
+	int32_t remaining;
+	int32_t new_itv, old_itv;
 	struct gptp_pdelay_req_state *state_pdelay;
 	struct gptp_port_ds *port_ds;
 
@@ -738,13 +738,13 @@ void gptp_update_pdelay_req_interval(int port, s8_t log_val)
 	k_timer_start(&state_pdelay->pdelay_timer, K_MSEC(new_itv), K_NO_WAIT);
 }
 
-void gptp_update_sync_interval(int port, s8_t log_val)
+void gptp_update_sync_interval(int port, int8_t log_val)
 {
 	struct gptp_pss_send_state *state_pss_send;
 	struct gptp_port_ds *port_ds;
-	s32_t new_itv, old_itv, period;
-	s32_t remaining;
-	u32_t time_spent;
+	int32_t new_itv, old_itv, period;
+	int32_t remaining;
+	uint32_t time_spent;
 
 	port_ds = GPTP_PORT_DS(port);
 	state_pss_send = &GPTP_PORT_STATE(port)->pss_send;
@@ -789,10 +789,10 @@ void gptp_update_sync_interval(int port, s8_t log_val)
 		      K_MSEC(period));
 }
 
-void gptp_update_announce_interval(int port, s8_t log_val)
+void gptp_update_announce_interval(int port, int8_t log_val)
 {
-	s32_t remaining;
-	s32_t new_itv, old_itv;
+	int32_t remaining;
+	int32_t new_itv, old_itv;
 	struct gptp_port_announce_transmit_state *state_ann;
 	struct gptp_port_bmca_data *bmca_data;
 	struct gptp_port_ds *port_ds;
@@ -968,10 +968,10 @@ static void vlan_disabled(struct k_work *work)
 }
 
 static void vlan_event_handler(struct net_mgmt_event_callback *cb,
-			       u32_t mgmt_event,
+			       uint32_t mgmt_event,
 			       struct net_if *iface)
 {
-	u16_t tag;
+	uint16_t tag;
 
 	if (mgmt_event != NET_EVENT_ETHERNET_VLAN_TAG_ENABLED &&
 	    mgmt_event != NET_EVENT_ETHERNET_VLAN_TAG_DISABLED) {
@@ -983,7 +983,7 @@ static void vlan_event_handler(struct net_mgmt_event_callback *cb,
 		return;
 	}
 
-	tag = *((u16_t *)cb->info);
+	tag = *((uint16_t *)cb->info);
 	if (tag != CONFIG_NET_GPTP_VLAN_TAG) {
 		return;
 	}
diff --git a/subsys/net/l2/ethernet/gptp/gptp_data_set.h b/subsys/net/l2/ethernet/gptp/gptp_data_set.h
index 8634d98eda..fd834c9105 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_data_set.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_data_set.h
@@ -148,10 +148,10 @@ enum gptp_received_info {
  */
 struct gptp_path_trace {
 	/** Length of the path trace. */
-	u16_t len;
+	uint16_t len;
 
 	/** Path trace of the announce message. */
-	u8_t path_sequence[GPTP_MAX_PATHTRACE_SIZE][GPTP_CLOCK_ID_LEN];
+	uint8_t path_sequence[GPTP_MAX_PATHTRACE_SIZE][GPTP_CLOCK_ID_LEN];
 };
 
 /**
@@ -165,10 +165,10 @@ struct gptp_path_trace {
  */
 struct gptp_global_ds {
 	/** Mean time interval between messages providing time-sync info. */
-	u64_t clk_master_sync_itv;
+	uint64_t clk_master_sync_itv;
 
 	/** Value if current time. */
-	u64_t sync_receipt_local_time;
+	uint64_t sync_receipt_local_time;
 
 	/** Fractional frequency offset of the Clock Source entity. */
 	double clk_src_freq_offset;
@@ -216,28 +216,28 @@ struct gptp_global_ds {
 	struct gptp_scaled_ns clk_src_phase_offset;
 
 	/** Grand Master Time Base Indicator. */
-	u16_t gm_time_base_indicator;
+	uint16_t gm_time_base_indicator;
 
 	/** Reselect port bit array. */
-	u32_t reselect_array;
+	uint32_t reselect_array;
 
 	/** Selected port bit array. */
-	u32_t selected_array;
+	uint32_t selected_array;
 
 	/** Steps removed from selected master. */
-	u16_t master_steps_removed;
+	uint16_t master_steps_removed;
 
 	/** Current UTC offset. */
-	s16_t current_utc_offset;
+	int16_t current_utc_offset;
 
 	/** System current UTC offset. */
-	s16_t sys_current_utc_offset;
+	int16_t sys_current_utc_offset;
 
 	/** Time Base Indicator. */
-	u16_t clk_src_time_base_indicator;
+	uint16_t clk_src_time_base_indicator;
 
 	/** Previous Time Base Indicator. */
-	u16_t clk_src_time_base_indicator_prev;
+	uint16_t clk_src_time_base_indicator_prev;
 
 	/** Time source. */
 	enum gptp_time_source time_source;
@@ -265,25 +265,25 @@ struct gptp_default_ds {
 	enum gptp_time_source time_source;
 
 	/** Clock Identity of the local clock. */
-	u8_t clk_id[GPTP_CLOCK_ID_LEN];
+	uint8_t clk_id[GPTP_CLOCK_ID_LEN];
 
 	/** System current flags. */
 	struct gptp_flags flags;
 
 	/** Current UTC offset. */
-	u16_t cur_utc_offset;
+	uint16_t cur_utc_offset;
 
 	/** Defines if this system is Grand Master capable. */
 	bool gm_capable;
 
 	/** Number of ports of the time-aware system. */
-	u8_t nb_ports;
+	uint8_t nb_ports;
 
 	/** Primary priority of the time-aware system. */
-	u8_t priority1;
+	uint8_t priority1;
 
 	/** Secondary priority of the time-aware system. */
-	u8_t priority2;
+	uint8_t priority2;
 };
 
 /**
@@ -296,28 +296,28 @@ struct gptp_current_ds {
 	struct gptp_scaled_ns last_gm_phase_change;
 
 	/** Time difference between a slave and the Grand Master. */
-	s64_t offset_from_master;
+	int64_t offset_from_master;
 
 	/** Last Grand Master Frequency change. */
 	double last_gm_freq_change;
 
 	/** Number of times a Grand Master has changed in the domain. */
-	u32_t gm_change_count;
+	uint32_t gm_change_count;
 
 	/** Time when the most recent Grand Master changed. */
-	u32_t last_gm_chg_evt_time;
+	uint32_t last_gm_chg_evt_time;
 
 	/** Time when the most recent Grand Master phase changed. */
-	u32_t last_gm_phase_chg_evt_time;
+	uint32_t last_gm_phase_chg_evt_time;
 
 	/** Time when the most recent Grand Master frequency changed. */
-	u32_t last_gm_freq_chg_evt_time;
+	uint32_t last_gm_freq_chg_evt_time;
 
 	/** Time Base Indicator of the current Grand Master. */
-	u16_t gm_timebase_indicator;
+	uint16_t gm_timebase_indicator;
 
 	/** Number of steps between the local clock and the Grand Master. */
-	u8_t steps_removed;
+	uint8_t steps_removed;
 };
 
 /**
@@ -327,10 +327,10 @@ struct gptp_current_ds {
  */
 struct gptp_parent_ds {
 	/** Ratio of the frequency of the GM with the local clock. */
-	s32_t cumulative_rate_ratio;
+	int32_t cumulative_rate_ratio;
 
 	/** Clock Identity of the Grand Master clock. */
-	u8_t gm_id[GPTP_CLOCK_ID_LEN];
+	uint8_t gm_id[GPTP_CLOCK_ID_LEN];
 
 	/** Clock Class of the Grand Master clock. */
 	struct gptp_clock_quality gm_clk_quality;
@@ -339,10 +339,10 @@ struct gptp_parent_ds {
 	struct gptp_port_identity port_id;
 
 	/** Primary Priority of the Grand Master clock. */
-	u8_t gm_priority1;
+	uint8_t gm_priority1;
 
 	/** Secondary Priority of the Grand Master clock. */
-	u8_t gm_priority2;
+	uint8_t gm_priority2;
 };
 
 /**
@@ -356,7 +356,7 @@ struct gptp_time_prop_ds {
 	enum gptp_time_source time_source;
 
 	/** Current UTC offset for the Grand Master. */
-	u16_t cur_utc_offset;
+	uint16_t cur_utc_offset;
 
 	/** Current UTC offset valid for the Grand Master. */
 	bool cur_utc_offset_valid : 1;
@@ -383,10 +383,10 @@ struct gptp_time_prop_ds {
  */
 struct gptp_port_ds {
 	/** Maximum interval between sync messages. */
-	u64_t sync_receipt_timeout_time_itv;
+	uint64_t sync_receipt_timeout_time_itv;
 
 	/** Asymmetry on the link relative to the grand master time base. */
-	s64_t delay_asymmetry;
+	int64_t delay_asymmetry;
 
 	/** One way propagation time on the link attached to this port. */
 	double neighbor_prop_delay;
@@ -407,46 +407,46 @@ struct gptp_port_ds {
 	struct gptp_uscaled_ns pdelay_req_itv;
 
 	/** Maximum number of Path Delay Requests without a response. */
-	u16_t allowed_lost_responses;
+	uint16_t allowed_lost_responses;
 
 	/** Current Sync sequence id for this port. */
-	u16_t sync_seq_id;
+	uint16_t sync_seq_id;
 
 	/** Current Path Delay Request sequence id for this port. */
-	u16_t pdelay_req_seq_id;
+	uint16_t pdelay_req_seq_id;
 
 	/** Current Announce sequence id for this port. */
-	u16_t announce_seq_id;
+	uint16_t announce_seq_id;
 
 	/** Current Signaling sequence id for this port. */
-	u16_t signaling_seq_id;
+	uint16_t signaling_seq_id;
 
 	/** Initial Announce Interval as a Logarithm to base 2. */
-	s8_t ini_log_announce_itv;
+	int8_t ini_log_announce_itv;
 
 	/** Current Announce Interval as a Logarithm to base 2. */
-	s8_t cur_log_announce_itv;
+	int8_t cur_log_announce_itv;
 
 	/** Time without receiving announce messages before running BMCA. */
-	u8_t announce_receipt_timeout;
+	uint8_t announce_receipt_timeout;
 
 	/** Initial Sync Interval as a Logarithm to base 2. */
-	s8_t ini_log_half_sync_itv;
+	int8_t ini_log_half_sync_itv;
 
 	/** Current Sync Interval as a Logarithm to base 2. */
-	s8_t cur_log_half_sync_itv;
+	int8_t cur_log_half_sync_itv;
 
 	/** Time without receiving sync messages before running BMCA. */
-	u8_t sync_receipt_timeout;
+	uint8_t sync_receipt_timeout;
 
 	/** Initial Path Delay Request Interval as a Logarithm to base 2. */
-	s8_t ini_log_pdelay_req_itv;
+	int8_t ini_log_pdelay_req_itv;
 
 	/** Current Path Delay Request Interval as a Logarithm to base 2. */
-	s8_t cur_log_pdelay_req_itv;
+	int8_t cur_log_pdelay_req_itv;
 
 	/** Version of PTP running on this port. */
-	u8_t version;
+	uint8_t version;
 
 	/** Time synchronization and Best Master Selection enabled. */
 	bool ptt_port_enabled : 1;
@@ -477,55 +477,55 @@ struct gptp_port_ds {
  */
 struct gptp_port_param_ds {
 	/** Number of Sync messages received. */
-	u32_t rx_sync_count;
+	uint32_t rx_sync_count;
 
 	/** Number of Follow Up messages received. */
-	u32_t rx_fup_count;
+	uint32_t rx_fup_count;
 
 	/** Number of Path Delay Requests messages received. */
-	u32_t rx_pdelay_req_count;
+	uint32_t rx_pdelay_req_count;
 
 	/** Number of Path Delay Response messages received. */
-	u32_t rx_pdelay_resp_count;
+	uint32_t rx_pdelay_resp_count;
 
 	/** Number of Path Delay Follow Up messages received. */
-	u32_t rx_pdelay_resp_fup_count;
+	uint32_t rx_pdelay_resp_fup_count;
 
 	/** Number of Announce messages received. */
-	u32_t rx_announce_count;
+	uint32_t rx_announce_count;
 
 	/** Number of ptp messages discarded. */
-	u32_t rx_ptp_packet_discard_count;
+	uint32_t rx_ptp_packet_discard_count;
 
 	/** Number of Sync reception timeout. */
-	u32_t sync_receipt_timeout_count;
+	uint32_t sync_receipt_timeout_count;
 
 	/** Number of Announce reception timeout. */
-	u32_t announce_receipt_timeout_count;
+	uint32_t announce_receipt_timeout_count;
 
 	/** Number Path Delay Requests without a response. */
-	u32_t pdelay_allowed_lost_resp_exceed_count;
+	uint32_t pdelay_allowed_lost_resp_exceed_count;
 
 	/** Number of Sync messages sent. */
-	u32_t tx_sync_count;
+	uint32_t tx_sync_count;
 
 	/** Number of Follow Up messages sent. */
-	u32_t tx_fup_count;
+	uint32_t tx_fup_count;
 
 	/** Number of Path Delay Request messages sent. */
-	u32_t tx_pdelay_req_count;
+	uint32_t tx_pdelay_req_count;
 
 	/** Number of Path Delay Response messages sent. */
-	u32_t tx_pdelay_resp_count;
+	uint32_t tx_pdelay_resp_count;
 
 	/** Number of Path Delay Response messages sent. */
-	u32_t tx_pdelay_resp_fup_count;
+	uint32_t tx_pdelay_resp_fup_count;
 
 	/** Number of Announce messages sent. */
-	u32_t tx_announce_count;
+	uint32_t tx_announce_count;
 
 	/** Neighbor propagation delay threshold exceeded. */
-	u32_t neighbor_prop_delay_exceeded;
+	uint32_t neighbor_prop_delay_exceeded;
 };
 
 /**
diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.c b/subsys/net/l2/ethernet/gptp/gptp_md.c
index f26464638c..f48dc8c1ba 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_md.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_md.c
@@ -212,8 +212,8 @@ static void gptp_md_pdelay_check_multiple_resp(int port)
 
 static void gptp_md_compute_pdelay_rate_ratio(int port)
 {
-	u64_t ingress_tstamp = 0U;
-	u64_t resp_evt_tstamp = 0U;
+	uint64_t ingress_tstamp = 0U;
+	uint64_t resp_evt_tstamp = 0U;
 	struct gptp_pdelay_resp_follow_up *fup;
 	struct gptp_pdelay_req_state *state;
 	struct gptp_port_ds *port_ds;
@@ -279,7 +279,7 @@ static void gptp_md_compute_pdelay_rate_ratio(int port)
 
 static void gptp_md_compute_prop_time(int port)
 {
-	u64_t t1_ns = 0U, t2_ns = 0U, t3_ns = 0U, t4_ns = 0U;
+	uint64_t t1_ns = 0U, t2_ns = 0U, t3_ns = 0U, t4_ns = 0U;
 	struct gptp_pdelay_resp_follow_up *fup;
 	struct gptp_pdelay_req_state *state;
 	struct gptp_pdelay_resp *resp;
@@ -309,7 +309,7 @@ static void gptp_md_compute_prop_time(int port)
 		hdr = GPTP_HDR(pkt);
 		resp = GPTP_PDELAY_RESP(pkt);
 
-		t2_ns = ((u64_t)ntohs(resp->req_receipt_ts_secs_high)) << 32;
+		t2_ns = ((uint64_t)ntohs(resp->req_receipt_ts_secs_high)) << 32;
 		t2_ns |= ntohl(resp->req_receipt_ts_secs_low);
 		t2_ns *= NSEC_PER_SEC;
 		t2_ns += ntohl(resp->req_receipt_ts_nsecs);
@@ -321,7 +321,7 @@ static void gptp_md_compute_prop_time(int port)
 		hdr = GPTP_HDR(pkt);
 		fup = GPTP_PDELAY_RESP_FOLLOWUP(pkt);
 
-		t3_ns = ((u64_t)ntohs(fup->resp_orig_ts_secs_high)) << 32;
+		t3_ns = ((uint64_t)ntohs(fup->resp_orig_ts_secs_high)) << 32;
 		t3_ns |= ntohl(fup->resp_orig_ts_secs_low);
 		t3_ns *= NSEC_PER_SEC;
 		t3_ns += ntohl(fup->resp_orig_ts_nsecs);
@@ -375,7 +375,7 @@ static void gptp_md_pdelay_compute(int port)
 		gptp_md_compute_prop_time(port);
 
 		NET_DBG("Neighbor prop delay %d",
-			(s32_t)port_ds->neighbor_prop_delay);
+			(int32_t)port_ds->neighbor_prop_delay);
 	}
 
 	state->lost_responses = 0U;
@@ -407,8 +407,8 @@ static void gptp_md_pdelay_compute(int port)
 		port_ds->as_capable = false;
 
 		NET_WARN("Not AS capable: %u ns > %u ns",
-			 (u32_t)port_ds->neighbor_prop_delay,
-			 (u32_t)port_ds->neighbor_prop_delay_thresh);
+			 (uint32_t)port_ds->neighbor_prop_delay,
+			 (uint32_t)port_ds->neighbor_prop_delay_thresh);
 
 		GPTP_STATS_INC(port, neighbor_prop_delay_exceeded);
 	}
diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.h b/subsys/net/l2/ethernet/gptp/gptp_md.h
index 5cc3e5e20b..e98000117f 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_md.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_md.h
@@ -33,10 +33,10 @@ struct gptp_md_sync_info {
 	struct net_ptp_time precise_orig_ts;
 
 	/** Most recent followupCorrectionField from the PortSyncSync. */
-	s64_t follow_up_correction_field;
+	int64_t follow_up_correction_field;
 
 	/** Most recent upstreamTxTime from the PortSyncSync. */
-	u64_t upstream_tx_time;
+	uint64_t upstream_tx_time;
 
 	/* Frequency of the current grandmaster compared to the previous. */
 	double last_gm_freq_change;
@@ -48,10 +48,10 @@ struct gptp_md_sync_info {
 	struct gptp_port_identity src_port_id;
 
 	/* Time Base Indicator of the current Grand Master. */
-	u16_t gm_time_base_indicator;
+	uint16_t gm_time_base_indicator;
 
 	/** Current Log Sync Interval for this port. */
-	s8_t log_msg_interval;
+	int8_t log_msg_interval;
 };
 
 /**
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c
index ccdf514822..2437865b8c 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_messages.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_messages.c
@@ -174,7 +174,7 @@ static struct net_pkt *setup_gptp_frame(struct net_if *iface,
 	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(iface)->addr;
 	net_pkt_lladdr_src(pkt)->len = net_if_get_link_addr(iface)->len;
 
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)&gptp_multicast_eth_addr;
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&gptp_multicast_eth_addr;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
 	return pkt;
@@ -595,7 +595,7 @@ void gptp_handle_sync(int port, struct net_pkt *pkt)
 	struct gptp_sync_rcv_state *state;
 	struct gptp_port_ds *port_ds;
 	struct gptp_hdr *hdr;
-	u64_t upstream_sync_itv;
+	uint64_t upstream_sync_itv;
 	k_timeout_t duration;
 
 	state = &GPTP_PORT_STATE(port)->sync_rcv;
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.h b/subsys/net/l2/ethernet/gptp/gptp_messages.h
index 7b698e08c9..e78515cea4 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_messages.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_messages.h
@@ -122,9 +122,9 @@ extern "C" {
  * This is used by the Best Master Clock Algorithm.
  */
 struct gptp_clock_quality {
-	u8_t clock_class;
-	u8_t clock_accuracy;
-	u16_t offset_scaled_log_var;
+	uint8_t clock_class;
+	uint8_t clock_accuracy;
+	uint16_t offset_scaled_log_var;
 } __packed;
 
 /**
@@ -135,49 +135,49 @@ struct gptp_clock_quality {
  */
 struct gptp_root_system_identity {
 	/** Grand Master priority1 component. */
-	u8_t grand_master_prio1;
+	uint8_t grand_master_prio1;
 
 	/** Grand Master clock quality. */
 	struct gptp_clock_quality clk_quality;
 
 	/** Grand Master priority2 component. */
-	u8_t grand_master_prio2;
+	uint8_t grand_master_prio2;
 
 	/** Grand Master clock identity. */
-	u8_t grand_master_id[GPTP_CLOCK_ID_LEN];
+	uint8_t grand_master_id[GPTP_CLOCK_ID_LEN];
 } __packed;
 
 /* Definition of all message types as defined by IEEE802.1AS. */
 
 struct gptp_path_trace_tlv {
 	/** TLV type: 0x8. */
-	u16_t type;
+	uint16_t type;
 
 	/** Length. Number of TLVs * 8 bytes. */
-	u16_t len;
+	uint16_t len;
 
 	/** ClockIdentity array of the successive time-aware systems. */
-	u8_t  path_sequence[1][8];
+	uint8_t  path_sequence[1][8];
 } __packed;
 
 struct gptp_announce {
 	/** Reserved fields. */
-	u8_t reserved1[10];
+	uint8_t reserved1[10];
 
 	/** Current UTC offset. */
-	s16_t cur_utc_offset;
+	int16_t cur_utc_offset;
 
 	/** Reserved field. */
-	u8_t reserved2;
+	uint8_t reserved2;
 
 	/* gmPriorityVector priority 1 of the peer sending the message. */
 	struct gptp_root_system_identity root_system_id;
 
 	/** masterStepsRemoved of the peer sending the message. */
-	u16_t steps_removed;
+	uint16_t steps_removed;
 
 	/** timeSource of the peer sending the message. */
-	u8_t time_source;
+	uint8_t time_source;
 
 	/* Path Trace TLV. This field has a variable length. */
 	struct gptp_path_trace_tlv tlv;
@@ -185,46 +185,46 @@ struct gptp_announce {
 
 struct gptp_sync {
 	/** Reserved field. This field is used for PTPv2, unused in gPTP. */
-	u8_t reserved[10];
+	uint8_t reserved[10];
 } __packed;
 
 struct gptp_follow_up_tlv_hdr {
 	/** TLV type: 0x3. */
-	u16_t type;
+	uint16_t type;
 
 	/** Length: 28. */
-	u16_t len;
+	uint16_t len;
 } __packed;
 
 struct gptp_follow_up_tlv {
 	/** Organization Id: 00-80-C2. */
-	u8_t org_id[3];
+	uint8_t org_id[3];
 
 	/** Organization Sub Type: 1. */
-	u8_t org_sub_type[3];
+	uint8_t org_sub_type[3];
 
 	/** Rate ratio relative to the grand master of the peer. */
-	s32_t cumulative_scaled_rate_offset;
+	int32_t cumulative_scaled_rate_offset;
 
 	/** Time Base Indicator of the current Grand Master. */
-	u16_t gm_time_base_indicator;
+	uint16_t gm_time_base_indicator;
 
 	/** Difference of the time between the current GM and the previous. */
 	struct gptp_scaled_ns last_gm_phase_change;
 
 	/** Diff of the frequency between the current GM and the previous. */
-	s32_t scaled_last_gm_freq_change;
+	int32_t scaled_last_gm_freq_change;
 } __packed;
 
 struct gptp_follow_up {
 	/** Higher 16 bits of the seconds at which the sync was sent. */
-	u16_t prec_orig_ts_secs_high;
+	uint16_t prec_orig_ts_secs_high;
 
 	/** Lower 32 bits of the seconds at which the sync was sent. */
-	u32_t prec_orig_ts_secs_low;
+	uint32_t prec_orig_ts_secs_low;
 
 	/** Nanoseconds at which the sync was sent. */
-	u32_t prec_orig_ts_nsecs;
+	uint32_t prec_orig_ts_nsecs;
 
 	/** Follow up TLV. */
 	struct gptp_follow_up_tlv_hdr tlv_hdr;
@@ -233,21 +233,21 @@ struct gptp_follow_up {
 
 struct gptp_pdelay_req {
 	/** Reserved fields. */
-	u8_t reserved1[10];
+	uint8_t reserved1[10];
 
 	/** Reserved fields. */
-	u8_t reserved2[10];
+	uint8_t reserved2[10];
 } __packed;
 
 struct gptp_pdelay_resp {
 	/** Higher 16 bits of the seconds at which the request was received. */
-	u16_t req_receipt_ts_secs_high;
+	uint16_t req_receipt_ts_secs_high;
 
 	/** Lower 32 bits of the seconds at which the request was received. */
-	u32_t req_receipt_ts_secs_low;
+	uint32_t req_receipt_ts_secs_low;
 
 	/** Nanoseconds at which the pdelay request was received. */
-	u32_t req_receipt_ts_nsecs;
+	uint32_t req_receipt_ts_nsecs;
 
 	/** Source Port Id of the Path Delay Request. */
 	struct gptp_port_identity requesting_port_id;
@@ -255,13 +255,13 @@ struct gptp_pdelay_resp {
 
 struct gptp_pdelay_resp_follow_up {
 	/** Higher 16 bits of the seconds at which the response was sent. */
-	u16_t resp_orig_ts_secs_high;
+	uint16_t resp_orig_ts_secs_high;
 
 	/** Lower 32 bits of the seconds at which the response was sent. */
-	u32_t resp_orig_ts_secs_low;
+	uint32_t resp_orig_ts_secs_low;
 
 	/** Nanoseconds at which the response was received. */
-	u32_t resp_orig_ts_nsecs;
+	uint32_t resp_orig_ts_nsecs;
 
 	/** Source Port Id of the Path Delay Request. */
 	struct gptp_port_identity requesting_port_id;
@@ -269,36 +269,36 @@ struct gptp_pdelay_resp_follow_up {
 
 struct gptp_message_itv_req_tlv {
 	/** TLV type: 0x3. */
-	u16_t type;
+	uint16_t type;
 
 	/** Length field: 12. */
-	u16_t len;
+	uint16_t len;
 
 	/** Organization Id: 00-80-C2. */
-	u8_t org_id[3];
+	uint8_t org_id[3];
 
 	/** Organization sub type: 0x2. */
-	u8_t org_sub_type[3];
+	uint8_t org_sub_type[3];
 
 	/** Log to base 2 of the mean time interval between pdelay requests. */
-	s8_t link_delay_itv;
+	int8_t link_delay_itv;
 
 	/** Log to base 2 of the mean time interval between syncs. */
-	s8_t time_sync_itv;
+	int8_t time_sync_itv;
 
 	/** Log to base 2 of the mean time interval between announces. */
-	s8_t announce_itv;
+	int8_t announce_itv;
 
 	/** Flags (computeNeighborRateRatio and computeNeighborPropDelay). */
 	union {
 		struct {
-		    u8_t compute_neighbor_rate_ratio : 1;
-		    u8_t compute_neighbor_prop_delay : 1;
+		    uint8_t compute_neighbor_rate_ratio : 1;
+		    uint8_t compute_neighbor_prop_delay : 1;
 		};
-		u8_t flags;
+		uint8_t flags;
 	};
 	/** Reserved fields. */
-	u8_t reserved[2];
+	uint8_t reserved[2];
 } __packed;
 
 struct gptp_signaling {
@@ -316,9 +316,9 @@ struct gptp_signaling {
  *
  * @return Pointer to the start of the gPTP message inside the packet.
  */
-static inline u8_t *gptp_data(struct net_pkt *pkt)
+static inline uint8_t *gptp_data(struct net_pkt *pkt)
 {
-	return (u8_t *)GPTP_HDR(pkt) + sizeof(struct gptp_hdr);
+	return (uint8_t *)GPTP_HDR(pkt) + sizeof(struct gptp_hdr);
 }
 
 /* Functions to prepare messages. */
diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c
index d3fcb1a5f4..d0c4ed53b4 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_mi.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_mi.c
@@ -277,7 +277,7 @@ void gptp_mi_init_state_machine(void)
 	gptp_mi_init_clock_master_sync_rcv_sm();
 }
 
-u64_t gptp_get_current_time_nanosecond(int port)
+uint64_t gptp_get_current_time_nanosecond(int port)
 {
 	struct device *clk;
 
@@ -301,7 +301,7 @@ use_uptime:
 	return k_uptime_get() * 1000000;
 }
 
-u64_t gptp_get_current_master_time_nanosecond(void)
+uint64_t gptp_get_current_master_time_nanosecond(void)
 {
 	int port;
 	enum gptp_port_state *port_role;
@@ -589,7 +589,7 @@ static void gptp_mi_site_ss_send_to_pss(void)
 static void gptp_mi_site_sync_sync_state_machine(void)
 {
 	bool gm_present;
-	u16_t local_port_number;
+	uint16_t local_port_number;
 	struct gptp_site_sync_sync_state *state;
 	struct gptp_clk_slave_sync_state *clk_ss;
 
@@ -643,7 +643,7 @@ static void gptp_mi_clk_slave_sync_compute(void)
 	struct gptp_global_ds *global_ds;
 	struct gptp_md_sync_info *pss;
 	struct gptp_port_ds *port_ds;
-	u64_t sync_receipt_time;
+	uint64_t sync_receipt_time;
 
 	state = &GPTP_STATE()->clk_slave_sync;
 	offset_state = &GPTP_STATE()->clk_master_sync_offset;
@@ -686,8 +686,8 @@ static void gptp_update_local_port_clock(void)
 	struct gptp_global_ds *global_ds;
 	struct gptp_port_ds *port_ds;
 	int port;
-	s64_t nanosecond_diff;
-	s64_t second_diff;
+	int64_t nanosecond_diff;
+	int64_t second_diff;
 	struct device *clk;
 	struct net_ptp_time tm;
 	int key;
@@ -864,7 +864,7 @@ static inline void gptp_mi_setup_sync_send_time(void)
 {
 	struct gptp_clk_master_sync_snd_state *state;
 	struct gptp_global_ds *global_ds;
-	u64_t time_helper;
+	uint64_t time_helper;
 
 	state = &GPTP_STATE()->clk_master_sync_send;
 	global_ds = GPTP_GLOBAL_DS();
@@ -887,7 +887,7 @@ static void gptp_mi_set_ps_sync_cmss(void)
 	struct gptp_clk_master_sync_snd_state *state;
 	struct gptp_global_ds *global_ds;
 	struct gptp_md_sync_info *sync_info;
-	u64_t current_time;
+	uint64_t current_time;
 
 	global_ds = GPTP_GLOBAL_DS();
 	state = &GPTP_STATE()->clk_master_sync_send;
@@ -948,7 +948,7 @@ static void gptp_mi_clk_master_sync_snd_state_machine(void)
 {
 	struct gptp_clk_master_sync_snd_state *state;
 	struct gptp_global_ds *global_ds;
-	u64_t current_time;
+	uint64_t current_time;
 
 	state = &GPTP_STATE()->clk_master_sync_send;
 	global_ds = GPTP_GLOBAL_DS();
@@ -1082,7 +1082,7 @@ static void gptp_mi_clk_master_sync_rcv_state_machine(void)
 
 #ifdef CONFIG_NET_GPTP_PROBE_CLOCK_SOURCE_ON_DEMAND
 	struct gptp_clk_src_time_invoke_params invoke_args = {};
-	u64_t cur = gptp_get_current_master_time_nanosecond();
+	uint64_t cur = gptp_get_current_master_time_nanosecond();
 
 	invoke_args.src_time.second = cur / NSEC_PER_SEC;
 	cur -= (invoke_args.src_time.second * NSEC_PER_SEC);
@@ -1163,7 +1163,7 @@ static void copy_path_trace(struct gptp_announce *announce)
 	       len);
 
 	/* Append local clockIdentity. */
-	memcpy((u8_t *)sys_path_trace->path_sequence + len,
+	memcpy((uint8_t *)sys_path_trace->path_sequence + len,
 	       GPTP_DEFAULT_DS()->clk_id, GPTP_CLOCK_ID_LEN);
 }
 
@@ -1172,7 +1172,7 @@ static bool gptp_mi_qualify_announce(int port, struct net_pkt *announce_msg)
 	struct gptp_announce *announce;
 	struct gptp_hdr *hdr;
 	int i;
-	u16_t len;
+	uint16_t len;
 
 	hdr = GPTP_HDR(announce_msg);
 	announce = GPTP_ANNOUNCE(announce_msg);
@@ -1269,7 +1269,7 @@ static enum gptp_received_info compare_priority_vectors(
 	rsi_cmp = memcmp(&announce->root_system_id,
 			 &vector->root_system_id,
 			 sizeof(struct gptp_root_system_identity) +
-			 sizeof(u16_t));
+			 sizeof(uint16_t));
 	if (rsi_cmp < 0) {
 		/* Better rootSystemIdentity. */
 		return GPTP_RCVD_INFO_SUPERIOR_MASTER_INFO;
@@ -1354,7 +1354,7 @@ static void copy_priority_vector(struct gptp_priority_vector *vector,
 	announce = GPTP_ANNOUNCE(pkt);
 
 	memcpy(&vector->root_system_id, &announce->root_system_id,
-	       sizeof(struct gptp_root_system_identity) + sizeof(u16_t));
+	       sizeof(struct gptp_root_system_identity) + sizeof(uint16_t));
 
 	memcpy(&vector->src_port_id, &hdr->port_id,
 	       sizeof(struct gptp_port_identity));
diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.h b/subsys/net/l2/ethernet/gptp/gptp_mi.h
index 2422787580..6a143069ca 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_mi.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_mi.h
@@ -27,13 +27,13 @@ extern "C" {
  */
 struct gptp_mi_port_sync_sync {
 	/** Time at which the sync receipt timeout occurs. */
-	u64_t sync_receipt_timeout_time;
+	uint64_t sync_receipt_timeout_time;
 
 	/** Copy of the gptp_md_sync_info to be transmitted. */
 	struct gptp_md_sync_info sync_info;
 
 	/** Port to which the Sync Information belongs to. */
-	u16_t local_port_number;
+	uint16_t local_port_number;
 };
 
 /**
@@ -67,7 +67,7 @@ void gptp_mi_state_machines(void);
  *
  * @return Current time in nanoseconds.
  */
-u64_t gptp_get_current_time_nanosecond(int port);
+uint64_t gptp_get_current_time_nanosecond(int port);
 
 #ifdef __cplusplus
 }
diff --git a/subsys/net/l2/ethernet/gptp/gptp_private.h b/subsys/net/l2/ethernet/gptp/gptp_private.h
index 6e158876df..0dea2cd5c8 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_private.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_private.h
@@ -60,8 +60,8 @@ int gptp_get_port_number(struct net_if *iface);
  * @param log_msg_interval Logarithm 2 to apply to this interval.
  */
 void gptp_set_time_itv(struct gptp_uscaled_ns *interval,
-		       u16_t seconds,
-		       s8_t log_msg_interval);
+		       uint16_t seconds,
+		       int8_t log_msg_interval);
 
 /**
  * @brief Convert uscaled ns to ms for timer use.
@@ -71,7 +71,7 @@ void gptp_set_time_itv(struct gptp_uscaled_ns *interval,
  * @return INT32_MAX if value exceed timer max value, 0 if the result of the
  *	    conversion is less 1ms, the converted value otherwise.
  */
-s32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns);
+int32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns);
 
 /**
  * @brief Update pDelay request interval and its timer.
@@ -80,7 +80,7 @@ s32_t gptp_uscaled_ns_to_timer_ms(struct gptp_uscaled_ns *usns);
  *
  * @param log_val New logarithm 2 to apply to this interval.
  */
-void gptp_update_pdelay_req_interval(int port, s8_t log_val);
+void gptp_update_pdelay_req_interval(int port, int8_t log_val);
 
 /**
  * @brief Update sync interval and its timer.
@@ -89,7 +89,7 @@ void gptp_update_pdelay_req_interval(int port, s8_t log_val);
  *
  * @param log_val New logarithm 2 to apply to this interval.
  */
-void gptp_update_sync_interval(int port, s8_t log_val);
+void gptp_update_sync_interval(int port, int8_t log_val);
 
 /**
  * @brief Update announce interval and its timer.
@@ -99,7 +99,7 @@ void gptp_update_sync_interval(int port, s8_t log_val);
  * @param log_val New logarithm 2 to apply to this interval.
  */
 
-void gptp_update_announce_interval(int port, s8_t log_val);
+void gptp_update_announce_interval(int port, int8_t log_val);
 
 /**
  * @brief Convert a ptp timestamp to nanoseconds.
@@ -108,7 +108,7 @@ void gptp_update_announce_interval(int port, s8_t log_val);
  *
  * @return Number of nanoseconds.
  */
-static inline u64_t gptp_timestamp_to_nsec(struct net_ptp_time *ts)
+static inline uint64_t gptp_timestamp_to_nsec(struct net_ptp_time *ts)
 {
 	if (!ts) {
 		return 0;
diff --git a/subsys/net/l2/ethernet/gptp/gptp_state.h b/subsys/net/l2/ethernet/gptp/gptp_state.h
index e200d3754e..7bb810442c 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_state.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_state.h
@@ -160,7 +160,7 @@ struct gptp_priority_vector {
 	struct gptp_root_system_identity root_system_id;
 
 	/** portNumber of the receiving port. */
-	u16_t port_number;
+	uint16_t port_number;
 
 	/** Port identity of the transmitting time-aware system. */
 	struct gptp_port_identity src_port_id;
@@ -168,16 +168,16 @@ struct gptp_priority_vector {
 	/** Steps removed from the announce message transmitter and the
 	 * master clock.
 	 */
-	u16_t steps_removed;
+	uint16_t steps_removed;
 } __packed;
 
 /* Pdelay Request state machine variables. */
 struct gptp_pdelay_req_state {
 	/** Initial Path Delay Response Peer Timestamp. */
-	u64_t ini_resp_evt_tstamp;
+	uint64_t ini_resp_evt_tstamp;
 
 	/** Initial Path Delay Response Ingress Timestamp. */
-	u64_t ini_resp_ingress_tstamp;
+	uint64_t ini_resp_ingress_tstamp;
 
 	/** Timer for the Path Delay Request. */
 	struct k_timer pdelay_timer;
@@ -192,13 +192,13 @@ struct gptp_pdelay_req_state {
 	struct net_pkt *tx_pdelay_req_ptr;
 
 	/** Path Delay Response messages received. */
-	u32_t rcvd_pdelay_resp;
+	uint32_t rcvd_pdelay_resp;
 
 	/** Path Delay Follow Up messages received. */
-	u32_t rcvd_pdelay_follow_up;
+	uint32_t rcvd_pdelay_follow_up;
 
 	/** Number of lost Path Delay Responses. */
-	u16_t lost_responses;
+	uint16_t lost_responses;
 
 	/** Current state of the state machine. */
 	enum gptp_pdelay_req_states state;
@@ -213,7 +213,7 @@ struct gptp_pdelay_req_state {
 	bool init_pdelay_compute;
 
 	/** Count consecutive Pdelay_req with multiple responses. */
-	u8_t multiple_resp_count;
+	uint8_t multiple_resp_count;
 };
 
 /**
@@ -227,7 +227,7 @@ struct gptp_pdelay_resp_state {
 /* SyncReceive state machine variables. */
 struct gptp_sync_rcv_state {
 	/** Time at which a Sync Message without Follow Up will be discarded. */
-	u64_t follow_up_receipt_timeout;
+	uint64_t follow_up_receipt_timeout;
 
 	/** Timer for the Follow Up discard. */
 	struct k_timer follow_up_discard_timer;
@@ -308,10 +308,10 @@ struct gptp_pss_send_state {
 	struct gptp_scaled_ns last_gm_phase_change;
 
 	/** Follow Up Correction Field of the last received PortSyncSync. */
-	s64_t last_follow_up_correction_field;
+	int64_t last_follow_up_correction_field;
 
 	/** Upstream Tx Time of the last received PortSyncSync. */
-	u64_t last_upstream_tx_time;
+	uint64_t last_upstream_tx_time;
 
 	/** PortSyncSync structure received from the SiteSyncSync. */
 	struct gptp_mi_port_sync_sync *pss_sync_ptr;
@@ -326,10 +326,10 @@ struct gptp_pss_send_state {
 	enum gptp_pss_send_states state;
 
 	/** GM Time Base Indicator of the last received PortSyncSync. */
-	u16_t last_gm_time_base_indicator;
+	uint16_t last_gm_time_base_indicator;
 
 	/** Received Port Number of the last received PortSyncSync. */
-	u16_t last_rcvd_port_num;
+	uint16_t last_rcvd_port_num;
 
 	/** Sync send to be transmitted to the MD Sync Send State Machine. */
 	struct gptp_md_sync_info sync_send;
@@ -545,13 +545,13 @@ struct gptp_port_bmca_data {
 	struct gptp_flags ann_flags;
 
 	/** The value of steps removed for the port. */
-	u16_t port_steps_removed;
+	uint16_t port_steps_removed;
 
 	/** The value of steps removed for the port. */
-	u16_t message_steps_removed;
+	uint16_t message_steps_removed;
 
 	/** Last announce message current UTC offset value. */
-	s16_t ann_current_utc_offset;
+	int16_t ann_current_utc_offset;
 
 	/** A qualified announce message has been received. */
 	bool rcvd_msg;
diff --git a/subsys/net/l2/ethernet/gptp/gptp_user_api.c b/subsys/net/l2/ethernet/gptp/gptp_user_api.c
index c79e8639bb..d5c9d17ab4 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_user_api.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_user_api.c
@@ -35,7 +35,7 @@ void gptp_call_phase_dis_cb(void)
 {
 	struct gptp_global_ds *global_ds;
 	sys_snode_t *sn, *sns;
-	u8_t *gm_id;
+	uint8_t *gm_id;
 
 	global_ds = GPTP_GLOBAL_DS();
 	gm_id = &global_ds->gm_priority.root_system_id.grand_master_id[0];
@@ -76,7 +76,7 @@ int gptp_event_capture(struct net_ptp_time *slave_time, bool *gm_present)
 	return -EAGAIN;
 }
 
-char *gptp_sprint_clock_id(const u8_t *clk_id, char *output, size_t output_len)
+char *gptp_sprint_clock_id(const uint8_t *clk_id, char *output, size_t output_len)
 {
 	return net_sprint_ll_addr_buf(clk_id, 8, output, output_len);
 }
diff --git a/subsys/net/l2/ethernet/lldp/lldp.c b/subsys/net/l2/ethernet/lldp/lldp.c
index b99d61af96..00fca9f5b4 100644
--- a/subsys/net/l2/ethernet/lldp/lldp.c
+++ b/subsys/net/l2/ethernet/lldp/lldp.c
@@ -51,7 +51,7 @@ static int lldp_find(struct ethernet_context *ctx, struct net_if *iface)
 	return -ENOENT;
 }
 
-static void lldp_submit_work(u32_t timeout)
+static void lldp_submit_work(uint32_t timeout)
 {
 	if (!k_delayed_work_remaining_get(&lldp_tx_timer) ||
 	    timeout < k_delayed_work_remaining_get(&lldp_tx_timer)) {
@@ -63,7 +63,7 @@ static void lldp_submit_work(u32_t timeout)
 	}
 }
 
-static bool lldp_check_timeout(s64_t start, u32_t time, s64_t timeout)
+static bool lldp_check_timeout(int64_t start, uint32_t time, int64_t timeout)
 {
 	start += time;
 	start = abs(start);
@@ -75,7 +75,7 @@ static bool lldp_check_timeout(s64_t start, u32_t time, s64_t timeout)
 	return true;
 }
 
-static bool lldp_timedout(struct ethernet_lldp *lldp, s64_t timeout)
+static bool lldp_timedout(struct ethernet_lldp *lldp, int64_t timeout)
 {
 	return lldp_check_timeout(lldp->tx_timer_start,
 				  lldp->tx_timer_timeout,
@@ -105,7 +105,7 @@ static int lldp_send(struct ethernet_lldp *lldp)
 	}
 
 	if (IS_ENABLED(CONFIG_NET_LLDP_END_LLDPDU_TLV_ENABLED)) {
-		len += sizeof(u16_t);
+		len += sizeof(uint16_t);
 	}
 
 	pkt = net_pkt_alloc_with_buffer(lldp->iface, len, AF_UNSPEC, 0,
@@ -117,7 +117,7 @@ static int lldp_send(struct ethernet_lldp *lldp)
 
 	net_pkt_set_lldp(pkt, true);
 
-	ret = net_pkt_write(pkt, (u8_t *)lldp->lldpdu,
+	ret = net_pkt_write(pkt, (uint8_t *)lldp->lldpdu,
 			    sizeof(struct net_lldpdu));
 	if (ret < 0) {
 		net_pkt_unref(pkt);
@@ -125,7 +125,7 @@ static int lldp_send(struct ethernet_lldp *lldp)
 	}
 
 	if (lldp->optional_du && lldp->optional_len) {
-		ret = net_pkt_write(pkt, (u8_t *)lldp->optional_du,
+		ret = net_pkt_write(pkt, (uint8_t *)lldp->optional_du,
 				    lldp->optional_len);
 		if (ret < 0) {
 			net_pkt_unref(pkt);
@@ -134,9 +134,9 @@ static int lldp_send(struct ethernet_lldp *lldp)
 	}
 
 	if (IS_ENABLED(CONFIG_NET_LLDP_END_LLDPDU_TLV_ENABLED)) {
-		u16_t tlv_end = htons(NET_LLDP_END_LLDPDU_VALUE);
+		uint16_t tlv_end = htons(NET_LLDP_END_LLDPDU_VALUE);
 
-		ret = net_pkt_write(pkt, (u8_t *)&tlv_end, sizeof(tlv_end));
+		ret = net_pkt_write(pkt, (uint8_t *)&tlv_end, sizeof(tlv_end));
 		if (ret < 0) {
 			net_pkt_unref(pkt);
 			goto out;
@@ -145,7 +145,7 @@ static int lldp_send(struct ethernet_lldp *lldp)
 
 	net_pkt_lladdr_src(pkt)->addr = net_if_get_link_addr(lldp->iface)->addr;
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)lldp_multicast_eth_addr.addr;
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)lldp_multicast_eth_addr.addr;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(struct net_eth_addr);
 
 	if (net_if_send_data(lldp->iface, pkt) == NET_DROP) {
@@ -159,9 +159,9 @@ out:
 	return ret;
 }
 
-static u32_t lldp_manage_timeouts(struct ethernet_lldp *lldp, s64_t timeout)
+static uint32_t lldp_manage_timeouts(struct ethernet_lldp *lldp, int64_t timeout)
 {
-	s32_t next_timeout;
+	int32_t next_timeout;
 
 	if (lldp_timedout(lldp, timeout)) {
 		lldp_send(lldp);
@@ -175,14 +175,14 @@ static u32_t lldp_manage_timeouts(struct ethernet_lldp *lldp, s64_t timeout)
 
 static void lldp_tx_timeout(struct k_work *work)
 {
-	u32_t timeout_update = UINT32_MAX - 1;
-	s64_t timeout = k_uptime_get();
+	uint32_t timeout_update = UINT32_MAX - 1;
+	int64_t timeout = k_uptime_get();
 	struct ethernet_lldp *current, *next;
 
 	ARG_UNUSED(work);
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&lldp_ifaces, current, next, node) {
-		u32_t next_timeout;
+		uint32_t next_timeout;
 
 		next_timeout = lldp_manage_timeouts(current, timeout);
 		if (next_timeout < timeout_update) {
@@ -225,7 +225,7 @@ static int lldp_check_iface(struct net_if *iface)
 	return 0;
 }
 
-static int lldp_start(struct net_if *iface, u32_t mgmt_event)
+static int lldp_start(struct net_if *iface, uint32_t mgmt_event)
 {
 	struct ethernet_context *ctx;
 	int ret, slot;
@@ -308,7 +308,7 @@ int net_lldp_register_callback(struct net_if *iface, net_lldp_recv_cb_t cb)
 }
 
 static void iface_event_handler(struct net_mgmt_event_callback *cb,
-				u32_t mgmt_event, struct net_if *iface)
+				uint32_t mgmt_event, struct net_if *iface)
 {
 	lldp_start(iface, mgmt_event);
 }
@@ -339,7 +339,7 @@ int net_lldp_config(struct net_if *iface, const struct net_lldpdu *lldpdu)
 	return 0;
 }
 
-int net_lldp_config_optional(struct net_if *iface, const u8_t *tlv, size_t len)
+int net_lldp_config_optional(struct net_if *iface, const uint8_t *tlv, size_t len)
 {
 	struct ethernet_context *ctx = net_if_l2_data(iface);
 	int i;
diff --git a/subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/l2/ieee802154/ieee802154.c
index c6c6f7cb2c..4932c46636 100644
--- a/subsys/net/l2/ieee802154/ieee802154.c
+++ b/subsys/net/l2/ieee802154/ieee802154.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(net_ieee802154, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #define BUF_TIMEOUT K_MSEC(50)
 
 /* No need to hold space for the FCS */
-static u8_t frame_buffer_data[IEEE802154_MTU - 2];
+static uint8_t frame_buffer_data[IEEE802154_MTU - 2];
 
 static struct net_buf frame_buf = {
 	.data = frame_buffer_data,
@@ -125,8 +125,8 @@ enum net_verdict ieee802154_manage_recv_packet(struct net_if *iface,
 					       size_t hdr_len)
 {
 	enum net_verdict verdict = NET_CONTINUE;
-	u32_t src;
-	u32_t dst;
+	uint32_t src;
+	uint32_t dst;
 
 	/* Upper IP stack expects the link layer address to be in
 	 * big endian format so we must swap it here.
@@ -218,7 +218,7 @@ static enum net_verdict ieee802154_recv(struct net_if *iface,
 
 	pkt_hexdump(RX_PKT_TITLE " (with ll)", pkt, true);
 
-	hdr_len = (u8_t *)mpdu.payload - net_pkt_data(pkt);
+	hdr_len = (uint8_t *)mpdu.payload - net_pkt_data(pkt);
 	net_buf_pull(pkt->buffer, hdr_len);
 
 	return ieee802154_manage_recv_packet(iface, pkt, hdr_len);
@@ -230,7 +230,7 @@ static int ieee802154_send(struct net_if *iface, struct net_pkt *pkt)
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 	struct ieee802154_fragment_ctx f_ctx;
 	struct net_buf *buf;
-	u8_t ll_hdr_size;
+	uint8_t ll_hdr_size;
 	bool fragment;
 	int len;
 
@@ -329,9 +329,9 @@ NET_L2_INIT(IEEE802154_L2,
 void ieee802154_init(struct net_if *iface)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
-	const u8_t *mac = net_if_get_link_addr(iface)->addr;
-	s16_t tx_power = CONFIG_NET_L2_IEEE802154_RADIO_DFLT_TX_POWER;
-	u8_t long_addr[8];
+	const uint8_t *mac = net_if_get_link_addr(iface)->addr;
+	int16_t tx_power = CONFIG_NET_L2_IEEE802154_RADIO_DFLT_TX_POWER;
+	uint8_t long_addr[8];
 
 	NET_DBG("Initializing IEEE 802.15.4 stack on iface %p", iface);
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_fragment.c b/subsys/net/l2/ieee802154/ieee802154_fragment.c
index 4bcf014794..790c159b56 100644
--- a/subsys/net/l2/ieee802154/ieee802154_fragment.c
+++ b/subsys/net/l2/ieee802154/ieee802154_fragment.c
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(net_ieee802154_fragment,
 	K_SECONDS(CONFIG_NET_L2_IEEE802154_REASSEMBLY_TIMEOUT)
 #define REASS_CACHE_SIZE CONFIG_NET_L2_IEEE802154_FRAGMENT_REASS_CACHE_SIZE
 
-static u16_t datagram_tag;
+static uint16_t datagram_tag;
 
 /**
  *  Reassemble cache : Depends on cache size it used for reassemble
@@ -44,8 +44,8 @@ static u16_t datagram_tag;
 struct frag_cache {
 	struct k_delayed_work timer;	/* Reassemble timer */
 	struct net_pkt *pkt;		/* Reassemble packet */
-	u16_t size;			/* Datagram size */
-	u16_t tag;			/* Datagram tag */
+	uint16_t size;			/* Datagram size */
+	uint16_t tag;			/* Datagram tag */
 	bool used;
 };
 
@@ -84,22 +84,22 @@ static struct frag_cache cache[REASS_CACHE_SIZE];
  *  +-+-+-+-+-+-+-+-+
  */
 
-static inline void set_datagram_size(u8_t *ptr, u16_t size)
+static inline void set_datagram_size(uint8_t *ptr, uint16_t size)
 {
 	ptr[0] |= ((size & 0x7FF) >> 8);
-	ptr[1] = (u8_t) size;
+	ptr[1] = (uint8_t) size;
 }
 
-static inline void set_datagram_tag(u8_t *ptr, u16_t tag)
+static inline void set_datagram_tag(uint8_t *ptr, uint16_t tag)
 {
 	ptr[0] = tag >> 8;
-	ptr[1] = (u8_t) tag;
+	ptr[1] = (uint8_t) tag;
 }
 
-static inline void set_up_frag_hdr(struct net_buf *frag, u16_t size,
-				   u8_t offset)
+static inline void set_up_frag_hdr(struct net_buf *frag, uint16_t size,
+				   uint8_t offset)
 {
-	u8_t pos = frag->len;
+	uint8_t pos = frag->len;
 
 	if (!offset) {
 		net_buf_add(frag, NET_6LO_FRAG1_HDR_LEN);
@@ -120,17 +120,17 @@ static inline void set_up_frag_hdr(struct net_buf *frag, u16_t size,
 	}
 }
 
-static inline u8_t calc_max_payload(struct net_buf *frag, u8_t offset)
+static inline uint8_t calc_max_payload(struct net_buf *frag, uint8_t offset)
 {
-	u8_t max = frag->size - frag->len;
+	uint8_t max = frag->size - frag->len;
 
 	return (max & 0xF8);
 }
 
-static inline u8_t copy_data(struct ieee802154_fragment_ctx *ctx,
-			     struct net_buf *frame_buf, u8_t max)
+static inline uint8_t copy_data(struct ieee802154_fragment_ctx *ctx,
+			     struct net_buf *frame_buf, uint8_t max)
 {
-	u8_t move = ctx->buf->len - (ctx->pos - ctx->buf->data);
+	uint8_t move = ctx->buf->len - (ctx->pos - ctx->buf->data);
 
 	move = MIN(move, max);
 
@@ -142,7 +142,7 @@ static inline u8_t copy_data(struct ieee802154_fragment_ctx *ctx,
 }
 
 static inline void update_fragment_ctx(struct ieee802154_fragment_ctx *ctx,
-				       u8_t move)
+				       uint8_t move)
 {
 	if (move == (ctx->buf->len - (ctx->pos - ctx->buf->data))) {
 		ctx->buf = ctx->buf->frags;
@@ -181,7 +181,7 @@ static inline void update_fragment_ctx(struct ieee802154_fragment_ctx *ctx,
 void ieee802154_fragment(struct ieee802154_fragment_ctx *ctx,
 			 struct net_buf *frame_buf, bool iphc)
 {
-	u8_t max;
+	uint8_t max;
 
 	if (!ctx->offset) {
 		datagram_tag++;
@@ -203,7 +203,7 @@ void ieee802154_fragment(struct ieee802154_fragment_ctx *ctx,
 	}
 
 	while (max && ctx->buf) {
-		u8_t move;
+		uint8_t move;
 
 		move = copy_data(ctx, frame_buf, max);
 
@@ -215,17 +215,17 @@ void ieee802154_fragment(struct ieee802154_fragment_ctx *ctx,
 	ctx->offset = ctx->processed >> 3;
 }
 
-static inline u16_t get_datagram_size(u8_t *ptr)
+static inline uint16_t get_datagram_size(uint8_t *ptr)
 {
 	return ((ptr[0] & 0x1F) << 8) | ptr[1];
 }
 
-static inline u16_t get_datagram_tag(u8_t *ptr)
+static inline uint16_t get_datagram_tag(uint8_t *ptr)
 {
 	return (ptr[0] << 8) | ptr[1];
 }
 
-static void update_protocol_header_lengths(struct net_pkt *pkt, u16_t size)
+static void update_protocol_header_lengths(struct net_pkt *pkt, uint16_t size)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(ipv6_access, struct net_ipv6_hdr);
 	struct net_ipv6_hdr *ipv6;
@@ -255,9 +255,9 @@ static void update_protocol_header_lengths(struct net_pkt *pkt, u16_t size)
 	}
 }
 
-static inline void clear_reass_cache(u16_t size, u16_t tag)
+static inline void clear_reass_cache(uint16_t size, uint16_t tag)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < REASS_CACHE_SIZE; i++) {
 		if (!(cache[i].size == size && cache[i].tag == tag)) {
@@ -300,7 +300,7 @@ static void reass_timeout(struct k_work *work)
  *  discard the fragments.
  */
 static inline struct frag_cache *set_reass_cache(struct net_pkt *pkt,
-						 u16_t size, u16_t tag)
+						 uint16_t size, uint16_t tag)
 {
 	int i;
 
@@ -326,9 +326,9 @@ static inline struct frag_cache *set_reass_cache(struct net_pkt *pkt,
  *  Return cache if it matches with size and tag of stored caches,
  *  otherwise return NULL.
  */
-static inline struct frag_cache *get_reass_cache(u16_t size, u16_t tag)
+static inline struct frag_cache *get_reass_cache(uint16_t size, uint16_t tag)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < REASS_CACHE_SIZE; i++) {
 		if (cache[i].used) {
@@ -361,11 +361,11 @@ static inline size_t fragment_cached_pkt_len(struct net_pkt *pkt)
 	size_t len = 0U;
 	struct net_buf *frag;
 	int hdr_len;
-	u8_t *data;
+	uint8_t *data;
 
 	frag = pkt->buffer;
 	while (frag) {
-		u16_t hdr_len = NET_6LO_FRAGN_HDR_LEN;
+		uint16_t hdr_len = NET_6LO_FRAGN_HDR_LEN;
 
 		if ((frag->data[0] & NET_FRAG_DISPATCH_MASK) ==
 		    NET_6LO_DISPATCH_FRAG1) {
@@ -394,14 +394,14 @@ static inline size_t fragment_cached_pkt_len(struct net_pkt *pkt)
 	return len + hdr_len;
 }
 
-static inline u16_t fragment_offset(struct net_buf *frag)
+static inline uint16_t fragment_offset(struct net_buf *frag)
 {
 	if ((frag->data[0] & NET_FRAG_DISPATCH_MASK) ==
 		    NET_6LO_DISPATCH_FRAG1) {
 		return 0;
 	}
 
-	return ((u16_t)frag->data[NET_FRAG_OFFSET_POS] << 3);
+	return ((uint16_t)frag->data[NET_FRAG_OFFSET_POS] << 3);
 }
 
 static void fragment_move_back(struct net_pkt *pkt,
@@ -433,7 +433,7 @@ static inline void fragment_remove_headers(struct net_pkt *pkt)
 
 	frag = pkt->buffer;
 	while (frag) {
-		u16_t hdr_len = NET_6LO_FRAGN_HDR_LEN;
+		uint16_t hdr_len = NET_6LO_FRAGN_HDR_LEN;
 
 		if ((frag->data[0] & NET_FRAG_DISPATCH_MASK) ==
 		    NET_6LO_DISPATCH_FRAG1) {
@@ -484,8 +484,8 @@ static inline enum net_verdict fragment_add_to_cache(struct net_pkt *pkt)
 	bool first_frag = false;
 	struct frag_cache *cache;
 	struct net_buf *frag;
-	u16_t size;
-	u16_t tag;
+	uint16_t size;
+	uint16_t tag;
 
 	/* Parse total size of packet */
 	size = get_datagram_size(pkt->buffer->data);
diff --git a/subsys/net/l2/ieee802154/ieee802154_fragment.h b/subsys/net/l2/ieee802154/ieee802154_fragment.h
index cd9c015498..ae882fa5b7 100644
--- a/subsys/net/l2/ieee802154/ieee802154_fragment.h
+++ b/subsys/net/l2/ieee802154/ieee802154_fragment.h
@@ -22,15 +22,15 @@
 
 struct ieee802154_fragment_ctx {
 	struct net_buf *buf;
-	u8_t *pos;
-	u16_t pkt_size;
-	u16_t processed;
-	u8_t hdr_diff;
-	u8_t offset;
+	uint8_t *pos;
+	uint16_t pkt_size;
+	uint16_t processed;
+	uint8_t hdr_diff;
+	uint8_t offset;
 };
 
 static inline bool ieee802154_fragment_is_needed(struct net_pkt *pkt,
-						 u8_t ll_hdr_size)
+						 uint8_t ll_hdr_size)
 {
 	return (net_pkt_get_len(pkt) + ll_hdr_size >
 			IEEE802154_MTU - IEEE802154_MFR_LENGTH);
@@ -38,7 +38,7 @@ static inline bool ieee802154_fragment_is_needed(struct net_pkt *pkt,
 
 static inline
 void ieee802154_fragment_ctx_init(struct ieee802154_fragment_ctx *ctx,
-				  struct net_pkt *pkt, u16_t hdr_diff,
+				  struct net_pkt *pkt, uint16_t hdr_diff,
 				  bool iphc)
 {
 	ctx->buf = pkt->buffer;
diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c
index 452c9a4164..ec258d11ca 100644
--- a/subsys/net/l2/ieee802154/ieee802154_frame.c
+++ b/subsys/net/l2/ieee802154/ieee802154_frame.c
@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(net_ieee802154_frame, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #define BUF_TIMEOUT K_MSEC(50)
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
-const u8_t level_2_tag_size[4] = {
+const uint8_t level_2_tag_size[4] = {
 	0,
 	IEEE8021254_AUTH_TAG_LENGTH_32,
 	IEEE8021254_AUTH_TAG_LENGTH_64,
@@ -37,8 +37,8 @@ const u8_t level_2_tag_size[4] = {
 };
 #endif
 
-struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(u8_t *buf, u8_t **p_buf,
-						      u8_t *length)
+struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(uint8_t *buf, uint8_t **p_buf,
+						      uint8_t *length)
 {
 	struct ieee802154_fcf_seq *fs = (struct ieee802154_fcf_seq *)buf;
 
@@ -90,11 +90,11 @@ struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(u8_t *buf, u8_t **p_buf,
 }
 
 static inline struct ieee802154_address_field *
-validate_addr(u8_t *buf, u8_t **p_buf, u8_t *length,
+validate_addr(uint8_t *buf, uint8_t **p_buf, uint8_t *length,
 	      enum ieee802154_addressing_mode mode,
 	      bool pan_id_compression)
 {
-	u8_t len = 0;
+	uint8_t len = 0;
 
 	*p_buf = buf;
 
@@ -128,11 +128,11 @@ validate_addr(u8_t *buf, u8_t **p_buf, u8_t *length,
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 struct ieee802154_aux_security_hdr *
-ieee802154_validate_aux_security_hdr(u8_t *buf, u8_t **p_buf, u8_t *length)
+ieee802154_validate_aux_security_hdr(uint8_t *buf, uint8_t **p_buf, uint8_t *length)
 {
 	struct ieee802154_aux_security_hdr *ash =
 		(struct ieee802154_aux_security_hdr *)buf;
-	u8_t len =  IEEE802154_SECURITY_CF_LENGTH +
+	uint8_t len =  IEEE802154_SECURITY_CF_LENGTH +
 		IEEE802154_SECURITY_FRAME_COUNTER_LENGTH;
 
 	/* At least the asf is sized of: control field + frame counter */
@@ -192,11 +192,11 @@ ieee802154_validate_aux_security_hdr(u8_t *buf, u8_t **p_buf, u8_t *length)
 #endif /* CONFIG_NET_L2_IEEE802154_SECURITY */
 
 static inline bool
-validate_beacon(struct ieee802154_mpdu *mpdu, u8_t *buf, u8_t *length)
+validate_beacon(struct ieee802154_mpdu *mpdu, uint8_t *buf, uint8_t *length)
 {
 	struct ieee802154_beacon *b = (struct ieee802154_beacon *)buf;
 	struct ieee802154_pas_spec *pas;
-	u8_t len = IEEE802154_BEACON_SF_SIZE +
+	uint8_t len = IEEE802154_BEACON_SF_SIZE +
 		IEEE802154_BEACON_GTS_SPEC_SIZE;
 
 
@@ -237,9 +237,9 @@ validate_beacon(struct ieee802154_mpdu *mpdu, u8_t *buf, u8_t *length)
 
 static inline bool
 validate_mac_command_cfi_to_mhr(struct ieee802154_mhr *mhr,
-				u8_t ar, u8_t comp,
-				u8_t src, bool src_pan_brdcst_chk,
-				u8_t dst, bool dst_brdcst_chk)
+				uint8_t ar, uint8_t comp,
+				uint8_t src, bool src_pan_brdcst_chk,
+				uint8_t dst, bool dst_brdcst_chk)
 {
 	if (mhr->fs->fc.ar != ar || mhr->fs->fc.pan_id_comp != comp) {
 		return false;
@@ -270,15 +270,15 @@ validate_mac_command_cfi_to_mhr(struct ieee802154_mhr *mhr,
 }
 
 static inline bool
-validate_mac_command(struct ieee802154_mpdu *mpdu, u8_t *buf, u8_t *length)
+validate_mac_command(struct ieee802154_mpdu *mpdu, uint8_t *buf, uint8_t *length)
 {
 	struct ieee802154_command *c = (struct ieee802154_command *)buf;
-	u8_t len = IEEE802154_CMD_CFI_LENGTH;
+	uint8_t len = IEEE802154_CMD_CFI_LENGTH;
 	bool src_pan_brdcst_chk = false;
 	bool dst_brdcst_chk = false;
-	u8_t comp = 0U;
-	u8_t ar = 0U;
-	u8_t src, dst;
+	uint8_t comp = 0U;
+	uint8_t ar = 0U;
+	uint8_t src, dst;
 
 	if (*length < len) {
 		return false;
@@ -377,12 +377,12 @@ validate_mac_command(struct ieee802154_mpdu *mpdu, u8_t *buf, u8_t *length)
 
 static inline bool
 validate_payload_and_mfr(struct ieee802154_mpdu *mpdu,
-			 u8_t *buf, u8_t *p_buf, u8_t *length)
+			 uint8_t *buf, uint8_t *p_buf, uint8_t *length)
 {
-	u8_t type = mpdu->mhr.fs->fc.frame_type;
+	uint8_t type = mpdu->mhr.fs->fc.frame_type;
 
 	NET_DBG("Header size: %u, payload size %u",
-		(u32_t)(p_buf - buf), *length);
+		(uint32_t)(p_buf - buf), *length);
 
 	if (type == IEEE802154_FRAME_TYPE_BEACON) {
 		if (!validate_beacon(mpdu, p_buf, length)) {
@@ -417,10 +417,10 @@ validate_payload_and_mfr(struct ieee802154_mpdu *mpdu,
 	return true;
 }
 
-bool ieee802154_validate_frame(u8_t *buf, u8_t length,
+bool ieee802154_validate_frame(uint8_t *buf, uint8_t length,
 			       struct ieee802154_mpdu *mpdu)
 {
-	u8_t *p_buf = NULL;
+	uint8_t *p_buf = NULL;
 
 	if (length > IEEE802154_MTU || length < IEEE802154_MIN_LENGTH) {
 		NET_DBG("Wrong packet length: %d", length);
@@ -459,10 +459,10 @@ bool ieee802154_validate_frame(u8_t *buf, u8_t length,
 	return validate_payload_and_mfr(mpdu, buf, p_buf, &length);
 }
 
-u8_t ieee802154_compute_header_size(struct net_if *iface,
+uint8_t ieee802154_compute_header_size(struct net_if *iface,
 				    struct in6_addr *dst)
 {
-	u8_t hdr_len = sizeof(struct ieee802154_fcf_seq);
+	uint8_t hdr_len = sizeof(struct ieee802154_fcf_seq);
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 	struct ieee802154_security_ctx *sec_ctx =
 		&((struct ieee802154_context *)net_if_l2_data(iface))->sec_ctx;
@@ -543,7 +543,7 @@ done:
 	return hdr_len;
 }
 
-static inline struct ieee802154_fcf_seq *generate_fcf_grounds(u8_t **p_buf,
+static inline struct ieee802154_fcf_seq *generate_fcf_grounds(uint8_t **p_buf,
 							      bool ack)
 {
 	struct ieee802154_fcf_seq *fs;
@@ -620,10 +620,10 @@ bool data_addr_to_fs_settings(struct net_linkaddr *dst,
 }
 
 static
-u8_t *generate_addressing_fields(struct ieee802154_context *ctx,
+uint8_t *generate_addressing_fields(struct ieee802154_context *ctx,
 				 struct ieee802154_fcf_seq *fs,
 				 struct ieee802154_frame_params *params,
-				 u8_t *p_buf)
+				 uint8_t *p_buf)
 {
 	struct ieee802154_address_field *af;
 	struct ieee802154_address *src_addr;
@@ -674,8 +674,8 @@ u8_t *generate_addressing_fields(struct ieee802154_context *ctx,
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 static
-u8_t *generate_aux_security_hdr(struct ieee802154_security_ctx *sec_ctx,
-				u8_t *p_buf)
+uint8_t *generate_aux_security_hdr(struct ieee802154_security_ctx *sec_ctx,
+				uint8_t *p_buf)
 {
 	struct ieee802154_aux_security_hdr *aux_sec;
 
@@ -704,12 +704,12 @@ u8_t *generate_aux_security_hdr(struct ieee802154_security_ctx *sec_ctx,
 bool ieee802154_create_data_frame(struct ieee802154_context *ctx,
 				  struct net_linkaddr *dst,
 				  struct net_buf *buf,
-				  u8_t hdr_size)
+				  uint8_t hdr_size)
 {
 	struct ieee802154_frame_params params;
 	struct ieee802154_fcf_seq *fs;
-	u8_t *p_buf = buf->data;
-	u8_t *buf_start = p_buf;
+	uint8_t *p_buf = buf->data;
+	uint8_t *buf_start = p_buf;
 	bool broadcast;
 
 	fs = generate_fcf_grounds(&p_buf, ctx->ack_requested);
@@ -740,7 +740,7 @@ bool ieee802154_create_data_frame(struct ieee802154_context *ctx,
 	 */
 	if (ctx->sec_ctx.level != IEEE802154_SECURITY_LEVEL_NONE &&
 	    ctx->sec_ctx.level != IEEE802154_SECURITY_LEVEL_ENC) {
-		u8_t level;
+		uint8_t level;
 
 		level = ctx->sec_ctx.level;
 		if (level >= IEEE802154_SECURITY_LEVEL_ENC) {
@@ -835,9 +835,9 @@ static inline bool cfi_to_fs_settings(enum ieee802154_cfi cfi,
 	return true;
 }
 
-static inline u8_t mac_command_length(enum ieee802154_cfi cfi)
+static inline uint8_t mac_command_length(enum ieee802154_cfi cfi)
 {
-	u8_t length = 1U; /* cfi is at least present */
+	uint8_t length = 1U; /* cfi is at least present */
 
 	switch (cfi) {
 	case IEEE802154_CFI_ASSOCIATION_REQUEST:
@@ -866,7 +866,7 @@ ieee802154_create_mac_cmd_frame(struct net_if *iface,
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 	struct ieee802154_fcf_seq *fs;
 	struct net_pkt *pkt;
-	u8_t *p_buf, *p_start;
+	uint8_t *p_buf, *p_start;
 
 	/* It would be costly to compute the size when actual frame are never
 	 * bigger than 125 bytes, so let's allocate that size as buffer.
@@ -918,9 +918,9 @@ void ieee802154_mac_cmd_finalize(struct net_pkt *pkt,
 
 #ifdef CONFIG_NET_L2_IEEE802154_ACK_REPLY
 bool ieee802154_create_ack_frame(struct net_if *iface,
-				 struct net_pkt *pkt, u8_t seq)
+				 struct net_pkt *pkt, uint8_t seq)
 {
-	u8_t *p_buf = net_pkt_data(pkt);
+	uint8_t *p_buf = net_pkt_data(pkt);
 	struct ieee802154_fcf_seq *fs;
 
 	if (!p_buf) {
@@ -946,7 +946,7 @@ bool ieee802154_decipher_data_frame(struct net_if *iface, struct net_pkt *pkt,
 				    struct ieee802154_mpdu *mpdu)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
-	u8_t level;
+	uint8_t level;
 
 	if (!mpdu->mhr.fs->fc.security_enabled) {
 		return true;
@@ -965,7 +965,7 @@ bool ieee802154_decipher_data_frame(struct net_if *iface, struct net_pkt *pkt,
 	 * in order to get the extended address related to it
 	 */
 	if (!ieee802154_decrypt_auth(&ctx->sec_ctx, net_pkt_data(pkt),
-				     (u8_t *)mpdu->payload - net_pkt_data(pkt),
+				     (uint8_t *)mpdu->payload - net_pkt_data(pkt),
 				     net_pkt_get_len(pkt),
 				     net_pkt_lladdr_src(pkt)->addr,
 				     sys_le32_to_cpu(
diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.h b/subsys/net/l2/ieee802154/ieee802154_frame.h
index 6970a2f029..21f621957f 100644
--- a/subsys/net/l2/ieee802154/ieee802154_frame.h
+++ b/subsys/net/l2/ieee802154/ieee802154_frame.h
@@ -80,40 +80,40 @@ enum ieee802154_version {
 struct ieee802154_fcf_seq {
 	struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-		u16_t frame_type		:3;
-		u16_t security_enabled		:1;
-		u16_t frame_pending		:1;
-		u16_t ar			:1;
-		u16_t pan_id_comp		:1;
-		u16_t reserved			:1;
-		u16_t seq_num_suppr		:1;
-		u16_t ie_list			:1;
-		u16_t dst_addr_mode		:2;
-		u16_t frame_version		:2;
-		u16_t src_addr_mode		:2;
+		uint16_t frame_type		:3;
+		uint16_t security_enabled		:1;
+		uint16_t frame_pending		:1;
+		uint16_t ar			:1;
+		uint16_t pan_id_comp		:1;
+		uint16_t reserved			:1;
+		uint16_t seq_num_suppr		:1;
+		uint16_t ie_list			:1;
+		uint16_t dst_addr_mode		:2;
+		uint16_t frame_version		:2;
+		uint16_t src_addr_mode		:2;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-		u16_t reserved			:1;
-		u16_t pan_id_comp		:1;
-		u16_t ar			:1;
-		u16_t frame_pending		:1;
-		u16_t security_enabled		:1;
-		u16_t frame_type		:3;
-		u16_t src_addr_mode		:2;
-		u16_t frame_version		:2;
-		u16_t dst_addr_mode		:2;
-		u16_t ie_list			:1;
-		u16_t seq_num_suppr		:1;
+		uint16_t reserved			:1;
+		uint16_t pan_id_comp		:1;
+		uint16_t ar			:1;
+		uint16_t frame_pending		:1;
+		uint16_t security_enabled		:1;
+		uint16_t frame_type		:3;
+		uint16_t src_addr_mode		:2;
+		uint16_t frame_version		:2;
+		uint16_t dst_addr_mode		:2;
+		uint16_t ie_list			:1;
+		uint16_t seq_num_suppr		:1;
 #endif
 	} fc __packed;
 
-	u8_t sequence;
+	uint8_t sequence;
 } __packed;
 
 struct ieee802154_address {
 	union {
-		u8_t simple_addr;
-		u16_t short_addr;
-		u8_t ext_addr[0];
+		uint8_t simple_addr;
+		uint16_t short_addr;
+		uint8_t ext_addr[0];
 	};
 } __packed;
 
@@ -122,7 +122,7 @@ struct ieee802154_address_field_comp {
 } __packed;
 
 struct ieee802154_address_field_plain {
-	u16_t pan_id;
+	uint16_t pan_id;
 	struct ieee802154_address addr;
 } __packed;
 
@@ -167,13 +167,13 @@ enum ieee802154_key_id_mode {
 /* See Section 7.4.1 */
 struct ieee802154_security_control_field {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t security_level	:3;
-	u8_t key_id_mode	:2;
-	u8_t reserved		:3;
+	uint8_t security_level	:3;
+	uint8_t key_id_mode	:2;
+	uint8_t reserved		:3;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t reserved		:3;
-	u8_t key_id_mode	:2;
-	u8_t security_level	:3;
+	uint8_t reserved		:3;
+	uint8_t key_id_mode	:2;
+	uint8_t security_level	:3;
 #endif
 } __packed;
 
@@ -184,17 +184,17 @@ struct ieee802154_key_identifier_field {
 	union {
 		/* mode_0 being implicit, it holds no info here */
 		struct {
-			u8_t key_index;
+			uint8_t key_index;
 		} mode_1;
 
 		struct {
-			u8_t key_src[4];
-			u8_t key_index;
+			uint8_t key_src[4];
+			uint8_t key_index;
 		} mode_2;
 
 		struct {
-			u8_t key_src[8];
-			u8_t key_index;
+			uint8_t key_src[8];
+			uint8_t key_index;
 		} mode_3;
 	};
 } __packed;
@@ -205,7 +205,7 @@ struct ieee802154_key_identifier_field {
  */
 struct ieee802154_aux_security_hdr {
 	struct ieee802154_security_control_field control;
-	u32_t frame_counter;
+	uint32_t frame_counter;
 	struct ieee802154_key_identifier_field kif;
 } __packed;
 
@@ -222,93 +222,93 @@ struct ieee802154_mhr {
 };
 
 struct ieee802154_mfr {
-	u16_t fcs;
+	uint16_t fcs;
 };
 
 struct ieee802154_gts_dir {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t mask			: 7;
-	u8_t reserved			: 1;
+	uint8_t mask			: 7;
+	uint8_t reserved			: 1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t reserved			: 1;
-	u8_t mask			: 7;
+	uint8_t reserved			: 1;
+	uint8_t mask			: 7;
 #endif
 } __packed;
 
 struct ieee802154_gts {
-	u16_t short_address;
+	uint16_t short_address;
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-	u8_t starting_slot		: 4;
-	u8_t length			: 4;
+	uint8_t starting_slot		: 4;
+	uint8_t length			: 4;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t length			: 4;
-	u8_t starting_slot		: 4;
+	uint8_t length			: 4;
+	uint8_t starting_slot		: 4;
 #endif
 } __packed;
 
 struct ieee802154_gts_spec {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 	/* Descriptor Count */
-	u8_t desc_count			: 3;
-	u8_t reserved			: 4;
+	uint8_t desc_count			: 3;
+	uint8_t reserved			: 4;
 	/* GTS Permit */
-	u8_t permit			: 1;
+	uint8_t permit			: 1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 	/* GTS Permit */
-	u8_t permit			: 1;
-	u8_t reserved			: 4;
+	uint8_t permit			: 1;
+	uint8_t reserved			: 4;
 	/* Descriptor Count */
-	u8_t desc_count			: 3;
+	uint8_t desc_count			: 3;
 #endif
 } __packed;
 
 struct ieee802154_pas_spec {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 	/* Number of Short Addresses Pending */
-	u8_t nb_sap			: 3;
-	u8_t reserved_1			: 1;
+	uint8_t nb_sap			: 3;
+	uint8_t reserved_1			: 1;
 	/* Number of Extended Addresses Pending */
-	u8_t nb_eap			: 3;
-	u8_t reserved_2			: 1;
+	uint8_t nb_eap			: 3;
+	uint8_t reserved_2			: 1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-	u8_t reserved_1			: 1;
+	uint8_t reserved_1			: 1;
 	/* Number of Extended Addresses Pending */
-	u8_t nb_eap			: 3;
-	u8_t reserved_2			: 1;
+	uint8_t nb_eap			: 3;
+	uint8_t reserved_2			: 1;
 	/* Number of Short Addresses Pending */
-	u8_t nb_sap			: 3;
+	uint8_t nb_sap			: 3;
 #endif
 } __packed;
 
 struct ieee802154_beacon_sf {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 	/* Beacon Order*/
-	u16_t bc_order		: 4;
+	uint16_t bc_order		: 4;
 	/* Superframe Order*/
-	u16_t sf_order		: 4;
+	uint16_t sf_order		: 4;
 	/* Final CAP Slot */
-	u16_t cap_slot		: 4;
+	uint16_t cap_slot		: 4;
 	/* Battery Life Extension */
-	u16_t ble		: 1;
-	u16_t reserved		: 1;
+	uint16_t ble		: 1;
+	uint16_t reserved		: 1;
 	/* PAN Coordinator */
-	u16_t coordinator	: 1;
+	uint16_t coordinator	: 1;
 	/* Association Permit */
-	u16_t association	: 1;
+	uint16_t association	: 1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 	/* Superframe Order*/
-	u16_t sf_order		: 4;
+	uint16_t sf_order		: 4;
 	/* Beacon Order*/
-	u16_t bc_order		: 4;
+	uint16_t bc_order		: 4;
 	/* Association Permit */
-	u16_t association	: 1;
+	uint16_t association	: 1;
 	/* PAN Coordinator */
-	u16_t coordinator	: 1;
-	u16_t reserved		: 1;
+	uint16_t coordinator	: 1;
+	uint16_t reserved		: 1;
 	/* Battery Life Extension */
-	u16_t ble		: 1;
+	uint16_t ble		: 1;
 	/* Final CAP Slot */
-	u16_t cap_slot		: 4;
+	uint16_t cap_slot		: 4;
 #endif
 } __packed;
 
@@ -323,21 +323,21 @@ struct ieee802154_beacon {
 struct ieee802154_cmd_assoc_req {
 	struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-		u8_t reserved_1		: 1;
-		u8_t dev_type		: 1;
-		u8_t power_src		: 1;
-		u8_t rx_on		: 1;
-		u8_t reserved_2		: 2;
-		u8_t sec_capability	: 1;
-		u8_t alloc_addr		: 1;
+		uint8_t reserved_1		: 1;
+		uint8_t dev_type		: 1;
+		uint8_t power_src		: 1;
+		uint8_t rx_on		: 1;
+		uint8_t reserved_2		: 2;
+		uint8_t sec_capability	: 1;
+		uint8_t alloc_addr		: 1;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-		u8_t alloc_addr		: 1;
-		u8_t sec_capability	: 1;
-		u8_t reserved_2		: 2;
-		u8_t rx_on		: 1;
-		u8_t power_src		: 1;
-		u8_t dev_type		: 1;
-		u8_t reserved_1		: 1;
+		uint8_t alloc_addr		: 1;
+		uint8_t sec_capability	: 1;
+		uint8_t reserved_2		: 2;
+		uint8_t rx_on		: 1;
+		uint8_t power_src		: 1;
+		uint8_t dev_type		: 1;
+		uint8_t reserved_1		: 1;
 #endif
 	} ci;
 } __packed;
@@ -354,8 +354,8 @@ enum ieee802154_association_status_field {
 };
 
 struct ieee802154_cmd_assoc_res {
-	u16_t short_addr;
-	u8_t status;
+	uint16_t short_addr;
+	uint8_t status;
 } __packed;
 
 #define IEEE802154_CMD_ASSOC_RES_LENGTH		3
@@ -370,18 +370,18 @@ enum ieee802154_disassociation_reason_field {
 };
 
 struct ieee802154_cmd_disassoc_note {
-	u8_t reason;
+	uint8_t reason;
 } __packed;
 
 #define IEEE802154_CMD_DISASSOC_NOTE_LENGTH	1
 
 /* See Section 5.3.8 */
 struct ieee802154_cmd_coord_realign {
-	u16_t pan_id;
-	u16_t coordinator_short_addr;
-	u8_t channel;
-	u16_t short_addr;
-	u8_t channel_page; /* Optional */
+	uint16_t pan_id;
+	uint16_t coordinator_short_addr;
+	uint8_t channel;
+	uint16_t short_addr;
+	uint8_t channel_page; /* Optional */
 } __packed;
 
 #define IEEE802154_CMD_COORD_REALIGN_LENGTH	3
@@ -390,15 +390,15 @@ struct ieee802154_cmd_coord_realign {
 struct ieee802154_gts_request {
 	struct {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-		u8_t length		: 4;
-		u8_t direction		: 1;
-		u8_t type		: 1;
-		u8_t reserved		: 2;
+		uint8_t length		: 4;
+		uint8_t direction		: 1;
+		uint8_t type		: 1;
+		uint8_t reserved		: 2;
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-		u8_t reserved		: 2;
-		u8_t type		: 1;
-		u8_t direction		: 1;
-		u8_t length		: 4;
+		uint8_t reserved		: 2;
+		uint8_t type		: 1;
+		uint8_t direction		: 1;
+		uint8_t length		: 4;
 #endif
 	} gts;
 } __packed;
@@ -421,7 +421,7 @@ enum ieee802154_cfi {
 };
 
 struct ieee802154_command {
-	u8_t cfi;
+	uint8_t cfi;
 	union {
 		struct ieee802154_cmd_assoc_req assoc_req;
 		struct ieee802154_cmd_assoc_res assoc_res;
@@ -451,36 +451,36 @@ struct ieee802154_mpdu {
 struct ieee802154_frame_params {
 	struct {
 		union {
-			u8_t *ext_addr;
-			u16_t short_addr;
+			uint8_t *ext_addr;
+			uint16_t short_addr;
 		};
 
-		u16_t len;
-		u16_t pan_id;
+		uint16_t len;
+		uint16_t pan_id;
 	} dst;
 
-	u16_t short_addr;
-	u16_t pan_id;
+	uint16_t short_addr;
+	uint16_t pan_id;
 } __packed;
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 struct ieee802154_aux_security_hdr *
-ieee802154_validate_aux_security_hdr(u8_t *buf, u8_t **p_buf, u8_t *length);
+ieee802154_validate_aux_security_hdr(uint8_t *buf, uint8_t **p_buf, uint8_t *length);
 #endif
 
-struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(u8_t *buf, u8_t **p_buf,
-						      u8_t *length);
+struct ieee802154_fcf_seq *ieee802154_validate_fc_seq(uint8_t *buf, uint8_t **p_buf,
+						      uint8_t *length);
 
-bool ieee802154_validate_frame(u8_t *buf, u8_t length,
+bool ieee802154_validate_frame(uint8_t *buf, uint8_t length,
 			       struct ieee802154_mpdu *mpdu);
 
-u8_t ieee802154_compute_header_size(struct net_if *iface,
+uint8_t ieee802154_compute_header_size(struct net_if *iface,
 				    struct in6_addr *dst);
 
 bool ieee802154_create_data_frame(struct ieee802154_context *ctx,
 				  struct net_linkaddr *dst,
 				  struct net_buf *frag,
-				  u8_t hdr_size);
+				  uint8_t hdr_size);
 
 struct net_pkt *
 ieee802154_create_mac_cmd_frame(struct net_if *iface,
@@ -499,7 +499,7 @@ struct ieee802154_command *ieee802154_get_mac_command(struct net_pkt *pkt)
 
 #ifdef CONFIG_NET_L2_IEEE802154_ACK_REPLY
 bool ieee802154_create_ack_frame(struct net_if *iface,
-				 struct net_pkt *pkt, u8_t seq);
+				 struct net_pkt *pkt, uint8_t seq);
 #endif
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
diff --git a/subsys/net/l2/ieee802154/ieee802154_mgmt.c b/subsys/net/l2/ieee802154/ieee802154_mgmt.c
index bf8182bbdf..66a85388f8 100644
--- a/subsys/net/l2/ieee802154/ieee802154_mgmt.c
+++ b/subsys/net/l2/ieee802154/ieee802154_mgmt.c
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(net_ieee802154_mgmt, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
 enum net_verdict ieee802154_handle_beacon(struct net_if *iface,
 					  struct ieee802154_mpdu *mpdu,
-					  u8_t lqi)
+					  uint8_t lqi)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 
@@ -61,7 +61,7 @@ enum net_verdict ieee802154_handle_beacon(struct net_if *iface,
 	return NET_OK;
 }
 
-static int ieee802154_cancel_scan(u32_t mgmt_request, struct net_if *iface,
+static int ieee802154_cancel_scan(uint32_t mgmt_request, struct net_if *iface,
 				  void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
@@ -79,14 +79,14 @@ static int ieee802154_cancel_scan(u32_t mgmt_request, struct net_if *iface,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_CANCEL_SCAN,
 				  ieee802154_cancel_scan);
 
-static int ieee802154_scan(u32_t mgmt_request, struct net_if *iface,
+static int ieee802154_scan(uint32_t mgmt_request, struct net_if *iface,
 			   void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 	struct ieee802154_req_params *scan =
 		(struct ieee802154_req_params *)data;
 	struct net_pkt *pkt = NULL;
-	u8_t channel;
+	uint8_t channel;
 	int ret;
 
 	NET_DBG("%s scan requested",
@@ -223,7 +223,7 @@ enum net_verdict ieee802154_handle_mac_command(struct net_if *iface,
 	return NET_DROP;
 }
 
-static int ieee802154_associate(u32_t mgmt_request, struct net_if *iface,
+static int ieee802154_associate(uint32_t mgmt_request, struct net_if *iface,
 				void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
@@ -303,7 +303,7 @@ out:
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_ASSOCIATE,
 				  ieee802154_associate);
 
-static int ieee802154_disassociate(u32_t mgmt_request, struct net_if *iface,
+static int ieee802154_disassociate(uint32_t mgmt_request, struct net_if *iface,
 				   void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
@@ -350,7 +350,7 @@ static int ieee802154_disassociate(u32_t mgmt_request, struct net_if *iface,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_DISASSOCIATE,
 				  ieee802154_disassociate);
 
-static int ieee802154_set_ack(u32_t mgmt_request, struct net_if *iface,
+static int ieee802154_set_ack(uint32_t mgmt_request, struct net_if *iface,
 			      void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
@@ -373,12 +373,12 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_ACK,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_UNSET_ACK,
 				  ieee802154_set_ack);
 
-static int ieee802154_set_parameters(u32_t mgmt_request,
+static int ieee802154_set_parameters(uint32_t mgmt_request,
 				     struct net_if *iface,
 				     void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
-	u16_t value;
+	uint16_t value;
 	int ret = 0;
 
 	if (ctx->associated) {
@@ -386,11 +386,11 @@ static int ieee802154_set_parameters(u32_t mgmt_request,
 	}
 
 	if (mgmt_request != NET_REQUEST_IEEE802154_SET_EXT_ADDR &&
-	    (len != sizeof(u16_t) || !data)) {
+	    (len != sizeof(uint16_t) || !data)) {
 		return -EINVAL;
 	}
 
-	value = *((u16_t *) data);
+	value = *((uint16_t *) data);
 
 	if (mgmt_request == NET_REQUEST_IEEE802154_SET_CHANNEL) {
 		if (ctx->channel != value) {
@@ -423,10 +423,10 @@ static int ieee802154_set_parameters(u32_t mgmt_request,
 			ieee802154_filter_short_addr(iface, ctx->short_addr);
 		}
 	} else if (mgmt_request == NET_REQUEST_IEEE802154_SET_TX_POWER) {
-		if (ctx->tx_power != (s16_t)value) {
-			ret = ieee802154_set_tx_power(iface, (s16_t)value);
+		if (ctx->tx_power != (int16_t)value) {
+			ret = ieee802154_set_tx_power(iface, (int16_t)value);
 			if (!ret) {
-				ctx->tx_power = (s16_t)value;
+				ctx->tx_power = (int16_t)value;
 			}
 		}
 	}
@@ -449,19 +449,19 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_SHORT_ADDR,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_TX_POWER,
 				  ieee802154_set_parameters);
 
-static int ieee802154_get_parameters(u32_t mgmt_request,
+static int ieee802154_get_parameters(uint32_t mgmt_request,
 				     struct net_if *iface,
 				     void *data, size_t len)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
-	u16_t *value;
+	uint16_t *value;
 
 	if (mgmt_request != NET_REQUEST_IEEE802154_GET_EXT_ADDR &&
-	    (len != sizeof(u16_t) || !data)) {
+	    (len != sizeof(uint16_t) || !data)) {
 		return -EINVAL;
 	}
 
-	value = (u16_t *)data;
+	value = (uint16_t *)data;
 
 	if (mgmt_request == NET_REQUEST_IEEE802154_GET_CHANNEL) {
 		*value = ctx->channel;
@@ -476,7 +476,7 @@ static int ieee802154_get_parameters(u32_t mgmt_request,
 	} else if (mgmt_request == NET_REQUEST_IEEE802154_GET_SHORT_ADDR) {
 		*value = ctx->short_addr;
 	} else if (mgmt_request == NET_REQUEST_IEEE802154_GET_TX_POWER) {
-		s16_t *s_value = (s16_t *)data;
+		int16_t *s_value = (int16_t *)data;
 
 		*s_value = ctx->tx_power;
 	}
@@ -501,7 +501,7 @@ NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_TX_POWER,
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 
-static int ieee802154_set_security_settings(u32_t mgmt_request,
+static int ieee802154_set_security_settings(uint32_t mgmt_request,
 					    struct net_if *iface,
 					    void *data, size_t len)
 {
@@ -532,7 +532,7 @@ static int ieee802154_set_security_settings(u32_t mgmt_request,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_SECURITY_SETTINGS,
 				  ieee802154_set_security_settings);
 
-static int ieee802154_get_security_settings(u32_t mgmt_request,
+static int ieee802154_get_security_settings(uint32_t mgmt_request,
 					    struct net_if *iface,
 					    void *data, size_t len)
 {
diff --git a/subsys/net/l2/ieee802154/ieee802154_mgmt_priv.h b/subsys/net/l2/ieee802154/ieee802154_mgmt_priv.h
index db1f489cf8..e0818afc26 100644
--- a/subsys/net/l2/ieee802154/ieee802154_mgmt_priv.h
+++ b/subsys/net/l2/ieee802154/ieee802154_mgmt_priv.h
@@ -32,7 +32,7 @@ static inline void ieee802154_mgmt_init(struct net_if *iface)
 
 enum net_verdict ieee802154_handle_beacon(struct net_if *iface,
 					  struct ieee802154_mpdu *mpdu,
-					  u8_t lqi);
+					  uint8_t lqi);
 
 enum net_verdict ieee802154_handle_mac_command(struct net_if *iface,
 					       struct ieee802154_mpdu *mpdu);
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
index d5680dbe6e..a978fa1de5 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
@@ -20,7 +20,7 @@ static inline int aloha_radio_send(struct net_if *iface,
 				   struct net_pkt *pkt,
 				   struct net_buf *frag)
 {
-	u8_t retries = CONFIG_NET_L2_IEEE802154_RADIO_TX_RETRIES;
+	uint8_t retries = CONFIG_NET_L2_IEEE802154_RADIO_TX_RETRIES;
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 	bool ack_required = prepare_for_ack(ctx, pkt, frag);
 	int ret = -EIO;
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
index be0f0d0543..51b3928ddb 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
@@ -23,13 +23,13 @@ static inline int csma_ca_radio_send(struct net_if *iface,
 				     struct net_pkt *pkt,
 				     struct net_buf *frag)
 {
-	const u8_t max_bo = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MAX_BO;
-	const u8_t max_be = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MAX_BE;
-	u8_t retries = CONFIG_NET_L2_IEEE802154_RADIO_TX_RETRIES;
+	const uint8_t max_bo = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MAX_BO;
+	const uint8_t max_be = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MAX_BE;
+	uint8_t retries = CONFIG_NET_L2_IEEE802154_RADIO_TX_RETRIES;
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
 	bool ack_required = prepare_for_ack(ctx, pkt, frag);
-	u8_t be = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MIN_BE;
-	u8_t nb = 0U;
+	uint8_t be = CONFIG_NET_L2_IEEE802154_RADIO_CSMA_CA_MIN_BE;
+	uint8_t nb = 0U;
 	int ret = -EIO;
 
 	NET_DBG("frag %p", frag);
@@ -39,7 +39,7 @@ loop:
 		retries--;
 
 		if (be) {
-			u8_t bo_n = sys_rand32_get() & ((1 << be) - 1);
+			uint8_t bo_n = sys_rand32_get() & ((1 << be) - 1);
 
 			k_busy_wait(bo_n * 20U);
 		}
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_utils.h b/subsys/net/l2/ieee802154/ieee802154_radio_utils.h
index 000bab1026..3c6998ad3f 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_utils.h
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_utils.h
@@ -68,7 +68,7 @@ static inline int handle_ack(struct ieee802154_context *ctx,
 			     struct net_pkt *pkt)
 {
 	if (pkt->buffer->len == IEEE802154_ACK_PKT_LENGTH) {
-		u8_t len = IEEE802154_ACK_PKT_LENGTH;
+		uint8_t len = IEEE802154_ACK_PKT_LENGTH;
 		struct ieee802154_fcf_seq *fs;
 
 		fs = ieee802154_validate_fc_seq(net_pkt_data(pkt), NULL, &len);
diff --git a/subsys/net/l2/ieee802154/ieee802154_security.c b/subsys/net/l2/ieee802154/ieee802154_security.c
index d31d1304f7..f6f35b5c28 100644
--- a/subsys/net/l2/ieee802154/ieee802154_security.c
+++ b/subsys/net/l2/ieee802154/ieee802154_security.c
@@ -14,13 +14,13 @@ LOG_MODULE_REGISTER(net_ieee802154_security,
 #include "ieee802154_frame.h"
 #include "ieee802154_security.h"
 
-extern const u8_t level_2_tag_size[4];
+extern const uint8_t level_2_tag_size[4];
 
 int ieee802154_security_setup_session(struct ieee802154_security_ctx *sec_ctx,
-				      u8_t level, u8_t key_mode,
-				      u8_t *key, u8_t key_len)
+				      uint8_t level, uint8_t key_mode,
+				      uint8_t *key, uint8_t key_len)
 {
-	u8_t tag_size;
+	uint8_t tag_size;
 	int ret;
 
 	if (level > IEEE802154_SECURITY_LEVEL_ENC_MIC_128 ||
@@ -83,15 +83,15 @@ int ieee802154_security_setup_session(struct ieee802154_security_ctx *sec_ctx,
 }
 
 bool ieee802154_decrypt_auth(struct ieee802154_security_ctx *sec_ctx,
-			     u8_t *frame,
-			     u8_t auth_payload_len,
-			     u8_t decrypt_payload_len,
-			     u8_t *src_ext_addr,
-			     u32_t frame_counter)
+			     uint8_t *frame,
+			     uint8_t auth_payload_len,
+			     uint8_t decrypt_payload_len,
+			     uint8_t *src_ext_addr,
+			     uint32_t frame_counter)
 {
 	struct cipher_aead_pkt apkt;
 	struct cipher_pkt pkt;
-	u8_t nonce[13];
+	uint8_t nonce[13];
 	int ret;
 
 	if (!sec_ctx || sec_ctx->level == IEEE802154_SECURITY_LEVEL_NONE) {
@@ -100,10 +100,10 @@ bool ieee802154_decrypt_auth(struct ieee802154_security_ctx *sec_ctx,
 
 	/* See Section 7.3.2 */
 	memcpy(nonce, src_ext_addr, IEEE802154_EXT_ADDR_LENGTH);
-	nonce[8] = (u8_t)(frame_counter >> 24);
-	nonce[9] = (u8_t)(frame_counter >> 16);
-	nonce[10] = (u8_t)(frame_counter >> 8);
-	nonce[11] = (u8_t)frame_counter;
+	nonce[8] = (uint8_t)(frame_counter >> 24);
+	nonce[9] = (uint8_t)(frame_counter >> 16);
+	nonce[10] = (uint8_t)(frame_counter >> 8);
+	nonce[11] = (uint8_t)frame_counter;
 	nonce[12] = sec_ctx->level;
 
 	pkt.in_buf = decrypt_payload_len ? frame + auth_payload_len : NULL;
@@ -129,14 +129,14 @@ bool ieee802154_decrypt_auth(struct ieee802154_security_ctx *sec_ctx,
 }
 
 bool ieee802154_encrypt_auth(struct ieee802154_security_ctx *sec_ctx,
-			     u8_t *frame,
-			     u8_t auth_payload_len,
-			     u8_t encrypt_payload_len,
-			     u8_t *src_ext_addr)
+			     uint8_t *frame,
+			     uint8_t auth_payload_len,
+			     uint8_t encrypt_payload_len,
+			     uint8_t *src_ext_addr)
 {
 	struct cipher_aead_pkt apkt;
 	struct cipher_pkt pkt;
-	u8_t nonce[13];
+	uint8_t nonce[13];
 	int ret;
 
 	if (!sec_ctx || sec_ctx->level == IEEE802154_SECURITY_LEVEL_NONE) {
diff --git a/subsys/net/l2/ieee802154/ieee802154_security.h b/subsys/net/l2/ieee802154/ieee802154_security.h
index f8d84562c0..251c7a22a5 100644
--- a/subsys/net/l2/ieee802154/ieee802154_security.h
+++ b/subsys/net/l2/ieee802154/ieee802154_security.h
@@ -9,21 +9,21 @@
 #include <net/ieee802154.h>
 
 int ieee802154_security_setup_session(struct ieee802154_security_ctx *sec_ctx,
-				      u8_t level, u8_t key_mode,
-				      u8_t *key, u8_t key_len);
+				      uint8_t level, uint8_t key_mode,
+				      uint8_t *key, uint8_t key_len);
 
 bool ieee802154_decrypt_auth(struct ieee802154_security_ctx *sec_ctx,
-			     u8_t *frame,
-			     u8_t auth_payload_len,
-			     u8_t decrypt_payload_len,
-			     u8_t *src_ext_addr,
-			     u32_t frame_counter);
+			     uint8_t *frame,
+			     uint8_t auth_payload_len,
+			     uint8_t decrypt_payload_len,
+			     uint8_t *src_ext_addr,
+			     uint32_t frame_counter);
 
 bool ieee802154_encrypt_auth(struct ieee802154_security_ctx *sec_ctx,
-			     u8_t *frame,
-			     u8_t auth_payload_len,
-			     u8_t encrypt_payload_len,
-			     u8_t *src_ext_addr);
+			     uint8_t *frame,
+			     uint8_t auth_payload_len,
+			     uint8_t encrypt_payload_len,
+			     uint8_t *src_ext_addr);
 
 int ieee802154_security_init(struct ieee802154_security_ctx *sec_ctx);
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_shell.c b/subsys/net/l2/ieee802154/ieee802154_shell.c
index 68b66f772a..8ad7a93cb5 100644
--- a/subsys/net/l2/ieee802154/ieee802154_shell.c
+++ b/subsys/net/l2/ieee802154/ieee802154_shell.c
@@ -61,7 +61,7 @@ static int cmd_ieee802154_ack(const struct shell *shell,
 	return 0;
 }
 
-static inline void parse_extended_address(char *addr, u8_t *ext_addr)
+static inline void parse_extended_address(char *addr, uint8_t *ext_addr)
 {
 	net_bytes_from_str(ext_addr, IEEE802154_EXT_ADDR_LENGTH, addr);
 }
@@ -90,7 +90,7 @@ static int cmd_ieee802154_associate(const struct shell *shell,
 		parse_extended_address(ext_addr, params.addr);
 		params.len = IEEE802154_EXT_ADDR_LENGTH;
 	} else {
-		params.short_addr = (u16_t) atoi(ext_addr);
+		params.short_addr = (uint16_t) atoi(ext_addr);
 		params.len = IEEE802154_SHORT_ADDR_LENGTH;
 	}
 
@@ -143,15 +143,15 @@ static int cmd_ieee802154_disassociate(const struct shell *shell,
 	return 0;
 }
 
-static inline u32_t parse_channel_set(char *str_set)
+static inline uint32_t parse_channel_set(char *str_set)
 {
-	u32_t channel_set = 0U;
+	uint32_t channel_set = 0U;
 	char *p, *n;
 
 	p = str_set;
 
 	do {
-		u32_t chan;
+		uint32_t chan;
 
 		n = strchr(p, ':');
 		if (n) {
@@ -190,7 +190,7 @@ static inline char *print_coordinator_address(char *buf, int buf_len)
 }
 
 static void scan_result_cb(struct net_mgmt_event_callback *cb,
-			   u32_t mgmt_event, struct net_if *iface)
+			   uint32_t mgmt_event, struct net_if *iface)
 {
 	char buf[64];
 
@@ -204,7 +204,7 @@ static int cmd_ieee802154_scan(const struct shell *shell,
 			       size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u32_t scan_type;
+	uint32_t scan_type;
 	int ret;
 
 	if (argc < 3) {
@@ -276,7 +276,7 @@ static int cmd_ieee802154_set_chan(const struct shell *shell,
 				   size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t channel;
+	uint16_t channel;
 
 	if (argc < 2) {
 		shell_help(shell);
@@ -289,10 +289,10 @@ static int cmd_ieee802154_set_chan(const struct shell *shell,
 		return -ENOEXEC;
 	}
 
-	channel = (u16_t)atoi(argv[1]);
+	channel = (uint16_t)atoi(argv[1]);
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_SET_CHANNEL, iface,
-		     &channel, sizeof(u16_t))) {
+		     &channel, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not set channel %u\n", channel);
 
@@ -309,7 +309,7 @@ static int cmd_ieee802154_get_chan(const struct shell *shell,
 				   size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t channel;
+	uint16_t channel;
 
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
@@ -321,7 +321,7 @@ static int cmd_ieee802154_get_chan(const struct shell *shell,
 	}
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_GET_CHANNEL, iface,
-		     &channel, sizeof(u16_t))) {
+		     &channel, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not get channel\n");
 
@@ -338,7 +338,7 @@ static int cmd_ieee802154_set_pan_id(const struct shell *shell,
 				     size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t pan_id;
+	uint16_t pan_id;
 
 	ARG_UNUSED(argc);
 
@@ -353,10 +353,10 @@ static int cmd_ieee802154_set_pan_id(const struct shell *shell,
 		return -ENOEXEC;
 	}
 
-	pan_id = (u16_t)atoi(argv[1]);
+	pan_id = (uint16_t)atoi(argv[1]);
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_SET_PAN_ID, iface,
-		     &pan_id, sizeof(u16_t))) {
+		     &pan_id, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not set PAN ID %u\n", pan_id);
 
@@ -373,7 +373,7 @@ static int cmd_ieee802154_get_pan_id(const struct shell *shell,
 				     size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t pan_id;
+	uint16_t pan_id;
 
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
@@ -385,7 +385,7 @@ static int cmd_ieee802154_get_pan_id(const struct shell *shell,
 	}
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_GET_PAN_ID, iface,
-		     &pan_id, sizeof(u16_t))) {
+		     &pan_id, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not get PAN ID\n");
 
@@ -402,7 +402,7 @@ static int cmd_ieee802154_set_ext_addr(const struct shell *shell,
 				       size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u8_t addr[IEEE802154_EXT_ADDR_LENGTH];
+	uint8_t addr[IEEE802154_EXT_ADDR_LENGTH];
 
 	if (argc < 2) {
 		shell_help(shell);
@@ -441,7 +441,7 @@ static int cmd_ieee802154_get_ext_addr(const struct shell *shell,
 				       size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u8_t addr[IEEE802154_EXT_ADDR_LENGTH];
+	uint8_t addr[IEEE802154_EXT_ADDR_LENGTH];
 
 	if (!iface) {
 		shell_fprintf(shell, SHELL_INFO,
@@ -477,7 +477,7 @@ static int cmd_ieee802154_set_short_addr(const struct shell *shell,
 					 size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t short_addr;
+	uint16_t short_addr;
 
 	if (argc < 2) {
 		shell_help(shell);
@@ -490,10 +490,10 @@ static int cmd_ieee802154_set_short_addr(const struct shell *shell,
 		return -ENOEXEC;
 	}
 
-	short_addr = (u16_t)atoi(argv[1]);
+	short_addr = (uint16_t)atoi(argv[1]);
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_SET_SHORT_ADDR, iface,
-		     &short_addr, sizeof(u16_t))) {
+		     &short_addr, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not set short address %u\n", short_addr);
 
@@ -510,7 +510,7 @@ static int cmd_ieee802154_get_short_addr(const struct shell *shell,
 					 size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	u16_t short_addr;
+	uint16_t short_addr;
 
 	if (!iface) {
 		shell_fprintf(shell, SHELL_INFO,
@@ -519,7 +519,7 @@ static int cmd_ieee802154_get_short_addr(const struct shell *shell,
 	}
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_GET_SHORT_ADDR, iface,
-		     &short_addr, sizeof(u16_t))) {
+		     &short_addr, sizeof(uint16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not get short address\n");
 
@@ -536,7 +536,7 @@ static int cmd_ieee802154_set_tx_power(const struct shell *shell,
 				       size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	s16_t tx_power;
+	int16_t tx_power;
 
 	if (argc < 2) {
 		shell_help(shell);
@@ -549,10 +549,10 @@ static int cmd_ieee802154_set_tx_power(const struct shell *shell,
 		return -ENOEXEC;
 	}
 
-	tx_power = (s16_t)atoi(argv[1]);
+	tx_power = (int16_t)atoi(argv[1]);
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_SET_TX_POWER, iface,
-		     &tx_power, sizeof(s16_t))) {
+		     &tx_power, sizeof(int16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not set TX power %d\n", tx_power);
 
@@ -569,7 +569,7 @@ static int cmd_ieee802154_get_tx_power(const struct shell *shell,
 				       size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_ieee802154();
-	s16_t tx_power;
+	int16_t tx_power;
 
 	if (!iface) {
 		shell_fprintf(shell, SHELL_INFO,
@@ -578,7 +578,7 @@ static int cmd_ieee802154_get_tx_power(const struct shell *shell,
 	}
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_GET_TX_POWER, iface,
-		     &tx_power, sizeof(s16_t))) {
+		     &tx_power, sizeof(int16_t))) {
 		shell_fprintf(shell, SHELL_WARNING,
 			      "Could not get TX power\n");
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_utils.h b/subsys/net/l2/ieee802154/ieee802154_utils.h
index e950a9f47f..f00b643695 100644
--- a/subsys/net/l2/ieee802154/ieee802154_utils.h
+++ b/subsys/net/l2/ieee802154/ieee802154_utils.h
@@ -39,7 +39,7 @@ static inline int ieee802154_cca(struct net_if *iface)
 	return radio->cca(net_if_get_device(iface));
 }
 
-static inline int ieee802154_set_channel(struct net_if *iface, u16_t channel)
+static inline int ieee802154_set_channel(struct net_if *iface, uint16_t channel)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -51,7 +51,7 @@ static inline int ieee802154_set_channel(struct net_if *iface, u16_t channel)
 	return radio->set_channel(net_if_get_device(iface), channel);
 }
 
-static inline int ieee802154_set_tx_power(struct net_if *iface, s16_t dbm)
+static inline int ieee802154_set_tx_power(struct net_if *iface, int16_t dbm)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -103,7 +103,7 @@ static inline int ieee802154_stop(struct net_if *iface)
 }
 
 static inline void ieee802154_filter_ieee_addr(struct net_if *iface,
-					       u8_t *ieee_addr)
+					       uint8_t *ieee_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -123,7 +123,7 @@ static inline void ieee802154_filter_ieee_addr(struct net_if *iface,
 }
 
 static inline void ieee802154_filter_short_addr(struct net_if *iface,
-						u16_t short_addr)
+						uint16_t short_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -143,7 +143,7 @@ static inline void ieee802154_filter_short_addr(struct net_if *iface,
 }
 
 static inline void ieee802154_filter_pan_id(struct net_if *iface,
-					    u16_t pan_id)
+					    uint16_t pan_id)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -163,7 +163,7 @@ static inline void ieee802154_filter_pan_id(struct net_if *iface,
 }
 
 static inline void ieee802154_filter_src_ieee_addr(struct net_if *iface,
-						   u8_t *ieee_addr)
+						   uint8_t *ieee_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -183,7 +183,7 @@ static inline void ieee802154_filter_src_ieee_addr(struct net_if *iface,
 }
 
 static inline void ieee802154_filter_src_short_addr(struct net_if *iface,
-						    u16_t short_addr)
+						    uint16_t short_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -203,7 +203,7 @@ static inline void ieee802154_filter_src_short_addr(struct net_if *iface,
 }
 
 static inline void ieee802154_remove_src_ieee_addr(struct net_if *iface,
-						   u8_t *ieee_addr)
+						   uint8_t *ieee_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -223,7 +223,7 @@ static inline void ieee802154_remove_src_ieee_addr(struct net_if *iface,
 }
 
 static inline void ieee802154_remove_src_short_addr(struct net_if *iface,
-						    u16_t short_addr)
+						    uint16_t short_addr)
 {
 	const struct ieee802154_radio_api *radio =
 		net_if_get_device(iface)->driver_api;
@@ -243,7 +243,7 @@ static inline void ieee802154_remove_src_short_addr(struct net_if *iface,
 }
 
 static inline bool ieee802154_verify_channel(struct net_if *iface,
-					     u16_t channel)
+					     uint16_t channel)
 {
 	if (channel == IEEE802154_NO_CHANNEL) {
 		return false;
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index c9ab4acca1..0854095731 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -102,7 +102,7 @@ k_tid_t openthread_thread_id_get(void)
 }
 
 static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb,
-				    u32_t mgmt_event, struct net_if *iface)
+				    uint32_t mgmt_event, struct net_if *iface)
 {
 	struct openthread_context *ot_context = net_if_l2_data(iface);
 
@@ -166,8 +166,8 @@ void ot_receive_handler(otMessage *aMessage, void *context)
 {
 	struct openthread_context *ot_context = context;
 
-	u16_t offset = 0U;
-	u16_t read_len;
+	uint16_t offset = 0U;
+	uint16_t read_len;
 	struct net_pkt *pkt;
 	struct net_buf *pkt_buf;
 
diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c
index c89c643967..8190ad9b3d 100644
--- a/subsys/net/l2/openthread/openthread_utils.c
+++ b/subsys/net/l2/openthread/openthread_utils.c
@@ -27,7 +27,7 @@ static bool is_anycast_locator(const otNetifAddress *address)
 }
 
 static bool is_mesh_local(struct openthread_context *context,
-			  const u8_t *address)
+			  const uint8_t *address)
 {
 	const otMeshLocalPrefix *ml_prefix =
 				otThreadGetMeshLocalPrefix(context->instance);
@@ -37,7 +37,7 @@ static bool is_mesh_local(struct openthread_context *context,
 
 int pkt_list_add(struct openthread_context *context, struct net_pkt *pkt)
 {
-	u16_t i_idx = context->pkt_list_in_idx;
+	uint16_t i_idx = context->pkt_list_in_idx;
 
 	if (context->pkt_list_full) {
 		return -ENOMEM;
diff --git a/subsys/net/l2/ppp/fsm.c b/subsys/net/l2/ppp/fsm.c
index 743ce0f968..43d29fa192 100644
--- a/subsys/net/l2/ppp/fsm.c
+++ b/subsys/net/l2/ppp/fsm.c
@@ -143,7 +143,7 @@ static void ppp_pkt_send(struct k_work *work)
 }
 
 
-void ppp_fsm_init(struct ppp_fsm *fsm, u16_t protocol)
+void ppp_fsm_init(struct ppp_fsm *fsm, uint16_t protocol)
 {
 	fsm->protocol = protocol;
 	fsm->state = PPP_INITIAL;
@@ -185,7 +185,7 @@ static void terminate(struct ppp_fsm *fsm, enum ppp_state next_state)
 	ppp_change_state(fsm, next_state);
 }
 
-void ppp_fsm_close(struct ppp_fsm *fsm, const u8_t *reason)
+void ppp_fsm_close(struct ppp_fsm *fsm, const uint8_t *reason)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
 		ppp_state_str(fsm->state), fsm->state);
@@ -342,14 +342,14 @@ void ppp_fsm_open(struct ppp_fsm *fsm)
 }
 
 int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
-		 enum ppp_packet_type type, u8_t id,
-		 void *data, u32_t data_len)
+		 enum ppp_packet_type type, uint8_t id,
+		 void *data, uint32_t data_len)
 {
 	/* Note that the data parameter is the received PPP packet if
 	 * we want to send PROTOCOL or CODE reject packet.
 	 */
 	struct net_pkt *req_pkt = data;
-	u16_t protocol = 0;
+	uint16_t protocol = 0;
 	size_t len = 0;
 	struct ppp_packet ppp;
 	struct net_pkt *pkt;
@@ -402,7 +402,7 @@ int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
 		break;
 
 	case PPP_ECHO_REQ:
-		len = sizeof(ppp) + sizeof(u32_t) + data_len;
+		len = sizeof(ppp) + sizeof(uint32_t) + data_len;
 		break;
 
 	case PPP_ECHO_REPLY:
@@ -410,7 +410,7 @@ int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
 		break;
 
 	case PPP_PROTOCOL_REJ:
-		len = sizeof(ppp) + sizeof(u16_t) +
+		len = sizeof(ppp) + sizeof(uint16_t) +
 			net_pkt_remaining_data(req_pkt);
 		protocol = PPP_LCP;
 		break;
@@ -432,7 +432,7 @@ int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
 	ppp.length = htons(len);
 
 	pkt = net_pkt_alloc_with_buffer(iface,
-					sizeof(u16_t) + len,
+					sizeof(uint16_t) + len,
 					AF_UNSPEC, 0, BUF_ALLOC_TIMEOUT);
 	if (!pkt) {
 		goto out_of_mem;
@@ -470,7 +470,7 @@ int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
 
 		data_len = MIN(data_len, PPP_MRU);
 		if (data_len > 0) {
-			if (data_len == sizeof(u32_t)) {
+			if (data_len == sizeof(uint32_t)) {
 				ret = net_pkt_write_be32(pkt,
 						       POINTER_TO_UINT(data));
 			} else {
@@ -535,9 +535,9 @@ out_of_mem:
 }
 
 static enum net_verdict fsm_recv_configure_req(struct ppp_fsm *fsm,
-					       u8_t id,
+					       uint8_t id,
 					       struct net_pkt *pkt,
-					       u16_t remaining_len)
+					       uint16_t remaining_len)
 {
 	struct net_buf *buf = NULL;
 	int len = 0;
@@ -642,9 +642,9 @@ static enum net_verdict fsm_recv_configure_req(struct ppp_fsm *fsm,
 	return NET_OK;
 }
 
-static enum net_verdict fsm_recv_configure_ack(struct ppp_fsm *fsm, u8_t id,
+static enum net_verdict fsm_recv_configure_ack(struct ppp_fsm *fsm, uint8_t id,
 					       struct net_pkt *pkt,
-					       u16_t remaining_len)
+					       uint16_t remaining_len)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
 		ppp_state_str(fsm->state), fsm->state);
@@ -713,9 +713,9 @@ static enum net_verdict fsm_recv_configure_ack(struct ppp_fsm *fsm, u8_t id,
 
 static enum net_verdict fsm_recv_configure_nack_rej(struct ppp_fsm *fsm,
 						    enum ppp_packet_type code,
-						    u8_t id,
+						    uint8_t id,
 						    struct net_pkt *pkt,
-						    u16_t length)
+						    uint16_t length)
 {
 	bool ret = false;
 
@@ -814,9 +814,9 @@ static enum net_verdict fsm_recv_configure_nack_rej(struct ppp_fsm *fsm,
 	return NET_OK;
 }
 
-static enum net_verdict fsm_recv_terminate_req(struct ppp_fsm *fsm, u8_t id,
+static enum net_verdict fsm_recv_terminate_req(struct ppp_fsm *fsm, uint8_t id,
 					       struct net_pkt *pkt,
-					       u16_t length)
+					       uint16_t length)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
 		ppp_state_str(fsm->state), fsm->state);
@@ -863,9 +863,9 @@ static enum net_verdict fsm_recv_terminate_req(struct ppp_fsm *fsm, u8_t id,
 	return NET_OK;
 }
 
-static enum net_verdict fsm_recv_terminate_ack(struct ppp_fsm *fsm, u8_t id,
+static enum net_verdict fsm_recv_terminate_ack(struct ppp_fsm *fsm, uint8_t id,
 					       struct net_pkt *pkt,
-					       u16_t length)
+					       uint16_t length)
 {
 	enum ppp_state new_state;
 
@@ -916,7 +916,7 @@ stopped:
 static enum net_verdict fsm_recv_code_rej(struct ppp_fsm *fsm,
 					  struct net_pkt *pkt)
 {
-	u8_t code, id;
+	uint8_t code, id;
 	int ret;
 
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
@@ -996,11 +996,11 @@ void ppp_fsm_proto_reject(struct ppp_fsm *fsm)
 	}
 }
 
-enum net_verdict ppp_fsm_input(struct ppp_fsm *fsm, u16_t proto,
+enum net_verdict ppp_fsm_input(struct ppp_fsm *fsm, uint16_t proto,
 			       struct net_pkt *pkt)
 {
-	u8_t code, id;
-	u16_t length;
+	uint8_t code, id;
+	uint16_t length;
 	int ret;
 
 	ret = net_pkt_read_u8(pkt, &code);
@@ -1083,7 +1083,7 @@ enum net_verdict ppp_fsm_input(struct ppp_fsm *fsm, u16_t proto,
 }
 
 enum net_verdict ppp_fsm_recv_protocol_rej(struct ppp_fsm *fsm,
-					   u8_t id,
+					   uint8_t id,
 					   struct net_pkt *pkt)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
@@ -1093,7 +1093,7 @@ enum net_verdict ppp_fsm_recv_protocol_rej(struct ppp_fsm *fsm,
 }
 
 enum net_verdict ppp_fsm_recv_echo_req(struct ppp_fsm *fsm,
-				       u8_t id,
+				       uint8_t id,
 				       struct net_pkt *pkt)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
@@ -1106,7 +1106,7 @@ enum net_verdict ppp_fsm_recv_echo_req(struct ppp_fsm *fsm,
 }
 
 enum net_verdict ppp_fsm_recv_echo_reply(struct ppp_fsm *fsm,
-					 u8_t id,
+					 uint8_t id,
 					 struct net_pkt *pkt)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
@@ -1125,7 +1125,7 @@ enum net_verdict ppp_fsm_recv_echo_reply(struct ppp_fsm *fsm,
 }
 
 enum net_verdict ppp_fsm_recv_discard_req(struct ppp_fsm *fsm,
-					  u8_t id,
+					  uint8_t id,
 					  struct net_pkt *pkt)
 {
 	NET_DBG("[%s/%p] Current state %s (%d)", fsm->name, fsm,
@@ -1135,9 +1135,9 @@ enum net_verdict ppp_fsm_recv_discard_req(struct ppp_fsm *fsm,
 }
 
 void ppp_send_proto_rej(struct net_if *iface, struct net_pkt *pkt,
-			u16_t protocol)
+			uint16_t protocol)
 {
-	u8_t code, id;
+	uint8_t code, id;
 	int ret;
 
 	ret = net_pkt_read_u8(pkt, &code);
diff --git a/subsys/net/l2/ppp/ipcp.c b/subsys/net/l2/ppp/ipcp.c
index 2998efcb0a..1f16e00348 100644
--- a/subsys/net/l2/ppp/ipcp.c
+++ b/subsys/net/l2/ppp/ipcp.c
@@ -25,7 +25,7 @@ static enum net_verdict ipcp_handle(struct ppp_context *ctx,
 	return ppp_fsm_input(&ctx->ipcp.fsm, PPP_IPCP, pkt);
 }
 
-static bool append_to_buf(struct net_buf *buf, u8_t *data, u8_t data_len)
+static bool append_to_buf(struct net_buf *buf, uint8_t *data, uint8_t data_len)
 {
 	if (data_len > net_buf_tailroom(buf)) {
 		return false;
@@ -50,14 +50,14 @@ static struct net_buf *ipcp_config_info_add(struct ppp_fsm *fsm)
 					       ipcp.fsm);
 
 	/* Currently we support IP address and DNS servers */
-	u8_t options[3 * IP_ADDRESS_OPTION_LEN];
+	uint8_t options[3 * IP_ADDRESS_OPTION_LEN];
 	const struct in_addr *my_addr;
 	struct net_buf *buf;
 	bool added;
 
 	my_addr = &ctx->ipcp.my_options.address;
 
-	u8_t *option = options;
+	uint8_t *option = options;
 	option[0] = IPCP_OPTION_IP_ADDRESS;
 	option[1] = IP_ADDRESS_OPTION_LEN;
 	memcpy(&option[2], &my_addr->s_addr, sizeof(my_addr->s_addr));
@@ -99,7 +99,7 @@ out_of_mem:
 
 static int ipcp_config_info_req(struct ppp_fsm *fsm,
 				struct net_pkt *pkt,
-				u16_t length,
+				uint16_t length,
 				struct net_buf **ret_buf)
 {
 	int nack_idx = 0, address_option_idx = -1;
@@ -213,7 +213,7 @@ static int ipcp_config_info_req(struct ppp_fsm *fsm,
 		net_pkt_cursor_restore(pkt,
 				       &options[address_option_idx].value);
 
-		ret = net_pkt_read(pkt, (u32_t *)&addr, sizeof(addr));
+		ret = net_pkt_read(pkt, (uint32_t *)&addr, sizeof(addr));
 		if (ret < 0) {
 			/* Should not happen, is the pkt corrupt? */
 			return -EMSGSIZE;
@@ -234,7 +234,7 @@ static int ipcp_config_info_req(struct ppp_fsm *fsm,
 
 		if (addr.s_addr) {
 			bool added;
-			u8_t val;
+			uint8_t val;
 
 			/* The address is the remote address, we then need
 			 * to figure out what our address should be.
@@ -260,7 +260,7 @@ static int ipcp_config_info_req(struct ppp_fsm *fsm,
 				goto bail_out;
 			}
 
-			added = append_to_buf(buf, (u8_t *)&addr.s_addr,
+			added = append_to_buf(buf, (uint8_t *)&addr.s_addr,
 					      sizeof(addr.s_addr));
 			if (!added) {
 				goto bail_out;
@@ -334,7 +334,7 @@ static void ipcp_set_dns_servers(struct ppp_fsm *fsm)
 
 static int ipcp_config_info_nack(struct ppp_fsm *fsm,
 				 struct net_pkt *pkt,
-				 u16_t length,
+				 uint16_t length,
 				 bool rejected)
 {
 	struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context,
@@ -391,7 +391,7 @@ static int ipcp_config_info_nack(struct ppp_fsm *fsm,
 
 		net_pkt_cursor_restore(pkt, &nack_options[i].value);
 
-		ret = net_pkt_read(pkt, (u32_t *)&addr, sizeof(addr));
+		ret = net_pkt_read(pkt, (uint32_t *)&addr, sizeof(addr));
 		if (ret < 0) {
 			/* Should not happen, is the pkt corrupt? */
 			return -EMSGSIZE;
@@ -438,7 +438,7 @@ static void ipcp_open(struct ppp_context *ctx)
 	ppp_fsm_open(&ctx->ipcp.fsm);
 }
 
-static void ipcp_close(struct ppp_context *ctx, const u8_t *reason)
+static void ipcp_close(struct ppp_context *ctx, const uint8_t *reason)
 {
 	ppp_fsm_close(&ctx->ipcp.fsm, reason);
 }
diff --git a/subsys/net/l2/ppp/ipv6cp.c b/subsys/net/l2/ppp/ipv6cp.c
index f03ea28636..c738705140 100644
--- a/subsys/net/l2/ppp/ipv6cp.c
+++ b/subsys/net/l2/ppp/ipv6cp.c
@@ -24,7 +24,7 @@ static enum net_verdict ipv6cp_handle(struct ppp_context *ctx,
 	return ppp_fsm_input(&ctx->ipv6cp.fsm, PPP_IPV6CP, pkt);
 }
 
-static bool append_to_buf(struct net_buf *buf, u8_t *data, u8_t data_len)
+static bool append_to_buf(struct net_buf *buf, uint8_t *data, uint8_t data_len)
 {
 	if (data_len > net_buf_tailroom(buf)) {
 		return false;
@@ -47,8 +47,8 @@ static struct net_buf *ipv6cp_config_info_add(struct ppp_fsm *fsm)
 					       ipv6cp.fsm);
 
 	/* Currently we support only one option (IP address) */
-	u8_t option[INTERFACE_IDENTIFIER_OPTION_LEN];
-	u8_t iid[PPP_INTERFACE_IDENTIFIER_LEN];
+	uint8_t option[INTERFACE_IDENTIFIER_OPTION_LEN];
+	uint8_t iid[PPP_INTERFACE_IDENTIFIER_LEN];
 	struct net_linkaddr *linkaddr;
 	struct net_buf *buf;
 	bool added;
@@ -89,7 +89,7 @@ out_of_mem:
 
 static int ipv6cp_config_info_req(struct ppp_fsm *fsm,
 				struct net_pkt *pkt,
-				u16_t length,
+				uint16_t length,
 				struct net_buf **ret_buf)
 {
 	int nack_idx = 0, iface_id_option_idx = -1;
@@ -186,10 +186,10 @@ static int ipv6cp_config_info_req(struct ppp_fsm *fsm,
 			}
 		}
 	} else {
-		u8_t iface_id[PPP_INTERFACE_IDENTIFIER_LEN];
+		uint8_t iface_id[PPP_INTERFACE_IDENTIFIER_LEN];
 		struct ppp_context *ctx;
 		bool added;
-		u8_t val;
+		uint8_t val;
 		int ret;
 
 		ctx = CONTAINER_OF(fsm, struct ppp_context, ipv6cp.fsm);
@@ -214,7 +214,7 @@ static int ipv6cp_config_info_req(struct ppp_fsm *fsm,
 		       sizeof(iface_id));
 
 		if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
-			u8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
+			uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
 
 			net_sprint_ll_addr_buf(iface_id, sizeof(iface_id),
 					       iid_str, sizeof(iid_str));
@@ -265,11 +265,11 @@ bail_out:
 static int config_info_ack_rej(struct ppp_context *ctx,
 			       struct ppp_fsm *fsm,
 			       struct net_pkt *pkt,
-			       u16_t length,
-			       u8_t code)
+			       uint16_t length,
+			       uint8_t code)
 {
 	struct ppp_option_pkt nack_options[MAX_IPV6CP_OPTIONS];
-	u8_t iface_id[PPP_INTERFACE_IDENTIFIER_LEN];
+	uint8_t iface_id[PPP_INTERFACE_IDENTIFIER_LEN];
 	int i, ret, iface_id_option_idx = -1;
 	enum net_verdict verdict;
 
@@ -319,7 +319,7 @@ static int config_info_ack_rej(struct ppp_context *ctx,
 	memcpy(ctx->ipv6cp.peer_accepted.iid, iface_id, sizeof(iface_id));
 
 	if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
-		u8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
+		uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
 
 		net_sprint_ll_addr_buf(iface_id, sizeof(iface_id),
 				       iid_str, sizeof(iid_str));
@@ -333,7 +333,7 @@ static int config_info_ack_rej(struct ppp_context *ctx,
 
 static int ipv6cp_config_info_rej(struct ppp_fsm *fsm,
 				struct net_pkt *pkt,
-				u16_t length)
+				uint16_t length)
 {
 	struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context,
 					       ipv6cp.fsm);
@@ -343,7 +343,7 @@ static int ipv6cp_config_info_rej(struct ppp_fsm *fsm,
 
 static int ipv6cp_config_info_ack(struct ppp_fsm *fsm,
 				  struct net_pkt *pkt,
-				  u16_t length)
+				  uint16_t length)
 {
 	struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context,
 					       ipv6cp.fsm);
@@ -367,12 +367,12 @@ static void ipv6cp_open(struct ppp_context *ctx)
 	ppp_fsm_open(&ctx->ipv6cp.fsm);
 }
 
-static void ipv6cp_close(struct ppp_context *ctx, const u8_t *reason)
+static void ipv6cp_close(struct ppp_context *ctx, const uint8_t *reason)
 {
 	ppp_fsm_close(&ctx->ipv6cp.fsm, reason);
 }
 
-static void setup_iid_address(u8_t *iid, struct in6_addr *addr)
+static void setup_iid_address(uint8_t *iid, struct in6_addr *addr)
 {
 	addr->s6_addr[0] = 0xfe;
 	addr->s6_addr[1] = 0x80;
@@ -384,7 +384,7 @@ static void setup_iid_address(u8_t *iid, struct in6_addr *addr)
 	/* addr->s6_addr[8] ^= 0x02; */
 }
 
-static void add_iid_address(struct net_if *iface, u8_t *iid)
+static void add_iid_address(struct net_if *iface, uint8_t *iid)
 {
 	struct net_if_addr *ifaddr;
 	struct in6_addr addr;
@@ -443,7 +443,7 @@ static void ipv6cp_up(struct ppp_fsm *fsm)
 						   (const void *)&peer_addr)));
 	} else {
 		if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
-			u8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
+			uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
 			char dst[INET6_ADDRSTRLEN];
 			char *addr_str;
 
@@ -495,7 +495,7 @@ static void ipv6cp_down(struct ppp_fsm *fsm)
 						   (const void *)&peer_addr)));
 	} else {
 		if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
-			u8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
+			uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
 			char dst[INET6_ADDRSTRLEN];
 			char *addr_str;
 
diff --git a/subsys/net/l2/ppp/lcp.c b/subsys/net/l2/ppp/lcp.c
index 896d0c9dfc..b03aadb02e 100644
--- a/subsys/net/l2/ppp/lcp.c
+++ b/subsys/net/l2/ppp/lcp.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 #include "ppp_internal.h"
 
 static enum net_verdict lcp_handle_ext(struct ppp_fsm *fsm,
-				       enum ppp_packet_type code, u8_t id,
+				       enum ppp_packet_type code, uint8_t id,
 				       struct net_pkt *pkt)
 {
 	enum net_verdict verdict = NET_DROP;
@@ -57,7 +57,7 @@ static enum net_verdict lcp_handle(struct ppp_context *ctx,
 	return ppp_fsm_input(&ctx->lcp.fsm, PPP_LCP, pkt);
 }
 
-static bool append_to_buf(struct net_buf *buf, u8_t *data, u8_t data_len)
+static bool append_to_buf(struct net_buf *buf, uint8_t *data, uint8_t data_len)
 {
 	if (data_len > net_buf_tailroom(buf)) {
 		return false;
@@ -73,7 +73,7 @@ static bool append_to_buf(struct net_buf *buf, u8_t *data, u8_t data_len)
 
 static int lcp_config_info_req(struct ppp_fsm *fsm,
 			       struct net_pkt *pkt,
-			       u16_t length,
+			       uint16_t length,
 			       struct net_buf **buf)
 {
 	struct ppp_option_pkt options[MAX_LCP_OPTIONS];
@@ -214,7 +214,7 @@ static void lcp_open(struct ppp_context *ctx)
 	ppp_fsm_open(&ctx->lcp.fsm);
 }
 
-static void lcp_close(struct ppp_context *ctx, const u8_t *reason)
+static void lcp_close(struct ppp_context *ctx, const uint8_t *reason)
 {
 	if (ctx->phase != PPP_DEAD) {
 		ppp_change_phase(ctx, PPP_TERMINATE);
diff --git a/subsys/net/l2/ppp/misc.c b/subsys/net/l2/ppp/misc.c
index abcf36d1b9..d4d8bd36f1 100644
--- a/subsys/net/l2/ppp/misc.c
+++ b/subsys/net/l2/ppp/misc.c
@@ -44,7 +44,7 @@ const char *ppp_phase_str(enum ppp_phase phase)
 static void validate_phase_transition(enum ppp_phase current,
 				      enum ppp_phase new)
 {
-	static const u8_t valid_transitions[] = {
+	static const uint8_t valid_transitions[] = {
 		[PPP_DEAD] = 1 << PPP_ESTABLISH,
 		[PPP_ESTABLISH] = 1 << PPP_DEAD |
 				1 << PPP_AUTH |
@@ -166,7 +166,7 @@ const char *ppp_pkt_type2str(enum ppp_packet_type type)
 	return "";
 }
 
-const char *ppp_proto2str(u16_t proto)
+const char *ppp_proto2str(uint16_t proto)
 {
 #if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG)
 	switch (proto) {
@@ -197,7 +197,7 @@ static void validate_state_transition(enum ppp_state current,
 				      enum ppp_state new)
 {
 	/* See RFC 1661 ch. 4.1 */
-	static const u16_t valid_transitions[] = {
+	static const uint16_t valid_transitions[] = {
 		[PPP_INITIAL] = 1 << PPP_CLOSED |
 				1 << PPP_STARTING,
 		[PPP_STARTING] = 1 << PPP_INITIAL |
diff --git a/subsys/net/l2/ppp/options.c b/subsys/net/l2/ppp/options.c
index a2baa67c3d..b0d8b8661e 100644
--- a/subsys/net/l2/ppp/options.c
+++ b/subsys/net/l2/ppp/options.c
@@ -20,13 +20,13 @@ LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
 enum net_verdict ppp_parse_options(struct ppp_fsm *fsm,
 				   struct net_pkt *pkt,
-				   u16_t length,
+				   uint16_t length,
 				   struct ppp_option_pkt options[],
 				   int options_len)
 {
 	int remaining = length, pkt_remaining;
 	enum net_verdict verdict;
-	u8_t opt_type, opt_len;
+	uint8_t opt_type, opt_len;
 	int ret, idx = 0;
 
 	pkt_remaining = net_pkt_remaining_data(pkt);
@@ -90,7 +90,7 @@ out:
 	return verdict;
 }
 
-struct net_buf *ppp_get_net_buf(struct net_buf *root_buf, u8_t len)
+struct net_buf *ppp_get_net_buf(struct net_buf *root_buf, uint8_t len)
 {
 	struct net_buf *tmp;
 
diff --git a/subsys/net/l2/ppp/ppp_internal.h b/subsys/net/l2/ppp/ppp_internal.h
index 6a3780ed65..b3319c9da0 100644
--- a/subsys/net/l2/ppp/ppp_internal.h
+++ b/subsys/net/l2/ppp/ppp_internal.h
@@ -21,9 +21,9 @@
  * PPP packet format.
  */
 struct ppp_packet {
-	u8_t code;
-	u8_t id;
-	u16_t length;
+	uint8_t code;
+	uint8_t id;
+	uint16_t length;
 } __packed;
 
 /** Timeout in milliseconds */
@@ -70,10 +70,10 @@ struct ppp_protocol_handler {
 	void (*open)(struct ppp_context *ctx);
 
 	/** Disable this protocol */
-	void (*close)(struct ppp_context *ctx, const u8_t *reason);
+	void (*close)(struct ppp_context *ctx, const uint8_t *reason);
 
 	/** PPP protocol number */
-	u16_t protocol;
+	uint16_t protocol;
 } __ppp_proto_align;
 
 #define PPP_PROTO_GET_NAME(proto_name)		\
@@ -99,7 +99,7 @@ extern struct ppp_protocol_handler __net_ppp_proto_end[];
 
 const char *ppp_phase_str(enum ppp_phase phase);
 const char *ppp_state_str(enum ppp_state state);
-const char *ppp_proto2str(u16_t proto);
+const char *ppp_proto2str(uint16_t proto);
 const char *ppp_pkt_type2str(enum ppp_packet_type type);
 const char *ppp_option2str(enum ppp_protocol_type protocol, int type);
 void ppp_fsm_name_set(struct ppp_fsm *fsm, const char *name);
@@ -122,38 +122,38 @@ void ppp_change_state_debug(struct ppp_fsm *fsm, enum ppp_state new_state,
 			    const char *caller, int line);
 #endif
 
-struct net_buf *ppp_get_net_buf(struct net_buf *root_buf, u8_t len);
+struct net_buf *ppp_get_net_buf(struct net_buf *root_buf, uint8_t len);
 int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface,
-		 enum ppp_packet_type type, u8_t id,
-		 void *data, u32_t data_len);
+		 enum ppp_packet_type type, uint8_t id,
+		 void *data, uint32_t data_len);
 void ppp_send_proto_rej(struct net_if *iface, struct net_pkt *pkt,
-			u16_t protocol);
+			uint16_t protocol);
 
-void ppp_fsm_init(struct ppp_fsm *fsm, u16_t protocol);
+void ppp_fsm_init(struct ppp_fsm *fsm, uint16_t protocol);
 void ppp_fsm_lower_up(struct ppp_fsm *fsm);
 void ppp_fsm_lower_down(struct ppp_fsm *fsm);
 void ppp_fsm_open(struct ppp_fsm *fsm);
-void ppp_fsm_close(struct ppp_fsm *fsm, const u8_t *reason);
+void ppp_fsm_close(struct ppp_fsm *fsm, const uint8_t *reason);
 void ppp_fsm_proto_reject(struct ppp_fsm *fsm);
-enum net_verdict ppp_fsm_input(struct ppp_fsm *fsm, u16_t proto,
+enum net_verdict ppp_fsm_input(struct ppp_fsm *fsm, uint16_t proto,
 			       struct net_pkt *pkt);
 enum net_verdict ppp_fsm_recv_protocol_rej(struct ppp_fsm *fsm,
-					   u8_t id,
+					   uint8_t id,
 					   struct net_pkt *pkt);
 enum net_verdict ppp_fsm_recv_echo_req(struct ppp_fsm *fsm,
-				       u8_t id,
+				       uint8_t id,
 				       struct net_pkt *pkt);
 enum net_verdict ppp_fsm_recv_echo_reply(struct ppp_fsm *fsm,
-					 u8_t id,
+					 uint8_t id,
 					 struct net_pkt *pkt);
 enum net_verdict ppp_fsm_recv_discard_req(struct ppp_fsm *fsm,
-					  u8_t id,
+					  uint8_t id,
 					  struct net_pkt *pkt);
 
 const struct ppp_protocol_handler *ppp_lcp_get(void);
 enum net_verdict ppp_parse_options(struct ppp_fsm *fsm,
 				   struct net_pkt *pkt,
-				   u16_t length,
+				   uint16_t length,
 				   struct ppp_option_pkt options[],
 				   int options_len);
 
diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c
index 131746c4f0..e8f0c473f3 100644
--- a/subsys/net/l2/ppp/ppp_l2.c
+++ b/subsys/net/l2/ppp/ppp_l2.c
@@ -61,7 +61,7 @@ static enum net_verdict process_ppp_msg(struct net_if *iface,
 	struct ppp_context *ctx = net_if_l2_data(iface);
 	enum net_verdict verdict = NET_DROP;
 	struct ppp_protocol_handler *proto;
-	u16_t protocol;
+	uint16_t protocol;
 	int ret;
 
 	if (!ctx->is_init || !ctx->is_ready_to_serve) {
@@ -340,8 +340,8 @@ static int get_ppp_context(int idx, struct ppp_context **ctx,
 static void echo_reply_handler(void *user_data, size_t user_data_len)
 {
 	struct ppp_context *ctx = user_data;
-	u32_t end_time = k_cycle_get_32();
-	u32_t time_diff;
+	uint32_t end_time = k_cycle_get_32();
+	uint32_t time_diff;
 
 	time_diff = end_time - ctx->shell.echo_req_data;
 	ctx->shell.echo_req_data =
@@ -350,7 +350,7 @@ static void echo_reply_handler(void *user_data, size_t user_data_len)
 	k_sem_give(&ctx->shell.wait_echo_reply);
 }
 
-int net_ppp_ping(int idx, s32_t timeout)
+int net_ppp_ping(int idx, int32_t timeout)
 {
 	struct ppp_context *ctx;
 	struct net_if *iface;
diff --git a/subsys/net/l2/ppp/ppp_stats.c b/subsys/net/l2/ppp/ppp_stats.c
index b76e623c15..45f41241d6 100644
--- a/subsys/net/l2/ppp/ppp_stats.c
+++ b/subsys/net/l2/ppp/ppp_stats.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(net_ppp_stats, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
 #if defined(CONFIG_NET_STATISTICS_USER_API)
 
-static int ppp_stats_get(u32_t mgmt_request, struct net_if *iface,
+static int ppp_stats_get(uint32_t mgmt_request, struct net_if *iface,
 			 void *data, size_t len)
 {
 	size_t len_chk = 0;
diff --git a/subsys/net/l2/ppp/ppp_stats.h b/subsys/net/l2/ppp/ppp_stats.h
index fd7f333e69..a13de481aa 100644
--- a/subsys/net/l2/ppp/ppp_stats.h
+++ b/subsys/net/l2/ppp/ppp_stats.h
@@ -14,7 +14,7 @@
 #include <net/net_if.h>
 
 static inline void ppp_stats_update_bytes_rx(struct net_if *iface,
-					     u32_t bytes)
+					     uint32_t bytes)
 {
 	const struct ppp_api *api = (const struct ppp_api *)
 		net_if_get_device(iface)->driver_api;
@@ -33,7 +33,7 @@ static inline void ppp_stats_update_bytes_rx(struct net_if *iface,
 }
 
 static inline void ppp_stats_update_bytes_tx(struct net_if *iface,
-					     u32_t bytes)
+					     uint32_t bytes)
 {
 	const struct ppp_api *api = (const struct ppp_api *)
 		net_if_get_device(iface)->driver_api;
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index dffe6a08b0..011b49464d 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(net_wifi_mgmt, CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL);
 #include <net/net_if.h>
 #include <net/wifi_mgmt.h>
 
-static int wifi_connect(u32_t mgmt_request, struct net_if *iface,
+static int wifi_connect(uint32_t mgmt_request, struct net_if *iface,
 			void *data, size_t len)
 {
 	struct wifi_connect_req_params *params =
@@ -69,7 +69,7 @@ static void scan_result_cb(struct net_if *iface, int status,
 					entry, sizeof(struct wifi_scan_result));
 }
 
-static int wifi_scan(u32_t mgmt_request, struct net_if *iface,
+static int wifi_scan(uint32_t mgmt_request, struct net_if *iface,
 		     void *data, size_t len)
 {
 	struct device *dev = net_if_get_device(iface);
@@ -86,7 +86,7 @@ static int wifi_scan(u32_t mgmt_request, struct net_if *iface,
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_SCAN, wifi_scan);
 
 
-static int wifi_disconnect(u32_t mgmt_request, struct net_if *iface,
+static int wifi_disconnect(uint32_t mgmt_request, struct net_if *iface,
 			   void *data, size_t len)
 {
 	struct device *dev = net_if_get_device(iface);
@@ -124,7 +124,7 @@ void wifi_mgmt_raise_disconnect_result_event(struct net_if *iface, int status)
 					sizeof(struct wifi_status));
 }
 
-static int wifi_ap_enable(u32_t mgmt_request, struct net_if *iface,
+static int wifi_ap_enable(uint32_t mgmt_request, struct net_if *iface,
 			  void *data, size_t len)
 {
 	struct wifi_connect_req_params *params =
@@ -142,7 +142,7 @@ static int wifi_ap_enable(u32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_ENABLE, wifi_ap_enable);
 
-static int wifi_ap_disable(u32_t mgmt_request, struct net_if *iface,
+static int wifi_ap_disable(uint32_t mgmt_request, struct net_if *iface,
 			  void *data, size_t len)
 {
 	struct device *dev = net_if_get_device(iface);
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 44ba674f34..7959263f9f 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -36,15 +36,15 @@ static struct {
 	union {
 		struct {
 
-			u8_t connecting		: 1;
-			u8_t disconnecting	: 1;
-			u8_t _unused		: 6;
+			uint8_t connecting		: 1;
+			uint8_t disconnecting	: 1;
+			uint8_t _unused		: 6;
 		};
-		u8_t all;
+		uint8_t all;
 	};
 } context;
 
-static u32_t scan_result;
+static uint32_t scan_result;
 
 static struct net_mgmt_event_callback wifi_shell_mgmt_cb;
 
@@ -126,7 +126,7 @@ static void handle_wifi_disconnect_result(struct net_mgmt_event_callback *cb)
 }
 
 static void wifi_mgmt_event_handler(struct net_mgmt_event_callback *cb,
-				    u32_t mgmt_event, struct net_if *iface)
+				    uint32_t mgmt_event, struct net_if *iface)
 {
 	switch (mgmt_event) {
 	case NET_EVENT_WIFI_SCAN_RESULT:
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index 2a939df9a3..cbd2bea0f4 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -49,9 +49,9 @@ LOG_MODULE_REGISTER(net_coap, CONFIG_COAP_LOG_LEVEL);
 #define BASIC_HEADER_SIZE	4
 
 /* The CoAP message ID that is incremented each time coap_next_id() is called. */
-static u16_t message_id;
+static uint16_t message_id;
 
-static inline bool append_u8(struct coap_packet *cpkt, u8_t data)
+static inline bool append_u8(struct coap_packet *cpkt, uint8_t data)
 {
 	if (!cpkt) {
 		return false;
@@ -66,7 +66,7 @@ static inline bool append_u8(struct coap_packet *cpkt, u8_t data)
 	return true;
 }
 
-static inline bool append_be16(struct coap_packet *cpkt, u16_t data)
+static inline bool append_be16(struct coap_packet *cpkt, uint16_t data)
 {
 	if (!cpkt) {
 		return false;
@@ -77,12 +77,12 @@ static inline bool append_be16(struct coap_packet *cpkt, u16_t data)
 	}
 
 	cpkt->data[cpkt->offset++] = data >> 8;
-	cpkt->data[cpkt->offset++] = (u8_t) data;
+	cpkt->data[cpkt->offset++] = (uint8_t) data;
 
 	return true;
 }
 
-static inline bool append(struct coap_packet *cpkt, const u8_t *data, u16_t len)
+static inline bool append(struct coap_packet *cpkt, const uint8_t *data, uint16_t len)
 {
 	if (!cpkt || !data) {
 		return false;
@@ -98,11 +98,11 @@ static inline bool append(struct coap_packet *cpkt, const u8_t *data, u16_t len)
 	return true;
 }
 
-int coap_packet_init(struct coap_packet *cpkt, u8_t *data,
-		     u16_t max_len, u8_t ver, u8_t type,
-		     u8_t tokenlen, u8_t *token, u8_t code, u16_t id)
+int coap_packet_init(struct coap_packet *cpkt, uint8_t *data,
+		     uint16_t max_len, uint8_t ver, uint8_t type,
+		     uint8_t tokenlen, uint8_t *token, uint8_t code, uint16_t id)
 {
-	u8_t hdr;
+	uint8_t hdr;
 	bool res;
 
 	if (!cpkt || !data || !max_len) {
@@ -148,17 +148,17 @@ int coap_packet_init(struct coap_packet *cpkt, u8_t *data,
 	return 0;
 }
 
-static void option_header_set_delta(u8_t *opt, u8_t delta)
+static void option_header_set_delta(uint8_t *opt, uint8_t delta)
 {
 	*opt = (delta & 0xF) << 4;
 }
 
-static void option_header_set_len(u8_t *opt, u8_t len)
+static void option_header_set_len(uint8_t *opt, uint8_t len)
 {
 	*opt |= (len & 0xF);
 }
 
-static u8_t encode_extended_option(u16_t num, u8_t *opt, u16_t *ext)
+static uint8_t encode_extended_option(uint16_t num, uint8_t *opt, uint16_t *ext)
 {
 	if (num < COAP_OPTION_EXT_13) {
 		*opt = num;
@@ -178,16 +178,16 @@ static u8_t encode_extended_option(u16_t num, u8_t *opt, u16_t *ext)
 	return 2;
 }
 
-static int encode_option(struct coap_packet *cpkt, u16_t code,
-			 const u8_t *value, u16_t len)
+static int encode_option(struct coap_packet *cpkt, uint16_t code,
+			 const uint8_t *value, uint16_t len)
 {
-	u16_t delta_ext; /* Extended delta */
-	u16_t len_ext; /* Extended length */
-	u8_t opt; /* delta | len */
-	u8_t opt_delta;
-	u8_t opt_len;
-	u8_t delta_size;
-	u8_t len_size;
+	uint16_t delta_ext; /* Extended delta */
+	uint16_t len_ext; /* Extended length */
+	uint8_t opt; /* delta | len */
+	uint8_t opt_delta;
+	uint8_t opt_len;
+	uint8_t delta_size;
+	uint8_t len_size;
 	bool res;
 
 	delta_size = encode_extended_option(code, &opt_delta, &delta_ext);
@@ -202,7 +202,7 @@ static int encode_option(struct coap_packet *cpkt, u16_t code,
 	}
 
 	if (delta_size == 1U) {
-		res = append_u8(cpkt, (u8_t)delta_ext);
+		res = append_u8(cpkt, (uint8_t)delta_ext);
 		if (!res) {
 			return -EINVAL;
 		}
@@ -214,7 +214,7 @@ static int encode_option(struct coap_packet *cpkt, u16_t code,
 	}
 
 	if (len_size == 1U) {
-		res = append_u8(cpkt, (u8_t)len_ext);
+		res = append_u8(cpkt, (uint8_t)len_ext);
 		if (!res) {
 			return -EINVAL;
 		}
@@ -238,8 +238,8 @@ static int encode_option(struct coap_packet *cpkt, u16_t code,
 /* TODO Add support for inserting options in proper place
  * and modify other option's delta accordingly.
  */
-int coap_packet_append_option(struct coap_packet *cpkt, u16_t code,
-			      const u8_t *value, u16_t len)
+int coap_packet_append_option(struct coap_packet *cpkt, uint16_t code,
+			      const uint8_t *value, uint16_t len)
 {
 	int r;
 
@@ -272,16 +272,16 @@ int coap_packet_append_option(struct coap_packet *cpkt, u16_t code,
 	return 0;
 }
 
-int coap_append_option_int(struct coap_packet *cpkt, u16_t code,
+int coap_append_option_int(struct coap_packet *cpkt, uint16_t code,
 			   unsigned int val)
 {
-	u8_t data[4], len;
+	uint8_t data[4], len;
 
 	if (val == 0U) {
 		data[0] = 0U;
 		len = 0U;
 	} else if (val < 0xFF) {
-		data[0] = (u8_t) val;
+		data[0] = (uint8_t) val;
 		len = 1U;
 	} else if (val < 0xFFFF) {
 		sys_put_be16(val, data);
@@ -325,34 +325,34 @@ int coap_packet_append_payload_marker(struct coap_packet *cpkt)
 	return append_u8(cpkt, COAP_MARKER) ? 0 : -EINVAL;
 }
 
-int coap_packet_append_payload(struct coap_packet *cpkt, u8_t *payload,
-			       u16_t payload_len)
+int coap_packet_append_payload(struct coap_packet *cpkt, uint8_t *payload,
+			       uint16_t payload_len)
 {
 	return append(cpkt, payload, payload_len) ? 0 : -EINVAL;
 }
 
-u8_t *coap_next_token(void)
+uint8_t *coap_next_token(void)
 {
-	static u32_t rand[2];
+	static uint32_t rand[2];
 
 	rand[0] = sys_rand32_get();
 	rand[1] = sys_rand32_get();
 
-	return (u8_t *) rand;
+	return (uint8_t *) rand;
 }
 
-static u8_t option_header_get_delta(u8_t opt)
+static uint8_t option_header_get_delta(uint8_t opt)
 {
 	return (opt & 0xF0) >> 4;
 }
 
-static u8_t option_header_get_len(u8_t opt)
+static uint8_t option_header_get_len(uint8_t opt)
 {
 	return opt & 0x0F;
 }
 
-static int read_u8(u8_t *data, u16_t offset, u16_t *pos,
-		   u16_t max_len, u8_t *value)
+static int read_u8(uint8_t *data, uint16_t offset, uint16_t *pos,
+		   uint16_t max_len, uint8_t *value)
 {
 	if (max_len - offset < 1) {
 		return -EINVAL;
@@ -364,8 +364,8 @@ static int read_u8(u8_t *data, u16_t offset, u16_t *pos,
 	return max_len - offset;
 }
 
-static int read_be16(u8_t *data, u16_t offset, u16_t *pos,
-		     u16_t max_len, u16_t *value)
+static int read_be16(uint8_t *data, uint16_t offset, uint16_t *pos,
+		     uint16_t max_len, uint16_t *value)
 {
 	if (max_len - offset < 2) {
 		return -EINVAL;
@@ -378,8 +378,8 @@ static int read_be16(u8_t *data, u16_t offset, u16_t *pos,
 	return max_len - offset;
 }
 
-static int read(u8_t *data, u16_t offset, u16_t *pos,
-		u16_t max_len, u16_t len, u8_t *value)
+static int read(uint8_t *data, uint16_t offset, uint16_t *pos,
+		uint16_t max_len, uint16_t len, uint8_t *value)
 {
 	if (max_len - offset < len) {
 		return -EINVAL;
@@ -392,13 +392,13 @@ static int read(u8_t *data, u16_t offset, u16_t *pos,
 	return max_len - offset;
 }
 
-static int decode_delta(u8_t *data, u16_t offset, u16_t *pos, u16_t max_len,
-			u16_t opt, u16_t *opt_ext, u16_t *hdr_len)
+static int decode_delta(uint8_t *data, uint16_t offset, uint16_t *pos, uint16_t max_len,
+			uint16_t opt, uint16_t *opt_ext, uint16_t *hdr_len)
 {
 	int ret = 0;
 
 	if (opt == COAP_OPTION_EXT_13) {
-		u8_t val;
+		uint8_t val;
 
 		*hdr_len = 1U;
 
@@ -409,7 +409,7 @@ static int decode_delta(u8_t *data, u16_t offset, u16_t *pos, u16_t max_len,
 
 		opt = val + COAP_OPTION_EXT_13;
 	} else if (opt == COAP_OPTION_EXT_14) {
-		u16_t val;
+		uint16_t val;
 
 		*hdr_len = 2U;
 
@@ -428,14 +428,14 @@ static int decode_delta(u8_t *data, u16_t offset, u16_t *pos, u16_t max_len,
 	return ret;
 }
 
-static int parse_option(u8_t *data, u16_t offset, u16_t *pos,
-			u16_t max_len, u16_t *opt_delta, u16_t *opt_len,
+static int parse_option(uint8_t *data, uint16_t offset, uint16_t *pos,
+			uint16_t max_len, uint16_t *opt_delta, uint16_t *opt_len,
 			struct coap_option *option)
 {
-	u16_t hdr_len;
-	u16_t delta;
-	u16_t len;
-	u8_t opt;
+	uint16_t hdr_len;
+	uint16_t delta;
+	uint16_t len;
+	uint8_t opt;
 	int r;
 
 	r = read_u8(data, offset, pos, max_len, &opt);
@@ -536,14 +536,14 @@ static int parse_option(u8_t *data, u16_t offset, u16_t *pos,
 	return r;
 }
 
-int coap_packet_parse(struct coap_packet *cpkt, u8_t *data, u16_t len,
-		      struct coap_option *options, u8_t opt_num)
+int coap_packet_parse(struct coap_packet *cpkt, uint8_t *data, uint16_t len,
+		      struct coap_option *options, uint8_t opt_num)
 {
-	u16_t opt_len;
-	u16_t offset;
-	u16_t delta;
-	u8_t num;
-	u8_t tkl;
+	uint16_t opt_len;
+	uint16_t offset;
+	uint16_t delta;
+	uint8_t num;
+	uint8_t tkl;
 	int ret;
 
 	if (!cpkt || !data) {
@@ -606,13 +606,13 @@ int coap_packet_parse(struct coap_packet *cpkt, u8_t *data, u16_t len,
 	return 0;
 }
 
-int coap_find_options(const struct coap_packet *cpkt, u16_t code,
-		      struct coap_option *options, u16_t veclen)
+int coap_find_options(const struct coap_packet *cpkt, uint16_t code,
+		      struct coap_option *options, uint16_t veclen)
 {
-	u16_t opt_len;
-	u16_t offset;
-	u16_t delta;
-	u8_t num;
+	uint16_t opt_len;
+	uint16_t offset;
+	uint16_t delta;
+	uint8_t num;
 	int r;
 
 	offset = cpkt->hdr_len;
@@ -640,7 +640,7 @@ int coap_find_options(const struct coap_packet *cpkt, u16_t code,
 	return num;
 }
 
-u8_t coap_header_get_version(const struct coap_packet *cpkt)
+uint8_t coap_header_get_version(const struct coap_packet *cpkt)
 {
 	if (!cpkt || !cpkt->data) {
 		return 0;
@@ -649,7 +649,7 @@ u8_t coap_header_get_version(const struct coap_packet *cpkt)
 	return (cpkt->data[0] & 0xC0) >> 6;
 }
 
-u8_t coap_header_get_type(const struct coap_packet *cpkt)
+uint8_t coap_header_get_type(const struct coap_packet *cpkt)
 {
 	if (!cpkt || !cpkt->data) {
 		return 0;
@@ -658,7 +658,7 @@ u8_t coap_header_get_type(const struct coap_packet *cpkt)
 	return (cpkt->data[0] & 0x30) >> 4;
 }
 
-static u8_t __coap_header_get_code(const struct coap_packet *cpkt)
+static uint8_t __coap_header_get_code(const struct coap_packet *cpkt)
 {
 	if (!cpkt || !cpkt->data) {
 		return 0;
@@ -667,9 +667,9 @@ static u8_t __coap_header_get_code(const struct coap_packet *cpkt)
 	return cpkt->data[1];
 }
 
-u8_t coap_header_get_token(const struct coap_packet *cpkt, u8_t *token)
+uint8_t coap_header_get_token(const struct coap_packet *cpkt, uint8_t *token)
 {
-	u8_t tkl;
+	uint8_t tkl;
 
 	if (!cpkt || !cpkt->data) {
 		return 0;
@@ -683,9 +683,9 @@ u8_t coap_header_get_token(const struct coap_packet *cpkt, u8_t *token)
 	return tkl;
 }
 
-u8_t coap_header_get_code(const struct coap_packet *cpkt)
+uint8_t coap_header_get_code(const struct coap_packet *cpkt)
 {
-	u8_t code = __coap_header_get_code(cpkt);
+	uint8_t code = __coap_header_get_code(cpkt);
 
 	switch (code) {
 	/* Methods are encoded in the code field too */
@@ -726,7 +726,7 @@ u8_t coap_header_get_code(const struct coap_packet *cpkt)
 	}
 }
 
-u16_t coap_header_get_id(const struct coap_packet *cpkt)
+uint16_t coap_header_get_id(const struct coap_packet *cpkt)
 {
 	if (!cpkt || !cpkt->data) {
 		return 0;
@@ -735,7 +735,7 @@ u16_t coap_header_get_id(const struct coap_packet *cpkt)
 	return (cpkt->data[2] << 8) | cpkt->data[3];
 }
 
-const u8_t *coap_packet_get_payload(const struct coap_packet *cpkt, u16_t *len)
+const uint8_t *coap_packet_get_payload(const struct coap_packet *cpkt, uint16_t *len)
 {
 	int payload_len;
 
@@ -757,10 +757,10 @@ const u8_t *coap_packet_get_payload(const struct coap_packet *cpkt, u16_t *len)
 static bool uri_path_eq(const struct coap_packet *cpkt,
 			const char * const *path,
 			struct coap_option *options,
-			u8_t opt_num)
+			uint8_t opt_num)
 {
-	u8_t i;
-	u8_t j = 0U;
+	uint8_t i;
+	uint8_t j = 0U;
 
 	for (i = 0U; i < opt_num && path[j]; i++) {
 		if (options[i].delta != COAP_OPTION_URI_PATH) {
@@ -792,7 +792,7 @@ static bool uri_path_eq(const struct coap_packet *cpkt,
 }
 
 static coap_method_t method_from_code(const struct coap_resource *resource,
-				      u8_t code)
+				      uint8_t code)
 {
 	switch (code) {
 	case COAP_METHOD_GET:
@@ -810,7 +810,7 @@ static coap_method_t method_from_code(const struct coap_resource *resource,
 
 static bool is_request(const struct coap_packet *cpkt)
 {
-	u8_t code = coap_header_get_code(cpkt);
+	uint8_t code = coap_header_get_code(cpkt);
 
 	return !(code & ~COAP_REQUEST_MASK);
 }
@@ -818,7 +818,7 @@ static bool is_request(const struct coap_packet *cpkt)
 int coap_handle_request(struct coap_packet *cpkt,
 			struct coap_resource *resources,
 			struct coap_option *options,
-			u8_t opt_num,
+			uint8_t opt_num,
 			struct sockaddr *addr, socklen_t addr_len)
 {
 	struct coap_resource *resource;
@@ -830,7 +830,7 @@ int coap_handle_request(struct coap_packet *cpkt,
 	/* FIXME: deal with hierarchical resources */
 	for (resource = resources; resource && resource->path; resource++) {
 		coap_method_t method;
-		u8_t code;
+		uint8_t code;
 
 		if (!uri_path_eq(cpkt, resource->path, options, opt_num)) {
 			continue;
@@ -871,7 +871,7 @@ int coap_block_transfer_init(struct coap_block_context *ctx,
 int coap_append_block1_option(struct coap_packet *cpkt,
 			      struct coap_block_context *ctx)
 {
-	u16_t bytes = coap_block_size_to_bytes(ctx->block_size);
+	uint16_t bytes = coap_block_size_to_bytes(ctx->block_size);
 	unsigned int val = 0U;
 	int r;
 
@@ -893,7 +893,7 @@ int coap_append_block2_option(struct coap_packet *cpkt,
 			      struct coap_block_context *ctx)
 {
 	int r, val = 0;
-	u16_t bytes = coap_block_size_to_bytes(ctx->block_size);
+	uint16_t bytes = coap_block_size_to_bytes(ctx->block_size);
 
 	if (is_request(cpkt)) {
 		SET_BLOCK_SIZE(val, ctx->block_size);
@@ -921,7 +921,7 @@ int coap_append_size2_option(struct coap_packet *cpkt,
 	return coap_append_option_int(cpkt, COAP_OPTION_SIZE2, ctx->total_size);
 }
 
-static int get_block_option(const struct coap_packet *cpkt, u16_t code)
+static int get_block_option(const struct coap_packet *cpkt, uint16_t code)
 {
 	struct coap_option option;
 	unsigned int val;
@@ -1146,7 +1146,7 @@ struct coap_pending *coap_pending_received(
 	struct coap_pending *pendings, size_t len)
 {
 	struct coap_pending *p;
-	u16_t resp_id = coap_header_get_id(response);
+	uint16_t resp_id = coap_header_get_id(response);
 	size_t i;
 
 	for (i = 0, p = pendings; i < len; i++, p++) {
@@ -1169,7 +1169,7 @@ struct coap_pending *coap_pending_next_to_expire(
 {
 	struct coap_pending *p, *found = NULL;
 	size_t i;
-	u32_t expiry, min_expiry;
+	uint32_t expiry, min_expiry;
 
 	for (i = 0, p = pendings; i < len; i++, p++) {
 		if (!p->timeout) {
@@ -1178,7 +1178,7 @@ struct coap_pending *coap_pending_next_to_expire(
 
 		expiry = p->t0 + p->timeout;
 
-		if (!found || (s32_t)(expiry - min_expiry) < 0) {
+		if (!found || (int32_t)(expiry - min_expiry) < 0) {
 			min_expiry = expiry;
 			found = p;
 		}
@@ -1194,7 +1194,7 @@ struct coap_pending *coap_pending_next_to_expire(
  */
 #define INIT_ACK_TIMEOUT	CONFIG_COAP_INIT_ACK_TIMEOUT_MS
 
-static s32_t next_timeout(s32_t previous)
+static int32_t next_timeout(int32_t previous)
 {
 	switch (previous) {
 	case INIT_ACK_TIMEOUT:
@@ -1212,7 +1212,7 @@ static s32_t next_timeout(s32_t previous)
 
 bool coap_pending_cycle(struct coap_pending *pending)
 {
-	s32_t old = pending->timeout;
+	int32_t old = pending->timeout;
 
 	pending->t0 += pending->timeout;
 	pending->timeout = next_timeout(pending->timeout);
@@ -1239,7 +1239,7 @@ void coap_pendings_clear(struct coap_pending *pendings, size_t len)
 static int get_observe_option(const struct coap_packet *cpkt)
 {
 	struct coap_option option = {};
-	u16_t count = 1U;
+	uint16_t count = 1U;
 	int r;
 
 	r = coap_find_options(cpkt, COAP_OPTION_OBSERVE, &option, count);
@@ -1256,13 +1256,13 @@ struct coap_reply *coap_response_received(
 	struct coap_reply *replies, size_t len)
 {
 	struct coap_reply *r;
-	u8_t token[8];
-	u16_t id;
-	u8_t tkl;
+	uint8_t token[8];
+	uint16_t id;
+	uint8_t tkl;
 	size_t i;
 
 	id = coap_header_get_id(response);
-	tkl = coap_header_get_token(response, (u8_t *)token);
+	tkl = coap_header_get_token(response, (uint8_t *)token);
 
 	for (i = 0, r = replies; i < len; i++, r++) {
 		int age;
@@ -1302,12 +1302,12 @@ struct coap_reply *coap_response_received(
 void coap_reply_init(struct coap_reply *reply,
 		     const struct coap_packet *request)
 {
-	u8_t token[8];
-	u8_t tkl;
+	uint8_t token[8];
+	uint8_t tkl;
 	int age;
 
 	reply->id = coap_header_get_id(request);
-	tkl = coap_header_get_token(request, (u8_t *)&token);
+	tkl = coap_header_get_token(request, (uint8_t *)&token);
 
 	if (tkl > 0) {
 		memcpy(reply->token, token, tkl);
@@ -1457,10 +1457,10 @@ struct coap_observer *coap_find_observer_by_addr(
 void net_coap_init(void)
 {
 	/* Initialize message_id to a random number */
-	message_id = (u16_t)sys_rand32_get();
+	message_id = (uint16_t)sys_rand32_get();
 }
 
-u16_t coap_next_id(void)
+uint16_t coap_next_id(void)
 {
 	return message_id++;
 }
diff --git a/subsys/net/lib/coap/coap_link_format.c b/subsys/net/lib/coap/coap_link_format.c
index b62c93afc8..6707df96cf 100644
--- a/subsys/net/lib/coap/coap_link_format.c
+++ b/subsys/net/lib/coap/coap_link_format.c
@@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #include <net/coap.h>
 #include <net/coap_link_format.h>
 
-static inline bool append_u8(struct coap_packet *cpkt, u8_t data)
+static inline bool append_u8(struct coap_packet *cpkt, uint8_t data)
 {
 	if (!cpkt) {
 		return false;
@@ -36,7 +36,7 @@ static inline bool append_u8(struct coap_packet *cpkt, u8_t data)
 	return true;
 }
 
-static inline bool append_be16(struct coap_packet *cpkt, u16_t data)
+static inline bool append_be16(struct coap_packet *cpkt, uint16_t data)
 {
 	if (!cpkt) {
 		return false;
@@ -47,12 +47,12 @@ static inline bool append_be16(struct coap_packet *cpkt, u16_t data)
 	}
 
 	cpkt->data[cpkt->offset++] = data >> 8;
-	cpkt->data[cpkt->offset++] = (u8_t) data;
+	cpkt->data[cpkt->offset++] = (uint8_t) data;
 
 	return true;
 }
 
-static inline bool append(struct coap_packet *cpkt, const u8_t *data, u16_t len)
+static inline bool append(struct coap_packet *cpkt, const uint8_t *data, uint16_t len)
 {
 	if (!cpkt || !data) {
 		return false;
@@ -69,7 +69,7 @@ static inline bool append(struct coap_packet *cpkt, const u8_t *data, u16_t len)
 }
 
 static bool match_path_uri(const char * const *path,
-			   const char *uri, u16_t len)
+			   const char *uri, uint16_t len)
 {
 	const char * const *p = NULL;
 	int i, j, k, plen;
@@ -142,7 +142,7 @@ static bool match_attributes(const char * const *attributes,
 	 * resources with resource type lux or temperature.
 	 */
 	for (attr = attributes; attr && *attr; attr++) {
-		u16_t attr_len = strlen(*attr);
+		uint16_t attr_len = strlen(*attr);
 
 		if (query->len != attr_len) {
 			continue;
@@ -180,7 +180,7 @@ static bool match_queries_resource(const struct coap_resource *resource,
 	    !strncmp((char *) query->value, "href", href_len)) {
 		/* The stuff after 'href=' */
 		const char *uri = (char *) query->value + href_len + 1;
-		u16_t uri_len  = query->len - (href_len + 1);
+		uint16_t uri_len  = query->len - (href_len + 1);
 
 		return match_path_uri(resource->path, uri, uri_len);
 	}
@@ -215,11 +215,11 @@ enum coap_block_size default_block_size(void)
 }
 
 static bool append_to_coap_pkt(struct coap_packet *response,
-			       const char *str, u16_t len,
-			       u16_t *remaining, size_t *offset,
+			       const char *str, uint16_t len,
+			       uint16_t *remaining, size_t *offset,
 			       size_t current)
 {
-	u16_t pos = 0U;
+	uint16_t pos = 0U;
 	bool res;
 
 	if (!*remaining) {
@@ -252,7 +252,7 @@ static bool append_to_coap_pkt(struct coap_packet *response,
 
 static int format_uri(const char * const *path,
 		      struct coap_packet *response,
-		      u16_t *remaining, size_t *offset,
+		      uint16_t *remaining, size_t *offset,
 		      size_t current, bool *more)
 {
 	static const char prefix[] = "</";
@@ -275,7 +275,7 @@ static int format_uri(const char * const *path,
 	}
 
 	for (p = path; *p; ) {
-		u16_t path_len = strlen(*p);
+		uint16_t path_len = strlen(*p);
 
 		res = append_to_coap_pkt(response, *p, path_len, remaining,
 					 offset, current);
@@ -323,7 +323,7 @@ static int format_uri(const char * const *path,
 
 static int format_attributes(const char * const *attributes,
 			     struct coap_packet *response,
-			     u16_t *remaining, size_t *offset,
+			     uint16_t *remaining, size_t *offset,
 			     size_t current, bool *more)
 {
 	const char * const *attr;
@@ -382,7 +382,7 @@ terminator:
 
 static int format_resource(const struct coap_resource *resource,
 			   struct coap_packet *response,
-			   u16_t *remaining, size_t *offset,
+			   uint16_t *remaining, size_t *offset,
 			   size_t current, bool *more)
 {
 	struct coap_core_metadata *meta = resource->user_data;
@@ -414,10 +414,10 @@ static int format_resource(const struct coap_resource *resource,
  */
 int clear_more_flag(struct coap_packet *cpkt)
 {
-	u16_t offset;
-	u8_t opt;
-	u8_t delta;
-	u8_t len;
+	uint16_t offset;
+	uint8_t opt;
+	uint8_t delta;
+	uint8_t len;
 
 	offset = cpkt->hdr_len;
 	delta = 0U;
@@ -450,17 +450,17 @@ int clear_more_flag(struct coap_packet *cpkt)
 int coap_well_known_core_get(struct coap_resource *resource,
 			      struct coap_packet *request,
 			      struct coap_packet *response,
-			      u8_t *data, u16_t len)
+			      uint8_t *data, uint16_t len)
 {
 	static struct coap_block_context ctx;
 	struct coap_option query;
 	unsigned int num_queries;
 	size_t offset;
-	u8_t token[8];
-	u16_t remaining;
-	u16_t id;
-	u8_t tkl;
-	u8_t format;
+	uint8_t token[8];
+	uint16_t remaining;
+	uint16_t id;
+	uint8_t tkl;
+	uint8_t format;
 	int r;
 	bool more = false;
 
@@ -569,27 +569,27 @@ static int format_uri(const char * const *path, struct coap_packet *response)
 		return -EINVAL;
 	}
 
-	res = append(response, (u8_t *) prefix, strlen(prefix));
+	res = append(response, (uint8_t *) prefix, strlen(prefix));
 	if (!res) {
 		return -ENOMEM;
 	}
 
 	for (p = path; *p; ) {
-		res = append(response, (u8_t *) *p, strlen(*p));
+		res = append(response, (uint8_t *) *p, strlen(*p));
 		if (!res) {
 			return -ENOMEM;
 		}
 
 		p++;
 		if (*p) {
-			res = append_u8(response, (u8_t) '/');
+			res = append_u8(response, (uint8_t) '/');
 			if (!res) {
 				return -ENOMEM;
 			}
 		}
 	}
 
-	res = append_u8(response, (u8_t) '>');
+	res = append_u8(response, (uint8_t) '>');
 	if (!res) {
 		return -ENOMEM;
 	}
@@ -608,14 +608,14 @@ static int format_attributes(const char * const *attributes,
 	}
 
 	for (attr = attributes; *attr; ) {
-		res = append(response, (u8_t *) *attr, strlen(*attr));
+		res = append(response, (uint8_t *) *attr, strlen(*attr));
 		if (!res) {
 			return -ENOMEM;
 		}
 
 		attr++;
 		if (*attr) {
-			res = append_u8(response, (u8_t) ';');
+			res = append_u8(response, (uint8_t) ';');
 			if (!res) {
 				return -ENOMEM;
 			}
@@ -623,7 +623,7 @@ static int format_attributes(const char * const *attributes,
 	}
 
 terminator:
-	res = append_u8(response, (u8_t) ';');
+	res = append_u8(response, (uint8_t) ';');
 	if (!res) {
 		return -ENOMEM;
 	}
@@ -653,14 +653,14 @@ static int format_resource(const struct coap_resource *resource,
 int coap_well_known_core_get(struct coap_resource *resource,
 			     struct coap_packet *request,
 			     struct coap_packet *response,
-			     u8_t *data, u16_t len)
+			     uint8_t *data, uint16_t len)
 {
 	struct coap_option query;
-	u8_t token[8];
-	u16_t id;
-	u8_t tkl;
-	u8_t format;
-	u8_t num_queries;
+	uint8_t token[8];
+	uint16_t id;
+	uint8_t tkl;
+	uint8_t format;
+	uint8_t num_queries;
 	int r;
 
 	if (!resource || !request || !response || !data || !len) {
@@ -716,7 +716,7 @@ int coap_well_known_core_get(struct coap_resource *resource,
 /* Exposing some of the APIs to CoAP unit tests in tests/net/lib/coap */
 #if defined(CONFIG_COAP_TEST_API_ENABLE)
 bool _coap_match_path_uri(const char * const *path,
-			  const char *uri, u16_t len)
+			  const char *uri, uint16_t len)
 {
 	return match_path_uri(path, uri, len);
 }
diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c
index c4814a9940..375632d937 100644
--- a/subsys/net/lib/config/ieee802154_settings.c
+++ b/subsys/net/lib/config/ieee802154_settings.c
@@ -19,9 +19,9 @@ LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
 int z_net_config_ieee802154_setup(void)
 {
-	u16_t channel = CONFIG_NET_CONFIG_IEEE802154_CHANNEL;
-	u16_t pan_id = CONFIG_NET_CONFIG_IEEE802154_PAN_ID;
-	s16_t tx_power = CONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER;
+	uint16_t channel = CONFIG_NET_CONFIG_IEEE802154_CHANNEL;
+	uint16_t pan_id = CONFIG_NET_CONFIG_IEEE802154_PAN_ID;
+	int16_t tx_power = CONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER;
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 	struct ieee802154_security_params sec_params = {
@@ -46,11 +46,11 @@ int z_net_config_ieee802154_setup(void)
 	}
 
 	if (net_mgmt(NET_REQUEST_IEEE802154_SET_PAN_ID,
-		     iface, &pan_id, sizeof(u16_t)) ||
+		     iface, &pan_id, sizeof(uint16_t)) ||
 	    net_mgmt(NET_REQUEST_IEEE802154_SET_CHANNEL,
-		     iface, &channel, sizeof(u16_t)) ||
+		     iface, &channel, sizeof(uint16_t)) ||
 	    net_mgmt(NET_REQUEST_IEEE802154_SET_TX_POWER,
-		     iface, &tx_power, sizeof(s16_t))) {
+		     iface, &tx_power, sizeof(int16_t))) {
 		return -EINVAL;
 	}
 
diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c
index ede7c7c304..c5330f4596 100644
--- a/subsys/net/lib/config/init.c
+++ b/subsys/net/lib/config/init.c
@@ -42,7 +42,7 @@ static struct net_mgmt_event_callback mgmt_iface_cb;
 static struct net_mgmt_event_callback mgmt4_cb;
 
 static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 #if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF
@@ -185,7 +185,7 @@ static struct net_mgmt_event_callback mgmt6_cb;
 static struct in6_addr laddr;
 
 static void ipv6_event_handler(struct net_mgmt_event_callback *cb,
-			       u32_t mgmt_event, struct net_if *iface)
+			       uint32_t mgmt_event, struct net_if *iface)
 {
 	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
 	int i;
@@ -235,10 +235,10 @@ static void ipv6_event_handler(struct net_mgmt_event_callback *cb,
 	}
 }
 
-static void setup_ipv6(struct net_if *iface, u32_t flags)
+static void setup_ipv6(struct net_if *iface, uint32_t flags)
 {
 	struct net_if_addr *ifaddr;
-	u32_t mask = NET_EVENT_IPV6_DAD_SUCCEED;
+	uint32_t mask = NET_EVENT_IPV6_DAD_SUCCEED;
 
 	if (sizeof(CONFIG_NET_CONFIG_MY_IPV6_ADDR) == 1) {
 		/* Empty address, skip setting ANY address in this case */
@@ -288,7 +288,7 @@ static void setup_ipv6(struct net_if *iface, u32_t flags)
 
 #if defined(CONFIG_NET_NATIVE)
 static void iface_up_handler(struct net_mgmt_event_callback *cb,
-			     u32_t mgmt_event, struct net_if *iface)
+			     uint32_t mgmt_event, struct net_if *iface)
 {
 	if (mgmt_event == NET_EVENT_IF_UP) {
 		NET_INFO("Interface %p coming up", iface);
@@ -324,7 +324,7 @@ static bool check_interface(struct net_if *iface)
 }
 #endif
 
-int net_config_init(const char *app_info, u32_t flags, s32_t timeout)
+int net_config_init(const char *app_info, uint32_t flags, int32_t timeout)
 {
 #define LOOP_DIVIDER 10
 	struct net_if *iface = net_if_get_default();
@@ -420,7 +420,7 @@ int net_config_init(const char *app_info, u32_t flags, s32_t timeout)
 #if defined(CONFIG_NET_CONFIG_AUTO_INIT)
 static int init_app(struct device *device)
 {
-	u32_t flags = 0U;
+	uint32_t flags = 0U;
 	int ret;
 
 	ARG_UNUSED(device);
diff --git a/subsys/net/lib/config/init_clock_sntp.c b/subsys/net/lib/config/init_clock_sntp.c
index 0de5fe3994..4e5d2bcb45 100644
--- a/subsys/net/lib/config/init_clock_sntp.c
+++ b/subsys/net/lib/config/init_clock_sntp.c
@@ -24,7 +24,7 @@ int net_init_clock_via_sntp(void)
 	}
 
 	tspec.tv_sec = ts.seconds;
-	tspec.tv_nsec = ((u64_t)ts.fraction * (1000 * 1000 * 1000)) >> 32;
+	tspec.tv_nsec = ((uint64_t)ts.fraction * (1000 * 1000 * 1000)) >> 32;
 	res = clock_settime(CLOCK_REALTIME, &tspec);
 
 	return 0;
diff --git a/subsys/net/lib/conn_mgr/conn_mgr.c b/subsys/net/lib/conn_mgr/conn_mgr.c
index 7d707e7d4f..c1303184d4 100644
--- a/subsys/net/lib/conn_mgr/conn_mgr.c
+++ b/subsys/net/lib/conn_mgr/conn_mgr.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(conn_mgr, CONFIG_NET_CONNECTION_MANAGER_LOG_LEVEL);
 
 #include <conn_mgr.h>
 
-u16_t iface_states[CONN_MGR_IFACE_MAX];
+uint16_t iface_states[CONN_MGR_IFACE_MAX];
 
 K_SEM_DEFINE(conn_mgr_lock, 1, UINT_MAX);
 
diff --git a/subsys/net/lib/conn_mgr/events_handler.c b/subsys/net/lib/conn_mgr/events_handler.c
index 0d5d2a90d0..3f8fcdc6a1 100644
--- a/subsys/net/lib/conn_mgr/events_handler.c
+++ b/subsys/net/lib/conn_mgr/events_handler.c
@@ -13,14 +13,14 @@ LOG_MODULE_DECLARE(conn_mgr, CONFIG_NET_CONNECTION_MANAGER_LOG_LEVEL);
 
 #include <conn_mgr.h>
 
-extern u16_t iface_states[CONN_MGR_IFACE_MAX];
+extern uint16_t iface_states[CONN_MGR_IFACE_MAX];
 
 static struct net_mgmt_event_callback iface_events_cb;
 static struct net_mgmt_event_callback ipv6_events_cb;
 static struct net_mgmt_event_callback ipv4_events_cb;
 
 static void conn_mgr_iface_events_handler(struct net_mgmt_event_callback *cb,
-					  u32_t mgmt_event,
+					  uint32_t mgmt_event,
 					  struct net_if *iface)
 {
 	int idx;
@@ -52,7 +52,7 @@ static void conn_mgr_iface_events_handler(struct net_mgmt_event_callback *cb,
 
 #if defined(CONFIG_NET_IPV6)
 static void conn_mgr_ipv6_events_handler(struct net_mgmt_event_callback *cb,
-					 u32_t mgmt_event,
+					 uint32_t mgmt_event,
 					 struct net_if *iface)
 {
 	int idx;
@@ -98,7 +98,7 @@ static void conn_mgr_ipv6_events_handler(struct net_mgmt_event_callback *cb,
 #else
 static inline
 void conn_mgr_ipv6_events_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 	ARG_UNUSED(cb);
@@ -109,7 +109,7 @@ void conn_mgr_ipv6_events_handler(struct net_mgmt_event_callback *cb,
 
 #if defined(CONFIG_NET_IPV4)
 static void conn_mgr_ipv4_events_handler(struct net_mgmt_event_callback *cb,
-					 u32_t mgmt_event,
+					 uint32_t mgmt_event,
 					 struct net_if *iface)
 {
 	int idx;
@@ -145,7 +145,7 @@ static void conn_mgr_ipv4_events_handler(struct net_mgmt_event_callback *cb,
 #else
 static inline
 void conn_mgr_ipv4_events_handler(struct net_mgmt_event_callback *cb,
-				  u32_t mgmt_event,
+				  uint32_t mgmt_event,
 				  struct net_if *iface)
 {
 	ARG_UNUSED(cb);
diff --git a/subsys/net/lib/dns/dns_pack.c b/subsys/net/lib/dns/dns_pack.c
index 0b25c5cf16..31db15f167 100644
--- a/subsys/net/lib/dns/dns_pack.c
+++ b/subsys/net/lib/dns/dns_pack.c
@@ -9,22 +9,22 @@
 
 #include "dns_pack.h"
 
-static inline u16_t dns_strlen(const char *str)
+static inline uint16_t dns_strlen(const char *str)
 {
 	if (str == NULL) {
 		return 0;
 	}
-	return (u16_t)strlen(str);
+	return (uint16_t)strlen(str);
 }
 
-int dns_msg_pack_qname(u16_t *len, u8_t *buf, u16_t size,
+int dns_msg_pack_qname(uint16_t *len, uint8_t *buf, uint16_t size,
 		       const char *domain_name)
 {
-	u16_t dn_size;
-	u16_t lb_start;
-	u16_t lb_index;
-	u16_t lb_size;
-	u16_t i;
+	uint16_t dn_size;
+	uint16_t lb_start;
+	uint16_t lb_index;
+	uint16_t lb_size;
+	uint16_t i;
 
 	lb_start = 0U;
 	lb_index = 1U;
@@ -65,7 +65,7 @@ int dns_msg_pack_qname(u16_t *len, u8_t *buf, u16_t size,
 }
 
 static inline void set_dns_msg_response(struct dns_msg_t *dns_msg, int type,
-					u16_t pos, u16_t len)
+					uint16_t pos, uint16_t len)
 {
 	dns_msg->response_type = type;
 	dns_msg->response_position = pos;
@@ -76,7 +76,7 @@ static inline void set_dns_msg_response(struct dns_msg_t *dns_msg, int type,
  * Skip encoded FQDN in DNS message.
  * Returns size in bytes of encoded FQDN, or negative error code.
  */
-static int skip_fqdn(u8_t *answer, int buf_sz)
+static int skip_fqdn(uint8_t *answer, int buf_sz)
 {
 	int i = 0;
 
@@ -104,13 +104,13 @@ static int skip_fqdn(u8_t *answer, int buf_sz)
 	return i;
 }
 
-int dns_unpack_answer(struct dns_msg_t *dns_msg, int dname_ptr, u32_t *ttl)
+int dns_unpack_answer(struct dns_msg_t *dns_msg, int dname_ptr, uint32_t *ttl)
 {
 	int dname_len;
-	u16_t rem_size;
-	u16_t pos;
-	u16_t len;
-	u8_t *answer;
+	uint16_t rem_size;
+	uint16_t pos;
+	uint16_t len;
+	uint8_t *answer;
 
 	answer = dns_msg->msg + dns_msg->answer_offset;
 
@@ -175,8 +175,8 @@ int dns_unpack_answer(struct dns_msg_t *dns_msg, int dname_ptr, u32_t *ttl)
 
 int dns_unpack_response_header(struct dns_msg_t *msg, int src_id)
 {
-	u8_t *dns_header;
-	u16_t size;
+	uint8_t *dns_header;
+	uint16_t size;
 	int qdcount;
 	int ancount;
 	int rc;
@@ -226,15 +226,15 @@ int dns_unpack_response_header(struct dns_msg_t *msg, int src_id)
 	return 0;
 }
 
-static int dns_msg_pack_query_header(u8_t *buf, u16_t size, u16_t id)
+static int dns_msg_pack_query_header(uint8_t *buf, uint16_t size, uint16_t id)
 {
-	u16_t offset;
+	uint16_t offset;
 
 	if (size < DNS_MSG_HEADER_SIZE) {
 		return -ENOMEM;
 	}
 
-	UNALIGNED_PUT(htons(id), (u16_t *)(buf));
+	UNALIGNED_PUT(htons(id), (uint16_t *)(buf));
 
 	/* RD = 1, TC = 0, AA = 0, Opcode = 0, QR = 0 <-> 0x01 (1B)
 	 * RCode = 0, Z = 0, RA = 0		      <-> 0x00 (1B)
@@ -251,25 +251,25 @@ static int dns_msg_pack_query_header(u8_t *buf, u16_t size, u16_t id)
 
 	offset += DNS_HEADER_FLAGS_LEN;
 	/* set question counter */
-	UNALIGNED_PUT(htons(1), (u16_t *)(buf + offset));
+	UNALIGNED_PUT(htons(1), (uint16_t *)(buf + offset));
 
 	offset += DNS_QDCOUNT_LEN;
 	/* set answer and ns rr */
-	UNALIGNED_PUT(0, (u32_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint32_t *)(buf + offset));
 
 	offset += DNS_ANCOUNT_LEN + DNS_NSCOUNT_LEN;
 	/* set the additional records */
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 
 	return 0;
 }
 
-int dns_msg_pack_query(u8_t *buf, u16_t *len, u16_t size,
-		       u8_t *qname, u16_t qname_len, u16_t id,
+int dns_msg_pack_query(uint8_t *buf, uint16_t *len, uint16_t size,
+		       uint8_t *qname, uint16_t qname_len, uint16_t id,
 		       enum dns_rr_type qtype)
 {
-	u16_t msg_size;
-	u16_t offset;
+	uint16_t msg_size;
+	uint16_t offset;
 	int rc;
 
 	msg_size = DNS_MSG_HEADER_SIZE + DNS_QTYPE_LEN + DNS_QCLASS_LEN;
@@ -288,18 +288,18 @@ int dns_msg_pack_query(u8_t *buf, u16_t *len, u16_t size,
 	offset += qname_len;
 
 	/* QType */
-	UNALIGNED_PUT(htons(qtype), (u16_t *)(buf + offset + 0));
+	UNALIGNED_PUT(htons(qtype), (uint16_t *)(buf + offset + 0));
 	offset += DNS_QTYPE_LEN;
 
 	/* QClass */
-	UNALIGNED_PUT(htons(DNS_CLASS_IN), (u16_t *)(buf + offset));
+	UNALIGNED_PUT(htons(DNS_CLASS_IN), (uint16_t *)(buf + offset));
 
 	*len = offset + DNS_QCLASS_LEN;
 
 	return 0;
 }
 
-static int dns_find_null(int *qname_size, u8_t *buf, u16_t size)
+static int dns_find_null(int *qname_size, uint8_t *buf, uint16_t size)
 {
 	*qname_size = 0;
 	while (*qname_size < size) {
@@ -313,8 +313,8 @@ static int dns_find_null(int *qname_size, u8_t *buf, u16_t size)
 
 int dns_unpack_response_query(struct dns_msg_t *dns_msg)
 {
-	u8_t *dns_query;
-	u8_t *buf;
+	uint8_t *dns_query;
+	uint8_t *buf;
 	int remaining_size;
 	int qname_size;
 	int offset;
@@ -354,12 +354,12 @@ int dns_unpack_response_query(struct dns_msg_t *dns_msg)
 	return 0;
 }
 
-int dns_copy_qname(u8_t *buf, u16_t *len, u16_t size,
-		   struct dns_msg_t *dns_msg, u16_t pos)
+int dns_copy_qname(uint8_t *buf, uint16_t *len, uint16_t size,
+		   struct dns_msg_t *dns_msg, uint16_t pos)
 {
-	u16_t msg_size = dns_msg->msg_size;
-	u8_t *msg = dns_msg->msg;
-	u16_t lb_size;
+	uint16_t msg_size = dns_msg->msg_size;
+	uint8_t *msg = dns_msg->msg;
+	uint16_t lb_size;
 	int rc = -EINVAL;
 	int i = 0;
 
@@ -378,7 +378,7 @@ int dns_copy_qname(u8_t *buf, u16_t *len, u16_t size,
 
 		/* pointer */
 		if (lb_size > DNS_LABEL_MAX_SIZE) {
-			u8_t mask = DNS_LABEL_MAX_SIZE;
+			uint8_t mask = DNS_LABEL_MAX_SIZE;
 
 			if (pos + 1 >= msg_size) {
 				rc = -ENOMEM;
@@ -418,10 +418,10 @@ int dns_copy_qname(u8_t *buf, u16_t *len, u16_t size,
 	return rc;
 }
 
-int mdns_unpack_query_header(struct dns_msg_t *msg, u16_t *src_id)
+int mdns_unpack_query_header(struct dns_msg_t *msg, uint16_t *src_id)
 {
-	u8_t *dns_header;
-	u16_t size;
+	uint8_t *dns_header;
+	uint16_t size;
 	int qdcount;
 
 	dns_header = msg->msg;
@@ -462,12 +462,12 @@ int mdns_unpack_query_header(struct dns_msg_t *msg, u16_t *src_id)
 }
 
 /* Returns the length of the unpacked name */
-static int dns_unpack_name(const u8_t *msg, int maxlen, const u8_t *src,
-			   struct net_buf *buf, const u8_t **eol)
+static int dns_unpack_name(const uint8_t *msg, int maxlen, const uint8_t *src,
+			   struct net_buf *buf, const uint8_t **eol)
 {
 	int dest_size = net_buf_tailroom(buf);
-	const u8_t *end_of_label = NULL;
-	const u8_t *curr_src = src;
+	const uint8_t *end_of_label = NULL;
+	const uint8_t *curr_src = src;
 	int loop_check = 0, len = -1;
 	int label_len;
 	int val;
@@ -543,8 +543,8 @@ static int dns_unpack_name(const u8_t *msg, int maxlen, const u8_t *src,
 int dns_unpack_query(struct dns_msg_t *dns_msg, struct net_buf *buf,
 		     enum dns_rr_type *qtype, enum dns_class *qclass)
 {
-	const u8_t *end_of_label;
-	u8_t *dns_query;
+	const uint8_t *end_of_label;
+	uint8_t *dns_query;
 	int remaining_size;
 	int ret;
 	int query_type, query_class;
diff --git a/subsys/net/lib/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h
index 248318b3fb..5853f8a445 100644
--- a/subsys/net/lib/dns/dns_pack.h
+++ b/subsys/net/lib/dns/dns_pack.h
@@ -67,15 +67,15 @@
  *     + response_length: this is an offset. It holds the response's length.
  */
 struct dns_msg_t {
-	u8_t *msg;
+	uint8_t *msg;
 
 	int response_type;
-	u16_t response_position;
-	u16_t response_length;
+	uint16_t response_position;
+	uint16_t response_length;
 
-	u16_t query_offset;
-	u16_t answer_offset;
-	u16_t msg_size;
+	uint16_t query_offset;
+	uint16_t answer_offset;
+	uint16_t msg_size;
 };
 
 #define DNS_MSG_INIT(b, s)	{.msg = b, .msg_size = s,	\
@@ -116,143 +116,143 @@ enum dns_header_rcode {
 };
 
 /** It returns the ID field in the DNS msg header	*/
-static inline int dns_header_id(u8_t *header)
+static inline int dns_header_id(uint8_t *header)
 {
-	return htons(UNALIGNED_GET((u16_t *)(header)));
+	return htons(UNALIGNED_GET((uint16_t *)(header)));
 }
 
 /* inline unpack routines are used to unpack data from network
  * order to cpu. Similar routines without the unpack prefix are
  * used for cpu to network order.
  */
-static inline int dns_unpack_header_id(u8_t *header)
+static inline int dns_unpack_header_id(uint8_t *header)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(header)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(header)));
 }
 
 /** It returns the QR field in the DNS msg header	*/
-static inline int dns_header_qr(u8_t *header)
+static inline int dns_header_qr(uint8_t *header)
 {
 	return ((*(header + 2)) & 0x80) ? 1 : 0;
 }
 
 /** It returns the OPCODE field in the DNS msg header	*/
-static inline int dns_header_opcode(u8_t *header)
+static inline int dns_header_opcode(uint8_t *header)
 {
 	return ((*(header + 2)) & 0x70) >> 1;
 }
 
 /** It returns the AA field in the DNS msg header	*/
-static inline int dns_header_aa(u8_t *header)
+static inline int dns_header_aa(uint8_t *header)
 {
 	return ((*(header + 2)) & 0x04) ? 1 : 0;
 }
 
 /** It returns the TC field in the DNS msg header	*/
-static inline int dns_header_tc(u8_t *header)
+static inline int dns_header_tc(uint8_t *header)
 {
 	return ((*(header + 2)) & 0x02) ? 1 : 0;
 }
 
 /** It returns the RD field in the DNS msg header	*/
-static inline int dns_header_rd(u8_t *header)
+static inline int dns_header_rd(uint8_t *header)
 {
 	return ((*(header + 2)) & 0x01) ? 1 : 0;
 }
 
 /** It returns the RA field in the DNS msg header	*/
-static inline int dns_header_ra(u8_t *header)
+static inline int dns_header_ra(uint8_t *header)
 {
 	return ((*(header + 3)) & 0x80) >> 7;
 }
 
 /** It returns the Z field in the DNS msg header	*/
-static inline int dns_header_z(u8_t *header)
+static inline int dns_header_z(uint8_t *header)
 {
 	return ((*(header + 3)) & 0x70) >> 4;
 }
 
 /** It returns the RCODE field in the DNS msg header	*/
-static inline int dns_header_rcode(u8_t *header)
+static inline int dns_header_rcode(uint8_t *header)
 {
 	return ((*(header + 3)) & 0x0F);
 }
 
 /** It returns the QDCOUNT field in the DNS msg header	*/
-static inline int dns_header_qdcount(u8_t *header)
+static inline int dns_header_qdcount(uint8_t *header)
 {
-	return htons(UNALIGNED_GET((u16_t *)(header + 4)));
+	return htons(UNALIGNED_GET((uint16_t *)(header + 4)));
 }
 
-static inline int dns_unpack_header_qdcount(u8_t *header)
+static inline int dns_unpack_header_qdcount(uint8_t *header)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(header + 4)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(header + 4)));
 }
 
 /** It returns the ANCOUNT field in the DNS msg header	*/
-static inline int dns_header_ancount(u8_t *header)
+static inline int dns_header_ancount(uint8_t *header)
 {
-	return htons(UNALIGNED_GET((u16_t *)(header + 6)));
+	return htons(UNALIGNED_GET((uint16_t *)(header + 6)));
 }
 
-static inline int dns_unpack_header_ancount(u8_t *header)
+static inline int dns_unpack_header_ancount(uint8_t *header)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(header + 6)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(header + 6)));
 }
 
 /** It returns the NSCOUNT field in the DNS msg header	*/
-static inline int dns_header_nscount(u8_t *header)
+static inline int dns_header_nscount(uint8_t *header)
 {
-	return htons(UNALIGNED_GET((u16_t *)(header + 8)));
+	return htons(UNALIGNED_GET((uint16_t *)(header + 8)));
 }
 
 /** It returns the ARCOUNT field in the DNS msg header	*/
-static inline int dns_header_arcount(u8_t *header)
+static inline int dns_header_arcount(uint8_t *header)
 {
-	return htons(UNALIGNED_GET((u16_t *)(header + 10)));
+	return htons(UNALIGNED_GET((uint16_t *)(header + 10)));
 }
 
-static inline int dns_query_qtype(u8_t *question)
+static inline int dns_query_qtype(uint8_t *question)
 {
-	return htons(UNALIGNED_GET((u16_t *)(question + 0)));
+	return htons(UNALIGNED_GET((uint16_t *)(question + 0)));
 }
 
-static inline int dns_unpack_query_qtype(const u8_t *question)
+static inline int dns_unpack_query_qtype(const uint8_t *question)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(question + 0)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(question + 0)));
 }
 
-static inline int dns_query_qclass(u8_t *question)
+static inline int dns_query_qclass(uint8_t *question)
 {
-	return htons(UNALIGNED_GET((u16_t *)(question + 2)));
+	return htons(UNALIGNED_GET((uint16_t *)(question + 2)));
 }
 
-static inline int dns_unpack_query_qclass(const u8_t *question)
+static inline int dns_unpack_query_qclass(const uint8_t *question)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(question + 2)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(question + 2)));
 }
 
-static inline int dns_answer_type(u16_t dname_size, u8_t *answer)
+static inline int dns_answer_type(uint16_t dname_size, uint8_t *answer)
 {
 	/* 4.1.3. Resource record format */
-	return ntohs(UNALIGNED_GET((u16_t *)(answer + dname_size + 0)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 0)));
 }
 
-static inline int dns_answer_class(u16_t dname_size, u8_t *answer)
+static inline int dns_answer_class(uint16_t dname_size, uint8_t *answer)
 {
 	/* 4.1.3. Resource record format */
-	return ntohs(UNALIGNED_GET((u16_t *)(answer + dname_size + 2)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 2)));
 }
 
-static inline int dns_answer_ttl(u16_t dname_size, u8_t *answer)
+static inline int dns_answer_ttl(uint16_t dname_size, uint8_t *answer)
 {
-	return ntohl(UNALIGNED_GET((u32_t *)(answer + dname_size + 4)));
+	return ntohl(UNALIGNED_GET((uint32_t *)(answer + dname_size + 4)));
 }
 
-static inline int dns_answer_rdlength(u16_t dname_size,
-					     u8_t *answer)
+static inline int dns_answer_rdlength(uint16_t dname_size,
+					     uint8_t *answer)
 {
-	return ntohs(UNALIGNED_GET((u16_t *)(answer + dname_size + 8)));
+	return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 8)));
 }
 
 /**
@@ -266,7 +266,7 @@ static inline int dns_answer_rdlength(u16_t dname_size,
  * @retval -ENOMEM if there is no enough space to store the resultant QNAME
  * @retval -EINVAL if an invalid parameter was passed as an argument
  */
-int dns_msg_pack_qname(u16_t *len, u8_t *buf, u16_t size,
+int dns_msg_pack_qname(uint16_t *len, uint8_t *buf, uint16_t size,
 		       const char *domain_name);
 
 /**
@@ -279,7 +279,7 @@ int dns_msg_pack_qname(u16_t *len, u8_t *buf, u16_t size,
  * @retval 0 on success
  * @retval -ENOMEM on error
  */
-int dns_unpack_answer(struct dns_msg_t *dns_msg, int dname_ptr, u32_t *ttl);
+int dns_unpack_answer(struct dns_msg_t *dns_msg, int dname_ptr, uint32_t *ttl);
 
 /**
  * @brief Unpacks the header's response.
@@ -314,8 +314,8 @@ int dns_unpack_response_header(struct dns_msg_t *msg, int src_id);
  * @retval On error, a negative value is returned.
  *         See: dns_msg_pack_query_header and  dns_msg_pack_qname.
  */
-int dns_msg_pack_query(u8_t *buf, u16_t *len, u16_t size,
-		       u8_t *qname, u16_t qname_len, u16_t id,
+int dns_msg_pack_query(uint8_t *buf, uint16_t *len, uint16_t size,
+		       uint8_t *qname, uint16_t qname_len, uint16_t id,
 		       enum dns_rr_type qtype);
 
 /**
@@ -351,8 +351,8 @@ int dns_unpack_response_query(struct dns_msg_t *dns_msg);
  * @retval -EINVAL if an invalid parameter was passed as an argument
  * @retval -ENOMEM if the label's size is corrupted
  */
-int dns_copy_qname(u8_t *buf, u16_t *len, u16_t size,
-		   struct dns_msg_t *dns_msg, u16_t pos);
+int dns_copy_qname(uint8_t *buf, uint16_t *len, uint16_t size,
+		   struct dns_msg_t *dns_msg, uint16_t pos);
 
 /**
  * @brief Unpacks the mDNS query. This is special version for multicast DNS
@@ -371,10 +371,10 @@ int dns_copy_qname(u8_t *buf, u16_t *len, u16_t size,
  * @retval RFC 1035 RCODEs (> 0) 1 Format error, 2 Server failure, 3 Name Error,
  *         4 Not Implemented and 5 Refused.
  */
-int mdns_unpack_query_header(struct dns_msg_t *msg, u16_t *src_id);
+int mdns_unpack_query_header(struct dns_msg_t *msg, uint16_t *src_id);
 
 static inline int llmnr_unpack_query_header(struct dns_msg_t *msg,
-					    u16_t *src_id)
+					    uint16_t *src_id)
 {
 	return mdns_unpack_query_header(msg, src_id);
 }
diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c
index 6d6acfb60a..8d8567694d 100644
--- a/subsys/net/lib/dns/llmnr_responder.c
+++ b/subsys/net/lib/dns/llmnr_responder.c
@@ -142,38 +142,38 @@ static int bind_ctx(struct net_context *ctx,
 	return ret;
 }
 
-static void setup_dns_hdr(u8_t *buf, u16_t answers, u16_t dns_id)
+static void setup_dns_hdr(uint8_t *buf, uint16_t answers, uint16_t dns_id)
 {
-	u16_t offset;
-	u16_t flags;
+	uint16_t offset;
+	uint16_t flags;
 
 	/* See RFC 1035, ch 4.1.1 and RFC 4795 ch 2.1.1 for header details */
 
 	flags = BIT(15);  /* This is response */
 
-	UNALIGNED_PUT(htons(dns_id), (u16_t *)(buf));
+	UNALIGNED_PUT(htons(dns_id), (uint16_t *)(buf));
 	offset = DNS_HEADER_ID_LEN;
 
-	UNALIGNED_PUT(htons(flags), (u16_t *)(buf+offset));
+	UNALIGNED_PUT(htons(flags), (uint16_t *)(buf+offset));
 	offset += DNS_HEADER_FLAGS_LEN;
 
-	UNALIGNED_PUT(htons(1), (u16_t *)(buf + offset));
+	UNALIGNED_PUT(htons(1), (uint16_t *)(buf + offset));
 	offset += DNS_QDCOUNT_LEN;
 
-	UNALIGNED_PUT(htons(answers), (u16_t *)(buf + offset));
+	UNALIGNED_PUT(htons(answers), (uint16_t *)(buf + offset));
 	offset += DNS_ANCOUNT_LEN;
 
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 	offset += DNS_NSCOUNT_LEN;
 
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 }
 
 static void add_question(struct net_buf *query, enum dns_rr_type qtype)
 {
 	char *dot = query->data + DNS_MSG_HEADER_SIZE;
 	char *prev = NULL;
-	u16_t offset;
+	uint16_t offset;
 
 	while ((dot = strchr(dot, '.'))) {
 		if (!prev) {
@@ -190,17 +190,17 @@ static void add_question(struct net_buf *query, enum dns_rr_type qtype)
 	}
 
 	offset = DNS_MSG_HEADER_SIZE + query->len + 1;
-	UNALIGNED_PUT(htons(qtype), (u16_t *)(query->data+offset));
+	UNALIGNED_PUT(htons(qtype), (uint16_t *)(query->data+offset));
 
 	offset += DNS_QTYPE_LEN;
-	UNALIGNED_PUT(htons(DNS_CLASS_IN), (u16_t *)(query->data+offset));
+	UNALIGNED_PUT(htons(DNS_CLASS_IN), (uint16_t *)(query->data+offset));
 }
 
-static int add_answer(struct net_buf *query, u32_t ttl,
-		       u16_t addr_len, const u8_t *addr)
+static int add_answer(struct net_buf *query, uint32_t ttl,
+		       uint16_t addr_len, const uint8_t *addr)
 {
-	const u16_t q_len = query->len + 1 + DNS_QTYPE_LEN + DNS_QCLASS_LEN;
-	u16_t offset = DNS_MSG_HEADER_SIZE + q_len;
+	const uint16_t q_len = query->len + 1 + DNS_QTYPE_LEN + DNS_QCLASS_LEN;
+	uint16_t offset = DNS_MSG_HEADER_SIZE + q_len;
 
 	memcpy(query->data + offset, query->data + DNS_MSG_HEADER_SIZE, q_len);
 	offset += q_len;
@@ -219,8 +219,8 @@ static int add_answer(struct net_buf *query, u32_t ttl,
 static int create_answer(struct net_context *ctx,
 			 enum dns_rr_type qtype,
 			 struct net_buf *query,
-			 u16_t dns_id,
-			 u16_t addr_len, const u8_t *addr)
+			 uint16_t dns_id,
+			 uint16_t addr_len, const uint8_t *addr)
 {
 	/* Prepare the response into the query buffer: move the name
 	 * query buffer has to get enough free space: dns_hdr + query + answer
@@ -244,7 +244,7 @@ static int create_answer(struct net_context *ctx,
 }
 
 #if defined(CONFIG_NET_IPV4)
-static const u8_t *get_ipv4_src(struct net_if *iface, struct in_addr *dst)
+static const uint8_t *get_ipv4_src(struct net_if *iface, struct in_addr *dst)
 {
 	const struct in_addr *addr;
 
@@ -253,12 +253,12 @@ static const u8_t *get_ipv4_src(struct net_if *iface, struct in_addr *dst)
 		return NULL;
 	}
 
-	return (const u8_t *)addr;
+	return (const uint8_t *)addr;
 }
 #endif
 
 #if defined(CONFIG_NET_IPV6)
-static const u8_t *get_ipv6_src(struct net_if *iface, struct in6_addr *dst)
+static const uint8_t *get_ipv6_src(struct net_if *iface, struct in6_addr *dst)
 {
 	const struct in6_addr *addr;
 
@@ -267,7 +267,7 @@ static const u8_t *get_ipv6_src(struct net_if *iface, struct in6_addr *dst)
 		return NULL;
 	}
 
-	return (const u8_t *)addr;
+	return (const uint8_t *)addr;
 }
 #endif
 
@@ -277,11 +277,11 @@ static int create_ipv4_answer(struct net_context *ctx,
 			      union net_ip_header *ip_hdr,
 			      enum dns_rr_type qtype,
 			      struct net_buf *query,
-			      u16_t dns_id,
+			      uint16_t dns_id,
 			      struct sockaddr *dst,
 			      socklen_t *dst_len)
 {
-	const u8_t *addr;
+	const uint8_t *addr;
 	int addr_len;
 
 	create_ipv4_dst_addr(pkt, net_sin(dst));
@@ -329,12 +329,12 @@ static int create_ipv6_answer(struct net_context *ctx,
 			      union net_ip_header *ip_hdr,
 			      enum dns_rr_type qtype,
 			      struct net_buf *query,
-			      u16_t dns_id,
+			      uint16_t dns_id,
 			      struct sockaddr *dst,
 			      socklen_t *dst_len)
 {
 #if defined(CONFIG_NET_IPV6)
-	const u8_t *addr;
+	const uint8_t *addr;
 	int addr_len;
 
 	create_ipv6_dst_addr(pkt, net_sin6(dst));
@@ -376,7 +376,7 @@ static int create_ipv6_answer(struct net_context *ctx,
 
 static int send_response(struct net_context *ctx, struct net_pkt *pkt,
 			 union net_ip_header *ip_hdr, struct net_buf *reply,
-			 enum dns_rr_type qtype, u16_t dns_id)
+			 enum dns_rr_type qtype, uint16_t dns_id)
 {
 	struct sockaddr dst;
 	socklen_t dst_len;
@@ -427,7 +427,7 @@ static int dns_read(struct net_context *ctx,
 	int hostname_len = strlen(hostname);
 	struct net_buf *result;
 	struct dns_msg_t dns_msg;
-	u16_t dns_id = 0U;
+	uint16_t dns_id = 0U;
 	int data_len;
 	int queries;
 	int ret;
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index 59d62feffd..4440e6a115 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -109,40 +109,40 @@ static int bind_ctx(struct net_context *ctx,
 	return ret;
 }
 
-static void setup_dns_hdr(u8_t *buf, u16_t answers)
+static void setup_dns_hdr(uint8_t *buf, uint16_t answers)
 {
-	u16_t offset;
-	u16_t flags;
+	uint16_t offset;
+	uint16_t flags;
 
 	/* See RFC 1035, ch 4.1.1 for header details */
 
 	flags = BIT(15);  /* This is response */
 	flags |= BIT(10); /* Authoritative Answer */
 
-	UNALIGNED_PUT(0, (u16_t *)(buf)); /* Identifier, RFC 6762 ch 18.1 */
+	UNALIGNED_PUT(0, (uint16_t *)(buf)); /* Identifier, RFC 6762 ch 18.1 */
 	offset = DNS_HEADER_ID_LEN;
 
-	UNALIGNED_PUT(htons(flags), (u16_t *)(buf+offset));
+	UNALIGNED_PUT(htons(flags), (uint16_t *)(buf+offset));
 	offset += DNS_HEADER_FLAGS_LEN;
 
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 	offset += DNS_QDCOUNT_LEN;
 
-	UNALIGNED_PUT(htons(answers), (u16_t *)(buf + offset));
+	UNALIGNED_PUT(htons(answers), (uint16_t *)(buf + offset));
 	offset += DNS_ANCOUNT_LEN;
 
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 	offset += DNS_NSCOUNT_LEN;
 
-	UNALIGNED_PUT(0, (u16_t *)(buf + offset));
+	UNALIGNED_PUT(0, (uint16_t *)(buf + offset));
 }
 
 static void add_answer(struct net_buf *query, enum dns_rr_type qtype,
-		       u32_t ttl, u16_t addr_len, u8_t *addr)
+		       uint32_t ttl, uint16_t addr_len, uint8_t *addr)
 {
 	char *dot = query->data + DNS_MSG_HEADER_SIZE;
 	char *prev = NULL;
-	u16_t offset;
+	uint16_t offset;
 
 	while ((dot = strchr(dot, '.'))) {
 		if (!prev) {
@@ -162,12 +162,12 @@ static void add_answer(struct net_buf *query, enum dns_rr_type qtype,
 	query->len += 1;
 
 	offset = DNS_MSG_HEADER_SIZE + query->len;
-	UNALIGNED_PUT(htons(qtype), (u16_t *)(query->data+offset));
+	UNALIGNED_PUT(htons(qtype), (uint16_t *)(query->data+offset));
 
 	/* Bit 15 tells to flush the cache */
 	offset += DNS_QTYPE_LEN;
 	UNALIGNED_PUT(htons(DNS_CLASS_IN | BIT(15)),
-		      (u16_t *)(query->data+offset));
+		      (uint16_t *)(query->data+offset));
 
 
 	offset += DNS_QCLASS_LEN;
@@ -183,7 +183,7 @@ static void add_answer(struct net_buf *query, enum dns_rr_type qtype,
 static int create_answer(struct net_context *ctx,
 			 struct net_buf *query,
 			 enum dns_rr_type qtype,
-			 u16_t addr_len, u8_t *addr)
+			 uint16_t addr_len, uint8_t *addr)
 {
 	/* Prepare the response into the query buffer: move the name
 	 * query buffer has to get enough free space: dns_hdr + answer
@@ -229,7 +229,7 @@ static int send_response(struct net_context *ctx,
 		dst_len = sizeof(struct sockaddr_in);
 
 		ret = create_answer(ctx, query, qtype,
-				      sizeof(struct in_addr), (u8_t *)addr);
+				      sizeof(struct in_addr), (uint8_t *)addr);
 		if (ret != 0) {
 			return ret;
 		}
@@ -250,7 +250,7 @@ static int send_response(struct net_context *ctx,
 		dst_len = sizeof(struct sockaddr_in6);
 
 		ret = create_answer(ctx, query, qtype,
-				      sizeof(struct in6_addr), (u8_t *)addr);
+				      sizeof(struct in6_addr), (uint8_t *)addr);
 		if (ret != 0) {
 			return -ENOMEM;
 		}
@@ -327,7 +327,7 @@ static int dns_read(struct net_context *ctx,
 	do {
 		enum dns_rr_type qtype;
 		enum dns_class qclass;
-		u8_t *lquery;
+		uint8_t *lquery;
 
 		(void)memset(result->data, 0, net_buf_tailroom(result));
 		result->len = 0U;
diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c
index bb83e7d7b9..1115c98a6f 100644
--- a/subsys/net/lib/dns/resolve.c
+++ b/subsys/net/lib/dns/resolve.c
@@ -343,8 +343,8 @@ static inline int get_cb_slot(struct dns_resolve_context *ctx)
 }
 
 static inline int get_slot_by_id(struct dns_resolve_context *ctx,
-				 u16_t dns_id,
-				 u16_t query_hash)
+				 uint16_t dns_id,
+				 uint16_t query_hash)
 {
 	int i;
 
@@ -362,15 +362,15 @@ static inline int get_slot_by_id(struct dns_resolve_context *ctx,
 static int dns_read(struct dns_resolve_context *ctx,
 		    struct net_pkt *pkt,
 		    struct net_buf *dns_data,
-		    u16_t *dns_id,
+		    uint16_t *dns_id,
 		    struct net_buf *dns_cname,
-		    u16_t *query_hash)
+		    uint16_t *query_hash)
 {
 	struct dns_addrinfo info = { 0 };
 	/* Helper struct to track the dns msg received from the server */
 	struct dns_msg_t dns_msg;
-	u32_t ttl; /* RR ttl, so far it is not passed to caller */
-	u8_t *src, *addr;
+	uint32_t ttl; /* RR ttl, so far it is not passed to caller */
+	uint8_t *src, *addr;
 	const char *query_name;
 	int address_size;
 	/* index that points to the current answer being analyzed */
@@ -477,7 +477,7 @@ static int dns_read(struct dns_resolve_context *ctx,
 				}
 
 				address_size = DNS_IPV4_LEN;
-				addr = (u8_t *)&net_sin(&info.ai_addr)->
+				addr = (uint8_t *)&net_sin(&info.ai_addr)->
 								sin_addr;
 				info.ai_family = AF_INET;
 				info.ai_addr.sa_family = AF_INET;
@@ -498,7 +498,7 @@ static int dns_read(struct dns_resolve_context *ctx,
 				 */
 #if defined(CONFIG_NET_IPV6)
 				address_size = DNS_IPV6_LEN;
-				addr = (u8_t *)&net_sin6(&info.ai_addr)->
+				addr = (uint8_t *)&net_sin6(&info.ai_addr)->
 								sin6_addr;
 				info.ai_family = AF_INET6;
 				info.ai_addr.sa_family = AF_INET6;
@@ -566,7 +566,7 @@ static int dns_read(struct dns_resolve_context *ctx,
 	 */
 	if (items == 0) {
 		if (dns_msg.response_type == DNS_RESPONSE_CNAME_NO_IP) {
-			u16_t pos = dns_msg.response_position;
+			uint16_t pos = dns_msg.response_position;
 
 			ret = dns_copy_qname(dns_cname->data, &dns_cname->len,
 					     dns_cname->size, &dns_msg, pos);
@@ -619,8 +619,8 @@ static void cb_recv(struct net_context *net_ctx,
 	struct dns_resolve_context *ctx = user_data;
 	struct net_buf *dns_cname = NULL;
 	struct net_buf *dns_data = NULL;
-	u16_t query_hash = 0U;
-	u16_t dns_id = 0U;
+	uint16_t query_hash = 0U;
+	uint16_t dns_id = 0U;
 	int ret, i;
 
 	ARG_UNUSED(net_ctx);
@@ -718,7 +718,7 @@ static int dns_write(struct dns_resolve_context *ctx,
 	struct net_context *net_ctx;
 	struct sockaddr *server;
 	int server_addr_len;
-	u16_t dns_id;
+	uint16_t dns_id;
 	int ret;
 
 	net_ctx = ctx->servers[server_idx].net_ctx;
@@ -784,8 +784,8 @@ static int dns_write(struct dns_resolve_context *ctx,
 }
 
 static int dns_resolve_cancel_with_hash(struct dns_resolve_context *ctx,
-					u16_t dns_id,
-					u16_t query_hash,
+					uint16_t dns_id,
+					uint16_t query_hash,
 					const char *query_name)
 {
 	int i;
@@ -810,15 +810,15 @@ static int dns_resolve_cancel_with_hash(struct dns_resolve_context *ctx,
 }
 
 int dns_resolve_cancel_with_name(struct dns_resolve_context *ctx,
-				 u16_t dns_id,
+				 uint16_t dns_id,
 				 const char *query_name,
 				 enum dns_query_type query_type)
 {
-	u16_t query_hash = 0;
+	uint16_t query_hash = 0;
 
 	if (query_name) {
 		struct net_buf *buf;
-		u16_t len;
+		uint16_t len;
 		int ret;
 
 		/* Use net_buf as a temporary buffer to store the packed
@@ -857,7 +857,7 @@ int dns_resolve_cancel_with_name(struct dns_resolve_context *ctx,
 					    query_name);
 }
 
-int dns_resolve_cancel(struct dns_resolve_context *ctx, u16_t dns_id)
+int dns_resolve_cancel(struct dns_resolve_context *ctx, uint16_t dns_id)
 {
 	return dns_resolve_cancel_with_name(ctx, dns_id, NULL, 0);
 }
@@ -879,10 +879,10 @@ static void query_timeout(struct k_work *work)
 int dns_resolve_name(struct dns_resolve_context *ctx,
 		     const char *query,
 		     enum dns_query_type type,
-		     u16_t *dns_id,
+		     uint16_t *dns_id,
 		     dns_resolve_cb_t cb,
 		     void *user_data,
-		     s32_t timeout)
+		     int32_t timeout)
 {
 	k_timeout_t tout;
 	struct net_buf *dns_data = NULL;
@@ -891,7 +891,7 @@ int dns_resolve_name(struct dns_resolve_context *ctx,
 	int ret, i = -1, j = 0;
 	int failure = 0;
 	bool mdns_query = false;
-	u8_t hop_limit;
+	uint8_t hop_limit;
 
 	if (!ctx || !ctx->is_used || !query || !cb) {
 		return -EINVAL;
diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c
index 13e1458cdc..0a72350590 100644
--- a/subsys/net/lib/http/http_client.c
+++ b/subsys/net/lib/http/http_client.c
@@ -164,7 +164,7 @@ static int on_status(struct http_parser *parser, const char *at, size_t length)
 	struct http_request *req = CONTAINER_OF(parser,
 						struct http_request,
 						internal.parser);
-	u16_t len;
+	uint16_t len;
 
 	len = MIN(length, sizeof(req->internal.response.http_status) - 1);
 	memcpy(req->internal.response.http_status, at, len);
@@ -188,7 +188,7 @@ static int on_header_field(struct http_parser *parser, const char *at,
 						struct http_request,
 						internal.parser);
 	const char *content_len = "Content-Length";
-	u16_t len;
+	uint16_t len;
 
 	len = strlen(content_len);
 	if (length >= len && strncasecmp(at, content_len, len) == 0) {
@@ -263,8 +263,8 @@ static int on_body(struct http_parser *parser, const char *at, size_t length)
 	}
 
 	if (!req->internal.response.body_start &&
-	    (u8_t *)at != (u8_t *)req->internal.response.recv_buf) {
-		req->internal.response.body_start = (u8_t *)at;
+	    (uint8_t *)at != (uint8_t *)req->internal.response.recv_buf) {
+		req->internal.response.body_start = (uint8_t *)at;
 	}
 
 	if (req->internal.response.cb) {
@@ -468,7 +468,7 @@ static void http_timeout(struct k_work *work)
 }
 
 int http_client_req(int sock, struct http_request *req,
-		    s32_t timeout, void *user_data)
+		    int32_t timeout, void *user_data)
 {
 	/* Utilize the network usage by sending data in bigger blocks */
 	char send_buf[MAX_SEND_BUF_LEN];
@@ -605,7 +605,7 @@ int http_client_req(int sock, struct http_request *req,
 
 			total_sent += ret;
 		} else {
-			u32_t length;
+			uint32_t length;
 
 			if (req->payload_len == 0) {
 				length = strlen(req->payload);
diff --git a/subsys/net/lib/http/http_parser.c b/subsys/net/lib/http/http_parser.c
index f9ddda549e..8744b72760 100644
--- a/subsys/net/lib/http/http_parser.c
+++ b/subsys/net/lib/http/http_parser.c
@@ -30,7 +30,7 @@
 #include <limits.h>
 
 #ifndef ULLONG_MAX
-# define ULLONG_MAX ((u64_t) -1) /* 2^64-1 */
+# define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
 #endif
 
 #ifndef MIN
@@ -159,7 +159,7 @@ static const char tokens[256] = {
 
 
 static const
-s8_t unhex[256] = {
+int8_t unhex[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -513,8 +513,8 @@ int header_states(struct http_parser *parser, const char *data, size_t len,
 		break;
 
 	case h_content_length: {
-		u64_t t;
-		u64_t value;
+		uint64_t t;
+		uint64_t value;
 
 		if (ch == ' ') {
 			break;
@@ -713,7 +713,7 @@ int parser_execute(struct http_parser *parser,
 	const char *url_mark = 0;
 	const char *body_mark = 0;
 	const char *status_mark = 0;
-	s8_t unhex_val;
+	int8_t unhex_val;
 	int rc;
 	char ch;
 	char c;
@@ -1169,7 +1169,7 @@ reexecute:
 				; /* nada */
 			} else if (IS_ALPHA(ch)) {
 
-				u64_t sw_option = parser->method << 16 |
+				uint64_t sw_option = parser->method << 16 |
 						     parser->index << 8 | ch;
 				switch (sw_option) {
 				case (HTTP_POST << 16 | 1 << 8 | 'U'):
@@ -1943,8 +1943,8 @@ reexecute:
 		}
 
 		case s_body_identity: {
-			u64_t to_read = MIN(parser->content_length,
-					       (u64_t) ((data + len) - p));
+			uint64_t to_read = MIN(parser->content_length,
+					       (uint64_t) ((data + len) - p));
 
 			assert(parser->content_length != 0U
 			       && parser->content_length != ULLONG_MAX);
@@ -2039,7 +2039,7 @@ reexecute:
 		}
 
 		case s_chunk_size: {
-			u64_t t;
+			uint64_t t;
 
 			assert(parser->flags & F_CHUNKED);
 
@@ -2067,7 +2067,7 @@ reexecute:
 			/* Overflow? Test against a conservative limit for
 			 * simplicity.
 			 */
-			u64_t ulong_value = (ULLONG_MAX - 16) / 16;
+			uint64_t ulong_value = (ULLONG_MAX - 16) / 16;
 
 			if (UNLIKELY(ulong_value < parser->content_length)) {
 				SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
@@ -2116,8 +2116,8 @@ reexecute:
 		}
 
 		case s_chunk_data: {
-			u64_t to_read = MIN(parser->content_length,
-					       (u64_t) ((data + len) - p));
+			uint64_t to_read = MIN(parser->content_length,
+					       (uint64_t) ((data + len) - p));
 
 			assert(parser->flags & F_CHUNKED);
 			assert(parser->content_length != 0U
diff --git a/subsys/net/lib/http/http_parser_url.c b/subsys/net/lib/http/http_parser_url.c
index f74c0c5608..12cfa91c3d 100644
--- a/subsys/net/lib/http/http_parser_url.c
+++ b/subsys/net/lib/http/http_parser_url.c
@@ -51,7 +51,7 @@ do {                                                                       \
 #endif
 
 
-static const u8_t normal_url_char[32] = {
+static const uint8_t normal_url_char[32] = {
 /*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
 	0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
 /*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
@@ -566,7 +566,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
 			return 1;
 		}
 
-		u->port = (u16_t) v;
+		u->port = (uint16_t) v;
 	}
 
 	return 0;
diff --git a/subsys/net/lib/lwm2m/buf_util.h b/subsys/net/lib/lwm2m/buf_util.h
index df384426ff..bfb5b8338a 100644
--- a/subsys/net/lib/lwm2m/buf_util.h
+++ b/subsys/net/lib/lwm2m/buf_util.h
@@ -16,8 +16,8 @@ extern "C" {
 #endif
 
 /* append */
-static inline int buf_append(u8_t *dst, u16_t *dst_len, u16_t dst_size,
-			     u8_t *src, u16_t src_len)
+static inline int buf_append(uint8_t *dst, uint16_t *dst_len, uint16_t dst_size,
+			     uint8_t *src, uint16_t src_len)
 {
 	if (!dst || !src) {
 		return -EINVAL;
@@ -33,8 +33,8 @@ static inline int buf_append(u8_t *dst, u16_t *dst_len, u16_t dst_size,
 }
 
 /* insert */
-static inline int buf_insert(u8_t *dst, u16_t *dst_len, u16_t dst_size,
-			     u16_t offset, u8_t *src, u16_t src_len)
+static inline int buf_insert(uint8_t *dst, uint16_t *dst_len, uint16_t dst_size,
+			     uint16_t offset, uint8_t *src, uint16_t src_len)
 {
 	if (!dst || !src) {
 		return -EINVAL;
@@ -54,8 +54,8 @@ static inline int buf_insert(u8_t *dst, u16_t *dst_len, u16_t dst_size,
 }
 
 /* read */
-static inline int buf_read(u8_t *dst, u16_t len, u8_t *src, u16_t src_len,
-			   u16_t *offset)
+static inline int buf_read(uint8_t *dst, uint16_t len, uint8_t *src, uint16_t src_len,
+			   uint16_t *offset)
 {
 	if (!src) {
 		return -EINVAL;
@@ -74,48 +74,48 @@ static inline int buf_read(u8_t *dst, u16_t len, u8_t *src, u16_t src_len,
 	return 0;
 }
 
-static inline int buf_skip(u16_t len, u8_t *src, u16_t src_len, u16_t *offset)
+static inline int buf_skip(uint16_t len, uint8_t *src, uint16_t src_len, uint16_t *offset)
 {
 	return buf_read(NULL, len, src, src_len, offset);
 }
 
-static inline int buf_read_u8(u8_t *value, u8_t *src, u16_t src_len,
-			      u16_t *offset)
+static inline int buf_read_u8(uint8_t *value, uint8_t *src, uint16_t src_len,
+			      uint16_t *offset)
 {
-	return buf_read(value, sizeof(u8_t), src, src_len, offset);
+	return buf_read(value, sizeof(uint8_t), src, src_len, offset);
 }
 
-static inline int buf_read_u16(u16_t *value, u8_t *src, u16_t src_len,
-			       u16_t *offset)
+static inline int buf_read_u16(uint16_t *value, uint8_t *src, uint16_t src_len,
+			       uint16_t *offset)
 {
-	return buf_read((u8_t *)value, sizeof(u16_t), src, src_len, offset);
+	return buf_read((uint8_t *)value, sizeof(uint16_t), src, src_len, offset);
 }
 
-static inline int buf_read_be16(u16_t *value, u8_t *src, u16_t src_len,
-				u16_t *offset)
+static inline int buf_read_be16(uint16_t *value, uint8_t *src, uint16_t src_len,
+				uint16_t *offset)
 {
 	int ret;
-	u8_t v16[2];
+	uint8_t v16[2];
 
-	ret = buf_read(v16, sizeof(u16_t), src, src_len, offset);
+	ret = buf_read(v16, sizeof(uint16_t), src, src_len, offset);
 	*value = v16[0] << 8 | v16[1];
 
 	return ret;
 }
 
-static inline int buf_read_u32(u32_t *value, u8_t *src, u16_t src_len,
-			       u16_t *offset)
+static inline int buf_read_u32(uint32_t *value, uint8_t *src, uint16_t src_len,
+			       uint16_t *offset)
 {
-	return buf_read((u8_t *)value, sizeof(u32_t), src, src_len, offset);
+	return buf_read((uint8_t *)value, sizeof(uint32_t), src, src_len, offset);
 }
 
-static inline int buf_read_be32(u32_t *value, u8_t *src, u16_t src_len,
-				u16_t *offset)
+static inline int buf_read_be32(uint32_t *value, uint8_t *src, uint16_t src_len,
+				uint16_t *offset)
 {
 	int ret;
-	u8_t v32[4];
+	uint8_t v32[4];
 
-	ret = buf_read(v32, sizeof(u32_t), src, src_len, offset);
+	ret = buf_read(v32, sizeof(uint32_t), src, src_len, offset);
 	*value = v32[0] << 24 | v32[1] << 16 | v32[2] << 8 | v32[3];
 
 	return ret;
diff --git a/subsys/net/lib/lwm2m/ipso_accelerometer.c b/subsys/net/lib/lwm2m/ipso_accelerometer.c
index 27d8fa64e5..07358423a6 100644
--- a/subsys/net/lib/lwm2m/ipso_accelerometer.c
+++ b/subsys/net/lib/lwm2m/ipso_accelerometer.c
@@ -78,7 +78,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][ACCEL_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static struct lwm2m_engine_obj_inst *accel_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *accel_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_buzzer.c b/subsys/net/lib/lwm2m/ipso_buzzer.c
index 5bf82966b6..d797607ad6 100644
--- a/subsys/net/lib/lwm2m/ipso_buzzer.c
+++ b/subsys/net/lib/lwm2m/ipso_buzzer.c
@@ -48,11 +48,11 @@ struct ipso_buzzer_data {
 	float64_value_t delay_duration;
 	float64_value_t min_off_time;
 
-	u64_t trigger_offset;
+	uint64_t trigger_offset;
 
 	struct k_delayed_work buzzer_work;
 
-	u16_t obj_inst_id;
+	uint16_t obj_inst_id;
 	bool onoff; /* toggle from resource */
 	bool active; /* digital state */
 };
@@ -74,7 +74,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][BUZZER_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static int float2ms(float64_value_t *f, u32_t *ms)
+static int float2ms(float64_value_t *f, uint32_t *ms)
 {
 	*ms = f->val1 * MSEC_PER_SEC;
 	*ms += f->val2 / (LWM2M_FLOAT64_DEC_MAX / MSEC_PER_SEC);
@@ -82,7 +82,7 @@ static int float2ms(float64_value_t *f, u32_t *ms)
 	return 0;
 }
 
-static int get_buzzer_index(u16_t obj_inst_id)
+static int get_buzzer_index(uint16_t obj_inst_id)
 {
 	int i, ret = -ENOENT;
 
@@ -100,7 +100,7 @@ static int get_buzzer_index(u16_t obj_inst_id)
 
 static int start_buzzer(struct ipso_buzzer_data *buzzer)
 {
-	u32_t temp = 0U;
+	uint32_t temp = 0U;
 	char path[MAX_RESOURCE_LEN];
 
 	/* make sure buzzer is currently not active */
@@ -147,9 +147,9 @@ static int stop_buzzer(struct ipso_buzzer_data *buzzer, bool cancel)
 	return 0;
 }
 
-static int onoff_post_write_cb(u16_t obj_inst_id,
-			       u16_t res_id, u16_t res_inst_id,
-			       u8_t *data, u16_t data_len,
+static int onoff_post_write_cb(uint16_t obj_inst_id,
+			       uint16_t res_id, uint16_t res_inst_id,
+			       uint8_t *data, uint16_t data_len,
 			       bool last_block, size_t total_size)
 {
 	int i;
@@ -176,7 +176,7 @@ static void buzzer_work_cb(struct k_work *work)
 	stop_buzzer(buzzer, false);
 }
 
-static struct lwm2m_engine_obj_inst *buzzer_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *buzzer_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_light_control.c b/subsys/net/lib/lwm2m/ipso_light_control.c
index 442f82b6ce..3719672f5b 100644
--- a/subsys/net/lib/lwm2m/ipso_light_control.c
+++ b/subsys/net/lib/lwm2m/ipso_light_control.c
@@ -48,9 +48,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* resource state variables */
 static bool on_off_value[MAX_INSTANCE_COUNT];
-static u8_t dimmer_value[MAX_INSTANCE_COUNT];
-static s32_t on_time_value[MAX_INSTANCE_COUNT];
-static u32_t on_time_offset[MAX_INSTANCE_COUNT];
+static uint8_t dimmer_value[MAX_INSTANCE_COUNT];
+static int32_t on_time_value[MAX_INSTANCE_COUNT];
+static uint32_t on_time_offset[MAX_INSTANCE_COUNT];
 static float32_value_t cumulative_active_value[MAX_INSTANCE_COUNT];
 static float32_value_t power_factor_value[MAX_INSTANCE_COUNT];
 static char colour[MAX_INSTANCE_COUNT][LIGHT_STRING_LONG];
@@ -73,7 +73,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][LIGHT_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static void *on_time_read_cb(u16_t obj_inst_id, u16_t res_id, u16_t res_inst_id,
+static void *on_time_read_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id,
 			     size_t *data_len)
 {
 	int i;
@@ -95,9 +95,9 @@ static void *on_time_read_cb(u16_t obj_inst_id, u16_t res_id, u16_t res_inst_id,
 	return NULL;
 }
 
-static int on_time_post_write_cb(u16_t obj_inst_id,
-				 u16_t res_id, u16_t res_inst_id,
-				 u8_t *data, u16_t data_len,
+static int on_time_post_write_cb(uint16_t obj_inst_id,
+				 uint16_t res_id, uint16_t res_inst_id,
+				 uint8_t *data, uint16_t data_len,
 				 bool last_block, size_t total_size)
 {
 	int i;
@@ -107,7 +107,7 @@ static int on_time_post_write_cb(u16_t obj_inst_id,
 		return -EINVAL;
 	}
 
-	s32_t counter = *(s32_t *) data;
+	int32_t counter = *(int32_t *) data;
 
 	for (i = 0; i < MAX_INSTANCE_COUNT; i++) {
 		if (!inst[i].obj || inst[i].obj_inst_id != obj_inst_id) {
@@ -116,7 +116,7 @@ static int on_time_post_write_cb(u16_t obj_inst_id,
 
 		if (counter == 0) {
 			on_time_offset[i] =
-				(s32_t)(k_uptime_get() / MSEC_PER_SEC);
+				(int32_t)(k_uptime_get() / MSEC_PER_SEC);
 		}
 
 		return 0;
@@ -125,7 +125,7 @@ static int on_time_post_write_cb(u16_t obj_inst_id,
 	return -ENOENT;
 }
 
-static struct lwm2m_engine_obj_inst *light_control_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *light_control_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_onoff_switch.c b/subsys/net/lib/lwm2m/ipso_onoff_switch.c
index 170c774c81..2ea0dd05f3 100644
--- a/subsys/net/lib/lwm2m/ipso_onoff_switch.c
+++ b/subsys/net/lib/lwm2m/ipso_onoff_switch.c
@@ -51,11 +51,11 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* resource state */
 struct ipso_switch_data {
-	u64_t trigger_offset;
-	u64_t on_time_sec;
-	u64_t off_time_sec;
-	u64_t counter;
-	u16_t obj_inst_id;
+	uint64_t trigger_offset;
+	uint64_t on_time_sec;
+	uint64_t off_time_sec;
+	uint64_t counter;
+	uint16_t obj_inst_id;
 	bool last_state;
 	bool state;
 };
@@ -79,7 +79,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][SWITCH_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static int get_switch_index(u16_t obj_inst_id)
+static int get_switch_index(uint16_t obj_inst_id)
 {
 	int i, ret = -ENOENT;
 
@@ -95,9 +95,9 @@ static int get_switch_index(u16_t obj_inst_id)
 	return ret;
 }
 
-static int state_post_write_cb(u16_t obj_inst_id,
-			       u16_t res_id, u16_t res_inst_id,
-			       u8_t *data, u16_t data_len,
+static int state_post_write_cb(uint16_t obj_inst_id,
+			       uint16_t res_id, uint16_t res_inst_id,
+			       uint8_t *data, uint16_t data_len,
 			       bool last_block, size_t total_size)
 {
 	int i;
@@ -124,8 +124,8 @@ static int state_post_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static void *on_time_read_cb(u16_t obj_inst_id,
-			     u16_t res_id, u16_t res_inst_id,
+static void *on_time_read_cb(uint16_t obj_inst_id,
+			     uint16_t res_id, uint16_t res_inst_id,
 			     size_t *data_len)
 {
 	int i = get_switch_index(obj_inst_id);
@@ -143,8 +143,8 @@ static void *on_time_read_cb(u16_t obj_inst_id,
 	return &switch_data[i].on_time_sec;
 }
 
-static void *off_time_read_cb(u16_t obj_inst_id,
-			      u16_t res_id, u16_t res_inst_id,
+static void *off_time_read_cb(uint16_t obj_inst_id,
+			      uint16_t res_id, uint16_t res_inst_id,
 			      size_t *data_len)
 {
 	int i = get_switch_index(obj_inst_id);
@@ -162,9 +162,9 @@ static void *off_time_read_cb(u16_t obj_inst_id,
 	return &switch_data[i].off_time_sec;
 }
 
-static int time_post_write_cb(u16_t obj_inst_id,
-			      u16_t res_id, u16_t res_inst_id,
-			      u8_t *data, u16_t data_len,
+static int time_post_write_cb(uint16_t obj_inst_id,
+			      uint16_t res_id, uint16_t res_inst_id,
+			      uint8_t *data, uint16_t data_len,
 			      bool last_block, size_t total_size)
 {
 	int i = get_switch_index(obj_inst_id);
@@ -177,7 +177,7 @@ static int time_post_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static struct lwm2m_engine_obj_inst *switch_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *switch_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_push_button.c b/subsys/net/lib/lwm2m/ipso_push_button.c
index 2a4229cb4f..9248304adc 100644
--- a/subsys/net/lib/lwm2m/ipso_push_button.c
+++ b/subsys/net/lib/lwm2m/ipso_push_button.c
@@ -49,8 +49,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* resource state */
 struct ipso_button_data {
-	u64_t counter;
-	u16_t obj_inst_id;
+	uint64_t counter;
+	uint16_t obj_inst_id;
 	bool last_state;
 	bool state;
 };
@@ -72,7 +72,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][BUTTON_MAX_ID];
 static struct lwm2m_engine_res_inst
 			res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static int get_button_index(u16_t obj_inst_id)
+static int get_button_index(uint16_t obj_inst_id)
 {
 	int i, ret = -ENOENT;
 
@@ -88,9 +88,9 @@ static int get_button_index(u16_t obj_inst_id)
 	return ret;
 }
 
-static int state_post_write_cb(u16_t obj_inst_id,
-			       u16_t res_id, u16_t res_inst_id,
-			       u8_t *data, u16_t data_len,
+static int state_post_write_cb(uint16_t obj_inst_id,
+			       uint16_t res_id, uint16_t res_inst_id,
+			       uint8_t *data, uint16_t data_len,
 			       bool last_block, size_t total_size)
 {
 	int i;
@@ -109,7 +109,7 @@ static int state_post_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static struct lwm2m_engine_obj_inst *button_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *button_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_temp_sensor.c b/subsys/net/lib/lwm2m/ipso_temp_sensor.c
index 09f2ab9b97..eb1918fda3 100644
--- a/subsys/net/lib/lwm2m/ipso_temp_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_temp_sensor.c
@@ -83,7 +83,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][TEMP_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static void update_min_measured(u16_t obj_inst_id, int index)
+static void update_min_measured(uint16_t obj_inst_id, int index)
 {
 	min_measured_value[index].val1 = sensor_value[index].val1;
 	min_measured_value[index].val2 = sensor_value[index].val2;
@@ -91,7 +91,7 @@ static void update_min_measured(u16_t obj_inst_id, int index)
 			TEMP_MIN_MEASURED_VALUE_ID);
 }
 
-static void update_max_measured(u16_t obj_inst_id, int index)
+static void update_max_measured(uint16_t obj_inst_id, int index)
 {
 	max_measured_value[index].val1 = sensor_value[index].val1;
 	max_measured_value[index].val2 = sensor_value[index].val2;
@@ -99,7 +99,7 @@ static void update_max_measured(u16_t obj_inst_id, int index)
 			TEMP_MAX_MEASURED_VALUE_ID);
 }
 
-static int reset_min_max_measured_values_cb(u16_t obj_inst_id)
+static int reset_min_max_measured_values_cb(uint16_t obj_inst_id)
 {
 	int i;
 
@@ -115,9 +115,9 @@ static int reset_min_max_measured_values_cb(u16_t obj_inst_id)
 	return -ENOENT;
 }
 
-static int sensor_value_write_cb(u16_t obj_inst_id,
-				 u16_t res_id, u16_t res_inst_id,
-				 u8_t *data, u16_t data_len,
+static int sensor_value_write_cb(uint16_t obj_inst_id,
+				 uint16_t res_id, uint16_t res_inst_id,
+				 uint8_t *data, uint16_t data_len,
 				 bool last_block, size_t total_size)
 {
 	int i;
@@ -158,7 +158,7 @@ static int sensor_value_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static struct lwm2m_engine_obj_inst *temp_sensor_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *temp_sensor_create(uint16_t obj_inst_id)
 {
 	int index, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/ipso_timer.c b/subsys/net/lib/lwm2m/ipso_timer.c
index 41a946c2c0..e66d32064d 100644
--- a/subsys/net/lib/lwm2m/ipso_timer.c
+++ b/subsys/net/lib/lwm2m/ipso_timer.c
@@ -60,14 +60,14 @@ struct ipso_timer_data {
 	float64_value_t min_off_time;
 	float64_value_t cumulative_time;
 
-	u64_t trigger_offset;
-	u32_t trigger_counter;
-	u32_t cumulative_time_ms;
+	uint64_t trigger_offset;
+	uint32_t trigger_counter;
+	uint32_t cumulative_time_ms;
 
 	struct k_delayed_work timer_work;
 
-	u16_t obj_inst_id;
-	u8_t timer_mode;
+	uint16_t obj_inst_id;
+	uint8_t timer_mode;
 	bool enabled;
 	bool active;
 };
@@ -94,7 +94,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][TIMER_MAX_ID];
 static struct lwm2m_engine_res_inst
 		res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static int ms2float(u32_t ms, float64_value_t *f)
+static int ms2float(uint32_t ms, float64_value_t *f)
 {
 	f->val1 = ms / MSEC_PER_SEC;
 	f->val2 = (ms % MSEC_PER_SEC) * (LWM2M_FLOAT64_DEC_MAX / MSEC_PER_SEC);
@@ -102,7 +102,7 @@ static int ms2float(u32_t ms, float64_value_t *f)
 	return 0;
 }
 
-static int float2ms(float64_value_t *f, u32_t *ms)
+static int float2ms(float64_value_t *f, uint32_t *ms)
 {
 	*ms = f->val1 * MSEC_PER_SEC;
 	*ms += f->val2 / (LWM2M_FLOAT64_DEC_MAX / MSEC_PER_SEC);
@@ -110,7 +110,7 @@ static int float2ms(float64_value_t *f, u32_t *ms)
 	return 0;
 }
 
-static int get_timer_index(u16_t obj_inst_id)
+static int get_timer_index(uint16_t obj_inst_id)
 {
 	int i, ret = -ENOENT;
 
@@ -128,7 +128,7 @@ static int get_timer_index(u16_t obj_inst_id)
 
 static int start_timer(struct ipso_timer_data *timer)
 {
-	u32_t temp = 0U;
+	uint32_t temp = 0U;
 	char path[MAX_RESOURCE_LEN];
 
 	/* make sure timer is enabled and not already active */
@@ -179,11 +179,11 @@ static int stop_timer(struct ipso_timer_data *timer, bool cancel)
 	return 0;
 }
 
-static void *remaining_time_read_cb(u16_t obj_inst_id,
-				    u16_t res_id, u16_t res_inst_id,
+static void *remaining_time_read_cb(uint16_t obj_inst_id,
+				    uint16_t res_id, uint16_t res_inst_id,
 				    size_t *data_len)
 {
-	u32_t temp = 0U;
+	uint32_t temp = 0U;
 	int i;
 
 	i = get_timer_index(obj_inst_id);
@@ -204,12 +204,12 @@ static void *remaining_time_read_cb(u16_t obj_inst_id,
 	return &timer_data[i].remaining_time;
 }
 
-static void *cumulative_time_read_cb(u16_t obj_inst_id,
-				     u16_t res_id, u16_t res_inst_id,
+static void *cumulative_time_read_cb(uint16_t obj_inst_id,
+				     uint16_t res_id, uint16_t res_inst_id,
 				     size_t *data_len)
 {
 	int i;
-	u32_t temp;
+	uint32_t temp;
 
 	i = get_timer_index(obj_inst_id);
 	if (i < 0) {
@@ -227,9 +227,9 @@ static void *cumulative_time_read_cb(u16_t obj_inst_id,
 	return &timer_data[i].cumulative_time;
 }
 
-static int cumulative_time_post_write_cb(u16_t obj_inst_id,
-					 u16_t res_id, u16_t res_inst_id,
-					 u8_t *data, u16_t data_len,
+static int cumulative_time_post_write_cb(uint16_t obj_inst_id,
+					 uint16_t res_id, uint16_t res_inst_id,
+					 uint8_t *data, uint16_t data_len,
 					 bool last_block, size_t total_size)
 {
 	int i;
@@ -243,9 +243,9 @@ static int cumulative_time_post_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static int enabled_post_write_cb(u16_t obj_inst_id,
-				 u16_t res_id, u16_t res_inst_id,
-				 u8_t *data, u16_t data_len,
+static int enabled_post_write_cb(uint16_t obj_inst_id,
+				 uint16_t res_id, uint16_t res_inst_id,
+				 uint8_t *data, uint16_t data_len,
 				 bool last_block, size_t total_size)
 {
 	int i;
@@ -263,9 +263,9 @@ static int enabled_post_write_cb(u16_t obj_inst_id,
 	return 0;
 }
 
-static int trigger_counter_post_write_cb(u16_t obj_inst_id,
-					 u16_t res_id, u16_t res_inst_id,
-					 u8_t *data, u16_t data_len,
+static int trigger_counter_post_write_cb(uint16_t obj_inst_id,
+					 uint16_t res_id, uint16_t res_inst_id,
+					 uint8_t *data, uint16_t data_len,
 					 bool last_block, size_t total_size)
 {
 	int i;
@@ -287,7 +287,7 @@ static void timer_work_cb(struct k_work *work)
 	stop_timer(timer, false);
 }
 
-static int timer_trigger_cb(u16_t obj_inst_id)
+static int timer_trigger_cb(uint16_t obj_inst_id)
 {
 	int i;
 
@@ -299,7 +299,7 @@ static int timer_trigger_cb(u16_t obj_inst_id)
 	return start_timer(&timer_data[i]);
 }
 
-static struct lwm2m_engine_obj_inst *timer_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *timer_create(uint16_t obj_inst_id)
 {
 	int index, avail = -1, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 306b714fde..a0df0a048e 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -89,14 +89,14 @@ struct observe_node {
 	sys_snode_t node;
 	struct lwm2m_ctx *ctx;
 	struct lwm2m_obj_path path;
-	u8_t  token[MAX_TOKEN_LEN];
-	s64_t event_timestamp;
-	s64_t last_timestamp;
-	u32_t min_period_sec;
-	u32_t max_period_sec;
-	u32_t counter;
-	u16_t format;
-	u8_t  tkl;
+	uint8_t  token[MAX_TOKEN_LEN];
+	int64_t event_timestamp;
+	int64_t last_timestamp;
+	uint32_t min_period_sec;
+	uint32_t max_period_sec;
+	uint32_t counter;
+	uint16_t format;
+	uint8_t  tkl;
 };
 
 struct notification_attrs {
@@ -104,9 +104,9 @@ struct notification_attrs {
 	float32_value_t gt;
 	float32_value_t lt;
 	float32_value_t st;
-	s32_t pmin;
-	s32_t pmax;
-	u8_t flags;
+	int32_t pmin;
+	int32_t pmax;
+	uint8_t flags;
 };
 
 static struct observe_node observe_node_data[CONFIG_LWM2M_ENGINE_MAX_OBSERVER];
@@ -116,8 +116,8 @@ static struct observe_node observe_node_data[CONFIG_LWM2M_ENGINE_MAX_OBSERVER];
 struct service_node {
 	sys_snode_t node;
 	k_work_handler_t service_work;
-	u32_t min_call_period; /* ms */
-	u64_t last_timestamp; /* ms */
+	uint32_t min_call_period; /* ms */
+	uint64_t last_timestamp; /* ms */
 };
 
 static struct service_node service_node_data[MAX_PERIODIC_SERVICE];
@@ -148,9 +148,9 @@ static int sock_nfds;
 
 struct block_context {
 	struct coap_block_context ctx;
-	s64_t timestamp;
-	u8_t token[8];
-	u8_t tkl;
+	int64_t timestamp;
+	uint8_t token[8];
+	uint8_t tkl;
 };
 
 static struct block_context block1_contexts[NUM_BLOCK1_CONTEXT];
@@ -158,7 +158,7 @@ static struct block_context block1_contexts[NUM_BLOCK1_CONTEXT];
 /* write-attribute related definitons */
 static const char * const LWM2M_ATTR_STR[] = { "pmin", "pmax",
 					       "gt", "lt", "st" };
-static const u8_t LWM2M_ATTR_LEN[] = { 4, 4, 2, 2, 2 };
+static const uint8_t LWM2M_ATTR_LEN[] = { 4, 4, 2, 2, 2 };
 
 static struct lwm2m_attr write_attr_pool[CONFIG_LWM2M_NUM_ATTR];
 
@@ -189,7 +189,7 @@ char *lwm2m_sprint_ip_addr(const struct sockaddr *addr)
 	return buf;
 }
 
-static u8_t to_hex_digit(u8_t digit)
+static uint8_t to_hex_digit(uint8_t digit)
 {
 	if (digit >= 10U) {
 		return digit - 10U + 'a';
@@ -198,7 +198,7 @@ static u8_t to_hex_digit(u8_t digit)
 	return digit + '0';
 }
 
-static char *sprint_token(const u8_t *token, u8_t tkl)
+static char *sprint_token(const uint8_t *token, uint8_t tkl)
 {
 	static char buf[32];
 	char *ptr = buf;
@@ -248,10 +248,10 @@ enum coap_block_size lwm2m_default_block_size(void)
 }
 
 static int
-init_block_ctx(const u8_t *token, u8_t tkl, struct block_context **ctx)
+init_block_ctx(const uint8_t *token, uint8_t tkl, struct block_context **ctx)
 {
 	int i;
-	s64_t timestamp;
+	int64_t timestamp;
 
 	*ctx = NULL;
 	timestamp = k_uptime_get();
@@ -285,7 +285,7 @@ init_block_ctx(const u8_t *token, u8_t tkl, struct block_context **ctx)
 }
 
 static int
-get_block_ctx(const u8_t *token, u8_t tkl, struct block_context **ctx)
+get_block_ctx(const uint8_t *token, uint8_t tkl, struct block_context **ctx)
 {
 	int i;
 
@@ -370,7 +370,7 @@ static void clear_attrs(void *ref)
 	}
 }
 
-int lwm2m_notify_observer(u16_t obj_id, u16_t obj_inst_id, u16_t res_id)
+int lwm2m_notify_observer(uint16_t obj_id, uint16_t obj_inst_id, uint16_t res_id)
 {
 	struct observe_node *obs;
 	int ret = 0;
@@ -401,8 +401,8 @@ int lwm2m_notify_observer_path(struct lwm2m_obj_path *path)
 }
 
 static int engine_add_observer(struct lwm2m_message *msg,
-			       const u8_t *token, u8_t tkl,
-			       u16_t format)
+			       const uint8_t *token, uint8_t tkl,
+			       uint16_t format)
 {
 	struct lwm2m_engine_obj *obj = NULL;
 	struct lwm2m_engine_obj_field *obj_field = NULL;
@@ -549,7 +549,7 @@ static int engine_add_observer(struct lwm2m_message *msg,
 	return 0;
 }
 
-static int engine_remove_observer(const u8_t *token, u8_t tkl)
+static int engine_remove_observer(const uint8_t *token, uint8_t tkl)
 {
 	struct observe_node *obs, *found_obj = NULL;
 	sys_snode_t *prev_node = NULL;
@@ -582,7 +582,7 @@ static int engine_remove_observer(const u8_t *token, u8_t tkl)
 	return 0;
 }
 
-static void engine_remove_observer_by_id(u16_t obj_id, s32_t obj_inst_id)
+static void engine_remove_observer_by_id(uint16_t obj_id, int32_t obj_inst_id)
 {
 	struct observe_node *obs, *tmp;
 	sys_snode_t *prev_node = NULL;
@@ -690,7 +690,7 @@ next_engine_obj_inst(int obj_id, int obj_inst_id)
 	return next;
 }
 
-int lwm2m_create_obj_inst(u16_t obj_id, u16_t obj_inst_id,
+int lwm2m_create_obj_inst(uint16_t obj_id, uint16_t obj_inst_id,
 			  struct lwm2m_engine_obj_inst **obj_inst)
 {
 	struct lwm2m_engine_obj *obj;
@@ -742,7 +742,7 @@ int lwm2m_create_obj_inst(u16_t obj_id, u16_t obj_inst_id,
 	return 0;
 }
 
-int lwm2m_delete_obj_inst(u16_t obj_id, u16_t obj_inst_id)
+int lwm2m_delete_obj_inst(uint16_t obj_id, uint16_t obj_inst_id)
 {
 	int i, ret = 0;
 	struct lwm2m_engine_obj *obj;
@@ -788,10 +788,10 @@ int lwm2m_delete_obj_inst(u16_t obj_id, u16_t obj_inst_id)
 
 /* utility functions */
 
-static int get_option_int(const struct coap_packet *cpkt, u8_t opt)
+static int get_option_int(const struct coap_packet *cpkt, uint8_t opt)
 {
 	struct coap_option option = {};
-	u16_t count = 1U;
+	uint16_t count = 1U;
 	int r;
 
 	r = coap_find_options(cpkt, opt, &option, count);
@@ -802,10 +802,10 @@ static int get_option_int(const struct coap_packet *cpkt, u8_t opt)
 	return coap_option_value_to_int(&option);
 }
 
-static u16_t atou16(u8_t *buf, u16_t buflen, u16_t *len)
+static uint16_t atou16(uint8_t *buf, uint16_t buflen, uint16_t *len)
 {
-	u16_t val = 0U;
-	u16_t pos = 0U;
+	uint16_t val = 0U;
+	uint16_t pos = 0U;
 
 	/* we should get a value first - consume all numbers */
 	while (pos < buflen && isdigit(buf[pos])) {
@@ -821,7 +821,7 @@ static int atof32(const char *input, float32_value_t *out)
 {
 	char *pos, *end, buf[24];
 	long int val;
-	s32_t base = 1000000, sign = 1;
+	int32_t base = 1000000, sign = 1;
 
 	if (!input || !out) {
 		return -EINVAL;
@@ -845,7 +845,7 @@ static int atof32(const char *input, float32_value_t *out)
 		return -EINVAL;
 	}
 
-	out->val1 = (s32_t) val;
+	out->val1 = (int32_t) val;
 	out->val2 = 0;
 
 	if (!pos) {
@@ -864,7 +864,7 @@ static int atof32(const char *input, float32_value_t *out)
 static int coap_options_to_path(struct coap_option *opt, int options_count,
 				struct lwm2m_obj_path *path)
 {
-	u16_t len, *id[4] = { &path->obj_id, &path->obj_inst_id,
+	uint16_t len, *id[4] = { &path->obj_id, &path->obj_inst_id,
 			      &path->res_id, &path->res_inst_id };
 
 	path->level = options_count;
@@ -941,8 +941,8 @@ void lwm2m_reset_message(struct lwm2m_message *msg, bool release)
 
 int lwm2m_init_message(struct lwm2m_message *msg)
 {
-	u8_t tokenlen = 0U;
-	u8_t *token = NULL;
+	uint8_t tokenlen = 0U;
+	uint8_t *token = NULL;
 	int r = 0;
 
 	if (!msg || !msg->ctx) {
@@ -1037,7 +1037,7 @@ int lwm2m_send_message(struct lwm2m_message *msg)
 	}
 
 	if (msg->type == COAP_TYPE_CON) {
-		s32_t remaining = k_delayed_work_remaining_get(
+		int32_t remaining = k_delayed_work_remaining_get(
 					&msg->ctx->retransmit_work);
 
 		/* If the item is already pending and its timeout is smaller
@@ -1059,12 +1059,12 @@ int lwm2m_send_message(struct lwm2m_message *msg)
 	return 0;
 }
 
-u16_t lwm2m_get_rd_data(u8_t *client_data, u16_t size)
+uint16_t lwm2m_get_rd_data(uint8_t *client_data, uint16_t size)
 {
 	struct lwm2m_engine_obj *obj;
 	struct lwm2m_engine_obj_inst *obj_inst;
-	u8_t temp[32];
-	u16_t pos = 0U;
+	uint8_t temp[32];
+	uint16_t pos = 0U;
 	int len;
 
 	/* Add resource-type/content-type to the registration message */
@@ -1120,7 +1120,7 @@ u16_t lwm2m_get_rd_data(u8_t *client_data, u16_t size)
 
 /* input / output selection */
 
-static int select_writer(struct lwm2m_output_context *out, u16_t accept)
+static int select_writer(struct lwm2m_output_context *out, uint16_t accept)
 {
 	switch (accept) {
 
@@ -1154,7 +1154,7 @@ static int select_writer(struct lwm2m_output_context *out, u16_t accept)
 	return 0;
 }
 
-static int select_reader(struct lwm2m_input_context *in, u16_t format)
+static int select_reader(struct lwm2m_input_context *in, uint16_t format)
 {
 	switch (format) {
 
@@ -1189,7 +1189,7 @@ static int select_reader(struct lwm2m_input_context *in, u16_t format)
 static int string_to_path(char *pathstr, struct lwm2m_obj_path *path,
 			  char delim)
 {
-	u16_t value, len;
+	uint16_t value, len;
 	int i, tokstart = -1, toklen;
 	int end_index = strlen(pathstr) - 1;
 
@@ -1347,8 +1347,8 @@ int lwm2m_engine_create_obj_inst(char *pathstr)
 	return lwm2m_create_obj_inst(path.obj_id, path.obj_inst_id, &obj_inst);
 }
 
-int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, u16_t data_len,
-			      u8_t data_flags)
+int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, uint16_t data_len,
+			      uint8_t data_flags)
 {
 	struct lwm2m_obj_path path;
 	struct lwm2m_engine_res_inst *res_inst = NULL;
@@ -1384,7 +1384,7 @@ int lwm2m_engine_set_res_data(char *pathstr, void *data_ptr, u16_t data_len,
 	return ret;
 }
 
-static int lwm2m_engine_set(char *pathstr, void *value, u16_t len)
+static int lwm2m_engine_set(char *pathstr, void *value, uint16_t len)
 {
 	struct lwm2m_obj_path path;
 	struct lwm2m_engine_obj_inst *obj_inst;
@@ -1460,45 +1460,45 @@ static int lwm2m_engine_set(char *pathstr, void *value, u16_t len)
 	switch (obj_field->data_type) {
 
 	case LWM2M_RES_TYPE_OPAQUE:
-		memcpy((u8_t *)data_ptr, value, len);
+		memcpy((uint8_t *)data_ptr, value, len);
 		break;
 
 	case LWM2M_RES_TYPE_STRING:
-		memcpy((u8_t *)data_ptr, value, len);
-		((u8_t *)data_ptr)[len] = '\0';
+		memcpy((uint8_t *)data_ptr, value, len);
+		((uint8_t *)data_ptr)[len] = '\0';
 		break;
 
 	case LWM2M_RES_TYPE_U64:
-		*((u64_t *)data_ptr) = *(u64_t *)value;
+		*((uint64_t *)data_ptr) = *(uint64_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_U32:
 	case LWM2M_RES_TYPE_TIME:
-		*((u32_t *)data_ptr) = *(u32_t *)value;
+		*((uint32_t *)data_ptr) = *(uint32_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_U16:
-		*((u16_t *)data_ptr) = *(u16_t *)value;
+		*((uint16_t *)data_ptr) = *(uint16_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_U8:
-		*((u8_t *)data_ptr) = *(u8_t *)value;
+		*((uint8_t *)data_ptr) = *(uint8_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_S64:
-		*((s64_t *)data_ptr) = *(s64_t *)value;
+		*((int64_t *)data_ptr) = *(int64_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_S32:
-		*((s32_t *)data_ptr) = *(s32_t *)value;
+		*((int32_t *)data_ptr) = *(int32_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_S16:
-		*((s16_t *)data_ptr) = *(s16_t *)value;
+		*((int16_t *)data_ptr) = *(int16_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_S8:
-		*((s8_t *)data_ptr) = *(s8_t *)value;
+		*((int8_t *)data_ptr) = *(int8_t *)value;
 		break;
 
 	case LWM2M_RES_TYPE_BOOL:
@@ -1538,7 +1538,7 @@ static int lwm2m_engine_set(char *pathstr, void *value, u16_t len)
 	return ret;
 }
 
-int lwm2m_engine_set_opaque(char *pathstr, char *data_ptr, u16_t data_len)
+int lwm2m_engine_set_opaque(char *pathstr, char *data_ptr, uint16_t data_len)
 {
 	return lwm2m_engine_set(pathstr, data_ptr, data_len);
 }
@@ -1548,49 +1548,49 @@ int lwm2m_engine_set_string(char *pathstr, char *data_ptr)
 	return lwm2m_engine_set(pathstr, data_ptr, strlen(data_ptr));
 }
 
-int lwm2m_engine_set_u8(char *pathstr, u8_t value)
+int lwm2m_engine_set_u8(char *pathstr, uint8_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 1);
 }
 
-int lwm2m_engine_set_u16(char *pathstr, u16_t value)
+int lwm2m_engine_set_u16(char *pathstr, uint16_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 2);
 }
 
-int lwm2m_engine_set_u32(char *pathstr, u32_t value)
+int lwm2m_engine_set_u32(char *pathstr, uint32_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 4);
 }
 
-int lwm2m_engine_set_u64(char *pathstr, u64_t value)
+int lwm2m_engine_set_u64(char *pathstr, uint64_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 8);
 }
 
-int lwm2m_engine_set_s8(char *pathstr, s8_t value)
+int lwm2m_engine_set_s8(char *pathstr, int8_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 1);
 }
 
-int lwm2m_engine_set_s16(char *pathstr, s16_t value)
+int lwm2m_engine_set_s16(char *pathstr, int16_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 2);
 }
 
-int lwm2m_engine_set_s32(char *pathstr, s32_t value)
+int lwm2m_engine_set_s32(char *pathstr, int32_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 4);
 }
 
-int lwm2m_engine_set_s64(char *pathstr, s64_t value)
+int lwm2m_engine_set_s64(char *pathstr, int64_t value)
 {
 	return lwm2m_engine_set(pathstr, &value, 8);
 }
 
 int lwm2m_engine_set_bool(char *pathstr, bool value)
 {
-	u8_t temp = (value != 0 ? 1 : 0);
+	uint8_t temp = (value != 0 ? 1 : 0);
 
 	return lwm2m_engine_set(pathstr, &temp, 1);
 }
@@ -1607,8 +1607,8 @@ int lwm2m_engine_set_float64(char *pathstr, float64_value_t *value)
 
 /* user data getter functions */
 
-int lwm2m_engine_get_res_data(char *pathstr, void **data_ptr, u16_t *data_len,
-			      u8_t *data_flags)
+int lwm2m_engine_get_res_data(char *pathstr, void **data_ptr, uint16_t *data_len,
+			      uint8_t *data_flags)
 {
 	struct lwm2m_obj_path path;
 	struct lwm2m_engine_res_inst *res_inst = NULL;
@@ -1643,7 +1643,7 @@ int lwm2m_engine_get_res_data(char *pathstr, void **data_ptr, u16_t *data_len,
 	return 0;
 }
 
-static int lwm2m_engine_get(char *pathstr, void *buf, u16_t buflen)
+static int lwm2m_engine_get(char *pathstr, void *buf, uint16_t buflen)
 {
 	int ret = 0;
 	struct lwm2m_obj_path path;
@@ -1703,40 +1703,40 @@ static int lwm2m_engine_get(char *pathstr, void *buf, u16_t buflen)
 			break;
 
 		case LWM2M_RES_TYPE_STRING:
-			strncpy((u8_t *)buf, (u8_t *)data_ptr, buflen);
+			strncpy((uint8_t *)buf, (uint8_t *)data_ptr, buflen);
 			break;
 
 		case LWM2M_RES_TYPE_U64:
-			*(u64_t *)buf = *(u64_t *)data_ptr;
+			*(uint64_t *)buf = *(uint64_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_U32:
 		case LWM2M_RES_TYPE_TIME:
-			*(u32_t *)buf = *(u32_t *)data_ptr;
+			*(uint32_t *)buf = *(uint32_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_U16:
-			*(u16_t *)buf = *(u16_t *)data_ptr;
+			*(uint16_t *)buf = *(uint16_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_U8:
-			*(u8_t *)buf = *(u8_t *)data_ptr;
+			*(uint8_t *)buf = *(uint8_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_S64:
-			*(s64_t *)buf = *(s64_t *)data_ptr;
+			*(int64_t *)buf = *(int64_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_S32:
-			*(s32_t *)buf = *(s32_t *)data_ptr;
+			*(int32_t *)buf = *(int32_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_S16:
-			*(s16_t *)buf = *(s16_t *)data_ptr;
+			*(int16_t *)buf = *(int16_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_S8:
-			*(s8_t *)buf = *(s8_t *)data_ptr;
+			*(int8_t *)buf = *(int8_t *)data_ptr;
 			break;
 
 		case LWM2M_RES_TYPE_BOOL:
@@ -1768,52 +1768,52 @@ static int lwm2m_engine_get(char *pathstr, void *buf, u16_t buflen)
 	return 0;
 }
 
-int lwm2m_engine_get_opaque(char *pathstr, void *buf, u16_t buflen)
+int lwm2m_engine_get_opaque(char *pathstr, void *buf, uint16_t buflen)
 {
 	return lwm2m_engine_get(pathstr, buf, buflen);
 }
 
-int lwm2m_engine_get_string(char *pathstr, void *buf, u16_t buflen)
+int lwm2m_engine_get_string(char *pathstr, void *buf, uint16_t buflen)
 {
 	return lwm2m_engine_get(pathstr, buf, buflen);
 }
 
-int lwm2m_engine_get_u8(char *pathstr, u8_t *value)
+int lwm2m_engine_get_u8(char *pathstr, uint8_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 1);
 }
 
-int lwm2m_engine_get_u16(char *pathstr, u16_t *value)
+int lwm2m_engine_get_u16(char *pathstr, uint16_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 2);
 }
 
-int lwm2m_engine_get_u32(char *pathstr, u32_t *value)
+int lwm2m_engine_get_u32(char *pathstr, uint32_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 4);
 }
 
-int lwm2m_engine_get_u64(char *pathstr, u64_t *value)
+int lwm2m_engine_get_u64(char *pathstr, uint64_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 8);
 }
 
-int lwm2m_engine_get_s8(char *pathstr, s8_t *value)
+int lwm2m_engine_get_s8(char *pathstr, int8_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 1);
 }
 
-int lwm2m_engine_get_s16(char *pathstr, s16_t *value)
+int lwm2m_engine_get_s16(char *pathstr, int16_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 2);
 }
 
-int lwm2m_engine_get_s32(char *pathstr, s32_t *value)
+int lwm2m_engine_get_s32(char *pathstr, int32_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 4);
 }
 
-int lwm2m_engine_get_s64(char *pathstr, s64_t *value)
+int lwm2m_engine_get_s64(char *pathstr, int64_t *value)
 {
 	return lwm2m_engine_get(pathstr, value, 8);
 }
@@ -1821,7 +1821,7 @@ int lwm2m_engine_get_s64(char *pathstr, s64_t *value)
 int lwm2m_engine_get_bool(char *pathstr, bool *value)
 {
 	int ret = 0;
-	s8_t temp = 0;
+	int8_t temp = 0;
 
 	ret = lwm2m_engine_get_s8(pathstr, &temp);
 	if (!ret) {
@@ -2015,7 +2015,7 @@ int lwm2m_engine_register_exec_callback(char *pathstr,
 	return 0;
 }
 
-int lwm2m_engine_register_create_callback(u16_t obj_id,
+int lwm2m_engine_register_create_callback(uint16_t obj_id,
 					  lwm2m_engine_user_cb_t cb)
 {
 	struct lwm2m_engine_obj *obj = NULL;
@@ -2030,7 +2030,7 @@ int lwm2m_engine_register_create_callback(u16_t obj_id,
 	return 0;
 }
 
-int lwm2m_engine_register_delete_callback(u16_t obj_id,
+int lwm2m_engine_register_delete_callback(uint16_t obj_id,
 					  lwm2m_engine_user_cb_t cb)
 {
 	struct lwm2m_engine_obj *obj = NULL;
@@ -2053,7 +2053,7 @@ static int lwm2m_read_handler(struct lwm2m_engine_obj_inst *obj_inst,
 			      struct lwm2m_message *msg)
 {
 	int i, loop_max = 1, found_values = 0;
-	u16_t res_inst_id_tmp = 0U;
+	uint16_t res_inst_id_tmp = 0U;
 	void *data_ptr = NULL;
 	size_t data_len = 0;
 
@@ -2111,55 +2111,55 @@ static int lwm2m_read_handler(struct lwm2m_engine_obj_inst *obj_inst,
 
 		case LWM2M_RES_TYPE_OPAQUE:
 			engine_put_opaque(&msg->out, &msg->path,
-					  (u8_t *)data_ptr,
+					  (uint8_t *)data_ptr,
 					  data_len);
 			break;
 
 		case LWM2M_RES_TYPE_STRING:
 			engine_put_string(&msg->out, &msg->path,
-					  (u8_t *)data_ptr,
-					  strlen((u8_t *)data_ptr));
+					  (uint8_t *)data_ptr,
+					  strlen((uint8_t *)data_ptr));
 			break;
 
 		case LWM2M_RES_TYPE_U64:
 			engine_put_s64(&msg->out, &msg->path,
-				       (s64_t)*(u64_t *)data_ptr);
+				       (int64_t)*(uint64_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_U32:
 		case LWM2M_RES_TYPE_TIME:
 			engine_put_s32(&msg->out, &msg->path,
-				       (s32_t)*(u32_t *)data_ptr);
+				       (int32_t)*(uint32_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_U16:
 			engine_put_s16(&msg->out, &msg->path,
-				       (s16_t)*(u16_t *)data_ptr);
+				       (int16_t)*(uint16_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_U8:
 			engine_put_s8(&msg->out, &msg->path,
-				      (s8_t)*(u8_t *)data_ptr);
+				      (int8_t)*(uint8_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_S64:
 			engine_put_s64(&msg->out, &msg->path,
-				       *(s64_t *)data_ptr);
+				       *(int64_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_S32:
 			engine_put_s32(&msg->out, &msg->path,
-				       *(s32_t *)data_ptr);
+				       *(int32_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_S16:
 			engine_put_s16(&msg->out, &msg->path,
-				       *(s16_t *)data_ptr);
+				       *(int16_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_S8:
 			engine_put_s8(&msg->out, &msg->path,
-				      *(s8_t *)data_ptr);
+				      *(int8_t *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_BOOL:
@@ -2194,9 +2194,9 @@ static int lwm2m_read_handler(struct lwm2m_engine_obj_inst *obj_inst,
 }
 
 size_t lwm2m_engine_get_opaque_more(struct lwm2m_input_context *in,
-				    u8_t *buf, size_t buflen, bool *last_block)
+				    uint8_t *buf, size_t buflen, bool *last_block)
 {
-	u16_t in_len = in->opaque_len;
+	uint16_t in_len = in->opaque_len;
 
 	if (in_len > buflen) {
 		in_len = buflen;
@@ -2229,7 +2229,7 @@ static int lwm2m_write_handler_opaque(struct lwm2m_engine_obj_inst *obj_inst,
 
 	while (!last_pkt_block && len > 0) {
 		if (first_read) {
-			len = engine_get_opaque(in, (u8_t *)data_ptr,
+			len = engine_get_opaque(in, (uint8_t *)data_ptr,
 						data_len, &last_pkt_block);
 			if (len == 0) {
 				/* ignore empty content and continue */
@@ -2238,7 +2238,7 @@ static int lwm2m_write_handler_opaque(struct lwm2m_engine_obj_inst *obj_inst,
 
 			first_read = false;
 		} else {
-			len = lwm2m_engine_get_opaque_more(in, (u8_t *)data_ptr,
+			len = lwm2m_engine_get_opaque_more(in, (uint8_t *)data_ptr,
 							   data_len,
 							   &last_pkt_block);
 		}
@@ -2275,11 +2275,11 @@ int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
 	size_t data_len = 0;
 	size_t len = 0;
 	size_t total_size = 0;
-	s64_t temp64 = 0;
-	s32_t temp32 = 0;
+	int64_t temp64 = 0;
+	int32_t temp32 = 0;
 	int ret = 0;
-	u8_t token[8];
-	u8_t tkl = 0U;
+	uint8_t token[8];
+	uint8_t tkl = 0U;
 	bool last_block = true;
 
 	if (!obj_inst || !res || !res_inst || !obj_field || !msg) {
@@ -2336,54 +2336,54 @@ int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
 			break;
 
 		case LWM2M_RES_TYPE_STRING:
-			engine_get_string(&msg->in, (u8_t *)data_ptr, data_len);
+			engine_get_string(&msg->in, (uint8_t *)data_ptr, data_len);
 			len = strlen((char *)data_ptr);
 			break;
 
 		case LWM2M_RES_TYPE_U64:
 			engine_get_s64(&msg->in, &temp64);
-			*(u64_t *)data_ptr = temp64;
+			*(uint64_t *)data_ptr = temp64;
 			len = 8;
 			break;
 
 		case LWM2M_RES_TYPE_U32:
 		case LWM2M_RES_TYPE_TIME:
 			engine_get_s32(&msg->in, &temp32);
-			*(u32_t *)data_ptr = temp32;
+			*(uint32_t *)data_ptr = temp32;
 			len = 4;
 			break;
 
 		case LWM2M_RES_TYPE_U16:
 			engine_get_s32(&msg->in, &temp32);
-			*(u16_t *)data_ptr = temp32;
+			*(uint16_t *)data_ptr = temp32;
 			len = 2;
 			break;
 
 		case LWM2M_RES_TYPE_U8:
 			engine_get_s32(&msg->in, &temp32);
-			*(u8_t *)data_ptr = temp32;
+			*(uint8_t *)data_ptr = temp32;
 			len = 1;
 			break;
 
 		case LWM2M_RES_TYPE_S64:
-			engine_get_s64(&msg->in, (s64_t *)data_ptr);
+			engine_get_s64(&msg->in, (int64_t *)data_ptr);
 			len = 8;
 			break;
 
 		case LWM2M_RES_TYPE_S32:
-			engine_get_s32(&msg->in, (s32_t *)data_ptr);
+			engine_get_s32(&msg->in, (int32_t *)data_ptr);
 			len = 4;
 			break;
 
 		case LWM2M_RES_TYPE_S16:
 			engine_get_s32(&msg->in, &temp32);
-			*(s16_t *)data_ptr = temp32;
+			*(int16_t *)data_ptr = temp32;
 			len = 2;
 			break;
 
 		case LWM2M_RES_TYPE_S8:
 			engine_get_s32(&msg->in, &temp32);
-			*(s8_t *)data_ptr = temp32;
+			*(int8_t *)data_ptr = temp32;
 			len = 1;
 			break;
 
@@ -2439,7 +2439,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 	struct lwm2m_attr *attr;
 	struct notification_attrs nattrs = { 0 };
 	struct observe_node *obs;
-	u8_t type = 0U;
+	uint8_t type = 0U;
 	void *nattr_ptrs[NR_LWM2M_ATTR] = {
 		&nattrs.pmin, &nattrs.pmax, &nattrs.gt, &nattrs.lt, &nattrs.st
 	};
@@ -2526,7 +2526,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 			nattrs.flags &= ~BIT(type);
 
 			(void)memset(nattr_ptrs[type], 0,
-				     type <= LWM2M_ATTR_PMAX ? sizeof(s32_t) :
+				     type <= LWM2M_ATTR_PMAX ? sizeof(int32_t) :
 				     sizeof(float32_value_t));
 			continue;
 		}
@@ -2568,7 +2568,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 		}
 
 		if (type <= LWM2M_ATTR_PMAX) {
-			*(s32_t *)nattr_ptrs[type] = val.val1;
+			*(int32_t *)nattr_ptrs[type] = val.val1;
 		} else {
 			memcpy(nattr_ptrs[type], &val, sizeof(float32_value_t));
 		}
@@ -2590,9 +2590,9 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 		}
 
 		if (nattrs.flags & BIT(LWM2M_ATTR_STEP)) {
-			s32_t st1 = nattrs.st.val1 * 2 +
+			int32_t st1 = nattrs.st.val1 * 2 +
 				    nattrs.st.val2 * 2 / 1000000;
-			s32_t st2 = nattrs.st.val2 * 2 % 1000000;
+			int32_t st2 = nattrs.st.val2 * 2 % 1000000;
 			if (!(((nattrs.lt.val1 + st1) < nattrs.gt.val1) ||
 			      ((nattrs.lt.val2 + st2) < nattrs.gt.val2))) {
 				LOG_DBG("lt + 2*st > gt");
@@ -2625,11 +2625,11 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 		nattrs.flags &= ~BIT(type);
 
 		if (type <= LWM2M_ATTR_PMAX) {
-			if (attr->int_val == *(s32_t *)nattr_ptrs[type]) {
+			if (attr->int_val == *(int32_t *)nattr_ptrs[type]) {
 				continue;
 			}
 
-			attr->int_val = *(s32_t *)nattr_ptrs[type];
+			attr->int_val = *(int32_t *)nattr_ptrs[type];
 			update_observe_node = true;
 		} else {
 			if (!memcmp(&attr->float_val, nattr_ptrs[type],
@@ -2668,7 +2668,7 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 		attr->ref = ref;
 
 		if (type <= LWM2M_ATTR_PMAX) {
-			attr->int_val = *(s32_t *)nattr_ptrs[type];
+			attr->int_val = *(int32_t *)nattr_ptrs[type];
 			update_observe_node = true;
 		} else {
 			memcpy(&attr->float_val, nattr_ptrs[type],
@@ -2754,8 +2754,8 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
 			obs->path.res_id, obs->path.level,
 			obs->min_period_sec, obs->max_period_sec,
 			nattrs.pmin, MAX(nattrs.pmin, nattrs.pmax));
-		obs->min_period_sec = (u32_t)nattrs.pmin;
-		obs->max_period_sec = (u32_t)MAX(nattrs.pmin, nattrs.pmax);
+		obs->min_period_sec = (uint32_t)nattrs.pmin;
+		obs->max_period_sec = (uint32_t)MAX(nattrs.pmin, nattrs.pmax);
 		(void)memset(&nattrs, 0, sizeof(nattrs));
 	}
 
@@ -2803,7 +2803,7 @@ static int lwm2m_delete_handler(struct lwm2m_message *msg)
 	return ret;
 }
 
-static int do_read_op(struct lwm2m_message *msg, u16_t content_format)
+static int do_read_op(struct lwm2m_message *msg, uint16_t content_format)
 {
 	switch (content_format) {
 
@@ -2829,14 +2829,14 @@ static int do_read_op(struct lwm2m_message *msg, u16_t content_format)
 	}
 }
 
-int lwm2m_perform_read_op(struct lwm2m_message *msg, u16_t content_format)
+int lwm2m_perform_read_op(struct lwm2m_message *msg, uint16_t content_format)
 {
 	struct lwm2m_engine_obj_inst *obj_inst = NULL;
 	struct lwm2m_engine_res *res = NULL;
 	struct lwm2m_engine_obj_field *obj_field;
 	struct lwm2m_obj_path temp_path;
 	int ret = 0, index;
-	u8_t num_read = 0U;
+	uint8_t num_read = 0U;
 
 	if (msg->path.level >= 2U) {
 		obj_inst = get_engine_obj_inst(msg->path.obj_id,
@@ -2963,12 +2963,12 @@ move_forward:
 }
 
 static int print_attr(struct lwm2m_output_context *out,
-		      u8_t *buf, u16_t buflen, void *ref)
+		      uint8_t *buf, uint16_t buflen, void *ref)
 {
 	struct lwm2m_attr *attr;
 	int i, used, base, ret;
-	u8_t digit;
-	s32_t fraction;
+	uint8_t digit;
+	int32_t fraction;
 
 	for (i = 0; i < CONFIG_LWM2M_NUM_ATTR; i++) {
 		if (ref != write_attr_pool[i].ref) {
@@ -3172,7 +3172,7 @@ static int do_discover_op(struct lwm2m_message *msg, bool well_known)
 
 int lwm2m_get_or_create_engine_obj(struct lwm2m_message *msg,
 				   struct lwm2m_engine_obj_inst **obj_inst,
-				   u8_t *created)
+				   uint8_t *created)
 {
 	int ret = 0;
 
@@ -3206,7 +3206,7 @@ int lwm2m_get_or_create_engine_obj(struct lwm2m_message *msg,
 }
 
 static int do_write_op(struct lwm2m_message *msg,
-		       u16_t format)
+		       uint16_t format)
 {
 	switch (format) {
 
@@ -3259,17 +3259,17 @@ static int handle_request(struct coap_packet *request,
 			  struct lwm2m_message *msg)
 {
 	int r;
-	u8_t code;
+	uint8_t code;
 	struct coap_option options[4];
 	struct lwm2m_engine_obj *obj = NULL;
-	u8_t token[8];
-	u8_t tkl = 0U;
-	u16_t format = LWM2M_FORMAT_NONE, accept;
+	uint8_t token[8];
+	uint8_t tkl = 0U;
+	uint16_t format = LWM2M_FORMAT_NONE, accept;
 	int observe = -1; /* default to -1, 0 = ENABLE, 1 = DISABLE */
 	bool well_known = false;
 	struct block_context *block_ctx = NULL;
 	enum coap_block_size block_size;
-	u16_t payload_len = 0U;
+	uint16_t payload_len = 0U;
 	bool last_block = false;
 
 	/* set CoAP request / message */
@@ -3603,7 +3603,7 @@ error:
 }
 
 static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
-			      u8_t *buf, u16_t buf_len,
+			      uint8_t *buf, uint16_t buf_len,
 			      struct sockaddr *from_addr,
 			      udp_request_handler_cb_t udp_request_handler)
 {
@@ -3612,8 +3612,8 @@ static void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx,
 	struct coap_reply *reply;
 	struct coap_packet response;
 	int r;
-	u8_t token[8];
-	u8_t tkl;
+	uint8_t token[8];
+	uint8_t tkl;
 
 	r = coap_packet_parse(&response, buf, buf_len, NULL, 0);
 	if (r < 0) {
@@ -3720,7 +3720,7 @@ static void retransmit_request(struct k_work *work)
 	struct lwm2m_ctx *client_ctx;
 	struct lwm2m_message *msg;
 	struct coap_pending *pending;
-	s32_t remaining;
+	int32_t remaining;
 
 	client_ctx = CONTAINER_OF(work, struct lwm2m_ctx, retransmit_work);
 	pending = coap_pending_next_to_expire(client_ctx->pendings,
@@ -3785,7 +3785,7 @@ static int notify_message_reply_cb(const struct coap_packet *response,
 				   const struct sockaddr *from)
 {
 	int ret = 0;
-	u8_t type, code;
+	uint8_t type, code;
 
 	type = coap_header_get_type(response);
 	code = coap_header_get_code(response);
@@ -3899,11 +3899,11 @@ cleanup:
 	return ret;
 }
 
-s32_t engine_next_service_timeout_ms(u32_t max_timeout)
+int32_t engine_next_service_timeout_ms(uint32_t max_timeout)
 {
 	struct service_node *srv;
-	u64_t time_left_ms, timestamp = k_uptime_get();
-	u32_t timeout = max_timeout;
+	uint64_t time_left_ms, timestamp = k_uptime_get();
+	uint32_t timeout = max_timeout;
 
 	SYS_SLIST_FOR_EACH_CONTAINER(&engine_service_list, srv, node) {
 		time_left_ms = srv->last_timestamp + srv->min_call_period;
@@ -3923,7 +3923,7 @@ s32_t engine_next_service_timeout_ms(u32_t max_timeout)
 	return timeout;
 }
 
-int lwm2m_engine_add_service(k_work_handler_t service, u32_t period_ms)
+int lwm2m_engine_add_service(k_work_handler_t service, uint32_t period_ms)
 {
 	int i;
 
@@ -3952,7 +3952,7 @@ static int lwm2m_engine_service(void)
 {
 	struct observe_node *obs;
 	struct service_node *srv;
-	s64_t timestamp, service_due_timestamp;
+	int64_t timestamp, service_due_timestamp;
 
 	/*
 	 * 1. scan the observer list
@@ -4088,7 +4088,7 @@ void lwm2m_socket_del(struct lwm2m_ctx *ctx)
 
 static void socket_receive_loop(void)
 {
-	static u8_t in_buf[NET_IPV6_MTU];
+	static uint8_t in_buf[NET_IPV6_MTU];
 	static struct sockaddr from_addr;
 	socklen_t from_addr_len;
 	ssize_t len;
@@ -4158,13 +4158,13 @@ static void socket_receive_loop(void)
 }
 
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
-static int load_tls_credential(struct lwm2m_ctx *client_ctx, u16_t res_id,
+static int load_tls_credential(struct lwm2m_ctx *client_ctx, uint16_t res_id,
 			       enum tls_credential_type type)
 {
 	int ret = 0;
 	void *cred = NULL;
-	u16_t cred_len;
-	u8_t cred_flags;
+	uint16_t cred_len;
+	uint8_t cred_flags;
 	char pathstr[MAX_RESOURCE_LEN];
 
 	/* ignore error value */
@@ -4267,8 +4267,8 @@ int lwm2m_parse_peerinfo(char *url, struct sockaddr *addr, bool *use_dtls)
 	struct addrinfo *res, hints = { 0 };
 #endif
 	int ret;
-	u16_t off, len;
-	u8_t tmp;
+	uint16_t off, len;
+	uint8_t tmp;
 
 	LOG_DBG("Parse url: %s", log_strdup(url));
 
@@ -4370,8 +4370,8 @@ int lwm2m_engine_start(struct lwm2m_ctx *client_ctx)
 {
 	char pathstr[MAX_RESOURCE_LEN];
 	char *url;
-	u16_t url_len;
-	u8_t url_data_flags;
+	uint16_t url_len;
+	uint8_t url_data_flags;
 	int ret = 0U;
 
 	/* get the server URL */
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.h b/subsys/net/lib/lwm2m/lwm2m_engine.h
index f536ef6eb9..150f57ce5b 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.h
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.h
@@ -51,27 +51,27 @@ typedef int (*udp_request_handler_cb_t)(struct coap_packet *request,
 
 char *lwm2m_sprint_ip_addr(const struct sockaddr *addr);
 
-int lwm2m_notify_observer(u16_t obj_id, u16_t obj_inst_id, u16_t res_id);
+int lwm2m_notify_observer(uint16_t obj_id, uint16_t obj_inst_id, uint16_t res_id);
 int lwm2m_notify_observer_path(struct lwm2m_obj_path *path);
 
 void lwm2m_register_obj(struct lwm2m_engine_obj *obj);
 void lwm2m_unregister_obj(struct lwm2m_engine_obj *obj);
 struct lwm2m_engine_obj_field *
 lwm2m_get_engine_obj_field(struct lwm2m_engine_obj *obj, int res_id);
-int  lwm2m_create_obj_inst(u16_t obj_id, u16_t obj_inst_id,
+int  lwm2m_create_obj_inst(uint16_t obj_id, uint16_t obj_inst_id,
 			   struct lwm2m_engine_obj_inst **obj_inst);
-int  lwm2m_delete_obj_inst(u16_t obj_id, u16_t obj_inst_id);
+int  lwm2m_delete_obj_inst(uint16_t obj_id, uint16_t obj_inst_id);
 int  lwm2m_get_or_create_engine_obj(struct lwm2m_message *msg,
 				    struct lwm2m_engine_obj_inst **obj_inst,
-				    u8_t *created);
+				    uint8_t *created);
 
 /* LwM2M context functions */
 int lwm2m_engine_context_close(struct lwm2m_ctx *client_ctx);
 void lwm2m_engine_context_init(struct lwm2m_ctx *client_ctx);
 
 /* Message buffer functions */
-u8_t *lwm2m_get_message_buf(void);
-int lwm2m_put_message_buf(u8_t *buf);
+uint8_t *lwm2m_get_message_buf(void);
+int lwm2m_put_message_buf(uint8_t *buf);
 
 /* LwM2M message functions */
 struct lwm2m_message *lwm2m_get_message(struct lwm2m_ctx *client_ctx);
@@ -79,9 +79,9 @@ void lwm2m_reset_message(struct lwm2m_message *msg, bool release);
 int lwm2m_init_message(struct lwm2m_message *msg);
 int lwm2m_send_message(struct lwm2m_message *msg);
 
-u16_t lwm2m_get_rd_data(u8_t *client_data, u16_t size);
+uint16_t lwm2m_get_rd_data(uint8_t *client_data, uint16_t size);
 
-int lwm2m_perform_read_op(struct lwm2m_message *msg, u16_t content_format);
+int lwm2m_perform_read_op(struct lwm2m_message *msg, uint16_t content_format);
 
 int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
 			struct lwm2m_engine_res *res,
@@ -91,7 +91,7 @@ int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
 
 enum coap_block_size lwm2m_default_block_size(void);
 
-int lwm2m_engine_add_service(k_work_handler_t service, u32_t period_ms);
+int lwm2m_engine_add_service(k_work_handler_t service, uint32_t period_ms);
 
 int lwm2m_engine_get_resource(char *pathstr,
 			      struct lwm2m_engine_res **res);
@@ -99,19 +99,19 @@ int lwm2m_engine_get_resource(char *pathstr,
 void lwm2m_engine_get_binding(char *binding);
 
 size_t lwm2m_engine_get_opaque_more(struct lwm2m_input_context *in,
-				    u8_t *buf, size_t buflen, bool *last_block);
+				    uint8_t *buf, size_t buflen, bool *last_block);
 
-int lwm2m_security_inst_id_to_index(u16_t obj_inst_id);
+int lwm2m_security_inst_id_to_index(uint16_t obj_inst_id);
 int lwm2m_security_index_to_inst_id(int index);
 
-s32_t lwm2m_server_get_pmin(u16_t obj_inst_id);
-s32_t lwm2m_server_get_pmax(u16_t obj_inst_id);
+int32_t lwm2m_server_get_pmin(uint16_t obj_inst_id);
+int32_t lwm2m_server_get_pmax(uint16_t obj_inst_id);
 
 #if defined(CONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT)
-u8_t lwm2m_firmware_get_update_state(void);
-void lwm2m_firmware_set_update_state(u8_t state);
-void lwm2m_firmware_set_update_result(u8_t result);
-u8_t lwm2m_firmware_get_update_result(void);
+uint8_t lwm2m_firmware_get_update_state(void);
+void lwm2m_firmware_set_update_state(uint8_t state);
+void lwm2m_firmware_set_update_result(uint8_t result);
+uint8_t lwm2m_firmware_get_update_result(void);
 #endif
 
 /* Network Layer */
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
index 948f328d75..9e87b8c5c7 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
@@ -72,12 +72,12 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 					CONNMON_ROUTER_IP_ADDRESS_MAX)
 
 /* resource state variables */
-static s8_t net_bearer;
-static s8_t rss;
-static u8_t link_quality;
-static u32_t cellid;
-static u16_t mnc;
-static u16_t mcc;
+static int8_t net_bearer;
+static int8_t rss;
+static uint8_t link_quality;
+static uint32_t cellid;
+static uint16_t mnc;
+static uint16_t mcc;
 
 /* only 1 instance of Connection Monitoring object exists */
 static struct lwm2m_engine_obj connmon;
@@ -99,7 +99,7 @@ static struct lwm2m_engine_obj_inst inst;
 static struct lwm2m_engine_res res[CONNMON_MAX_ID];
 static struct lwm2m_engine_res_inst res_inst[RESOURCE_INSTANCE_COUNT];
 
-static struct lwm2m_engine_obj_inst *connmon_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *connmon_create(uint16_t obj_inst_id)
 {
 	int i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_device.c b/subsys/net/lib/lwm2m/lwm2m_obj_device.c
index b63f106bb5..73f9827f65 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_device.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_device.c
@@ -78,10 +78,10 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 				DEVICE_PWRSRC_MAX*3 + DEVICE_ERROR_CODE_MAX)
 
 /* resource state variables */
-static u8_t  error_code_list[DEVICE_ERROR_CODE_MAX];
-static s32_t time_temp;
-static u32_t time_offset;
-static u8_t  binding_mode[DEVICE_STRING_SHORT];
+static uint8_t  error_code_list[DEVICE_ERROR_CODE_MAX];
+static int32_t time_temp;
+static uint32_t time_offset;
+static uint8_t  binding_mode[DEVICE_STRING_SHORT];
 
 /* only 1 instance of device object exists */
 static struct lwm2m_engine_obj device;
@@ -120,7 +120,7 @@ static struct lwm2m_engine_res_inst *error_code_ri;
 
 /* callbacks */
 
-static int reset_error_list_cb(u16_t obj_inst_id)
+static int reset_error_list_cb(uint16_t obj_inst_id)
 {
 	int i;
 
@@ -133,8 +133,8 @@ static int reset_error_list_cb(u16_t obj_inst_id)
 	return 0;
 }
 
-static void *current_time_read_cb(u16_t obj_inst_id, u16_t res_id,
-				  u16_t res_inst_id, size_t *data_len)
+static void *current_time_read_cb(uint16_t obj_inst_id, uint16_t res_id,
+				  uint16_t res_inst_id, size_t *data_len)
 {
 	time_temp = time_offset + (k_uptime_get() / 1000);
 	*data_len = sizeof(time_temp);
@@ -142,20 +142,20 @@ static void *current_time_read_cb(u16_t obj_inst_id, u16_t res_id,
 	return &time_temp;
 }
 
-static void *current_time_pre_write_cb(u16_t obj_inst_id, u16_t res_id,
-				       u16_t res_inst_id, size_t *data_len)
+static void *current_time_pre_write_cb(uint16_t obj_inst_id, uint16_t res_id,
+				       uint16_t res_inst_id, size_t *data_len)
 {
 	*data_len = sizeof(time_temp);
 	return &time_temp;
 }
 
-static int current_time_post_write_cb(u16_t obj_inst_id, u16_t res_id,
-				      u16_t res_inst_id,
-				      u8_t *data, u16_t data_len,
+static int current_time_post_write_cb(uint16_t obj_inst_id, uint16_t res_id,
+				      uint16_t res_inst_id,
+				      uint8_t *data, uint16_t data_len,
 				      bool last_block, size_t total_size)
 {
 	if (data_len == 4U) {
-		time_offset = *(s32_t *)data - (s32_t)(k_uptime_get() / 1000);
+		time_offset = *(int32_t *)data - (int32_t)(k_uptime_get() / 1000);
 		return 0;
 	}
 
@@ -165,7 +165,7 @@ static int current_time_post_write_cb(u16_t obj_inst_id, u16_t res_id,
 
 /* special setter functions */
 
-__deprecated int lwm2m_device_add_pwrsrc(u8_t pwrsrc_type)
+__deprecated int lwm2m_device_add_pwrsrc(uint8_t pwrsrc_type)
 {
 	int i;
 	struct lwm2m_engine_res *res;
@@ -192,7 +192,7 @@ __deprecated int lwm2m_device_add_pwrsrc(u8_t pwrsrc_type)
 		return -ENOMEM;
 	}
 
-	*(u8_t *)res->res_instances[i].data_ptr = pwrsrc_type;
+	*(uint8_t *)res->res_instances[i].data_ptr = pwrsrc_type;
 	res->res_instances[i].res_inst_id = i;
 	NOTIFY_OBSERVER(LWM2M_OBJECT_DEVICE_ID, 0,
 			DEVICE_AVAILABLE_POWER_SOURCES_ID);
@@ -225,7 +225,7 @@ __deprecated int lwm2m_device_remove_pwrsrc(int index)
 		return -ENOMEM;
 	}
 
-	*(u8_t *)res->res_instances[index].data_ptr = 0;
+	*(uint8_t *)res->res_instances[index].data_ptr = 0;
 	res->res_instances[index].res_inst_id = RES_INSTANCE_NOT_CREATED;
 	NOTIFY_OBSERVER(LWM2M_OBJECT_DEVICE_ID, 0,
 			DEVICE_AVAILABLE_POWER_SOURCES_ID);
@@ -233,7 +233,7 @@ __deprecated int lwm2m_device_remove_pwrsrc(int index)
 	return 0;
 }
 
-static int device_set_pwrsrc_value(char *pathstr, int index, s32_t value)
+static int device_set_pwrsrc_value(char *pathstr, int index, int32_t value)
 {
 	int ret;
 	struct lwm2m_engine_res *res;
@@ -254,7 +254,7 @@ static int device_set_pwrsrc_value(char *pathstr, int index, s32_t value)
 		return -ENOMEM;
 	}
 
-	*(s32_t *)res->res_instances[index].data_ptr = value;
+	*(int32_t *)res->res_instances[index].data_ptr = value;
 	NOTIFY_OBSERVER(LWM2M_OBJECT_DEVICE_ID, 0, res->res_id);
 
 	return 0;
@@ -272,7 +272,7 @@ __deprecated int lwm2m_device_set_pwrsrc_current_ma(int index, int current_ma)
 
 /* error code function */
 
-int lwm2m_device_add_err(u8_t error_code)
+int lwm2m_device_add_err(uint8_t error_code)
 {
 	int i;
 
@@ -298,7 +298,7 @@ static void device_periodic_service(struct k_work *work)
 	NOTIFY_OBSERVER(LWM2M_OBJECT_DEVICE_ID, 0, DEVICE_CURRENT_TIME_ID);
 }
 
-static struct lwm2m_engine_obj_inst *device_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *device_create(uint16_t obj_inst_id)
 {
 	int i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
index e34d3db481..c004976f0c 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
@@ -44,9 +44,9 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define RESOURCE_INSTANCE_COUNT	(FIRMWARE_MAX_ID - 1)
 
 /* resource state variables */
-static u8_t update_state;
-static u8_t update_result;
-static u8_t delivery_method;
+static uint8_t update_state;
+static uint8_t update_result;
+static uint8_t delivery_method;
 static char package_uri[PACKAGE_URI_LEN];
 
 /* only 1 instance of firmware object exists */
@@ -74,12 +74,12 @@ static lwm2m_engine_user_cb_t update_cb;
 extern int lwm2m_firmware_start_transfer(char *package_uri);
 #endif
 
-u8_t lwm2m_firmware_get_update_state(void)
+uint8_t lwm2m_firmware_get_update_state(void)
 {
 	return update_state;
 }
 
-void lwm2m_firmware_set_update_state(u8_t state)
+void lwm2m_firmware_set_update_state(uint8_t state)
 {
 	bool error = false;
 
@@ -118,14 +118,14 @@ void lwm2m_firmware_set_update_state(u8_t state)
 	LOG_DBG("Update state = %d", update_state);
 }
 
-u8_t lwm2m_firmware_get_update_result(void)
+uint8_t lwm2m_firmware_get_update_result(void)
 {
 	return update_result;
 }
 
-void lwm2m_firmware_set_update_result(u8_t result)
+void lwm2m_firmware_set_update_result(uint8_t result)
 {
-	u8_t state;
+	uint8_t state;
 	bool error = false;
 
 	/* Check LWM2M SPEC appendix E.6.1 */
@@ -187,11 +187,11 @@ void lwm2m_firmware_set_update_result(u8_t result)
 	LOG_DBG("Update result = %d", update_result);
 }
 
-static int package_write_cb(u16_t obj_inst_id, u16_t res_id,
-			    u16_t res_inst_id, u8_t *data, u16_t data_len,
+static int package_write_cb(uint16_t obj_inst_id, uint16_t res_id,
+			    uint16_t res_inst_id, uint8_t *data, uint16_t data_len,
 			    bool last_block, size_t total_size)
 {
-	u8_t state;
+	uint8_t state;
 	int ret;
 
 	state = lwm2m_firmware_get_update_state();
@@ -236,14 +236,14 @@ static int package_write_cb(u16_t obj_inst_id, u16_t res_id,
 	return ret;
 }
 
-static int package_uri_write_cb(u16_t obj_inst_id, u16_t res_id,
-				u16_t res_inst_id, u8_t *data, u16_t data_len,
+static int package_uri_write_cb(uint16_t obj_inst_id, uint16_t res_id,
+				uint16_t res_inst_id, uint8_t *data, uint16_t data_len,
 				bool last_block, size_t total_size)
 {
 	LOG_DBG("PACKAGE_URI WRITE: %s", log_strdup(package_uri));
 
 #ifdef CONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT
-	u8_t state = lwm2m_firmware_get_update_state();
+	uint8_t state = lwm2m_firmware_get_update_state();
 
 	if (state == STATE_IDLE) {
 		lwm2m_firmware_set_update_result(RESULT_DEFAULT);
@@ -279,10 +279,10 @@ lwm2m_engine_user_cb_t lwm2m_firmware_get_update_cb(void)
 	return update_cb;
 }
 
-static int firmware_update_cb(u16_t obj_inst_id)
+static int firmware_update_cb(uint16_t obj_inst_id)
 {
 	lwm2m_engine_user_cb_t callback;
-	u8_t state;
+	uint8_t state;
 	int ret;
 
 	state = lwm2m_firmware_get_update_state();
@@ -308,7 +308,7 @@ static int firmware_update_cb(u16_t obj_inst_id)
 	return 0;
 }
 
-static struct lwm2m_engine_obj_inst *firmware_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *firmware_create(uint16_t obj_inst_id)
 {
 	int i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
index 9958cc7055..e5fa21cd17 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
@@ -62,7 +62,7 @@ static void set_update_result_from_error(int error_code)
 }
 
 static int transfer_request(struct coap_block_context *ctx,
-			    u8_t *token, u8_t tkl,
+			    uint8_t *token, uint8_t tkl,
 			    coap_reply_t reply_cb)
 {
 	struct lwm2m_message *msg;
@@ -70,7 +70,7 @@ static int transfer_request(struct coap_block_context *ctx,
 	char *cursor;
 #if !defined(CONFIG_LWM2M_FIRMWARE_UPDATE_PULL_COAP_PROXY_SUPPORT)
 	struct http_parser_url parser;
-	u16_t off, len;
+	uint16_t off, len;
 	char *next_slash;
 #endif
 
@@ -194,7 +194,7 @@ cleanup:
 	return ret;
 }
 
-static int transfer_empty_ack(u16_t mid)
+static int transfer_empty_ack(uint16_t mid)
 {
 	struct lwm2m_message *msg;
 	int ret;
@@ -234,14 +234,14 @@ do_firmware_transfer_reply_cb(const struct coap_packet *response,
 {
 	int ret;
 	bool last_block;
-	u8_t token[8];
-	u8_t tkl;
-	u16_t payload_len, payload_offset, len;
+	uint8_t token[8];
+	uint8_t tkl;
+	uint16_t payload_len, payload_offset, len;
 	struct coap_packet *check_response = (struct coap_packet *)response;
 	struct lwm2m_engine_res *res = NULL;
 	lwm2m_engine_set_data_cb_t write_cb;
 	size_t write_buflen;
-	u8_t resp_code, *write_buf;
+	uint8_t resp_code, *write_buf;
 	struct coap_block_context received_block_ctx;
 
 	/* token is used to determine a valid ACK vs a separated response */
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_location.c b/subsys/net/lib/lwm2m/lwm2m_obj_location.c
index e4f5e70522..a9e2a9bcb6 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_location.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_location.c
@@ -39,7 +39,7 @@ static float32_value_t longitude;
 static float32_value_t altitude;
 static float32_value_t radius;
 static float32_value_t speed;
-static s32_t timestamp;
+static int32_t timestamp;
 
 static struct lwm2m_engine_obj location;
 static struct lwm2m_engine_obj_field fields[] = {
@@ -56,7 +56,7 @@ static struct lwm2m_engine_obj_inst inst;
 static struct lwm2m_engine_res res[LOCATION_MAX_ID];
 static struct lwm2m_engine_res_inst res_inst[RESOURCE_INSTANCE_COUNT];
 
-static struct lwm2m_engine_obj_inst *location_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *location_create(uint16_t obj_inst_id)
 {
 	int i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_security.c b/subsys/net/lib/lwm2m/lwm2m_obj_security.c
index 514bca02cd..a7ed28a47b 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_security.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_security.c
@@ -48,12 +48,12 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 /* resource state variables */
 static char  security_uri[MAX_INSTANCE_COUNT][SECURITY_URI_LEN];
-static u8_t  client_identity[MAX_INSTANCE_COUNT][IDENTITY_LEN];
-static u8_t  server_pk[MAX_INSTANCE_COUNT][KEY_LEN];
-static u8_t  secret_key[MAX_INSTANCE_COUNT][KEY_LEN];
+static uint8_t  client_identity[MAX_INSTANCE_COUNT][IDENTITY_LEN];
+static uint8_t  server_pk[MAX_INSTANCE_COUNT][KEY_LEN];
+static uint8_t  secret_key[MAX_INSTANCE_COUNT][KEY_LEN];
 static bool  bootstrap_flag[MAX_INSTANCE_COUNT];
-static u8_t  security_mode[MAX_INSTANCE_COUNT];
-static u16_t short_server_id[MAX_INSTANCE_COUNT];
+static uint8_t  security_mode[MAX_INSTANCE_COUNT];
+static uint16_t short_server_id[MAX_INSTANCE_COUNT];
 
 static struct lwm2m_engine_obj security;
 static struct lwm2m_engine_obj_field fields[] = {
@@ -77,7 +77,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][SECURITY_MAX_ID];
 static struct lwm2m_engine_res_inst
 			res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static struct lwm2m_engine_obj_inst *security_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *security_create(uint16_t obj_inst_id)
 {
 	int index, i = 0, j = 0;
 
@@ -143,7 +143,7 @@ static struct lwm2m_engine_obj_inst *security_create(u16_t obj_inst_id)
 	return &inst[index];
 }
 
-int lwm2m_security_inst_id_to_index(u16_t obj_inst_id)
+int lwm2m_security_inst_id_to_index(uint16_t obj_inst_id)
 {
 	int i;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_server.c b/subsys/net/lib/lwm2m/lwm2m_obj_server.c
index 91269bd609..6711d689c3 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_server.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_server.c
@@ -49,13 +49,13 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define RESOURCE_INSTANCE_COUNT	(SERVER_MAX_ID - 2)
 
 /* resource state variables */
-static u16_t server_id[MAX_INSTANCE_COUNT];
-static u32_t lifetime[MAX_INSTANCE_COUNT];
-static u32_t default_min_period[MAX_INSTANCE_COUNT];
-static u32_t default_max_period[MAX_INSTANCE_COUNT];
-static u8_t  server_flag_disabled[MAX_INSTANCE_COUNT];
-static u32_t disabled_timeout[MAX_INSTANCE_COUNT];
-static u8_t  server_flag_store_notify[MAX_INSTANCE_COUNT];
+static uint16_t server_id[MAX_INSTANCE_COUNT];
+static uint32_t lifetime[MAX_INSTANCE_COUNT];
+static uint32_t default_min_period[MAX_INSTANCE_COUNT];
+static uint32_t default_max_period[MAX_INSTANCE_COUNT];
+static uint8_t  server_flag_disabled[MAX_INSTANCE_COUNT];
+static uint32_t disabled_timeout[MAX_INSTANCE_COUNT];
+static uint8_t  server_flag_store_notify[MAX_INSTANCE_COUNT];
 static char  transport_binding[MAX_INSTANCE_COUNT][TRANSPORT_BINDING_LEN];
 
 static struct lwm2m_engine_obj server;
@@ -82,7 +82,7 @@ static struct lwm2m_engine_res res[MAX_INSTANCE_COUNT][SERVER_MAX_ID];
 static struct lwm2m_engine_res_inst
 			res_inst[MAX_INSTANCE_COUNT][RESOURCE_INSTANCE_COUNT];
 
-static int disable_cb(u16_t obj_inst_id)
+static int disable_cb(uint16_t obj_inst_id)
 {
 	int i;
 
@@ -97,7 +97,7 @@ static int disable_cb(u16_t obj_inst_id)
 	return -ENOENT;
 }
 
-static int update_trigger_cb(u16_t obj_inst_id)
+static int update_trigger_cb(uint16_t obj_inst_id)
 {
 #ifdef CONFIG_LWM2M_RD_CLIENT_SUPPORT
 	engine_trigger_update();
@@ -107,8 +107,8 @@ static int update_trigger_cb(u16_t obj_inst_id)
 #endif
 }
 
-static s32_t server_get_instance_s32(u16_t obj_inst_id, s32_t *data,
-				     s32_t default_value)
+static int32_t server_get_instance_s32(uint16_t obj_inst_id, int32_t *data,
+				     int32_t default_value)
 {
 	int i;
 
@@ -121,19 +121,19 @@ static s32_t server_get_instance_s32(u16_t obj_inst_id, s32_t *data,
 	return default_value;
 }
 
-s32_t lwm2m_server_get_pmin(u16_t obj_inst_id)
+int32_t lwm2m_server_get_pmin(uint16_t obj_inst_id)
 {
 	return server_get_instance_s32(obj_inst_id, default_min_period,
 				       CONFIG_LWM2M_SERVER_DEFAULT_PMIN);
 }
 
-s32_t lwm2m_server_get_pmax(u16_t obj_inst_id)
+int32_t lwm2m_server_get_pmax(uint16_t obj_inst_id)
 {
 	return server_get_instance_s32(obj_inst_id, default_max_period,
 				       CONFIG_LWM2M_SERVER_DEFAULT_PMAX);
 }
 
-static struct lwm2m_engine_obj_inst *server_create(u16_t obj_inst_id)
+static struct lwm2m_engine_obj_inst *server_create(uint16_t obj_inst_id)
 {
 	int index, i = 0, j = 0;
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_object.h b/subsys/net/lib/lwm2m/lwm2m_object.h
index 7a6a7f1e61..9156ed2ff1 100644
--- a/subsys/net/lib/lwm2m/lwm2m_object.h
+++ b/subsys/net/lib/lwm2m/lwm2m_object.h
@@ -141,11 +141,11 @@ struct lwm2m_message;
 
 /* path representing object instances */
 struct lwm2m_obj_path {
-	u16_t obj_id;
-	u16_t obj_inst_id;
-	u16_t res_id;
-	u16_t res_inst_id;
-	u8_t  level;  /* 0/1/2/3/4 (4 = resource instance) */
+	uint16_t obj_id;
+	uint16_t obj_inst_id;
+	uint16_t res_id;
+	uint16_t res_inst_id;
+	uint8_t  level;  /* 0/1/2/3/4 (4 = resource instance) */
 };
 
 #define OBJ_FIELD(_id, _perm, _type) \
@@ -164,13 +164,13 @@ struct lwm2m_obj_path {
 	OBJ_FIELD(res_id, X_OPT, NONE)
 
 struct lwm2m_engine_obj_field {
-	u16_t  res_id;
-	u8_t   permissions;
-	u8_t   data_type;
+	uint16_t  res_id;
+	uint8_t   permissions;
+	uint8_t   data_type;
 };
 
 typedef struct lwm2m_engine_obj_inst *
-	(*lwm2m_engine_obj_create_cb_t)(u16_t obj_inst_id);
+	(*lwm2m_engine_obj_create_cb_t)(uint16_t obj_inst_id);
 
 struct lwm2m_engine_obj {
 	/* object list */
@@ -186,10 +186,10 @@ struct lwm2m_engine_obj {
 	lwm2m_engine_user_cb_t user_delete_cb;
 
 	/* object member data */
-	u16_t obj_id;
-	u16_t field_count;
-	u16_t instance_count;
-	u16_t max_instance_count;
+	uint16_t obj_id;
+	uint16_t field_count;
+	uint16_t instance_count;
+	uint16_t max_instance_count;
 };
 
 /* Resource instances with this value are considered "not created" yet */
@@ -314,17 +314,17 @@ struct lwm2m_attr {
 	/* values */
 	union {
 		float32_value_t float_val;
-		s32_t int_val;
+		int32_t int_val;
 	};
 
-	u8_t type;
+	uint8_t type;
 };
 
 struct lwm2m_engine_res_inst {
 	void  *data_ptr;
-	u16_t data_len;
-	u16_t res_inst_id; /* 65535 == not "created" */
-	u8_t  data_flags;
+	uint16_t data_len;
+	uint16_t res_inst_id; /* 65535 == not "created" */
+	uint8_t  data_flags;
 };
 
 struct lwm2m_engine_res {
@@ -334,8 +334,8 @@ struct lwm2m_engine_res {
 	lwm2m_engine_user_cb_t			execute_cb;
 
 	struct lwm2m_engine_res_inst *res_instances;
-	u16_t res_id;
-	u8_t  res_inst_count;
+	uint16_t res_id;
+	uint8_t  res_inst_count;
 };
 
 struct lwm2m_engine_obj_inst {
@@ -346,8 +346,8 @@ struct lwm2m_engine_obj_inst {
 	struct lwm2m_engine_res *resources;
 
 	/* object instance member data */
-	u16_t obj_inst_id;
-	u16_t resource_count;
+	uint16_t obj_inst_id;
+	uint16_t resource_count;
 };
 
 /* Initialize resource instances prior to use */
@@ -375,10 +375,10 @@ struct lwm2m_input_context {
 	struct coap_packet *in_cpkt;
 
 	/* current position in buffer */
-	u16_t offset;
+	uint16_t offset;
 
 	/* length of incoming opaque */
-	u16_t opaque_len;
+	uint16_t opaque_len;
 
 	/* private output data */
 	void *user_data;
@@ -403,26 +403,26 @@ struct lwm2m_message {
 	struct coap_packet cpkt;
 
 	/** Buffer data related outgoing message */
-	u8_t msg_data[MAX_PACKET_SIZE];
+	uint8_t msg_data[MAX_PACKET_SIZE];
 
 	/** Message transmission handling for TYPE_CON */
 	struct coap_pending *pending;
 	struct coap_reply *reply;
 
 	/** Message configuration */
-	u8_t *token;
+	uint8_t *token;
 	coap_reply_t reply_cb;
 	lwm2m_message_timeout_cb_t message_timeout_cb;
-	u16_t mid;
-	u8_t type;
-	u8_t code;
-	u8_t tkl;
+	uint16_t mid;
+	uint8_t type;
+	uint8_t code;
+	uint8_t tkl;
 
 	/** Incoming message action */
-	u8_t operation;
+	uint8_t operation;
 
 	/** Counter for message re-send / abort handling */
-	u8_t send_attempts;
+	uint8_t send_attempts;
 };
 
 /* LWM2M format writer for the various formats supported */
@@ -445,16 +445,16 @@ struct lwm2m_writer {
 			     struct lwm2m_obj_path *path);
 	size_t (*put_s8)(struct lwm2m_output_context *out,
 			 struct lwm2m_obj_path *path,
-			 s8_t value);
+			 int8_t value);
 	size_t (*put_s16)(struct lwm2m_output_context *out,
 			  struct lwm2m_obj_path *path,
-			  s16_t value);
+			  int16_t value);
 	size_t (*put_s32)(struct lwm2m_output_context *out,
 			  struct lwm2m_obj_path *path,
-			  s32_t value);
+			  int32_t value);
 	size_t (*put_s64)(struct lwm2m_output_context *out,
 			  struct lwm2m_obj_path *path,
-			  s64_t value);
+			  int64_t value);
 	size_t (*put_string)(struct lwm2m_output_context *out,
 			     struct lwm2m_obj_path *path,
 			     char *buf, size_t buflen);
@@ -474,11 +474,11 @@ struct lwm2m_writer {
 
 struct lwm2m_reader {
 	size_t (*get_s32)(struct lwm2m_input_context *in,
-			  s32_t *value);
+			  int32_t *value);
 	size_t (*get_s64)(struct lwm2m_input_context *in,
-			  s64_t *value);
+			  int64_t *value);
 	size_t (*get_string)(struct lwm2m_input_context *in,
-			     u8_t *buf, size_t buflen);
+			     uint8_t *buf, size_t buflen);
 	size_t (*get_float32fix)(struct lwm2m_input_context *in,
 				 float32_value_t *value);
 	size_t (*get_float64fix)(struct lwm2m_input_context *in,
@@ -486,7 +486,7 @@ struct lwm2m_reader {
 	size_t (*get_bool)(struct lwm2m_input_context *in,
 			   bool *value);
 	size_t (*get_opaque)(struct lwm2m_input_context *in,
-			     u8_t *buf, size_t buflen, bool *last_block);
+			     uint8_t *buf, size_t buflen, bool *last_block);
 };
 
 /* output user_data management functions */
@@ -609,28 +609,28 @@ static inline size_t engine_put_end_ri(struct lwm2m_output_context *out,
 
 static inline size_t engine_put_s8(struct lwm2m_output_context *out,
 				   struct lwm2m_obj_path *path,
-				   s8_t value)
+				   int8_t value)
 {
 	return out->writer->put_s8(out, path, value);
 }
 
 static inline size_t engine_put_s16(struct lwm2m_output_context *out,
 				    struct lwm2m_obj_path *path,
-				    s16_t value)
+				    int16_t value)
 {
 	return out->writer->put_s16(out, path, value);
 }
 
 static inline size_t engine_put_s32(struct lwm2m_output_context *out,
 				    struct lwm2m_obj_path *path,
-				    s32_t value)
+				    int32_t value)
 {
 	return out->writer->put_s32(out, path, value);
 }
 
 static inline size_t engine_put_s64(struct lwm2m_output_context *out,
 				    struct lwm2m_obj_path *path,
-				    s64_t value)
+				    int64_t value)
 {
 	return out->writer->put_s64(out, path, value);
 }
@@ -675,19 +675,19 @@ static inline size_t engine_put_opaque(struct lwm2m_output_context *out,
 }
 
 static inline size_t engine_get_s32(struct lwm2m_input_context *in,
-				    s32_t *value)
+				    int32_t *value)
 {
 	return in->reader->get_s32(in, value);
 }
 
 static inline size_t engine_get_s64(struct lwm2m_input_context *in,
-				    s64_t *value)
+				    int64_t *value)
 {
 	return in->reader->get_s64(in, value);
 }
 
 static inline size_t engine_get_string(struct lwm2m_input_context *in,
-				       u8_t *buf, size_t buflen)
+				       uint8_t *buf, size_t buflen)
 {
 	return in->reader->get_string(in, buf, buflen);
 }
@@ -711,7 +711,7 @@ static inline size_t engine_get_bool(struct lwm2m_input_context *in,
 }
 
 static inline size_t engine_get_opaque(struct lwm2m_input_context *in,
-				       u8_t *buf, size_t buflen,
+				       uint8_t *buf, size_t buflen,
 				       bool *last_block)
 {
 	if (in->reader->get_opaque) {
diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
index 5e4b6691c9..86fd8b430b 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
@@ -96,14 +96,14 @@ enum sm_engine_state {
 };
 
 struct lwm2m_rd_client_info {
-	u32_t lifetime;
+	uint32_t lifetime;
 	struct lwm2m_ctx *ctx;
-	u8_t engine_state;
-	u8_t use_bootstrap;
-	u8_t trigger_update;
+	uint8_t engine_state;
+	uint8_t use_bootstrap;
+	uint8_t trigger_update;
 
-	s64_t last_update;
-	s64_t last_tx;
+	int64_t last_update;
+	int64_t last_tx;
 
 	char ep_name[CLIENT_EP_LEN];
 	char server_ep[CLIENT_EP_LEN];
@@ -113,14 +113,14 @@ struct lwm2m_rd_client_info {
 
 /* buffers */
 static char query_buffer[64]; /* allocate some data for queries and updates */
-static u8_t client_data[256]; /* allocate some data for the RD */
+static uint8_t client_data[256]; /* allocate some data for the RD */
 
 void engine_update_tx_time(void)
 {
 	client.last_tx = k_uptime_get();
 }
 
-static void set_sm_state(u8_t sm_state)
+static void set_sm_state(uint8_t sm_state)
 {
 	enum lwm2m_rd_client_event event = LWM2M_RD_CLIENT_EVENT_NONE;
 
@@ -160,7 +160,7 @@ static bool sm_is_registered(void)
 		client.engine_state <= ENGINE_DEREGISTER_FAILED);
 }
 
-static u8_t get_sm_state(void)
+static uint8_t get_sm_state(void)
 {
 	/* TODO: add locking? */
 	return client.engine_state;
@@ -219,7 +219,7 @@ static int do_bootstrap_reply_cb(const struct coap_packet *response,
 				 struct coap_reply *reply,
 				 const struct sockaddr *from)
 {
-	u8_t code;
+	uint8_t code;
 
 	code = coap_header_get_code(response);
 	LOG_DBG("Bootstrap callback (code:%u.%u)",
@@ -266,7 +266,7 @@ static int do_registration_reply_cb(const struct coap_packet *response,
 				    const struct sockaddr *from)
 {
 	struct coap_option options[2];
-	u8_t code;
+	uint8_t code;
 	int ret;
 
 	code = coap_header_get_code(response);
@@ -333,7 +333,7 @@ static int do_update_reply_cb(const struct coap_packet *response,
 			      struct coap_reply *reply,
 			      const struct sockaddr *from)
 {
-	u8_t code;
+	uint8_t code;
 
 	code = coap_header_get_code(response);
 	LOG_INF("Update callback (code:%u.%u)",
@@ -370,7 +370,7 @@ static int do_deregister_reply_cb(const struct coap_packet *response,
 				  struct coap_reply *reply,
 				  const struct sockaddr *from)
 {
-	u8_t code;
+	uint8_t code;
 
 	code = coap_header_get_code(response);
 	LOG_DBG("Deregister callback (code:%u.%u)",
@@ -402,7 +402,7 @@ static void do_deregister_timeout_cb(struct lwm2m_message *msg)
 }
 
 static int sm_select_next_sec_inst(bool bootstrap_server,
-				   int *sec_obj_inst, u32_t *lifetime)
+				   int *sec_obj_inst, uint32_t *lifetime)
 {
 	char pathstr[MAX_RESOURCE_LEN];
 	int ret, end, i, obj_inst_id, found = -1;
@@ -601,7 +601,7 @@ static int sm_send_registration(bool send_obj_support_data,
 				lwm2m_message_timeout_cb_t timeout_cb)
 {
 	struct lwm2m_message *msg;
-	u16_t client_data_len;
+	uint16_t client_data_len;
 	int ret;
 	char binding[CLIENT_BINDING_LEN];
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_json.c b/subsys/net/lib/lwm2m/lwm2m_rw_json.c
index c230e51388..baaa1b8741 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_json.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_json.c
@@ -92,29 +92,29 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 struct json_out_formatter_data {
 	/* offset position storage */
-	u16_t mark_pos_ri;
+	uint16_t mark_pos_ri;
 
 	/* flags */
-	u8_t writer_flags;
+	uint8_t writer_flags;
 
 	/* path storage */
-	u8_t path_level;
+	uint8_t path_level;
 };
 
 struct json_in_formatter_data {
 	/* name info */
-	u16_t name_offset;
-	u16_t name_len;
+	uint16_t name_offset;
+	uint16_t name_len;
 
 	/* value info */
-	u16_t value_offset;
-	u16_t value_len;
+	uint16_t value_offset;
+	uint16_t value_len;
 
 	/* state */
-	u16_t offset;
+	uint16_t offset;
 
 	/* flags */
-	u8_t json_flags;
+	uint8_t json_flags;
 };
 
 /* some temporary buffer space for format conversions */
@@ -144,7 +144,7 @@ static void json_add_char(struct lwm2m_input_context *in,
 static int json_next_token(struct lwm2m_input_context *in,
 			   struct json_in_formatter_data *fd)
 {
-	u8_t cont, c;
+	uint8_t cont, c;
 	bool escape = false;
 
 	(void)memset(fd, 0, sizeof(*fd));
@@ -401,7 +401,7 @@ static size_t put_json_postfix(struct lwm2m_output_context *out)
 }
 
 static size_t put_s32(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s32_t value)
+		      struct lwm2m_obj_path *path, int32_t value)
 {
 	int len;
 
@@ -413,19 +413,19 @@ static size_t put_s32(struct lwm2m_output_context *out,
 }
 
 static size_t put_s16(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s16_t value)
+		      struct lwm2m_obj_path *path, int16_t value)
 {
-	return put_s32(out, path, (s32_t)value);
+	return put_s32(out, path, (int32_t)value);
 }
 
 static size_t put_s8(struct lwm2m_output_context *out,
-		     struct lwm2m_obj_path *path, s8_t value)
+		     struct lwm2m_obj_path *path, int8_t value)
 {
-	return put_s32(out, path, (s32_t)value);
+	return put_s32(out, path, (int32_t)value);
 }
 
 static size_t put_s64(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s64_t value)
+		      struct lwm2m_obj_path *path, int64_t value)
 {
 	int len;
 
@@ -527,12 +527,12 @@ static size_t put_bool(struct lwm2m_output_context *out,
 }
 
 static size_t read_number(struct lwm2m_input_context *in,
-			  s64_t *value1, s64_t *value2,
+			  int64_t *value1, int64_t *value2,
 			  bool accept_sign, bool accept_dot)
 {
 	struct json_in_formatter_data *fd;
-	s64_t *counter = value1;
-	u8_t *buf;
+	int64_t *counter = value1;
+	uint8_t *buf;
 	size_t i = 0;
 	bool neg = false;
 	bool dot_found = false;
@@ -575,26 +575,26 @@ static size_t read_number(struct lwm2m_input_context *in,
 	return i;
 }
 
-static size_t get_s64(struct lwm2m_input_context *in, s64_t *value)
+static size_t get_s64(struct lwm2m_input_context *in, int64_t *value)
 {
 	return read_number(in, value, NULL, true, true);
 }
 
-static size_t get_s32(struct lwm2m_input_context *in, s32_t *value)
+static size_t get_s32(struct lwm2m_input_context *in, int32_t *value)
 {
-	s64_t tmp = 0;
+	int64_t tmp = 0;
 	size_t len = 0;
 
 	len = read_number(in, &tmp, NULL, true, true);
 	if (len > 0) {
-		*value = (s32_t)tmp;
+		*value = (int32_t)tmp;
 	}
 
 	return len;
 }
 
 static size_t get_string(struct lwm2m_input_context *in,
-			 u8_t *buf, size_t buflen)
+			 uint8_t *buf, size_t buflen)
 {
 	struct json_in_formatter_data *fd;
 	int ret;
@@ -622,13 +622,13 @@ static size_t get_string(struct lwm2m_input_context *in,
 static size_t get_float32fix(struct lwm2m_input_context *in,
 			     float32_value_t *value)
 {
-	s64_t tmp1, tmp2;
+	int64_t tmp1, tmp2;
 	size_t len;
 
 	len = read_number(in, &tmp1, &tmp2, true, true);
 	if (len > 0) {
-		value->val1 = (s32_t)tmp1;
-		value->val2 = (s32_t)tmp2;
+		value->val1 = (int32_t)tmp1;
+		value->val2 = (int32_t)tmp2;
 	}
 
 	return len;
@@ -637,7 +637,7 @@ static size_t get_float32fix(struct lwm2m_input_context *in,
 static size_t get_float64fix(struct lwm2m_input_context *in,
 			     float64_value_t *value)
 {
-	s64_t tmp1, tmp2;
+	int64_t tmp1, tmp2;
 	size_t len;
 
 	len = read_number(in, &tmp1, &tmp2, true, true);
@@ -670,7 +670,7 @@ static size_t get_bool(struct lwm2m_input_context *in, bool *value)
 }
 
 static size_t get_opaque(struct lwm2m_input_context *in,
-			 u8_t *value, size_t buflen, bool *last_block)
+			 uint8_t *value, size_t buflen, bool *last_block)
 {
 	/* TODO */
 	return 0;
@@ -716,13 +716,13 @@ int do_read_op_json(struct lwm2m_message *msg, int content_format)
 	return ret;
 }
 
-static int parse_path(const u8_t *buf, u16_t buflen,
+static int parse_path(const uint8_t *buf, uint16_t buflen,
 		      struct lwm2m_obj_path *path)
 {
 	int ret = 0;
 	int pos = 0;
-	u16_t val;
-	u8_t c = 0U;
+	uint16_t val;
+	uint8_t c = 0U;
 
 	(void)memset(path, 0, sizeof(*path));
 	do {
@@ -771,10 +771,10 @@ int do_write_op_json(struct lwm2m_message *msg)
 	struct lwm2m_obj_path orig_path;
 	struct json_in_formatter_data fd;
 	int ret = 0, index;
-	u8_t value[TOKEN_BUF_LEN];
-	u8_t base_name[MAX_RESOURCE_LEN];
-	u8_t full_name[MAX_RESOURCE_LEN];
-	u8_t created;
+	uint8_t value[TOKEN_BUF_LEN];
+	uint8_t base_name[MAX_RESOURCE_LEN];
+	uint8_t full_name[MAX_RESOURCE_LEN];
+	uint8_t created;
 
 	(void)memset(&fd, 0, sizeof(fd));
 	engine_set_in_user_data(&msg->in, &fd);
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c b/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
index 60ff04c2e6..a250d6d33a 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
@@ -82,20 +82,20 @@ enum {
 };
 
 struct oma_tlv {
-	u8_t  type;
-	u16_t id; /* can be 8-bit or 16-bit when serialized */
-	u32_t length;
+	uint8_t  type;
+	uint16_t id; /* can be 8-bit or 16-bit when serialized */
+	uint32_t length;
 };
 
 struct tlv_out_formatter_data {
 	/* offset position storage */
-	u16_t mark_pos;
-	u16_t mark_pos_oi;
-	u16_t mark_pos_ri;
-	u8_t writer_flags;
+	uint16_t mark_pos;
+	uint16_t mark_pos_oi;
+	uint16_t mark_pos_ri;
+	uint8_t writer_flags;
 };
 
-static u8_t get_len_type(const struct oma_tlv *tlv)
+static uint8_t get_len_type(const struct oma_tlv *tlv)
 {
 	if (tlv->length < 8) {
 		return 0;
@@ -108,20 +108,20 @@ static u8_t get_len_type(const struct oma_tlv *tlv)
 	return 3;
 }
 
-static u8_t tlv_calc_type(u8_t flags)
+static uint8_t tlv_calc_type(uint8_t flags)
 {
 	return flags & WRITER_RESOURCE_INSTANCE ?
 			OMA_TLV_TYPE_RESOURCE_INSTANCE : OMA_TLV_TYPE_RESOURCE;
 }
 
-static u16_t tlv_calc_id(u8_t flags, struct lwm2m_obj_path *path)
+static uint16_t tlv_calc_id(uint8_t flags, struct lwm2m_obj_path *path)
 {
 	return flags & WRITER_RESOURCE_INSTANCE ?
 			path->res_inst_id : path->res_id;
 }
 
-static void tlv_setup(struct oma_tlv *tlv, u8_t type, u16_t id,
-		      u32_t buflen)
+static void tlv_setup(struct oma_tlv *tlv, uint8_t type, uint16_t id,
+		      uint32_t buflen)
 {
 	if (tlv) {
 		tlv->type = type;
@@ -131,7 +131,7 @@ static void tlv_setup(struct oma_tlv *tlv, u8_t type, u16_t id,
 }
 
 static int oma_tlv_put_u8(struct lwm2m_output_context *out,
-			  u8_t value, bool insert)
+			  uint8_t value, bool insert)
 {
 	struct tlv_out_formatter_data *fd;
 	int ret;
@@ -161,11 +161,11 @@ static int oma_tlv_put_u8(struct lwm2m_output_context *out,
 
 static size_t oma_tlv_put(const struct oma_tlv *tlv,
 			  struct lwm2m_output_context *out,
-			  u8_t *value, bool insert)
+			  uint8_t *value, bool insert)
 {
 	size_t pos;
 	int ret, i;
-	u8_t len_type, tmp;
+	uint8_t len_type, tmp;
 
 	/* len_type is the same as number of bytes required for length */
 	len_type = get_len_type(tlv);
@@ -233,11 +233,11 @@ static size_t oma_tlv_get(struct oma_tlv *tlv,
 			  struct lwm2m_input_context *in,
 			  bool dont_advance)
 {
-	u8_t len_type;
-	u8_t len_pos = 1U;
+	uint8_t len_type;
+	uint8_t len_pos = 1U;
 	size_t tlv_len;
-	u16_t tmp_offset;
-	u8_t buf[2];
+	uint16_t tmp_offset;
+	uint8_t buf[2];
 
 	tmp_offset = in->offset;
 	if (buf_read_u8(&buf[0], CPKT_BUF_READ(in->in_cpkt), &tmp_offset) < 0) {
@@ -299,8 +299,8 @@ error:
 	return 0;
 }
 
-static size_t put_begin_tlv(struct lwm2m_output_context *out, u16_t *mark_pos,
-			    u8_t *writer_flags, int writer_flag)
+static size_t put_begin_tlv(struct lwm2m_output_context *out, uint16_t *mark_pos,
+			    uint8_t *writer_flags, int writer_flag)
 {
 	/* set flags */
 	*writer_flags |= writer_flag;
@@ -313,13 +313,13 @@ static size_t put_begin_tlv(struct lwm2m_output_context *out, u16_t *mark_pos,
 	return 0;
 }
 
-static size_t put_end_tlv(struct lwm2m_output_context *out, u16_t mark_pos,
-			  u8_t *writer_flags, u8_t writer_flag,
+static size_t put_end_tlv(struct lwm2m_output_context *out, uint16_t mark_pos,
+			  uint8_t *writer_flags, uint8_t writer_flag,
 			  int tlv_type, int tlv_id)
 {
 	struct tlv_out_formatter_data *fd;
 	struct oma_tlv tlv;
-	u32_t len = 0U;
+	uint32_t len = 0U;
 
 	fd = engine_get_out_user_data(out);
 	if (!fd) {
@@ -397,7 +397,7 @@ static size_t put_end_ri(struct lwm2m_output_context *out,
 }
 
 static size_t put_s8(struct lwm2m_output_context *out,
-		     struct lwm2m_obj_path *path, s8_t value)
+		     struct lwm2m_obj_path *path, int8_t value)
 {
 	struct tlv_out_formatter_data *fd;
 	size_t len;
@@ -411,17 +411,17 @@ static size_t put_s8(struct lwm2m_output_context *out,
 	tlv_setup(&tlv, tlv_calc_type(fd->writer_flags),
 		  tlv_calc_id(fd->writer_flags, path), sizeof(value));
 
-	len = oma_tlv_put(&tlv, out, (u8_t *)&value, false);
+	len = oma_tlv_put(&tlv, out, (uint8_t *)&value, false);
 	return len;
 }
 
 static size_t put_s16(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s16_t value)
+		      struct lwm2m_obj_path *path, int16_t value)
 {
 	struct tlv_out_formatter_data *fd;
 	size_t len;
 	struct oma_tlv tlv;
-	s16_t net_value;
+	int16_t net_value;
 
 	fd = engine_get_out_user_data(out);
 	if (!fd) {
@@ -432,17 +432,17 @@ static size_t put_s16(struct lwm2m_output_context *out,
 	tlv_setup(&tlv, tlv_calc_type(fd->writer_flags),
 		  tlv_calc_id(fd->writer_flags, path), sizeof(net_value));
 
-	len = oma_tlv_put(&tlv, out, (u8_t *)&net_value, false);
+	len = oma_tlv_put(&tlv, out, (uint8_t *)&net_value, false);
 	return len;
 }
 
 static size_t put_s32(struct lwm2m_output_context *out,
-			struct lwm2m_obj_path *path, s32_t value)
+			struct lwm2m_obj_path *path, int32_t value)
 {
 	struct tlv_out_formatter_data *fd;
 	size_t len;
 	struct oma_tlv tlv;
-	s32_t net_value;
+	int32_t net_value;
 
 	fd = engine_get_out_user_data(out);
 	if (!fd) {
@@ -453,17 +453,17 @@ static size_t put_s32(struct lwm2m_output_context *out,
 	tlv_setup(&tlv, tlv_calc_type(fd->writer_flags),
 		  tlv_calc_id(fd->writer_flags, path), sizeof(net_value));
 
-	len = oma_tlv_put(&tlv, out, (u8_t *)&net_value, false);
+	len = oma_tlv_put(&tlv, out, (uint8_t *)&net_value, false);
 	return len;
 }
 
 static size_t put_s64(struct lwm2m_output_context *out,
-			struct lwm2m_obj_path *path, s64_t value)
+			struct lwm2m_obj_path *path, int64_t value)
 {
 	struct tlv_out_formatter_data *fd;
 	size_t len;
 	struct oma_tlv tlv;
-	s64_t net_value;
+	int64_t net_value;
 
 	fd = engine_get_out_user_data(out);
 	if (!fd) {
@@ -474,7 +474,7 @@ static size_t put_s64(struct lwm2m_output_context *out,
 	tlv_setup(&tlv, tlv_calc_type(fd->writer_flags),
 		  tlv_calc_id(fd->writer_flags, path), sizeof(net_value));
 
-	len = oma_tlv_put(&tlv, out, (u8_t *)&net_value, false);
+	len = oma_tlv_put(&tlv, out, (uint8_t *)&net_value, false);
 	return len;
 }
 
@@ -492,8 +492,8 @@ static size_t put_string(struct lwm2m_output_context *out,
 	}
 
 	tlv_setup(&tlv, tlv_calc_type(fd->writer_flags),
-		  tlv_calc_id(fd->writer_flags, path), (u32_t)buflen);
-	len = oma_tlv_put(&tlv, out, (u8_t *)buf, false);
+		  tlv_calc_id(fd->writer_flags, path), (uint32_t)buflen);
+	len = oma_tlv_put(&tlv, out, (uint8_t *)buf, false);
 	return len;
 }
 
@@ -505,7 +505,7 @@ static size_t put_float32fix(struct lwm2m_output_context *out,
 	size_t len;
 	struct oma_tlv tlv;
 	int ret;
-	u8_t b32[4];
+	uint8_t b32[4];
 
 	fd = engine_get_out_user_data(out);
 	if (!fd) {
@@ -531,7 +531,7 @@ static size_t put_float64fix(struct lwm2m_output_context *out,
 	struct tlv_out_formatter_data *fd;
 	size_t len;
 	struct oma_tlv tlv;
-	u8_t b64[8];
+	uint8_t b64[8];
 	int ret;
 
 	fd = engine_get_out_user_data(out);
@@ -554,7 +554,7 @@ static size_t put_float64fix(struct lwm2m_output_context *out,
 static size_t put_bool(struct lwm2m_output_context *out,
 		       struct lwm2m_obj_path *path, bool value)
 {
-	s8_t value_s8 = (value != 0 ? 1 : 0);
+	int8_t value_s8 = (value != 0 ? 1 : 0);
 
 	return put_s8(out, path, value_s8);
 }
@@ -566,12 +566,12 @@ static size_t put_opaque(struct lwm2m_output_context *out,
 	return put_string(out, path, buf, buflen);
 }
 
-static size_t get_number(struct lwm2m_input_context *in, s64_t *value,
-			 u8_t max_len)
+static size_t get_number(struct lwm2m_input_context *in, int64_t *value,
+			 uint8_t max_len)
 {
 	struct oma_tlv tlv;
 	size_t size = oma_tlv_get(&tlv, in, false);
-	s64_t temp;
+	int64_t temp;
 
 	*value = 0;
 	if (size > 0) {
@@ -580,7 +580,7 @@ static size_t get_number(struct lwm2m_input_context *in, s64_t *value,
 			return 0;
 		}
 
-		if (buf_read((u8_t *)&temp, tlv.length,
+		if (buf_read((uint8_t *)&temp, tlv.length,
 			     CPKT_BUF_READ(in->in_cpkt), &in->offset) < 0) {
 			/* TODO: Generate error? */
 			return 0;
@@ -588,13 +588,13 @@ static size_t get_number(struct lwm2m_input_context *in, s64_t *value,
 
 		switch (tlv.length) {
 		case 1:
-			*value = (s8_t)temp;
+			*value = (int8_t)temp;
 			break;
 		case 2:
-			*value = sys_cpu_to_be16((s16_t)temp);
+			*value = sys_cpu_to_be16((int16_t)temp);
 			break;
 		case 4:
-			*value = sys_cpu_to_be32((s32_t)temp);
+			*value = sys_cpu_to_be32((int32_t)temp);
 			break;
 		case 8:
 			*value = sys_cpu_to_be64(temp);
@@ -608,27 +608,27 @@ static size_t get_number(struct lwm2m_input_context *in, s64_t *value,
 	return size;
 }
 
-static size_t get_s64(struct lwm2m_input_context *in, s64_t *value)
+static size_t get_s64(struct lwm2m_input_context *in, int64_t *value)
 {
 	return get_number(in, value, 8);
 }
 
-static size_t get_s32(struct lwm2m_input_context *in, s32_t *value)
+static size_t get_s32(struct lwm2m_input_context *in, int32_t *value)
 {
-	s64_t temp;
+	int64_t temp;
 	size_t size;
 
 	*value = 0;
 	size = get_number(in, &temp, 4);
 	if (size > 0) {
-		*value = (s32_t)temp;
+		*value = (int32_t)temp;
 	}
 
 	return size;
 }
 
 static size_t get_string(struct lwm2m_input_context *in,
-			 u8_t *buf, size_t buflen)
+			 uint8_t *buf, size_t buflen)
 {
 	struct oma_tlv tlv;
 	size_t size = oma_tlv_get(&tlv, in, false);
@@ -657,7 +657,7 @@ static size_t get_float32fix(struct lwm2m_input_context *in,
 {
 	struct oma_tlv tlv;
 	size_t size = oma_tlv_get(&tlv, in, false);
-	u8_t b32[4];
+	uint8_t b32[4];
 	int ret;
 
 	if (size > 0) {
@@ -698,7 +698,7 @@ static size_t get_float64fix(struct lwm2m_input_context *in,
 {
 	struct oma_tlv tlv;
 	size_t size = oma_tlv_get(&tlv, in, false);
-	u8_t b64[8];
+	uint8_t b64[8];
 	int ret;
 
 	if (size > 0) {
@@ -736,7 +736,7 @@ static size_t get_float64fix(struct lwm2m_input_context *in,
 
 static size_t get_bool(struct lwm2m_input_context *in, bool *value)
 {
-	s64_t temp;
+	int64_t temp;
 	size_t size;
 
 	*value = 0;
@@ -749,7 +749,7 @@ static size_t get_bool(struct lwm2m_input_context *in, bool *value)
 }
 
 static size_t get_opaque(struct lwm2m_input_context *in,
-			 u8_t *value, size_t buflen, bool *last_block)
+			 uint8_t *value, size_t buflen, bool *last_block)
 {
 	struct oma_tlv tlv;
 
@@ -799,7 +799,7 @@ int do_read_op_tlv(struct lwm2m_message *msg, int content_format)
 static int do_write_op_tlv_dummy_read(struct lwm2m_message *msg)
 {
 	struct oma_tlv tlv;
-	u8_t read_char;
+	uint8_t read_char;
 
 	oma_tlv_get(&tlv, &msg->in, false);
 	while (tlv.length--) {
@@ -818,7 +818,7 @@ static int do_write_op_tlv_item(struct lwm2m_message *msg)
 	struct lwm2m_engine_res *res = NULL;
 	struct lwm2m_engine_res_inst *res_inst = NULL;
 	struct lwm2m_engine_obj_field *obj_field = NULL;
-	u8_t created = 0U;
+	uint8_t created = 0U;
 	int ret, i;
 
 	ret = lwm2m_get_or_create_engine_obj(msg, &obj_inst, &created);
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c b/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
index 8a059c13f6..0613ce3240 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
@@ -98,25 +98,25 @@ size_t plain_text_put_format(struct lwm2m_output_context *out,
 }
 
 static size_t put_s32(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s32_t value)
+		      struct lwm2m_obj_path *path, int32_t value)
 {
 	return plain_text_put_format(out, "%d", value);
 }
 
 static size_t put_s8(struct lwm2m_output_context *out,
-		     struct lwm2m_obj_path *path, s8_t value)
+		     struct lwm2m_obj_path *path, int8_t value)
 {
 	return plain_text_put_format(out, "%d", value);
 }
 
 static size_t put_s16(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s16_t value)
+		      struct lwm2m_obj_path *path, int16_t value)
 {
 	return plain_text_put_format(out, "%d", value);
 }
 
 static size_t put_s64(struct lwm2m_output_context *out,
-		      struct lwm2m_obj_path *path, s64_t value)
+		      struct lwm2m_obj_path *path, int64_t value)
 {
 	return plain_text_put_format(out, "%lld", value);
 }
@@ -200,15 +200,15 @@ static int get_length_left(struct lwm2m_input_context *in)
 }
 
 static size_t plain_text_read_number(struct lwm2m_input_context *in,
-				     s64_t *value1,
-				     s64_t *value2,
+				     int64_t *value1,
+				     int64_t *value2,
 				     bool accept_sign, bool accept_dot)
 {
-	s64_t *counter = value1;
+	int64_t *counter = value1;
 	int i = 0;
 	bool neg = false;
 	bool dot_found = false;
-	u8_t tmp;
+	uint8_t tmp;
 
 	/* initialize values to 0 */
 	*value1 = 0;
@@ -246,28 +246,28 @@ static size_t plain_text_read_number(struct lwm2m_input_context *in,
 	return i;
 }
 
-static size_t get_s32(struct lwm2m_input_context *in, s32_t *value)
+static size_t get_s32(struct lwm2m_input_context *in, int32_t *value)
 {
-	s64_t tmp = 0;
+	int64_t tmp = 0;
 	size_t len = 0;
 
 	len = plain_text_read_number(in, &tmp, NULL, true, false);
 	if (len > 0) {
-		*value = (s32_t)tmp;
+		*value = (int32_t)tmp;
 	}
 
 	return len;
 }
 
-static size_t get_s64(struct lwm2m_input_context *in, s64_t *value)
+static size_t get_s64(struct lwm2m_input_context *in, int64_t *value)
 {
 	return plain_text_read_number(in, value, NULL, true, false);
 }
 
 static size_t get_string(struct lwm2m_input_context *in,
-			 u8_t *value, size_t buflen)
+			 uint8_t *value, size_t buflen)
 {
-	u16_t in_len = get_length_left(in);
+	uint16_t in_len = get_length_left(in);
 
 	if (in_len > buflen) {
 		/* TODO: generate warning? */
@@ -287,13 +287,13 @@ static size_t get_string(struct lwm2m_input_context *in,
 static size_t get_float32fix(struct lwm2m_input_context *in,
 			     float32_value_t *value)
 {
-	s64_t tmp1, tmp2;
+	int64_t tmp1, tmp2;
 	size_t len = 0;
 
 	len = plain_text_read_number(in, &tmp1, &tmp2, true, true);
 	if (len > 0) {
-		value->val1 = (s32_t)tmp1;
-		value->val2 = (s32_t)tmp2;
+		value->val1 = (int32_t)tmp1;
+		value->val2 = (int32_t)tmp2;
 	}
 
 	return len;
@@ -309,7 +309,7 @@ static size_t get_float64fix(struct lwm2m_input_context *in,
 static size_t get_bool(struct lwm2m_input_context *in,
 		       bool *value)
 {
-	u8_t tmp;
+	uint8_t tmp;
 
 	if (buf_read_u8(&tmp, CPKT_BUF_READ(in->in_cpkt), &in->offset) < 0) {
 		return 0;
@@ -324,7 +324,7 @@ static size_t get_bool(struct lwm2m_input_context *in,
 }
 
 static size_t get_opaque(struct lwm2m_input_context *in,
-			 u8_t *value, size_t buflen, bool *last_block)
+			 uint8_t *value, size_t buflen, bool *last_block)
 {
 	in->opaque_len = get_length_left(in);
 	return lwm2m_engine_get_opaque_more(in, value, buflen, last_block);
@@ -368,7 +368,7 @@ int do_write_op_plain_text(struct lwm2m_message *msg)
 	struct lwm2m_engine_res *res = NULL;
 	struct lwm2m_engine_res_inst *res_inst = NULL;
 	int ret, i;
-	u8_t created = 0U;
+	uint8_t created = 0U;
 
 	ret = lwm2m_get_or_create_engine_obj(msg, &obj_inst, &created);
 	if (ret < 0) {
diff --git a/subsys/net/lib/lwm2m/lwm2m_util.c b/subsys/net/lib/lwm2m/lwm2m_util.c
index e3606c37e6..87e783d28a 100644
--- a/subsys/net/lib/lwm2m/lwm2m_util.c
+++ b/subsys/net/lib/lwm2m/lwm2m_util.c
@@ -12,9 +12,9 @@
 #define SHIFT_RIGHT(v, o, m) (((v) >> (o)) & (m))
 
 /* convert from float32 to binary32 */
-int lwm2m_f32_to_b32(float32_value_t *f32, u8_t *b32, size_t len)
+int lwm2m_f32_to_b32(float32_value_t *f32, uint8_t *b32, size_t len)
 {
-	s32_t e = -1, v, f = 0;
+	int32_t e = -1, v, f = 0;
 	int i;
 
 	if (len != 4) {
@@ -91,10 +91,10 @@ int lwm2m_f32_to_b32(float32_value_t *f32, u8_t *b32, size_t len)
 }
 
 /* convert from float64 to binary64 */
-int lwm2m_f64_to_b64(float64_value_t *f64, u8_t *b64, size_t len)
+int lwm2m_f64_to_b64(float64_value_t *f64, uint8_t *b64, size_t len)
 {
-	s64_t v, f = 0;
-	s32_t e = -1;
+	int64_t v, f = 0;
+	int32_t e = -1;
 	int i;
 
 	if (len != 8) {
@@ -115,7 +115,7 @@ int lwm2m_f64_to_b64(float64_value_t *f64, u8_t *b64, size_t len)
 		f >>= 1;
 
 		if (v & 1) {
-			f |= ((s64_t)1 << 52);
+			f |= ((int64_t)1 << 52);
 		}
 
 		v >>= 1;
@@ -135,7 +135,7 @@ int lwm2m_f64_to_b64(float64_value_t *f64, u8_t *b64, size_t len)
 			continue;
 		} else if (v >= LWM2M_FLOAT64_DEC_MAX) {
 			v -= LWM2M_FLOAT64_DEC_MAX;
-			f |= (s64_t)1 << (51 - i);
+			f |= (int64_t)1 << (51 - i);
 		}
 
 		if (v == 0) {
@@ -175,9 +175,9 @@ int lwm2m_f64_to_b64(float64_value_t *f64, u8_t *b64, size_t len)
 }
 
 /* convert from binary32 to float32 */
-int lwm2m_b32_to_f32(u8_t *b32, size_t len, float32_value_t *f32)
+int lwm2m_b32_to_f32(uint8_t *b32, size_t len, float32_value_t *f32)
 {
-	s32_t f, k, i, e;
+	int32_t f, k, i, e;
 	bool sign = false;
 
 	if (len != 4) {
@@ -197,10 +197,10 @@ int lwm2m_b32_to_f32(u8_t *b32, size_t len, float32_value_t *f32)
 	e -= 127;
 
 	/* enable "hidden" fraction bit 23 which is always 1 */
-	f  = ((s32_t)1 << 22);
+	f  = ((int32_t)1 << 22);
 	/* calc fraction: bits 22-0 */
-	f += ((s32_t)(b32[1] & 0x7F) << 16);
-	f += ((s32_t)b32[2] << 8);
+	f += ((int32_t)(b32[1] & 0x7F) << 16);
+	f += ((int32_t)b32[2] << 8);
 	f += b32[3];
 
 	/* handle whole number */
@@ -234,9 +234,9 @@ int lwm2m_b32_to_f32(u8_t *b32, size_t len, float32_value_t *f32)
 }
 
 /* convert from binary64 to float64 */
-int lwm2m_b64_to_f64(u8_t *b64, size_t len, float64_value_t *f64)
+int lwm2m_b64_to_f64(uint8_t *b64, size_t len, float64_value_t *f64)
 {
-	s64_t f, k;
+	int64_t f, k;
 	int i, e;
 	bool sign = false;
 
@@ -251,20 +251,20 @@ int lwm2m_b64_to_f64(u8_t *b64, size_t len, float64_value_t *f64)
 	sign = SHIFT_RIGHT(b64[0], 7, 0x1);
 
 	/* get exponent: bits 62-52 */
-	e  = SHIFT_LEFT((u16_t)b64[0], 4, 0x7F0);
+	e  = SHIFT_LEFT((uint16_t)b64[0], 4, 0x7F0);
 	e += SHIFT_RIGHT(b64[1], 4, 0xF);
 	/* remove bias */
 	e -= 1023;
 
 	/* enable "hidden" fraction bit 53 which is always 1 */
-	f  = ((s64_t)1 << 52);
+	f  = ((int64_t)1 << 52);
 	/* get fraction: bits 51-0 */
-	f += ((s64_t)(b64[1] & 0xF) << 48);
-	f += ((s64_t)b64[2] << 40);
-	f += ((s64_t)b64[3] << 32);
-	f += ((s64_t)b64[4] << 24);
-	f += ((s64_t)b64[5] << 16);
-	f += ((s64_t)b64[6] << 8);
+	f += ((int64_t)(b64[1] & 0xF) << 48);
+	f += ((int64_t)b64[2] << 40);
+	f += ((int64_t)b64[3] << 32);
+	f += ((int64_t)b64[4] << 24);
+	f += ((int64_t)b64[5] << 16);
+	f += ((int64_t)b64[6] << 8);
 	f += b64[7];
 
 	/* handle whole number */
@@ -288,7 +288,7 @@ int lwm2m_b64_to_f64(u8_t *b64, size_t len, float64_value_t *f64)
 
 	for (i = 51 - e; i >= 0; i--) {
 		k /= 2;
-		if (f & ((s64_t)1 << i)) {
+		if (f & ((int64_t)1 << i)) {
 			f64->val2 += k;
 
 		}
diff --git a/subsys/net/lib/lwm2m/lwm2m_util.h b/subsys/net/lib/lwm2m/lwm2m_util.h
index f24e1bcfae..9fbaada91a 100644
--- a/subsys/net/lib/lwm2m/lwm2m_util.h
+++ b/subsys/net/lib/lwm2m/lwm2m_util.h
@@ -10,11 +10,11 @@
 #include <net/lwm2m.h>
 
 /* convert float struct to binary format */
-int lwm2m_f32_to_b32(float32_value_t *f32, u8_t *b32, size_t len);
-int lwm2m_f64_to_b64(float64_value_t *f64, u8_t *b64, size_t len);
+int lwm2m_f32_to_b32(float32_value_t *f32, uint8_t *b32, size_t len);
+int lwm2m_f64_to_b64(float64_value_t *f64, uint8_t *b64, size_t len);
 
 /* convert binary format to float struct */
-int lwm2m_b32_to_f32(u8_t *b32, size_t len, float32_value_t *f32);
-int lwm2m_b64_to_f64(u8_t *b64, size_t len, float64_value_t *f64);
+int lwm2m_b32_to_f32(uint8_t *b32, size_t len, float32_value_t *f32);
+int lwm2m_b64_to_f64(uint8_t *b64, size_t len, float64_value_t *f64);
 
 #endif /* LWM2M_UTIL_H_ */
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index 7f609226f2..4f14931c70 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -138,8 +138,8 @@ static int client_read(struct mqtt_client *client)
 	return err_code;
 }
 
-static int client_write(struct mqtt_client *client, const u8_t *data,
-			u32_t datalen)
+static int client_write(struct mqtt_client *client, const uint8_t *data,
+			uint32_t datalen)
 {
 	int err_code;
 
@@ -607,7 +607,7 @@ int mqtt_abort(struct mqtt_client *client)
 int mqtt_live(struct mqtt_client *client)
 {
 	int err_code = 0;
-	u32_t elapsed_time;
+	uint32_t elapsed_time;
 	bool ping_sent = false;
 
 	NULL_PARAM_CHECK(client);
@@ -631,11 +631,11 @@ int mqtt_live(struct mqtt_client *client)
 	}
 }
 
-u32_t mqtt_keepalive_time_left(const struct mqtt_client *client)
+uint32_t mqtt_keepalive_time_left(const struct mqtt_client *client)
 {
-	u32_t elapsed_time = mqtt_elapsed_time_in_ms_get(
+	uint32_t elapsed_time = mqtt_elapsed_time_in_ms_get(
 					client->internal.last_activity);
-	u32_t keepalive_ms = 1000U * client->keepalive;
+	uint32_t keepalive_ms = 1000U * client->keepalive;
 
 	if (client->keepalive == 0) {
 		/* Keep alive not enabled. */
@@ -722,10 +722,10 @@ int mqtt_read_publish_payload_blocking(struct mqtt_client *client, void *buffer,
 	return read_publish_payload(client, buffer, length, true);
 }
 
-int mqtt_readall_publish_payload(struct mqtt_client *client, u8_t *buffer,
+int mqtt_readall_publish_payload(struct mqtt_client *client, uint8_t *buffer,
 				 size_t length)
 {
-	u8_t *end = buffer + length;
+	uint8_t *end = buffer + length;
 
 	while (buffer < end) {
 		int ret = mqtt_read_publish_payload_blocking(client, buffer,
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index 23915afd9d..9dd0601f21 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -27,11 +27,11 @@ LOG_MODULE_REGISTER(net_mqtt_dec, CONFIG_MQTT_LOG_LEVEL);
  * @retval 0 if the procedure is successful.
  * @retval -EINVAL if the buffer would be exceeded during the read
  */
-static int unpack_uint8(struct buf_ctx *buf, u8_t *val)
+static int unpack_uint8(struct buf_ctx *buf, uint8_t *val)
 {
 	MQTT_TRC(">> cur:%p, end:%p", buf->cur, buf->end);
 
-	if ((buf->end - buf->cur) < sizeof(u8_t)) {
+	if ((buf->end - buf->cur) < sizeof(uint8_t)) {
 		return -EINVAL;
 	}
 
@@ -53,11 +53,11 @@ static int unpack_uint8(struct buf_ctx *buf, u8_t *val)
  * @retval 0 if the procedure is successful.
  * @retval -EINVAL if the buffer would be exceeded during the read
  */
-static int unpack_uint16(struct buf_ctx *buf, u16_t *val)
+static int unpack_uint16(struct buf_ctx *buf, uint16_t *val)
 {
 	MQTT_TRC(">> cur:%p, end:%p", buf->cur, buf->end);
 
-	if ((buf->end - buf->cur) < sizeof(u16_t)) {
+	if ((buf->end - buf->cur) < sizeof(uint16_t)) {
 		return -EINVAL;
 	}
 
@@ -82,7 +82,7 @@ static int unpack_uint16(struct buf_ctx *buf, u16_t *val)
  */
 static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
 {
-	u16_t utf8_strlen;
+	uint16_t utf8_strlen;
 	int err_code;
 
 	MQTT_TRC(">> cur:%p, end:%p", buf->cur, buf->end);
@@ -106,7 +106,7 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
 		str->utf8 = NULL;
 	}
 
-	MQTT_TRC("<< str_size:%08x", (u32_t)GET_UT8STR_BUFFER_SIZE(str));
+	MQTT_TRC("<< str_size:%08x", (uint32_t)GET_UT8STR_BUFFER_SIZE(str));
 
 	return 0;
 }
@@ -123,7 +123,7 @@ static int unpack_utf8_str(struct buf_ctx *buf, struct mqtt_utf8 *str)
  * @retval 0 if the procedure is successful.
  * @retval -EINVAL if the buffer would be exceeded during the read
  */
-static int unpack_data(u32_t length, struct buf_ctx *buf,
+static int unpack_data(uint32_t length, struct buf_ctx *buf,
 		       struct mqtt_binstr *str)
 {
 	MQTT_TRC(">> cur:%p, end:%p", buf->cur, buf->end);
@@ -158,10 +158,10 @@ static int unpack_data(u32_t length, struct buf_ctx *buf,
  * @retval -EINVAL if the length decoding would use more that 4 bytes.
  * @retval -EAGAIN if the buffer would be exceeded during the read.
  */
-static int packet_length_decode(struct buf_ctx *buf, u32_t *length)
+static int packet_length_decode(struct buf_ctx *buf, uint32_t *length)
 {
-	u8_t shift = 0U;
-	u8_t bytes = 0U;
+	uint8_t shift = 0U;
+	uint8_t bytes = 0U;
 
 	*length = 0U;
 	do {
@@ -173,7 +173,7 @@ static int packet_length_decode(struct buf_ctx *buf, u32_t *length)
 			return -EAGAIN;
 		}
 
-		*length += ((u32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
+		*length += ((uint32_t)*(buf->cur) & MQTT_LENGTH_VALUE_MASK)
 								<< shift;
 		shift += MQTT_LENGTH_SHIFT;
 		bytes++;
@@ -188,8 +188,8 @@ static int packet_length_decode(struct buf_ctx *buf, u32_t *length)
 	return 0;
 }
 
-int fixed_header_decode(struct buf_ctx *buf, u8_t *type_and_flags,
-			u32_t *length)
+int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
+			uint32_t *length)
 {
 	int err_code;
 
@@ -205,7 +205,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 		       struct mqtt_connack_param *param)
 {
 	int err_code;
-	u8_t flags, ret_code;
+	uint8_t flags, ret_code;
 
 	err_code = unpack_uint8(buf, &flags);
 	if (err_code != 0) {
@@ -230,11 +230,11 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
 	return 0;
 }
 
-int publish_decode(u8_t flags, u32_t var_length, struct buf_ctx *buf,
+int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param)
 {
 	int err_code;
-	u32_t var_header_length;
+	uint32_t var_header_length;
 
 	param->dup_flag = flags & MQTT_HEADER_DUP_MASK;
 	param->retain_flag = flags & MQTT_HEADER_RETAIN_MASK;
@@ -245,7 +245,7 @@ int publish_decode(u8_t flags, u32_t var_length, struct buf_ctx *buf,
 		return err_code;
 	}
 
-	var_header_length = param->message.topic.topic.size + sizeof(u16_t);
+	var_header_length = param->message.topic.topic.size + sizeof(uint16_t);
 
 	if (param->message.topic.qos > MQTT_QOS_0_AT_MOST_ONCE) {
 		err_code = unpack_uint16(buf, &param->message_id);
@@ -253,7 +253,7 @@ int publish_decode(u8_t flags, u32_t var_length, struct buf_ctx *buf,
 			return err_code;
 		}
 
-		var_header_length += sizeof(u16_t);
+		var_header_length += sizeof(uint16_t);
 	}
 
 	if (var_length < var_header_length) {
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 4c70394eb0..e2decf7f34 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -22,13 +22,13 @@ static const struct mqtt_utf8 mqtt_3_1_1_proto_desc =
 	MQTT_UTF8_LITERAL("MQTT");
 
 /** Never changing ping request, needed for Keep Alive. */
-static const u8_t ping_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
+static const uint8_t ping_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 	MQTT_PKT_TYPE_PINGREQ,
 	0x00
 };
 
 /** Never changing disconnect request. */
-static const u8_t disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
+static const uint8_t disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
 	MQTT_PKT_TYPE_DISCONNECT,
 	0x00
 };
@@ -43,9 +43,9 @@ static const u8_t disc_packet[MQTT_FIXED_HEADER_MIN_SIZE] = {
  * @retval 0 if procedure is successful.
  * @retval -ENOMEM if there is no place in the buffer to store the value.
  */
-static int pack_uint8(u8_t val, struct buf_ctx *buf)
+static int pack_uint8(uint8_t val, struct buf_ctx *buf)
 {
-	if ((buf->end - buf->cur) < sizeof(u8_t)) {
+	if ((buf->end - buf->cur) < sizeof(uint8_t)) {
 		return -ENOMEM;
 	}
 
@@ -67,9 +67,9 @@ static int pack_uint8(u8_t val, struct buf_ctx *buf)
  * @retval 0 if the procedure is successful.
  * @retval -ENOMEM if there is no place in the buffer to store the value.
  */
-static int pack_uint16(u16_t val, struct buf_ctx *buf)
+static int pack_uint16(uint16_t val, struct buf_ctx *buf)
 {
-	if ((buf->end - buf->cur) < sizeof(u16_t)) {
+	if ((buf->end - buf->cur) < sizeof(uint16_t)) {
 		return -ENOMEM;
 	}
 
@@ -99,7 +99,7 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
 	}
 
 	MQTT_TRC(">> str_size:%08x cur:%p, end:%p",
-		 (u32_t)GET_UT8STR_BUFFER_SIZE(str), buf->cur, buf->end);
+		 (uint32_t)GET_UT8STR_BUFFER_SIZE(str), buf->cur, buf->end);
 
 	/* Pack length followed by string. */
 	(void)pack_uint16(str->size, buf);
@@ -135,9 +135,9 @@ static int pack_utf8_str(const struct mqtt_utf8 *str, struct buf_ctx *buf)
  *
  * @return Number of bytes needed to encode length value.
  */
-static u8_t packet_length_encode(u32_t length, struct buf_ctx *buf)
+static uint8_t packet_length_encode(uint32_t length, struct buf_ctx *buf)
 {
-	u8_t encoded_bytes = 0U;
+	uint8_t encoded_bytes = 0U;
 
 	MQTT_TRC(">> length:0x%08x cur:%p, end:%p", length,
 		 (buf == NULL) ? 0 : buf->cur, (buf == NULL) ? 0 : buf->end);
@@ -183,11 +183,11 @@ static u8_t packet_length_encode(u32_t length, struct buf_ctx *buf)
  * @retval 0 if the procedure is successful.
  * @retval -EMSGSIZE if the message is too big for MQTT.
  */
-static u32_t mqtt_encode_fixed_header(u8_t message_type, u8_t *start,
+static uint32_t mqtt_encode_fixed_header(uint8_t message_type, uint8_t *start,
 				      struct buf_ctx *buf)
 {
-	u32_t length = buf->cur - start;
-	u8_t fixed_header_length;
+	uint32_t length = buf->cur - start;
+	uint8_t fixed_header_length;
 
 	if (length > MQTT_MAX_PAYLOAD_SIZE) {
 		return -EMSGSIZE;
@@ -196,7 +196,7 @@ static u32_t mqtt_encode_fixed_header(u8_t message_type, u8_t *start,
 	MQTT_TRC("<< msg type:0x%02x length:0x%08x", message_type, length);
 
 	fixed_header_length = packet_length_encode(length, NULL);
-	fixed_header_length += sizeof(u8_t);
+	fixed_header_length += sizeof(uint8_t);
 
 	MQTT_TRC("Fixed header length = %02x", fixed_header_length);
 
@@ -243,11 +243,11 @@ static int zero_len_str_encode(struct buf_ctx *buf)
  *
  * @retval 0 or an error code indicating a reason for failure.
  */
-static int mqtt_message_id_only_enc(u8_t message_type, u16_t message_id,
+static int mqtt_message_id_only_enc(uint8_t message_type, uint16_t message_id,
 				    struct buf_ctx *buf)
 {
 	int err_code;
-	u8_t *start;
+	uint8_t *start;
 
 	/* Message id zero is not permitted by spec. */
 	if (message_id == 0U) {
@@ -269,13 +269,13 @@ static int mqtt_message_id_only_enc(u8_t message_type, u16_t message_id,
 int connect_request_encode(const struct mqtt_client *client,
 			   struct buf_ctx *buf)
 {
-	u8_t connect_flags = client->clean_session << 1;
-	const u8_t message_type =
+	uint8_t connect_flags = client->clean_session << 1;
+	const uint8_t message_type =
 			MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_CONNECT, 0, 0, 0);
 	const struct mqtt_utf8 *mqtt_proto_desc;
-	u8_t *connect_flags_pos;
+	uint8_t *connect_flags_pos;
 	int err_code;
-	u8_t *start;
+	uint8_t *start;
 
 	if (client->protocol_version == MQTT_VERSION_3_1_1) {
 		mqtt_proto_desc = &mqtt_3_1_1_proto_desc;
@@ -388,11 +388,11 @@ int connect_request_encode(const struct mqtt_client *client,
 
 int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
 {
-	const u8_t message_type = MQTT_MESSAGES_OPTIONS(
+	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
 			MQTT_PKT_TYPE_PUBLISH, param->dup_flag,
 			param->message.topic.qos, param->retain_flag);
 	int err_code;
-	u8_t *start;
+	uint8_t *start;
 
 	/* Message id zero is not permitted by spec. */
 	if ((param->message.topic.qos) && (param->message_id == 0U)) {
@@ -433,7 +433,7 @@ int publish_encode(const struct mqtt_publish_param *param, struct buf_ctx *buf)
 int publish_ack_encode(const struct mqtt_puback_param *param,
 		       struct buf_ctx *buf)
 {
-	const u8_t message_type =
+	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBACK, 0, 0, 0);
 
 	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
@@ -442,7 +442,7 @@ int publish_ack_encode(const struct mqtt_puback_param *param,
 int publish_receive_encode(const struct mqtt_pubrec_param *param,
 			   struct buf_ctx *buf)
 {
-	const u8_t message_type =
+	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREC, 0, 0, 0);
 
 	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
@@ -451,7 +451,7 @@ int publish_receive_encode(const struct mqtt_pubrec_param *param,
 int publish_release_encode(const struct mqtt_pubrel_param *param,
 			   struct buf_ctx *buf)
 {
-	const u8_t message_type =
+	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBREL, 0, 1, 0);
 
 	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
@@ -460,7 +460,7 @@ int publish_release_encode(const struct mqtt_pubrel_param *param,
 int publish_complete_encode(const struct mqtt_pubcomp_param *param,
 			    struct buf_ctx *buf)
 {
-	const u8_t message_type =
+	const uint8_t message_type =
 		MQTT_MESSAGES_OPTIONS(MQTT_PKT_TYPE_PUBCOMP, 0, 0, 0);
 
 	return mqtt_message_id_only_enc(message_type, param->message_id, buf);
@@ -481,10 +481,10 @@ int disconnect_encode(struct buf_ctx *buf)
 int subscribe_encode(const struct mqtt_subscription_list *param,
 		     struct buf_ctx *buf)
 {
-	const u8_t message_type = MQTT_MESSAGES_OPTIONS(
+	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
 			MQTT_PKT_TYPE_SUBSCRIBE, 0, 1, 0);
 	int err_code, i;
-	u8_t *start;
+	uint8_t *start;
 
 	/* Message id zero is not permitted by spec. */
 	if (param->message_id == 0U) {
@@ -518,10 +518,10 @@ int subscribe_encode(const struct mqtt_subscription_list *param,
 int unsubscribe_encode(const struct mqtt_subscription_list *param,
 		       struct buf_ctx *buf)
 {
-	const u8_t message_type = MQTT_MESSAGES_OPTIONS(
+	const uint8_t message_type = MQTT_MESSAGES_OPTIONS(
 		MQTT_PKT_TYPE_UNSUBSCRIBE, 0, MQTT_QOS_1_AT_LEAST_ONCE, 0);
 	int err_code, i;
-	u8_t *start;
+	uint8_t *start;
 
 	/* Reserve space for fixed header. */
 	buf->cur += MQTT_FIXED_HEADER_MAX_SIZE;
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index e4125f2633..291b03d146 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -68,7 +68,7 @@ extern "C" {
 #define MQTT_MAX_PAYLOAD_SIZE 0x0FFFFFFF
 
 /**@brief Computes total size needed to pack a UTF8 string. */
-#define GET_UT8STR_BUFFER_SIZE(STR) (sizeof(u16_t) + (STR)->size)
+#define GET_UT8STR_BUFFER_SIZE(STR) (sizeof(uint16_t) + (STR)->size)
 
 /**@brief Computes total size needed to pack a binary stream. */
 #define GET_BINSTR_BUFFER_SIZE(STR) ((STR)->len)
@@ -121,8 +121,8 @@ extern "C" {
 
 /** Buffer context to iterate over buffer. */
 struct buf_ctx {
-	u8_t *cur;
-	u8_t *end;
+	uint8_t *cur;
+	uint8_t *end;
 };
 
 /**@brief MQTT States. */
@@ -295,8 +295,8 @@ int ping_request_encode(struct buf_ctx *buf);
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int fixed_header_decode(struct buf_ctx *buf, u8_t *type_and_flags,
-			u32_t *length);
+int fixed_header_decode(struct buf_ctx *buf, uint8_t *type_and_flags,
+			uint32_t *length);
 
 /**@brief Decode MQTT Connect Ack packet.
  *
@@ -320,7 +320,7 @@ int connect_ack_decode(const struct mqtt_client *client, struct buf_ctx *buf,
  *
  * @return 0 if the procedure is successful, an error code otherwise.
  */
-int publish_decode(u8_t flags, u32_t var_length, struct buf_ctx *buf,
+int publish_decode(uint8_t flags, uint32_t var_length, struct buf_ctx *buf,
 		   struct mqtt_publish_param *param);
 
 /**@brief Decode MQTT Publish Ack packet.
diff --git a/subsys/net/lib/mqtt/mqtt_os.h b/subsys/net/lib/mqtt/mqtt_os.h
index 91e576dddb..85230997e5 100644
--- a/subsys/net/lib/mqtt/mqtt_os.h
+++ b/subsys/net/lib/mqtt/mqtt_os.h
@@ -72,7 +72,7 @@ static inline void mqtt_mutex_unlock(struct mqtt_client *client)
  *
  * @retval Current wall clock or sys tick value in milliseconds.
  */
-static inline u32_t mqtt_sys_tick_in_ms_get(void)
+static inline uint32_t mqtt_sys_tick_in_ms_get(void)
 {
 	return k_uptime_get_32();
 }
@@ -83,9 +83,9 @@ static inline u32_t mqtt_sys_tick_in_ms_get(void)
  *
  * @retval Time elapsed since last_activity time.
  */
-static inline u32_t mqtt_elapsed_time_in_ms_get(u32_t last_activity)
+static inline uint32_t mqtt_elapsed_time_in_ms_get(uint32_t last_activity)
 {
-	s32_t diff = k_uptime_get_32() - last_activity;
+	int32_t diff = k_uptime_get_32() - last_activity;
 
 	if (diff < 0) {
 		return 0;
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index d124d7ae19..5b582be756 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -17,8 +17,8 @@ LOG_MODULE_REGISTER(net_mqtt_rx, CONFIG_MQTT_LOG_LEVEL);
  */
 
 static int mqtt_handle_packet(struct mqtt_client *client,
-			      u8_t type_and_flags,
-			      u32_t var_length,
+			      uint8_t type_and_flags,
+			      uint32_t var_length,
 			      struct buf_ctx *buf)
 {
 	int err_code = 0;
@@ -144,9 +144,9 @@ static int mqtt_handle_packet(struct mqtt_client *client,
 }
 
 static int mqtt_read_message_chunk(struct mqtt_client *client,
-				   struct buf_ctx *buf, u32_t length)
+				   struct buf_ctx *buf, uint32_t length)
 {
-	u32_t remaining;
+	uint32_t remaining;
 	int len;
 
 	/* In case all data requested has already been buffered, return. */
@@ -190,15 +190,15 @@ static int mqtt_read_message_chunk(struct mqtt_client *client,
 }
 
 static int mqtt_read_publish_var_header(struct mqtt_client *client,
-					u8_t type_and_flags,
+					uint8_t type_and_flags,
 					struct buf_ctx *buf)
 {
-	u8_t qos = (type_and_flags & MQTT_HEADER_QOS_MASK) >> 1;
+	uint8_t qos = (type_and_flags & MQTT_HEADER_QOS_MASK) >> 1;
 	int err_code;
-	u32_t variable_header_length;
+	uint32_t variable_header_length;
 
 	/* Read topic length field. */
-	err_code = mqtt_read_message_chunk(client, buf, sizeof(u16_t));
+	err_code = mqtt_read_message_chunk(client, buf, sizeof(uint16_t));
 	if (err_code < 0) {
 		return err_code;
 	}
@@ -207,11 +207,11 @@ static int mqtt_read_publish_var_header(struct mqtt_client *client,
 	variable_header_length |= *(buf->cur + 1); /* LSB */
 
 	/* Add two bytes for topic length field. */
-	variable_header_length += sizeof(u16_t);
+	variable_header_length += sizeof(uint16_t);
 
 	/* Add two bytes for message_id, if needed. */
 	if (qos > MQTT_QOS_0_AT_MOST_ONCE) {
-		variable_header_length += sizeof(u16_t);
+		variable_header_length += sizeof(uint16_t);
 	}
 
 	/* Now we can read the whole header. */
@@ -225,12 +225,12 @@ static int mqtt_read_publish_var_header(struct mqtt_client *client,
 }
 
 static int mqtt_read_and_parse_fixed_header(struct mqtt_client *client,
-					    u8_t *type_and_flags,
-					    u32_t *var_length,
+					    uint8_t *type_and_flags,
+					    uint32_t *var_length,
 					    struct buf_ctx *buf)
 {
 	/* Read the mandatory part of the fixed header in first iteration. */
-	u8_t chunk_size = MQTT_FIXED_HEADER_MIN_SIZE;
+	uint8_t chunk_size = MQTT_FIXED_HEADER_MIN_SIZE;
 	int err_code;
 
 	do {
@@ -252,8 +252,8 @@ static int mqtt_read_and_parse_fixed_header(struct mqtt_client *client,
 int mqtt_handle_rx(struct mqtt_client *client)
 {
 	int err_code;
-	u8_t type_and_flags;
-	u32_t var_length;
+	uint8_t type_and_flags;
+	uint32_t var_length;
 	struct buf_ctx buf;
 
 	buf.cur = client->rx_buf;
diff --git a/subsys/net/lib/mqtt/mqtt_transport.c b/subsys/net/lib/mqtt/mqtt_transport.c
index d0bcdaf4c3..bc8b042ac1 100644
--- a/subsys/net/lib/mqtt/mqtt_transport.c
+++ b/subsys/net/lib/mqtt/mqtt_transport.c
@@ -54,8 +54,8 @@ int mqtt_transport_connect(struct mqtt_client *client)
 	return transport_fn[client->transport.type].connect(client);
 }
 
-int mqtt_transport_write(struct mqtt_client *client, const u8_t *data,
-			 u32_t datalen)
+int mqtt_transport_write(struct mqtt_client *client, const uint8_t *data,
+			 uint32_t datalen)
 {
 	return transport_fn[client->transport.type].write(client, data,
 							  datalen);
@@ -67,7 +67,7 @@ int mqtt_transport_write_msg(struct mqtt_client *client,
 	return transport_fn[client->transport.type].write_msg(client, message);
 }
 
-int mqtt_transport_read(struct mqtt_client *client, u8_t *data, u32_t buflen,
+int mqtt_transport_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen,
 			bool shall_block)
 {
 	return transport_fn[client->transport.type].read(client, data, buflen,
diff --git a/subsys/net/lib/mqtt/mqtt_transport.h b/subsys/net/lib/mqtt/mqtt_transport.h
index df7e3265e5..4bd8edce9b 100644
--- a/subsys/net/lib/mqtt/mqtt_transport.h
+++ b/subsys/net/lib/mqtt/mqtt_transport.h
@@ -23,15 +23,15 @@ typedef int (*transport_connect_handler_t)(struct mqtt_client *client);
 
 /**@brief Transport write handler. */
 typedef int (*transport_write_handler_t)(struct mqtt_client *client,
-					 const u8_t *data, u32_t datalen);
+					 const uint8_t *data, uint32_t datalen);
 
 /**@brief Transport write message handler, similar to POSIX sendmsg function. */
 typedef int (*transport_write_msg_handler_t)(struct mqtt_client *client,
 					     const struct msghdr *message);
 
 /**@brief Transport read handler. */
-typedef int (*transport_read_handler_t)(struct mqtt_client *client, u8_t *data,
-					u32_t buflen, bool shall_block);
+typedef int (*transport_read_handler_t)(struct mqtt_client *client, uint8_t *data,
+					uint32_t buflen, bool shall_block);
 
 /**@brief Transport disconnect handler. */
 typedef int (*transport_disconnect_handler_t)(struct mqtt_client *client);
@@ -80,8 +80,8 @@ int mqtt_transport_connect(struct mqtt_client *client);
  *
  * @retval 0 or an error code indicating reason for failure.
  */
-int mqtt_transport_write(struct mqtt_client *client, const u8_t *data,
-			 u32_t datalen);
+int mqtt_transport_write(struct mqtt_client *client, const uint8_t *data,
+			 uint32_t datalen);
 
 /**@brief Handles write message requests on configured transport.
  *
@@ -104,7 +104,7 @@ int mqtt_transport_write_msg(struct mqtt_client *client,
  * @retval Number of bytes read or an error code indicating reason for failure.
  *         0 if connection was closed.
  */
-int mqtt_transport_read(struct mqtt_client *client, u8_t *data, u32_t buflen,
+int mqtt_transport_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen,
 			bool shall_block);
 
 /**@brief Handles transport disconnection requests on configured transport.
@@ -117,34 +117,34 @@ int mqtt_transport_disconnect(struct mqtt_client *client);
 
 /* Transport handler functions for TCP socket transport. */
 int mqtt_client_tcp_connect(struct mqtt_client *client);
-int mqtt_client_tcp_write(struct mqtt_client *client, const u8_t *data,
-			  u32_t datalen);
+int mqtt_client_tcp_write(struct mqtt_client *client, const uint8_t *data,
+			  uint32_t datalen);
 int mqtt_client_tcp_write_msg(struct mqtt_client *client,
 			      const struct msghdr *message);
-int mqtt_client_tcp_read(struct mqtt_client *client, u8_t *data,
-			 u32_t buflen, bool shall_block);
+int mqtt_client_tcp_read(struct mqtt_client *client, uint8_t *data,
+			 uint32_t buflen, bool shall_block);
 int mqtt_client_tcp_disconnect(struct mqtt_client *client);
 
 #if defined(CONFIG_MQTT_LIB_TLS)
 /* Transport handler functions for TLS socket transport. */
 int mqtt_client_tls_connect(struct mqtt_client *client);
-int mqtt_client_tls_write(struct mqtt_client *client, const u8_t *data,
-			  u32_t datalen);
+int mqtt_client_tls_write(struct mqtt_client *client, const uint8_t *data,
+			  uint32_t datalen);
 int mqtt_client_tls_write_msg(struct mqtt_client *client,
 			      const struct msghdr *message);
-int mqtt_client_tls_read(struct mqtt_client *client, u8_t *data,
-			 u32_t buflen, bool shall_block);
+int mqtt_client_tls_read(struct mqtt_client *client, uint8_t *data,
+			 uint32_t buflen, bool shall_block);
 int mqtt_client_tls_disconnect(struct mqtt_client *client);
 #endif /* CONFIG_MQTT_LIB_TLS */
 
 #if defined(CONFIG_MQTT_LIB_WEBSOCKET)
 int mqtt_client_websocket_connect(struct mqtt_client *client);
-int mqtt_client_websocket_write(struct mqtt_client *client, const u8_t *data,
-				u32_t datalen);
+int mqtt_client_websocket_write(struct mqtt_client *client, const uint8_t *data,
+				uint32_t datalen);
 int mqtt_client_websocket_write_msg(struct mqtt_client *client,
 				    const struct msghdr *message);
-int mqtt_client_websocket_read(struct mqtt_client *client, u8_t *data,
-			       u32_t buflen, bool shall_block);
+int mqtt_client_websocket_read(struct mqtt_client *client, uint8_t *data,
+			       uint32_t buflen, bool shall_block);
 int mqtt_client_websocket_disconnect(struct mqtt_client *client);
 #endif
 
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
index 0e4c64fc20..b71c83ff3e 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
@@ -60,10 +60,10 @@ int mqtt_client_tcp_connect(struct mqtt_client *client)
 	return 0;
 }
 
-int mqtt_client_tcp_write(struct mqtt_client *client, const u8_t *data,
-			  u32_t datalen)
+int mqtt_client_tcp_write(struct mqtt_client *client, const uint8_t *data,
+			  uint32_t datalen)
 {
-	u32_t offset = 0U;
+	uint32_t offset = 0U;
 	int ret;
 
 	while (offset < datalen) {
@@ -93,7 +93,7 @@ int mqtt_client_tcp_write_msg(struct mqtt_client *client,
 	return 0;
 }
 
-int mqtt_client_tcp_read(struct mqtt_client *client, u8_t *data, u32_t buflen,
+int mqtt_client_tcp_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen,
 			 bool shall_block)
 {
 	int flags = 0;
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index f005ea8ffd..40937e2e62 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -98,10 +98,10 @@ error:
 	return -errno;
 }
 
-int mqtt_client_tls_write(struct mqtt_client *client, const u8_t *data,
-			  u32_t datalen)
+int mqtt_client_tls_write(struct mqtt_client *client, const uint8_t *data,
+			  uint32_t datalen)
 {
-	u32_t offset = 0U;
+	uint32_t offset = 0U;
 	int ret;
 
 	while (offset < datalen) {
@@ -130,7 +130,7 @@ int mqtt_client_tls_write_msg(struct mqtt_client *client,
 	return 0;
 }
 
-int mqtt_client_tls_read(struct mqtt_client *client, u8_t *data, u32_t buflen,
+int mqtt_client_tls_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen,
 			 bool shall_block)
 {
 	int flags = 0;
diff --git a/subsys/net/lib/mqtt/mqtt_transport_websocket.c b/subsys/net/lib/mqtt/mqtt_transport_websocket.c
index 1147853929..8e01dca92d 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_websocket.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_websocket.c
@@ -86,10 +86,10 @@ int mqtt_client_websocket_connect(struct mqtt_client *client)
 	return 0;
 }
 
-int mqtt_client_websocket_write(struct mqtt_client *client, const u8_t *data,
-				u32_t datalen)
+int mqtt_client_websocket_write(struct mqtt_client *client, const uint8_t *data,
+				uint32_t datalen)
 {
-	u32_t offset = 0U;
+	uint32_t offset = 0U;
 	int ret;
 
 	while (offset < datalen) {
@@ -137,11 +137,11 @@ int mqtt_client_websocket_write_msg(struct mqtt_client *client,
 	return len;
 }
 
-int mqtt_client_websocket_read(struct mqtt_client *client, u8_t *data,
-			       u32_t buflen, bool shall_block)
+int mqtt_client_websocket_read(struct mqtt_client *client, uint8_t *data,
+			       uint32_t buflen, bool shall_block)
 {
-	s32_t timeout = SYS_FOREVER_MS;
-	u32_t message_type = 0U;
+	int32_t timeout = SYS_FOREVER_MS;
+	uint32_t message_type = 0U;
 	int ret;
 
 	if (!shall_block) {
diff --git a/subsys/net/lib/openthread/platform/alarm.c b/subsys/net/lib/openthread/platform/alarm.c
index 512708d8a2..d3667032d9 100644
--- a/subsys/net/lib/openthread/platform/alarm.c
+++ b/subsys/net/lib/openthread/platform/alarm.c
@@ -47,8 +47,8 @@ void otPlatAlarmMilliStartAt(otInstance *aInstance, uint32_t t0, uint32_t dt)
 {
 	ARG_UNUSED(aInstance);
 
-	s64_t reftime = (s64_t)t0 + (s64_t)dt;
-	s64_t delta = -k_uptime_delta(&reftime);
+	int64_t reftime = (int64_t)t0 + (int64_t)dt;
+	int64_t delta = -k_uptime_delta(&reftime);
 
 	if (delta > 0) {
 		k_timer_start(&ot_timer, K_MSEC(delta), K_NO_WAIT);
diff --git a/subsys/net/lib/openthread/platform/flash.c b/subsys/net/lib/openthread/platform/flash.c
index cf0cc90527..94f0be07b5 100644
--- a/subsys/net/lib/openthread/platform/flash.c
+++ b/subsys/net/lib/openthread/platform/flash.c
@@ -13,7 +13,7 @@ static struct device *flash_dev;
 static size_t ot_flash_size;
 static size_t ot_flash_offset;
 
-static inline u32_t mapAddress(u32_t aAddress)
+static inline uint32_t mapAddress(uint32_t aAddress)
 {
 	return aAddress + ot_flash_offset;
 }
@@ -54,16 +54,16 @@ otError utilsFlashInit(void)
 	return OT_ERROR_NONE;
 }
 
-u32_t utilsFlashGetSize(void)
+uint32_t utilsFlashGetSize(void)
 {
 	return ot_flash_size;
 }
 
-otError utilsFlashErasePage(u32_t aAddress)
+otError utilsFlashErasePage(uint32_t aAddress)
 {
 	otError err = OT_ERROR_NONE;
 	struct flash_pages_info info;
-	u32_t address;
+	uint32_t address;
 
 	address = mapAddress(aAddress);
 	if (flash_get_page_info_by_offs(flash_dev, address, &info)) {
@@ -83,16 +83,16 @@ otError utilsFlashErasePage(u32_t aAddress)
 	return err;
 }
 
-otError utilsFlashStatusWait(u32_t aTimeout)
+otError utilsFlashStatusWait(uint32_t aTimeout)
 {
 	ARG_UNUSED(aTimeout);
 
 	return OT_ERROR_NONE;
 }
 
-u32_t utilsFlashWrite(u32_t aAddress, uint8_t *aData, u32_t aSize)
+uint32_t utilsFlashWrite(uint32_t aAddress, uint8_t *aData, uint32_t aSize)
 {
-	u32_t index = 0U;
+	uint32_t index = 0U;
 
 	flash_write_protection_set(flash_dev, false);
 	if (!flash_write(flash_dev, mapAddress(aAddress), aData, aSize)) {
@@ -103,9 +103,9 @@ u32_t utilsFlashWrite(u32_t aAddress, uint8_t *aData, u32_t aSize)
 	return index;
 }
 
-u32_t utilsFlashRead(u32_t aAddress, uint8_t *aData, u32_t aSize)
+uint32_t utilsFlashRead(uint32_t aAddress, uint8_t *aData, uint32_t aSize)
 {
-	u32_t index = 0U;
+	uint32_t index = 0U;
 
 	if (!flash_read(flash_dev, mapAddress(aAddress), aData, aSize)) {
 		index = aSize;
diff --git a/subsys/net/lib/openthread/platform/logging.c b/subsys/net/lib/openthread/platform/logging.c
index 83e3022aae..6a7c6e383f 100644
--- a/subsys/net/lib/openthread/platform/logging.c
+++ b/subsys/net/lib/openthread/platform/logging.c
@@ -25,7 +25,7 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion,
 	ARG_UNUSED(aLogRegion);
 
 	char logString[LOG_PARSE_BUFFER_SIZE + 1];
-	u16_t length = 0U;
+	uint16_t length = 0U;
 
 	/* Parse user string. */
 	va_list paramList;
diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c
index a6490c02bd..8a1b4c80eb 100644
--- a/subsys/net/lib/openthread/platform/radio.c
+++ b/subsys/net/lib/openthread/platform/radio.c
@@ -62,7 +62,7 @@ static otRadioState sState = OT_RADIO_STATE_DISABLED;
 
 static otRadioFrame sTransmitFrame;
 static otRadioFrame ack_frame;
-static u8_t ack_psdu[ACK_PKT_LENGTH];
+static uint8_t ack_psdu[ACK_PKT_LENGTH];
 
 static struct net_pkt *tx_pkt;
 static struct net_buf *tx_payload;
@@ -70,13 +70,13 @@ static struct net_buf *tx_payload;
 static struct device *radio_dev;
 static struct ieee802154_radio_api *radio_api;
 
-static s8_t tx_power;
-static u16_t channel;
+static int8_t tx_power;
+static uint16_t channel;
 static bool promiscuous;
 
-static u16_t energy_detection_time;
-static u8_t  energy_detection_channel;
-static s16_t energy_detected_value;
+static uint16_t energy_detection_time;
+static uint8_t  energy_detection_channel;
+static int16_t energy_detected_value;
 
 ATOMIC_DEFINE(pending_events, PENDING_EVENT_COUNT);
 K_THREAD_STACK_DEFINE(ot_task_stack, OT_WORKER_STACK_SIZE);
@@ -106,7 +106,7 @@ static inline void clear_pending_events(void)
 	atomic_clear(pending_events);
 }
 
-void energy_detected(struct device *dev, s16_t max_ed)
+void energy_detected(struct device *dev, int16_t max_ed)
 {
 	if (dev == radio_dev) {
 		energy_detected_value = max_ed;
@@ -374,7 +374,7 @@ void platformRadioProcess(otInstance *aInstance)
 
 		if (is_pending_event_set(PENDING_EVENT_DETECT_ENERGY_DONE)) {
 			otPlatRadioEnergyScanDone(aInstance,
-						(s8_t)energy_detected_value);
+						(int8_t)energy_detected_value);
 			reset_pending_event(PENDING_EVENT_DETECT_ENERGY_DONE);
 		}
 	}
@@ -391,7 +391,7 @@ uint16_t platformRadioChannelGet(otInstance *aInstance)
 	return channel;
 }
 
-void otPlatRadioSetPanId(otInstance *aInstance, u16_t aPanId)
+void otPlatRadioSetPanId(otInstance *aInstance, uint16_t aPanId)
 {
 	ARG_UNUSED(aInstance);
 
@@ -408,7 +408,7 @@ void otPlatRadioSetExtendedAddress(otInstance *aInstance,
 			  (struct ieee802154_filter *) &aExtAddress);
 }
 
-void otPlatRadioSetShortAddress(otInstance *aInstance, u16_t aShortAddress)
+void otPlatRadioSetShortAddress(otInstance *aInstance, uint16_t aShortAddress)
 {
 	ARG_UNUSED(aInstance);
 
@@ -458,7 +458,7 @@ otError otPlatRadioSleep(otInstance *aInstance)
 	return error;
 }
 
-otError otPlatRadioReceive(otInstance *aInstance, u8_t aChannel)
+otError otPlatRadioReceive(otInstance *aInstance, uint8_t aChannel)
 {
 	ARG_UNUSED(aInstance);
 
@@ -497,7 +497,7 @@ otRadioFrame *otPlatRadioGetTransmitBuffer(otInstance *aInstance)
 	return &sTransmitFrame;
 }
 
-static void get_rssi_energy_detected(struct device *dev, s16_t max_ed)
+static void get_rssi_energy_detected(struct device *dev, int16_t max_ed)
 {
 	ARG_UNUSED(dev);
 	energy_detected_value = max_ed;
@@ -506,9 +506,9 @@ static void get_rssi_energy_detected(struct device *dev, s16_t max_ed)
 
 int8_t otPlatRadioGetRssi(otInstance *aInstance)
 {
-	s8_t ret_rssi = INT8_MAX;
+	int8_t ret_rssi = INT8_MAX;
 	int error = 0;
-	const u16_t energy_detection_time = 1;
+	const uint16_t energy_detection_time = 1;
 	enum ieee802154_hw_caps radio_caps;
 	ARG_UNUSED(aInstance);
 
@@ -531,7 +531,7 @@ int8_t otPlatRadioGetRssi(otInstance *aInstance)
 		if (error == 0) {
 			k_sem_take(&radio_sem, K_FOREVER);
 
-			ret_rssi = (s8_t)energy_detected_value;
+			ret_rssi = (int8_t)energy_detected_value;
 		}
 	}
 
@@ -588,8 +588,8 @@ void otPlatRadioSetPromiscuous(otInstance *aInstance, bool aEnable)
 	radio_api->configure(radio_dev, IEEE802154_CONFIG_PROMISCUOUS, &config);
 }
 
-otError otPlatRadioEnergyScan(otInstance *aInstance, u8_t aScanChannel,
-			      u16_t aScanDuration)
+otError otPlatRadioEnergyScan(otInstance *aInstance, uint8_t aScanChannel,
+			      uint16_t aScanDuration)
 {
 	energy_detection_time    = aScanDuration;
 	energy_detection_channel = aScanChannel;
@@ -650,11 +650,11 @@ void otPlatRadioEnableSrcMatch(otInstance *aInstance, bool aEnable)
 }
 
 otError otPlatRadioAddSrcMatchShortEntry(otInstance *aInstance,
-					 const u16_t aShortAddress)
+					 const uint16_t aShortAddress)
 {
 	ARG_UNUSED(aInstance);
 
-	u8_t short_address[SHORT_ADDRESS_SIZE];
+	uint8_t short_address[SHORT_ADDRESS_SIZE];
 	struct ieee802154_config config = {
 		.ack_fpb.enabled = true,
 		.ack_fpb.addr = short_address,
@@ -678,7 +678,7 @@ otError otPlatRadioAddSrcMatchExtEntry(otInstance *aInstance,
 
 	struct ieee802154_config config = {
 		.ack_fpb.enabled = true,
-		.ack_fpb.addr = (u8_t *)aExtAddress->m8,
+		.ack_fpb.addr = (uint8_t *)aExtAddress->m8,
 		.ack_fpb.extended = true
 	};
 
@@ -691,11 +691,11 @@ otError otPlatRadioAddSrcMatchExtEntry(otInstance *aInstance,
 }
 
 otError otPlatRadioClearSrcMatchShortEntry(otInstance *aInstance,
-					   const u16_t aShortAddress)
+					   const uint16_t aShortAddress)
 {
 	ARG_UNUSED(aInstance);
 
-	u8_t short_address[SHORT_ADDRESS_SIZE];
+	uint8_t short_address[SHORT_ADDRESS_SIZE];
 	struct ieee802154_config config = {
 		.ack_fpb.enabled = false,
 		.ack_fpb.addr = short_address,
@@ -719,7 +719,7 @@ otError otPlatRadioClearSrcMatchExtEntry(otInstance *aInstance,
 
 	struct ieee802154_config config = {
 		.ack_fpb.enabled = false,
-		.ack_fpb.addr = (u8_t *)aExtAddress->m8,
+		.ack_fpb.addr = (uint8_t *)aExtAddress->m8,
 		.ack_fpb.extended = true
 	};
 
diff --git a/subsys/net/lib/openthread/platform/settings.c b/subsys/net/lib/openthread/platform/settings.c
index 37ba910a5f..d40ef49527 100644
--- a/subsys/net/lib/openthread/platform/settings.c
+++ b/subsys/net/lib/openthread/platform/settings.c
@@ -129,10 +129,10 @@ static bool ot_setting_exists(const char *path)
 
 struct ot_setting_read_ctx {
 	/* Buffer for the setting. */
-	u8_t *value;
+	uint8_t *value;
 
 	/* Buffer length on input, setting length read on output. */
-	u16_t *length;
+	uint16_t *length;
 
 	/* Current entry index, used to iterate over multiple setting
 	 * instances.
@@ -210,7 +210,7 @@ otError otPlatSettingsGet(otInstance *aInstance, uint16_t aKey, int aIndex,
 	char path[OT_SETTINGS_MAX_PATH_LEN];
 	struct ot_setting_read_ctx read_ctx = {
 		.value = aValue,
-		.length = (u16_t *)aValueLength,
+		.length = (uint16_t *)aValueLength,
 		.status = -ENOENT,
 		.target_index = aIndex
 	};
diff --git a/subsys/net/lib/openthread/platform/spi.c b/subsys/net/lib/openthread/platform/spi.c
index 99bacfe725..ea34fb660f 100644
--- a/subsys/net/lib/openthread/platform/spi.c
+++ b/subsys/net/lib/openthread/platform/spi.c
@@ -32,10 +32,10 @@ void otPlatSpiSlaveDisable(void)
 }
 
 otError otPlatSpiSlavePrepareTransaction(
-	u8_t *anOutputBuf,
-	u16_t anOutputBufLen,
-	u8_t *anInputBuf,
-	u16_t anInputBufLen,
+	uint8_t *anOutputBuf,
+	uint16_t anOutputBufLen,
+	uint8_t *anInputBuf,
+	uint16_t anInputBufLen,
 	bool aRequestTransactionFlag
 )
 {
diff --git a/subsys/net/lib/openthread/platform/uart.c b/subsys/net/lib/openthread/platform/uart.c
index 86ca768409..fcd359c93d 100644
--- a/subsys/net/lib/openthread/platform/uart.c
+++ b/subsys/net/lib/openthread/platform/uart.c
@@ -50,9 +50,9 @@ OT_UART_DEFINE(ot_uart, CONFIG_OPENTHREAD_NCP_UART_RING_BUFFER_SIZE);
 
 static void uart_rx_handle(void)
 {
-	u8_t *data;
-	u32_t len;
-	u32_t rd_len;
+	uint8_t *data;
+	uint32_t len;
+	uint32_t rd_len;
 	bool new_data = false;
 
 	do {
@@ -72,7 +72,7 @@ static void uart_rx_handle(void)
 			(void)err;
 			__ASSERT_NO_MSG(err == 0);
 		} else {
-			u8_t dummy;
+			uint8_t dummy;
 
 			/* No space in the ring buffer - consume byte. */
 			LOG_WRN("RX ring buffer full.");
@@ -89,10 +89,10 @@ static void uart_rx_handle(void)
 
 static void uart_tx_handle(void)
 {
-	u32_t len;
-	const u8_t *data;
+	uint32_t len;
+	const uint8_t *data;
 
-	len = ring_buf_get_claim(ot_uart.tx_ringbuf, (u8_t **)&data,
+	len = ring_buf_get_claim(ot_uart.tx_ringbuf, (uint8_t **)&data,
 				 ot_uart.tx_ringbuf->size);
 	if (len) {
 		int err;
@@ -128,13 +128,13 @@ static void uart_callback(void *user_data)
 
 void platformUartProcess(otInstance *aInstance)
 {
-	u32_t len = 0;
-	const u8_t *data;
+	uint32_t len = 0;
+	const uint8_t *data;
 
 	/* Process UART RX */
 	while ((len = ring_buf_get_claim(
 			ot_uart.rx_ringbuf,
-			(u8_t **)&data,
+			(uint8_t **)&data,
 			ot_uart.rx_ringbuf->size)) > 0) {
 		int err;
 
@@ -166,7 +166,7 @@ otError otPlatUartEnable(void)
 
 #ifdef CONFIG_OPENTHREAD_NCP_SPINEL_ON_UART_ACM
 	int ret = usb_enable(NULL);
-	u32_t baudrate = 0U;
+	uint32_t baudrate = 0U;
 
 	if (ret != 0) {
 		LOG_ERR("Failed to enable USB");
@@ -203,7 +203,7 @@ otError otPlatUartDisable(void)
 };
 
 
-otError otPlatUartSend(const u8_t *aBuf, u16_t aBufLength)
+otError otPlatUartSend(const uint8_t *aBuf, uint16_t aBufLength)
 {
 	size_t cnt = ring_buf_put(ot_uart.tx_ringbuf, aBuf, aBufLength);
 
diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c
index 7c7d4544b6..2aa6e40112 100644
--- a/subsys/net/lib/sntp/sntp.c
+++ b/subsys/net/lib/sntp/sntp.c
@@ -43,11 +43,11 @@ static void sntp_pkt_dump(struct sntp_pkt *pkt)
 	NET_DBG("tx_tm_f:         %x", pkt->tx_tm_f);
 }
 
-static s32_t parse_response(u8_t *data, u16_t len, u32_t orig_ts,
+static int32_t parse_response(uint8_t *data, uint16_t len, uint32_t orig_ts,
 			    struct sntp_time *time)
 {
 	struct sntp_pkt *pkt = (struct sntp_pkt *)data;
-	u32_t ts;
+	uint32_t ts;
 
 	sntp_pkt_dump(pkt);
 
@@ -99,7 +99,7 @@ static s32_t parse_response(u8_t *data, u16_t len, u32_t orig_ts,
 	return 0;
 }
 
-static int sntp_recv_response(struct sntp_ctx *sntp, u32_t timeout,
+static int sntp_recv_response(struct sntp_ctx *sntp, uint32_t timeout,
 			      struct sntp_time *time)
 {
 	struct sntp_pkt buf = { 0 };
@@ -116,7 +116,7 @@ static int sntp_recv_response(struct sntp_ctx *sntp, u32_t timeout,
 		return -ETIMEDOUT;
 	}
 
-	rcvd = recv(sntp->sock.fd, (u8_t *)&buf, sizeof(buf), 0);
+	rcvd = recv(sntp->sock.fd, (uint8_t *)&buf, sizeof(buf), 0);
 	if (rcvd < 0) {
 		return -errno;
 	}
@@ -125,15 +125,15 @@ static int sntp_recv_response(struct sntp_ctx *sntp, u32_t timeout,
 		return -EMSGSIZE;
 	}
 
-	status = parse_response((u8_t *)&buf, sizeof(buf),
+	status = parse_response((uint8_t *)&buf, sizeof(buf),
 				sntp->expected_orig_ts,
 				time);
 	return status;
 }
 
-static u32_t get_uptime_in_sec(void)
+static uint32_t get_uptime_in_sec(void)
 {
-	u64_t time;
+	uint64_t time;
 
 	time = k_uptime_get_32();
 
@@ -170,7 +170,7 @@ int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len)
 	return 0;
 }
 
-int sntp_request(struct sntp_ctx *ctx, u32_t timeout, u64_t *epoch_time)
+int sntp_request(struct sntp_ctx *ctx, uint32_t timeout, uint64_t *epoch_time)
 {
 	struct sntp_time time;
 	int res = sntp_query(ctx, timeout, &time);
@@ -180,7 +180,7 @@ int sntp_request(struct sntp_ctx *ctx, u32_t timeout, u64_t *epoch_time)
 	return res;
 }
 
-int sntp_query(struct sntp_ctx *ctx, u32_t timeout, struct sntp_time *time)
+int sntp_query(struct sntp_ctx *ctx, uint32_t timeout, struct sntp_time *time)
 {
 	struct sntp_pkt tx_pkt = { 0 };
 	int ret = 0;
@@ -196,7 +196,7 @@ int sntp_query(struct sntp_ctx *ctx, u32_t timeout, struct sntp_time *time)
 	ctx->expected_orig_ts = get_uptime_in_sec() + OFFSET_1970_JAN_1;
 	tx_pkt.tx_tm_s = htonl(ctx->expected_orig_ts);
 
-	ret = send(ctx->sock.fd, (u8_t *)&tx_pkt, sizeof(tx_pkt), 0);
+	ret = send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0);
 	if (ret < 0) {
 		NET_ERR("Failed to send over UDP socket %d", ret);
 		return ret;
diff --git a/subsys/net/lib/sntp/sntp_pkt.h b/subsys/net/lib/sntp/sntp_pkt.h
index d5af2423a1..4f04007116 100644
--- a/subsys/net/lib/sntp/sntp_pkt.h
+++ b/subsys/net/lib/sntp/sntp_pkt.h
@@ -26,21 +26,21 @@
 #define SNTP_SET_MODE(x, v) (x = x | (v << SNTP_MODE_SHIFT))
 
 struct sntp_pkt {
-	u8_t lvm;		/* li, vn, and mode in big endian fashion */
-	u8_t stratum;
-	u8_t poll;
-	u8_t precision;
-	u32_t root_delay;
-	u32_t root_dispersion;
-	u32_t ref_id;
-	u32_t ref_tm_s;
-	u32_t ref_tm_f;
-	u32_t orig_tm_s;	/* Originate timestamp seconds */
-	u32_t orig_tm_f;	/* Originate timsstamp seconds fraction */
-	u32_t rx_tm_s;		/* Receive timestamp seconds */
-	u32_t rx_tm_f;		/* Receive timestamp seconds fraction */
-	u32_t tx_tm_s;		/* Transimit timestamp seconds */
-	u32_t tx_tm_f;		/* Transimit timestamp seconds fraction */
+	uint8_t lvm;		/* li, vn, and mode in big endian fashion */
+	uint8_t stratum;
+	uint8_t poll;
+	uint8_t precision;
+	uint32_t root_delay;
+	uint32_t root_dispersion;
+	uint32_t ref_id;
+	uint32_t ref_tm_s;
+	uint32_t ref_tm_f;
+	uint32_t orig_tm_s;	/* Originate timestamp seconds */
+	uint32_t orig_tm_f;	/* Originate timsstamp seconds fraction */
+	uint32_t rx_tm_s;		/* Receive timestamp seconds */
+	uint32_t rx_tm_f;		/* Receive timestamp seconds fraction */
+	uint32_t tx_tm_s;		/* Transimit timestamp seconds */
+	uint32_t tx_tm_f;		/* Transimit timestamp seconds fraction */
 } __packed;
 
 #endif
diff --git a/subsys/net/lib/sntp/sntp_simple.c b/subsys/net/lib/sntp/sntp_simple.c
index c49a59c62a..5aa321eb06 100644
--- a/subsys/net/lib/sntp/sntp_simple.c
+++ b/subsys/net/lib/sntp/sntp_simple.c
@@ -8,14 +8,14 @@
 #include <net/sntp.h>
 #include <net/socketutils.h>
 
-int sntp_simple(const char *server, u32_t timeout, struct sntp_time *time)
+int sntp_simple(const char *server, uint32_t timeout, struct sntp_time *time)
 {
 	int res;
 	static struct addrinfo hints;
 	struct addrinfo *addr;
 	struct sntp_ctx sntp_ctx;
-	u64_t deadline;
-	u32_t iter_timeout;
+	uint64_t deadline;
+	uint32_t iter_timeout;
 
 	hints.ai_family = AF_INET;
 	hints.ai_socktype = SOCK_DGRAM;
@@ -37,9 +37,9 @@ int sntp_simple(const char *server, u32_t timeout, struct sntp_time *time)
 	}
 
 	if (timeout == SYS_FOREVER_MS) {
-		deadline = (u64_t)timeout;
+		deadline = (uint64_t)timeout;
 	} else {
-		deadline = k_uptime_get() + (u64_t)timeout;
+		deadline = k_uptime_get() + (uint64_t)timeout;
 	}
 
 	/* Timeout for current iteration */
diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c
index 409460c55d..ba7f1702b1 100644
--- a/subsys/net/lib/sockets/getaddrinfo.c
+++ b/subsys/net/lib/sockets/getaddrinfo.c
@@ -34,8 +34,8 @@ struct getaddrinfo_state {
 	const struct zsock_addrinfo *hints;
 	struct k_sem sem;
 	int status;
-	u16_t idx;
-	u16_t port;
+	uint16_t idx;
+	uint16_t port;
 	struct zsock_addrinfo *ai_arr;
 };
 
@@ -284,7 +284,7 @@ static inline int z_vrfy_z_zsock_getaddrinfo_internal(const char *host,
 {
 	struct zsock_addrinfo hints_copy;
 	char *host_copy = NULL, *service_copy = NULL;
-	u32_t ret;
+	uint32_t ret;
 
 	if (hints) {
 		Z_OOPS(z_user_from_copy(&hints_copy, (void *)hints,
diff --git a/subsys/net/lib/sockets/socketpair.c b/subsys/net/lib/sockets/socketpair.c
index 199803e805..fb5be1e69b 100644
--- a/subsys/net/lib/sockets/socketpair.c
+++ b/subsys/net/lib/sockets/socketpair.c
@@ -50,7 +50,7 @@ enum {
  */
 __net_socket struct spair {
 	int remote; /**< the remote endpoint file descriptor */
-	u32_t flags; /**< status and option bits */
+	uint32_t flags; /**< status and option bits */
 	struct k_sem sem; /**< semaphore for exclusive structure access */
 	struct k_pipe recv_q; /**< receive queue of local endpoint */
 	/** indicates write of local @a recv_q occurred */
@@ -58,7 +58,7 @@ __net_socket struct spair {
 	/** indicates read of local @a recv_q occurred */
 	struct k_poll_signal read_signal;
 	/** buffer for @a recv_q recv_q */
-	u8_t buf[CONFIG_NET_SOCKETPAIR_BUFFER_SIZE];
+	uint8_t buf[CONFIG_NET_SOCKETPAIR_BUFFER_SIZE];
 };
 
 /* forward declaration */
@@ -121,9 +121,9 @@ static inline size_t spair_read_avail(struct spair *spair)
 }
 
 /** Swap two 32-bit integers */
-static inline void swap32(u32_t *a, u32_t *b)
+static inline void swap32(uint32_t *a, uint32_t *b)
 {
-	u32_t c;
+	uint32_t c;
 
 	c = *b;
 	*b = *a;
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 8849137f01..0f5f02b77d 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -739,7 +739,7 @@ static int sock_get_pkt_src_addr(struct net_pkt *pkt,
 {
 	int ret = 0;
 	struct net_pkt_cursor backup;
-	u16_t *port;
+	uint16_t *port;
 
 	if (!addr || !pkt) {
 		return -EINVAL;
@@ -1155,9 +1155,9 @@ static int zsock_poll_update_ctx(struct net_context *ctx,
 	return 0;
 }
 
-static inline int time_left(u32_t start, u32_t timeout)
+static inline int time_left(uint32_t start, uint32_t timeout)
 {
-	u32_t elapsed = k_uptime_get_32() - start;
+	uint32_t elapsed = k_uptime_get_32() - start;
 
 	return timeout - elapsed;
 }
@@ -1173,7 +1173,7 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 	struct k_poll_event *pev_end = poll_events + ARRAY_SIZE(poll_events);
 	const struct fd_op_vtable *vtable;
 	k_timeout_t timeout;
-	u64_t end;
+	uint64_t end;
 
 	if (poll_timeout < 0) {
 		timeout = K_FOREVER;
@@ -1230,7 +1230,7 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 
 	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT) &&
 	    !K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-		s64_t remaining = end - z_tick_get();
+		int64_t remaining = end - z_tick_get();
 
 		if (remaining <= 0) {
 			timeout = K_NO_WAIT;
@@ -1295,7 +1295,7 @@ int z_impl_zsock_poll(struct zsock_pollfd *fds, int nfds, int poll_timeout)
 			}
 
 			if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
-				s64_t remaining = end - z_tick_get();
+				int64_t remaining = end - z_tick_get();
 
 				if (remaining <= 0) {
 					break;
diff --git a/subsys/net/lib/sockets/sockets_net_mgmt.c b/subsys/net/lib/sockets/sockets_net_mgmt.c
index d9e0346097..7f0fa64687 100644
--- a/subsys/net/lib/sockets/sockets_net_mgmt.c
+++ b/subsys/net/lib/sockets/sockets_net_mgmt.c
@@ -31,7 +31,7 @@ __net_socket struct net_mgmt_socket {
 	uintptr_t pid;
 
 	/* net_mgmt mask */
-	u32_t mask;
+	uint32_t mask;
 
 	/* Message allocation timeout */
 	k_timeout_t alloc_timeout;
@@ -43,7 +43,7 @@ __net_socket struct net_mgmt_socket {
 	int proto;
 
 	/* Is this entry in use (true) or not (false) */
-	u8_t is_in_use : 1;
+	uint8_t is_in_use : 1;
 };
 
 static struct net_mgmt_socket
@@ -145,11 +145,11 @@ static ssize_t znet_mgmt_recvfrom(struct net_mgmt_socket *mgmt, void *buf,
 {
 	struct sockaddr_nm *nm_addr = (struct sockaddr_nm *)src_addr;
 	k_timeout_t timeout = mgmt->wait_timeout;
-	u32_t raised_event = 0;
-	u8_t *copy_to = buf;
+	uint32_t raised_event = 0;
+	uint8_t *copy_to = buf;
 	struct net_mgmt_msghdr hdr;
 	struct net_if *iface;
-	const u8_t *info;
+	const uint8_t *info;
 	size_t info_len;
 	int ret;
 
diff --git a/subsys/net/lib/sockets/sockets_select.c b/subsys/net/lib/sockets/sockets_select.c
index 62ac1d9b19..a76c3f7f31 100644
--- a/subsys/net/lib/sockets/sockets_select.c
+++ b/subsys/net/lib/sockets/sockets_select.c
@@ -27,7 +27,7 @@ void ZSOCK_FD_ZERO(zsock_fd_set *set)
 
 int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set)
 {
-	u32_t word_idx, bit_mask;
+	uint32_t word_idx, bit_mask;
 
 	if (fd < 0 || fd >= ZSOCK_FD_SETSIZE) {
 		return 0;
@@ -40,7 +40,7 @@ int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set)
 
 void ZSOCK_FD_CLR(int fd, zsock_fd_set *set)
 {
-	u32_t word_idx, bit_mask;
+	uint32_t word_idx, bit_mask;
 
 	if (fd < 0 || fd >= ZSOCK_FD_SETSIZE) {
 		return;
@@ -53,7 +53,7 @@ void ZSOCK_FD_CLR(int fd, zsock_fd_set *set)
 
 void ZSOCK_FD_SET(int fd, zsock_fd_set *set)
 {
-	u32_t word_idx, bit_mask;
+	uint32_t word_idx, bit_mask;
 
 	if (fd < 0 || fd >= ZSOCK_FD_SETSIZE) {
 		return;
@@ -74,9 +74,9 @@ int zsock_select(int nfds, zsock_fd_set *readfds, zsock_fd_set *writefds,
 	int fd_no = 0;
 
 	for (i = 0; i < STRUCT_MEMBER_ARRAY_SIZE(zsock_fd_set, bitset); i++) {
-		u32_t bit_mask = 1U;
-		u32_t read_mask = 0U, write_mask = 0U, except_mask = 0U;
-		u32_t ored_mask;
+		uint32_t bit_mask = 1U;
+		uint32_t read_mask = 0U, write_mask = 0U, except_mask = 0U;
+		uint32_t ored_mask;
 
 		if (readfds != NULL) {
 			read_mask = readfds->bitset[i];
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index 67697d3185..a477317bd9 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -55,17 +55,17 @@ struct sec_tag_list {
 /** Timer context for DTLS. */
 struct dtls_timing_context {
 	/** Current time, stored during timer set. */
-	u32_t snapshot;
+	uint32_t snapshot;
 
 	/** Intermediate delay value. For details, refer to mbedTLS API
 	 *  documentation (mbedtls_ssl_set_timer_t).
 	 */
-	u32_t int_ms;
+	uint32_t int_ms;
 
 	/** Final delay value. For details, refer to mbedTLS API documentation
 	 *  (mbedtls_ssl_set_timer_t).
 	 */
-	u32_t fin_ms;
+	uint32_t fin_ms;
 };
 
 /** TLS context information. */
@@ -98,10 +98,10 @@ struct tls_context {
 		bool is_hostname_set;
 
 		/** Peer verification level. */
-		s8_t verify_level;
+		int8_t verify_level;
 
 		/** DTLS role, client by default. */
-		s8_t role;
+		int8_t role;
 	} options;
 
 #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS)
@@ -185,11 +185,11 @@ static int tls_entropy_func(void *ctx, unsigned char *buf, size_t len)
 	ARG_UNUSED(ctx);
 
 	size_t i = len / 4;
-	u32_t val;
+	uint32_t val;
 
 	while (i--) {
 		val = sys_rand32_get();
-		UNALIGNED_PUT(val, (u32_t *)buf);
+		UNALIGNED_PUT(val, (uint32_t *)buf);
 		buf += 4;
 	}
 
@@ -399,9 +399,9 @@ static int tls_release(struct tls_context *tls)
 	return 0;
 }
 
-static inline int time_left(u32_t start, u32_t timeout)
+static inline int time_left(uint32_t start, uint32_t timeout)
 {
-	u32_t elapsed = k_uptime_get_32() - start;
+	uint32_t elapsed = k_uptime_get_32() - start;
 
 	return timeout - elapsed;
 }
@@ -483,7 +483,7 @@ static int dtls_rx(void *ctx, unsigned char *buf, size_t len,
 			  sock_is_nonblock(net_ctx));
 	k_timeout_t timeout = (dtls_timeout == 0U) ? K_FOREVER :
 						     K_MSEC(dtls_timeout);
-	u64_t end = z_timeout_end_calc(timeout);
+	uint64_t end = z_timeout_end_calc(timeout);
 	socklen_t addrlen = sizeof(struct sockaddr);
 	struct sockaddr addr;
 	int err;
@@ -543,7 +543,7 @@ static int dtls_rx(void *ctx, unsigned char *buf, size_t len,
 
 			if (!K_TIMEOUT_EQ(timeout, K_FOREVER)) {
 				/* Recalculate the timeout value. */
-				s64_t remaining = end - z_tick_get();
+				int64_t remaining = end - z_tick_get();
 
 				if (remaining <= 0) {
 					return MBEDTLS_ERR_SSL_TIMEOUT;
diff --git a/subsys/net/lib/socks/socks.c b/subsys/net/lib/socks/socks.c
index 3fc5ded212..97df431d1a 100644
--- a/subsys/net/lib/socks/socks.c
+++ b/subsys/net/lib/socks/socks.c
@@ -31,7 +31,7 @@ static void socks5_method_rsp_cb(struct net_context *ctx,
 		goto end;
 	}
 
-	if (net_pkt_read(pkt, (u8_t *)method_rsp,
+	if (net_pkt_read(pkt, (uint8_t *)method_rsp,
 			 sizeof(struct socks5_method_response))) {
 		memset(method_rsp, 0, sizeof(struct socks5_method_response));
 	}
@@ -59,7 +59,7 @@ static void socks5_cmd_rsp_cb(struct net_context *ctx,
 
 	size = sizeof(struct socks5_command_request_common);
 
-	if (net_pkt_read(pkt, (u8_t *)cmd_rsp, size)) {
+	if (net_pkt_read(pkt, (uint8_t *)cmd_rsp, size)) {
 		memset(cmd_rsp, 0,
 		       sizeof(struct socks5_command_request_common));
 	}
@@ -91,7 +91,7 @@ static int socks5_tcp_connect(struct net_context *ctx,
 	/* size + 1 because just one method is supported */
 	size = sizeof(struct socks5_method_request_common) + 1;
 
-	ret = net_context_sendto(ctx, (u8_t *)&method_req, size,
+	ret = net_context_sendto(ctx, (uint8_t *)&method_req, size,
 				 proxy, proxy_len, NULL, K_NO_WAIT,
 				 ctx->user_data);
 	if (ret < 0) {
@@ -129,7 +129,7 @@ static int socks5_tcp_connect(struct net_context *ctx,
 		cmd_req.r.atyp = SOCKS5_ATYP_IPV4;
 
 		memcpy(&cmd_req.ipv4_addr.addr,
-		       (u8_t *)&d4->sin_addr,
+		       (uint8_t *)&d4->sin_addr,
 		       sizeof(cmd_req.ipv4_addr.addr));
 
 		cmd_req.ipv4_addr.port = d4->sin_port;
@@ -143,7 +143,7 @@ static int socks5_tcp_connect(struct net_context *ctx,
 		cmd_req.r.atyp = SOCKS5_ATYP_IPV6;
 
 		memcpy(&cmd_req.ipv6_addr.addr,
-		       (u8_t *)&d6->sin6_addr,
+		       (uint8_t *)&d6->sin6_addr,
 		       sizeof(cmd_req.ipv6_addr.addr));
 
 		cmd_req.ipv6_addr.port = d6->sin6_port;
@@ -152,7 +152,7 @@ static int socks5_tcp_connect(struct net_context *ctx,
 			+ sizeof(struct socks5_ipv6_addr);
 	}
 
-	ret = net_context_sendto(ctx, (u8_t *)&cmd_req, size,
+	ret = net_context_sendto(ctx, (uint8_t *)&cmd_req, size,
 				 proxy, proxy_len, NULL, K_NO_WAIT,
 				 ctx->user_data);
 	if (ret < 0) {
diff --git a/subsys/net/lib/socks/socks_internal.h b/subsys/net/lib/socks/socks_internal.h
index cbbe38f012..0bf6727011 100644
--- a/subsys/net/lib/socks/socks_internal.h
+++ b/subsys/net/lib/socks/socks_internal.h
@@ -34,35 +34,35 @@
 #define SOCKS5_CMD_RESP_ATYP_NOT_SUPPORTED	0x08
 
 struct socks5_method_request_common {
-	u8_t ver;
-	u8_t nmethods;
+	uint8_t ver;
+	uint8_t nmethods;
 } __packed;
 
 struct socks5_method_request {
 	struct socks5_method_request_common r;
-	u8_t methods[255];
+	uint8_t methods[255];
 } __packed;
 
 struct socks5_method_response {
-	u8_t ver;
-	u8_t method;
+	uint8_t ver;
+	uint8_t method;
 } __packed;
 
 struct socks5_ipv4_addr {
-	u8_t addr[4];
-	u16_t port;
+	uint8_t addr[4];
+	uint16_t port;
 } __packed;
 
 struct socks5_ipv6_addr {
-	u8_t addr[16];
-	u16_t port;
+	uint8_t addr[16];
+	uint16_t port;
 } __packed;
 
 struct socks5_command_request_common {
-	u8_t ver;
-	u8_t cmd;
-	u8_t rsv;
-	u8_t atyp;
+	uint8_t ver;
+	uint8_t cmd;
+	uint8_t rsv;
+	uint8_t atyp;
 } __packed;
 
 struct socks5_command_request {
@@ -74,10 +74,10 @@ struct socks5_command_request {
 } __packed;
 
 struct socks5_command_response_common {
-	u8_t ver;
-	u8_t rep;
-	u8_t rsv;
-	u8_t atyp;
+	uint8_t ver;
+	uint8_t rep;
+	uint8_t rsv;
+	uint8_t atyp;
 } __packed;
 
 struct socks5_command_response {
diff --git a/subsys/net/lib/tftp/tftp_client.c b/subsys/net/lib/tftp/tftp_client.c
index 06567d0f54..e0cb67f9f4 100644
--- a/subsys/net/lib/tftp/tftp_client.c
+++ b/subsys/net/lib/tftp/tftp_client.c
@@ -12,12 +12,12 @@ LOG_MODULE_REGISTER(tftp_client, LOG_LEVEL_DBG);
 #include "tftp_client.h"
 
 /* TFTP Global Buffer. */
-static u8_t   tftpc_buffer[TFTPC_MAX_BUF_SIZE];
-static u32_t  tftpc_buffer_size;
+static uint8_t   tftpc_buffer[TFTPC_MAX_BUF_SIZE];
+static uint32_t  tftpc_buffer_size;
 
 /* TFTP Request block number property. */
-static u32_t  tftpc_block_no;
-static u32_t  tftpc_index;
+static uint32_t  tftpc_block_no;
+static uint32_t  tftpc_index;
 
 /* Global mutex to protect critical resources. */
 K_MUTEX_DEFINE(tftpc_lock);
@@ -27,10 +27,10 @@ K_MUTEX_DEFINE(tftpc_lock);
  * returns a read request packet. This packet can be sent
  * out directly to the TFTP server.
  */
-static u32_t make_request(const char *remote_file, const char *mode,
-			  u8_t request_type)
+static uint32_t make_request(const char *remote_file, const char *mode,
+			  uint8_t request_type)
 {
-	u32_t      req_size;
+	uint32_t      req_size;
 	const char def_mode[] = "octet";
 
 	/* Populate the read request with the provided params. Note that this
@@ -72,7 +72,7 @@ static u32_t make_request(const char *remote_file, const char *mode,
  */
 static inline int send_err(int sock, int err_code, char *err_string)
 {
-	u32_t req_size;
+	uint32_t req_size;
 
 	LOG_ERR("Client Error. Sending code: %d(%s)", err_code, err_string);
 
@@ -128,7 +128,7 @@ static int tftpc_recv_data(int sock)
  */
 static int tftpc_process_resp(int sock, struct tftpc *client)
 {
-	u16_t    block_no;
+	uint16_t    block_no;
 
 	/* Get the block number as received in the packet. */
 	block_no = sys_get_be16(tftpc_buffer + 2);
@@ -181,11 +181,11 @@ static int tftpc_process_resp(int sock, struct tftpc *client)
  * -> DATA_OPCODE:  If the remote server responded with "Data".
  * -> ACK_OPCODE:   If the remote server responded with "Ack".
  */
-static int tftp_send_request(int sock, u8_t request,
+static int tftp_send_request(int sock, uint8_t request,
 			     const char *remote_file, const char *mode)
 {
-	u8_t    retx_cnt = 0;
-	u32_t   req_size;
+	uint8_t    retx_cnt = 0;
+	uint32_t   req_size;
 
 	/* Create TFTP Request. */
 	req_size = make_request(remote_file, mode, request);
@@ -223,9 +223,9 @@ int tftp_get(struct sockaddr *server, struct tftpc *client,
 	     const char *remote_file, const char *mode)
 {
 
-	s32_t   stat     = TFTPC_UNKNOWN_FAILURE;
-	u8_t    retx_cnt = 0;
-	s32_t   sock;
+	int32_t   stat     = TFTPC_UNKNOWN_FAILURE;
+	uint8_t    retx_cnt = 0;
+	int32_t   sock;
 
 	/* Re-init the global "block number" variable. */
 	tftpc_block_no = 1;
diff --git a/subsys/net/lib/tftp/tftp_client.h b/subsys/net/lib/tftp/tftp_client.h
index 5b35c7ae56..44bac42870 100644
--- a/subsys/net/lib/tftp/tftp_client.h
+++ b/subsys/net/lib/tftp/tftp_client.h
@@ -44,7 +44,7 @@
  */
 static inline int send_ack(int sock, int block)
 {
-	u8_t tmp[4];
+	uint8_t tmp[4];
 
 	LOG_INF("Client acking Block Number: %d", block);
 
diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c
index a0c2b0ff29..7019a02cac 100644
--- a/subsys/net/lib/websocket/websocket.c
+++ b/subsys/net/lib/websocket/websocket.c
@@ -171,7 +171,7 @@ static int on_header_field(struct http_parser *parser, const char *at,
 						internal.parser);
 	struct websocket_context *ctx = req->internal.user_data;
 	const char *ws_accept_str = "Sec-WebSocket-Accept";
-	u16_t len;
+	uint16_t len;
 
 	len = strlen(ws_accept_str);
 	if (length >= len && strncasecmp(at, ws_accept_str, len) == 0) {
@@ -224,21 +224,21 @@ static int on_header_value(struct http_parser *parser, const char *at,
 }
 
 int websocket_connect(int sock, struct websocket_request *wreq,
-		      s32_t timeout, void *user_data)
+		      int32_t timeout, void *user_data)
 {
 	/* This is the expected Sec-WebSocket-Accept key. We are storing a
 	 * pointer to this in ctx but the value is only used for the duration
 	 * of this function call so there is no issue even if this variable
 	 * is allocated from stack.
 	 */
-	u8_t sec_accept_key[WS_SHA1_OUTPUT_LEN];
+	uint8_t sec_accept_key[WS_SHA1_OUTPUT_LEN];
 	struct http_parser_settings http_parser_settings;
 	struct websocket_context *ctx;
 	struct http_request req;
 	int ret, fd, key_len;
 	size_t olen;
 	char key_accept[MAX_SEC_ACCEPT_LEN + sizeof(WS_MAGIC)];
-	u32_t rnd_value = sys_rand32_get();
+	uint32_t rnd_value = sys_rand32_get();
 	char sec_ws_key[] =
 		"Sec-WebSocket-Key: 0123456789012345678901==\r\n";
 	char *headers[] = {
@@ -438,9 +438,9 @@ static int websocket_ioctl_vmeth(void *obj, unsigned int request, va_list args)
 }
 
 static int websocket_prepare_and_send(struct websocket_context *ctx,
-				      u8_t *header, size_t header_len,
-				      u8_t *payload, size_t payload_len,
-				      s32_t timeout)
+				      uint8_t *header, size_t header_len,
+				      uint8_t *payload, size_t payload_len,
+				      int32_t timeout)
 {
 	struct iovec io_vector[2];
 	struct msghdr msg;
@@ -477,13 +477,13 @@ static int websocket_prepare_and_send(struct websocket_context *ctx,
 #endif /* CONFIG_NET_TEST */
 }
 
-int websocket_send_msg(int ws_sock, const u8_t *payload, size_t payload_len,
+int websocket_send_msg(int ws_sock, const uint8_t *payload, size_t payload_len,
 		       enum websocket_opcode opcode, bool mask, bool final,
-		       s32_t timeout)
+		       int32_t timeout)
 {
 	struct websocket_context *ctx;
-	u8_t header[MAX_HEADER_LEN], hdr_len = 2;
-	u8_t *data_to_send = (u8_t *)payload;
+	uint8_t header[MAX_HEADER_LEN], hdr_len = 2;
+	uint8_t *data_to_send = (uint8_t *)payload;
 	int ret;
 
 	if (opcode != WEBSOCKET_OPCODE_DATA_TEXT &&
@@ -584,14 +584,14 @@ quit:
 	return ret - hdr_len;
 }
 
-static bool websocket_parse_header(u8_t *buf, size_t buf_len, bool *masked,
-				   u32_t *mask_value, u64_t *message_length,
-				   u32_t *message_type_flag,
+static bool websocket_parse_header(uint8_t *buf, size_t buf_len, bool *masked,
+				   uint32_t *mask_value, uint64_t *message_length,
+				   uint32_t *message_type_flag,
 				   size_t *header_len)
 {
-	u8_t len_len; /* length of the length field in header */
-	u8_t len;     /* message length byte */
-	u16_t value;
+	uint8_t len_len; /* length of the length field in header */
+	uint8_t len;     /* message length byte */
+	uint16_t value;
 
 	value = sys_get_be16(&buf[0]);
 	if (value & 0x8000) {
@@ -648,8 +648,8 @@ static bool websocket_parse_header(u8_t *buf, size_t buf_len, bool *masked,
 	return false;
 }
 
-int websocket_recv_msg(int ws_sock, u8_t *buf, size_t buf_len,
-		       u32_t *message_type, u64_t *remaining, s32_t timeout)
+int websocket_recv_msg(int ws_sock, uint8_t *buf, size_t buf_len,
+		       uint32_t *message_type, uint64_t *remaining, int32_t timeout)
 {
 	struct websocket_context *ctx;
 	size_t header_len = 0;
@@ -667,7 +667,7 @@ int websocket_recv_msg(int ws_sock, u8_t *buf, size_t buf_len,
 	 * the data directly here when testing this function.
 	 */
 	struct test_data {
-		u8_t *input_buf;
+		uint8_t *input_buf;
 		size_t input_len;
 		struct websocket_context *ctx;
 	};
@@ -832,7 +832,7 @@ int websocket_recv_msg(int ws_sock, u8_t *buf, size_t buf_len,
 		 * which byte from masking value to take. The mask_shift will
 		 * tell that.
 		 */
-		int mask_shift = (ctx->total_read - recv_len) % sizeof(u32_t);
+		int mask_shift = (ctx->total_read - recv_len) % sizeof(uint32_t);
 		int i;
 
 		for (i = 0; i < recv_len; i++) {
@@ -859,8 +859,8 @@ int websocket_recv_msg(int ws_sock, u8_t *buf, size_t buf_len,
 	return recv_len;
 }
 
-static int websocket_send(struct websocket_context *ctx, const u8_t *buf,
-			  size_t buf_len, s32_t timeout)
+static int websocket_send(struct websocket_context *ctx, const uint8_t *buf,
+			  size_t buf_len, int32_t timeout)
 {
 	int ret;
 
@@ -879,11 +879,11 @@ static int websocket_send(struct websocket_context *ctx, const u8_t *buf,
 	return ret;
 }
 
-static int websocket_recv(struct websocket_context *ctx, u8_t *buf,
-			  size_t buf_len, s32_t timeout)
+static int websocket_recv(struct websocket_context *ctx, uint8_t *buf,
+			  size_t buf_len, int32_t timeout)
 {
-	u32_t message_type;
-	u64_t remaining;
+	uint32_t message_type;
+	uint64_t remaining;
 	int ret;
 
 	NET_DBG("[%p] Waiting data, buf len %zd bytes", ctx, buf_len);
@@ -920,7 +920,7 @@ static ssize_t websocket_sendto_ctx(void *obj, const void *buf, size_t len,
 				    socklen_t addrlen)
 {
 	struct websocket_context *ctx = obj;
-	s32_t timeout = SYS_FOREVER_MS;
+	int32_t timeout = SYS_FOREVER_MS;
 
 	if (flags & ZSOCK_MSG_DONTWAIT) {
 		timeout = 0;
@@ -937,7 +937,7 @@ static ssize_t websocket_recvfrom_ctx(void *obj, void *buf, size_t max_len,
 				      socklen_t *addrlen)
 {
 	struct websocket_context *ctx = obj;
-	s32_t timeout = SYS_FOREVER_MS;
+	int32_t timeout = SYS_FOREVER_MS;
 
 	if (flags & ZSOCK_MSG_DONTWAIT) {
 		timeout = 0;
diff --git a/subsys/net/lib/websocket/websocket_internal.h b/subsys/net/lib/websocket/websocket_internal.h
index 42a1033172..2cb36b6693 100644
--- a/subsys/net/lib/websocket/websocket_internal.h
+++ b/subsys/net/lib/websocket/websocket_internal.h
@@ -35,7 +35,7 @@ __net_socket struct websocket_context {
 		/** This is used during HTTP handshake to verify that the
 		 * peer sent proper Sec-WebSocket-Accept key.
 		 */
-		u8_t *sec_accept_key;
+		uint8_t *sec_accept_key;
 	};
 
 	/** Reference count.
@@ -63,7 +63,7 @@ __net_socket struct websocket_context {
 	 * headers. User must provide the actual buffer where the headers are
 	 * stored temporarily.
 	 */
-	u8_t *tmp_buf;
+	uint8_t *tmp_buf;
 
 	/** Temporary buffer length.
 	 */
@@ -78,31 +78,31 @@ __net_socket struct websocket_context {
 	int real_sock;
 
 	/** Websocket connection masking value */
-	u32_t masking_value;
+	uint32_t masking_value;
 
 	/** Amount of data received. */
-	u64_t total_read;
+	uint64_t total_read;
 
 	/** Message length */
-	u64_t message_len;
+	uint64_t message_len;
 
 	/** Message type */
-	u32_t message_type;
+	uint32_t message_type;
 
 	/** Is the message masked */
-	u8_t masked : 1;
+	uint8_t masked : 1;
 
 	/** Did we receive Sec-WebSocket-Accept: field */
-	u8_t sec_accept_present : 1;
+	uint8_t sec_accept_present : 1;
 
 	/** Is Sec-WebSocket-Accept field correct */
-	u8_t sec_accept_ok : 1;
+	uint8_t sec_accept_ok : 1;
 
 	/** Did we receive all from peer during HTTP handshake */
-	u8_t all_received : 1;
+	uint8_t all_received : 1;
 
 	/** Header received */
-	u8_t header_received : 1;
+	uint8_t header_received : 1;
 };
 
 /**
diff --git a/subsys/power/device.c b/subsys/power/device.c
index ac56780cce..2f2207012f 100644
--- a/subsys/power/device.c
+++ b/subsys/power/device.c
@@ -50,7 +50,7 @@ static const char *const core_devices[] = {
 #endif
 
 /* Ordinal of sufficient size to index available devices. */
-typedef u16_t device_idx_t;
+typedef uint16_t device_idx_t;
 
 /* The maximum value representable with a device_idx_t. */
 #define DEVICE_IDX_MAX ((device_idx_t)(-1))
@@ -69,7 +69,7 @@ static device_idx_t num_pm;
 /* Number of devices successfully suspended. */
 static device_idx_t num_susp;
 
-const char *device_pm_state_str(u32_t state)
+const char *device_pm_state_str(uint32_t state)
 {
 	switch (state) {
 	case DEVICE_PM_ACTIVE_STATE:
@@ -87,7 +87,7 @@ const char *device_pm_state_str(u32_t state)
 	}
 }
 
-static int _sys_pm_devices(u32_t state)
+static int _sys_pm_devices(uint32_t state)
 {
 	num_susp = 0;
 
diff --git a/subsys/power/device_pm.c b/subsys/power/device_pm.c
index 5b46282cc5..45e8a23cf0 100644
--- a/subsys/power/device_pm.c
+++ b/subsys/power/device_pm.c
@@ -23,7 +23,7 @@ static void device_pm_callback(struct device *dev,
 	__ASSERT(retval == 0, "Device set power state failed");
 
 	/* Set the fsm_state */
-	if (*((u32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
+	if (*((uint32_t *)context) == DEVICE_PM_ACTIVE_STATE) {
 		atomic_set(&dev->pm->fsm_state,
 			   DEVICE_PM_FSM_STATE_ACTIVE);
 	} else {
@@ -40,7 +40,7 @@ static void pm_work_handler(struct k_work *work)
 					struct device_pm, work);
 	struct device *dev = pm->dev;
 	int ret = 0;
-	u8_t pm_state;
+	uint8_t pm_state;
 
 	switch (atomic_get(&dev->pm->fsm_state)) {
 	case DEVICE_PM_FSM_STATE_ACTIVE:
@@ -86,7 +86,7 @@ fsm_out:
 }
 
 static int device_pm_request(struct device *dev,
-			     u32_t target_state, u32_t pm_flags)
+			     uint32_t target_state, uint32_t pm_flags)
 {
 	int result, signaled = 0;
 
diff --git a/subsys/power/policy/pm_policy.h b/subsys/power/policy/pm_policy.h
index e573ee3b9a..6a753024e1 100644
--- a/subsys/power/policy/pm_policy.h
+++ b/subsys/power/policy/pm_policy.h
@@ -41,7 +41,7 @@ void sys_pm_resume_devices(void);
 /**
  * @brief Function to get the next PM state based on the ticks
  */
-enum power_states sys_pm_policy_next_state(s32_t ticks);
+enum power_states sys_pm_policy_next_state(int32_t ticks);
 
 /**
  * @brief Function to determine whether to put devices in low
diff --git a/subsys/power/policy/policy_dummy.c b/subsys/power/policy/policy_dummy.c
index a949bf52c4..c629da7d59 100644
--- a/subsys/power/policy/policy_dummy.c
+++ b/subsys/power/policy/policy_dummy.c
@@ -11,9 +11,9 @@
 #include <logging/log.h>
 LOG_MODULE_DECLARE(power, CONFIG_SYS_PM_LOG_LEVEL);
 
-enum power_states sys_pm_policy_next_state(s32_t ticks)
+enum power_states sys_pm_policy_next_state(int32_t ticks)
 {
-	static u8_t cur_power_state;
+	static uint8_t cur_power_state;
 	int i = cur_power_state;
 
 	if (SYS_POWER_STATE_MAX == 0) {
diff --git a/subsys/power/policy/policy_residency.c b/subsys/power/policy/policy_residency.c
index ebe228bd83..32de138dc9 100644
--- a/subsys/power/policy/policy_residency.c
+++ b/subsys/power/policy/policy_residency.c
@@ -45,7 +45,7 @@ static const unsigned int pm_min_residency[] = {
 #endif /* CONFIG_SYS_POWER_DEEP_SLEEP_STATES */
 };
 
-enum power_states sys_pm_policy_next_state(s32_t ticks)
+enum power_states sys_pm_policy_next_state(int32_t ticks)
 {
 	int i;
 
diff --git a/subsys/power/policy/policy_residency_cc13x2_cc26x2.c b/subsys/power/policy/policy_residency_cc13x2_cc26x2.c
index 722ea8c6c2..abd186eedf 100644
--- a/subsys/power/policy/policy_residency_cc13x2_cc26x2.c
+++ b/subsys/power/policy/policy_residency_cc13x2_cc26x2.c
@@ -37,9 +37,9 @@ static const unsigned int pm_min_residency[] = {
 #endif /* CONFIG_SYS_POWER_SLEEP_STATES */
 };
 
-enum power_states sys_pm_policy_next_state(s32_t ticks)
+enum power_states sys_pm_policy_next_state(int32_t ticks)
 {
-	u32_t constraints;
+	uint32_t constraints;
 	bool disallowed = false;
 	int i;
 
diff --git a/subsys/power/power.c b/subsys/power/power.c
index 6243d9479b..d458b6511a 100644
--- a/subsys/power/power.c
+++ b/subsys/power/power.c
@@ -22,13 +22,13 @@ static enum power_states pm_state;
 #ifdef CONFIG_SYS_PM_DEBUG
 
 struct pm_debug_info {
-	u32_t count;
-	u32_t last_res;
-	u32_t total_res;
+	uint32_t count;
+	uint32_t last_res;
+	uint32_t total_res;
 };
 
 static struct pm_debug_info pm_dbg_info[SYS_POWER_STATE_MAX];
-static u32_t timer_start, timer_end;
+static uint32_t timer_start, timer_end;
 
 static inline void sys_pm_debug_start_timer(void)
 {
@@ -42,7 +42,7 @@ static inline void sys_pm_debug_stop_timer(void)
 
 static void sys_pm_log_debug_info(enum power_states state)
 {
-	u32_t res = timer_end - timer_start;
+	uint32_t res = timer_end - timer_start;
 
 	pm_dbg_info[state].count++;
 	pm_dbg_info[state].last_res = res;
@@ -89,7 +89,7 @@ void sys_pm_force_power_state(enum power_states state)
 #endif
 }
 
-enum power_states _sys_suspend(s32_t ticks)
+enum power_states _sys_suspend(int32_t ticks)
 {
 	bool deep_sleep;
 #if CONFIG_DEVICE_POWER_MANAGEMENT
diff --git a/subsys/random/rand32_ctr_drbg.c b/subsys/random/rand32_ctr_drbg.c
index 67d6827077..9c85b6d829 100644
--- a/subsys/random/rand32_ctr_drbg.c
+++ b/subsys/random/rand32_ctr_drbg.c
@@ -80,7 +80,7 @@ static int ctr_drbg_initialize(void)
 
 #elif defined(CONFIG_TINYCRYPT)
 
-	u8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
+	uint8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
 
 	ret = entropy_get_entropy(entropy_driver, (void *)&entropy,
 				  sizeof(entropy));
@@ -104,7 +104,7 @@ static int ctr_drbg_initialize(void)
 }
 
 
-int sys_csrand_get(void *dst, u32_t outlen)
+int sys_csrand_get(void *dst, uint32_t outlen)
 {
 	int ret;
 	unsigned int key = irq_lock();
@@ -122,7 +122,7 @@ int sys_csrand_get(void *dst, u32_t outlen)
 
 #elif defined(CONFIG_TINYCRYPT)
 
-	u8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
+	uint8_t entropy[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
 
 	ret = tc_ctr_prng_generate(&ctr_ctx, 0, 0, (uint8_t *)dst, outlen);
 
diff --git a/subsys/random/rand32_entropy_device.c b/subsys/random/rand32_entropy_device.c
index 3f1b531c9d..d958710b2a 100644
--- a/subsys/random/rand32_entropy_device.c
+++ b/subsys/random/rand32_entropy_device.c
@@ -12,10 +12,10 @@
 static struct device *entropy_driver;
 
 #if defined(CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR)
-u32_t sys_rand32_get(void)
+uint32_t sys_rand32_get(void)
 {
 	struct device *dev = entropy_driver;
-	u32_t random_num;
+	uint32_t random_num;
 	int ret;
 
 	if (unlikely(!dev)) {
@@ -30,7 +30,7 @@ u32_t sys_rand32_get(void)
 		entropy_driver = dev;
 	}
 
-	ret = entropy_get_entropy(dev, (u8_t *)&random_num,
+	ret = entropy_get_entropy(dev, (uint8_t *)&random_num,
 				  sizeof(random_num));
 	if (unlikely(ret < 0)) {
 		/* Use system timer in case the entropy device couldn't deliver
@@ -46,10 +46,10 @@ u32_t sys_rand32_get(void)
 }
 #endif /* CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR */
 
-static int rand_get(u8_t *dst, size_t outlen, bool csrand)
+static int rand_get(uint8_t *dst, size_t outlen, bool csrand)
 {
 	struct device *dev = entropy_driver;
-	u32_t random_num;
+	uint32_t random_num;
 	int ret;
 
 	if (unlikely(!dev)) {
@@ -81,8 +81,8 @@ static int rand_get(u8_t *dst, size_t outlen, bool csrand)
 		 * still be gathering entropy during early boot situations.
 		 */
 
-		u32_t len = 0;
-		u32_t blocksize = 4;
+		uint32_t len = 0;
+		uint32_t blocksize = 4;
 
 		while (len < outlen) {
 			random_num = k_cycle_get_32();
@@ -91,7 +91,7 @@ static int rand_get(u8_t *dst, size_t outlen, bool csrand)
 				(void)memcpy(&(dst[random_num]),
 						&random_num, blocksize);
 			} else {
-				*((u32_t *)&dst[len]) = random_num;
+				*((uint32_t *)&dst[len]) = random_num;
 			}
 
 			len += blocksize;
diff --git a/subsys/random/rand32_timer.c b/subsys/random/rand32_timer.c
index 8c9207dfae..e2439ab63e 100644
--- a/subsys/random/rand32_timer.c
+++ b/subsys/random/rand32_timer.c
@@ -41,7 +41,7 @@ static atomic_val_t _rand32_counter;
  * @return a 32-bit number
  */
 
-u32_t sys_rand32_get(void)
+uint32_t sys_rand32_get(void)
 {
 	return k_cycle_get_32() + atomic_add(&_rand32_counter, _RAND32_INC);
 }
@@ -62,10 +62,10 @@ u32_t sys_rand32_get(void)
 
 void sys_rand_get(void *dst, size_t outlen)
 {
-	u32_t len = 0;
-	u32_t blocksize = 4;
-	u32_t ret;
-	u32_t *udst = (u32_t *)dst;
+	uint32_t len = 0;
+	uint32_t blocksize = 4;
+	uint32_t ret;
+	uint32_t *udst = (uint32_t *)dst;
 
 	while (len < outlen) {
 		ret = sys_rand32_get();
diff --git a/subsys/random/rand32_xoroshiro128.c b/subsys/random/rand32_xoroshiro128.c
index 32506d4c12..2fdded203c 100644
--- a/subsys/random/rand32_xoroshiro128.c
+++ b/subsys/random/rand32_xoroshiro128.c
@@ -43,9 +43,9 @@
 #include <kernel.h>
 #include <string.h>
 
-static u64_t state[2];
+static uint64_t state[2];
 
-static inline u64_t rotl(const u64_t x, int k)
+static inline uint64_t rotl(const uint64_t x, int k)
 {
 	return (x << k) | (x >> (64 - k));
 }
@@ -57,14 +57,14 @@ static int xoroshiro128_initialize(struct device *dev)
 		return -EINVAL;
 	}
 
-	s32_t rc = entropy_get_entropy_isr(dev, (uint8_t *)&state,
+	int32_t rc = entropy_get_entropy_isr(dev, (uint8_t *)&state,
 					   sizeof(state), ENTROPY_BUSYWAIT);
 
 	if (rc == -ENOTSUP) {
 		/* Driver does not provide an ISR-specific API, assume it can
 		 * be called from ISR context
 		 */
-		rc = entropy_get_entropy(dev, (u8_t *)&state, sizeof(state));
+		rc = entropy_get_entropy(dev, (uint8_t *)&state, sizeof(state));
 	}
 
 	if (rc < 0) {
@@ -74,22 +74,22 @@ static int xoroshiro128_initialize(struct device *dev)
 	return 0;
 }
 
-static u32_t xoroshiro128_next(void)
+static uint32_t xoroshiro128_next(void)
 {
-	const u64_t s0 = state[0];
-	u64_t s1 = state[1];
-	const u64_t result = s0 + s1;
+	const uint64_t s0 = state[0];
+	uint64_t s1 = state[1];
+	const uint64_t result = s0 + s1;
 
 	s1 ^= s0;
 	state[0] = rotl(s0, 55) ^ s1 ^ (s1 << 14);
 	state[1] = rotl(s1, 36);
 
-	return (u32_t)result;
+	return (uint32_t)result;
 }
 
-u32_t sys_rand32_get(void)
+uint32_t sys_rand32_get(void)
 {
-	u32_t ret;
+	uint32_t ret;
 
 	ret = xoroshiro128_next();
 
@@ -98,10 +98,10 @@ u32_t sys_rand32_get(void)
 
 void sys_rand_get(void *dst, size_t outlen)
 {
-	u32_t ret;
-	u32_t blocksize = 4;
-	u32_t len = 0;
-	u32_t *udst = (u32_t *)dst;
+	uint32_t ret;
+	uint32_t blocksize = 4;
+	uint32_t len = 0;
+	uint32_t *udst = (uint32_t *)dst;
 
 	while (len < outlen) {
 		ret = xoroshiro128_next();
diff --git a/subsys/settings/include/settings/settings_nvs.h b/subsys/settings/include/settings/settings_nvs.h
index 47460d2689..9545a28684 100644
--- a/subsys/settings/include/settings/settings_nvs.h
+++ b/subsys/settings/include/settings/settings_nvs.h
@@ -36,7 +36,7 @@ extern "C" {
 struct settings_nvs {
 	struct settings_store cf_store;
 	struct nvs_fs cf_nvs;
-	u16_t last_name_id;
+	uint16_t last_name_id;
 	const char *flash_dev_name;
 };
 
diff --git a/subsys/settings/src/settings_fcb.c b/subsys/settings/src/settings_fcb.c
index a3d5d3a390..5903dae470 100644
--- a/subsys/settings/src/settings_fcb.c
+++ b/subsys/settings/src/settings_fcb.c
@@ -201,7 +201,7 @@ static void settings_fcb_compress(struct settings_fcb *cf)
 	char name1[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN];
 	char name2[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN];
 	int copy;
-	u8_t rbs;
+	uint8_t rbs;
 
 	rc = fcb_append_to_scratch(&cf->cf_fcb);
 	if (rc) {
@@ -308,7 +308,7 @@ static int settings_fcb_save_priv(struct settings_store *cs, const char *name,
 	int len;
 	int rc;
 	int i;
-	u8_t wbs;
+	uint8_t wbs;
 
 	if (!name) {
 		return -EINVAL;
@@ -370,7 +370,7 @@ static int settings_fcb_save(struct settings_store *cs, const char *name,
 
 void settings_mount_fcb_backend(struct settings_fcb *cf)
 {
-	u8_t rbs;
+	uint8_t rbs;
 
 	rbs = cf->cf_fcb.f_align;
 
@@ -385,7 +385,7 @@ int settings_backend_init(void)
 		.cf_fcb.f_magic = CONFIG_SETTINGS_FCB_MAGIC,
 		.cf_fcb.f_sectors = settings_fcb_area,
 	};
-	u32_t cnt = sizeof(settings_fcb_area) /
+	uint32_t cnt = sizeof(settings_fcb_area) /
 		    sizeof(settings_fcb_area[0]);
 	int rc;
 	const struct flash_area *fap;
diff --git a/subsys/settings/src/settings_line.c b/subsys/settings/src/settings_line.c
index 236a97476e..437d8fbd85 100644
--- a/subsys/settings/src/settings_line.c
+++ b/subsys/settings/src/settings_line.c
@@ -22,7 +22,7 @@ struct settings_io_cb_s {
 	int (*read_cb)(void *ctx, off_t off, char *buf, size_t *len);
 	int (*write_cb)(void *ctx, off_t off, char const *buf, size_t len);
 	size_t (*get_len_cb)(void *ctx);
-	u8_t rwbs;
+	uint8_t rwbs;
 } static settings_io_cb;
 
 #define MAX_ENC_BLOCK_SIZE 4
@@ -44,9 +44,9 @@ int settings_line_write(const char *name, const char *value, size_t val_len,
 	char w_buf[16]; /* write buff, must be aligned either to minimal */
 			/* base64 encoding size and write-block-size */
 	int rc;
-	u8_t wbs = settings_io_cb.rwbs;
+	uint8_t wbs = settings_io_cb.rwbs;
 #ifdef CONFIG_SETTINGS_ENCODE_LEN
-	u16_t len_field;
+	uint16_t len_field;
 #endif
 
 	rem = strlen(name);
@@ -160,7 +160,7 @@ int settings_line_write(const char *name, const char *value, size_t val_len,
 int settings_next_line_ctx(struct line_entry_ctx *entry_ctx)
 {
 	size_t len_read;
-	u16_t readout;
+	uint16_t readout;
 	int rc;
 
 	entry_ctx->seek += entry_ctx->len; /* to begin of nex line */
@@ -224,7 +224,7 @@ static int settings_line_raw_read_until(off_t seek, char *out, size_t len_req,
 	size_t rem_size, len;
 	char temp_buf[16]; /* buffer for fit read-block-size requirements */
 	size_t exp_size, read_size;
-	u8_t rbs = settings_io_cb.rwbs;
+	uint8_t rbs = settings_io_cb.rwbs;
 	off_t off;
 	int rc;
 
@@ -373,7 +373,7 @@ size_t settings_line_val_get_len(off_t val_off, void *read_cb_ctx)
 
 	len = settings_io_cb.get_len_cb(read_cb_ctx);
 #ifdef CONFIG_SETTINGS_USE_BASE64
-	u8_t raw[2];
+	uint8_t raw[2];
 	int rc;
 	size_t len_base64 = len - val_off;
 
@@ -458,7 +458,7 @@ void settings_line_io_init(int (*read_cb)(void *ctx, off_t off, char *buf,
 			  int (*write_cb)(void *ctx, off_t off, char const *buf,
 					  size_t len),
 			  size_t (*get_len_cb)(void *ctx),
-			  u8_t io_rwbs)
+			  uint8_t io_rwbs)
 {
 	settings_io_cb.read_cb = read_cb;
 	settings_io_cb.write_cb = write_cb;
diff --git a/subsys/settings/src/settings_nvs.c b/subsys/settings/src/settings_nvs.c
index eea8e8eaf0..6485085fe9 100644
--- a/subsys/settings/src/settings_nvs.c
+++ b/subsys/settings/src/settings_nvs.c
@@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 struct settings_nvs_read_fn_arg {
 	struct nvs_fs *fs;
-	u16_t id;
+	uint16_t id;
 };
 
 static int settings_nvs_load(struct settings_store *cs,
@@ -73,7 +73,7 @@ static int settings_nvs_load(struct settings_store *cs,
 	char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
 	char buf;
 	ssize_t rc1, rc2;
-	u16_t name_id = NVS_NAMECNT_ID;
+	uint16_t name_id = NVS_NAMECNT_ID;
 
 	name_id = cf->last_name_id + 1;
 
@@ -105,7 +105,7 @@ static int settings_nvs_load(struct settings_store *cs,
 			if (name_id == cf->last_name_id) {
 				cf->last_name_id--;
 				nvs_write(&cf->cf_nvs, NVS_NAMECNT_ID,
-					  &cf->last_name_id, sizeof(u16_t));
+					  &cf->last_name_id, sizeof(uint16_t));
 			}
 			nvs_delete(&cf->cf_nvs, name_id);
 			nvs_delete(&cf->cf_nvs, name_id + NVS_NAME_ID_OFFSET);
@@ -133,7 +133,7 @@ static int settings_nvs_save(struct settings_store *cs, const char *name,
 {
 	struct settings_nvs *cf = (struct settings_nvs *)cs;
 	char rdname[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
-	u16_t name_id, write_name_id;
+	uint16_t name_id, write_name_id;
 	bool delete, write_name;
 	int rc = 0;
 
@@ -173,7 +173,7 @@ static int settings_nvs_save(struct settings_store *cs, const char *name,
 		if ((delete) && (name_id == cf->last_name_id)) {
 			cf->last_name_id--;
 			rc = nvs_write(&cf->cf_nvs, NVS_NAMECNT_ID,
-				       &cf->last_name_id, sizeof(u16_t));
+				       &cf->last_name_id, sizeof(uint16_t));
 			if (rc < 0) {
 				/* Error: can't to store
 				 * the largest name ID in use.
@@ -226,7 +226,7 @@ static int settings_nvs_save(struct settings_store *cs, const char *name,
 	if (write_name_id > cf->last_name_id) {
 		cf->last_name_id = write_name_id;
 		rc = nvs_write(&cf->cf_nvs, NVS_NAMECNT_ID, &cf->last_name_id,
-			       sizeof(u16_t));
+			       sizeof(uint16_t));
 	}
 
 	if (rc < 0) {
@@ -240,7 +240,7 @@ static int settings_nvs_save(struct settings_store *cs, const char *name,
 int settings_nvs_backend_init(struct settings_nvs *cf)
 {
 	int rc;
-	u16_t last_name_id;
+	uint16_t last_name_id;
 
 	rc = nvs_init(&cf->cf_nvs, cf->flash_dev_name);
 	if (rc) {
@@ -263,11 +263,11 @@ int settings_backend_init(void)
 {
 	static struct settings_nvs default_settings_nvs;
 	int rc;
-	u16_t cnt = 0;
+	uint16_t cnt = 0;
 	size_t nvs_sector_size, nvs_size = 0;
 	const struct flash_area *fa;
 	struct flash_sector hw_flash_sector;
-	u32_t sector_cnt = 1;
+	uint32_t sector_cnt = 1;
 
 	rc = flash_area_open(FLASH_AREA_ID(storage), &fa);
 	if (rc) {
diff --git a/subsys/settings/src/settings_priv.h b/subsys/settings/src/settings_priv.h
index b62ecbd50d..739efedcc4 100644
--- a/subsys/settings/src/settings_priv.h
+++ b/subsys/settings/src/settings_priv.h
@@ -29,7 +29,7 @@ void settings_line_io_init(int (*read_cb)(void *ctx, off_t off, char *buf,
 			   int (*write_cb)(void *ctx, off_t off,
 					   char const *buf, size_t len),
 			   size_t (*get_len_cb)(void *ctx),
-			   u8_t io_rwbs);
+			   uint8_t io_rwbs);
 
 int settings_line_write(const char *name, const char *value, size_t val_len,
 			off_t w_loc, void *cb_arg);
@@ -118,7 +118,7 @@ void settings_line_io_init(int (*read_cb)(void *ctx, off_t off, char *buf,
 			  int (*write_cb)(void *ctx, off_t off, char const *buf,
 					  size_t len),
 			  size_t (*get_len_cb)(void *ctx),
-			  u8_t io_rwbs);
+			  uint8_t io_rwbs);
 
 
 extern sys_slist_t settings_load_srcs;
diff --git a/subsys/shell/modules/device_service.c b/subsys/shell/modules/device_service.c
index d9cdace82d..2ca89968da 100644
--- a/subsys/shell/modules/device_service.c
+++ b/subsys/shell/modules/device_service.c
@@ -99,7 +99,7 @@ static int cmd_device_list(const struct shell *shell,
 		shell_fprintf(shell, SHELL_NORMAL, "- %s", dev->name);
 
 #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
-		u32_t state = DEVICE_PM_ACTIVE_STATE;
+		uint32_t state = DEVICE_PM_ACTIVE_STATE;
 		int err;
 
 		err = device_get_power_state(dev, &state);
diff --git a/subsys/shell/modules/kernel_service.c b/subsys/shell/modules/kernel_service.c
index e82b79eca0..e1e4531ddd 100644
--- a/subsys/shell/modules/kernel_service.c
+++ b/subsys/shell/modules/kernel_service.c
@@ -18,7 +18,7 @@
 static int cmd_kernel_version(const struct shell *shell,
 			      size_t argc, char **argv)
 {
-	u32_t version = sys_kernel_version_get();
+	uint32_t version = sys_kernel_version_get();
 
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
@@ -137,7 +137,7 @@ extern K_THREAD_STACK_ARRAY_DEFINE(z_interrupt_stacks, CONFIG_MP_NUM_CPUS,
 static int cmd_kernel_stacks(const struct shell *shell,
 			     size_t argc, char **argv)
 {
-	u8_t *buf;
+	uint8_t *buf;
 	size_t size, unused = 0;
 
 	ARG_UNUSED(argc);
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index 5d76ec5592..d29f2dc1b9 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -92,11 +92,11 @@ static void state_set(const struct shell *shell, enum shell_state state)
 }
 
 static void tab_item_print(const struct shell *shell, const char *option,
-			   u16_t longest_option)
+			   uint16_t longest_option)
 {
 	static const char *tab = "  ";
-	u16_t columns;
-	u16_t diff;
+	uint16_t columns;
+	uint16_t diff;
 
 	/* Function initialization has been requested. */
 	if (option == NULL) {
@@ -148,7 +148,7 @@ static void history_mode_exit(const struct shell *shell)
 	shell_history_mode_exit(shell->history);
 }
 
-static void history_put(const struct shell *shell, u8_t *line, size_t length)
+static void history_put(const struct shell *shell, uint8_t *line, size_t length)
 {
 	if (!IS_ENABLED(CONFIG_SHELL_HISTORY)) {
 		return;
@@ -160,7 +160,7 @@ static void history_put(const struct shell *shell, u8_t *line, size_t length)
 static void history_handle(const struct shell *shell, bool up)
 {
 	bool history_mode;
-	u16_t len;
+	uint16_t len;
 
 	/*optional feature */
 	if (!IS_ENABLED(CONFIG_SHELL_HISTORY)) {
@@ -176,7 +176,7 @@ static void history_handle(const struct shell *shell, bool up)
 	/* Backup command if history is entered */
 	if (!shell_history_active(shell->history)) {
 		if (up) {
-			u16_t cmd_len = shell_strlen(shell->ctx->cmd_buff);
+			uint16_t cmd_len = shell_strlen(shell->ctx->cmd_buff);
 
 			if (cmd_len) {
 				strcpy(shell->ctx->temp_buff,
@@ -208,9 +208,9 @@ static void history_handle(const struct shell *shell, bool up)
 	shell_op_cond_next_line(shell);
 }
 
-static inline u16_t completion_space_get(const struct shell *shell)
+static inline uint16_t completion_space_get(const struct shell *shell)
 {
-	u16_t space = (CONFIG_SHELL_CMD_BUFF_SIZE - 1) -
+	uint16_t space = (CONFIG_SHELL_CMD_BUFF_SIZE - 1) -
 			shell->ctx->cmd_buff_len;
 	return space;
 }
@@ -222,7 +222,7 @@ static bool tab_prepare(const struct shell *shell,
 			size_t *complete_arg_idx,
 			struct shell_static_entry *d_entry)
 {
-	u16_t compl_space = completion_space_get(shell);
+	uint16_t compl_space = completion_space_get(shell);
 	size_t search_argc;
 
 	if (compl_space == 0U) {
@@ -292,7 +292,7 @@ static void find_completion_candidates(const struct shell *shell,
 				       const struct shell_static_entry *cmd,
 				       const char *incompl_cmd,
 				       size_t *first_idx, size_t *cnt,
-				       u16_t *longest)
+				       uint16_t *longest)
 {
 	size_t incompl_cmd_len = shell_strlen(incompl_cmd);
 	const struct shell_static_entry *candidate;
@@ -325,8 +325,8 @@ static void autocomplete(const struct shell *shell,
 			 size_t subcmd_idx)
 {
 	const struct shell_static_entry *match;
-	u16_t cmd_len;
-	u16_t arg_len = shell_strlen(arg);
+	uint16_t cmd_len;
+	uint16_t arg_len = shell_strlen(arg);
 
 	/* shell->ctx->active_cmd can be safely used outside of command context
 	 * to save stack
@@ -381,7 +381,7 @@ static size_t str_common(const char *s1, const char *s2, size_t n)
 static void tab_options_print(const struct shell *shell,
 			      const struct shell_static_entry *cmd,
 			      const char *str, size_t first, size_t cnt,
-			      u16_t longest)
+			      uint16_t longest)
 {
 	const struct shell_static_entry *match;
 	size_t str_len = shell_strlen(str);
@@ -413,14 +413,14 @@ static void tab_options_print(const struct shell *shell,
 	shell_print_prompt_and_cmd(shell);
 }
 
-static u16_t common_beginning_find(const struct shell *shell,
+static uint16_t common_beginning_find(const struct shell *shell,
 				   const struct shell_static_entry *cmd,
 				   const char **str,
-				   size_t first, size_t cnt, u16_t arg_len)
+				   size_t first, size_t cnt, uint16_t arg_len)
 {
 	struct shell_static_entry dynamic_entry;
 	const struct shell_static_entry *match;
-	u16_t common = UINT16_MAX;
+	uint16_t common = UINT16_MAX;
 	size_t idx = first + 1;
 
 	__ASSERT_NO_MSG(cnt > 1);
@@ -459,8 +459,8 @@ static void partial_autocomplete(const struct shell *shell,
 				 size_t first, size_t cnt)
 {
 	const char *completion;
-	u16_t arg_len = shell_strlen(arg);
-	u16_t common = common_beginning_find(shell, cmd, &completion, first,
+	uint16_t arg_len = shell_strlen(arg);
+	uint16_t common = common_beginning_find(shell, cmd, &completion, first,
 					     cnt, arg_len);
 
 	if (common) {
@@ -492,9 +492,9 @@ static int exec_cmd(const struct shell *shell, size_t argc, const char **argv,
 	}
 
 	if (shell->ctx->active_cmd.args.mandatory) {
-		u32_t mand = shell->ctx->active_cmd.args.mandatory;
-		u8_t opt8 = shell->ctx->active_cmd.args.optional;
-		u32_t opt = (opt8 == SHELL_OPT_ARG_CHECK_SKIP) ?
+		uint32_t mand = shell->ctx->active_cmd.args.mandatory;
+		uint8_t opt8 = shell->ctx->active_cmd.args.optional;
+		uint32_t opt = (opt8 == SHELL_OPT_ARG_CHECK_SKIP) ?
 				UINT16_MAX : opt8;
 		bool in_range = (argc >= mand) && (argc <= (mand + opt));
 
@@ -741,7 +741,7 @@ static void tab_handle(const struct shell *shell)
 	const char **argv = __argv;
 	size_t first = 0;
 	size_t arg_idx;
-	u16_t longest;
+	uint16_t longest;
 	size_t argc;
 	size_t cnt;
 
@@ -860,7 +860,7 @@ static void ctrl_metakeys_handle(const struct shell *shell, char data)
 }
 
 /* Functions returns true if new line character shall be processed */
-static bool process_nl(const struct shell *shell, u8_t data)
+static bool process_nl(const struct shell *shell, uint8_t data)
 {
 	if ((data != '\r') && (data != '\n')) {
 		flag_last_nl_set(shell, 0);
@@ -879,7 +879,7 @@ static bool process_nl(const struct shell *shell, u8_t data)
 #define SHELL_ASCII_MAX_CHAR (127u)
 static inline int ascii_filter(const char data)
 {
-	return (u8_t) data > SHELL_ASCII_MAX_CHAR ? -EINVAL : 0;
+	return (uint8_t) data > SHELL_ASCII_MAX_CHAR ? -EINVAL : 0;
 }
 
 static void state_collect(const struct shell *shell)
@@ -1195,7 +1195,7 @@ void shell_thread(void *shell_handle, void *arg_log_backend,
 {
 	struct shell *shell = shell_handle;
 	bool log_backend = (bool)arg_log_backend;
-	u32_t log_level = POINTER_TO_UINT(arg_log_level);
+	uint32_t log_level = POINTER_TO_UINT(arg_log_level);
 	int err;
 
 	err = shell->iface->api->enable(shell->iface, false);
@@ -1243,7 +1243,7 @@ void shell_thread(void *shell_handle, void *arg_log_backend,
 }
 
 int shell_init(const struct shell *shell, const void *transport_config,
-	       bool use_colors, bool log_backend, u32_t init_log_level)
+	       bool use_colors, bool log_backend, uint32_t init_log_level)
 {
 	__ASSERT_NO_MSG(shell);
 	__ASSERT_NO_MSG(shell->ctx && shell->iface && shell->default_prompt);
@@ -1390,7 +1390,7 @@ void shell_fprintf(const struct shell *shell, enum shell_vt100_color color,
 }
 
 static void shell_hexdump_line(const struct shell *shell, unsigned int offset,
-			       const u8_t *data, size_t len)
+			       const uint8_t *data, size_t len)
 {
 	int i;
 
@@ -1429,9 +1429,9 @@ static void shell_hexdump_line(const struct shell *shell, unsigned int offset,
 	shell_print(shell, "|");
 }
 
-void shell_hexdump(const struct shell *shell, const u8_t *data, size_t len)
+void shell_hexdump(const struct shell *shell, const uint8_t *data, size_t len)
 {
-	const u8_t *p = data;
+	const uint8_t *p = data;
 	size_t line_len;
 
 	while (len) {
@@ -1466,7 +1466,7 @@ void shell_help(const struct shell *shell)
 
 int shell_execute_cmd(const struct shell *shell, const char *cmd)
 {
-	u16_t cmd_len = shell_strlen(cmd);
+	uint16_t cmd_len = shell_strlen(cmd);
 	int ret_val;
 
 	if (cmd == NULL) {
diff --git a/subsys/shell/shell_cmds.c b/subsys/shell/shell_cmds.c
index c352672a78..139253e64a 100644
--- a/subsys/shell/shell_cmds.c
+++ b/subsys/shell/shell_cmds.c
@@ -60,9 +60,9 @@
 #define SHELL_DEFAULT_TERMINAL_HEIGHT 24
 
 /* Function reads cursor position from terminal. */
-static int cursor_position_get(const struct shell *shell, u16_t *x, u16_t *y)
+static int cursor_position_get(const struct shell *shell, uint16_t *x, uint16_t *y)
 {
-	u16_t buff_idx = 0U;
+	uint16_t buff_idx = 0U;
 	size_t cnt;
 	char c = 0;
 
@@ -82,7 +82,7 @@ static int cursor_position_get(const struct shell *shell, u16_t *x, u16_t *y)
 	transport_buffer_flush(shell);
 
 	/* timeout for terminal response = ~1s */
-	for (u16_t i = 0; i < 1000; i++) {
+	for (uint16_t i = 0; i < 1000; i++) {
 		do {
 			(void)shell->iface->api->read(shell->iface, &c,
 						      sizeof(c), &cnt);
@@ -167,8 +167,8 @@ static int cursor_position_get(const struct shell *shell, u16_t *x, u16_t *y)
 /* Function gets terminal width and height. */
 static int terminal_size_get(const struct shell *shell)
 {
-	u16_t x; /* horizontal position */
-	u16_t y; /* vertical position */
+	uint16_t x; /* horizontal position */
+	uint16_t y; /* vertical position */
 	int ret_val = 0;
 
 	cursor_save(shell);
@@ -304,7 +304,7 @@ static int cmd_history(const struct shell *shell, size_t argc, char **argv)
 	ARG_UNUSED(argv);
 
 	size_t i = 0;
-	u16_t len;
+	uint16_t len;
 
 	while (1) {
 		shell_history_get(shell->history, true,
diff --git a/subsys/shell/shell_fprintf.c b/subsys/shell/shell_fprintf.c
index 3921149f6e..1f6e8b0b16 100644
--- a/subsys/shell/shell_fprintf.c
+++ b/subsys/shell/shell_fprintf.c
@@ -26,7 +26,7 @@ static int out_func(int c, void *ctx)
 		(void)out_func('\r', ctx);
 	}
 
-	sh_fprintf->buffer[sh_fprintf->ctrl_blk->buffer_cnt] = (u8_t)c;
+	sh_fprintf->buffer[sh_fprintf->ctrl_blk->buffer_cnt] = (uint8_t)c;
 	sh_fprintf->ctrl_blk->buffer_cnt++;
 
 	if (sh_fprintf->ctrl_blk->buffer_cnt == sh_fprintf->buffer_size) {
diff --git a/subsys/shell/shell_help.c b/subsys/shell/shell_help.c
index 237bda9242..3074ac525f 100644
--- a/subsys/shell/shell_help.c
+++ b/subsys/shell/shell_help.c
@@ -107,10 +107,10 @@ static void formatted_text_print(const struct shell *shell, const char *str,
 }
 
 static void help_item_print(const struct shell *shell, const char *item_name,
-			    u16_t item_name_width, const char *item_help)
+			    uint16_t item_name_width, const char *item_help)
 {
-	static const u8_t tabulator[] = "  ";
-	const u16_t offset = 2 * strlen(tabulator) + item_name_width + 1;
+	static const uint8_t tabulator[] = "  ";
+	const uint16_t offset = 2 * strlen(tabulator) + item_name_width + 1;
 
 	if (item_name == NULL) {
 		return;
@@ -123,12 +123,12 @@ static void help_item_print(const struct shell *shell, const char *item_name,
 				       item_name_width, item_name,
 				       tabulator);
 	} else {
-		u16_t tmp = item_name_width - strlen(item_name);
+		uint16_t tmp = item_name_width - strlen(item_name);
 		char space = ' ';
 
 		shell_internal_fprintf(shell, SHELL_NORMAL, "%s%s", tabulator,
 				       item_name);
-		for (u16_t i = 0; i < tmp; i++) {
+		for (uint16_t i = 0; i < tmp; i++) {
 			shell_write(shell, &space, 1);
 		}
 		shell_internal_fprintf(shell, SHELL_NORMAL, "%s:", tabulator);
@@ -150,7 +150,7 @@ void shell_help_subcmd_print(const struct shell *shell)
 	const struct shell_static_entry *entry = NULL;
 	const struct shell_static_entry *parent = &shell->ctx->active_cmd;
 	struct shell_static_entry dloc;
-	u16_t longest = 0U;
+	uint16_t longest = 0U;
 	size_t idx = 0;
 
 	/* Searching for the longest subcommand to print. */
@@ -177,7 +177,7 @@ void shell_help_cmd_print(const struct shell *shell)
 {
 	static const char cmd_sep[] = " - ";	/* commands separator */
 
-	u16_t field_width = shell_strlen(shell->ctx->active_cmd.syntax) +
+	uint16_t field_width = shell_strlen(shell->ctx->active_cmd.syntax) +
 							  shell_strlen(cmd_sep);
 
 	shell_internal_fprintf(shell, SHELL_NORMAL, "%s%s",
diff --git a/subsys/shell/shell_history.c b/subsys/shell/shell_history.c
index 3514aff0d0..852e700019 100644
--- a/subsys/shell/shell_history.c
+++ b/subsys/shell/shell_history.c
@@ -36,8 +36,8 @@
  */
 struct shell_history_item {
 	sys_dnode_t dnode;
-	u16_t len;
-	u16_t padding;
+	uint16_t len;
+	uint16_t padding;
 	char data[0];
 };
 
@@ -47,7 +47,7 @@ void shell_history_mode_exit(struct shell_history *history)
 }
 
 bool shell_history_get(struct shell_history *history, bool up,
-		       u8_t *dst, u16_t *len)
+		       uint8_t *dst, uint16_t *len)
 {
 	struct shell_history_item *h_item; /* history item */
 	sys_dnode_t *l_item; /* list item */
@@ -90,7 +90,7 @@ bool shell_history_get(struct shell_history *history, bool up,
 
 static void add_to_head(struct shell_history *history,
 			struct shell_history_item *item,
-			u8_t *src, size_t len, u16_t padding)
+			uint8_t *src, size_t len, uint16_t padding)
 {
 	item->len = len;
 	item->padding = padding;
@@ -103,7 +103,7 @@ static bool remove_from_tail(struct shell_history *history)
 {
 	sys_dnode_t *l_item; /* list item */
 	struct shell_history_item *h_item;
-	u32_t total_len;
+	uint32_t total_len;
 
 	if (sys_dlist_is_empty(&history->list)) {
 		return false;
@@ -127,14 +127,14 @@ void shell_history_purge(struct shell_history *history)
 	}
 }
 
-void shell_history_put(struct shell_history *history, u8_t *line, size_t len)
+void shell_history_put(struct shell_history *history, uint8_t *line, size_t len)
 {
 	sys_dnode_t *l_item; /* list item */
 	struct shell_history_item *h_item;
-	u32_t total_len = len + offsetof(struct shell_history_item, data);
-	u32_t claim_len;
-	u32_t claim2_len;
-	u16_t padding = (~total_len + 1) & (sizeof(void *) - 1);
+	uint32_t total_len = len + offsetof(struct shell_history_item, data);
+	uint32_t claim_len;
+	uint32_t claim2_len;
+	uint16_t padding = (~total_len + 1) & (sizeof(void *) - 1);
 
 	/* align to word. */
 	total_len += padding;
@@ -161,14 +161,14 @@ void shell_history_put(struct shell_history *history, u8_t *line, size_t len)
 
 	do {
 		claim_len = ring_buf_put_claim(history->ring_buf,
-						(u8_t **)&h_item, total_len);
+						(uint8_t **)&h_item, total_len);
 		/* second allocation may succeed if we were at the end of the
 		 * buffer.
 		 */
 		if (claim_len < total_len) {
 			claim2_len =
 				ring_buf_put_claim(history->ring_buf,
-						   (u8_t **)&h_item, total_len);
+						   (uint8_t **)&h_item, total_len);
 			if (claim2_len == total_len) {
 				ring_buf_put_finish(history->ring_buf,
 						    claim_len);
diff --git a/subsys/shell/shell_log_backend.c b/subsys/shell/shell_log_backend.c
index b89269498d..c1c8686bc7 100644
--- a/subsys/shell/shell_log_backend.c
+++ b/subsys/shell/shell_log_backend.c
@@ -9,14 +9,14 @@
 #include "shell_ops.h"
 #include <logging/log_ctrl.h>
 
-int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx)
+int shell_log_backend_output_func(uint8_t *data, size_t length, void *ctx)
 {
 	shell_print_stream(ctx, data, length);
 	return length;
 }
 
 void shell_log_backend_enable(const struct shell_log_backend *backend,
-			      void *ctx, u32_t init_log_level)
+			      void *ctx, uint32_t init_log_level)
 {
 	int err = 0;
 
@@ -62,8 +62,8 @@ static void flush_expired_messages(const struct shell *shell)
 	int err;
 	struct shell_log_backend_msg msg;
 	struct k_msgq *msgq = shell->log_backend->msgq;
-	u32_t timeout = shell->log_backend->timeout;
-	u32_t now = k_uptime_get_32();
+	uint32_t timeout = shell->log_backend->timeout;
+	uint32_t now = k_uptime_get_32();
 
 	while (1) {
 		err = k_msgq_peek(msgq, &msg);
@@ -127,7 +127,7 @@ void shell_log_backend_disable(const struct shell_log_backend *backend)
 static void msg_process(const struct log_output *log_output,
 			struct log_msg *msg, bool colors)
 {
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL |
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL |
 		      LOG_OUTPUT_FLAG_TIMESTAMP |
 		      LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
 
@@ -141,7 +141,7 @@ static void msg_process(const struct log_output *log_output,
 
 bool shell_log_backend_process(const struct shell_log_backend *backend)
 {
-	u32_t dropped;
+	uint32_t dropped;
 	const struct shell *shell =
 			(const struct shell *)backend->backend->cb->ctx;
 	bool colors = IS_ENABLED(CONFIG_SHELL_VT100_COLORS) &&
@@ -208,12 +208,12 @@ static void put(const struct log_backend *const backend, struct log_msg *msg)
 }
 
 static void put_sync_string(const struct log_backend *const backend,
-			    struct log_msg_ids src_level, u32_t timestamp,
+			    struct log_msg_ids src_level, uint32_t timestamp,
 			    const char *fmt, va_list ap)
 {
 	const struct shell *shell = (const struct shell *)backend->cb->ctx;
-	u32_t key;
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL |
+	uint32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL |
 		      LOG_OUTPUT_FLAG_TIMESTAMP |
 		      LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
 
@@ -234,12 +234,12 @@ static void put_sync_string(const struct log_backend *const backend,
 }
 
 static void put_sync_hexdump(const struct log_backend *const backend,
-			 struct log_msg_ids src_level, u32_t timestamp,
-			 const char *metadata, const u8_t *data, u32_t length)
+			 struct log_msg_ids src_level, uint32_t timestamp,
+			 const char *metadata, const uint8_t *data, uint32_t length)
 {
 	const struct shell *shell = (const struct shell *)backend->cb->ctx;
-	u32_t key;
-	u32_t flags = LOG_OUTPUT_FLAG_LEVEL |
+	uint32_t key;
+	uint32_t flags = LOG_OUTPUT_FLAG_LEVEL |
 		      LOG_OUTPUT_FLAG_TIMESTAMP |
 		      LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
 
@@ -290,7 +290,7 @@ static void panic(const struct log_backend *const backend)
 	}
 }
 
-static void dropped(const struct log_backend *const backend, u32_t cnt)
+static void dropped(const struct log_backend *const backend, uint32_t cnt)
 {
 	const struct shell *shell = (const struct shell *)backend->cb->ctx;
 	const struct shell_log_backend *log_backend = shell->log_backend;
diff --git a/subsys/shell/shell_ops.c b/subsys/shell/shell_ops.c
index 577a8937c2..90bb3a53d6 100644
--- a/subsys/shell/shell_ops.c
+++ b/subsys/shell/shell_ops.c
@@ -7,7 +7,7 @@
 #include <ctype.h>
 #include "shell_ops.h"
 
-void shell_op_cursor_vert_move(const struct shell *shell, s32_t delta)
+void shell_op_cursor_vert_move(const struct shell *shell, int32_t delta)
 {
 	if (delta != 0) {
 		shell_raw_fprintf(shell->fprintf_ctx, "\033[%d%c",
@@ -16,7 +16,7 @@ void shell_op_cursor_vert_move(const struct shell *shell, s32_t delta)
 	}
 }
 
-void shell_op_cursor_horiz_move(const struct shell *shell, s32_t delta)
+void shell_op_cursor_horiz_move(const struct shell *shell, int32_t delta)
 {
 	if (delta != 0) {
 		shell_raw_fprintf(shell->fprintf_ctx, "\033[%d%c",
@@ -74,12 +74,12 @@ void shell_op_cursor_position_synchronize(const struct shell *shell)
 	}
 }
 
-void shell_op_cursor_move(const struct shell *shell, s16_t val)
+void shell_op_cursor_move(const struct shell *shell, int16_t val)
 {
 	struct shell_multiline_cons *cons = &shell->ctx->vt100_ctx.cons;
-	u16_t new_pos = shell->ctx->cmd_buff_pos + val;
-	s32_t row_span;
-	s32_t col_span;
+	uint16_t new_pos = shell->ctx->cmd_buff_pos + val;
+	int32_t row_span;
+	int32_t col_span;
 
 	shell_multiline_data_calc(cons, shell->ctx->cmd_buff_pos,
 				  shell->ctx->cmd_buff_len);
@@ -98,11 +98,11 @@ void shell_op_cursor_move(const struct shell *shell, s16_t val)
 	shell->ctx->cmd_buff_pos = new_pos;
 }
 
-static u16_t shift_calc(const char *str, u16_t pos, u16_t len, s16_t sign)
+static uint16_t shift_calc(const char *str, uint16_t pos, uint16_t len, int16_t sign)
 {
 	bool found = false;
-	u16_t ret = 0U;
-	u16_t idx;
+	uint16_t ret = 0U;
+	uint16_t idx;
 
 	while (1) {
 		idx = pos + ret * sign;
@@ -123,10 +123,10 @@ static u16_t shift_calc(const char *str, u16_t pos, u16_t len, s16_t sign)
 	return ret;
 }
 
-void shell_op_cursor_word_move(const struct shell *shell, s16_t val)
+void shell_op_cursor_word_move(const struct shell *shell, int16_t val)
 {
-	s16_t shift;
-	s16_t sign;
+	int16_t shift;
+	int16_t sign;
 
 	if (val < 0) {
 		val = -val;
@@ -147,7 +147,7 @@ void shell_op_word_remove(const struct shell *shell)
 {
 	char *str = &shell->ctx->cmd_buff[shell->ctx->cmd_buff_pos - 1];
 	char *str_start = &shell->ctx->cmd_buff[0];
-	u16_t chars_to_delete;
+	uint16_t chars_to_delete;
 
 	/* Line must not be empty and cursor must not be at 0 to continue. */
 	if ((shell->ctx->cmd_buff_len == 0) ||
@@ -209,7 +209,7 @@ void shell_op_right_arrow(const struct shell *shell)
 	}
 }
 
-static void reprint_from_cursor(const struct shell *shell, u16_t diff,
+static void reprint_from_cursor(const struct shell *shell, uint16_t diff,
 				bool data_removed)
 {
 	/* Clear eos is needed only when newly printed command is shorter than
@@ -236,9 +236,9 @@ static void reprint_from_cursor(const struct shell *shell, u16_t diff,
 	shell_op_cursor_move(shell, -diff);
 }
 
-static void data_insert(const struct shell *shell, const char *data, u16_t len)
+static void data_insert(const struct shell *shell, const char *data, uint16_t len)
 {
-	u16_t after = shell->ctx->cmd_buff_len - shell->ctx->cmd_buff_pos;
+	uint16_t after = shell->ctx->cmd_buff_len - shell->ctx->cmd_buff_pos;
 	char *curr_pos = &shell->ctx->cmd_buff[shell->ctx->cmd_buff_pos];
 
 	if ((shell->ctx->cmd_buff_len + len) >= CONFIG_SHELL_CMD_BUFF_SIZE) {
@@ -295,7 +295,7 @@ void shell_op_char_backspace(const struct shell *shell)
 
 void shell_op_char_delete(const struct shell *shell)
 {
-	u16_t diff = shell->ctx->cmd_buff_len - shell->ctx->cmd_buff_pos;
+	uint16_t diff = shell->ctx->cmd_buff_len - shell->ctx->cmd_buff_pos;
 	char *str = &shell->ctx->cmd_buff[shell->ctx->cmd_buff_pos];
 
 	if (diff == 0U) {
@@ -317,7 +317,7 @@ void shell_op_delete_from_cursor(const struct shell *shell)
 
 void shell_op_completion_insert(const struct shell *shell,
 				const char *compl,
-				u16_t compl_len)
+				uint16_t compl_len)
 {
 	data_insert(shell, compl, compl_len);
 }
@@ -378,7 +378,7 @@ void shell_write(const struct shell *shell, const void *data,
 
 	while (length) {
 		int err = shell->iface->api->write(shell->iface,
-				&((const u8_t *) data)[offset], length,
+				&((const uint8_t *) data)[offset], length,
 				&tmp_cnt);
 		(void)err;
 		__ASSERT_NO_MSG(err == 0);
@@ -408,7 +408,7 @@ static void vt100_bgcolor_set(const struct shell *shell,
 	}
 
 	/* -1 because default value is first in enum */
-	u8_t cmd[] = SHELL_VT100_BGCOLOR(bgcolor - 1);
+	uint8_t cmd[] = SHELL_VT100_BGCOLOR(bgcolor - 1);
 
 	shell->ctx->vt100_ctx.col.bgcol = bgcolor;
 	shell_raw_fprintf(shell->fprintf_ctx, "%s", cmd);
@@ -427,11 +427,11 @@ void shell_vt100_color_set(const struct shell *shell,
 
 	if (color != SHELL_NORMAL) {
 
-		u8_t cmd[] = SHELL_VT100_COLOR(color - 1);
+		uint8_t cmd[] = SHELL_VT100_COLOR(color - 1);
 
 		shell_raw_fprintf(shell->fprintf_ctx, "%s", cmd);
 	} else {
-		static const u8_t cmd[] = SHELL_VT100_MODESOFF;
+		static const uint8_t cmd[] = SHELL_VT100_MODESOFF;
 
 		shell_raw_fprintf(shell->fprintf_ctx, "%s", cmd);
 	}
diff --git a/subsys/shell/shell_ops.h b/subsys/shell/shell_ops.h
index f1953b192a..4a0141baad 100644
--- a/subsys/shell/shell_ops.h
+++ b/subsys/shell/shell_ops.h
@@ -141,18 +141,18 @@ static inline void flag_cmd_ctx_set(const struct shell *shell, bool val)
 	shell->ctx->internal.flags.cmd_ctx = val ? 1 : 0;
 }
 
-static inline u8_t flag_last_nl_get(const struct shell *shell)
+static inline uint8_t flag_last_nl_get(const struct shell *shell)
 {
 	return shell->ctx->internal.flags.last_nl;
 }
 
-static inline void flag_last_nl_set(const struct shell *shell, u8_t val)
+static inline void flag_last_nl_set(const struct shell *shell, uint8_t val)
 {
 	shell->ctx->internal.flags.last_nl = val;
 }
 
-void shell_op_cursor_vert_move(const struct shell *shell, s32_t delta);
-void shell_op_cursor_horiz_move(const struct shell *shell, s32_t delta);
+void shell_op_cursor_vert_move(const struct shell *shell, int32_t delta);
+void shell_op_cursor_horiz_move(const struct shell *shell, int32_t delta);
 
 void shell_op_cond_next_line(const struct shell *shell);
 
@@ -163,14 +163,14 @@ void shell_op_cond_next_line(const struct shell *shell);
  */
 void shell_op_cursor_position_synchronize(const struct shell *shell);
 
-void shell_op_cursor_move(const struct shell *shell, s16_t val);
+void shell_op_cursor_move(const struct shell *shell, int16_t val);
 
 void shell_op_left_arrow(const struct shell *shell);
 
 void shell_op_right_arrow(const struct shell *shell);
 
 /* Moves cursor by defined number of words left (val negative) or right. */
-void shell_op_cursor_word_move(const struct shell *shell, s16_t val);
+void shell_op_cursor_word_move(const struct shell *shell, int16_t val);
 
 /*
  *  Removes the "word" to the left of the cursor:
@@ -198,7 +198,7 @@ void shell_op_delete_from_cursor(const struct shell *shell);
 
 void shell_op_completion_insert(const struct shell *shell,
 				const char *compl,
-				u16_t compl_len);
+				uint16_t compl_len);
 
 bool shell_cursor_in_empty_line(const struct shell *shell);
 
diff --git a/subsys/shell/shell_rtt.c b/subsys/shell/shell_rtt.c
index 1caea17288..4cd4f28ac1 100644
--- a/subsys/shell/shell_rtt.c
+++ b/subsys/shell/shell_rtt.c
@@ -71,7 +71,7 @@ static int write(const struct shell_transport *transport,
 		 const void *data, size_t length, size_t *cnt)
 {
 	struct shell_rtt *sh_rtt = (struct shell_rtt *)transport->ctx;
-	const u8_t *data8 = (const u8_t *)data;
+	const uint8_t *data8 = (const uint8_t *)data;
 
 	if (rtt_blocking) {
 		*cnt = SEGGER_RTT_WriteNoLock(0, data8, length);
@@ -107,7 +107,7 @@ static int enable_shell_rtt(struct device *arg)
 {
 	ARG_UNUSED(arg);
 	bool log_backend = CONFIG_SHELL_RTT_INIT_LOG_LEVEL > 0;
-	u32_t level = (CONFIG_SHELL_RTT_INIT_LOG_LEVEL > LOG_LEVEL_DBG) ?
+	uint32_t level = (CONFIG_SHELL_RTT_INIT_LOG_LEVEL > LOG_LEVEL_DBG) ?
 		      CONFIG_LOG_MAX_LEVEL : CONFIG_SHELL_RTT_INIT_LOG_LEVEL;
 
 	shell_init(&shell_rtt, NULL, true, log_backend, level);
diff --git a/subsys/shell/shell_telnet.c b/subsys/shell/shell_telnet.c
index 346229f735..1b12d4770d 100644
--- a/subsys/shell/shell_telnet.c
+++ b/subsys/shell/shell_telnet.c
@@ -60,7 +60,7 @@ static void telnet_sent_cb(struct net_context *client,
 	}
 }
 
-static void telnet_command_send_reply(u8_t *msg, u16_t len)
+static void telnet_command_send_reply(uint8_t *msg, uint16_t len)
 {
 	int err;
 
@@ -80,7 +80,7 @@ static void telnet_reply_ay_command(void)
 {
 	static const char alive[] = "Zephyr at your service\r\n";
 
-	telnet_command_send_reply((u8_t *)alive, strlen(alive));
+	telnet_command_send_reply((uint8_t *)alive, strlen(alive));
 }
 
 static void telnet_reply_do_command(struct telnet_simple_command *cmd)
@@ -94,7 +94,7 @@ static void telnet_reply_do_command(struct telnet_simple_command *cmd)
 		break;
 	}
 
-	telnet_command_send_reply((u8_t *)cmd,
+	telnet_command_send_reply((uint8_t *)cmd,
 				  sizeof(struct telnet_simple_command));
 }
 
@@ -158,7 +158,7 @@ static void telnet_send_prematurely(struct k_work *work)
 static inline bool telnet_handle_command(struct net_pkt *pkt)
 {
 	/* Commands are two or three bytes. */
-	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(cmd_access, u16_t);
+	NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(cmd_access, uint16_t);
 	struct telnet_simple_command *cmd;
 
 	cmd = (struct telnet_simple_command *)net_pkt_get_data(pkt,
@@ -372,7 +372,7 @@ static int write(const struct shell_transport *transport,
 	struct shell_telnet_line_buf *lb;
 	size_t copy_len;
 	int err;
-	u32_t timeout;
+	uint32_t timeout;
 
 	if (sh_telnet == NULL) {
 		*cnt = 0;
@@ -399,7 +399,7 @@ static int write(const struct shell_transport *transport,
 			copy_len = length - *cnt;
 		}
 
-		memcpy(lb->buf + lb->len, (u8_t *)data + *cnt, copy_len);
+		memcpy(lb->buf + lb->len, (uint8_t *)data + *cnt, copy_len);
 		lb->len += copy_len;
 
 		/* Send the data immediately if the buffer is full or line feed
@@ -490,7 +490,7 @@ static int enable_shell_telnet(struct device *arg)
 	ARG_UNUSED(arg);
 
 	bool log_backend = CONFIG_SHELL_TELNET_INIT_LOG_LEVEL > 0;
-	u32_t level = (CONFIG_SHELL_TELNET_INIT_LOG_LEVEL > LOG_LEVEL_DBG) ?
+	uint32_t level = (CONFIG_SHELL_TELNET_INIT_LOG_LEVEL > LOG_LEVEL_DBG) ?
 		      CONFIG_LOG_MAX_LEVEL : CONFIG_SHELL_TELNET_INIT_LOG_LEVEL;
 
 	return shell_init(&shell_telnet, NULL, true, log_backend, level);
diff --git a/subsys/shell/shell_telnet_protocol.h b/subsys/shell/shell_telnet_protocol.h
index a77ca29d9d..a957484294 100644
--- a/subsys/shell/shell_telnet_protocol.h
+++ b/subsys/shell/shell_telnet_protocol.h
@@ -107,11 +107,11 @@
 /** Describes a telnet command */
 struct telnet_simple_command {
 	/** Mandatory IAC code */
-	u8_t iac;
+	uint8_t iac;
 	/** Type of operation (see Telnet commands above) */
-	u8_t op;
+	uint8_t op;
 	/** Option code */
-	u8_t opt;
+	uint8_t opt;
 };
 
 static inline void telnet_command_cpy(struct telnet_simple_command *dst,
diff --git a/subsys/shell/shell_uart.c b/subsys/shell/shell_uart.c
index 79264cb3e3..9304bf5567 100644
--- a/subsys/shell/shell_uart.c
+++ b/subsys/shell/shell_uart.c
@@ -29,9 +29,9 @@ SHELL_DEFINE(shell_uart, CONFIG_SHELL_PROMPT_UART, &shell_transport_uart,
 #ifdef CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN
 static void uart_rx_handle(const struct shell_uart *sh_uart)
 {
-	u8_t *data;
-	u32_t len;
-	u32_t rd_len;
+	uint8_t *data;
+	uint32_t len;
+	uint32_t rd_len;
 	bool new_data = false;
 
 	do {
@@ -57,7 +57,7 @@ static void uart_rx_handle(const struct shell_uart *sh_uart)
 			rd_len -= i;
 			new_data = true;
 			if (rd_len) {
-				for (u32_t j = 0; j < rd_len; j++) {
+				for (uint32_t j = 0; j < rd_len; j++) {
 					data[j] = data[i + j];
 				}
 			}
@@ -71,7 +71,7 @@ static void uart_rx_handle(const struct shell_uart *sh_uart)
 			(void)err;
 			__ASSERT_NO_MSG(err == 0);
 		} else {
-			u8_t dummy;
+			uint8_t dummy;
 
 			/* No space in the ring buffer - consume byte. */
 			LOG_WRN("RX ring buffer full.");
@@ -96,11 +96,11 @@ static void uart_rx_handle(const struct shell_uart *sh_uart)
 static void uart_tx_handle(const struct shell_uart *sh_uart)
 {
 	struct device *dev = sh_uart->ctrl_blk->dev;
-	u32_t len;
+	uint32_t len;
 	int err;
-	const u8_t *data;
+	const uint8_t *data;
 
-	len = ring_buf_get_claim(sh_uart->tx_ringbuf, (u8_t **)&data,
+	len = ring_buf_get_claim(sh_uart->tx_ringbuf, (uint8_t **)&data,
 				 sh_uart->tx_ringbuf->size);
 	if (len) {
 		len = uart_fifo_fill(dev, data, len);
@@ -144,7 +144,7 @@ static void uart_irq_init(const struct shell_uart *sh_uart)
 
 static void timer_handler(struct k_timer *timer)
 {
-	u8_t c;
+	uint8_t c;
 	const struct shell_uart *sh_uart = k_timer_user_data_get(timer);
 
 	while (uart_poll_in(sh_uart->ctrl_blk->dev, &c) == 0) {
@@ -215,7 +215,7 @@ static int write(const struct shell_transport *transport,
 		 const void *data, size_t length, size_t *cnt)
 {
 	const struct shell_uart *sh_uart = (struct shell_uart *)transport->ctx;
-	const u8_t *data8 = (const u8_t *)data;
+	const uint8_t *data8 = (const uint8_t *)data;
 
 	if (IS_ENABLED(CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN) &&
 		!sh_uart->ctrl_blk->blocking_tx) {
@@ -270,7 +270,7 @@ static int enable_shell_uart(struct device *arg)
 	struct device *dev =
 			device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
 	bool log_backend = CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > 0;
-	u32_t level =
+	uint32_t level =
 		(CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL > LOG_LEVEL_DBG) ?
 		CONFIG_LOG_MAX_LEVEL : CONFIG_SHELL_BACKEND_SERIAL_LOG_LEVEL;
 
diff --git a/subsys/shell/shell_utils.c b/subsys/shell/shell_utils.c
index 2f280a767f..2580fc31e8 100644
--- a/subsys/shell/shell_utils.c
+++ b/subsys/shell/shell_utils.c
@@ -10,44 +10,44 @@
 extern const struct shell_cmd_entry __shell_root_cmds_start[0];
 extern const struct shell_cmd_entry __shell_root_cmds_end[0];
 
-static inline const struct shell_cmd_entry *shell_root_cmd_get(u32_t id)
+static inline const struct shell_cmd_entry *shell_root_cmd_get(uint32_t id)
 {
 	return &__shell_root_cmds_start[id];
 }
 
 /* Calculates relative line number of given position in buffer */
-static u32_t line_num_with_buffer_offset_get(struct shell_multiline_cons *cons,
-					     u16_t buffer_pos)
+static uint32_t line_num_with_buffer_offset_get(struct shell_multiline_cons *cons,
+					     uint16_t buffer_pos)
 {
 	return ((buffer_pos + cons->name_len) / cons->terminal_wid);
 }
 
 /* Calculates column number of given position in buffer */
-static u32_t col_num_with_buffer_offset_get(struct shell_multiline_cons *cons,
-					    u16_t buffer_pos)
+static uint32_t col_num_with_buffer_offset_get(struct shell_multiline_cons *cons,
+					    uint16_t buffer_pos)
 {
 	/* columns are counted from 1 */
 	return (1 + ((buffer_pos + cons->name_len) % cons->terminal_wid));
 }
 
-s32_t column_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
-					  u16_t offset1,
-					  u16_t offset2)
+int32_t column_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
+					  uint16_t offset1,
+					  uint16_t offset2)
 {
 	return col_num_with_buffer_offset_get(cons, offset2)
 			- col_num_with_buffer_offset_get(cons, offset1);
 }
 
-s32_t row_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
-				       u16_t offset1,
-				       u16_t offset2)
+int32_t row_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
+				       uint16_t offset1,
+				       uint16_t offset2)
 {
 	return line_num_with_buffer_offset_get(cons, offset2)
 		- line_num_with_buffer_offset_get(cons, offset1);
 }
 
 void shell_multiline_data_calc(struct shell_multiline_cons *cons,
-			       u16_t buff_pos, u16_t buff_len)
+			       uint16_t buff_pos, uint16_t buff_len)
 {
 	/* Current cursor position in command.
 	 * +1 -> because home position is (1, 1)
@@ -60,7 +60,7 @@ void shell_multiline_data_calc(struct shell_multiline_cons *cons,
 	cons->cur_x_end = (buff_len + cons->name_len) % cons->terminal_wid + 1;
 }
 
-static char make_argv(char **ppcmd, u8_t c)
+static char make_argv(char **ppcmd, uint8_t c)
 {
 	char *cmd = *ppcmd;
 	char quote = 0;
@@ -108,8 +108,8 @@ static char make_argv(char **ppcmd, u8_t c)
 			}
 
 			if (t == '0') {
-				u8_t i;
-				u8_t v = 0U;
+				uint8_t i;
+				uint8_t v = 0U;
 
 				for (i = 2U; i < (2 + 3); i++) {
 					t = *(cmd + i);
@@ -130,8 +130,8 @@ static char make_argv(char **ppcmd, u8_t c)
 			}
 
 			if (t == 'x') {
-				u8_t i;
-				u8_t v = 0U;
+				uint8_t i;
+				uint8_t v = 0U;
 
 				for (i = 2U; i < (2 + 2); i++) {
 					t = *(cmd + i);
@@ -169,7 +169,7 @@ static char make_argv(char **ppcmd, u8_t c)
 }
 
 
-char shell_make_argv(size_t *argc, const char **argv, char *cmd, u8_t max_argc)
+char shell_make_argv(size_t *argc, const char **argv, char *cmd, uint8_t max_argc)
 {
 	char quote = 0;
 	char c;
@@ -198,11 +198,11 @@ char shell_make_argv(size_t *argc, const char **argv, char *cmd, u8_t max_argc)
 	return quote;
 }
 
-void shell_pattern_remove(char *buff, u16_t *buff_len, const char *pattern)
+void shell_pattern_remove(char *buff, uint16_t *buff_len, const char *pattern)
 {
 	char *pattern_addr = strstr(buff, pattern);
-	u16_t shift;
-	u16_t pattern_len = shell_strlen(pattern);
+	uint16_t shift;
+	uint16_t pattern_len = shell_strlen(pattern);
 
 	if (!pattern_addr) {
 		return;
@@ -221,10 +221,10 @@ void shell_pattern_remove(char *buff, u16_t *buff_len, const char *pattern)
 	memmove(pattern_addr, pattern_addr + pattern_len, shift);
 }
 
-static inline u32_t shell_root_cmd_count(void)
+static inline uint32_t shell_root_cmd_count(void)
 {
-	return ((u8_t *)__shell_root_cmds_end -
-			(u8_t *)__shell_root_cmds_start)/
+	return ((uint8_t *)__shell_root_cmds_end -
+			(uint8_t *)__shell_root_cmds_start)/
 				sizeof(struct shell_cmd_entry);
 }
 
@@ -357,12 +357,12 @@ int shell_set_root_cmd(const char *cmd)
 	return 0;
 }
 
-int shell_command_add(char *buff, u16_t *buff_len,
+int shell_command_add(char *buff, uint16_t *buff_len,
 		      const char *new_cmd, const char *pattern)
 {
-	u16_t cmd_len = shell_strlen(new_cmd);
+	uint16_t cmd_len = shell_strlen(new_cmd);
 	char *cmd_source_addr;
-	u16_t shift;
+	uint16_t shift;
 
 	/* +1 for space */
 	if ((*buff_len + cmd_len + 1) > CONFIG_SHELL_CMD_BUFF_SIZE) {
@@ -389,16 +389,16 @@ int shell_command_add(char *buff, u16_t *buff_len,
 
 void shell_spaces_trim(char *str)
 {
-	u16_t len = shell_strlen(str);
-	u16_t shift = 0U;
+	uint16_t len = shell_strlen(str);
+	uint16_t shift = 0U;
 
 	if (!str) {
 		return;
 	}
 
-	for (u16_t i = 0; i < len - 1; i++) {
+	for (uint16_t i = 0; i < len - 1; i++) {
 		if (isspace((int)str[i])) {
-			for (u16_t j = i + 1; j < len; j++) {
+			for (uint16_t j = i + 1; j < len; j++) {
 				if (isspace((int)str[j])) {
 					shift++;
 					continue;
@@ -422,9 +422,9 @@ void shell_spaces_trim(char *str)
 /** @brief Remove white chars from beginning and end of command buffer.
  *
  */
-static void buffer_trim(char *buff, u16_t *buff_len)
+static void buffer_trim(char *buff, uint16_t *buff_len)
 {
-	u16_t i = 0U;
+	uint16_t i = 0U;
 
 	/* no command in the buffer */
 	if (buff[0] == '\0') {
diff --git a/subsys/shell/shell_utils.h b/subsys/shell/shell_utils.h
index a3aca23342..9bacb2ee75 100644
--- a/subsys/shell/shell_utils.h
+++ b/subsys/shell/shell_utils.h
@@ -15,20 +15,20 @@ extern "C" {
 
 #define SHELL_MSG_SPECIFY_SUBCOMMAND	"Please specify a subcommand.\n"
 
-s32_t row_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
-				       u16_t offset1,
-				       u16_t offset2);
+int32_t row_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
+				       uint16_t offset1,
+				       uint16_t offset2);
 
-s32_t column_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
-					  u16_t offset1,
-					  u16_t offset2);
+int32_t column_span_with_buffer_offsets_get(struct shell_multiline_cons *cons,
+					  uint16_t offset1,
+					  uint16_t offset2);
 
 void shell_multiline_data_calc(struct shell_multiline_cons *cons,
-				   u16_t buff_pos, u16_t buff_len);
+				   uint16_t buff_pos, uint16_t buff_len);
 
-static inline u16_t shell_strlen(const char *str)
+static inline uint16_t shell_strlen(const char *str)
 {
-	return str == NULL ? 0U : (u16_t)strlen(str);
+	return str == NULL ? 0U : (uint16_t)strlen(str);
 }
 
 char shell_make_argv(size_t *argc, const char **argv,
@@ -37,7 +37,7 @@ char shell_make_argv(size_t *argc, const char **argv,
 /** @brief Removes pattern and following space
  *
  */
-void shell_pattern_remove(char *buff, u16_t *buff_len, const char *pattern);
+void shell_pattern_remove(char *buff, uint16_t *buff_len, const char *pattern);
 
 /** @brief Get subcommand with given index from the root.
  *
@@ -77,7 +77,7 @@ const struct shell_static_entry *shell_get_last_command(
 					struct shell_static_entry *dloc,
 					bool only_static);
 
-int shell_command_add(char *buff, u16_t *buff_len,
+int shell_command_add(char *buff, uint16_t *buff_len,
 		      const char *new_cmd, const char *pattern);
 
 const struct shell_static_entry *shell_root_cmd_find(const char *syntax);
diff --git a/subsys/shell/shell_wildcard.c b/subsys/shell/shell_wildcard.c
index 871f5d6f4d..aed8c69be3 100644
--- a/subsys/shell/shell_wildcard.c
+++ b/subsys/shell/shell_wildcard.c
@@ -10,13 +10,13 @@
 #include "shell_utils.h"
 #include "shell_ops.h"
 
-static enum shell_wildcard_status command_add(char *buff, u16_t *buff_len,
+static enum shell_wildcard_status command_add(char *buff, uint16_t *buff_len,
 					      char const *cmd,
 					      char const *pattern)
 {
-	u16_t cmd_len = shell_strlen(cmd);
+	uint16_t cmd_len = shell_strlen(cmd);
 	char *completion_addr;
-	u16_t shift;
+	uint16_t shift;
 
 	/* +1 for space */
 	if ((*buff_len + cmd_len + 1) > CONFIG_SHELL_CMD_BUFF_SIZE) {
@@ -107,7 +107,7 @@ static enum shell_wildcard_status commands_expand(const struct shell *shell,
 
 bool shell_wildcard_character_exist(const char *str)
 {
-	u16_t str_len = shell_strlen(str);
+	uint16_t str_len = shell_strlen(str);
 
 	for (size_t i = 0; i < str_len; i++) {
 		if ((str[i] == '?') || (str[i] == '*')) {
diff --git a/subsys/stats/stats.c b/subsys/stats/stats.c
index c9555116b3..f487519c40 100644
--- a/subsys/stats/stats.c
+++ b/subsys/stats/stats.c
@@ -21,7 +21,7 @@ stats_get_name(const struct stats_hdr *hdr, int idx)
 {
 #ifdef CONFIG_STATS_NAMES
 	const struct stats_name_map *cur;
-	u16_t off;
+	uint16_t off;
 	int i;
 
 	/* The stats name map contains two elements, an offset into the
@@ -41,7 +41,7 @@ stats_get_name(const struct stats_hdr *hdr, int idx)
 	return NULL;
 }
 
-static u16_t
+static uint16_t
 stats_get_off(const struct stats_hdr *hdr, int idx)
 {
 	return sizeof(*hdr) + idx * hdr->s_size;
@@ -131,8 +131,8 @@ stats_walk(struct stats_hdr *hdr, stats_walk_fn *walk_func, void *arg)
  * @param map_cnt The number of items in the statistics map
  */
 void
-stats_init(struct stats_hdr *hdr, u8_t size, u16_t cnt,
-	   const struct stats_name_map *map, u16_t map_cnt)
+stats_init(struct stats_hdr *hdr, uint8_t size, uint16_t cnt,
+	   const struct stats_name_map *map, uint16_t map_cnt)
 {
 	hdr->s_size = size;
 	hdr->s_cnt = cnt;
@@ -257,8 +257,8 @@ stats_register(const char *name, struct stats_hdr *hdr)
  * @return 0 on success, non-zero error code on failure.
  */
 int
-stats_init_and_reg(struct stats_hdr *shdr, u8_t size, u16_t cnt,
-		   const struct stats_name_map *map, u16_t map_cnt,
+stats_init_and_reg(struct stats_hdr *shdr, uint8_t size, uint16_t cnt,
+		   const struct stats_name_map *map, uint16_t map_cnt,
 		   const char *name)
 {
 	int rc;
@@ -281,5 +281,5 @@ stats_init_and_reg(struct stats_hdr *shdr, u8_t size, u16_t cnt,
 void
 stats_reset(struct stats_hdr *hdr)
 {
-	(void)memset((u8_t *)hdr + sizeof(*hdr), 0, hdr->s_size * hdr->s_cnt);
+	(void)memset((uint8_t *)hdr + sizeof(*hdr), 0, hdr->s_size * hdr->s_cnt);
 }
diff --git a/subsys/storage/flash_map/flash_map.c b/subsys/storage/flash_map/flash_map.c
index 9f3c9053b8..25a18ec979 100644
--- a/subsys/storage/flash_map/flash_map.c
+++ b/subsys/storage/flash_map/flash_map.c
@@ -17,12 +17,12 @@
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 struct layout_data {
-	u32_t area_idx;
-	u32_t area_off;
-	u32_t area_len;
+	uint32_t area_idx;
+	uint32_t area_off;
+	uint32_t area_len;
 	void *ret;        /* struct flash_area* or struct flash_sector* */
-	u32_t ret_idx;
-	u32_t ret_len;
+	uint32_t ret_idx;
+	uint32_t ret_len;
 	int status;
 };
 #endif /* CONFIG_FLASH_PAGE_LAYOUT */
@@ -48,7 +48,7 @@ void flash_area_foreach(flash_area_cb_t user_cb, void *user_data)
 	}
 }
 
-int flash_area_open(u8_t id, const struct flash_area **fap)
+int flash_area_open(uint8_t id, const struct flash_area **fap)
 {
 	const struct flash_area *area;
 
@@ -115,7 +115,7 @@ static bool should_bail(const struct flash_pages_info *info,
  * flash_area_get_sectors(). A lot of this can be inlined once
  * flash_area_to_sectors() is removed.
  */
-static int flash_area_layout(int idx, u32_t *cnt, void *ret,
+static int flash_area_layout(int idx, uint32_t *cnt, void *ret,
 flash_page_cb cb, struct layout_data *cb_data)
 {
 	struct device *flash_dev;
@@ -169,7 +169,7 @@ static bool get_sectors_cb(const struct flash_pages_info *info, void *datav)
 	return true;
 }
 
-int flash_area_get_sectors(int idx, u32_t *cnt, struct flash_sector *ret)
+int flash_area_get_sectors(int idx, uint32_t *cnt, struct flash_sector *ret)
 {
 	struct layout_data data;
 
@@ -240,7 +240,7 @@ int flash_area_erase(const struct flash_area *fa, off_t off, size_t len)
 	return rc;
 }
 
-u8_t flash_area_align(const struct flash_area *fa)
+uint8_t flash_area_align(const struct flash_area *fa)
 {
 	struct device *dev;
 
diff --git a/subsys/storage/stream/stream_flash.c b/subsys/storage/stream/stream_flash.c
index 847cb9863e..3170521600 100644
--- a/subsys/storage/stream/stream_flash.c
+++ b/subsys/storage/stream/stream_flash.c
@@ -106,14 +106,14 @@ static int flash_sync(struct stream_flash_ctx *ctx)
 	return rc;
 }
 
-int stream_flash_buffered_write(struct stream_flash_ctx *ctx, const u8_t *data,
+int stream_flash_buffered_write(struct stream_flash_ctx *ctx, const uint8_t *data,
 				size_t len, bool flush)
 {
 	int processed = 0;
 	int rc = 0;
 	int buf_empty_bytes;
 	size_t fill_length;
-	u8_t filler;
+	uint8_t filler;
 
 	if (!ctx || !data) {
 		return -EFAULT;
@@ -179,7 +179,7 @@ size_t stream_flash_bytes_written(struct stream_flash_ctx *ctx)
 }
 
 int stream_flash_init(struct stream_flash_ctx *ctx, struct device *fdev,
-		      u8_t *buf, size_t buf_len, size_t offset, size_t size,
+		      uint8_t *buf, size_t buf_len, size_t offset, size_t size,
 		      stream_flash_callback_t cb)
 {
 	if (!ctx || !fdev || !buf) {
diff --git a/subsys/testsuite/coverage/coverage.c b/subsys/testsuite/coverage/coverage.c
index a4f093ea84..a1cfa94e11 100644
--- a/subsys/testsuite/coverage/coverage.c
+++ b/subsys/testsuite/coverage/coverage.c
@@ -54,29 +54,29 @@ void __gcov_exit(void)
 #define MASK_32BIT (0xffffffffUL)
 static inline void buff_write_u64(void *buffer, size_t *off, uint64_t v)
 {
-	*((u32_t *)((u8_t *)buffer + *off) + 0) = (u32_t)(v & MASK_32BIT);
-	*((u32_t *)((u8_t *)buffer + *off) + 1) = (u32_t)((v >> 32) &
+	*((uint32_t *)((uint8_t *)buffer + *off) + 0) = (uint32_t)(v & MASK_32BIT);
+	*((uint32_t *)((uint8_t *)buffer + *off) + 1) = (uint32_t)((v >> 32) &
 							  MASK_32BIT);
-	*off = *off + sizeof(u64_t);
+	*off = *off + sizeof(uint64_t);
 }
 
 /**
  * buff_write_u32 - Store 32 bit data on a buffer and return the size
  */
-static inline void buff_write_u32(void *buffer, size_t *off, u32_t v)
+static inline void buff_write_u32(void *buffer, size_t *off, uint32_t v)
 {
-	*((u32_t *)((u8_t *)buffer + *off)) = v;
-	*off = *off + sizeof(u32_t);
+	*((uint32_t *)((uint8_t *)buffer + *off)) = v;
+	*off = *off + sizeof(uint32_t);
 }
 
 
 size_t calculate_buff_size(struct gcov_info *info)
 {
-	u32_t iter;
-	u32_t iter_1;
-	u32_t iter_2;
+	uint32_t iter;
+	uint32_t iter_1;
+	uint32_t iter_2;
 	/* few Fixed values at the start version, stamp and magic number. */
-	u32_t size = sizeof(u32_t) * 3;
+	uint32_t size = sizeof(uint32_t) * 3;
 
 	for (iter = 0U; iter < info->n_functions; iter++) {
 		/* space for TAG_FUNCTION and FUNCTION_LENGTH
@@ -84,7 +84,7 @@ size_t calculate_buff_size(struct gcov_info *info)
 		 * lineno_checksum
 		 * cfg_checksum
 		 */
-		size += (sizeof(u32_t) * 5);
+		size += (sizeof(uint32_t) * 5);
 
 		for (iter_1 = 0U; iter_1 < GCOV_COUNTERS; iter_1++) {
 			if (!info->merge[iter_1]) {
@@ -92,14 +92,14 @@ size_t calculate_buff_size(struct gcov_info *info)
 			}
 
 			/*  for function counter and number of values  */
-			size += (sizeof(u32_t) * 2);
+			size += (sizeof(uint32_t) * 2);
 
 			for (iter_2 = 0U;
 			     iter_2 < info->functions[iter]->ctrs->num;
 			     iter_2++) {
 
-				/* Iter for values which is u64_t */
-				size += (sizeof(u64_t));
+				/* Iter for values which is uint64_t */
+				size += (sizeof(uint64_t));
 			}
 
 		}
@@ -117,13 +117,13 @@ size_t calculate_buff_size(struct gcov_info *info)
  * This buffer will now have info similar to a regular gcda
  * format.
  */
-size_t populate_buffer(u8_t *buffer, struct gcov_info *info)
+size_t populate_buffer(uint8_t *buffer, struct gcov_info *info)
 {
 	struct gcov_fn_info *functions;
 	struct gcov_ctr_info *counters_per_func;
-	u32_t iter_functions;
-	u32_t iter_counts;
-	u32_t iter_counter_values;
+	uint32_t iter_functions;
+	uint32_t iter_counts;
+	uint32_t iter_counter_values;
 	size_t buffer_write_position = 0;
 
 	/* File header. */
@@ -202,7 +202,7 @@ size_t populate_buffer(u8_t *buffer, struct gcov_info *info)
 
 void dump_on_console(const char *filename, char *ptr, size_t len)
 {
-	u32_t iter;
+	uint32_t iter;
 
 	printk("\n%c", FILE_START_INDICATOR);
 	while (*filename != '\0') {
@@ -213,7 +213,7 @@ void dump_on_console(const char *filename, char *ptr, size_t len)
 	/* Data dump */
 
 	for (iter = 0U; iter < len; iter++) {
-		printk(" %02x", (u8_t)*ptr++);
+		printk(" %02x", (uint8_t)*ptr++);
 	}
 }
 
@@ -222,7 +222,7 @@ void dump_on_console(const char *filename, char *ptr, size_t len)
  */
 void gcov_coverage_dump(void)
 {
-	u8_t *buffer;
+	uint8_t *buffer;
 	size_t size;
 	size_t written_size;
 	struct gcov_info *gcov_list = gcov_info_head;
@@ -233,7 +233,7 @@ void gcov_coverage_dump(void)
 
 		size = calculate_buff_size(gcov_list);
 
-		buffer = (u8_t *) k_mem_pool_malloc(&gcov_heap_mem_pool, size);
+		buffer = (uint8_t *) k_mem_pool_malloc(&gcov_heap_mem_pool, size);
 		if (!buffer) {
 			printk("No Mem available to continue dump\n");
 			goto coverage_dump_end;
@@ -260,9 +260,9 @@ coverage_dump_end:
 /* Initialize the gcov by calling the required constructors */
 void gcov_static_init(void)
 {
-	extern u32_t __init_array_start, __init_array_end;
-	u32_t func_pointer_start = (u32_t) &__init_array_start;
-	u32_t func_pointer_end = (u32_t) &__init_array_end;
+	extern uint32_t __init_array_start, __init_array_end;
+	uint32_t func_pointer_start = (uint32_t) &__init_array_start;
+	uint32_t func_pointer_end = (uint32_t) &__init_array_end;
 
 	while (func_pointer_start < func_pointer_end) {
 		void (**p)(void);
diff --git a/subsys/testsuite/coverage/coverage.h b/subsys/testsuite/coverage/coverage.h
index e8e8a2e832..e0e3c3bc1f 100644
--- a/subsys/testsuite/coverage/coverage.h
+++ b/subsys/testsuite/coverage/coverage.h
@@ -36,14 +36,14 @@
 #define GCOV_COUNTERS 10U
 #endif
 
-typedef u64_t gcov_type;
+typedef uint64_t gcov_type;
 
 #define GCOV_TAG_FUNCTION_LENGTH  3
 #define GCOV_DATA_MAGIC   (0x67636461)
 #define GCOV_TAG_FUNCTION (0x01000000)
 #define GCOV_TAG_COUNTER_BASE (0x01a10000)
 #define GCOV_TAG_FOR_COUNTER(count)         \
-(GCOV_TAG_COUNTER_BASE + ((u32_t) (count) << 17))
+(GCOV_TAG_COUNTER_BASE + ((uint32_t) (count) << 17))
 
 #define FILE_START_INDICATOR	'*'
 #define GCOV_DUMP_SEPARATOR	'<'
diff --git a/subsys/testsuite/include/test_utils.h b/subsys/testsuite/include/test_utils.h
index 98209e9255..20ecff8207 100644
--- a/subsys/testsuite/include/test_utils.h
+++ b/subsys/testsuite/include/test_utils.h
@@ -35,19 +35,19 @@
 #include <tc_util.h>
 #include <tinycrypt/constants.h>
 
-static inline void show_str(const char *label, const u8_t *s, size_t len)
+static inline void show_str(const char *label, const uint8_t *s, size_t len)
 {
-	u32_t i;
+	uint32_t i;
 
 	TC_PRINT("%s = ", label);
-	for (i = 0U; i < (u32_t)len; ++i) {
+	for (i = 0U; i < (uint32_t)len; ++i) {
 		TC_PRINT("%02x", s[i]);
 	}
 	TC_PRINT("\n");
 }
 
 static inline
-void fatal(u32_t testnum, const void *expected, size_t expectedlen,
+void fatal(uint32_t testnum, const void *expected, size_t expectedlen,
 	   const void *computed, size_t computedlen)
 {
 	TC_ERROR("\tTest #%d Failed!\n", testnum);
@@ -57,11 +57,11 @@ void fatal(u32_t testnum, const void *expected, size_t expectedlen,
 }
 
 static inline
-u32_t check_result(u32_t testnum, const void *expected,
+uint32_t check_result(uint32_t testnum, const void *expected,
 		      size_t expectedlen, const void *computed,
-		      size_t computedlen, u32_t verbose)
+		      size_t computedlen, uint32_t verbose)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	ARG_UNUSED(verbose);
 
diff --git a/subsys/testsuite/include/timestamp.h b/subsys/testsuite/include/timestamp.h
index 7dbfc9d1f6..7bd6c75c57 100644
--- a/subsys/testsuite/include/timestamp.h
+++ b/subsys/testsuite/include/timestamp.h
@@ -28,17 +28,17 @@
 #define OS_GET_TIME() k_cycle_get_32()
 
 /* time necessary to read the time */
-extern u32_t tm_off;
+extern uint32_t tm_off;
 
-static inline u32_t TIME_STAMP_DELTA_GET(u32_t ts)
+static inline uint32_t TIME_STAMP_DELTA_GET(uint32_t ts)
 {
-	u32_t t;
+	uint32_t t;
 
 	/* serialize so OS_GET_TIME() is not reordered */
 	timestamp_serialize();
 
 	t = OS_GET_TIME();
-	u32_t res = (t >= ts) ? (t - ts) : (ULONG_MAX - ts + t);
+	uint32_t res = (t >= ts) ? (t - ts) : (ULONG_MAX - ts + t);
 
 	if (ts > 0) {
 		res -= tm_off;
@@ -52,14 +52,14 @@ static inline u32_t TIME_STAMP_DELTA_GET(u32_t ts)
  */
 static inline void bench_test_init(void)
 {
-	u32_t t = OS_GET_TIME();
+	uint32_t t = OS_GET_TIME();
 
 	tm_off = OS_GET_TIME() - t;
 }
 
 
 /* timestamp for checks */
-static s64_t tCheck;
+static int64_t tCheck;
 
 /*
  * Routines are invoked before and after the benchmark and check
diff --git a/subsys/testsuite/ztest/include/arch/cpu.h b/subsys/testsuite/ztest/include/arch/cpu.h
index 5857b1d53e..8db9eea49d 100644
--- a/subsys/testsuite/ztest/include/arch/cpu.h
+++ b/subsys/testsuite/ztest/include/arch/cpu.h
@@ -18,7 +18,7 @@ struct _thread_arch {
 typedef struct _thread_arch _thread_arch_t;
 
 /* Architecture functions */
-static inline u32_t arch_k_cycle_get_32(void)
+static inline uint32_t arch_k_cycle_get_32(void)
 {
 	return 0;
 }
diff --git a/subsys/testsuite/ztest/include/ztest_mock.h b/subsys/testsuite/ztest/include/ztest_mock.h
index 1cbb33a538..d184f44c80 100644
--- a/subsys/testsuite/ztest/include/ztest_mock.h
+++ b/subsys/testsuite/ztest/include/ztest_mock.h
@@ -134,7 +134,7 @@ void z_ztest_check_expected_value(const char *fn, const char *param,
 
 void z_ztest_expect_data(const char *fn, const char *name, void *val);
 void z_ztest_check_expected_data(const char *fn, const char *name, void *data,
-				 u32_t length);
+				 uint32_t length);
 
 void z_ztest_returns_value(const char *fn, uintptr_t value);
 uintptr_t z_ztest_get_return_value(const char *fn);
diff --git a/subsys/testsuite/ztest/include/ztest_test.h b/subsys/testsuite/ztest/include/ztest_test.h
index 9814f6139e..b0188a3ca2 100644
--- a/subsys/testsuite/ztest/include/ztest_test.h
+++ b/subsys/testsuite/ztest/include/ztest_test.h
@@ -24,7 +24,7 @@ struct unit_test {
 	void (*test)(void);
 	void (*setup)(void);
 	void (*teardown)(void);
-	u32_t thread_options;
+	uint32_t thread_options;
 };
 
 void z_ztest_run_test_suite(const char *name, struct unit_test *suite);
diff --git a/subsys/testsuite/ztest/src/ztest.c b/subsys/testsuite/ztest/src/ztest.c
index 93e1416d32..1b37d93295 100644
--- a/subsys/testsuite/ztest/src/ztest.c
+++ b/subsys/testsuite/ztest/src/ztest.c
@@ -108,7 +108,7 @@ static void cpu_hold(void *arg1, void *arg2, void *arg3)
 	ARG_UNUSED(arg2);
 	ARG_UNUSED(arg3);
 	unsigned int key = arch_irq_lock();
-	u32_t dt, start_ms = k_uptime_get_32();
+	uint32_t dt, start_ms = k_uptime_get_32();
 
 	k_sem_give(&cpuhold_sem);
 
@@ -426,10 +426,10 @@ void main(void)
 	end_report();
 	if (IS_ENABLED(CONFIG_ZTEST_RETEST_IF_PASSED)) {
 		static __noinit struct {
-			u32_t magic;
-			u32_t boots;
+			uint32_t magic;
+			uint32_t boots;
 		} state;
-		const u32_t magic = 0x152ac523;
+		const uint32_t magic = 0x152ac523;
 
 		if (state.magic != magic) {
 			state.magic = magic;
diff --git a/subsys/testsuite/ztest/src/ztest_mock.c b/subsys/testsuite/ztest/src/ztest_mock.c
index b5d0b42be7..abd10ca58f 100644
--- a/subsys/testsuite/ztest/src/ztest_mock.c
+++ b/subsys/testsuite/ztest/src/ztest_mock.c
@@ -207,7 +207,7 @@ void z_ztest_expect_data(const char *fn, const char *name, void *val)
 }
 
 void z_ztest_check_expected_data(const char *fn, const char *name, void *data,
-				 u32_t length)
+				 uint32_t length)
 {
 	struct parameter *param;
 	void *expected;
diff --git a/subsys/tracing/cpu_stats.c b/subsys/tracing/cpu_stats.c
index cba4af11f8..9902bab63b 100644
--- a/subsys/tracing/cpu_stats.c
+++ b/subsys/tracing/cpu_stats.c
@@ -18,14 +18,14 @@ enum cpu_state {
 static enum cpu_state last_cpu_state = CPU_STATE_SCHEDULER;
 static enum cpu_state cpu_state_before_interrupts;
 
-static u32_t last_time;
+static uint32_t last_time;
 static struct cpu_stats stats_hw_tick;
 static int nested_interrupts;
 static struct k_thread *current_thread;
 
-void update_counter(volatile u64_t *cnt)
+void update_counter(volatile uint64_t *cnt)
 {
-	u32_t time = k_cycle_get_32();
+	uint32_t time = k_cycle_get_32();
 
 	if (time >= last_time) {
 		(*cnt) += (time - last_time);
@@ -68,7 +68,7 @@ void cpu_stats_get_ns(struct cpu_stats *cpu_stats_ns)
 	irq_unlock(key);
 }
 
-u32_t cpu_stats_non_idle_and_sched_get_percent(void)
+uint32_t cpu_stats_non_idle_and_sched_get_percent(void)
 {
 	int key = irq_lock();
 
diff --git a/subsys/tracing/ctf/ctf_top.c b/subsys/tracing/ctf/ctf_top.c
index ed3dff5b12..06646aca43 100644
--- a/subsys/tracing/ctf/ctf_top.c
+++ b/subsys/tracing/ctf/ctf_top.c
@@ -13,19 +13,19 @@ void sys_trace_thread_switched_out(void)
 {
 	struct k_thread *thread = k_current_get();
 
-	ctf_top_thread_switched_out((u32_t)(uintptr_t)thread);
+	ctf_top_thread_switched_out((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_switched_in(void)
 {
 	struct k_thread *thread = k_current_get();
 
-	ctf_top_thread_switched_in((u32_t)(uintptr_t)thread);
+	ctf_top_thread_switched_in((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_priority_set(struct k_thread *thread)
 {
-	ctf_top_thread_priority_set((u32_t)(uintptr_t)thread,
+	ctf_top_thread_priority_set((uint32_t)(uintptr_t)thread,
 				    thread->base.prio);
 }
 
@@ -44,14 +44,14 @@ void sys_trace_thread_create(struct k_thread *thread)
 #endif
 
 	ctf_top_thread_create(
-		(u32_t)(uintptr_t)thread,
+		(uint32_t)(uintptr_t)thread,
 		thread->base.prio,
 		name
 		);
 
 #if defined(CONFIG_THREAD_STACK_INFO)
 	ctf_top_thread_info(
-		(u32_t)(uintptr_t)thread,
+		(uint32_t)(uintptr_t)thread,
 		thread->stack_info.start,
 		thread->stack_info.size
 		);
@@ -60,34 +60,34 @@ void sys_trace_thread_create(struct k_thread *thread)
 
 void sys_trace_thread_abort(struct k_thread *thread)
 {
-	ctf_top_thread_abort((u32_t)(uintptr_t)thread);
+	ctf_top_thread_abort((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_suspend(struct k_thread *thread)
 {
-	ctf_top_thread_suspend((u32_t)(uintptr_t)thread);
+	ctf_top_thread_suspend((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_resume(struct k_thread *thread)
 {
-	ctf_top_thread_resume((u32_t)(uintptr_t)thread);
+	ctf_top_thread_resume((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_ready(struct k_thread *thread)
 {
-	ctf_top_thread_ready((u32_t)(uintptr_t)thread);
+	ctf_top_thread_ready((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_pend(struct k_thread *thread)
 {
-	ctf_top_thread_pend((u32_t)(uintptr_t)thread);
+	ctf_top_thread_pend((uint32_t)(uintptr_t)thread);
 }
 
 void sys_trace_thread_info(struct k_thread *thread)
 {
 #if defined(CONFIG_THREAD_STACK_INFO)
 	ctf_top_thread_info(
-		(u32_t)(uintptr_t)thread,
+		(uint32_t)(uintptr_t)thread,
 		thread->stack_info.start,
 		thread->stack_info.size
 		);
@@ -106,7 +106,7 @@ void sys_trace_thread_name_set(struct k_thread *thread)
 		name.buf[sizeof(name.buf) - 1] = 0;
 	}
 	ctf_top_thread_name_set(
-		(u32_t)(uintptr_t)thread,
+		(uint32_t)(uintptr_t)thread,
 		name
 		);
 #endif
diff --git a/subsys/tracing/ctf/ctf_top.h b/subsys/tracing/ctf/ctf_top.h
index 39ed7b357e..8308f940c7 100644
--- a/subsys/tracing/ctf/ctf_top.h
+++ b/subsys/tracing/ctf/ctf_top.h
@@ -34,8 +34,8 @@
  */
 #define CTF_GATHER_FIELDS(...)						    \
 {									    \
-	u8_t epacket[0 MAP(CTF_INTERNAL_FIELD_SIZE, ##__VA_ARGS__)];	    \
-	u8_t *epacket_cursor = &epacket[0];				    \
+	uint8_t epacket[0 MAP(CTF_INTERNAL_FIELD_SIZE, ##__VA_ARGS__)];	    \
+	uint8_t *epacket_cursor = &epacket[0];				    \
 									    \
 	MAP(CTF_INTERNAL_FIELD_APPEND, ##__VA_ARGS__)			    \
 	tracing_format_raw_data(epacket, sizeof(epacket));		    \
@@ -44,7 +44,7 @@
 #ifdef CONFIG_TRACING_CTF_TIMESTAMP
 #define CTF_EVENT(...)							    \
 	{								    \
-		const u32_t tstamp = k_cycle_get_32();			    \
+		const uint32_t tstamp = k_cycle_get_32();			    \
 									    \
 		CTF_GATHER_FIELDS(tstamp, __VA_ARGS__)			    \
 	}
@@ -92,92 +92,92 @@ typedef struct {
 } ctf_bounded_string_t;
 
 
-static inline void ctf_top_thread_switched_out(u32_t thread_id)
+static inline void ctf_top_thread_switched_out(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_SWITCHED_OUT),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_SWITCHED_OUT),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_switched_in(u32_t thread_id)
+static inline void ctf_top_thread_switched_in(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_SWITCHED_IN),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_SWITCHED_IN),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_priority_set(u32_t thread_id, s8_t prio)
+static inline void ctf_top_thread_priority_set(uint32_t thread_id, int8_t prio)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_PRIORITY_SET),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_PRIORITY_SET),
 		thread_id,
 		prio
 		);
 }
 
 static inline void ctf_top_thread_create(
-	u32_t thread_id,
-	s8_t prio,
+	uint32_t thread_id,
+	int8_t prio,
 	ctf_bounded_string_t name
 	)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_CREATE),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_CREATE),
 		thread_id,
 		name
 		);
 }
 
-static inline void ctf_top_thread_abort(u32_t thread_id)
+static inline void ctf_top_thread_abort(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_ABORT),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_ABORT),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_suspend(u32_t thread_id)
+static inline void ctf_top_thread_suspend(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_SUSPEND),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_SUSPEND),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_resume(u32_t thread_id)
+static inline void ctf_top_thread_resume(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_RESUME),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_RESUME),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_ready(u32_t thread_id)
+static inline void ctf_top_thread_ready(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_READY),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_READY),
 		thread_id
 		);
 }
 
-static inline void ctf_top_thread_pend(u32_t thread_id)
+static inline void ctf_top_thread_pend(uint32_t thread_id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_PENDING),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_PENDING),
 		thread_id
 		);
 }
 
 static inline void ctf_top_thread_info(
-	u32_t thread_id,
-	u32_t stack_base,
-	u32_t stack_size
+	uint32_t thread_id,
+	uint32_t stack_base,
+	uint32_t stack_size
 	)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_INFO),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_INFO),
 		thread_id,
 		stack_base,
 		stack_size
@@ -185,12 +185,12 @@ static inline void ctf_top_thread_info(
 }
 
 static inline void ctf_top_thread_name_set(
-	u32_t thread_id,
+	uint32_t thread_id,
 	ctf_bounded_string_t name
 	)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_THREAD_NAME_SET),
+		CTF_LITERAL(uint8_t, CTF_EVENT_THREAD_NAME_SET),
 		thread_id,
 		name
 		);
@@ -199,43 +199,43 @@ static inline void ctf_top_thread_name_set(
 static inline void ctf_top_isr_enter(void)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_ISR_ENTER)
+		CTF_LITERAL(uint8_t, CTF_EVENT_ISR_ENTER)
 		);
 }
 
 static inline void ctf_top_isr_exit(void)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_ISR_EXIT)
+		CTF_LITERAL(uint8_t, CTF_EVENT_ISR_EXIT)
 		);
 }
 
 static inline void ctf_top_isr_exit_to_scheduler(void)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_ISR_EXIT_TO_SCHEDULER)
+		CTF_LITERAL(uint8_t, CTF_EVENT_ISR_EXIT_TO_SCHEDULER)
 		);
 }
 
 static inline void ctf_top_idle(void)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_IDLE)
+		CTF_LITERAL(uint8_t, CTF_EVENT_IDLE)
 		);
 }
 
-static inline void ctf_top_void(u32_t id)
+static inline void ctf_top_void(uint32_t id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_ID_START_CALL),
+		CTF_LITERAL(uint8_t, CTF_EVENT_ID_START_CALL),
 		id
 		);
 }
 
-static inline void ctf_top_end_call(u32_t id)
+static inline void ctf_top_end_call(uint32_t id)
 {
 	CTF_EVENT(
-		CTF_LITERAL(u8_t, CTF_EVENT_ID_END_CALL),
+		CTF_LITERAL(uint8_t, CTF_EVENT_ID_END_CALL),
 		id
 		);
 }
diff --git a/subsys/tracing/include/tracing_backend.h b/subsys/tracing/include/tracing_backend.h
index 75b74747fa..0147bc3ba7 100644
--- a/subsys/tracing/include/tracing_backend.h
+++ b/subsys/tracing/include/tracing_backend.h
@@ -29,7 +29,7 @@ struct tracing_backend;
 struct tracing_backend_api {
 	void (*init)(void);
 	void (*output)(const struct tracing_backend *backend,
-		       u8_t *data, u32_t length);
+		       uint8_t *data, uint32_t length);
 };
 
 /**
@@ -75,7 +75,7 @@ static inline void tracing_backend_init(
  */
 static inline void tracing_backend_output(
 		const struct tracing_backend *backend,
-		u8_t *data, u32_t length)
+		uint8_t *data, uint32_t length)
 {
 	if (backend && backend->api) {
 		backend->api->output(backend, data, length);
diff --git a/subsys/tracing/include/tracing_buffer.h b/subsys/tracing/include/tracing_buffer.h
index b1270c725c..a76c90fcc1 100644
--- a/subsys/tracing/include/tracing_buffer.h
+++ b/subsys/tracing/include/tracing_buffer.h
@@ -31,14 +31,14 @@ bool tracing_buffer_is_empty(void);
  *
  * @return Tracing buffer free space (in bytes).
  */
-u32_t tracing_buffer_space_get(void);
+uint32_t tracing_buffer_space_get(void);
 
 /**
  * @brief Get tracing buffer capacity (max size).
  *
  * @return Tracing buffer capacity (in bytes).
  */
-u32_t tracing_buffer_capacity_get(void);
+uint32_t tracing_buffer_capacity_get(void);
 
 /**
  * @brief Try to allocate buffer in the tracing buffer.
@@ -50,7 +50,7 @@ u32_t tracing_buffer_capacity_get(void);
  * @return Size of allocated buffer which can be smaller than
  *         requested if there isn't enough free space or buffer wraps.
  */
-u32_t tracing_buffer_put_claim(u8_t **data, u32_t size);
+uint32_t tracing_buffer_put_claim(uint8_t **data, uint32_t size);
 
 /**
  * @brief Indicate number of bytes written to the allocated buffer.
@@ -60,7 +60,7 @@ u32_t tracing_buffer_put_claim(u8_t **data, u32_t size);
  * @retval 0 Successful operation.
  * @retval -EINVAL Given @a size exceeds free space of tracing buffer.
  */
-int tracing_buffer_put_finish(u32_t size);
+int tracing_buffer_put_finish(uint32_t size);
 
 /**
  * @brief Write data to tracing buffer.
@@ -70,7 +70,7 @@ int tracing_buffer_put_finish(u32_t size);
  *
  * @retval Number of bytes written to tracing buffer.
  */
-u32_t tracing_buffer_put(u8_t *data, u32_t size);
+uint32_t tracing_buffer_put(uint8_t *data, uint32_t size);
 
 /**
  * @brief Get address of the first valid data in tracing buffer.
@@ -82,7 +82,7 @@ u32_t tracing_buffer_put(u8_t *data, u32_t size);
  * @return Size of valid buffer which can be smaller than requested
  *         if there isn't enough valid data or buffer wraps.
  */
-u32_t tracing_buffer_get_claim(u8_t **data, u32_t size);
+uint32_t tracing_buffer_get_claim(uint8_t **data, uint32_t size);
 
 /**
  * @brief Indicate number of bytes read from claimed buffer.
@@ -92,7 +92,7 @@ u32_t tracing_buffer_get_claim(u8_t **data, u32_t size);
  * @retval 0 Successful operation.
  * @retval -EINVAL Given @a size exceeds available data of tracing buffer.
  */
-int tracing_buffer_get_finish(u32_t size);
+int tracing_buffer_get_finish(uint32_t size);
 
 /**
  * @brief Read data from tracing buffer to output buffer.
@@ -102,7 +102,7 @@ int tracing_buffer_get_finish(u32_t size);
  *
  * @retval Number of bytes written to the output buffer.
  */
-u32_t tracing_buffer_get(u8_t *data, u32_t size);
+uint32_t tracing_buffer_get(uint8_t *data, uint32_t size);
 
 /**
  * @brief Get buffer from tracing command buffer.
@@ -111,7 +111,7 @@ u32_t tracing_buffer_get(u8_t *data, u32_t size);
  *
  * @return Tracing command buffer size (in bytes).
  */
-u32_t tracing_cmd_buffer_alloc(u8_t **data);
+uint32_t tracing_cmd_buffer_alloc(uint8_t **data);
 
 #ifdef __cplusplus
 }
diff --git a/subsys/tracing/include/tracing_core.h b/subsys/tracing/include/tracing_core.h
index 355b51e19d..031721ad5a 100644
--- a/subsys/tracing/include/tracing_core.h
+++ b/subsys/tracing/include/tracing_core.h
@@ -31,7 +31,7 @@ bool is_tracing_enabled(void);
  * @param data Tracing buffer address.
  * @param length Tracing buffer length.
  */
-void tracing_buffer_handle(u8_t *data, u32_t length);
+void tracing_buffer_handle(uint8_t *data, uint32_t length);
 
 /**
  * @brief Handle tracing packet drop.
@@ -44,7 +44,7 @@ void tracing_packet_drop_handle(void);
  * @param buf Tracing command buffer address.
  * @param length Tracing command buffer length.
  */
-void tracing_cmd_handle(u8_t *buf, u32_t length);
+void tracing_cmd_handle(uint8_t *buf, uint32_t length);
 
 /**
  * @brief Trigger tracing thread to run after every first put.
diff --git a/subsys/tracing/include/tracing_cpu_stats.h b/subsys/tracing/include/tracing_cpu_stats.h
index 4c5c2d23a9..8b1f6db143 100644
--- a/subsys/tracing/include/tracing_cpu_stats.h
+++ b/subsys/tracing/include/tracing_cpu_stats.h
@@ -15,9 +15,9 @@ extern "C" {
 #endif
 
 struct cpu_stats {
-	u64_t idle;
-	u64_t non_idle;
-	u64_t sched;
+	uint64_t idle;
+	uint64_t non_idle;
+	uint64_t sched;
 };
 
 void sys_trace_thread_switched_in(void);
@@ -27,7 +27,7 @@ void sys_trace_isr_exit(void);
 void sys_trace_idle(void);
 
 void cpu_stats_get_ns(struct cpu_stats *cpu_stats_ns);
-u32_t cpu_stats_non_idle_and_sched_get_percent(void);
+uint32_t cpu_stats_non_idle_and_sched_get_percent(void);
 void cpu_stats_reset_counters(void);
 
 #define sys_trace_isr_exit_to_scheduler()
diff --git a/subsys/tracing/include/tracing_format_common.h b/subsys/tracing/include/tracing_format_common.h
index 2451b6e569..25d50e00e7 100644
--- a/subsys/tracing/include/tracing_format_common.h
+++ b/subsys/tracing/include/tracing_format_common.h
@@ -20,7 +20,7 @@ extern "C" {
  */
 typedef struct {
 	int status;
-	u32_t length;
+	uint32_t length;
 } tracing_ctx_t;
 
 #ifdef CONFIG_NEWLIB_LIBC
@@ -49,7 +49,7 @@ bool tracing_format_string_put(const char *str, va_list args);
  *
  * @return true if put tracing message to tracing buffer successfully.
  */
-bool tracing_format_raw_data_put(u8_t *data, u32_t size);
+bool tracing_format_raw_data_put(uint8_t *data, uint32_t size);
 
 /**
  * @brief Put tracing_data format message to tracing buffer.
@@ -59,7 +59,7 @@ bool tracing_format_raw_data_put(u8_t *data, u32_t size);
  *
  * @return true if put tracing message to tracing buffer successfully.
  */
-bool tracing_format_data_put(tracing_data_t *tracing_data_array, u32_t count);
+bool tracing_format_data_put(tracing_data_t *tracing_data_array, uint32_t count);
 
 #ifdef __cplusplus
 }
diff --git a/subsys/tracing/sysview/sysview.c b/subsys/tracing/sysview/sysview.c
index 632e340ccd..e01bb21e76 100644
--- a/subsys/tracing/sysview/sysview.c
+++ b/subsys/tracing/sysview/sysview.c
@@ -12,14 +12,14 @@
 #include <Global.h>
 #include "SEGGER_SYSVIEW_Zephyr.h"
 
-static u32_t interrupt;
+static uint32_t interrupt;
 
-u32_t sysview_get_timestamp(void)
+uint32_t sysview_get_timestamp(void)
 {
 	return k_cycle_get_32();
 }
 
-u32_t sysview_get_interrupt(void)
+uint32_t sysview_get_interrupt(void)
 {
 	return interrupt;
 }
@@ -33,7 +33,7 @@ void sys_trace_thread_switched_in(void)
 	if (z_is_idle_thread_object(thread)) {
 		SEGGER_SYSVIEW_OnIdle();
 	} else {
-		SEGGER_SYSVIEW_OnTaskStartExec((u32_t)(uintptr_t)thread);
+		SEGGER_SYSVIEW_OnTaskStartExec((uint32_t)(uintptr_t)thread);
 	}
 }
 
@@ -76,7 +76,7 @@ static void send_task_list_cb(void)
 
 		snprintk(name, sizeof(name), "T%pE%p", thread, &thread->entry);
 		SEGGER_SYSVIEW_SendTaskInfo(&(SEGGER_SYSVIEW_TASKINFO) {
-			.TaskID = (u32_t)(uintptr_t)thread,
+			.TaskID = (uint32_t)(uintptr_t)thread,
 		      .sName = tname?tname:name,
 			.StackSize = thread->stack_info.size,
 			.StackBase = thread->stack_info.start,
diff --git a/subsys/tracing/sysview/tracing_sysview.h b/subsys/tracing/sysview/tracing_sysview.h
index a41338b0a1..034a622010 100644
--- a/subsys/tracing/sysview/tracing_sysview.h
+++ b/subsys/tracing/sysview/tracing_sysview.h
@@ -29,7 +29,7 @@ static inline void sys_trace_thread_info(struct k_thread *thread)
 
 	SEGGER_SYSVIEW_TASKINFO Info;
 
-	Info.TaskID = (u32_t)(uintptr_t)thread;
+	Info.TaskID = (uint32_t)(uintptr_t)thread;
 	Info.sName = name;
 	Info.Prio = thread->base.prio;
 	Info.StackBase = thread->stack_info.size;
@@ -39,7 +39,7 @@ static inline void sys_trace_thread_info(struct k_thread *thread)
 
 #define sys_trace_thread_create(thread)				       \
 	do {							       \
-		SEGGER_SYSVIEW_OnTaskCreate((u32_t)(uintptr_t)thread); \
+		SEGGER_SYSVIEW_OnTaskCreate((uint32_t)(uintptr_t)thread); \
 		sys_trace_thread_info(thread);			       \
 	} while (0)
 
@@ -52,10 +52,10 @@ static inline void sys_trace_thread_info(struct k_thread *thread)
 #define sys_trace_thread_resume(thread)
 
 #define sys_trace_thread_ready(thread) \
-	SEGGER_SYSVIEW_OnTaskStartReady((u32_t)(uintptr_t)thread)
+	SEGGER_SYSVIEW_OnTaskStartReady((uint32_t)(uintptr_t)thread)
 
 #define sys_trace_thread_pend(thread) \
-	SEGGER_SYSVIEW_OnTaskStopReady((u32_t)(uintptr_t)thread, 3 << 3)
+	SEGGER_SYSVIEW_OnTaskStopReady((uint32_t)(uintptr_t)thread, 3 << 3)
 
 #define sys_trace_void(id) SEGGER_SYSVIEW_RecordVoid(id)
 
diff --git a/subsys/tracing/tracing_backend_posix.c b/subsys/tracing/tracing_backend_posix.c
index 79b9bfb9f4..f18d6c9805 100644
--- a/subsys/tracing/tracing_backend_posix.c
+++ b/subsys/tracing/tracing_backend_posix.c
@@ -27,7 +27,7 @@ static void tracing_backend_posix_init(void)
 
 static void tracing_backend_posix_output(
 		const struct tracing_backend *backend,
-		u8_t *data, u32_t length)
+		uint8_t *data, uint32_t length)
 {
 	fwrite(data, length, 1, (FILE *)out_stream);
 
diff --git a/subsys/tracing/tracing_backend_uart.c b/subsys/tracing/tracing_backend_uart.c
index 80beb7d2fd..da83a708a2 100644
--- a/subsys/tracing/tracing_backend_uart.c
+++ b/subsys/tracing/tracing_backend_uart.c
@@ -20,9 +20,9 @@ static struct device *dev;
 static void uart_isr(struct device *dev)
 {
 	int rx;
-	u8_t byte;
-	static u8_t *cmd;
-	static u32_t length, cur;
+	uint8_t byte;
+	static uint8_t *cmd;
+	static uint32_t length, cur;
 
 	while (uart_irq_update(dev) && uart_irq_is_pending(dev)) {
 		if (!uart_irq_rx_ready(dev)) {
@@ -59,9 +59,9 @@ static void uart_isr(struct device *dev)
 
 static void tracing_backend_uart_output(
 		const struct tracing_backend *backend,
-		u8_t *data, u32_t length)
+		uint8_t *data, uint32_t length)
 {
-	for (u32_t i = 0; i < length; i++) {
+	for (uint32_t i = 0; i < length; i++) {
 		uart_poll_out(dev, data[i]);
 	}
 }
@@ -78,7 +78,7 @@ static void tracing_backend_uart_init(void)
 	uart_irq_callback_set(dev, uart_isr);
 
 	while (uart_irq_rx_ready(dev)) {
-		u8_t c;
+		uint8_t c;
 
 		uart_fifo_read(dev, &c, 1);
 	}
diff --git a/subsys/tracing/tracing_backend_usb.c b/subsys/tracing/tracing_backend_usb.c
index 51b463cff5..3b70b2ff37 100644
--- a/subsys/tracing/tracing_backend_usb.c
+++ b/subsys/tracing/tracing_backend_usb.c
@@ -72,7 +72,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_device_desc dev_desc = {
 
 static void dev_status_cb(struct usb_cfg_data *cfg,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 	ARG_UNUSED(param);
@@ -80,10 +80,10 @@ static void dev_status_cb(struct usb_cfg_data *cfg,
 	usb_device_status = status;
 }
 
-static void tracing_ep_out_cb(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void tracing_ep_out_cb(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
-	u8_t *cmd = NULL;
-	u32_t bytes_to_read, length;
+	uint8_t *cmd = NULL;
+	uint32_t bytes_to_read, length;
 
 	usb_read(ep, NULL, 0, &bytes_to_read);
 
@@ -104,7 +104,7 @@ static void tracing_ep_out_cb(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 	usb_write(TRACING_IF_IN_EP_ADDR, NULL, 0, NULL);
 }
 
-static void tracing_ep_in_cb(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void tracing_ep_in_cb(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	ARG_UNUSED(ep);
 	ARG_UNUSED(ep_status);
@@ -138,10 +138,10 @@ USBD_CFG_DATA_DEFINE(primary, tracing_backend_usb)
 };
 
 static void tracing_backend_usb_output(const struct tracing_backend *backend,
-				       u8_t *data, u32_t length)
+				       uint8_t *data, uint32_t length)
 {
 	int ret = 0;
-	u32_t bytes;
+	uint32_t bytes;
 
 	while (length > 0) {
 		transfer_state = USB_TRANSFER_ONGOING;
diff --git a/subsys/tracing/tracing_buffer.c b/subsys/tracing/tracing_buffer.c
index 01e88f2c25..1af37469ce 100644
--- a/subsys/tracing/tracing_buffer.c
+++ b/subsys/tracing/tracing_buffer.c
@@ -7,42 +7,42 @@
 #include <sys/ring_buffer.h>
 
 static struct ring_buf tracing_ring_buf;
-static u8_t tracing_buffer[CONFIG_TRACING_BUFFER_SIZE + 1];
-static u8_t tracing_cmd_buffer[CONFIG_TRACING_CMD_BUFFER_SIZE];
+static uint8_t tracing_buffer[CONFIG_TRACING_BUFFER_SIZE + 1];
+static uint8_t tracing_cmd_buffer[CONFIG_TRACING_CMD_BUFFER_SIZE];
 
-u32_t tracing_cmd_buffer_alloc(u8_t **data)
+uint32_t tracing_cmd_buffer_alloc(uint8_t **data)
 {
 	*data = &tracing_cmd_buffer[0];
 
 	return sizeof(tracing_cmd_buffer);
 }
 
-u32_t tracing_buffer_put_claim(u8_t **data, u32_t size)
+uint32_t tracing_buffer_put_claim(uint8_t **data, uint32_t size)
 {
 	return ring_buf_put_claim(&tracing_ring_buf, data, size);
 }
 
-int tracing_buffer_put_finish(u32_t size)
+int tracing_buffer_put_finish(uint32_t size)
 {
 	return ring_buf_put_finish(&tracing_ring_buf, size);
 }
 
-u32_t tracing_buffer_put(u8_t *data, u32_t size)
+uint32_t tracing_buffer_put(uint8_t *data, uint32_t size)
 {
 	return ring_buf_put(&tracing_ring_buf, data, size);
 }
 
-u32_t tracing_buffer_get_claim(u8_t **data, u32_t size)
+uint32_t tracing_buffer_get_claim(uint8_t **data, uint32_t size)
 {
 	return ring_buf_get_claim(&tracing_ring_buf, data, size);
 }
 
-int tracing_buffer_get_finish(u32_t size)
+int tracing_buffer_get_finish(uint32_t size)
 {
 	return ring_buf_get_finish(&tracing_ring_buf, size);
 }
 
-u32_t tracing_buffer_get(u8_t *data, u32_t size)
+uint32_t tracing_buffer_get(uint8_t *data, uint32_t size)
 {
 	return ring_buf_get(&tracing_ring_buf, data, size);
 }
@@ -58,12 +58,12 @@ bool tracing_buffer_is_empty(void)
 	return ring_buf_is_empty(&tracing_ring_buf);
 }
 
-u32_t tracing_buffer_capacity_get(void)
+uint32_t tracing_buffer_capacity_get(void)
 {
 	return ring_buf_capacity_get(&tracing_ring_buf);
 }
 
-u32_t tracing_buffer_space_get(void)
+uint32_t tracing_buffer_space_get(void)
 {
 	return ring_buf_space_get(&tracing_ring_buf);
 }
diff --git a/subsys/tracing/tracing_core.c b/subsys/tracing/tracing_core.c
index bc5ca02196..86c45f1868 100644
--- a/subsys/tracing/tracing_core.c
+++ b/subsys/tracing/tracing_core.c
@@ -47,8 +47,8 @@ static K_THREAD_STACK_DEFINE(tracing_thread_stack,
 
 static void tracing_thread_func(void *dummy1, void *dummy2, void *dummy3)
 {
-	u8_t *transferring_buf;
-	u32_t transferring_length, tracing_buffer_max_length;
+	uint8_t *transferring_buf;
+	uint32_t transferring_length, tracing_buffer_max_length;
 
 	tracing_thread_tid = k_current_get();
 
@@ -134,7 +134,7 @@ bool is_tracing_enabled(void)
 	return atomic_get(&tracing_state) == TRACING_ENABLE;
 }
 
-void tracing_cmd_handle(u8_t *buf, u32_t length)
+void tracing_cmd_handle(uint8_t *buf, uint32_t length)
 {
 	if (strncmp(buf, TRACING_CMD_ENABLE, length) == 0) {
 		tracing_set_state(TRACING_ENABLE);
@@ -143,7 +143,7 @@ void tracing_cmd_handle(u8_t *buf, u32_t length)
 	}
 }
 
-void tracing_buffer_handle(u8_t *data, u32_t length)
+void tracing_buffer_handle(uint8_t *data, uint32_t length)
 {
 	tracing_backend_output(working_backend, data, length);
 }
diff --git a/subsys/tracing/tracing_format_async.c b/subsys/tracing/tracing_format_async.c
index 7ed40a4a48..ac2604b7a7 100644
--- a/subsys/tracing/tracing_format_async.c
+++ b/subsys/tracing/tracing_format_async.c
@@ -33,7 +33,7 @@ void tracing_format_string(const char *str, ...)
 	}
 }
 
-void tracing_format_raw_data(u8_t *data, u32_t length)
+void tracing_format_raw_data(uint8_t *data, uint32_t length)
 {
 	bool put_success, before_put_is_empty;
 
@@ -53,7 +53,7 @@ void tracing_format_raw_data(u8_t *data, u32_t length)
 	}
 }
 
-void tracing_format_data(tracing_data_t *tracing_data_array, u32_t count)
+void tracing_format_data(tracing_data_t *tracing_data_array, uint32_t count)
 {
 	bool put_success, before_put_is_empty;
 
diff --git a/subsys/tracing/tracing_format_common.c b/subsys/tracing/tracing_format_common.c
index 3277e40513..f485326566 100644
--- a/subsys/tracing/tracing_format_common.c
+++ b/subsys/tracing/tracing_format_common.c
@@ -13,12 +13,12 @@ static int str_put(int c, void *ctx)
 	tracing_ctx_t *str_ctx = (tracing_ctx_t *)ctx;
 
 	if (str_ctx->status == 0) {
-		u8_t *buf;
-		u32_t claimed_size;
+		uint8_t *buf;
+		uint32_t claimed_size;
 
 		claimed_size = tracing_buffer_put_claim(&buf, 1);
 		if (claimed_size) {
-			*buf = (u8_t)c;
+			*buf = (uint8_t)c;
 			str_ctx->length++;
 		} else {
 			str_ctx->status = -1;
@@ -47,9 +47,9 @@ bool tracing_format_string_put(const char *str, va_list args)
 	return false;
 }
 
-bool tracing_format_raw_data_put(u8_t *data, u32_t size)
+bool tracing_format_raw_data_put(uint8_t *data, uint32_t size)
 {
-	u32_t space = tracing_buffer_space_get();
+	uint32_t space = tracing_buffer_space_get();
 
 	if (space >= size) {
 		tracing_buffer_put(data, size);
@@ -59,15 +59,15 @@ bool tracing_format_raw_data_put(u8_t *data, u32_t size)
 	return false;
 }
 
-bool tracing_format_data_put(tracing_data_t *tracing_data_array, u32_t count)
+bool tracing_format_data_put(tracing_data_t *tracing_data_array, uint32_t count)
 {
-	u32_t total_size = 0U;
+	uint32_t total_size = 0U;
 
-	for (u32_t i = 0; i < count; i++) {
+	for (uint32_t i = 0; i < count; i++) {
 		tracing_data_t *tracing_data =
 				tracing_data_array + i;
-		u8_t *data = tracing_data->data, *buf;
-		u32_t length = tracing_data->length, claimed_size;
+		uint8_t *data = tracing_data->data, *buf;
+		uint32_t length = tracing_data->length, claimed_size;
 
 		do {
 			claimed_size = tracing_buffer_put_claim(&buf, length);
diff --git a/subsys/tracing/tracing_format_sync.c b/subsys/tracing/tracing_format_sync.c
index e8830ca0f7..253d3dbd86 100644
--- a/subsys/tracing/tracing_format_sync.c
+++ b/subsys/tracing/tracing_format_sync.c
@@ -10,10 +10,10 @@
 
 void tracing_format_string(const char *str, ...)
 {
-	u8_t *data;
+	uint8_t *data;
 	va_list args;
 	bool put_success;
-	u32_t length, tracing_buffer_size;
+	uint32_t length, tracing_buffer_size;
 
 	if (!is_tracing_enabled()) {
 		return;
@@ -38,7 +38,7 @@ void tracing_format_string(const char *str, ...)
 	va_end(args);
 }
 
-void tracing_format_raw_data(u8_t *data, u32_t length)
+void tracing_format_raw_data(uint8_t *data, uint32_t length)
 {
 	if (!is_tracing_enabled()) {
 		return;
@@ -49,11 +49,11 @@ void tracing_format_raw_data(u8_t *data, u32_t length)
 	TRACING_UNLOCK();
 }
 
-void tracing_format_data(tracing_data_t *tracing_data_array, u32_t count)
+void tracing_format_data(tracing_data_t *tracing_data_array, uint32_t count)
 {
-	u8_t *data;
+	uint8_t *data;
 	bool put_success;
-	u32_t length, tracing_buffer_size;
+	uint32_t length, tracing_buffer_size;
 
 	if (!is_tracing_enabled()) {
 		return;
diff --git a/subsys/usb/bos.c b/subsys/usb/bos.c
index 2c1260ea1d..d896adf731 100644
--- a/subsys/usb/bos.c
+++ b/subsys/usb/bos.c
@@ -15,8 +15,8 @@ LOG_MODULE_REGISTER(usb_bos);
 
 #include <usb/bos.h>
 
-extern const u8_t __usb_bos_desc_start[];
-extern const u8_t __usb_bos_desc_end[];
+extern const uint8_t __usb_bos_desc_start[];
+extern const uint8_t __usb_bos_desc_end[];
 
 USB_DEVICE_BOS_DESC_DEFINE_HDR struct usb_bos_descriptor hdr = {
 	.bLength = sizeof(struct usb_bos_descriptor),
@@ -53,11 +53,11 @@ void usb_bos_register_cap(struct usb_bos_platform_descriptor *desc)
 }
 
 int usb_handle_bos(struct usb_setup_packet *setup,
-		   s32_t *len, u8_t **data)
+		   int32_t *len, uint8_t **data)
 {
 	if (GET_DESC_TYPE(setup->wValue) == DESCRIPTOR_TYPE_BOS) {
 		LOG_DBG("Read BOS descriptor");
-		*data = (u8_t *)usb_bos_get_header();
+		*data = (uint8_t *)usb_bos_get_header();
 		*len = usb_bos_get_length();
 
 		return 0;
diff --git a/subsys/usb/class/audio/audio.c b/subsys/usb/class/audio/audio.c
index 54f90f9c0d..bbd04b82e8 100644
--- a/subsys/usb/class/audio/audio.c
+++ b/subsys/usb/class/audio/audio.c
@@ -30,9 +30,9 @@ LOG_MODULE_REGISTER(usb_audio, CONFIG_USB_AUDIO_LOG_LEVEL);
 struct usb_audio_dev_data {
 	const struct usb_audio_ops *ops;
 
-	u8_t *controls[2];
+	uint8_t *controls[2];
 
-	u8_t ch_cnt[2];
+	uint8_t ch_cnt[2];
 
 	const struct cs_ac_if_descriptor *desc_hdr;
 
@@ -41,7 +41,7 @@ struct usb_audio_dev_data {
 	struct net_buf_pool *pool;
 
 	/* Not applicable for Headphones, left with 0 */
-	u16_t in_frame_size;
+	uint16_t in_frame_size;
 
 	bool rx_enable;
 	bool tx_enable;
@@ -147,7 +147,7 @@ static struct usb_ep_cfg_data dev##_usb_audio_ep_data_##i[] = {		  \
 }
 
 #define DEFINE_AUDIO_DEV_DATA(dev, i, __out_pool, __in_pool_size)   \
-	static u8_t dev##_controls_##i[FEATURES_SIZE(dev, i)] = {0};\
+	static uint8_t dev##_controls_##i[FEATURES_SIZE(dev, i)] = {0};\
 	static struct usb_audio_dev_data dev##_audio_dev_data_##i = \
 		{ .pool = __out_pool,				    \
 		  .in_frame_size = __in_pool_size,		    \
@@ -156,8 +156,8 @@ static struct usb_ep_cfg_data dev##_usb_audio_ep_data_##i[] = {		  \
 		}
 
 #define DEFINE_AUDIO_DEV_DATA_BIDIR(dev, i, __out_pool, __in_pool_size)	   \
-	static u8_t dev##_controls0_##i[FEATURES_SIZE(dev##_MIC, i)] = {0};\
-	static u8_t dev##_controls1_##i[FEATURES_SIZE(dev##_HP, i)] = {0}; \
+	static uint8_t dev##_controls0_##i[FEATURES_SIZE(dev##_MIC, i)] = {0};\
+	static uint8_t dev##_controls1_##i[FEATURES_SIZE(dev##_HP, i)] = {0}; \
 	static struct usb_audio_dev_data dev##_audio_dev_data_##i =	   \
 		{ .pool = __out_pool,					   \
 		  .in_frame_size = __in_pool_size,			   \
@@ -170,18 +170,18 @@ static struct usb_ep_cfg_data dev##_usb_audio_ep_data_##i[] = {		  \
  * Helper function for getting channel number directly from the
  * feature unit descriptor.
  */
-static u8_t get_num_of_channels(const struct feature_unit_descriptor *fu)
+static uint8_t get_num_of_channels(const struct feature_unit_descriptor *fu)
 {
-	return (fu->bLength - FU_FIXED_ELEMS_SIZE)/sizeof(u16_t);
+	return (fu->bLength - FU_FIXED_ELEMS_SIZE)/sizeof(uint16_t);
 }
 
 /**
  * Helper function for getting supported controls directly from
  * the feature unit descriptor.
  */
-static u16_t get_controls(const struct feature_unit_descriptor *fu)
+static uint16_t get_controls(const struct feature_unit_descriptor *fu)
 {
-	return *(u16_t *)((u8_t *)fu + BMA_CONTROLS_OFFSET);
+	return *(uint16_t *)((uint8_t *)fu + BMA_CONTROLS_OFFSET);
 }
 
 /**
@@ -192,7 +192,7 @@ static enum usb_audio_direction get_fu_dir(
 {
 	const struct output_terminal_descriptor *ot =
 		(struct output_terminal_descriptor *)
-		((u8_t *)fu + fu->bLength);
+		((uint8_t *)fu + fu->bLength);
 	enum usb_audio_direction dir;
 
 	if (ot->wTerminalType == USB_AUDIO_USB_STREAMING) {
@@ -213,9 +213,9 @@ static void fix_fu_descriptors(struct usb_if_descriptor *iface)
 	struct feature_unit_descriptor *fu;
 
 	header = (struct cs_ac_if_descriptor *)
-			((u8_t *)iface + USB_PASSIVE_IF_DESC_SIZE);
+			((uint8_t *)iface + USB_PASSIVE_IF_DESC_SIZE);
 
-	fu = (struct feature_unit_descriptor *)((u8_t *)header +
+	fu = (struct feature_unit_descriptor *)((uint8_t *)header +
 						header->bLength +
 						INPUT_TERMINAL_DESC_SIZE);
 
@@ -225,7 +225,7 @@ static void fix_fu_descriptors(struct usb_if_descriptor *iface)
 	}
 
 	if (header->bInCollection == 2) {
-		fu = (struct feature_unit_descriptor *)((u8_t *)fu +
+		fu = (struct feature_unit_descriptor *)((uint8_t *)fu +
 			fu->bLength +
 			INPUT_TERMINAL_DESC_SIZE +
 			OUTPUT_TERMINAL_DESC_SIZE);
@@ -242,12 +242,12 @@ static void fix_fu_descriptors(struct usb_if_descriptor *iface)
  */
 static struct feature_unit_descriptor *get_feature_unit(
 				struct usb_audio_dev_data *audio_dev_data,
-				u8_t *device, u8_t fu_id)
+				uint8_t *device, uint8_t fu_id)
 {
 	struct feature_unit_descriptor *fu;
 
 	fu = (struct feature_unit_descriptor *)
-		((u8_t *)audio_dev_data->desc_hdr +
+		((uint8_t *)audio_dev_data->desc_hdr +
 		audio_dev_data->desc_hdr->bLength +
 		INPUT_TERMINAL_DESC_SIZE);
 
@@ -257,7 +257,7 @@ static struct feature_unit_descriptor *get_feature_unit(
 	}
 	/* skip to the next Feature Unit */
 	fu = (struct feature_unit_descriptor *)
-			((u8_t *)fu + fu->bLength +
+			((uint8_t *)fu + fu->bLength +
 			INPUT_TERMINAL_DESC_SIZE +
 			OUTPUT_TERMINAL_DESC_SIZE);
 	*device = 1;
@@ -272,7 +272,7 @@ static struct feature_unit_descriptor *get_feature_unit(
 static void audio_dc_sof(struct usb_cfg_data *cfg,
 			 struct usb_audio_dev_data *dev_data)
 {
-	u8_t ep_addr;
+	uint8_t ep_addr;
 
 	/* In endpoint always at index 0 */
 	ep_addr = cfg->endpoint[0].ep_addr;
@@ -285,7 +285,7 @@ static void audio_dc_sof(struct usb_cfg_data *cfg,
 }
 
 static void audio_interface_config(struct usb_desc_header *head,
-				   u8_t bInterfaceNumber)
+				   uint8_t bInterfaceNumber)
 {
 	struct usb_if_descriptor *iface = (struct usb_if_descriptor *)head;
 	struct cs_ac_if_descriptor *header;
@@ -301,36 +301,36 @@ static void audio_interface_config(struct usb_desc_header *head,
 	/* Audio Control Interface */
 	iface->bInterfaceNumber = bInterfaceNumber;
 	header = (struct cs_ac_if_descriptor *)
-		 ((u8_t *)iface + iface->bLength);
+		 ((uint8_t *)iface + iface->bLength);
 	header->baInterfaceNr[0] = bInterfaceNumber + 1;
 
 	/* Audio Streaming Interface Passive */
 	iface = (struct usb_if_descriptor *)
-			  ((u8_t *)header + header->wTotalLength);
+			  ((uint8_t *)header + header->wTotalLength);
 	iface->bInterfaceNumber = bInterfaceNumber + 1;
 
 	/* Audio Streaming Interface Active */
 	iface = (struct usb_if_descriptor *)
-			  ((u8_t *)iface + iface->bLength);
+			  ((uint8_t *)iface + iface->bLength);
 	iface->bInterfaceNumber = bInterfaceNumber + 1;
 
 	if (header->bInCollection == 2) {
 		header->baInterfaceNr[1] = bInterfaceNumber + 2;
 		/* Audio Streaming Interface Passive */
 		iface = (struct usb_if_descriptor *)
-			((u8_t *)iface + USB_ACTIVE_IF_DESC_SIZE);
+			((uint8_t *)iface + USB_ACTIVE_IF_DESC_SIZE);
 		iface->bInterfaceNumber = bInterfaceNumber + 2;
 
 		/* Audio Streaming Interface Active */
 		iface = (struct usb_if_descriptor *)
-			((u8_t *)iface + USB_PASSIVE_IF_DESC_SIZE);
+			((uint8_t *)iface + USB_PASSIVE_IF_DESC_SIZE);
 		iface->bInterfaceNumber = bInterfaceNumber + 2;
 	}
 }
 
 static void audio_cb_usb_status(struct usb_cfg_data *cfg,
 			 enum usb_dc_status_code cb_status,
-			 const u8_t *param)
+			 const uint8_t *param)
 {
 	struct usb_audio_dev_data *audio_dev_data;
 	struct usb_dev_data *dev_data;
@@ -381,7 +381,7 @@ static bool is_entity_valid(struct usb_audio_dev_data *audio_dev_data,
 	const struct feature_unit_descriptor *fu;
 
 	header = audio_dev_data->desc_hdr;
-	fu = (struct feature_unit_descriptor *)((u8_t *)header +
+	fu = (struct feature_unit_descriptor *)((uint8_t *)header +
 						header->bLength +
 						INPUT_TERMINAL_DESC_SIZE);
 	if (fu->bUnitID == entity->id) {
@@ -390,7 +390,7 @@ static bool is_entity_valid(struct usb_audio_dev_data *audio_dev_data,
 	}
 
 	if (header->bInCollection == 2) {
-		fu = (struct feature_unit_descriptor *)((u8_t *)fu +
+		fu = (struct feature_unit_descriptor *)((uint8_t *)fu +
 			fu->bLength +
 			INPUT_TERMINAL_DESC_SIZE +
 			OUTPUT_TERMINAL_DESC_SIZE);
@@ -447,12 +447,12 @@ static struct usb_audio_dev_data *get_audio_dev_data_by_entity(
  * @return true if interface matched audio_dev_data, false otherwise.
  */
 static bool is_interface_valid(struct usb_audio_dev_data *audio_dev_data,
-			       u8_t interface)
+			       uint8_t interface)
 {
 	const struct cs_ac_if_descriptor *header;
 
 	header = audio_dev_data->desc_hdr;
-	u8_t desc_iface = 0;
+	uint8_t desc_iface = 0;
 
 	for (size_t i = 0; i < header->bInCollection; i++) {
 		desc_iface = header->baInterfaceNr[i];
@@ -475,7 +475,7 @@ static bool is_interface_valid(struct usb_audio_dev_data *audio_dev_data,
  *
  * @return audio_dev_data for given interface, NULL if not found.
  */
-static struct usb_audio_dev_data *get_audio_dev_data_by_iface(u8_t interface)
+static struct usb_audio_dev_data *get_audio_dev_data_by_iface(uint8_t interface)
 {
 	struct usb_dev_data *dev_data;
 	struct usb_audio_dev_data *audio_dev_data;
@@ -509,14 +509,14 @@ static struct usb_audio_dev_data *get_audio_dev_data_by_iface(u8_t interface)
  */
 static int handle_fu_mute_req(struct usb_audio_dev_data *audio_dev_data,
 			      struct usb_setup_packet *pSetup,
-			      s32_t *len, u8_t **data,
+			      int32_t *len, uint8_t **data,
 			      struct usb_audio_fu_evt *evt,
-			      u8_t device)
+			      uint8_t device)
 {
-	u8_t ch = (pSetup->wValue) & 0xFF;
-	u8_t ch_cnt = audio_dev_data->ch_cnt[device];
-	u8_t *controls = audio_dev_data->controls[device];
-	u8_t *control_val = &controls[POS(MUTE, ch, ch_cnt)];
+	uint8_t ch = (pSetup->wValue) & 0xFF;
+	uint8_t ch_cnt = audio_dev_data->ch_cnt[device];
+	uint8_t *controls = audio_dev_data->controls[device];
+	uint8_t *control_val = &controls[POS(MUTE, ch, ch_cnt)];
 
 	/* Check if *len has valid value */
 	if (*len != LEN(1, MUTE)) {
@@ -555,15 +555,15 @@ static int handle_fu_mute_req(struct usb_audio_dev_data *audio_dev_data,
  */
 static int handle_feature_unit_req(struct usb_audio_dev_data *audio_dev_data,
 				   struct usb_setup_packet *pSetup,
-				   s32_t *len, u8_t **data)
+				   int32_t *len, uint8_t **data)
 {
 	const struct feature_unit_descriptor *fu;
 	struct usb_audio_fu_evt evt;
 	enum usb_audio_fucs cs;
-	u8_t device;
-	u8_t fu_id;
-	u8_t ch_cnt;
-	u8_t ch;
+	uint8_t device;
+	uint8_t fu_id;
+	uint8_t ch_cnt;
+	uint8_t ch;
 	int ret;
 
 	fu_id = ((pSetup->wIndex) >> 8) & 0xFF;
@@ -624,21 +624,21 @@ static int handle_feature_unit_req(struct usb_audio_dev_data *audio_dev_data,
  * @return  0 on success, negative errno code on fail.
  */
 static int handle_interface_req(struct usb_setup_packet *pSetup,
-				s32_t *len,
-				u8_t **data)
+				int32_t *len,
+				uint8_t **data)
 {
 	struct usb_audio_dev_data *audio_dev_data;
 	struct usb_audio_entity entity;
 
 	/* parse wIndex for interface request */
-	u8_t entity_id = ((pSetup->wIndex) >> 8) & 0xFF;
+	uint8_t entity_id = ((pSetup->wIndex) >> 8) & 0xFF;
 
 	entity.id = entity_id;
 
 	/** Normally there should be a call to usb_get_dev_data_by_iface()
 	 * and addressed interface should be read from wIndex low byte.
 	 *
-	 * u8_t interface = (pSetup->wIndex) & 0xFF;
+	 * uint8_t interface = (pSetup->wIndex) & 0xFF;
 	 *
 	 * However, Linux is using special form of Audio Requests
 	 * which always left wIndex low byte 0 no matter which device and
@@ -679,15 +679,15 @@ static int handle_interface_req(struct usb_setup_packet *pSetup,
  * @return 0 on success, positive value if request is intended to be handled
  *	   by the core USB stack. Negative error code on fail.
  */
-static int audio_custom_handler(struct usb_setup_packet *pSetup, s32_t *len,
-				u8_t **data)
+static int audio_custom_handler(struct usb_setup_packet *pSetup, int32_t *len,
+				uint8_t **data)
 {
 	const struct cs_ac_if_descriptor *header;
 	struct usb_audio_dev_data *audio_dev_data;
 	const struct usb_if_descriptor *if_desc;
 	const struct usb_ep_descriptor *ep_desc;
 
-	u8_t iface = (pSetup->wIndex) & 0xFF;
+	uint8_t iface = (pSetup->wIndex) & 0xFF;
 
 	audio_dev_data = get_audio_dev_data_by_iface(iface);
 	if (audio_dev_data == NULL) {
@@ -701,12 +701,12 @@ static int audio_custom_handler(struct usb_setup_packet *pSetup, s32_t *len,
 	header = audio_dev_data->desc_hdr;
 
 	/* Skip to the first interface */
-	if_desc = (struct usb_if_descriptor *)((u8_t *)header +
+	if_desc = (struct usb_if_descriptor *)((uint8_t *)header +
 						header->wTotalLength +
 						USB_PASSIVE_IF_DESC_SIZE);
 
 	if (if_desc->bInterfaceNumber == iface) {
-		ep_desc = (struct usb_ep_descriptor *)((u8_t *)if_desc +
+		ep_desc = (struct usb_ep_descriptor *)((uint8_t *)if_desc +
 						USB_PASSIVE_IF_DESC_SIZE +
 						USB_AC_CS_IF_DESC_SIZE +
 						USB_FORMAT_TYPE_I_DESC_SIZE);
@@ -716,9 +716,9 @@ static int audio_custom_handler(struct usb_setup_packet *pSetup, s32_t *len,
 		 * get_audio_dev_data_by_iface() found the device. It
 		 * must be the second interface associated with the device.
 		 */
-		if_desc = (struct usb_if_descriptor *)((u8_t *)if_desc +
+		if_desc = (struct usb_if_descriptor *)((uint8_t *)if_desc +
 						USB_ACTIVE_IF_DESC_SIZE);
-		ep_desc = (struct usb_ep_descriptor *)((u8_t *)if_desc +
+		ep_desc = (struct usb_ep_descriptor *)((uint8_t *)if_desc +
 						USB_PASSIVE_IF_DESC_SIZE +
 						USB_AC_CS_IF_DESC_SIZE +
 						USB_FORMAT_TYPE_I_DESC_SIZE);
@@ -759,7 +759,7 @@ static int audio_custom_handler(struct usb_setup_packet *pSetup, s32_t *len,
  * @return  0 on success, negative errno code on fail.
  */
 static int audio_class_handle_req(struct usb_setup_packet *pSetup,
-				  s32_t *len, u8_t **data)
+				  int32_t *len, uint8_t **data)
 {
 	LOG_INF("bmRequestType 0x%02x, bRequest 0x%02x, wValue 0x%04x,"
 		"wIndex 0x%04x, wLength 0x%04x",
@@ -782,7 +782,7 @@ static int usb_audio_device_init(struct device *dev)
 	return 0;
 }
 
-static void audio_write_cb(u8_t ep, int size, void *priv)
+static void audio_write_cb(uint8_t ep, int size, void *priv)
 {
 	struct usb_dev_data *dev_data;
 	struct usb_audio_dev_data *audio_dev_data;
@@ -813,7 +813,7 @@ int usb_audio_send(const struct device *dev, struct net_buf *buffer,
 	struct usb_audio_dev_data *audio_dev_data = dev->driver_data;
 	struct usb_cfg_data *cfg = (void *)dev->config_info;
 	/* EP ISO IN is always placed first in the endpoint table */
-	u8_t ep = cfg->endpoint[0].ep_addr;
+	uint8_t ep = cfg->endpoint[0].ep_addr;
 
 	if (!(ep & USB_EP_DIR_MASK)) {
 		LOG_ERR("Wrong device");
@@ -845,7 +845,7 @@ size_t usb_audio_get_in_frame_size(const struct device *dev)
 	return audio_dev_data->in_frame_size;
 }
 
-static void audio_receive_cb(u8_t ep, enum usb_dc_ep_cb_status_code status)
+static void audio_receive_cb(uint8_t ep, enum usb_dc_ep_cb_status_code status)
 {
 	struct usb_audio_dev_data *audio_dev_data;
 	struct usb_dev_data *common;
@@ -906,7 +906,7 @@ void usb_audio_register(struct device *dev,
 		cfg->interface_descriptor;
 	const struct cs_ac_if_descriptor *header =
 		(struct cs_ac_if_descriptor *)
-		((u8_t *)iface_descr + USB_PASSIVE_IF_DESC_SIZE);
+		((uint8_t *)iface_descr + USB_PASSIVE_IF_DESC_SIZE);
 
 	audio_dev_data->ops = ops;
 	audio_dev_data->common.dev = dev;
diff --git a/subsys/usb/class/audio/usb_audio_internal.h b/subsys/usb/class/audio/usb_audio_internal.h
index 42092780a4..e4e7cc0516 100644
--- a/subsys/usb/class/audio/usb_audio_internal.h
+++ b/subsys/usb/class/audio/usb_audio_internal.h
@@ -195,7 +195,7 @@
  */
 struct usb_audio_entity {
 	enum usb_audio_cs_ac_int_desc_subtypes subtype;
-	u8_t id;
+	uint8_t id;
 };
 
 /**
@@ -205,26 +205,26 @@ struct usb_audio_entity {
  * .bLength.
  */
 struct cs_ac_if_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u16_t bcdADC;
-	u16_t wTotalLength;
-	u8_t bInCollection;
-	u8_t baInterfaceNr[2];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint16_t bcdADC;
+	uint16_t wTotalLength;
+	uint8_t bInCollection;
+	uint8_t baInterfaceNr[2];
 } __packed;
 
 struct input_terminal_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bTerminalID;
-	u16_t wTerminalType;
-	u8_t bAssocTerminal;
-	u8_t bNrChannels;
-	u16_t wChannelConfig;
-	u8_t iChannelNames;
-	u8_t iTerminal;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bTerminalID;
+	uint16_t wTerminalType;
+	uint8_t bAssocTerminal;
+	uint8_t bNrChannels;
+	uint16_t wChannelConfig;
+	uint8_t iChannelNames;
+	uint8_t iTerminal;
 } __packed;
 
 /**
@@ -232,88 +232,88 @@ struct input_terminal_descriptor {
  * This structure is just a helper not a common type.
  */
 struct feature_unit_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bUnitID;
-	u8_t bSourceID;
-	u8_t bControlSize;
-	u16_t bmaControls[1];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bUnitID;
+	uint8_t bSourceID;
+	uint8_t bControlSize;
+	uint16_t bmaControls[1];
 } __packed;
 
 struct output_terminal_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bTerminalID;
-	u16_t wTerminalType;
-	u8_t bAssocTerminal;
-	u8_t bSourceID;
-	u8_t iTerminal;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bTerminalID;
+	uint16_t wTerminalType;
+	uint8_t bAssocTerminal;
+	uint8_t bSourceID;
+	uint8_t iTerminal;
 } __packed;
 
 struct as_cs_interface_descriptor {
-	u8_t  bLength;
-	u8_t  bDescriptorType;
-	u8_t  bDescriptorSubtype;
-	u8_t  bTerminalLink;
-	u8_t  bDelay;
-	u16_t wFormatTag;
+	uint8_t  bLength;
+	uint8_t  bDescriptorType;
+	uint8_t  bDescriptorSubtype;
+	uint8_t  bTerminalLink;
+	uint8_t  bDelay;
+	uint16_t wFormatTag;
 } __packed;
 
 struct format_type_i_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bFormatType;
-	u8_t bNrChannels;
-	u8_t bSubframeSize;
-	u8_t bBitResolution;
-	u8_t bSamFreqType;
-	u8_t tSamFreq[3];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bFormatType;
+	uint8_t bNrChannels;
+	uint8_t bSubframeSize;
+	uint8_t bBitResolution;
+	uint8_t bSamFreqType;
+	uint8_t tSamFreq[3];
 } __packed;
 
 struct std_as_ad_endpoint_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bEndpointAddress;
-	u8_t bmAttributes;
-	u16_t wMaxPacketSize;
-	u8_t bInterval;
-	u8_t bRefresh;
-	u8_t bSynchAddress;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bEndpointAddress;
+	uint8_t bmAttributes;
+	uint16_t wMaxPacketSize;
+	uint8_t bInterval;
+	uint8_t bRefresh;
+	uint8_t bSynchAddress;
 } __packed;
 
 struct cs_as_ad_ep_descriptor {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bDescriptorSubtype;
-	u8_t bmAttributes;
-	u8_t bLockDelayUnits;
-	u16_t wLockDelay;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDescriptorSubtype;
+	uint8_t bmAttributes;
+	uint8_t bLockDelayUnits;
+	uint16_t wLockDelay;
 } __packed;
 
 #define DECLARE_HEADER(dev, i, ifaces)	\
 struct dev##_cs_ac_if_descriptor_##i {	\
-	u8_t bLength;			\
-	u8_t bDescriptorType;		\
-	u8_t bDescriptorSubtype;	\
-	u16_t bcdADC;			\
-	u16_t wTotalLength;		\
-	u8_t bInCollection;		\
-	u8_t baInterfaceNr[ifaces];	\
+	uint8_t bLength;			\
+	uint8_t bDescriptorType;		\
+	uint8_t bDescriptorSubtype;	\
+	uint16_t bcdADC;			\
+	uint16_t wTotalLength;		\
+	uint8_t bInCollection;		\
+	uint8_t baInterfaceNr[ifaces];	\
 } __packed
 
 #define DECLARE_FEATURE_UNIT(dev, i)		\
 struct dev##_feature_unit_descriptor_##i {	\
-	u8_t bLength;				\
-	u8_t bDescriptorType;			\
-	u8_t bDescriptorSubtype;		\
-	u8_t bUnitID;				\
-	u8_t bSourceID;				\
-	u8_t bControlSize;			\
-	u16_t bmaControls[CH_CNT(dev, i) + 1];	\
-	u8_t iFeature;				\
+	uint8_t bLength;				\
+	uint8_t bDescriptorType;			\
+	uint8_t bDescriptorSubtype;		\
+	uint8_t bUnitID;				\
+	uint8_t bSourceID;				\
+	uint8_t bControlSize;			\
+	uint16_t bmaControls[CH_CNT(dev, i) + 1];	\
+	uint8_t iFeature;				\
 } __packed
 
 #define INIT_IAD(iface_subclass, if_cnt)			\
@@ -461,7 +461,7 @@ struct dev##_descriptor_##i {						\
 	.bDescriptorSubtype = USB_AUDIO_FEATURE_UNIT,			\
 	.bUnitID = unit_id,						\
 	.bSourceID = source_id,						\
-	.bControlSize = sizeof(u16_t),					\
+	.bControlSize = sizeof(uint16_t),					\
 	.bmaControls = { FEATURES(dev, i) },				\
 	.iFeature = 0,							\
 }
diff --git a/subsys/usb/class/bluetooth.c b/subsys/usb/class/bluetooth.c
index 2bf0e12e50..a8706b7f38 100644
--- a/subsys/usb/class/bluetooth.c
+++ b/subsys/usb/class/bluetooth.c
@@ -168,9 +168,9 @@ static void hci_rx_thread(void)
 	}
 }
 
-static void acl_read_cb(u8_t ep, int size, void *priv)
+static void acl_read_cb(uint8_t ep, int size, void *priv)
 {
-	static u8_t data[BLUETOOTH_BULK_EP_MPS];
+	static uint8_t data[BLUETOOTH_BULK_EP_MPS];
 
 	if (size > 0) {
 		struct net_buf *buf;
@@ -198,7 +198,7 @@ static void acl_read_cb(u8_t ep, int size, void *priv)
 
 static void bluetooth_status_cb(struct usb_cfg_data *cfg,
 				enum usb_dc_status_code status,
-				const u8_t *param)
+				const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -240,7 +240,7 @@ static void bluetooth_status_cb(struct usb_cfg_data *cfg,
 	}
 }
 
-static u8_t vs_read_usb_transport_mode(struct net_buf *buf)
+static uint8_t vs_read_usb_transport_mode(struct net_buf *buf)
 {
 	struct net_buf *rsp;
 	struct bt_hci_rp_vs_read_usb_transport_mode *rp;
@@ -259,10 +259,10 @@ static u8_t vs_read_usb_transport_mode(struct net_buf *buf)
 	return BT_HCI_ERR_EXT_HANDLED;
 }
 
-static u8_t vs_set_usb_transport_mode(struct net_buf *buf)
+static uint8_t vs_set_usb_transport_mode(struct net_buf *buf)
 {
 	struct bt_hci_cp_vs_set_usb_transport_mode *cp;
-	u8_t mode;
+	uint8_t mode;
 
 	cp = net_buf_pull_mem(buf, sizeof(*cp));
 
@@ -294,7 +294,7 @@ static struct bt_hci_raw_cmd_ext cmd_ext[] = {
 };
 
 static int bluetooth_class_handler(struct usb_setup_packet *setup,
-				   s32_t *len, u8_t **data)
+				   int32_t *len, uint8_t **data)
 {
 	struct net_buf *buf;
 
@@ -312,7 +312,7 @@ static int bluetooth_class_handler(struct usb_setup_packet *setup,
 }
 
 static void bluetooth_interface_config(struct usb_desc_header *head,
-				       u8_t bInterfaceNumber)
+				       uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/class/bt_h4.c b/subsys/usb/class/bt_h4.c
index bd1bab856b..21a0d9bd7c 100644
--- a/subsys/usb/class/bt_h4.c
+++ b/subsys/usb/class/bt_h4.c
@@ -92,9 +92,9 @@ static struct usb_ep_cfg_data bt_h4_ep_data[] = {
 	},
 };
 
-static void bt_h4_read(u8_t ep, int size, void *priv)
+static void bt_h4_read(uint8_t ep, int size, void *priv)
 {
-	static u8_t data[BT_H4_BULK_EP_MPS];
+	static uint8_t data[BT_H4_BULK_EP_MPS];
 
 	if (size > 0) {
 		struct net_buf *buf;
@@ -143,7 +143,7 @@ static void hci_rx_thread(void)
 }
 
 static void bt_h4_status_cb(struct usb_cfg_data *cfg,
-			    enum usb_dc_status_code status, const u8_t *param)
+			    enum usb_dc_status_code status, const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -174,7 +174,7 @@ static void bt_h4_status_cb(struct usb_cfg_data *cfg,
 }
 
 static int bt_h4_vendor_handler(struct usb_setup_packet *setup,
-				s32_t *len, u8_t **data)
+				int32_t *len, uint8_t **data)
 {
 	LOG_DBG("Class request: bRequest 0x%x bmRequestType 0x%x len %d",
 		setup->bRequest, setup->bmRequestType, *len);
@@ -200,7 +200,7 @@ static int bt_h4_vendor_handler(struct usb_setup_packet *setup,
 }
 
 static void bt_h4_interface_config(struct usb_desc_header *head,
-				   u8_t bInterfaceNumber)
+				   uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c
index 689dbdb1fa..ce90e91275 100644
--- a/subsys/usb/class/cdc_acm.c
+++ b/subsys/usb/class/cdc_acm.c
@@ -181,18 +181,18 @@ struct cdc_acm_dev_data_t {
 	bool rx_ready;				/* Rx ready status */
 	bool tx_irq_ena;			/* Tx interrupt enable status */
 	bool rx_irq_ena;			/* Rx interrupt enable status */
-	u8_t rx_buf[CDC_ACM_BUFFER_SIZE];	/* Internal RX buffer */
+	uint8_t rx_buf[CDC_ACM_BUFFER_SIZE];	/* Internal RX buffer */
 	struct ring_buf *rx_ringbuf;
 	struct ring_buf *tx_ringbuf;
 	/* Interface data buffer */
 	/* CDC ACM line coding properties. LE order */
 	struct cdc_acm_line_coding line_coding;
 	/* CDC ACM line state bitmap, DTE side */
-	u8_t line_state;
+	uint8_t line_state;
 	/* CDC ACM serial state bitmap, DCE side */
-	u8_t serial_state;
+	uint8_t serial_state;
 	/* CDC ACM notification sent status */
-	u8_t notification_sent;
+	uint8_t notification_sent;
 
 	struct usb_dev_data common;
 };
@@ -209,7 +209,7 @@ static sys_slist_t cdc_acm_data_devlist;
  * @return  0 on success, negative errno code on fail.
  */
 int cdc_acm_class_handle_req(struct usb_setup_packet *pSetup,
-			     s32_t *len, u8_t **data)
+			     int32_t *len, uint8_t **data)
 {
 	struct cdc_acm_dev_data_t *dev_data;
 	struct usb_dev_data *common;
@@ -236,13 +236,13 @@ int cdc_acm_class_handle_req(struct usb_setup_packet *pSetup,
 		break;
 
 	case SET_CONTROL_LINE_STATE:
-		dev_data->line_state = (u8_t)sys_le16_to_cpu(pSetup->wValue);
+		dev_data->line_state = (uint8_t)sys_le16_to_cpu(pSetup->wValue);
 		LOG_DBG("CDC_SET_CONTROL_LINE_STATE 0x%x",
 			dev_data->line_state);
 		break;
 
 	case GET_LINE_CODING:
-		*data = (u8_t *)(&dev_data->line_coding);
+		*data = (uint8_t *)(&dev_data->line_coding);
 		*len = sizeof(dev_data->line_coding);
 		LOG_DBG("CDC_GET_LINE_CODING %d %d %d %d",
 			sys_le32_to_cpu(dev_data->line_coding.dwDTERate),
@@ -260,7 +260,7 @@ int cdc_acm_class_handle_req(struct usb_setup_packet *pSetup,
 	return 0;
 }
 
-static void cdc_acm_write_cb(u8_t ep, int size, void *priv)
+static void cdc_acm_write_cb(uint8_t ep, int size, void *priv)
 {
 	struct cdc_acm_dev_data_t *dev_data = priv;
 
@@ -289,8 +289,8 @@ static void tx_work_handler(struct k_work *work)
 		CONTAINER_OF(work, struct cdc_acm_dev_data_t, tx_work);
 	struct device *dev = dev_data->common.dev;
 	struct usb_cfg_data *cfg = (void *)dev->config_info;
-	u8_t ep = cfg->endpoint[ACM_IN_EP_IDX].ep_addr;
-	u8_t *data;
+	uint8_t ep = cfg->endpoint[ACM_IN_EP_IDX].ep_addr;
+	uint8_t *data;
 	size_t len;
 
 	if (usb_transfer_is_busy(ep)) {
@@ -324,7 +324,7 @@ static void tx_work_handler(struct k_work *work)
 	ring_buf_get_finish(dev_data->tx_ringbuf, len);
 }
 
-static void cdc_acm_read_cb(u8_t ep, int size, void *priv)
+static void cdc_acm_read_cb(uint8_t ep, int size, void *priv)
 {
 	struct cdc_acm_dev_data_t *dev_data = priv;
 	size_t wrote;
@@ -362,7 +362,7 @@ done:
  *
  * @return  N/A.
  */
-static void cdc_acm_int_in(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void cdc_acm_int_in(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	struct cdc_acm_dev_data_t *dev_data;
 	struct usb_dev_data *common;
@@ -397,7 +397,7 @@ static void cdc_acm_reset_port(struct cdc_acm_dev_data_t *dev_data)
 
 static void cdc_acm_do_cb(struct cdc_acm_dev_data_t *dev_data,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	struct device *dev = dev_data->common.dev;
 	struct usb_cfg_data *cfg = (void *)dev->config_info;
@@ -450,7 +450,7 @@ static void cdc_acm_do_cb(struct cdc_acm_dev_data_t *dev_data,
 
 static void cdc_acm_dev_status_cb(struct usb_cfg_data *cfg,
 				  enum usb_dc_status_code status,
-				  const u8_t *param)
+				  const uint8_t *param)
 {
 	struct cdc_acm_dev_data_t *dev_data;
 	struct usb_dev_data *common;
@@ -469,7 +469,7 @@ static void cdc_acm_dev_status_cb(struct usb_cfg_data *cfg,
 }
 
 static void cdc_interface_config(struct usb_desc_header *head,
-				 u8_t bInterfaceNumber)
+				 uint8_t bInterfaceNumber)
 {
 	struct usb_if_descriptor *if_desc = (struct usb_if_descriptor *) head;
 	struct usb_cdc_acm_config *desc =
@@ -541,7 +541,7 @@ static int cdc_acm_init(struct device *dev)
  * @return Number of bytes sent.
  */
 static int cdc_acm_fifo_fill(struct device *dev,
-			     const u8_t *tx_data, int len)
+			     const uint8_t *tx_data, int len)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 	size_t wrote;
@@ -576,10 +576,10 @@ static int cdc_acm_fifo_fill(struct device *dev,
  *
  * @return Number of bytes read.
  */
-static int cdc_acm_fifo_read(struct device *dev, u8_t *rx_data, const int size)
+static int cdc_acm_fifo_read(struct device *dev, uint8_t *rx_data, const int size)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
-	u32_t len;
+	uint32_t len;
 
 	LOG_DBG("dev %p size %d rx_ringbuf space %u",
 		dev, size, ring_buf_space_get(dev_data->rx_ringbuf));
@@ -757,7 +757,7 @@ static void cdc_acm_irq_callback_set(struct device *dev,
  *
  * @return N/A.
  */
-static void cdc_acm_baudrate_set(struct device *dev, u32_t baudrate)
+static void cdc_acm_baudrate_set(struct device *dev, uint32_t baudrate)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 
@@ -775,12 +775,12 @@ static void cdc_acm_baudrate_set(struct device *dev, u32_t baudrate)
  *
  * @return  N/A.
  */
-static int cdc_acm_send_notification(struct device *dev, u16_t serial_state)
+static int cdc_acm_send_notification(struct device *dev, uint16_t serial_state)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 	struct usb_cfg_data * const cfg = (void *)dev->config_info;
 	struct cdc_acm_notification notification;
-	u32_t cnt = 0U;
+	uint32_t cnt = 0U;
 
 	notification.bmRequestType = 0xA1;
 	notification.bNotificationType = 0x20;
@@ -792,10 +792,10 @@ static int cdc_acm_send_notification(struct device *dev, u16_t serial_state)
 	dev_data->notification_sent = 0U;
 
 	usb_write(cfg->endpoint[ACM_INT_EP_IDX].ep_addr,
-		  (const u8_t *)&notification, sizeof(notification), NULL);
+		  (const uint8_t *)&notification, sizeof(notification), NULL);
 
 	/* Wait for notification to be sent */
-	while (!((volatile u8_t)dev_data->notification_sent)) {
+	while (!((volatile uint8_t)dev_data->notification_sent)) {
 		k_busy_wait(1);
 
 		if (++cnt > CDC_CONTROL_SERIAL_STATE_TIMEOUT_US) {
@@ -817,7 +817,7 @@ static int cdc_acm_send_notification(struct device *dev, u16_t serial_state)
  * @return 0 if successful, failed otherwise.
  */
 static int cdc_acm_line_ctrl_set(struct device *dev,
-				 u32_t ctrl, u32_t val)
+				 uint32_t ctrl, uint32_t val)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 
@@ -898,7 +898,7 @@ static int cdc_acm_line_ctrl_set(struct device *dev,
  * @return 0 if successful, failed otherwise.
  */
 static int cdc_acm_line_ctrl_get(struct device *dev,
-				 u32_t ctrl, u32_t *val)
+				 uint32_t ctrl, uint32_t *val)
 {
 	struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev);
 
diff --git a/subsys/usb/class/hid/core.c b/subsys/usb/class/hid/core.c
index cffbc513cc..8e3928cb7a 100644
--- a/subsys/usb/class/hid/core.c
+++ b/subsys/usb/class/hid/core.c
@@ -115,17 +115,17 @@ struct usb_hid_config {
 #endif
 
 struct hid_device_info {
-	const u8_t *report_desc;
+	const uint8_t *report_desc;
 	size_t report_size;
 	const struct hid_ops *ops;
 #ifdef CONFIG_USB_DEVICE_SOF
-	u32_t sof_cnt[CONFIG_USB_HID_REPORTS + 1];
+	uint32_t sof_cnt[CONFIG_USB_HID_REPORTS + 1];
 	bool idle_on;
 	bool idle_id_report;
-	u8_t idle_rate[CONFIG_USB_HID_REPORTS + 1];
+	uint8_t idle_rate[CONFIG_USB_HID_REPORTS + 1];
 #endif
 #ifdef CONFIG_USB_HID_BOOT_PROTOCOL
-	u8_t protocol;
+	uint8_t protocol;
 #endif
 	struct usb_dev_data common;
 };
@@ -133,18 +133,18 @@ struct hid_device_info {
 static sys_slist_t usb_hid_devlist;
 
 static int hid_on_get_idle(struct hid_device_info *dev_data,
-			   struct usb_setup_packet *setup, s32_t *len,
-			   u8_t **data)
+			   struct usb_setup_packet *setup, int32_t *len,
+			   uint8_t **data)
 {
 #ifdef CONFIG_USB_DEVICE_SOF
-	u8_t report_id = sys_le16_to_cpu(setup->wValue) & 0xFF;
+	uint8_t report_id = sys_le16_to_cpu(setup->wValue) & 0xFF;
 
 	if (report_id > CONFIG_USB_HID_REPORTS) {
 		LOG_ERR("Report id out of limit: %d", report_id);
 		return -ENOTSUP;
 	}
 
-	u32_t size = sizeof(dev_data->idle_rate[report_id]);
+	uint32_t size = sizeof(dev_data->idle_rate[report_id]);
 
 	LOG_DBG("Get Idle callback, report_id: %d", report_id);
 
@@ -157,8 +157,8 @@ static int hid_on_get_idle(struct hid_device_info *dev_data,
 }
 
 static int hid_on_get_report(struct hid_device_info *dev_data,
-			     struct usb_setup_packet *setup, s32_t *len,
-			     u8_t **data)
+			     struct usb_setup_packet *setup, int32_t *len,
+			     uint8_t **data)
 {
 	LOG_DBG("Get Report callback");
 
@@ -168,8 +168,8 @@ static int hid_on_get_report(struct hid_device_info *dev_data,
 }
 
 static int hid_on_get_protocol(struct hid_device_info *dev_data,
-			       struct usb_setup_packet *setup, s32_t *len,
-			       u8_t **data)
+			       struct usb_setup_packet *setup, int32_t *len,
+			       uint8_t **data)
 {
 #ifdef CONFIG_USB_HID_BOOT_PROTOCOL
 	if (setup->wValue) {
@@ -177,7 +177,7 @@ static int hid_on_get_protocol(struct hid_device_info *dev_data,
 		return -ENOTSUP;
 	}
 
-	u32_t size = sizeof(dev_data->protocol);
+	uint32_t size = sizeof(dev_data->protocol);
 
 	LOG_DBG("Get Protocol callback, protocol: %d", dev_data->protocol);
 
@@ -190,12 +190,12 @@ static int hid_on_get_protocol(struct hid_device_info *dev_data,
 }
 
 static int hid_on_set_idle(struct hid_device_info *dev_data,
-			   struct usb_setup_packet *setup, s32_t *len,
-			   u8_t **data)
+			   struct usb_setup_packet *setup, int32_t *len,
+			   uint8_t **data)
 {
 #ifdef CONFIG_USB_DEVICE_SOF
-	u8_t rate = ((sys_le16_to_cpu(setup->wValue) & 0xFF00) >> 8);
-	u8_t report_id = sys_le16_to_cpu(setup->wValue) & 0xFF;
+	uint8_t rate = ((sys_le16_to_cpu(setup->wValue) & 0xFF00) >> 8);
+	uint8_t report_id = sys_le16_to_cpu(setup->wValue) & 0xFF;
 
 	if (report_id > CONFIG_USB_HID_REPORTS) {
 		LOG_ERR("Report id out of limit: %d", report_id);
@@ -210,7 +210,7 @@ static int hid_on_set_idle(struct hid_device_info *dev_data,
 		/* Clear idle */
 		bool clear = true;
 
-		for (u16_t i = 1; i <= CONFIG_USB_HID_REPORTS; i++) {
+		for (uint16_t i = 1; i <= CONFIG_USB_HID_REPORTS; i++) {
 			if (dev_data->idle_rate[i] != 0U) {
 				/* Report with non-zero id has idle rate. */
 				clear = false;
@@ -243,8 +243,8 @@ static int hid_on_set_idle(struct hid_device_info *dev_data,
 }
 
 static int hid_on_set_report(struct hid_device_info *dev_data,
-			     struct usb_setup_packet *setup, s32_t *len,
-			     u8_t **data)
+			     struct usb_setup_packet *setup, int32_t *len,
+			     uint8_t **data)
 {
 	LOG_DBG("Set Report callback");
 
@@ -254,11 +254,11 @@ static int hid_on_set_report(struct hid_device_info *dev_data,
 }
 
 static int hid_on_set_protocol(struct hid_device_info *dev_data,
-			       struct usb_setup_packet *setup, s32_t *len,
-			       u8_t **data)
+			       struct usb_setup_packet *setup, int32_t *len,
+			       uint8_t **data)
 {
 #ifdef CONFIG_USB_HID_BOOT_PROTOCOL
-	u16_t protocol = sys_le16_to_cpu(setup->wValue);
+	uint16_t protocol = sys_le16_to_cpu(setup->wValue);
 
 	if (protocol > HID_PROTOCOL_REPORT) {
 		LOG_ERR("Unsupported protocol: %u", protocol);
@@ -281,7 +281,7 @@ static int hid_on_set_protocol(struct hid_device_info *dev_data,
 #endif
 }
 
-static void usb_set_hid_report_size(const struct usb_cfg_data *cfg, u16_t size)
+static void usb_set_hid_report_size(const struct usb_cfg_data *cfg, uint16_t size)
 {
 	struct usb_if_descriptor *if_desc = (void *)cfg->interface_descriptor;
 	struct usb_hid_config *desc =
@@ -290,7 +290,7 @@ static void usb_set_hid_report_size(const struct usb_cfg_data *cfg, u16_t size)
 	LOG_DBG("if_desc %p desc %p size %u", if_desc, desc, size);
 
 	sys_put_le16(size,
-		     (u8_t *)&(desc->if0_hid.subdesc[0].wDescriptorLength));
+		     (uint8_t *)&(desc->if0_hid.subdesc[0].wDescriptorLength));
 }
 
 #ifdef CONFIG_USB_DEVICE_SOF
@@ -298,7 +298,7 @@ void hid_clear_idle_ctx(struct hid_device_info *dev_data)
 {
 	dev_data->idle_on = false;
 	dev_data->idle_id_report = false;
-	for (u16_t i = 0; i <= CONFIG_USB_HID_REPORTS; i++) {
+	for (uint16_t i = 0; i <= CONFIG_USB_HID_REPORTS; i++) {
 		dev_data->sof_cnt[i] = 0U;
 		dev_data->idle_rate[i] = 0U;
 	}
@@ -306,12 +306,12 @@ void hid_clear_idle_ctx(struct hid_device_info *dev_data)
 
 void hid_sof_handler(struct hid_device_info *dev_data)
 {
-	for (u16_t i = 0; i <= CONFIG_USB_HID_REPORTS; i++) {
+	for (uint16_t i = 0; i <= CONFIG_USB_HID_REPORTS; i++) {
 		if (dev_data->idle_rate[i]) {
 			dev_data->sof_cnt[i]++;
 		}
 
-		u32_t diff = abs((dev_data->idle_rate[i] * 4U)
+		uint32_t diff = abs((dev_data->idle_rate[i] * 4U)
 				 - dev_data->sof_cnt[i]);
 
 		if (diff < (2 + (dev_data->idle_rate[i] / 10U))) {
@@ -333,7 +333,7 @@ void hid_sof_handler(struct hid_device_info *dev_data)
 
 static void hid_do_status_cb(struct hid_device_info *dev_data,
 			     enum usb_dc_status_code status,
-			     const u8_t *param)
+			     const uint8_t *param)
 {
 	switch (status) {
 	case USB_DC_ERROR:
@@ -380,7 +380,7 @@ static void hid_do_status_cb(struct hid_device_info *dev_data,
 
 static void hid_status_cb(struct usb_cfg_data *cfg,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	struct hid_device_info *dev_data;
 	struct usb_dev_data *common;
@@ -399,7 +399,7 @@ static void hid_status_cb(struct usb_cfg_data *cfg,
 }
 
 static int hid_class_handle_req(struct usb_setup_packet *setup,
-				s32_t *len, u8_t **data)
+				int32_t *len, uint8_t **data)
 {
 	struct hid_device_info *dev_data;
 	struct usb_dev_data *common;
@@ -489,7 +489,7 @@ static int hid_class_handle_req(struct usb_setup_packet *setup,
 }
 
 static int hid_custom_handle_req(struct usb_setup_packet *setup,
-				 s32_t *len, u8_t **data)
+				 int32_t *len, uint8_t **data)
 {
 	LOG_DBG("Standard request: bRequest 0x%x bmRequestType 0x%x len %d",
 		setup->bRequest, setup->bmRequestType, *len);
@@ -498,8 +498,8 @@ static int hid_custom_handle_req(struct usb_setup_packet *setup,
 	    REQTYPE_GET_RECIP(setup->bmRequestType) ==
 					REQTYPE_RECIP_INTERFACE &&
 					setup->bRequest == REQ_GET_DESCRIPTOR) {
-		u8_t value = sys_le16_to_cpu(setup->wValue) >> 8;
-		u8_t iface_num = sys_le16_to_cpu(setup->wIndex);
+		uint8_t value = sys_le16_to_cpu(setup->wValue) >> 8;
+		uint8_t iface_num = sys_le16_to_cpu(setup->wIndex);
 		struct hid_device_info *dev_data;
 		struct usb_dev_data *common;
 		const struct usb_cfg_data *cfg;
@@ -522,7 +522,7 @@ static int hid_custom_handle_req(struct usb_setup_packet *setup,
 			LOG_DBG("Return HID Descriptor");
 
 			*len = MIN(*len, hid_desc->if0_hid.bLength);
-			*data = (u8_t *)&hid_desc->if0_hid;
+			*data = (uint8_t *)&hid_desc->if0_hid;
 			break;
 		case HID_CLASS_DESCRIPTOR_REPORT:
 			LOG_DBG("Return Report Descriptor");
@@ -536,7 +536,7 @@ static int hid_custom_handle_req(struct usb_setup_packet *setup,
 					"Report Descriptor size", *len);
 				*len = MIN(*len, dev_data->report_size);
 			}
-			*data = (u8_t *)dev_data->report_desc;
+			*data = (uint8_t *)dev_data->report_desc;
 			break;
 		default:
 			return -ENOTSUP;
@@ -548,7 +548,7 @@ static int hid_custom_handle_req(struct usb_setup_packet *setup,
 	return -EINVAL;
 }
 
-static void hid_int_in(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void hid_int_in(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	struct hid_device_info *dev_data;
 	struct usb_dev_data *common;
@@ -570,7 +570,7 @@ static void hid_int_in(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 }
 
 #ifdef CONFIG_ENABLE_HID_INT_OUT_EP
-static void hid_int_out(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void hid_int_out(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	struct hid_device_info *dev_data;
 	struct usb_dev_data *common;
@@ -613,7 +613,7 @@ static void hid_int_out(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 #endif
 
 static void hid_interface_config(struct usb_desc_header *head,
-				 u8_t bInterfaceNumber)
+				 uint8_t bInterfaceNumber)
 {
 	struct usb_if_descriptor *if_desc = (struct usb_if_descriptor *)head;
 	struct usb_hid_config *desc =
@@ -657,7 +657,7 @@ int usb_hid_init(const struct device *dev)
 	return 0;
 }
 
-void usb_hid_register_device(struct device *dev, const u8_t *desc,
+void usb_hid_register_device(struct device *dev, const uint8_t *desc,
 			     size_t size, const struct hid_ops *ops)
 {
 	struct hid_device_info *dev_data = dev->driver_data;
@@ -674,8 +674,8 @@ void usb_hid_register_device(struct device *dev, const u8_t *desc,
 		&usb_hid_devlist);
 }
 
-int hid_int_ep_write(const struct device *dev, const u8_t *data, u32_t data_len,
-		     u32_t *bytes_ret)
+int hid_int_ep_write(const struct device *dev, const uint8_t *data, uint32_t data_len,
+		     uint32_t *bytes_ret)
 {
 	const struct usb_cfg_data *cfg = dev->config_info;
 
@@ -683,8 +683,8 @@ int hid_int_ep_write(const struct device *dev, const u8_t *data, u32_t data_len,
 			 data_len, bytes_ret);
 }
 
-int hid_int_ep_read(const struct device *dev, u8_t *data, u32_t max_data_len,
-		    u32_t *ret_bytes)
+int hid_int_ep_read(const struct device *dev, uint8_t *data, uint32_t max_data_len,
+		    uint32_t *ret_bytes)
 {
 #ifdef CONFIG_ENABLE_HID_INT_OUT_EP
 	const struct usb_cfg_data *cfg = dev->config_info;
diff --git a/subsys/usb/class/loopback.c b/subsys/usb/class/loopback.c
index 754c2a4906..a49c51e691 100644
--- a/subsys/usb/class/loopback.c
+++ b/subsys/usb/class/loopback.c
@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(usb_loopback);
 #define LOOPBACK_OUT_EP_IDX		0
 #define LOOPBACK_IN_EP_IDX		1
 
-static u8_t loopback_buf[1024];
+static uint8_t loopback_buf[1024];
 
 /* usb.rst config structure start */
 struct usb_loopback_config {
@@ -68,16 +68,16 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_loopback_config loopback_cfg = {
 };
 /* usb.rst config structure end */
 
-static void loopback_out_cb(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void loopback_out_cb(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
-	u32_t bytes_to_read;
+	uint32_t bytes_to_read;
 
 	usb_read(ep, NULL, 0, &bytes_to_read);
 	LOG_DBG("ep 0x%x, bytes to read %d ", ep, bytes_to_read);
 	usb_read(ep, loopback_buf, bytes_to_read, NULL);
 }
 
-static void loopback_in_cb(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void loopback_in_cb(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	if (usb_write(ep, loopback_buf, CONFIG_LOOPBACK_BULK_EP_MPS, NULL)) {
 		LOG_DBG("ep 0x%x", ep);
@@ -99,7 +99,7 @@ static struct usb_ep_cfg_data ep_cfg[] = {
 
 static void loopback_status_cb(struct usb_cfg_data *cfg,
 			       enum usb_dc_status_code status,
-			       const u8_t *param)
+			       const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -124,7 +124,7 @@ static void loopback_status_cb(struct usb_cfg_data *cfg,
 
 /* usb.rst vendor handler start */
 static int loopback_vendor_handler(struct usb_setup_packet *setup,
-				   s32_t *len, u8_t **data)
+				   int32_t *len, uint8_t **data)
 {
 	LOG_DBG("Class request: bRequest 0x%x bmRequestType 0x%x len %d",
 		setup->bRequest, setup->bmRequestType, *len);
@@ -151,7 +151,7 @@ static int loopback_vendor_handler(struct usb_setup_packet *setup,
 /* usb.rst vendor handler end */
 
 static void loopback_interface_config(struct usb_desc_header *head,
-				      u8_t bInterfaceNumber)
+				      uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c
index 7485d907a5..e9cb51dcbb 100644
--- a/subsys/usb/class/mass_storage.c
+++ b/subsys/usb/class/mass_storage.c
@@ -107,7 +107,7 @@ static volatile int thread_op;
 static K_THREAD_STACK_DEFINE(mass_thread_stack, DISK_THREAD_STACK_SZ);
 static struct k_thread mass_thread_data;
 static struct k_sem disk_wait_sem;
-static volatile u32_t defered_wr_sz;
+static volatile uint32_t defered_wr_sz;
 
 /*
  * Keep block buffer larger than BLOCK_SIZE for the case
@@ -117,19 +117,19 @@ static volatile u32_t defered_wr_sz;
  * Align for cases where the underlying disk access requires word-aligned
  * addresses.
  */
-static u8_t __aligned(4) page[BLOCK_SIZE + CONFIG_MASS_STORAGE_BULK_EP_MPS];
+static uint8_t __aligned(4) page[BLOCK_SIZE + CONFIG_MASS_STORAGE_BULK_EP_MPS];
 
 /* Initialized during mass_storage_init() */
-static u32_t memory_size;
-static u32_t block_count;
+static uint32_t memory_size;
+static uint32_t block_count;
 static const char *disk_pdrv = CONFIG_MASS_STORAGE_DISK_NAME;
 
 #define MSD_OUT_EP_IDX			0
 #define MSD_IN_EP_IDX			1
 
-static void mass_storage_bulk_out(u8_t ep,
+static void mass_storage_bulk_out(uint8_t ep,
 				  enum usb_dc_ep_cb_status_code ep_status);
-static void mass_storage_bulk_in(u8_t ep,
+static void mass_storage_bulk_in(uint8_t ep,
 				 enum usb_dc_ep_cb_status_code ep_status);
 
 /* Describe EndPoints configuration */
@@ -170,12 +170,12 @@ static struct CBW cbw;
 static struct CSW csw;
 
 /*addr where will be read or written data*/
-static u32_t addr;
+static uint32_t addr;
 
 /*length of a reading or writing*/
-static u32_t length;
+static uint32_t length;
 
-static u8_t max_lun_count;
+static uint8_t max_lun_count;
 
 /*memory OK (after a memoryVerify)*/
 static bool memOK;
@@ -197,14 +197,14 @@ static void msd_init(void)
 static void sendCSW(void)
 {
 	csw.Signature = CSW_Signature;
-	if (usb_write(mass_ep_data[MSD_IN_EP_IDX].ep_addr, (u8_t *)&csw,
+	if (usb_write(mass_ep_data[MSD_IN_EP_IDX].ep_addr, (uint8_t *)&csw,
 		      sizeof(struct CSW), NULL) != 0) {
 		LOG_ERR("usb write failure");
 	}
 	stage = MSC_WAIT_CSW;
 }
 
-static bool write(u8_t *buf, u16_t size)
+static bool write(uint8_t *buf, uint16_t size)
 {
 	if (size >= cbw.DataLength) {
 		size = cbw.DataLength;
@@ -235,7 +235,7 @@ static bool write(u8_t *buf, u16_t size)
  * @return  0 on success, negative errno code on fail.
  */
 static int mass_storage_class_handle_req(struct usb_setup_packet *pSetup,
-					 s32_t *len, u8_t **data)
+					 int32_t *len, uint8_t **data)
 {
 	if (sys_le16_to_cpu(pSetup->wIndex) != mass_cfg.if0.bInterfaceNumber ||
 	    sys_le16_to_cpu(pSetup->wValue) != 0) {
@@ -264,7 +264,7 @@ static int mass_storage_class_handle_req(struct usb_setup_packet *pSetup,
 		}
 
 		max_lun_count = 0U;
-		*data = (u8_t *)(&max_lun_count);
+		*data = (uint8_t *)(&max_lun_count);
 		*len = 1;
 		break;
 
@@ -295,7 +295,7 @@ static void testUnitReady(void)
 
 static bool requestSense(void)
 {
-	u8_t request_sense[] = {
+	uint8_t request_sense[] = {
 		0x70,
 		0x00,
 		0x05,   /* Sense Key: illegal request */
@@ -321,7 +321,7 @@ static bool requestSense(void)
 
 static bool inquiryRequest(void)
 {
-	u8_t inquiry[] = { 0x00, 0x80, 0x00, 0x01,
+	uint8_t inquiry[] = { 0x00, 0x80, 0x00, 0x01,
 	36 - 4, 0x80, 0x00, 0x00,
 	'Z', 'E', 'P', 'H', 'Y', 'R', ' ', ' ',
 	'Z', 'E', 'P', 'H', 'Y', 'R', ' ', 'U', 'S', 'B', ' ',
@@ -334,23 +334,23 @@ static bool inquiryRequest(void)
 
 static bool modeSense6(void)
 {
-	u8_t sense6[] = { 0x03, 0x00, 0x00, 0x00 };
+	uint8_t sense6[] = { 0x03, 0x00, 0x00, 0x00 };
 
 	return write(sense6, sizeof(sense6));
 }
 
 static bool readFormatCapacity(void)
 {
-	u8_t capacity[] = { 0x00, 0x00, 0x00, 0x08,
-			(u8_t)((block_count >> 24) & 0xff),
-			(u8_t)((block_count >> 16) & 0xff),
-			(u8_t)((block_count >> 8) & 0xff),
-			(u8_t)((block_count >> 0) & 0xff),
+	uint8_t capacity[] = { 0x00, 0x00, 0x00, 0x08,
+			(uint8_t)((block_count >> 24) & 0xff),
+			(uint8_t)((block_count >> 16) & 0xff),
+			(uint8_t)((block_count >> 8) & 0xff),
+			(uint8_t)((block_count >> 0) & 0xff),
 
 			0x02,
-			(u8_t)((BLOCK_SIZE >> 16) & 0xff),
-			(u8_t)((BLOCK_SIZE >> 8) & 0xff),
-			(u8_t)((BLOCK_SIZE >> 0) & 0xff),
+			(uint8_t)((BLOCK_SIZE >> 16) & 0xff),
+			(uint8_t)((BLOCK_SIZE >> 8) & 0xff),
+			(uint8_t)((BLOCK_SIZE >> 0) & 0xff),
 	};
 
 	return write(capacity, sizeof(capacity));
@@ -358,7 +358,7 @@ static bool readFormatCapacity(void)
 
 static bool readCapacity(void)
 {
-	u8_t capacity[8];
+	uint8_t capacity[8];
 
 	sys_put_be32(block_count - 1, &capacity[0]);
 	sys_put_be32(BLOCK_SIZE, &capacity[4]);
@@ -368,7 +368,7 @@ static bool readCapacity(void)
 
 static void thread_memory_read_done(void)
 {
-	u32_t n;
+	uint32_t n;
 
 	n = (length > MAX_PACKET) ? MAX_PACKET : length;
 	if ((addr + n) > memory_size) {
@@ -396,7 +396,7 @@ static void thread_memory_read_done(void)
 
 static void memoryRead(void)
 {
-	u32_t n;
+	uint32_t n;
 
 	n = (length > MAX_PACKET) ? MAX_PACKET : length;
 	if ((addr + n) > memory_size) {
@@ -439,7 +439,7 @@ static bool check_cbw_data_length(void)
 
 static bool infoTransfer(void)
 {
-	u32_t n;
+	uint32_t n;
 
 	if (!check_cbw_data_length()) {
 		return false;
@@ -503,14 +503,14 @@ static void fail(void)
 	sendCSW();
 }
 
-static void CBWDecode(u8_t *buf, u16_t size)
+static void CBWDecode(uint8_t *buf, uint16_t size)
 {
 	if (size != sizeof(cbw)) {
 		LOG_ERR("size != sizeof(cbw)");
 		return;
 	}
 
-	memcpy((u8_t *)&cbw, buf, size);
+	memcpy((uint8_t *)&cbw, buf, size);
 	if (cbw.Signature != CBW_Signature) {
 		LOG_ERR("CBW Signature Mismatch");
 		return;
@@ -623,9 +623,9 @@ static void CBWDecode(u8_t *buf, u16_t size)
 
 }
 
-static void memoryVerify(u8_t *buf, u16_t size)
+static void memoryVerify(uint8_t *buf, uint16_t size)
 {
-	u32_t n;
+	uint32_t n;
 
 	if ((addr + size) > memory_size) {
 		size = memory_size - addr;
@@ -663,7 +663,7 @@ static void memoryVerify(u8_t *buf, u16_t size)
 	}
 }
 
-static void memoryWrite(u8_t *buf, u16_t size)
+static void memoryWrite(uint8_t *buf, uint16_t size)
 {
 	if ((addr + size) > memory_size) {
 		size = memory_size - addr;
@@ -700,11 +700,11 @@ static void memoryWrite(u8_t *buf, u16_t size)
 }
 
 
-static void mass_storage_bulk_out(u8_t ep,
+static void mass_storage_bulk_out(uint8_t ep,
 		enum usb_dc_ep_cb_status_code ep_status)
 {
-	u32_t bytes_read = 0U;
-	u8_t bo_buf[CONFIG_MASS_STORAGE_BULK_EP_MPS];
+	uint32_t bytes_read = 0U;
+	uint8_t bo_buf[CONFIG_MASS_STORAGE_BULK_EP_MPS];
 
 	ARG_UNUSED(ep_status);
 
@@ -755,7 +755,7 @@ static void mass_storage_bulk_out(u8_t ep,
 
 static void thread_memory_write_done(void)
 {
-	u32_t size = defered_wr_sz;
+	uint32_t size = defered_wr_sz;
 	size_t overflowed_len = (addr + size) % CONFIG_MASS_STORAGE_BULK_EP_MPS;
 
 	if (overflowed_len) {
@@ -785,7 +785,7 @@ static void thread_memory_write_done(void)
  *
  * @return  N/A.
  */
-static void mass_storage_bulk_in(u8_t ep,
+static void mass_storage_bulk_in(uint8_t ep,
 				 enum usb_dc_ep_cb_status_code ep_status)
 {
 	ARG_UNUSED(ep_status);
@@ -838,7 +838,7 @@ static void mass_storage_bulk_in(u8_t ep,
  */
 static void mass_storage_status_cb(struct usb_cfg_data *cfg,
 				   enum usb_dc_status_code status,
-				   const u8_t *param)
+				   const uint8_t *param)
 {
 	ARG_UNUSED(param);
 	ARG_UNUSED(cfg);
@@ -881,7 +881,7 @@ static void mass_storage_status_cb(struct usb_cfg_data *cfg,
 }
 
 static void mass_interface_config(struct usb_desc_header *head,
-				  u8_t bInterfaceNumber)
+				  uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
@@ -948,7 +948,7 @@ static void mass_thread_main(int arg1, int unused)
  */
 static int mass_storage_init(struct device *dev)
 {
-	u32_t block_size = 0U;
+	uint32_t block_size = 0U;
 
 	ARG_UNUSED(dev);
 
diff --git a/subsys/usb/class/netusb/function_ecm.c b/subsys/usb/class/netusb/function_ecm.c
index aec9acdfb9..c0d42e991d 100644
--- a/subsys/usb/class/netusb/function_ecm.c
+++ b/subsys/usb/class/netusb/function_ecm.c
@@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(usb_ecm);
 #define ECM_IN_EP_IDX			2
 
 
-static u8_t tx_buf[NET_ETH_MAX_FRAME_SIZE], rx_buf[NET_ETH_MAX_FRAME_SIZE];
+static uint8_t tx_buf[NET_ETH_MAX_FRAME_SIZE], rx_buf[NET_ETH_MAX_FRAME_SIZE];
 
 struct usb_cdc_ecm_config {
 #ifdef CONFIG_USB_COMPOSITE_DEVICE
@@ -164,12 +164,12 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_cdc_ecm_config cdc_ecm_cfg = {
 	},
 };
 
-static u8_t ecm_get_first_iface_number(void)
+static uint8_t ecm_get_first_iface_number(void)
 {
 	return cdc_ecm_cfg.if0.bInterfaceNumber;
 }
 
-static void ecm_int_in(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void ecm_int_in(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 	LOG_DBG("EP 0x%x status %d", ep, ep_status);
 }
@@ -192,8 +192,8 @@ static struct usb_ep_cfg_data ecm_ep_data[] = {
 	},
 };
 
-static int ecm_class_handler(struct usb_setup_packet *setup, s32_t *len,
-			     u8_t **data)
+static int ecm_class_handler(struct usb_setup_packet *setup, int32_t *len,
+			     uint8_t **data)
 {
 	LOG_DBG("len %d req_type 0x%x req 0x%x enabled %u",
 		*len, setup->bmRequestType, setup->bRequest,
@@ -224,8 +224,8 @@ static int ecm_class_handler(struct usb_setup_packet *setup, s32_t *len,
 static size_t ecm_eth_size(void *ecm_pkt, size_t len)
 {
 	struct net_eth_hdr *hdr = (void *)ecm_pkt;
-	u8_t *ip_data = (u8_t *)ecm_pkt + sizeof(struct net_eth_hdr);
-	u16_t ip_len;
+	uint8_t *ip_data = (uint8_t *)ecm_pkt + sizeof(struct net_eth_hdr);
+	uint16_t ip_len;
 
 	if (len < NET_IPV6H_LEN + sizeof(struct net_eth_hdr)) {
 		/* Too short */
@@ -277,7 +277,7 @@ static int ecm_send(struct net_pkt *pkt)
 	return 0;
 }
 
-static void ecm_read_cb(u8_t ep, int size, void *priv)
+static void ecm_read_cb(uint8_t ep, int size, void *priv)
 {
 	struct net_pkt *pkt;
 
@@ -339,11 +339,11 @@ static struct netusb_function ecm_function = {
 	.send_pkt = ecm_send,
 };
 
-static inline void ecm_status_interface(const u8_t *desc)
+static inline void ecm_status_interface(const uint8_t *desc)
 {
 	const struct usb_if_descriptor *if_desc = (void *)desc;
-	u8_t iface_num = if_desc->bInterfaceNumber;
-	u8_t alt_set = if_desc->bAlternateSetting;
+	uint8_t iface_num = if_desc->bInterfaceNumber;
+	uint8_t alt_set = if_desc->bAlternateSetting;
 
 	LOG_DBG("iface %u alt_set %u", iface_num, if_desc->bAlternateSetting);
 
@@ -358,7 +358,7 @@ static inline void ecm_status_interface(const u8_t *desc)
 
 static void ecm_status_cb(struct usb_cfg_data *cfg,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -394,9 +394,9 @@ static void ecm_status_cb(struct usb_cfg_data *cfg,
 }
 
 struct usb_cdc_ecm_mac_descr {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_NETWORK_ECM_MAC)];
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_NETWORK_ECM_MAC)];
 } __packed;
 
 USBD_STRING_DESCR_DEFINE(primary) struct usb_cdc_ecm_mac_descr utf16le_mac = {
@@ -407,7 +407,7 @@ USBD_STRING_DESCR_DEFINE(primary) struct usb_cdc_ecm_mac_descr utf16le_mac = {
 };
 
 static void ecm_interface_config(struct usb_desc_header *head,
-				 u8_t bInterfaceNumber)
+				 uint8_t bInterfaceNumber)
 {
 	int idx = usb_get_str_descriptor_idx(&utf16le_mac);
 
diff --git a/subsys/usb/class/netusb/function_eem.c b/subsys/usb/class/netusb/function_eem.c
index f14f5f1084..f625c97f22 100644
--- a/subsys/usb/class/netusb/function_eem.c
+++ b/subsys/usb/class/netusb/function_eem.c
@@ -18,12 +18,12 @@ LOG_MODULE_REGISTER(usb_eem);
 
 #include "netusb.h"
 
-static u8_t sentinel[] = { 0xde, 0xad, 0xbe, 0xef };
+static uint8_t sentinel[] = { 0xde, 0xad, 0xbe, 0xef };
 
 #define EEM_FRAME_SIZE (NET_ETH_MAX_FRAME_SIZE + sizeof(sentinel) + \
-			sizeof(u16_t)) /* EEM header */
+			sizeof(uint16_t)) /* EEM header */
 
-static u8_t tx_buf[EEM_FRAME_SIZE], rx_buf[EEM_FRAME_SIZE];
+static uint8_t tx_buf[EEM_FRAME_SIZE], rx_buf[EEM_FRAME_SIZE];
 
 struct usb_cdc_eem_config {
 	struct usb_if_descriptor if0;
@@ -69,7 +69,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_cdc_eem_config cdc_eem_cfg = {
 	},
 };
 
-static u8_t eem_get_first_iface_number(void)
+static uint8_t eem_get_first_iface_number(void)
 {
 	return cdc_eem_cfg.if0.bInterfaceNumber;
 }
@@ -90,7 +90,7 @@ static struct usb_ep_cfg_data eem_ep_data[] = {
 	},
 };
 
-static inline u16_t eem_pkt_size(u16_t hdr)
+static inline uint16_t eem_pkt_size(uint16_t hdr)
 {
 	if (hdr & BIT(15)) {
 		return hdr & 0x07ff;
@@ -101,7 +101,7 @@ static inline u16_t eem_pkt_size(u16_t hdr)
 
 static int eem_send(struct net_pkt *pkt)
 {
-	u16_t *hdr = (u16_t *)&tx_buf[0];
+	uint16_t *hdr = (uint16_t *)&tx_buf[0];
 	int ret, len, b_idx = 0;
 
 	/* With EEM, it's possible to send multiple ethernet packets in one
@@ -109,14 +109,14 @@ static int eem_send(struct net_pkt *pkt)
 	 */
 	len = net_pkt_get_len(pkt) + sizeof(sentinel);
 
-	if (len + sizeof(u16_t) > sizeof(tx_buf)) {
+	if (len + sizeof(uint16_t) > sizeof(tx_buf)) {
 		LOG_WRN("Trying to send too large packet, drop");
 		return -ENOMEM;
 	}
 
 	/* Add EEM header */
 	*hdr = sys_cpu_to_le16(0x3FFF & len);
-	b_idx += sizeof(u16_t);
+	b_idx += sizeof(uint16_t);
 
 	if (net_pkt_read(pkt, &tx_buf[b_idx], net_pkt_get_len(pkt))) {
 		return -ENOBUFS;
@@ -140,29 +140,29 @@ static int eem_send(struct net_pkt *pkt)
 	return 0;
 }
 
-static void eem_read_cb(u8_t ep, int size, void *priv)
+static void eem_read_cb(uint8_t ep, int size, void *priv)
 {
-	u8_t *ptr = rx_buf;
+	uint8_t *ptr = rx_buf;
 
 	do {
-		u16_t eem_hdr, eem_size;
+		uint16_t eem_hdr, eem_size;
 		struct net_pkt *pkt;
 
-		if (size < sizeof(u16_t)) {
+		if (size < sizeof(uint16_t)) {
 			break;
 		}
 
 		eem_hdr = sys_get_le16(ptr);
 		eem_size = eem_pkt_size(eem_hdr);
 
-		if (eem_size + sizeof(u16_t) > size) {
+		if (eem_size + sizeof(uint16_t) > size) {
 			/* eem pkt greater than transferred data */
 			LOG_ERR("pkt size error");
 			break;
 		}
 
-		size -= sizeof(u16_t);
-		ptr += sizeof(u16_t);
+		size -= sizeof(uint16_t);
+		ptr += sizeof(uint16_t);
 
 		if (eem_hdr & BIT(15)) {
 			/* EEM Command, do nothing for now */
@@ -221,10 +221,10 @@ static struct netusb_function eem_function = {
 	.send_pkt = eem_send,
 };
 
-static inline void eem_status_interface(const u8_t *desc)
+static inline void eem_status_interface(const uint8_t *desc)
 {
 	const struct usb_if_descriptor *if_desc = (void *)desc;
-	u8_t iface_num = if_desc->bInterfaceNumber;
+	uint8_t iface_num = if_desc->bInterfaceNumber;
 
 	LOG_DBG("");
 
@@ -237,7 +237,7 @@ static inline void eem_status_interface(const u8_t *desc)
 
 static void eem_status_cb(struct usb_cfg_data *cfg,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -273,7 +273,7 @@ static void eem_status_cb(struct usb_cfg_data *cfg,
 }
 
 static void eem_interface_config(struct usb_desc_header *head,
-				 u8_t bInterfaceNumber)
+				 uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/class/netusb/function_rndis.c b/subsys/usb/class/netusb/function_rndis.c
index fdf94fae97..0828c28dcc 100644
--- a/subsys/usb/class/netusb/function_rndis.c
+++ b/subsys/usb/class/netusb/function_rndis.c
@@ -172,13 +172,13 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_rndis_config rndis_cfg = {
  * TLV structure is used for data encapsulation parsing
  */
 struct tlv {
-	u32_t type;
-	u32_t len;
-	u8_t data[];
+	uint32_t type;
+	uint32_t len;
+	uint8_t data[];
 } __packed;
 
 static struct __rndis {
-	u32_t net_filter;
+	uint32_t net_filter;
 
 	enum {
 		UNINITIALIZED,
@@ -189,18 +189,18 @@ static struct __rndis {
 	int in_pkt_len;		/* Packet length to be assembled */
 	int skip_bytes;		/* In case of low memory, skip bytes */
 
-	u16_t mtu;
-	u16_t speed;		/* TODO: Calculate right speed */
+	uint16_t mtu;
+	uint16_t speed;		/* TODO: Calculate right speed */
 
 	/* Statistics */
-	u32_t rx_err;
-	u32_t tx_err;
-	u32_t rx_no_buf;
+	uint32_t rx_err;
+	uint32_t tx_err;
+	uint32_t rx_no_buf;
 
 	atomic_t notify_count;
 
-	u8_t mac[6];
-	u8_t media_status;
+	uint8_t mac[6];
+	uint8_t media_status;
 } rndis = {
 	.mac =  { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x01 },
 	.mtu = 1500, /* Ethernet frame */
@@ -210,13 +210,13 @@ static struct __rndis {
 	.speed = 0,
 };
 
-static u8_t manufacturer[] = CONFIG_USB_DEVICE_MANUFACTURER;
-static u32_t drv_version = 1U;
+static uint8_t manufacturer[] = CONFIG_USB_DEVICE_MANUFACTURER;
+static uint32_t drv_version = 1U;
 
-static u8_t tx_buf[NET_ETH_MAX_FRAME_SIZE +
+static uint8_t tx_buf[NET_ETH_MAX_FRAME_SIZE +
 				sizeof(struct rndis_payload_packet)];
 
-static u32_t object_id_supported[] = {
+static uint32_t object_id_supported[] = {
 	RNDIS_OBJECT_ID_GEN_SUPP_LIST,
 	RNDIS_OBJECT_ID_GEN_HW_STATUS,
 	RNDIS_OBJECT_ID_GEN_SUPP_MEDIA,
@@ -256,7 +256,7 @@ static u32_t object_id_supported[] = {
 #define RNDIS_OUT_EP_IDX		1
 #define RNDIS_IN_EP_IDX			2
 
-static void rndis_bulk_out(u8_t ep, enum usb_dc_ep_cb_status_code ep_status);
+static void rndis_bulk_out(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status);
 
 static struct usb_ep_cfg_data rndis_ep_data[] = {
 	{
@@ -273,10 +273,10 @@ static struct usb_ep_cfg_data rndis_ep_data[] = {
 	},
 };
 
-static int parse_rndis_header(const u8_t *buffer, u32_t buf_len)
+static int parse_rndis_header(const uint8_t *buffer, uint32_t buf_len)
 {
 	struct rndis_payload_packet *hdr = (void *)buffer;
-	u32_t len;
+	uint32_t len;
 
 	if (buf_len < sizeof(*hdr)) {
 		LOG_ERR("Too small packet len %u", buf_len);
@@ -322,11 +322,11 @@ void rndis_clean(void)
 	rndis.skip_bytes = 0;
 }
 
-static void rndis_bulk_out(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void rndis_bulk_out(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
-	u8_t buffer[CONFIG_RNDIS_BULK_EP_MPS];
-	u32_t hdr_offset = 0U;
-	u32_t len, read;
+	uint8_t buffer[CONFIG_RNDIS_BULK_EP_MPS];
+	uint32_t hdr_offset = 0U;
+	uint32_t len, read;
 
 	usb_read(ep, NULL, 0, &len);
 
@@ -434,7 +434,7 @@ static void rndis_bulk_out(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 	}
 }
 
-static void rndis_notify_cb(u8_t ep, int size, void *priv)
+static void rndis_notify_cb(uint8_t ep, int size, void *priv)
 {
 	LOG_DBG("ep %x size %u", ep, size);
 
@@ -456,7 +456,7 @@ static void rndis_queue_rsp(struct net_buf *rsp)
 /* Notify host about available data */
 static void rndis_notify_rsp(void)
 {
-	static u32_t buf[2] = {
+	static uint32_t buf[2] = {
 		sys_cpu_to_le32(0x01),
 		sys_cpu_to_le32(0x00)
 	};
@@ -472,7 +472,7 @@ static void rndis_notify_rsp(void)
 	atomic_inc(&rndis.notify_count);
 
 	ret = usb_transfer(rndis_ep_data[RNDIS_INT_EP_IDX].ep_addr,
-			   (u8_t *)buf, sizeof(buf),
+			   (uint8_t *)buf, sizeof(buf),
 			   USB_TRANS_WRITE | USB_TRANS_NO_ZLP,
 			   rndis_notify_cb, NULL);
 	if (ret < 0) {
@@ -480,7 +480,7 @@ static void rndis_notify_rsp(void)
 	}
 }
 
-static int rndis_init_handle(u8_t *data, u32_t len)
+static int rndis_init_handle(uint8_t *data, uint32_t len)
 {
 	struct rndis_init_cmd *cmd = (void *)data;
 	struct rndis_init_cmd_complete *rsp;
@@ -544,12 +544,12 @@ static uint32_t rndis_query_add_supp_list(struct net_buf *buf)
 	return sizeof(object_id_supported);
 }
 
-static int rndis_query_handle(u8_t *data, u32_t len)
+static int rndis_query_handle(uint8_t *data, uint32_t len)
 {
 	struct rndis_query_cmd *cmd = (void *)data;
 	struct rndis_query_cmd_complete *rsp;
 	struct net_buf *buf;
-	u32_t object_id, buf_len = 0U;
+	uint32_t object_id, buf_len = 0U;
 
 	buf = net_buf_alloc(&rndis_tx_pool, K_NO_WAIT);
 	if (!buf) {
@@ -680,13 +680,13 @@ static int rndis_query_handle(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int rndis_set_handle(u8_t *data, u32_t len)
+static int rndis_set_handle(uint8_t *data, uint32_t len)
 {
 	struct rndis_set_cmd *cmd = (void *)data;
 	struct rndis_set_cmd_complete *rsp;
 	struct net_buf *buf;
-	u32_t object_id;
-	u8_t *param;
+	uint32_t object_id;
+	uint8_t *param;
 
 	if (len < sizeof(*cmd)) {
 		LOG_ERR("Packet is shorter then header");
@@ -694,9 +694,9 @@ static int rndis_set_handle(u8_t *data, u32_t len)
 	}
 
 	/* Parameter starts at offset buf_offset of the req_id field ;) */
-	param = (u8_t *)&cmd->req_id + sys_le32_to_cpu(cmd->buf_offset);
+	param = (uint8_t *)&cmd->req_id + sys_le32_to_cpu(cmd->buf_offset);
 
-	if (len - ((u32_t)param - (u32_t)cmd) !=
+	if (len - ((uint32_t)param - (uint32_t)cmd) !=
 	    sys_le32_to_cpu(cmd->buf_len)) {
 		LOG_ERR("Packet parsing error");
 		return -EINVAL;
@@ -753,7 +753,7 @@ static int rndis_set_handle(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int rndis_reset_handle(u8_t *data, u32_t len)
+static int rndis_reset_handle(uint8_t *data, uint32_t len)
 {
 	struct rndis_reset_cmd_complete *rsp;
 	struct net_buf *buf;
@@ -780,7 +780,7 @@ static int rndis_reset_handle(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int rndis_keepalive_handle(u8_t *data, u32_t len)
+static int rndis_keepalive_handle(uint8_t *data, uint32_t len)
 {
 	struct rndis_keepalive_cmd *cmd = (void *)data;
 	struct rndis_keepalive_cmd_complete *rsp;
@@ -808,7 +808,7 @@ static int rndis_keepalive_handle(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int queue_encapsulated_cmd(u8_t *data, u32_t len)
+static int queue_encapsulated_cmd(uint8_t *data, uint32_t len)
 {
 	struct net_buf *buf;
 
@@ -827,7 +827,7 @@ static int queue_encapsulated_cmd(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int handle_encapsulated_cmd(u8_t *data, u32_t len)
+static int handle_encapsulated_cmd(uint8_t *data, uint32_t len)
 {
 	struct tlv *msg = (void *)data;
 
@@ -865,7 +865,7 @@ static int handle_encapsulated_cmd(u8_t *data, u32_t len)
 	return 0;
 }
 
-static int handle_encapsulated_rsp(u8_t **data, u32_t *len)
+static int handle_encapsulated_rsp(uint8_t **data, uint32_t *len)
 {
 	struct net_buf *buf;
 
@@ -890,8 +890,8 @@ static int handle_encapsulated_rsp(u8_t **data, u32_t *len)
 	return 0;
 }
 
-static int rndis_class_handler(struct usb_setup_packet *setup, s32_t *len,
-			       u8_t **data)
+static int rndis_class_handler(struct usb_setup_packet *setup, int32_t *len,
+			       uint8_t **data)
 {
 	LOG_DBG("len %d req_type 0x%x req 0x%x enabled %u",
 		*len, setup->bmRequestType, setup->bRequest,
@@ -945,10 +945,10 @@ static void cmd_thread(void)
  * RNDIS Send functions
  */
 
-static void rndis_hdr_add(u8_t *buf, u32_t len)
+static void rndis_hdr_add(uint8_t *buf, uint32_t len)
 {
 	struct rndis_payload_packet *hdr = (void *)buf;
-	u32_t offset = offsetof(struct rndis_payload_packet, payload_offset);
+	uint32_t offset = offsetof(struct rndis_payload_packet, payload_offset);
 
 	(void)memset(hdr, 0, sizeof(*hdr));
 
@@ -1008,11 +1008,11 @@ static int rndis_send(struct net_pkt *pkt)
  */
 #define MSOS_STRING_LENGTH	18
 static struct string_desc {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bString[MSOS_STRING_LENGTH - 4];
-	u8_t bMS_VendorCode;
-	u8_t bPad;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bString[MSOS_STRING_LENGTH - 4];
+	uint8_t bMS_VendorCode;
+	uint8_t bPad;
 } __packed msosv1_string_descriptor = {
 	.bLength = MSOS_STRING_LENGTH,
 	.bDescriptorType = USB_STRING_DESC,
@@ -1027,18 +1027,18 @@ static struct string_desc {
 
 static struct compat_id_desc {
 	/* MS OS 1.0 Header Section */
-	u32_t dwLength;
-	u16_t bcdVersion;
-	u16_t wIndex;
-	u8_t bCount;
-	u8_t Reserved[7];
+	uint32_t dwLength;
+	uint16_t bcdVersion;
+	uint16_t wIndex;
+	uint8_t bCount;
+	uint8_t Reserved[7];
 	/* MS OS 1.0 Function Section */
 	struct compat_id_func {
-		u8_t bFirstInterfaceNumber;
-		u8_t Reserved1;
-		u8_t compatibleID[8];
-		u8_t subCompatibleID[8];
-		u8_t Reserved2[6];
+		uint8_t bFirstInterfaceNumber;
+		uint8_t Reserved1;
+		uint8_t compatibleID[8];
+		uint8_t subCompatibleID[8];
+		uint8_t Reserved2[6];
 	} __packed func[1];
 } __packed msosv1_compatid_descriptor = {
 	.dwLength = sys_cpu_to_le32(40),
@@ -1067,10 +1067,10 @@ static struct compat_id_desc {
 };
 
 static struct usb_os_descriptor os_desc = {
-	.string = (u8_t *)&msosv1_string_descriptor,
+	.string = (uint8_t *)&msosv1_string_descriptor,
 	.string_len = sizeof(msosv1_string_descriptor),
 	.vendor_code = 0x03,
-	.compat_id = (u8_t *)&msosv1_compatid_descriptor,
+	.compat_id = (uint8_t *)&msosv1_compatid_descriptor,
 	.compat_id_len = sizeof(msosv1_compatid_descriptor),
 };
 #endif /* CONFIG_USB_DEVICE_OS_DESC */
@@ -1115,7 +1115,7 @@ static struct netusb_function rndis_function = {
 
 static void rndis_status_cb(struct usb_cfg_data *cfg,
 			    enum usb_dc_status_code status,
-			    const u8_t *param)
+			    const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 
@@ -1151,7 +1151,7 @@ static void rndis_status_cb(struct usb_cfg_data *cfg,
 }
 
 static void netusb_interface_config(struct usb_desc_header *head,
-				    u8_t bInterfaceNumber)
+				    uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/class/netusb/function_rndis.h b/subsys/usb/class/netusb/function_rndis.h
index 06119219ef..a5f44495ae 100644
--- a/subsys/usb/class/netusb/function_rndis.h
+++ b/subsys/usb/class/netusb/function_rndis.h
@@ -40,37 +40,37 @@ void rndis_clean(void);
 #define RNDIS_MEDIUM_WIRED_ETHERNET	0
 
 struct rndis_init_cmd {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t major_ver;
-	u32_t minor_version;
-	u32_t max_transfer_size;
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t major_ver;
+	uint32_t minor_version;
+	uint32_t max_transfer_size;
 } __packed;
 
 struct rndis_init_cmd_complete {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t status;
-	u32_t major_ver;
-	u32_t minor_ver;
-	u32_t flags;
-	u32_t medium;
-	u32_t max_packets;
-	u32_t max_transfer_size;
-	u32_t pkt_align_factor;
-	u32_t __reserved[2];
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t status;
+	uint32_t major_ver;
+	uint32_t minor_ver;
+	uint32_t flags;
+	uint32_t medium;
+	uint32_t max_packets;
+	uint32_t max_transfer_size;
+	uint32_t pkt_align_factor;
+	uint32_t __reserved[2];
 } __packed;
 
 struct rndis_query_cmd {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t object_id;
-	u32_t buf_len;
-	u32_t buf_offset;
-	u32_t vc_handle;	/* Reserved for connection-oriented devices */
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t object_id;
+	uint32_t buf_len;
+	uint32_t buf_offset;
+	uint32_t vc_handle;	/* Reserved for connection-oriented devices */
 } __packed;
 
 /* Specifies RNDS objects for Query and Set */
@@ -118,69 +118,69 @@ struct rndis_query_cmd {
 #define RNDIS_STATUS_DISCONNECT_MEDIA		0x4001000C
 
 struct rndis_query_cmd_complete {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t status;
-	u32_t buf_len;
-	u32_t buf_offset;
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t status;
+	uint32_t buf_len;
+	uint32_t buf_offset;
 } __packed;
 
 struct rndis_set_cmd {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t object_id;
-	u32_t buf_len;
-	u32_t buf_offset;
-	u32_t vc_handle;	/* Reserved for connection-oriented devices */
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t object_id;
+	uint32_t buf_len;
+	uint32_t buf_offset;
+	uint32_t vc_handle;	/* Reserved for connection-oriented devices */
 } __packed;
 
 struct rndis_set_cmd_complete {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t status;
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t status;
 } __packed;
 
 struct rndis_payload_packet {
-	u32_t type;
-	u32_t len;
-	u32_t payload_offset;
-	u32_t payload_len;
-	u32_t oob_payload_offset;
-	u32_t oob_payload_len;
-	u32_t oob_num;
-	u32_t pkt_payload_offset;
-	u32_t pkt_payload_len;
-	u32_t vc_handle;
-	u32_t __reserved;
+	uint32_t type;
+	uint32_t len;
+	uint32_t payload_offset;
+	uint32_t payload_len;
+	uint32_t oob_payload_offset;
+	uint32_t oob_payload_len;
+	uint32_t oob_num;
+	uint32_t pkt_payload_offset;
+	uint32_t pkt_payload_len;
+	uint32_t vc_handle;
+	uint32_t __reserved;
 } __packed;
 
 struct rndis_keepalive_cmd {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
 } __packed;
 
 struct rndis_keepalive_cmd_complete {
-	u32_t type;
-	u32_t len;
-	u32_t req_id;
-	u32_t status;
+	uint32_t type;
+	uint32_t len;
+	uint32_t req_id;
+	uint32_t status;
 } __packed;
 
 struct rndis_media_status_indicate {
-	u32_t type;
-	u32_t len;
-	u32_t status;
-	u32_t buf_len;
-	u32_t buf_offset;
+	uint32_t type;
+	uint32_t len;
+	uint32_t status;
+	uint32_t buf_len;
+	uint32_t buf_offset;
 } __packed;
 
 struct rndis_reset_cmd_complete {
-	u32_t type;
-	u32_t len;
-	u32_t status;
-	u32_t addr_reset;
+	uint32_t type;
+	uint32_t len;
+	uint32_t status;
+	uint32_t addr_reset;
 } __packed;
diff --git a/subsys/usb/class/netusb/netusb.c b/subsys/usb/class/netusb/netusb.c
index 6bdb9acd10..a295a7ce0f 100644
--- a/subsys/usb/class/netusb/netusb.c
+++ b/subsys/usb/class/netusb/netusb.c
@@ -127,7 +127,7 @@ static void netusb_init(struct net_if *iface)
 {
 	int ret;
 
-	static u8_t mac[6] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x00 };
+	static uint8_t mac[6] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x00 };
 
 	LOG_DBG("netusb device initialization");
 
diff --git a/subsys/usb/class/usb_dfu.c b/subsys/usb/class/usb_dfu.c
index 935d69acd5..d36a083f32 100644
--- a/subsys/usb/class/usb_dfu.c
+++ b/subsys/usb/class/usb_dfu.c
@@ -75,9 +75,9 @@ static struct k_poll_signal dfu_signal;
 static struct k_work dfu_work;
 
 struct dfu_worker_data_t {
-	u8_t buf[USB_DFU_MAX_XFER_SIZE];
+	uint8_t buf[USB_DFU_MAX_XFER_SIZE];
 	enum dfu_state worker_state;
-	u16_t worker_len;
+	uint16_t worker_len;
 };
 
 static struct dfu_worker_data_t dfu_data_worker;
@@ -139,8 +139,8 @@ struct dev_dfu_mode_descriptor dfu_mode_desc = {
 		.bDeviceSubClass = 0,
 		.bDeviceProtocol = 0,
 		.bMaxPacketSize0 = USB_MAX_CTRL_MPS,
-		.idVendor = sys_cpu_to_le16((u16_t)CONFIG_USB_DEVICE_VID),
-		.idProduct = sys_cpu_to_le16((u16_t)CONFIG_USB_DEVICE_PID),
+		.idVendor = sys_cpu_to_le16((uint16_t)CONFIG_USB_DEVICE_VID),
+		.idProduct = sys_cpu_to_le16((uint16_t)CONFIG_USB_DEVICE_PID),
 		.bcdDevice = sys_cpu_to_le16(BCDDEVICE_RELNUM),
 		.iManufacturer = 1,
 		.iProduct = 2,
@@ -201,34 +201,34 @@ struct dev_dfu_mode_descriptor dfu_mode_desc = {
 struct usb_string_desription {
 	struct usb_string_descriptor lang_descr;
 	struct usb_mfr_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(
 				CONFIG_USB_DEVICE_MANUFACTURER)];
 	} __packed utf16le_mfr;
 
 	struct usb_product_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_PRODUCT)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_PRODUCT)];
 	} __packed utf16le_product;
 
 	struct usb_sn_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_SN)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_SN)];
 	} __packed utf16le_sn;
 
 	struct image_0_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(FIRMWARE_IMAGE_0_LABEL)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(FIRMWARE_IMAGE_0_LABEL)];
 	} __packed utf16le_image0;
 
 	struct image_1_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(FIRMWARE_IMAGE_1_LABEL)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(FIRMWARE_IMAGE_1_LABEL)];
 	} __packed utf16le_image1;
 } __packed;
 
@@ -285,16 +285,16 @@ static struct usb_cfg_data dfu_config;
 
 /* Device data structure */
 struct dfu_data_t {
-	u8_t flash_area_id;
-	u32_t flash_upload_size;
+	uint8_t flash_area_id;
+	uint32_t flash_upload_size;
 	/* Number of bytes sent during upload */
-	u32_t bytes_sent;
-	u32_t alt_setting;              /* DFU alternate setting */
+	uint32_t bytes_sent;
+	uint32_t alt_setting;              /* DFU alternate setting */
 	struct flash_img_context ctx;
 	enum dfu_state state;              /* State of the DFU device */
 	enum dfu_status status;            /* Status of the DFU device */
-	u16_t block_nr;                 /* DFU block number */
-	u16_t bwPollTimeout;
+	uint16_t block_nr;                 /* DFU block number */
+	uint16_t bwPollTimeout;
 };
 
 static struct dfu_data_t dfu_data = {
@@ -335,7 +335,7 @@ static void dfu_reset_counters(void)
 	}
 }
 
-static void dfu_flash_write(u8_t *data, size_t len)
+static void dfu_flash_write(uint8_t *data, size_t len)
 {
 	bool flush = false;
 
@@ -374,10 +374,10 @@ static void dfu_flash_write(u8_t *data, size_t len)
  * @return  0 on success, negative errno code on fail.
  */
 static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
-		s32_t *data_len, u8_t **data)
+		int32_t *data_len, uint8_t **data)
 {
 	int ret;
-	u32_t len, bytes_left;
+	uint32_t len, bytes_left;
 
 	switch (pSetup->bRequest) {
 	case DFU_GETSTATUS:
@@ -579,7 +579,7 @@ static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
 		 */
 
 		/* Set the DFU mode descriptors to be used after reset */
-		dfu_config.usb_device_description = (u8_t *) &dfu_mode_desc;
+		dfu_config.usb_device_description = (uint8_t *) &dfu_mode_desc;
 		if (usb_set_config(dfu_config.usb_device_description) != 0) {
 			LOG_ERR("usb_set_config failed in DFU_DETACH");
 			return -EIO;
@@ -602,7 +602,7 @@ static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
  */
 static void dfu_status_cb(struct usb_cfg_data *cfg,
 			  enum usb_dc_status_code status,
-			  const u8_t *param)
+			  const uint8_t *param)
 {
 	ARG_UNUSED(param);
 	ARG_UNUSED(cfg);
@@ -655,7 +655,7 @@ static void dfu_status_cb(struct usb_cfg_data *cfg,
  */
 
 static int dfu_custom_handle_req(struct usb_setup_packet *pSetup,
-		s32_t *data_len, u8_t **data)
+		int32_t *data_len, uint8_t **data)
 {
 	ARG_UNUSED(data);
 
@@ -698,7 +698,7 @@ static int dfu_custom_handle_req(struct usb_setup_packet *pSetup,
 }
 
 static void dfu_interface_config(struct usb_desc_header *head,
-				 u8_t bInterfaceNumber)
+				 uint8_t bInterfaceNumber)
 {
 	ARG_UNUSED(head);
 
diff --git a/subsys/usb/os_desc.c b/subsys/usb/os_desc.c
index d925ef1179..08b51e2d5e 100644
--- a/subsys/usb/os_desc.c
+++ b/subsys/usb/os_desc.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(usb_os_desc);
 static struct usb_os_descriptor *os_desc;
 
 int usb_handle_os_desc(struct usb_setup_packet *setup,
-		       s32_t *len, u8_t **data)
+		       int32_t *len, uint8_t **data)
 {
 	if (!os_desc) {
 		return -ENOTSUP;
@@ -36,7 +36,7 @@ int usb_handle_os_desc(struct usb_setup_packet *setup,
 }
 
 int usb_handle_os_desc_feature(struct usb_setup_packet *setup,
-			       s32_t *len, u8_t **data)
+			       int32_t *len, uint8_t **data)
 {
 	LOG_DBG("bRequest 0x%x", setup->bRequest);
 
diff --git a/subsys/usb/os_desc.h b/subsys/usb/os_desc.h
index 941123b0e6..2798f60b70 100644
--- a/subsys/usb/os_desc.h
+++ b/subsys/usb/os_desc.h
@@ -15,18 +15,18 @@
 #define USB_OSDESC_STRING_DESC_INDEX	0xEE
 
 struct usb_os_descriptor {
-	u8_t *string;
+	uint8_t *string;
 	size_t string_len;
-	u8_t vendor_code;
+	uint8_t vendor_code;
 
-	u8_t *compat_id;
+	uint8_t *compat_id;
 	size_t compat_id_len;
 };
 
 int usb_handle_os_desc(struct usb_setup_packet *setup,
-		       s32_t *len, u8_t **data_buf);
+		       int32_t *len, uint8_t **data_buf);
 int usb_handle_os_desc_feature(struct usb_setup_packet *setup,
-			       s32_t *len, u8_t **data_buf);
+			       int32_t *len, uint8_t **data_buf);
 void usb_register_os_desc(struct usb_os_descriptor *desc);
 bool usb_os_desc_enabled(void);
 #else
diff --git a/subsys/usb/usb_descriptor.c b/subsys/usb/usb_descriptor.c
index 14507080e3..9d9e7ee468 100644
--- a/subsys/usb/usb_descriptor.c
+++ b/subsys/usb/usb_descriptor.c
@@ -75,8 +75,8 @@ USBD_DEVICE_DESCR_DEFINE(primary) struct common_descriptor common_desc = {
 		.bDeviceProtocol = 0,
 #endif
 		.bMaxPacketSize0 = USB_MAX_CTRL_MPS,
-		.idVendor = sys_cpu_to_le16((u16_t)CONFIG_USB_DEVICE_VID),
-		.idProduct = sys_cpu_to_le16((u16_t)CONFIG_USB_DEVICE_PID),
+		.idVendor = sys_cpu_to_le16((uint16_t)CONFIG_USB_DEVICE_VID),
+		.idProduct = sys_cpu_to_le16((uint16_t)CONFIG_USB_DEVICE_PID),
 		.bcdDevice = sys_cpu_to_le16(BCDDEVICE_RELNUM),
 		.iManufacturer = USB_DESC_MANUFACTURER_IDX,
 		.iProduct = USB_DESC_PRODUCT_IDX,
@@ -100,22 +100,22 @@ USBD_DEVICE_DESCR_DEFINE(primary) struct common_descriptor common_desc = {
 struct usb_string_desription {
 	struct usb_string_descriptor lang_descr;
 	struct usb_mfr_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(
 				CONFIG_USB_DEVICE_MANUFACTURER)];
 	} __packed utf16le_mfr;
 
 	struct usb_product_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_PRODUCT)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_PRODUCT)];
 	} __packed utf16le_product;
 
 	struct usb_sn_descriptor {
-		u8_t bLength;
-		u8_t bDescriptorType;
-		u8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_SN)];
+		uint8_t bLength;
+		uint8_t bDescriptorType;
+		uint8_t bString[USB_BSTRING_LENGTH(CONFIG_USB_DEVICE_SN)];
 	} __packed utf16le_sn;
 } __packed;
 
@@ -167,7 +167,7 @@ static void ascii7_to_utf16le(void *descriptor)
 	struct usb_string_descriptor *str_descr = descriptor;
 	int idx_max = USB_BSTRING_UTF16LE_IDX_MAX(str_descr->bLength);
 	int ascii_idx_max = USB_BSTRING_ASCII_IDX_MAX(str_descr->bLength);
-	u8_t *buf = (u8_t *)&str_descr->bString;
+	uint8_t *buf = (uint8_t *)&str_descr->bString;
 
 	LOG_DBG("idx_max %d, ascii_idx_max %d, buf %p",
 		idx_max, ascii_idx_max, buf);
@@ -210,7 +210,7 @@ int usb_get_str_descriptor_idx(void *ptr)
 		}
 
 		/* move to next descriptor */
-		head = (struct usb_desc_header *)((u8_t *)head + head->bLength);
+		head = (struct usb_desc_header *)((uint8_t *)head + head->bLength);
 	}
 
 	return 0;
@@ -226,7 +226,7 @@ int usb_get_str_descriptor_idx(void *ptr)
  */
 static int usb_validate_ep_cfg_data(struct usb_ep_descriptor * const ep_descr,
 				    struct usb_cfg_data * const cfg_data,
-				    u32_t *requested_ep)
+				    uint32_t *requested_ep)
 {
 	for (int i = 0; i < cfg_data->num_endpoints; i++) {
 		struct usb_ep_cfg_data *ep_data = cfg_data->endpoint;
@@ -238,7 +238,7 @@ static int usb_validate_ep_cfg_data(struct usb_ep_descriptor * const ep_descr,
 			continue;
 		}
 
-		for (u8_t idx = 1; idx < 16; idx++) {
+		for (uint8_t idx = 1; idx < 16; idx++) {
 			struct usb_dc_ep_cfg_data ep_cfg;
 
 			ep_cfg.ep_type = (ep_descr->bmAttributes &
@@ -301,10 +301,10 @@ static struct usb_cfg_data *usb_get_cfg_data(struct usb_if_descriptor *iface)
  * of this function. Please note that the length of the new Serial Number
  * descriptor may not exceed the length of the CONFIG_USB_DEVICE_SN.
  */
-__weak u8_t *usb_update_sn_string_descriptor(void)
+__weak uint8_t *usb_update_sn_string_descriptor(void)
 {
-	u8_t hwid[sizeof(CONFIG_USB_DEVICE_SN) / 2];
-	static u8_t sn[sizeof(CONFIG_USB_DEVICE_SN) + 1];
+	uint8_t hwid[sizeof(CONFIG_USB_DEVICE_SN) / 2];
+	static uint8_t sn[sizeof(CONFIG_USB_DEVICE_SN) + 1];
 	const char hex[] = "0123456789ABCDEF";
 
 	memset(hwid, 0, sizeof(hwid));
@@ -323,7 +323,7 @@ __weak u8_t *usb_update_sn_string_descriptor(void)
 
 static void usb_fix_ascii_sn_string_descriptor(struct usb_sn_descriptor *sn)
 {
-	u8_t *runtime_sn =  usb_update_sn_string_descriptor();
+	uint8_t *runtime_sn =  usb_update_sn_string_descriptor();
 	int runtime_sn_len, default_sn_len;
 
 	if (!runtime_sn) {
@@ -362,9 +362,9 @@ static int usb_fix_descriptor(struct usb_desc_header *head)
 	struct usb_if_descriptor *if_descr = NULL;
 	struct usb_cfg_data *cfg_data = NULL;
 	struct usb_ep_descriptor *ep_descr = NULL;
-	u8_t numof_ifaces = 0U;
-	u8_t str_descr_idx = 0U;
-	u32_t requested_ep = BIT(16) | BIT(0);
+	uint8_t numof_ifaces = 0U;
+	uint8_t str_descr_idx = 0U;
+	uint32_t requested_ep = BIT(16) | BIT(0);
 
 	while (head->bLength != 0U) {
 		switch (head->bDescriptorType) {
@@ -439,9 +439,9 @@ static int usb_fix_descriptor(struct usb_desc_header *head)
 				}
 
 				LOG_DBG("Now the wTotalLength is %zd",
-					(u8_t *)head - (u8_t *)cfg_descr);
-				sys_put_le16((u8_t *)head - (u8_t *)cfg_descr,
-					     (u8_t *)&cfg_descr->wTotalLength);
+					(uint8_t *)head - (uint8_t *)cfg_descr);
+				sys_put_le16((uint8_t *)head - (uint8_t *)cfg_descr,
+					     (uint8_t *)&cfg_descr->wTotalLength);
 				cfg_descr->bNumInterfaces = numof_ifaces;
 			}
 
@@ -453,7 +453,7 @@ static int usb_fix_descriptor(struct usb_desc_header *head)
 		}
 
 		/* Move to next descriptor */
-		head = (struct usb_desc_header *)((u8_t *)head + head->bLength);
+		head = (struct usb_desc_header *)((uint8_t *)head + head->bLength);
 	}
 
 	if ((head + 1) != __usb_descriptor_end) {
@@ -465,7 +465,7 @@ static int usb_fix_descriptor(struct usb_desc_header *head)
 }
 
 
-u8_t *usb_get_device_descriptor(void)
+uint8_t *usb_get_device_descriptor(void)
 {
 	LOG_DBG("__usb_descriptor_start %p", __usb_descriptor_start);
 	LOG_DBG("__usb_descriptor_end %p", __usb_descriptor_end);
@@ -475,7 +475,7 @@ u8_t *usb_get_device_descriptor(void)
 		return NULL;
 	}
 
-	return (u8_t *) __usb_descriptor_start;
+	return (uint8_t *) __usb_descriptor_start;
 }
 
 struct usb_dev_data *usb_get_dev_data_by_cfg(sys_slist_t *list,
@@ -498,7 +498,7 @@ struct usb_dev_data *usb_get_dev_data_by_cfg(sys_slist_t *list,
 }
 
 struct usb_dev_data *usb_get_dev_data_by_iface(sys_slist_t *list,
-					       u8_t iface_num)
+					       uint8_t iface_num)
 {
 	struct usb_dev_data *dev_data;
 
@@ -518,7 +518,7 @@ struct usb_dev_data *usb_get_dev_data_by_iface(sys_slist_t *list,
 	return NULL;
 }
 
-struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, u8_t ep)
+struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, uint8_t ep)
 {
 	struct usb_dev_data *dev_data;
 
@@ -527,7 +527,7 @@ struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, u8_t ep)
 		const struct usb_cfg_data *cfg = dev->config_info;
 		const struct usb_ep_cfg_data *ep_data = cfg->endpoint;
 
-		for (u8_t i = 0; i < cfg->num_endpoints; i++) {
+		for (uint8_t i = 0; i < cfg->num_endpoints; i++) {
 			if (ep_data[i].ep_addr == ep) {
 				return dev_data;
 			}
diff --git a/subsys/usb/usb_descriptor.h b/subsys/usb/usb_descriptor.h
index 96f0e80a44..3ad856add1 100644
--- a/subsys/usb/usb_descriptor.h
+++ b/subsys/usb/usb_descriptor.h
@@ -46,12 +46,12 @@ struct usb_dev_data {
 struct usb_dev_data *usb_get_dev_data_by_cfg(sys_slist_t *list,
 					     struct usb_cfg_data *cfg);
 struct usb_dev_data *usb_get_dev_data_by_iface(sys_slist_t *list,
-					       u8_t iface_num);
-struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, u8_t ep);
+					       uint8_t iface_num);
+struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, uint8_t ep);
 
 int usb_get_str_descriptor_idx(void *ptr);
 
-u8_t *usb_update_sn_string_descriptor(void);
-u8_t *usb_get_device_descriptor(void);
+uint8_t *usb_update_sn_string_descriptor(void);
+uint8_t *usb_get_device_descriptor(void);
 
 #endif /* __USB_DESCRIPTOR_H__ */
diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c
index 8707ef7252..1572448ea6 100644
--- a/subsys/usb/usb_device.c
+++ b/subsys/usb/usb_device.c
@@ -113,11 +113,11 @@ static struct usb_dev_priv {
 	/** Setup packet */
 	struct usb_setup_packet setup;
 	/** Pointer to data buffer */
-	u8_t *data_buf;
+	uint8_t *data_buf;
 	/** Remaining bytes in buffer */
-	s32_t data_buf_residue;
+	int32_t data_buf_residue;
 	/** Total length of control transfer */
-	s32_t data_buf_len;
+	int32_t data_buf_len;
 	/** Zero length packet flag of control transfer */
 	bool zlp_flag;
 	/** Installed custom request handler */
@@ -127,18 +127,18 @@ static struct usb_dev_priv {
 	/** USB user status callback */
 	usb_dc_status_callback user_status_callback;
 	/** Pointer to registered descriptors */
-	const u8_t *descriptors;
+	const uint8_t *descriptors;
 	/** Array of installed request handler callbacks */
 	usb_request_handler req_handlers[MAX_NUM_REQ_HANDLERS];
 	/* Buffer used for storing standard, class and vendor request data */
-	u8_t req_data[CONFIG_USB_REQUEST_BUFFER_SIZE];
+	uint8_t req_data[CONFIG_USB_REQUEST_BUFFER_SIZE];
 
 	/** Variable to check whether the usb has been enabled */
 	bool enabled;
 	/** Variable to check whether the usb has been configured */
 	bool configured;
 	/** Currently selected configuration */
-	u8_t configuration;
+	uint8_t configuration;
 	/** Remote wakeup feature status */
 	bool remote_wakeup;
 } usb_dev;
@@ -177,9 +177,9 @@ static void usb_print_setup(struct usb_setup_packet *setup)
  * @return true if the request was handles successfully
  */
 static bool usb_handle_request(struct usb_setup_packet *setup,
-			       s32_t *len, u8_t **data)
+			       int32_t *len, uint8_t **data)
 {
-	u32_t type = REQTYPE_GET_TYPE(setup->bmRequestType);
+	uint32_t type = REQTYPE_GET_TYPE(setup->bmRequestType);
 	usb_request_handler handler = usb_dev.req_handlers[type];
 
 	if (type >= MAX_NUM_REQ_HANDLERS) {
@@ -206,10 +206,10 @@ static bool usb_handle_request(struct usb_setup_packet *setup,
  *
  * @return N/A
  */
-static void usb_data_to_host(u16_t len)
+static void usb_data_to_host(uint16_t len)
 {
 	if (usb_dev.zlp_flag == false) {
-		u32_t chunk = usb_dev.data_buf_residue;
+		uint32_t chunk = usb_dev.data_buf_residue;
 
 		/*Always EP0 for control*/
 		usb_write(USB_CONTROL_IN_EP0, usb_dev.data_buf,
@@ -248,23 +248,23 @@ static void usb_data_to_host(u16_t len)
  *
  * @return N/A
  */
-static void usb_handle_control_transfer(u8_t ep,
+static void usb_handle_control_transfer(uint8_t ep,
 					enum usb_dc_ep_cb_status_code ep_status)
 {
-	u32_t chunk = 0U;
+	uint32_t chunk = 0U;
 	struct usb_setup_packet *setup = &usb_dev.setup;
 
 	LOG_DBG("ep 0x%02x, status 0x%02x", ep, ep_status);
 
 	if (ep == USB_CONTROL_OUT_EP0 && ep_status == USB_DC_EP_SETUP) {
-		u16_t length;
+		uint16_t length;
 
 		/*
 		 * OUT transfer, Setup packet,
 		 * reset request message state machine
 		 */
 		if (usb_dc_ep_read(ep,
-				   (u8_t *)setup, sizeof(*setup), NULL) < 0) {
+				   (uint8_t *)setup, sizeof(*setup), NULL) < 0) {
 			LOG_DBG("Read Setup Packet failed");
 			usb_dc_ep_set_stall(USB_CONTROL_IN_EP0);
 			return;
@@ -361,7 +361,7 @@ static void usb_handle_control_transfer(u8_t ep,
  *
  * @return N/A
  */
-static void usb_register_request_handler(s32_t type,
+static void usb_register_request_handler(int32_t type,
 					 usb_request_handler handler)
 {
 	usb_dev.req_handlers[type] = handler;
@@ -375,7 +375,7 @@ static void usb_register_request_handler(s32_t type,
  *
  * @param [in] usb_descriptors The descriptor byte array
  */
-static void usb_register_descriptors(const u8_t *usb_descriptors)
+static void usb_register_descriptors(const uint8_t *usb_descriptors)
 {
 	usb_dev.descriptors = usb_descriptors;
 }
@@ -393,13 +393,13 @@ static void usb_register_descriptors(const u8_t *usb_descriptors)
  *
  * @return true if the descriptor was found, false otherwise
  */
-static bool usb_get_descriptor(u16_t type_index, u16_t lang_id,
-		s32_t *len, u8_t **data)
+static bool usb_get_descriptor(uint16_t type_index, uint16_t lang_id,
+		int32_t *len, uint8_t **data)
 {
-	u8_t type = 0U;
-	u8_t index = 0U;
-	u8_t *p = NULL;
-	s32_t cur_index = 0;
+	uint8_t type = 0U;
+	uint8_t index = 0U;
+	uint8_t *p = NULL;
+	int32_t cur_index = 0;
 	bool found = false;
 
 	/*Avoid compiler warning until this is used for something*/
@@ -417,7 +417,7 @@ static bool usb_get_descriptor(u16_t type_index, u16_t lang_id,
 		return false;
 	}
 
-	p = (u8_t *)usb_dev.descriptors;
+	p = (uint8_t *)usb_dev.descriptors;
 	cur_index = 0;
 
 	while (p[DESC_bLength] != 0U) {
@@ -532,8 +532,8 @@ static bool reset_endpoint(const struct usb_ep_descriptor *ep_desc)
 }
 
 static bool usb_eps_reconfigure(struct usb_ep_descriptor *ep_desc,
-				u8_t cur_alt_setting,
-				u8_t alt_setting)
+				uint8_t cur_alt_setting,
+				uint8_t alt_setting)
 {
 	bool ret;
 
@@ -560,11 +560,11 @@ static bool usb_eps_reconfigure(struct usb_ep_descriptor *ep_desc,
  *
  * @return true if successfully configured false if error or unconfigured
  */
-static bool usb_set_configuration(u8_t config_index, u8_t alt_setting)
+static bool usb_set_configuration(uint8_t config_index, uint8_t alt_setting)
 {
-	u8_t *p = (u8_t *)usb_dev.descriptors;
-	u8_t cur_alt_setting = 0xFF;
-	u8_t cur_config = 0xFF;
+	uint8_t *p = (uint8_t *)usb_dev.descriptors;
+	uint8_t cur_alt_setting = 0xFF;
+	uint8_t cur_config = 0xFF;
 	bool found = false;
 
 	if (config_index == 0U) {
@@ -623,13 +623,13 @@ static bool usb_set_configuration(u8_t config_index, u8_t alt_setting)
  *
  * @return true if successfully configured false if error or unconfigured
  */
-static bool usb_set_interface(u8_t iface, u8_t alt_setting)
+static bool usb_set_interface(uint8_t iface, uint8_t alt_setting)
 {
-	const u8_t *p = usb_dev.descriptors;
-	const u8_t *if_desc = NULL;
+	const uint8_t *p = usb_dev.descriptors;
+	const uint8_t *if_desc = NULL;
 	struct usb_ep_descriptor *ep;
-	u8_t cur_alt_setting = 0xFF;
-	u8_t cur_iface = 0xFF;
+	uint8_t cur_alt_setting = 0xFF;
+	uint8_t cur_iface = 0xFF;
 	bool ret = false;
 
 	LOG_DBG("iface %u alt_setting %u", iface, alt_setting);
@@ -681,12 +681,12 @@ static bool usb_set_interface(u8_t iface, u8_t alt_setting)
  * @return true if the request was handled successfully
  */
 static bool usb_handle_std_device_req(struct usb_setup_packet *setup,
-				      s32_t *len, u8_t **data_buf)
+				      int32_t *len, uint8_t **data_buf)
 {
-	u16_t value = sys_le16_to_cpu(setup->wValue);
-	u16_t index = sys_le16_to_cpu(setup->wIndex);
+	uint16_t value = sys_le16_to_cpu(setup->wValue);
+	uint16_t index = sys_le16_to_cpu(setup->wIndex);
 	bool ret = true;
-	u8_t *data = *data_buf;
+	uint8_t *data = *data_buf;
 
 	switch (setup->bRequest) {
 	case REQ_GET_STATUS:
@@ -786,9 +786,9 @@ static bool usb_handle_std_device_req(struct usb_setup_packet *setup,
  * @return true if the request was handled successfully
  */
 static bool usb_handle_std_interface_req(struct usb_setup_packet *setup,
-					 s32_t *len, u8_t **data_buf)
+					 int32_t *len, uint8_t **data_buf)
 {
-	u8_t *data = *data_buf;
+	uint8_t *data = *data_buf;
 
 	switch (setup->bRequest) {
 	case REQ_GET_STATUS:
@@ -834,10 +834,10 @@ static bool usb_handle_std_interface_req(struct usb_setup_packet *setup,
  * @return true if the request was handled successfully
  */
 static bool usb_handle_std_endpoint_req(struct usb_setup_packet *setup,
-					s32_t *len, u8_t **data_buf)
+					int32_t *len, uint8_t **data_buf)
 {
-	u8_t ep = sys_le16_to_cpu(setup->wIndex);
-	u8_t *data = *data_buf;
+	uint8_t ep = sys_le16_to_cpu(setup->wIndex);
+	uint8_t *data = *data_buf;
 
 	switch (setup->bRequest) {
 	case REQ_GET_STATUS:
@@ -898,7 +898,7 @@ static bool usb_handle_std_endpoint_req(struct usb_setup_packet *setup,
  * @return true if the request was handled successfully
  */
 static int usb_handle_standard_request(struct usb_setup_packet *setup,
-				       s32_t *len, u8_t **data_buf)
+				       int32_t *len, uint8_t **data_buf)
 {
 	int rc = 0;
 
@@ -977,7 +977,7 @@ static int foreach_ep(int (* endpoint_callback)(const struct usb_ep_cfg_data *))
 		struct usb_cfg_data *cfg = &__usb_data_start[i];
 		struct usb_ep_cfg_data *ep_data = cfg->endpoint;
 
-		for (u8_t n = 0; n < cfg->num_endpoints; n++) {
+		for (uint8_t n = 0; n < cfg->num_endpoints; n++) {
 			int ret;
 
 			ret = endpoint_callback(&ep_data[n]);
@@ -995,7 +995,7 @@ static int disable_interface_ep(const struct usb_ep_cfg_data *ep_data)
 	return usb_dc_ep_disable(ep_data->ep_addr);
 }
 
-static void forward_status_cb(enum usb_dc_status_code status, const u8_t *param)
+static void forward_status_cb(enum usb_dc_status_code status, const uint8_t *param)
 {
 	size_t size = (__usb_data_end - __usb_data_start);
 
@@ -1126,7 +1126,7 @@ int usb_disable(void)
 	return 0;
 }
 
-int usb_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *bytes_ret)
+int usb_write(uint8_t ep, const uint8_t *data, uint32_t data_len, uint32_t *bytes_ret)
 {
 	int tries = CONFIG_USB_NUMOF_EP_WRITE_RETRIES;
 	int ret;
@@ -1143,27 +1143,27 @@ int usb_write(u8_t ep, const u8_t *data, u32_t data_len, u32_t *bytes_ret)
 	return ret;
 }
 
-int usb_read(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *ret_bytes)
+int usb_read(uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_t *ret_bytes)
 {
 	return usb_dc_ep_read(ep, data, max_data_len, ret_bytes);
 }
 
-int usb_ep_set_stall(u8_t ep)
+int usb_ep_set_stall(uint8_t ep)
 {
 	return usb_dc_ep_set_stall(ep);
 }
 
-int usb_ep_clear_stall(u8_t ep)
+int usb_ep_clear_stall(uint8_t ep)
 {
 	return usb_dc_ep_clear_stall(ep);
 }
 
-int usb_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len, u32_t *ret_bytes)
+int usb_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len, uint32_t *ret_bytes)
 {
 	return usb_dc_ep_read_wait(ep, data, max_data_len, ret_bytes);
 }
 
-int usb_ep_read_continue(u8_t ep)
+int usb_ep_read_continue(uint8_t ep)
 {
 	return usb_dc_ep_read_continue(ep);
 }
@@ -1193,7 +1193,7 @@ int usb_wakeup_request(void)
  */
 
 static int class_handler(struct usb_setup_packet *pSetup,
-			 s32_t *len, u8_t **data)
+			 int32_t *len, uint8_t **data)
 {
 	size_t size = (__usb_data_end - __usb_data_start);
 	const struct usb_if_descriptor *if_descr;
@@ -1209,7 +1209,7 @@ static int class_handler(struct usb_setup_packet *pSetup,
 		 * Wind forward until it is within the range
 		 * of the current descriptor.
 		 */
-		if ((u8_t *)if_descr < usb_dev.descriptors) {
+		if ((uint8_t *)if_descr < usb_dev.descriptors) {
 			continue;
 		}
 
@@ -1224,7 +1224,7 @@ static int class_handler(struct usb_setup_packet *pSetup,
 }
 
 static int custom_handler(struct usb_setup_packet *pSetup,
-			  s32_t *len, u8_t **data)
+			  int32_t *len, uint8_t **data)
 {
 	size_t size = (__usb_data_end - __usb_data_start);
 	const struct usb_if_descriptor *if_descr;
@@ -1240,7 +1240,7 @@ static int custom_handler(struct usb_setup_packet *pSetup,
 		 * Wind forward until it is within the range
 		 * of the current descriptor.
 		 */
-		if ((u8_t *)if_descr < usb_dev.descriptors) {
+		if ((uint8_t *)if_descr < usb_dev.descriptors) {
 			continue;
 		}
 
@@ -1259,7 +1259,7 @@ static int custom_handler(struct usb_setup_packet *pSetup,
 }
 
 static int vendor_handler(struct usb_setup_packet *pSetup,
-			  s32_t *len, u8_t **data)
+			  int32_t *len, uint8_t **data)
 {
 	size_t size = (__usb_data_end - __usb_data_start);
 	struct usb_interface_cfg_data *iface;
@@ -1292,7 +1292,7 @@ static int composite_setup_ep_cb(void)
 
 	for (size_t i = 0; i < size; i++) {
 		ep_data = __usb_data_start[i].endpoint;
-		for (u8_t n = 0; n < __usb_data_start[i].num_endpoints; n++) {
+		for (uint8_t n = 0; n < __usb_data_start[i].num_endpoints; n++) {
 			LOG_DBG("set cb, ep: 0x%x", ep_data[n].ep_addr);
 			if (usb_dc_ep_set_callback(ep_data[n].ep_addr,
 						   ep_data[n].ep_cb)) {
@@ -1304,7 +1304,7 @@ static int composite_setup_ep_cb(void)
 	return 0;
 }
 
-int usb_set_config(const u8_t *device_descriptor)
+int usb_set_config(const uint8_t *device_descriptor)
 {
 	/* register descriptors */
 	usb_register_descriptors(device_descriptor);
@@ -1421,7 +1421,7 @@ out:
  */
 static int usb_device_init(struct device *dev)
 {
-	u8_t *device_descriptor;
+	uint8_t *device_descriptor;
 
 	if (usb_dev.enabled == true) {
 		return 0;
diff --git a/subsys/usb/usb_transfer.c b/subsys/usb/usb_transfer.c
index c30150ba36..bbac5dbb93 100644
--- a/subsys/usb/usb_transfer.c
+++ b/subsys/usb/usb_transfer.c
@@ -22,11 +22,11 @@ struct usb_transfer_sync_priv {
 
 struct usb_transfer_data {
 	/** endpoint associated to the transfer */
-	u8_t ep;
+	uint8_t ep;
 	/** Transfer status */
 	int status;
 	/** Transfer read/write buffer */
-	u8_t *buffer;
+	uint8_t *buffer;
 	/** Transfer buffer size */
 	size_t bsize;
 	/** Transferred size */
@@ -46,7 +46,7 @@ struct usb_transfer_data {
 static struct usb_transfer_data ut_data[MAX_NUM_TRANSFERS];
 
 /* Transfer management */
-static struct usb_transfer_data *usb_ep_get_transfer(u8_t ep)
+static struct usb_transfer_data *usb_ep_get_transfer(uint8_t ep)
 {
 	for (int i = 0; i < ARRAY_SIZE(ut_data); i++) {
 		if (ut_data[i].ep == ep) {
@@ -57,7 +57,7 @@ static struct usb_transfer_data *usb_ep_get_transfer(u8_t ep)
 	return NULL;
 }
 
-bool usb_transfer_is_busy(u8_t ep)
+bool usb_transfer_is_busy(uint8_t ep)
 {
 	struct usb_transfer_data *trans = usb_ep_get_transfer(ep);
 
@@ -72,8 +72,8 @@ static void usb_transfer_work(struct k_work *item)
 {
 	struct usb_transfer_data *trans;
 	int ret = 0;
-	u32_t bytes;
-	u8_t ep;
+	uint32_t bytes;
+	uint8_t ep;
 
 	trans = CONTAINER_OF(item, struct usb_transfer_data, work);
 	ep = trans->ep;
@@ -155,7 +155,7 @@ done:
 	}
 }
 
-void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code status)
+void usb_transfer_ep_callback(uint8_t ep, enum usb_dc_ep_cb_status_code status)
 {
 	struct usb_transfer_data *trans = usb_ep_get_transfer(ep);
 
@@ -165,7 +165,7 @@ void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code status)
 
 	if (!trans) {
 		if (status == USB_DC_EP_DATA_OUT) {
-			u32_t bytes;
+			uint32_t bytes;
 			/* In the unlikely case we receive data while no
 			 * transfer is ongoing, we have to consume the data
 			 * anyway. This is to prevent stucking reception on
@@ -173,7 +173,7 @@ void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code status)
 			 * so drain it).
 			 */
 			do {
-				u8_t data;
+				uint8_t data;
 
 				usb_dc_ep_read_wait(ep, &data, 1, &bytes);
 			} while (bytes);
@@ -192,7 +192,7 @@ void usb_transfer_ep_callback(u8_t ep, enum usb_dc_ep_cb_status_code status)
 	}
 }
 
-int usb_transfer(u8_t ep, u8_t *data, size_t dlen, unsigned int flags,
+int usb_transfer(uint8_t ep, uint8_t *data, size_t dlen, unsigned int flags,
 		 usb_transfer_callback cb, void *cb_data)
 {
 	struct usb_transfer_data *trans = NULL;
@@ -252,7 +252,7 @@ done:
 	return ret;
 }
 
-void usb_cancel_transfer(u8_t ep)
+void usb_cancel_transfer(uint8_t ep)
 {
 	struct usb_transfer_data *trans;
 	unsigned int key;
@@ -293,7 +293,7 @@ void usb_cancel_transfers(void)
 	}
 }
 
-static void usb_transfer_sync_cb(u8_t ep, int size, void *priv)
+static void usb_transfer_sync_cb(uint8_t ep, int size, void *priv)
 {
 	struct usb_transfer_sync_priv *pdata = priv;
 
@@ -301,7 +301,7 @@ static void usb_transfer_sync_cb(u8_t ep, int size, void *priv)
 	k_sem_give(&pdata->sem);
 }
 
-int usb_transfer_sync(u8_t ep, u8_t *data, size_t dlen, unsigned int flags)
+int usb_transfer_sync(uint8_t ep, uint8_t *data, size_t dlen, unsigned int flags)
 {
 	struct usb_transfer_sync_priv pdata;
 	int ret;
diff --git a/tests/application_development/libcxx/src/main.cpp b/tests/application_development/libcxx/src/main.cpp
index e4528b123f..873bab8273 100644
--- a/tests/application_development/libcxx/src/main.cpp
+++ b/tests/application_development/libcxx/src/main.cpp
@@ -21,7 +21,7 @@ static void test_array(void)
 	zassert_equal(array[0], 1, "array[0] wrong");
 	zassert_equal(array[3], 4, "array[3] wrong");
 
-	std::array<u8_t, 2> local = {1, 2};
+	std::array<uint8_t, 2> local = {1, 2};
 	zassert_equal(local.size(), 2, "unexpected size");
 	zassert_equal(local[0], 1, "local[0] wrong");
 	zassert_equal(local[1], 2, "local[1] wrong");
@@ -69,7 +69,7 @@ static void test_make_unique(void)
 
 void test_main(void)
 {
-	TC_PRINT("version %u\n", (u32_t)__cplusplus);
+	TC_PRINT("version %u\n", (uint32_t)__cplusplus);
 	ztest_test_suite(libcxx_tests,
 			 ztest_unit_test(test_array),
 			 ztest_unit_test(test_vector),
diff --git a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
index 51d74e2f33..378bc8527b 100644
--- a/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
+++ b/tests/arch/arm/arm_ramfunc/src/arm_ramfunc.c
@@ -26,14 +26,14 @@ void test_arm_ramfunc(void)
 	 * inside SRAM, and that arm_ram_function(.) is located inside
 	 * the .ramfunc section.
 	 */
-	zassert_true((u32_t)&_ramfunc_ram_size != 0,
+	zassert_true((uint32_t)&_ramfunc_ram_size != 0,
 		".ramfunc linker section is empty");
-	zassert_true(((u32_t)&_ramfunc_ram_start >= (u32_t)&_image_ram_start)
-			&& ((u32_t)&_ramfunc_ram_end < (u32_t)&_image_ram_end),
+	zassert_true(((uint32_t)&_ramfunc_ram_start >= (uint32_t)&_image_ram_start)
+			&& ((uint32_t)&_ramfunc_ram_end < (uint32_t)&_image_ram_end),
 			".ramfunc linker section not in RAM");
 	zassert_true(
-		(((u32_t)&_ramfunc_ram_start) <= (u32_t)arm_ram_function) &&
-		(((u32_t)&_ramfunc_ram_end) > (u32_t)arm_ram_function),
+		(((uint32_t)&_ramfunc_ram_start) <= (uint32_t)arm_ram_function) &&
+		(((uint32_t)&_ramfunc_ram_end) > (uint32_t)arm_ram_function),
 		"arm_ram_function not loaded into .ramfunc");
 
 	/* If we build with User Mode support, verify that the
diff --git a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
index e7f80bf57d..8ac2faead7 100644
--- a/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
+++ b/tests/arch/arm/arm_runtime_nmi/src/arm_runtime_nmi.c
@@ -47,7 +47,7 @@ static void nmi_test_isr(void)
  */
 void test_arm_runtime_nmi(void)
 {
-	u32_t i = 0U;
+	uint32_t i = 0U;
 
 	TC_START("nmi_test_isr");
 	/* Configure the NMI isr */
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
index cd766afd38..6d1edbd9d0 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -55,7 +55,7 @@ void z_impl_test_arm_user_syscall(void)
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	zassert_true(__get_PSPLIM() == _current->arch.priv_stack_start,
 	"PSPLIM not guarding the thread's privileged stack\n");
-	zassert_true(__get_MSPLIM() == (u32_t)z_interrupt_stacks,
+	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
 	"MSPLIM not guarding the interrupt stack\n");
 #endif
 }
@@ -108,13 +108,13 @@ void arm_isr_handler(void *args)
 		 */
 		zassert_true(__get_PSPLIM() == 0,
 		"PSPLIM not clear\n");
-		zassert_true(__get_MSPLIM() == (u32_t)z_interrupt_stacks,
+		zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
 		"MSPLIM not guarding the interrupt stack\n");
 #endif
 	}
 }
 
-static void user_thread_entry(u32_t irq_line)
+static void user_thread_entry(uint32_t irq_line)
 {
 	/* User Thread */
 #if !defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
@@ -131,7 +131,7 @@ static void user_thread_entry(u32_t irq_line)
 	 * Trigger an ISR to switch to handler mode, to inspect
 	 * the kernel structs and verify the thread state.
 	 */
-	TC_PRINT("USR Thread: IRQ Line: %u\n", (u32_t)irq_line);
+	TC_PRINT("USR Thread: IRQ Line: %u\n", (uint32_t)irq_line);
 
 	NVIC->STIR = irq_line;
 	__DSB();
@@ -176,7 +176,7 @@ void test_arm_syscalls(void)
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
 	zassert_true(__get_PSPLIM() == _current->stack_info.start,
 	"PSPLIM not guarding the default stack\n");
-	zassert_true(__get_MSPLIM() == (u32_t)z_interrupt_stacks,
+	zassert_true(__get_MSPLIM() == (uint32_t)z_interrupt_stacks,
 	"MSPLIM not guarding the interrupt stack\n");
 #endif
 
@@ -231,7 +231,7 @@ void test_arm_syscalls(void)
 		user_thread_stack,
 		K_THREAD_STACK_SIZEOF(user_thread_stack),
 		(k_thread_entry_t)user_thread_entry,
-		(u32_t *)i, NULL, NULL,
+		(uint32_t *)i, NULL, NULL,
 		K_PRIO_COOP(PRIORITY), K_USER,
 		K_NO_WAIT);
 }
diff --git a/tests/arch/x86/boot_page_table/src/boot_page_table.c b/tests/arch/x86/boot_page_table/src/boot_page_table.c
index d75cffea39..ed4c693e4f 100644
--- a/tests/arch/x86/boot_page_table/src/boot_page_table.c
+++ b/tests/arch/x86/boot_page_table/src/boot_page_table.c
@@ -17,25 +17,25 @@ MMU_BOOT_REGION(START_ADDR_RANGE2, ADDR_SIZE, REGION_PERM);
 MMU_BOOT_REGION(START_ADDR_RANGE3, ADDR_SIZE, REGION_PERM);
 MMU_BOOT_REGION(START_ADDR_RANGE4, ADDR_SIZE, REGION_PERM);
 
-static int check_param(u64_t value, u64_t perm)
+static int check_param(uint64_t value, uint64_t perm)
 {
 	return ((value & REGION_PERM) == REGION_PERM);
 }
 
-static int check_param_nonset_region(u64_t value, u64_t perm)
+static int check_param_nonset_region(uint64_t value, uint64_t perm)
 {
-	u32_t status = ((value & Z_X86_MMU_RW) == 0);
+	uint32_t status = ((value & Z_X86_MMU_RW) == 0);
 
 	status &= ((value & Z_X86_MMU_US) == 0);
 	status &= ((value & Z_X86_MMU_P) == 0);
 	return status;
 }
 
-static void starting_addr_range(u32_t start_addr_range)
+static void starting_addr_range(uint32_t start_addr_range)
 {
 
-	u32_t addr_range, status = true;
-	u64_t value;
+	uint32_t addr_range, status = true;
+	uint64_t value;
 
 	for (addr_range = start_addr_range; addr_range <=
 	     (start_addr_range + STARTING_ADDR_RANGE_LMT);
@@ -47,10 +47,10 @@ static void starting_addr_range(u32_t start_addr_range)
 	}
 }
 
-static void before_start_addr_range(u32_t start_addr_range)
+static void before_start_addr_range(uint32_t start_addr_range)
 {
-	u32_t addr_range, status = true;
-	u64_t value;
+	uint32_t addr_range, status = true;
+	uint64_t value;
 
 	for (addr_range = start_addr_range - 0x7000;
 	     addr_range < (start_addr_range); addr_range += 0x1000) {
@@ -63,10 +63,10 @@ static void before_start_addr_range(u32_t start_addr_range)
 	}
 }
 
-static void ending_start_addr_range(u32_t start_addr_range)
+static void ending_start_addr_range(uint32_t start_addr_range)
 {
-	u32_t addr_range, status = true;
-	u64_t value;
+	uint32_t addr_range, status = true;
+	uint64_t value;
 
 	for (addr_range = start_addr_range + ADDR_SIZE; addr_range <
 	     (start_addr_range + ADDR_SIZE + 0x10000);
@@ -95,7 +95,7 @@ static void ending_start_addr_range(u32_t start_addr_range)
  */
 void test_boot_page_table(void)
 {
-	u32_t start_addr_range;
+	uint32_t start_addr_range;
 	int iterator = 0;
 
 	for (iterator = 0; iterator < MEMORY_REG_NUM; iterator++) {
diff --git a/tests/arch/x86/info/src/timer.c b/tests/arch/x86/info/src/timer.c
index e85e790e00..0c5f4f2215 100644
--- a/tests/arch/x86/info/src/timer.c
+++ b/tests/arch/x86/info/src/timer.c
@@ -9,9 +9,9 @@
 
 #define NR_SAMPLES 10	/* sample timer 10 times */
 
-static u32_t sync(struct device *cmos)
+static uint32_t sync(struct device *cmos)
 {
-	u32_t this, last;
+	uint32_t this, last;
 	int err;
 
 	err = counter_get_value(cmos, &this);
@@ -53,12 +53,12 @@ void timer(void)
 	if (cmos == NULL) {
 		printk("\tCan't get reference CMOS clock device.\n");
 	} else {
-		u64_t sum = 0;
+		uint64_t sum = 0;
 
 		printk("\tUsing CMOS RTC as reference clock:\n");
 
 		for (int i = 0; i < NR_SAMPLES; ++i) {
-			u32_t start, end;
+			uint32_t start, end;
 
 			start = sync(cmos);
 			end = sync(cmos);
diff --git a/tests/arch/x86/static_idt/src/main.c b/tests/arch/x86/static_idt/src/main.c
index adcaded996..160e86aa35 100644
--- a/tests/arch/x86/static_idt/src/main.c
+++ b/tests/arch/x86/static_idt/src/main.c
@@ -112,13 +112,13 @@ extern void *_EXCEPTION_STUB_NAME(exc_divide_error_handler, IV_DIVIDE_ERROR);
 void test_idt_stub(void)
 {
 	struct segment_descriptor *p_idt_entry;
-	u32_t offset;
+	uint32_t offset;
 
 	TC_PRINT("Testing to see if IDT has address of test stubs()\n");
 	/* Check for the interrupt stub */
 	p_idt_entry = (struct segment_descriptor *)
 		      (_idt_base_address + (TEST_SOFT_INT << 3));
-	offset = (u32_t)(&int_stub);
+	offset = (uint32_t)(&int_stub);
 	zassert_equal(DTE_OFFSET(p_idt_entry), offset,
 		      "Failed to find offset of int_stub (0x%x)"
 		      " at vector %d\n", offset, TEST_SOFT_INT);
@@ -126,7 +126,7 @@ void test_idt_stub(void)
 	/* Check for the exception stub */
 	p_idt_entry = (struct segment_descriptor *)
 		      (_idt_base_address + (IV_DIVIDE_ERROR << 3));
-	offset = (u32_t)(&_EXCEPTION_STUB_NAME(exc_divide_error_handler, 0));
+	offset = (uint32_t)(&_EXCEPTION_STUB_NAME(exc_divide_error_handler, 0));
 	zassert_equal(DTE_OFFSET(p_idt_entry), offset,
 		      "Failed to find offset of exc stub (0x%x)"
 		      " at vector %d\n", offset, IV_DIVIDE_ERROR);
diff --git a/tests/arch/x86/x86_mmu_api/src/userbuffer_validate.c b/tests/arch/x86/x86_mmu_api/src/userbuffer_validate.c
index adc711dabb..1796272a92 100644
--- a/tests/arch/x86/x86_mmu_api/src/userbuffer_validate.c
+++ b/tests/arch/x86/x86_mmu_api/src/userbuffer_validate.c
@@ -15,9 +15,9 @@
 
 static int status;
 
-#define BUFF_READABLE ((u32_t) 0x0)
-#define BUFF_WRITEABLE ((u32_t) 0x1)
-#define BUFF_USER ((u32_t) 0x2)
+#define BUFF_READABLE ((uint32_t) 0x0)
+#define BUFF_WRITEABLE ((uint32_t) 0x1)
+#define BUFF_USER ((uint32_t) 0x2)
 
 void reset_flag(void);
 void reset_multi_pte_page_flag(void);
@@ -25,15 +25,15 @@ void reset_multi_pde_flag(void);
 
 #define PTABLES (&z_x86_kernel_ptables)
 
-#define ADDR_PAGE_1 ((u8_t *)__bss_start + SKIP_SIZE * MMU_PAGE_SIZE)
-#define ADDR_PAGE_2 ((u8_t *)__bss_start + (SKIP_SIZE + 1) * MMU_PAGE_SIZE)
+#define ADDR_PAGE_1 ((uint8_t *)__bss_start + SKIP_SIZE * MMU_PAGE_SIZE)
+#define ADDR_PAGE_2 ((uint8_t *)__bss_start + (SKIP_SIZE + 1) * MMU_PAGE_SIZE)
 #define PRESET_PAGE_1_VALUE set_flags(ADDR_PAGE_1, MMU_PAGE_SIZE, \
 				      MMU_ENTRY_PRESENT, Z_X86_MMU_P)
 #define PRESET_PAGE_2_VALUE set_flags(ADDR_PAGE_2, MMU_PAGE_SIZE, \
 				      MMU_ENTRY_PRESENT, Z_X86_MMU_P)
 
-static void set_flags(void *ptr, size_t size, u64_t flags,
-		      u64_t mask)
+static void set_flags(void *ptr, size_t size, uint64_t flags,
+		      uint64_t mask)
 {
 	z_x86_mmu_set_flags(PTABLES, ptr, size, flags, mask, true);
 }
diff --git a/tests/benchmarks/app_kernel/src/fifo_b.c b/tests/benchmarks/app_kernel/src/fifo_b.c
index 6ed132aef3..347214c532 100644
--- a/tests/benchmarks/app_kernel/src/fifo_b.c
+++ b/tests/benchmarks/app_kernel/src/fifo_b.c
@@ -18,7 +18,7 @@
  */
 void queue_test(void)
 {
-	u32_t et; /* elapsed time */
+	uint32_t et; /* elapsed time */
 	int i;
 
 	PRINT_STRING(dashline, output_file);
diff --git a/tests/benchmarks/app_kernel/src/mailbox_b.c b/tests/benchmarks/app_kernel/src/mailbox_b.c
index d61e0041e7..9b1813eb53 100644
--- a/tests/benchmarks/app_kernel/src/mailbox_b.c
+++ b/tests/benchmarks/app_kernel/src/mailbox_b.c
@@ -42,7 +42,7 @@ static struct k_mbox_msg message;
 
 #define PRINT_ONE_RESULT()                                                   \
 	PRINT_F(output_file, "|%11u|%32u|%32u|\n", putsize, puttime,	     \
-	     (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime)))
+	     (uint32_t)(((uint64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime)))
 
 #define PRINT_OVERHEAD()                                                     \
 	PRINT_F(output_file,						\
@@ -52,7 +52,7 @@ static struct k_mbox_msg message;
 #define PRINT_XFER_RATE()                                                    \
 	PRINT_F(output_file, "| raw transfer rate:     %10u KB/sec (without" \
 	     " overhead)                 |\n",                               \
-	     (u32_t)((u64_t)(putsize >> 1) * 1000000U                   \
+	     (uint32_t)((uint64_t)(putsize >> 1) * 1000000U                   \
 	     / SAFE_DIVISOR(puttime - empty_msg_put_time)))
 
 #endif
@@ -61,7 +61,7 @@ static struct k_mbox_msg message;
 /*
  * Function prototypes.
  */
-void mailbox_put(u32_t size, int count, u32_t *time);
+void mailbox_put(uint32_t size, int count, uint32_t *time);
 
 /*
  * Function declarations.
@@ -75,8 +75,8 @@ void mailbox_put(u32_t size, int count, u32_t *time);
  */
 void mailbox_test(void)
 {
-	u32_t putsize;
-	u32_t puttime;
+	uint32_t putsize;
+	uint32_t puttime;
 	int putcount;
 	unsigned int empty_msg_put_time;
 	struct getinfo getinfo;
@@ -127,7 +127,7 @@ void mailbox_test(void)
  *
  * @return N/A
  */
-void mailbox_put(u32_t size, int count, u32_t *time)
+void mailbox_put(uint32_t size, int count, uint32_t *time)
 {
 	int i;
 	unsigned int t;
diff --git a/tests/benchmarks/app_kernel/src/mailbox_r.c b/tests/benchmarks/app_kernel/src/mailbox_r.c
index 3d8e7f7587..cfb0ae502c 100644
--- a/tests/benchmarks/app_kernel/src/mailbox_r.c
+++ b/tests/benchmarks/app_kernel/src/mailbox_r.c
@@ -77,7 +77,7 @@ void mailbox_get(struct k_mbox *mailbox,
 {
 	int i;
 	unsigned int t;
-	s32_t return_value = 0;
+	int32_t return_value = 0;
 	struct k_mbox_msg Message;
 
 	Message.rx_source_thread = K_ANY;
diff --git a/tests/benchmarks/app_kernel/src/master.c b/tests/benchmarks/app_kernel/src/master.c
index 09225a6b99..f672fe6a81 100644
--- a/tests/benchmarks/app_kernel/src/master.c
+++ b/tests/benchmarks/app_kernel/src/master.c
@@ -32,7 +32,7 @@ FILE *output_file;
  * Time in timer cycles necessary to read time.
  * Used for correction in time measurements.
  */
-u32_t tm_off;
+uint32_t tm_off;
 
 
 /********************************************************************/
diff --git a/tests/benchmarks/app_kernel/src/master.h b/tests/benchmarks/app_kernel/src/master.h
index 6e6672e74d..f581f6455e 100644
--- a/tests/benchmarks/app_kernel/src/master.h
+++ b/tests/benchmarks/app_kernel/src/master.h
@@ -172,9 +172,9 @@ extern struct k_mem_pool DEMOPOOL;
 #define PRINT_OVERFLOW_ERROR()						\
 	PRINT_F(output_file, __FILE__":%d Error: tick occurred\n", __LINE__)
 
-static inline u32_t BENCH_START(void)
+static inline uint32_t BENCH_START(void)
 {
-	u32_t et;
+	uint32_t et;
 
 	bench_test_start();
 	et = TIME_STAMP_DELTA_GET(0);
diff --git a/tests/benchmarks/app_kernel/src/memmap_b.c b/tests/benchmarks/app_kernel/src/memmap_b.c
index d00f091e78..37bc887c4f 100644
--- a/tests/benchmarks/app_kernel/src/memmap_b.c
+++ b/tests/benchmarks/app_kernel/src/memmap_b.c
@@ -20,7 +20,7 @@
  */
 void memorymap_test(void)
 {
-	u32_t et; /* elapsed time */
+	uint32_t et; /* elapsed time */
 	int i;
 	void *p;
 	int alloc_status;
diff --git a/tests/benchmarks/app_kernel/src/mempool_b.c b/tests/benchmarks/app_kernel/src/mempool_b.c
index 4abed56ac7..7c229d31d8 100644
--- a/tests/benchmarks/app_kernel/src/mempool_b.c
+++ b/tests/benchmarks/app_kernel/src/mempool_b.c
@@ -18,9 +18,9 @@
  */
 void mempool_test(void)
 {
-	u32_t et; /* elapsed time */
+	uint32_t et; /* elapsed time */
 	int i;
-	s32_t return_value = 0;
+	int32_t return_value = 0;
 	struct k_mem_block block;
 
 	PRINT_STRING(dashline, output_file);
diff --git a/tests/benchmarks/app_kernel/src/mutex_b.c b/tests/benchmarks/app_kernel/src/mutex_b.c
index 160d744e3b..7c18e47eae 100644
--- a/tests/benchmarks/app_kernel/src/mutex_b.c
+++ b/tests/benchmarks/app_kernel/src/mutex_b.c
@@ -18,7 +18,7 @@
  */
 void mutex_test(void)
 {
-	u32_t et; /* elapsed time */
+	uint32_t et; /* elapsed time */
 	int i;
 
 	PRINT_STRING(dashline, output_file);
diff --git a/tests/benchmarks/app_kernel/src/pipe_b.c b/tests/benchmarks/app_kernel/src/pipe_b.c
index 8bdad71cde..6a7464658f 100644
--- a/tests/benchmarks/app_kernel/src/pipe_b.c
+++ b/tests/benchmarks/app_kernel/src/pipe_b.c
@@ -72,16 +72,16 @@
 	     puttime[0],                                             \
 	     puttime[1],                                             \
 	     puttime[2],                                             \
-	     (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[0])), \
-	     (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[1])), \
-	     (u32_t)(((u64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[2])))
+	     (uint32_t)(((uint64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[0])), \
+	     (uint32_t)(((uint64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[1])), \
+	     (uint32_t)(((uint64_t)putsize * 1000000U) / SAFE_DIVISOR(puttime[2])))
 #endif /* FLOAT */
 
 /*
  * Function prototypes.
  */
 int pipeput(struct k_pipe *pipe, enum pipe_options
-		 option, int size, int count, u32_t *time);
+		 option, int size, int count, uint32_t *time);
 
 /*
  * Function declarations.
@@ -95,12 +95,12 @@ int pipeput(struct k_pipe *pipe, enum pipe_options
  */
 void pipe_test(void)
 {
-	u32_t	putsize;
+	uint32_t	putsize;
 	int         getsize;
-	u32_t	puttime[3];
+	uint32_t	puttime[3];
 	int		putcount;
 	int		pipe;
-	u32_t	TaskPrio = UINT32_MAX;
+	uint32_t	TaskPrio = UINT32_MAX;
 	int		prio;
 	struct getinfo	getinfo;
 
@@ -197,7 +197,7 @@ int pipeput(struct k_pipe *pipe,
 	    enum pipe_options option,
 	    int size,
 	    int count,
-	    u32_t *time)
+	    uint32_t *time)
 {
 	int i;
 	unsigned int t;
diff --git a/tests/benchmarks/app_kernel/src/sema_b.c b/tests/benchmarks/app_kernel/src/sema_b.c
index e3e7c6df7e..8ec0643050 100644
--- a/tests/benchmarks/app_kernel/src/sema_b.c
+++ b/tests/benchmarks/app_kernel/src/sema_b.c
@@ -19,7 +19,7 @@
  */
 void sema_test(void)
 {
-	u32_t et; /* elapsed Time */
+	uint32_t et; /* elapsed Time */
 	int i;
 
 	PRINT_STRING(dashline, output_file);
diff --git a/tests/benchmarks/boot_time/src/main.c b/tests/benchmarks/boot_time/src/main.c
index 9326a21420..e16f0f9864 100644
--- a/tests/benchmarks/boot_time/src/main.c
+++ b/tests/benchmarks/boot_time/src/main.c
@@ -21,10 +21,10 @@
 
 void main(void)
 {
-	u32_t task_time_stamp;	/* timestamp at beginning of first task */
-	u32_t main_us;		/* begin of main timestamp in us */
-	u32_t task_us;		/* begin of task timestamp in us */
-	u32_t idle_us;		/* begin of idle timestamp in us */
+	uint32_t task_time_stamp;	/* timestamp at beginning of first task */
+	uint32_t main_us;		/* begin of main timestamp in us */
+	uint32_t task_us;		/* begin of task timestamp in us */
+	uint32_t idle_us;		/* begin of idle timestamp in us */
 
 	task_time_stamp = k_cycle_get_32();
 
@@ -33,14 +33,14 @@ void main(void)
 	 */
 	k_sleep(K_MSEC(1));
 
-	main_us = (u32_t)ceiling_fraction(USEC_PER_SEC *
-					  (u64_t)z_timestamp_main,
+	main_us = (uint32_t)ceiling_fraction(USEC_PER_SEC *
+					  (uint64_t)z_timestamp_main,
 					  sys_clock_hw_cycles_per_sec());
-	task_us = (u32_t)ceiling_fraction(USEC_PER_SEC *
-					  (u64_t)task_time_stamp,
+	task_us = (uint32_t)ceiling_fraction(USEC_PER_SEC *
+					  (uint64_t)task_time_stamp,
 					  sys_clock_hw_cycles_per_sec());
-	idle_us = (u32_t)ceiling_fraction(USEC_PER_SEC *
-					  (u64_t)z_timestamp_idle,
+	idle_us = (uint32_t)ceiling_fraction(USEC_PER_SEC *
+					  (uint64_t)z_timestamp_idle,
 					  sys_clock_hw_cycles_per_sec());
 
 	TC_START("Boot Time Measurement");
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
index 0d27865b97..994d686f3a 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/f32.c
@@ -13,7 +13,7 @@
 
 #define PATTERN_LENGTH	(256)
 
-static const u32_t input1[256] = {
+static const uint32_t input1[256] = {
 	0xbe7615dd, 0x3e0a5b1e, 0x3e9425e8, 0x3f433216,
 	0x3e816b4e, 0xbe143e49, 0x3e877d60, 0xbd29de75,
 	0xbebc69ec, 0x3e687466, 0xbe2e1b66, 0x3e0346d2,
@@ -80,7 +80,7 @@ static const u32_t input1[256] = {
 	0xbf03caa7, 0xbd92238d, 0xbe7cdc64, 0xbe2ac8aa
 	};
 
-static const u32_t input2[256] = {
+static const uint32_t input2[256] = {
 	0x3efd7b68, 0xbf3396c6, 0x3ecf0d7f, 0xbce77d0c,
 	0xbe8045d0, 0xbea8c5d4, 0x3e6a3aaa, 0xbeb9c2f5,
 	0x3ce7f210, 0xbf0f4737, 0xbee71c87, 0xbdcd4ed3,
@@ -149,7 +149,7 @@ static const u32_t input2[256] = {
 
 void test_benchmark_vec_add_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -176,7 +176,7 @@ void test_benchmark_vec_add_f32(void)
 
 void test_benchmark_vec_sub_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -203,7 +203,7 @@ void test_benchmark_vec_sub_f32(void)
 
 void test_benchmark_vec_mult_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -230,7 +230,7 @@ void test_benchmark_vec_mult_f32(void)
 
 void test_benchmark_vec_abs_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -255,7 +255,7 @@ void test_benchmark_vec_abs_f32(void)
 
 void test_benchmark_vec_negate_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -280,7 +280,7 @@ void test_benchmark_vec_negate_f32(void)
 
 void test_benchmark_vec_offset_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -305,7 +305,7 @@ void test_benchmark_vec_offset_f32(void)
 
 void test_benchmark_vec_scale_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t *output;
 
 	/* Allocate output buffer */
@@ -330,7 +330,7 @@ void test_benchmark_vec_scale_f32(void)
 
 void test_benchmark_vec_dot_prod_f32(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	float32_t output;
 
 	/* Begin benchmark */
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
index 52889b5957..f6f92a7b5d 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q15.c
@@ -85,7 +85,7 @@ static const q15_t input2[256] = {
 
 void test_benchmark_vec_add_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -110,7 +110,7 @@ void test_benchmark_vec_add_q15(void)
 
 void test_benchmark_vec_sub_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -135,7 +135,7 @@ void test_benchmark_vec_sub_q15(void)
 
 void test_benchmark_vec_mult_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -160,7 +160,7 @@ void test_benchmark_vec_mult_q15(void)
 
 void test_benchmark_vec_abs_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -185,7 +185,7 @@ void test_benchmark_vec_abs_q15(void)
 
 void test_benchmark_vec_negate_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -210,7 +210,7 @@ void test_benchmark_vec_negate_q15(void)
 
 void test_benchmark_vec_offset_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -235,7 +235,7 @@ void test_benchmark_vec_offset_q15(void)
 
 void test_benchmark_vec_scale_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q15_t *output;
 
 	/* Allocate output buffer */
@@ -260,7 +260,7 @@ void test_benchmark_vec_scale_q15(void)
 
 void test_benchmark_vec_dot_prod_q15(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q63_t output;
 
 	/* Begin benchmark */
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
index bea681aa46..188c9c96d8 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q31.c
@@ -149,7 +149,7 @@ static const q31_t input2[256] = {
 
 void test_benchmark_vec_add_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -174,7 +174,7 @@ void test_benchmark_vec_add_q31(void)
 
 void test_benchmark_vec_sub_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -199,7 +199,7 @@ void test_benchmark_vec_sub_q31(void)
 
 void test_benchmark_vec_mult_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -224,7 +224,7 @@ void test_benchmark_vec_mult_q31(void)
 
 void test_benchmark_vec_abs_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -249,7 +249,7 @@ void test_benchmark_vec_abs_q31(void)
 
 void test_benchmark_vec_negate_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -274,7 +274,7 @@ void test_benchmark_vec_negate_q31(void)
 
 void test_benchmark_vec_offset_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -299,7 +299,7 @@ void test_benchmark_vec_offset_q31(void)
 
 void test_benchmark_vec_scale_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t *output;
 
 	/* Allocate output buffer */
@@ -324,7 +324,7 @@ void test_benchmark_vec_scale_q31(void)
 
 void test_benchmark_vec_dot_prod_q31(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q63_t output;
 
 	/* Begin benchmark */
diff --git a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
index 81211da26d..196f50c587 100644
--- a/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/benchmarks/cmsis_dsp/basicmath/src/q7.c
@@ -85,7 +85,7 @@ static const q7_t input2[PATTERN_LENGTH] = {
 
 void test_benchmark_vec_add_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -110,7 +110,7 @@ void test_benchmark_vec_add_q7(void)
 
 void test_benchmark_vec_sub_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -135,7 +135,7 @@ void test_benchmark_vec_sub_q7(void)
 
 void test_benchmark_vec_mult_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -160,7 +160,7 @@ void test_benchmark_vec_mult_q7(void)
 
 void test_benchmark_vec_abs_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -185,7 +185,7 @@ void test_benchmark_vec_abs_q7(void)
 
 void test_benchmark_vec_negate_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -210,7 +210,7 @@ void test_benchmark_vec_negate_q7(void)
 
 void test_benchmark_vec_offset_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -235,7 +235,7 @@ void test_benchmark_vec_offset_q7(void)
 
 void test_benchmark_vec_scale_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q7_t *output;
 
 	/* Allocate output buffer */
@@ -260,7 +260,7 @@ void test_benchmark_vec_scale_q7(void)
 
 void test_benchmark_vec_dot_prod_q7(void)
 {
-	u32_t irq_key, timestamp, timespan;
+	uint32_t irq_key, timestamp, timespan;
 	q31_t output;
 
 	/* Begin benchmark */
diff --git a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
index 4febf76cbe..c71cb1efb9 100644
--- a/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
+++ b/tests/benchmarks/cmsis_dsp/common/benchmark_common.h
@@ -15,7 +15,7 @@
 
 #include <arch/arm/cortex_m/cmsis.h>
 
-static ALWAYS_INLINE void benchmark_begin(u32_t *irq_key, u32_t *timestamp)
+static ALWAYS_INLINE void benchmark_begin(uint32_t *irq_key, uint32_t *timestamp)
 {
 	ARG_UNUSED(timestamp);
 
@@ -27,7 +27,7 @@ static ALWAYS_INLINE void benchmark_begin(u32_t *irq_key, u32_t *timestamp)
 	DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
 }
 
-static ALWAYS_INLINE u32_t benchmark_end(u32_t irq_key, u32_t timestamp)
+static ALWAYS_INLINE uint32_t benchmark_end(uint32_t irq_key, uint32_t timestamp)
 {
 	/* Stop DWT cycle counter */
 	DWT->CTRL &= ~DWT_CTRL_CYCCNTENA_Msk;
@@ -44,9 +44,9 @@ static ALWAYS_INLINE u32_t benchmark_end(u32_t irq_key, u32_t timestamp)
 #else
 /* Use system timer clock on other systems */
 
-static ALWAYS_INLINE void benchmark_begin(u32_t *irq_key, u32_t *timestamp)
+static ALWAYS_INLINE void benchmark_begin(uint32_t *irq_key, uint32_t *timestamp)
 {
-	volatile u32_t now;
+	volatile uint32_t now;
 
 	/* Lock interrupts to prevent preemption */
 	*irq_key = irq_lock();
@@ -58,9 +58,9 @@ static ALWAYS_INLINE void benchmark_begin(u32_t *irq_key, u32_t *timestamp)
 	*timestamp = now;
 }
 
-static ALWAYS_INLINE u32_t benchmark_end(u32_t irq_key, u32_t timestamp)
+static ALWAYS_INLINE uint32_t benchmark_end(uint32_t irq_key, uint32_t timestamp)
 {
-	volatile u32_t now;
+	volatile uint32_t now;
 
 	/* Read timestamp for the end of benchmark */
 	now = k_cycle_get_32();
diff --git a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
index 7cc39bc118..e6fd6a333a 100644
--- a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
+++ b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
@@ -34,11 +34,11 @@ static K_THREAD_STACK_DEFINE(thread_two_stack, STACKSIZE);
 static struct k_thread thread_one_data;
 static struct k_thread thread_two_data;
 
-static u32_t timestamp_start;
-static u32_t timestamp_end;
+static uint32_t timestamp_start;
+static uint32_t timestamp_end;
 
 /* context switches counter */
-static volatile u32_t ctx_switch_counter;
+static volatile uint32_t ctx_switch_counter;
 
 /* context switch balancer. Incremented by one thread, decremented by another*/
 static volatile int ctx_switch_balancer;
@@ -118,7 +118,7 @@ int coop_ctx_switch(void)
 		error_count++;
 		PRINT_OVERFLOW_ERROR();
 	} else {
-		u32_t diff;
+		uint32_t diff;
 
 		diff = TIMING_INFO_GET_DELTA(timestamp_start, timestamp_end);
 
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread.c b/tests/benchmarks/latency_measure/src/int_to_thread.c
index 81c854c40e..1840ea61ff 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread.c
@@ -22,8 +22,8 @@
 
 static volatile int flag_var;
 
-static u32_t timestamp_start;
-static u32_t timestamp_end;
+static uint32_t timestamp_start;
+static uint32_t timestamp_end;
 
 /**
  *
@@ -72,7 +72,7 @@ static void make_int(void)
  */
 int int_to_thread(void)
 {
-	u32_t diff;
+	uint32_t diff;
 
 	PRINT_FORMAT(" 1 - Measure time to switch from ISR back to"
 		     " interrupted thread");
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
index 869ea7f5f4..350f3ea249 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
@@ -23,8 +23,8 @@
 
 #include <arch/cpu.h>
 
-static u32_t timestamp_start;
-static u32_t timestamp_end;
+static uint32_t timestamp_start;
+static uint32_t timestamp_end;
 static struct k_work work;
 
 K_SEM_DEFINE(INTSEMA, 0, 1);
@@ -89,7 +89,7 @@ K_THREAD_DEFINE(int_thread_id, 512,
  */
 int int_to_thread_evt(void)
 {
-	u32_t diff;
+	uint32_t diff;
 
 	PRINT_FORMAT(" 2 - Measure time from ISR to executing a different thread"
 		     " (rescheduled)");
diff --git a/tests/benchmarks/latency_measure/src/main.c b/tests/benchmarks/latency_measure/src/main.c
index 564f4e16fd..b028ec7aac 100644
--- a/tests/benchmarks/latency_measure/src/main.c
+++ b/tests/benchmarks/latency_measure/src/main.c
@@ -16,7 +16,7 @@
 
 #define STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACKSIZE)
 
-u32_t tm_off;        /* time necessary to read the time */
+uint32_t tm_off;        /* time necessary to read the time */
 int error_count;        /* track number of errors */
 
 
diff --git a/tests/benchmarks/latency_measure/src/sema_lock_release.c b/tests/benchmarks/latency_measure/src/sema_lock_release.c
index d3d0e6ec0b..08771e0ea8 100644
--- a/tests/benchmarks/latency_measure/src/sema_lock_release.c
+++ b/tests/benchmarks/latency_measure/src/sema_lock_release.c
@@ -25,8 +25,8 @@
 /* the number of mutex lock/unlock cycles */
 #define N_TEST_MUTEX 1000
 
-static u32_t timestamp_start;
-static u32_t timestamp_end;
+static uint32_t timestamp_start;
+static uint32_t timestamp_end;
 
 K_SEM_DEFINE(lock_unlock_sema, 0, N_TEST_SEMA);
 K_MUTEX_DEFINE(TEST_MUTEX);
@@ -43,7 +43,7 @@ K_MUTEX_DEFINE(TEST_MUTEX);
 int sema_lock_unlock(void)
 {
 	int i;
-	u32_t diff;
+	uint32_t diff;
 
 	PRINT_FORMAT(" 3 - Measure average time to signal a sema then test"
 		     " that sema");
@@ -111,7 +111,7 @@ int sema_lock_unlock(void)
 int mutex_lock_unlock(void)
 {
 	int i;
-	u32_t diff;
+	uint32_t diff;
 
 	benchmark_timer_start();
 	PRINT_FORMAT(" 4- Measure average time to lock a mutex then"
diff --git a/tests/benchmarks/latency_measure/src/thread_switch_yield.c b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
index 8ec1661b3c..29fd5df3f4 100644
--- a/tests/benchmarks/latency_measure/src/thread_switch_yield.c
+++ b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
@@ -20,7 +20,7 @@
 /* context switch enough time so our measurement is precise */
 #define NB_OF_YIELD     1000
 
-static u32_t helper_thread_iterations;
+static uint32_t helper_thread_iterations;
 
 #define Y_STACK_SIZE    (512 + CONFIG_TEST_EXTRA_STACKSIZE)
 #define Y_PRIORITY      10
@@ -50,11 +50,11 @@ void yielding_thread(void *arg1, void *arg2, void *arg3)
  */
 void thread_switch_yield(void)
 {
-	u32_t iterations = 0U;
-	s32_t delta;
-	u32_t timestamp_start;
-	u32_t timestamp_end;
-	u32_t ts_diff;
+	uint32_t iterations = 0U;
+	int32_t delta;
+	uint32_t timestamp_start;
+	uint32_t timestamp_end;
+	uint32_t ts_diff;
 
 	PRINT_FORMAT(" 5 - Measure average context switch time between threads"
 		     " using (k_yield)");
diff --git a/tests/benchmarks/latency_measure/src/timing_info.h b/tests/benchmarks/latency_measure/src/timing_info.h
index e19ef16c9a..d1d8644f06 100644
--- a/tests/benchmarks/latency_measure/src/timing_info.h
+++ b/tests/benchmarks/latency_measure/src/timing_info.h
@@ -105,13 +105,13 @@ static inline void benchmark_timer_init(void)  {       }
 static inline void benchmark_timer_stop(void)  {       }
 static inline void benchmark_timer_start(void) {       }
 
-#define CYCLES_TO_NS(x) ((u32_t)k_cyc_to_ns_floor64(x))
+#define CYCLES_TO_NS(x) ((uint32_t)k_cyc_to_ns_floor64(x))
 #define CYCLES_TO_NS_AVG(x, NCYCLES) \
-	((u32_t)(k_cyc_to_ns_floor64(x) / NCYCLES))
+	((uint32_t)(k_cyc_to_ns_floor64(x) / NCYCLES))
 
 #endif /* CONFIG_NRF_RTC_TIMER */
 
-static inline u32_t TIMING_INFO_GET_DELTA(u32_t start, u32_t end)
+static inline uint32_t TIMING_INFO_GET_DELTA(uint32_t start, uint32_t end)
 {
 	return (end >= start) ? (end - start) : (ULONG_MAX - start + end);
 }
diff --git a/tests/benchmarks/latency_measure/src/utils.h b/tests/benchmarks/latency_measure/src/utils.h
index bcffcf4bed..27a78be1ec 100644
--- a/tests/benchmarks/latency_measure/src/utils.h
+++ b/tests/benchmarks/latency_measure/src/utils.h
@@ -79,7 +79,7 @@ static inline void print_dash_line(void)
 #endif
 
 void raiseIntFunc(void);
-extern void raiseInt(u8_t id);
+extern void raiseInt(uint8_t id);
 
 /* pointer to the ISR */
 typedef void (*ptestIsr) (void *unused);
diff --git a/tests/benchmarks/mbedtls/src/benchmark.c b/tests/benchmarks/mbedtls/src/benchmark.c
index 5732de29d1..ce8ccb9f27 100644
--- a/tests/benchmarks/mbedtls/src/benchmark.c
+++ b/tests/benchmarks/mbedtls/src/benchmark.c
@@ -153,8 +153,8 @@ void mbedtls_set_alarm(int seconds)
 #define TIME_AND_TSC(TITLE, CODE)                                     \
 do {                                                                  \
 	unsigned long ii, jj;                                         \
-	u32_t tsc;                                                    \
-	u64_t delta;                                                  \
+	uint32_t tsc;                                                    \
+	uint64_t delta;                                                  \
 	int ret = 0;                                                  \
 								      \
 	mbedtls_printf(HEADER_FORMAT, TITLE);                         \
diff --git a/tests/benchmarks/sched/src/main.c b/tests/benchmarks/sched/src/main.c
index 8bef594fef..a449775641 100644
--- a/tests/benchmarks/sched/src/main.c
+++ b/tests/benchmarks/sched/src/main.c
@@ -56,11 +56,11 @@ enum {
 	NUM_STAMP_STATES
 };
 
-u32_t stamps[NUM_STAMP_STATES];
+uint32_t stamps[NUM_STAMP_STATES];
 
 static inline int _stamp(int state)
 {
-	u32_t t;
+	uint32_t t;
 
 	/* In theory the TSC has much lower overhead and higher
 	 * precision.  In practice it's VERY jittery in recent qemu
@@ -110,8 +110,8 @@ void main(void)
 	/* Let it start running and pend */
 	k_sleep(K_MSEC(100));
 
-	u64_t tot = 0U;
-	u32_t runs = 0U;
+	uint64_t tot = 0U;
+	uint32_t runs = 0U;
 
 	for (int i = 0; i < N_RUNS + N_SETTLE; i++) {
 		stamp(UNPENDING);
@@ -129,7 +129,7 @@ void main(void)
 		k_yield();
 		stamp(YIELDED);
 
-		u32_t avg, whole = stamps[4] - stamps[0];
+		uint32_t avg, whole = stamps[4] - stamps[0];
 
 		if (++runs > N_SETTLE) {
 			/* Only compute averages after the first ~10
diff --git a/tests/benchmarks/sys_kernel/src/lifo.c b/tests/benchmarks/sys_kernel/src/lifo.c
index a6843278f7..1489bbd0f8 100644
--- a/tests/benchmarks/sys_kernel/src/lifo.c
+++ b/tests/benchmarks/sys_kernel/src/lifo.c
@@ -137,7 +137,7 @@ void lifo_thread3(void *par1, void *par2, void *par3)
  */
 int lifo_test(void)
 {
-	u32_t t;
+	uint32_t t;
 	int i = 0;
 	int return_value = 0;
 	intptr_t element[2];
diff --git a/tests/benchmarks/sys_kernel/src/mwfifo.c b/tests/benchmarks/sys_kernel/src/mwfifo.c
index 6fde36a9dd..a8b573c187 100644
--- a/tests/benchmarks/sys_kernel/src/mwfifo.c
+++ b/tests/benchmarks/sys_kernel/src/mwfifo.c
@@ -138,7 +138,7 @@ void fifo_thread3(void *par1, void *par2, void *par3)
  */
 int fifo_test(void)
 {
-	u32_t t;
+	uint32_t t;
 	int i = 0;
 	int return_value = 0;
 	intptr_t element[2];
diff --git a/tests/benchmarks/sys_kernel/src/sema.c b/tests/benchmarks/sys_kernel/src/sema.c
index e2a1ef61d9..bf5a197932 100644
--- a/tests/benchmarks/sys_kernel/src/sema.c
+++ b/tests/benchmarks/sys_kernel/src/sema.c
@@ -110,7 +110,7 @@ void sema_thread3(void *par1, void *par2, void *par3)
  */
 int sema_test(void)
 {
-	u32_t t;
+	uint32_t t;
 	int i = 0;
 	int return_value = 0;
 
diff --git a/tests/benchmarks/sys_kernel/src/stack.c b/tests/benchmarks/sys_kernel/src/stack.c
index 35071b38e9..873f1883a5 100644
--- a/tests/benchmarks/sys_kernel/src/stack.c
+++ b/tests/benchmarks/sys_kernel/src/stack.c
@@ -143,7 +143,7 @@ void stack_thread3(void *par1, void *par2, void *par3)
  */
 int stack_test(void)
 {
-	u32_t t;
+	uint32_t t;
 	int i = 0;
 	int return_value = 0;
 
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index e2edbaf898..18d72331ec 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -27,10 +27,10 @@ const char sz_partial[] = "PARTIAL";
 const char sz_fail[] = "FAILED";
 
 /* time necessary to read the time */
-u32_t tm_off;
+uint32_t tm_off;
 
 /* Holds the loop count that need to be carried out. */
-u32_t number_of_loops;
+uint32_t number_of_loops;
 
 /**
  *
@@ -58,7 +58,7 @@ void begin_test(void)
  * @param i   Number of tests.
  * @param t   Time in ticks for the whole test.
  */
-int check_result(int i, u32_t t)
+int check_result(int i, uint32_t t)
 {
 	/*
 	 * bench_test_end checks tCheck static variable.
@@ -147,11 +147,11 @@ void main(void)
 	/* The following code is needed to make the benchmakring run on
 	 * slower platforms.
 	 */
-	u64_t time_stamp = z_tick_get();
+	uint64_t time_stamp = z_tick_get();
 
 	k_sleep(K_MSEC(1));
 
-	u64_t time_stamp_2 = z_tick_get();
+	uint64_t time_stamp_2 = z_tick_get();
 
 	if (time_stamp_2 - time_stamp > 1) {
 		number_of_loops = 10U;
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.h b/tests/benchmarks/sys_kernel/src/syskernel.h
index 37dbfcd404..1dc76a6c76 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.h
+++ b/tests/benchmarks/sys_kernel/src/syskernel.h
@@ -28,7 +28,7 @@ extern const char sz_success[];
 extern const char sz_partial[];
 extern const char sz_fail[];
 
-extern u32_t number_of_loops;
+extern uint32_t number_of_loops;
 
 #define sz_module_title_fmt	"\nMODULE: %s"
 #define sz_module_result_fmt	"\n\nPROJECT EXECUTION %s\n"
@@ -45,7 +45,7 @@ extern u32_t number_of_loops;
 #define sz_case_end_fmt		"\nEND TEST CASE"
 #define sz_case_timing_fmt	"%u nSec"
 
-int check_result(int i, u32_t ticks);
+int check_result(int i, uint32_t ticks);
 
 int sema_test(void);
 int lifo_test(void);
@@ -53,9 +53,9 @@ int fifo_test(void);
 int stack_test(void);
 void begin_test(void);
 
-static inline u32_t BENCH_START(void)
+static inline uint32_t BENCH_START(void)
 {
-	u32_t et;
+	uint32_t et;
 
 	begin_test();
 	et = TIME_STAMP_DELTA_GET(0);
diff --git a/tests/benchmarks/timing_info/src/arch/x86/tsc.c b/tests/benchmarks/timing_info/src/arch/x86/tsc.c
index 7a3fcc989b..ad9428f513 100644
--- a/tests/benchmarks/timing_info/src/arch/x86/tsc.c
+++ b/tests/benchmarks/timing_info/src/arch/x86/tsc.c
@@ -12,38 +12,38 @@
 
 #define CALIB_LOOPS	8
 
-static u64_t tsc_freq;
+static uint64_t tsc_freq;
 
 void calibrate_timer(void)
 {
-	u32_t cyc_start = k_cycle_get_32();
-	u64_t tsc_start = z_tsc_read();
+	uint32_t cyc_start = k_cycle_get_32();
+	uint64_t tsc_start = z_tsc_read();
 
 	k_busy_wait(10 * USEC_PER_MSEC);
 
-	u32_t cyc_end = k_cycle_get_32();
-	u64_t tsc_end = z_tsc_read();
+	uint32_t cyc_end = k_cycle_get_32();
+	uint64_t tsc_end = z_tsc_read();
 
-	u64_t cyc_freq = sys_clock_hw_cycles_per_sec();
+	uint64_t cyc_freq = sys_clock_hw_cycles_per_sec();
 
 	/*
 	 * cycles are in 32-bit, and delta must be
 	 * calculated in 32-bit percision. Or it would
 	 * wrapping around in 64-bit.
 	 */
-	u64_t dcyc = (u32_t)cyc_end - (u32_t)cyc_start;
+	uint64_t dcyc = (uint32_t)cyc_end - (uint32_t)cyc_start;
 
-	u64_t dtsc = tsc_end - tsc_start;
+	uint64_t dtsc = tsc_end - tsc_start;
 
 	tsc_freq = (cyc_freq * dtsc) / dcyc;
 }
 
-u32_t x86_get_timer_freq_MHz(void)
+uint32_t x86_get_timer_freq_MHz(void)
 {
-	return (u32_t)(tsc_freq / 1000000);
+	return (uint32_t)(tsc_freq / 1000000);
 }
 
-u32_t x86_cyc_to_ns_floor64(u64_t cyc)
+uint32_t x86_cyc_to_ns_floor64(uint64_t cyc)
 {
 	return ((cyc) * USEC_PER_SEC / tsc_freq);
 }
diff --git a/tests/benchmarks/timing_info/src/main_benchmark.c b/tests/benchmarks/timing_info/src/main_benchmark.c
index 9c60002bd9..fe80982f7d 100644
--- a/tests/benchmarks/timing_info/src/main_benchmark.c
+++ b/tests/benchmarks/timing_info/src/main_benchmark.c
@@ -22,7 +22,7 @@ void __weak calibrate_timer(void)
 
 void main(void)
 {
-	u32_t freq;
+	uint32_t freq;
 
 	calibrate_timer();
 
diff --git a/tests/benchmarks/timing_info/src/msg_passing_bench.c b/tests/benchmarks/timing_info/src/msg_passing_bench.c
index bc87c95fb1..6561d1b49c 100644
--- a/tests/benchmarks/timing_info/src/msg_passing_bench.c
+++ b/tests/benchmarks/timing_info/src/msg_passing_bench.c
@@ -23,38 +23,38 @@ K_MBOX_DEFINE(benchmark_mbox);
 K_SEM_DEFINE(mbox_sem, 1, 1);
 
 /* common location for the swap to write the tsc data*/
-extern u32_t arch_timing_value_swap_end;
-extern u64_t arch_timing_value_swap_common;
+extern uint32_t arch_timing_value_swap_end;
+extern uint64_t arch_timing_value_swap_common;
 
 /* location of the time stamps*/
-u64_t __msg_q_put_state;
-u64_t __msg_q_get_state;
+uint64_t __msg_q_put_state;
+uint64_t __msg_q_get_state;
 
-u64_t __msg_q_put_w_cxt_start_time;
-u64_t __msg_q_put_w_cxt_end_time;
+uint64_t __msg_q_put_w_cxt_start_time;
+uint64_t __msg_q_put_w_cxt_end_time;
 
-u64_t __msg_q_put_wo_cxt_start_time;  /* without context switch */
-u64_t __msg_q_put_wo_cxt_end_time;
+uint64_t __msg_q_put_wo_cxt_start_time;  /* without context switch */
+uint64_t __msg_q_put_wo_cxt_end_time;
 
-u64_t __msg_q_get_w_cxt_start_time;
-u64_t __msg_q_get_w_cxt_end_time;
+uint64_t __msg_q_get_w_cxt_start_time;
+uint64_t __msg_q_get_w_cxt_end_time;
 
-u64_t msg_q_get_wo_cxt_start_time;
-u64_t msg_q_get_wo_cxt_end_time;
+uint64_t msg_q_get_wo_cxt_start_time;
+uint64_t msg_q_get_wo_cxt_end_time;
 
-u32_t __mbox_sync_put_state;
-u64_t mbox_sync_put_start_time;
-u64_t mbox_sync_put_end_time;
+uint32_t __mbox_sync_put_state;
+uint64_t mbox_sync_put_start_time;
+uint64_t mbox_sync_put_end_time;
 
-u32_t __mbox_sync_get_state;
-u64_t mbox_sync_get_start_time;
-u64_t mbox_sync_get_end_time;
+uint32_t __mbox_sync_get_state;
+uint64_t mbox_sync_get_start_time;
+uint64_t mbox_sync_get_end_time;
 
-u64_t mbox_async_put_start_time;
-u64_t mbox_async_put_end_time;
+uint64_t mbox_async_put_start_time;
+uint64_t mbox_async_put_end_time;
 
-u64_t mbox_get_w_cxt_start_time;
-u64_t mbox_get_w_cxt_end_time;
+uint64_t mbox_get_w_cxt_start_time;
+uint64_t mbox_get_w_cxt_end_time;
 
 /*For benchmarking msg queues*/
 k_tid_t producer_w_cxt_switch_tid;
@@ -91,7 +91,7 @@ void thread_mbox_sync_get_receive(void *p1, void *p2, void *p3);
 void thread_mbox_async_put_send(void *p1, void *p2, void *p3);
 void thread_mbox_async_put_receive(void *p1, void *p2, void *p3);
 
-volatile u64_t time_check;
+volatile uint64_t time_check;
 int received_data_get;
 int received_data_consumer;
 int data_to_send;
@@ -131,7 +131,7 @@ void msg_passing_bench(void)
 				thread_producer_msgq_w_cxt_switch, NULL,
 				NULL, NULL, 2 /*priority*/, 0, K_MSEC(50));
 
-	u32_t msg_status =  k_msgq_get(&benchmark_q, &received_data,
+	uint32_t msg_status =  k_msgq_get(&benchmark_q, &received_data,
 				       K_MSEC(300));
 
 	producer_wo_cxt_switch_tid =
@@ -142,7 +142,7 @@ void msg_passing_bench(void)
 
 	k_thread_abort(producer_w_cxt_switch_tid);
 	k_thread_abort(producer_wo_cxt_switch_tid);
-	__msg_q_put_w_cxt_end_time = ((u32_t)arch_timing_value_swap_common);
+	__msg_q_put_w_cxt_end_time = ((uint32_t)arch_timing_value_swap_common);
 	ARG_UNUSED(msg_status);
 
 	/*******************************************************************/
@@ -285,44 +285,44 @@ void msg_passing_bench(void)
 
 	/* Only print lower 32bit of time result */
 	PRINT_STATS("Message Queue Put with context switch",
-		    (u32_t)((__msg_q_put_w_cxt_end_time -
+		    (uint32_t)((__msg_q_put_w_cxt_end_time -
 			     __msg_q_put_w_cxt_start_time) & 0xFFFFFFFFULL),
-		    (u32_t) (total_msg_q_put_w_cxt_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_msg_q_put_w_cxt_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("Message Queue Put without context switch",
-		    (u32_t)((__msg_q_put_wo_cxt_end_time -
+		    (uint32_t)((__msg_q_put_wo_cxt_end_time -
 			     __msg_q_put_wo_cxt_start_time) & 0xFFFFFFFFULL),
-		    (u32_t) (total_msg_q_put_wo_cxt_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_msg_q_put_wo_cxt_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("Message Queue get with context switch",
-		    (u32_t)((__msg_q_get_w_cxt_end_time -
+		    (uint32_t)((__msg_q_get_w_cxt_end_time -
 			     __msg_q_get_w_cxt_start_time) & 0xFFFFFFFFULL),
-		    (u32_t) (total_msg_q_get_w_cxt_time & 0xFFFFFFFFULL));
+		    (uint32_t) (total_msg_q_get_w_cxt_time & 0xFFFFFFFFULL));
 
 	PRINT_STATS("Message Queue get without context switch",
-		    (u32_t)((msg_q_get_wo_cxt_end_time -
+		    (uint32_t)((msg_q_get_wo_cxt_end_time -
 			     msg_q_get_wo_cxt_start_time) & 0xFFFFFFFFULL),
-		    (u32_t) (total_msg_q_get_wo_cxt_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_msg_q_get_wo_cxt_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("MailBox synchronous put",
-		    (u32_t)((mbox_sync_put_end_time - mbox_sync_put_start_time)
+		    (uint32_t)((mbox_sync_put_end_time - mbox_sync_put_start_time)
 			    & 0xFFFFFFFFULL),
-		    (u32_t) (total_mbox_sync_put_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_mbox_sync_put_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("MailBox synchronous get",
-		    (u32_t)((mbox_sync_get_end_time - mbox_sync_get_start_time)
+		    (uint32_t)((mbox_sync_get_end_time - mbox_sync_get_start_time)
 			    & 0xFFFFFFFFULL),
-		    (u32_t) (total_mbox_sync_get_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_mbox_sync_get_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("MailBox asynchronous put",
-		    (u32_t)((mbox_async_put_end_time - mbox_async_put_start_time)
+		    (uint32_t)((mbox_async_put_end_time - mbox_async_put_start_time)
 			    & 0xFFFFFFFFULL),
-		    (u32_t) (total_mbox_async_put_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_mbox_async_put_time  & 0xFFFFFFFFULL));
 
 	PRINT_STATS("MailBox get without context switch",
-		    (u32_t)((mbox_get_w_cxt_end_time - mbox_get_w_cxt_start_time)
+		    (uint32_t)((mbox_get_w_cxt_end_time - mbox_get_w_cxt_start_time)
 			    & 0xFFFFFFFFULL),
-		    (u32_t) (total_mbox_get_w_cxt_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_mbox_get_w_cxt_time  & 0xFFFFFFFFULL));
 
 }
 
@@ -332,7 +332,7 @@ void thread_producer_msgq_w_cxt_switch(void *p1, void *p2, void *p3)
 
 	arch_timing_value_swap_end = 1U;
 	TIMING_INFO_PRE_READ();
-	__msg_q_put_w_cxt_start_time = (u32_t) TIMING_INFO_OS_GET_TIME();
+	__msg_q_put_w_cxt_start_time = (uint32_t) TIMING_INFO_OS_GET_TIME();
 	k_msgq_put(&benchmark_q, &data_to_send, K_NO_WAIT);
 }
 
diff --git a/tests/benchmarks/timing_info/src/semaphore_bench.c b/tests/benchmarks/timing_info/src/semaphore_bench.c
index 243b11302b..d9317f8616 100644
--- a/tests/benchmarks/timing_info/src/semaphore_bench.c
+++ b/tests/benchmarks/timing_info/src/semaphore_bench.c
@@ -22,18 +22,18 @@ extern K_THREAD_STACK_DEFINE(my_stack_area_0, STACK_SIZE);
 extern struct k_thread my_thread;
 extern struct k_thread my_thread_0;
 
-/* u64_t thread_yield_start_time[1000]; */
-/* u64_t thread_yield_end_time[1000]; */
-extern u64_t thread_start_time;
-extern u64_t thread_end_time;
-u64_t sem_start_time;
-u64_t sem_end_time;
-u64_t sem_give_start_time;
-u64_t sem_give_end_time;
+/* uint64_t thread_yield_start_time[1000]; */
+/* uint64_t thread_yield_end_time[1000]; */
+extern uint64_t thread_start_time;
+extern uint64_t thread_end_time;
+uint64_t sem_start_time;
+uint64_t sem_end_time;
+uint64_t sem_give_start_time;
+uint64_t sem_give_end_time;
 
-u32_t swap_called;
-u64_t test_time2;
-u64_t test_time1;
+uint32_t swap_called;
+uint64_t test_time2;
+uint64_t test_time1;
 
 void thread_sem0_test(void *p1, void *p2, void *p3);
 void thread_sem1_test(void *p1, void *p2, void *p3);
@@ -43,8 +43,8 @@ void thread_sem1_give_test(void *p1, void *p2, void *p3);
 k_tid_t sem0_tid;
 k_tid_t sem1_tid;
 
-extern u64_t arch_timing_value_swap_common;
-extern u32_t arch_timing_value_swap_end;
+extern uint64_t arch_timing_value_swap_common;
+extern uint32_t arch_timing_value_swap_end;
 
 void semaphore_bench(void)
 {
@@ -63,9 +63,9 @@ void semaphore_bench(void)
 	k_sleep(K_MSEC(1000));
 
 
-	/* u64_t test_time1 = z_tsc_read(); */
+	/* uint64_t test_time1 = z_tsc_read(); */
 	sem_end_time = (arch_timing_value_swap_common);
-	u32_t sem_cycles = sem_end_time - sem_start_time;
+	uint32_t sem_cycles = sem_end_time - sem_start_time;
 
 	sem0_tid = k_thread_create(&my_thread, my_stack_area,
 				   STACK_SIZE, thread_sem0_give_test,
@@ -78,31 +78,31 @@ void semaphore_bench(void)
 
 	k_sleep(K_MSEC(1000));
 	sem_give_end_time = (arch_timing_value_swap_common);
-	u32_t sem_give_cycles = sem_give_end_time - sem_give_start_time;
+	uint32_t sem_give_cycles = sem_give_end_time - sem_give_start_time;
 
 
 	/* Semaphore without context switch*/
 	TIMING_INFO_PRE_READ();
-	u32_t sem_give_wo_cxt_start = TIMING_INFO_OS_GET_TIME();
+	uint32_t sem_give_wo_cxt_start = TIMING_INFO_OS_GET_TIME();
 
 	k_sem_give(&sem_bench);
 
 	TIMING_INFO_PRE_READ();
-	u32_t sem_give_wo_cxt_end = TIMING_INFO_OS_GET_TIME();
-	u32_t sem_give_wo_cxt_cycles = sem_give_wo_cxt_end -
+	uint32_t sem_give_wo_cxt_end = TIMING_INFO_OS_GET_TIME();
+	uint32_t sem_give_wo_cxt_cycles = sem_give_wo_cxt_end -
 					  sem_give_wo_cxt_start;
 
 	TIMING_INFO_PRE_READ();
-	u32_t sem_take_wo_cxt_start = TIMING_INFO_OS_GET_TIME();
+	uint32_t sem_take_wo_cxt_start = TIMING_INFO_OS_GET_TIME();
 
 	k_sem_take(&sem_bench, K_MSEC(10));
 	TIMING_INFO_PRE_READ();
-	u32_t sem_take_wo_cxt_end = TIMING_INFO_OS_GET_TIME();
-	u32_t sem_take_wo_cxt_cycles = sem_take_wo_cxt_end -
+	uint32_t sem_take_wo_cxt_end = TIMING_INFO_OS_GET_TIME();
+	uint32_t sem_take_wo_cxt_cycles = sem_take_wo_cxt_end -
 					  sem_take_wo_cxt_start;
 
-	/* TC_PRINT("test_time1 , %d cycles\n", (u32_t)test_time1); */
-	/* TC_PRINT("test_time2 , %d cycles\n", (u32_t)test_time2); */
+	/* TC_PRINT("test_time1 , %d cycles\n", (uint32_t)test_time1); */
+	/* TC_PRINT("test_time2 , %d cycles\n", (uint32_t)test_time2); */
 
 	PRINT_STATS("Semaphore Take with context switch",
 		sem_cycles, CYCLES_TO_NS(sem_cycles));
@@ -121,17 +121,17 @@ void semaphore_bench(void)
 K_MUTEX_DEFINE(mutex0);
 void mutex_bench(void)
 {
-	u32_t mutex_lock_start_time;
-	u32_t mutex_lock_end_time;
-	u32_t mutex_lock_diff = 0U;
+	uint32_t mutex_lock_start_time;
+	uint32_t mutex_lock_end_time;
+	uint32_t mutex_lock_diff = 0U;
 
-	u32_t mutex_unlock_start_time;
-	u32_t mutex_unlock_end_time;
-	u32_t mutex_unlock_diff = 0U;
-	u32_t count = 0U;
+	uint32_t mutex_unlock_start_time;
+	uint32_t mutex_unlock_end_time;
+	uint32_t mutex_unlock_diff = 0U;
+	uint32_t count = 0U;
 
 	for (int i = 0; i < 1000; i++) {
-		s64_t before = k_uptime_get();
+		int64_t before = k_uptime_get();
 
 		TIMING_INFO_PRE_READ();
 		mutex_lock_start_time = TIMING_INFO_OS_GET_TIME();
@@ -150,7 +150,7 @@ void mutex_bench(void)
 		mutex_unlock_end_time = TIMING_INFO_OS_GET_TIME();
 
 		/* If timer interrupt occurs we need to omit that sample*/
-		s64_t after = k_uptime_get();
+		int64_t after = k_uptime_get();
 
 		if (after - before) {
 			continue;
@@ -183,7 +183,7 @@ void thread_sem1_test(void *p1, void *p2, void *p3)
 	k_sem_take(&sem_bench, K_MSEC(10));
 }
 
-u32_t sem_count;
+uint32_t sem_count;
 void thread_sem0_test(void *p1, void *p2, void *p3)
 {
 	k_sem_take(&sem_bench, K_MSEC(10));/* To sync threads */
diff --git a/tests/benchmarks/timing_info/src/thread_bench.c b/tests/benchmarks/timing_info/src/thread_bench.c
index 59bfed5fc9..752380e2c6 100644
--- a/tests/benchmarks/timing_info/src/thread_bench.c
+++ b/tests/benchmarks/timing_info/src/thread_bench.c
@@ -19,24 +19,24 @@ char sline[256];
 /* FILE *output_file = stdout; */
 
 /* location of the time stamps*/
-extern u32_t arch_timing_value_swap_end;
-extern u64_t arch_timing_value_swap_temp;
-extern u64_t arch_timing_value_swap_common;
+extern uint32_t arch_timing_value_swap_end;
+extern uint64_t arch_timing_value_swap_temp;
+extern uint64_t arch_timing_value_swap_common;
 
-volatile u64_t thread_abort_end_time;
-volatile u64_t thread_abort_start_time;
+volatile uint64_t thread_abort_end_time;
+volatile uint64_t thread_abort_start_time;
 
 /* Thread suspend*/
-volatile u64_t thread_suspend_start_time;
-volatile u64_t thread_suspend_end_time;
+volatile uint64_t thread_suspend_start_time;
+volatile uint64_t thread_suspend_end_time;
 
 /* Thread resume*/
-volatile u64_t thread_resume_start_time;
-volatile u64_t thread_resume_end_time;
+volatile uint64_t thread_resume_start_time;
+volatile uint64_t thread_resume_end_time;
 
 /* Thread sleep*/
-volatile u64_t thread_sleep_start_time;
-volatile u64_t thread_sleep_end_time;
+volatile uint64_t thread_sleep_start_time;
+volatile uint64_t thread_sleep_end_time;
 
 /*For benchmarking msg queues*/
 k_tid_t producer_tid;
@@ -48,10 +48,10 @@ K_THREAD_STACK_DEFINE(my_stack_area_0, STACK_SIZE);
 struct k_thread my_thread;
 struct k_thread my_thread_0;
 
-u32_t arch_timing_value_swap_end_test = 1U;
-u64_t dummy_time;
-u64_t start_time;
-u64_t test_end_time;
+uint32_t arch_timing_value_swap_end_test = 1U;
+uint64_t dummy_time;
+uint64_t start_time;
+uint64_t test_end_time;
 
 /* Disable the overhead calculations, this is needed to calculate
  * the overhead created by the benchmarking code itself.
@@ -59,7 +59,7 @@ u64_t test_end_time;
 #define DISABLE_OVERHEAD_MEASUREMENT
 
 #if defined(CONFIG_X86) && !defined(DISABLE_OVERHEAD_MEASUREMENT)
-u32_t benchmarking_overhead_swap(void)
+uint32_t benchmarking_overhead_swap(void)
 {
 
 	__asm__ __volatile__ (
@@ -115,14 +115,14 @@ void main_msg_bench(void);
 void system_thread_bench(void)
 {
 	/*Thread create*/
-	u64_t thread_create_start_time;
-	u64_t thread_create_end_time;
+	uint64_t thread_create_start_time;
+	uint64_t thread_create_end_time;
 
 	DECLARE_VAR(thread, create)
 
 	/*Thread cancel*/
-	u64_t thread_cancel_start_time;
-	u64_t thread_cancel_end_time;
+	uint64_t thread_cancel_start_time;
+	uint64_t thread_cancel_end_time;
 	DECLARE_VAR(thread, cancel)
 
 	/* Thread Abort*/
@@ -151,11 +151,11 @@ void system_thread_bench(void)
 	 * arch_timing_swap_start.
 	 */
 #endif
-	u32_t total_swap_cycles = arch_timing_swap_end - arch_timing_swap_start;
+	uint32_t total_swap_cycles = arch_timing_swap_end - arch_timing_swap_start;
 
 	/* Interrupt latency*/
-	u64_t local_end_intr_time = arch_timing_irq_end;
-	u64_t local_start_intr_time = arch_timing_irq_start;
+	uint64_t local_end_intr_time = arch_timing_irq_end;
+	uint64_t local_start_intr_time = arch_timing_irq_start;
 
 	/*******************************************************************/
 	/* thread create*/
@@ -210,57 +210,57 @@ void system_thread_bench(void)
 
 	/* Only print lower 32bit of time result */
 	PRINT_STATS("Context switch",
-		(u32_t)(total_swap_cycles & 0xFFFFFFFFULL),
-		(u32_t) CYCLES_TO_NS(total_swap_cycles));
+		(uint32_t)(total_swap_cycles & 0xFFFFFFFFULL),
+		(uint32_t) CYCLES_TO_NS(total_swap_cycles));
 
 	/*TC_PRINT("Swap Overhead:%d cycles\n", benchmarking_overhead_swap());*/
 
 	/*Interrupt latency */
-	u32_t intr_latency_cycles = SUBTRACT_CLOCK_CYCLES(local_end_intr_time) -
+	uint32_t intr_latency_cycles = SUBTRACT_CLOCK_CYCLES(local_end_intr_time) -
 		SUBTRACT_CLOCK_CYCLES(local_start_intr_time);
 
 	PRINT_STATS("Interrupt latency",
-		(u32_t)(intr_latency_cycles),
-		(u32_t) (CYCLES_TO_NS(intr_latency_cycles)));
+		(uint32_t)(intr_latency_cycles),
+		(uint32_t) (CYCLES_TO_NS(intr_latency_cycles)));
 
 	/*tick overhead*/
-	u32_t tick_overhead_cycles =
+	uint32_t tick_overhead_cycles =
 		SUBTRACT_CLOCK_CYCLES(arch_timing_tick_end) -
 		SUBTRACT_CLOCK_CYCLES(arch_timing_tick_start);
 
 	PRINT_STATS("Tick overhead",
-		(u32_t)(tick_overhead_cycles),
-		(u32_t) (CYCLES_TO_NS(tick_overhead_cycles)));
+		(uint32_t)(tick_overhead_cycles),
+		(uint32_t) (CYCLES_TO_NS(tick_overhead_cycles)));
 
 	/*thread creation*/
 	PRINT_STATS("Thread Creation",
-		(u32_t)((thread_create_end_time - thread_create_start_time) &
+		(uint32_t)((thread_create_end_time - thread_create_start_time) &
 			   0xFFFFFFFFULL),
-		(u32_t) ((total_thread_create_time) & 0xFFFFFFFFULL));
+		(uint32_t) ((total_thread_create_time) & 0xFFFFFFFFULL));
 
 	/*thread cancel*/
 	PRINT_STATS("Thread cancel",
-		(u32_t)((thread_cancel_end_time - thread_cancel_start_time) &
+		(uint32_t)((thread_cancel_end_time - thread_cancel_start_time) &
 			   0xFFFFFFFFULL),
-		(u32_t) (total_thread_cancel_time  & 0xFFFFFFFFULL));
+		(uint32_t) (total_thread_cancel_time  & 0xFFFFFFFFULL));
 
 	/*thread abort*/
 	PRINT_STATS("Thread abort",
-		(u32_t)((thread_abort_end_time - thread_abort_start_time) &
+		(uint32_t)((thread_abort_end_time - thread_abort_start_time) &
 			   0xFFFFFFFFULL),
-		(u32_t) (total_thread_abort_time  & 0xFFFFFFFFULL));
+		(uint32_t) (total_thread_abort_time  & 0xFFFFFFFFULL));
 
 	/*thread suspend*/
 	PRINT_STATS("Thread Suspend",
-		(u32_t)((thread_suspend_end_time - thread_suspend_start_time) &
+		(uint32_t)((thread_suspend_end_time - thread_suspend_start_time) &
 			   0xFFFFFFFFULL),
-		(u32_t) (total_thread_suspend_time  & 0xFFFFFFFFULL));
+		(uint32_t) (total_thread_suspend_time  & 0xFFFFFFFFULL));
 
 	/*thread resume*/
 	PRINT_STATS("Thread Resume",
-		(u32_t)((thread_resume_end_time - thread_suspend_end_time)
+		(uint32_t)((thread_resume_end_time - thread_suspend_end_time)
 			   & 0xFFFFFFFFULL),
-		(u32_t) (total_thread_resume_time  & 0xFFFFFFFFULL));
+		(uint32_t) (total_thread_resume_time  & 0xFFFFFFFFULL));
 
 
 }
@@ -281,16 +281,16 @@ void thread_suspend_test(void *p1, void *p2, void *p3)
 void heap_malloc_free_bench(void)
 {
 	/* heap malloc*/
-	u64_t heap_malloc_start_time = 0U;
-	u64_t heap_malloc_end_time = 0U;
+	uint64_t heap_malloc_start_time = 0U;
+	uint64_t heap_malloc_end_time = 0U;
 
 	/* heap free*/
-	u64_t heap_free_start_time = 0U;
-	u64_t heap_free_end_time = 0U;
+	uint64_t heap_free_start_time = 0U;
+	uint64_t heap_free_end_time = 0U;
 
-	s32_t count = 0;
-	u32_t sum_malloc = 0U;
-	u32_t sum_free = 0U;
+	int32_t count = 0;
+	uint32_t sum_malloc = 0U;
+	uint32_t sum_free = 0U;
 
 	k_sleep(K_MSEC(10));
 	while (count++ != 100) {
@@ -316,10 +316,10 @@ void heap_malloc_free_bench(void)
 	}
 
 	PRINT_STATS("Heap Malloc",
-		(u32_t)((sum_malloc / count) & 0xFFFFFFFFULL),
-		(u32_t)(CYCLES_TO_NS(sum_malloc / count)));
+		(uint32_t)((sum_malloc / count) & 0xFFFFFFFFULL),
+		(uint32_t)(CYCLES_TO_NS(sum_malloc / count)));
 	PRINT_STATS("Heap Free",
-		(u32_t)((sum_free / count) & 0xFFFFFFFFULL),
-		(u32_t)(CYCLES_TO_NS(sum_free / count)));
+		(uint32_t)((sum_free / count) & 0xFFFFFFFFULL),
+		(uint32_t)(CYCLES_TO_NS(sum_free / count)));
 
 }
diff --git a/tests/benchmarks/timing_info/src/timing_info.h b/tests/benchmarks/timing_info/src/timing_info.h
index 0229fe8ebd..a5366ab666 100644
--- a/tests/benchmarks/timing_info/src/timing_info.h
+++ b/tests/benchmarks/timing_info/src/timing_info.h
@@ -14,7 +14,7 @@
 	}
 
 #define DECLARE_VAR(profile, name) \
-	u64_t total_##profile##_##name##_time;
+	uint64_t total_##profile##_##name##_time;
 
 /* Stack size for all the threads created in this benchmark */
 #define STACK_SIZE (512 + CONFIG_TEST_EXTRA_STACKSIZE)
@@ -60,13 +60,13 @@
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()      (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE()  (SysTick->VAL)
-#define SUBTRACT_CLOCK_CYCLES(val)     (SysTick->LOAD - (u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)     (SysTick->LOAD - (uint32_t)val)
 
 #elif defined(CONFIG_ARC)
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()     (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE() (z_arc_v2_aux_reg_read(_ARC_V2_TMR0_COUNT))
-#define SUBTRACT_CLOCK_CYCLES(val)    ((u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)    ((uint32_t)val)
 
 #elif defined(CONFIG_NIOS2)
 #include "altera_avalon_timer_regs.h"
@@ -74,24 +74,24 @@
 	(IOWR_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE, 10))
 
 #define TIMING_INFO_OS_GET_TIME()      (SUBTRACT_CLOCK_CYCLES(\
-	((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
-	| ((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE))))
+	((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
+	| ((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE))))
 
 #define TIMING_INFO_GET_TIMER_VALUE()  (\
-	((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
-	| ((u32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE)))
+	((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPH(TIMER_0_BASE) << 16)\
+	| ((uint32_t)IORD_ALTERA_AVALON_TIMER_SNAPL(TIMER_0_BASE)))
 
 #define SUBTRACT_CLOCK_CYCLES(val)     \
 	((IORD_ALTERA_AVALON_TIMER_PERIODH(TIMER_0_BASE)	\
 	  << 16 |						\
 	  (IORD_ALTERA_AVALON_TIMER_PERIODL(TIMER_0_BASE)))	\
-	 - ((u32_t)val))
+	 - ((uint32_t)val))
 
 #else
 #define TIMING_INFO_PRE_READ()
 #define TIMING_INFO_OS_GET_TIME()      (k_cycle_get_32())
 #define TIMING_INFO_GET_TIMER_VALUE()  (k_cycle_get_32())
-#define SUBTRACT_CLOCK_CYCLES(val)     ((u32_t)val)
+#define SUBTRACT_CLOCK_CYCLES(val)     ((uint32_t)val)
 #endif
 
 /******************************************************************************/
@@ -128,7 +128,7 @@ static inline void benchmark_timer_start(void)
 }
 
 /* Get Core Frequency in MHz */
-static inline u32_t get_core_freq_MHz(void)
+static inline uint32_t get_core_freq_MHz(void)
 {
 	return SystemCoreClock/1000000;
 }
@@ -169,7 +169,7 @@ static inline void benchmark_timer_start(void)
 }
 
 /* 48MHz counter frequency */
-static inline u32_t get_core_freq_MHz(void)
+static inline uint32_t get_core_freq_MHz(void)
 {
 	return CYCLES_PER_SEC;
 }
@@ -180,12 +180,12 @@ static inline void benchmark_timer_init(void)  {       }
 static inline void benchmark_timer_stop(void)  {       }
 static inline void benchmark_timer_start(void) {       }
 
-extern u32_t x86_cyc_to_ns_floor64(u64_t cyc);
-extern u32_t x86_get_timer_freq_MHz(void);
+extern uint32_t x86_cyc_to_ns_floor64(uint64_t cyc);
+extern uint32_t x86_get_timer_freq_MHz(void);
 
 #define CYCLES_TO_NS(x) x86_cyc_to_ns_floor64(x)
 
-static inline u32_t get_core_freq_MHz(void)
+static inline uint32_t get_core_freq_MHz(void)
 {
 	return x86_get_timer_freq_MHz();
 }
@@ -198,10 +198,10 @@ static inline void benchmark_timer_init(void)  {       }
 static inline void benchmark_timer_stop(void)  {       }
 static inline void benchmark_timer_start(void) {       }
 
-#define CYCLES_TO_NS(x) (u32_t)k_cyc_to_ns_floor64(x)
+#define CYCLES_TO_NS(x) (uint32_t)k_cyc_to_ns_floor64(x)
 
 /* Get Core Frequency in MHz */
-static inline u32_t get_core_freq_MHz(void)
+static inline uint32_t get_core_freq_MHz(void)
 {
 	return  (sys_clock_hw_cycles_per_sec() / 1000000);
 }
@@ -269,7 +269,7 @@ void userspace_bench(void);
 #ifdef CONFIG_USERSPACE
 #include <syscall_handler.h>
 __syscall int k_dummy_syscall(void);
-__syscall u32_t userspace_read_timer_value(void);
+__syscall uint32_t userspace_read_timer_value(void);
 __syscall int validation_overhead_syscall(void);
 #include <syscalls/timing_info.h>
 #endif	/* CONFIG_USERSPACE */
diff --git a/tests/benchmarks/timing_info/src/userspace_bench.c b/tests/benchmarks/timing_info/src/userspace_bench.c
index b1d2caf5b1..85bb3d4673 100644
--- a/tests/benchmarks/timing_info/src/userspace_bench.c
+++ b/tests/benchmarks/timing_info/src/userspace_bench.c
@@ -20,10 +20,10 @@ K_APPMEM_PARTITION_DEFINE(bench_ptn);
 struct k_mem_domain bench_domain;
 
 extern char sline[256];
-extern u64_t arch_timing_enter_user_mode_end;
+extern uint64_t arch_timing_enter_user_mode_end;
 
-u32_t drop_to_user_mode_end_time, drop_to_user_mode_start_time;
-u32_t user_thread_creation_end_time, user_thread_creation_start_time;
+uint32_t drop_to_user_mode_end_time, drop_to_user_mode_start_time;
+uint32_t user_thread_creation_end_time, user_thread_creation_start_time;
 
 struct k_thread my_thread_user;
 K_THREAD_STACK_EXTERN(my_stack_area);
@@ -32,13 +32,13 @@ K_THREAD_STACK_EXTERN(my_stack_area_0);
 
 /******************************************************************************/
 /* syscall needed to read timer value when in user space */
-u32_t z_impl_userspace_read_timer_value(void)
+uint32_t z_impl_userspace_read_timer_value(void)
 {
 	TIMING_INFO_PRE_READ();
 	return TIMING_INFO_GET_TIMER_VALUE();
 }
 
-static inline u32_t z_vrfy_userspace_read_timer_value(void)
+static inline uint32_t z_vrfy_userspace_read_timer_value(void)
 {
 	TIMING_INFO_PRE_READ();
 	return TIMING_INFO_GET_TIMER_VALUE();
@@ -73,7 +73,7 @@ void userspace_bench(void)
 
 void test_drop_to_user_mode_1(void *p1, void *p2, void *p3)
 {
-	volatile u32_t dummy = 100U;
+	volatile uint32_t dummy = 100U;
 
 	dummy++;
 }
@@ -104,21 +104,21 @@ void drop_to_user_mode(void)
 
 	k_yield();
 
-	drop_to_user_mode_end_time = (u32_t)
+	drop_to_user_mode_end_time = (uint32_t)
 		SUBTRACT_CLOCK_CYCLES(arch_timing_enter_user_mode_end);
 
-	u32_t tmp_start_time =
+	uint32_t tmp_start_time =
 		SUBTRACT_CLOCK_CYCLES(drop_to_user_mode_start_time);
 
-	u32_t total_drop_to_user_mode_time =
-		CYCLES_TO_NS((u32_t)
+	uint32_t total_drop_to_user_mode_time =
+		CYCLES_TO_NS((uint32_t)
 			     ((drop_to_user_mode_end_time - tmp_start_time) &
 			      0xFFFFFFFFULL));
 
 	PRINT_STATS("Drop to user mode",
-		    (u32_t)((drop_to_user_mode_end_time - tmp_start_time) &
+		    (uint32_t)((drop_to_user_mode_end_time - tmp_start_time) &
 		     0xFFFFFFFFULL),
-		    (u32_t) (total_drop_to_user_mode_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_drop_to_user_mode_time  & 0xFFFFFFFFULL));
 
 
 
@@ -127,7 +127,7 @@ void drop_to_user_mode(void)
 /******************************************************************************/
 void user_thread_creation(void)
 {
-	u32_t total_user_thread_creation_time;
+	uint32_t total_user_thread_creation_time;
 
 	TIMING_INFO_PRE_READ();
 	user_thread_creation_start_time = TIMING_INFO_GET_TIMER_VALUE();
@@ -141,7 +141,7 @@ void user_thread_creation(void)
 	user_thread_creation_end_time = TIMING_INFO_GET_TIMER_VALUE();
 	k_thread_abort(&my_thread_user);
 
-	u32_t total_cycles = (u32_t)
+	uint32_t total_cycles = (uint32_t)
 		((SUBTRACT_CLOCK_CYCLES(user_thread_creation_end_time) -
 		  SUBTRACT_CLOCK_CYCLES(user_thread_creation_start_time)) &
 		 0xFFFFFFFFULL);
@@ -150,13 +150,13 @@ void user_thread_creation(void)
 
 	PRINT_STATS("User thread Creation",
 		    total_cycles,
-		    (u32_t) (total_user_thread_creation_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_user_thread_creation_time  & 0xFFFFFFFFULL));
 
 }
 
 /******************************************************************************/
 /* dummy syscalls creation */
-K_APP_BMEM(bench_ptn) u32_t syscall_overhead_start_time,
+K_APP_BMEM(bench_ptn) uint32_t syscall_overhead_start_time,
 	syscall_overhead_end_time;
 
 int z_impl_k_dummy_syscall(void)
@@ -184,7 +184,7 @@ void syscall_overhead_user_thread(void *p1, void *p2, void *p3)
 
 void syscall_overhead(void)
 {
-	u32_t total_syscall_overhead_time;
+	uint32_t total_syscall_overhead_time;
 
 	k_thread_create(&my_thread_user, my_stack_area_0, STACK_SIZE,
 			syscall_overhead_user_thread,
@@ -192,7 +192,7 @@ void syscall_overhead(void)
 			-1 /*priority*/, K_INHERIT_PERMS | K_USER, K_NO_WAIT);
 
 
-	u32_t total_cycles = (u32_t)
+	uint32_t total_cycles = (uint32_t)
 		((SUBTRACT_CLOCK_CYCLES(syscall_overhead_end_time) -
 		  SUBTRACT_CLOCK_CYCLES(syscall_overhead_start_time)) &
 		 0xFFFFFFFFULL);
@@ -201,16 +201,16 @@ void syscall_overhead(void)
 
 	PRINT_STATS("Syscall overhead",
 		    total_cycles,
-		    (u32_t) (total_syscall_overhead_time  & 0xFFFFFFFFULL));
+		    (uint32_t) (total_syscall_overhead_time  & 0xFFFFFFFFULL));
 
 }
 
 /******************************************************************************/
 K_SEM_DEFINE(test_sema, 1, 10);
-u32_t validation_overhead_obj_init_start_time;
-u32_t validation_overhead_obj_init_end_time;
-u32_t validation_overhead_obj_start_time;
-u32_t validation_overhead_obj_end_time;
+uint32_t validation_overhead_obj_init_start_time;
+uint32_t validation_overhead_obj_init_end_time;
+uint32_t validation_overhead_obj_start_time;
+uint32_t validation_overhead_obj_end_time;
 
 int z_impl_validation_overhead_syscall(void)
 {
@@ -256,30 +256,30 @@ void validation_overhead(void)
 			-1 /*priority*/, K_INHERIT_PERMS | K_USER, K_NO_WAIT);
 
 
-	u32_t total_cycles_obj_init = (u32_t)
+	uint32_t total_cycles_obj_init = (uint32_t)
 		((SUBTRACT_CLOCK_CYCLES(validation_overhead_obj_init_end_time) -
 		  SUBTRACT_CLOCK_CYCLES(validation_overhead_obj_init_start_time)
 		  ) & 0xFFFFFFFFULL);
 
-	u32_t total_cycles_obj = (u32_t)
+	uint32_t total_cycles_obj = (uint32_t)
 		((SUBTRACT_CLOCK_CYCLES(validation_overhead_obj_end_time) -
 		  SUBTRACT_CLOCK_CYCLES(validation_overhead_obj_start_time)) &
 		 0xFFFFFFFFULL);
 
-	u32_t total_validation_overhead_obj_init_time =
+	uint32_t total_validation_overhead_obj_init_time =
 		CYCLES_TO_NS(total_cycles_obj_init);
 
-	u32_t  total_validation_overhead_obj_time =
+	uint32_t  total_validation_overhead_obj_time =
 		CYCLES_TO_NS(total_cycles_obj);
 
 	PRINT_STATS("Validation overhead k object init",
 		    total_cycles_obj_init,
-		    (u32_t) (total_validation_overhead_obj_init_time  &
+		    (uint32_t) (total_validation_overhead_obj_init_time  &
 			     0xFFFFFFFFULL));
 
 	PRINT_STATS("Validation overhead k object permission",
 		    total_cycles_obj,
-		    (u32_t) (total_validation_overhead_obj_time  &
+		    (uint32_t) (total_validation_overhead_obj_time  &
 			     0xFFFFFFFFULL));
 
 
diff --git a/tests/benchmarks/timing_info/src/yield_bench.c b/tests/benchmarks/timing_info/src/yield_bench.c
index a8b79ff678..0d74e8dd78 100644
--- a/tests/benchmarks/timing_info/src/yield_bench.c
+++ b/tests/benchmarks/timing_info/src/yield_bench.c
@@ -20,11 +20,11 @@ extern struct k_thread my_thread_0;
 
 extern char sline[];
 
-extern u64_t thread_sleep_start_time;
-extern u64_t thread_sleep_end_time;
-u64_t thread_start_time;
-u64_t thread_end_time;
-static u32_t count;
+extern uint64_t thread_sleep_start_time;
+extern uint64_t thread_sleep_end_time;
+uint64_t thread_start_time;
+uint64_t thread_end_time;
+static uint32_t count;
 
 void thread_yield0_test(void *p1, void *p2, void *p3);
 void thread_yield1_test(void *p1, void *p2, void *p3);
@@ -53,10 +53,10 @@ void yield_bench(void)
 	TIMING_INFO_PRE_READ();
 	thread_sleep_start_time =   TIMING_INFO_OS_GET_TIME();
 	k_sleep(K_MSEC(1000));
-	thread_sleep_end_time =   ((u32_t)arch_timing_value_swap_common);
+	thread_sleep_end_time =   ((uint32_t)arch_timing_value_swap_common);
 
-	u32_t yield_cycles = (thread_end_time - thread_start_time) / 2000U;
-	u32_t sleep_cycles = thread_sleep_end_time - thread_sleep_start_time;
+	uint32_t yield_cycles = (thread_end_time - thread_start_time) / 2000U;
+	uint32_t sleep_cycles = thread_sleep_end_time - thread_sleep_start_time;
 
 	PRINT_STATS("Thread Yield", yield_cycles,
 		CYCLES_TO_NS(yield_cycles));
diff --git a/tests/bluetooth/at/src/main.c b/tests/bluetooth/at/src/main.c
index 7a98766cc5..4de70b2004 100644
--- a/tests/bluetooth/at/src/main.c
+++ b/tests/bluetooth/at/src/main.c
@@ -23,7 +23,7 @@ static const char example_data[] = "\r\n+ABCD:999\r\n";
 
 int at_handle(struct at_client *hf_at)
 {
-	u32_t val;
+	uint32_t val;
 
 	zassert_equal(at_get_number(hf_at, &val), 0, "Error getting value");
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
index f8caea3167..8451bfc6c7 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
@@ -96,9 +96,9 @@ static void test_con1_tick(bs_time_t HW_device_time)
 	}
 }
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			struct bt_gatt_subscribe_params *params,
-			const void *data, u16_t length)
+			const void *data, uint16_t length)
 {
 	static int notify_count;
 	if (!data) {
@@ -128,7 +128,7 @@ static u8_t notify_func(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 		const struct bt_gatt_attr *attr,
 		struct bt_gatt_discover_params *params)
 {
@@ -204,7 +204,7 @@ static struct bt_conn_auth_cb auth_cb_success = {
 	.pairing_complete = update_conn,
 };
 
-static void connected(struct bt_conn *conn, u8_t conn_err)
+static void connected(struct bt_conn *conn, uint8_t conn_err)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 	int err;
@@ -235,10 +235,10 @@ static void connected(struct bt_conn *conn, u8_t conn_err)
 	}
 }
 
-static void params_updated(struct bt_conn *conn, u16_t interval,
-			   u16_t latency, u16_t timeout)
+static void params_updated(struct bt_conn *conn, uint16_t interval,
+			   uint16_t latency, uint16_t timeout)
 {
-	u8_t chm[5] = { 0x11, 0x22, 0x33, 0x44, 0x00 };
+	uint8_t chm[5] = { 0x11, 0x22, 0x33, 0x44, 0x00 };
 	int err;
 
 	if (interval != UPDATE_PARAM_INTERVAL_MAX ||
@@ -284,15 +284,15 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	switch (data->type) {
 	case BT_DATA_UUID16_SOME:
 	case BT_DATA_UUID16_ALL:
-		if (data->data_len % sizeof(u16_t) != 0U) {
+		if (data->data_len % sizeof(uint16_t) != 0U) {
 			FAIL("AD malformed\n");
 			return true;
 		}
 
-		for (i = 0; i < data->data_len; i += sizeof(u16_t)) {
+		for (i = 0; i < data->data_len; i += sizeof(uint16_t)) {
 			struct bt_uuid *uuid;
 			struct bt_le_conn_param *param;
-			u16_t u16;
+			uint16_t u16;
 			int err;
 
 			memcpy(&u16, &data->data[i], sizeof(u16));
@@ -321,7 +321,7 @@ static bool eir_found(struct bt_data *data, void *user_data)
 	return true;
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 		struct net_buf_simple *ad)
 {
 	char dev[BT_ADDR_LE_STR_LEN];
@@ -337,7 +337,7 @@ static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t type,
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	char addr[BT_ADDR_LE_STR_LEN];
 	int err;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
index 384d8febbc..bc9efb03d3 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
@@ -74,7 +74,7 @@ static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL, 0x0d, 0x18, 0x0f, 0x18, 0x05, 0x18),
 };
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		FAIL("Connection failed (err 0x%02x)\n", err);
@@ -84,7 +84,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
@@ -116,7 +116,7 @@ static void bt_ready(void)
 
 static void bas_notify(void)
 {
-	u8_t battery_level = bt_gatt_bas_get_battery_level();
+	uint8_t battery_level = bt_gatt_bas_get_battery_level();
 
 	battery_level--;
 
@@ -129,7 +129,7 @@ static void bas_notify(void)
 
 static void hrs_notify(void)
 {
-	static u8_t heartrate = 90U;
+	static uint8_t heartrate = 90U;
 
 	/* Heartrate measurements simulation */
 	heartrate++;
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver.h b/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver.h
index c490487d5c..ac7c307956 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver.h
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver.h
@@ -24,8 +24,8 @@ extern "C" {
  */
 bool edtt_start(void);
 bool edtt_stop(void);
-int edtt_read(u8_t *ptr, size_t size, int flags);
-int edtt_write(u8_t *ptr, size_t size, int flags);
+int edtt_read(uint8_t *ptr, size_t size, int flags);
+int edtt_write(uint8_t *ptr, size_t size, int flags);
 
 #if defined(CONFIG_ARCH_POSIX)
 /**
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver_bsim.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver_bsim.c
index 8cdfe75c18..b866e24311 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver_bsim.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/common/edtt_driver_bsim.c
@@ -46,7 +46,7 @@ extern unsigned int global_device_nbr;
 
 static void edttd_clean_up(void);
 static void edptd_create_fifo_if(void);
-static int fifo_low_level_read(u8_t *bufptr, int size);
+static int fifo_low_level_read(uint8_t *bufptr, int size);
 
 bool edtt_start(void)
 {
@@ -57,7 +57,7 @@ bool edtt_start(void)
 
 	edptd_create_fifo_if();
 
-	extern void tm_set_phy_max_resync_offset(u64_t offset_in_us);
+	extern void tm_set_phy_max_resync_offset(uint64_t offset_in_us);
 	tm_set_phy_max_resync_offset(EDTT_SIMU_RESYNC_TIME_WITH_EDTT);
 	return true;
 }
@@ -90,7 +90,7 @@ NATIVE_TASK(edtt_stop, ON_EXIT, 1);
  *
  * Returns the amount of read bytes, or -1 on error
  */
-int edtt_read(u8_t *ptr, size_t size, int flags)
+int edtt_read(uint8_t *ptr, size_t size, int flags)
 {
 	if (edtt_mode_enabled == false) {
 		return -1;
@@ -132,7 +132,7 @@ int edtt_read(u8_t *ptr, size_t size, int flags)
  * <flags> is ignored in this driver, all writes to the tool are
  * instantaneous
  */
-int edtt_write(u8_t *ptr, size_t size, int flags)
+int edtt_write(uint8_t *ptr, size_t size, int flags)
 {
 	if (edtt_mode_enabled == false) {
 		return -1;
@@ -240,7 +240,7 @@ static void edttd_clean_up(void)
 	}
 }
 
-static int fifo_low_level_read(u8_t *bufptr, int size)
+static int fifo_low_level_read(uint8_t *bufptr, int size)
 {
 	int received_bytes = read(fifo[TO_DEVICE], bufptr, size);
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
index eec7197472..ba9d3959c4 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_1.c
@@ -38,8 +38,8 @@ extern struct bt_gatt_attr service_d_1_attrs[];
  */
 #define BT_UUID_VALUE_V3                BT_UUID_DECLARE_16(0xb003)
 
-static u8_t   value_v1_value = 0x01;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v1_value = 0x01;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
@@ -81,13 +81,13 @@ static u8_t   value_v2_value[] = {
 	      '9', '0', '0', '0', '0', '0', '1', '2', '3', '4', '5', '6', '7',
 	      '8', '9', '0', '1', '2', '\0'
 };
-static u8_t   value_v2_1_value[] = {
+static uint8_t   value_v2_1_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '9', '9', '0', '0', '0', '0', '0', '\0'
 };
-static u8_t   value_v3_value = 0x03;
+static uint8_t   value_v3_value = 0x03;
 
 /**
  * @brief Attribute read call back for the Value V1 attribute
@@ -103,9 +103,9 @@ static u8_t   value_v3_value = 0x03;
  */
 static ssize_t read_value_v1(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v1_value));
@@ -125,7 +125,7 @@ static ssize_t read_value_v1(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -148,7 +148,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -177,8 +177,8 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_1(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -207,9 +207,9 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
  */
 static ssize_t write_value_v3(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
index c5cfa83f0d..cf12a22d80 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_2.c
@@ -39,14 +39,14 @@ extern struct bt_gatt_attr service_c_1_2_attrs[];
  */
 #define BT_UUID_VALUE_V3                BT_UUID_DECLARE_16(0xb003)
 
-static u8_t   value_v1_value = 0x01;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v1_value = 0x01;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '9', '9', '0', '0', '0', '0', '0', '\0'
 };
-static u8_t   value_v3_value = 0x03;
+static uint8_t   value_v3_value = 0x03;
 
 /**
  * @brief Attribute read call back for the Value V1 attribute
@@ -62,9 +62,9 @@ static u8_t   value_v3_value = 0x03;
  */
 static ssize_t read_value_v1(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v1_value));
@@ -84,7 +84,7 @@ static ssize_t read_value_v1(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -107,7 +107,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -136,9 +136,9 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t write_value_v3(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
index d716db0135..d55e02a8bf 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_a_3.c
@@ -39,14 +39,14 @@ extern struct bt_gatt_attr service_c_1_3_attrs[];
  */
 #define BT_UUID_VALUE_V3                BT_UUID_DECLARE_16(0xb003)
 
-static u8_t   value_v1_value = 0x01;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v1_value = 0x01;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '9', '9', '0', '0', '0', '0', '0', '\0'
 };
-static u8_t   value_v3_value = 0x03;
+static uint8_t   value_v3_value = 0x03;
 
 /**
  * @brief Attribute read call back for the Value V1 attribute
@@ -62,9 +62,9 @@ static u8_t   value_v3_value = 0x03;
  */
 static ssize_t read_value_v1(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v1_value));
@@ -84,7 +84,7 @@ static ssize_t read_value_v1(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -107,7 +107,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -136,9 +136,9 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t write_value_v3(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
index 2055775f9c..10ea1f8e4a 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_1.c
@@ -31,23 +31,23 @@
  */
 #define BT_UUID_LONG_DES_V2D1           BT_UUID_DECLARE_16(0xb012)
 
-static u8_t   value_v4_value = 0x04;
-static u8_t   value_v4_1_value = 0x04;
-static u16_t  server_cha_con_value;
-static u8_t   value_v4_2_value = 0x04;
-static u8_t   long_des_v2d1_value[] = {
+static uint8_t   value_v4_value = 0x04;
+static uint8_t   value_v4_1_value = 0x04;
+static uint16_t  server_cha_con_value;
+static uint8_t   value_v4_2_value = 0x04;
+static uint8_t   long_des_v2d1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33
 };
-static u8_t   value_v4_3_value[] = {
+static uint8_t   value_v4_3_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33
 };
-static u8_t   long_des_v2d1_1_value[] = {
+static uint8_t   long_des_v2d1_1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
@@ -68,9 +68,9 @@ static u8_t   long_des_v2d1_1_value[] = {
  */
 static ssize_t read_value_v4(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v4_value));
@@ -91,9 +91,9 @@ static ssize_t read_value_v4(struct bt_conn *conn,
  */
 static ssize_t write_value_v4(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v4_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -119,9 +119,9 @@ static ssize_t write_value_v4(struct bt_conn *conn,
  */
 static ssize_t read_value_v4_1(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v4_1_value));
@@ -142,10 +142,10 @@ static ssize_t read_value_v4_1(struct bt_conn *conn,
  */
 static ssize_t write_value_v4_1(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v4_1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -172,10 +172,10 @@ static ssize_t write_value_v4_1(struct bt_conn *conn,
  */
 static ssize_t read_server_cha_con(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr, void *buf,
-				   u16_t len, u16_t offset)
+				   uint16_t len, uint16_t offset)
 {
-	const u16_t *value = attr->user_data;
-	u16_t server_cha_con_conv = sys_cpu_to_le16(*value);
+	const uint16_t *value = attr->user_data;
+	uint16_t server_cha_con_conv = sys_cpu_to_le16(*value);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset,
 				 &server_cha_con_conv,
@@ -198,18 +198,18 @@ static ssize_t read_server_cha_con(struct bt_conn *conn,
  */
 static ssize_t write_server_cha_con(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr,
-				    const void *buf, u16_t len, u16_t offset,
-				    u8_t flags)
+				    const void *buf, uint16_t len, uint16_t offset,
+				    uint8_t flags)
 {
-	u16_t *value = attr->user_data;
-	u16_t server_cha_con_conv = sys_cpu_to_le16(*value);
+	uint16_t *value = attr->user_data;
+	uint16_t server_cha_con_conv = sys_cpu_to_le16(*value);
 
 	if (offset >= sizeof(server_cha_con_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	if (offset + len > sizeof(server_cha_con_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 
-	memcpy((u8_t *)&server_cha_con_conv + offset, buf, len);
+	memcpy((uint8_t *)&server_cha_con_conv + offset, buf, len);
 
 	*value = sys_le16_to_cpu(server_cha_con_conv);
 
@@ -230,9 +230,9 @@ static ssize_t write_server_cha_con(struct bt_conn *conn,
  */
 static ssize_t read_value_v4_3(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v4_3_value));
@@ -252,9 +252,9 @@ static ssize_t read_value_v4_3(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d1_1(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d1_1_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
index 45f4f7a522..da3bf5f24e 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_2.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V4                BT_UUID_DECLARE_16(0xb004)
 
-static u8_t   value_v4_value = 0x04;
+static uint8_t   value_v4_value = 0x04;
 
 /**
  * @brief Attribute read call back for the Value V4 attribute
@@ -42,9 +42,9 @@ static u8_t   value_v4_value = 0x04;
  */
 static ssize_t read_value_v4(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v4_value));
@@ -65,9 +65,9 @@ static ssize_t read_value_v4(struct bt_conn *conn,
  */
 static ssize_t write_value_v4(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v4_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
index 3a676aeff5..4f44615edd 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_1_3.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V4                BT_UUID_DECLARE_16(0xb004)
 
-static u8_t   value_v4_value = 0x04;
+static uint8_t   value_v4_value = 0x04;
 
 /**
  * @brief Attribute read call back for the Value V4 attribute
@@ -42,9 +42,9 @@ static u8_t   value_v4_value = 0x04;
  */
 static ssize_t read_value_v4(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v4_value));
@@ -65,9 +65,9 @@ static ssize_t read_value_v4(struct bt_conn *conn,
  */
 static ssize_t write_value_v4(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v4_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
index 499ea6600b..62ec64d307 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_1.c
@@ -33,9 +33,9 @@
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd4, 0xd5, 0x00, 0x00)
 
-static u8_t   value_v5_value = 0x05;
+static uint8_t   value_v5_value = 0x05;
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0003 };
-static u8_t   cha_user_des_value[] = {
+static uint8_t   cha_user_des_value[] = {
 	      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
 	      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
 	      '\0'
@@ -43,7 +43,7 @@ static u8_t   cha_user_des_value[] = {
 static const struct bt_gatt_cpf cha_format_value = {
 	     0x04, 0x00, 0x3001, 0x01, 0x3111
 };
-static u8_t   des_v5d4__128_bit_uuid_value = 0x44;
+static uint8_t   des_v5d4__128_bit_uuid_value = 0x44;
 static bool   bAuthorized;
 
 /**
@@ -60,9 +60,9 @@ static bool   bAuthorized;
  */
 static ssize_t read_value_v5(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v5_value));
@@ -83,9 +83,9 @@ static ssize_t read_value_v5(struct bt_conn *conn,
  */
 static ssize_t write_value_v5(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v5_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -114,9 +114,9 @@ static ssize_t write_value_v5(struct bt_conn *conn,
  */
 static ssize_t read_des_v5d4__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v5d4__128_bit_uuid_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
index bc1a7a1582..a55402d76b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_2.c
@@ -33,10 +33,10 @@
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd4, 0xd5, 0x00, 0x00)
 
-static u8_t   value_v5_value = 0x05;
-static u8_t   des_v5d4__128_bit_uuid_value = 0x44;
+static uint8_t   value_v5_value = 0x05;
+static uint8_t   des_v5d4__128_bit_uuid_value = 0x44;
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0003 };
-static u8_t   cha_user_des_value[] = {
+static uint8_t   cha_user_des_value[] = {
 	      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
 	      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
 	      '\0'
@@ -59,9 +59,9 @@ static const struct bt_gatt_cpf cha_format_value = {
  */
 static ssize_t read_value_v5(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v5_value));
@@ -82,9 +82,9 @@ static ssize_t read_value_v5(struct bt_conn *conn,
  */
 static ssize_t write_value_v5(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v5_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -111,9 +111,9 @@ static ssize_t write_value_v5(struct bt_conn *conn,
  */
 static ssize_t read_des_v5d4__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v5d4__128_bit_uuid_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
index b230fc3344..f74329637a 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_2_3.c
@@ -33,14 +33,14 @@
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd4, 0xd5, 0x00, 0x00)
 
-static u8_t   value_v5_value = 0x05;
-static u8_t   cha_user_des_value[] = {
+static uint8_t   value_v5_value = 0x05;
+static uint8_t   cha_user_des_value[] = {
 	      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
 	      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
 	      '\0'
 };
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0003 };
-static u8_t   des_v5d4__128_bit_uuid_value = 0x44;
+static uint8_t   des_v5d4__128_bit_uuid_value = 0x44;
 static const struct bt_gatt_cpf cha_format_value = {
 	     0x04, 0x00, 0x3001, 0x01, 0x3111
 };
@@ -59,9 +59,9 @@ static const struct bt_gatt_cpf cha_format_value = {
  */
 static ssize_t read_value_v5(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v5_value));
@@ -82,9 +82,9 @@ static ssize_t read_value_v5(struct bt_conn *conn,
  */
 static ssize_t write_value_v5(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v5_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -111,9 +111,9 @@ static ssize_t write_value_v5(struct bt_conn *conn,
  */
 static ssize_t read_des_v5d4__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v5d4__128_bit_uuid_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
index db41df6694..492c698030 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_1.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V6                BT_UUID_DECLARE_16(0xb006)
 
-static u8_t   value_v6_value = 0x06;
+static uint8_t   value_v6_value = 0x06;
 static bool   value_v6_ntf_active;
 
 /**
@@ -43,9 +43,9 @@ static bool   value_v6_ntf_active;
  */
 static ssize_t read_value_v6(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v6_value));
@@ -66,9 +66,9 @@ static ssize_t read_value_v6(struct bt_conn *conn,
  */
 static ssize_t write_value_v6(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v6_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -87,7 +87,7 @@ static ssize_t write_value_v6(struct bt_conn *conn,
  * @param value The new value of the descriptor configuration
  */
 static void value_v6_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				     u16_t value)
+				     uint16_t value)
 {
 	value_v6_ntf_active = value == BT_GATT_CCC_NOTIFY;
 }
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
index 9e998b7520..e780570af8 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_2.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V6                BT_UUID_DECLARE_16(0xb006)
 
-static u8_t   value_v6_value = 0x06;
+static uint8_t   value_v6_value = 0x06;
 static struct bt_gatt_indicate_params ind_params;
 static bool   value_v6_ntf_active;
 static bool   value_v6_ind_active;
@@ -45,9 +45,9 @@ static bool   value_v6_ind_active;
  */
 static ssize_t read_value_v6(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v6_value));
@@ -68,9 +68,9 @@ static ssize_t read_value_v6(struct bt_conn *conn,
  */
 static ssize_t write_value_v6(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v6_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -89,7 +89,7 @@ static ssize_t write_value_v6(struct bt_conn *conn,
  * @param value The new value of the descriptor configuration
  */
 static void value_v6_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				     u16_t value)
+				     uint16_t value)
 {
 	value_v6_ntf_active = value == BT_GATT_CCC_NOTIFY;
 	value_v6_ind_active = value == BT_GATT_CCC_INDICATE;
@@ -147,7 +147,7 @@ void service_b_3_2_value_v6_notify(void)
  *             BT_GATT_ERR() with a specific ATT error code.
  */
 static void value_v6_indicate_cb(struct bt_conn *conn,
-				 const struct bt_gatt_attr *attr, u8_t err)
+				 const struct bt_gatt_attr *attr, uint8_t err)
 {
 	printk("Indication for attribute 'Value V6' %s\n",
 	       (err) ? "failed" : "succeded");
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
index 6f0a123fe6..11b64ebab0 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_3_3.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V6                BT_UUID_DECLARE_16(0xb006)
 
-static u8_t   value_v6_value = 0x06;
+static uint8_t   value_v6_value = 0x06;
 static struct bt_gatt_indicate_params ind_params;
 static bool   value_v6_ntf_active;
 static bool   value_v6_ind_active;
@@ -45,9 +45,9 @@ static bool   value_v6_ind_active;
  */
 static ssize_t read_value_v6(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v6_value));
@@ -68,9 +68,9 @@ static ssize_t read_value_v6(struct bt_conn *conn,
  */
 static ssize_t write_value_v6(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v6_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -89,7 +89,7 @@ static ssize_t write_value_v6(struct bt_conn *conn,
  * @param value The new value of the descriptor configuration
  */
 static void value_v6_ccc_cfg_changed(const struct bt_gatt_attr *attr,
-				     u16_t value)
+				     uint16_t value)
 {
 	value_v6_ntf_active = value == BT_GATT_CCC_NOTIFY;
 	value_v6_ind_active = value == BT_GATT_CCC_INDICATE;
@@ -147,7 +147,7 @@ void service_b_3_3_value_v6_notify(void)
  *             BT_GATT_ERR() with a specific ATT error code.
  */
 static void value_v6_indicate_cb(struct bt_conn *conn,
-				 const struct bt_gatt_attr *attr, u8_t err)
+				 const struct bt_gatt_attr *attr, uint8_t err)
 {
 	printk("Indication for attribute 'Value V6' %s\n",
 	       (err) ? "failed" : "succeded");
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
index 51061436b9..a42e8cc012 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_1.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V7                BT_UUID_DECLARE_16(0xb007)
 
-static u8_t   value_v7_value = 0x07;
+static uint8_t   value_v7_value = 0x07;
 
 /**
  * @brief Attribute write call back for the Value V7 attribute
@@ -43,9 +43,9 @@ static u8_t   value_v7_value = 0x07;
  */
 static ssize_t write_value_v7(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v7_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
index 9749408fda..1abdea061b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_2.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V7                BT_UUID_DECLARE_16(0xb007)
 
-static u8_t   value_v7_value = 0x07;
+static uint8_t   value_v7_value = 0x07;
 
 /**
  * @brief Attribute write call back for the Value V7 attribute
@@ -43,9 +43,9 @@ static u8_t   value_v7_value = 0x07;
  */
 static ssize_t write_value_v7(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v7_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
index 9825d27bb5..a7353b426b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_4_3.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V7                BT_UUID_DECLARE_16(0xb007)
 
-static u8_t   value_v7_value = 0x07;
+static uint8_t   value_v7_value = 0x07;
 
 /**
  * @brief Attribute write call back for the Value V7 attribute
@@ -43,9 +43,9 @@ static u8_t   value_v7_value = 0x07;
  */
 static ssize_t write_value_v7(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v7_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
index 9f3df6e304..83676b53cd 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_1.c
@@ -41,10 +41,10 @@
  */
 #define BT_UUID_DES_V8D3                BT_UUID_DECLARE_16(0xb017)
 
-static u8_t   value_v8_value = 0x08;
-static u8_t   des_v8d1_value = 0x01;
-static u8_t   des_v8d2_value = 0x02;
-static u8_t   des_v8d3_value = 0x03;
+static uint8_t   value_v8_value = 0x08;
+static uint8_t   des_v8d1_value = 0x01;
+static uint8_t   des_v8d2_value = 0x02;
+static uint8_t   des_v8d3_value = 0x03;
 static bool   bAuthorized;
 
 /**
@@ -61,9 +61,9 @@ static bool   bAuthorized;
  */
 static ssize_t read_value_v8(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v8_value));
@@ -84,9 +84,9 @@ static ssize_t read_value_v8(struct bt_conn *conn,
  */
 static ssize_t write_value_v8(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v8_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -112,9 +112,9 @@ static ssize_t write_value_v8(struct bt_conn *conn,
  */
 static ssize_t read_des_v8d1(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v8d1_value));
@@ -135,9 +135,9 @@ static ssize_t read_des_v8d1(struct bt_conn *conn,
  */
 static ssize_t write_des_v8d1(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v8d1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -163,9 +163,9 @@ static ssize_t write_des_v8d1(struct bt_conn *conn,
  */
 static ssize_t read_des_v8d2(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	if (!bAuthorized)
 		return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
@@ -189,9 +189,9 @@ static ssize_t read_des_v8d2(struct bt_conn *conn,
  */
 static ssize_t write_des_v8d2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v8d2_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -219,9 +219,9 @@ static ssize_t write_des_v8d2(struct bt_conn *conn,
  */
 static ssize_t read_des_v8d3(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v8d3_value));
@@ -242,9 +242,9 @@ static ssize_t read_des_v8d3(struct bt_conn *conn,
  */
 static ssize_t write_des_v8d3(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v8d3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
index 88c41d6d8e..0005ded90d 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_2.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V8                BT_UUID_DECLARE_16(0xb008)
 
-static u8_t   value_v8_value = 0x08;
+static uint8_t   value_v8_value = 0x08;
 
 /**
  * @brief Attribute read call back for the Value V8 attribute
@@ -42,9 +42,9 @@ static u8_t   value_v8_value = 0x08;
  */
 static ssize_t read_value_v8(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v8_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
index e8ed3a37bb..deb1d44808 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_b_5_3.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V8                BT_UUID_DECLARE_16(0xb008)
 
-static u8_t   value_v8_value = 0x08;
+static uint8_t   value_v8_value = 0x08;
 
 /**
  * @brief Attribute read call back for the Value V8 attribute
@@ -42,9 +42,9 @@ static u8_t   value_v8_value = 0x08;
  */
 static ssize_t read_value_v8(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v8_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
index 5d28b71a1a..1c71fca914 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_1.c
@@ -46,10 +46,10 @@ extern struct bt_gatt_attr service_d_1_attrs[];
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd3, 0xd9, 0x00, 0x00)
 
-static u8_t   value_v9__128_bit_uuid_value = 0x09;
+static uint8_t   value_v9__128_bit_uuid_value = 0x09;
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0001 };
-static u8_t   des_v9d2__128_bit_uuid_value = 0x22;
-static u8_t   des_v9d3__128_bit_uuid_value = 0x33;
+static uint8_t   des_v9d2__128_bit_uuid_value = 0x22;
+static uint8_t   des_v9d3__128_bit_uuid_value = 0x33;
 
 /**
  * @brief Attribute read call back for the Value V9 (128-bit UUID) attribute
@@ -65,9 +65,9 @@ static u8_t   des_v9d3__128_bit_uuid_value = 0x33;
  */
 static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v9__128_bit_uuid_value));
@@ -88,10 +88,10 @@ static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v9__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -118,9 +118,9 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v9d2__128_bit_uuid_value));
@@ -142,10 +142,10 @@ static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -173,10 +173,10 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
index 4796b316d2..487e569dc1 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_2.c
@@ -46,9 +46,9 @@ extern struct bt_gatt_attr service_d_2_attrs[];
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd3, 0xd9, 0x00, 0x00)
 
-static u8_t   value_v9__128_bit_uuid_value = 0x09;
-static u8_t   des_v9d2__128_bit_uuid_value = 0x22;
-static u8_t   des_v9d3__128_bit_uuid_value = 0x33;
+static uint8_t   value_v9__128_bit_uuid_value = 0x09;
+static uint8_t   des_v9d2__128_bit_uuid_value = 0x22;
+static uint8_t   des_v9d3__128_bit_uuid_value = 0x33;
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0001 };
 
 /**
@@ -65,9 +65,9 @@ static struct bt_gatt_cep cha_ext_pro_value = { 0x0001 };
  */
 static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v9__128_bit_uuid_value));
@@ -88,10 +88,10 @@ static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v9__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -118,9 +118,9 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v9d2__128_bit_uuid_value));
@@ -142,10 +142,10 @@ static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -173,10 +173,10 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
index cd2e6c08a6..61ed43e797 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_1_3.c
@@ -44,10 +44,10 @@
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0xd3, 0xd9, 0x00, 0x00)
 
-static u8_t   value_v9__128_bit_uuid_value = 0x09;
-static u8_t   des_v9d2__128_bit_uuid_value = 0x22;
+static uint8_t   value_v9__128_bit_uuid_value = 0x09;
+static uint8_t   des_v9d2__128_bit_uuid_value = 0x22;
 static struct bt_gatt_cep cha_ext_pro_value = { 0x0001 };
-static u8_t   des_v9d3__128_bit_uuid_value = 0x33;
+static uint8_t   des_v9d3__128_bit_uuid_value = 0x33;
 
 /**
  * @brief Attribute read call back for the Value V9 (128-bit UUID) attribute
@@ -63,9 +63,9 @@ static u8_t   des_v9d3__128_bit_uuid_value = 0x33;
  */
 static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v9__128_bit_uuid_value));
@@ -86,10 +86,10 @@ static ssize_t read_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v9__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -116,9 +116,9 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					   const struct bt_gatt_attr *attr,
-					   void *buf, u16_t len, u16_t offset)
+					   void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(des_v9d2__128_bit_uuid_value));
@@ -140,10 +140,10 @@ static ssize_t read_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -171,10 +171,10 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    const void *buf, u16_t len,
-					    u16_t offset, u8_t flags)
+					    const void *buf, uint16_t len,
+					    uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
index 5bebbc5392..998e92246c 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_1.c
@@ -48,101 +48,101 @@
  */
 #define BT_UUID_LONG_DES_V2D3           BT_UUID_DECLARE_16(0xb014)
 
-static u8_t   value_v10_value = 0x0A;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v10_value = 0x0A;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '\0'
 };
-static u8_t   long_des_v2d1_value[] = {
+static uint8_t   long_des_v2d1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11
 };
-static u8_t   value_v2_1_value[] = {
+static uint8_t   value_v2_1_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '\0'
 };
-static u8_t   long_des_v2d2_value[] = {
+static uint8_t   long_des_v2d2_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22
 };
-static u8_t   value_v2_2_value[] = {
+static uint8_t   value_v2_2_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '\0'
 };
-static u8_t   long_des_v2d3_value[] = {
+static uint8_t   long_des_v2d3_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22,
 	      0x33
 };
-static u8_t   value_v2_3_value[] = {
+static uint8_t   value_v2_3_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33
 };
-static u8_t   long_des_v2d1_1_value[] = {
+static uint8_t   long_des_v2d1_1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33
 };
-static u8_t   value_v2_4_value[] = {
+static uint8_t   value_v2_4_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44
 };
-static u8_t   long_des_v2d2_1_value[] = {
+static uint8_t   long_des_v2d2_1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44
 };
-static u8_t   value_v2_5_value[] = {
+static uint8_t   value_v2_5_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44,
 	      0x55
 };
-static u8_t   long_des_v2d3_1_value[] = {
+static uint8_t   long_des_v2d3_1_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44,
 	      0x55
 };
-static u8_t   value_v2_6_value[] = {
+static uint8_t   value_v2_6_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '\0'
 };
-static u8_t   long_des_v2d1_2_value[] = {
+static uint8_t   long_des_v2d1_2_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33
 };
-static u8_t   value_v2_7_value[] = {
+static uint8_t   value_v2_7_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '6', '6', '6', '7',
 	      '7', '7', '7', '7', '8', '8', '8', '8', '8', '9', '9', '9', '9',
 	      '9', '0', '0', '0', '0', '\0'
 };
-static u8_t   long_des_v2d2_2_value[] = {
+static uint8_t   long_des_v2d2_2_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
 	      0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x11, 0x22, 0x33, 0x44
 };
-static u8_t   value_v2_8_value[] = {
+static uint8_t   value_v2_8_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '7', '7', '8',
 	      '8', '8', '8', '8', '9', '9', '9', '9', '9', '0', '0', '0', '0',
 	      '0', '1', '1', '1', '1', '1', '\0'
 };
-static u8_t   long_des_v2d3_2_value[] = {
+static uint8_t   long_des_v2d3_2_value[] = {
 	      0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00, 0x12,
 	      0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34,
 	      0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x11, 0x22, 0x33,
@@ -165,9 +165,9 @@ static bool   bAuthorized;
  */
 static ssize_t read_value_v10(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v10_value));
@@ -187,7 +187,7 @@ static ssize_t read_value_v10(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -210,7 +210,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -238,9 +238,9 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d1(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr, void *buf,
-				  u16_t len, u16_t offset)
+				  uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d1_value));
@@ -261,10 +261,10 @@ static ssize_t read_long_des_v2d1(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d1(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr,
-				   const void *buf, u16_t len, u16_t offset,
-				   u8_t flags)
+				   const void *buf, uint16_t len, uint16_t offset,
+				   uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -291,8 +291,8 @@ static ssize_t write_long_des_v2d1(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_1(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -320,9 +320,9 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d2(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr, void *buf,
-				  u16_t len, u16_t offset)
+				  uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d2_value));
@@ -343,10 +343,10 @@ static ssize_t read_long_des_v2d2(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d2(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr,
-				   const void *buf, u16_t len, u16_t offset,
-				   u8_t flags)
+				   const void *buf, uint16_t len, uint16_t offset,
+				   uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d2_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -373,8 +373,8 @@ static ssize_t write_long_des_v2d2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_2(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -402,9 +402,9 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d3(struct bt_conn *conn,
 				  const struct bt_gatt_attr *attr, void *buf,
-				  u16_t len, u16_t offset)
+				  uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d3_value));
@@ -425,10 +425,10 @@ static ssize_t read_long_des_v2d3(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d3(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr,
-				   const void *buf, u16_t len, u16_t offset,
-				   u8_t flags)
+				   const void *buf, uint16_t len, uint16_t offset,
+				   uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -454,9 +454,9 @@ static ssize_t write_long_des_v2d3(struct bt_conn *conn,
  */
 static ssize_t read_value_v2_3(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v2_3_value));
@@ -477,10 +477,10 @@ static ssize_t read_value_v2_3(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_3(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v2_3_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -506,9 +506,9 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d1_1(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d1_1_value));
@@ -529,10 +529,10 @@ static ssize_t read_long_des_v2d1_1(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d1_1(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d1_1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -558,9 +558,9 @@ static ssize_t write_long_des_v2d1_1(struct bt_conn *conn,
  */
 static ssize_t read_value_v2_4(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v2_4_value));
@@ -581,10 +581,10 @@ static ssize_t read_value_v2_4(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_4(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v2_4_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -610,9 +610,9 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d2_1(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d2_1_value));
@@ -633,10 +633,10 @@ static ssize_t read_long_des_v2d2_1(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d2_1(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d2_1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -662,9 +662,9 @@ static ssize_t write_long_des_v2d2_1(struct bt_conn *conn,
  */
 static ssize_t read_value_v2_5(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v2_5_value));
@@ -685,10 +685,10 @@ static ssize_t read_value_v2_5(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_5(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v2_5_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -714,9 +714,9 @@ static ssize_t write_value_v2_5(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d3_1(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d3_1_value));
@@ -737,10 +737,10 @@ static ssize_t read_long_des_v2d3_1(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d3_1(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d3_1_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -767,8 +767,8 @@ static ssize_t write_long_des_v2d3_1(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_6(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -796,9 +796,9 @@ static ssize_t write_value_v2_6(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d1_2(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d1_2_value));
@@ -819,10 +819,10 @@ static ssize_t read_long_des_v2d1_2(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d1_2(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d1_2_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -848,7 +848,7 @@ static ssize_t write_long_des_v2d1_2(struct bt_conn *conn,
  */
 static ssize_t read_str_auth_value(struct bt_conn *conn,
 				   const struct bt_gatt_attr *attr, void *buf,
-				   u16_t len, u16_t offset)
+				   uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -873,8 +873,8 @@ static ssize_t read_str_auth_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_7(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -904,9 +904,9 @@ static ssize_t write_value_v2_7(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d2_2(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	if (!bAuthorized)
 		return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
@@ -930,10 +930,10 @@ static ssize_t read_long_des_v2d2_2(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d2_2(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d2_2_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -962,8 +962,8 @@ static ssize_t write_long_des_v2d2_2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_8(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -991,9 +991,9 @@ static ssize_t write_value_v2_8(struct bt_conn *conn,
  */
 static ssize_t read_long_des_v2d3_2(struct bt_conn *conn,
 				    const struct bt_gatt_attr *attr, void *buf,
-				    u16_t len, u16_t offset)
+				    uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(long_des_v2d3_2_value));
@@ -1014,10 +1014,10 @@ static ssize_t read_long_des_v2d3_2(struct bt_conn *conn,
  */
 static ssize_t write_long_des_v2d3_2(struct bt_conn *conn,
 				     const struct bt_gatt_attr *attr,
-				     const void *buf, u16_t len, u16_t offset,
-				     u8_t flags)
+				     const void *buf, uint16_t len, uint16_t offset,
+				     uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(long_des_v2d3_2_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
index 7752504a36..5318abb5f2 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_2.c
@@ -33,32 +33,32 @@
  */
 #define BT_UUID_VALUE_V2                BT_UUID_DECLARE_16(0xb002)
 
-static u8_t   value_v10_value = 0x0A;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v10_value = 0x0A;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '\0'
 };
-static u8_t   value_v2_1_value[] = {
+static uint8_t   value_v2_1_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '\0'
 };
-static u8_t   value_v2_2_value[] = {
+static uint8_t   value_v2_2_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '\0'
 };
-static u8_t   value_v2_3_value[] = {
+static uint8_t   value_v2_3_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '\0'
 };
-static u8_t   value_v2_4_value[] = {
+static uint8_t   value_v2_4_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '6', '6', '6', '7',
 	      '7', '7', '7', '7', '8', '8', '8', '8', '8', '9', '9', '9', '9',
 	      '9', '0', '0', '0', '0', '\0'
 };
-static u8_t   value_v2_5_value[] = {
+static uint8_t   value_v2_5_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '7', '7', '8',
 	      '8', '8', '8', '8', '9', '9', '9', '9', '9', '0', '0', '0', '0',
@@ -79,9 +79,9 @@ static u8_t   value_v2_5_value[] = {
  */
 static ssize_t read_value_v10(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v10_value));
@@ -101,7 +101,7 @@ static ssize_t read_value_v10(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -124,7 +124,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -153,8 +153,8 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_1(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -183,8 +183,8 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_2(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -213,8 +213,8 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_3(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -243,8 +243,8 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_4(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -273,8 +273,8 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_5(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
index 9a0f8c9f95..be725afc79 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_c_2_3.c
@@ -33,32 +33,32 @@
  */
 #define BT_UUID_VALUE_V2                BT_UUID_DECLARE_16(0xb002)
 
-static u8_t   value_v10_value = 0x0A;
-static u8_t   value_v2_value[] = {
+static uint8_t   value_v10_value = 0x0A;
+static uint8_t   value_v2_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '\0'
 };
-static u8_t   value_v2_1_value[] = {
+static uint8_t   value_v2_1_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '\0'
 };
-static u8_t   value_v2_2_value[] = {
+static uint8_t   value_v2_2_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '\0'
 };
-static u8_t   value_v2_3_value[] = {
+static uint8_t   value_v2_3_value[] = {
 	      '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '3', '3', '3',
 	      '3', '3', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '6',
 	      '6', '6', '6', '6', '7', '7', '7', '7', '7', '8', '8', '8', '8',
 	      '8', '9', '9', '9', '\0'
 };
-static u8_t   value_v2_4_value[] = {
+static uint8_t   value_v2_4_value[] = {
 	      '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '4', '4', '4',
 	      '4', '4', '5', '5', '5', '5', '5', '6', '6', '6', '6', '6', '7',
 	      '7', '7', '7', '7', '8', '8', '8', '8', '8', '9', '9', '9', '9',
 	      '9', '0', '0', '0', '0', '\0'
 };
-static u8_t   value_v2_5_value[] = {
+static uint8_t   value_v2_5_value[] = {
 	      '3', '3', '3', '3', '3', '4', '4', '4', '4', '4', '5', '5', '5',
 	      '5', '5', '6', '6', '6', '6', '6', '7', '7', '7', '7', '7', '8',
 	      '8', '8', '8', '8', '9', '9', '9', '9', '9', '0', '0', '0', '0',
@@ -79,9 +79,9 @@ static u8_t   value_v2_5_value[] = {
  */
 static ssize_t read_value_v10(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v10_value));
@@ -101,7 +101,7 @@ static ssize_t read_value_v10(struct bt_conn *conn,
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -124,7 +124,7 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t write_value_v2(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -153,8 +153,8 @@ static ssize_t write_value_v2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_1(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -183,8 +183,8 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_2(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -213,8 +213,8 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_3(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -243,8 +243,8 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_4(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
@@ -273,8 +273,8 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
  */
 static ssize_t write_value_v2_5(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
-				const void *buf, u16_t len, u16_t offset,
-				u8_t flags)
+				const void *buf, uint16_t len, uint16_t offset,
+				uint8_t flags)
 {
 	char *value = attr->user_data;
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
index dddbc3a516..b2b2415967 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_1.c
@@ -35,8 +35,8 @@ extern struct bt_gatt_attr service_b_5_1_attrs[];
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0x0b, 0xb0, 0x00, 0x00)
 
-static u8_t   value_v12_value = 0x0C;
-static u8_t   value_v11__128_bit_uuid_value = 0x0B;
+static uint8_t   value_v12_value = 0x0C;
+static uint8_t   value_v11__128_bit_uuid_value = 0x0B;
 static bool   bAuthorized;
 
 /**
@@ -53,9 +53,9 @@ static bool   bAuthorized;
  */
 static ssize_t read_value_v12(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v12_value));
@@ -75,9 +75,9 @@ static ssize_t read_value_v12(struct bt_conn *conn,
  */
 static ssize_t read_value_v11__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    void *buf, u16_t len, u16_t offset)
+					    void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	if (!bAuthorized)
 		return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
index f5bdb73912..936a52dc6b 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_2.c
@@ -35,8 +35,8 @@ extern struct bt_gatt_attr service_b_1_2_attrs[];
  */
 #define BT_UUID_VALUE_V12               BT_UUID_DECLARE_16(0xb00c)
 
-static u8_t   value_v11__128_bit_uuid_value = 0x0B;
-static u8_t   value_v12_value = 0x0C;
+static uint8_t   value_v11__128_bit_uuid_value = 0x0B;
+static uint8_t   value_v12_value = 0x0C;
 
 /**
  * @brief Attribute read call back for the Value V11 (128-bit UUID) attribute
@@ -52,9 +52,9 @@ static u8_t   value_v12_value = 0x0C;
  */
 static ssize_t read_value_v11__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    void *buf, u16_t len, u16_t offset)
+					    void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v11__128_bit_uuid_value));
@@ -74,9 +74,9 @@ static ssize_t read_value_v11__128_bit_uuid(struct bt_conn *conn,
  */
 static ssize_t read_value_v12(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v12_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
index 2ce2efaa0f..288669bfdc 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_d_3.c
@@ -35,8 +35,8 @@ extern struct bt_gatt_attr service_c_1_3_attrs[];
 		0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, \
 		0x00, 0x00, 0x00, 0x00, 0x0b, 0xb0, 0x00, 0x00)
 
-static u8_t   value_v12_value = 0x0C;
-static u8_t   value_v11__128_bit_uuid_value = 0x0B;
+static uint8_t   value_v12_value = 0x0C;
+static uint8_t   value_v11__128_bit_uuid_value = 0x0B;
 
 /**
  * @brief Attribute read call back for the Value V12 attribute
@@ -52,9 +52,9 @@ static u8_t   value_v11__128_bit_uuid_value = 0x0B;
  */
 static ssize_t read_value_v12(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v12_value));
@@ -74,9 +74,9 @@ static ssize_t read_value_v12(struct bt_conn *conn,
  */
 static ssize_t read_value_v11__128_bit_uuid(struct bt_conn *conn,
 					    const struct bt_gatt_attr *attr,
-					    void *buf, u16_t len, u16_t offset)
+					    void *buf, uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v11__128_bit_uuid_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
index b333b9518e..3750c6a6f5 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_e_2.c
@@ -26,7 +26,7 @@
  */
 #define BT_UUID_VALUE_V13               BT_UUID_DECLARE_16(0xb00d)
 
-static u8_t   value_v13_value = 0x0D;
+static uint8_t   value_v13_value = 0x0D;
 
 /**
  * @brief Attribute read call back for the Value V13 attribute
@@ -42,9 +42,9 @@ static u8_t   value_v13_value = 0x0D;
  */
 static ssize_t read_value_v13(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v13_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
index 2b5695241b..60d3fab5d4 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/gatt/service_f_1.c
@@ -56,35 +56,35 @@
  */
 #define BT_UUID_VALUE_V17               BT_UUID_DECLARE_16(0xb011)
 
-static u8_t   value_v14_value[] = {
+static uint8_t   value_v14_value[] = {
 	      'L', 'e', 'n', 'g', 't', 'h', ' ', 'i', 's', ' ', '\0'
 };
 static const struct bt_gatt_cpf cha_format_value = {
 	     0x19, 0x00, 0x3000, 0x01, 0x0000
 };
-static u8_t   value_v15_value = 0x65;
+static uint8_t   value_v15_value = 0x65;
 static const struct bt_gatt_cpf cha_format_1_value = {
 	     0x04, 0x00, 0x2701, 0x01, 0x0001
 };
-static u16_t  value_v6_value = 0x1234;
+static uint16_t  value_v6_value = 0x1234;
 static const struct bt_gatt_cpf cha_format_2_value = {
 	     0x06, 0x00, 0x2710, 0x01, 0x0002
 };
-static u32_t  value_v7_value = 0x01020304;
+static uint32_t  value_v7_value = 0x01020304;
 static const struct bt_gatt_cpf cha_format_3_value = {
 	     0x08, 0x00, 0x2717, 0x01, 0x0003
 };
 static struct __packed value_v16_t {
-	u8_t  field_a;
-	u16_t field_b;
-	u32_t field_c;
+	uint8_t  field_a;
+	uint16_t field_b;
+	uint32_t field_c;
 } value_v16_value = { 0x65, 0x1234, 0x01020304 };
 static struct __packed agg_format_t {
-	u16_t field_a;
-	u16_t field_b;
-	u16_t field_c;
+	uint16_t field_a;
+	uint16_t field_b;
+	uint16_t field_c;
 } agg_format_value = { 0x00A6, 0x00A9, 0x00AC };
-static u8_t   value_v17_value = 0x12;
+static uint8_t   value_v17_value = 0x12;
 
 /**
  * @brief Attribute read call back for the Value V14 string attribute
@@ -100,7 +100,7 @@ static u8_t   value_v17_value = 0x12;
  */
 static ssize_t read_str_value(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -122,9 +122,9 @@ static ssize_t read_str_value(struct bt_conn *conn,
  */
 static ssize_t read_value_v15(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v15_value));
@@ -145,9 +145,9 @@ static ssize_t read_value_v15(struct bt_conn *conn,
  */
 static ssize_t write_value_v15(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, const void *buf,
-			       u16_t len, u16_t offset, u8_t flags)
+			       uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset >= sizeof(value_v15_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -173,10 +173,10 @@ static ssize_t write_value_v15(struct bt_conn *conn,
  */
 static ssize_t read_value_v6(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u16_t *value = attr->user_data;
-	u16_t value_v6_conv = sys_cpu_to_le16(*value);
+	const uint16_t *value = attr->user_data;
+	uint16_t value_v6_conv = sys_cpu_to_le16(*value);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &value_v6_conv,
 				 sizeof(value_v6_conv));
@@ -197,17 +197,17 @@ static ssize_t read_value_v6(struct bt_conn *conn,
  */
 static ssize_t write_value_v6(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u16_t *value = attr->user_data;
-	u16_t value_v6_conv = sys_cpu_to_le16(*value);
+	uint16_t *value = attr->user_data;
+	uint16_t value_v6_conv = sys_cpu_to_le16(*value);
 
 	if (offset >= sizeof(value_v6_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	if (offset + len > sizeof(value_v6_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 
-	memcpy((u8_t *)&value_v6_conv + offset, buf, len);
+	memcpy((uint8_t *)&value_v6_conv + offset, buf, len);
 
 	*value = sys_le16_to_cpu(value_v6_conv);
 
@@ -228,10 +228,10 @@ static ssize_t write_value_v6(struct bt_conn *conn,
  */
 static ssize_t read_value_v7(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr, void *buf,
-			     u16_t len, u16_t offset)
+			     uint16_t len, uint16_t offset)
 {
-	const u32_t *value = attr->user_data;
-	u32_t value_v7_conv = sys_cpu_to_le32(*value);
+	const uint32_t *value = attr->user_data;
+	uint32_t value_v7_conv = sys_cpu_to_le32(*value);
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, &value_v7_conv,
 				 sizeof(value_v7_conv));
@@ -252,17 +252,17 @@ static ssize_t read_value_v7(struct bt_conn *conn,
  */
 static ssize_t write_value_v7(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, const void *buf,
-			      u16_t len, u16_t offset, u8_t flags)
+			      uint16_t len, uint16_t offset, uint8_t flags)
 {
-	u32_t *value = attr->user_data;
-	u32_t value_v7_conv = sys_cpu_to_le32(*value);
+	uint32_t *value = attr->user_data;
+	uint32_t value_v7_conv = sys_cpu_to_le32(*value);
 
 	if (offset >= sizeof(value_v7_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
 	if (offset + len > sizeof(value_v7_value))
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
 
-	memcpy((u8_t *)&value_v7_conv + offset, buf, len);
+	memcpy((uint8_t *)&value_v7_conv + offset, buf, len);
 
 	*value = sys_le32_to_cpu(value_v7_conv);
 
@@ -283,7 +283,7 @@ static ssize_t write_value_v7(struct bt_conn *conn,
  */
 static ssize_t read_value_v16(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
 	const struct value_v16_t *value = attr->user_data;
 	struct value_v16_t value_v16_conv;
@@ -310,7 +310,7 @@ static ssize_t read_value_v16(struct bt_conn *conn,
  */
 static ssize_t read_agg_format(struct bt_conn *conn,
 			       const struct bt_gatt_attr *attr, void *buf,
-			       u16_t len, u16_t offset)
+			       uint16_t len, uint16_t offset)
 {
 	const struct agg_format_t *value = attr->user_data;
 	struct agg_format_t agg_format_conv;
@@ -337,9 +337,9 @@ static ssize_t read_agg_format(struct bt_conn *conn,
  */
 static ssize_t read_value_v17(struct bt_conn *conn,
 			      const struct bt_gatt_attr *attr, void *buf,
-			      u16_t len, u16_t offset)
+			      uint16_t len, uint16_t offset)
 {
-	const u8_t *value = attr->user_data;
+	const uint8_t *value = attr->user_data;
 
 	return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
 				 sizeof(value_v17_value));
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
index 64d58e7227..7901225e32 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/src/main.c
@@ -44,7 +44,7 @@ static const struct bt_data sd[] = {
 
 static int service_set;
 
-static void connected(struct bt_conn *conn, u8_t err)
+static void connected(struct bt_conn *conn, uint8_t err)
 {
 	if (err) {
 		printk("Connection failed (err %u)\n", err);
@@ -53,7 +53,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 	}
 }
 
-static void disconnected(struct bt_conn *conn, u8_t reason)
+static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason %u)\n", reason);
 }
@@ -261,12 +261,12 @@ static struct bt_conn_auth_cb auth_cb_display = {
 /**
  * @brief Clean out excess bytes from the input buffer
  */
-static void read_excess_bytes(u16_t size)
+static void read_excess_bytes(uint16_t size)
 {
 	if (size > 0) {
-		u8_t buffer[size];
+		uint8_t buffer[size];
 
-		edtt_read((u8_t *)buffer, size, EDTTT_BLOCK);
+		edtt_read((uint8_t *)buffer, size, EDTTT_BLOCK);
 		printk("command size wrong! (%u extra bytes removed)", size);
 	}
 }
@@ -274,58 +274,58 @@ static void read_excess_bytes(u16_t size)
 /**
  * @brief Switch GATT Service Set
  */
-static void switch_service_set(u16_t size)
+static void switch_service_set(uint16_t size)
 {
-	u16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_SET_RSP);
-	u8_t  set;
+	uint16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_SET_RSP);
+	uint8_t  set;
 
 	if (size > 0) {
-		edtt_read((u8_t *)&set, sizeof(set), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&set, sizeof(set), EDTTT_BLOCK);
 		service_setup((int)set);
 		size -= sizeof(set);
 	}
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 }
 
 /**
  * @brief Send Notifications from GATT Service Set
  */
-static void handle_service_notify(u16_t size)
+static void handle_service_notify(uint16_t size)
 {
-	u16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_NOTIFY_RSP);
+	uint16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_NOTIFY_RSP);
 
 	service_notify();
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 }
 
 /**
  * @brief Send Indications from GATT Service Set
  */
-static void handle_service_indicate(u16_t size)
+static void handle_service_indicate(uint16_t size)
 {
-	u16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_INDICATE_RSP);
+	uint16_t response = sys_cpu_to_le16(CMD_GATT_SERVICE_INDICATE_RSP);
 
 	service_indicate();
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 }
 
 void main(void)
 {
 	int err;
-	u16_t command;
-	u16_t size;
+	uint16_t command;
+	uint16_t size;
 
 	err = bt_enable(bt_ready);
 	if (err) {
@@ -352,9 +352,9 @@ void main(void)
 		/**
 		 * Wait for a command to arrive - then read and execute command
 		 */
-		edtt_read((u8_t *)&command, sizeof(command), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&command, sizeof(command), EDTTT_BLOCK);
 		command = sys_le16_to_cpu(command);
-		edtt_read((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 		size = sys_le16_to_cpu(size);
 		bs_trace_raw_time(4, "command 0x%04X received (size %u)\n",
 				command, size);
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
index 6f8e6e5fc7..199b941a33 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
@@ -35,19 +35,19 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(hci_test_app);
 
-static u16_t waiting_opcode;
+static uint16_t waiting_opcode;
 static enum commands_t waiting_response;
-static u8_t m_events;
+static uint8_t m_events;
 
 /**
  * @brief Clean out excess bytes from the input buffer
  */
-static void read_excess_bytes(u16_t size)
+static void read_excess_bytes(uint16_t size)
 {
 	if (size > 0) {
-		u8_t buffer[size];
+		uint8_t buffer[size];
 
-		edtt_read((u8_t *)buffer, size, EDTTT_BLOCK);
+		edtt_read((uint8_t *)buffer, size, EDTTT_BLOCK);
 		LOG_ERR("command size wrong! (%u extra bytes removed)", size);
 	}
 }
@@ -57,13 +57,13 @@ static void read_excess_bytes(u16_t size)
  */
 static void error_response(int error)
 {
-	u16_t response = sys_cpu_to_le16(waiting_response);
+	uint16_t response = sys_cpu_to_le16(waiting_response);
 	int   le_error = sys_cpu_to_le32(error);
-	u16_t size = sys_cpu_to_le16(sizeof(le_error));
+	uint16_t size = sys_cpu_to_le16(sizeof(le_error));
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-	edtt_write((u8_t *)&le_error, sizeof(le_error), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&le_error, sizeof(le_error), EDTTT_BLOCK);
 	waiting_response = CMD_NOTHING;
 	waiting_opcode = 0;
 }
@@ -71,7 +71,7 @@ static void error_response(int error)
 /**
  * @brief Allocate buffer for HCI command and fill in opCode for the command
  */
-static struct net_buf *hci_cmd_create(u16_t opcode, u8_t param_len)
+static struct net_buf *hci_cmd_create(uint16_t opcode, uint8_t param_len)
 {
 	struct bt_hci_cmd_hdr *hdr;
 	struct net_buf *buf;
@@ -107,7 +107,7 @@ static struct net_buf *acl_data_create(struct bt_hci_acl_hdr *le_hdr)
  * @brief Allocate buffer for HCI command, fill in parameters and send the
  * command...
  */
-static int send_hci_command(u16_t opcode, u8_t param_len, u16_t response)
+static int send_hci_command(uint16_t opcode, uint8_t param_len, uint16_t response)
 {
 	struct net_buf *buf;
 	void *cp;
@@ -118,7 +118,7 @@ static int send_hci_command(u16_t opcode, u8_t param_len, u16_t response)
 	if (buf) {
 		if (param_len) {
 			cp = net_buf_add(buf, param_len);
-			edtt_read((u8_t *)cp, param_len, EDTTT_BLOCK);
+			edtt_read((uint8_t *)cp, param_len, EDTTT_BLOCK);
 		}
 		err = bt_send(buf);
 		if (err) {
@@ -137,16 +137,16 @@ static int send_hci_command(u16_t opcode, u8_t param_len, u16_t response)
 /**
  * @brief Echo function - echo input received...
  */
-static void echo(u16_t size)
+static void echo(uint16_t size)
 {
-	u16_t response = sys_cpu_to_le16(CMD_ECHO_RSP);
-	u16_t le_size = sys_cpu_to_le16(size);
+	uint16_t response = sys_cpu_to_le16(CMD_ECHO_RSP);
+	uint16_t le_size = sys_cpu_to_le16(size);
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&le_size, sizeof(le_size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&le_size, sizeof(le_size), EDTTT_BLOCK);
 
 	if (size > 0) {
-		u8_t buff[size];
+		uint8_t buff[size];
 
 		edtt_read(buff, size, EDTTT_BLOCK);
 		edtt_write(buff, size, EDTTT_BLOCK);
@@ -166,10 +166,10 @@ static K_FIFO_DEFINE(data_queue);
 static void command_complete(struct net_buf *buf)
 {
 	struct bt_hci_evt_cmd_complete *evt = (void *)buf->data;
-	u16_t opcode = sys_le16_to_cpu(evt->opcode);
-	u16_t response = sys_cpu_to_le16(waiting_response);
+	uint16_t opcode = sys_le16_to_cpu(evt->opcode);
+	uint16_t response = sys_cpu_to_le16(waiting_response);
 	struct net_buf_simple_state state;
-	u16_t size;
+	uint16_t size;
 
 	net_buf_simple_save(&buf->b, &state);
 
@@ -179,9 +179,9 @@ static void command_complete(struct net_buf *buf)
 	if (opcode == waiting_opcode) {
 		LOG_DBG("Command complete for 0x%04x", waiting_opcode);
 
-		edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-		edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
+		edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)buf->data, buf->len, EDTTT_BLOCK);
 		waiting_opcode = 0;
 	} else {
 		LOG_WRN("Not waiting for 0x(%04x) command status,"
@@ -197,11 +197,11 @@ static void command_complete(struct net_buf *buf)
 static void command_status(struct net_buf *buf)
 {
 	struct bt_hci_evt_cmd_status *evt = (void *)buf->data;
-	u16_t opcode = sys_le16_to_cpu(evt->opcode);
-	u16_t response = sys_cpu_to_le16(waiting_response);
+	uint16_t opcode = sys_le16_to_cpu(evt->opcode);
+	uint16_t response = sys_cpu_to_le16(waiting_response);
 	struct net_buf_simple_state state;
-	u8_t status = evt->status;
-	u16_t size;
+	uint8_t status = evt->status;
+	uint16_t size;
 
 	net_buf_simple_save(&buf->b, &state);
 
@@ -211,10 +211,10 @@ static void command_status(struct net_buf *buf)
 	if (opcode == waiting_opcode) {
 		LOG_DBG("Command status for 0x%04x", waiting_opcode);
 
-		edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-		edtt_write((u8_t *)&status, sizeof(status), EDTTT_BLOCK);
-		edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
+		edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)&status, sizeof(status), EDTTT_BLOCK);
+		edtt_write((uint8_t *)buf->data, buf->len, EDTTT_BLOCK);
 		waiting_opcode = 0;
 	} else {
 		LOG_WRN("Not waiting for 0x(%04x) command status,"
@@ -315,9 +315,9 @@ static void service_events(void *p1, void *p2, void *p3)
 /**
  * @brief Flush all HCI events from the input-copy queue
  */
-static void flush_events(u16_t size)
+static void flush_events(uint16_t size)
 {
-	u16_t  response = sys_cpu_to_le16(CMD_FLUSH_EVENTS_RSP);
+	uint16_t  response = sys_cpu_to_le16(CMD_FLUSH_EVENTS_RSP);
 	struct net_buf *buf;
 
 	while ((buf = net_buf_get(&event_queue, K_NO_WAIT))) {
@@ -327,53 +327,53 @@ static void flush_events(u16_t size)
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 }
 
 /**
  * @brief Get next available HCI event from the input-copy queue
  */
-static void get_event(u16_t size)
+static void get_event(uint16_t size)
 {
-	u16_t  response = sys_cpu_to_le16(CMD_GET_EVENT_RSP);
+	uint16_t  response = sys_cpu_to_le16(CMD_GET_EVENT_RSP);
 	struct net_buf *buf;
 
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
 	buf = net_buf_get(&event_queue, K_FOREVER);
 	if (buf) {
 		size = sys_cpu_to_le16(buf->len);
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-		edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)buf->data, buf->len, EDTTT_BLOCK);
 		net_buf_unref(buf);
 		m_events--;
 	} else {
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 	}
 }
 
 /**
  * @brief Get next available HCI events from the input-copy queue
  */
-static void get_events(u16_t size)
+static void get_events(uint16_t size)
 {
-	u16_t response = sys_cpu_to_le16(CMD_GET_EVENT_RSP);
+	uint16_t response = sys_cpu_to_le16(CMD_GET_EVENT_RSP);
 	struct net_buf *buf;
-	u8_t count = m_events;
+	uint8_t count = m_events;
 
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&count, sizeof(count), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&count, sizeof(count), EDTTT_BLOCK);
 	while (count--) {
 		buf = net_buf_get(&event_queue, K_FOREVER);
 		size = sys_cpu_to_le16(buf->len);
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-		edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)buf->data, buf->len, EDTTT_BLOCK);
 		net_buf_unref(buf);
 		m_events--;
 	}
@@ -382,12 +382,12 @@ static void get_events(u16_t size)
 /**
  * @brief Check whether an HCI event is available in the input-copy queue
  */
-static void has_event(u16_t size)
+static void has_event(uint16_t size)
 {
 	struct has_event_resp {
-		u16_t response;
-		u16_t size;
-		u8_t  count;
+		uint16_t response;
+		uint16_t size;
+		uint8_t  count;
 	} __packed;
 	struct has_event_resp le_response = {
 		.response = sys_cpu_to_le16(CMD_HAS_EVENT_RSP),
@@ -398,15 +398,15 @@ static void has_event(u16_t size)
 	if (size > 0) {
 		read_excess_bytes(size);
 	}
-	edtt_write((u8_t *)&le_response, sizeof(le_response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&le_response, sizeof(le_response), EDTTT_BLOCK);
 }
 
 /**
  * @brief Flush all ACL Data Packages from the input-copy queue
  */
-static void le_flush_data(u16_t size)
+static void le_flush_data(uint16_t size)
 {
-	u16_t  response = sys_cpu_to_le16(CMD_LE_FLUSH_DATA_RSP);
+	uint16_t  response = sys_cpu_to_le16(CMD_LE_FLUSH_DATA_RSP);
 	struct net_buf *buf;
 
 	while ((buf = net_buf_get(&data_queue, K_NO_WAIT))) {
@@ -415,19 +415,19 @@ static void le_flush_data(u16_t size)
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
-	edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 }
 
 /**
  * @brief Check whether an ACL Data Package is available in the input-copy queue
  */
-static void le_data_ready(u16_t size)
+static void le_data_ready(uint16_t size)
 {
 	struct has_data_resp {
-		u16_t response;
-		u16_t size;
-		u8_t  empty;
+		uint16_t response;
+		uint16_t size;
+		uint8_t  empty;
 	} __packed;
 	struct has_data_resp le_response = {
 		.response = sys_cpu_to_le16(CMD_LE_DATA_READY_RSP),
@@ -441,41 +441,41 @@ static void le_data_ready(u16_t size)
 	if (k_fifo_is_empty(&data_queue)) {
 		le_response.empty = 1;
 	}
-	edtt_write((u8_t *)&le_response, sizeof(le_response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&le_response, sizeof(le_response), EDTTT_BLOCK);
 }
 
 /**
  * @brief Get next available HCI Data Package from the input-copy queue
  */
-static void le_data_read(u16_t size)
+static void le_data_read(uint16_t size)
 {
-	u16_t  response = sys_cpu_to_le16(CMD_LE_DATA_READ_RSP);
+	uint16_t  response = sys_cpu_to_le16(CMD_LE_DATA_READ_RSP);
 	struct net_buf *buf;
 
 	read_excess_bytes(size);
 	size = 0;
 
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
 	buf = net_buf_get(&data_queue, K_FOREVER);
 	if (buf) {
 		size = sys_cpu_to_le16(buf->len);
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
-		edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)buf->data, buf->len, EDTTT_BLOCK);
 		net_buf_unref(buf);
 	} else {
-		edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_write((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 	}
 }
 
 /**
  * @brief Write ACL Data Package to the Controller...
  */
-static void le_data_write(u16_t size)
+static void le_data_write(uint16_t size)
 {
 	struct data_write_resp {
-		u16_t code;
-		u16_t size;
-		u8_t  status;
+		uint16_t code;
+		uint16_t size;
+		uint8_t  status;
 	} __packed;
 	struct data_write_resp response = {
 		.code = sys_cpu_to_le16(CMD_LE_DATA_WRITE_RSP),
@@ -487,12 +487,12 @@ static void le_data_write(u16_t size)
 	int err;
 
 	if (size >= sizeof(hdr)) {
-		edtt_read((u8_t *)&hdr, sizeof(hdr), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&hdr, sizeof(hdr), EDTTT_BLOCK);
 		size -= sizeof(hdr);
 		buf = acl_data_create(&hdr);
 		if (buf) {
-			u16_t hdr_length = sys_le16_to_cpu(hdr.len);
-			u8_t *pdata = net_buf_add(buf, hdr_length);
+			uint16_t hdr_length = sys_le16_to_cpu(hdr.len);
+			uint8_t *pdata = net_buf_add(buf, hdr_length);
 
 			if (size >= hdr_length) {
 				edtt_read(pdata, hdr_length, EDTTT_BLOCK);
@@ -514,7 +514,7 @@ static void le_data_write(u16_t size)
 	read_excess_bytes(size);
 
 	response.status = sys_cpu_to_le32(err);
-	edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
+	edtt_write((uint8_t *)&response, sizeof(response), EDTTT_BLOCK);
 }
 
 static K_THREAD_STACK_DEFINE(service_events_stack,
@@ -527,9 +527,9 @@ static struct k_thread service_events_data;
 void main(void)
 {
 	int err;
-	u16_t command;
-	u16_t size;
-	u16_t opcode;
+	uint16_t command;
+	uint16_t size;
+	uint16_t opcode;
 	/**
 	 * Initialize HCI command opcode and response variables...
 	 */
@@ -564,9 +564,9 @@ void main(void)
 		/**
 		 * Wait for a command to arrive - then read and execute command
 		 */
-		edtt_read((u8_t *)&command, sizeof(command), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&command, sizeof(command), EDTTT_BLOCK);
 		command = sys_le16_to_cpu(command);
-		edtt_read((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
+		edtt_read((uint8_t *)&size, sizeof(size), EDTTT_BLOCK);
 		size = sys_le16_to_cpu(size);
 		bs_trace_raw_time(4, "command 0x%04X received (size %u) "
 				  "events=%u\n",
@@ -584,9 +584,9 @@ void main(void)
 			break;
 		case CMD_GET_EVENT_REQ:
 		{
-			u8_t multiple;
+			uint8_t multiple;
 
-			edtt_read((u8_t *)&multiple, sizeof(multiple),
+			edtt_read((uint8_t *)&multiple, sizeof(multiple),
 				  EDTTT_BLOCK);
 			if (multiple)
 				get_events(--size);
@@ -608,7 +608,7 @@ void main(void)
 			break;
 		default:
 			if (size >= 2) {
-				edtt_read((u8_t *)&opcode, sizeof(opcode),
+				edtt_read((uint8_t *)&opcode, sizeof(opcode),
 					  EDTTT_BLOCK);
 				send_hci_command(sys_le16_to_cpu(opcode),
 						 size - 2, command + 1);
diff --git a/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c b/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
index 70696d92bb..449d142078 100644
--- a/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
+++ b/tests/bluetooth/ctrl_sw_privacy_unit/src/main.c
@@ -30,7 +30,7 @@
 void helper_privacy_clear(void)
 {
 	zassert_equal(newest_prpa, 0, "");
-	for (u8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
+	for (uint8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
 		zassert_equal(prpa_cache[i].taken, 0U, "");
 	}
 }
@@ -38,7 +38,7 @@ void helper_privacy_clear(void)
 void helper_privacy_add(int skew)
 {
 	bt_addr_t a1, a2, a3, a4, a5;
-	u8_t pos, ex_pos;
+	uint8_t pos, ex_pos;
 
 	bt_addr_copy(&a1, BT_ADDR_INIT(0x12, 0x13, 0x14, 0x15, 0x16, 0x17));
 	bt_addr_copy(&a2, BT_ADDR_INIT(0x22, 0x23, 0x24, 0x25, 0x26, 0x27));
@@ -94,8 +94,8 @@ void test_privacy_add_stress(void)
 {
 	bt_addr_t ar;
 
-	for (u8_t skew = 0; skew < CONFIG_BT_CTLR_RPA_CACHE_SIZE; skew++) {
-		for (u8_t i = 0; i < skew; i++) {
+	for (uint8_t skew = 0; skew < CONFIG_BT_CTLR_RPA_CACHE_SIZE; skew++) {
+		for (uint8_t i = 0; i < skew; i++) {
 			bt_addr_copy(&ar,
 				     BT_ADDR_INIT(0xde, 0xad, 0xbe,
 						  0xef, 0xaa, 0xff));
diff --git a/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c b/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
index 981a68aacd..5e6cd2a7cf 100644
--- a/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
+++ b/tests/bluetooth/ctrl_user_ext/src/hci_user_ext.c
@@ -21,7 +21,7 @@
  * in this file are simple stubs without functional behavior.
  */
 
-s8_t hci_user_ext_get_class(struct node_rx_pdu *node_rx)
+int8_t hci_user_ext_get_class(struct node_rx_pdu *node_rx)
 {
 	return 0;
 }
diff --git a/tests/bluetooth/gatt/src/main.c b/tests/bluetooth/gatt/src/main.c
index 8759611471..fc9de9ba6a 100644
--- a/tests/bluetooth/gatt/src/main.c
+++ b/tests/bluetooth/gatt/src/main.c
@@ -22,7 +22,7 @@ static struct bt_uuid_128 test_chrc_uuid = BT_UUID_INIT_128(
 	0xf2, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t test_value[] = { 'T', 'e', 's', 't', '\0' };
+static uint8_t test_value[] = { 'T', 'e', 's', 't', '\0' };
 
 static struct bt_uuid_128 test1_uuid = BT_UUID_INIT_128(
 	0xf4, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
@@ -32,15 +32,15 @@ static const struct bt_uuid_128 test1_nfy_uuid = BT_UUID_INIT_128(
 	0xf5, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12,
 	0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12);
 
-static u8_t nfy_enabled;
+static uint8_t nfy_enabled;
 
-static void test1_ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void test1_ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	nfy_enabled = (value == BT_GATT_CCC_NOTIFY) ? 1 : 0;
 }
 
 static ssize_t read_test(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			void *buf, u16_t len, u16_t offset)
+			void *buf, uint16_t len, uint16_t offset)
 {
 	const char *value = attr->user_data;
 
@@ -49,10 +49,10 @@ static ssize_t read_test(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 }
 
 static ssize_t write_test(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			 const void *buf, u16_t len, u16_t offset,
-			 u8_t flags)
+			 const void *buf, uint16_t len, uint16_t offset,
+			 uint8_t flags)
 {
-	u8_t *value = attr->user_data;
+	uint8_t *value = attr->user_data;
 
 	if (offset + len > sizeof(test_value)) {
 		return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
@@ -136,16 +136,16 @@ void test_gatt_unregister(void)
 		     "Test service unregister failed");
 }
 
-static u8_t count_attr(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t count_attr(const struct bt_gatt_attr *attr, void *user_data)
 {
-	u16_t *count = user_data;
+	uint16_t *count = user_data;
 
 	(*count)++;
 
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static u8_t find_attr(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t find_attr(const struct bt_gatt_attr *attr, void *user_data)
 {
 	const struct bt_gatt_attr **tmp = user_data;
 
@@ -157,7 +157,7 @@ static u8_t find_attr(const struct bt_gatt_attr *attr, void *user_data)
 void test_gatt_foreach(void)
 {
 	const struct bt_gatt_attr *attr;
-	u16_t num = 0;
+	uint16_t num = 0;
 
 	/* Attempt to register services */
 	zassert_false(bt_gatt_service_register(&test_svc),
@@ -225,7 +225,7 @@ void test_gatt_foreach(void)
 void test_gatt_read(void)
 {
 	const struct bt_gatt_attr *attr;
-	u8_t buf[256];
+	uint8_t buf[256];
 	ssize_t ret;
 
 	/* Find attribute by UUID */
diff --git a/tests/bluetooth/hci_prop_evt/src/main.c b/tests/bluetooth/hci_prop_evt/src/main.c
index 7217857586..8afc16c1db 100644
--- a/tests/bluetooth/hci_prop_evt/src/main.c
+++ b/tests/bluetooth/hci_prop_evt/src/main.c
@@ -19,27 +19,27 @@
 #include <sys/byteorder.h>
 
 /* HCI Proprietary vendor event */
-const u8_t hci_prop_evt_prefix[2] = { 0xAB, 0xBA };
+const uint8_t hci_prop_evt_prefix[2] = { 0xAB, 0xBA };
 
 struct hci_evt_prop {
-	u8_t  prefix[2];
+	uint8_t  prefix[2];
 } __packed;
 
 struct hci_evt_prop_report {
-	u8_t  data_len;
-	u8_t  data[0];
+	uint8_t  data_len;
+	uint8_t  data[0];
 } __packed;
 
 /* Command handler structure for cmd_handle(). */
 struct cmd_handler {
-	u16_t opcode; /* HCI command opcode */
-	u8_t len;     /* HCI command response length */
+	uint16_t opcode; /* HCI command opcode */
+	uint8_t len;     /* HCI command response length */
 	void (*handler)(struct net_buf *buf, struct net_buf **evt,
-			u8_t len, u16_t opcode);
+			uint8_t len, uint16_t opcode);
 };
 
 /* Add event to net_buf. */
-static void evt_create(struct net_buf *buf, u8_t evt, u8_t len)
+static void evt_create(struct net_buf *buf, uint8_t evt, uint8_t len)
 {
 	struct bt_hci_evt_hdr *hdr;
 
@@ -49,7 +49,7 @@ static void evt_create(struct net_buf *buf, u8_t evt, u8_t len)
 }
 
 /* Create a command complete event. */
-static void *cmd_complete(struct net_buf **buf, u8_t plen, u16_t opcode)
+static void *cmd_complete(struct net_buf **buf, uint8_t plen, uint16_t opcode)
 {
 	struct bt_hci_evt_cmd_complete *cc;
 
@@ -62,7 +62,7 @@ static void *cmd_complete(struct net_buf **buf, u8_t plen, u16_t opcode)
 }
 
 /* Loop over handlers to try to handle the command given by opcode. */
-static int cmd_handle_helper(u16_t opcode, struct net_buf *cmd,
+static int cmd_handle_helper(uint16_t opcode, struct net_buf *cmd,
 			     struct net_buf **evt,
 			     const struct cmd_handler *handlers,
 			     size_t num_handlers)
@@ -91,7 +91,7 @@ static int cmd_handle(struct net_buf *cmd,
 	struct net_buf *evt = NULL;
 	struct bt_hci_evt_cc_status *ccst;
 	struct bt_hci_cmd_hdr *chdr;
-	u16_t opcode;
+	uint16_t opcode;
 	int err;
 
 	chdr = net_buf_pull_mem(cmd, sizeof(*chdr));
@@ -113,7 +113,7 @@ static int cmd_handle(struct net_buf *cmd,
 
 /* Generic command complete with success status. */
 static void generic_success(struct net_buf *buf, struct net_buf **evt,
-			    u8_t len, u16_t opcode)
+			    uint8_t len, uint16_t opcode)
 {
 	struct bt_hci_evt_cc_status *ccst;
 
@@ -127,7 +127,7 @@ static void generic_success(struct net_buf *buf, struct net_buf **evt,
 
 /* Bogus handler for BT_HCI_OP_READ_LOCAL_FEATURES. */
 static void read_local_features(struct net_buf *buf, struct net_buf **evt,
-				u8_t len, u16_t opcode)
+				uint8_t len, uint16_t opcode)
 {
 	struct bt_hci_rp_read_local_features *rp;
 
@@ -138,7 +138,7 @@ static void read_local_features(struct net_buf *buf, struct net_buf **evt,
 
 /* Bogus handler for BT_HCI_OP_READ_SUPPORTED_COMMANDS. */
 static void read_supported_commands(struct net_buf *buf, struct net_buf **evt,
-				    u8_t len, u16_t opcode)
+				    uint8_t len, uint16_t opcode)
 {
 	struct bt_hci_rp_read_supported_commands *rp;
 
@@ -149,7 +149,7 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf **evt,
 
 /* Bogus handler for BT_HCI_OP_LE_READ_LOCAL_FEATURES. */
 static void le_read_local_features(struct net_buf *buf, struct net_buf **evt,
-				   u8_t len, u16_t opcode)
+				   uint8_t len, uint16_t opcode)
 {
 	struct bt_hci_rp_le_read_local_features *rp;
 
@@ -160,7 +160,7 @@ static void le_read_local_features(struct net_buf *buf, struct net_buf **evt,
 
 /* Bogus handler for BT_HCI_OP_LE_READ_SUPP_STATES. */
 static void le_read_supp_states(struct net_buf *buf, struct net_buf **evt,
-				u8_t len, u16_t opcode)
+				uint8_t len, uint16_t opcode)
 {
 	struct bt_hci_rp_le_read_supp_states *rp;
 
@@ -279,8 +279,8 @@ static void bt_recv_job_submit(struct net_buf *buf)
 static K_SEM_DEFINE(prop_cb_sem, 0, 1);
 
 /* Used to verify prop event data. */
-static u8_t *prop_cb_data;
-static u8_t prop_cb_data_len;
+static uint8_t *prop_cb_data;
+static uint8_t prop_cb_data_len;
 
 /* Prop callback. */
 static bool prop_cb(struct net_buf_simple *buf)
@@ -295,8 +295,8 @@ static bool prop_cb(struct net_buf_simple *buf)
 
 		per = net_buf_simple_pull_mem(buf, sizeof(*per));
 
-		u8_t data_len = per->data_len;
-		u8_t *data = &per->data[0];
+		uint8_t data_len = per->data_len;
+		uint8_t *data = &per->data[0];
 
 		/* Allocate memory for storing the data */
 		prop_cb_data = k_malloc(data_len);
@@ -316,7 +316,7 @@ static bool prop_cb(struct net_buf_simple *buf)
 }
 
 /* Create a HCI Vendor Specific event to carry the prop event report. */
-static void *prop_evt(struct net_buf *buf, u8_t pelen)
+static void *prop_evt(struct net_buf *buf, uint8_t pelen)
 {
 	struct hci_evt_prop *pe;
 
@@ -329,7 +329,7 @@ static void *prop_evt(struct net_buf *buf, u8_t pelen)
 }
 
 /* Send a prop event report wit the given data. */
-static void send_prop_report(u8_t *data, u8_t data_len)
+static void send_prop_report(uint8_t *data, uint8_t data_len)
 {
 	struct net_buf *buf;
 	struct hci_evt_prop_report *per;
@@ -357,8 +357,8 @@ static void test_hci_prop_evt_entry(void)
 	bt_hci_register_vnd_evt_cb(prop_cb);
 
 	/* Generate some data */
-	u8_t data_len = 10;
-	u8_t data[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+	uint8_t data_len = 10;
+	uint8_t data[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
 
 	/* Send the prop event report */
 	send_prop_report(&data[0], data_len);
diff --git a/tests/bluetooth/ll_settings/src/main.c b/tests/bluetooth/ll_settings/src/main.c
index c15f06077e..5fd357d59e 100644
--- a/tests/bluetooth/ll_settings/src/main.c
+++ b/tests/bluetooth/ll_settings/src/main.c
@@ -16,7 +16,7 @@
 
 void test_company_id(void)
 {
-	u16_t cid;
+	uint16_t cid;
 	int err;
 
 	cid = 0x1234;
@@ -34,7 +34,7 @@ void test_company_id(void)
 
 void test_subversion_number(void)
 {
-	u16_t svn;
+	uint16_t svn;
 
 	svn = 0x1234;
 	settings_runtime_set("bt/ctlr/subver", &svn, sizeof(svn));
diff --git a/tests/bluetooth/mesh/src/board.h b/tests/bluetooth/mesh/src/board.h
index e02b70db67..df9ff8c2fa 100644
--- a/tests/bluetooth/mesh/src/board.h
+++ b/tests/bluetooth/mesh/src/board.h
@@ -7,14 +7,14 @@
  */
 
 #if defined(CONFIG_BOARD_BBC_MICROBIT)
-void board_output_number(bt_mesh_output_action_t action, u32_t number);
+void board_output_number(bt_mesh_output_action_t action, uint32_t number);
 
 void board_prov_complete(void);
 
 void board_init(void);
 #else
 static inline void board_output_number(bt_mesh_output_action_t action,
-				       u32_t number)
+				       uint32_t number)
 {
 }
 
diff --git a/tests/bluetooth/mesh/src/main.c b/tests/bluetooth/mesh/src/main.c
index c7caa795c1..26487d0a0e 100644
--- a/tests/bluetooth/mesh/src/main.c
+++ b/tests/bluetooth/mesh/src/main.c
@@ -41,10 +41,10 @@ static struct bt_mesh_cfg_srv cfg_srv = {
 	.relay_retransmit = BT_MESH_TRANSMIT(2, 20),
 };
 
-static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
-			 u16_t *company_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_cur(struct bt_mesh_model *model, uint8_t *test_id,
+			 uint16_t *company_id, uint8_t *faults, uint8_t *fault_count)
 {
-	u8_t reg_faults[MAX_FAULT] = { [0 ... (MAX_FAULT - 1)] = 0xff };
+	uint8_t reg_faults[MAX_FAULT] = { [0 ... (MAX_FAULT - 1)] = 0xff };
 
 	printk("fault_get_cur() has_reg_fault %u\n", has_reg_fault);
 
@@ -56,8 +56,8 @@ static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
 	return 0;
 }
 
-static int fault_get_reg(struct bt_mesh_model *model, u16_t company_id,
-			 u8_t *test_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_reg(struct bt_mesh_model *model, uint16_t company_id,
+			 uint8_t *test_id, uint8_t *faults, uint8_t *fault_count)
 {
 	if (company_id != BT_COMP_ID_LF) {
 		return -EINVAL;
@@ -68,7 +68,7 @@ static int fault_get_reg(struct bt_mesh_model *model, u16_t company_id,
 	*test_id = 0x00;
 
 	if (has_reg_fault) {
-		u8_t reg_faults[MAX_FAULT] = { [0 ... (MAX_FAULT - 1)] = 0xff };
+		uint8_t reg_faults[MAX_FAULT] = { [0 ... (MAX_FAULT - 1)] = 0xff };
 
 		memcpy(faults, reg_faults, sizeof(reg_faults));
 		*fault_count = sizeof(reg_faults);
@@ -161,7 +161,7 @@ static int output_number(bt_mesh_output_action_t action, uint32_t number)
 }
 #endif
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	board_prov_complete();
 
@@ -175,7 +175,7 @@ static void prov_reset(void)
 	bt_mesh_prov_enable(BT_MESH_PROV_ADV | BT_MESH_PROV_GATT);
 }
 
-static const u8_t dev_uuid[16] = { 0xdd, 0xdd };
+static const uint8_t dev_uuid[16] = { 0xdd, 0xdd };
 
 static const struct bt_mesh_prov prov = {
 	.uuid = dev_uuid,
diff --git a/tests/bluetooth/mesh/src/microbit.c b/tests/bluetooth/mesh/src/microbit.c
index f34bd37a6c..13f9d4e6e6 100644
--- a/tests/bluetooth/mesh/src/microbit.c
+++ b/tests/bluetooth/mesh/src/microbit.c
@@ -14,11 +14,11 @@
 
 #include "board.h"
 
-static u32_t oob_number;
+static uint32_t oob_number;
 static struct device *gpio;
 
 static void button_pressed(struct device *dev, struct gpio_callback *cb,
-			   u32_t pins)
+			   uint32_t pins)
 {
 	struct mb_display *disp = mb_display_get();
 
@@ -44,7 +44,7 @@ static void configure_button(void)
 	gpio_add_callback(gpio, &button_cb);
 }
 
-void board_output_number(bt_mesh_output_action_t action, u32_t number)
+void board_output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	struct mb_display *disp = mb_display_get();
 	struct mb_image arrow = MB_IMAGE({ 0, 0, 1, 0, 0 },
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index 1f70f3b7af..38d3b49456 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -103,7 +103,7 @@ SHELL_CMD_ARG_REGISTER(hrs, &hrs_cmds, "Heart Rate Service shell commands",
 #if defined(CONFIG_BT_GATT_HRS)
 static void hrs_notify(void)
 {
-	static u8_t heartrate = 90U;
+	static uint8_t heartrate = 90U;
 
 	/* Heartrate measurements simulation */
 	heartrate++;
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 4e4022920d..426e3013fb 100644
--- a/tests/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
@@ -30,7 +30,7 @@ static struct k_thread cmd_thread;
 struct btp_buf {
 	intptr_t _reserved;
 	union {
-		u8_t data[BTP_MTU];
+		uint8_t data[BTP_MTU];
 		struct btp_hdr hdr;
 	};
 };
@@ -40,9 +40,9 @@ static struct btp_buf cmd_buf[CMD_QUEUED];
 static K_FIFO_DEFINE(cmds_queue);
 static K_FIFO_DEFINE(avail_queue);
 
-static void supported_commands(u8_t *data, u16_t len)
+static void supported_commands(uint8_t *data, uint16_t len)
 {
-	u8_t buf[1];
+	uint8_t buf[1];
 	struct core_read_supported_commands_rp *rp = (void *) buf;
 
 	(void)memset(buf, 0, sizeof(buf));
@@ -53,12 +53,12 @@ static void supported_commands(u8_t *data, u16_t len)
 	tester_set_bit(buf, CORE_UNREGISTER_SERVICE);
 
 	tester_send(BTP_SERVICE_ID_CORE, CORE_READ_SUPPORTED_COMMANDS,
-		    BTP_INDEX_NONE, (u8_t *) rp, sizeof(buf));
+		    BTP_INDEX_NONE, (uint8_t *) rp, sizeof(buf));
 }
 
-static void supported_services(u8_t *data, u16_t len)
+static void supported_services(uint8_t *data, uint16_t len)
 {
-	u8_t buf[1];
+	uint8_t buf[1];
 	struct core_read_supported_services_rp *rp = (void *) buf;
 
 	(void)memset(buf, 0, sizeof(buf));
@@ -74,13 +74,13 @@ static void supported_services(u8_t *data, u16_t len)
 #endif /* CONFIG_BT_MESH */
 
 	tester_send(BTP_SERVICE_ID_CORE, CORE_READ_SUPPORTED_SERVICES,
-		    BTP_INDEX_NONE, (u8_t *) rp, sizeof(buf));
+		    BTP_INDEX_NONE, (uint8_t *) rp, sizeof(buf));
 }
 
-static void register_service(u8_t *data, u16_t len)
+static void register_service(uint8_t *data, uint16_t len)
 {
 	struct core_register_service_cmd *cmd = (void *) data;
-	u8_t status;
+	uint8_t status;
 
 	switch (cmd->id) {
 	case BTP_SERVICE_ID_GAP:
@@ -114,10 +114,10 @@ rsp:
 		   status);
 }
 
-static void unregister_service(u8_t *data, u16_t len)
+static void unregister_service(uint8_t *data, uint16_t len)
 {
 	struct core_unregister_service_cmd *cmd = (void *) data;
-	u8_t status;
+	uint8_t status;
 
 	switch (cmd->id) {
 	case BTP_SERVICE_ID_GAP:
@@ -146,8 +146,8 @@ static void unregister_service(u8_t *data, u16_t len)
 		   status);
 }
 
-static void handle_core(u8_t opcode, u8_t index, u8_t *data,
-			u16_t len)
+static void handle_core(uint8_t opcode, uint8_t index, uint8_t *data,
+			uint16_t len)
 {
 	if (index != BTP_INDEX_NONE) {
 		LOG_WRN("index != BTP_INDEX_NONE: 0x%x", index);
@@ -180,7 +180,7 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 {
 	while (1) {
 		struct btp_buf *cmd;
-		u16_t len;
+		uint16_t len;
 
 		cmd = k_fifo_get(&cmds_queue, K_FOREVER);
 
@@ -226,11 +226,11 @@ static void cmd_handler(void *p1, void *p2, void *p3)
 	}
 }
 
-static u8_t *recv_cb(u8_t *buf, size_t *off)
+static uint8_t *recv_cb(uint8_t *buf, size_t *off)
 {
 	struct btp_hdr *cmd = (void *) buf;
 	struct btp_buf *new_buf;
-	u16_t len;
+	uint16_t len;
 
 	if (*off < sizeof(*cmd)) {
 		return buf;
@@ -281,7 +281,7 @@ void tester_init(void)
 		    NULL, 0);
 }
 
-void tester_send(u8_t service, u8_t opcode, u8_t index, u8_t *data,
+void tester_send(uint8_t service, uint8_t opcode, uint8_t index, uint8_t *data,
 		 size_t len)
 {
 	struct btp_hdr msg;
@@ -291,13 +291,13 @@ void tester_send(u8_t service, u8_t opcode, u8_t index, u8_t *data,
 	msg.index = index;
 	msg.len = len;
 
-	uart_pipe_send((u8_t *)&msg, sizeof(msg));
+	uart_pipe_send((uint8_t *)&msg, sizeof(msg));
 	if (data && len) {
 		uart_pipe_send(data, len);
 	}
 }
 
-void tester_rsp(u8_t service, u8_t opcode, u8_t index, u8_t status)
+void tester_rsp(uint8_t service, uint8_t opcode, uint8_t index, uint8_t status)
 {
 	struct btp_status s;
 
@@ -307,5 +307,5 @@ void tester_rsp(u8_t service, u8_t opcode, u8_t index, u8_t status)
 	}
 
 	s.code = status;
-	tester_send(service, BTP_STATUS, index, (u8_t *) &s, sizeof(s));
+	tester_send(service, BTP_STATUS, index, (uint8_t *) &s, sizeof(s));
 }
diff --git a/tests/bluetooth/tester/src/bttester.h b/tests/bluetooth/tester/src/bttester.h
index 480c2be6e3..82656ceb83 100644
--- a/tests/bluetooth/tester/src/bttester.h
+++ b/tests/bluetooth/tester/src/bttester.h
@@ -25,37 +25,37 @@
 #define BTP_STATUS_NOT_READY	0x03
 
 struct btp_hdr {
-	u8_t  service;
-	u8_t  opcode;
-	u8_t  index;
-	u16_t len;
-	u8_t  data[0];
+	uint8_t  service;
+	uint8_t  opcode;
+	uint8_t  index;
+	uint16_t len;
+	uint8_t  data[0];
 } __packed;
 
 #define BTP_STATUS			0x00
 struct btp_status {
-	u8_t code;
+	uint8_t code;
 } __packed;
 
 /* Core Service */
 #define CORE_READ_SUPPORTED_COMMANDS	0x01
 struct core_read_supported_commands_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define CORE_READ_SUPPORTED_SERVICES	0x02
 struct core_read_supported_services_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define CORE_REGISTER_SERVICE		0x03
 struct core_register_service_cmd {
-	u8_t id;
+	uint8_t id;
 } __packed;
 
 #define CORE_UNREGISTER_SERVICE		0x04
 struct core_unregister_service_cmd {
-	u8_t id;
+	uint8_t id;
 } __packed;
 
 /* events */
@@ -65,13 +65,13 @@ struct core_unregister_service_cmd {
 /* commands */
 #define GAP_READ_SUPPORTED_COMMANDS	0x01
 struct gap_read_supported_commands_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define GAP_READ_CONTROLLER_INDEX_LIST	0x02
 struct gap_read_controller_index_list_rp {
-	u8_t num;
-	u8_t index[0];
+	uint8_t num;
+	uint8_t index[0];
 } __packed;
 
 #define GAP_SETTINGS_POWERED		0
@@ -93,41 +93,41 @@ struct gap_read_controller_index_list_rp {
 
 #define GAP_READ_CONTROLLER_INFO	0x03
 struct gap_read_controller_info_rp {
-	u8_t  address[6];
-	u32_t supported_settings;
-	u32_t current_settings;
-	u8_t  cod[3];
-	u8_t  name[249];
-	u8_t  short_name[11];
+	uint8_t  address[6];
+	uint32_t supported_settings;
+	uint32_t current_settings;
+	uint8_t  cod[3];
+	uint8_t  name[249];
+	uint8_t  short_name[11];
 } __packed;
 
 #define GAP_RESET			0x04
 struct gap_reset_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_SET_POWERED			0x05
 struct gap_set_powered_cmd {
-	u8_t powered;
+	uint8_t powered;
 } __packed;
 struct gap_set_powered_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_SET_CONNECTABLE		0x06
 struct gap_set_connectable_cmd {
-	u8_t connectable;
+	uint8_t connectable;
 } __packed;
 struct gap_set_connectable_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_SET_FAST_CONNECTABLE	0x07
 struct gap_set_fast_connectable_cmd {
-	u8_t fast_connectable;
+	uint8_t fast_connectable;
 } __packed;
 struct gap_set_fast_connectable_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_NON_DISCOVERABLE		0x00
@@ -136,34 +136,34 @@ struct gap_set_fast_connectable_rp {
 
 #define GAP_SET_DISCOVERABLE		0x08
 struct gap_set_discoverable_cmd {
-	u8_t discoverable;
+	uint8_t discoverable;
 } __packed;
 struct gap_set_discoverable_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_SET_BONDABLE		0x09
 struct gap_set_bondable_cmd {
-	u8_t bondable;
+	uint8_t bondable;
 } __packed;
 struct gap_set_bondable_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_START_ADVERTISING	0x0a
 struct gap_start_advertising_cmd {
-	u8_t adv_data_len;
-	u8_t scan_rsp_len;
-	u8_t adv_data[0];
-	u8_t scan_rsp[0];
+	uint8_t adv_data_len;
+	uint8_t scan_rsp_len;
+	uint8_t adv_data[0];
+	uint8_t scan_rsp[0];
 } __packed;
 struct gap_start_advertising_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_STOP_ADVERTISING		0x0b
 struct gap_stop_advertising_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_DISCOVERY_FLAG_LE			0x01
@@ -175,21 +175,21 @@ struct gap_stop_advertising_rp {
 
 #define GAP_START_DISCOVERY		0x0c
 struct gap_start_discovery_cmd {
-	u8_t flags;
+	uint8_t flags;
 } __packed;
 
 #define GAP_STOP_DISCOVERY		0x0d
 
 #define GAP_CONNECT			0x0e
 struct gap_connect_cmd {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GAP_DISCONNECT			0x0f
 struct gap_disconnect_cmd {
-	u8_t  address_type;
-	u8_t  address[6];
+	uint8_t  address_type;
+	uint8_t  address[6];
 } __packed;
 
 #define GAP_IO_CAP_DISPLAY_ONLY		0
@@ -200,89 +200,89 @@ struct gap_disconnect_cmd {
 
 #define GAP_SET_IO_CAP			0x10
 struct gap_set_io_cap_cmd {
-	u8_t io_cap;
+	uint8_t io_cap;
 } __packed;
 
 #define GAP_PAIR			0x11
 struct gap_pair_cmd {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GAP_UNPAIR			0x12
 struct gap_unpair_cmd {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GAP_PASSKEY_ENTRY		0x13
 struct gap_passkey_entry_cmd {
-	u8_t  address_type;
-	u8_t  address[6];
-	u32_t passkey;
+	uint8_t  address_type;
+	uint8_t  address[6];
+	uint32_t passkey;
 } __packed;
 
 #define GAP_PASSKEY_CONFIRM		0x14
 struct gap_passkey_confirm_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t match;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t match;
 } __packed;
 
 #define GAP_START_DIRECTED_ADV		0x15
 struct gap_start_directed_adv_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t high_duty;
-	u8_t own_id_addr;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t high_duty;
+	uint8_t own_id_addr;
 } __packed;
 struct gap_start_directed_adv_rp {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_CONN_PARAM_UPDATE		0x16
 struct gap_conn_param_update_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t interval_min;
-	u16_t interval_max;
-	u16_t latency;
-	u16_t timeout;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t interval_min;
+	uint16_t interval_max;
+	uint16_t latency;
+	uint16_t timeout;
 } __packed;
 
 #define GAP_PAIRING_CONSENT		0x17
 struct gap_pairing_consent_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t consent;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t consent;
 } __packed;
 
 #define GAP_OOB_LEGACY_SET_DATA		0x18
 struct gap_oob_legacy_set_data_cmd {
-	u8_t oob_data[16];
+	uint8_t oob_data[16];
 } __packed;
 
 #define GAP_OOB_SC_GET_LOCAL_DATA	0x19
 struct gap_oob_sc_get_local_data_rp {
-	u8_t rand[16];
-	u8_t conf[16];
+	uint8_t rand[16];
+	uint8_t conf[16];
 } __packed;
 
 #define GAP_OOB_SC_SET_REMOTE_DATA	0x1a
 struct gap_oob_sc_set_remote_data_cmd {
-	u8_t rand[16];
-	u8_t conf[16];
+	uint8_t rand[16];
+	uint8_t conf[16];
 } __packed;
 
 #define GAP_SET_MITM			0x1b
 struct gap_set_mitm {
-	u8_t mitm;
+	uint8_t mitm;
 } __packed;
 
 /* events */
 #define GAP_EV_NEW_SETTINGS		0x80
 struct gap_new_settings_ev {
-	u32_t current_settings;
+	uint32_t current_settings;
 } __packed;
 
 #define GAP_DEVICE_FOUND_FLAG_RSSI	0x01
@@ -291,64 +291,64 @@ struct gap_new_settings_ev {
 
 #define GAP_EV_DEVICE_FOUND		0x81
 struct gap_device_found_ev {
-	u8_t  address_type;
-	u8_t  address[6];
-	s8_t   rssi;
-	u8_t  flags;
-	u16_t eir_data_len;
-	u8_t  eir_data[0];
+	uint8_t  address_type;
+	uint8_t  address[6];
+	int8_t   rssi;
+	uint8_t  flags;
+	uint16_t eir_data_len;
+	uint8_t  eir_data[0];
 } __packed;
 
 #define GAP_EV_DEVICE_CONNECTED		0x82
 struct gap_device_connected_ev {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t interval;
-	u16_t latency;
-	u16_t timeout;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
 } __packed;
 
 #define GAP_EV_DEVICE_DISCONNECTED	0x83
 struct gap_device_disconnected_ev {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GAP_EV_PASSKEY_DISPLAY		0x84
 struct gap_passkey_display_ev {
-	u8_t  address_type;
-	u8_t  address[6];
-	u32_t passkey;
+	uint8_t  address_type;
+	uint8_t  address[6];
+	uint32_t passkey;
 } __packed;
 
 #define GAP_EV_PASSKEY_ENTRY_REQ	0x85
 struct gap_passkey_entry_req_ev {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GAP_EV_PASSKEY_CONFIRM_REQ	0x86
 struct gap_passkey_confirm_req_ev {
-	u8_t  address_type;
-	u8_t  address[6];
-	u32_t passkey;
+	uint8_t  address_type;
+	uint8_t  address[6];
+	uint32_t passkey;
 } __packed;
 
 #define GAP_EV_IDENTITY_RESOLVED	0x87
 struct gap_identity_resolved_ev {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t identity_address_type;
-	u8_t identity_address[6];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t identity_address_type;
+	uint8_t identity_address[6];
 } __packed;
 
 #define GAP_EV_CONN_PARAM_UPDATE	0x88
 struct gap_conn_param_update_ev {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t interval;
-	u16_t latency;
-	u16_t timeout;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t interval;
+	uint16_t latency;
+	uint16_t timeout;
 } __packed;
 
 #define GAP_SEC_LEVEL_UNAUTH_ENC	0x01
@@ -357,22 +357,22 @@ struct gap_conn_param_update_ev {
 
 #define GAP_EV_SEC_LEVEL_CHANGED	0x89
 struct gap_sec_level_changed_ev {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t sec_level;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t sec_level;
 } __packed;
 
 #define GAP_EV_PAIRING_CONSENT_REQ	0x8a
 struct gap_pairing_consent_req_ev {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 /* GATT Service */
 /* commands */
 #define GATT_READ_SUPPORTED_COMMANDS	0x01
 struct gatt_read_supported_commands_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define GATT_SERVICE_PRIMARY		0x00
@@ -380,349 +380,349 @@ struct gatt_read_supported_commands_rp {
 
 #define GATT_ADD_SERVICE		0x02
 struct gatt_add_service_cmd {
-	u8_t type;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint8_t type;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 struct gatt_add_service_rp {
-	u16_t svc_id;
+	uint16_t svc_id;
 } __packed;
 
 #define GATT_ADD_CHARACTERISTIC		0x03
 struct gatt_add_characteristic_cmd {
-	u16_t svc_id;
-	u8_t properties;
-	u8_t permissions;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint16_t svc_id;
+	uint8_t properties;
+	uint8_t permissions;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 struct gatt_add_characteristic_rp {
-	u16_t char_id;
+	uint16_t char_id;
 } __packed;
 
 #define GATT_ADD_DESCRIPTOR		0x04
 struct gatt_add_descriptor_cmd {
-	u16_t char_id;
-	u8_t permissions;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint16_t char_id;
+	uint8_t permissions;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 struct gatt_add_descriptor_rp {
-	u16_t desc_id;
+	uint16_t desc_id;
 } __packed;
 
 #define GATT_ADD_INCLUDED_SERVICE	0x05
 struct gatt_add_included_service_cmd {
-	u16_t svc_id;
+	uint16_t svc_id;
 } __packed;
 struct gatt_add_included_service_rp {
-	u16_t included_service_id;
+	uint16_t included_service_id;
 } __packed;
 
 #define GATT_SET_VALUE			0x06
 	struct gatt_set_value_cmd {
-	u16_t attr_id;
-	u16_t len;
-	u8_t value[0];
+	uint16_t attr_id;
+	uint16_t len;
+	uint8_t value[0];
 } __packed;
 
 #define GATT_START_SERVER		0x07
 struct gatt_start_server_rp {
-	u16_t db_attr_off;
-	u8_t db_attr_cnt;
+	uint16_t db_attr_off;
+	uint8_t db_attr_cnt;
 } __packed;
 
 #define GATT_RESET_SERVER		0x08
 
 #define GATT_SET_ENC_KEY_SIZE		0x09
 struct gatt_set_enc_key_size_cmd {
-	u16_t attr_id;
-	u8_t key_size;
+	uint16_t attr_id;
+	uint8_t key_size;
 } __packed;
 
 /* Gatt Client */
 struct gatt_service {
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 
 struct gatt_included {
-	u16_t included_handle;
+	uint16_t included_handle;
 	struct gatt_service service;
 } __packed;
 
 struct gatt_characteristic {
-	u16_t characteristic_handle;
-	u16_t value_handle;
-	u8_t properties;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint16_t characteristic_handle;
+	uint16_t value_handle;
+	uint8_t properties;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 
 struct gatt_descriptor {
-	u16_t descriptor_handle;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint16_t descriptor_handle;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 
 #define GATT_EXCHANGE_MTU		0x0a
 struct gatt_exchange_mtu_cmd {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define GATT_DISC_ALL_PRIM		0x0b
 struct gatt_disc_all_prim_cmd {
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 struct gatt_disc_all_prim_rp {
-	u8_t services_count;
+	uint8_t services_count;
 	struct gatt_service services[0];
 } __packed;
 
 #define GATT_DISC_PRIM_UUID		0x0c
 struct gatt_disc_prim_uuid_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 struct gatt_disc_prim_rp {
-	u8_t services_count;
+	uint8_t services_count;
 	struct gatt_service services[0];
 } __packed;
 
 #define GATT_FIND_INCLUDED		0x0d
 struct gatt_find_included_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t start_handle;
-	u16_t end_handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t start_handle;
+	uint16_t end_handle;
 } __packed;
 struct gatt_find_included_rp {
-	u8_t services_count;
+	uint8_t services_count;
 	struct gatt_included included[0];
 } __packed;
 
 #define GATT_DISC_ALL_CHRC		0x0e
 struct gatt_disc_all_chrc_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t start_handle;
-	u16_t end_handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t start_handle;
+	uint16_t end_handle;
 } __packed;
 struct gatt_disc_chrc_rp {
-	u8_t characteristics_count;
+	uint8_t characteristics_count;
 	struct gatt_characteristic characteristics[0];
 } __packed;
 
 #define GATT_DISC_CHRC_UUID		0x0f
 struct gatt_disc_chrc_uuid_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 
 #define GATT_DISC_ALL_DESC		0x10
 struct gatt_disc_all_desc_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t start_handle;
-	u16_t end_handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t start_handle;
+	uint16_t end_handle;
 } __packed;
 struct gatt_disc_all_desc_rp {
-	u8_t descriptors_count;
+	uint8_t descriptors_count;
 	struct gatt_descriptor descriptors[0];
 } __packed;
 
 #define GATT_READ			0x11
 struct gatt_read_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
 } __packed;
 struct gatt_read_rp {
-	u8_t att_response;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t att_response;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_READ_UUID			0x12
 struct gatt_read_uuid_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t uuid_length;
-	u8_t uuid[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t uuid_length;
+	uint8_t uuid[0];
 } __packed;
 struct gatt_read_uuid_rp {
-	u8_t att_response;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t att_response;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_READ_LONG			0x13
 struct gatt_read_long_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t offset;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t offset;
 } __packed;
 struct gatt_read_long_rp {
-	u8_t att_response;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t att_response;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_READ_MULTIPLE		0x14
 struct gatt_read_multiple_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t handles_count;
-	u16_t handles[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t handles_count;
+	uint16_t handles[0];
 } __packed;
 struct gatt_read_multiple_rp {
-	u8_t att_response;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t att_response;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_WRITE_WITHOUT_RSP		0x15
 struct gatt_write_without_rsp_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_SIGNED_WRITE_WITHOUT_RSP	0x16
 struct gatt_signed_write_without_rsp_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_WRITE			0x17
 struct gatt_write_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 struct gatt_write_rp {
-	u8_t att_response;
+	uint8_t att_response;
 } __packed;
 
 #define GATT_WRITE_LONG			0x18
 struct gatt_write_long_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t offset;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t offset;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 struct gatt_write_long_rp {
-	u8_t att_response;
+	uint8_t att_response;
 } __packed;
 
 #define GATT_RELIABLE_WRITE		0x19
 struct gatt_reliable_write_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
-	u16_t offset;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
+	uint16_t offset;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 struct gatt_reliable_write_rp {
-	u8_t att_response;
+	uint8_t att_response;
 } __packed;
 
 #define GATT_CFG_NOTIFY			0x1a
 #define GATT_CFG_INDICATE		0x1b
 struct gatt_cfg_notify_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t enable;
-	u16_t ccc_handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t enable;
+	uint16_t ccc_handle;
 } __packed;
 
 #define GATT_GET_ATTRIBUTES		0x1c
 struct gatt_get_attributes_cmd {
-	u16_t start_handle;
-	u16_t end_handle;
-	u8_t type_length;
-	u8_t type[0];
+	uint16_t start_handle;
+	uint16_t end_handle;
+	uint8_t type_length;
+	uint8_t type[0];
 } __packed;
 struct gatt_get_attributes_rp {
-	u8_t attrs_count;
-	u8_t attrs[0];
+	uint8_t attrs_count;
+	uint8_t attrs[0];
 } __packed;
 struct gatt_attr {
-	u16_t handle;
-	u8_t permission;
-	u8_t type_length;
-	u8_t type[0];
+	uint16_t handle;
+	uint8_t permission;
+	uint8_t type_length;
+	uint8_t type[0];
 } __packed;
 
 #define GATT_GET_ATTRIBUTE_VALUE	0x1d
 struct gatt_get_attribute_value_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t handle;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t handle;
 } __packed;
 struct gatt_get_attribute_value_rp {
-	u8_t att_response;
-	u16_t value_length;
-	u8_t value[0];
+	uint8_t att_response;
+	uint16_t value_length;
+	uint8_t value[0];
 } __packed;
 
 #define GATT_CHANGE_DB			0x1e
 struct gatt_change_db_cmd {
-	u16_t start_handle;
-	u8_t visibility;
+	uint16_t start_handle;
+	uint8_t visibility;
 } __packed;
 
 /* GATT events */
 #define GATT_EV_NOTIFICATION		0x80
 struct gatt_notification_ev {
-	u8_t address_type;
-	u8_t address[6];
-	u8_t type;
-	u16_t handle;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t address_type;
+	uint8_t address[6];
+	uint8_t type;
+	uint16_t handle;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 #define GATT_EV_ATTR_VALUE_CHANGED	0x81
 struct gatt_attr_value_changed_ev {
-	u16_t handle;
-	u16_t data_length;
-	u8_t data[0];
+	uint16_t handle;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
-static inline void tester_set_bit(u8_t *addr, unsigned int bit)
+static inline void tester_set_bit(uint8_t *addr, unsigned int bit)
 {
-	u8_t *p = addr + (bit / 8U);
+	uint8_t *p = addr + (bit / 8U);
 
 	*p |= BIT(bit % 8);
 }
 
-static inline u8_t tester_test_bit(const u8_t *addr, unsigned int bit)
+static inline uint8_t tester_test_bit(const uint8_t *addr, unsigned int bit)
 {
-	const u8_t *p = addr + (bit / 8U);
+	const uint8_t *p = addr + (bit / 8U);
 
 	return *p & BIT(bit % 8);
 }
@@ -731,32 +731,32 @@ static inline u8_t tester_test_bit(const u8_t *addr, unsigned int bit)
 /* commands */
 #define L2CAP_READ_SUPPORTED_COMMANDS	0x01
 struct l2cap_read_supported_commands_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define L2CAP_CONNECT			0x02
 struct l2cap_connect_cmd {
-	u8_t address_type;
-	u8_t address[6];
-	u16_t psm;
-	u16_t mtu;
-	u8_t num;
+	uint8_t address_type;
+	uint8_t address[6];
+	uint16_t psm;
+	uint16_t mtu;
+	uint8_t num;
 } __packed;
 struct l2cap_connect_rp {
-	u8_t num;
-	u8_t chan_id[0];
+	uint8_t num;
+	uint8_t chan_id[0];
 } __packed;
 
 #define L2CAP_DISCONNECT		0x03
 struct l2cap_disconnect_cmd {
-	u8_t chan_id;
+	uint8_t chan_id;
 } __packed;
 
 #define L2CAP_SEND_DATA			0x04
 struct l2cap_send_data_cmd {
-	u8_t chan_id;
-	u16_t data_len;
-	u8_t data[];
+	uint8_t chan_id;
+	uint16_t data_len;
+	uint8_t data[];
 } __packed;
 
 #define L2CAP_TRANSPORT_BREDR		0x00
@@ -764,60 +764,60 @@ struct l2cap_send_data_cmd {
 
 #define L2CAP_LISTEN			0x05
 struct l2cap_listen_cmd {
-	u16_t psm;
-	u8_t transport;
+	uint16_t psm;
+	uint8_t transport;
 	uint16_t mtu;
 	uint16_t response;
 } __packed;
 
 #define L2CAP_ACCEPT_CONNECTION		0x06
 struct l2cap_accept_connection_cmd {
-	u8_t chan_id;
-	u16_t result;
+	uint8_t chan_id;
+	uint16_t result;
 } __packed;
 
 /* events */
 #define L2CAP_EV_CONNECTION_REQ		0x80
 struct l2cap_connection_req_ev {
-	u8_t chan_id;
-	u16_t psm;
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t chan_id;
+	uint16_t psm;
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define L2CAP_EV_CONNECTED		0x81
 struct l2cap_connected_ev {
-	u8_t chan_id;
-	u16_t psm;
-	u16_t mtu_remote;
-	u16_t mps_remote;
-	u16_t mtu_local;
-	u16_t mps_local;
-	u8_t address_type;
-	u8_t address[6];
+	uint8_t chan_id;
+	uint16_t psm;
+	uint16_t mtu_remote;
+	uint16_t mps_remote;
+	uint16_t mtu_local;
+	uint16_t mps_local;
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define L2CAP_EV_DISCONNECTED		0x82
 struct l2cap_disconnected_ev {
-	u16_t result;
-	u8_t chan_id;
-	u16_t psm;
-	u8_t address_type;
-	u8_t address[6];
+	uint16_t result;
+	uint8_t chan_id;
+	uint16_t psm;
+	uint8_t address_type;
+	uint8_t address[6];
 } __packed;
 
 #define L2CAP_EV_DATA_RECEIVED		0x83
 struct l2cap_data_received_ev {
-	u8_t chan_id;
-	u16_t data_length;
-	u8_t data[0];
+	uint8_t chan_id;
+	uint16_t data_length;
+	uint8_t data[0];
 } __packed;
 
 /* MESH Service */
 /* commands */
 #define MESH_READ_SUPPORTED_COMMANDS	0x01
 struct mesh_read_supported_commands_rp {
-	u8_t data[0];
+	uint8_t data[0];
 } __packed;
 
 #define MESH_OUT_BLINK			BIT(0)
@@ -833,88 +833,88 @@ struct mesh_read_supported_commands_rp {
 
 #define MESH_CONFIG_PROVISIONING	0x02
 struct mesh_config_provisioning_cmd {
-	u8_t uuid[16];
-	u8_t static_auth[16];
-	u8_t out_size;
-	u16_t out_actions;
-	u8_t in_size;
-	u16_t in_actions;
+	uint8_t uuid[16];
+	uint8_t static_auth[16];
+	uint8_t out_size;
+	uint16_t out_actions;
+	uint8_t in_size;
+	uint16_t in_actions;
 } __packed;
 
 #define MESH_PROVISION_NODE		0x03
 struct mesh_provision_node_cmd {
-	u8_t net_key[16];
-	u16_t net_key_idx;
-	u8_t flags;
-	u32_t iv_index;
-	u32_t seq_num;
-	u16_t addr;
-	u8_t dev_key[16];
+	uint8_t net_key[16];
+	uint16_t net_key_idx;
+	uint8_t flags;
+	uint32_t iv_index;
+	uint32_t seq_num;
+	uint16_t addr;
+	uint8_t dev_key[16];
 } __packed;
 
 #define MESH_INIT			0x04
 #define MESH_RESET			0x05
 #define MESH_INPUT_NUMBER		0x06
 struct mesh_input_number_cmd {
-	u32_t number;
+	uint32_t number;
 } __packed;
 
 #define MESH_INPUT_STRING		0x07
 struct mesh_input_string_cmd {
-	u8_t string_len;
-	u8_t string[0];
+	uint8_t string_len;
+	uint8_t string[0];
 } __packed;
 
 #define MESH_IVU_TEST_MODE		0x08
 struct mesh_ivu_test_mode_cmd {
-	u8_t enable;
+	uint8_t enable;
 } __packed;
 
 #define MESH_IVU_TOGGLE_STATE			0x09
 
 #define MESH_NET_SEND			0x0a
 struct mesh_net_send_cmd {
-	u8_t ttl;
-	u16_t src;
-	u16_t dst;
-	u8_t payload_len;
-	u8_t payload[0];
+	uint8_t ttl;
+	uint16_t src;
+	uint16_t dst;
+	uint8_t payload_len;
+	uint8_t payload[0];
 } __packed;
 
 #define MESH_HEALTH_GENERATE_FAULTS	0x0b
 struct mesh_health_generate_faults_rp {
-	u8_t test_id;
-	u8_t cur_faults_count;
-	u8_t reg_faults_count;
-	u8_t current_faults[0];
-	u8_t registered_faults[0];
+	uint8_t test_id;
+	uint8_t cur_faults_count;
+	uint8_t reg_faults_count;
+	uint8_t current_faults[0];
+	uint8_t registered_faults[0];
 } __packed;
 
 #define MESH_HEALTH_CLEAR_FAULTS	0x0c
 
 #define MESH_LPN			0x0d
 struct mesh_lpn_set_cmd {
-	u8_t enable;
+	uint8_t enable;
 } __packed;
 
 #define MESH_LPN_POLL			0x0e
 
 #define MESH_MODEL_SEND			0x0f
 struct mesh_model_send_cmd {
-	u16_t src;
-	u16_t dst;
-	u8_t payload_len;
-	u8_t payload[0];
+	uint16_t src;
+	uint16_t dst;
+	uint8_t payload_len;
+	uint8_t payload[0];
 } __packed;
 
 #define MESH_LPN_SUBSCRIBE		0x10
 struct mesh_lpn_subscribe_cmd {
-	u16_t address;
+	uint16_t address;
 } __packed;
 
 #define MESH_LPN_UNSUBSCRIBE		0x11
 struct mesh_lpn_unsubscribe_cmd {
-	u16_t address;
+	uint16_t address;
 } __packed;
 
 #define MESH_RPL_CLEAR			0x12
@@ -923,20 +923,20 @@ struct mesh_lpn_unsubscribe_cmd {
 /* events */
 #define MESH_EV_OUT_NUMBER_ACTION	0x80
 struct mesh_out_number_action_ev {
-	u16_t action;
-	u32_t number;
+	uint16_t action;
+	uint32_t number;
 } __packed;
 
 #define MESH_EV_OUT_STRING_ACTION	0x81
 struct mesh_out_string_action_ev {
-	u8_t string_len;
-	u8_t string[0];
+	uint8_t string_len;
+	uint8_t string[0];
 } __packed;
 
 #define MESH_EV_IN_ACTION		0x82
 struct mesh_in_action_ev {
-	u16_t action;
-	u8_t size;
+	uint16_t action;
+	uint8_t size;
 } __packed;
 
 #define MESH_EV_PROVISIONED		0x83
@@ -945,54 +945,54 @@ struct mesh_in_action_ev {
 #define MESH_PROV_BEARER_PB_GATT	0x01
 #define MESH_EV_PROV_LINK_OPEN		0x84
 struct mesh_prov_link_open_ev {
-	u8_t bearer;
+	uint8_t bearer;
 } __packed;
 
 #define MESH_EV_PROV_LINK_CLOSED	0x85
 struct mesh_prov_link_closed_ev {
-	u8_t bearer;
+	uint8_t bearer;
 } __packed;
 
 #define MESH_EV_NET_RECV		0x86
 struct mesh_net_recv_ev {
-	u8_t ttl;
-	u8_t ctl;
-	u16_t src;
-	u16_t dst;
-	u8_t payload_len;
-	u8_t payload[0];
+	uint8_t ttl;
+	uint8_t ctl;
+	uint16_t src;
+	uint16_t dst;
+	uint8_t payload_len;
+	uint8_t payload[0];
 } __packed;
 
 #define MESH_EV_INVALID_BEARER		0x87
 struct mesh_invalid_bearer_ev {
-	u8_t opcode;
+	uint8_t opcode;
 } __packed;
 
 #define MESH_EV_INCOMP_TIMER_EXP	0x88
 
 void tester_init(void);
-void tester_rsp(u8_t service, u8_t opcode, u8_t index, u8_t status);
-void tester_send(u8_t service, u8_t opcode, u8_t index, u8_t *data,
+void tester_rsp(uint8_t service, uint8_t opcode, uint8_t index, uint8_t status);
+void tester_send(uint8_t service, uint8_t opcode, uint8_t index, uint8_t *data,
 		 size_t len);
 
-u8_t tester_init_gap(void);
-u8_t tester_unregister_gap(void);
-void tester_handle_gap(u8_t opcode, u8_t index, u8_t *data,
-		       u16_t len);
-u8_t tester_init_gatt(void);
-u8_t tester_unregister_gatt(void);
-void tester_handle_gatt(u8_t opcode, u8_t index, u8_t *data,
-			u16_t len);
+uint8_t tester_init_gap(void);
+uint8_t tester_unregister_gap(void);
+void tester_handle_gap(uint8_t opcode, uint8_t index, uint8_t *data,
+		       uint16_t len);
+uint8_t tester_init_gatt(void);
+uint8_t tester_unregister_gatt(void);
+void tester_handle_gatt(uint8_t opcode, uint8_t index, uint8_t *data,
+			uint16_t len);
 
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-u8_t tester_init_l2cap(void);
-u8_t tester_unregister_l2cap(void);
-void tester_handle_l2cap(u8_t opcode, u8_t index, u8_t *data,
-			 u16_t len);
+uint8_t tester_init_l2cap(void);
+uint8_t tester_unregister_l2cap(void);
+void tester_handle_l2cap(uint8_t opcode, uint8_t index, uint8_t *data,
+			 uint16_t len);
 #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
 
 #if defined(CONFIG_BT_MESH)
-u8_t tester_init_mesh(void);
-u8_t tester_unregister_mesh(void);
-void tester_handle_mesh(u8_t opcode, u8_t index, u8_t *data, u16_t len);
+uint8_t tester_init_mesh(void);
+uint8_t tester_unregister_mesh(void);
+void tester_handle_mesh(uint8_t opcode, uint8_t index, uint8_t *data, uint16_t len);
 #endif /* CONFIG_BT_MESH */
diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
index 3a3c30862e..84da5c2bfe 100644
--- a/tests/bluetooth/tester/src/gap.c
+++ b/tests/bluetooth/tester/src/gap.c
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 static atomic_t current_settings;
 struct bt_conn_auth_cb cb;
 
-static void le_connected(struct bt_conn *conn, u8_t err)
+static void le_connected(struct bt_conn *conn, uint8_t err)
 {
 	struct gap_device_connected_ev ev;
 	struct bt_conn_info info;
@@ -51,10 +51,10 @@ static void le_connected(struct bt_conn *conn, u8_t err)
 	ev.timeout = sys_cpu_to_le16(info.le.timeout);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_DEVICE_CONNECTED,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
-static void le_disconnected(struct bt_conn *conn, u8_t reason)
+static void le_disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	struct gap_device_disconnected_ev ev;
 	const bt_addr_le_t *addr = bt_conn_get_dst(conn);
@@ -63,7 +63,7 @@ static void le_disconnected(struct bt_conn *conn, u8_t reason)
 	ev.address_type = addr->type;
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_DEVICE_DISCONNECTED,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void le_identity_resolved(struct bt_conn *conn, const bt_addr_le_t *rpa,
@@ -79,11 +79,11 @@ static void le_identity_resolved(struct bt_conn *conn, const bt_addr_le_t *rpa,
 	       sizeof(ev.identity_address));
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_IDENTITY_RESOLVED,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
-static void le_param_updated(struct bt_conn *conn, u16_t interval,
-			     u16_t latency, u16_t timeout)
+static void le_param_updated(struct bt_conn *conn, uint16_t interval,
+			     uint16_t latency, uint16_t timeout)
 {
 	struct gap_conn_param_update_ev ev;
 	const bt_addr_le_t *addr = bt_conn_get_dst(conn);
@@ -95,7 +95,7 @@ static void le_param_updated(struct bt_conn *conn, u16_t interval,
 	ev.timeout = sys_cpu_to_le16(timeout);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_CONN_PARAM_UPDATE,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static struct bt_conn_cb conn_callbacks = {
@@ -105,9 +105,9 @@ static struct bt_conn_cb conn_callbacks = {
 	.le_param_updated = le_param_updated,
 };
 
-static void supported_commands(u8_t *data, u16_t len)
+static void supported_commands(uint8_t *data, uint16_t len)
 {
-	u8_t cmds[4];
+	uint8_t cmds[4];
 	struct gap_read_supported_commands_rp *rp = (void *) &cmds;
 
 	(void)memset(cmds, 0, sizeof(cmds));
@@ -132,13 +132,13 @@ static void supported_commands(u8_t *data, u16_t len)
 	tester_set_bit(cmds, GAP_SET_MITM);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_READ_SUPPORTED_COMMANDS,
-		    CONTROLLER_INDEX, (u8_t *) rp, sizeof(cmds));
+		    CONTROLLER_INDEX, (uint8_t *) rp, sizeof(cmds));
 }
 
-static void controller_index_list(u8_t *data,  u16_t len)
+static void controller_index_list(uint8_t *data,  uint16_t len)
 {
 	struct gap_read_controller_index_list_rp *rp;
-	u8_t buf[sizeof(*rp) + 1];
+	uint8_t buf[sizeof(*rp) + 1];
 
 	rp = (void *) buf;
 
@@ -146,14 +146,14 @@ static void controller_index_list(u8_t *data,  u16_t len)
 	rp->index[0] = CONTROLLER_INDEX;
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_READ_CONTROLLER_INDEX_LIST,
-		    BTP_INDEX_NONE, (u8_t *) rp, sizeof(buf));
+		    BTP_INDEX_NONE, (uint8_t *) rp, sizeof(buf));
 }
 
-static void controller_info(u8_t *data, u16_t len)
+static void controller_info(uint8_t *data, uint16_t len)
 {
 	struct gap_read_controller_info_rp rp;
 	struct bt_le_oob oob;
-	u32_t supported_settings;
+	uint32_t supported_settings;
 
 	(void)memset(&rp, 0, sizeof(rp));
 
@@ -181,10 +181,10 @@ static void controller_info(u8_t *data, u16_t len)
 	memcpy(rp.name, CONTROLLER_NAME, sizeof(CONTROLLER_NAME));
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_READ_CONTROLLER_INFO,
-		    CONTROLLER_INDEX, (u8_t *) &rp, sizeof(rp));
+		    CONTROLLER_INDEX, (uint8_t *) &rp, sizeof(rp));
 }
 
-static void set_connectable(u8_t *data, u16_t len)
+static void set_connectable(uint8_t *data, uint16_t len)
 {
 	const struct gap_set_connectable_cmd *cmd = (void *) data;
 	struct gap_set_connectable_rp rp;
@@ -198,16 +198,16 @@ static void set_connectable(u8_t *data, u16_t len)
 	rp.current_settings = sys_cpu_to_le32(current_settings);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_SET_CONNECTABLE, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 }
 
-static u8_t ad_flags = BT_LE_AD_NO_BREDR;
+static uint8_t ad_flags = BT_LE_AD_NO_BREDR;
 static struct bt_data ad[10] = {
 	BT_DATA(BT_DATA_FLAGS, &ad_flags, sizeof(ad_flags)),
 };
 static struct bt_data sd[10];
 
-static void set_discoverable(u8_t *data, u16_t len)
+static void set_discoverable(uint8_t *data, uint16_t len)
 {
 	const struct gap_set_discoverable_cmd *cmd = (void *) data;
 	struct gap_set_discoverable_rp rp;
@@ -237,10 +237,10 @@ static void set_discoverable(u8_t *data, u16_t len)
 	rp.current_settings = sys_cpu_to_le32(current_settings);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_SET_DISCOVERABLE, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 }
 
-static void set_bondable(u8_t *data, u16_t len)
+static void set_bondable(uint8_t *data, uint16_t len)
 {
 	const struct gap_set_bondable_cmd *cmd = (void *) data;
 	struct gap_set_bondable_rp rp;
@@ -258,14 +258,14 @@ static void set_bondable(u8_t *data, u16_t len)
 	rp.current_settings = sys_cpu_to_le32(current_settings);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_SET_BONDABLE, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 }
 
-static void start_advertising(const u8_t *data, u16_t len)
+static void start_advertising(const uint8_t *data, uint16_t len)
 {
 	const struct gap_start_advertising_cmd *cmd = (void *) data;
 	struct gap_start_advertising_rp rp;
-	u8_t adv_len, sd_len;
+	uint8_t adv_len, sd_len;
 	bool adv_conn;
 	int i;
 
@@ -306,14 +306,14 @@ static void start_advertising(const u8_t *data, u16_t len)
 	rp.current_settings = sys_cpu_to_le32(current_settings);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_START_ADVERTISING, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 	return;
 fail:
 	tester_rsp(BTP_SERVICE_ID_GAP, GAP_START_ADVERTISING, CONTROLLER_INDEX,
 		   BTP_STATUS_FAILED);
 }
 
-static void stop_advertising(const u8_t *data, u16_t len)
+static void stop_advertising(const uint8_t *data, uint16_t len)
 {
 	struct gap_stop_advertising_rp rp;
 	int err;
@@ -330,12 +330,12 @@ static void stop_advertising(const u8_t *data, u16_t len)
 	rp.current_settings = sys_cpu_to_le32(current_settings);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_STOP_ADVERTISING, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 }
 
-static u8_t get_ad_flags(struct net_buf_simple *ad)
+static uint8_t get_ad_flags(struct net_buf_simple *ad)
 {
-	u8_t len, i;
+	uint8_t len, i;
 
 	/* Parse advertisement to get flags */
 	for (i = 0U; i < ad->len; i += len - 1) {
@@ -360,10 +360,10 @@ static u8_t get_ad_flags(struct net_buf_simple *ad)
 	return 0;
 }
 
-static u8_t discovery_flags;
+static uint8_t discovery_flags;
 static struct net_buf_simple *adv_buf = NET_BUF_SIMPLE(ADV_BUF_LEN);
 
-static void store_adv(const bt_addr_le_t *addr, s8_t rssi,
+static void store_adv(const bt_addr_le_t *addr, int8_t rssi,
 		      struct net_buf_simple *ad)
 {
 	struct gap_device_found_ev *ev;
@@ -381,13 +381,13 @@ static void store_adv(const bt_addr_le_t *addr, s8_t rssi,
 	memcpy(net_buf_simple_add(adv_buf, ad->len), ad->data, ad->len);
 }
 
-static void device_found(const bt_addr_le_t *addr, s8_t rssi, u8_t evtype,
+static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t evtype,
 			 struct net_buf_simple *ad)
 {
 	/* if General/Limited Discovery - parse Advertising data to get flags */
 	if (!(discovery_flags & GAP_DISCOVERY_FLAG_LE_OBSERVE) &&
 	    (evtype != BT_GAP_ADV_TYPE_SCAN_RSP)) {
-		u8_t flags = get_ad_flags(ad);
+		uint8_t flags = get_ad_flags(ad);
 
 		/* ignore non-discoverable devices */
 		if (!(flags & BT_LE_AD_DISCOV_MASK)) {
@@ -459,10 +459,10 @@ done:
 		    CONTROLLER_INDEX, adv_buf->data, adv_buf->len);
 }
 
-static void start_discovery(const u8_t *data, u16_t len)
+static void start_discovery(const uint8_t *data, uint16_t len)
 {
 	const struct gap_start_discovery_cmd *cmd = (void *) data;
-	u8_t status;
+	uint8_t status;
 
 	/* only LE scan is supported */
 	if (cmd->flags & GAP_DISCOVERY_FLAG_BREDR) {
@@ -488,9 +488,9 @@ reply:
 		   status);
 }
 
-static void stop_discovery(const u8_t *data, u16_t len)
+static void stop_discovery(const uint8_t *data, uint16_t len)
 {
-	u8_t status = BTP_STATUS_SUCCESS;
+	uint8_t status = BTP_STATUS_SUCCESS;
 	int err;
 
 	err = bt_le_scan_stop();
@@ -503,10 +503,10 @@ static void stop_discovery(const u8_t *data, u16_t len)
 		   status);
 }
 
-static void connect(const u8_t *data, u16_t len)
+static void connect(const uint8_t *data, uint16_t len)
 {
 	struct bt_conn *conn;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	err = bt_conn_le_create((bt_addr_le_t *) data, BT_CONN_LE_CREATE_CONN,
@@ -524,10 +524,10 @@ rsp:
 	tester_rsp(BTP_SERVICE_ID_GAP, GAP_CONNECT, CONTROLLER_INDEX, status);
 }
 
-static void disconnect(const u8_t *data, u16_t len)
+static void disconnect(const uint8_t *data, uint16_t len)
 {
 	struct bt_conn *conn;
-	u8_t status;
+	uint8_t status;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
 	if (!conn) {
@@ -560,7 +560,7 @@ static void auth_passkey_display(struct bt_conn *conn, unsigned int passkey)
 	ev.passkey = sys_cpu_to_le32(passkey);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_PASSKEY_DISPLAY,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void auth_passkey_entry(struct bt_conn *conn)
@@ -572,7 +572,7 @@ static void auth_passkey_entry(struct bt_conn *conn)
 	ev.address_type = addr->type;
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_PASSKEY_ENTRY_REQ,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void auth_passkey_confirm(struct bt_conn *conn, unsigned int passkey)
@@ -585,7 +585,7 @@ static void auth_passkey_confirm(struct bt_conn *conn, unsigned int passkey)
 	ev.passkey = sys_cpu_to_le32(passkey);
 
 	tester_send(BTP_SERVICE_ID_GAP, GAP_EV_PASSKEY_CONFIRM_REQ,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void auth_cancel(struct bt_conn *conn)
@@ -593,10 +593,10 @@ static void auth_cancel(struct bt_conn *conn)
 	/* TODO */
 }
 
-static void set_io_cap(const u8_t *data, u16_t len)
+static void set_io_cap(const uint8_t *data, uint16_t len)
 {
 	const struct gap_set_io_cap_cmd *cmd = (void *) data;
-	u8_t status;
+	uint8_t status;
 
 	/* Reset io cap requirements */
 	(void)memset(&cb, 0, sizeof(cb));
@@ -641,10 +641,10 @@ rsp:
 		   status);
 }
 
-static void pair(const u8_t *data, u16_t len)
+static void pair(const uint8_t *data, uint16_t len)
 {
 	struct bt_conn *conn;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
@@ -669,12 +669,12 @@ rsp:
 	tester_rsp(BTP_SERVICE_ID_GAP, GAP_PAIR, CONTROLLER_INDEX, status);
 }
 
-static void unpair(const u8_t *data, u16_t len)
+static void unpair(const uint8_t *data, uint16_t len)
 {
 	struct gap_unpair_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
 	bt_addr_le_t addr;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	addr.type = cmd->address_type;
@@ -703,11 +703,11 @@ rsp:
 	tester_rsp(BTP_SERVICE_ID_GAP, GAP_UNPAIR, CONTROLLER_INDEX, status);
 }
 
-static void passkey_entry(const u8_t *data, u16_t len)
+static void passkey_entry(const uint8_t *data, uint16_t len)
 {
 	const struct gap_passkey_entry_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
@@ -730,11 +730,11 @@ rsp:
 		   status);
 }
 
-static void passkey_confirm(const u8_t *data, u16_t len)
+static void passkey_confirm(const uint8_t *data, uint16_t len)
 {
 	const struct gap_passkey_confirm_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
@@ -765,7 +765,7 @@ rsp:
 }
 
 
-static void conn_param_update(const u8_t *data, u16_t len)
+static void conn_param_update(const uint8_t *data, uint16_t len)
 {
 	const struct gap_conn_param_update_cmd *cmd = (void *) data;
 	struct bt_le_conn_param param = {
@@ -775,7 +775,7 @@ static void conn_param_update(const u8_t *data, u16_t len)
 		.timeout = sys_le16_to_cpu(cmd->timeout),
 	};
 	struct bt_conn *conn;
-	u8_t status = BTP_STATUS_FAILED;
+	uint8_t status = BTP_STATUS_FAILED;
 	int err;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
@@ -797,7 +797,7 @@ rsp:
 		   status);
 }
 
-static void set_mitm(const u8_t *data, u16_t len)
+static void set_mitm(const uint8_t *data, uint16_t len)
 {
 	LOG_WRN("Use CONFIG_BT_SMP_ENFORCE_MITM instead");
 
@@ -806,8 +806,8 @@ static void set_mitm(const u8_t *data, u16_t len)
 }
 
 
-void tester_handle_gap(u8_t opcode, u8_t index, u8_t *data,
-		       u16_t len)
+void tester_handle_gap(uint8_t opcode, uint8_t index, uint8_t *data,
+		       uint16_t len)
 {
 	LOG_DBG("opcode: 0x%02x", opcode);
 	switch (opcode) {
@@ -922,7 +922,7 @@ static void tester_init_gap_cb(int err)
 		   BTP_STATUS_SUCCESS);
 }
 
-u8_t tester_init_gap(void)
+uint8_t tester_init_gap(void)
 {
 	int err;
 
@@ -935,7 +935,7 @@ u8_t tester_init_gap(void)
 	return BTP_STATUS_SUCCESS;
 }
 
-u8_t tester_unregister_gap(void)
+uint8_t tester_unregister_gap(void)
 {
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index b660d7695e..ac72c0f28b 100644
--- a/tests/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
@@ -62,9 +62,9 @@ static struct bt_gatt_attr server_db[SERVER_MAX_ATTRIBUTES];
 static struct net_buf *server_buf;
 NET_BUF_POOL_DEFINE(server_pool, 1, SERVER_BUF_SIZE, 0, NULL);
 
-static u8_t attr_count;
-static u8_t svc_attr_count;
-static u8_t svc_count;
+static uint8_t attr_count;
+static uint8_t svc_attr_count;
+static uint8_t svc_count;
 
 /*
  * gatt_buf - cache used by a gatt client (to cache data read/discovered)
@@ -72,8 +72,8 @@ static u8_t svc_count;
  * It is not intended to be used by client and server at the same time.
  */
 static struct {
-	u16_t len;
-	u8_t buf[MAX_BUFFER_SIZE];
+	uint16_t len;
+	uint8_t buf[MAX_BUFFER_SIZE];
 } gatt_buf;
 
 static void *gatt_buf_add(const void *data, size_t len)
@@ -152,10 +152,10 @@ static struct bt_gatt_attr *gatt_db_add(const struct bt_gatt_attr *pattern,
 }
 
 /* Convert UUID from BTP command to bt_uuid */
-static u8_t btp2bt_uuid(const u8_t *uuid, u8_t len,
+static uint8_t btp2bt_uuid(const uint8_t *uuid, uint8_t len,
 			   struct bt_uuid *bt_uuid)
 {
-	u16_t le16;
+	uint16_t le16;
 
 	switch (len) {
 	case 0x02: /* UUID 16 */
@@ -174,9 +174,9 @@ static u8_t btp2bt_uuid(const u8_t *uuid, u8_t len,
 	return BTP_STATUS_SUCCESS;
 }
 
-static void supported_commands(u8_t *data, u16_t len)
+static void supported_commands(uint8_t *data, uint16_t len)
 {
-	u8_t cmds[4];
+	uint8_t cmds[4];
 	struct gatt_read_supported_commands_rp *rp = (void *) cmds;
 
 	(void)memset(cmds, 0, sizeof(cmds));
@@ -209,7 +209,7 @@ static void supported_commands(u8_t *data, u16_t len)
 	tester_set_bit(cmds, GATT_DISC_ALL_PRIM);
 
 	tester_send(BTP_SERVICE_ID_GATT, GATT_READ_SUPPORTED_COMMANDS,
-		    CONTROLLER_INDEX, (u8_t *) rp, sizeof(cmds));
+		    CONTROLLER_INDEX, (uint8_t *) rp, sizeof(cmds));
 }
 
 static int register_service(void)
@@ -229,7 +229,7 @@ static int register_service(void)
 	return err;
 }
 
-static void add_service(u8_t *data, u16_t len)
+static void add_service(uint8_t *data, uint16_t len)
 {
 	const struct gatt_add_service_cmd *cmd = (void *) data;
 	struct gatt_add_service_rp rp;
@@ -274,7 +274,7 @@ static void add_service(u8_t *data, u16_t len)
 	rp.svc_id = sys_cpu_to_le16(attr_svc->handle);
 
 	tester_send(BTP_SERVICE_ID_GATT, GATT_ADD_SERVICE, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 
 	return;
 fail:
@@ -283,10 +283,10 @@ fail:
 }
 
 struct gatt_value {
-	u16_t len;
-	u8_t *data;
-	u8_t enc_key_size;
-	u8_t flags[1];
+	uint16_t len;
+	uint8_t *data;
+	uint8_t enc_key_size;
+	uint8_t flags[1];
 };
 
 enum {
@@ -296,7 +296,7 @@ enum {
 };
 
 static ssize_t read_value(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			  void *buf, u16_t len, u16_t offset)
+			  void *buf, uint16_t len, uint16_t offset)
 {
 	const struct gatt_value *value = attr->user_data;
 
@@ -313,9 +313,9 @@ static ssize_t read_value(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 value->len);
 }
 
-static void attr_value_changed_ev(u16_t handle, const u8_t *value, u16_t len)
+static void attr_value_changed_ev(uint16_t handle, const uint8_t *value, uint16_t len)
 {
-	u8_t buf[len + sizeof(struct gatt_attr_value_changed_ev)];
+	uint8_t buf[len + sizeof(struct gatt_attr_value_changed_ev)];
 	struct gatt_attr_value_changed_ev *ev = (void *) buf;
 
 	ev->handle = sys_cpu_to_le16(handle);
@@ -328,7 +328,7 @@ static void attr_value_changed_ev(u16_t handle, const u8_t *value, u16_t len)
 
 static ssize_t write_value(struct bt_conn *conn,
 			   const struct bt_gatt_attr *attr, const void *buf,
-			   u16_t len, u16_t offset, u8_t flags)
+			   uint16_t len, uint16_t offset, uint8_t flags)
 {
 	struct gatt_value *value = attr->user_data;
 
@@ -365,9 +365,9 @@ static ssize_t write_value(struct bt_conn *conn,
 }
 
 struct add_characteristic {
-	u16_t char_id;
-	u8_t properties;
-	u8_t permissions;
+	uint16_t char_id;
+	uint8_t properties;
+	uint8_t permissions;
 	const struct bt_uuid *uuid;
 };
 
@@ -432,7 +432,7 @@ static int alloc_characteristic(struct add_characteristic *ch)
 	return 0;
 }
 
-static void add_characteristic(u8_t *data, u16_t len)
+static void add_characteristic(uint8_t *data, uint16_t len)
 {
 	const struct gatt_add_characteristic_cmd *cmd = (void *) data;
 	struct gatt_add_characteristic_rp rp;
@@ -460,7 +460,7 @@ static void add_characteristic(u8_t *data, u16_t len)
 
 	rp.char_id = sys_cpu_to_le16(cmd_data.char_id);
 	tester_send(BTP_SERVICE_ID_GATT, GATT_ADD_CHARACTERISTIC,
-		    CONTROLLER_INDEX, (u8_t *) &rp, sizeof(rp));
+		    CONTROLLER_INDEX, (uint8_t *) &rp, sizeof(rp));
 	return;
 
 fail:
@@ -470,9 +470,9 @@ fail:
 
 static bool ccc_added;
 
-static u8_t ccc_value;
+static uint8_t ccc_value;
 
-static void ccc_cfg_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void ccc_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	ccc_value = value;
 }
@@ -528,8 +528,8 @@ static struct bt_gatt_attr *add_cep(const struct bt_gatt_attr *attr_chrc)
 }
 
 struct add_descriptor {
-	u16_t desc_id;
-	u8_t permissions;
+	uint16_t desc_id;
+	uint8_t permissions;
 	const struct bt_uuid *uuid;
 };
 
@@ -609,7 +609,7 @@ static struct bt_gatt_attr *get_base_chrc(struct bt_gatt_attr *attr)
 	return NULL;
 }
 
-static void add_descriptor(u8_t *data, u16_t len)
+static void add_descriptor(uint8_t *data, uint16_t len)
 {
 	const struct gatt_add_descriptor_cmd *cmd = (void *) data;
 	struct gatt_add_descriptor_rp rp;
@@ -648,7 +648,7 @@ static void add_descriptor(u8_t *data, u16_t len)
 
 	rp.desc_id = sys_cpu_to_le16(cmd_data.desc_id);
 	tester_send(BTP_SERVICE_ID_GATT, GATT_ADD_DESCRIPTOR, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 	return;
 
 fail:
@@ -657,7 +657,7 @@ fail:
 }
 
 static int alloc_included(struct bt_gatt_attr *attr,
-			  u16_t *included_service_id, u16_t svc_handle)
+			  uint16_t *included_service_id, uint16_t svc_handle)
 {
 	struct bt_gatt_attr *attr_incl;
 
@@ -678,12 +678,12 @@ static int alloc_included(struct bt_gatt_attr *attr,
 	return 0;
 }
 
-static void add_included(u8_t *data, u16_t len)
+static void add_included(uint8_t *data, uint16_t len)
 {
 	const struct gatt_add_included_service_cmd *cmd = (void *) data;
 	struct gatt_add_included_service_rp rp;
 	struct bt_gatt_attr *svc;
-	u16_t included_service_id = 0U;
+	uint16_t included_service_id = 0U;
 
 	if (!svc_count || !cmd->svc_id) {
 		goto fail;
@@ -703,7 +703,7 @@ static void add_included(u8_t *data, u16_t len)
 
 	rp.included_service_id = sys_cpu_to_le16(included_service_id);
 	tester_send(BTP_SERVICE_ID_GATT, GATT_ADD_INCLUDED_SERVICE,
-		    CONTROLLER_INDEX, (u8_t *) &rp, sizeof(rp));
+		    CONTROLLER_INDEX, (uint8_t *) &rp, sizeof(rp));
 	return;
 
 fail:
@@ -711,11 +711,11 @@ fail:
 		   CONTROLLER_INDEX, BTP_STATUS_FAILED);
 }
 
-static u8_t set_cep_value(struct bt_gatt_attr *attr, const void *value,
-			     const u16_t len)
+static uint8_t set_cep_value(struct bt_gatt_attr *attr, const void *value,
+			     const uint16_t len)
 {
 	struct bt_gatt_cep *cep_value = attr->user_data;
-	u16_t properties;
+	uint16_t properties;
 
 	if (len != sizeof(properties)) {
 		return BTP_STATUS_FAILED;
@@ -728,14 +728,14 @@ static u8_t set_cep_value(struct bt_gatt_attr *attr, const void *value,
 }
 
 struct set_value {
-	const u8_t *value;
-	u16_t len;
+	const uint8_t *value;
+	uint16_t len;
 };
 
 struct bt_gatt_indicate_params indicate_params;
 
 static void indicate_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
-			u8_t err)
+			uint8_t err)
 {
 	if (err != 0U) {
 		LOG_ERR("Indication fail");
@@ -744,7 +744,7 @@ static void indicate_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 	}
 }
 
-static u8_t alloc_value(struct bt_gatt_attr *attr, struct set_value *data)
+static uint8_t alloc_value(struct bt_gatt_attr *attr, struct set_value *data)
 {
 	struct gatt_value *value;
 
@@ -789,11 +789,11 @@ static u8_t alloc_value(struct bt_gatt_attr *attr, struct set_value *data)
 	return BTP_STATUS_SUCCESS;
 }
 
-static void set_value(u8_t *data, u16_t len)
+static void set_value(uint8_t *data, uint16_t len)
 {
 	const struct gatt_set_value_cmd *cmd = (void *) data;
 	struct set_value cmd_data;
-	u8_t status;
+	uint8_t status;
 
 	/* Pre-set btp_status */
 	cmd_data.value = cmd->value;
@@ -811,7 +811,7 @@ static void set_value(u8_t *data, u16_t len)
 		   status);
 }
 
-static void start_server(u8_t *data, u16_t len)
+static void start_server(uint8_t *data, uint16_t len)
 {
 	struct gatt_start_server_rp rp;
 
@@ -825,11 +825,11 @@ static void start_server(u8_t *data, u16_t len)
 	}
 
 	tester_send(BTP_SERVICE_ID_GATT, GATT_START_SERVER, CONTROLLER_INDEX,
-		    (u8_t *) &rp, sizeof(rp));
+		    (uint8_t *) &rp, sizeof(rp));
 }
 
 static int set_attr_enc_key_size(const struct bt_gatt_attr *attr,
-				 u8_t key_size)
+				 uint8_t key_size)
 {
 	struct gatt_value *value;
 
@@ -852,10 +852,10 @@ static int set_attr_enc_key_size(const struct bt_gatt_attr *attr,
 	return 0;
 }
 
-static void set_enc_key_size(u8_t *data, u16_t len)
+static void set_enc_key_size(uint8_t *data, uint16_t len)
 {
 	const struct gatt_set_enc_key_size_cmd *cmd = (void *) data;
-	u8_t status;
+	uint8_t status;
 
 	/* Fail if requested key size is invalid */
 	if (cmd->key_size < 0x07 || cmd->key_size > 0x0f) {
@@ -877,7 +877,7 @@ fail:
 		   status);
 }
 
-static void exchange_func(struct bt_conn *conn, u8_t err,
+static void exchange_func(struct bt_conn *conn, uint8_t err,
 			  struct bt_gatt_exchange_params *params)
 {
 	if (err) {
@@ -893,7 +893,7 @@ static void exchange_func(struct bt_conn *conn, u8_t err,
 
 static struct bt_gatt_exchange_params exchange_params;
 
-static void exchange_mtu(u8_t *data, u16_t len)
+static void exchange_mtu(uint8_t *data, uint16_t len)
 {
 	struct bt_conn *conn;
 
@@ -920,7 +920,7 @@ fail:
 
 static struct bt_gatt_discover_params discover_params;
 static union uuid uuid;
-static u8_t btp_opcode;
+static uint8_t btp_opcode;
 
 static void discover_destroy(struct bt_gatt_discover_params *params)
 {
@@ -928,14 +928,14 @@ static void discover_destroy(struct bt_gatt_discover_params *params)
 	gatt_buf_clear();
 }
 
-static u8_t disc_prim_cb(struct bt_conn *conn,
+static uint8_t disc_prim_cb(struct bt_conn *conn,
 			 const struct bt_gatt_attr *attr,
 			 struct bt_gatt_discover_params *params)
 {
 	struct bt_gatt_service_val *data;
 	struct gatt_disc_prim_rp *rp = (void *) gatt_buf.buf;
 	struct gatt_service *service;
-	u8_t uuid_length;
+	uint8_t uuid_length;
 
 	if (!attr) {
 		tester_send(BTP_SERVICE_ID_GATT, btp_opcode,
@@ -961,7 +961,7 @@ static u8_t disc_prim_cb(struct bt_conn *conn,
 	service->uuid_length = uuid_length;
 
 	if (data->uuid->type == BT_UUID_TYPE_16) {
-		u16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
+		uint16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
 
 		memcpy(service->uuid, &u16, uuid_length);
 	} else {
@@ -974,7 +974,7 @@ static u8_t disc_prim_cb(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void disc_all_prim(u8_t *data, u16_t len)
+static void disc_all_prim(uint8_t *data, uint16_t len)
 {
 	struct bt_conn *conn;
 
@@ -1012,7 +1012,7 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void disc_prim_uuid(u8_t *data, u16_t len)
+static void disc_prim_uuid(uint8_t *data, uint16_t len)
 {
 	const struct gatt_disc_prim_uuid_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1055,14 +1055,14 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static u8_t find_included_cb(struct bt_conn *conn,
+static uint8_t find_included_cb(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
 				struct bt_gatt_discover_params *params)
 {
 	struct bt_gatt_include *data;
 	struct gatt_find_included_rp *rp = (void *) gatt_buf.buf;
 	struct gatt_included *included;
-	u8_t uuid_length;
+	uint8_t uuid_length;
 
 	if (!attr) {
 		tester_send(BTP_SERVICE_ID_GATT, GATT_FIND_INCLUDED,
@@ -1089,7 +1089,7 @@ static u8_t find_included_cb(struct bt_conn *conn,
 	included->service.uuid_length = uuid_length;
 
 	if (data->uuid->type == BT_UUID_TYPE_16) {
-		u16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
+		uint16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
 
 		memcpy(included->service.uuid, &u16, uuid_length);
 	} else {
@@ -1102,7 +1102,7 @@ static u8_t find_included_cb(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void find_included(u8_t *data, u16_t len)
+static void find_included(uint8_t *data, uint16_t len)
 {
 	const struct gatt_find_included_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1138,14 +1138,14 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static u8_t disc_chrc_cb(struct bt_conn *conn,
+static uint8_t disc_chrc_cb(struct bt_conn *conn,
 			    const struct bt_gatt_attr *attr,
 			    struct bt_gatt_discover_params *params)
 {
 	struct bt_gatt_chrc *data;
 	struct gatt_disc_chrc_rp *rp = (void *) gatt_buf.buf;
 	struct gatt_characteristic *chrc;
-	u8_t uuid_length;
+	uint8_t uuid_length;
 
 	if (!attr) {
 		tester_send(BTP_SERVICE_ID_GATT, btp_opcode,
@@ -1172,7 +1172,7 @@ static u8_t disc_chrc_cb(struct bt_conn *conn,
 	chrc->uuid_length = uuid_length;
 
 	if (data->uuid->type == BT_UUID_TYPE_16) {
-		u16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
+		uint16_t u16 = sys_cpu_to_le16(BT_UUID_16(data->uuid)->val);
 
 		memcpy(chrc->uuid, &u16, uuid_length);
 	} else {
@@ -1184,7 +1184,7 @@ static u8_t disc_chrc_cb(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void disc_all_chrc(u8_t *data, u16_t len)
+static void disc_all_chrc(uint8_t *data, uint16_t len)
 {
 	const struct gatt_disc_all_chrc_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1223,7 +1223,7 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void disc_chrc_uuid(u8_t *data, u16_t len)
+static void disc_chrc_uuid(uint8_t *data, uint16_t len)
 {
 	const struct gatt_disc_chrc_uuid_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1267,13 +1267,13 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static u8_t disc_all_desc_cb(struct bt_conn *conn,
+static uint8_t disc_all_desc_cb(struct bt_conn *conn,
 				const struct bt_gatt_attr *attr,
 				struct bt_gatt_discover_params *params)
 {
 	struct gatt_disc_all_desc_rp *rp = (void *) gatt_buf.buf;
 	struct gatt_descriptor *descriptor;
-	u8_t uuid_length;
+	uint8_t uuid_length;
 
 	if (!attr) {
 		tester_send(BTP_SERVICE_ID_GATT, GATT_DISC_ALL_DESC,
@@ -1296,7 +1296,7 @@ static u8_t disc_all_desc_cb(struct bt_conn *conn,
 	descriptor->uuid_length = uuid_length;
 
 	if (attr->uuid->type == BT_UUID_TYPE_16) {
-		u16_t u16 = sys_cpu_to_le16(BT_UUID_16(attr->uuid)->val);
+		uint16_t u16 = sys_cpu_to_le16(BT_UUID_16(attr->uuid)->val);
 
 		memcpy(descriptor->uuid, &u16, uuid_length);
 	} else {
@@ -1309,7 +1309,7 @@ static u8_t disc_all_desc_cb(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void disc_all_desc(u8_t *data, u16_t len)
+static void disc_all_desc(uint8_t *data, uint16_t len)
 {
 	const struct gatt_disc_all_desc_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1353,9 +1353,9 @@ static void read_destroy(struct bt_gatt_read_params *params)
 	gatt_buf_clear();
 }
 
-static u8_t read_cb(struct bt_conn *conn, u8_t err,
+static uint8_t read_cb(struct bt_conn *conn, uint8_t err,
 		       struct bt_gatt_read_params *params, const void *data,
-		       u16_t length)
+		       uint16_t length)
 {
 	struct gatt_read_rp *rp = (void *) gatt_buf.buf;
 
@@ -1384,7 +1384,7 @@ static u8_t read_cb(struct bt_conn *conn, u8_t err,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void read(u8_t *data, u16_t len)
+static void read(uint8_t *data, uint16_t len)
 {
 	const struct gatt_read_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1423,7 +1423,7 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void read_uuid(u8_t *data, u16_t len)
+static void read_uuid(uint8_t *data, uint16_t len)
 {
 	const struct gatt_read_uuid_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1466,7 +1466,7 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void read_long(u8_t *data, u16_t len)
+static void read_long(uint8_t *data, uint16_t len)
 {
 	const struct gatt_read_long_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1505,10 +1505,10 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void read_multiple(u8_t *data, u16_t len)
+static void read_multiple(uint8_t *data, uint16_t len)
 {
 	const struct gatt_read_multiple_cmd *cmd = (void *) data;
-	u16_t handles[cmd->handles_count];
+	uint16_t handles[cmd->handles_count];
 	struct bt_conn *conn;
 	int i;
 
@@ -1548,12 +1548,12 @@ fail_conn:
 		   BTP_STATUS_FAILED);
 }
 
-static void write_without_rsp(u8_t *data, u16_t len, u8_t op,
+static void write_without_rsp(uint8_t *data, uint16_t len, uint8_t op,
 			      bool sign)
 {
 	const struct gatt_write_without_rsp_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
-	u8_t status = BTP_STATUS_SUCCESS;
+	uint8_t status = BTP_STATUS_SUCCESS;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
 	if (!conn) {
@@ -1573,7 +1573,7 @@ rsp:
 	tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, status);
 }
 
-static void write_rsp(struct bt_conn *conn, u8_t err,
+static void write_rsp(struct bt_conn *conn, uint8_t err,
 		      struct bt_gatt_write_params *params)
 {
 	tester_send(BTP_SERVICE_ID_GATT, GATT_WRITE, CONTROLLER_INDEX, &err,
@@ -1582,7 +1582,7 @@ static void write_rsp(struct bt_conn *conn, u8_t err,
 
 static struct bt_gatt_write_params write_params;
 
-static void write(u8_t *data, u16_t len)
+static void write(uint8_t *data, uint16_t len)
 {
 	const struct gatt_write_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1611,14 +1611,14 @@ fail:
 		   BTP_STATUS_FAILED);
 }
 
-static void write_long_rsp(struct bt_conn *conn, u8_t err,
+static void write_long_rsp(struct bt_conn *conn, uint8_t err,
 			   struct bt_gatt_write_params *params)
 {
 	tester_send(BTP_SERVICE_ID_GATT, GATT_WRITE_LONG, CONTROLLER_INDEX,
 		    &err, sizeof(err));
 }
 
-static void write_long(u8_t *data, u16_t len)
+static void write_long(uint8_t *data, uint16_t len)
 {
 	const struct gatt_write_long_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
@@ -1650,11 +1650,11 @@ fail:
 static struct bt_gatt_subscribe_params subscribe_params;
 
 /* ev header + default MTU_ATT-3 */
-static u8_t ev_buf[33];
+static uint8_t ev_buf[33];
 
-static u8_t notify_func(struct bt_conn *conn,
+static uint8_t notify_func(struct bt_conn *conn,
 			   struct bt_gatt_subscribe_params *params,
-			   const void *data, u16_t length)
+			   const void *data, uint16_t length)
 {
 	struct gatt_notification_ev *ev = (void *) ev_buf;
 	const bt_addr_le_t *addr;
@@ -1665,7 +1665,7 @@ static u8_t notify_func(struct bt_conn *conn,
 		return BT_GATT_ITER_STOP;
 	}
 	addr = bt_conn_get_dst(conn);
-	ev->type = (u8_t) subscribe_params.value;
+	ev->type = (uint8_t) subscribe_params.value;
 	ev->handle = sys_cpu_to_le16(subscribe_params.value_handle);
 	ev->data_length = sys_cpu_to_le16(length);
 	memcpy(ev->data, data, length);
@@ -1681,7 +1681,7 @@ static u8_t notify_func(struct bt_conn *conn,
 static void discover_complete(struct bt_conn *conn,
 			      struct bt_gatt_discover_params *params)
 {
-	u8_t op, status;
+	uint8_t op, status;
 
 	/* If no value handle it means that chrc has not been found */
 	if (!subscribe_params.value_handle) {
@@ -1706,7 +1706,7 @@ fail:
 	tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, status);
 }
 
-static u8_t discover_func(struct bt_conn *conn,
+static uint8_t discover_func(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
 			     struct bt_gatt_discover_params *params)
 {
@@ -1725,8 +1725,8 @@ static u8_t discover_func(struct bt_conn *conn,
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static int enable_subscription(struct bt_conn *conn, u16_t ccc_handle,
-			       u16_t value)
+static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle,
+			       uint16_t value)
 {
 	/* Fail if there is another subscription enabled */
 	if (subscribe_params.ccc_handle) {
@@ -1747,7 +1747,7 @@ static int enable_subscription(struct bt_conn *conn, u16_t ccc_handle,
 	return bt_gatt_discover(conn, &discover_params);
 }
 
-static int disable_subscription(struct bt_conn *conn, u16_t ccc_handle)
+static int disable_subscription(struct bt_conn *conn, uint16_t ccc_handle)
 {
 	/* Fail if CCC handle doesn't match */
 	if (ccc_handle != subscribe_params.ccc_handle) {
@@ -1764,12 +1764,12 @@ static int disable_subscription(struct bt_conn *conn, u16_t ccc_handle)
 	return 0;
 }
 
-static void config_subscription(u8_t *data, u16_t len, u16_t op)
+static void config_subscription(uint8_t *data, uint16_t len, uint16_t op)
 {
 	const struct gatt_cfg_notify_cmd *cmd = (void *) data;
 	struct bt_conn *conn;
-	u16_t ccc_handle = sys_le16_to_cpu(cmd->ccc_handle);
-	u8_t status;
+	uint16_t ccc_handle = sys_le16_to_cpu(cmd->ccc_handle);
+	uint8_t status;
 
 	conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
 	if (!conn) {
@@ -1779,7 +1779,7 @@ static void config_subscription(u8_t *data, u16_t len, u16_t op)
 	}
 
 	if (cmd->enable) {
-		u16_t value;
+		uint16_t value;
 
 		if (op == GATT_CFG_NOTIFY) {
 			value = BT_GATT_CCC_NOTIFY;
@@ -1811,10 +1811,10 @@ static void config_subscription(u8_t *data, u16_t len, u16_t op)
 struct get_attrs_foreach_data {
 	struct net_buf_simple *buf;
 	struct bt_uuid *uuid;
-	u8_t count;
+	uint8_t count;
 };
 
-static u8_t get_attrs_rp(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t get_attrs_rp(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct get_attrs_foreach_data *foreach = user_data;
 	struct gatt_attr *gatt_attr;
@@ -1844,13 +1844,13 @@ static u8_t get_attrs_rp(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_CONTINUE;
 }
 
-static void get_attrs(u8_t *data, u16_t len)
+static void get_attrs(uint8_t *data, uint16_t len)
 {
 	const struct gatt_get_attributes_cmd *cmd = (void *) data;
 	struct gatt_get_attributes_rp *rp;
 	struct net_buf_simple *buf = NET_BUF_SIMPLE(BTP_DATA_MAX_SIZE);
 	struct get_attrs_foreach_data foreach;
-	u16_t start_handle, end_handle;
+	uint16_t start_handle, end_handle;
 	union uuid uuid;
 
 	start_handle = sys_le16_to_cpu(cmd->start_handle);
@@ -1893,7 +1893,7 @@ fail:
 		   BTP_STATUS_FAILED);
 }
 
-static u8_t err_to_att(int err)
+static uint8_t err_to_att(int err)
 {
 	if (err < 0 && err >= -0xff) {
 		return -err;
@@ -1902,7 +1902,7 @@ static u8_t err_to_att(int err)
 	return BT_ATT_ERR_UNLIKELY;
 }
 
-static u8_t get_attr_val_rp(const struct bt_gatt_attr *attr, void *user_data)
+static uint8_t get_attr_val_rp(const struct bt_gatt_attr *attr, void *user_data)
 {
 	struct net_buf_simple *buf = user_data;
 	struct gatt_get_attribute_value_rp *rp;
@@ -1935,11 +1935,11 @@ static u8_t get_attr_val_rp(const struct bt_gatt_attr *attr, void *user_data)
 	return BT_GATT_ITER_STOP;
 }
 
-static void get_attr_val(u8_t *data, u16_t len)
+static void get_attr_val(uint8_t *data, uint16_t len)
 {
 	const struct gatt_get_attribute_value_cmd *cmd = (void *) data;
 	struct net_buf_simple *buf = NET_BUF_SIMPLE(BTP_DATA_MAX_SIZE);
-	u16_t handle = sys_le16_to_cpu(cmd->handle);
+	uint16_t handle = sys_le16_to_cpu(cmd->handle);
 
 	net_buf_simple_init(buf, 0);
 
@@ -1954,8 +1954,8 @@ static void get_attr_val(u8_t *data, u16_t len)
 	}
 }
 
-void tester_handle_gatt(u8_t opcode, u8_t index, u8_t *data,
-			 u16_t len)
+void tester_handle_gatt(uint8_t opcode, uint8_t index, uint8_t *data,
+			 uint16_t len)
 {
 	switch (opcode) {
 	case GATT_READ_SUPPORTED_COMMANDS:
@@ -2044,7 +2044,7 @@ void tester_handle_gatt(u8_t opcode, u8_t index, u8_t *data,
 	}
 }
 
-u8_t tester_init_gatt(void)
+uint8_t tester_init_gatt(void)
 {
 	server_buf = net_buf_alloc(&server_pool, K_NO_WAIT);
 	if (!server_buf) {
@@ -2056,7 +2056,7 @@ u8_t tester_init_gatt(void)
 	return BTP_STATUS_SUCCESS;
 }
 
-u8_t tester_unregister_gatt(void)
+uint8_t tester_unregister_gatt(void)
 {
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/l2cap.c b/tests/bluetooth/tester/src/l2cap.c
index 2bfa9482bf..6965d61a11 100644
--- a/tests/bluetooth/tester/src/l2cap.c
+++ b/tests/bluetooth/tester/src/l2cap.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 NET_BUF_POOL_FIXED_DEFINE(data_pool, 1, DATA_MTU, NULL);
 
 static struct channel {
-	u8_t chan_id; /* Internal number that identifies L2CAP channel. */
+	uint8_t chan_id; /* Internal number that identifies L2CAP channel. */
 	struct bt_l2cap_le_chan le;
 } channels[CHANNELS];
 
@@ -38,7 +38,7 @@ static struct net_buf *alloc_buf_cb(struct bt_l2cap_chan *chan)
 	return net_buf_alloc(&data_pool, K_FOREVER);
 }
 
-static u8_t recv_cb_buf[DATA_MTU + sizeof(struct l2cap_data_received_ev)];
+static uint8_t recv_cb_buf[DATA_MTU + sizeof(struct l2cap_data_received_ev)];
 
 static int recv_cb(struct bt_l2cap_chan *l2cap_chan, struct net_buf *buf)
 {
@@ -82,7 +82,7 @@ static void connected_cb(struct bt_l2cap_chan *l2cap_chan)
 	}
 
 	tester_send(BTP_SERVICE_ID_L2CAP, L2CAP_EV_CONNECTED, CONTROLLER_INDEX,
-		    (u8_t *) &ev, sizeof(ev));
+		    (uint8_t *) &ev, sizeof(ev));
 }
 
 static void disconnected_cb(struct bt_l2cap_chan *l2cap_chan)
@@ -111,7 +111,7 @@ static void disconnected_cb(struct bt_l2cap_chan *l2cap_chan)
 	}
 
 	tester_send(BTP_SERVICE_ID_L2CAP, L2CAP_EV_DISCONNECTED,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static const struct bt_l2cap_chan_ops l2cap_ops = {
@@ -123,7 +123,7 @@ static const struct bt_l2cap_chan_ops l2cap_ops = {
 
 static struct channel *get_free_channel()
 {
-	u8_t i;
+	uint8_t i;
 	struct channel *chan;
 
 	for (i = 0U; i < CHANNELS; i++) {
@@ -140,14 +140,14 @@ static struct channel *get_free_channel()
 	return NULL;
 }
 
-static void connect(u8_t *data, u16_t len)
+static void connect(uint8_t *data, uint16_t len)
 {
 	const struct l2cap_connect_cmd *cmd = (void *) data;
 	struct l2cap_connect_rp *rp;
 	struct bt_conn *conn;
 	struct channel *chan;
-	u16_t mtu = sys_le16_to_cpu(cmd->mtu);
-	u8_t buf[sizeof(*rp) + 1];
+	uint16_t mtu = sys_le16_to_cpu(cmd->mtu);
+	uint8_t buf[sizeof(*rp) + 1];
 	int err;
 
 	if (cmd->num > 1 || mtu > DATA_MTU) {
@@ -177,7 +177,7 @@ static void connect(u8_t *data, u16_t len)
 	rp->chan_id[0] = chan->chan_id;
 
 	tester_send(BTP_SERVICE_ID_L2CAP, L2CAP_CONNECT, CONTROLLER_INDEX,
-		    (u8_t *)rp, sizeof(buf));
+		    (uint8_t *)rp, sizeof(buf));
 
 	return;
 
@@ -186,11 +186,11 @@ fail:
 		   BTP_STATUS_FAILED);
 }
 
-static void disconnect(u8_t *data, u16_t len)
+static void disconnect(uint8_t *data, uint16_t len)
 {
 	const struct l2cap_disconnect_cmd *cmd = (void *) data;
 	struct channel *chan = &channels[cmd->chan_id];
-	u8_t status;
+	uint8_t status;
 	int err;
 
 	err = bt_l2cap_chan_disconnect(&chan->le.chan);
@@ -206,13 +206,13 @@ rsp:
 		   status);
 }
 
-static void send_data(u8_t *data, u16_t len)
+static void send_data(uint8_t *data, uint16_t len)
 {
 	const struct l2cap_send_data_cmd *cmd = (void *) data;
 	struct channel *chan = &channels[cmd->chan_id];
 	struct net_buf *buf;
 	int ret;
-	u16_t data_len = sys_le16_to_cpu(cmd->data_len);
+	uint16_t data_len = sys_le16_to_cpu(cmd->data_len);
 
 	/* FIXME: For now, fail if data length exceeds buffer length */
 	if (data_len > DATA_MTU - BT_L2CAP_CHAN_SEND_RESERVE) {
@@ -246,7 +246,7 @@ fail:
 
 static struct bt_l2cap_server *get_free_server(void)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < SERVERS ; i++) {
 		if (servers[i].psm) {
@@ -259,9 +259,9 @@ static struct bt_l2cap_server *get_free_server(void)
 	return NULL;
 }
 
-static bool is_free_psm(u16_t psm)
+static bool is_free_psm(uint16_t psm)
 {
-	u8_t i;
+	uint8_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(servers); i++) {
 		if (servers[i].psm == psm) {
@@ -289,7 +289,7 @@ static int accept(struct bt_conn *conn, struct bt_l2cap_chan **l2cap_chan)
 	return 0;
 }
 
-static void listen(u8_t *data, u16_t len)
+static void listen(uint8_t *data, uint16_t len)
 {
 	const struct l2cap_listen_cmd *cmd = (void *) data;
 	struct bt_l2cap_server *server;
@@ -322,9 +322,9 @@ fail:
 		   BTP_STATUS_FAILED);
 }
 
-static void supported_commands(u8_t *data, u16_t len)
+static void supported_commands(uint8_t *data, uint16_t len)
 {
-	u8_t cmds[1];
+	uint8_t cmds[1];
 	struct l2cap_read_supported_commands_rp *rp = (void *) cmds;
 
 	(void)memset(cmds, 0, sizeof(cmds));
@@ -336,11 +336,11 @@ static void supported_commands(u8_t *data, u16_t len)
 	tester_set_bit(cmds, L2CAP_SEND_DATA);
 
 	tester_send(BTP_SERVICE_ID_L2CAP, L2CAP_READ_SUPPORTED_COMMANDS,
-		    CONTROLLER_INDEX, (u8_t *) rp, sizeof(cmds));
+		    CONTROLLER_INDEX, (uint8_t *) rp, sizeof(cmds));
 }
 
-void tester_handle_l2cap(u8_t opcode, u8_t index, u8_t *data,
-			 u16_t len)
+void tester_handle_l2cap(uint8_t opcode, uint8_t index, uint8_t *data,
+			 uint16_t len)
 {
 	switch (opcode) {
 	case L2CAP_READ_SUPPORTED_COMMANDS:
@@ -365,12 +365,12 @@ void tester_handle_l2cap(u8_t opcode, u8_t index, u8_t *data,
 	}
 }
 
-u8_t tester_init_l2cap(void)
+uint8_t tester_init_l2cap(void)
 {
 	return BTP_STATUS_SUCCESS;
 }
 
-u8_t tester_unregister_l2cap(void)
+uint8_t tester_unregister_l2cap(void)
 {
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/tester/src/mesh.c b/tests/bluetooth/tester/src/mesh.c
index f41523901e..262899218c 100644
--- a/tests/bluetooth/tester/src/mesh.c
+++ b/tests/bluetooth/tester/src/mesh.c
@@ -26,21 +26,21 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define CUR_FAULTS_MAX 4
 #define HEALTH_TEST_ID 0x00
 
-static u8_t cur_faults[CUR_FAULTS_MAX];
-static u8_t reg_faults[CUR_FAULTS_MAX * 2];
+static uint8_t cur_faults[CUR_FAULTS_MAX];
+static uint8_t reg_faults[CUR_FAULTS_MAX * 2];
 
 /* Provision node data */
-static u8_t net_key[16];
-static u16_t net_key_idx;
-static u8_t flags;
-static u32_t iv_index;
-static u16_t addr;
-static u8_t dev_key[16];
-static u8_t input_size;
+static uint8_t net_key[16];
+static uint16_t net_key_idx;
+static uint8_t flags;
+static uint32_t iv_index;
+static uint16_t addr;
+static uint8_t dev_key[16];
+static uint8_t input_size;
 
 /* Configured provisioning data */
-static u8_t dev_uuid[16];
-static u8_t static_auth[16];
+static uint8_t dev_uuid[16];
+static uint8_t static_auth[16];
 
 /* Vendor Model data */
 #define VND_MODEL_ID_1 0x1234
@@ -50,20 +50,20 @@ static u8_t static_auth[16];
 
 static struct model_data {
 	struct bt_mesh_model *model;
-	u16_t addr;
-	u16_t appkey_idx;
+	uint16_t addr;
+	uint16_t appkey_idx;
 } model_bound[MODEL_BOUNDS_MAX];
 
 static struct {
-	u16_t local;
-	u16_t dst;
-	u16_t net_idx;
+	uint16_t local;
+	uint16_t dst;
+	uint16_t net_idx;
 } net = {
 	.local = BT_MESH_ADDR_UNASSIGNED,
 	.dst = BT_MESH_ADDR_UNASSIGNED,
 };
 
-static void supported_commands(u8_t *data, u16_t len)
+static void supported_commands(uint8_t *data, uint16_t len)
 {
 	struct net_buf_simple *buf = NET_BUF_SIMPLE(BTP_DATA_MAX_SIZE);
 
@@ -120,9 +120,9 @@ static struct bt_mesh_cfg_srv cfg_srv = {
 	.relay_retransmit = BT_MESH_TRANSMIT(2, 20),
 };
 
-static void get_faults(u8_t *faults, u8_t faults_size, u8_t *dst, u8_t *count)
+static void get_faults(uint8_t *faults, uint8_t faults_size, uint8_t *dst, uint8_t *count)
 {
-	u8_t i, limit = *count;
+	uint8_t i, limit = *count;
 
 	for (i = 0U, *count = 0U; i < faults_size && *count < limit; i++) {
 		if (faults[i]) {
@@ -132,8 +132,8 @@ static void get_faults(u8_t *faults, u8_t faults_size, u8_t *dst, u8_t *count)
 	}
 }
 
-static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
-			 u16_t *company_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_cur(struct bt_mesh_model *model, uint8_t *test_id,
+			 uint16_t *company_id, uint8_t *faults, uint8_t *fault_count)
 {
 	LOG_DBG("");
 
@@ -145,8 +145,8 @@ static int fault_get_cur(struct bt_mesh_model *model, u8_t *test_id,
 	return 0;
 }
 
-static int fault_get_reg(struct bt_mesh_model *model, u16_t company_id,
-			 u8_t *test_id, u8_t *faults, u8_t *fault_count)
+static int fault_get_reg(struct bt_mesh_model *model, uint16_t company_id,
+			 uint8_t *test_id, uint8_t *faults, uint8_t *fault_count)
 {
 	LOG_DBG("company_id 0x%04x", company_id);
 
@@ -202,7 +202,7 @@ BT_MESH_HEALTH_PUB_DEFINE(health_pub, CUR_FAULTS_MAX);
 static struct bt_mesh_cfg_cli cfg_cli = {
 };
 
-void show_faults(u8_t test_id, u16_t cid, u8_t *faults, size_t fault_count)
+void show_faults(uint8_t test_id, uint16_t cid, uint8_t *faults, size_t fault_count)
 {
 	size_t i;
 
@@ -220,8 +220,8 @@ void show_faults(u8_t test_id, u16_t cid, u8_t *faults, size_t fault_count)
 	}
 }
 
-static void health_current_status(struct bt_mesh_health_cli *cli, u16_t addr,
-				  u8_t test_id, u16_t cid, u8_t *faults,
+static void health_current_status(struct bt_mesh_health_cli *cli, uint16_t addr,
+				  uint8_t test_id, uint16_t cid, uint8_t *faults,
 				  size_t fault_count)
 {
 	LOG_DBG("Health Current Status from 0x%04x", addr);
@@ -268,7 +268,7 @@ static void link_open(bt_mesh_prov_bearer_t bearer)
 	}
 
 	tester_send(BTP_SERVICE_ID_MESH, MESH_EV_PROV_LINK_OPEN,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void link_close(bt_mesh_prov_bearer_t bearer)
@@ -291,10 +291,10 @@ static void link_close(bt_mesh_prov_bearer_t bearer)
 	}
 
 	tester_send(BTP_SERVICE_ID_MESH, MESH_EV_PROV_LINK_CLOSED,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
-static int output_number(bt_mesh_output_action_t action, u32_t number)
+static int output_number(bt_mesh_output_action_t action, uint32_t number)
 {
 	struct mesh_out_number_action_ev ev;
 
@@ -304,7 +304,7 @@ static int output_number(bt_mesh_output_action_t action, u32_t number)
 	ev.number = sys_cpu_to_le32(number);
 
 	tester_send(BTP_SERVICE_ID_MESH, MESH_EV_OUT_NUMBER_ACTION,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 
 	return 0;
 }
@@ -329,7 +329,7 @@ static int output_string(const char *str)
 	return 0;
 }
 
-static int input(bt_mesh_input_action_t action, u8_t size)
+static int input(bt_mesh_input_action_t action, uint8_t size)
 {
 	struct mesh_in_action_ev ev;
 
@@ -341,12 +341,12 @@ static int input(bt_mesh_input_action_t action, u8_t size)
 	ev.size = size;
 
 	tester_send(BTP_SERVICE_ID_MESH, MESH_EV_IN_ACTION, CONTROLLER_INDEX,
-		    (u8_t *) &ev, sizeof(ev));
+		    (uint8_t *) &ev, sizeof(ev));
 
 	return 0;
 }
 
-static void prov_complete(u16_t net_idx, u16_t addr)
+static void prov_complete(uint16_t net_idx, uint16_t addr)
 {
 	LOG_DBG("net_idx 0x%04x addr 0x%04x", net_idx, addr);
 
@@ -384,7 +384,7 @@ static struct bt_mesh_prov prov = {
 	.reset = prov_reset,
 };
 
-static void config_prov(u8_t *data, u16_t len)
+static void config_prov(uint8_t *data, uint16_t len)
 {
 	const struct mesh_config_provisioning_cmd *cmd = (void *) data;
 
@@ -402,7 +402,7 @@ static void config_prov(u8_t *data, u16_t len)
 		   CONTROLLER_INDEX, BTP_STATUS_SUCCESS);
 }
 
-static void provision_node(u8_t *data, u16_t len)
+static void provision_node(uint8_t *data, uint16_t len)
 {
 	const struct mesh_provision_node_cmd *cmd = (void *) data;
 
@@ -420,9 +420,9 @@ static void provision_node(u8_t *data, u16_t len)
 		   CONTROLLER_INDEX, BTP_STATUS_SUCCESS);
 }
 
-static void init(u8_t *data, u16_t len)
+static void init(uint8_t *data, uint16_t len)
 {
-	u8_t status = BTP_STATUS_SUCCESS;
+	uint8_t status = BTP_STATUS_SUCCESS;
 	int err;
 
 	LOG_DBG("");
@@ -455,7 +455,7 @@ rsp:
 		   status);
 }
 
-static void reset(u8_t *data, u16_t len)
+static void reset(uint8_t *data, uint16_t len)
 {
 	LOG_DBG("");
 
@@ -465,11 +465,11 @@ static void reset(u8_t *data, u16_t len)
 		   BTP_STATUS_SUCCESS);
 }
 
-static void input_number(u8_t *data, u16_t len)
+static void input_number(uint8_t *data, uint16_t len)
 {
 	const struct mesh_input_number_cmd *cmd = (void *) data;
-	u8_t status = BTP_STATUS_SUCCESS;
-	u32_t number;
+	uint8_t status = BTP_STATUS_SUCCESS;
+	uint32_t number;
 	int err;
 
 	number = sys_le32_to_cpu(cmd->number);
@@ -485,11 +485,11 @@ static void input_number(u8_t *data, u16_t len)
 		   status);
 }
 
-static void input_string(u8_t *data, u16_t len)
+static void input_string(uint8_t *data, uint16_t len)
 {
 	const struct mesh_input_string_cmd *cmd = (void *) data;
-	u8_t status = BTP_STATUS_SUCCESS;
-	u8_t str_auth[16];
+	uint8_t status = BTP_STATUS_SUCCESS;
+	uint8_t str_auth[16];
 	int err;
 
 	LOG_DBG("");
@@ -516,7 +516,7 @@ rsp:
 		   status);
 }
 
-static void ivu_test_mode(u8_t *data, u16_t len)
+static void ivu_test_mode(uint8_t *data, uint16_t len)
 {
 	const struct mesh_ivu_test_mode_cmd *cmd = (void *) data;
 
@@ -528,7 +528,7 @@ static void ivu_test_mode(u8_t *data, u16_t len)
 		   BTP_STATUS_SUCCESS);
 }
 
-static void ivu_toggle_state(u8_t *data, u16_t len)
+static void ivu_toggle_state(uint8_t *data, uint16_t len)
 {
 	bool result;
 
@@ -543,7 +543,7 @@ static void ivu_toggle_state(u8_t *data, u16_t len)
 		   result ? BTP_STATUS_SUCCESS : BTP_STATUS_FAILED);
 }
 
-static void lpn(u8_t *data, u16_t len)
+static void lpn(uint8_t *data, uint16_t len)
 {
 	struct mesh_lpn_set_cmd *cmd = (void *) data;
 	bool enable;
@@ -561,7 +561,7 @@ static void lpn(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-static void lpn_poll(u8_t *data, u16_t len)
+static void lpn_poll(uint8_t *data, uint16_t len)
 {
 	int err;
 
@@ -576,7 +576,7 @@ static void lpn_poll(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-static void net_send(u8_t *data, u16_t len)
+static void net_send(uint8_t *data, uint16_t len)
 {
 	struct mesh_net_send_cmd *cmd = (void *) data;
 	NET_BUF_SIMPLE_DEFINE(msg, UINT8_MAX);
@@ -602,13 +602,13 @@ static void net_send(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-static void health_generate_faults(u8_t *data, u16_t len)
+static void health_generate_faults(uint8_t *data, uint16_t len)
 {
 	struct mesh_health_generate_faults_rp *rp;
 	NET_BUF_SIMPLE_DEFINE(buf, sizeof(*rp) + sizeof(cur_faults) +
 			      sizeof(reg_faults));
-	u8_t some_faults[] = { 0x01, 0x02, 0x03, 0xff, 0x06 };
-	u8_t cur_faults_count, reg_faults_count;
+	uint8_t some_faults[] = { 0x01, 0x02, 0x03, 0xff, 0x06 };
+	uint8_t cur_faults_count, reg_faults_count;
 
 	rp = net_buf_simple_add(&buf, sizeof(*rp));
 
@@ -628,7 +628,7 @@ static void health_generate_faults(u8_t *data, u16_t len)
 		    CONTROLLER_INDEX, buf.data, buf.len);
 }
 
-static void health_clear_faults(u8_t *data, u16_t len)
+static void health_clear_faults(uint8_t *data, uint16_t len)
 {
 	LOG_DBG("");
 
@@ -641,7 +641,7 @@ static void health_clear_faults(u8_t *data, u16_t len)
 		   CONTROLLER_INDEX, BTP_STATUS_SUCCESS);
 }
 
-static void model_send(u8_t *data, u16_t len)
+static void model_send(uint8_t *data, uint16_t len)
 {
 	struct mesh_model_send_cmd *cmd = (void *) data;
 	NET_BUF_SIMPLE_DEFINE(msg, UINT8_MAX);
@@ -653,7 +653,7 @@ static void model_send(u8_t *data, u16_t len)
 	};
 	struct bt_mesh_model *model = NULL;
 	int err, i;
-	u16_t src = sys_le16_to_cpu(cmd->src);
+	uint16_t src = sys_le16_to_cpu(cmd->src);
 
 	/* Lookup source address */
 	for (i = 0; i < ARRAY_SIZE(model_bound); i++) {
@@ -688,10 +688,10 @@ fail:
 }
 
 #if defined(CONFIG_BT_TESTING)
-static void lpn_subscribe(u8_t *data, u16_t len)
+static void lpn_subscribe(uint8_t *data, uint16_t len)
 {
 	struct mesh_lpn_subscribe_cmd *cmd = (void *) data;
-	u16_t address = sys_le16_to_cpu(cmd->address);
+	uint16_t address = sys_le16_to_cpu(cmd->address);
 	int err;
 
 	LOG_DBG("address 0x%04x", address);
@@ -705,10 +705,10 @@ static void lpn_subscribe(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-static void lpn_unsubscribe(u8_t *data, u16_t len)
+static void lpn_unsubscribe(uint8_t *data, uint16_t len)
 {
 	struct mesh_lpn_unsubscribe_cmd *cmd = (void *) data;
-	u16_t address = sys_le16_to_cpu(cmd->address);
+	uint16_t address = sys_le16_to_cpu(cmd->address);
 	int err;
 
 	LOG_DBG("address 0x%04x", address);
@@ -722,7 +722,7 @@ static void lpn_unsubscribe(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-static void rpl_clear(u8_t *data, u16_t len)
+static void rpl_clear(uint8_t *data, uint16_t len)
 {
 	int err;
 
@@ -738,7 +738,7 @@ static void rpl_clear(u8_t *data, u16_t len)
 }
 #endif /* CONFIG_BT_TESTING */
 
-static void proxy_identity_enable(u8_t *data, u16_t len)
+static void proxy_identity_enable(uint8_t *data, uint16_t len)
 {
 	int err;
 
@@ -753,7 +753,7 @@ static void proxy_identity_enable(u8_t *data, u16_t len)
 		   err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS);
 }
 
-void tester_handle_mesh(u8_t opcode, u8_t index, u8_t *data, u16_t len)
+void tester_handle_mesh(uint8_t opcode, uint8_t index, uint8_t *data, uint16_t len)
 {
 	switch (opcode) {
 	case MESH_READ_SUPPORTED_COMMANDS:
@@ -822,7 +822,7 @@ void tester_handle_mesh(u8_t opcode, u8_t index, u8_t *data, u16_t len)
 	}
 }
 
-void net_recv_ev(u8_t ttl, u8_t ctl, u16_t src, u16_t dst, const void *payload,
+void net_recv_ev(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst, const void *payload,
 		 size_t payload_len)
 {
 	NET_BUF_SIMPLE_DEFINE(buf, UINT8_MAX);
@@ -848,8 +848,8 @@ void net_recv_ev(u8_t ttl, u8_t ctl, u16_t src, u16_t dst, const void *payload,
 		    buf.data, buf.len);
 }
 
-static void model_bound_cb(u16_t addr, struct bt_mesh_model *model,
-			   u16_t key_idx)
+static void model_bound_cb(uint16_t addr, struct bt_mesh_model *model,
+			   uint16_t key_idx)
 {
 	int i;
 
@@ -869,8 +869,8 @@ static void model_bound_cb(u16_t addr, struct bt_mesh_model *model,
 	LOG_ERR("model_bound is full");
 }
 
-static void model_unbound_cb(u16_t addr, struct bt_mesh_model *model,
-			     u16_t key_idx)
+static void model_unbound_cb(uint16_t addr, struct bt_mesh_model *model,
+			     uint16_t key_idx)
 {
 	int i;
 
@@ -890,7 +890,7 @@ static void model_unbound_cb(u16_t addr, struct bt_mesh_model *model,
 	LOG_INF("model not found");
 }
 
-static void invalid_bearer_cb(u8_t opcode)
+static void invalid_bearer_cb(uint8_t opcode)
 {
 	struct mesh_invalid_bearer_ev ev = {
 		.opcode = opcode,
@@ -899,7 +899,7 @@ static void invalid_bearer_cb(u8_t opcode)
 	LOG_DBG("opcode 0x%02x", opcode);
 
 	tester_send(BTP_SERVICE_ID_MESH, MESH_EV_INVALID_BEARER,
-		    CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
+		    CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
 }
 
 static void incomp_timer_exp_cb(void)
@@ -916,7 +916,7 @@ static struct bt_test_cb bt_test_cb = {
 	.mesh_trans_incomp_timer_exp = incomp_timer_exp_cb,
 };
 
-u8_t tester_init_mesh(void)
+uint8_t tester_init_mesh(void)
 {
 	if (IS_ENABLED(CONFIG_BT_TESTING)) {
 		bt_test_cb_register(&bt_test_cb);
@@ -925,7 +925,7 @@ u8_t tester_init_mesh(void)
 	return BTP_STATUS_SUCCESS;
 }
 
-u8_t tester_unregister_mesh(void)
+uint8_t tester_unregister_mesh(void)
 {
 	return BTP_STATUS_SUCCESS;
 }
diff --git a/tests/bluetooth/uuid/src/main.c b/tests/bluetooth/uuid/src/main.c
index 6fbb0b8e3f..48fc533acc 100644
--- a/tests/bluetooth/uuid/src/main.c
+++ b/tests/bluetooth/uuid/src/main.c
@@ -47,8 +47,8 @@ static void test_uuid_cmp(void)
 
 static void test_uuid_create(void)
 {
-	u8_t le16[] = { 0x01, 0x00 };
-	u8_t be16[] = { 0x00, 0x01 };
+	uint8_t le16[] = { 0x01, 0x00 };
+	uint8_t be16[] = { 0x00, 0x01 };
 	union {
 		struct bt_uuid uuid;
 		struct bt_uuid_16 u16;
diff --git a/tests/boards/altera_max10/i2c_master/src/i2c_master.c b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
index 874c87f726..c3cdc3f82c 100644
--- a/tests/boards/altera_max10/i2c_master/src/i2c_master.c
+++ b/tests/boards/altera_max10/i2c_master/src/i2c_master.c
@@ -30,7 +30,7 @@
 
 static int powerup_adv7513(struct device *i2c_dev)
 {
-	u8_t data;
+	uint8_t data;
 
 	TC_PRINT("Powering up ADV7513\n");
 	/* write to HPD control registers */
@@ -66,8 +66,8 @@ static int powerup_adv7513(struct device *i2c_dev)
 static int test_i2c_adv7513(void)
 {
 	struct device *i2c_dev = device_get_binding(DT_LABEL(DT_INST(0, nios2_i2c)));
-	u32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER;
-	u8_t data;
+	uint32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER;
+	uint8_t data;
 
 	if (!i2c_dev) {
 		TC_PRINT("cannot get i2c device\n");
diff --git a/tests/boards/altera_max10/msgdma/src/dma.c b/tests/boards/altera_max10/msgdma/src/dma.c
index 2d5e0d9a0b..68217ff1d9 100644
--- a/tests/boards/altera_max10/msgdma/src/dma.c
+++ b/tests/boards/altera_max10/msgdma/src/dma.c
@@ -26,7 +26,7 @@ static char rx_data[DMA_BUFF_SIZE];
 static struct dma_config dma_cfg = {0};
 static struct dma_block_config dma_block_cfg = {0};
 
-static void dma_user_callback(void *arg, u32_t id, int error_code)
+static void dma_user_callback(void *arg, uint32_t id, int error_code)
 {
 	if (error_code == 0) {
 		TC_PRINT("DMA completed successfully\n");
@@ -40,7 +40,7 @@ static void dma_user_callback(void *arg, u32_t id, int error_code)
 void test_msgdma(void)
 {
 	struct device *dma;
-	static u32_t chan_id;
+	static uint32_t chan_id;
 	int i;
 
 	dma = device_get_binding(CONFIG_DMA_0_NAME);
@@ -69,8 +69,8 @@ void test_msgdma(void)
 
 	/* Init DMA descriptor info */
 	dma_block_cfg.block_size = DMA_BUFF_SIZE;
-	dma_block_cfg.source_address = (u32_t)tx_data;
-	dma_block_cfg.dest_address = (u32_t)rx_data;
+	dma_block_cfg.source_address = (uint32_t)tx_data;
+	dma_block_cfg.dest_address = (uint32_t)rx_data;
 
 	/* Configure DMA */
 	zassert_true(dma_config(dma, chan_id, &dma_cfg) == 0,
diff --git a/tests/boards/altera_max10/qspi/src/qspi_flash.c b/tests/boards/altera_max10/qspi/src/qspi_flash.c
index 4494f913d2..1f6cd084e2 100644
--- a/tests/boards/altera_max10/qspi/src/qspi_flash.c
+++ b/tests/boards/altera_max10/qspi/src/qspi_flash.c
@@ -18,9 +18,9 @@
 void test_qspi_flash(void)
 {
 	struct device *flash_dev;
-	u32_t i, offset, rd_val, wr_val;
-	u8_t wr_buf[4] = {0xAA, 0xBB, 0xCC, 0xDD};
-	u8_t rd_buf[2];
+	uint32_t i, offset, rd_val, wr_val;
+	uint8_t wr_buf[4] = {0xAA, 0xBB, 0xCC, 0xDD};
+	uint8_t rd_buf[2];
 
 	flash_dev = device_get_binding(CONFIG_SOC_FLASH_NIOS2_QSPI_DEV_NAME);
 	zassert_equal(!flash_dev, TC_PASS, "Flash device not found!");
diff --git a/tests/boards/altera_max10/sysid/src/sysid.c b/tests/boards/altera_max10/sysid/src/sysid.c
index dd50601895..7c0f375c28 100644
--- a/tests/boards/altera_max10/sysid/src/sysid.c
+++ b/tests/boards/altera_max10/sysid/src/sysid.c
@@ -11,7 +11,7 @@
 
 void test_sysid(void)
 {
-	s32_t sysid, status = TC_FAIL;
+	int32_t sysid, status = TC_FAIL;
 
 	sysid = alt_avalon_sysid_test();
 	if (!sysid) {
diff --git a/tests/boards/intel_s1000_crb/cache/src/cache_test.c b/tests/boards/intel_s1000_crb/cache/src/cache_test.c
index 41f8c5b944..d249f9badb 100644
--- a/tests/boards/intel_s1000_crb/cache/src/cache_test.c
+++ b/tests/boards/intel_s1000_crb/cache/src/cache_test.c
@@ -16,8 +16,8 @@ LOG_MODULE_REGISTER(cache_test);
 #define CACHE_TEST_BUFFER_SIZE	256
 
 struct test_buffer {
-	u8_t	flush[CACHE_TEST_BUFFER_SIZE];
-	u8_t	invalidate[CACHE_TEST_BUFFER_SIZE];
+	uint8_t	flush[CACHE_TEST_BUFFER_SIZE];
+	uint8_t	invalidate[CACHE_TEST_BUFFER_SIZE];
 };
 
 static struct test_buffer *cached_buffer = (struct test_buffer *)LP_SRAM_BASE;
@@ -25,7 +25,7 @@ static struct test_buffer *cached_buffer = (struct test_buffer *)LP_SRAM_BASE;
 static struct test_buffer *mem_buffer =
 	(struct test_buffer *)LP_SRAM_BASE_UNCACHED;
 
-static void buffer_fill_sequence(u8_t *buffer, bool inv_seq)
+static void buffer_fill_sequence(uint8_t *buffer, bool inv_seq)
 {
 	int byte;
 
diff --git a/tests/boards/intel_s1000_crb/main/src/dma_test.c b/tests/boards/intel_s1000_crb/main/src/dma_test.c
index 3ee3fb73f9..a51d95ce27 100644
--- a/tests/boards/intel_s1000_crb/main/src/dma_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/dma_test.c
@@ -98,11 +98,11 @@ static struct transfers transfer_blocks[MAX_TRANSFERS] = {
 	},
 };
 static struct device *dma_device;
-static u32_t current_block_count, total_block_count;
+static uint32_t current_block_count, total_block_count;
 
-static void test_done(void *arg, u32_t channel, int error_code)
+static void test_done(void *arg, uint32_t channel, int error_code)
 {
-	u32_t src, dst;
+	uint32_t src, dst;
 	size_t size;
 
 	current_block_count++;
@@ -111,8 +111,8 @@ static void test_done(void *arg, u32_t channel, int error_code)
 		printk("DMA transfer met an error = 0x%x\n", error_code);
 		k_sem_give(&dma_sem);
 	} else if (current_block_count < total_block_count) {
-		src = (u32_t)transfer_blocks[current_block_count].source;
-		dst = (u32_t)transfer_blocks[current_block_count].destination;
+		src = (uint32_t)transfer_blocks[current_block_count].source;
+		dst = (uint32_t)transfer_blocks[current_block_count].destination;
 		size = transfer_blocks[current_block_count].size;
 		dma_reload(dma_device, channel, src, dst, size);
 		dma_start(dma_device, channel);
@@ -122,14 +122,14 @@ static void test_done(void *arg, u32_t channel, int error_code)
 	}
 }
 
-static int test_task(u32_t chan_id, u32_t blen, u32_t block_count)
+static int test_task(uint32_t chan_id, uint32_t blen, uint32_t block_count)
 {
 	struct dma_config dma_cfg = {0};
 
 	struct dma_block_config dma_block_cfg = {
 		.block_size = sizeof(tx_data),
-		.source_address = (u32_t)tx_data,
-		.dest_address = (u32_t)rx_data,
+		.source_address = (uint32_t)tx_data,
+		.dest_address = (uint32_t)rx_data,
 	};
 
 	if (block_count > ARRAY_SIZE(transfer_blocks)) {
diff --git a/tests/boards/intel_s1000_crb/main/src/gpio_test.c b/tests/boards/intel_s1000_crb/main/src/gpio_test.c
index fe31d2edf1..56b9753106 100644
--- a/tests/boards/intel_s1000_crb/main/src/gpio_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/gpio_test.c
@@ -50,7 +50,7 @@
 extern struct k_sem thread_sem;
 
 void gpio_test_callback(struct device *port,
-		   struct gpio_callback *cb, u32_t pins)
+		   struct gpio_callback *cb, uint32_t pins)
 {
 	printk(GPIO_NAME "%d triggered\n", GPIO_INT_PIN);
 }
diff --git a/tests/boards/intel_s1000_crb/main/src/i2c_test.c b/tests/boards/intel_s1000_crb/main/src/i2c_test.c
index b829cb7d73..5b2fde3371 100644
--- a/tests/boards/intel_s1000_crb/main/src/i2c_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/i2c_test.c
@@ -54,7 +54,7 @@
 
 extern struct k_sem thread_sem;
 
-void test_i2c_write_led(struct device *i2c_dev, u16_t i2c_slave_led, u8_t color)
+void test_i2c_write_led(struct device *i2c_dev, uint16_t i2c_slave_led, uint8_t color)
 {
 	int ret;
 	int led_val[6];
@@ -120,10 +120,10 @@ void test_i2c_write_led(struct device *i2c_dev, u16_t i2c_slave_led, u8_t color)
 	}
 }
 
-void test_i2c_read_led(struct device *i2c_dev, u16_t i2c_slave_led)
+void test_i2c_read_led(struct device *i2c_dev, uint16_t i2c_slave_led)
 {
 	int ret;
-	u8_t data = 0U;
+	uint8_t data = 0U;
 
 	ret = i2c_reg_read_byte(i2c_dev, i2c_slave_led, LED0, &data);
 	if (ret) {
diff --git a/tests/boards/intel_s1000_crb/main/src/i2s_test.c b/tests/boards/intel_s1000_crb/main/src/i2s_test.c
index 9529c362c8..f0afb0fd49 100644
--- a/tests/boards/intel_s1000_crb/main/src/i2s_test.c
+++ b/tests/boards/intel_s1000_crb/main/src/i2s_test.c
@@ -44,7 +44,7 @@ extern struct k_sem thread_sem;
 #define FRAME_CLK_FREQ		48000
 #define I2S_WORDSIZE		32
 #define BLOCK_SIZE		192
-#define BLOCK_SIZE_BYTES	(BLOCK_SIZE * sizeof(s32_t))
+#define BLOCK_SIZE_BYTES	(BLOCK_SIZE * sizeof(int32_t))
 #define FRAMES_PER_ITERATION	50
 #define TIMEOUT			2000
 
diff --git a/tests/boards/intel_s1000_crb/main/src/spi_flash.c b/tests/boards/intel_s1000_crb/main/src/spi_flash.c
index 62f9ceee3e..ab4766c2bf 100644
--- a/tests/boards/intel_s1000_crb/main/src/spi_flash.c
+++ b/tests/boards/intel_s1000_crb/main/src/spi_flash.c
@@ -18,10 +18,10 @@ LOG_MODULE_REGISTER(test_flash);
 #define TEST_DATA_BYTE_1         0x4a
 #define TEST_DATA_LEN            128
 
-int flash_region_is_empty(u32_t off, void *dst, u32_t len)
+int flash_region_is_empty(uint32_t off, void *dst, uint32_t len)
 {
-	u8_t i;
-	u8_t *u8dst;
+	uint8_t i;
+	uint8_t *u8dst;
 	int rc;
 	const struct flash_area *fap;
 
@@ -52,8 +52,8 @@ int flash_region_is_empty(u32_t off, void *dst, u32_t len)
 void test_flash(void)
 {
 	struct device *flash_dev;
-	u8_t buf[TEST_DATA_LEN];
-	u32_t magic[4];
+	uint8_t buf[TEST_DATA_LEN];
+	uint32_t magic[4];
 	int i;
 
 	flash_dev = device_get_binding(DT_LABEL(DT_INST(0, jedec_spi_nor)));
diff --git a/tests/boards/intel_s1000_crb/main/src/test_hid.c b/tests/boards/intel_s1000_crb/main/src/test_hid.c
index 15daf7b03d..7ef209247f 100644
--- a/tests/boards/intel_s1000_crb/main/src/test_hid.c
+++ b/tests/boards/intel_s1000_crb/main/src/test_hid.c
@@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(main);
 #define PRIORITY                7
 
 /* Some HID sample Report Descriptor */
-static const u8_t hid_report_desc[] = {
+static const uint8_t hid_report_desc[] = {
 	/* 0x05, 0x01,		USAGE_PAGE (Generic Desktop)		*/
 	HID_GI_USAGE_PAGE, USAGE_GEN_DESKTOP,
 	/* 0x09, 0x00,		USAGE (Undefined)			*/
@@ -58,16 +58,16 @@ static const u8_t hid_report_desc[] = {
 	HID_MI_COLLECTION_END,
 };
 
-int debug_cb(struct usb_setup_packet *setup, s32_t *len,
-	     u8_t **data)
+int debug_cb(struct usb_setup_packet *setup, int32_t *len,
+	     uint8_t **data)
 {
 	LOG_DBG("Debug callback");
 
 	return -ENOTSUP;
 }
 
-int set_idle_cb(struct usb_setup_packet *setup, s32_t *len,
-		u8_t **data)
+int set_idle_cb(struct usb_setup_packet *setup, int32_t *len,
+		uint8_t **data)
 {
 	LOG_DBG("Set Idle callback");
 
@@ -76,8 +76,8 @@ int set_idle_cb(struct usb_setup_packet *setup, s32_t *len,
 	return 0;
 }
 
-int get_report_cb(struct usb_setup_packet *setup, s32_t *len,
-		  u8_t **data)
+int get_report_cb(struct usb_setup_packet *setup, int32_t *len,
+		  uint8_t **data)
 {
 	LOG_DBG("Get report callback");
 
@@ -97,7 +97,7 @@ static struct hid_ops ops = {
 
 void hid_thread(void)
 {
-	u8_t report_1[2] = { REPORT_ID_1, 0x00 };
+	uint8_t report_1[2] = { REPORT_ID_1, 0x00 };
 	struct device *hid_dev;
 	int ret, wrote;
 
diff --git a/tests/boards/native_posix/rtc/src/main.c b/tests/boards/native_posix/rtc/src/main.c
index 5dbe6e37d3..353d71812e 100644
--- a/tests/boards/native_posix/rtc/src/main.c
+++ b/tests/boards/native_posix/rtc/src/main.c
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-static char *us_time_to_str(char *dest, u64_t time)
+static char *us_time_to_str(char *dest, uint64_t time)
 {
 	if (time != NEVER) {
 		unsigned int hour;
@@ -47,12 +47,12 @@ static char *us_time_to_str(char *dest, u64_t time)
  */
 static void test_realtime(void)
 {
-	extern u64_t get_host_us_time(void);
-	u64_t time;
+	extern uint64_t get_host_us_time(void);
+	uint64_t time;
 	char time_s[60];
-	u64_t end_time, start_time;
-	s64_t diff, error;
-	u64_t start_rtc_time[3];
+	uint64_t end_time, start_time;
+	int64_t diff, error;
+	uint64_t start_rtc_time[3];
 	double acc_ratio = 1;
 	double time_ratios[5] = {0.25, 2, 2, 2, 2};
 	/* This ratio adjustments lead to test speeds 0.25x, 0.5x, 1x, 2x & 4x*/
@@ -146,8 +146,8 @@ static void test_realtime(void)
 static void test_rtc_offset(void)
 {
 	int offset = 567;
-	u64_t start_rtc_time[2];
-	s64_t diff, error;
+	uint64_t start_rtc_time[2];
+	int64_t diff, error;
 
 	start_rtc_time[0] = native_rtc_gettime_us(RTC_CLOCK_REALTIME);
 	start_rtc_time[1] = native_rtc_gettime_us(RTC_CLOCK_PSEUDOHOSTREALTIME);
diff --git a/tests/crypto/mbedtls/src/mbedtls.c b/tests/crypto/mbedtls/src/mbedtls.c
index 04cc61ad11..0d7f0c8cd9 100644
--- a/tests/crypto/mbedtls/src/mbedtls.c
+++ b/tests/crypto/mbedtls/src/mbedtls.c
@@ -75,7 +75,7 @@
 #if defined(MBEDTLS_RSA_C)
 int rand(void)
 {
-	static ZTEST_DMEM u32_t seed = 7U;
+	static ZTEST_DMEM uint32_t seed = 7U;
 
 	seed ^= seed << 13;
 	seed ^= seed >> 17;
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index 0be9e33711..ab291e6a2c 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -8,8 +8,8 @@
 
 /*
  * This tests the following random number routines:
- * void z_early_boot_rand_get(u8_t *buf, size_t length)
- * u32_t sys_rand32_get(void);
+ * void z_early_boot_rand_get(uint8_t *buf, size_t length)
+ * uint32_t sys_rand32_get(void);
  */
 
 
@@ -29,14 +29,14 @@
 
 void test_rand32(void)
 {
-	u32_t gen, last_gen;
+	uint32_t gen, last_gen;
 	int rnd_cnt;
 	int equal_count = 0;
-	u32_t buf[N_VALUES];
+	uint32_t buf[N_VALUES];
 
 	/* Test early boot random number generation function */
-	z_early_boot_rand_get((u8_t *)&last_gen, sizeof(last_gen));
-	z_early_boot_rand_get((u8_t *)&gen, sizeof(gen));
+	z_early_boot_rand_get((uint8_t *)&last_gen, sizeof(last_gen));
+	z_early_boot_rand_get((uint8_t *)&gen, sizeof(gen));
 	zassert_true(last_gen != gen,
 			"z_early_boot_rand_get failed");
 
@@ -69,7 +69,7 @@ void test_rand32(void)
 
 	printk("Generating bulk fill random numbers\n");
 	memset(buf, 0, sizeof(buf));
-	sys_rand_get((u8_t *)(&buf[0]), sizeof(buf));
+	sys_rand_get((uint8_t *)(&buf[0]), sizeof(buf));
 
 	for (rnd_cnt = 0; rnd_cnt < (N_VALUES - 1); rnd_cnt++) {
 		gen = buf[rnd_cnt];
diff --git a/tests/crypto/tinycrypt/src/aes.c b/tests/crypto/tinycrypt/src/aes.c
index 6dd8c13116..ea75dd5b50 100644
--- a/tests/crypto/tinycrypt/src/aes.c
+++ b/tests/crypto/tinycrypt/src/aes.c
@@ -61,8 +61,8 @@
 
 
 struct kat_table {
-	u8_t in[NUM_OF_NIST_KEYS];
-	u8_t out[NUM_OF_NIST_KEYS];
+	uint8_t in[NUM_OF_NIST_KEYS];
+	uint8_t out[NUM_OF_NIST_KEYS];
 };
 
 /*
@@ -70,8 +70,8 @@ struct kat_table {
  */
 void test_aes_key_chain(void)
 {
-	u32_t result = TC_PASS;
-	const u8_t nist_key[NUM_OF_NIST_KEYS] = {
+	uint32_t result = TC_PASS;
+	const uint8_t nist_key[NUM_OF_NIST_KEYS] = {
 		0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
 		0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c
 	};
@@ -111,20 +111,20 @@ void test_aes_key_chain(void)
 void test_aes_vectors(void)
 {
 	int result = TC_PASS;
-	const u8_t nist_key[NUM_OF_NIST_KEYS] = {
+	const uint8_t nist_key[NUM_OF_NIST_KEYS] = {
 		0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
 		0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c
 	};
-	const u8_t nist_input[NUM_OF_NIST_KEYS] = {
+	const uint8_t nist_input[NUM_OF_NIST_KEYS] = {
 		0x32, 0x43, 0xf6, 0xa8, 0x88, 0x5a, 0x30, 0x8d,
 		0x31, 0x31, 0x98, 0xa2, 0xe0, 0x37, 0x07, 0x34
 	};
-	const u8_t expected[NUM_OF_NIST_KEYS] = {
+	const uint8_t expected[NUM_OF_NIST_KEYS] = {
 		0x39, 0x25, 0x84, 0x1d, 0x02, 0xdc, 0x09, 0xfb,
 		0xdc, 0x11, 0x85, 0x97, 0x19, 0x6a, 0x0b, 0x32
 	};
 	struct tc_aes_key_sched_struct s;
-	u8_t ciphertext[NUM_OF_NIST_KEYS];
+	uint8_t ciphertext[NUM_OF_NIST_KEYS];
 
 	TC_PRINT("AES128 %s (NIST encryption test):\n", __func__);
 
@@ -142,12 +142,12 @@ void test_aes_vectors(void)
 			"AES128 test #2 (NIST encryption test) failed.");
 }
 
-u32_t var_text_test(u32_t r, const u8_t *in, const u8_t *out,
+uint32_t var_text_test(uint32_t r, const uint8_t *in, const uint8_t *out,
 		       TCAesKeySched_t s)
 {
-	u8_t ciphertext[NUM_OF_NIST_KEYS];
-	u8_t decrypted[NUM_OF_NIST_KEYS];
-	u32_t result = TC_PASS;
+	uint8_t ciphertext[NUM_OF_NIST_KEYS];
+	uint8_t decrypted[NUM_OF_NIST_KEYS];
+	uint32_t result = TC_PASS;
 
 	(void)tc_aes_encrypt(ciphertext, in, s);
 	result = check_result(r, out, NUM_OF_NIST_KEYS,
@@ -169,8 +169,8 @@ u32_t var_text_test(u32_t r, const u8_t *in, const u8_t *out,
  */
 void test_aes_fixed_key_variable_text(void)
 {
-	u32_t result = TC_PASS;
-	const u8_t key[NUM_OF_NIST_KEYS] = {
+	uint32_t result = TC_PASS;
+	const uint8_t key[NUM_OF_NIST_KEYS] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	};
@@ -1073,7 +1073,7 @@ void test_aes_fixed_key_variable_text(void)
 			} }
 	};
 	struct tc_aes_key_sched_struct s;
-	u32_t i;
+	uint32_t i;
 
 	TC_PRINT("AES128 %s (NIST fixed-key and variable-text):\n", __func__);
 
@@ -1091,15 +1091,15 @@ void test_aes_fixed_key_variable_text(void)
 			"AES128 test #3 (NIST fixed-key and variable-text) failed.");
 }
 
-u32_t var_key_test(u32_t r, const u8_t *in, const u8_t *out)
+uint32_t var_key_test(uint32_t r, const uint8_t *in, const uint8_t *out)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
-	const u8_t plaintext[NUM_OF_NIST_KEYS] = {
+	const uint8_t plaintext[NUM_OF_NIST_KEYS] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	};
-	u8_t ciphertext[NUM_OF_NIST_KEYS];
+	uint8_t ciphertext[NUM_OF_NIST_KEYS];
 	struct tc_aes_key_sched_struct s;
 
 	(void)tc_aes128_set_encrypt_key(&s, in);
@@ -1115,7 +1115,7 @@ u32_t var_key_test(u32_t r, const u8_t *in, const u8_t *out)
  */
 void test_aes_variable_key_fixed_text(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	const struct kat_table kat_tbl[NUM_OF_FIXED_KEYS] = {
 		{{
 				0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2014,7 +2014,7 @@ void test_aes_variable_key_fixed_text(void)
 				0x89, 0x64, 0x48, 0x45, 0x38, 0xbf, 0xc9, 0x2c
 			} }
 	};
-	u32_t i;
+	uint32_t i;
 
 	TC_PRINT("AES128 test #4 (NIST variable-key and fixed-text):\n");
 
diff --git a/tests/crypto/tinycrypt/src/cbc_mode.c b/tests/crypto/tinycrypt/src/cbc_mode.c
index 9726a611e1..dcc4ec2f33 100644
--- a/tests/crypto/tinycrypt/src/cbc_mode.c
+++ b/tests/crypto/tinycrypt/src/cbc_mode.c
@@ -69,17 +69,17 @@
  * Output Block 3ff1caa1681fac09120eca307586e1a7
  * Ciphertext 3ff1caa1681fac09120eca307586e1a7
  */
-const u8_t key[16] = {
+const uint8_t key[16] = {
 	0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88,
 	0x09, 0xcf, 0x4f, 0x3c
 };
 
-const u8_t iv[16] = {
+const uint8_t iv[16] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
 	0x0c, 0x0d, 0x0e, 0x0f
 };
 
-const u8_t plaintext[64] = {
+const uint8_t plaintext[64] = {
 	0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11,
 	0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
 	0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46,
@@ -88,7 +88,7 @@ const u8_t plaintext[64] = {
 	0xe6, 0x6c, 0x37, 0x10
 };
 
-const u8_t ciphertext[80] = {
+const uint8_t ciphertext[80] = {
 	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
 	0x0c, 0x0d, 0x0e, 0x0f, 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46,
 	0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d, 0x50, 0x86, 0xcb, 0x9b,
@@ -109,11 +109,11 @@ void test_cbc_sp_800_38a_encrypt_decrypt(void)
 	TC_PRINT("Performing CBC tests:\n");
 
 	struct tc_aes_key_sched_struct a;
-	u8_t iv_buffer[16];
-	u8_t encrypted[80];
-	u8_t decrypted[64];
-	u8_t *p;
-	u32_t length;
+	uint8_t iv_buffer[16];
+	uint8_t encrypted[80];
+	uint8_t decrypted[64];
+	uint8_t *p;
+	uint32_t length;
 	int result = TC_PASS;
 
 	(void)tc_aes128_set_encrypt_key(&a, key);
@@ -136,7 +136,7 @@ void test_cbc_sp_800_38a_encrypt_decrypt(void)
 	(void)tc_aes128_set_decrypt_key(&a, key);
 
 	p = &encrypted[TC_AES_BLOCK_SIZE];
-	length = ((u32_t) sizeof(encrypted)) - TC_AES_BLOCK_SIZE;
+	length = ((uint32_t) sizeof(encrypted)) - TC_AES_BLOCK_SIZE;
 
 	/**TESTPOINT: Check test 2*/
 	zassert_true(tc_cbc_mode_decrypt(decrypted,
diff --git a/tests/crypto/tinycrypt/src/ccm_mode.c b/tests/crypto/tinycrypt/src/ccm_mode.c
index 0b47bb1c68..ca48429ecc 100644
--- a/tests/crypto/tinycrypt/src/ccm_mode.c
+++ b/tests/crypto/tinycrypt/src/ccm_mode.c
@@ -68,16 +68,16 @@
 #define EXPECTED_BUF_LEN34 34
 #define EXPECTED_BUF_LEN35 35
 
-u32_t do_test(const u8_t *key,
-		 u8_t *nonce, size_t nlen,
-		 const u8_t *hdr, size_t hlen,
-		 const u8_t *data, size_t dlen,
-		 const u8_t *expected, size_t elen,
+uint32_t do_test(const uint8_t *key,
+		 uint8_t *nonce, size_t nlen,
+		 const uint8_t *hdr, size_t hlen,
+		 const uint8_t *data, size_t dlen,
+		 const uint8_t *expected, size_t elen,
 		 const int mlen)
 {
-	u32_t result = TC_PASS;
-	u8_t ciphertext[CIPHERTEXT_LEN];
-	u8_t decrypted[DECRYPTED_LEN];
+	uint32_t result = TC_PASS;
+	uint8_t ciphertext[CIPHERTEXT_LEN];
+	uint8_t decrypted[DECRYPTED_LEN];
 	struct tc_ccm_mode_struct c;
 	struct tc_aes_key_sched_struct sched;
 
@@ -122,31 +122,31 @@ u32_t do_test(const u8_t *key,
 
 void test_ccm_vector_1(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #1 */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
 		0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0xa0,
 		0xa1, 0xa2, 0xa3, 0xa4, 0xa5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN23] = {
+	const uint8_t data[DATA_BUF_LEN23] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
 	};
-	const u8_t expected[EXPECTED_BUF_LEN31] = {
+	const uint8_t expected[EXPECTED_BUF_LEN31] = {
 		0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x63, 0xd2,
 		0xf0, 0x66, 0xd0, 0xc2, 0xc0, 0xf9, 0x89, 0x80,
 		0x6d, 0x5f, 0x6b, 0x61, 0xda, 0xc3, 0x84, 0x17,
 		0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0
 	};
-	u16_t mlen = M_LEN8;
+	uint16_t mlen = M_LEN8;
 
 	TC_PRINT("%s: Performing CCM test #1 (RFC 3610 test vector #1):\n",
 		 __func__);
@@ -160,31 +160,31 @@ void test_ccm_vector_1(void)
 
 void test_ccm_vector_2(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #2 */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
 		0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x01, 0xa0,
 		0xa1, 0xa2, 0xa3, 0xa4, 0xa5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN24] = {
+	const uint8_t data[DATA_BUF_LEN24] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
 	};
-	const u8_t expected[EXPECTED_BUF_LEN32] = {
+	const uint8_t expected[EXPECTED_BUF_LEN32] = {
 		0x72, 0xc9, 0x1a, 0x36, 0xe1, 0x35, 0xf8, 0xcf,
 		0x29, 0x1c, 0xa8, 0x94, 0x08, 0x5c, 0x87, 0xe3,
 		0xcc, 0x15, 0xc4, 0x39, 0xc9, 0xe4, 0x3a, 0x3b,
 		0xa0, 0x91, 0xd5, 0x6e, 0x10, 0x40, 0x09, 0x16
 	};
-	u16_t mlen = M_LEN8;
+	uint16_t mlen = M_LEN8;
 
 	TC_PRINT("%s: Performing CCM test #2 (RFC 3610 test vector #2):\n",
 		 __func__);
@@ -198,33 +198,33 @@ void test_ccm_vector_2(void)
 
 void test_ccm_vector_3(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #3  */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
 		0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02, 0xa0,
 		0xa1, 0xa2, 0xa3, 0xa4, 0xa5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN25] = {
+	const uint8_t data[DATA_BUF_LEN25] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
 		0x20
 	};
-	const u8_t expected[EXPECTED_BUF_LEN33] = {
+	const uint8_t expected[EXPECTED_BUF_LEN33] = {
 		0x51, 0xb1, 0xe5, 0xf4, 0x4a, 0x19, 0x7d, 0x1d,
 		0xa4, 0x6b, 0x0f, 0x8e, 0x2d, 0x28, 0x2a, 0xe8,
 		0x71, 0xe8, 0x38, 0xbb, 0x64, 0xda, 0x85, 0x96,
 		0x57, 0x4a, 0xda, 0xa7, 0x6f, 0xbd, 0x9f, 0xb0,
 		0xc5
 	};
-	u16_t mlen = M_LEN8;
+	uint16_t mlen = M_LEN8;
 
 	TC_PRINT("%s: Performing CCM test #3 (RFC 3610 test vector #3):\n",
 		 __func__);
@@ -238,32 +238,32 @@ void test_ccm_vector_3(void)
 
 void test_ccm_vector_4(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #7  */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
 		0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06, 0xa0,
 		0xa1, 0xa2, 0xa3, 0xa4, 0xa5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN23] = {
+	const uint8_t data[DATA_BUF_LEN23] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
 	};
-	const u8_t expected[EXPECTED_BUF_LEN33] = {
+	const uint8_t expected[EXPECTED_BUF_LEN33] = {
 		0x01, 0x35, 0xD1, 0xB2,  0xC9, 0x5F, 0x41, 0xD5,
 		0xD1, 0xD4, 0xFE, 0xC1,  0x85, 0xD1, 0x66, 0xB8,
 		0x09, 0x4E, 0x99, 0x9D,  0xFE, 0xD9, 0x6C, 0x04,
 		0x8C, 0x56, 0x60, 0x2C,  0x97, 0xAC, 0xBB, 0x74,
 		0x90
 	};
-	u16_t mlen = M_LEN10;
+	uint16_t mlen = M_LEN10;
 
 	TC_PRINT("%s: Performing CCM test #4 (RFC 3610 test vector #7):\n",
 		 __func__);
@@ -277,32 +277,32 @@ void test_ccm_vector_4(void)
 
 void test_ccm_vector_5(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #8  */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
 		0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x0A, 0x09, 0x08, 0x07, 0xA0,
 		0xA1, 0xA2, 0xA3, 0xA4, 0xA5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN24] = {
+	const uint8_t data[DATA_BUF_LEN24] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
 	};
-	const u8_t expected[EXPECTED_BUF_LEN34] = {
+	const uint8_t expected[EXPECTED_BUF_LEN34] = {
 		0x7B, 0x75, 0x39, 0x9A, 0xC0, 0x83, 0x1D, 0xD2,
 		0xF0, 0xBB, 0xD7, 0x58, 0x79, 0xA2, 0xFD, 0x8F,
 		0x6C, 0xAE, 0x6B, 0x6C, 0xD9, 0xB7, 0xDB, 0x24,
 		0xC1, 0x7B, 0x44, 0x33, 0xF4, 0x34, 0x96, 0x3F,
 		0x34, 0xB4
 	};
-	u16_t mlen = M_LEN10;
+	uint16_t mlen = M_LEN10;
 
 	TC_PRINT("%s: Performing CCM test #5 (RFC 3610 test vector #8):\n",
 		 __func__);
@@ -316,33 +316,33 @@ void test_ccm_vector_5(void)
 
 void test_ccm_vector_6(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* RFC 3610 test vector #9  */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
 		0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x0B, 0x0A, 0x09, 0x08, 0xA0,
 		0xA1, 0xA2, 0xA3, 0xA4, 0xA5
 	};
-	const u8_t hdr[HEADER_LEN] = {
+	const uint8_t hdr[HEADER_LEN] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	const u8_t data[DATA_BUF_LEN25] = {
+	const uint8_t data[DATA_BUF_LEN25] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
 		0x20
 	};
-	const u8_t expected[EXPECTED_BUF_LEN35] = {
+	const uint8_t expected[EXPECTED_BUF_LEN35] = {
 		0x82, 0x53, 0x1a, 0x60, 0xCC, 0x24, 0x94, 0x5a,
 		0x4b, 0x82, 0x79, 0x18, 0x1a, 0xb5, 0xc8, 0x4d,
 		0xf2, 0x1c, 0xe7, 0xf9, 0xb7, 0x3f, 0x42, 0xe1,
 		0x97, 0xea, 0x9c, 0x07, 0xe5, 0x6b, 0x5e, 0xb1,
 		0x7e, 0x5f, 0x4e
 	};
-	u16_t mlen = M_LEN10;
+	uint16_t mlen = M_LEN10;
 
 	TC_PRINT("%s: Performing CCM test #6 (RFC 3610 test vector #9):\n",
 		 __func__);
@@ -356,19 +356,19 @@ void test_ccm_vector_6(void)
 
 void test_ccm_vector_7(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* Test based on RFC 3610 test vector #9 but with no associated data */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
 		0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x0B, 0x0A, 0x09, 0x08, 0xA0,
 		0xA1, 0xA2, 0xA3, 0xA4, 0xA5
 	};
-	u8_t *hdr = NULL;
+	uint8_t *hdr = NULL;
 
-	u8_t data[DATA_BUF_LEN25] = {
+	uint8_t data[DATA_BUF_LEN25] = {
 		0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 		0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
 		0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
@@ -376,9 +376,9 @@ void test_ccm_vector_7(void)
 	};
 	struct tc_ccm_mode_struct c;
 	struct tc_aes_key_sched_struct sched;
-	u8_t decrypted[DECRYPTED_LEN];
-	u8_t ciphertext[CIPHERTEXT_LEN];
-	u16_t mlen = M_LEN10;
+	uint8_t decrypted[DECRYPTED_LEN];
+	uint8_t ciphertext[CIPHERTEXT_LEN];
+	uint16_t mlen = M_LEN10;
 
 	TC_PRINT("%s: Performing CCM test #7 (no associated data):\n",
 		 __func__);
@@ -417,25 +417,25 @@ void test_ccm_vector_7(void)
 
 void test_ccm_vector_8(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 	/* Test based on RFC 3610 test vector #9 but with no payload data */
-	const u8_t key[NUM_NIST_KEYS] = {
+	const uint8_t key[NUM_NIST_KEYS] = {
 		0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
 		0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF
 	};
-	u8_t nonce[NONCE_LEN] = {
+	uint8_t nonce[NONCE_LEN] = {
 		0x00, 0x00, 0x00, 0x0B, 0x0A, 0x09, 0x08, 0xA0,
 		0xA1, 0xA2, 0xA3, 0xA4, 0xA5
 	};
-	const u8_t hdr[8] = {
+	const uint8_t hdr[8] = {
 		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
 	};
-	u8_t data[] = {};
+	uint8_t data[] = {};
 	struct tc_ccm_mode_struct c;
 	struct tc_aes_key_sched_struct sched;
-	u8_t decrypted[DECRYPTED_LEN];
-	u8_t ciphertext[CIPHERTEXT_LEN];
-	u16_t mlen = M_LEN10;
+	uint8_t decrypted[DECRYPTED_LEN];
+	uint8_t ciphertext[CIPHERTEXT_LEN];
+	uint16_t mlen = M_LEN10;
 
 	TC_PRINT("%s: Performing CCM test #8 (no payload data):\n", __func__);
 
diff --git a/tests/crypto/tinycrypt/src/cmac_mode.c b/tests/crypto/tinycrypt/src/cmac_mode.c
index 763c4bf74d..5e016db7a3 100644
--- a/tests/crypto/tinycrypt/src/cmac_mode.c
+++ b/tests/crypto/tinycrypt/src/cmac_mode.c
@@ -52,9 +52,9 @@
 
 #define BUF_LEN 16
 
-static void show(const char *label, const u8_t *s, size_t slen)
+static void show(const char *label, const uint8_t *s, size_t slen)
 {
-	u32_t i;
+	uint32_t i;
 
 	TC_PRINT("%s\t", label);
 	for (i = 0U; i < slen; ++i) {
@@ -63,25 +63,25 @@ static void show(const char *label, const u8_t *s, size_t slen)
 	TC_PRINT("\n");
 }
 
-extern void gf_double(u8_t *out, u8_t *in);
+extern void gf_double(uint8_t *out, uint8_t *in);
 
-static u32_t verify_gf_2_128_double(u8_t *K1, u8_t *K2, struct tc_cmac_struct s)
+static uint32_t verify_gf_2_128_double(uint8_t *K1, uint8_t *K2, struct tc_cmac_struct s)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("Performing CMAC test #1 (GF(2^128) double):\n");
 
-	u8_t zero[BUF_LEN];
-	u8_t L[BUF_LEN];
-	const u8_t l[BUF_LEN] = {
+	uint8_t zero[BUF_LEN];
+	uint8_t L[BUF_LEN];
+	const uint8_t l[BUF_LEN] = {
 		0x7d, 0xf7, 0x6b, 0x0c, 0x1a, 0xb8, 0x99, 0xb3,
 		0x3e, 0x42, 0xf0, 0x47, 0xb9, 0x1b, 0x54, 0x6f
 	};
-	const u8_t k1[BUF_LEN] = {
+	const uint8_t k1[BUF_LEN] = {
 		0xfb, 0xee, 0xd6, 0x18, 0x35, 0x71, 0x33, 0x66,
 		0x7c, 0x85, 0xe0, 0x8f, 0x72, 0x36, 0xa8, 0xde
 	};
-	const u8_t k2[BUF_LEN] = {
+	const uint8_t k2[BUF_LEN] = {
 		0xf7, 0xdd, 0xac, 0x30, 0x6a, 0xe2, 0x66, 0xcc,
 		0xf9, 0x0b, 0xc1, 0x1e, 0xe4, 0x6d, 0x51, 0x3b
 	};
@@ -115,20 +115,20 @@ static u32_t verify_gf_2_128_double(u8_t *K1, u8_t *K2, struct tc_cmac_struct s)
 	return result;
 }
 
-static u32_t verify_cmac_null_msg(TCCmacState_t s)
+static uint32_t verify_cmac_null_msg(TCCmacState_t s)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("Performing CMAC test #2 (SP 800-38B test vector #1):\n");
 
-	const u8_t tag[BUF_LEN] = {
+	const uint8_t tag[BUF_LEN] = {
 		0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28,
 		0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46
 	};
-	u8_t Tag[BUF_LEN];
+	uint8_t Tag[BUF_LEN];
 
 	(void) tc_cmac_init(s);
-	(void) tc_cmac_update(s, (const u8_t *) 0, 0);
+	(void) tc_cmac_update(s, (const uint8_t *) 0, 0);
 	(void) tc_cmac_final(Tag, s);
 
 	if (memcmp(Tag, tag, BUF_LEN) != 0) {
@@ -142,21 +142,21 @@ static u32_t verify_cmac_null_msg(TCCmacState_t s)
 	return result;
 }
 
-static u32_t verify_cmac_1_block_msg(TCCmacState_t s)
+static uint32_t verify_cmac_1_block_msg(TCCmacState_t s)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("Performing CMAC test #3 (SP 800-38B test vector #2):\n");
 
-	const u8_t msg[BUF_LEN] = {
+	const uint8_t msg[BUF_LEN] = {
 		0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
 		0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a
 	};
-	const u8_t tag[BUF_LEN] = {
+	const uint8_t tag[BUF_LEN] = {
 		0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44,
 		0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c
 	};
-	u8_t Tag[BUF_LEN];
+	uint8_t Tag[BUF_LEN];
 
 	(void) tc_cmac_init(s);
 	(void) tc_cmac_update(s, msg, sizeof(msg));
@@ -174,24 +174,24 @@ static u32_t verify_cmac_1_block_msg(TCCmacState_t s)
 	return result;
 }
 
-static u32_t verify_cmac_320_bit_msg(TCCmacState_t s)
+static uint32_t verify_cmac_320_bit_msg(TCCmacState_t s)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("Performing CMAC test #4 (SP 800-38B test vector #3):\n");
 
-	const u8_t msg[40] = {
+	const uint8_t msg[40] = {
 		0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
 		0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
 		0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
 		0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
 		0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11
 	};
-	const u8_t tag[BUF_LEN] = {
+	const uint8_t tag[BUF_LEN] = {
 		0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30,
 		0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27
 	};
-	u8_t Tag[BUF_LEN];
+	uint8_t Tag[BUF_LEN];
 
 	(void) tc_cmac_init(s);
 	(void) tc_cmac_update(s, msg, sizeof(msg));
@@ -209,13 +209,13 @@ static u32_t verify_cmac_320_bit_msg(TCCmacState_t s)
 	return result;
 }
 
-static u32_t verify_cmac_512_bit_msg(TCCmacState_t s)
+static uint32_t verify_cmac_512_bit_msg(TCCmacState_t s)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("Performing CMAC test #5 (SP 800-38B test vector #4)\n");
 
-	const u8_t msg[64] = {
+	const uint8_t msg[64] = {
 		0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
 		0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
 		0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
@@ -225,11 +225,11 @@ static u32_t verify_cmac_512_bit_msg(TCCmacState_t s)
 		0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17,
 		0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10
 	};
-	const u8_t tag[BUF_LEN] = {
+	const uint8_t tag[BUF_LEN] = {
 		0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92,
 		0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe
 	};
-	u8_t Tag[BUF_LEN];
+	uint8_t Tag[BUF_LEN];
 
 	(void)tc_cmac_init(s);
 	(void)tc_cmac_update(s, msg, sizeof(msg));
@@ -254,16 +254,16 @@ static u32_t verify_cmac_512_bit_msg(TCCmacState_t s)
 void test_cmac_mode(void)
 {
 
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	struct tc_cmac_struct state;
 	struct tc_aes_key_sched_struct sched;
 
-	const u8_t key[BUF_LEN] = {
+	const uint8_t key[BUF_LEN] = {
 		0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
 		0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c
 	};
-	u8_t K1[BUF_LEN], K2[BUF_LEN];
+	uint8_t K1[BUF_LEN], K2[BUF_LEN];
 
 	TC_START("Performing CMAC tests:");
 
diff --git a/tests/crypto/tinycrypt/src/ctr_mode.c b/tests/crypto/tinycrypt/src/ctr_mode.c
index f2e6bdd361..d0677ff513 100644
--- a/tests/crypto/tinycrypt/src/ctr_mode.c
+++ b/tests/crypto/tinycrypt/src/ctr_mode.c
@@ -55,17 +55,17 @@ void test_ctr_sp_800_38a_encrypt_decrypt(void)
 
 	TC_PRINT("Performing CTR tests:\n");
 
-	const u8_t key[16] = {
+	const uint8_t key[16] = {
 		0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7,
 		0x15, 0x88,
 		0x09, 0xcf, 0x4f, 0x3c
 	};
-	u8_t ctr[16] = {
+	uint8_t ctr[16] = {
 		0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
 		0xfa, 0xfb,
 		0xfc, 0xfd, 0xfe, 0xff
 	};
-	const u8_t plaintext[64] = {
+	const uint8_t plaintext[64] = {
 		0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d,
 		0x7e, 0x11,
 		0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03,
@@ -78,7 +78,7 @@ void test_ctr_sp_800_38a_encrypt_decrypt(void)
 		0x41, 0x7b,
 		0xe6, 0x6c, 0x37, 0x10
 	};
-	const u8_t ciphertext[80] = {
+	const uint8_t ciphertext[80] = {
 		0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
 		0xfa, 0xfb,
 		0xfc, 0xfd, 0xfe, 0xff, 0x87, 0x4d, 0x61, 0x91, 0xb6, 0x20,
@@ -94,9 +94,9 @@ void test_ctr_sp_800_38a_encrypt_decrypt(void)
 		0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee
 	};
 	struct tc_aes_key_sched_struct sched;
-	u8_t out[80];
-	u8_t decrypted[64];
-	u32_t result = TC_PASS;
+	uint8_t out[80];
+	uint8_t decrypted[64];
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("CTR test #1 (encryption SP 800-38a tests):\n");
 	(void)tc_aes128_set_encrypt_key(&sched, key);
diff --git a/tests/crypto/tinycrypt/src/ctr_prng.c b/tests/crypto/tinycrypt/src/ctr_prng.c
index bbf7e2db7c..7d3e66d99b 100644
--- a/tests/crypto/tinycrypt/src/ctr_prng.c
+++ b/tests/crypto/tinycrypt/src/ctr_prng.c
@@ -43,9 +43,9 @@
 #define MAX_EXPECTED_STRING	128
 #define MAX_BIN_SIZE		(MAX_EXPECTED_STRING / 2)
 
-u8_t per[MAX_BIN_SIZE];
-u8_t ai1[MAX_BIN_SIZE];
-u8_t ai2[MAX_BIN_SIZE];
+uint8_t per[MAX_BIN_SIZE];
+uint8_t ai1[MAX_BIN_SIZE];
+uint8_t ai2[MAX_BIN_SIZE];
 
 struct prng_vector {
 	char *entropy;
@@ -247,7 +247,7 @@ struct prng_vector vectors[] = {
 /* utility function to convert hex character representation
  * to their nibble (4 bit) values
  */
-static u8_t char_to_nibble(char c)
+static uint8_t char_to_nibble(char c)
 {
 	if (c >= '0' && c <= '9') {
 		return c - '0';
@@ -265,7 +265,7 @@ static u8_t char_to_nibble(char c)
  * Convert a string of characters representing a hex buffer into a series of
  * bytes of that real value
  */
-static void hex_str_to_num(u8_t *buf, char *in)
+static void hex_str_to_num(uint8_t *buf, char *in)
 {
 	int len;
 	int i;
@@ -281,12 +281,12 @@ static int test_prng_vector(struct prng_vector *v)
 {
 	TCCtrPrng_t ctx;
 
-	u8_t entropy[MAX_BIN_SIZE];
-	u8_t expected[MAX_BIN_SIZE];
-	u8_t output[MAX_BIN_SIZE];
-	u8_t *personal   = NULL;
-	u8_t *extra1 = NULL;
-	u8_t *extra2 = NULL;
+	uint8_t entropy[MAX_BIN_SIZE];
+	uint8_t expected[MAX_BIN_SIZE];
+	uint8_t output[MAX_BIN_SIZE];
+	uint8_t *personal   = NULL;
+	uint8_t *extra1 = NULL;
+	uint8_t *extra2 = NULL;
 
 	int extra1_len = 0;
 	int extra2_len = 0;
@@ -345,15 +345,15 @@ static int test_prng_vector(struct prng_vector *v)
 
 void test_ctr_prng_reseed(void)
 {
-	u8_t expectedV1[] = {0x7E, 0xE3, 0xA0, 0xCB, 0x6D, 0x5C, 0x4B, 0xC2,
+	uint8_t expectedV1[] = {0x7E, 0xE3, 0xA0, 0xCB, 0x6D, 0x5C, 0x4B, 0xC2,
 				0x4B, 0x7E, 0x3C, 0x48, 0x88, 0xC3, 0x69, 0x70};
-	u8_t expectedV2[] = {0x5E, 0xC1, 0x84, 0xED, 0x45, 0x76, 0x67, 0xEC,
+	uint8_t expectedV2[] = {0x5E, 0xC1, 0x84, 0xED, 0x45, 0x76, 0x67, 0xEC,
 				0x7B, 0x4C, 0x08, 0x7E, 0xB0, 0xF9, 0x55, 0x4E};
-	u8_t extra_input[32] = {0};
-	u8_t entropy[32] = {0}; /* value not important */
-	u8_t output[32];
+	uint8_t extra_input[32] = {0};
+	uint8_t entropy[32] = {0}; /* value not important */
+	uint8_t output[32];
 	TCCtrPrng_t ctx;
-	u32_t i;
+	uint32_t i;
 	int rc;
 
 	rc = tc_ctr_prng_init(&ctx, entropy, sizeof(entropy), 0, 0U);
@@ -429,7 +429,7 @@ void test_ctr_prng_reseed(void)
 
 void test_ctr_prng_uninstantiate(void)
 {
-	u8_t entropy[32] = {0}; /* value not important */
+	uint8_t entropy[32] = {0}; /* value not important */
 	TCCtrPrng_t ctx;
 	size_t words;
 	size_t i;
@@ -464,8 +464,8 @@ void test_ctr_prng_uninstantiate(void)
 
 void test_ctr_prng_robustness(void)
 {
-	u8_t entropy[32] = {0}; /* value not important */
-	u8_t output[32];
+	uint8_t entropy[32] = {0}; /* value not important */
+	uint8_t output[32];
 	TCCtrPrng_t ctx;
 	int rc;
 
diff --git a/tests/crypto/tinycrypt/src/ecc_dsa.c b/tests/crypto/tinycrypt/src/ecc_dsa.c
index eb0caba084..cf38554a59 100644
--- a/tests/crypto/tinycrypt/src/ecc_dsa.c
+++ b/tests/crypto/tinycrypt/src/ecc_dsa.c
@@ -610,14 +610,14 @@ int montecarlo_signverify(int num_tests, bool verbose)
 	return TC_PASS;
 }
 
-int default_CSPRNG(u8_t *dest, unsigned int size)
+int default_CSPRNG(uint8_t *dest, unsigned int size)
 {
 	/* This is not a CSPRNG, but it's the only thing available in the
 	 * system at this point in time.  */
 
 	while (size) {
-		u32_t len = size >= sizeof(u32_t) ? sizeof(u32_t) : size;
-		u32_t rv = sys_rand32_get();
+		uint32_t len = size >= sizeof(uint32_t) ? sizeof(uint32_t) : size;
+		uint32_t rv = sys_rand32_get();
 
 		memcpy(dest, &rv, len);
 		dest += len;
diff --git a/tests/crypto/tinycrypt/src/hmac.c b/tests/crypto/tinycrypt/src/hmac.c
index c698f2c9c6..01cd320312 100644
--- a/tests/crypto/tinycrypt/src/hmac.c
+++ b/tests/crypto/tinycrypt/src/hmac.c
@@ -42,12 +42,12 @@
 #include <test_utils.h>
 #include <ztest.h>
 
-u32_t do_hmac_test(TCHmacState_t h, u32_t testnum, const u8_t *data,
-		      size_t datalen, const u8_t *expected,
+uint32_t do_hmac_test(TCHmacState_t h, uint32_t testnum, const uint8_t *data,
+		      size_t datalen, const uint8_t *expected,
 		      size_t expectedlen)
 {
-	u8_t digest[32];
-	u32_t result = TC_PASS;
+	uint8_t digest[32];
+	uint32_t result = TC_PASS;
 
 	(void)tc_hmac_init(h);
 	(void)tc_hmac_update(h, data, datalen);
@@ -62,21 +62,21 @@ u32_t do_hmac_test(TCHmacState_t h, u32_t testnum, const u8_t *data,
  */
 void test_hmac_1(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_START("Performing HMAC tests (RFC4231 test vectors):");
 
 	TC_PRINT("HMAC %s:\n", __func__);
 
-	const u8_t key[20] = {
+	const uint8_t key[20] = {
 		0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
 		    0x0b, 0x0b,
 		0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b
 	};
-	const u8_t data[8] = {
+	const uint8_t data[8] = {
 		0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, 0x5c, 0xa8,
 		    0xaf, 0xce,
 		0xaf, 0x0b, 0xf1, 0x2b, 0x88, 0x1d, 0xc2, 0x00, 0xc9, 0x83,
@@ -96,20 +96,20 @@ void test_hmac_1(void)
 
 void test_hmac_2(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[4] = {
+	const uint8_t key[4] = {
 		0x4a, 0x65, 0x66, 0x65
 	};
-	const u8_t data[28] = {
+	const uint8_t data[28] = {
 		0x77, 0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x20, 0x79, 0x61,
 		    0x20, 0x77,
 		0x61, 0x6e, 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f,
 		    0x74, 0x68,
 		0x69, 0x6e, 0x67, 0x3f
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e, 0x6a, 0x04,
 		    0x24, 0x26,
 		0x08, 0x95, 0x75, 0xc7, 0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27,
@@ -130,15 +130,15 @@ void test_hmac_2(void)
 
 void test_hmac_3(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[20] = {
+	const uint8_t key[20] = {
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 		    0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
 	};
-	const u8_t data[50] = {
+	const uint8_t data[50] = {
 		0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
 		    0xdd, 0xdd,
 		0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
@@ -149,7 +149,7 @@ void test_hmac_3(void)
 		    0xdd, 0xdd,
 		0xdd, 0xdd
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46, 0x85, 0x4d,
 		    0xb8, 0xeb,
 		0xd0, 0x91, 0x81, 0xa7, 0x29, 0x59, 0x09, 0x8b, 0x3e, 0xf8,
@@ -170,17 +170,17 @@ void test_hmac_3(void)
 
 void test_hmac_4(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[25] = {
+	const uint8_t key[25] = {
 		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
 		    0x0b, 0x0c,
 		0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
 		    0x17, 0x18,
 		0x19
 	};
-	const u8_t data[50] = {
+	const uint8_t data[50] = {
 		0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
 		    0xcd, 0xcd,
 		0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
@@ -191,7 +191,7 @@ void test_hmac_4(void)
 		    0xcd, 0xcd,
 		0xcd, 0xcd
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x82, 0x55, 0x8a, 0x38, 0x9a, 0x44, 0x3c, 0x0e, 0xa4, 0xcc,
 		    0x81, 0x98,
 		0x99, 0xf2, 0x08, 0x3a, 0x85, 0xf0, 0xfa, 0xa3, 0xe5, 0x78,
@@ -212,20 +212,20 @@ void test_hmac_4(void)
 
 void test_hmac_5(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[20] = {
+	const uint8_t key[20] = {
 		0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
 		    0x0c, 0x0c,
 		0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c
 	};
-	const u8_t data[20] = {
+	const uint8_t data[20] = {
 		0x54, 0x65, 0x73, 0x74, 0x20, 0x57, 0x69, 0x74, 0x68, 0x20,
 		    0x54, 0x72,
 		0x75, 0x6e, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xa3, 0xb6, 0x16, 0x74, 0x73, 0x10, 0x0e, 0xe0, 0x6e, 0x0c,
 		    0x79, 0x6c,
 		0x29, 0x55, 0x55, 0x2b, 0xfa, 0x6f, 0x7c, 0x0a, 0x6a, 0x8a,
@@ -246,10 +246,10 @@ void test_hmac_5(void)
 
 void test_hmac_6(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[131] = {
+	const uint8_t key[131] = {
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 		    0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
@@ -272,7 +272,7 @@ void test_hmac_6(void)
 		    0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
 	};
-	const u8_t data[54] = {
+	const uint8_t data[54] = {
 		0x54, 0x65, 0x73, 0x74, 0x20, 0x55, 0x73, 0x69, 0x6e, 0x67,
 		    0x20, 0x4c,
 		0x61, 0x72, 0x67, 0x65, 0x72, 0x20, 0x54, 0x68, 0x61, 0x6e,
@@ -283,7 +283,7 @@ void test_hmac_6(void)
 		    0x65, 0x79,
 		0x20, 0x46, 0x69, 0x72, 0x73, 0x74
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x60, 0xe4, 0x31, 0x59, 0x1e, 0xe0, 0xb6, 0x7f, 0x0d, 0x8a,
 		    0x26, 0xaa,
 		0xcb, 0xf5, 0xb7, 0x7f, 0x8e, 0x0b, 0xc6, 0x21, 0x37, 0x28,
@@ -304,10 +304,10 @@ void test_hmac_6(void)
 
 void test_hmac_7(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("HMAC %s:\n", __func__);
-	const u8_t key[131] = {
+	const uint8_t key[131] = {
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 		    0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
@@ -330,7 +330,7 @@ void test_hmac_7(void)
 		    0xaa, 0xaa,
 		0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
 	};
-	const u8_t data[152] = {
+	const uint8_t data[152] = {
 		0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20,
 		    0x74, 0x65,
 		0x73, 0x74, 0x20, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x61,
@@ -357,7 +357,7 @@ void test_hmac_7(void)
 		    0x61, 0x6c,
 		0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x2e
 	};
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x9b, 0x09, 0xff, 0xa7, 0x1b, 0x94, 0x2f, 0xcb, 0x27, 0x63,
 		    0x5f, 0xbc,
 		0xd5, 0xb0, 0xe9, 0x44, 0xbf, 0xdc, 0x63, 0x64, 0x4f, 0x07,
diff --git a/tests/crypto/tinycrypt/src/sha256.c b/tests/crypto/tinycrypt/src/sha256.c
index d4cbc5249c..1e41e1f234 100644
--- a/tests/crypto/tinycrypt/src/sha256.c
+++ b/tests/crypto/tinycrypt/src/sha256.c
@@ -54,10 +54,10 @@ void test_sha256_1(void)
 {
 	TC_START("Performing SHA256 tests (NIST tests vectors):");
 
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #1:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41,
 		    0x40, 0xde,
 		0x5d, 0xae, 0x22, 0x23, 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17,
@@ -65,11 +65,11 @@ void test_sha256_1(void)
 		0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad
 	};
 	const char *m = "abc";
-	u8_t digest[32];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)tc_sha256_init(&s);
-	tc_sha256_update(&s, (const u8_t *)m, strlen(m));
+	tc_sha256_update(&s, (const uint8_t *)m, strlen(m));
 	(void)tc_sha256_final(digest, &s);
 	result = check_result(1, expected, sizeof(expected),
 			      digest, sizeof(digest), 1);
@@ -83,10 +83,10 @@ void test_sha256_1(void)
  */
 void test_sha256_2(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #2:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8, 0xe5, 0xc0,
 		    0x26, 0x93,
 		0x0c, 0x3e, 0x60, 0x39, 0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff,
@@ -95,11 +95,11 @@ void test_sha256_2(void)
 	};
 	const char *m =
 	    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
-	u8_t digest[32];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)tc_sha256_init(&s);
-	tc_sha256_update(&s, (const u8_t *)m, strlen(m));
+	tc_sha256_update(&s, (const uint8_t *)m, strlen(m));
 	(void)tc_sha256_final(digest, &s);
 
 	result = check_result(2, expected, sizeof(expected),
@@ -111,18 +111,18 @@ void test_sha256_2(void)
 
 void test_sha256_3(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #3:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x68, 0x32, 0x57, 0x20, 0xaa, 0xbd, 0x7c, 0x82, 0xf3, 0x0f,
 		    0x55, 0x4b,
 		0x31, 0x3d, 0x05, 0x70, 0xc9, 0x5a, 0xcc, 0xbb, 0x7d, 0xc4,
 		    0xb5, 0xaa,
 		0xe1, 0x12, 0x04, 0xc0, 0x8f, 0xfe, 0x73, 0x2b
 	};
-	const u8_t m[1] = { 0xbd };
-	u8_t digest[32];
+	const uint8_t m[1] = { 0xbd };
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)tc_sha256_init(&s);
@@ -139,18 +139,18 @@ void test_sha256_3(void)
 
 void test_sha256_4(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #4:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x7a, 0xbc, 0x22, 0xc0, 0xae, 0x5a, 0xf2, 0x6c, 0xe9, 0x3d,
 		    0xbb, 0x94,
 		0x43, 0x3a, 0x0e, 0x0b, 0x2e, 0x11, 0x9d, 0x01, 0x4f, 0x8e,
 		    0x7f, 0x65,
 		0xbd, 0x56, 0xc6, 0x1c, 0xcc, 0xcd, 0x95, 0x04
 	};
-	const u8_t m[4] = { 0xc9, 0x8c, 0x8e, 0x55 };
-	u8_t digest[32];
+	const uint8_t m[4] = { 0xc9, 0x8c, 0x8e, 0x55 };
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)tc_sha256_init(&s);
@@ -167,18 +167,18 @@ void test_sha256_4(void)
 
 void test_sha256_5(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #5:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x02, 0x77, 0x94, 0x66, 0xcd, 0xec, 0x16, 0x38, 0x11, 0xd0,
 		    0x78, 0x81,
 		0x5c, 0x63, 0x3f, 0x21, 0x90, 0x14, 0x13, 0x08, 0x14, 0x49,
 		    0x00, 0x2f,
 		0x24, 0xaa, 0x3e, 0x80, 0xf0, 0xb8, 0x8e, 0xf7
 	};
-	u8_t m[55];
-	u8_t digest[32];
+	uint8_t m[55];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x00, sizeof(m));
@@ -197,18 +197,18 @@ void test_sha256_5(void)
 
 void test_sha256_6(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #6:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xd4, 0x81, 0x7a, 0xa5, 0x49, 0x76, 0x28, 0xe7, 0xc7, 0x7e,
 		    0x6b, 0x60,
 		0x61, 0x07, 0x04, 0x2b, 0xbb, 0xa3, 0x13, 0x08, 0x88, 0xc5,
 		    0xf4, 0x7a,
 		0x37, 0x5e, 0x61, 0x79, 0xbe, 0x78, 0x9f, 0xbb
 	};
-	u8_t m[56];
-	u8_t digest[32];
+	uint8_t m[56];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x00, sizeof(m));
@@ -227,18 +227,18 @@ void test_sha256_6(void)
 
 void test_sha256_7(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #7:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x65, 0xa1, 0x6c, 0xb7, 0x86, 0x13, 0x35, 0xd5, 0xac, 0xe3,
 		    0xc6, 0x07,
 		0x18, 0xb5, 0x05, 0x2e, 0x44, 0x66, 0x07, 0x26, 0xda, 0x4c,
 		    0xd1, 0x3b,
 		0xb7, 0x45, 0x38, 0x1b, 0x23, 0x5a, 0x17, 0x85
 	};
-	u8_t m[57];
-	u8_t digest[32];
+	uint8_t m[57];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x00, sizeof(m));
@@ -257,18 +257,18 @@ void test_sha256_7(void)
 
 void test_sha256_8(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #8:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xf5, 0xa5, 0xfd, 0x42, 0xd1, 0x6a, 0x20, 0x30, 0x27, 0x98,
 		    0xef, 0x6e,
 		0xd3, 0x09, 0x97, 0x9b, 0x43, 0x00, 0x3d, 0x23, 0x20, 0xd9,
 		    0xf0, 0xe8,
 		0xea, 0x98, 0x31, 0xa9, 0x27, 0x59, 0xfb, 0x4b
 	};
-	u8_t m[64];
-	u8_t digest[32];
+	uint8_t m[64];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x00, sizeof(m));
@@ -287,18 +287,18 @@ void test_sha256_8(void)
 
 void test_sha256_9(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #9:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x54, 0x1b, 0x3e, 0x9d, 0xaa, 0x09, 0xb2, 0x0b, 0xf8, 0x5f,
 		    0xa2, 0x73,
 		0xe5, 0xcb, 0xd3, 0xe8, 0x01, 0x85, 0xaa, 0x4e, 0xc2, 0x98,
 		    0xe7, 0x65,
 		0xdb, 0x87, 0x74, 0x2b, 0x70, 0x13, 0x8a, 0x53
 	};
-	u8_t m[1000];
-	u8_t digest[32];
+	uint8_t m[1000];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x00, sizeof(m));
@@ -317,18 +317,18 @@ void test_sha256_9(void)
 
 void test_sha256_10(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #10:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xc2, 0xe6, 0x86, 0x82, 0x34, 0x89, 0xce, 0xd2, 0x01, 0x7f,
 		    0x60, 0x59,
 		0xb8, 0xb2, 0x39, 0x31, 0x8b, 0x63, 0x64, 0xf6, 0xdc, 0xd8,
 		    0x35, 0xd0,
 		0xa5, 0x19, 0x10, 0x5a, 0x1e, 0xad, 0xd6, 0xe4
 	};
-	u8_t m[1000];
-	u8_t digest[32];
+	uint8_t m[1000];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x41, sizeof(m));
@@ -347,18 +347,18 @@ void test_sha256_10(void)
 
 void test_sha256_11(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #11:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xf4, 0xd6, 0x2d, 0xde, 0xc0, 0xf3, 0xdd, 0x90, 0xea, 0x13,
 		    0x80, 0xfa,
 		0x16, 0xa5, 0xff, 0x8d, 0xc4, 0xc5, 0x4b, 0x21, 0x74, 0x06,
 		    0x50, 0xf2,
 		0x4a, 0xfc, 0x41, 0x20, 0x90, 0x35, 0x52, 0xb0
 	};
-	u8_t m[1005];
-	u8_t digest[32];
+	uint8_t m[1005];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
 
 	(void)memset(m, 0x55, sizeof(m));
@@ -377,20 +377,20 @@ void test_sha256_11(void)
 
 void test_sha256_12(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #12:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0xd2, 0x97, 0x51, 0xf2, 0x64, 0x9b, 0x32, 0xff, 0x57, 0x2b,
 		    0x5e, 0x0a,
 		0x9f, 0x54, 0x1e, 0xa6, 0x60, 0xa5, 0x0f, 0x94, 0xff, 0x0b,
 		    0xee, 0xdf,
 		0xb0, 0xb6, 0x92, 0xb9, 0x24, 0xcc, 0x80, 0x25
 	};
-	u8_t m[1000];
-	u8_t digest[32];
+	uint8_t m[1000];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
-	u32_t i;
+	uint32_t i;
 
 	(void)memset(m, 0x00, sizeof(m));
 
@@ -409,20 +409,20 @@ void test_sha256_12(void)
 #if EXTREME_SLOW
 void test_sha256_13(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #13:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x15, 0xa1, 0x86, 0x8c, 0x12, 0xcc, 0x53, 0x95, 0x1e, 0x18,
 		    0x23, 0x44,
 		0x27, 0x74, 0x47, 0xcd, 0x09, 0x79, 0x53, 0x6b, 0xad, 0xcc,
 		    0x51, 0x2a,
 		0xd2, 0x4c, 0x67, 0xe9, 0xb2, 0xd4, 0xf3, 0xdd
 	};
-	u8_t m[32768];
-	u8_t digest[32];
+	uint8_t m[32768];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
-	u32_t i;
+	uint32_t i;
 
 	(void)memset(m, 0x5a, sizeof(m));
 
@@ -442,20 +442,20 @@ void test_sha256_13(void)
 
 void test_sha256_14(void)
 {
-	u32_t result = TC_PASS;
+	uint32_t result = TC_PASS;
 
 	TC_PRINT("SHA256 test #14:\n");
-	const u8_t expected[32] = {
+	const uint8_t expected[32] = {
 		0x46, 0x1c, 0x19, 0xa9, 0x3b, 0xd4, 0x34, 0x4f, 0x92, 0x15,
 		    0xf5, 0xec,
 		0x64, 0x35, 0x70, 0x90, 0x34, 0x2b, 0xc6, 0x6b, 0x15, 0xa1,
 		    0x48, 0x31,
 		0x7d, 0x27, 0x6e, 0x31, 0xcb, 0xc2, 0x0b, 0x53
 	};
-	u8_t m[32768];
-	u8_t digest[32];
+	uint8_t m[32768];
+	uint8_t digest[32];
 	struct tc_sha256_state_struct s;
-	u32_t i;
+	uint32_t i;
 
 	(void)memset(m, 0x00, sizeof(m));
 
diff --git a/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c b/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
index 5d960cad39..e5d5651cd1 100644
--- a/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
+++ b/tests/crypto/tinycrypt_hmac_prng/src/hmac_prng.c
@@ -49,30 +49,30 @@
 #include <ztest.h>
 
 struct hmac_prng_test_vector {
-	u8_t entropyinputlen;
-	u8_t noncelen;
-	u8_t personalizationstringlen;
-	u8_t additionalinputlen;
-	u8_t returnedbitslen;
-	u8_t entropyinput[32];
-	u8_t nonce[16];
-	u8_t personalizationstring[32];
-	u8_t entropyinputreseed[32];
-	u8_t additionalinputreseed[32];
-	u8_t returnedbits[128];
+	uint8_t entropyinputlen;
+	uint8_t noncelen;
+	uint8_t personalizationstringlen;
+	uint8_t additionalinputlen;
+	uint8_t returnedbitslen;
+	uint8_t entropyinput[32];
+	uint8_t nonce[16];
+	uint8_t personalizationstring[32];
+	uint8_t entropyinputreseed[32];
+	uint8_t additionalinputreseed[32];
+	uint8_t returnedbits[128];
 };
 
 unsigned int do_hmac_prng_pr_false_test(unsigned int testnum, const struct
 					hmac_prng_test_vector * vec)
 {
 	struct tc_hmac_prng_struct h;
-	u8_t random[128];
-	u32_t seed_material_size;
+	uint8_t random[128];
+	uint32_t seed_material_size;
 	/* entropyinput || nonce || personalizationstring */
-	u8_t seed_material[32 + 16 + 32];
+	uint8_t seed_material[32 + 16 + 32];
 	unsigned int result = TC_PASS;
 
-	u8_t *p = seed_material;
+	uint8_t *p = seed_material;
 
 	memset(&h, 0x0, sizeof(h));
 
diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c
index 0a21c0529c..7288144bf0 100644
--- a/tests/drivers/adc/adc_api/src/test_adc.c
+++ b/tests/drivers/adc/adc_api/src/test_adc.c
@@ -212,7 +212,7 @@
 #endif
 
 #define BUFFER_SIZE  6
-static ZTEST_BMEM s16_t m_sample_buffer[BUFFER_SIZE];
+static ZTEST_BMEM int16_t m_sample_buffer[BUFFER_SIZE];
 
 static const struct adc_channel_cfg m_1st_channel_cfg = {
 	.gain             = ADC_GAIN,
@@ -268,7 +268,7 @@ static void check_samples(int expected_count)
 
 	TC_PRINT("Samples read: ");
 	for (i = 0; i < BUFFER_SIZE; i++) {
-		s16_t sample_value = m_sample_buffer[i];
+		int16_t sample_value = m_sample_buffer[i];
 
 		TC_PRINT("0x%04x ", sample_value);
 		if (i < expected_count) {
@@ -411,7 +411,7 @@ void test_adc_asynchronous_call(void)
 static enum adc_action sample_with_interval_callback(
 				struct device *dev,
 				const struct adc_sequence *sequence,
-				u16_t sampling_index)
+				uint16_t sampling_index)
 {
 	TC_PRINT("%s: sampling %d\n", __func__, sampling_index);
 	return ADC_ACTION_CONTINUE;
@@ -455,11 +455,11 @@ void test_adc_sample_with_interval(void)
 /*
  * test_adc_repeated_samplings
  */
-static u8_t m_samplings_done;
+static uint8_t m_samplings_done;
 static enum adc_action repeated_samplings_callback(
 				struct device *dev,
 				const struct adc_sequence *sequence,
-				u16_t sampling_index)
+				uint16_t sampling_index)
 {
 	++m_samplings_done;
 	TC_PRINT("%s: done %d\n", __func__, m_samplings_done);
diff --git a/tests/drivers/can/api/src/main.c b/tests/drivers/can/api/src/main.c
index f80abb4e32..30bdc3f18a 100644
--- a/tests/drivers/can/api/src/main.c
+++ b/tests/drivers/can/api/src/main.c
@@ -128,7 +128,7 @@ const struct zcan_filter test_std_some_filter = {
 struct zcan_work can_work;
 
 static inline void check_msg(struct zcan_frame *msg1, struct zcan_frame *msg2,
-			     u32_t mask)
+			     uint32_t mask)
 {
 	int cmp_res;
 
@@ -153,7 +153,7 @@ static inline void check_msg(struct zcan_frame *msg1, struct zcan_frame *msg2,
 	zassert_equal(cmp_res, 0, "Received data differ");
 }
 
-static void tx_std_isr(u32_t error_flags, void *arg)
+static void tx_std_isr(uint32_t error_flags, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -162,7 +162,7 @@ static void tx_std_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->std_id, TEST_CAN_STD_ID, "Arg does not match");
 }
 
-static void tx_std_masked_isr(u32_t error_flags, void *arg)
+static void tx_std_masked_isr(uint32_t error_flags, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -171,7 +171,7 @@ static void tx_std_masked_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->std_id, TEST_CAN_STD_MASK_ID, "Arg does not match");
 }
 
-static void tx_ext_isr(u32_t error_flags, void *arg)
+static void tx_ext_isr(uint32_t error_flags, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -180,7 +180,7 @@ static void tx_ext_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->ext_id, TEST_CAN_EXT_ID, "Arg does not match");
 }
 
-static void tx_ext_masked_isr(u32_t error_flags, void *arg)
+static void tx_ext_masked_isr(uint32_t error_flags, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -365,7 +365,7 @@ static void send_receive(const struct zcan_filter *filter, struct zcan_frame *ms
 {
 	int ret, filter_id;
 	struct zcan_frame msg_buffer;
-	u32_t mask = 0U;
+	uint32_t mask = 0U;
 
 	zassert_not_null(can_dev, "Device not not found");
 
diff --git a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
index 576c88c381..fa4c5636e8 100644
--- a/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
+++ b/tests/drivers/clock_control/clock_control_api/src/test_clock_control.c
@@ -14,13 +14,13 @@ LOG_MODULE_REGISTER(test);
 
 struct device_subsys_data {
 	clock_control_subsys_t subsys;
-	u32_t startup_us;
+	uint32_t startup_us;
 };
 
 struct device_data {
 	const char *name;
 	const struct device_subsys_data *subsys_data;
-	u32_t subsys_cnt;
+	uint32_t subsys_cnt;
 };
 
 static const struct device_data devices[] = {
@@ -48,7 +48,7 @@ static const struct device_data devices[] = {
 
 typedef void (*test_func_t)(const char *dev_name,
 			    clock_control_subsys_t subsys,
-			    u32_t startup_us);
+			    uint32_t startup_us);
 
 typedef bool (*test_capability_check_t)(const char *dev_name,
 					clock_control_subsys_t subsys);
@@ -75,7 +75,7 @@ static void tear_down_instance(const char *dev_name,
 
 static void test_with_single_instance(const char *dev_name,
 				      clock_control_subsys_t subsys,
-				      u32_t startup_time,
+				      uint32_t startup_time,
 				      test_func_t func,
 				      test_capability_check_t capability_check)
 {
@@ -105,7 +105,7 @@ static void test_all_instances(test_func_t func,
  */
 static void test_on_off_status_instance(const char *dev_name,
 					clock_control_subsys_t subsys,
-					u32_t startup_us)
+					uint32_t startup_us)
 {
 	struct device *dev = device_get_binding(dev_name);
 	enum clock_control_status status;
@@ -151,7 +151,7 @@ static void test_on_off_status(void)
  */
 static void test_multiple_users_instance(const char *dev_name,
 					 clock_control_subsys_t subsys,
-					 u32_t startup_us)
+					 uint32_t startup_us)
 {
 	struct device *dev = device_get_binding(dev_name);
 	enum clock_control_status status;
@@ -217,7 +217,7 @@ static void clock_on_callback(struct device *dev,
 
 static void test_async_on_instance(const char *dev_name,
 				   clock_control_subsys_t subsys,
-				   u32_t startup_us)
+				   uint32_t startup_us)
 {
 	struct device *dev = device_get_binding(dev_name);
 	enum clock_control_status status;
@@ -261,7 +261,7 @@ static void test_async_on(void)
  */
 static void test_async_on_stopped_on_instance(const char *dev_name,
 					      clock_control_subsys_t subsys,
-					      u32_t startup_us)
+					      uint32_t startup_us)
 {
 	struct device *dev = device_get_binding(dev_name);
 	enum clock_control_status status;
@@ -303,7 +303,7 @@ static void test_async_on_stopped(void)
  */
 static void test_immediate_cb_when_clock_on_on_instance(const char *dev_name,
 						clock_control_subsys_t subsys,
-						u32_t startup_us)
+						uint32_t startup_us)
 {
 	struct device *dev = device_get_binding(dev_name);
 	enum clock_control_status status;
diff --git a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
index 4fb854514f..fdf74d8955 100644
--- a/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
+++ b/tests/drivers/clock_control/nrf_clock_calibration/src/test_nrf_clock_calibration.c
@@ -43,8 +43,8 @@ static void turn_off_clock(struct device *dev, clock_control_subsys_t subsys)
 /* Function tests if during given time expected number of calibrations and
  * skips occurs.
  */
-static void test_calibration(u32_t exp_cal, u32_t exp_skip,
-				u32_t sleep_ms, u32_t line)
+static void test_calibration(uint32_t exp_cal, uint32_t exp_skip,
+				uint32_t sleep_ms, uint32_t line)
 {
 	int cal_cnt;
 	int skip_cnt;
@@ -70,7 +70,7 @@ static void test_calibration(u32_t exp_cal, u32_t exp_skip,
  */
 static void sync_just_after_calibration(void)
 {
-	u32_t cal_cnt = z_nrf_clock_calibration_count();
+	uint32_t cal_cnt = z_nrf_clock_calibration_count();
 
 	/* wait until calibration is performed. */
 	while (z_nrf_clock_calibration_count() == cal_cnt) {
diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c
index a8750d2570..05c7f40e3e 100644
--- a/tests/drivers/counter/counter_basic_api/src/test_counter.c
+++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c
@@ -160,8 +160,8 @@ void test_set_top_value_with_alarm_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t cnt;
-	u32_t top_cnt;
+	uint32_t cnt;
+	uint32_t top_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -210,8 +210,8 @@ void test_set_top_value_without_alarm_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t cnt;
-	u32_t top_cnt;
+	uint32_t cnt;
+	uint32_t top_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = NULL,
 		.user_data = NULL,
@@ -251,17 +251,17 @@ void test_set_top_value_without_alarm(void)
 			   set_top_value_capable);
 }
 
-static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter,
+static void alarm_handler(struct device *dev, uint8_t chan_id, uint32_t counter,
 			  void *user_data)
 {
 	/* Arbitrary limit for alarm processing - time between hw expiration
 	 * and read-out from counter in the handler.
 	 */
-	static const u64_t processing_limit_us = 1000;
-	u32_t now;
+	static const uint64_t processing_limit_us = 1000;
+	uint32_t now;
 	int err;
-	u32_t top;
-	u32_t diff;
+	uint32_t top;
+	uint32_t diff;
 
 	err = counter_get_value(dev, &now);
 	zassert_true(err == 0, "%s: Counter read failed (err: %d)",
@@ -296,8 +296,8 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
 {
 	struct device *dev;
 	int err;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -341,7 +341,7 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
 	zassert_equal(0, err, "%s: Counter set alarm failed (err: %d)",
 			dev_name, err);
 
-	k_busy_wait(2*(u32_t)counter_ticks_to_us(dev, ticks));
+	k_busy_wait(2*(uint32_t)counter_ticks_to_us(dev, ticks));
 
 	alarm_cnt = k_sem_count_get(&alarm_cnt_sem);
 	zassert_equal(1, alarm_cnt,
@@ -409,7 +409,7 @@ void test_single_shot_alarm_top(void)
 
 static void *clbk_data[10];
 
-static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter,
+static void alarm_handler2(struct device *dev, uint8_t chan_id, uint32_t counter,
 			   void *user_data)
 {
 	clbk_data[k_sem_count_get(&alarm_cnt_sem)] = user_data;
@@ -426,8 +426,8 @@ void test_multiple_alarms_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -462,7 +462,7 @@ void test_multiple_alarms_instance(const char *dev_name)
 	zassert_equal(0, err,
 			"%s: Counter failed to set top value", dev_name);
 
-	k_busy_wait(3*(u32_t)counter_ticks_to_us(dev, alarm_cfg.ticks));
+	k_busy_wait(3*(uint32_t)counter_ticks_to_us(dev, alarm_cfg.ticks));
 
 	err = counter_set_channel_alarm(dev, 0, &alarm_cfg);
 	zassert_equal(0, err, "%s: Counter set alarm failed", dev_name);
@@ -512,8 +512,8 @@ void test_all_channels_instance(const char *dev_name)
 	int nchan = 0;
 	bool limit_reached = false;
 	struct counter_alarm_cfg alarm_cfgs;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 
 	dev = device_get_binding(dev_name);
 	ticks = counter_us_to_ticks(dev, COUNTER_PERIOD_US);
@@ -569,10 +569,10 @@ void test_all_channels(void)
 void test_late_alarm_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
-	u32_t guard = counter_us_to_ticks(dev, 200);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
+	uint32_t guard = counter_us_to_ticks(dev, 200);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = COUNTER_ALARM_CFG_ABSOLUTE |
@@ -622,8 +622,8 @@ void test_late_alarm_error_instance(const char *dev_name)
 {
 	int err;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
-	u32_t guard = counter_us_to_ticks(dev, 200);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
+	uint32_t guard = counter_us_to_ticks(dev, 200);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = COUNTER_ALARM_CFG_ABSOLUTE,
@@ -658,7 +658,7 @@ void test_late_alarm_error_instance(const char *dev_name)
 static bool late_detection_capable(const char *dev_name)
 {
 	struct device *dev = device_get_binding(dev_name);
-	u32_t guard = counter_get_guard_period(dev,
+	uint32_t guard = counter_get_guard_period(dev,
 					COUNTER_GUARD_PERIOD_LATE_TO_SET);
 	int err = counter_set_guard_period(dev, guard,
 					COUNTER_GUARD_PERIOD_LATE_TO_SET);
@@ -684,9 +684,9 @@ void test_late_alarm_error(void)
 static void test_short_relative_alarm_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = 0,
@@ -775,13 +775,13 @@ static void test_short_relative_alarm(void)
 static void test_cancelled_alarm_does_not_expire_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t us = 1000;
-	u32_t ticks = counter_us_to_ticks(dev, us);
-	u32_t top = counter_get_top_value(dev);
+	uint32_t us = 1000;
+	uint32_t ticks = counter_us_to_ticks(dev, us);
+	uint32_t top = counter_get_top_value(dev);
 
-	us = (u32_t)counter_ticks_to_us(dev, ticks);
+	us = (uint32_t)counter_ticks_to_us(dev, ticks);
 
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
diff --git a/tests/drivers/counter/counter_cmos/src/main.c b/tests/drivers/counter/counter_cmos/src/main.c
index 59b7d02297..1c5b00961a 100644
--- a/tests/drivers/counter/counter_cmos/src/main.c
+++ b/tests/drivers/counter/counter_cmos/src/main.c
@@ -18,7 +18,7 @@
 void test_cmos_rate(void)
 {
 	struct device *cmos;
-	u32_t start, elapsed;
+	uint32_t start, elapsed;
 	int err;
 
 	cmos = device_get_binding("CMOS");
diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
index c515ff952a..8d92e27ce6 100644
--- a/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
+++ b/tests/drivers/counter/counter_nrf_rtc/fixed_top/src/test_counter_fixed_top.c
@@ -11,7 +11,7 @@
 #include <hal/nrf_rtc.h>
 LOG_MODULE_REGISTER(test);
 
-static volatile u32_t top_cnt;
+static volatile uint32_t top_cnt;
 
 const char *devices[] = {
 #ifdef CONFIG_COUNTER_RTC0
@@ -84,7 +84,7 @@ static void top_handler(struct device *dev, void *user_data)
 void test_top_handler_on_instance(const char *dev_name)
 {
 	struct device *dev;
-	u32_t tmp_top_cnt;
+	uint32_t tmp_top_cnt;
 	int err;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
diff --git a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
index 69f46d1780..c3c28d5430 100644
--- a/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
+++ b/tests/drivers/counter/maxim_ds3231_api/src/test_counter.c
@@ -117,8 +117,8 @@ void test_set_top_value_with_alarm_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t cnt;
-	u32_t top_cnt;
+	uint32_t cnt;
+	uint32_t top_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -167,8 +167,8 @@ void test_set_top_value_without_alarm_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t cnt;
-	u32_t top_cnt;
+	uint32_t cnt;
+	uint32_t top_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = NULL,
 		.user_data = NULL,
@@ -208,10 +208,10 @@ void test_set_top_value_without_alarm(void)
 			   set_top_value_capable);
 }
 
-static void alarm_handler(struct device *dev, u8_t chan_id, u32_t counter,
+static void alarm_handler(struct device *dev, uint8_t chan_id, uint32_t counter,
 			  void *user_data)
 {
-	u32_t now;
+	uint32_t now;
 	int err;
 
 	err = counter_get_value(dev, &now);
@@ -243,8 +243,8 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
 {
 	struct device *dev;
 	int err;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -289,7 +289,7 @@ void test_single_shot_alarm_instance(const char *dev_name, bool set_top)
 		      dev_name, err);
 
 	err = counter_set_top_value(dev, &top_cfg);
-	k_sleep(K_USEC(2 * (u32_t)counter_ticks_to_us(dev, ticks)));
+	k_sleep(K_USEC(2 * (uint32_t)counter_ticks_to_us(dev, ticks)));
 
 	alarm_cnt = k_sem_count_get(&alarm_cnt_sem);
 	zassert_equal(1, alarm_cnt,
@@ -358,7 +358,7 @@ void test_single_shot_alarm_top(void)
 
 static void *clbk_data[10];
 
-static void alarm_handler2(struct device *dev, u8_t chan_id, u32_t counter,
+static void alarm_handler2(struct device *dev, uint8_t chan_id, uint32_t counter,
 			   void *user_data)
 {
 	clbk_data[k_sem_count_get(&alarm_cnt_sem)] = user_data;
@@ -375,8 +375,8 @@ void test_multiple_alarms_instance(const char *dev_name)
 {
 	struct device *dev;
 	int err;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 	struct counter_top_cfg top_cfg = {
 		.callback = top_handler,
 		.user_data = exp_user_data,
@@ -412,7 +412,7 @@ void test_multiple_alarms_instance(const char *dev_name)
 	zassert_equal(-ENOTSUP, err,
 		      "%s: Counter failed to set top value: %d", dev_name);
 
-	k_sleep(K_USEC(3 * (u32_t)counter_ticks_to_us(dev, alarm_cfg.ticks)));
+	k_sleep(K_USEC(3 * (uint32_t)counter_ticks_to_us(dev, alarm_cfg.ticks)));
 
 	err = counter_set_channel_alarm(dev, 0, &alarm_cfg);
 	zassert_equal(0, err, "%s: Counter set alarm failed", dev_name);
@@ -475,8 +475,8 @@ void test_all_channels_instance(const char *dev_name)
 	int nchan = 0;
 	bool limit_reached = false;
 	struct counter_alarm_cfg alarm_cfgs;
-	u32_t ticks;
-	u32_t alarm_cnt;
+	uint32_t ticks;
+	uint32_t alarm_cnt;
 
 	dev = device_get_binding(dev_name);
 
@@ -539,10 +539,10 @@ void test_all_channels(void)
 void test_late_alarm_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
-	u32_t guard = counter_us_to_ticks(dev, 200);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
+	uint32_t guard = counter_us_to_ticks(dev, 200);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = COUNTER_ALARM_CFG_ABSOLUTE |
@@ -592,8 +592,8 @@ void test_late_alarm_error_instance(const char *dev_name)
 {
 	int err;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
-	u32_t guard = counter_us_to_ticks(dev, 200);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
+	uint32_t guard = counter_us_to_ticks(dev, 200);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = COUNTER_ALARM_CFG_ABSOLUTE,
@@ -628,7 +628,7 @@ void test_late_alarm_error_instance(const char *dev_name)
 static bool late_detection_capable(const char *dev_name)
 {
 	struct device *dev = device_get_binding(dev_name);
-	u32_t guard = counter_get_guard_period(dev,
+	uint32_t guard = counter_get_guard_period(dev,
 					       COUNTER_GUARD_PERIOD_LATE_TO_SET);
 	int err = counter_set_guard_period(dev, guard,
 					   COUNTER_GUARD_PERIOD_LATE_TO_SET);
@@ -654,9 +654,9 @@ void test_late_alarm_error(void)
 static void test_short_relative_alarm_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t tick_us = (u32_t)counter_ticks_to_us(dev, 1);
+	uint32_t tick_us = (uint32_t)counter_ticks_to_us(dev, 1);
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
 		.flags = 0,
@@ -745,12 +745,12 @@ static void test_short_relative_alarm(void)
 static void test_cancelled_alarm_does_not_expire_instance(const char *dev_name)
 {
 	int err;
-	u32_t alarm_cnt;
+	uint32_t alarm_cnt;
 	struct device *dev = device_get_binding(dev_name);
-	u32_t us = 1000;
-	u32_t ticks = counter_us_to_ticks(dev, us);
+	uint32_t us = 1000;
+	uint32_t ticks = counter_us_to_ticks(dev, us);
 
-	us = (u32_t)counter_ticks_to_us(dev, ticks);
+	us = (uint32_t)counter_ticks_to_us(dev, ticks);
 
 	struct counter_alarm_cfg alarm_cfg = {
 		.callback = alarm_handler,
@@ -894,7 +894,7 @@ static void test_ds3231_get_syncpoint(void)
 	zassert_equal(syncpoint.rtc.tv_nsec, 0,
 		      "%s: Unexpected nanoseconds\n", dev_name);
 
-	TC_PRINT("Time %u at %u local\n", (u32_t)syncpoint.rtc.tv_sec,
+	TC_PRINT("Time %u at %u local\n", (uint32_t)syncpoint.rtc.tv_sec,
 		 syncpoint.syncclock);
 }
 
diff --git a/tests/drivers/dac/dac_loopback/src/test_dac.c b/tests/drivers/dac/dac_loopback/src/test_dac.c
index 8a470756d4..1af2bdd69e 100644
--- a/tests/drivers/dac/dac_loopback/src/test_dac.c
+++ b/tests/drivers/dac/dac_loopback/src/test_dac.c
@@ -141,7 +141,7 @@ static int test_task_loopback(void)
 	/* wait to let DAC output settle */
 	k_sleep(K_MSEC(10));
 
-	static s16_t m_sample_buffer[1];
+	static int16_t m_sample_buffer[1];
 	static const struct adc_sequence sequence = {
 		.channels    = BIT(ADC_CHANNEL_ID),
 		.buffer      = m_sample_buffer,
diff --git a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
index 90571fa195..899daaef99 100644
--- a/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
+++ b/tests/drivers/dma/chan_blen_transfer/src/test_dma.c
@@ -29,7 +29,7 @@
 static const char tx_data[] = "It is harder to be kind than to be wise";
 static char rx_data[RX_BUFF_SIZE] = { 0 };
 
-static void test_done(void *arg, u32_t id, int error_code)
+static void test_done(void *arg, uint32_t id, int error_code)
 {
 	if (error_code == 0) {
 		TC_PRINT("DMA transfer done\n");
@@ -38,7 +38,7 @@ static void test_done(void *arg, u32_t id, int error_code)
 	}
 }
 
-static int test_task(u32_t chan_id, u32_t blen)
+static int test_task(uint32_t chan_id, uint32_t blen)
 {
 	struct dma_config dma_cfg = {0};
 	struct dma_block_config dma_block_cfg = {0};
@@ -66,8 +66,8 @@ static int test_task(u32_t chan_id, u32_t blen)
 	TC_PRINT("Starting the transfer\n");
 	(void)memset(rx_data, 0, sizeof(rx_data));
 	dma_block_cfg.block_size = sizeof(tx_data);
-	dma_block_cfg.source_address = (u32_t)tx_data;
-	dma_block_cfg.dest_address = (u32_t)rx_data;
+	dma_block_cfg.source_address = (uint32_t)tx_data;
+	dma_block_cfg.dest_address = (uint32_t)rx_data;
 
 	if (dma_config(dma, chan_id, &dma_cfg)) {
 		TC_PRINT("ERROR: transfer\n");
diff --git a/tests/drivers/dma/loop_transfer/src/dma.c b/tests/drivers/dma/loop_transfer/src/dma.c
index e0d9574978..437f17ee6d 100644
--- a/tests/drivers/dma/loop_transfer/src/dma.c
+++ b/tests/drivers/dma/loop_transfer/src/dma.c
@@ -24,19 +24,19 @@ static char rx_data[TRANSFER_LOOPS][RX_BUFF_SIZE] = {{ 0 } };
 
 #define DMA_DEVICE_NAME "DMA_0"
 
-volatile u8_t transfer_count;
+volatile uint8_t transfer_count;
 static struct dma_config dma_cfg = {0};
 static struct dma_block_config dma_block_cfg = {0};
 
-static void test_transfer(struct device *dev, u32_t id)
+static void test_transfer(struct device *dev, uint32_t id)
 {
 	int ret;
 
 	transfer_count++;
 	if (transfer_count < TRANSFER_LOOPS) {
 		dma_block_cfg.block_size = strlen(tx_data);
-		dma_block_cfg.source_address = (u32_t)tx_data;
-		dma_block_cfg.dest_address = (u32_t)rx_data[transfer_count];
+		dma_block_cfg.source_address = (uint32_t)tx_data;
+		dma_block_cfg.dest_address = (uint32_t)rx_data[transfer_count];
 
 		ret = dma_config(dev, id, &dma_cfg);
 		if (ret == 0) {
@@ -50,7 +50,7 @@ static void test_error(void)
 	printk("DMA could not proceed, an error occurred\n");
 }
 
-static void dma_user_callback(void *arg, u32_t id, int error_code)
+static void dma_user_callback(void *arg, uint32_t id, int error_code)
 {
 	struct device *dev = (struct device *)arg;
 
@@ -64,7 +64,7 @@ static void dma_user_callback(void *arg, u32_t id, int error_code)
 void main(void)
 {
 	struct device *dma;
-	static u32_t chan_id;
+	static uint32_t chan_id;
 
 	printk("DMA memory to memory transfer started on %s\n",
 		DMA_DEVICE_NAME);
@@ -90,8 +90,8 @@ void main(void)
 
 	printk("Starting the transfer and waiting for 1 second\n");
 	dma_block_cfg.block_size = strlen(tx_data);
-	dma_block_cfg.source_address = (u32_t)tx_data;
-	dma_block_cfg.dest_address = (u32_t)rx_data[transfer_count];
+	dma_block_cfg.source_address = (uint32_t)tx_data;
+	dma_block_cfg.dest_address = (uint32_t)rx_data[transfer_count];
 
 	if (dma_config(dma, chan_id, &dma_cfg)) {
 		printk("ERROR: transfer config\n");
diff --git a/tests/drivers/eeprom/src/main.c b/tests/drivers/eeprom/src/main.c
index 6d37cc5f07..e122caf6ab 100644
--- a/tests/drivers/eeprom/src/main.c
+++ b/tests/drivers/eeprom/src/main.c
@@ -21,7 +21,7 @@ static void test_size(void)
 
 static void test_out_of_bounds(void)
 {
-	const u8_t data[4] = { 0x01, 0x02, 0x03, 0x03 };
+	const uint8_t data[4] = { 0x01, 0x02, 0x03, 0x03 };
 	struct device *eeprom;
 	size_t size;
 	int rc;
@@ -35,9 +35,9 @@ static void test_out_of_bounds(void)
 
 static void test_write_and_verify(void)
 {
-	const u8_t wr_buf1[4] = { 0xFF, 0xEE, 0xDD, 0xCC };
-	const u8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD };
-	u8_t rd_buf[sizeof(wr_buf1)];
+	const uint8_t wr_buf1[4] = { 0xFF, 0xEE, 0xDD, 0xCC };
+	const uint8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD };
+	uint8_t rd_buf[sizeof(wr_buf1)];
 	struct device *eeprom;
 	int rc;
 
@@ -64,9 +64,9 @@ static void test_write_and_verify(void)
 
 static void test_zero_length_write(void)
 {
-	const u8_t wr_buf1[4] = { 0x10, 0x20, 0x30, 0x40 };
-	const u8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD };
-	u8_t rd_buf[sizeof(wr_buf1)];
+	const uint8_t wr_buf1[4] = { 0x10, 0x20, 0x30, 0x40 };
+	const uint8_t wr_buf2[sizeof(wr_buf1)] = { 0xAA, 0xBB, 0xCC, 0xDD };
+	uint8_t rd_buf[sizeof(wr_buf1)];
 	struct device *eeprom;
 	int rc;
 
diff --git a/tests/drivers/entropy/api/src/main.c b/tests/drivers/entropy/api/src/main.c
index eb5610c240..fb90f1a8b4 100644
--- a/tests/drivers/entropy/api/src/main.c
+++ b/tests/drivers/entropy/api/src/main.c
@@ -68,7 +68,7 @@ static int random_entropy(struct device *dev, char *buffer, char num)
 static int get_entropy(void)
 {
 	struct device *dev;
-	u8_t buffer[BUFFER_LENGTH] = { 0 };
+	uint8_t buffer[BUFFER_LENGTH] = { 0 };
 	int ret;
 
 	dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
diff --git a/tests/drivers/flash_simulator/src/main.c b/tests/drivers/flash_simulator/src/main.c
index 026bd2c420..c8ac362c5a 100644
--- a/tests/drivers/flash_simulator/src/main.c
+++ b/tests/drivers/flash_simulator/src/main.c
@@ -26,30 +26,30 @@
 			   FLASH_SIMULATOR_BASE_OFFSET)
 
 static struct device *flash_dev;
-static u8_t test_read_buf[TEST_SIM_FLASH_SIZE];
+static uint8_t test_read_buf[TEST_SIM_FLASH_SIZE];
 
-static u32_t p32_inc;
+static uint32_t p32_inc;
 
-void pattern32_ini(u32_t val)
+void pattern32_ini(uint32_t val)
 {
 	p32_inc = val;
 }
 
-static u32_t pattern32_inc(void)
+static uint32_t pattern32_inc(void)
 {
 	return p32_inc++;
 }
 
-static u32_t pattern32_flat(void)
+static uint32_t pattern32_flat(void)
 {
 	return p32_inc;
 }
 
-static void test_check_pattern32(off_t start, u32_t (*pattern_gen)(void),
+static void test_check_pattern32(off_t start, uint32_t (*pattern_gen)(void),
 				 size_t size)
 {
 	off_t off;
-	u32_t val32, r_val32;
+	uint32_t val32, r_val32;
 	int rc;
 
 	for (off = 0; off < size; off += 4) {
@@ -88,7 +88,7 @@ static void test_int(void)
 static void test_write_read(void)
 {
 	off_t off;
-	u32_t val32 = 0, r_val32;
+	uint32_t val32 = 0, r_val32;
 	int rc;
 
 	for (off = 0; off < TEST_SIM_FLASH_SIZE; off += 4) {
@@ -147,7 +147,7 @@ static void test_erase(void)
 
 static void test_access(void)
 {
-	u32_t data[2] = {0};
+	uint32_t data[2] = {0};
 	int rc;
 
 	rc = flash_write_protection_set(flash_dev, true);
@@ -165,7 +165,7 @@ static void test_access(void)
 static void test_out_of_bounds(void)
 {
 	int rc;
-	u8_t data[4] = {0};
+	uint8_t data[4] = {0};
 
 	rc = flash_write_protection_set(flash_dev, false);
 
@@ -223,7 +223,7 @@ static void test_out_of_bounds(void)
 static void test_align(void)
 {
 	int rc;
-	u8_t data[4] = {0};
+	uint8_t data[4] = {0};
 
 	rc = flash_read(flash_dev, FLASH_SIMULATOR_BASE_OFFSET + 1,
 				 data, 4);
@@ -251,7 +251,7 @@ static void test_align(void)
 static void test_double_write(void)
 {
 	int rc;
-	u8_t data[4] = {0};
+	uint8_t data[4] = {0};
 
 	rc = flash_erase(flash_dev, FLASH_SIMULATOR_BASE_OFFSET,
 			 FLASH_SIMULATOR_ERASE_UNIT);
diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c
index c5d9d477da..8c29370c73 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/main.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/main.c
@@ -100,7 +100,7 @@ static void board_setup(void)
 	/* Assumes ARDUINO pins are mapped on PORT0 on all boards*/
 	struct device *port0 =
 		device_get_binding(CONFIG_PINMUX_MCUX_LPC_PORT0_NAME);
-	const u32_t pin_config = (
+	const uint32_t pin_config = (
 			IOCON_PIO_FUNC0 |
 			IOCON_PIO_INV_DI |
 			IOCON_PIO_DIGITAL_EN |
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
index bdb7778e32..9a8a9296e6 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_manage.c
@@ -18,20 +18,20 @@ static struct drv_data cb_data[2];
 static int cb_cnt[2];
 
 static void callback_1(struct device *dev,
-		       struct gpio_callback *gpio_cb, u32_t pins)
+		       struct gpio_callback *gpio_cb, uint32_t pins)
 {
 	TC_PRINT("%s triggered: %d\n", __func__, ++cb_cnt[0]);
 
 }
 
 static void callback_2(struct device *dev,
-		       struct gpio_callback *gpio_cb, u32_t pins)
+		       struct gpio_callback *gpio_cb, uint32_t pins)
 {
 	TC_PRINT("%s triggered: %d\n", __func__, ++cb_cnt[1]);
 }
 
 static void callback_remove_self(struct device *dev,
-		       struct gpio_callback *gpio_cb, u32_t pins)
+		       struct gpio_callback *gpio_cb, uint32_t pins)
 {
 	struct drv_data *dd = CONTAINER_OF(gpio_cb, struct drv_data, gpio_cb);
 
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
index 40de70e755..a8791a00ee 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_callback_trigger.c
@@ -19,7 +19,7 @@ static struct drv_data data;
 static int cb_cnt;
 
 static void callback(struct device *dev,
-		     struct gpio_callback *gpio_cb, u32_t pins)
+		     struct gpio_callback *gpio_cb, uint32_t pins)
 {
 	const struct drv_data *dd = CONTAINER_OF(gpio_cb,
 						 struct drv_data, gpio_cb);
@@ -48,7 +48,7 @@ static int test_callback(int mode)
 	gpio_pin_interrupt_configure(dev, PIN_OUT, GPIO_INT_DISABLE);
 
 	/* 1. set PIN_OUT to logical initial state inactive */
-	u32_t out_flags = GPIO_OUTPUT_LOW;
+	uint32_t out_flags = GPIO_OUTPUT_LOW;
 
 	if ((mode & GPIO_INT_LOW_0) != 0) {
 		out_flags = GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW;
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c b/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c
index e8503b7167..87d1f780bb 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_deprecated.c
@@ -19,7 +19,7 @@ static struct drv_data data;
 static int cb_cnt;
 
 static void callback(struct device *dev,
-		     struct gpio_callback *gpio_cb, u32_t pins)
+		     struct gpio_callback *gpio_cb, uint32_t pins)
 {
 	int rc;
 	const struct drv_data *dd = CONTAINER_OF(gpio_cb,
diff --git a/tests/drivers/hwinfo/api/src/main.c b/tests/drivers/hwinfo/api/src/main.c
index dd626f396e..b9476a8b67 100644
--- a/tests/drivers/hwinfo/api/src/main.c
+++ b/tests/drivers/hwinfo/api/src/main.c
@@ -29,8 +29,8 @@
 #ifdef CONFIG_HWINFO_HAS_DRIVER
 static void test_device_id_get(void)
 {
-	u8_t buffer_1[BUFFER_LENGTH];
-	u8_t buffer_2[BUFFER_LENGTH];
+	uint8_t buffer_1[BUFFER_LENGTH];
+	uint8_t buffer_2[BUFFER_LENGTH];
 	ssize_t length_read_1, length_read_2;
 	int i;
 
@@ -72,7 +72,7 @@ static void test_device_id_get(void) {}
 static void test_device_id_enotsup(void)
 {
 	ssize_t ret;
-	u8_t buffer[1];
+	uint8_t buffer[1];
 
 	ret = hwinfo_get_device_id(buffer, 1);
 	/* There is no hwinfo driver for this platform, hence the return value
diff --git a/tests/drivers/i2c/i2c_api/src/test_i2c.c b/tests/drivers/i2c/i2c_api/src/test_i2c.c
index 6df2bc8683..57184952fe 100644
--- a/tests/drivers/i2c/i2c_api/src/test_i2c.c
+++ b/tests/drivers/i2c/i2c_api/src/test_i2c.c
@@ -26,7 +26,7 @@
 #error "Please set the correct I2C device"
 #endif
 
-u32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER;
+uint32_t i2c_cfg = I2C_SPEED_SET(I2C_SPEED_STANDARD) | I2C_MODE_MASTER;
 
 static int test_gy271(void)
 {
diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
index 1c55ef9016..942b075910 100644
--- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
+++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
@@ -21,13 +21,13 @@ struct i2c_virtual_data {
 	sys_slist_t slaves;
 };
 
-int i2c_virtual_runtime_configure(struct device *dev, u32_t config)
+int i2c_virtual_runtime_configure(struct device *dev, uint32_t config)
 {
 	return 0;
 }
 
 static struct i2c_slave_config *find_address(struct i2c_virtual_data *data,
-					     u16_t address, bool is_10bit)
+					     uint16_t address, bool is_10bit)
 {
 	struct i2c_slave_config *cfg = NULL;
 	sys_snode_t *node;
@@ -89,7 +89,7 @@ static int i2c_virtual_msg_write(struct device *dev, struct i2c_msg *msg,
 				 bool prev_write)
 {
 	unsigned int len = 0U;
-	u8_t *buf = msg->buf;
+	uint8_t *buf = msg->buf;
 	int ret;
 
 	if (!prev_write) {
@@ -122,7 +122,7 @@ static int i2c_virtual_msg_read(struct device *dev, struct i2c_msg *msg,
 				struct i2c_slave_config *config)
 {
 	unsigned int len = msg->len;
-	u8_t *buf = msg->buf;
+	uint8_t *buf = msg->buf;
 
 	if (!msg->len) {
 		return 0;
@@ -148,7 +148,7 @@ static int i2c_virtual_msg_read(struct device *dev, struct i2c_msg *msg,
 #define OPERATION(msg) (((struct i2c_msg *) msg)->flags & I2C_MSG_RW_MASK)
 
 static int i2c_virtual_transfer(struct device *dev, struct i2c_msg *msg,
-			      u8_t num_msgs, u16_t slave)
+			      uint8_t num_msgs, uint16_t slave)
 {
 	struct i2c_virtual_data *data = DEV_DATA(dev);
 	struct i2c_msg *current, *next;
diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c
index 17476a45b4..538c92dd0e 100644
--- a/tests/drivers/i2c/i2c_slave_api/src/main.c
+++ b/tests/drivers/i2c/i2c_slave_api/src/main.c
@@ -23,18 +23,18 @@ LOG_MODULE_REGISTER(main);
 
 #define TEST_DATA_SIZE	20
 
-static u8_t eeprom_0_data[TEST_DATA_SIZE] = "0123456789abcdefghij";
-static u8_t eeprom_1_data[TEST_DATA_SIZE] = "jihgfedcba9876543210";
-static u8_t i2c_buffer[TEST_DATA_SIZE];
+static uint8_t eeprom_0_data[TEST_DATA_SIZE] = "0123456789abcdefghij";
+static uint8_t eeprom_1_data[TEST_DATA_SIZE] = "jihgfedcba9876543210";
+static uint8_t i2c_buffer[TEST_DATA_SIZE];
 
 /*
  * We need 5x(buffer size) + 1 to print a comma-separated list of each
  * byte in hex, plus a null.
  */
-u8_t buffer_print_eeprom[TEST_DATA_SIZE * 5 + 1];
-u8_t buffer_print_i2c[TEST_DATA_SIZE * 5 + 1];
+uint8_t buffer_print_eeprom[TEST_DATA_SIZE * 5 + 1];
+uint8_t buffer_print_i2c[TEST_DATA_SIZE * 5 + 1];
 
-static void to_display_format(const u8_t *src, size_t size, char *dst)
+static void to_display_format(const uint8_t *src, size_t size, char *dst)
 {
 	size_t i;
 
@@ -43,7 +43,7 @@ static void to_display_format(const u8_t *src, size_t size, char *dst)
 	}
 }
 
-static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer)
+static void run_full_read(struct device *i2c, uint8_t addr, uint8_t *comp_buffer)
 {
 	int ret;
 
@@ -69,7 +69,7 @@ static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer)
 	}
 }
 
-static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer,
+static void run_partial_read(struct device *i2c, uint8_t addr, uint8_t *comp_buffer,
 			     unsigned int offset)
 {
 	int ret;
@@ -95,7 +95,7 @@ static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer,
 	}
 }
 
-static void run_program_read(struct device *i2c, u8_t addr, unsigned int offset)
+static void run_program_read(struct device *i2c, uint8_t addr, unsigned int offset)
 {
 	int ret, i;
 
diff --git a/tests/drivers/i2s/i2s_api/src/common.c b/tests/drivers/i2s/i2s_api/src/common.c
index bd8e6a4404..d70c0e507a 100644
--- a/tests/drivers/i2s/i2s_api/src/common.c
+++ b/tests/drivers/i2s/i2s_api/src/common.c
@@ -10,7 +10,7 @@
 #include "i2s_api_test.h"
 
 /* The data_l represent a sine wave */
-s16_t data_l[SAMPLE_NO] = {
+int16_t data_l[SAMPLE_NO] = {
 	  6392,  12539,  18204,  23169,  27244,  30272,  32137,  32767,  32137,
 	 30272,  27244,  23169,  18204,  12539,   6392,      0,  -6393, -12540,
 	-18205, -23170, -27245, -30273, -32138, -32767, -32138, -30273, -27245,
@@ -18,14 +18,14 @@ s16_t data_l[SAMPLE_NO] = {
 };
 
 /* The data_r represent a sine wave with double the frequency of data_l */
-s16_t data_r[SAMPLE_NO] = {
+int16_t data_r[SAMPLE_NO] = {
 	 12539,  23169,  30272,  32767,  30272,  23169,  12539,      0, -12540,
 	-23170, -30273, -32767, -30273, -23170, -12540,     -1,  12539,  23169,
 	 30272,  32767,  30272,  23169,  12539,      0, -12540, -23170, -30273,
 	-32767, -30273, -23170, -12540,     -1,
 };
 
-static void fill_buf(s16_t *tx_block, int att)
+static void fill_buf(int16_t *tx_block, int att)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		tx_block[2 * i] = data_l[i] >> att;
@@ -33,7 +33,7 @@ static void fill_buf(s16_t *tx_block, int att)
 	}
 }
 
-static int verify_buf(s16_t *rx_block, int att)
+static int verify_buf(int16_t *rx_block, int att)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		if (rx_block[2 * i] != data_l[i] >> att) {
@@ -53,7 +53,7 @@ static int verify_buf(s16_t *rx_block, int att)
 	return TC_PASS;
 }
 
-void fill_buf_const(s16_t *tx_block, s16_t val_l, s16_t val_r)
+void fill_buf_const(int16_t *tx_block, int16_t val_l, int16_t val_r)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		tx_block[2 * i] = val_l;
@@ -61,7 +61,7 @@ void fill_buf_const(s16_t *tx_block, s16_t val_l, s16_t val_r)
 	}
 }
 
-int verify_buf_const(s16_t *rx_block, s16_t val_l, s16_t val_r)
+int verify_buf_const(int16_t *rx_block, int16_t val_l, int16_t val_r)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		if (rx_block[2 * i] != val_l) {
@@ -87,7 +87,7 @@ int tx_block_write_slab(struct device *dev_i2s, int att, int err,
 	char tx_block[BLOCK_SIZE];
 	int ret;
 
-	fill_buf((u16_t *)tx_block, att);
+	fill_buf((uint16_t *)tx_block, att);
 	ret = i2s_buf_write(dev_i2s, tx_block, BLOCK_SIZE);
 	if (ret != err) {
 		TC_PRINT("Error: i2s_write failed expected %d, actual %d\n",
@@ -110,7 +110,7 @@ int rx_block_read_slab(struct device *dev_i2s, int att,
 		TC_PRINT("Error: Read failed\n");
 		return -TC_FAIL;
 	}
-	ret = verify_buf((u16_t *)rx_block, att);
+	ret = verify_buf((uint16_t *)rx_block, att);
 	if (ret < 0) {
 		TC_PRINT("Error: Verify failed\n");
 		return -TC_FAIL;
diff --git a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
index 8a661bf137..442f7a017d 100644
--- a/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
+++ b/tests/drivers/i2s/i2s_api/src/i2s_api_test.h
@@ -37,8 +37,8 @@ extern struct k_mem_slab tx_1_mem_slab;
 #define TIMEOUT		2000
 #define FRAME_CLK_FREQ	8000
 
-extern s16_t data_l[SAMPLE_NO];
-extern s16_t data_r[SAMPLE_NO];
+extern int16_t data_l[SAMPLE_NO];
+extern int16_t data_r[SAMPLE_NO];
 
 #define I2S_DEV_NAME "I2S_0"
 #define BLOCK_SIZE (2 * sizeof(data_l))
@@ -48,7 +48,7 @@ int rx_block_read_slab(struct device *dev_i2s, int att,
 int tx_block_write_slab(struct device *dev_i2s, int att, int err,
 			struct k_mem_slab *slab);
 
-void fill_buf_const(s16_t *tx_block, s16_t val_l, s16_t val_r);
-int verify_buf_const(s16_t *rx_block, s16_t val_l, s16_t val_r);
+void fill_buf_const(int16_t *tx_block, int16_t val_l, int16_t val_r);
+int verify_buf_const(int16_t *rx_block, int16_t val_l, int16_t val_r);
 
 #endif
diff --git a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
index 8f4b806dbd..796b400565 100644
--- a/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
+++ b/tests/drivers/i2s/i2s_api/src/test_i2s_loopback.c
@@ -219,7 +219,7 @@ void test_i2s_rx_sync_start(void)
 
 	/* Prefill TX queue */
 	for (int n = 0; n < NUM_TX_BLOCKS; n++) {
-		fill_buf_const((u16_t *)buf, 1, 2);
+		fill_buf_const((uint16_t *)buf, 1, 2);
 		ret = i2s_buf_write(dev_i2s, buf, BLOCK_SIZE);
 		zassert_equal(ret, TC_PASS, NULL);
 		TC_PRINT("%d->OK\n", n);
@@ -236,7 +236,7 @@ void test_i2s_rx_sync_start(void)
 	zassert_equal(ret, 0, "RX START trigger failed");
 	ret = i2s_buf_read(dev_i2s, buf, &rx_size);
 	zassert_equal(ret, TC_PASS, NULL);
-	ret = verify_buf_const((u16_t *)buf, 1, 2);
+	ret = verify_buf_const((uint16_t *)buf, 1, 2);
 
 	zassert_equal(ret, TC_PASS, NULL);
 	TC_PRINT("%d<-OK\n", 1);
diff --git a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
index f3382a3195..d2a1c7cf82 100644
--- a/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
+++ b/tests/drivers/i2s/i2s_speed/src/test_i2s_speed.c
@@ -21,7 +21,7 @@
 #define SAMPLE_NO 64
 
 /* The data_l represent a sine wave */
-static s16_t data_l[SAMPLE_NO] = {
+static int16_t data_l[SAMPLE_NO] = {
 	  3211,   6392,   9511,  12539,  15446,  18204,  20787,  23169,
 	 25329,  27244,  28897,  30272,  31356,  32137,  32609,  32767,
 	 32609,  32137,  31356,  30272,  28897,  27244,  25329,  23169,
@@ -33,7 +33,7 @@ static s16_t data_l[SAMPLE_NO] = {
 };
 
 /* The data_r represent a sine wave shifted by 90 deg to data_l sine wave */
-static s16_t data_r[SAMPLE_NO] = {
+static int16_t data_r[SAMPLE_NO] = {
 	 32609,  32137,  31356,  30272,  28897,  27244,  25329,  23169,
 	 20787,  18204,  15446,  12539,   9511,   6392,   3211,      0,
 	 -3212,  -6393,  -9512, -12540, -15447, -18205, -20788, -23170,
@@ -49,7 +49,7 @@ static s16_t data_r[SAMPLE_NO] = {
 K_MEM_SLAB_DEFINE(rx_0_mem_slab, BLOCK_SIZE, NUM_BLOCKS, 32);
 K_MEM_SLAB_DEFINE(tx_0_mem_slab, BLOCK_SIZE, NUM_BLOCKS, 32);
 
-static void fill_buf(s16_t *tx_block, int att)
+static void fill_buf(int16_t *tx_block, int att)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		tx_block[2 * i] = data_l[i] >> att;
@@ -57,7 +57,7 @@ static void fill_buf(s16_t *tx_block, int att)
 	}
 }
 
-static int verify_buf(s16_t *rx_block, int att)
+static int verify_buf(int16_t *rx_block, int att)
 {
 	for (int i = 0; i < SAMPLE_NO; i++) {
 		if (rx_block[2 * i] != data_l[i] >> att) {
@@ -155,7 +155,7 @@ void test_i2s_transfer_short(void)
 	for (int i = 0; i < 3; i++) {
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block, K_FOREVER);
 		zassert_equal(ret, 0, NULL);
-		fill_buf((u16_t *)tx_block, i);
+		fill_buf((uint16_t *)tx_block, i);
 
 		ret = i2s_write(dev_i2s, tx_block, BLOCK_SIZE);
 		zassert_equal(ret, 0, NULL);
@@ -192,17 +192,17 @@ void test_i2s_transfer_short(void)
 	zassert_equal(rx_size, BLOCK_SIZE, NULL);
 
 	/* Verify received data */
-	ret = verify_buf((u16_t *)rx_block[0], 0);
+	ret = verify_buf((uint16_t *)rx_block[0], 0);
 	zassert_equal(ret, 0, NULL);
 	k_mem_slab_free(&rx_0_mem_slab, &rx_block[0]);
 	TC_PRINT("%d<-OK\n", 1);
 
-	ret = verify_buf((u16_t *)rx_block[1], 1);
+	ret = verify_buf((uint16_t *)rx_block[1], 1);
 	zassert_equal(ret, 0, NULL);
 	k_mem_slab_free(&rx_0_mem_slab, &rx_block[1]);
 	TC_PRINT("%d<-OK\n", 2);
 
-	ret = verify_buf((u16_t *)rx_block[2], 2);
+	ret = verify_buf((uint16_t *)rx_block[2], 2);
 	zassert_equal(ret, 0, NULL);
 	k_mem_slab_free(&rx_0_mem_slab, &rx_block[2]);
 	TC_PRINT("%d<-OK\n", 3);
@@ -235,7 +235,7 @@ void test_i2s_transfer_long(void)
 		ret = k_mem_slab_alloc(&tx_0_mem_slab, &tx_block[tx_idx],
 				       K_FOREVER);
 		zassert_equal(ret, 0, NULL);
-		fill_buf((u16_t *)tx_block[tx_idx], tx_idx % 3);
+		fill_buf((uint16_t *)tx_block[tx_idx], tx_idx % 3);
 	}
 
 	tx_idx = 0;
@@ -286,7 +286,7 @@ void test_i2s_transfer_long(void)
 	/* Verify received data */
 	num_verified = 0;
 	for (rx_idx = 0; rx_idx < NUM_BLOCKS; rx_idx++) {
-		ret = verify_buf((u16_t *)rx_block[rx_idx], rx_idx % 3);
+		ret = verify_buf((uint16_t *)rx_block[rx_idx], rx_idx % 3);
 		if (ret != 0) {
 			TC_PRINT("%d RX block invalid\n", rx_idx);
 		} else {
diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c
index 0b723d52f6..61e3dd8a58 100644
--- a/tests/drivers/ipm/src/ipm_dummy.c
+++ b/tests/drivers/ipm/src/ipm_dummy.c
@@ -43,12 +43,12 @@ static void ipm_dummy_isr(void *data)
 
 /* IPM API functions for the dummy driver */
 
-static int ipm_dummy_send(struct device *d, int wait, u32_t id,
+static int ipm_dummy_send(struct device *d, int wait, uint32_t id,
 			  const void *data, int size)
 {
 	struct ipm_dummy_driver_data *driver_data;
-	volatile u8_t *datareg;
-	const u8_t *data8;
+	volatile uint8_t *datareg;
+	const uint8_t *data8;
 	int i;
 
 	driver_data = d->driver_data;
@@ -60,8 +60,8 @@ static int ipm_dummy_send(struct device *d, int wait, u32_t id,
 		return -EBUSY;
 	}
 
-	data8 = (const u8_t *)data;
-	datareg = (volatile u8_t *)driver_data->regs.data;
+	data8 = (const uint8_t *)data;
+	datareg = (volatile uint8_t *)driver_data->regs.data;
 
 	for (i = 0; i < size; ++i) {
 		datareg[i] = data8[i];
@@ -101,14 +101,14 @@ static int ipm_dummy_set_enabled(struct device *d, int enable)
 	return 0;
 }
 
-static u32_t ipm_dummy_max_id_val_get(struct device *d)
+static uint32_t ipm_dummy_max_id_val_get(struct device *d)
 {
 	return 0xFFFFFFFF;
 }
 
 static int ipm_dummy_max_data_size_get(struct device *d)
 {
-	return DUMMY_IPM_DATA_WORDS * sizeof(u32_t);
+	return DUMMY_IPM_DATA_WORDS * sizeof(uint32_t);
 }
 
 struct ipm_driver_api ipm_dummy_api = {
diff --git a/tests/drivers/ipm/src/ipm_dummy.h b/tests/drivers/ipm/src/ipm_dummy.h
index 5b55ace9b0..f800369211 100644
--- a/tests/drivers/ipm/src/ipm_dummy.h
+++ b/tests/drivers/ipm/src/ipm_dummy.h
@@ -16,10 +16,10 @@
 #define DUMMY_IPM_DATA_WORDS    4
 
 struct ipm_dummy_regs {
-	u32_t id;
-	u32_t data[DUMMY_IPM_DATA_WORDS];
-	u8_t busy;
-	u8_t enabled;
+	uint32_t id;
+	uint32_t data[DUMMY_IPM_DATA_WORDS];
+	uint8_t busy;
+	uint8_t enabled;
 };
 
 struct ipm_dummy_driver_data {
diff --git a/tests/drivers/ipm/src/main.c b/tests/drivers/ipm/src/main.c
index a3b4688a09..0970aa66be 100644
--- a/tests/drivers/ipm/src/main.c
+++ b/tests/drivers/ipm/src/main.c
@@ -51,7 +51,7 @@ DEVICE_INIT(ipm_console_send0, "ipm_send0", ipm_console_sender_init,
 #define LINE_BUF_SIZE           80
 #define RING_BUF_SIZE32         8
 
-static u32_t ring_buf_data[RING_BUF_SIZE32];
+static uint32_t ring_buf_data[RING_BUF_SIZE32];
 static K_THREAD_STACK_DEFINE(thread_stack, IPM_CONSOLE_STACK_SIZE);
 static char line_buf[LINE_BUF_SIZE];
 
diff --git a/tests/drivers/kscan/kscan_api/src/test_kscan.c b/tests/drivers/kscan/kscan_api/src/test_kscan.c
index 325fbbdcac..0b8bff27c9 100644
--- a/tests/drivers/kscan/kscan_api/src/test_kscan.c
+++ b/tests/drivers/kscan/kscan_api/src/test_kscan.c
@@ -12,7 +12,7 @@
 
 #define KSCAN_DEV_NAME DT_LABEL(DT_ALIAS(kscan0))
 
-static void kb_callback(struct device *dev, u32_t row, u32_t col, bool pressed)
+static void kb_callback(struct device *dev, uint32_t row, uint32_t col, bool pressed)
 {
 	ARG_UNUSED(dev);
 	ARG_UNUSED(row);
diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c
index 05886a7775..5a5219339d 100644
--- a/tests/drivers/pwm/pwm_api/src/test_pwm.c
+++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c
@@ -72,7 +72,7 @@
 #define UNIT_USECS	1
 #define UNIT_NSECS	2
 
-static int test_task(u32_t port, u32_t period, u32_t pulse, u8_t unit)
+static int test_task(uint32_t port, uint32_t period, uint32_t pulse, uint8_t unit)
 {
 	TC_PRINT("[PWM]: %" PRIu8 ", [period]: %" PRIu32 ", [pulse]: %" PRIu32 "\n",
 		port, period, pulse);
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index b688188591..c69a0d4502 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -37,24 +37,24 @@ struct spi_cs_control spi_cs = {
 
 #define STACK_SIZE 512
 #define BUF_SIZE 17
-u8_t buffer_tx[] = "0123456789abcdef\0";
-u8_t buffer_rx[BUF_SIZE] = {};
+uint8_t buffer_tx[] = "0123456789abcdef\0";
+uint8_t buffer_rx[BUF_SIZE] = {};
 
 #define BUF2_SIZE 36
-u8_t buffer2_tx[] = "Thequickbrownfoxjumpsoverthelazydog\0";
-u8_t buffer2_rx[BUF2_SIZE] = {};
+uint8_t buffer2_tx[] = "Thequickbrownfoxjumpsoverthelazydog\0";
+uint8_t buffer2_rx[BUF2_SIZE] = {};
 
 /*
  * We need 5x(buffer size) + 1 to print a comma-separated list of each
  * byte in hex, plus a null.
  */
-u8_t buffer_print_tx[BUF_SIZE * 5 + 1];
-u8_t buffer_print_rx[BUF_SIZE * 5 + 1];
+uint8_t buffer_print_tx[BUF_SIZE * 5 + 1];
+uint8_t buffer_print_rx[BUF_SIZE * 5 + 1];
 
-u8_t buffer_print_tx2[BUF2_SIZE * 5 + 1];
-u8_t buffer_print_rx2[BUF2_SIZE * 5 + 1];
+uint8_t buffer_print_tx2[BUF2_SIZE * 5 + 1];
+uint8_t buffer_print_rx2[BUF2_SIZE * 5 + 1];
 
-static void to_display_format(const u8_t *src, size_t size, char *dst)
+static void to_display_format(const uint8_t *src, size_t size, char *dst)
 {
 	size_t i;
 
@@ -219,7 +219,7 @@ static int spi_complete_loop(struct device *dev, struct spi_config *spi_conf)
 
 static int spi_null_tx_buf(struct device *dev, struct spi_config *spi_conf)
 {
-	static const u8_t EXPECTED_NOP_RETURN_BUF[BUF_SIZE] = { 0 };
+	static const uint8_t EXPECTED_NOP_RETURN_BUF[BUF_SIZE] = { 0 };
 	(void)memset(buffer_rx, 0x77, BUF_SIZE);
 
 	const struct spi_buf tx_bufs[] = {
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index c268726dec..49c9a7d4ef 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -30,7 +30,7 @@ void test_single_read_callback(struct uart_event *evt, void *user_data)
 		k_sem_give(&tx_done);
 		break;
 	case UART_TX_ABORTED:
-		(*(u32_t *)user_data)++;
+		(*(uint32_t *)user_data)++;
 		break;
 	case UART_RX_RDY:
 		k_sem_give(&rx_rdy);
@@ -47,7 +47,7 @@ void test_single_read_callback(struct uart_event *evt, void *user_data)
 
 }
 
-ZTEST_BMEM volatile u32_t tx_aborted_count;
+ZTEST_BMEM volatile uint32_t tx_aborted_count;
 
 void test_single_read_setup(void)
 {
@@ -63,8 +63,8 @@ void test_single_read(void)
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
 
 
-	u8_t rx_buf[10] = {0};
-	u8_t tx_buf[5] = "test";
+	uint8_t rx_buf[10] = {0};
+	uint8_t tx_buf[5] = "test";
 
 	zassert_not_equal(memcmp(tx_buf, rx_buf, 5), 0,
 			  "Initial buffer check failed");
@@ -89,11 +89,11 @@ void test_single_read(void)
 	zassert_equal(tx_aborted_count, 0, "TX aborted triggered");
 }
 
-ZTEST_BMEM u8_t chained_read_buf0[10];
-ZTEST_BMEM u8_t chained_read_buf1[20];
-ZTEST_BMEM u8_t chained_read_buf2[30];
-ZTEST_DMEM u8_t buf_num = 1U;
-ZTEST_BMEM u8_t *read_ptr;
+ZTEST_BMEM uint8_t chained_read_buf0[10];
+ZTEST_BMEM uint8_t chained_read_buf1[20];
+ZTEST_BMEM uint8_t chained_read_buf2[30];
+ZTEST_DMEM uint8_t buf_num = 1U;
+ZTEST_BMEM uint8_t *read_ptr;
 ZTEST_BMEM volatile size_t read_len;
 
 void test_chained_read_callback(struct uart_event *evt, void *user_data)
@@ -141,7 +141,7 @@ void test_chained_read_setup(void)
 void test_chained_read(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
-	u8_t tx_buf[10];
+	uint8_t tx_buf[10];
 
 	uart_rx_enable(uart_dev, chained_read_buf0, 10, 50);
 
@@ -167,8 +167,8 @@ void test_chained_read(void)
 		      "RX_DISABLED timeout");
 }
 
-ZTEST_BMEM u8_t double_buffer[2][12];
-ZTEST_DMEM u8_t *next_buf = double_buffer[1];
+ZTEST_BMEM uint8_t double_buffer[2][12];
+ZTEST_DMEM uint8_t *next_buf = double_buffer[1];
 
 void test_double_buffer_callback(struct uart_event *evt, void *user_data)
 {
@@ -208,7 +208,7 @@ void test_double_buffer_setup(void)
 void test_double_buffer(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
-	u8_t tx_buf[4];
+	uint8_t tx_buf[4];
 
 	zassert_equal(uart_rx_enable(uart_dev,
 				     double_buffer[0],
@@ -264,8 +264,8 @@ void test_read_abort(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
 
-	u8_t rx_buf[100];
-	u8_t tx_buf[100];
+	uint8_t rx_buf[100];
+	uint8_t tx_buf[100];
 
 	memset(rx_buf, 0, sizeof(rx_buf));
 	memset(tx_buf, 1, sizeof(tx_buf));
@@ -330,8 +330,8 @@ void test_write_abort(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
 
-	u8_t rx_buf[100];
-	u8_t tx_buf[100];
+	uint8_t rx_buf[100];
+	uint8_t tx_buf[100];
 
 	memset(rx_buf, 0, sizeof(rx_buf));
 	memset(tx_buf, 1, sizeof(tx_buf));
@@ -397,8 +397,8 @@ void test_forever_timeout(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
 
-	u8_t rx_buf[100];
-	u8_t tx_buf[100];
+	uint8_t rx_buf[100];
+	uint8_t tx_buf[100];
 
 	memset(rx_buf, 0, sizeof(rx_buf));
 	memset(tx_buf, 1, sizeof(tx_buf));
@@ -431,9 +431,9 @@ void test_forever_timeout(void)
 }
 
 
-ZTEST_DMEM u8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
+ZTEST_DMEM uint8_t chained_write_tx_bufs[2][10] = {"Message 1", "Message 2"};
 ZTEST_DMEM bool chained_write_next_buf = true;
-ZTEST_BMEM volatile u8_t tx_sent;
+ZTEST_BMEM volatile uint8_t tx_sent;
 
 void test_chained_write_callback(struct uart_event *evt, void *user_data)
 {
@@ -478,7 +478,7 @@ void test_chained_write(void)
 {
 	struct device *uart_dev = device_get_binding(UART_DEVICE_NAME);
 
-	u8_t rx_buf[20];
+	uint8_t rx_buf[20];
 
 	memset(rx_buf, 0, sizeof(rx_buf));
 
@@ -504,10 +504,10 @@ void test_chained_write(void)
 		      "RX_DISABLED timeout");
 }
 
-ZTEST_BMEM u8_t long_rx_buf[1024];
-ZTEST_BMEM u8_t long_rx_buf2[1024];
-ZTEST_BMEM u8_t long_tx_buf[1000];
-ZTEST_BMEM volatile u8_t evt_num;
+ZTEST_BMEM uint8_t long_rx_buf[1024];
+ZTEST_BMEM uint8_t long_rx_buf2[1024];
+ZTEST_BMEM uint8_t long_tx_buf[1000];
+ZTEST_BMEM volatile uint8_t evt_num;
 ZTEST_BMEM size_t long_received[2];
 
 void test_long_buffers_callback(struct uart_event *evt, void *user_data)
diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c b/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c
index 00805bd66d..17bdb25399 100644
--- a/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c
+++ b/tests/drivers/uart/uart_basic_api/src/test_uart_fifo.c
@@ -43,7 +43,7 @@ static const char fifo_data[] = "This is a FIFO test.\r\n";
 
 static void uart_fifo_callback(struct device *dev)
 {
-	u8_t recvData;
+	uint8_t recvData;
 	static int tx_data_idx;
 
 	/* Verify uart_irq_update() */
@@ -63,7 +63,7 @@ static void uart_fifo_callback(struct device *dev)
 		 * well, we'll fail test.
 		 */
 		if (uart_fifo_fill(dev,
-				   (u8_t *)&fifo_data[tx_data_idx++], 1) > 0) {
+				   (uint8_t *)&fifo_data[tx_data_idx++], 1) > 0) {
 			data_transmitted = true;
 			char_sent++;
 		}
diff --git a/tests/kernel/common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
index 51866c45cb..e1102e0d06 100644
--- a/tests/kernel/common/src/bitfield.c
+++ b/tests/kernel/common/src/bitfield.c
@@ -29,7 +29,7 @@
  */
 void test_bitfield(void)
 {
-	u32_t b1 = 0U;
+	uint32_t b1 = 0U;
 	unsigned char b2[BITFIELD_SIZE >> 3] = { 0 };
 	unsigned int bit;
 	int ret;
diff --git a/tests/kernel/common/src/boot_delay.c b/tests/kernel/common/src/boot_delay.c
index 099d1ff2a8..ce8724f997 100644
--- a/tests/kernel/common/src/boot_delay.c
+++ b/tests/kernel/common/src/boot_delay.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 
-#define NSEC_PER_MSEC (u64_t)(NSEC_PER_USEC * USEC_PER_MSEC)
+#define NSEC_PER_MSEC (uint64_t)(NSEC_PER_USEC * USEC_PER_MSEC)
 /**
  * @brief Test delay during boot
  * @defgroup kernel_bootdelay_tests Init
@@ -19,7 +19,7 @@
  */
 void test_verify_bootdelay(void)
 {
-	u32_t current_cycles = k_cycle_get_32();
+	uint32_t current_cycles = k_cycle_get_32();
 
 	/* compare this with the boot delay specified */
 	zassert_true(k_cyc_to_ns_floor64(current_cycles) >=
diff --git a/tests/kernel/common/src/byteorder.c b/tests/kernel/common/src/byteorder.c
index 55f57293e0..a9e294f8e2 100644
--- a/tests/kernel/common/src/byteorder.c
+++ b/tests/kernel/common/src/byteorder.c
@@ -23,11 +23,11 @@
  */
 void test_byteorder_memcpy_swap(void)
 {
-	u8_t buf_orig[8] = { 0x00, 0x01, 0x02, 0x03,
+	uint8_t buf_orig[8] = { 0x00, 0x01, 0x02, 0x03,
 			     0x04, 0x05, 0x06, 0x07 };
-	u8_t buf_chk[8] = { 0x07, 0x06, 0x05, 0x04,
+	uint8_t buf_chk[8] = { 0x07, 0x06, 0x05, 0x04,
 			    0x03, 0x02, 0x01, 0x00 };
-	u8_t buf_dst[8] = { 0 };
+	uint8_t buf_dst[8] = { 0 };
 
 	sys_memcpy_swap(buf_dst, buf_orig, 8);
 	zassert_true((memcmp(buf_dst, buf_chk, 8) == 0),
@@ -47,14 +47,14 @@ void test_byteorder_memcpy_swap(void)
  */
 void test_byteorder_mem_swap(void)
 {
-	u8_t buf_orig_1[8] = { 0x00, 0x01, 0x02, 0x03,
+	uint8_t buf_orig_1[8] = { 0x00, 0x01, 0x02, 0x03,
 			       0x04, 0x05, 0x06, 0x07 };
-	u8_t buf_orig_2[11] = { 0x00, 0x01, 0x02, 0x03,
+	uint8_t buf_orig_2[11] = { 0x00, 0x01, 0x02, 0x03,
 				0x04, 0x05, 0x06, 0x07,
 				0x08, 0x09, 0xa0 };
-	u8_t buf_chk_1[8] = { 0x07, 0x06, 0x05, 0x04,
+	uint8_t buf_chk_1[8] = { 0x07, 0x06, 0x05, 0x04,
 			      0x03, 0x02, 0x01, 0x00 };
-	u8_t buf_chk_2[11] = { 0xa0, 0x09, 0x08, 0x07,
+	uint8_t buf_chk_2[11] = { 0xa0, 0x09, 0x08, 0x07,
 			       0x06, 0x05, 0x04, 0x03,
 			       0x02, 0x01, 0x00 };
 
@@ -76,8 +76,8 @@ void test_byteorder_mem_swap(void)
  */
 void test_sys_get_be64(void)
 {
-	u64_t val = 0xf0e1d2c3b4a59687, tmp;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3b4a59687, tmp;
+	uint8_t buf[] = {
 		0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87
 	};
 
@@ -95,15 +95,15 @@ void test_sys_get_be64(void)
  */
 void test_sys_put_be64(void)
 {
-	u64_t val = 0xf0e1d2c3b4a59687;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3b4a59687;
+	uint8_t buf[] = {
 		0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87
 	};
-	u8_t tmp[sizeof(u64_t)];
+	uint8_t tmp[sizeof(uint64_t)];
 
 	sys_put_be64(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u64_t), "sys_put_be64() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint64_t), "sys_put_be64() failed");
 }
 
 /**
@@ -115,8 +115,8 @@ void test_sys_put_be64(void)
  */
 void test_sys_get_be32(void)
 {
-	u32_t val = 0xf0e1d2c3, tmp;
-	u8_t buf[] = {
+	uint32_t val = 0xf0e1d2c3, tmp;
+	uint8_t buf[] = {
 		0xf0, 0xe1, 0xd2, 0xc3
 	};
 
@@ -134,15 +134,15 @@ void test_sys_get_be32(void)
  */
 void test_sys_put_be32(void)
 {
-	u64_t val = 0xf0e1d2c3;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3;
+	uint8_t buf[] = {
 		0xf0, 0xe1, 0xd2, 0xc3
 	};
-	u8_t tmp[sizeof(u32_t)];
+	uint8_t tmp[sizeof(uint32_t)];
 
 	sys_put_be32(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u32_t), "sys_put_be32() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint32_t), "sys_put_be32() failed");
 }
 
 /**
@@ -154,8 +154,8 @@ void test_sys_put_be32(void)
  */
 void test_sys_get_be16(void)
 {
-	u32_t val = 0xf0e1, tmp;
-	u8_t buf[] = {
+	uint32_t val = 0xf0e1, tmp;
+	uint8_t buf[] = {
 		0xf0, 0xe1
 	};
 
@@ -173,15 +173,15 @@ void test_sys_get_be16(void)
  */
 void test_sys_put_be16(void)
 {
-	u64_t val = 0xf0e1;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1;
+	uint8_t buf[] = {
 		0xf0, 0xe1
 	};
-	u8_t tmp[sizeof(u16_t)];
+	uint8_t tmp[sizeof(uint16_t)];
 
 	sys_put_be16(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u16_t), "sys_put_be16() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint16_t), "sys_put_be16() failed");
 }
 
 /**
@@ -193,8 +193,8 @@ void test_sys_put_be16(void)
  */
 void test_sys_get_le16(void)
 {
-	u32_t val = 0xf0e1, tmp;
-	u8_t buf[] = {
+	uint32_t val = 0xf0e1, tmp;
+	uint8_t buf[] = {
 		0xe1, 0xf0
 	};
 
@@ -212,15 +212,15 @@ void test_sys_get_le16(void)
  */
 void test_sys_put_le16(void)
 {
-	u64_t val = 0xf0e1;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1;
+	uint8_t buf[] = {
 		0xe1, 0xf0
 	};
-	u8_t tmp[sizeof(u16_t)];
+	uint8_t tmp[sizeof(uint16_t)];
 
 	sys_put_le16(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u16_t), "sys_put_le16() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint16_t), "sys_put_le16() failed");
 }
 
 /**
@@ -232,8 +232,8 @@ void test_sys_put_le16(void)
  */
 void test_sys_get_le32(void)
 {
-	u32_t val = 0xf0e1d2c3, tmp;
-	u8_t buf[] = {
+	uint32_t val = 0xf0e1d2c3, tmp;
+	uint8_t buf[] = {
 		0xc3, 0xd2, 0xe1, 0xf0
 	};
 
@@ -251,15 +251,15 @@ void test_sys_get_le32(void)
  */
 void test_sys_put_le32(void)
 {
-	u64_t val = 0xf0e1d2c3;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3;
+	uint8_t buf[] = {
 		0xc3, 0xd2, 0xe1, 0xf0
 	};
-	u8_t tmp[sizeof(u32_t)];
+	uint8_t tmp[sizeof(uint32_t)];
 
 	sys_put_le32(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u32_t), "sys_put_le32() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint32_t), "sys_put_le32() failed");
 }
 
 /**
@@ -271,8 +271,8 @@ void test_sys_put_le32(void)
  */
 void test_sys_get_le64(void)
 {
-	u64_t val = 0xf0e1d2c3b4a59687, tmp;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3b4a59687, tmp;
+	uint8_t buf[] = {
 		0x87, 0x96, 0xa5, 0xb4, 0xc3, 0xd2, 0xe1, 0xf0
 	};
 
@@ -290,15 +290,15 @@ void test_sys_get_le64(void)
  */
 void test_sys_put_le64(void)
 {
-	u64_t val = 0xf0e1d2c3b4a59687;
-	u8_t buf[] = {
+	uint64_t val = 0xf0e1d2c3b4a59687;
+	uint8_t buf[] = {
 		0x87, 0x96, 0xa5, 0xb4, 0xc3, 0xd2, 0xe1, 0xf0
 	};
-	u8_t tmp[sizeof(u64_t)];
+	uint8_t tmp[sizeof(uint64_t)];
 
 	sys_put_le64(val, tmp);
 
-	zassert_mem_equal(tmp, buf, sizeof(u64_t), "sys_put_le64() failed");
+	zassert_mem_equal(tmp, buf, sizeof(uint64_t), "sys_put_le64() failed");
 }
 
 /**
diff --git a/tests/kernel/common/src/clock.c b/tests/kernel/common/src/clock.c
index 6fff8001b8..1a413a4a1c 100644
--- a/tests/kernel/common/src/clock.c
+++ b/tests/kernel/common/src/clock.c
@@ -9,14 +9,14 @@
 #if defined(CONFIG_ARCH_POSIX)
 #define ALIGN_MS_BOUNDARY		       \
 	do {				       \
-		u32_t t = k_uptime_get_32();   \
+		uint32_t t = k_uptime_get_32();   \
 		while (t == k_uptime_get_32()) \
 			k_busy_wait(50);       \
 	} while (0)
 #else
 #define ALIGN_MS_BOUNDARY		       \
 	do {				       \
-		u32_t t = k_uptime_get_32();   \
+		uint32_t t = k_uptime_get_32();   \
 		while (t == k_uptime_get_32()) \
 			;		       \
 	} while (0)
@@ -34,8 +34,8 @@
  */
 void test_clock_uptime(void)
 {
-	u64_t t64, t32;
-	s64_t d64 = 0;
+	uint64_t t64, t32;
+	int64_t d64 = 0;
 
 	/**TESTPOINT: uptime elapse*/
 	t64 = k_uptime_get();
@@ -74,7 +74,7 @@ void test_clock_uptime(void)
  */
 void test_clock_cycle(void)
 {
-	u32_t c32, c0, c1, t32;
+	uint32_t c32, c0, c1, t32;
 
 	/**TESTPOINT: cycle elapse*/
 	ALIGN_MS_BOUNDARY;
@@ -105,7 +105,7 @@ void test_clock_cycle(void)
 			     (sys_clock_hw_cycles_per_sec() / MSEC_PER_SEC),
 			     NULL);
 		/* delta NS should be greater than 1 milli-second */
-		zassert_true((u32_t)k_cyc_to_ns_floor64(c1 - c0) >
+		zassert_true((uint32_t)k_cyc_to_ns_floor64(c1 - c0) >
 			     (NSEC_PER_SEC / MSEC_PER_SEC), NULL);
 	}
 }
diff --git a/tests/kernel/common/src/irq_offload.c b/tests/kernel/common/src/irq_offload.c
index 86bcf9d591..63d53dd575 100644
--- a/tests/kernel/common/src/irq_offload.c
+++ b/tests/kernel/common/src/irq_offload.c
@@ -17,12 +17,12 @@
 #include <kernel_structs.h>
 #include <irq_offload.h>
 
-volatile u32_t sentinel;
+volatile uint32_t sentinel;
 #define SENTINEL_VALUE 0xDEADBEEF
 
 static void offload_function(void *param)
 {
-	u32_t x = POINTER_TO_INT(param);
+	uint32_t x = POINTER_TO_INT(param);
 
 	/* Make sure we're in IRQ context */
 	zassert_true(k_is_in_isr(), "Not in IRQ context!");
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
index dc37077de1..fe66213837 100644
--- a/tests/kernel/common/src/main.c
+++ b/tests/kernel/common/src/main.c
@@ -67,7 +67,7 @@ void test_printk(void)
  */
 static void test_version(void)
 {
-	u32_t version = sys_kernel_version_get();
+	uint32_t version = sys_kernel_version_get();
 
 	zassert_true(SYS_KERNEL_VER_MAJOR(version) == KERNEL_VERSION_MAJOR,
 		     "major version mismatch");
diff --git a/tests/kernel/common/src/printk.c b/tests/kernel/common/src/printk.c
index 78fb12abc5..a5fa6c3cb8 100644
--- a/tests/kernel/common/src/printk.c
+++ b/tests/kernel/common/src/printk.c
@@ -53,7 +53,7 @@ unsigned long ul = 40000;
 
 /* FIXME
  * we know printk doesn't have full support for 64-bit values.
- * at least show it can print u64_t values less than 32-bits wide
+ * at least show it can print uint64_t values less than 32-bits wide
  */
 unsigned long long ull = 22;
 
@@ -63,7 +63,7 @@ signed int si = -32768;
 signed long sl = -40000;
 signed long long sll = -22;
 
-u32_t hex = 0xCAFEBABE;
+uint32_t hex = 0xCAFEBABE;
 
 void *ptr = (void *)0xBEEF;
 
diff --git a/tests/kernel/common/src/timeout_order.c b/tests/kernel/common/src/timeout_order.c
index d5f4f36283..87f927cc4e 100644
--- a/tests/kernel/common/src/timeout_order.c
+++ b/tests/kernel/common/src/timeout_order.c
@@ -63,7 +63,7 @@ void test_timeout_order(void)
 	}
 
 
-	u32_t uptime = k_uptime_get_32();
+	uint32_t uptime = k_uptime_get_32();
 
 	/* sync on tick */
 	while (uptime == k_uptime_get_32()) {
diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c
index 50bc8f13ea..2ec1043611 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -670,7 +670,7 @@ static void kernel_thread_entry(void *_thread_id, void *arg1, void *arg2)
  */
 struct timeout_order {
 	void *link_in_fifo;
-	s32_t timeout;
+	int32_t timeout;
 	int timeout_order;
 	int q_order;
 };
@@ -693,7 +693,7 @@ static struct k_thread timeout_threads[NUM_TIMEOUT_THREADS];
 /* a thread busy waits */
 static void busy_wait_thread(void *mseconds, void *arg2, void *arg3)
 {
-	u32_t usecs;
+	uint32_t usecs;
 
 	ARG_UNUSED(arg2);
 	ARG_UNUSED(arg3);
@@ -733,7 +733,7 @@ static void busy_wait_thread(void *mseconds, void *arg2, void *arg3)
 /* a thread sleeps and times out, then reports through a fifo */
 static void thread_sleep(void *delta, void *arg2, void *arg3)
 {
-	s64_t timestamp;
+	int64_t timestamp;
 	int timeout = POINTER_TO_INT(delta);
 
 	ARG_UNUSED(arg2);
@@ -778,7 +778,7 @@ static void delayed_thread(void *num, void *arg2, void *arg3)
  */
 static void test_busy_wait(void)
 {
-	s32_t timeout;
+	int32_t timeout;
 	int rv;
 
 	timeout = 20;           /* in ms */
@@ -803,7 +803,7 @@ static void test_busy_wait(void)
 static void test_k_sleep(void)
 {
 	struct timeout_order *data;
-	s32_t timeout;
+	int32_t timeout;
 	int rv;
 	int i;
 
diff --git a/tests/kernel/device/src/bad_driver.c b/tests/kernel/device/src/bad_driver.c
index d6b1016f60..989810320c 100644
--- a/tests/kernel/device/src/bad_driver.c
+++ b/tests/kernel/device/src/bad_driver.c
@@ -11,14 +11,14 @@
 #define BAD_DRIVER_NAME	"bad_driver"
 
 typedef int (*bad_api_configure_t)(struct device *dev,
-				     u32_t dev_config);
+				     uint32_t dev_config);
 
 
 struct bad_driver_api {
 	bad_api_configure_t configure;
 };
 
-static int bad_configure(struct device *dev, u32_t config)
+static int bad_configure(struct device *dev, uint32_t config)
 {
 	return 0;
 }
diff --git a/tests/kernel/device/src/dummy_driver.c b/tests/kernel/device/src/dummy_driver.c
index b8b57dba53..c719dba589 100644
--- a/tests/kernel/device/src/dummy_driver.c
+++ b/tests/kernel/device/src/dummy_driver.c
@@ -11,14 +11,14 @@
 #define DUMMY_DRIVER_NAME	"dummy_driver"
 
 typedef int (*dummy_api_configure_t)(struct device *dev,
-				     u32_t dev_config);
+				     uint32_t dev_config);
 
 
 struct dummy_driver_api {
 	dummy_api_configure_t configure;
 };
 
-static int dummy_configure(struct device *dev, u32_t config)
+static int dummy_configure(struct device *dev, uint32_t config)
 {
 	return 0;
 }
diff --git a/tests/kernel/early_sleep/src/main.c b/tests/kernel/early_sleep/src/main.c
index 82340e7a03..edd3b8517d 100644
--- a/tests/kernel/early_sleep/src/main.c
+++ b/tests/kernel/early_sleep/src/main.c
@@ -54,8 +54,8 @@ static void helper_thread(void *p1, void *p2, void *p3)
 
 static int ticks_to_sleep(int ticks)
 {
-	u32_t start_time;
-	u32_t stop_time;
+	uint32_t start_time;
+	uint32_t stop_time;
 
 	start_time = k_cycle_get_32();
 	k_sleep(K_MSEC(k_ticks_to_ms_floor64(ticks)));
diff --git a/tests/kernel/fatal/src/main.c b/tests/kernel/fatal/src/main.c
index dad727d190..55c1768ebb 100644
--- a/tests/kernel/fatal/src/main.c
+++ b/tests/kernel/fatal/src/main.c
@@ -226,7 +226,7 @@ void user_priv_stack_hw_overflow(void)
 }
 #endif /* CONFIG_USERSPACE */
 
-void check_stack_overflow(void *handler, u32_t flags)
+void check_stack_overflow(void *handler, uint32_t flags)
 {
 #ifdef CONFIG_STACK_SENTINEL
 	/* When testing stack sentinel feature, the overflow stack is a
diff --git a/tests/kernel/fifo/fifo_api/src/test_fifo.h b/tests/kernel/fifo/fifo_api/src/test_fifo.h
index 53f1787614..ff4182944e 100644
--- a/tests/kernel/fifo/fifo_api/src/test_fifo.h
+++ b/tests/kernel/fifo/fifo_api/src/test_fifo.h
@@ -12,6 +12,6 @@
 
 typedef struct fdata {
 	sys_snode_t snode;
-	u32_t data;
+	uint32_t data;
 } fdata_t;
 #endif
diff --git a/tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c b/tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c
index 5420d3b89d..2fd219c2c8 100644
--- a/tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c
+++ b/tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c
@@ -27,9 +27,9 @@ static void tfifo_thread_thread(struct k_fifo *pfifo)
 	k_tid_t tid = k_thread_create(&thread, tstack, STACK_SIZE,
 				      t_cancel_wait_entry, pfifo, NULL, NULL,
 				      K_PRIO_PREEMPT(0), 0, K_NO_WAIT);
-	u32_t start_t = k_uptime_get_32();
+	uint32_t start_t = k_uptime_get_32();
 	void *ret = k_fifo_get(pfifo, K_MSEC(500));
-	u32_t dur = k_uptime_get_32() - start_t;
+	uint32_t dur = k_uptime_get_32() - start_t;
 
 	/* While we observed the side effect of the last statement
 	 * ( call to k_fifo_cancel_wait) of the thread, it's not fact
diff --git a/tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c b/tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c
index e87eefafb9..bb9c7a0663 100644
--- a/tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c
+++ b/tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c
@@ -32,7 +32,7 @@ static void tfifo_put(struct k_fifo *pfifo)
 
 	head->snode.next = (sys_snode_t *)tail;
 	tail->snode.next = NULL;
-	k_fifo_put_list(pfifo, (u32_t *)head, (u32_t *)tail);
+	k_fifo_put_list(pfifo, (uint32_t *)head, (uint32_t *)tail);
 
 	/**TESTPOINT: fifo put slist*/
 	sys_slist_t slist;
diff --git a/tests/kernel/fifo/fifo_timeout/src/main.c b/tests/kernel/fifo/fifo_timeout/src/main.c
index a77e66a3b0..5d4d444e71 100644
--- a/tests/kernel/fifo/fifo_timeout/src/main.c
+++ b/tests/kernel/fifo/fifo_timeout/src/main.c
@@ -34,15 +34,15 @@ struct scratch_fifo_packet {
 
 struct reply_packet {
 	void *link_in_fifo;
-	s32_t reply;
+	int32_t reply;
 };
 
 struct timeout_order_data {
 	void *link_in_fifo;
 	struct k_fifo *fifo;
-	u32_t timeout;
-	s32_t timeout_order;
-	s32_t q_order;
+	uint32_t timeout;
+	int32_t timeout_order;
+	int32_t q_order;
 };
 
 
@@ -96,12 +96,12 @@ static void put_scratch_packet(void *packet)
 	k_fifo_put(&scratch_fifo_packets_fifo, packet);
 }
 
-static bool is_timeout_in_range(u32_t start_time, u32_t timeout)
+static bool is_timeout_in_range(uint32_t start_time, uint32_t timeout)
 {
-	u32_t stop_time, diff;
+	uint32_t stop_time, diff;
 
 	stop_time = k_cycle_get_32();
-	diff = (u32_t)k_cyc_to_ns_floor64(stop_time -
+	diff = (uint32_t)k_cyc_to_ns_floor64(stop_time -
 			start_time) / NSEC_PER_USEC;
 	diff = diff / USEC_PER_MSEC;
 	return timeout <= diff;
@@ -110,7 +110,7 @@ static bool is_timeout_in_range(u32_t start_time, u32_t timeout)
 /* a thread sleeps then puts data on the fifo */
 static void test_thread_put_timeout(void *p1, void *p2, void *p3)
 {
-	u32_t timeout = *((u32_t *)p2);
+	uint32_t timeout = *((uint32_t *)p2);
 
 	k_msleep(timeout);
 	k_fifo_put((struct k_fifo *)p1, get_scratch_packet());
@@ -120,7 +120,7 @@ static void test_thread_put_timeout(void *p1, void *p2, void *p3)
 static void test_thread_pend_and_timeout(void *p1, void *p2, void *p3)
 {
 	struct timeout_order_data *d = (struct timeout_order_data *)p1;
-	u32_t start_time;
+	uint32_t start_time;
 	void *packet;
 
 	k_msleep(1); /* Align to ticks */
@@ -137,7 +137,7 @@ static int test_multiple_threads_pending(struct timeout_order_data *test_data,
 					 int test_data_size)
 {
 	int ii, j;
-	u32_t diff_ms;
+	uint32_t diff_ms;
 
 	for (ii = 0; ii < test_data_size; ii++) {
 		tid[ii] = k_thread_create(&ttdata[ii], ttstack[ii], TSTACK_SIZE,
@@ -298,7 +298,7 @@ static void test_thread_timeout_reply_values_wfe(void *p1, void *p2, void *p3)
 static void test_timeout_empty_fifo(void)
 {
 	void *packet;
-	u32_t start_time, timeout;
+	uint32_t start_time, timeout;
 
 	k_msleep(1); /* Align to ticks */
 
@@ -351,7 +351,7 @@ static void test_timeout_fifo_thread(void)
 {
 	void *packet, *scratch_packet;
 	struct reply_packet reply_packet;
-	u32_t start_time, timeout;
+	uint32_t start_time, timeout;
 
 	k_msleep(1); /* Align to ticks */
 
@@ -436,7 +436,7 @@ static void test_timeout_fifo_thread(void)
  */
 static void test_timeout_threads_pend_on_fifo(void)
 {
-	s32_t rv, test_data_size;
+	int32_t rv, test_data_size;
 
 	/*
 	 * Test multiple threads pending on the same
@@ -455,7 +455,7 @@ static void test_timeout_threads_pend_on_fifo(void)
  */
 static void test_timeout_threads_pend_on_dual_fifos(void)
 {
-	s32_t rv, test_data_size;
+	int32_t rv, test_data_size;
 
 	/*
 	 * Test multiple threads pending on different
@@ -476,7 +476,7 @@ static void test_timeout_threads_pend_on_dual_fifos(void)
  */
 static void test_timeout_threads_pend_fail_on_fifo(void)
 {
-	s32_t rv, test_data_size;
+	int32_t rv, test_data_size;
 
 	/*
 	 * Test multiple threads pending on same
diff --git a/tests/kernel/fifo/fifo_usage/src/main.c b/tests/kernel/fifo/fifo_usage/src/main.c
index fed48b64d2..3900876fe6 100644
--- a/tests/kernel/fifo/fifo_usage/src/main.c
+++ b/tests/kernel/fifo/fifo_usage/src/main.c
@@ -40,7 +40,7 @@
 
 struct fdata_t {
 	sys_snode_t snode;
-	u32_t data;
+	uint32_t data;
 };
 
 static K_FIFO_DEFINE(fifo1);
@@ -58,7 +58,7 @@ static struct k_sem end_sema;
 /*entry of contexts*/
 static void tIsr_entry_put(void *p)
 {
-	u32_t i;
+	uint32_t i;
 
 	/* Put items into fifo */
 	for (i = 0U; i < LIST_LEN; i++) {
@@ -70,7 +70,7 @@ static void tIsr_entry_put(void *p)
 static void tIsr_entry_get(void *p)
 {
 	void *rx_data;
-	u32_t i;
+	uint32_t i;
 
 	/* Get items from fifo */
 	for (i = 0U; i < LIST_LEN; i++) {
@@ -83,7 +83,7 @@ static void tIsr_entry_get(void *p)
 static void thread_entry_fn_single(void *p1, void *p2, void *p3)
 {
 	void *rx_data;
-	u32_t i;
+	uint32_t i;
 
 	/* Get items from fifo */
 	for (i = 0U; i < LIST_LEN; i++) {
@@ -103,7 +103,7 @@ static void thread_entry_fn_single(void *p1, void *p2, void *p3)
 static void thread_entry_fn_dual(void *p1, void *p2, void *p3)
 {
 	void *rx_data;
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < LIST_LEN; i++) {
 		/* Get items from fifo2 */
@@ -144,7 +144,7 @@ static void thread_entry_fn_isr(void *p1, void *p2, void *p3)
 static void test_single_fifo_play(void)
 {
 	void *rx_data;
-	u32_t i;
+	uint32_t i;
 
 	/* Init kernel objects */
 	k_sem_init(&end_sema, 0, 1);
@@ -183,7 +183,7 @@ static void test_single_fifo_play(void)
 static void test_dual_fifo_play(void)
 {
 	void *rx_data;
-	u32_t i;
+	uint32_t i;
 
 	k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
 				thread_entry_fn_dual, &fifo1, &fifo2, NULL,
diff --git a/tests/kernel/fpu_sharing/generic/src/float_context.h b/tests/kernel/fpu_sharing/generic/src/float_context.h
index 87cf796105..ddfb04ba90 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_context.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_context.h
@@ -92,10 +92,10 @@ struct fp_non_volatile_register_set {
 
 struct fp_volatile_register_set {
 #ifdef CONFIG_FP_FPU_DA
-	u32_t dpfp2h;
-	u32_t dpfp2l;
-	u32_t dpfp1h;
-	u32_t dpfp1l;
+	uint32_t dpfp2h;
+	uint32_t dpfp2l;
+	uint32_t dpfp1h;
+	uint32_t dpfp1l;
 #endif
 };
 
@@ -110,9 +110,9 @@ struct fp_non_volatile_register_set {
 
 struct fp_volatile_register_set {
 #ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION
-	u64_t fp[32];
+	uint64_t fp[32];
 #else
-	u32_t fp[32];
+	uint32_t fp[32];
 #endif
 };
 
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
index fa8aed5252..125cc49292 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
@@ -39,7 +39,7 @@
 static inline void _load_all_float_registers(struct fp_register_set *regs)
 {
 #ifdef CONFIG_FP_FPU_DA
-	u32_t temp = 0;
+	uint32_t temp = 0;
 
 	__asm__ volatile (
 		"ld.ab %1, [%0, 4];\n\t"
@@ -73,7 +73,7 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
 static inline void _store_all_float_registers(struct fp_register_set *regs)
 {
 #ifdef CONFIG_FP_FPU_DA
-	u32_t temp = 0;
+	uint32_t temp = 0;
 
 	__asm__ volatile (
 		"lr %1, [%2];\n\t"
diff --git a/tests/kernel/gen_isr_table/src/main.c b/tests/kernel/gen_isr_table/src/main.c
index bd353c538a..227ed314b9 100644
--- a/tests/kernel/gen_isr_table/src/main.c
+++ b/tests/kernel/gen_isr_table/src/main.c
@@ -9,7 +9,7 @@
 #include <tc_util.h>
 #include <sw_isr_table.h>
 
-extern u32_t _irq_vector_table[];
+extern uint32_t _irq_vector_table[];
 
 #if defined(ARCH_IRQ_DIRECT_CONNECT) && defined(CONFIG_GEN_IRQ_VECTOR_TABLE)
 #define HAS_DIRECT_IRQS
@@ -67,7 +67,7 @@ void trigger_irq(int irq)
 #elif defined(CONFIG_RISCV)
 void trigger_irq(int irq)
 {
-	u32_t mip;
+	uint32_t mip;
 
 	__asm__ volatile ("csrrs %0, mip, %1\n"
 			  : "=r" (mip)
@@ -168,7 +168,7 @@ static int check_vector(void *isr, int offset)
 	TC_PRINT("Checking _irq_vector_table entry %d for irq %d\n",
 		 TABLE_INDEX(offset), IRQ_LINE(offset));
 
-	if (_irq_vector_table[TABLE_INDEX(offset)] != (u32_t)isr) {
+	if (_irq_vector_table[TABLE_INDEX(offset)] != (uint32_t)isr) {
 		TC_PRINT("bad entry %d in vector table\n", TABLE_INDEX(offset));
 		return -1;
 	}
@@ -182,7 +182,7 @@ static int check_vector(void *isr, int offset)
 #endif
 
 #ifdef CONFIG_GEN_SW_ISR_TABLE
-static int check_sw_isr(void *isr, u32_t arg, int offset)
+static int check_sw_isr(void *isr, uint32_t arg, int offset)
 {
 	struct _isr_table_entry *e = &_sw_isr_table[TABLE_INDEX(offset)];
 #ifdef CONFIG_GEN_IRQ_VECTOR_TABLE
diff --git a/tests/kernel/interrupt/src/interrupt_util.h b/tests/kernel/interrupt/src/interrupt_util.h
index e55d64c0c2..25c936f21e 100644
--- a/tests/kernel/interrupt/src/interrupt_util.h
+++ b/tests/kernel/interrupt/src/interrupt_util.h
@@ -14,7 +14,7 @@
 #if defined(CONFIG_CPU_CORTEX_M)
 #include <arch/arm/aarch32/cortex_m/cmsis.h>
 
-static inline u32_t get_available_nvic_line(u32_t initial_offset)
+static inline uint32_t get_available_nvic_line(uint32_t initial_offset)
 {
 	int i;
 
diff --git a/tests/kernel/interrupt/src/nested_irq.c b/tests/kernel/interrupt/src/nested_irq.c
index 6f38a04021..f982a2e96d 100644
--- a/tests/kernel/interrupt/src/nested_irq.c
+++ b/tests/kernel/interrupt/src/nested_irq.c
@@ -62,11 +62,11 @@
 #endif
 
 #ifdef TEST_NESTED_ISR
-static u32_t irq_line_0;
-static u32_t irq_line_1;
+static uint32_t irq_line_0;
+static uint32_t irq_line_1;
 
-static u32_t isr0_result;
-static u32_t isr1_result;
+static uint32_t isr0_result;
+static uint32_t isr1_result;
 
 void isr1(void *param)
 {
diff --git a/tests/kernel/interrupt/src/prevent_irq.c b/tests/kernel/interrupt/src/prevent_irq.c
index 6271bb1ad5..f350888c46 100644
--- a/tests/kernel/interrupt/src/prevent_irq.c
+++ b/tests/kernel/interrupt/src/prevent_irq.c
@@ -11,7 +11,7 @@
 #define HANDLER_TOKEN	0xDEADBEEF
 
 static struct k_timer irqlock_timer;
-volatile u32_t handler_result;
+volatile uint32_t handler_result;
 
 static void timer_handler(struct k_timer *timer)
 {
diff --git a/tests/kernel/lifo/lifo_api/src/test_lifo.h b/tests/kernel/lifo/lifo_api/src/test_lifo.h
index 47aaf12fc7..35469040b7 100644
--- a/tests/kernel/lifo/lifo_api/src/test_lifo.h
+++ b/tests/kernel/lifo/lifo_api/src/test_lifo.h
@@ -12,6 +12,6 @@
 
 typedef struct ldata {
 	sys_snode_t snode;
-	u32_t data;
+	uint32_t data;
 } ldata_t;
 #endif
diff --git a/tests/kernel/lifo/lifo_usage/src/lifo_usage.h b/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
index 943823432c..1e53493d96 100644
--- a/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
+++ b/tests/kernel/lifo/lifo_usage/src/lifo_usage.h
@@ -10,6 +10,6 @@
 
 typedef struct ldata {
 	sys_snode_t snode;
-	u32_t data;
+	uint32_t data;
 } ldata_t;
 #endif
diff --git a/tests/kernel/lifo/lifo_usage/src/main.c b/tests/kernel/lifo/lifo_usage/src/main.c
index d40f89224f..a035b2d38a 100644
--- a/tests/kernel/lifo/lifo_usage/src/main.c
+++ b/tests/kernel/lifo/lifo_usage/src/main.c
@@ -29,15 +29,15 @@ struct scratch_lifo_packet {
 
 struct reply_packet {
 	void *link_in_lifo;
-	s32_t reply;
+	int32_t reply;
 };
 
 struct timeout_order_data {
 	void *link_in_lifo;
 	struct k_lifo *klifo;
 	k_ticks_t timeout;
-	s32_t timeout_order;
-	s32_t q_order;
+	int32_t timeout_order;
+	int32_t q_order;
 };
 
 static struct k_lifo lifo_timeout[2];
@@ -105,12 +105,12 @@ static void thread_entry_nowait(void *p1, void *p2, void *p3)
 	k_sem_give(&start_sema);
 }
 
-static bool is_timeout_in_range(u32_t start_time, u32_t timeout)
+static bool is_timeout_in_range(uint32_t start_time, uint32_t timeout)
 {
-	u32_t stop_time, diff;
+	uint32_t stop_time, diff;
 
 	stop_time = k_cycle_get_32();
-	diff = (u32_t)k_cyc_to_ns_floor64(stop_time -
+	diff = (uint32_t)k_cyc_to_ns_floor64(stop_time -
 					start_time) / NSEC_PER_USEC;
 	diff = diff / USEC_PER_MSEC;
 	return timeout <= diff;
@@ -198,7 +198,7 @@ static void test_thread_timeout_reply_values_wfe(void *p1, void *p2, void *p3)
  */
 static void test_thread_put_timeout(void *p1, void *p2, void *p3)
 {
-	u32_t timeout = *((u32_t *)p2);
+	uint32_t timeout = *((uint32_t *)p2);
 
 	k_msleep(timeout);
 	k_lifo_put((struct k_lifo *)p1, get_scratch_packet());
@@ -264,7 +264,7 @@ static void test_timeout_empty_lifo(void)
 {
 	void *packet;
 
-	u32_t start_time, timeout;
+	uint32_t start_time, timeout;
 
 	timeout = 10U;
 
@@ -311,7 +311,7 @@ static void test_timeout_lifo_thread(void)
 {
 	void *packet, *scratch_packet;
 	struct reply_packet reply_packet;
-	u32_t start_time, timeout;
+	uint32_t start_time, timeout;
 
 	/*
 	 * Test lifo with some timeout and child thread that puts
@@ -393,7 +393,7 @@ static void test_timeout_lifo_thread(void)
 void test_thread_pend_and_timeout(void *p1, void *p2, void *p3)
 {
 	struct timeout_order_data *d = (struct timeout_order_data *)p1;
-	u32_t start_time;
+	uint32_t start_time;
 	void *packet;
 
 	start_time = k_cycle_get_32();
@@ -413,7 +413,7 @@ void test_thread_pend_and_timeout(void *p1, void *p2, void *p3)
  */
 static void test_timeout_threads_pend_on_lifo(void)
 {
-	s32_t rv, test_data_size;
+	int32_t rv, test_data_size;
 
 	/*
 	 * Test multiple threads pending on the same
diff --git a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
index 695fbbb631..172e7f56dc 100644
--- a/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
+++ b/tests/kernel/mbox/mbox_api/src/test_mbox_api.c
@@ -501,7 +501,7 @@ static void tmbox_get(struct k_mbox *pmbox)
 		break;
 	case MULTIPLE_WAITING_GET:
 		/* Create 5 threads who will wait on a mbox_get. */
-		for (u32_t i = 0; i < 5; i++) {
+		for (uint32_t i = 0; i < 5; i++) {
 			k_thread_create(&waiting_get_tid[i],
 					waiting_get_stack[i],
 					STACK_SIZE,
diff --git a/tests/kernel/mem_pool/mem_pool/src/main.c b/tests/kernel/mem_pool/mem_pool/src/main.c
index a67fd0b59e..07cb35ac48 100644
--- a/tests/kernel/mem_pool/mem_pool/src/main.c
+++ b/tests/kernel/mem_pool/mem_pool/src/main.c
@@ -56,12 +56,12 @@ struct TEST_CASE {
 	struct k_mem_block *block;      /* pointer to block data */
 	struct k_mem_pool *pool_id;     /* pool ID */
 	int size;                       /* request size in bytes */
-	s32_t timeout;                  /* # of ticks to wait */
+	int32_t timeout;                  /* # of ticks to wait */
 	int rcode;                      /* expected return code */
 };
 
 typedef int (*pool_block_get_func_t)(struct k_mem_block *, struct k_mem_pool *,
-				     int, s32_t);
+				     int, int32_t);
 typedef int (*pool_move_block_func_t)(struct k_mem_block *, struct k_mem_pool *);
 
 static volatile int evidence;
@@ -125,7 +125,7 @@ static struct TEST_CASE getwt_set[] = {
  * @return k_mem_pool_alloc() return value
  */
 static int pool_block_get_func(struct k_mem_block *block, struct k_mem_pool *pool,
-			int size, s32_t unused)
+			int size, int32_t unused)
 {
 	ARG_UNUSED(unused);
 
@@ -140,7 +140,7 @@ static int pool_block_get_func(struct k_mem_block *block, struct k_mem_pool *poo
  * @return k_mem_pool_alloc(timeout) return value
  */
 static int pool_block_get_wt_func(struct k_mem_block *block, struct k_mem_pool *pool,
-			   int size, s32_t timeout)
+			   int size, int32_t timeout)
 {
 	return k_mem_pool_alloc(pool, block, size, K_MSEC(timeout));
 }
diff --git a/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c b/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c
index 1c48f9d2d8..1a9173e146 100644
--- a/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c
+++ b/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c
@@ -153,7 +153,7 @@ void test_mpool_alloc_size(void)
 void test_mpool_alloc_timeout(void)
 {
 	static struct k_mem_block block[2 * BLK_NUM_MIN], fblock;
-	s64_t tms;
+	int64_t tms;
 	int nb;
 
 	/* allocate all blocks */
diff --git a/tests/kernel/mem_protect/futex/src/main.c b/tests/kernel/mem_protect/futex/src/main.c
index a850f59372..27fa24bdd1 100644
--- a/tests/kernel/mem_protect/futex/src/main.c
+++ b/tests/kernel/mem_protect/futex/src/main.c
@@ -61,7 +61,7 @@ void futex_wake_from_isr(struct k_futex *futex)
 /* test futex wait, no futex wake */
 void futex_wait_task(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 	k_ticks_t time_val = *(int *)p1;
 
 	zassert_true(time_val >= (int)K_TICKS_FOREVER,
@@ -92,7 +92,7 @@ void futex_wait_task(void *p1, void *p2, void *p3)
 
 void futex_wake_task(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 	int woken_num = *(int *)p1;
 
 	ret_value = k_futex_wake(&simple_futex,
@@ -103,7 +103,7 @@ void futex_wake_task(void *p1, void *p2, void *p3)
 
 void futex_wait_wake_task(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 	int time_val = *(int *)p1;
 
 	zassert_true(time_val >= (int)K_TICKS_FOREVER, "invalid timeout parameter");
@@ -131,7 +131,7 @@ void futex_wait_wake_task(void *p1, void *p2, void *p3)
 
 void futex_multiple_wake_task(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 	int woken_num = *(int *)p1;
 	int idx = *(int *)p2;
 
@@ -145,7 +145,7 @@ void futex_multiple_wake_task(void *p1, void *p2, void *p3)
 
 void futex_multiple_wait_wake_task(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 	int time_val = *(int *)p1;
 	int idx = *(int *)p2;
 
diff --git a/tests/kernel/mem_protect/mem_protect/src/inherit.c b/tests/kernel/mem_protect/mem_protect/src/inherit.c
index f7d886acff..ece2350297 100644
--- a/tests/kernel/mem_protect/mem_protect/src/inherit.c
+++ b/tests/kernel/mem_protect/mem_protect/src/inherit.c
@@ -24,7 +24,7 @@ K_TIMER_DEFINE(inherit_timer, dummy_start, dummy_end);
 K_MSGQ_DEFINE(inherit_msgq, MSG_Q_SIZE, MSG_Q_MAX_NUM_MSGS, MSG_Q_ALIGN);
 struct k_thread test_1_tid;
 
-u8_t MEM_DOMAIN_ALIGNMENT inherit_buf[MEM_REGION_ALLOC]; /* for mem domain */
+uint8_t MEM_DOMAIN_ALIGNMENT inherit_buf[MEM_REGION_ALLOC]; /* for mem domain */
 
 K_MEM_PARTITION_DEFINE(inherit_memory_partition,
 		       inherit_buf,
@@ -41,7 +41,7 @@ struct k_mem_domain inherit_mem_domain;
 /* generic function to do check the access permissions. */
 static void access_test(void)
 {
-	u32_t msg_q_data = 0xA5A5;
+	uint32_t msg_q_data = 0xA5A5;
 
 	/* check for all accesses  */
 	k_sem_give(&inherit_sem);
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_domain.c b/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
index 4a5cacd5e3..d3a62fb547 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_domain.c
@@ -17,18 +17,18 @@ struct k_thread mem_domain_1_tid, mem_domain_2_tid, mem_domain_6_tid;
 
 /****************************************************************************/
 /* The mem domains needed.*/
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_buf[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_buf1[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_buf[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_buf1[MEM_REGION_ALLOC];
 
 /* partitions added later in the test cases.*/
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part1[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part2[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part3[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part4[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part5[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part6[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part7[MEM_REGION_ALLOC];
-u8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part8[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part1[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part2[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part3[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part4[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part5[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part6[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part7[MEM_REGION_ALLOC];
+uint8_t MEM_DOMAIN_ALIGNMENT mem_domain_tc3_part8[MEM_REGION_ALLOC];
 
 K_MEM_PARTITION_DEFINE(mem_domain_memory_partition,
 		       mem_domain_buf,
@@ -164,7 +164,7 @@ static void thread_entry_rw(void *p1, void *p2, void *p3)
 {
 	set_fault_valid(false);
 
-	u8_t read_data = mem_domain_buf[0];
+	uint8_t read_data = mem_domain_buf[0];
 
 	/* Just to avoid compiler warnings */
 	(void) read_data;
@@ -201,7 +201,7 @@ static void user_thread_entry_ro(void *p1, void *p2, void *p3)
 	set_fault_valid(true);
 
 	/* Read the partition */
-	u8_t read_data = mem_domain_buf1[0];
+	uint8_t read_data = mem_domain_buf1[0];
 
 	/* Just to avoid compiler warning */
 	(void) read_data;
@@ -351,8 +351,8 @@ void test_mem_domain_add_partitions_invalid(void *p1, void *p2, void *p3)
 	/* Subtract one since the domain is initialized with one partition
 	 * already present.
 	 */
-	u8_t max_partitions = (u8_t)arch_mem_domain_max_partitions_get() - 1;
-	u8_t index;
+	uint8_t max_partitions = (uint8_t)arch_mem_domain_max_partitions_get() - 1;
+	uint8_t index;
 
 	k_mem_domain_remove_thread(k_current_get());
 
@@ -415,8 +415,8 @@ static void mem_domain_for_user_tc4(void *max_partitions, void *p2, void *p3)
 void test_mem_domain_add_partitions_simple(void *p1, void *p2, void *p3)
 {
 
-	u8_t max_partitions = (u8_t)arch_mem_domain_max_partitions_get();
-	u8_t index;
+	uint8_t max_partitions = (uint8_t)arch_mem_domain_max_partitions_get();
+	uint8_t index;
 
 	k_mem_domain_init(&mem_domain_tc3_mem_domain,
 			  1,
diff --git a/tests/kernel/mem_protect/protection/src/main.c b/tests/kernel/mem_protect/protection/src/main.c
index 8fa4355282..d7f09ab0a5 100644
--- a/tests/kernel/mem_protect/protection/src/main.c
+++ b/tests/kernel/mem_protect/protection/src/main.c
@@ -42,7 +42,7 @@ static int __attribute__((noinline)) add_one(int i)
 	return (i + 1);
 }
 
-static void execute_from_buffer(u8_t *dst)
+static void execute_from_buffer(uint8_t *dst)
 {
 	void *src = FUNC_TO_PTR(add_one);
 	int (*func)(int i) = PTR_TO_FUNC(dst);
@@ -76,7 +76,7 @@ static void execute_from_buffer(u8_t *dst)
  */
 static void test_write_ro(void)
 {
-	u32_t *ptr = (u32_t *)&rodata_var;
+	uint32_t *ptr = (uint32_t *)&rodata_var;
 
 	/*
 	 * Try writing to rodata.  Optimally, this triggers a fault.
@@ -147,7 +147,7 @@ static void test_exec_data(void)
  */
 static void test_exec_stack(void)
 {
-	u8_t stack_buf[BUF_SIZE] __aligned(sizeof(int));
+	uint8_t stack_buf[BUF_SIZE] __aligned(sizeof(int));
 
 	execute_from_buffer(stack_buf);
 	zassert_unreachable("Execute from stack did not fault");
@@ -161,7 +161,7 @@ static void test_exec_stack(void)
 #if (CONFIG_HEAP_MEM_POOL_SIZE > 0)
 static void test_exec_heap(void)
 {
-	u8_t *heap_buf = k_malloc(BUF_SIZE);
+	uint8_t *heap_buf = k_malloc(BUF_SIZE);
 
 	execute_from_buffer(heap_buf);
 	k_free(heap_buf);
diff --git a/tests/kernel/mem_protect/protection/src/targets.c b/tests/kernel/mem_protect/protection/src/targets.c
index 42814de9bd..5a86be94be 100644
--- a/tests/kernel/mem_protect/protection/src/targets.c
+++ b/tests/kernel/mem_protect/protection/src/targets.c
@@ -9,9 +9,9 @@
 
 #include "targets.h"
 
-const u32_t rodata_var = RODATA_VALUE;
+const uint32_t rodata_var = RODATA_VALUE;
 
-u8_t data_buf[BUF_SIZE] __aligned(sizeof(int));
+uint8_t data_buf[BUF_SIZE] __aligned(sizeof(int));
 
 int overwrite_target(int i)
 {
diff --git a/tests/kernel/mem_protect/protection/src/targets.h b/tests/kernel/mem_protect/protection/src/targets.h
index 2e83b72f1c..69cbad31a6 100644
--- a/tests/kernel/mem_protect/protection/src/targets.h
+++ b/tests/kernel/mem_protect/protection/src/targets.h
@@ -8,10 +8,10 @@
 #define _PROT_TEST_TARGETS_H_
 
 #define RODATA_VALUE  0xF00FF00F
-extern const u32_t rodata_var;
+extern const uint32_t rodata_var;
 
 #define BUF_SIZE 16
-extern u8_t data_buf[BUF_SIZE];
+extern uint8_t data_buf[BUF_SIZE];
 
 extern int overwrite_target(int i);
 
diff --git a/tests/kernel/mem_protect/sys_sem/src/main.c b/tests/kernel/mem_protect/sys_sem/src/main.c
index 1683655a8e..3123901779 100644
--- a/tests/kernel/mem_protect/sys_sem/src/main.c
+++ b/tests/kernel/mem_protect/sys_sem/src/main.c
@@ -71,7 +71,7 @@ void sem_take_timeout_isr_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_low_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = sys_sem_take(&low_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "sys_sem_take failed");
@@ -84,7 +84,7 @@ void sem_take_multiple_low_prio_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_mid_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = sys_sem_take(&mid_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "sys_sem_take failed");
@@ -97,7 +97,7 @@ void sem_take_multiple_mid_prio_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_high_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = sys_sem_take(&high_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "sys_sem_take failed");
@@ -128,7 +128,7 @@ void sem_multiple_threads_wait_helper(void *p1, void *p2, void *p3)
 #ifdef CONFIG_USERSPACE
 void test_basic_sem_test(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = sys_sem_init(NULL, SEM_INIT_VAL, SEM_MAX_VAL);
 	zassert_true(ret_value == -EINVAL,
@@ -157,7 +157,7 @@ void test_basic_sem_test(void)
  */
 void test_simple_sem_from_isr(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -177,7 +177,7 @@ void test_simple_sem_from_isr(void)
  */
 void test_simple_sem_from_task(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -197,8 +197,8 @@ void test_simple_sem_from_task(void)
  */
 void test_sem_take_no_wait(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
+	uint32_t signal_count;
+	int32_t ret_value;
 
 	for (int i = 4; i >= 0; i--) {
 		ret_value = sys_sem_take(&simple_sem, K_NO_WAIT);
@@ -219,8 +219,8 @@ void test_sem_take_no_wait(void)
  */
 void test_sem_take_no_wait_fails(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
+	uint32_t signal_count;
+	int32_t ret_value;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -242,7 +242,7 @@ void test_sem_take_no_wait_fails(void)
  */
 void test_sem_take_timeout_fails(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -259,7 +259,7 @@ void test_sem_take_timeout_fails(void)
  */
 void test_sem_take_timeout(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 #ifdef CONFIG_USERSPACE
 	int thread_flags = K_USER | K_INHERIT_PERMS;
 #else
@@ -283,7 +283,7 @@ void test_sem_take_timeout(void)
  */
 void test_sem_take_timeout_forever(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 #ifdef CONFIG_USERSPACE
 	int thread_flags = K_USER | K_INHERIT_PERMS;
 #else
@@ -307,7 +307,7 @@ void test_sem_take_timeout_forever(void)
  */
 void test_sem_take_timeout_isr(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -325,7 +325,7 @@ void test_sem_take_timeout_isr(void)
  */
 void test_sem_take_multiple(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 #ifdef CONFIG_USERSPACE
 	int thread_flags = K_USER | K_INHERIT_PERMS;
 #else
@@ -425,7 +425,7 @@ void test_sem_take_multiple(void)
  */
 void test_sem_give_take_from_isr(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -455,8 +455,8 @@ void test_sem_give_take_from_isr(void)
  */
 void test_sem_give_limit(void)
 {
-	s32_t ret_value;
-	u32_t signal_count;
+	int32_t ret_value;
+	uint32_t signal_count;
 
 	sys_sem_init(&simple_sem, SEM_INIT_VAL, SEM_MAX_VAL);
 
@@ -495,9 +495,9 @@ void test_sem_give_limit(void)
  */
 void test_sem_multiple_threads_wait(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
-	u32_t repeat_count = 0U;
+	uint32_t signal_count;
+	int32_t ret_value;
+	uint32_t repeat_count = 0U;
 #ifdef CONFIG_USERSPACE
 	int thread_flags = K_USER | K_INHERIT_PERMS;
 #else
diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c
index bd58e15dc0..5b6809b8c3 100644
--- a/tests/kernel/mem_protect/syscalls/src/main.c
+++ b/tests/kernel/mem_protect/syscalls/src/main.c
@@ -104,7 +104,7 @@ static inline int z_vrfy_to_copy(char *dest)
 }
 #include <syscalls/to_copy_mrsh.c>
 
-int z_impl_syscall_arg64(u64_t arg)
+int z_impl_syscall_arg64(uint64_t arg)
 {
 	/* "Hash" (heh) the return to avoid accidental false positives
 	 * due to using common/predictable values.
@@ -112,7 +112,7 @@ int z_impl_syscall_arg64(u64_t arg)
 	return (int)(arg + 0x8c32a9eda4ca2621ULL + (size_t)&kernel_string);
 }
 
-static inline int z_vrfy_syscall_arg64(u64_t arg)
+static inline int z_vrfy_syscall_arg64(uint64_t arg)
 {
 	return z_impl_syscall_arg64(arg);
 }
@@ -122,12 +122,12 @@ static inline int z_vrfy_syscall_arg64(u64_t arg)
  * arguments (this one happens to need 9), and to test generation of
  * 64 bit return values.
  */
-u64_t z_impl_syscall_arg64_big(u32_t arg1, u32_t arg2,
-			       u64_t arg3, u32_t arg4,
-			       u32_t arg5, u64_t arg6)
+uint64_t z_impl_syscall_arg64_big(uint32_t arg1, uint32_t arg2,
+			       uint64_t arg3, uint32_t arg4,
+			       uint32_t arg5, uint64_t arg6)
 {
-	u64_t args[] = { arg1, arg2, arg3, arg4, arg5, arg6 };
-	u64_t ret = 0xae751a24ef464cc0ULL;
+	uint64_t args[] = { arg1, arg2, arg3, arg4, arg5, arg6 };
+	uint64_t ret = 0xae751a24ef464cc0ULL;
 
 	for (int i = 0; i < ARRAY_SIZE(args); i++) {
 		ret += args[i];
@@ -137,9 +137,9 @@ u64_t z_impl_syscall_arg64_big(u32_t arg1, u32_t arg2,
 	return ret;
 }
 
-static inline u64_t z_vrfy_syscall_arg64_big(u32_t arg1, u32_t arg2,
-					     u64_t arg3, u32_t arg4,
-					     u32_t arg5, u64_t arg6)
+static inline uint64_t z_vrfy_syscall_arg64_big(uint32_t arg1, uint32_t arg2,
+					     uint64_t arg3, uint32_t arg4,
+					     uint32_t arg5, uint64_t arg6)
 {
 	return z_impl_syscall_arg64_big(arg1, arg2, arg3, arg4, arg5, arg6);
 }
diff --git a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
index 7f107054a6..e25969aca4 100644
--- a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
+++ b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
@@ -16,10 +16,10 @@ __syscall int to_copy(char *dest);
 
 __syscall size_t string_nlen(char *src, size_t maxlen, int *err);
 
-__syscall int syscall_arg64(u64_t arg);
+__syscall int syscall_arg64(uint64_t arg);
 
-__syscall u64_t syscall_arg64_big(u32_t arg1, u32_t arg2, u64_t arg3,
-				  u32_t arg4, u32_t arg5, u64_t arg6);
+__syscall uint64_t syscall_arg64_big(uint32_t arg1, uint32_t arg2, uint64_t arg3,
+				  uint32_t arg4, uint32_t arg5, uint64_t arg6);
 
 __syscall bool syscall_context(void);
 
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index 51d892fdb9..c3ab574608 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -309,7 +309,7 @@ static void test_write_kernel_data(void)
  */
 K_APP_DMEM(part0) volatile char *priv_stack_ptr;
 #if defined(CONFIG_ARC)
-K_APP_DMEM(part0) s32_t size = (0 - CONFIG_PRIVILEGED_STACK_SIZE -
+K_APP_DMEM(part0) int32_t size = (0 - CONFIG_PRIVILEGED_STACK_SIZE -
 			       STACK_GUARD_SIZE);
 #endif
 
@@ -659,7 +659,7 @@ static void test_access_other_memdomain(void)
 
 
 #if defined(CONFIG_ARM)
-extern u8_t *z_priv_stack_find(void *obj);
+extern uint8_t *z_priv_stack_find(void *obj);
 #endif
 extern k_thread_stack_t ztest_thread_stack[];
 
@@ -932,7 +932,7 @@ static inline int z_vrfy_check_perms(void *addr, size_t size, int write)
 void stack_buffer_scenarios(k_thread_stack_t *stack_obj, size_t obj_size)
 {
 	size_t stack_size, unused;
-	u8_t val;
+	uint8_t val;
 	char *stack_start, *stack_ptr, *stack_end, *obj_start, *obj_end;
 	volatile char *pos;
 	int ret, expected;
@@ -1045,7 +1045,7 @@ void stest_thread_entry(void *p1, void *p2, void *p3)
 	}
 }
 
-void stest_thread_launch(void *stack_obj, size_t obj_size, u32_t flags,
+void stest_thread_launch(void *stack_obj, size_t obj_size, uint32_t flags,
 			 bool drop)
 {
 	int ret;
diff --git a/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c b/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
index 02f8b664eb..6853c7f31c 100644
--- a/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
+++ b/tests/kernel/mem_slab/mslab_api/src/test_mslab_api.c
@@ -62,7 +62,7 @@ static void tmslab_alloc_timeout(void *data)
 {
 	struct k_mem_slab *pslab = (struct k_mem_slab *)data;
 	void *block[BLK_NUM], *block_fail;
-	s64_t tms;
+	int64_t tms;
 
 	for (int i = 0; i < BLK_NUM; i++) {
 		zassert_true(k_mem_slab_alloc(pslab, &block[i], K_NO_WAIT) == 0,
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c b/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c
index 7e3d833748..7c85d1f107 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_attrs.c
@@ -7,8 +7,8 @@
 #include "test_msgq.h"
 extern struct k_msgq msgq;
 static ZTEST_BMEM char __aligned(4) tbuffer[MSG_SIZE * MSGQ_LEN];
-static ZTEST_DMEM u32_t send_buf[MSGQ_LEN] = { MSG0, MSG1 };
-static ZTEST_DMEM u32_t rec_buf[MSGQ_LEN] = { MSG0, MSG1 };
+static ZTEST_DMEM uint32_t send_buf[MSGQ_LEN] = { MSG0, MSG1 };
+static ZTEST_DMEM uint32_t rec_buf[MSGQ_LEN] = { MSG0, MSG1 };
 
 static void attrs_get(struct k_msgq *q)
 {
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
index 56857fad78..29b54d3744 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_contexts.c
@@ -19,13 +19,13 @@ struct k_thread tdata1;
 struct k_thread tdata2;
 static ZTEST_BMEM char __aligned(4) tbuffer[MSG_SIZE * MSGQ_LEN];
 static ZTEST_DMEM char __aligned(4) tbuffer1[MSG_SIZE];
-static ZTEST_DMEM u32_t data[MSGQ_LEN] = { MSG0, MSG1 };
+static ZTEST_DMEM uint32_t data[MSGQ_LEN] = { MSG0, MSG1 };
 struct k_sem end_sema;
 
 static void put_msgq(struct k_msgq *pmsgq)
 {
 	int ret;
-	u32_t read_data;
+	uint32_t read_data;
 
 	for (int i = 0; i < MSGQ_LEN; i++) {
 		ret = k_msgq_put(pmsgq, (void *)&data[i], K_NO_WAIT);
@@ -49,7 +49,7 @@ static void put_msgq(struct k_msgq *pmsgq)
 
 static void get_msgq(struct k_msgq *pmsgq)
 {
-	u32_t rx_data, read_data;
+	uint32_t rx_data, read_data;
 	int ret;
 
 	for (int i = 0; i < MSGQ_LEN; i++) {
@@ -71,7 +71,7 @@ static void get_msgq(struct k_msgq *pmsgq)
 
 static void purge_msgq(struct k_msgq *pmsgq)
 {
-	u32_t read_data;
+	uint32_t read_data;
 
 	k_msgq_purge(pmsgq);
 	zassert_equal(k_msgq_num_free_get(pmsgq), MSGQ_LEN, NULL);
@@ -109,7 +109,7 @@ static void thread_entry_overflow(void *p1, void *p2, void *p3)
 {
 	int ret;
 
-	u32_t rx_buf[MSGQ_LEN];
+	uint32_t rx_buf[MSGQ_LEN];
 
 	ret = k_msgq_get(p1, &rx_buf[0], K_FOREVER);
 
@@ -159,7 +159,7 @@ static void msgq_isr(struct k_msgq *pmsgq)
 
 static void thread_entry_get_data(void *p1, void *p2, void *p3)
 {
-	u32_t rx_buf[MSGQ_LEN];
+	uint32_t rx_buf[MSGQ_LEN];
 	int i = 0;
 
 	while (k_msgq_get(p1, &rx_buf[i], K_NO_WAIT) != 0) {
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
index b6df4f5a33..50b050217d 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_fail.c
@@ -6,7 +6,7 @@
 #include "test_msgq.h"
 
 static ZTEST_BMEM char __aligned(4) tbuffer[MSG_SIZE * MSGQ_LEN];
-static ZTEST_DMEM u32_t data[MSGQ_LEN] = { MSG0, MSG1 };
+static ZTEST_DMEM uint32_t data[MSGQ_LEN] = { MSG0, MSG1 };
 extern struct k_msgq msgq;
 
 static void put_fail(struct k_msgq *q)
@@ -28,7 +28,7 @@ static void put_fail(struct k_msgq *q)
 
 static void get_fail(struct k_msgq *q)
 {
-	u32_t rx_data;
+	uint32_t rx_data;
 
 	/**TESTPOINT: msgq get returns -ENOMSG*/
 	int ret = k_msgq_get(q, &rx_data, K_NO_WAIT);
diff --git a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
index d8f3b0c919..3ac547904d 100644
--- a/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
+++ b/tests/kernel/msgq/msgq_api/src/test_msgq_purge.c
@@ -10,7 +10,7 @@ K_THREAD_STACK_EXTERN(tstack);
 extern struct k_thread tdata;
 extern struct k_msgq msgq;
 static ZTEST_BMEM char __aligned(4) tbuffer[MSG_SIZE * MSGQ_LEN];
-static ZTEST_DMEM u32_t data[MSGQ_LEN] = { MSG0, MSG1 };
+static ZTEST_DMEM uint32_t data[MSGQ_LEN] = { MSG0, MSG1 };
 
 static void tThread_entry(void *p1, void *p2, void *p3)
 {
diff --git a/tests/kernel/pending/src/main.c b/tests/kernel/pending/src/main.c
index 455cf415a7..4d206d212a 100644
--- a/tests/kernel/pending/src/main.c
+++ b/tests/kernel/pending/src/main.c
@@ -43,12 +43,12 @@ static K_THREAD_STACK_DEFINE(offload_work_q_stack,
 
 struct fifo_data {
 	intptr_t reserved;
-	u32_t data;
+	uint32_t data;
 };
 
 struct lifo_data {
 	intptr_t reserved;
-	u32_t data;
+	uint32_t data;
 };
 
 struct offload_work {
@@ -77,8 +77,8 @@ struct lifo_data lifo_test_data[4] = {
 	{ 0, LIFO_TEST_END + 3 }, { 0, LIFO_TEST_END + 4 }
 };
 
-static u32_t timer_start_tick;
-static u32_t timer_end_tick;
+static uint32_t timer_start_tick;
+static uint32_t timer_end_tick;
 static void *timer_data;
 
 static int __noinit coop_high_state;
@@ -88,12 +88,12 @@ static int __noinit task_low_state;
 
 static int __noinit counter;
 
-static inline void *my_fifo_get(struct k_fifo *fifo, s32_t timeout)
+static inline void *my_fifo_get(struct k_fifo *fifo, int32_t timeout)
 {
 	return k_fifo_get(fifo, K_MSEC(timeout));
 }
 
-static inline void *my_lifo_get(struct k_lifo *lifo, s32_t timeout)
+static inline void *my_lifo_get(struct k_lifo *lifo, int32_t timeout)
 {
 	return k_lifo_get(lifo, K_MSEC(timeout));
 }
@@ -121,8 +121,8 @@ static void sync_threads(struct k_work *work)
 
 }
 
-static void fifo_tests(s32_t timeout, volatile int *state,
-		       void *(*get)(struct k_fifo *, s32_t),
+static void fifo_tests(int32_t timeout, volatile int *state,
+		       void *(*get)(struct k_fifo *, int32_t),
 		       int (*sem_take)(struct k_sem *, k_timeout_t))
 {
 	struct fifo_data *data;
@@ -159,8 +159,8 @@ static void fifo_tests(s32_t timeout, volatile int *state,
 	sem_take(&end_test_sem, K_FOREVER);
 }
 
-static void lifo_tests(s32_t timeout, volatile int *state,
-		       void *(*get)(struct k_lifo *, s32_t),
+static void lifo_tests(int32_t timeout, volatile int *state,
+		       void *(*get)(struct k_lifo *, int32_t),
 		       int (*sem_take)(struct k_sem *, k_timeout_t))
 {
 	struct lifo_data *data;
diff --git a/tests/kernel/pipe/pipe/src/test_pipe.c b/tests/kernel/pipe/pipe/src/test_pipe.c
index 7266f11563..488df044f6 100644
--- a/tests/kernel/pipe/pipe/src/test_pipe.c
+++ b/tests/kernel/pipe/pipe/src/test_pipe.c
@@ -19,8 +19,8 @@ K_SEM_DEFINE(sync_sem, 0, 1);
 K_SEM_DEFINE(multiple_send_sem, 0, 1);
 
 
-ZTEST_BMEM u8_t tx_buffer[PIPE_SIZE + 1];
-ZTEST_BMEM u8_t rx_buffer[PIPE_SIZE + 1];
+ZTEST_BMEM uint8_t tx_buffer[PIPE_SIZE + 1];
+ZTEST_BMEM uint8_t rx_buffer[PIPE_SIZE + 1];
 
 #define TOTAL_ELEMENTS (sizeof(single_elements) / sizeof(struct pipe_sequence))
 #define TOTAL_WAIT_ELEMENTS (sizeof(wait_elements) / \
@@ -45,9 +45,9 @@ ZTEST_BMEM u8_t rx_buffer[PIPE_SIZE + 1];
 
 /* encompasing structs */
 struct pipe_sequence {
-	u32_t size;
-	u32_t min_size;
-	u32_t sent_bytes;
+	uint32_t size;
+	uint32_t min_size;
+	uint32_t sent_bytes;
 	int return_value;
 };
 
@@ -116,9 +116,9 @@ struct k_thread get_single_tid;
 
 /* Helper functions */
 
-u32_t rx_buffer_check(char *buffer, u32_t size)
+uint32_t rx_buffer_check(char *buffer, uint32_t size)
 {
-	u32_t index;
+	uint32_t index;
 
 	for (index = 0U; index < size; index++) {
 		if (buffer[index] != (char) index) {
@@ -135,7 +135,7 @@ u32_t rx_buffer_check(char *buffer, u32_t size)
 /******************************************************************************/
 void pipe_put_single(void)
 {
-	u32_t index;
+	uint32_t index;
 	size_t written;
 	int return_value;
 	size_t min_xfer;
@@ -169,7 +169,7 @@ void pipe_put_single(void)
 
 void pipe_get_single(void *p1, void *p2, void *p3)
 {
-	u32_t index;
+	uint32_t index;
 	size_t read;
 	int return_value;
 	size_t min_xfer;
@@ -210,7 +210,7 @@ void pipe_get_single(void *p1, void *p2, void *p3)
 /******************************************************************************/
 void pipe_put_multiple(void)
 {
-	u32_t index;
+	uint32_t index;
 	size_t written;
 	int return_value;
 	size_t min_xfer;
@@ -247,7 +247,7 @@ void pipe_put_multiple(void)
 
 void pipe_get_multiple(void *p1, void *p2, void *p3)
 {
-	u32_t index;
+	uint32_t index;
 	size_t read;
 	int return_value;
 	size_t min_xfer;
@@ -528,8 +528,8 @@ void pipe_get_on_empty_pipe(void)
 {
 	size_t read;
 	int return_value;
-	u32_t read_size;
-	u32_t size_array[] = { 1, PIPE_SIZE - 1, PIPE_SIZE, PIPE_SIZE + 1 };
+	uint32_t read_size;
+	uint32_t size_array[] = { 1, PIPE_SIZE - 1, PIPE_SIZE, PIPE_SIZE + 1 };
 
 	for (int i = 0; i < 4; i++) {
 		read_size = size_array[i];
@@ -568,7 +568,7 @@ void pipe_get_on_empty_pipe(void)
 /******************************************************************************/
 void pipe_put_forever_timeout(void)
 {
-	u32_t index;
+	uint32_t index;
 	size_t written;
 	int return_value;
 	size_t min_xfer;
@@ -602,7 +602,7 @@ void pipe_put_forever_timeout(void)
 
 void pipe_get_forever_timeout(void *p1, void *p2, void *p3)
 {
-	u32_t index;
+	uint32_t index;
 	size_t read;
 	int return_value;
 	size_t min_xfer;
@@ -640,7 +640,7 @@ void pipe_get_forever_timeout(void *p1, void *p2, void *p3)
 /******************************************************************************/
 void pipe_put_get_timeout(void)
 {
-	u32_t index;
+	uint32_t index;
 	size_t read;
 	int return_value;
 	size_t min_xfer;
diff --git a/tests/kernel/poll/src/test_poll.c b/tests/kernel/poll/src/test_poll.c
index 1db299800b..4e8d1b27f5 100644
--- a/tests/kernel/poll/src/test_poll.c
+++ b/tests/kernel/poll/src/test_poll.c
@@ -10,7 +10,7 @@
 /* global values and data structures */
 struct fifo_msg {
 	void *private;
-	u32_t msg;
+	uint32_t msg;
 };
 
 #define SIGNAL_RESULT 0x1ee7d00d
diff --git a/tests/kernel/profiling/profiling_api/src/main.c b/tests/kernel/profiling/profiling_api/src/main.c
index 0d36560394..eeabce4d3e 100644
--- a/tests/kernel/profiling/profiling_api/src/main.c
+++ b/tests/kernel/profiling/profiling_api/src/main.c
@@ -39,7 +39,7 @@ __weak void _sys_pm_power_state_exit_post_ops(enum power_states state)
 }
 
 /* Our PM policy handler */
-enum power_states sys_pm_policy_next_state(s32_t ticks)
+enum power_states sys_pm_policy_next_state(int32_t ticks)
 {
 	static bool test_flag;
 
diff --git a/tests/kernel/queue/src/test_queue.h b/tests/kernel/queue/src/test_queue.h
index 5a96c3ed82..ee4933dc1d 100644
--- a/tests/kernel/queue/src/test_queue.h
+++ b/tests/kernel/queue/src/test_queue.h
@@ -29,7 +29,7 @@ extern struct k_mem_pool test_pool;
 
 typedef struct qdata {
 	sys_snode_t snode;
-	u32_t data;
+	uint32_t data;
 	bool allocated;
 } qdata_t;
 #endif
diff --git a/tests/kernel/queue/src/test_queue_contexts.c b/tests/kernel/queue/src/test_queue_contexts.c
index 964f59764f..34867b7307 100644
--- a/tests/kernel/queue/src/test_queue_contexts.c
+++ b/tests/kernel/queue/src/test_queue_contexts.c
@@ -49,7 +49,7 @@ static void tqueue_append(struct k_queue *pqueue)
 
 	head->snode.next = (sys_snode_t *)tail;
 	tail->snode.next = NULL;
-	k_queue_append_list(pqueue, (u32_t *)head, (u32_t *)tail);
+	k_queue_append_list(pqueue, (uint32_t *)head, (uint32_t *)tail);
 
 	/**TESTPOINT: queue merge slist*/
 	sys_slist_t slist;
diff --git a/tests/kernel/sched/preempt/src/main.c b/tests/kernel/sched/preempt/src/main.c
index 7e6be7ed6c..bbde283f9d 100644
--- a/tests/kernel/sched/preempt/src/main.c
+++ b/tests/kernel/sched/preempt/src/main.c
@@ -289,7 +289,7 @@ void worker(void *p1, void *p2, void *p3)
 		}
 
 		if (do_sleep) {
-			u64_t start = k_uptime_get();
+			uint64_t start = k_uptime_get();
 
 			k_sleep(K_MSEC(1));
 
diff --git a/tests/kernel/sched/schedule_api/src/main.c b/tests/kernel/sched/schedule_api/src/main.c
index cfaa3ead0d..781dcc3249 100644
--- a/tests/kernel/sched/schedule_api/src/main.c
+++ b/tests/kernel/sched/schedule_api/src/main.c
@@ -15,7 +15,7 @@ K_THREAD_STACK_EXTERN(ustack);
 
 void spin_for_ms(int ms)
 {
-	u32_t t32 = k_uptime_get_32();
+	uint32_t t32 = k_uptime_get_32();
 
 	while (k_uptime_get_32() - t32 < ms) {
 		/* In the posix arch, a busy loop takes no time, so
diff --git a/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c b/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
index 101694c39d..2e5dacf986 100644
--- a/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
+++ b/tests/kernel/sched/schedule_api/src/test_sched_timeslice_reset.c
@@ -20,7 +20,7 @@ BUILD_ASSERT(NUM_THREAD <= MAX_NUM_THREAD);
 /* a half timeslice*/
 #define HALF_SLICE_SIZE (SLICE_SIZE >> 1)
 #define HALF_SLICE_SIZE_CYCLES                                                 \
-	((u64_t)(HALF_SLICE_SIZE)*sys_clock_hw_cycles_per_sec() / 1000)
+	((uint64_t)(HALF_SLICE_SIZE)*sys_clock_hw_cycles_per_sec() / 1000)
 
 /* Task switch tolerance ... */
 #if CONFIG_SYS_CLOCK_TICKS_PER_SEC >= 1000
@@ -33,12 +33,12 @@ BUILD_ASSERT(NUM_THREAD <= MAX_NUM_THREAD);
 
 K_SEM_DEFINE(sema, 0, NUM_THREAD);
 /*elapsed_slice taken by last thread*/
-static u32_t elapsed_slice;
+static uint32_t elapsed_slice;
 static int thread_idx;
 
-static u32_t cycles_delta(u32_t *reftime)
+static uint32_t cycles_delta(uint32_t *reftime)
 {
-	u32_t now, delta;
+	uint32_t now, delta;
 
 	now = k_cycle_get_32();
 	delta = now - *reftime;
@@ -49,8 +49,8 @@ static u32_t cycles_delta(u32_t *reftime)
 
 static void thread_time_slice(void *p1, void *p2, void *p3)
 {
-	u32_t t = cycles_delta(&elapsed_slice);
-	u32_t expected_slice_min, expected_slice_max;
+	uint32_t t = cycles_delta(&elapsed_slice);
+	uint32_t expected_slice_min, expected_slice_max;
 
 	if (thread_idx == 0) {
 		/*
@@ -58,10 +58,10 @@ static void thread_time_slice(void *p1, void *p2, void *p3)
 		 * expected to switch in less than the switching tolerance.
 		 */
 		expected_slice_min =
-			(u64_t)(HALF_SLICE_SIZE - TASK_SWITCH_TOLERANCE) *
+			(uint64_t)(HALF_SLICE_SIZE - TASK_SWITCH_TOLERANCE) *
 			sys_clock_hw_cycles_per_sec() / 1000;
 		expected_slice_max =
-			(u64_t)(HALF_SLICE_SIZE + TASK_SWITCH_TOLERANCE) *
+			(uint64_t)(HALF_SLICE_SIZE + TASK_SWITCH_TOLERANCE) *
 			sys_clock_hw_cycles_per_sec() / 1000;
 	} else {
 		/*
@@ -119,7 +119,7 @@ static void thread_time_slice(void *p1, void *p2, void *p3)
  */
 void test_slice_reset(void)
 {
-	u32_t t32;
+	uint32_t t32;
 	k_tid_t tid[NUM_THREAD];
 	struct k_thread t[NUM_THREAD];
 	int old_prio = k_thread_priority_get(k_current_get());
diff --git a/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c b/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
index 0026e23bd4..0792cdca66 100644
--- a/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
+++ b/tests/kernel/sched/schedule_api/src/test_slice_scheduling.c
@@ -29,7 +29,7 @@ static struct k_thread t[NUM_THREAD];
 
 static K_SEM_DEFINE(sema1, 0, NUM_THREAD);
 /*elapsed_slice taken by last thread*/
-static s64_t elapsed_slice;
+static int64_t elapsed_slice;
 
 static int thread_idx;
 
@@ -41,8 +41,8 @@ static void thread_tslice(void *p1, void *p2, void *p3)
 	int thread_parameter = (idx == (NUM_THREAD - 1)) ? '\n' :
 			       (idx + 'A');
 
-	s64_t expected_slice_min = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(SLICE_SIZE));
-	s64_t expected_slice_max = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(SLICE_SIZE) + 1);
+	int64_t expected_slice_min = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(SLICE_SIZE));
+	int64_t expected_slice_max = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(SLICE_SIZE) + 1);
 
 	/* Clumsy, but need to handle the precision loss with
 	 * submillisecond ticks.  It's always possible to alias and
@@ -53,7 +53,7 @@ static void thread_tslice(void *p1, void *p2, void *p3)
 	}
 
 	while (1) {
-		s64_t tdelta = k_uptime_delta(&elapsed_slice);
+		int64_t tdelta = k_uptime_delta(&elapsed_slice);
 		TC_PRINT("%c", thread_parameter);
 		/* Test Fails if thread exceed allocated time slice or
 		 * Any thread is scheduled out of order.
diff --git a/tests/kernel/semaphore/semaphore/src/main.c b/tests/kernel/semaphore/semaphore/src/main.c
index b28f23ebee..fb412971f0 100644
--- a/tests/kernel/semaphore/semaphore/src/main.c
+++ b/tests/kernel/semaphore/semaphore/src/main.c
@@ -21,7 +21,7 @@
 #define SEC2MS(s) ((s) * 1000)
 
 struct timeout_info {
-	u32_t timeout;
+	uint32_t timeout;
 	struct k_sem *sema;
 };
 
@@ -103,7 +103,7 @@ void sem_take_timeout_isr_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_low_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = k_sem_take(&low_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "k_sem_take failed");
@@ -116,7 +116,7 @@ void sem_take_multiple_low_prio_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_mid_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = k_sem_take(&mid_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "k_sem_take failed");
@@ -129,7 +129,7 @@ void sem_take_multiple_mid_prio_helper(void *p1, void *p2, void *p3)
 
 void sem_take_multiple_high_prio_helper(void *p1, void *p2, void *p3)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	ret_value = k_sem_take(&high_prio_sem, K_FOREVER);
 	zassert_true(ret_value == 0, "k_sem_take failed");
@@ -260,7 +260,7 @@ void test_sema_count_get(void)
  */
 void test_simple_sem_from_isr(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	/*
 	 * Signal the semaphore several times from an ISR.  After each signal,
@@ -284,7 +284,7 @@ void test_simple_sem_from_isr(void)
  */
 void test_simple_sem_from_task(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	/*
 	 * Signal the semaphore several times from a task.  After each signal,
@@ -310,8 +310,8 @@ void test_simple_sem_from_task(void)
  */
 void test_sem_take_no_wait(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
+	uint32_t signal_count;
+	int32_t ret_value;
 
 	/*
 	 * Test the semaphore without wait.  Check the signal count after each
@@ -343,8 +343,8 @@ void test_sem_take_no_wait(void)
  */
 void test_sem_take_no_wait_fails(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
+	uint32_t signal_count;
+	int32_t ret_value;
 
 	/*
 	 * Test the semaphore without wait.  Check the signal count after each
@@ -372,7 +372,7 @@ void test_sem_take_no_wait_fails(void)
  */
 void test_sem_take_timeout_fails(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	/*
 	 * Test the semaphore with timeout without a k_sem_give.
@@ -394,7 +394,7 @@ void test_sem_take_timeout_fails(void)
  */
 void test_sem_take_timeout(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	/*
 	 * Signal the semaphore upon which the other thread is waiting.  The
@@ -420,7 +420,7 @@ void test_sem_take_timeout(void)
  */
 void test_sem_take_timeout_forever(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	/*
 	 * Signal the semaphore upon which the another thread is waiting.  The
@@ -446,7 +446,7 @@ void test_sem_take_timeout_forever(void)
  */
 void test_sem_take_timeout_isr(void)
 {
-	s32_t ret_value;
+	int32_t ret_value;
 
 	/*
 	 * Signal the semaphore upon which the another thread is waiting.  The
@@ -470,7 +470,7 @@ void test_sem_take_timeout_isr(void)
  */
 void test_sem_take_multiple(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	/*
 	 * Signal the semaphore upon which the another thread is waiting.  The
@@ -563,7 +563,7 @@ void test_sem_take_multiple(void)
  */
 void test_sem_give_take_from_isr(void)
 {
-	u32_t signal_count;
+	uint32_t signal_count;
 
 	k_sem_reset(&simple_sem);
 
@@ -609,9 +609,9 @@ void sem_multiple_threads_wait_helper(void *p1, void *p2, void *p3)
  */
 void test_sem_multiple_threads_wait(void)
 {
-	u32_t signal_count;
-	s32_t ret_value;
-	u32_t repeat_count = 0U;
+	uint32_t signal_count;
+	int32_t ret_value;
+	uint32_t repeat_count = 0U;
 
 	k_sem_reset(&simple_sem);
 	k_sem_reset(&multiple_thread_sem);
@@ -670,8 +670,8 @@ void test_sem_multiple_threads_wait(void)
  */
 void test_sem_measure_timeouts(void)
 {
-	s32_t ret_value;
-	u32_t start_ticks, end_ticks;
+	int32_t ret_value;
+	uint32_t start_ticks, end_ticks;
 
 	k_sem_reset(&simple_sem);
 
@@ -721,8 +721,8 @@ void sem_measure_timeout_from_thread_helper(void *p1, void *p2, void *p3)
  */
 void test_sem_measure_timeout_from_thread(void)
 {
-	s32_t ret_value;
-	u32_t start_ticks, end_ticks;
+	int32_t ret_value;
+	uint32_t start_ticks, end_ticks;
 
 	k_sem_reset(&simple_sem);
 	k_sem_reset(&multiple_thread_sem);
@@ -755,7 +755,7 @@ void test_sem_measure_timeout_from_thread(void)
 void sem_multiple_take_and_timeouts_helper(void *p1, void *p2, void *p3)
 {
 	int timeout = POINTER_TO_INT(p1);
-	u32_t start_ticks, end_ticks;
+	uint32_t start_ticks, end_ticks;
 	size_t bytes_written;
 
 	start_ticks = k_uptime_get();
@@ -781,7 +781,7 @@ void sem_multiple_take_and_timeouts_helper(void *p1, void *p2, void *p3)
  */
 void test_sem_multiple_take_and_timeouts(void)
 {
-	u32_t timeout;
+	uint32_t timeout;
 	size_t bytes_read;
 
 	k_sem_reset(&simple_sem);
@@ -815,8 +815,8 @@ void sem_multi_take_timeout_diff_sem_helper(void *p1, void *p2, void *p3)
 {
 	int timeout = POINTER_TO_INT(p1);
 	struct k_sem *sema = p2;
-	u32_t start_ticks, end_ticks;
-	s32_t ret_value;
+	uint32_t start_ticks, end_ticks;
+	int32_t ret_value;
 	size_t bytes_written;
 	struct timeout_info info = {
 		.timeout = timeout,
diff --git a/tests/kernel/sleep/src/main.c b/tests/kernel/sleep/src/main.c
index 574355d0f7..0216f2a515 100644
--- a/tests/kernel/sleep/src/main.c
+++ b/tests/kernel/sleep/src/main.c
@@ -22,7 +22,7 @@
 
 #define ONE_SECOND		(MSEC_PER_SEC)
 #define ONE_SECOND_ALIGNED	\
-	(u32_t)(k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(ONE_SECOND) + _TICK_ALIGN))
+	(uint32_t)(k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(ONE_SECOND) + _TICK_ALIGN))
 
 #if defined(CONFIG_SOC_XILINX_ZYNQMP)
 /*
@@ -78,7 +78,7 @@ static void test_objects_init(void)
 
 static void align_to_tick_boundary(void)
 {
-	u32_t tick;
+	uint32_t tick;
 
 	tick = k_uptime_get_32();
 	while (k_uptime_get_32() == tick) {
@@ -95,17 +95,17 @@ static void align_to_tick_boundary(void)
  * measurement. Qemu at least will leak the external world's clock
  * rate into the simulator when the host is under load.
  */
-static int sleep_time_valid(u32_t start, u32_t end, u32_t dur)
+static int sleep_time_valid(uint32_t start, uint32_t end, uint32_t dur)
 {
-	u32_t dt = end - start;
+	uint32_t dt = end - start;
 
 	return dt >= dur && dt <= (dur + TICK_MARGIN);
 }
 
 static void test_thread(int arg1, int arg2)
 {
-	u32_t start_tick;
-	u32_t end_tick;
+	uint32_t start_tick;
+	uint32_t end_tick;
 
 	k_sem_take(&test_thread_sem, K_FOREVER);
 
@@ -194,8 +194,8 @@ static void helper_thread(int arg1, int arg2)
 void test_sleep(void)
 {
 	int status = TC_FAIL;
-	u32_t start_tick;
-	u32_t end_tick;
+	uint32_t start_tick;
+	uint32_t end_tick;
 
 	/*
 	 * Main thread(test_main) priority is 0 but ztest thread runs at
@@ -248,7 +248,7 @@ extern void test_usleep(void);
 
 static void forever_thread_entry(void *p1, void *p2, void *p3)
 {
-	s32_t ret;
+	int32_t ret;
 
 	ret = k_sleep(K_FOREVER);
 	zassert_equal(ret, K_TICKS_FOREVER, "unexpected return value");
diff --git a/tests/kernel/sleep/src/usleep.c b/tests/kernel/sleep/src/usleep.c
index 169698879f..735d92a304 100644
--- a/tests/kernel/sleep/src/usleep.c
+++ b/tests/kernel/sleep/src/usleep.c
@@ -62,11 +62,11 @@
 void test_usleep(void)
 {
 	int retries = 0;
-	s64_t elapsed_ms;
+	int64_t elapsed_ms;
 
 	while (retries < RETRIES) {
-		s64_t start_ms;
-		s64_t end_ms;
+		int64_t start_ms;
+		int64_t end_ms;
 		int i;
 
 		++retries;
diff --git a/tests/kernel/smp/src/main.c b/tests/kernel/smp/src/main.c
index 4ea89722d6..809453d3be 100644
--- a/tests/kernel/smp/src/main.c
+++ b/tests/kernel/smp/src/main.c
@@ -181,7 +181,7 @@ static void thread_entry(void *p1, void *p2, void *p3)
 static void spin_for_threads_exit(void)
 {
 	for (int i = 0; i < THREADS_NUM - 1; i++) {
-		volatile u8_t *p = &tinfo[i].tid->base.thread_state;
+		volatile uint8_t *p = &tinfo[i].tid->base.thread_state;
 
 		while (!(*p & _THREAD_DEAD)) {
 		}
diff --git a/tests/kernel/stack/stack/src/main.c b/tests/kernel/stack/stack/src/main.c
index 38c9e43a8a..88bcf1f595 100644
--- a/tests/kernel/stack/stack/src/main.c
+++ b/tests/kernel/stack/stack/src/main.c
@@ -93,7 +93,7 @@ dummy_test(test_stack_user_pop_fail);
 /* entry of contexts */
 static void tIsr_entry_push(void *p)
 {
-	u32_t i;
+	uint32_t i;
 
 	/* Push items to stack */
 	for (i = 0U; i < STACK_LEN; i++) {
@@ -103,7 +103,7 @@ static void tIsr_entry_push(void *p)
 
 static void tIsr_entry_pop(void *p)
 {
-	u32_t i;
+	uint32_t i;
 
 	/* Pop items from stack */
 	for (i = 0U; i < STACK_LEN; i++) {
@@ -118,7 +118,7 @@ static void tIsr_entry_pop(void *p)
 static void thread_entry_fn_single(void *p1, void *p2, void *p3)
 {
 	stack_data_t tmp[STACK_LEN];
-	u32_t i;
+	uint32_t i;
 
 	/* Pop items from stack */
 	for (i = STACK_LEN; i; i--) {
@@ -139,7 +139,7 @@ static void thread_entry_fn_single(void *p1, void *p2, void *p3)
 static void thread_entry_fn_dual(void *p1, void *p2, void *p3)
 {
 	stack_data_t tmp[STACK_LEN];
-	u32_t i;
+	uint32_t i;
 
 	for (i = 0U; i < STACK_LEN; i++) {
 		/* Pop items from stack2 */
@@ -179,7 +179,7 @@ static void thread_entry_fn_isr(void *p1, void *p2, void *p3)
 static void test_single_stack_play(void)
 {
 	stack_data_t tmp[STACK_LEN];
-	u32_t i;
+	uint32_t i;
 
 	/* Init kernel objects */
 	k_sem_init(&end_sema, 0, 1);
@@ -216,7 +216,7 @@ static void test_single_stack_play(void)
 static void test_dual_stack_play(void)
 {
 	stack_data_t tmp[STACK_LEN];
-	u32_t i;
+	uint32_t i;
 
 	k_tid_t tid = k_thread_create(&thread_data, threadstack, TSTACK_SIZE,
 				      thread_entry_fn_dual, &stack1, &stack2,
diff --git a/tests/kernel/threads/thread_apis/src/main.c b/tests/kernel/threads/thread_apis/src/main.c
index 0ec9e5baec..15abf18ff0 100644
--- a/tests/kernel/threads/thread_apis/src/main.c
+++ b/tests/kernel/threads/thread_apis/src/main.c
@@ -382,7 +382,7 @@ int join_scenario(enum control_method m)
 
 void test_thread_join(void)
 {
-	s64_t interval;
+	int64_t interval;
 
 #ifdef CONFIG_USERSPACE
 	/* scenario: thread never started */
diff --git a/tests/kernel/threads/thread_init/src/main.c b/tests/kernel/threads/thread_init/src/main.c
index c881b5b447..9a2f1fbf53 100644
--- a/tests/kernel/threads/thread_init/src/main.c
+++ b/tests/kernel/threads/thread_init/src/main.c
@@ -44,10 +44,10 @@ static K_THREAD_STACK_DEFINE(stack_coop, INIT_COOP_STACK_SIZE);
 static K_THREAD_STACK_DEFINE(stack_preempt, INIT_PREEMPT_STACK_SIZE);
 static struct k_thread thread_coop;
 static struct k_thread thread_preempt;
-static ZTEST_BMEM u64_t t_create;
+static ZTEST_BMEM uint64_t t_create;
 static ZTEST_BMEM struct thread_data {
 	int init_prio;
-	s32_t init_delay;
+	int32_t init_delay;
 	void *init_p1;
 	void *init_p2;
 	void *init_p3;
@@ -57,7 +57,7 @@ static ZTEST_BMEM struct thread_data {
 static void thread_entry(void *p1, void *p2, void *p3)
 {
 	if (t_create) {
-		u64_t t_delay = k_uptime_get() - t_create;
+		uint64_t t_delay = k_uptime_get() - t_create;
 		/**TESTPOINT: check delay start*/
 		zassert_true(t_delay >= expected.init_delay,
 			     "k_thread_create delay start failed");
diff --git a/tests/kernel/tickless/tickless/src/main.c b/tests/kernel/tickless/tickless/src/main.c
index 4f024aa8e4..1c0d2d3413 100644
--- a/tests/kernel/tickless/tickless/src/main.c
+++ b/tests/kernel/tickless/tickless/src/main.c
@@ -32,7 +32,7 @@ static K_THREAD_STACK_DEFINE(thread_tickless_stack, STACKSIZE);
  * failed when it was removed.  So just leave it here as a vestigial
  * thing until the test gets reworked
  */
-s32_t _sys_idle_threshold_ticks;
+int32_t _sys_idle_threshold_ticks;
 #endif
 
 #define TICKS_TO_MS  (MSEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC)
@@ -48,7 +48,7 @@ s32_t _sys_idle_threshold_ticks;
  */
 
 #if defined(CONFIG_X86) || defined(CONFIG_ARC) || defined(CONFIG_ARCH_POSIX)
-typedef u64_t _timer_res_t;
+typedef uint64_t _timer_res_t;
 #define _TIMER_ZERO  0ULL
 
 /* timestamp routines */
@@ -67,12 +67,12 @@ typedef u64_t _timer_res_t;
 #error "This QEMU target does not support tickless idle!"
 #  endif
 
-typedef u32_t _timer_res_t;
+typedef uint32_t _timer_res_t;
 #define _TIMER_ZERO  0
 
 /* timestamp routines, from timestamps.c */
 extern void _timestamp_open(void);
-extern u32_t _timestamp_read(void);
+extern uint32_t _timestamp_read(void);
 extern void _timestamp_close(void);
 
 #define _TIMESTAMP_OPEN()       (_timestamp_open())
@@ -85,10 +85,10 @@ extern void _timestamp_close(void);
 
 void ticklessTestThread(void)
 {
-	s32_t start_time;
-	s32_t end_time;
-	s32_t diff_time;
-	s32_t diff_ticks;
+	int32_t start_time;
+	int32_t end_time;
+	int32_t diff_time;
+	int32_t diff_ticks;
 	_timer_res_t start_tsc;
 	_timer_res_t end_tsc;
 	_timer_res_t cal_tsc = _TIMER_ZERO;
@@ -96,7 +96,7 @@ void ticklessTestThread(void)
 	_timer_res_t diff_per;
 
 #ifdef CONFIG_TICKLESS_IDLE
-	s32_t oldThreshold;
+	int32_t oldThreshold;
 #endif
 	int i;
 
@@ -135,7 +135,7 @@ void ticklessTestThread(void)
 
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
 	printk("Calibrated time stamp period = 0x%x%x\n",
-	       (u32_t)(cal_tsc >> 32), (u32_t)(cal_tsc & 0xFFFFFFFFLL));
+	       (uint32_t)(cal_tsc >> 32), (uint32_t)(cal_tsc & 0xFFFFFFFFLL));
 #elif defined(CONFIG_ARCH_POSIX)
 	printk("Calibrated time stamp period = %llu\n", cal_tsc);
 #elif defined(CONFIG_ARM)
@@ -180,9 +180,9 @@ void ticklessTestThread(void)
 
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
 	printk("diff  time stamp: 0x%x%x\n",
-	       (u32_t)(diff_tsc >> 32), (u32_t)(diff_tsc & 0xFFFFFFFFULL));
+	       (uint32_t)(diff_tsc >> 32), (uint32_t)(diff_tsc & 0xFFFFFFFFULL));
 	printk("Cal   time stamp: 0x%x%x\n",
-	       (u32_t)(cal_tsc >> 32), (u32_t)(cal_tsc & 0xFFFFFFFFLL));
+	       (uint32_t)(cal_tsc >> 32), (uint32_t)(cal_tsc & 0xFFFFFFFFLL));
 #elif defined(CONFIG_ARCH_POSIX)
 	printk("diff  time stamp: %llu\n", diff_tsc);
 	printk("Cal   time stamp: %llu\n", cal_tsc);
@@ -201,7 +201,7 @@ void ticklessTestThread(void)
 		diff_per = ((cal_tsc - diff_tsc) * 100U) / cal_tsc;
 	}
 
-	printk("variance in time stamp diff: %d percent\n", (s32_t)diff_per);
+	printk("variance in time stamp diff: %d percent\n", (int32_t)diff_per);
 
 	zassert_equal(diff_ticks, SLEEP_TICKS,
 		      "* TEST FAILED. TICK COUNT INCORRECT *");
diff --git a/tests/kernel/tickless/tickless/src/timestamps.c b/tests/kernel/tickless/tickless/src/timestamps.c
index 2587164517..9361714a4d 100644
--- a/tests/kernel/tickless/tickless/src/timestamps.c
+++ b/tests/kernel/tickless/tickless/src/timestamps.c
@@ -25,29 +25,29 @@
 
 #define _TIMESTAMP_NUM 0  /* set to timer # for use by timestamp (0-3) */
 
-#define _CLKGATECTRL (*((volatile u32_t *)0x400FE104))
+#define _CLKGATECTRL (*((volatile uint32_t *)0x400FE104))
 #define _CLKGATECTRL_TIMESTAMP_EN (1 << (16 + _TIMESTAMP_NUM))
 
 #define _TIMESTAMP_BASE 0x40030000
 #define _TIMESTAMP_OFFSET (0x1000 * _TIMESTAMP_NUM)
 #define _TIMESTAMP_ADDR (_TIMESTAMP_BASE + _TIMESTAMP_OFFSET)
 
-#define _TIMESTAMP_CFG (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0)))
-#define _TIMESTAMP_CTRL (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0xC)))
-#define _TIMESTAMP_MODE (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x4)))
-#define _TIMESTAMP_LOAD (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x28)))
-#define _TIMESTAMP_IMASK (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x18)))
-#define _TIMESTAMP_ISTATUS (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x1C)))
-#define _TIMESTAMP_ICLEAR (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x24)))
-#define _TIMESTAMP_VAL (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x48)))
+#define _TIMESTAMP_CFG (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0)))
+#define _TIMESTAMP_CTRL (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0xC)))
+#define _TIMESTAMP_MODE (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x4)))
+#define _TIMESTAMP_LOAD (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x28)))
+#define _TIMESTAMP_IMASK (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x18)))
+#define _TIMESTAMP_ISTATUS (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x1C)))
+#define _TIMESTAMP_ICLEAR (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x24)))
+#define _TIMESTAMP_VAL (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x48)))
 
 /*
  * Set the rollover value such that it leaves the most significant bit of
  * the returned timestamp value unused.  This allows room for extended values
  * when handling rollovers when converting to an up-counter value.
  */
-#define _TIMESTAMP_MAX ((u32_t)0x7FFFFFFF)
-#define _TIMESTAMP_EXT ((u32_t)0x80000000)
+#define _TIMESTAMP_MAX ((uint32_t)0x7FFFFFFF)
+#define _TIMESTAMP_EXT ((uint32_t)0x80000000)
 
 #define TICKS_TO_MS  (MSEC_PER_SEC / CONFIG_SYS_CLOCK_TICKS_PER_SEC)
 
@@ -90,11 +90,11 @@ void _timestamp_open(void)
  *
  * @return timestamp value
  */
-u32_t _timestamp_read(void)
+uint32_t _timestamp_read(void)
 {
-	static u32_t last_timer_val;
-	static u32_t cnt;
-	u32_t timer_val = _TIMESTAMP_VAL;
+	static uint32_t last_timer_val;
+	static uint32_t cnt;
+	uint32_t timer_val = _TIMESTAMP_VAL;
 
 	/* handle rollover for every other read (end of sleep) */
 
@@ -139,25 +139,25 @@ void _timestamp_close(void)
 
 #define _COUNTDOWN_TIMER false
 
-#define _CLKGATECTRL (*((volatile u32_t *)0x4004803C))
+#define _CLKGATECTRL (*((volatile uint32_t *)0x4004803C))
 #define _CLKGATECTRL_TIMESTAMP_EN (1 << 29)
 
-#define _SYSOPTCTRL2 (*((volatile u32_t *)0x40048004))
+#define _SYSOPTCTRL2 (*((volatile uint32_t *)0x40048004))
 #define _SYSOPTCTRL2_32KHZRTCCLK (1 << 4)
 
 #define _TIMESTAMP_ADDR (0x4003D000)
 
-#define _TIMESTAMP_ICLEAR (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x24)))
+#define _TIMESTAMP_ICLEAR (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x24)))
 
-#define _TIMESTAMP_VAL (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0)))
-#define _TIMESTAMP_PRESCALE (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x4)))
-#define _TIMESTAMP_COMP (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0xC)))
-#define _TIMESTAMP_CTRL (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x10)))
-#define _TIMESTAMP_STATUS (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x14)))
-#define _TIMESTAMP_LOCK (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x18)))
-#define _TIMESTAMP_IMASK (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x1C)))
-#define _TIMESTAMP_RACCESS (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x800)))
-#define _TIMESTAMP_WACCESS (*((volatile u32_t *)(_TIMESTAMP_ADDR + 0x804)))
+#define _TIMESTAMP_VAL (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0)))
+#define _TIMESTAMP_PRESCALE (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x4)))
+#define _TIMESTAMP_COMP (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0xC)))
+#define _TIMESTAMP_CTRL (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x10)))
+#define _TIMESTAMP_STATUS (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x14)))
+#define _TIMESTAMP_LOCK (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x18)))
+#define _TIMESTAMP_IMASK (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x1C)))
+#define _TIMESTAMP_RACCESS (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x800)))
+#define _TIMESTAMP_WACCESS (*((volatile uint32_t *)(_TIMESTAMP_ADDR + 0x804)))
 
 /**
  *
@@ -202,12 +202,12 @@ void _timestamp_open(void)
  *
  * @return timestamp value
  */
-u32_t _timestamp_read(void)
+uint32_t _timestamp_read(void)
 {
-	static u32_t last_prescale;
-	static u32_t cnt;
-	u32_t prescale1 = _TIMESTAMP_PRESCALE;
-	u32_t prescale2 = _TIMESTAMP_PRESCALE;
+	static uint32_t last_prescale;
+	static uint32_t cnt;
+	uint32_t prescale1 = _TIMESTAMP_PRESCALE;
+	uint32_t prescale2 = _TIMESTAMP_PRESCALE;
 
 	/* ensure a valid reading */
 
@@ -274,10 +274,10 @@ void _timestamp_open(void)
  *
  * @return timestamp value
  */
-u32_t _timestamp_read(void)
+uint32_t _timestamp_read(void)
 {
-	u32_t timer_val_0;
-	u32_t timer_val_1;
+	uint32_t timer_val_0;
+	uint32_t timer_val_1;
 
 	/* As RTT_VR can be updated asynchronously with the Master Clock, it
 	 * must be read twice at the same value to ensure the read value is
diff --git a/tests/kernel/tickless/tickless_concept/src/main.c b/tests/kernel/tickless/tickless_concept/src/main.c
index 91df2f49dd..fd1e9fcb65 100644
--- a/tests/kernel/tickless/tickless_concept/src/main.c
+++ b/tests/kernel/tickless/tickless_concept/src/main.c
@@ -31,24 +31,24 @@ static struct k_thread tdata[NUM_THREAD];
 #if defined(CONFIG_ARCH_POSIX)
 #define ALIGN_MS_BOUNDARY()		       \
 	do {				       \
-		u32_t t = k_uptime_get_32();   \
+		uint32_t t = k_uptime_get_32();   \
 		while (t == k_uptime_get_32()) \
 			k_busy_wait(50);       \
 	} while (0)
 #else
 #define ALIGN_MS_BOUNDARY()		       \
 	do {				       \
-		u32_t t = k_uptime_get_32();   \
+		uint32_t t = k_uptime_get_32();   \
 		while (t == k_uptime_get_32()) \
 			;		       \
 	} while (0)
 #endif
 K_SEM_DEFINE(sema, 0, NUM_THREAD);
-static s64_t elapsed_slice;
+static int64_t elapsed_slice;
 
 static void thread_tslice(void *p1, void *p2, void *p3)
 {
-	s64_t t = k_uptime_delta(&elapsed_slice);
+	int64_t t = k_uptime_delta(&elapsed_slice);
 
 	TC_PRINT("elapsed slice %lld, expected: <%lld, %lld>\n",
 		t, SLICE_SIZE, SLICE_SIZE_LIMIT);
@@ -75,7 +75,7 @@ static void thread_tslice(void *p1, void *p2, void *p3)
  */
 void test_tickless_sysclock(void)
 {
-	volatile u32_t t0, t1;
+	volatile uint32_t t0, t1;
 
 	ALIGN_MS_BOUNDARY();
 	t0 = k_uptime_get_32();
diff --git a/tests/kernel/timer/starve/src/main.c b/tests/kernel/timer/starve/src/main.c
index 536ffe3d2f..e5fed0b50f 100644
--- a/tests/kernel/timer/starve/src/main.c
+++ b/tests/kernel/timer/starve/src/main.c
@@ -14,15 +14,15 @@
 #define TIMER_DELAY_ms 500
 #define BUSY_WAIT_ms 100
 
-static volatile u32_t na;
+static volatile uint32_t na;
 
 static void handler(struct k_timer *timer)
 {
 	++na;
 }
 
-static u32_t iters;
-static u32_t now;
+static uint32_t iters;
+static uint32_t now;
 
 static const char *tag(void)
 {
@@ -37,9 +37,9 @@ static void test_starve(void)
 {
 	static struct k_timer tmr;
 	static struct k_spinlock lock;
-	u32_t stamp = 0;
-	u32_t last_now = 0;
-	u64_t last_ticks = 0;
+	uint32_t stamp = 0;
+	uint32_t last_now = 0;
+	uint64_t last_ticks = 0;
 	k_spinlock_key_t key;
 
 	TC_PRINT("Cycle clock runs at %u Hz\n",
@@ -63,7 +63,7 @@ static void test_starve(void)
 			stamp += STAMP_INTERVAL_s * MSEC_PER_SEC;
 		}
 
-		s32_t now_diff = now - last_now;
+		int32_t now_diff = now - last_now;
 
 		zassert_true(now_diff > 0,
 			     "%sTime went backwards by %d: was %u.%03u\n",
@@ -72,15 +72,15 @@ static void test_starve(void)
 		last_now = now;
 
 		/* Assume tick delta fits in printable 32 bits */
-		u64_t ticks = z_tick_get();
-		s64_t ticks_diff = ticks - last_ticks;
+		uint64_t ticks = z_tick_get();
+		int64_t ticks_diff = ticks - last_ticks;
 
 		zassert_true(ticks_diff > 0,
 			     "%sTicks went backwards by %d\n",
-			     tag(), -(s32_t)ticks_diff);
+			     tag(), -(int32_t)ticks_diff);
 		last_ticks = ticks;
 
-		u32_t na_capture = na;
+		uint32_t na_capture = na;
 
 		zassert_equal(na_capture, 0,
 			      "%sTimer alarm fired: %u\n",
diff --git a/tests/kernel/timer/timer_api/src/main.c b/tests/kernel/timer/timer_api/src/main.c
index a756c19762..b826ddbd0b 100644
--- a/tests/kernel/timer/timer_api/src/main.c
+++ b/tests/kernel/timer/timer_api/src/main.c
@@ -11,7 +11,7 @@
 struct timer_data {
 	int expire_cnt;
 	int stop_cnt;
-	s64_t timestamp;
+	int64_t timestamp;
 };
 
 #define DURATION 100
@@ -87,7 +87,7 @@ static void init_timer_data(void)
 static void duration_expire(struct k_timer *timer)
 {
 	/** TESTPOINT: expire function */
-	s64_t interval = k_uptime_delta(&tdata.timestamp);
+	int64_t interval = k_uptime_delta(&tdata.timestamp);
 
 	tdata.expire_cnt++;
 	if (tdata.expire_cnt == 1) {
@@ -127,7 +127,7 @@ static void status_expire(struct k_timer *timer)
 	}
 }
 
-static void busy_wait_ms(s32_t ms)
+static void busy_wait_ms(int32_t ms)
 {
 	k_busy_wait(ms*1000);
 }
@@ -274,8 +274,8 @@ static void tick_sync(void)
  */
 void test_timer_periodicity(void)
 {
-	u64_t period_ms = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(PERIOD));
-	s64_t delta;
+	uint64_t period_ms = k_ticks_to_ms_floor64(k_ms_to_ticks_ceil32(PERIOD));
+	int64_t delta;
 
 	/* Start at a tick boundary, otherwise a tick expiring between
 	 * the unlocked (and unlockable) start/uptime/sync steps below
@@ -565,12 +565,12 @@ void test_timer_user_data(void)
 
 void test_timer_remaining(void)
 {
-	u32_t dur_ticks = k_ms_to_ticks_ceil32(DURATION);
-	u32_t target_rem_ticks = k_ms_to_ticks_ceil32(DURATION / 2) + 1;
-	u32_t rem_ms, rem_ticks, exp_ticks;
-	s32_t delta_ticks;
-	u32_t slew_ticks;
-	u64_t now;
+	uint32_t dur_ticks = k_ms_to_ticks_ceil32(DURATION);
+	uint32_t target_rem_ticks = k_ms_to_ticks_ceil32(DURATION / 2) + 1;
+	uint32_t rem_ms, rem_ticks, exp_ticks;
+	int32_t delta_ticks;
+	uint32_t slew_ticks;
+	uint64_t now;
 
 	k_usleep(1); /* align to tick */
 
@@ -598,7 +598,7 @@ void test_timer_remaining(void)
 	 * dur_ticks/2.  Also set a threshold based on expected clock
 	 * skew.
 	 */
-	delta_ticks = (s32_t)(rem_ticks - target_rem_ticks);
+	delta_ticks = (int32_t)(rem_ticks - target_rem_ticks);
 	slew_ticks = BUSY_SLEW_THRESHOLD_TICKS(DURATION * USEC_PER_MSEC / 2U);
 	zassert_true(abs(delta_ticks) <= MAX(slew_ticks, 1U),
 		     "tick/busy slew %d larger than test threshold %u",
@@ -611,18 +611,18 @@ void test_timer_remaining(void)
 	 * delay cannot be exactly represented as an integer number of
 	 * ticks.
 	 */
-	zassert_true(((s64_t)exp_ticks - (s64_t)now) <= (dur_ticks / 2) + 1,
+	zassert_true(((int64_t)exp_ticks - (int64_t)now) <= (dur_ticks / 2) + 1,
 		     NULL);
 }
 
 void test_timeout_abs(void)
 {
 #ifdef CONFIG_TIMEOUT_64BIT
-	const u64_t exp_ms = 10000000;
-	u64_t cap_ticks;
-	u64_t rem_ticks;
-	u64_t cap2_ticks;
-	u64_t exp_ticks = k_ms_to_ticks_ceil64(exp_ms);
+	const uint64_t exp_ms = 10000000;
+	uint64_t cap_ticks;
+	uint64_t rem_ticks;
+	uint64_t cap2_ticks;
+	uint64_t exp_ticks = k_ms_to_ticks_ceil64(exp_ms);
 	k_timeout_t t = K_TIMEOUT_ABS_TICKS(exp_ticks), t2;
 
 	/* Check the other generator macros to make sure they produce
diff --git a/tests/kernel/timer/timer_api/src/timer_convert.c b/tests/kernel/timer/timer_api/src/timer_convert.c
index 0d45070356..084419f5a6 100644
--- a/tests/kernel/timer/timer_api/src/timer_convert.c
+++ b/tests/kernel/timer/timer_api/src/timer_convert.c
@@ -89,7 +89,7 @@ static struct test_rec tests[] = {
 	 TESTREC(ticks, ns, ceil, 64),
 	};
 
-u32_t get_hz(enum units u)
+uint32_t get_hz(enum units u)
 {
 	if (u == UNIT_ticks) {
 		return CONFIG_SYS_CLOCK_TICKS_PER_SEC;
@@ -106,24 +106,24 @@ u32_t get_hz(enum units u)
 	return 0;
 }
 
-void test_conversion(struct test_rec *t, u64_t val)
+void test_conversion(struct test_rec *t, uint64_t val)
 {
-	u32_t from_hz = get_hz(t->src), to_hz = get_hz(t->dst);
-	u64_t result;
+	uint32_t from_hz = get_hz(t->src), to_hz = get_hz(t->dst);
+	uint64_t result;
 
 	if (t->precision == 32) {
-		u32_t (*convert)(u32_t) = (u32_t (*)(u32_t)) t->func;
+		uint32_t (*convert)(uint32_t) = (uint32_t (*)(uint32_t)) t->func;
 
-		result = convert((u32_t) val);
+		result = convert((uint32_t) val);
 
 		/* If the input value legitimately overflows, then
 		 * there is nothing to test
 		 */
-		if ((val * to_hz) >= ((((u64_t)from_hz) << 32))) {
+		if ((val * to_hz) >= ((((uint64_t)from_hz) << 32))) {
 			return;
 		}
 	} else {
-		u64_t (*convert)(u64_t) = (u64_t (*)(u64_t)) t->func;
+		uint64_t (*convert)(uint64_t) = (uint64_t (*)(uint64_t)) t->func;
 
 		result = convert(val);
 	}
@@ -140,18 +140,18 @@ void test_conversion(struct test_rec *t, u64_t val)
 	 * up, or [-from_hz/2:from_hz/2] if we are rounding to the
 	 * nearest.
 	 */
-	s64_t diff = (s64_t)(val * to_hz - result * from_hz);
-	s64_t maxdiff, mindiff;
+	int64_t diff = (int64_t)(val * to_hz - result * from_hz);
+	int64_t maxdiff, mindiff;
 
 	if (t->round == ROUND_floor) {
 		maxdiff = from_hz - 1;
 		mindiff = 0;
 	} else if (t->round == ROUND_ceil) {
 		maxdiff = 0;
-		mindiff = -(s64_t)(from_hz-1);
+		mindiff = -(int64_t)(from_hz-1);
 	} else {
 		maxdiff = from_hz/2;
-		mindiff = -(s64_t)(from_hz/2);
+		mindiff = -(int64_t)(from_hz/2);
 	}
 
 	zassert_true(diff <= maxdiff && diff >= mindiff,
diff --git a/tests/kernel/timer/timer_monotonic/src/main.c b/tests/kernel/timer/timer_monotonic/src/main.c
index d674face25..866e7ee0f2 100644
--- a/tests/kernel/timer/timer_monotonic/src/main.c
+++ b/tests/kernel/timer/timer_monotonic/src/main.c
@@ -10,7 +10,7 @@
 
 int test_frequency(void)
 {
-	u32_t start, end, delta, pct;
+	uint32_t start, end, delta, pct;
 
 	TC_PRINT("Testing system tick frequency\n");
 
@@ -19,7 +19,7 @@ int test_frequency(void)
 	end = k_cycle_get_32();
 
 	delta = end - start;
-	pct = (u64_t)delta * 100U / sys_clock_hw_cycles_per_sec();
+	pct = (uint64_t)delta * 100U / sys_clock_hw_cycles_per_sec();
 
 	printk("delta: %u  expected: %u  %u%%\n", delta,
 	       sys_clock_hw_cycles_per_sec(), pct);
@@ -49,8 +49,8 @@ int test_frequency(void)
  */
 void test_timer(void)
 {
-	u32_t t_last, t_now, i, errors;
-	s32_t diff;
+	uint32_t t_last, t_now, i, errors;
+	int32_t diff;
 
 	errors = 0U;
 
diff --git a/tests/kernel/workq/critical/src/main.c b/tests/kernel/workq/critical/src/main.c
index 4bc48015fb..44fa9107b0 100644
--- a/tests/kernel/workq/critical/src/main.c
+++ b/tests/kernel/workq/critical/src/main.c
@@ -38,8 +38,8 @@
 #endif
 
 
-static u32_t critical_var;
-static u32_t alt_thread_iterations;
+static uint32_t critical_var;
+static uint32_t alt_thread_iterations;
 
 static struct k_work_q offload_work_q;
 static K_THREAD_STACK_DEFINE(offload_work_q_stack,
@@ -64,7 +64,7 @@ K_SEM_DEFINE(TEST_SEM, 0, UINT_MAX);
  */
 void critical_rtn(struct k_work *unused)
 {
-	volatile u32_t x;
+	volatile uint32_t x;
 
 	ARG_UNUSED(unused);
 
@@ -80,20 +80,20 @@ void critical_rtn(struct k_work *unused)
  *
  * @return number of critical section calls made by a thread
  */
-u32_t critical_loop(const char *tag, u32_t count)
+uint32_t critical_loop(const char *tag, uint32_t count)
 {
-	s64_t now;
-	s64_t last;
-	s64_t mseconds;
+	int64_t now;
+	int64_t last;
+	int64_t mseconds;
 
 	last = mseconds = k_uptime_get();
-	TC_PRINT("Start %s at %u\n", tag, (u32_t)last);
+	TC_PRINT("Start %s at %u\n", tag, (uint32_t)last);
 	while (((now = k_uptime_get())) < mseconds + NUM_MILLISECONDS) {
 		struct k_work work_item;
 
 		if (now < last) {
 			TC_PRINT("Time went backwards: %u < %u\n",
-				 (u32_t)now, (u32_t)last);
+				 (uint32_t)now, (uint32_t)last);
 		}
 		last = now;
 
@@ -109,7 +109,7 @@ u32_t critical_loop(const char *tag, u32_t count)
 		 */
 #endif
 	}
-	TC_PRINT("End %s at %u\n", tag, (u32_t)now);
+	TC_PRINT("End %s at %u\n", tag, (uint32_t)now);
 
 	return count;
 }
@@ -148,7 +148,7 @@ void alternate_thread(void *arg1, void *arg2, void *arg3)
 
 void regression_thread(void *arg1, void *arg2, void *arg3)
 {
-	u32_t ncalls = 0U;
+	uint32_t ncalls = 0U;
 
 	ARG_UNUSED(arg1);
 	ARG_UNUSED(arg2);
diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c
index 9e2f86816e..6802aaaf5f 100644
--- a/tests/kernel/workq/work_queue/src/main.c
+++ b/tests/kernel/workq/work_queue/src/main.c
@@ -368,7 +368,7 @@ static void coop_delayed_work_resubmit(void)
 #if defined(CONFIG_ARCH_POSIX)
 		k_busy_wait(1000);
 #else
-		volatile u32_t uptime;
+		volatile uint32_t uptime;
 		uptime = k_uptime_get_32();
 		while (k_uptime_get_32() == uptime) {
 		}
diff --git a/tests/kernel/workq/work_queue_api/src/main.c b/tests/kernel/workq/work_queue_api/src/main.c
index cf60897282..f0a81f51e4 100644
--- a/tests/kernel/workq/work_queue_api/src/main.c
+++ b/tests/kernel/workq/work_queue_api/src/main.c
@@ -124,8 +124,8 @@ static void tdelayed_work_submit_1(struct k_work_q *work_q,
 				   struct k_delayed_work *w,
 				   k_work_handler_t handler)
 {
-	s32_t time_remaining;
-	s32_t timeout_ticks;
+	int32_t time_remaining;
+	int32_t timeout_ticks;
 
 	/**TESTPOINT: init via k_delayed_work_init*/
 	k_delayed_work_init(w, handler);
diff --git a/tests/kernel/xip/src/main.c b/tests/kernel/xip/src/main.c
index 0dd26639d3..f60a30b23c 100644
--- a/tests/kernel/xip/src/main.c
+++ b/tests/kernel/xip/src/main.c
@@ -30,13 +30,13 @@
 
 #define XIP_TEST_ARRAY_SZ 4
 
-extern u32_t xip_array[XIP_TEST_ARRAY_SZ];
+extern uint32_t xip_array[XIP_TEST_ARRAY_SZ];
 
 /*
  * This array is deliberately defined outside of the scope of the main test
  * module to avoid optimization issues.
  */
-u32_t xip_array[XIP_TEST_ARRAY_SZ] = {
+uint32_t xip_array[XIP_TEST_ARRAY_SZ] = {
 	TEST_VAL_1, TEST_VAL_2, TEST_VAL_3, TEST_VAL_4};
 
 /**
diff --git a/tests/lib/c_lib/src/main.c b/tests/lib/c_lib/src/main.c
index ae2929e738..8a5f47ada0 100644
--- a/tests/lib/c_lib/src/main.c
+++ b/tests/lib/c_lib/src/main.c
@@ -107,8 +107,8 @@ void test_stddef(void)
  * to prevent compiler from computing results at compile time
  */
 
-volatile u8_t unsigned_byte = 0xff;
-volatile u32_t unsigned_int = 0xffffff00;
+volatile uint8_t unsigned_byte = 0xff;
+volatile uint32_t unsigned_int = 0xffffff00;
 
 /**
  *
diff --git a/tests/lib/cmsis_dsp/basicmath/src/f32.c b/tests/lib/cmsis_dsp/basicmath/src/f32.c
index f691e0c546..dbef57ab67 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/f32.c
@@ -17,7 +17,7 @@
 #define REL_ERROR_THRESH	(5.0e-5)
 
 static void test_arm_add_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -49,7 +49,7 @@ DEFINE_TEST_VARIANT4(arm_add_f32, 8, in_com1, in_com2, ref_add, 8);
 DEFINE_TEST_VARIANT4(arm_add_f32, 11, in_com1, in_com2, ref_add, 11);
 
 static void test_arm_sub_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -81,7 +81,7 @@ DEFINE_TEST_VARIANT4(arm_sub_f32, 8, in_com1, in_com2, ref_sub, 8);
 DEFINE_TEST_VARIANT4(arm_sub_f32, 11, in_com1, in_com2, ref_sub, 11);
 
 static void test_arm_mult_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -113,7 +113,7 @@ DEFINE_TEST_VARIANT4(arm_mult_f32, 8, in_com1, in_com2, ref_mult, 8);
 DEFINE_TEST_VARIANT4(arm_mult_f32, 11, in_com1, in_com2, ref_mult, 11);
 
 static void test_arm_negate_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
@@ -144,7 +144,7 @@ DEFINE_TEST_VARIANT3(arm_negate_f32, 8, in_com1, ref_negate, 8);
 DEFINE_TEST_VARIANT3(arm_negate_f32, 11, in_com1, ref_negate, 11);
 
 static void test_arm_offset_f32(
-	const u32_t *input1, float32_t scalar, const u32_t *ref,
+	const uint32_t *input1, float32_t scalar, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -176,7 +176,7 @@ DEFINE_TEST_VARIANT4(arm_offset_f32, 0p5_8, in_com1, 0.5f, ref_offset, 8);
 DEFINE_TEST_VARIANT4(arm_offset_f32, 0p5_11, in_com1, 0.5f, ref_offset, 11);
 
 static void test_arm_scale_f32(
-	const u32_t *input1, float32_t scalar, const u32_t *ref,
+	const uint32_t *input1, float32_t scalar, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -208,7 +208,7 @@ DEFINE_TEST_VARIANT4(arm_scale_f32, 0p5_8, in_com1, 0.5f, ref_scale, 8);
 DEFINE_TEST_VARIANT4(arm_scale_f32, 0p5_11, in_com1, 0.5f, ref_scale, 11);
 
 static void test_arm_dot_prod_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -241,7 +241,7 @@ DEFINE_TEST_VARIANT4(arm_dot_prod_f32, 8, in_com1, in_com2, ref_dot_prod_4, 8);
 DEFINE_TEST_VARIANT4(arm_dot_prod_f32, 11, in_com1, in_com2, ref_dot_prod_4n1, 11);
 
 static void test_arm_abs_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.c b/tests/lib/cmsis_dsp/basicmath/src/q15.c
index 10c9c0fc87..e6bde058a3 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q15.c
@@ -293,13 +293,13 @@ DEFINE_TEST_VARIANT3(arm_shift_q15, possat, in_maxpos, ref_shift_possat, 17);
 DEFINE_TEST_VARIANT3(arm_shift_q15, negsat, in_maxneg, ref_shift_negsat, 17);
 
 static void test_arm_and_u16(
-	const u16_t *input1, const u16_t *input2, const u16_t *ref,
+	const uint16_t *input1, const uint16_t *input2, const uint16_t *ref,
 	size_t length)
 {
-	u16_t *output;
+	uint16_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u16_t));
+	output = malloc(length * sizeof(uint16_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -319,13 +319,13 @@ DEFINE_TEST_VARIANT4(arm_and_u16, 16, in_bitwise1, in_bitwise2, ref_and, 16);
 DEFINE_TEST_VARIANT4(arm_and_u16, 23, in_bitwise1, in_bitwise2, ref_and, 23);
 
 static void test_arm_or_u16(
-	const u16_t *input1, const u16_t *input2, const u16_t *ref,
+	const uint16_t *input1, const uint16_t *input2, const uint16_t *ref,
 	size_t length)
 {
-	u16_t *output;
+	uint16_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u16_t));
+	output = malloc(length * sizeof(uint16_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -345,12 +345,12 @@ DEFINE_TEST_VARIANT4(arm_or_u16, 16, in_bitwise1, in_bitwise2, ref_or, 16);
 DEFINE_TEST_VARIANT4(arm_or_u16, 23, in_bitwise1, in_bitwise2, ref_or, 23);
 
 static void test_arm_not_u16(
-	const u16_t *input1, const u16_t *ref, size_t length)
+	const uint16_t *input1, const uint16_t *ref, size_t length)
 {
-	u16_t *output;
+	uint16_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u16_t));
+	output = malloc(length * sizeof(uint16_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -370,13 +370,13 @@ DEFINE_TEST_VARIANT3(arm_not_u16, 16, in_bitwise1, ref_not, 16);
 DEFINE_TEST_VARIANT3(arm_not_u16, 23, in_bitwise1, ref_not, 23);
 
 static void test_arm_xor_u16(
-	const u16_t *input1, const u16_t *input2, const u16_t *ref,
+	const uint16_t *input1, const uint16_t *input2, const uint16_t *ref,
 	size_t length)
 {
-	u16_t *output;
+	uint16_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u16_t));
+	output = malloc(length * sizeof(uint16_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q15.pat b/tests/lib/cmsis_dsp/basicmath/src/q15.pat
index 799f27d901..de2c9b234d 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q15.pat
+++ b/tests/lib/cmsis_dsp/basicmath/src/q15.pat
@@ -433,25 +433,25 @@ static const q15_t ref_shift_negsat[17] = {
     0x8000
     };
 
-static const u16_t ref_and[23] = {
+static const uint16_t ref_and[23] = {
     0x628A, 0x903A, 0x4220, 0x5A01, 0x4000, 0x0308, 0x0010, 0x2AA2,
     0x0148, 0x1510, 0x0108, 0x0182, 0x2A32, 0x0213, 0x2732, 0x8A50,
     0x3408, 0xACD0, 0x0910, 0x04E0, 0x40D0, 0x2014, 0x2410
     };
 
-static const u16_t ref_or[23] = {
+static const uint16_t ref_or[23] = {
     0xFFBF, 0xDC7F, 0xD33C, 0xDFB7, 0xDE5F, 0xB3AC, 0x2BFE, 0xEAF3,
     0x4D6B, 0xF57F, 0x77FE, 0xDDFF, 0x7BFB, 0xD7BF, 0xFFF6, 0xDAFF,
     0x3FEF, 0xEDFF, 0xBB3D, 0xE7F3, 0xDAFF, 0xF754, 0x7DFD
     };
 
-static const u16_t ref_not[23] = {
+static const uint16_t ref_not[23] = {
     0x1845, 0x67C5, 0xADCB, 0xA07E, 0xBDB2, 0x4C73, 0xDEEB, 0xD51D,
     0xFA97, 0x2A88, 0xDA87, 0x7258, 0x8585, 0xF8EC, 0x988D, 0x352E,
     0xC0F2, 0x130F, 0x54CE, 0x7B1E, 0x3709, 0x8BAB, 0x9A86
     };
 
-static const u16_t ref_xor[23] = {
+static const uint16_t ref_xor[23] = {
     0x9D35, 0x4C45, 0x911C, 0x85B6, 0x9E5F, 0xB0A4, 0x2BEE, 0xC051,
     0x4C23, 0xE06F, 0x76F6, 0xDC7D, 0x51C9, 0xD5AC, 0xD8C4, 0x50AF,
     0x0BE7, 0x412F, 0xB22D, 0xE313, 0x9A2F, 0xD740, 0x59ED
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.c b/tests/lib/cmsis_dsp/basicmath/src/q31.c
index a2b9c5052a..a77163cbd3 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q31.c
@@ -288,12 +288,12 @@ DEFINE_TEST_VARIANT3(arm_shift_q31, possat, in_maxpos, ref_shift_possat, 9);
 DEFINE_TEST_VARIANT3(arm_shift_q31, negsat, in_maxneg, ref_shift_negsat, 9);
 
 static void test_arm_and_u32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref, size_t length)
 {
-	u32_t *output;
+	uint32_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u32_t));
+	output = malloc(length * sizeof(uint32_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -313,12 +313,12 @@ DEFINE_TEST_VARIANT4(arm_and_u32, 8, in_bitwise1, in_bitwise2, ref_and, 8);
 DEFINE_TEST_VARIANT4(arm_and_u32, 11, in_bitwise1, in_bitwise2, ref_and, 11);
 
 static void test_arm_or_u32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref, size_t length)
 {
-	u32_t *output;
+	uint32_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u32_t));
+	output = malloc(length * sizeof(uint32_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -338,12 +338,12 @@ DEFINE_TEST_VARIANT4(arm_or_u32, 8, in_bitwise1, in_bitwise2, ref_or, 8);
 DEFINE_TEST_VARIANT4(arm_or_u32, 11, in_bitwise1, in_bitwise2, ref_or, 11);
 
 static void test_arm_not_u32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
-	u32_t *output;
+	uint32_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u32_t));
+	output = malloc(length * sizeof(uint32_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -363,12 +363,12 @@ DEFINE_TEST_VARIANT3(arm_not_u32, 8, in_bitwise1, ref_not, 8);
 DEFINE_TEST_VARIANT3(arm_not_u32, 11, in_bitwise1, ref_not, 11);
 
 static void test_arm_xor_u32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref, size_t length)
 {
-	u32_t *output;
+	uint32_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u32_t));
+	output = malloc(length * sizeof(uint32_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q31.pat b/tests/lib/cmsis_dsp/basicmath/src/q31.pat
index 6bfa4a21f1..cb5f75a350 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q31.pat
+++ b/tests/lib/cmsis_dsp/basicmath/src/q31.pat
@@ -721,25 +721,25 @@ static const q31_t ref_shift_negsat[9] = {
     0x80000000
     };
 
-static const u32_t ref_and[11] = {
+static const uint32_t ref_and[11] = {
     0x0418E004, 0x04002208, 0x4A100080, 0x40394D00,
     0x2140A805, 0xC2C08210, 0x81002C20, 0x40031182,
     0x22180104, 0x25029904, 0x2008430E
     };
 
-static const u32_t ref_or[11] = {
+static const uint32_t ref_or[11] = {
     0x977DFFCF, 0x7FC7AEDB, 0xCF177BBF, 0xFE3F7D89,
     0xF7FFFFFD, 0xF6C7CFFF, 0x9D6D3C7D, 0xEFEF7BDA,
     0x6B5ADFE6, 0xF5CFDFBC, 0xBB7FF73F
     };
 
-static const u32_t ref_not[11] = {
+static const uint32_t ref_not[11] = {
     0x7AC61631, 0xD07BD5B6, 0x34EC8443, 0x0DC482F6,
     0x0C8A522A, 0x393B306D, 0x76B6D38F, 0x16D0AC35,
     0x95A5E619, 0x8A7562E3, 0xCEC5B8C1
     };
 
-static const u32_t ref_xor[11] = {
+static const uint32_t ref_xor[11] = {
     0x93651FCB, 0x7BC78CD3, 0x85077B3F, 0xBE063089,
     0xD6BF57F8, 0x34074DEF, 0x1C6D105D, 0xAFEC6A58,
     0x4942DEE2, 0xD0CD46B8, 0x9B77B431
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.c b/tests/lib/cmsis_dsp/basicmath/src/q7.c
index be7f9507dc..b33c09cb14 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.c
+++ b/tests/lib/cmsis_dsp/basicmath/src/q7.c
@@ -289,12 +289,12 @@ DEFINE_TEST_VARIANT3(arm_shift_q7, possat, in_maxpos, ref_shift_possat, 33);
 DEFINE_TEST_VARIANT3(arm_shift_q7, negsat, in_maxneg, ref_shift_negsat, 33);
 
 static void test_arm_and_u8(
-	const u8_t *input1, const u8_t *input2, const u8_t *ref, size_t length)
+	const uint8_t *input1, const uint8_t *input2, const uint8_t *ref, size_t length)
 {
-	u8_t *output;
+	uint8_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u8_t));
+	output = malloc(length * sizeof(uint8_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -314,12 +314,12 @@ DEFINE_TEST_VARIANT4(arm_and_u8, 32, in_bitwise1, in_bitwise2, ref_and, 32);
 DEFINE_TEST_VARIANT4(arm_and_u8, 47, in_bitwise1, in_bitwise2, ref_and, 47);
 
 static void test_arm_or_u8(
-	const u8_t *input1, const u8_t *input2, const u8_t *ref, size_t length)
+	const uint8_t *input1, const uint8_t *input2, const uint8_t *ref, size_t length)
 {
-	u8_t *output;
+	uint8_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u8_t));
+	output = malloc(length * sizeof(uint8_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -339,12 +339,12 @@ DEFINE_TEST_VARIANT4(arm_or_u8, 32, in_bitwise1, in_bitwise2, ref_or, 32);
 DEFINE_TEST_VARIANT4(arm_or_u8, 47, in_bitwise1, in_bitwise2, ref_or, 47);
 
 static void test_arm_not_u8(
-	const u8_t *input1, const u8_t *ref, size_t length)
+	const uint8_t *input1, const uint8_t *ref, size_t length)
 {
-	u8_t *output;
+	uint8_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u8_t));
+	output = malloc(length * sizeof(uint8_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
@@ -364,12 +364,12 @@ DEFINE_TEST_VARIANT3(arm_not_u8, 32, in_bitwise1, ref_not, 32);
 DEFINE_TEST_VARIANT3(arm_not_u8, 47, in_bitwise1, ref_not, 47);
 
 static void test_arm_xor_u8(
-	const u8_t *input1, const u8_t *input2, const u8_t *ref, size_t length)
+	const uint8_t *input1, const uint8_t *input2, const uint8_t *ref, size_t length)
 {
-	u8_t *output;
+	uint8_t *output;
 
 	/* Allocate output buffer */
-	output = malloc(length * sizeof(u8_t));
+	output = malloc(length * sizeof(uint8_t));
 	zassert_not_null(output, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	/* Run test function */
diff --git a/tests/lib/cmsis_dsp/basicmath/src/q7.pat b/tests/lib/cmsis_dsp/basicmath/src/q7.pat
index 4ee419b6aa..17db2a00be 100644
--- a/tests/lib/cmsis_dsp/basicmath/src/q7.pat
+++ b/tests/lib/cmsis_dsp/basicmath/src/q7.pat
@@ -471,7 +471,7 @@ static const q7_t ref_shift_negsat[33] = {
     0x80
     };
 
-static const u8_t ref_and[47] = {
+static const uint8_t ref_and[47] = {
     0x80, 0x08, 0x42, 0x24, 0x44, 0x88, 0x10, 0x06,
     0xF8, 0x42, 0x46, 0x00, 0x28, 0x3B, 0x80, 0x00,
     0x98, 0x2F, 0x40, 0x08, 0x00, 0x00, 0xDE, 0x04,
@@ -480,7 +480,7 @@ static const u8_t ref_and[47] = {
     0x00, 0x04, 0x00, 0x22, 0x41, 0x18, 0x15
     };
 
-static const u8_t ref_or[47] = {
+static const uint8_t ref_or[47] = {
     0xEC, 0x6F, 0xFF, 0xAF, 0x5F, 0xFD, 0x70, 0xA7,
     0xF9, 0x7F, 0xFF, 0xDF, 0xFB, 0x7B, 0xEF, 0x5F,
     0xFE, 0xAF, 0xF6, 0x6C, 0x2E, 0x4F, 0xDE, 0x4E,
@@ -489,7 +489,7 @@ static const u8_t ref_or[47] = {
     0xBD, 0x6F, 0x73, 0xF6, 0xFF, 0xDC, 0xB5
     };
 
-static const u8_t ref_not[47] = {
+static const uint8_t ref_not[47] = {
     0x77, 0xD7, 0x25, 0x59, 0xBB, 0x46, 0xAF, 0xF8,
     0x06, 0x9D, 0x91, 0xB5, 0xD7, 0x84, 0x3A, 0xF6,
     0x43, 0xD0, 0x1F, 0xF3, 0xD9, 0xF8, 0x21, 0xB3,
@@ -498,7 +498,7 @@ static const u8_t ref_not[47] = {
     0xD6, 0xBB, 0xED, 0x4D, 0x90, 0xA7, 0xCA
     };
 
-static const u8_t ref_xor[47] = {
+static const uint8_t ref_xor[47] = {
     0x6C, 0x67, 0xBD, 0x8B, 0x1B, 0x75, 0x60, 0xA1,
     0x01, 0x3D, 0xB9, 0xDF, 0xD3, 0x40, 0x6F, 0x5F,
     0x66, 0x80, 0xB6, 0x64, 0x2E, 0x4F, 0x00, 0x4A,
diff --git a/tests/lib/cmsis_dsp/bayes/src/f32.c b/tests/lib/cmsis_dsp/bayes/src/f32.c
index ed13b79f1e..01e32f0809 100644
--- a/tests/lib/cmsis_dsp/bayes/src/f32.c
+++ b/tests/lib/cmsis_dsp/bayes/src/f32.c
@@ -20,14 +20,14 @@ void test_gaussian_naive_bayes_predict_f32(void)
 	arm_gaussian_naive_bayes_instance_f32 inst;
 
 	size_t index;
-	const u16_t pattern_count = in_dims[0];
-	const u16_t class_count = in_dims[1];
-	const u16_t vec_dims = in_dims[2];
+	const uint16_t pattern_count = in_dims[0];
+	const uint16_t class_count = in_dims[1];
+	const uint16_t vec_dims = in_dims[2];
 
 	const float32_t *params = (const float32_t *)in_param;
 	const float32_t *input = (const float32_t *)in_val;
 	float32_t *output_probs_buf, *output_probs;
-	u16_t *output_preds_buf, *output_preds;
+	uint16_t *output_preds_buf, *output_preds;
 
 	/* Initialise instance */
 	inst.vectorDimension = vec_dims;
@@ -43,7 +43,7 @@ void test_gaussian_naive_bayes_predict_f32(void)
 	zassert_not_null(output_probs_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output_preds_buf =
-		malloc(pattern_count * sizeof(u16_t));
+		malloc(pattern_count * sizeof(uint16_t));
 	zassert_not_null(output_preds_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output_probs = output_probs_buf;
diff --git a/tests/lib/cmsis_dsp/common/math_helper.h b/tests/lib/cmsis_dsp/common/math_helper.h
index 67a35ea6a2..9b259e17b7 100644
--- a/tests/lib/cmsis_dsp/common/math_helper.h
+++ b/tests/lib/cmsis_dsp/common/math_helper.h
@@ -45,7 +45,7 @@
  * @brief  Calculation of SNR
  * @param  float*   Pointer to the reference buffer
  * @param  float*   Pointer to the test buffer
- * @param  u32_t    total number of samples
+ * @param  uint32_t    total number of samples
  * @return float    SNR
  * The function calculates signal to noise ratio for the reference output
  * and test output
@@ -71,10 +71,10 @@
 	} while (0)
 
 static inline double arm_snr_f64(const double *pRef, const double *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	double EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	double SNR;
 
 	for (i = 0; i < buffSize; i++) {
@@ -101,10 +101,10 @@ static inline double arm_snr_f64(const double *pRef, const double *pTest,
 }
 
 static inline float arm_snr_f32(const float *pRef, const float *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	float EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	float SNR;
 
 	for (i = 0; i < buffSize; i++) {
@@ -132,10 +132,10 @@ static inline float arm_snr_f32(const float *pRef, const float *pTest,
 }
 
 static inline float arm_snr_q63(const q63_t *pRef, const q63_t *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	double EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	float SNR;
 
 	double testVal, refVal;
@@ -159,10 +159,10 @@ static inline float arm_snr_q63(const q63_t *pRef, const q63_t *pTest,
 }
 
 static inline float arm_snr_q31(const q31_t *pRef, const q31_t *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	float EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	float SNR;
 
 	float32_t testVal, refVal;
@@ -187,10 +187,10 @@ static inline float arm_snr_q31(const q31_t *pRef, const q31_t *pTest,
 }
 
 static inline float arm_snr_q15(const q15_t *pRef, const q15_t *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	float EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	float SNR;
 
 	float32_t testVal, refVal;
@@ -213,10 +213,10 @@ static inline float arm_snr_q15(const q15_t *pRef, const q15_t *pTest,
 }
 
 static inline float arm_snr_q7(const q7_t *pRef, const q7_t *pTest,
-	u32_t buffSize)
+	uint32_t buffSize)
 {
 	float EnergySignal = 0.0, EnergyError = 0.0;
-	u32_t i;
+	uint32_t i;
 	float SNR;
 
 	float32_t testVal, refVal;
diff --git a/tests/lib/cmsis_dsp/complexmath/src/f32.c b/tests/lib/cmsis_dsp/complexmath/src/f32.c
index c6685eaeef..a2d4b2b4e3 100644
--- a/tests/lib/cmsis_dsp/complexmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/complexmath/src/f32.c
@@ -17,7 +17,7 @@
 #define REL_ERROR_THRESH	(7.0e-6)
 
 static void test_arm_cmplx_conj_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	size_t buf_length;
 	float32_t *output;
@@ -52,7 +52,7 @@ DEFINE_TEST_VARIANT3(arm_cmplx_conj_f32, 8, in_com1, ref_conj, 8);
 DEFINE_TEST_VARIANT3(arm_cmplx_conj_f32, 11, in_com1, ref_conj, 11);
 
 static void test_arm_cmplx_dot_prod_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	float32_t *output;
@@ -86,7 +86,7 @@ DEFINE_TEST_VARIANT4(arm_cmplx_dot_prod_f32, 8, in_com1, in_com2, ref_dot_prod_4
 DEFINE_TEST_VARIANT4(arm_cmplx_dot_prod_f32, 11, in_com1, in_com2, ref_dot_prod_4n1, 11);
 
 static void test_arm_cmplx_mag_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
@@ -117,7 +117,7 @@ DEFINE_TEST_VARIANT3(arm_cmplx_mag_f32, 8, in_com1, ref_mag, 8);
 DEFINE_TEST_VARIANT3(arm_cmplx_mag_f32, 11, in_com1, ref_mag, 11);
 
 static void test_arm_cmplx_mag_squared_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
@@ -148,7 +148,7 @@ DEFINE_TEST_VARIANT3(arm_cmplx_mag_squared_f32, 8, in_com1, ref_mag_squared, 8);
 DEFINE_TEST_VARIANT3(arm_cmplx_mag_squared_f32, 11, in_com1, ref_mag_squared, 11);
 
 static void test_arm_cmplx_mult_cmplx_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	size_t buf_length;
@@ -185,7 +185,7 @@ DEFINE_TEST_VARIANT4(arm_cmplx_mult_cmplx_f32, 8, in_com1, in_com2, ref_mult_cmp
 DEFINE_TEST_VARIANT4(arm_cmplx_mult_cmplx_f32, 11, in_com1, in_com2, ref_mult_cmplx, 11);
 
 static void test_arm_cmplx_mult_real_f32(
-	const u32_t *input1, const u32_t *input2, const u32_t *ref,
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref,
 	size_t length)
 {
 	size_t buf_length;
diff --git a/tests/lib/cmsis_dsp/distance/src/f32.c b/tests/lib/cmsis_dsp/distance/src/f32.c
index 2f09440509..3fd83b42db 100644
--- a/tests/lib/cmsis_dsp/distance/src/f32.c
+++ b/tests/lib/cmsis_dsp/distance/src/f32.c
@@ -28,8 +28,8 @@
 #define OP_JENSENSHANNON	(7)
 #define OP_MINKOWSKI		(8)
 
-static void test_arm_distance(int op, bool scratchy, const u16_t *dims,
-	const u32_t *dinput1, const u32_t *dinput2, const u32_t *ref)
+static void test_arm_distance(int op, bool scratchy, const uint16_t *dims,
+	const uint32_t *dinput1, const uint32_t *dinput2, const uint32_t *ref)
 {
 	size_t index;
 	const size_t length = DIMS_IN;
@@ -155,7 +155,7 @@ static void test_arm_distance_minkowski(void)
 	size_t index;
 	const size_t length = in_dims_minkowski[0];
 	const size_t dims_vec = in_dims_minkowski[1];
-	const u16_t *dims = in_dims_minkowski + 2;
+	const uint16_t *dims = in_dims_minkowski + 2;
 	const float32_t *input1 = (const float32_t *)in_com1;
 	const float32_t *input2 = (const float32_t *)in_com2;
 	float32_t *output;
diff --git a/tests/lib/cmsis_dsp/distance/src/u32.c b/tests/lib/cmsis_dsp/distance/src/u32.c
index 4cfbf9284f..7abc6fe95c 100644
--- a/tests/lib/cmsis_dsp/distance/src/u32.c
+++ b/tests/lib/cmsis_dsp/distance/src/u32.c
@@ -30,7 +30,7 @@
 #define OP_YULE			(8)
 
 static void test_arm_distance(int op, const uint16_t *dims,
-	const u32_t *input1, const u32_t *input2, const u32_t *ref)
+	const uint32_t *input1, const uint32_t *input2, const uint32_t *ref)
 {
 	size_t index;
 	const size_t length = DIMS_IN;
diff --git a/tests/lib/cmsis_dsp/fastmath/src/f32.c b/tests/lib/cmsis_dsp/fastmath/src/f32.c
index 7c6c32e0cc..99cf8d3172 100644
--- a/tests/lib/cmsis_dsp/fastmath/src/f32.c
+++ b/tests/lib/cmsis_dsp/fastmath/src/f32.c
@@ -120,7 +120,7 @@ static void test_arm_sqrt_f32(void)
 }
 
 static void test_arm_vlog_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
@@ -152,7 +152,7 @@ DEFINE_TEST_VARIANT3(arm_vlog_f32, 8, in_log, ref_log, 8);
 DEFINE_TEST_VARIANT3(arm_vlog_f32, 11, in_log, ref_log, 11);
 
 static void test_arm_vexp_f32(
-	const u32_t *input1, const u32_t *ref, size_t length)
+	const uint32_t *input1, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
index b6790d951c..ef266b5843 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f32.c
@@ -119,7 +119,7 @@ static void test_arm_biquad_cascade_df1_f32_rand(void)
 	size_t sample_index, stage_count, block_size;
 	size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
 	size_t length = ARRAY_SIZE(ref_rand_mono);
-	const u16_t *config = in_rand_config;
+	const uint16_t *config = in_rand_config;
 	const float32_t *input = (const float32_t *)in_rand_mono_val;
 	const float32_t *coeff = (const float32_t *)in_rand_coeff;
 	const float32_t *ref = (const float32_t *)ref_rand_mono;
@@ -176,7 +176,7 @@ static void test_arm_biquad_cascade_df2t_f32_rand(void)
 	size_t sample_index, stage_count, block_size;
 	size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
 	size_t length = ARRAY_SIZE(ref_rand_mono);
-	const u16_t *config = in_rand_config;
+	const uint16_t *config = in_rand_config;
 	const float32_t *input = (const float32_t *)in_rand_mono_val;
 	const float32_t *coeff = (const float32_t *)in_rand_coeff;
 	const float32_t *ref = (const float32_t *)ref_rand_mono;
@@ -233,7 +233,7 @@ static void test_arm_biquad_cascade_stereo_df2t_f32_rand(void)
 	size_t sample_index, stage_count, block_size;
 	size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
 	size_t length = ARRAY_SIZE(ref_rand_stereo);
-	const u16_t *config = in_rand_config;
+	const uint16_t *config = in_rand_config;
 	const float32_t *input = (const float32_t *)in_rand_stereo_val;
 	const float32_t *coeff = (const float32_t *)in_rand_coeff;
 	const float32_t *ref = (const float32_t *)ref_rand_stereo;
diff --git a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
index 9b47263e98..a0fe336521 100644
--- a/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
+++ b/tests/lib/cmsis_dsp/filtering/src/biquad_f64.c
@@ -71,7 +71,7 @@ static void test_arm_biquad_cascade_df2t_f64_rand(void)
 	size_t sample_index, stage_count, block_size;
 	size_t sample_count = ARRAY_SIZE(in_rand_config) / 2;
 	size_t length = ARRAY_SIZE(ref_rand_mono);
-	const u16_t *config = in_rand_config;
+	const uint16_t *config = in_rand_config;
 	const float64_t *input = (const float64_t *)in_rand_mono_val;
 	const float64_t *coeff = (const float64_t *)in_rand_coeff;
 	const float64_t *ref = (const float64_t *)ref_rand_mono;
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
index fd7c0092d9..0ddc39e180 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_f32.c
@@ -22,7 +22,7 @@ static void test_arm_fir_f32(void)
 	size_t block_size, tap_count;
 	size_t sample_count = ARRAY_SIZE(in_config) / 2;
 	size_t length = ARRAY_SIZE(ref_val);
-	const u16_t *config = in_config;
+	const uint16_t *config = in_config;
 	const float32_t *input = (const float32_t *)in_val;
 	const float32_t *coeff = (const float32_t *)in_coeff;
 	const float32_t *ref = (const float32_t *)ref_val;
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
index eb4324df8d..5b175b7bd3 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q15.c
@@ -22,7 +22,7 @@ static void test_arm_fir_q15(void)
 	size_t block_size, tap_count;
 	size_t sample_count = ARRAY_SIZE(in_config) / 2;
 	size_t length = ARRAY_SIZE(ref_val);
-	const u16_t *config = in_config;
+	const uint16_t *config = in_config;
 	const q15_t *input = (const q15_t *)in_val;
 	const q15_t *coeff = (const q15_t *)in_coeff;
 	const q15_t *ref = (const q15_t *)ref_val;
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
index da79c6d543..c38c816244 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q31.c
@@ -22,7 +22,7 @@ static void test_arm_fir_q31(void)
 	size_t block_size, tap_count;
 	size_t sample_count = ARRAY_SIZE(in_config) / 2;
 	size_t length = ARRAY_SIZE(ref_val);
-	const u16_t *config = in_config;
+	const uint16_t *config = in_config;
 	const q31_t *input = (const q31_t *)in_val;
 	const q31_t *coeff = (const q31_t *)in_coeff;
 	const q31_t *ref = (const q31_t *)ref_val;
diff --git a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
index c8ef22c9af..2dbc1456c4 100644
--- a/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
+++ b/tests/lib/cmsis_dsp/filtering/src/fir_q7.c
@@ -22,7 +22,7 @@ static void test_arm_fir_q7(void)
 	size_t block_size, tap_count;
 	size_t sample_count = ARRAY_SIZE(in_config) / 2;
 	size_t length = ARRAY_SIZE(ref_val);
-	const u16_t *config = in_config;
+	const uint16_t *config = in_config;
 	const q7_t *input = (const q7_t *)in_val;
 	const q7_t *coeff = (const q7_t *)in_coeff;
 	const q7_t *ref = (const q7_t *)ref_val;
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
index 0cabfbd247..402c76fcf6 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_f32.c
@@ -23,13 +23,13 @@
 #define OP2_MULT		(0)
 #define OP2C_CMPLX_MULT		(0)
 
-static void test_op2(int op, const u32_t *input1, const u32_t *input2,
-	const u32_t *ref, size_t length)
+static void test_op2(int op, const uint32_t *input1, const uint32_t *input2,
+	const uint32_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	float32_t *tmp1, *tmp2, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_f32 mat_in1;
 	arm_matrix_instance_f32 mat_in2;
@@ -108,13 +108,13 @@ DEFINE_TEST_VARIANT5(
 	in_mult1, in_mult2, ref_mult,
 	ARRAY_SIZE(ref_mult));
 
-static void test_op2c(int op, const u32_t *input1, const u32_t *input2,
-	const u32_t *ref, size_t length)
+static void test_op2c(int op, const uint32_t *input1, const uint32_t *input2,
+	const uint32_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	float32_t *tmp1, *tmp2, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_f32 mat_in1;
 	arm_matrix_instance_f32 mat_in2;
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
index e04ba9a0bd..e0d64df9e5 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q15.c
@@ -29,9 +29,9 @@ static void test_op2(int op, const q15_t *input1, const q15_t *input2,
 	const q15_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q15_t *tmp1, *tmp2, *scratch, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_q15 mat_in1;
 	arm_matrix_instance_q15 mat_in2;
@@ -118,9 +118,9 @@ static void test_op2c(int op, const q15_t *input1, const q15_t *input2,
 	const q15_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q15_t *tmp1, *tmp2, *scratch, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_q15 mat_in1;
 	arm_matrix_instance_q15 mat_in2;
diff --git a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
index 454a1eea6f..83c9f9b8d0 100644
--- a/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/binary_q31.c
@@ -27,9 +27,9 @@ static void test_op2(int op, const q31_t *input1, const q31_t *input2,
 	const q31_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q31_t *tmp1, *tmp2, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_q31 mat_in1;
 	arm_matrix_instance_q31 mat_in2;
@@ -110,9 +110,9 @@ static void test_op2c(int op, const q31_t *input1, const q31_t *input2,
 	const q31_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q31_t *tmp1, *tmp2, *output;
-	u16_t rows, internal, columns;
+	uint16_t rows, internal, columns;
 
 	arm_matrix_instance_q31 mat_in1;
 	arm_matrix_instance_q31 mat_in2;
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
index 1027dbd2ed..4d77bb9ef5 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f32.c
@@ -33,9 +33,9 @@
 static void test_op2(int op, const uint32_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	float32_t *tmp1, *tmp2, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_f32 mat_in1;
 	arm_matrix_instance_f32 mat_in2;
@@ -114,9 +114,9 @@ static void test_op1(int op, const uint32_t *ref, size_t length,
 	bool transpose)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	float32_t *tmp1, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_f32 mat_in1;
 	arm_matrix_instance_f32 mat_out;
@@ -188,10 +188,10 @@ static void test_arm_mat_inverse_f32(void)
 {
 	size_t index;
 	size_t length = ARRAY_SIZE(ref_inv);
-	u16_t *dims = (u16_t *)in_inv_dims;
+	uint16_t *dims = (uint16_t *)in_inv_dims;
 	float32_t *input, *tmp1, *output;
 	arm_status status;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_f32 mat_in1;
 	arm_matrix_instance_f32 mat_out;
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
index b6266d108b..8489052499 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_f64.c
@@ -24,10 +24,10 @@ static void test_arm_mat_inverse_f64(void)
 {
 	size_t index;
 	size_t length = ARRAY_SIZE(ref_inv);
-	u16_t *dims = (u16_t *)in_inv_dims;
+	uint16_t *dims = (uint16_t *)in_inv_dims;
 	float64_t *input, *tmp1, *output;
 	arm_status status;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_f64 mat_in1;
 	arm_matrix_instance_f64 mat_out;
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
index 12c62a1fed..fba1ac970a 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q15.c
@@ -28,9 +28,9 @@
 static void test_op2(int op, const q15_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q15_t *tmp1, *tmp2, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_q15 mat_in1;
 	arm_matrix_instance_q15 mat_in2;
@@ -103,9 +103,9 @@ DEFINE_TEST_VARIANT3(op2, arm_mat_sub_q15, OP2_SUB,
 static void test_op1(int op, const q15_t *ref, size_t length, bool transpose)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q15_t *tmp1, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_q15 mat_in1;
 	arm_matrix_instance_q15 mat_out;
diff --git a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
index bf6687762d..04fcb9015b 100644
--- a/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
+++ b/tests/lib/cmsis_dsp/matrix/src/unary_q31.c
@@ -28,9 +28,9 @@
 static void test_op2(int op, const q31_t *ref, size_t length)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q31_t *tmp1, *tmp2, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_q31 mat_in1;
 	arm_matrix_instance_q31 mat_in2;
@@ -103,9 +103,9 @@ DEFINE_TEST_VARIANT3(op2, arm_mat_sub_q31, OP2_SUB,
 static void test_op1(int op, const q31_t *ref, size_t length, bool transpose)
 {
 	size_t index;
-	u16_t *dims = (u16_t *)in_dims;
+	uint16_t *dims = (uint16_t *)in_dims;
 	q31_t *tmp1, *output;
-	u16_t rows, columns;
+	uint16_t rows, columns;
 
 	arm_matrix_instance_q31 mat_in1;
 	arm_matrix_instance_q31 mat_out;
diff --git a/tests/lib/cmsis_dsp/statistics/src/f32.c b/tests/lib/cmsis_dsp/statistics/src/f32.c
index 24487c45ef..192af336c1 100644
--- a/tests/lib/cmsis_dsp/statistics/src/f32.c
+++ b/tests/lib/cmsis_dsp/statistics/src/f32.c
@@ -17,10 +17,10 @@
 #define REL_ERROR_THRESH	(1.0e-5)
 
 static void test_arm_max_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_max_f32((float32_t *)input1, length, &val, &index);
@@ -38,7 +38,7 @@ DEFINE_TEST_VARIANT3(arm_max_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_max_f32, 11, in_com1, 2, 11);
 
 static void test_arm_max_no_idx_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t val;
 
@@ -55,10 +55,10 @@ DEFINE_TEST_VARIANT3(arm_max_no_idx_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_max_no_idx_f32, 11, in_com1, 2, 11);
 
 static void test_arm_min_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_min_f32((float32_t *)input1, length, &val, &index);
@@ -76,7 +76,7 @@ DEFINE_TEST_VARIANT3(arm_min_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_min_f32, 11, in_com1, 2, 11);
 
 static void test_arm_mean_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t ref[1];
 	float32_t *output;
@@ -109,7 +109,7 @@ DEFINE_TEST_VARIANT3(arm_mean_f32, 8, in_com2, 1, 8);
 DEFINE_TEST_VARIANT3(arm_mean_f32, 11, in_com2, 2, 11);
 
 static void test_arm_power_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t ref[1];
 	float32_t *output;
@@ -142,7 +142,7 @@ DEFINE_TEST_VARIANT3(arm_power_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_power_f32, 11, in_com1, 2, 11);
 
 static void test_arm_rms_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t ref[1];
 	float32_t *output;
@@ -175,7 +175,7 @@ DEFINE_TEST_VARIANT3(arm_rms_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_rms_f32, 11, in_com1, 2, 11);
 
 static void test_arm_std_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t ref[1];
 	float32_t *output;
@@ -208,7 +208,7 @@ DEFINE_TEST_VARIANT3(arm_std_f32, 8, in_com1, 1, 8);
 DEFINE_TEST_VARIANT3(arm_std_f32, 11, in_com1, 2, 11);
 
 static void test_arm_var_f32(
-	const u32_t *input1, int ref_index, size_t length)
+	const uint32_t *input1, int ref_index, size_t length)
 {
 	float32_t ref[1];
 	float32_t *output;
diff --git a/tests/lib/cmsis_dsp/statistics/src/q15.c b/tests/lib/cmsis_dsp/statistics/src/q15.c
index 65f99d3b2d..a853cbe7b5 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q15.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q15.c
@@ -21,7 +21,7 @@ static void test_arm_max_q15(
 	const q15_t *input1, int ref_index, size_t length)
 {
 	q15_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_max_q15(input1, length, &val, &index);
@@ -42,7 +42,7 @@ static void test_arm_min_q15(
 	const q15_t *input1, int ref_index, size_t length)
 {
 	q15_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_min_q15(input1, length, &val, &index);
diff --git a/tests/lib/cmsis_dsp/statistics/src/q31.c b/tests/lib/cmsis_dsp/statistics/src/q31.c
index dac3d4d9db..93562addf8 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q31.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q31.c
@@ -21,7 +21,7 @@ static void test_arm_max_q31(
 	const q31_t *input1, int ref_index, size_t length)
 {
 	q31_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_max_q31(input1, length, &val, &index);
@@ -42,7 +42,7 @@ static void test_arm_min_q31(
 	const q31_t *input1, int ref_index, size_t length)
 {
 	q31_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_min_q31(input1, length, &val, &index);
diff --git a/tests/lib/cmsis_dsp/statistics/src/q7.c b/tests/lib/cmsis_dsp/statistics/src/q7.c
index 34cf052c42..f4130865d6 100644
--- a/tests/lib/cmsis_dsp/statistics/src/q7.c
+++ b/tests/lib/cmsis_dsp/statistics/src/q7.c
@@ -21,7 +21,7 @@ static void test_arm_max_q7(
 	const q7_t *input1, int ref_index, size_t length)
 {
 	q7_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_max_q7(input1, length, &val, &index);
@@ -43,7 +43,7 @@ static void test_arm_min_q7(
 	const q7_t *input1, int ref_index, size_t length)
 {
 	q7_t val;
-	u32_t index;
+	uint32_t index;
 
 	/* Run test function */
 	arm_min_q7(input1, length, &val, &index);
diff --git a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
index d3576b08a7..60d466c564 100644
--- a/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
+++ b/tests/lib/cmsis_dsp/support/src/barycenter_f32.c
@@ -19,8 +19,8 @@ void test_arm_barycenter_f32(void)
 {
 	int test_index;
 	const size_t length = ARRAY_SIZE(ref_barycenter);
-	const u16_t test_count = in_barycenter_dims[0];
-	const u16_t *dims = in_barycenter_dims + 1;
+	const uint16_t test_count = in_barycenter_dims[0];
+	const uint16_t *dims = in_barycenter_dims + 1;
 	const float32_t *input_val = (const float32_t *)in_barycenter_val;
 	const float32_t *input_coeff = (const float32_t *)in_barycenter_coeff;
 	float32_t *output, *output_buf;
@@ -33,8 +33,8 @@ void test_arm_barycenter_f32(void)
 
 	/* Enumerate tests */
 	for (test_index = 0; test_index < test_count; test_index++) {
-		const u16_t vec_count = dims[0];
-		const u16_t vec_length = dims[1];
+		const uint16_t vec_count = dims[0];
+		const uint16_t vec_length = dims[1];
 
 		/* Run test function */
 		arm_barycenter_f32(
diff --git a/tests/lib/cmsis_dsp/support/src/f32.c b/tests/lib/cmsis_dsp/support/src/f32.c
index 6e665b69e2..4b0daff002 100644
--- a/tests/lib/cmsis_dsp/support/src/f32.c
+++ b/tests/lib/cmsis_dsp/support/src/f32.c
@@ -19,7 +19,7 @@
 #define ABS_ERROR_THRESH_Q15	((q15_t)10)
 #define ABS_ERROR_THRESH_Q31	((q31_t)80)
 
-static void test_arm_copy_f32(const u32_t *input1, size_t length)
+static void test_arm_copy_f32(const uint32_t *input1, size_t length)
 {
 	float32_t *output;
 
@@ -71,7 +71,7 @@ DEFINE_TEST_VARIANT1(arm_fill_f32, 8, 8);
 DEFINE_TEST_VARIANT1(arm_fill_f32, 11, 11);
 
 static void test_arm_float_to_q31(
-	const u32_t *input1, const q31_t *ref, size_t length)
+	const uint32_t *input1, const q31_t *ref, size_t length)
 {
 	q31_t *output;
 
@@ -96,7 +96,7 @@ DEFINE_TEST_VARIANT3(arm_float_to_q31, 8, in_f32, ref_q31, 8);
 DEFINE_TEST_VARIANT3(arm_float_to_q31, 11, in_f32, ref_q31, 11);
 
 static void test_arm_float_to_q15(
-	const u32_t *input1, const q15_t *ref, size_t length)
+	const uint32_t *input1, const q15_t *ref, size_t length)
 {
 	q15_t *output;
 
@@ -121,7 +121,7 @@ DEFINE_TEST_VARIANT3(arm_float_to_q15, 16, in_f32, ref_q15, 16);
 DEFINE_TEST_VARIANT3(arm_float_to_q15, 17, in_f32, ref_q15, 17);
 
 static void test_arm_float_to_q7(
-	const u32_t *input1, const q7_t *ref, size_t length)
+	const uint32_t *input1, const q7_t *ref, size_t length)
 {
 	q7_t *output;
 
@@ -175,7 +175,7 @@ DEFINE_TEST_VARIANT2(arm_weighted_sum_f32, 8, 1, 8);
 DEFINE_TEST_VARIANT2(arm_weighted_sum_f32, 11, 2, 11);
 
 static void test_arm_sort_out(
-	const u32_t *input1, const u32_t *ref, size_t length,
+	const uint32_t *input1, const uint32_t *ref, size_t length,
 	arm_sort_alg alg, arm_sort_dir dir)
 {
 	float32_t *output;
@@ -229,7 +229,7 @@ DEFINE_TEST_VARIANT5(arm_sort_out, selection_11,
 	ARM_SORT_SELECTION, ARM_SORT_ASCENDING);
 
 static void test_arm_merge_sort_out(
-	const u32_t *input1, const u32_t *ref, size_t length,
+	const uint32_t *input1, const uint32_t *ref, size_t length,
 	arm_sort_dir dir)
 {
 	float32_t *output;
@@ -264,7 +264,7 @@ DEFINE_TEST_VARIANT4(arm_merge_sort_out, 11,
 	in_sort, ref_sort, 11, ARM_SORT_ASCENDING);
 
 static void test_arm_sort_in(
-	const u32_t *input1, const u32_t *ref, size_t length,
+	const uint32_t *input1, const uint32_t *ref, size_t length,
 	arm_sort_alg alg, arm_sort_dir dir)
 {
 	float32_t *output;
@@ -317,7 +317,7 @@ DEFINE_TEST_VARIANT5(arm_sort_in, selection_11,
 	ARM_SORT_SELECTION, ARM_SORT_ASCENDING);
 
 static void test_arm_sort_const(
-	const u32_t *input1, const u32_t *ref, size_t length,
+	const uint32_t *input1, const uint32_t *ref, size_t length,
 	arm_sort_alg alg, arm_sort_dir dir)
 {
 	float32_t *output;
@@ -367,7 +367,7 @@ DEFINE_TEST_VARIANT5(arm_sort_const, selection_16,
 	ARM_SORT_SELECTION, ARM_SORT_ASCENDING);
 
 static void test_arm_merge_sort_const(
-	const u32_t *input1, const u32_t *ref, size_t length,
+	const uint32_t *input1, const uint32_t *ref, size_t length,
 	arm_sort_dir dir)
 {
 	float32_t *output;
@@ -402,9 +402,9 @@ DEFINE_TEST_VARIANT4(arm_merge_sort_const, 16,
 	in_sort_const, ref_sort_const, 16, ARM_SORT_ASCENDING);
 
 static void test_arm_spline(
-	const u32_t *input_x, const u32_t *input_y,
-	const u32_t *input_xq, const u32_t *ref, size_t length,
-	u32_t n, arm_spline_type type)
+	const uint32_t *input_x, const uint32_t *input_y,
+	const uint32_t *input_xq, const uint32_t *ref, size_t length,
+	uint32_t n, arm_spline_type type)
 {
 	float32_t *output;
 	float32_t *scratch;
diff --git a/tests/lib/cmsis_dsp/svm/src/f32.c b/tests/lib/cmsis_dsp/svm/src/f32.c
index d14d55cc87..096cae19b6 100644
--- a/tests/lib/cmsis_dsp/svm/src/f32.c
+++ b/tests/lib/cmsis_dsp/svm/src/f32.c
@@ -14,19 +14,19 @@
 #include "f32.pat"
 
 #define DECLARE_COMMON_VARS(in_dims, in_param) \
-	const s16_t *dims = in_dims; \
+	const int16_t *dims = in_dims; \
 	const float32_t *params = (const float32_t *)in_param; \
-	const s32_t classes[2] = { dims[1], dims[2] }; \
-	const u16_t sample_count = dims[3]; \
-	const u16_t vec_dims = dims[4]; \
-	const u16_t svec_count = dims[5]; \
+	const int32_t classes[2] = { dims[1], dims[2] }; \
+	const uint16_t sample_count = dims[3]; \
+	const uint16_t vec_dims = dims[4]; \
+	const uint16_t svec_count = dims[5]; \
 	const float32_t intercept = \
 		params[svec_count + (vec_dims * svec_count)]; \
 	const float32_t *svec = params; \
 	const float32_t *dual_coeff = params + (vec_dims * svec_count)
 
 #define DECLARE_POLY_VARS() \
-	const u16_t degree = dims[6]; \
+	const uint16_t degree = dims[6]; \
 	const float32_t coeff0 = \
 		params[svec_count + (vec_dims * svec_count) + 1]; \
 	const float32_t gamma = \
@@ -50,14 +50,14 @@ static void test_arm_svm_linear_predict_f32(void)
 	size_t index;
 	const size_t length = ARRAY_SIZE(ref_linear);
 	const float32_t *input = (const float32_t *)in_linear_val;
-	s32_t *output, *output_buf;
+	int32_t *output, *output_buf;
 
 	/* Initialise instance */
 	arm_svm_linear_init_f32(&inst, svec_count, vec_dims,
 		intercept, dual_coeff, svec, classes);
 
 	/* Allocate output buffer */
-	output_buf = malloc(length * sizeof(s32_t));
+	output_buf = malloc(length * sizeof(int32_t));
 	zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output = output_buf;
@@ -90,7 +90,7 @@ static void test_arm_svm_polynomial_predict_f32(void)
 	size_t index;
 	const size_t length = ARRAY_SIZE(ref_polynomial);
 	const float32_t *input = (const float32_t *)in_polynomial_val;
-	s32_t *output, *output_buf;
+	int32_t *output, *output_buf;
 
 	/* Initialise instance */
 	arm_svm_polynomial_init_f32(
@@ -99,7 +99,7 @@ static void test_arm_svm_polynomial_predict_f32(void)
 		degree, coeff0, gamma);
 
 	/* Allocate output buffer */
-	output_buf = malloc(length * sizeof(s32_t));
+	output_buf = malloc(length * sizeof(int32_t));
 	zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output = output_buf;
@@ -132,7 +132,7 @@ static void test_arm_svm_rbf_predict_f32(void)
 	size_t index;
 	const size_t length = ARRAY_SIZE(ref_rbf);
 	const float32_t *input = (const float32_t *)in_rbf_val;
-	s32_t *output, *output_buf;
+	int32_t *output, *output_buf;
 
 	/* Initialise instance */
 	arm_svm_rbf_init_f32(
@@ -140,7 +140,7 @@ static void test_arm_svm_rbf_predict_f32(void)
 		intercept, dual_coeff, svec, classes, gamma);
 
 	/* Allocate output buffer */
-	output_buf = malloc(length * sizeof(s32_t));
+	output_buf = malloc(length * sizeof(int32_t));
 	zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output = output_buf;
@@ -173,7 +173,7 @@ static void test_arm_svm_sigmoid_predict_f32(void)
 	size_t index;
 	const size_t length = ARRAY_SIZE(ref_sigmoid);
 	const float32_t *input = (const float32_t *)in_sigmoid_val;
-	s32_t *output, *output_buf;
+	int32_t *output, *output_buf;
 
 	/* Initialise instance */
 	arm_svm_sigmoid_init_f32(
@@ -181,7 +181,7 @@ static void test_arm_svm_sigmoid_predict_f32(void)
 		intercept, dual_coeff, svec, classes, coeff0, gamma);
 
 	/* Allocate output buffer */
-	output_buf = malloc(length * sizeof(s32_t));
+	output_buf = malloc(length * sizeof(int32_t));
 	zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output = output_buf;
@@ -214,7 +214,7 @@ static void test_arm_svm_oneclass_predict_f32(void)
 	size_t index;
 	const size_t length = ARRAY_SIZE(ref_oneclass);
 	const float32_t *input = (const float32_t *)in_oneclass_val;
-	s32_t *output, *output_buf;
+	int32_t *output, *output_buf;
 
 	/* Initialise instance */
 	arm_svm_rbf_init_f32(
@@ -222,7 +222,7 @@ static void test_arm_svm_oneclass_predict_f32(void)
 		intercept, dual_coeff, svec, classes, gamma);
 
 	/* Allocate output buffer */
-	output_buf = malloc(length * sizeof(s32_t));
+	output_buf = malloc(length * sizeof(int32_t));
 	zassert_not_null(output_buf, ASSERT_MSG_BUFFER_ALLOC_FAILED);
 
 	output = output_buf;
diff --git a/tests/lib/cmsis_dsp/transform/src/cf32.c b/tests/lib/cmsis_dsp/transform/src/cf32.c
index 4c0397e9c4..cc0e24a3db 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf32.c
@@ -18,7 +18,7 @@
 
 static void test_arm_cfft_f32_cmplx_backend(
 	const arm_cfft_instance_f32 * inst, bool inverse,
-	const u32_t *input, const u32_t *ref, size_t length)
+	const uint32_t *input, const uint32_t *ref, size_t length)
 {
 	float32_t *output;
 
@@ -44,7 +44,7 @@ static void test_arm_cfft_f32_cmplx_backend(
 
 static void test_arm_cfft_f32_cmplx(
 	const arm_cfft_instance_f32 * inst,
-	const u32_t *input, const u32_t *ref, size_t length)
+	const uint32_t *input, const uint32_t *ref, size_t length)
 {
 	test_arm_cfft_f32_cmplx_backend(inst, false, input, ref, length);
 }
@@ -105,7 +105,7 @@ DEFINE_TEST_VARIANT4(arm_cfft_f32_cmplx, step_4096, &arm_cfft_sR_f32_len4096,
 
 static void test_arm_cifft_f32_cmplx(
 	const arm_cfft_instance_f32 * inst,
-	const u32_t *input, const u32_t *ref, size_t length)
+	const uint32_t *input, const uint32_t *ref, size_t length)
 {
 	test_arm_cfft_f32_cmplx_backend(inst, true, input, ref, length);
 }
diff --git a/tests/lib/cmsis_dsp/transform/src/cf64.c b/tests/lib/cmsis_dsp/transform/src/cf64.c
index 856c32f304..dcf829fb6d 100644
--- a/tests/lib/cmsis_dsp/transform/src/cf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/cf64.c
@@ -18,7 +18,7 @@
 
 static void test_arm_cfft_f64_cmplx_backend(
 	const arm_cfft_instance_f64 * inst, bool inverse,
-	const u64_t *input, const u64_t *ref, size_t length)
+	const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	float64_t *output;
 
@@ -44,7 +44,7 @@ static void test_arm_cfft_f64_cmplx_backend(
 
 static void test_arm_cfft_f64_cmplx(
 	const arm_cfft_instance_f64 * inst,
-	const u64_t *input, const u64_t *ref, size_t length)
+	const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	test_arm_cfft_f64_cmplx_backend(inst, false, input, ref, length);
 }
@@ -105,7 +105,7 @@ DEFINE_TEST_VARIANT4(arm_cfft_f64_cmplx, step_4096, &arm_cfft_sR_f64_len4096,
 
 static void test_arm_cifft_f64_cmplx(
 	const arm_cfft_instance_f64 * inst,
-	const u64_t *input, const u64_t *ref, size_t length)
+	const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	test_arm_cfft_f64_cmplx_backend(inst, true, input, ref, length);
 }
diff --git a/tests/lib/cmsis_dsp/transform/src/rf32.c b/tests/lib/cmsis_dsp/transform/src/rf32.c
index 2acb9c4ec3..68965b1bc3 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf32.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf32.c
@@ -17,7 +17,7 @@
 #define SNR_ERROR_THRESH	((float32_t)120)
 
 static void test_arm_rfft_f32_real_backend(
-	bool inverse, const u32_t *input, const u32_t *ref,
+	bool inverse, const uint32_t *input, const uint32_t *ref,
 	size_t length)
 {
 	arm_rfft_fast_instance_f32 inst;
@@ -51,7 +51,7 @@ static void test_arm_rfft_f32_real_backend(
 }
 
 static void test_arm_rfft_f32_real(
-	const u32_t *input, const u32_t *ref, size_t length)
+	const uint32_t *input, const uint32_t *ref, size_t length)
 {
 	test_arm_rfft_f32_real_backend(false, input, ref, length);
 }
@@ -105,7 +105,7 @@ DEFINE_TEST_VARIANT3(arm_rfft_f32_real, step_4096,
 	in_rfft_step_4096, ref_rfft_step_4096, 4096);
 
 static void test_arm_rifft_f32_real(
-	const u32_t *input, const u32_t *ref, size_t length)
+	const uint32_t *input, const uint32_t *ref, size_t length)
 {
 	test_arm_rfft_f32_real_backend(true, input, ref, length);
 }
diff --git a/tests/lib/cmsis_dsp/transform/src/rf64.c b/tests/lib/cmsis_dsp/transform/src/rf64.c
index 27b3039808..ca05518109 100644
--- a/tests/lib/cmsis_dsp/transform/src/rf64.c
+++ b/tests/lib/cmsis_dsp/transform/src/rf64.c
@@ -17,7 +17,7 @@
 #define SNR_ERROR_THRESH	((float64_t)250)
 
 static void test_arm_rfft_f64_real_backend(
-	bool inverse, const u64_t *input, const u64_t *ref, size_t length)
+	bool inverse, const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	arm_rfft_fast_instance_f64 inst;
 	float64_t *output, *scratch;
@@ -50,7 +50,7 @@ static void test_arm_rfft_f64_real_backend(
 }
 
 static void test_arm_rfft_f64_real(
-	const u64_t *input, const u64_t *ref, size_t length)
+	const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	test_arm_rfft_f64_real_backend(false, input, ref, length);
 }
@@ -104,7 +104,7 @@ DEFINE_TEST_VARIANT3(arm_rfft_f64_real, step_4096,
 	in_rfft_step_4096, ref_rfft_step_4096, 4096);
 
 static void test_arm_rifft_f64_real(
-	const u64_t *input, const u64_t *ref, size_t length)
+	const uint64_t *input, const uint64_t *ref, size_t length)
 {
 	test_arm_rfft_f64_real_backend(true, input, ref, length);
 }
diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c
index 2263773689..42f553d0bb 100644
--- a/tests/lib/devicetree/api/src/main.c
+++ b/tests/lib/devicetree/api/src/main.c
@@ -1201,8 +1201,8 @@ static void test_arrays(void)
 }
 
 struct test_gpio_info {
-	u32_t reg_addr;
-	u32_t reg_len;
+	uint32_t reg_addr;
+	uint32_t reg_len;
 };
 
 struct test_gpio_data {
diff --git a/tests/lib/gui/lvgl/src/img.c b/tests/lib/gui/lvgl/src/img.c
index 7031756aa7..233b8277a6 100644
--- a/tests/lib/gui/lvgl/src/img.c
+++ b/tests/lib/gui/lvgl/src/img.c
@@ -8,7 +8,7 @@
 #include <lvgl.h>
 #include "img.h"
 
-static const u8_t img_data[] = {
+static const uint8_t img_data[] = {
 	0x00, 0x00, 0x00, 0x00,	/* Index color 0 */
 	0x00, 0xff, 0x00, 0x00,	/* Index color 1 */
 
diff --git a/tests/lib/heap/src/main.c b/tests/lib/heap/src/main.c
index c601919d66..ca8c51e013 100644
--- a/tests/lib/heap/src/main.c
+++ b/tests/lib/heap/src/main.c
@@ -119,10 +119,10 @@ void testfree(void *arg, void *p)
 
 static void log_result(size_t sz, struct z_heap_stress_result *r)
 {
-	u32_t tot = r->total_allocs + r->total_frees;
-	u32_t avg = (u32_t)((r->accumulated_in_use_bytes + tot/2) / tot);
-	u32_t avg_pct = (u32_t)((100ULL * avg + sz / 2) / sz);
-	u32_t succ_pct = ((100ULL * r->successful_allocs + r->total_allocs / 2)
+	uint32_t tot = r->total_allocs + r->total_frees;
+	uint32_t avg = (uint32_t)((r->accumulated_in_use_bytes + tot/2) / tot);
+	uint32_t avg_pct = (uint32_t)((100ULL * avg + sz / 2) / sz);
+	uint32_t succ_pct = ((100ULL * r->successful_allocs + r->total_allocs / 2)
 			  / r->total_allocs);
 
 	TC_PRINT("successful allocs: %d/%d (%d%%), frees: %d,"
diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c
index c1cfd3d6e0..97a94f1421 100644
--- a/tests/lib/json/src/main.c
+++ b/tests/lib/json/src/main.c
@@ -522,13 +522,13 @@ static void test_json_escape_bounds_check(void)
 static void test_json_encode_bounds_check(void)
 {
 	struct number {
-		u32_t val;
+		uint32_t val;
 	} str = { 0 };
 	const struct json_obj_descr descr[] = {
 		JSON_OBJ_DESCR_PRIM(struct number, val, JSON_TOK_NUMBER),
 	};
 	/* Encodes to {"val":0}\0 for a total of 10 bytes */
-	u8_t buf[10];
+	uint8_t buf[10];
 	ssize_t ret = json_obj_encode_buf(descr, ARRAY_SIZE(descr),
 					  &str, buf, 10);
 	zassert_equal(ret, 0, "Bounds check passed");
diff --git a/tests/lib/notify/src/main.c b/tests/lib/notify/src/main.c
index 4f858cac39..6ec5d8f16c 100644
--- a/tests/lib/notify/src/main.c
+++ b/tests/lib/notify/src/main.c
@@ -7,15 +7,15 @@
 #include <ztest.h>
 #include <sys/notify.h>
 
-static u32_t get_extflags(const struct sys_notify *anp)
+static uint32_t get_extflags(const struct sys_notify *anp)
 {
-	u32_t flags = anp->flags & SYS_NOTIFY_EXTENSION_MASK;
+	uint32_t flags = anp->flags & SYS_NOTIFY_EXTENSION_MASK;
 
 	return flags >> SYS_NOTIFY_EXTENSION_POS;
 }
 
 static void set_extflags(struct sys_notify *anp,
-			 u32_t flags)
+			 uint32_t flags)
 {
 	anp->flags = (anp->flags & ~SYS_NOTIFY_EXTENSION_MASK)
 		     | (flags << SYS_NOTIFY_EXTENSION_POS);
@@ -48,7 +48,7 @@ static void test_spinwait(void)
 	int res;
 	sys_notify_generic_callback cb;
 	struct sys_notify notify;
-	u32_t xflags = 0x1234;
+	uint32_t xflags = 0x1234;
 
 	memset(&notify, 0xac, sizeof(notify));
 	rc = sys_notify_validate(&notify);
@@ -102,7 +102,7 @@ static void test_signal(void)
 	struct k_poll_signal sig;
 	sys_notify_generic_callback cb;
 	struct sys_notify notify;
-	u32_t xflags = 0x1234;
+	uint32_t xflags = 0x1234;
 
 	memset(&notify, 0xac, sizeof(notify));
 	rc = sys_notify_validate(&notify);
@@ -174,7 +174,7 @@ static void test_callback(void)
 	int res;
 	sys_notify_generic_callback cb;
 	struct sys_notify notify;
-	u32_t xflags = 0x8765432;
+	uint32_t xflags = 0x8765432;
 
 	memset(&notify, 0xac, sizeof(notify));
 	rc = sys_notify_validate(&notify);
diff --git a/tests/lib/onoff/src/main.c b/tests/lib/onoff/src/main.c
index a1cdffc661..b9ec3531e3 100644
--- a/tests/lib/onoff/src/main.c
+++ b/tests/lib/onoff/src/main.c
@@ -14,7 +14,7 @@ static struct onoff_manager srv;
 static struct onoff_monitor mon;
 
 struct transition_record {
-	u32_t state;
+	uint32_t state;
 	int res;
 };
 static struct transition_record trans[32];
@@ -22,7 +22,7 @@ static size_t ntrans;
 
 static void trans_callback(struct onoff_manager *mgr,
 			  struct onoff_monitor *mon,
-			  u32_t state,
+			  uint32_t state,
 			  int res)
 {
 	if (ntrans < ARRAY_SIZE(trans)) {
@@ -33,8 +33,8 @@ static void trans_callback(struct onoff_manager *mgr,
 	}
 }
 
-static void check_trans(u32_t idx,
-		       u32_t state,
+static void check_trans(uint32_t idx,
+		       uint32_t state,
 		       int res,
 		       const char *tag)
 {
@@ -51,13 +51,13 @@ static void check_trans(u32_t idx,
 		      idx, xp->res, res, tag);
 }
 
-static u32_t callback_state;
+static uint32_t callback_state;
 static int callback_res;
 static onoff_client_callback callback_fn;
 
 static void callback(struct onoff_manager *srv,
 		     struct onoff_client *cli,
-		     u32_t state,
+		     uint32_t state,
 		     int res)
 {
 	onoff_client_callback cb = callback_fn;
@@ -71,7 +71,7 @@ static void callback(struct onoff_manager *srv,
 	}
 }
 
-static void check_callback(u32_t state,
+static void check_callback(uint32_t state,
 			   int res,
 			   const char *tag)
 {
@@ -761,7 +761,7 @@ static void test_recheck_stop(void)
 
 static void rel_in_req_cb(struct onoff_manager *srv,
 			  struct onoff_client *cli,
-			  u32_t state,
+			  uint32_t state,
 			  int res)
 {
 	int rc = onoff_release(srv);
diff --git a/tests/lib/ringbuffer/src/main.c b/tests/lib/ringbuffer/src/main.c
index c18e9fb7c2..0b10b974b7 100644
--- a/tests/lib/ringbuffer/src/main.c
+++ b/tests/lib/ringbuffer/src/main.c
@@ -52,16 +52,16 @@ RING_BUF_ITEM_DECLARE_POW2(ring_buf1, 8);
 void test_ring_buffer_main(void)
 {
 	int ret, put_count, i;
-	u32_t getdata[6];
-	u8_t getsize, getval;
-	u16_t gettype;
+	uint32_t getdata[6];
+	uint8_t getsize, getval;
+	uint16_t gettype;
 	int dsize = INITIAL_SIZE;
-	__aligned(sizeof(u32_t)) char rb_data[] = "ABCDEFGHIJKLMNOPQRSTUVWX";
+	__aligned(sizeof(uint32_t)) char rb_data[] = "ABCDEFGHIJKLMNOPQRSTUVWX";
 	put_count = 0;
 
 	while (1) {
 		ret = ring_buf_item_put(&ring_buf1, TYPE, VALUE,
-				       (u32_t *)rb_data, dsize);
+				       (uint32_t *)rb_data, dsize);
 		if (ret == -EMSGSIZE) {
 			LOG_DBG("ring buffer is full");
 			break;
@@ -91,7 +91,7 @@ void test_ring_buffer_main(void)
 			    getsize, gettype, getval,
 			    ring_buf_space_get(&ring_buf1));
 
-		zassert_true((memcmp((char *)getdata, rb_data, getsize * sizeof(u32_t)) == 0),
+		zassert_true((memcmp((char *)getdata, rb_data, getsize * sizeof(uint32_t)) == 0),
 			     "data corrupted");
 		zassert_true((gettype == TYPE), "type information corrupted");
 		zassert_true((getval == VALUE), "value information corrupted");
@@ -113,13 +113,13 @@ RING_BUF_DECLARE(ringbuf_raw, RINGBUFFER_SIZE);
 
 static struct ring_buf ringbuf, *pbuf;
 
-static u32_t buffer[RINGBUFFER_SIZE];
+static uint32_t buffer[RINGBUFFER_SIZE];
 
 static struct {
-	u8_t length;
-	u8_t value;
-	u16_t type;
-	u32_t buffer[DATA_MAX_SIZE];
+	uint8_t length;
+	uint8_t value;
+	uint16_t type;
+	uint32_t buffer[DATA_MAX_SIZE];
 } data[] = {
 	{ 0, 32, 1, {} },
 	{ 1, 76, 54, { 0x89ab } },
@@ -139,9 +139,9 @@ static void tringbuf_put(void *p)
 
 static void tringbuf_get(void *p)
 {
-	u16_t type;
-	u8_t value, size32 = DATA_MAX_SIZE;
-	u32_t rx_data[DATA_MAX_SIZE];
+	uint16_t type;
+	uint8_t value, size32 = DATA_MAX_SIZE;
+	uint32_t rx_data[DATA_MAX_SIZE];
 	int ret, index = POINTER_TO_INT(p);
 
 	/**TESTPOINT: ring buffer get*/
@@ -237,8 +237,8 @@ void test_ringbuffer_size_put_get_thread_isr(void)
 void test_ringbuffer_raw(void)
 {
 	int i;
-	u8_t inbuf[RINGBUFFER_SIZE];
-	u8_t outbuf[RINGBUFFER_SIZE];
+	uint8_t inbuf[RINGBUFFER_SIZE];
+	uint8_t outbuf[RINGBUFFER_SIZE];
 	size_t in_size;
 	size_t out_size;
 
@@ -282,12 +282,12 @@ void test_ringbuffer_raw(void)
 
 void test_ringbuffer_alloc_put(void)
 {
-	u8_t outputbuf[RINGBUFFER_SIZE];
-	u8_t inputbuf[] = {1, 2, 3, 4};
-	u32_t read_size;
-	u32_t allocated;
-	u32_t sum_allocated;
-	u8_t *data;
+	uint8_t outputbuf[RINGBUFFER_SIZE];
+	uint8_t inputbuf[] = {1, 2, 3, 4};
+	uint32_t read_size;
+	uint32_t allocated;
+	uint32_t sum_allocated;
+	uint8_t *data;
 	int err;
 
 	ring_buf_init(&ringbuf_raw, RINGBUFFER_SIZE, ringbuf_raw.buf.buf8);
@@ -350,10 +350,10 @@ void test_ringbuffer_alloc_put(void)
 
 void test_byte_put_free(void)
 {
-	u8_t indata[] = {1, 2, 3, 4, 5};
+	uint8_t indata[] = {1, 2, 3, 4, 5};
 	int err;
-	u32_t granted;
-	u8_t *data;
+	uint32_t granted;
+	uint8_t *data;
 
 	ring_buf_init(&ringbuf_raw, RINGBUFFER_SIZE, ringbuf_raw.buf.buf8);
 
@@ -372,7 +372,7 @@ void test_byte_put_free(void)
 			zassert_true(memcmp(indata, data, granted) == 0, NULL);
 		} else if (granted < (RINGBUFFER_SIZE-2)) {
 			/* When buffer wraps, operation is split. */
-			u32_t granted_1 = granted;
+			uint32_t granted_1 = granted;
 
 			zassert_true(memcmp(indata, data, granted) == 0, NULL);
 			granted = ring_buf_get_claim(&ringbuf_raw, &data,
@@ -397,7 +397,7 @@ void test_byte_put_free(void)
 
 void test_capacity(void)
 {
-	u32_t capacity;
+	uint32_t capacity;
 
 	ring_buf_init(&ringbuf_raw, RINGBUFFER_SIZE, ringbuf_raw.buf.buf8);
 
@@ -411,13 +411,13 @@ void test_capacity(void)
 
 void test_reset(void)
 {
-	u8_t indata[] = {1, 2, 3, 4, 5};
-	u8_t outdata[RINGBUFFER_SIZE];
-	u8_t *outbuf;
-	u32_t len;
-	u32_t out_len;
-	u32_t granted;
-	u32_t space;
+	uint8_t indata[] = {1, 2, 3, 4, 5};
+	uint8_t outdata[RINGBUFFER_SIZE];
+	uint8_t *outbuf;
+	uint32_t len;
+	uint32_t out_len;
+	uint32_t granted;
+	uint32_t space;
 
 	ring_buf_init(&ringbuf_raw, RINGBUFFER_SIZE, ringbuf_raw.buf.buf8);
 
diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c
index 3338e46d40..8d41e86472 100644
--- a/tests/lib/sprintf/src/main.c
+++ b/tests/lib/sprintf/src/main.c
@@ -48,8 +48,8 @@
 union raw_double_u {
 	double d;
 	struct {
-		u32_t u1;       /* This part contains the exponent */
-		u32_t u2;       /* This part contains the fraction */
+		uint32_t u1;       /* This part contains the exponent */
+		uint32_t u2;       /* This part contains the fraction */
 	};
 };
 
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index 0a779c279a..03ae1542b8 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -95,8 +95,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_6LO_LOG_LEVEL);
 		{ { { 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
 		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xaa } } }
 
-u8_t src_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xbb };
-u8_t dst_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xaa };
+uint8_t src_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xbb };
+uint8_t dst_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xaa };
 
 /* Source and Destination addresses are contect related addresses. */
 #if defined(CONFIG_NET_6LO_CONTEXT)
@@ -287,7 +287,7 @@ static bool compare_ipv6_hdr(struct net_pkt *pkt, struct net_6lo_data *data)
 
 	net_pkt_acknowledge_data(pkt, &ipv6_access);
 
-	res = memcmp((u8_t *)ipv6_hdr, (u8_t *)&data->ipv6,
+	res = memcmp((uint8_t *)ipv6_hdr, (uint8_t *)&data->ipv6,
 		      sizeof(struct net_ipv6_hdr));
 	if (res) {
 		TC_PRINT("Missmatch IPv6 HDR\n");
@@ -310,7 +310,7 @@ static bool compare_udp_hdr(struct net_pkt *pkt, struct net_6lo_data *data)
 
 	net_pkt_acknowledge_data(pkt, &udp_access);
 
-	res = memcmp((u8_t *)udp_hdr, (u8_t *)&data->nh.udp,
+	res = memcmp((uint8_t *)udp_hdr, (uint8_t *)&data->nh.udp,
 		      sizeof(struct net_udp_hdr));
 	if (res) {
 		TC_PRINT("Missmatch UDP HDR\n");
@@ -333,7 +333,7 @@ static bool compare_icmp_hdr(struct net_pkt *pkt, struct net_6lo_data *data)
 
 	net_pkt_acknowledge_data(pkt, &icmp_access);
 
-	res = memcmp((u8_t *)icmp_hdr, (u8_t *)&data->nh.icmp,
+	res = memcmp((uint8_t *)icmp_hdr, (uint8_t *)&data->nh.icmp,
 		      sizeof(struct net_icmp_hdr));
 	if (res) {
 		TC_PRINT("Missmatch ICMP HDR\n");
@@ -456,8 +456,8 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data)
 {
 	struct net_pkt *pkt;
 	struct net_buf *frag;
-	u8_t bytes, pos;
-	u16_t len;
+	uint8_t bytes, pos;
+	uint16_t len;
 	int remaining;
 
 	pkt = net_pkt_alloc_on_iface(net_if_get_default(), K_FOREVER);
@@ -480,14 +480,14 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data)
 	}
 
 	if (data->nh_udp) {
-		memcpy(frag->data, (u8_t *) data, NET_IPV6UDPH_LEN);
+		memcpy(frag->data, (uint8_t *) data, NET_IPV6UDPH_LEN);
 		net_buf_add(frag, NET_IPV6UDPH_LEN);
 	} else if (data->nh_icmp) {
-		memcpy(frag->data, (u8_t *) data, NET_IPV6ICMPH_LEN);
+		memcpy(frag->data, (uint8_t *) data, NET_IPV6ICMPH_LEN);
 		net_buf_add(frag, NET_IPV6ICMPH_LEN);
 
 	} else {
-		memcpy(frag->data, (u8_t *) data, NET_IPV6H_LEN);
+		memcpy(frag->data, (uint8_t *) data, NET_IPV6H_LEN);
 		net_buf_add(frag, NET_IPV6H_LEN);
 	}
 
@@ -506,19 +506,19 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data)
 	 * in ipv6, udp and in data pointer too (it's required in comparison)
 	 */
 	frag->data[4] = len >> 8;
-	frag->data[5] = (u8_t) len;
+	frag->data[5] = (uint8_t) len;
 
 	data->ipv6.len = htons(len);
 
 	if (data->nh_udp) {
 		frag->data[44] = len >> 8;
-		frag->data[45] = (u8_t) len;
+		frag->data[45] = (uint8_t) len;
 
 		data->nh.udp.len = htons(len);
 	}
 
 	while (remaining > 0) {
-		u8_t copy;
+		uint8_t copy;
 
 		bytes = net_buf_tailroom(frag);
 		copy = remaining > bytes ? bytes : remaining;
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index fb6f1d41ce..e5f7e2b619 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -45,7 +45,7 @@ static struct net_eth_addr hwaddr = { { 0x42, 0x11, 0x69, 0xde, 0xfa, 0xec } };
 static int send_status = -EINVAL;
 
 struct net_arp_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -58,7 +58,7 @@ int net_arp_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_arp_get_mac(struct device *dev)
+static uint8_t *net_arp_get_mac(struct device *dev)
 {
 	struct net_arp_context *context = dev->driver_data;
 
@@ -77,7 +77,7 @@ static u8_t *net_arp_get_mac(struct device *dev)
 
 static void net_arp_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_arp_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_arp_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
@@ -112,12 +112,12 @@ static int tester_send(struct device *dev, struct net_pkt *pkt)
 
 				snprintk(out, sizeof(out), "%s",
 					 net_sprint_ll_addr(
-						 (u8_t *)&hdr->dst,
+						 (uint8_t *)&hdr->dst,
 						 sizeof(struct net_eth_addr)));
 				printk("Invalid dst hwaddr %s, should be %s\n",
 				       out,
 				       net_sprint_ll_addr(
-					       (u8_t *)&hwaddr,
+					       (uint8_t *)&hwaddr,
 					       sizeof(struct net_eth_addr)));
 				send_status = -EINVAL;
 				return send_status;
@@ -130,12 +130,12 @@ static int tester_send(struct device *dev, struct net_pkt *pkt)
 
 				snprintk(out, sizeof(out), "%s",
 					 net_sprint_ll_addr(
-						 (u8_t *)&hdr->src,
+						 (uint8_t *)&hdr->src,
 						 sizeof(struct net_eth_addr)));
 				printk("Invalid src hwaddr %s, should be %s\n",
 				       out,
 				       net_sprint_ll_addr(
-					       (u8_t *)&hwaddr,
+					       (uint8_t *)&hwaddr,
 					       sizeof(struct net_eth_addr)));
 				send_status = -EINVAL;
 				return send_status;
@@ -268,7 +268,7 @@ static inline struct net_pkt *prepare_arp_request(struct net_if *iface,
 }
 
 static void setup_eth_header(struct net_if *iface, struct net_pkt *pkt,
-			     const struct net_eth_addr *hwaddr, u16_t type)
+			     const struct net_eth_addr *hwaddr, uint16_t type)
 {
 	struct net_eth_hdr *hdr = (struct net_eth_hdr *)net_pkt_data(pkt);
 
@@ -358,7 +358,7 @@ void test_arp(void)
 		len, AF_INET, 0, K_SECONDS(1));
 	zassert_not_null(pkt, "out of mem");
 
-	net_pkt_lladdr_src(pkt)->addr = (u8_t *)net_if_get_link_addr(iface);
+	net_pkt_lladdr_src(pkt)->addr = (uint8_t *)net_if_get_link_addr(iface);
 	net_pkt_lladdr_src(pkt)->len = sizeof(struct net_eth_addr);
 
 	ipv4 = (struct net_ipv4_hdr *)net_buf_add(pkt->buffer,
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index ad1a1bf5a2..eee66be5a0 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -21,18 +21,18 @@ struct bt_data {
 	void *hci_sync;
 
 	union {
-		u16_t hci_opcode;
-		u16_t acl_handle;
+		uint16_t hci_opcode;
+		uint16_t acl_handle;
 	};
 
-	u8_t type;
+	uint8_t type;
 };
 
 struct in6_addr {
 	union {
-		u8_t		u6_addr8[16];
-		u16_t	u6_addr16[8]; /* In big endian */
-		u32_t	u6_addr32[4]; /* In big endian */
+		uint8_t		u6_addr8[16];
+		uint16_t	u6_addr16[8]; /* In big endian */
+		uint32_t	u6_addr32[4]; /* In big endian */
 	} in6_u;
 #define s6_addr			in6_u.u6_addr8
 #define s6_addr16		in6_u.u6_addr16
@@ -40,21 +40,21 @@ struct in6_addr {
 };
 
 struct ipv6_hdr {
-	u8_t vtc;
-	u8_t tcflow;
-	u16_t flow;
-	u8_t len[2];
-	u8_t nexthdr;
-	u8_t hop_limit;
+	uint8_t vtc;
+	uint8_t tcflow;
+	uint16_t flow;
+	uint8_t len[2];
+	uint8_t nexthdr;
+	uint8_t hop_limit;
 	struct in6_addr src;
 	struct in6_addr dst;
 } __attribute__((__packed__));
 
 struct udp_hdr {
-	u16_t src_port;
-	u16_t dst_port;
-	u16_t len;
-	u16_t chksum;
+	uint16_t src_port;
+	uint16_t dst_port;
+	uint16_t len;
+	uint16_t chksum;
 } __attribute__((__packed__));
 
 static int destroy_called;
@@ -340,7 +340,7 @@ static void test_net_buf_big_buf(void)
 	}
 
 	ipv6 = (struct ipv6_hdr *)(frag->data - net_buf_headroom(frag));
-	udp = (struct udp_hdr *)((u8_t *)ipv6 + sizeof(*ipv6));
+	udp = (struct udp_hdr *)((uint8_t *)ipv6 + sizeof(*ipv6));
 
 	net_buf_frag_add(buf, frag);
 	net_buf_unref(buf);
@@ -393,7 +393,7 @@ static void test_net_buf_multi_frags(void)
 	}
 
 	ipv6 = (struct ipv6_hdr *)(frags[i]->data - net_buf_headroom(frags[i]));
-	udp = (struct udp_hdr *)((u8_t *)ipv6 + sizeof(*ipv6));
+	udp = (struct udp_hdr *)((uint8_t *)ipv6 + sizeof(*ipv6));
 
 	net_buf_unref(buf);
 
@@ -460,19 +460,19 @@ static void test_net_buf_var_pool(void)
 static void test_net_buf_byte_order(void)
 {
 	struct net_buf *buf;
-	u8_t le16[2] = { 0x02, 0x01 };
-	u8_t be16[2] = { 0x01, 0x02 };
-	u8_t le24[3] = { 0x03, 0x02, 0x01 };
-	u8_t be24[3] = { 0x01, 0x02, 0x03 };
-	u8_t le32[4] = { 0x04, 0x03, 0x02, 0x01 };
-	u8_t be32[4] = { 0x01, 0x02, 0x03, 0x04 };
-	u8_t le48[6] = { 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 };
-	u8_t be48[6] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	u8_t le64[8] = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 };
-	u8_t be64[8] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
-	u16_t u16;
-	u32_t u32;
-	u64_t u64;
+	uint8_t le16[2] = { 0x02, 0x01 };
+	uint8_t be16[2] = { 0x01, 0x02 };
+	uint8_t le24[3] = { 0x03, 0x02, 0x01 };
+	uint8_t be24[3] = { 0x01, 0x02, 0x03 };
+	uint8_t le32[4] = { 0x04, 0x03, 0x02, 0x01 };
+	uint8_t be32[4] = { 0x01, 0x02, 0x03, 0x04 };
+	uint8_t le48[6] = { 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 };
+	uint8_t be48[6] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
+	uint8_t le64[8] = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 };
+	uint8_t be64[8] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
+	uint16_t u16;
+	uint32_t u32;
+	uint64_t u64;
 
 	buf = net_buf_alloc_len(&fixed_pool, 16, K_FOREVER);
 	zassert_not_null(buf, "Failed to get buffer");
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index 0fd45e391b..0449780d47 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -85,9 +85,9 @@ static K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
-	u16_t expecting_tag;
+	uint16_t expecting_tag;
 };
 
 static struct eth_context eth_context_offloading_disabled;
@@ -108,7 +108,7 @@ static void eth_iface_init(struct net_if *iface)
 	ethernet_init(iface);
 }
 
-static u16_t get_udp_chksum(struct net_pkt *pkt)
+static uint16_t get_udp_chksum(struct net_pkt *pkt)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr);
 	struct net_udp_hdr *udp_hdr;
@@ -150,8 +150,8 @@ static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt)
 
 	if (start_receiving) {
 		struct net_udp_hdr hdr, *udp_hdr;
-		u16_t port;
-		u8_t lladdr[6];
+		uint16_t port;
+		uint8_t lladdr[6];
 
 		DBG("Packet %p received\n", pkt);
 
@@ -200,7 +200,7 @@ static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt)
 	}
 
 	if (test_started) {
-		u16_t chksum;
+		uint16_t chksum;
 
 		chksum = get_udp_chksum(pkt);
 
@@ -228,7 +228,7 @@ static int eth_tx_offloading_enabled(struct device *dev, struct net_pkt *pkt)
 	}
 
 	if (test_started) {
-		u16_t chksum;
+		uint16_t chksum;
 
 		chksum = get_udp_chksum(pkt);
 
@@ -267,7 +267,7 @@ static struct ethernet_api api_funcs_offloading_enabled = {
 	.send = eth_tx_offloading_enabled,
 };
 
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
 	mac_addr[0] = 0x00;
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index 8e137ad830..adb91a3db2 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -675,7 +675,7 @@ static void recv_cb_timeout(struct net_context *context,
 void timeout_thread(struct net_context *ctx, void *param2, void *param3)
 {
 	int family = POINTER_TO_INT(param2);
-	s32_t timeout = POINTER_TO_INT(param3);
+	int32_t timeout = POINTER_TO_INT(param3);
 	int ret;
 
 	ret = net_context_recv(ctx, recv_cb_timeout, K_MSEC(timeout),
@@ -698,7 +698,7 @@ void timeout_thread(struct net_context *ctx, void *param2, void *param3)
 	k_sem_give(&wait_data);
 }
 
-static k_tid_t start_timeout_v6_thread(s32_t timeout)
+static k_tid_t start_timeout_v6_thread(int32_t timeout)
 {
 	return k_thread_create(&thread_data, thread_stack, STACKSIZE,
 			       (k_thread_entry_t)timeout_thread,
@@ -707,7 +707,7 @@ static k_tid_t start_timeout_v6_thread(s32_t timeout)
 			       K_PRIO_COOP(7), 0, K_NO_WAIT);
 }
 
-static k_tid_t start_timeout_v4_thread(s32_t timeout)
+static k_tid_t start_timeout_v4_thread(int32_t timeout)
 {
 	return k_thread_create(&thread_data, thread_stack, STACKSIZE,
 			       (k_thread_entry_t)timeout_thread,
@@ -852,7 +852,7 @@ static void test_net_ctx_put(void)
 }
 
 struct net_context_test {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -861,7 +861,7 @@ int net_context_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_context_get_mac(struct device *dev)
+static uint8_t *net_context_get_mac(struct device *dev)
 {
 	struct net_context_test *context = dev->driver_data;
 
@@ -880,7 +880,7 @@ static u8_t *net_context_get_mac(struct device *dev)
 
 static void net_context_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_context_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_context_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -908,7 +908,7 @@ static int tester_send(struct device *dev, struct net_pkt *pkt)
 		/* We need to swap the IP addresses because otherwise
 		 * the packet will be dropped.
 		 */
-		u16_t port;
+		uint16_t port;
 
 		if (net_pkt_family(pkt) == AF_INET6) {
 			struct in6_addr addr;
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index 271d525d9e..4338f46fae 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -150,8 +150,8 @@ static const struct in_addr client_addr = { { { 255, 255, 255, 255 } } };
 #define REQUEST		3
 
 struct dhcp_msg {
-	u32_t xid;
-	u8_t type;
+	uint32_t xid;
+	uint8_t type;
 };
 
 static struct k_sem test_lock;
@@ -159,7 +159,7 @@ static struct k_sem test_lock;
 #define WAIT_TIME K_SECONDS(CONFIG_NET_DHCPV4_INITIAL_DELAY_MAX + 1)
 
 struct net_dhcpv4_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -172,7 +172,7 @@ static int net_dhcpv4_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_dhcpv4_get_mac(struct device *dev)
+static uint8_t *net_dhcpv4_get_mac(struct device *dev)
 {
 	struct net_dhcpv4_context *context = dev->driver_data;
 
@@ -191,12 +191,12 @@ static u8_t *net_dhcpv4_get_mac(struct device *dev)
 
 static void net_dhcpv4_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_dhcpv4_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_dhcpv4_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
 
-struct net_pkt *prepare_dhcp_offer(struct net_if *iface, u32_t xid)
+struct net_pkt *prepare_dhcp_offer(struct net_if *iface, uint32_t xid)
 {
 	struct net_pkt *pkt;
 
@@ -237,7 +237,7 @@ fail:
 	return NULL;
 }
 
-struct net_pkt *prepare_dhcp_ack(struct net_if *iface, u32_t xid)
+struct net_pkt *prepare_dhcp_ack(struct net_if *iface, uint32_t xid)
 {
 	struct net_pkt *pkt;
 
@@ -300,8 +300,8 @@ static int parse_dhcp_message(struct net_pkt *pkt, struct dhcp_msg *msg)
 	}
 
 	while (1) {
-		u8_t length = 0U;
-		u8_t type;
+		uint8_t length = 0U;
+		uint8_t type;
 
 		if (net_pkt_read_u8(pkt, &type)) {
 			return 0;
@@ -391,7 +391,7 @@ static struct net_mgmt_event_callback dns_cb;
 static int event_count;
 
 static void receiver_cb(struct net_mgmt_event_callback *cb,
-			u32_t nm_event, struct net_if *iface)
+			uint32_t nm_event, struct net_if *iface)
 {
 	if (nm_event != NET_EVENT_IPV4_ADDR_ADD &&
 	    nm_event != NET_EVENT_DNS_SERVER_ADD &&
diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c
index 2daf4da5c7..de09a5897a 100644
--- a/tests/net/ethernet_mgmt/src/main.c
+++ b/tests/net/ethernet_mgmt/src/main.c
@@ -15,15 +15,15 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 
 #include <ztest.h>
 
-static const u8_t mac_addr_init[6] = { 0x01, 0x02, 0x03,
+static const uint8_t mac_addr_init[6] = { 0x01, 0x02, 0x03,
 				       0x04,  0x05,  0x06 };
 
-static const u8_t mac_addr_change[6] = { 0x01, 0x02, 0x03,
+static const uint8_t mac_addr_change[6] = { 0x01, 0x02, 0x03,
 					 0x04,  0x05,  0x07 };
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 
 	bool auto_negotiation;
 	bool full_duplex;
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
index c6b71f8fe7..92ca820b3d 100644
--- a/tests/net/hostname/src/main.c
+++ b/tests/net/hostname/src/main.c
@@ -56,8 +56,8 @@ static struct k_sem wait_data;
 #define WAIT_TIME 250
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -66,7 +66,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -88,7 +88,7 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -131,7 +131,7 @@ NET_DEVICE_INIT_INSTANCE(net_iface1_test,
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 	bool promisc_mode;
 };
 
@@ -278,7 +278,7 @@ static void test_iface_setup(void)
 	test_started = true;
 }
 
-static int bytes_from_hostname_unique(u8_t *buf, int buf_len, const char *src)
+static int bytes_from_hostname_unique(uint8_t *buf, int buf_len, const char *src)
 {
 	unsigned int i;
 
diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c
index 7c77b1a448..cf21e7b694 100644
--- a/tests/net/icmpv4/src/main.c
+++ b/tests/net/icmpv4/src/main.c
@@ -110,7 +110,7 @@ static const unsigned char icmpv4_echo_req_opt_bad[] = {
 #define TEST_ICMPV4_ECHO_REQ  1
 #define TEST_ICMPV4_ECHO_REQ_OPTS 2
 
-static u8_t current = TEST_ICMPV4_UNKNOWN;
+static uint8_t current = TEST_ICMPV4_UNKNOWN;
 static struct in_addr my_addr  = { { { 192, 0, 2, 1 } } };
 static struct net_if *iface;
 
@@ -133,7 +133,7 @@ static struct net_icmpv4_handler echo_rep_handler = {
 };
 
 struct net_icmpv4_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -146,7 +146,7 @@ static int net_icmpv4_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_icmpv4_get_mac(struct device *dev)
+static uint8_t *net_icmpv4_get_mac(struct device *dev)
 {
 	struct net_icmpv4_context *context = dev->driver_data;
 
@@ -165,7 +165,7 @@ static u8_t *net_icmpv4_get_mac(struct device *dev)
 
 static void net_icmpv4_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_icmpv4_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_icmpv4_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
@@ -173,9 +173,9 @@ static void net_icmpv4_iface_init(struct net_if *iface)
 static int verify_echo_reply(struct net_pkt *pkt)
 {
 	struct net_icmp_hdr icmp_hdr;
-	u8_t buf[60];
+	uint8_t buf[60];
 	int ret;
-	u8_t payload_len;
+	uint8_t payload_len;
 
 	net_pkt_set_overwrite(pkt, true);
 	net_pkt_cursor_init(pkt);
@@ -224,11 +224,11 @@ static int verify_echo_reply(struct net_pkt *pkt)
 static int verify_echo_reply_with_opts(struct net_pkt *pkt)
 {
 	struct net_icmp_hdr icmp_hdr;
-	u8_t buf[60];
+	uint8_t buf[60];
 	int ret;
-	u8_t vhl;
-	u8_t opts_len;
-	u8_t payload_len;
+	uint8_t vhl;
+	uint8_t opts_len;
+	uint8_t payload_len;
 
 	net_pkt_set_overwrite(pkt, true);
 	net_pkt_cursor_init(pkt);
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index 2265ce3706..b9feebaaa9 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -166,7 +166,7 @@ int net_fragment_dev_init(struct device *dev)
 
 static void net_fragment_iface_init(struct net_if *iface)
 {
-	static u8_t mac[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xbb};
+	static uint8_t mac[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xbb};
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
 }
@@ -190,7 +190,7 @@ NET_DEVICE_INIT(net_fragment_test, "net_fragment_test",
 static bool compare_data(struct net_pkt *pkt, struct net_fragment_data *data)
 {
 	int remaining = data->len;
-	u32_t bytes, pos, compare, offset;
+	uint32_t bytes, pos, compare, offset;
 	struct net_buf *frag;
 
 	if (net_pkt_get_len(pkt) != (NET_IPV6UDPH_LEN + remaining)) {
@@ -202,7 +202,7 @@ static bool compare_data(struct net_pkt *pkt, struct net_fragment_data *data)
 
 	frag = pkt->frags;
 
-	if (memcmp(frag->data, (u8_t *)data, NET_IPV6UDPH_LEN)) {
+	if (memcmp(frag->data, (uint8_t *)data, NET_IPV6UDPH_LEN)) {
 		printk("mismatch headers\n");
 		return false;
 	}
@@ -230,11 +230,11 @@ static bool compare_data(struct net_pkt *pkt, struct net_fragment_data *data)
 
 static struct net_pkt *create_pkt(struct net_fragment_data *data)
 {
-	static u16_t dummy_short_addr;
+	static uint16_t dummy_short_addr;
 	struct net_pkt *pkt;
 	struct net_buf *buf;
-	u32_t bytes, pos;
-	u16_t len;
+	uint32_t bytes, pos;
+	uint16_t len;
 	int remaining;
 
 	pkt = net_pkt_alloc_on_iface(net_if_get_default(), K_FOREVER);
@@ -250,7 +250,7 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data)
 		return NULL;
 	}
 
-	memcpy(buf->data, (u8_t *) data, NET_IPV6UDPH_LEN);
+	memcpy(buf->data, (uint8_t *) data, NET_IPV6UDPH_LEN);
 	net_buf_add(buf, NET_IPV6UDPH_LEN);
 
 	pos = 0U;
@@ -260,15 +260,15 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data)
 	/* length is not set in net_fragment_data data pointer, calculate and set
 	 * in ipv6, udp and in data pointer too (it's required in comparison) */
 	buf->data[4] = len >> 8;
-	buf->data[5] = (u8_t) len;
+	buf->data[5] = (uint8_t) len;
 	buf->data[44] = len >> 8;
-	buf->data[45] = (u8_t) len;
+	buf->data[45] = (uint8_t) len;
 
 	data->ipv6.len = htons(len);
 	data->udp.len = htons(len);
 
 	while (remaining > 0) {
-		u8_t copy;
+		uint8_t copy;
 		bytes = net_buf_tailroom(buf);
 		copy = remaining > bytes ? bytes : remaining;
 		memcpy(net_buf_add(buf, copy), &user_data[pos], copy);
@@ -289,7 +289,7 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data)
 	}
 
 	/* Setup link layer addresses. */
-	net_pkt_lladdr_dst(pkt)->addr = (u8_t *)&dummy_short_addr;
+	net_pkt_lladdr_dst(pkt)->addr = (uint8_t *)&dummy_short_addr;
 	net_pkt_lladdr_dst(pkt)->len = sizeof(dummy_short_addr);
 	net_pkt_lladdr_dst(pkt)->type = NET_LINK_IEEE802154;
 
@@ -436,7 +436,7 @@ static struct net_fragment_data test_data_8 = {
 	.iphc = false
 };
 
-static u8_t frame_buffer_data[IEEE802154_MTU - 2];
+static uint8_t frame_buffer_data[IEEE802154_MTU - 2];
 
 static struct net_buf frame_buf = {
 	.data = frame_buffer_data,
diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
index 6c9dc47d68..65f2064e88 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c
@@ -30,14 +30,14 @@ static int fake_cca(struct device *dev)
 	return 0;
 }
 
-static int fake_set_channel(struct device *dev, u16_t channel)
+static int fake_set_channel(struct device *dev, uint16_t channel)
 {
 	NET_INFO("Channel %u\n", channel);
 
 	return 0;
 }
 
-static int fake_set_txpower(struct device *dev, s16_t dbm)
+static int fake_set_txpower(struct device *dev, int16_t dbm)
 {
 	NET_INFO("TX power %d dbm\n", dbm);
 
@@ -95,7 +95,7 @@ static int fake_stop(struct device *dev)
 static void fake_iface_init(struct net_if *iface)
 {
 	struct ieee802154_context *ctx = net_if_l2_data(iface);
-	static u8_t mac[8] = { 0x00, 0x12, 0x4b, 0x00,
+	static uint8_t mac[8] = { 0x00, 0x12, 0x4b, 0x00,
 				  0x00, 0x9e, 0xa3, 0xc2 };
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154);
diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c
index ecede5c535..1d0816a5e2 100644
--- a/tests/net/ieee802154/l2/src/ieee802154_test.c
+++ b/tests/net/ieee802154/l2/src/ieee802154_test.c
@@ -23,8 +23,8 @@ struct ieee802154_pkt_test {
 	char *name;
 	struct in6_addr src;
 	struct in6_addr dst;
-	u8_t *pkt;
-	u8_t length;
+	uint8_t *pkt;
+	uint8_t length;
 	struct {
 		struct ieee802154_fcf_seq *fc_seq;
 		struct ieee802154_address_field *dst_addr;
@@ -32,7 +32,7 @@ struct ieee802154_pkt_test {
 	} mhr_check;
 };
 
-u8_t ns_pkt[] = {
+uint8_t ns_pkt[] = {
 	0x41, 0xd8, 0x3e, 0xcd, 0xab, 0xff, 0xff, 0xc2, 0xa3, 0x9e, 0x00,
 	0x00, 0x4b, 0x12, 0x00, 0x7b, 0x09, 0x3a, 0x20, 0x01, 0x0d, 0xb8,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -56,7 +56,7 @@ struct ieee802154_pkt_test test_ns_pkt = {
 	.mhr_check.src_addr = (struct ieee802154_address_field *)(ns_pkt + 7),
 };
 
-u8_t ack_pkt[] = { 0x02, 0x10, 0x16 };
+uint8_t ack_pkt[] = { 0x02, 0x10, 0x16 };
 
 struct ieee802154_pkt_test test_ack_pkt = {
 	.name = "ACK frame",
@@ -67,7 +67,7 @@ struct ieee802154_pkt_test test_ack_pkt = {
 	.mhr_check.src_addr = NULL,
 };
 
-u8_t beacon_pkt[] = {
+uint8_t beacon_pkt[] = {
 	0x00, 0xd0, 0x11, 0xcd, 0xab, 0xc2, 0xa3, 0x9e, 0x00, 0x00, 0x4b,
 	0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -82,7 +82,7 @@ struct ieee802154_pkt_test test_beacon_pkt = {
 	(struct ieee802154_address_field *) (beacon_pkt + 3),
 };
 
-u8_t sec_data_pkt[] = {
+uint8_t sec_data_pkt[] = {
 	0x49, 0xd8, 0x03, 0xcd, 0xab, 0xff, 0xff, 0x02, 0x6d, 0xbb, 0xa7,
 	0x00, 0x4b, 0x12, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x8e,
 	0x49, 0xa7, 0xe2, 0x00, 0x67, 0xd4, 0x00, 0x42, 0x52, 0x6f, 0x01,
@@ -105,7 +105,7 @@ struct net_pkt *current_pkt;
 struct net_if *iface;
 K_SEM_DEFINE(driver_lock, 0, UINT_MAX);
 
-static void pkt_hexdump(u8_t *pkt, u8_t length)
+static void pkt_hexdump(uint8_t *pkt, uint8_t length)
 {
 	int i;
 
@@ -125,7 +125,7 @@ static void pkt_hexdump(u8_t *pkt, u8_t length)
 	}
 }
 
-static void ieee_addr_hexdump(u8_t *addr, u8_t length)
+static void ieee_addr_hexdump(uint8_t *addr, uint8_t length)
 {
 	int i;
 
@@ -202,7 +202,7 @@ static bool test_ns_sending(struct ieee802154_pkt_test *t)
 
 static bool test_ack_reply(struct ieee802154_pkt_test *t)
 {
-	static u8_t data_pkt[] = {
+	static uint8_t data_pkt[] = {
 		0x61, 0xdc, 0x16, 0xcd, 0xab, 0x26, 0x11, 0x32, 0x00, 0x00, 0x4b,
 		0x12, 0x00, 0x26, 0x18, 0x32, 0x00, 0x00, 0x4b, 0x12, 0x00, 0x7b,
 		0x00, 0x3a, 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index 90e4e3c05c..8d3bc32070 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -69,8 +69,8 @@ static struct k_sem wait_data;
 #define WAIT_TIME 250
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -79,7 +79,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -101,7 +101,7 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -186,7 +186,7 @@ NET_DEVICE_INIT_INSTANCE(net_iface3_test,
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 	bool promisc_mode;
 };
 
@@ -420,7 +420,7 @@ static void test_iface_setup(void)
 
 static bool send_iface(struct net_if *iface, int val, bool expect_fail)
 {
-	static u8_t data[] = { 't', 'e', 's', 't', '\0' };
+	static uint8_t data[] = { 't', 'e', 's', 't', '\0' };
 	struct net_pkt *pkt;
 	int ret;
 
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index 6c7dc8bcd8..268b332b15 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -51,7 +51,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #define TEST_LL_6(a, b, c, d, e, f, expected)				\
 	do {								\
-		u8_t ll[] = { a, b, c, d, e, f };			\
+		uint8_t ll[] = { a, b, c, d, e, f };			\
 		zassert_false(strcmp(net_sprint_ll_addr(ll, sizeof(ll)),\
 				     expected),				\
 			      "Test %s failed.\n", expected);		\
@@ -59,7 +59,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #define TEST_LL_8(a, b, c, d, e, f, g, h, expected)			\
 	do {								\
-		u8_t ll[] = { a, b, c, d, e, f, g, h };			\
+		uint8_t ll[] = { a, b, c, d, e, f, g, h };			\
 		zassert_false(strcmp(net_sprint_ll_addr(ll, sizeof(ll)), \
 				     expected),				\
 			      "Test %s failed.\n", expected);		\
@@ -67,8 +67,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #define TEST_LL_6_TWO(a, b, c, d, e, f, expected)			\
 	do {								\
-		u8_t ll1[] = { a, b, c, d, e, f };			\
-		u8_t ll2[] = { f, e, d, c, b, a };			\
+		uint8_t ll1[] = { a, b, c, d, e, f };			\
+		uint8_t ll2[] = { f, e, d, c, b, a };			\
 		char out[2 * sizeof("xx:xx:xx:xx:xx:xx") + 1 + 1];	\
 		snprintk(out, sizeof(out), "%s ",			\
 			 net_sprint_ll_addr(ll1, sizeof(ll1)));		\
@@ -100,7 +100,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 	} while (0)
 
 struct net_test_context {
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 	struct net_linkaddr ll_addr;
 };
 
@@ -113,7 +113,7 @@ int net_test_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_test_get_mac(struct device *dev)
+static uint8_t *net_test_get_mac(struct device *dev)
 {
 	struct net_test_context *context = dev->driver_data;
 
@@ -132,7 +132,7 @@ static u8_t *net_test_get_mac(struct device *dev)
 
 static void net_test_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_test_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_test_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
@@ -255,20 +255,20 @@ static void test_ipv6_addresses(void)
 		     "My IPv6 address check failed");
 
 	/**TESTPOINTS: Check IPv6 prefix*/
-	zassert_true(net_ipv6_is_prefix((u8_t *)&addr6_pref1,
-					(u8_t *)&addr6_pref2, 64),
+	zassert_true(net_ipv6_is_prefix((uint8_t *)&addr6_pref1,
+					(uint8_t *)&addr6_pref2, 64),
 		     "Same IPv6 prefix test failed");
 
-	zassert_false(net_ipv6_is_prefix((u8_t *)&addr6_pref1,
-					 (u8_t *)&addr6_pref3, 64),
+	zassert_false(net_ipv6_is_prefix((uint8_t *)&addr6_pref1,
+					 (uint8_t *)&addr6_pref3, 64),
 		      "Different IPv6 prefix test failed");
 
-	zassert_false(net_ipv6_is_prefix((u8_t *)&addr6_pref1,
-					 (u8_t *)&addr6_pref2, 128),
+	zassert_false(net_ipv6_is_prefix((uint8_t *)&addr6_pref1,
+					 (uint8_t *)&addr6_pref2, 128),
 		      "Different full IPv6 prefix test failed");
 
-	zassert_false(net_ipv6_is_prefix((u8_t *)&addr6_pref1,
-					 (u8_t *)&addr6_pref3, 255),
+	zassert_false(net_ipv6_is_prefix((uint8_t *)&addr6_pref1,
+					 (uint8_t *)&addr6_pref3, 255),
 		      "Too long prefix test failed");
 
 	ifmaddr1 = net_if_ipv6_maddr_add(net_if_get_default(), &mcast);
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 9f4722a387..aae4f18468 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -122,7 +122,7 @@ static const unsigned char ipv6_hbho[] = {
 };
 
 static bool expecting_ra;
-static u32_t dad_time[3];
+static uint32_t dad_time[3];
 static bool test_failed;
 static struct k_sem wait_data;
 static bool recv_cb_called;
@@ -134,7 +134,7 @@ static bool recv_cb_called;
 #define PEER_PORT 16233
 
 struct net_test_ipv6 {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -143,7 +143,7 @@ int net_test_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_test_get_mac(struct device *dev)
+static uint8_t *net_test_get_mac(struct device *dev)
 {
 	struct net_test_ipv6 *context = dev->driver_data;
 
@@ -162,7 +162,7 @@ static u8_t *net_test_get_mac(struct device *dev)
 
 static void net_test_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_test_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_test_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -354,36 +354,36 @@ static void test_cmp_prefix(void)
 	struct in6_addr prefix2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0,
 					0, 0, 0, 0, 0, 0, 0, 0x2 } } };
 
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 64);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 64);
 	zassert_true(st, "Prefix /64  compare failed");
 
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 65);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 65);
 	zassert_true(st, "Prefix /65 compare failed");
 
 	/* Set one extra bit in the other prefix for testing /65 */
 	prefix1.s6_addr[8] = 0x80;
 
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 65);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 65);
 	zassert_false(st, "Prefix /65 compare should have failed");
 
 	/* Set two bits in prefix2, it is now /66 */
 	prefix2.s6_addr[8] = 0xc0;
 
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 65);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 65);
 	zassert_true(st, "Prefix /65 compare failed");
 
 	/* Set all remaining bits in prefix2, it is now /128 */
 	(void)memset(&prefix2.s6_addr[8], 0xff, 8);
 
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 65);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 65);
 	zassert_true(st, "Prefix /65 compare failed");
 
 	/* Comparing /64 should be still ok */
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 64);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 64);
 	zassert_true(st, "Prefix /64 compare failed");
 
 	/* But comparing /66 should should fail */
-	st = net_ipv6_is_prefix((u8_t *)&prefix1, (u8_t *)&prefix2, 66);
+	st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 66);
 	zassert_false(st, "Prefix /66 compare should have failed");
 
 }
@@ -424,7 +424,7 @@ static void test_add_max_neighbors(void)
 	struct net_nbr *nbr;
 	struct net_linkaddr_storage llstorage;
 	struct net_linkaddr lladdr;
-	u8_t i;
+	uint8_t i;
 
 	llstorage.addr[0] = 0x01;
 	llstorage.addr[1] = 0x02;
@@ -528,7 +528,7 @@ static void test_prefix_timeout(void)
 	struct net_if_ipv6_prefix *prefix;
 	struct in6_addr addr = { { { 0x20, 1, 0x0d, 0xb8, 42, 0, 0, 0,
 				     0, 0, 0, 0, 0, 0, 0, 0 } } };
-	u32_t lifetime = 1U;
+	uint32_t lifetime = 1U;
 	int len = 64;
 
 	prefix = net_if_ipv6_prefix_add(net_if_get_default(),
@@ -551,9 +551,9 @@ static void test_prefix_timeout_long(void)
 	struct net_if_ipv6_prefix *ifprefix;
 	struct in6_addr prefix = { { { 0x20, 1, 0x0d, 0xb8, 43, 0, 0, 0,
 				     0, 0, 0, 0, 0, 0, 0, 0 } } };
-	u32_t lifetime = 0xfffffffe;
+	uint32_t lifetime = 0xfffffffe;
 	int len = 64;
-	u64_t remaining;
+	uint64_t remaining;
 	int ret;
 
 	ifprefix = net_if_ipv6_prefix_add(net_if_get_default(),
@@ -565,8 +565,8 @@ static void test_prefix_timeout_long(void)
 	zassert_equal(ifprefix->lifetime.wrap_counter, 2000,
 		      "Wrap counter wrong (%d)",
 		      ifprefix->lifetime.wrap_counter);
-	remaining = MSEC_PER_SEC * (u64_t)lifetime -
-		NET_TIMEOUT_MAX_VALUE * (u64_t)ifprefix->lifetime.wrap_counter;
+	remaining = MSEC_PER_SEC * (uint64_t)lifetime -
+		NET_TIMEOUT_MAX_VALUE * (uint64_t)ifprefix->lifetime.wrap_counter;
 
 	zassert_equal(remaining, ifprefix->lifetime.timer_timeout,
 		     "Remaining time wrong (%llu vs %d)", remaining,
@@ -924,10 +924,10 @@ static void test_address_lifetime(void)
 	struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0,
 				     0, 0, 0, 0, 0, 0, 0x20, 0x1 } } };
 	struct net_if *iface = net_if_get_default();
-	u32_t vlifetime = 0xffff;
-	u64_t timeout = (u64_t)vlifetime * MSEC_PER_SEC;
+	uint32_t vlifetime = 0xffff;
+	uint64_t timeout = (uint64_t)vlifetime * MSEC_PER_SEC;
 	struct net_if_addr *ifaddr;
-	u64_t remaining;
+	uint64_t remaining;
 	bool ret;
 
 	ifaddr = net_if_ipv6_addr_add(iface, &addr, NET_ADDR_AUTOCONF,
@@ -953,8 +953,8 @@ static void test_address_lifetime(void)
 
 	zassert_equal(ifaddr->lifetime.wrap_counter, 2,
 		      "Wrap counter wrong (%d)", ifaddr->lifetime.wrap_counter);
-	remaining = MSEC_PER_SEC * (u64_t)vlifetime -
-		NET_TIMEOUT_MAX_VALUE * (u64_t)ifaddr->lifetime.wrap_counter;
+	remaining = MSEC_PER_SEC * (uint64_t)vlifetime -
+		NET_TIMEOUT_MAX_VALUE * (uint64_t)ifaddr->lifetime.wrap_counter;
 
 	zassert_equal(remaining, ifaddr->lifetime.timer_timeout,
 		     "Remaining time wrong (%llu vs %d)", remaining,
@@ -988,13 +988,13 @@ static void test_address_lifetime(void)
  */
 static void test_change_ll_addr(void)
 {
-	static u8_t new_mac[] = { 00, 01, 02, 03, 04, 05 };
+	static uint8_t new_mac[] = { 00, 01, 02, 03, 04, 05 };
 	struct net_linkaddr_storage *ll;
 	struct net_linkaddr *ll_iface;
 	struct in6_addr dst;
 	struct net_if *iface;
 	struct net_nbr *nbr;
-	u32_t flags;
+	uint32_t flags;
 	int ret;
 
 	net_ipv6_addr_create(&dst, 0xff02, 0, 0, 0, 0, 0, 0, 1);
@@ -1078,8 +1078,8 @@ static void test_dad_timeout(void)
 static struct net_pkt *setup_ipv6_udp(struct net_if *iface,
 				      struct in6_addr *local_addr,
 				      struct in6_addr *remote_addr,
-				      u16_t local_port,
-				      u16_t remote_port)
+				      uint16_t local_port,
+				      uint16_t remote_port)
 {
 	static const char payload[] = "foobar";
 	struct net_pkt *pkt;
@@ -1100,7 +1100,7 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface,
 		zassert_true(0, "exiting");
 	}
 
-	if (net_pkt_write(pkt, (u8_t *)payload, strlen(payload))) {
+	if (net_pkt_write(pkt, (uint8_t *)payload, strlen(payload))) {
 		printk("Cannot write IPv6 ext header pkt %p", pkt);
 		zassert_true(0, "exiting");
 	}
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index 448ac5f282..6b7abba037 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -44,7 +44,7 @@ static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0,
 				       0, 0, 0, 0xf2, 0xaa, 0x29, 0x02,
 				       0x04 } } };
 
-static u8_t mac2_addr[] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x02 };
+static uint8_t mac2_addr[] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x02 };
 static struct net_linkaddr ll_addr2 = {
 	.addr = mac2_addr,
 	.len = 6,
@@ -903,16 +903,16 @@ static bool test_failed;
 static bool test_started;
 static struct k_sem wait_data;
 
-static u16_t pkt_data_len;
-static u16_t pkt_recv_data_len;
+static uint16_t pkt_data_len;
+static uint16_t pkt_recv_data_len;
 
 #define WAIT_TIME K_SECONDS(1)
 
 #define ALLOC_TIMEOUT K_MSEC(500)
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -930,7 +930,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -952,7 +952,7 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -967,7 +967,7 @@ static int verify_fragment(struct net_pkt *pkt)
 	 *  4) UDP/ICMPv6/TCP header
 	 *  5) data
 	 */
-	u16_t offset;
+	uint16_t offset;
 
 	frag_count++;
 
@@ -1108,11 +1108,11 @@ large:
 	net_pkt_cursor_init(pkt);
 
 	if (frag_count == 1) {
-		u16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
-		u16_t recv_ext_len;
-		u16_t exp_payload_len = 200U;
-		u16_t recv_payload_len;
-		u16_t frag_offset;
+		uint16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
+		uint16_t recv_ext_len;
+		uint16_t exp_payload_len = 200U;
+		uint16_t recv_payload_len;
+		uint16_t frag_offset;
 
 		recv_ext_len = net_pkt_ipv6_ext_len(pkt);
 		if (recv_ext_len != exp_ext_len) {
@@ -1148,11 +1148,11 @@ large:
 	}
 
 	if (frag_count == 2) {
-		u16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
-		u16_t recv_ext_len;
-		u16_t exp_payload_len = 200U;
-		u16_t recv_payload_len;
-		u16_t frag_offset;
+		uint16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
+		uint16_t recv_ext_len;
+		uint16_t exp_payload_len = 200U;
+		uint16_t recv_payload_len;
+		uint16_t frag_offset;
 
 		recv_ext_len = net_pkt_ipv6_ext_len(pkt);
 		if (recv_ext_len != exp_ext_len) {
@@ -1188,11 +1188,11 @@ large:
 	}
 
 	if (frag_count == 3) {
-		u16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
-		u16_t recv_ext_len;
-		u16_t exp_payload_len = 16U;
-		u16_t recv_payload_len;
-		u16_t frag_offset;
+		uint16_t exp_ext_len = 1040U; /* 1032 (HBHO) + 8 (FRAG)*/
+		uint16_t recv_ext_len;
+		uint16_t exp_payload_len = 16U;
+		uint16_t recv_payload_len;
+		uint16_t frag_offset;
 
 		recv_ext_len = net_pkt_ipv6_ext_len(pkt);
 		if (recv_ext_len != exp_ext_len) {
@@ -1233,11 +1233,11 @@ without:
 	net_pkt_cursor_init(pkt);
 
 	if (frag_count == 1) {
-		u16_t exp_ext_len = 8U; /* 0 (HBHO) + 8 (FRAG)*/
-		u16_t recv_ext_len;
-		u16_t exp_payload_len = 1232U;
-		u16_t recv_payload_len;
-		u16_t frag_offset;
+		uint16_t exp_ext_len = 8U; /* 0 (HBHO) + 8 (FRAG)*/
+		uint16_t recv_ext_len;
+		uint16_t exp_payload_len = 1232U;
+		uint16_t recv_payload_len;
+		uint16_t frag_offset;
 
 		recv_ext_len = net_pkt_ipv6_ext_len(pkt);
 		if (recv_ext_len != exp_ext_len) {
@@ -1279,11 +1279,11 @@ without:
 	}
 
 	if (frag_count == 2) {
-		u16_t exp_ext_len = 8U; /* 0 (HBHO) + 8 (FRAG)*/
-		u16_t recv_ext_len;
-		u16_t exp_payload_len = 76U;
-		u16_t recv_payload_len;
-		u16_t frag_offset;
+		uint16_t exp_ext_len = 8U; /* 0 (HBHO) + 8 (FRAG)*/
+		uint16_t recv_ext_len;
+		uint16_t exp_payload_len = 76U;
+		uint16_t recv_payload_len;
+		uint16_t frag_offset;
 
 		recv_ext_len = net_pkt_ipv6_ext_len(pkt);
 		if (recv_ext_len != exp_ext_len) {
@@ -1413,8 +1413,8 @@ static enum net_verdict udp_data_received(struct net_conn *conn,
 
 static void setup_udp_handler(const struct in6_addr *raddr,
 			      const struct in6_addr *laddr,
-			      u16_t remote_port,
-			      u16_t local_port)
+			      uint16_t remote_port,
+			      uint16_t local_port)
 {
 	static struct net_conn_handle *handle;
 	struct sockaddr remote_addr = { 0 };
@@ -1498,8 +1498,8 @@ static void test_setup(void)
 
 static void test_find_last_ipv6_fragment_udp(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
 	int ret;
 
@@ -1532,8 +1532,8 @@ static void test_find_last_ipv6_fragment_udp(void)
 
 static void test_find_last_ipv6_fragment_hbho_udp(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
 	int ret;
 
@@ -1567,11 +1567,11 @@ static void test_find_last_ipv6_fragment_hbho_udp(void)
 
 static void test_find_last_ipv6_fragment_hbho_1(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
-	u8_t next_hdr;
-	u8_t last_hdr;
+	uint8_t next_hdr;
+	uint8_t last_hdr;
 	int ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_1),
@@ -1610,11 +1610,11 @@ static void test_find_last_ipv6_fragment_hbho_1(void)
 
 static void test_find_last_ipv6_fragment_hbho_2(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
-	u8_t next_hdr;
-	u8_t last_hdr;
+	uint8_t next_hdr;
+	uint8_t last_hdr;
 	int ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_2),
@@ -1653,11 +1653,11 @@ static void test_find_last_ipv6_fragment_hbho_2(void)
 
 static void test_find_last_ipv6_fragment_hbho_3(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
-	u8_t next_hdr;
-	u8_t last_hdr;
+	uint8_t next_hdr;
+	uint8_t last_hdr;
 	int ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_3),
@@ -1696,8 +1696,8 @@ static void test_find_last_ipv6_fragment_hbho_3(void)
 
 static void test_find_last_ipv6_fragment_hbho_frag(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
 	int ret;
 
@@ -1731,11 +1731,11 @@ static void test_find_last_ipv6_fragment_hbho_frag(void)
 
 static void test_find_last_ipv6_fragment_hbho_frag_1(void)
 {
-	u16_t next_hdr_pos = 0U;
-	u16_t last_hdr_pos = 0U;
+	uint16_t next_hdr_pos = 0U;
+	uint16_t last_hdr_pos = 0U;
 	struct net_pkt *pkt;
-	u8_t next_hdr;
-	u8_t last_hdr;
+	uint8_t next_hdr;
+	uint8_t last_hdr;
 	int ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_frag_1),
@@ -1929,7 +1929,7 @@ static void test_send_ipv6_fragment_without_hbho(void)
 	}
 }
 
-static u8_t ipv6_reass_frag1[] = {
+static uint8_t ipv6_reass_frag1[] = {
 0x60, 0x00, 0x00, 0x00, 0x04, 0xd8, 0x2c, 0x40,
 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
@@ -1939,7 +1939,7 @@ static u8_t ipv6_reass_frag1[] = {
 0x81, 0x00, 0xb1, 0xb2, 0x28, 0x5b, 0x00, 0x01
 };
 
-static u8_t ipv6_reass_frag2[] = {
+static uint8_t ipv6_reass_frag2[] = {
 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0x2c, 0x40,
 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
@@ -1954,10 +1954,10 @@ static void test_recv_ipv6_fragment(void)
 	struct net_pkt_cursor backup;
 	struct net_pkt *pkt1;
 	struct net_pkt *pkt2;
-	u16_t total_payload_len;
-	u16_t payload1_len;
-	u16_t payload2_len;
-	u8_t data;
+	uint16_t total_payload_len;
+	uint16_t payload1_len;
+	uint16_t payload2_len;
+	uint8_t data;
 	int ret;
 
 	/* Fragment 1 */
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index ea4c4dcd9a..0363ffe884 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -34,7 +34,7 @@ static struct coap_reply replies[NUM_REPLIES];
 
 /* This is exposed for this test in subsys/net/lib/coap/coap_link_format.c */
 bool _coap_match_path_uri(const char * const *path,
-			  const char *uri, u16_t len);
+			  const char *uri, uint16_t len);
 
 /* Some forward declarations */
 static void server_notify_callback(struct coap_resource *resource,
@@ -61,13 +61,13 @@ static struct sockaddr_in6 dummy_addr = {
 
 static int test_build_empty_pdu(void)
 {
-	u8_t result_pdu[] = { 0x40, 0x01, 0x0, 0x0 };
+	uint8_t result_pdu[] = { 0x40, 0x01, 0x0, 0x0 };
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -102,24 +102,24 @@ done:
 
 static int test_build_simple_pdu(void)
 {
-	u8_t result_pdu[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e',
+	uint8_t result_pdu[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e',
 				 'n', 0xC1, 0x00, 0xFF, 'p', 'a', 'y', 'l',
 				 'o', 'a', 'd', 0x00 };
 	struct coap_packet cpkt;
 	const char token[] = "token";
-	u8_t *data;
-	u8_t format = 0U;
+	uint8_t *data;
+	uint8_t format = 0U;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
 
 	r = coap_packet_init(&cpkt, data, COAP_BUF_SIZE,
 			     1, COAP_TYPE_NON_CON,
-			     strlen(token), (u8_t *)token,
+			     strlen(token), (uint8_t *)token,
 			     COAP_RESPONSE_CODE_PROXYING_NOT_SUPPORTED,
 			     0x1234);
 	if (r < 0) {
@@ -158,17 +158,17 @@ done:
 /* No options, No payload */
 static int test_parse_empty_pdu(void)
 {
-	u8_t pdu[] = { 0x40, 0x01, 0, 0 };
+	uint8_t pdu[] = { 0x40, 0x01, 0, 0 };
 	struct coap_packet cpkt;
-	u8_t *data;
-	u8_t ver;
-	u8_t type;
-	u8_t code;
-	u16_t id;
+	uint8_t *data;
+	uint8_t ver;
+	uint8_t type;
+	uint8_t code;
+	uint16_t id;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -219,17 +219,17 @@ done:
 /* 1 option, No payload (No payload marker) */
 static int test_parse_empty_pdu_1(void)
 {
-	u8_t pdu[] = { 0x40, 0x01, 0, 0, 0x40};
+	uint8_t pdu[] = { 0x40, 0x01, 0, 0, 0x40};
 	struct coap_packet cpkt;
-	u8_t *data;
-	u8_t ver;
-	u8_t type;
-	u8_t code;
-	u16_t id;
+	uint8_t *data;
+	uint8_t ver;
+	uint8_t type;
+	uint8_t code;
+	uint16_t id;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -279,22 +279,22 @@ done:
 
 static int test_parse_simple_pdu(void)
 {
-	u8_t pdu[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
+	uint8_t pdu[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
 		       0x00, 0xc1, 0x00, 0xff, 'p', 'a', 'y', 'l', 'o',
 		       'a', 'd', 0x00 };
 	struct coap_packet cpkt;
 	struct coap_option options[16] = {};
-	const u8_t token[8];
-	u8_t *data;
-	u8_t ver;
-	u8_t type;
-	u8_t code;
-	u8_t tkl;
-	u16_t id;
+	const uint8_t token[8];
+	uint8_t *data;
+	uint8_t ver;
+	uint8_t type;
+	uint8_t code;
+	uint8_t tkl;
+	uint16_t id;
 	int result = TC_FAIL;
 	int r, count = ARRAY_SIZE(options) - 1;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -332,7 +332,7 @@ static int test_parse_simple_pdu(void)
 		goto done;
 	}
 
-	tkl = coap_header_get_token(&cpkt, (u8_t *)token);
+	tkl = coap_header_get_token(&cpkt, (uint8_t *)token);
 
 	if (tkl != 5U) {
 		TC_PRINT("Token length doesn't match reference\n");
@@ -356,7 +356,7 @@ static int test_parse_simple_pdu(void)
 		goto done;
 	}
 
-	if (((u8_t *)options[0].value)[0] != 0U) {
+	if (((uint8_t *)options[0].value)[0] != 0U) {
 		TC_PRINT("Option value doesn't match the reference\n");
 		goto done;
 	}
@@ -380,14 +380,14 @@ done:
 
 static int test_parse_malformed_opt(void)
 {
-	u8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
+	uint8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
 		       0xD0 };
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -409,14 +409,14 @@ done:
 
 static int test_parse_malformed_opt_len(void)
 {
-	u8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
+	uint8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
 		       0xC1 };
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -438,14 +438,14 @@ done:
 
 static int test_parse_malformed_opt_ext(void)
 {
-	u8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
+	uint8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
 		       0xE0, 0x01 };
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -467,14 +467,14 @@ done:
 
 static int test_parse_malformed_opt_len_ext(void)
 {
-	u8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
+	uint8_t opt[] = { 0x55, 0xA5, 0x12, 0x34, 't', 'o', 'k', 'e', 'n',
 		       0xEE, 0x01, 0x02, 0x01};
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -497,13 +497,13 @@ done:
 /* 1 option, No payload (with payload marker) */
 static int test_parse_malformed_marker(void)
 {
-	u8_t pdu[] = { 0x40, 0x01, 0, 0, 0x40, 0xFF};
+	uint8_t pdu[] = { 0x40, 0x01, 0, 0, 0x40, 0xFF};
 	struct coap_packet cpkt;
-	u8_t *data;
+	uint8_t *data;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		goto done;
 	}
@@ -595,8 +595,8 @@ static int prepare_block1_request(struct coap_packet *req,
 				  int *more)
 {
 	const char token[] = "token";
-	u8_t payload[32] = { 0 };
-	u8_t *data;
+	uint8_t payload[32] = { 0 };
+	uint8_t *data;
 	bool first;
 	int r;
 
@@ -609,7 +609,7 @@ static int prepare_block1_request(struct coap_packet *req,
 		first = false;
 	}
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -617,7 +617,7 @@ static int prepare_block1_request(struct coap_packet *req,
 
 	r = coap_packet_init(req, data, COAP_BUF_SIZE, 1,
 			     COAP_TYPE_CON, strlen(token),
-			     (u8_t *) token, COAP_METHOD_POST,
+			     (uint8_t *) token, COAP_METHOD_POST,
 			     coap_next_id());
 	if (r < 0) {
 		TC_PRINT("Unable to initialize request\n");
@@ -662,10 +662,10 @@ static int prepare_block1_response(struct coap_packet *rsp,
 				   struct coap_block_context *rsp_ctx,
 				   struct coap_packet *req)
 {
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t tkl;
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t tkl;
 	int r;
 
 	if (rsp_ctx->total_size == 0) {
@@ -678,7 +678,7 @@ static int prepare_block1_response(struct coap_packet *rsp,
 		return -EINVAL;
 	}
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -707,7 +707,7 @@ done:
 	return -EINVAL;
 }
 
-static int test_block1_request(struct coap_block_context *req_ctx, u8_t iter)
+static int test_block1_request(struct coap_block_context *req_ctx, uint8_t iter)
 {
 	int result = TC_FAIL;
 
@@ -744,7 +744,7 @@ done:
 	return result;
 }
 
-static int test_block1_response(struct coap_block_context *rsp_ctx, u8_t iter)
+static int test_block1_response(struct coap_block_context *rsp_ctx, uint8_t iter)
 {
 	int result = TC_FAIL;
 
@@ -780,7 +780,7 @@ static int test_block1_size(void)
 	int result;
 	int more;
 	int r;
-	u8_t i;
+	uint8_t i;
 
 	i = 0U;
 	result = TC_FAIL;
@@ -833,7 +833,7 @@ static int prepare_block2_request(struct coap_packet *req,
 				  struct coap_packet *rsp)
 {
 	const char token[] = "token";
-	u8_t *data;
+	uint8_t *data;
 	int r;
 
 	/* Request Context */
@@ -844,7 +844,7 @@ static int prepare_block2_request(struct coap_packet *req,
 		coap_next_block(rsp, req_ctx);
 	}
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -852,7 +852,7 @@ static int prepare_block2_request(struct coap_packet *req,
 
 	r = coap_packet_init(req, data, COAP_BUF_SIZE, 1,
 			     COAP_TYPE_CON, strlen(token),
-			     (u8_t *) token, COAP_METHOD_GET,
+			     (uint8_t *) token, COAP_METHOD_GET,
 			     coap_next_id());
 	if (r < 0) {
 		TC_PRINT("Unable to initialize request\n");
@@ -875,11 +875,11 @@ static int prepare_block2_response(struct coap_packet *rsp,
 				   struct coap_packet *req,
 				   int *more)
 {
-	u8_t payload[64];
-	u8_t token[8];
-	u8_t *data;
-	u16_t id;
-	u8_t tkl;
+	uint8_t payload[64];
+	uint8_t token[8];
+	uint8_t *data;
+	uint16_t id;
+	uint8_t tkl;
 	bool first;
 	int r;
 
@@ -891,7 +891,7 @@ static int prepare_block2_response(struct coap_packet *rsp,
 		first = false;
 	}
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -943,7 +943,7 @@ done:
 	return -EINVAL;
 }
 
-static int test_block2_request(struct coap_block_context *req_ctx, u8_t iter)
+static int test_block2_request(struct coap_block_context *req_ctx, uint8_t iter)
 {
 	int result = TC_FAIL;
 
@@ -970,7 +970,7 @@ done:
 	return result;
 }
 
-static int test_block2_response(struct coap_block_context *rsp_ctx, u8_t iter)
+static int test_block2_response(struct coap_block_context *rsp_ctx, uint8_t iter)
 {
 	int result = TC_FAIL;
 
@@ -1016,7 +1016,7 @@ static int test_block2_size(void)
 	int result;
 	int more;
 	int r;
-	u8_t i;
+	uint8_t i;
 
 	i = 0U;
 	result = TC_FAIL;
@@ -1071,13 +1071,13 @@ static int test_retransmit_second_round(void)
 	struct coap_packet rsp;
 	struct coap_pending *pending;
 	struct coap_pending *rsp_pending;
-	u8_t *data = NULL;
-	u8_t *rsp_data = NULL;
+	uint8_t *data = NULL;
+	uint8_t *rsp_data = NULL;
 	int result = TC_FAIL;
 	int r;
-	u16_t id;
+	uint16_t id;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -1117,7 +1117,7 @@ static int test_retransmit_second_round(void)
 		goto done;
 	}
 
-	rsp_data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	rsp_data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!rsp_data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -1195,11 +1195,11 @@ static int server_resource_1_get(struct coap_resource *resource,
 {
 	struct coap_packet response;
 	struct coap_observer *observer;
-	u8_t *data;
+	uint8_t *data;
 	char payload[] = "This is the payload";
-	u8_t token[8];
-	u8_t tkl;
-	u16_t id;
+	uint8_t token[8];
+	uint8_t tkl;
+	uint16_t id;
 	int r;
 
 	if (!coap_request_is_observe(request)) {
@@ -1213,14 +1213,14 @@ static int server_resource_1_get(struct coap_resource *resource,
 		return -EINVAL;
 	}
 
-	tkl = coap_header_get_token(request, (u8_t *) token);
+	tkl = coap_header_get_token(request, (uint8_t *) token);
 	id = coap_header_get_id(request);
 
 	coap_observer_init(observer, request, addr);
 
 	coap_register_observer(resource, observer);
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		return -EINVAL;
@@ -1242,7 +1242,7 @@ static int server_resource_1_get(struct coap_resource *resource,
 		goto done;
 	}
 
-	r = coap_packet_append_payload(&response, (u8_t *)payload,
+	r = coap_packet_append_payload(&response, (uint8_t *)payload,
 				       strlen(payload));
 	if (r < 0) {
 		TC_PRINT("Unable to append payload\n");
@@ -1261,13 +1261,13 @@ done:
 
 static int test_observer_server(void)
 {
-	u8_t valid_request_pdu[] = {
+	uint8_t valid_request_pdu[] = {
 		0x45, 0x01, 0x12, 0x34,
 		't', 'o', 'k', 'e', 'n',
 		0x60, /* enable observe option */
 		0x51, 's', 0x01, '1', /* path */
 	};
-	u8_t not_found_request_pdu[] = {
+	uint8_t not_found_request_pdu[] = {
 		0x45, 0x01, 0x12, 0x34,
 		't', 'o', 'k', 'e', 'n',
 		0x60, /* enable observe option */
@@ -1275,12 +1275,12 @@ static int test_observer_server(void)
 	};
 	struct coap_packet req;
 	struct coap_option options[4] = {};
-	u8_t *data;
-	u8_t opt_num = ARRAY_SIZE(options) - 1;
+	uint8_t *data;
+	uint8_t opt_num = ARRAY_SIZE(options) - 1;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -1312,7 +1312,7 @@ static int test_observer_server(void)
 
 	k_free(data);
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -1362,14 +1362,14 @@ static int test_observer_client(void)
 	struct coap_option options[4] = {};
 	const char token[] = "token";
 	const char * const *p;
-	u8_t *data = NULL;
-	u8_t *rsp_data = NULL;
-	u8_t opt_num = ARRAY_SIZE(options) - 1;
+	uint8_t *data = NULL;
+	uint8_t *rsp_data = NULL;
+	uint8_t opt_num = ARRAY_SIZE(options) - 1;
 	int observe = 0;
 	int result = TC_FAIL;
 	int r;
 
-	data = (u8_t *)k_malloc(COAP_BUF_SIZE);
+	data = (uint8_t *)k_malloc(COAP_BUF_SIZE);
 	if (!data) {
 		TC_PRINT("Unable to allocate memory for req");
 		goto done;
@@ -1377,7 +1377,7 @@ static int test_observer_client(void)
 
 	r = coap_packet_init(&req, data, COAP_BUF_SIZE,
 			     1, COAP_TYPE_CON,
-			     strlen(token), (u8_t *)token,
+			     strlen(token), (uint8_t *)token,
 			     COAP_METHOD_GET, coap_next_id());
 	if (r < 0) {
 		TC_PRINT("Unable to initialize request\n");
diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c
index dccd086e1d..b80558d395 100644
--- a/tests/net/lib/dns_addremove/src/main.c
+++ b/tests/net/lib/dns_addremove/src/main.c
@@ -74,8 +74,8 @@ static struct dns_resolve_context resv_ipv6_2;
 #define WAIT_TIME K_MSEC((DNS_TIMEOUT + 300) * 3)
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 };
 
 static int net_iface_dev_init(struct device *dev)
@@ -83,7 +83,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -102,7 +102,7 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -142,7 +142,7 @@ NET_DEVICE_INIT_INSTANCE(net_iface1_test,
 			 127);
 
 static void dns_evt_handler(struct net_mgmt_event_callback *cb,
-			      u32_t mgmt_event, struct net_if *iface)
+			      uint32_t mgmt_event, struct net_if *iface)
 {
 	if (mgmt_event == NET_EVENT_DNS_SERVER_ADD) {
 		k_sem_give(&dns_added);
diff --git a/tests/net/lib/dns_packet/src/main.c b/tests/net/lib/dns_packet/src/main.c
index ba1ecc174c..92025e564d 100644
--- a/tests/net/lib/dns_packet/src/main.c
+++ b/tests/net/lib/dns_packet/src/main.c
@@ -13,11 +13,11 @@
 /* RFC 1035, 4.1.1. Header section format */
 #define DNS_HEADER_SIZE	12
 
-static u8_t buf[MAX_BUF_SIZE];
-static u16_t buf_len;
+static uint8_t buf[MAX_BUF_SIZE];
+static uint16_t buf_len;
 
-static u8_t qname[MAX_BUF_SIZE];
-static u16_t qname_len;
+static uint8_t qname[MAX_BUF_SIZE];
+static uint16_t qname_len;
 
 
 /* Domain: www.zephyrproject.org
@@ -25,7 +25,7 @@ static u16_t qname_len;
  * Transaction ID: 0xda0f
  * Recursion desired
  */
-static u8_t query_ipv4[] = { 0xda, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
+static uint8_t query_ipv4[] = { 0xda, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
 				0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
 				0x0d, 0x7a, 0x65, 0x70, 0x68, 0x79, 0x72, 0x70,
 				0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x03, 0x6f,
@@ -37,7 +37,7 @@ static u8_t query_ipv4[] = { 0xda, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
  * Type: standard query (IPv6)
  * Recursion not desired
  */
-static u8_t query_mdns[] = {
+static uint8_t query_mdns[] = {
 	0xda, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x06, 0x7a, 0x65, 0x70,
 	0x68, 0x79, 0x72, 0x05, 0x6c, 0x6f, 0x63, 0x61,
@@ -46,12 +46,12 @@ static u8_t query_mdns[] = {
 
 #define ZEPHYR_LOCAL "zephyr.local"
 
-static u16_t tid1 = 0xda0f;
+static uint16_t tid1 = 0xda0f;
 
-static int eval_query(const char *dname, u16_t tid, enum dns_rr_type type,
-		      u8_t *expected, u16_t expected_len)
+static int eval_query(const char *dname, uint16_t tid, enum dns_rr_type type,
+		      uint8_t *expected, uint16_t expected_len)
 {
-	u8_t *question;
+	uint8_t *question;
 	int rc;
 
 	rc = dns_msg_pack_qname(&qname_len, qname, MAX_BUF_SIZE, dname);
@@ -188,26 +188,26 @@ struct dns_response_test {
 	const char *dname;
 
 	/* expected result */
-	u8_t *res;
+	uint8_t *res;
 	/* expected result length */
-	u16_t res_len;
+	uint16_t res_len;
 
 	/* transaction id */
-	u16_t tid;
+	uint16_t tid;
 	/* A, AAAA */
-	u8_t answer_type;
+	uint8_t answer_type;
 	/* answer counter */
-	u8_t ancount;
+	uint8_t ancount;
 	/* answer TTL */
-	u32_t ttl;
+	uint32_t ttl;
 	/* recursion available */
-	u8_t ra;
+	uint8_t ra;
 	/* recursion desired */
-	u8_t rd;
+	uint8_t rd;
 	/* data len */
-	u8_t rdlen;
+	uint8_t rdlen;
 	/* data */
-	const u8_t *rdata;
+	const uint8_t *rdata;
 };
 
 /* This routine evaluates DNS responses with one RR, and assumes that the
@@ -215,8 +215,8 @@ struct dns_response_test {
  */
 static int eval_response1(struct dns_response_test *resp, bool unpack_answer)
 {
-	u8_t *ptr = resp->res;
-	u16_t offset;
+	uint8_t *ptr = resp->res;
+	uint16_t offset;
 	int  rc;
 
 	if (resp->res_len < RESPONSE_MIN_SIZE) {
@@ -335,7 +335,7 @@ static int eval_response1(struct dns_response_test *resp, bool unpack_answer)
 	offset += INT_SIZE + INT_SIZE;
 
 	if (unpack_answer) {
-		u32_t ttl;
+		uint32_t ttl;
 		struct dns_msg_t msg;
 
 		msg.msg = resp->res;
@@ -441,7 +441,7 @@ void test_dns_query(void)
  * RD len: 4 (IPv4 Address)
  * RData: 140.211.169.8
  */
-static u8_t resp_ipv4[] = { 0xb0, 0x41, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
+static uint8_t resp_ipv4[] = { 0xb0, 0x41, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
 			       0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
 			       0x0d, 0x7a, 0x65, 0x70, 0x68, 0x79, 0x72, 0x70,
 			       0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x03, 0x6f,
@@ -449,7 +449,7 @@ static u8_t resp_ipv4[] = { 0xb0, 0x41, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
 			       0x0c, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0b,
 			       0xd4, 0x00, 0x04, 0x8c, 0xd3, 0xa9, 0x08 };
 
-static const u8_t resp_ipv4_addr[] = {140, 211, 169, 8};
+static const uint8_t resp_ipv4_addr[] = {140, 211, 169, 8};
 
 void test_dns_response(void)
 {
@@ -500,7 +500,7 @@ char answer_ipv4[] = {
 
 #define DNAME2 "www.wireshark.org"
 
-static const u8_t answer_ipv4_addr[] = { 174, 137, 42, 65 };
+static const uint8_t answer_ipv4_addr[] = { 174, 137, 42, 65 };
 
 void test_dns_response2(void)
 {
@@ -544,7 +544,7 @@ void test_mdns_query(void)
  * RD len: 16 (IPv6 Address)
  * RData: fe80:0000:0000:0000:0200:5eff:fe00:5337
  */
-static u8_t resp_ipv6[] = {
+static uint8_t resp_ipv6[] = {
 	0xf2, 0xb6, 0x80, 0x00, 0x00, 0x01, 0x00, 0x01,
 	0x00, 0x00, 0x00, 0x00, 0x06, 0x7a, 0x65, 0x70,
 	0x68, 0x79, 0x72, 0x05, 0x6c, 0x6f, 0x63, 0x61,
@@ -556,7 +556,7 @@ static u8_t resp_ipv6[] = {
 	0x5e, 0xff, 0xfe, 0x00, 0x53, 0x37,
 };
 
-static const u8_t resp_ipv6_addr[] = {
+static const uint8_t resp_ipv6_addr[] = {
 	0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x02, 0x00, 0x5e, 0xff, 0xfe, 0x00, 0x53, 0x37
 };
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index efb7107fec..3ed7c7f065 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -64,15 +64,15 @@ static bool test_started;
 static bool timeout_query;
 static struct k_sem wait_data;
 static struct k_sem wait_data2;
-static u16_t current_dns_id;
+static uint16_t current_dns_id;
 static struct dns_addrinfo addrinfo;
 
 /* this must be higher that the DNS_TIMEOUT */
 #define WAIT_TIME K_MSEC(DNS_TIMEOUT + 300)
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -81,7 +81,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -103,14 +103,14 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
 }
 
 static inline int get_slot_by_id(struct dns_resolve_context *ctx,
-				 u16_t dns_id)
+				 uint16_t dns_id)
 {
 	int i;
 
@@ -521,7 +521,7 @@ static void verify_cancelled(void)
 static void test_dns_query_ipv4_cancel(void)
 {
 	int expected_status = DNS_EAI_CANCELED;
-	u16_t dns_id;
+	uint16_t dns_id;
 	int ret;
 
 	timeout_query = true;
@@ -547,7 +547,7 @@ static void test_dns_query_ipv4_cancel(void)
 static void test_dns_query_ipv6_cancel(void)
 {
 	int expected_status = DNS_EAI_CANCELED;
-	u16_t dns_id;
+	uint16_t dns_id;
 	int ret;
 
 	timeout_query = true;
diff --git a/tests/net/lib/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
index e258eb39d3..404ac99a80 100644
--- a/tests/net/lib/mqtt_packet/src/mqtt_packet.c
+++ b/tests/net/lib/mqtt_packet/src/mqtt_packet.c
@@ -18,8 +18,8 @@
 
 #define BUFFER_SIZE 128
 
-static ZTEST_DMEM u8_t rx_buffer[BUFFER_SIZE];
-static ZTEST_DMEM u8_t tx_buffer[BUFFER_SIZE];
+static ZTEST_DMEM uint8_t rx_buffer[BUFFER_SIZE];
+static ZTEST_DMEM uint8_t tx_buffer[BUFFER_SIZE];
 static ZTEST_DMEM struct mqtt_client client;
 
 static ZTEST_DMEM struct mqtt_topic topic_qos_0 = {
@@ -65,10 +65,10 @@ struct mqtt_test {
 	int (*eval_fcn)(struct mqtt_test *);
 
 	/* expected result */
-	u8_t *expected;
+	uint8_t *expected;
 
 	/* length of 'expected' */
-	u16_t expected_len;
+	uint16_t expected_len;
 };
 
 /**
@@ -207,7 +207,7 @@ static int eval_corrupted_pkt_len(struct mqtt_test *mqtt_test);
  * @return			TC_FAIL on error and prints both buffers
  */
 static int eval_buffers(const struct buf_ctx *buf,
-			const u8_t *expected, u16_t len);
+			const uint8_t *expected, uint16_t len);
 
 
 /**
@@ -215,7 +215,7 @@ static int eval_buffers(const struct buf_ctx *buf,
  * @param a			The array
  * @param size			Array's size
  */
-static void print_array(const u8_t *a, u16_t size);
+static void print_array(const uint8_t *a, uint16_t size);
 
 /*
  * MQTT CONNECT msg:
@@ -228,7 +228,7 @@ static void print_array(const u8_t *a, u16_t size);
  * mosquitto_sub -V mqttv311 -i zephyr -k 60 -t sensors
  */
 static ZTEST_DMEM
-u8_t connect1[] = {0x10, 0x12, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect1[] = {0x10, 0x12, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x02, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72};
 
@@ -250,7 +250,7 @@ static ZTEST_DMEM struct mqtt_client client_connect1 = {
  * --will-qos 0 --will-payload bye
  */
 static ZTEST_DMEM
-u8_t connect2[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect2[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x06, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
@@ -272,7 +272,7 @@ static ZTEST_DMEM struct mqtt_client client_connect2 = {
  * --will-qos 0 --will-payload bye  --will-retain
  */
 static ZTEST_DMEM
-u8_t connect3[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect3[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x26, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
@@ -294,7 +294,7 @@ static ZTEST_DMEM struct mqtt_client client_connect3 = {
  * --will-qos 1 --will-payload bye
  */
 static ZTEST_DMEM
-u8_t connect4[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect4[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x0e, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
@@ -316,7 +316,7 @@ static ZTEST_DMEM struct mqtt_client client_connect4 = {
  * --will-qos 1 --will-payload bye --will-retain
  */
 static ZTEST_DMEM
-u8_t connect5[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect5[] = {0x10, 0x21, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		   0x04, 0x2e, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		   0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		   0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
@@ -338,7 +338,7 @@ static ZTEST_DMEM struct mqtt_client client_connect5 = {
  * --will-qos 1 --will-payload bye --will-retain -u zephyr1 -P password
  */
 static ZTEST_DMEM
-u8_t connect6[] = {0x10, 0x34, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
+uint8_t connect6[] = {0x10, 0x34, 0x00, 0x04, 0x4d, 0x51, 0x54, 0x54,
 		  0x04, 0xee, 0x00, 0x3c, 0x00, 0x06, 0x7a, 0x65,
 		  0x70, 0x68, 0x79, 0x72, 0x00, 0x08, 0x71, 0x75,
 		  0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x03,
@@ -354,7 +354,7 @@ static ZTEST_DMEM struct mqtt_client client_connect6 = {
 };
 
 static ZTEST_DMEM
-u8_t disconnect1[] = {0xe0, 0x00};
+uint8_t disconnect1[] = {0xe0, 0x00};
 
 /*
  * MQTT PUBLISH msg:
@@ -364,14 +364,14 @@ u8_t disconnect1[] = {0xe0, 0x00};
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 0 -m "OK"
  */
 static ZTEST_DMEM
-u8_t publish1[] = {0x30, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
+uint8_t publish1[] = {0x30, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x4f, 0x4b};
 
 static ZTEST_DMEM struct mqtt_publish_param msg_publish1 = {
 	.dup_flag = 0, .retain_flag = 0, .message_id = 0,
 	.message.topic.qos = 0,
 	.message.topic.topic = TOPIC,
-	.message.payload.data = (u8_t *)"OK",
+	.message.payload.data = (uint8_t *)"OK",
 	.message.payload.len = 2,
 };
 
@@ -383,14 +383,14 @@ static ZTEST_DMEM struct mqtt_publish_param msg_publish1 = {
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 0 -m "OK" -r
  */
 static ZTEST_DMEM
-u8_t publish2[] = {0x31, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
+uint8_t publish2[] = {0x31, 0x0b, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x4f, 0x4b};
 
 static ZTEST_DMEM struct mqtt_publish_param msg_publish2 = {
 	.dup_flag = 0, .retain_flag = 1, .message_id = 0,
 	.message.topic.qos = 0,
 	.message.topic.topic = TOPIC,
-	.message.payload.data = (u8_t *)"OK",
+	.message.payload.data = (uint8_t *)"OK",
 	.message.payload.len = 2,
 };
 
@@ -402,14 +402,14 @@ static ZTEST_DMEM struct mqtt_publish_param msg_publish2 = {
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 1 -m "OK" -r
  */
 static ZTEST_DMEM
-u8_t publish3[] = {0x33, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
+uint8_t publish3[] = {0x33, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x00, 0x01, 0x4f, 0x4b};
 
 static ZTEST_DMEM struct mqtt_publish_param msg_publish3 = {
 	.dup_flag = 0, .retain_flag = 1, .message_id = 1,
 	.message.topic.qos = 1,
 	.message.topic.topic = TOPIC,
-	.message.payload.data = (u8_t *)"OK",
+	.message.payload.data = (uint8_t *)"OK",
 	.message.payload.len = 2,
 };
 
@@ -421,18 +421,18 @@ static ZTEST_DMEM struct mqtt_publish_param msg_publish3 = {
  * mosquitto_pub -V mqttv311 -i zephyr -t sensors -q 2 -m "OK"
  */
 static ZTEST_DMEM
-u8_t publish4[] = {0x34, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
+uint8_t publish4[] = {0x34, 0x0d, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 		   0x6f, 0x72, 0x73, 0x00, 0x01, 0x4f, 0x4b};
 static ZTEST_DMEM struct mqtt_publish_param msg_publish4 = {
 	.dup_flag = 0, .retain_flag = 0, .message_id = 1,
 	.message.topic.qos = 2,
 	.message.topic.topic = TOPIC,
-	.message.payload.data = (u8_t *)"OK",
+	.message.payload.data = (uint8_t *)"OK",
 	.message.payload.len = 2,
 };
 
 static ZTEST_DMEM
-u8_t publish_corrupted[] = {0x30, 0x07, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
+uint8_t publish_corrupted[] = {0x30, 0x07, 0x00, 0x07, 0x73, 0x65, 0x6e, 0x73,
 			    0x6f, 0x72, 0x73, 0x00, 0x01, 0x4f, 0x4b};
 static ZTEST_DMEM struct buf_ctx publish_corrupted_buf = {
 	.cur = publish_corrupted,
@@ -447,7 +447,7 @@ static ZTEST_DMEM struct buf_ctx publish_corrupted_buf = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 0
  */
 static ZTEST_DMEM
-u8_t subscribe1[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
+uint8_t subscribe1[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x00};
 static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe1 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_0
@@ -461,7 +461,7 @@ static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe1 = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 1
  */
 static ZTEST_DMEM
-u8_t subscribe2[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
+uint8_t subscribe2[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x01};
 static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe2 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_1
@@ -475,7 +475,7 @@ static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe2 = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 2
  */
 static ZTEST_DMEM
-u8_t subscribe3[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
+uint8_t subscribe3[] = {0x82, 0x0c, 0x00, 0x01, 0x00, 0x07, 0x73, 0x65,
 		     0x6e, 0x73, 0x6f, 0x72, 0x73, 0x02};
 static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe3 = {
 	.message_id = 1, .list_count = 1, .list = &topic_qos_2
@@ -489,8 +489,8 @@ static ZTEST_DMEM struct mqtt_subscription_list msg_subscribe3 = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 0
  */
 static ZTEST_DMEM
-u8_t suback1[] = {0x90, 0x03, 0x00, 0x01, 0x00};
-static ZTEST_DMEM u8_t data_suback1[] = { MQTT_SUBACK_SUCCESS_QoS_0 };
+uint8_t suback1[] = {0x90, 0x03, 0x00, 0x01, 0x00};
+static ZTEST_DMEM uint8_t data_suback1[] = { MQTT_SUBACK_SUCCESS_QoS_0 };
 static ZTEST_DMEM struct mqtt_suback_param msg_suback1 = {
 	.message_id = 1, .return_codes.len = 1,
 	.return_codes.data = data_suback1
@@ -504,8 +504,8 @@ static ZTEST_DMEM struct mqtt_suback_param msg_suback1 = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 1
  */
 static ZTEST_DMEM
-u8_t suback2[] = {0x90, 0x03, 0x00, 0x01, 0x01};
-static ZTEST_DMEM u8_t data_suback2[] = { MQTT_SUBACK_SUCCESS_QoS_1 };
+uint8_t suback2[] = {0x90, 0x03, 0x00, 0x01, 0x01};
+static ZTEST_DMEM uint8_t data_suback2[] = { MQTT_SUBACK_SUCCESS_QoS_1 };
 static ZTEST_DMEM struct mqtt_suback_param msg_suback2 = {
 	.message_id = 1, .return_codes.len = 1,
 	.return_codes.data = data_suback2
@@ -519,44 +519,44 @@ static ZTEST_DMEM struct mqtt_suback_param msg_suback2 = {
  * mosquitto_sub -V mqttv311 -i zephyr -t sensors -q 2
  */
 static ZTEST_DMEM
-u8_t suback3[] = {0x90, 0x03, 0x00, 0x01, 0x02};
-static ZTEST_DMEM u8_t data_suback3[] = { MQTT_SUBACK_SUCCESS_QoS_2 };
+uint8_t suback3[] = {0x90, 0x03, 0x00, 0x01, 0x02};
+static ZTEST_DMEM uint8_t data_suback3[] = { MQTT_SUBACK_SUCCESS_QoS_2 };
 static ZTEST_DMEM struct mqtt_suback_param msg_suback3 = {
 	.message_id = 1, .return_codes.len = 1,
 	.return_codes.data = data_suback3
 };
 
 static ZTEST_DMEM
-u8_t pingreq1[] = {0xc0, 0x00};
+uint8_t pingreq1[] = {0xc0, 0x00};
 
 static ZTEST_DMEM
-u8_t puback1[] = {0x40, 0x02, 0x00, 0x01};
+uint8_t puback1[] = {0x40, 0x02, 0x00, 0x01};
 static ZTEST_DMEM struct mqtt_puback_param msg_puback1 = {.message_id = 1};
 
 static ZTEST_DMEM
-u8_t pubrec1[] = {0x50, 0x02, 0x00, 0x01};
+uint8_t pubrec1[] = {0x50, 0x02, 0x00, 0x01};
 static ZTEST_DMEM struct mqtt_pubrec_param msg_pubrec1 = {.message_id = 1};
 
 static ZTEST_DMEM
-u8_t pubrel1[] = {0x62, 0x02, 0x00, 0x01};
+uint8_t pubrel1[] = {0x62, 0x02, 0x00, 0x01};
 static ZTEST_DMEM struct mqtt_pubrel_param msg_pubrel1 = {.message_id = 1};
 
 static ZTEST_DMEM
-u8_t pubcomp1[] = {0x70, 0x02, 0x00, 0x01};
+uint8_t pubcomp1[] = {0x70, 0x02, 0x00, 0x01};
 static ZTEST_DMEM struct mqtt_pubcomp_param msg_pubcomp1 = {.message_id = 1};
 
 static ZTEST_DMEM
-u8_t unsuback1[] = {0xb0, 0x02, 0x00, 0x01};
+uint8_t unsuback1[] = {0xb0, 0x02, 0x00, 0x01};
 static ZTEST_DMEM struct mqtt_unsuback_param msg_unsuback1 = {.message_id = 1};
 
 static ZTEST_DMEM
-u8_t max_pkt_len[] = {0x30, 0xff, 0xff, 0xff, 0x7f};
+uint8_t max_pkt_len[] = {0x30, 0xff, 0xff, 0xff, 0x7f};
 static ZTEST_DMEM struct buf_ctx max_pkt_len_buf = {
 	.cur = max_pkt_len, .end = max_pkt_len + sizeof(max_pkt_len)
 };
 
 static ZTEST_DMEM
-u8_t corrupted_pkt_len[] = {0x30, 0xff, 0xff, 0xff, 0xff, 0x01};
+uint8_t corrupted_pkt_len[] = {0x30, 0xff, 0xff, 0xff, 0xff, 0x01};
 static ZTEST_DMEM struct buf_ctx corrupted_pkt_len_buf = {
 	.cur = corrupted_pkt_len,
 	.end = corrupted_pkt_len + sizeof(corrupted_pkt_len)
@@ -670,9 +670,9 @@ struct mqtt_test mqtt_tests[] = {
 	{.test_name = NULL}
 };
 
-static void print_array(const u8_t *a, u16_t size)
+static void print_array(const uint8_t *a, uint16_t size)
 {
-	u16_t i;
+	uint16_t i;
 
 	TC_PRINT("\n");
 	for (i = 0U; i < size; i++) {
@@ -685,7 +685,7 @@ static void print_array(const u8_t *a, u16_t size)
 }
 
 static
-int eval_buffers(const struct buf_ctx *buf, const u8_t *expected, u16_t len)
+int eval_buffers(const struct buf_ctx *buf, const uint8_t *expected, uint16_t len)
 {
 	if (buf->end - buf->cur != len) {
 		goto exit_eval;
@@ -764,8 +764,8 @@ static int eval_msg_publish(struct mqtt_test *mqtt_test)
 			(struct mqtt_publish_param *)mqtt_test->ctx;
 	struct mqtt_publish_param dec_param;
 	int rc;
-	u8_t type_and_flags;
-	u32_t length;
+	uint8_t type_and_flags;
+	uint32_t length;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -823,8 +823,8 @@ static int eval_msg_corrupted_publish(struct mqtt_test *mqtt_test)
 {
 	struct buf_ctx *buf = (struct buf_ctx *)mqtt_test->ctx;
 	int rc;
-	u8_t type_and_flags;
-	u32_t length;
+	uint8_t type_and_flags;
+	uint32_t length;
 	struct mqtt_publish_param dec_param;
 
 	rc = fixed_header_decode(buf, &type_and_flags, &length);
@@ -861,8 +861,8 @@ static int eval_msg_suback(struct mqtt_test *mqtt_test)
 	struct mqtt_suback_param dec_param;
 
 	int rc;
-	u8_t type_and_flags;
-	u32_t length;
+	uint8_t type_and_flags;
+	uint32_t length;
 	struct buf_ctx buf;
 
 	buf.cur = mqtt_test->expected;
@@ -918,8 +918,8 @@ static int eval_msg_puback(struct mqtt_test *mqtt_test)
 			(struct mqtt_puback_param *)mqtt_test->ctx;
 	struct mqtt_puback_param dec_param;
 	int rc;
-	u8_t type_and_flags;
-	u32_t length;
+	uint8_t type_and_flags;
+	uint32_t length;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -956,8 +956,8 @@ static int eval_msg_pubcomp(struct mqtt_test *mqtt_test)
 			(struct mqtt_pubcomp_param *)mqtt_test->ctx;
 	struct mqtt_pubcomp_param dec_param;
 	int rc;
-	u32_t length;
-	u8_t type_and_flags;
+	uint32_t length;
+	uint8_t type_and_flags;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -994,8 +994,8 @@ static int eval_msg_pubrec(struct mqtt_test *mqtt_test)
 			(struct mqtt_pubrec_param *)mqtt_test->ctx;
 	struct mqtt_pubrec_param dec_param;
 	int rc;
-	u32_t length;
-	u8_t type_and_flags;
+	uint32_t length;
+	uint8_t type_and_flags;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -1032,8 +1032,8 @@ static int eval_msg_pubrel(struct mqtt_test *mqtt_test)
 			(struct mqtt_pubrel_param *)mqtt_test->ctx;
 	struct mqtt_pubrel_param dec_param;
 	int rc;
-	u32_t length;
-	u8_t type_and_flags;
+	uint32_t length;
+	uint8_t type_and_flags;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -1070,8 +1070,8 @@ static int eval_msg_unsuback(struct mqtt_test *mqtt_test)
 			(struct mqtt_unsuback_param *)mqtt_test->ctx;
 	struct mqtt_unsuback_param dec_param;
 	int rc;
-	u32_t length;
-	u8_t type_and_flags;
+	uint32_t length;
+	uint8_t type_and_flags;
 	struct buf_ctx buf;
 
 	memset(&dec_param, 0, sizeof(dec_param));
@@ -1097,8 +1097,8 @@ static int eval_max_pkt_len(struct mqtt_test *mqtt_test)
 {
 	struct buf_ctx *buf = (struct buf_ctx *)mqtt_test->ctx;
 	int rc;
-	u8_t flags;
-	u32_t length;
+	uint8_t flags;
+	uint32_t length;
 
 	rc = fixed_header_decode(buf, &flags, &length);
 
@@ -1113,8 +1113,8 @@ static int eval_corrupted_pkt_len(struct mqtt_test *mqtt_test)
 {
 	struct buf_ctx *buf = (struct buf_ctx *)mqtt_test->ctx;
 	int rc;
-	u8_t flags;
-	u32_t length;
+	uint8_t flags;
+	uint32_t length;
 
 	rc = fixed_header_decode(buf, &flags, &length);
 
diff --git a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
index c52bb22554..3b253fa354 100644
--- a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
+++ b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
@@ -21,8 +21,8 @@ char payload[] = "DOORS:OPEN_QoSx";
 
 #define BUFFER_SIZE 128
 
-static u8_t rx_buffer[BUFFER_SIZE];
-static u8_t tx_buffer[BUFFER_SIZE];
+static uint8_t rx_buffer[BUFFER_SIZE];
+static uint8_t tx_buffer[BUFFER_SIZE];
 static struct mqtt_client client_ctx;
 static struct sockaddr broker;
 static struct pollfd fds[1];
diff --git a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
index d57b199058..b786fc199b 100644
--- a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
+++ b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
@@ -18,22 +18,22 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
 #define BUFFER_SIZE 32
 
-static u8_t rx_buffer[BUFFER_SIZE];
-static u8_t tx_buffer[BUFFER_SIZE];
+static uint8_t rx_buffer[BUFFER_SIZE];
+static uint8_t tx_buffer[BUFFER_SIZE];
 static struct mqtt_client client_ctx;
 static struct sockaddr broker;
 static struct pollfd fds[1];
 static int nfds;
 static bool connected;
 static int payload_left;
-static const u8_t *payload;
+static const uint8_t *payload;
 
-static const u8_t payload_short[] = "Short payload";
+static const uint8_t payload_short[] = "Short payload";
 
 /* Generated by http://www.lipsum.com/
  * 2 paragraphs, 171 words, 1210 bytes of Lorem Ipsum
  */
-static const u8_t payload_long[] =
+static const uint8_t payload_long[] =
 	"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse "
 	"eleifend odio sit amet scelerisque tincidunt. In orci ligula, egestas "
 	"ut neque sit amet, fringilla malesuada dolor. Fusce rhoncus nunc in "
@@ -101,7 +101,7 @@ void publish_handler(struct mqtt_client *const client,
 		    const struct mqtt_evt *evt)
 {
 	int rc;
-	static u8_t buf[sizeof(payload_long)];
+	static uint8_t buf[sizeof(payload_long)];
 
 	if (evt->result != 0) {
 		TC_PRINT("MQTT PUBLISH error: %d\n", evt->result);
@@ -256,7 +256,7 @@ static void client_init(struct mqtt_client *client)
 	/* MQTT client configuration */
 	client->broker = &broker;
 	client->evt_cb = mqtt_evt_handler;
-	client->client_id.utf8 = (u8_t *)MQTT_CLIENTID;
+	client->client_id.utf8 = (uint8_t *)MQTT_CLIENTID;
 	client->client_id.size = strlen(MQTT_CLIENTID);
 	client->password = NULL;
 	client->user_name = NULL;
@@ -348,10 +348,10 @@ static int test_publish(enum mqtt_qos qos)
 	payload_left = strlen(payload);
 
 	param.message.topic.qos = qos;
-	param.message.topic.topic.utf8 = (u8_t *)get_mqtt_topic();
+	param.message.topic.topic.utf8 = (uint8_t *)get_mqtt_topic();
 	param.message.topic.topic.size =
 			strlen(param.message.topic.topic.utf8);
-	param.message.payload.data = (u8_t *)payload;
+	param.message.payload.data = (uint8_t *)payload;
 	param.message.payload.len = payload_left;
 	param.message_id = sys_rand32_get();
 	param.dup_flag = 0U;
diff --git a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
index 440c151af2..7c87fcbecd 100644
--- a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
+++ b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
@@ -18,8 +18,8 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 
 #define BUFFER_SIZE 128
 
-static u8_t rx_buffer[BUFFER_SIZE];
-static u8_t tx_buffer[BUFFER_SIZE];
+static uint8_t rx_buffer[BUFFER_SIZE];
+static uint8_t tx_buffer[BUFFER_SIZE];
 static struct mqtt_client client_ctx;
 static struct sockaddr broker;
 static struct pollfd fds[1];
diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c
index 2b05b2af1c..f30690f74a 100644
--- a/tests/net/mgmt/src/mgmt.c
+++ b/tests/net/mgmt/src/mgmt.c
@@ -27,17 +27,17 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 	MAX(sizeof(TEST_INFO_STRING), sizeof(struct in6_addr))
 
 /* Notifier infra */
-static u32_t event2throw;
-static u32_t throw_times;
-static u32_t throw_sleep;
+static uint32_t event2throw;
+static uint32_t throw_times;
+static uint32_t throw_sleep;
 static bool with_info;
 static K_THREAD_STACK_DEFINE(thrower_stack, 512 + CONFIG_TEST_EXTRA_STACKSIZE);
 static struct k_thread thrower_thread_data;
 static struct k_sem thrower_lock;
 
 /* Receiver infra */
-static u32_t rx_event;
-static u32_t rx_calls;
+static uint32_t rx_event;
+static uint32_t rx_calls;
 static size_t info_length_in_test;
 static struct net_mgmt_event_callback rx_cb;
 static char *info_string = TEST_INFO_STRING;
@@ -47,14 +47,14 @@ static struct in6_addr addr6 = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0,
 
 static char info_data[TEST_MGMT_EVENT_INFO_SIZE];
 
-static int test_mgmt_request(u32_t mgmt_request,
-			     struct net_if *iface, void *data, u32_t len)
+static int test_mgmt_request(uint32_t mgmt_request,
+			     struct net_if *iface, void *data, uint32_t len)
 {
-	u32_t *test_data = data;
+	uint32_t *test_data = data;
 
 	ARG_UNUSED(iface);
 
-	if (len == sizeof(u32_t)) {
+	if (len == sizeof(uint32_t)) {
 		*test_data = 1U;
 
 		return 0;
@@ -74,7 +74,7 @@ int fake_dev_init(struct device *dev)
 
 static void fake_iface_init(struct net_if *iface)
 {
-	static u8_t mac[8] = { 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d};
+	static uint8_t mac[8] = { 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0d};
 
 	net_if_set_link_addr(iface, mac, 8, NET_LINK_DUMMY);
 }
@@ -96,7 +96,7 @@ NET_DEVICE_INIT(net_event_test, "net_event_test",
 
 void test_requesting_nm(void)
 {
-	u32_t data = 0U;
+	uint32_t data = 0U;
 
 	TC_PRINT("- Request Net MGMT\n");
 
@@ -130,18 +130,18 @@ static void thrower_thread(void)
 }
 
 static void receiver_cb(struct net_mgmt_event_callback *cb,
-			u32_t nm_event, struct net_if *iface)
+			uint32_t nm_event, struct net_if *iface)
 {
 	TC_PRINT("\t\tReceived event 0x%08X\n", nm_event);
 
 	if (with_info && cb->info) {
 		if (cb->info_length != info_length_in_test) {
-			rx_calls = (u32_t) -1;
+			rx_calls = (uint32_t) -1;
 			return;
 		}
 
 		if (memcmp(info_data, cb->info, info_length_in_test)) {
-			rx_calls = (u32_t) -1;
+			rx_calls = (uint32_t) -1;
 			return;
 		}
 	}
@@ -150,7 +150,7 @@ static void receiver_cb(struct net_mgmt_event_callback *cb,
 	rx_calls++;
 }
 
-static int sending_event(u32_t times, bool receiver, bool info)
+static int sending_event(uint32_t times, bool receiver, bool info)
 {
 	TC_PRINT("- Sending event %u times, %s a receiver, %s info\n",
 		 times, receiver ? "with" : "without",
@@ -182,19 +182,19 @@ static int sending_event(u32_t times, bool receiver, bool info)
 	return TC_PASS;
 }
 
-static int test_sending_event(u32_t times, bool receiver)
+static int test_sending_event(uint32_t times, bool receiver)
 {
 	return sending_event(times, receiver, false);
 }
 
-static int test_sending_event_info(u32_t times, bool receiver)
+static int test_sending_event_info(uint32_t times, bool receiver)
 {
 	return sending_event(times, receiver, true);
 }
 
-static int test_synchronous_event_listener(u32_t times, bool on_iface)
+static int test_synchronous_event_listener(uint32_t times, bool on_iface)
 {
-	u32_t event_mask;
+	uint32_t event_mask;
 	int ret;
 
 	TC_PRINT("- Synchronous event listener %s\n",
@@ -251,7 +251,7 @@ static void initialize_event_tests(void)
 			NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
 }
 
-static int test_core_event(u32_t event, bool (*func)(void))
+static int test_core_event(uint32_t event, bool (*func)(void))
 {
 	TC_PRINT("- Triggering core event: 0x%08X\n", event);
 
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index 9cc3a922d9..c1050d00da 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -62,7 +62,7 @@ K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 #define PEER_PORT 13856
 
 struct net_test_mld {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -71,7 +71,7 @@ int net_test_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_test_get_mac(struct device *dev)
+static uint8_t *net_test_get_mac(struct device *dev)
 {
 	struct net_test_mld *context = dev->driver_data;
 
@@ -90,7 +90,7 @@ static u8_t *net_test_get_mac(struct device *dev)
 
 static void net_test_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_test_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_test_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -148,7 +148,7 @@ NET_DEVICE_INIT(net_test_mld, "net_test_mld",
 		127);
 
 static void group_joined(struct net_mgmt_event_callback *cb,
-			 u32_t nm_event, struct net_if *iface)
+			 uint32_t nm_event, struct net_if *iface)
 {
 	if (nm_event != NET_EVENT_IPV6_MCAST_JOIN) {
 		/* Spurious callback. */
@@ -161,7 +161,7 @@ static void group_joined(struct net_mgmt_event_callback *cb,
 }
 
 static void group_left(struct net_mgmt_event_callback *cb,
-			 u32_t nm_event, struct net_if *iface)
+			 uint32_t nm_event, struct net_if *iface)
 {
 	if (nm_event != NET_EVENT_IPV6_MCAST_LEAVE) {
 		/* Spurious callback. */
@@ -174,7 +174,7 @@ static void group_left(struct net_mgmt_event_callback *cb,
 }
 
 static struct mgmt_events {
-	u32_t event;
+	uint32_t event;
 	net_mgmt_event_handler_t handler;
 	struct net_mgmt_event_callback cb;
 } mgmt_events[] = {
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index 921c17ee31..f658abdc02 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -15,9 +15,9 @@
 
 #include <ztest.h>
 
-static u8_t mac_addr[sizeof(struct net_eth_addr)];
+static uint8_t mac_addr[sizeof(struct net_eth_addr)];
 static struct net_if *eth_if;
-static u8_t small_buffer[512];
+static uint8_t small_buffer[512];
 
 /************************\
  * FAKE ETHERNET DEVICE *
@@ -209,7 +209,7 @@ static void test_net_pkt_basics_of_rw(void)
 {
 	struct net_pkt_cursor backup;
 	struct net_pkt *pkt;
-	u16_t value16;
+	uint16_t value16;
 	int ret;
 
 	pkt = net_pkt_alloc_with_buffer(eth_if, 512,
@@ -457,7 +457,7 @@ void test_net_pkt_advanced_basics(void)
 	 * position in the buffer and cast it to the type you want.
 	 */
 	{
-		u32_t *val = (u32_t *)net_pkt_cursor_get_pos(pkt);
+		uint32_t *val = (uint32_t *)net_pkt_cursor_get_pos(pkt);
 
 		*val = 0U;
 		/* etc... */
@@ -534,7 +534,7 @@ void test_net_pkt_easier_rw_usage(void)
 		     "Pkt not properly unreferenced");
 }
 
-u8_t b5_data[10] = "qrstuvwxyz";
+uint8_t b5_data[10] = "qrstuvwxyz";
 struct net_buf b5 = {
 	.ref   = 1,
 	.data  = b5_data,
@@ -542,7 +542,7 @@ struct net_buf b5 = {
 	.size  = 0,
 };
 
-u8_t b4_data[4] = "mnop";
+uint8_t b4_data[4] = "mnop";
 struct net_buf b4 = {
 	.frags = &b5,
 	.ref   = 1,
@@ -556,7 +556,7 @@ struct net_buf b3 = {
 	.ref   = 1,
 };
 
-u8_t b2_data[8] = "efghijkl";
+uint8_t b2_data[8] = "efghijkl";
 struct net_buf b2 = {
 	.frags = &b3,
 	.ref   = 1,
@@ -565,7 +565,7 @@ struct net_buf b2 = {
 	.size  = sizeof(b2_data),
 };
 
-u8_t b1_data[4] = "abcd";
+uint8_t b1_data[4] = "abcd";
 struct net_buf b1 = {
 	.frags = &b2,
 	.ref   = 1,
@@ -636,8 +636,8 @@ void test_net_pkt_pull(void)
 	const int PULL_AMOUNT = 8;
 	const int LARGE_PULL_AMOUNT = 200;
 	struct net_pkt *dummy_pkt;
-	static u8_t pkt_data[PULL_TEST_PKT_DATA_SIZE];
-	static u8_t pkt_data_readback[PULL_TEST_PKT_DATA_SIZE];
+	static uint8_t pkt_data[PULL_TEST_PKT_DATA_SIZE];
+	static uint8_t pkt_data_readback[PULL_TEST_PKT_DATA_SIZE];
 	size_t len;
 	int i, ret;
 
@@ -747,7 +747,7 @@ void test_net_pkt_pull(void)
 
 void test_net_pkt_clone(void)
 {
-	u8_t buf[26] = {"abcdefghijklmnopqrstuvwxyz"};
+	uint8_t buf[26] = {"abcdefghijklmnopqrstuvwxyz"};
 	struct net_pkt *pkt;
 	struct net_pkt *cloned_pkt;
 	int ret;
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index 48b1fd226d..41e11000d5 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -16,23 +16,23 @@
 #include <net/socket.h>
 
 struct fake_dev_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_if *iface;
 };
 
-static int fake_dev_pm_control(struct device *dev, u32_t command,
+static int fake_dev_pm_control(struct device *dev, uint32_t command,
 			       void *context, device_pm_cb cb, void *arg)
 {
 	struct fake_dev_context *ctx = dev->driver_data;
 	int ret = 0;
 
 	if (command == DEVICE_PM_SET_POWER_STATE) {
-		if (*(u32_t *)context == DEVICE_PM_SUSPEND_STATE) {
+		if (*(uint32_t *)context == DEVICE_PM_SUSPEND_STATE) {
 			ret = net_if_suspend(ctx->iface);
 			if (ret == -EBUSY) {
 				goto out;
 			}
-		} else if (*(u32_t *)context == DEVICE_PM_ACTIVE_STATE) {
+		} else if (*(uint32_t *)context == DEVICE_PM_ACTIVE_STATE) {
 			ret = net_if_resume(ctx->iface);
 		}
 	} else {
@@ -56,7 +56,7 @@ static int fake_dev_send(struct device *dev, struct net_pkt *pkt)
 	return 0;
 }
 
-static u8_t *fake_dev_get_mac(struct fake_dev_context *ctx)
+static uint8_t *fake_dev_get_mac(struct fake_dev_context *ctx)
 {
 	if (ctx->mac_addr[2] == 0x00) {
 		/* 00-00-5E-00-53-xx Documentation RFC 7042 */
@@ -75,7 +75,7 @@ static void fake_dev_iface_init(struct net_if *iface)
 {
 	struct device *dev = net_if_get_device(iface);
 	struct fake_dev_context *ctx = dev->driver_data;
-	u8_t *mac = fake_dev_get_mac(ctx);
+	uint8_t *mac = fake_dev_get_mac(ctx);
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 
diff --git a/tests/net/ppp/driver/src/main.c b/tests/net/ppp/driver/src/main.c
index d6b11b31be..438c1866c7 100644
--- a/tests/net/ppp/driver/src/main.c
+++ b/tests/net/ppp/driver/src/main.c
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 typedef enum net_verdict (*ppp_l2_callback_t)(struct net_if *iface,
 					      struct net_pkt *pkt);
 void ppp_l2_register_pkt_cb(ppp_l2_callback_t cb); /* found in ppp_l2.c */
-void ppp_driver_feed_data(u8_t *data, int data_len);
+void ppp_driver_feed_data(uint8_t *data, int data_len);
 
 static struct net_if *iface;
 
@@ -45,7 +45,7 @@ static struct k_sem wait_data;
 #define WAIT_TIME_LONG K_SECONDS(1)
 
 /* If we receive this wire format PPP data, */
-static u8_t ppp_recv_data1[] = {
+static uint8_t ppp_recv_data1[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0xc0, 0x21, 0x7d, 0x21,
 	0x7d, 0x21, 0x7d, 0x20, 0x7d, 0x34, 0x7d, 0x22,
 	0x7d, 0x26, 0x7d, 0x20, 0x7d, 0x20, 0x7d, 0x20,
@@ -55,13 +55,13 @@ static u8_t ppp_recv_data1[] = {
 };
 
 /* then we should see this FCS checked PPP data */
-static u8_t ppp_expect_data1[] = {
+static uint8_t ppp_expect_data1[] = {
 	0xc0, 0x21, 0x01, 0x01, 0x00, 0x14, 0x02, 0x06,
 	0x00, 0x00, 0x00, 0x00, 0x05, 0x06, 0x5d, 0x58,
 	0xcf, 0x41, 0x07, 0x02, 0x08, 0x02,
 };
 
-static u8_t ppp_recv_data2[] = {
+static uint8_t ppp_recv_data2[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0xc0, 0x21, 0x7d, 0x21,
 	0x7d, 0x21, 0x7d, 0x20, 0x7d, 0x34, 0x7d, 0x22,
 	0x7d, 0x26, 0x7d, 0x20, 0x7d, 0x20, 0x7d, 0x20,
@@ -74,28 +74,28 @@ static u8_t ppp_recv_data2[] = {
 };
 
 /* This is HDLC encoded PPP message */
-static u8_t ppp_recv_data3[] = {
+static uint8_t ppp_recv_data3[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0xc0, 0x21, 0x7d, 0x22,
 	0x7d, 0x21, 0x7d, 0x20, 0x7d, 0x24, 0x1c, 0x90, 0x7e
 };
 
-static u8_t ppp_expect_data3[] = {
+static uint8_t ppp_expect_data3[] = {
 	0xc0, 0x21, 0x02, 0x01, 0x00, 0x04,
 };
 
-static u8_t ppp_recv_data4[] = {
+static uint8_t ppp_recv_data4[] = {
 	/* There is FCS error in this packet */
 	0x7e, 0xff, 0x7d, 0x5d, 0xe4, 0x7d, 0x23, 0xc0,
 	0x21, 0x7d, 0x22, 0x7d, 0x21, 0x7d, 0x20, 0x7d,
 	0x24, 0x7d, 0x3c, 0x90, 0x7e,
 };
 
-static u8_t ppp_expect_data4[] = {
+static uint8_t ppp_expect_data4[] = {
 	0xff, 0x7d, 0xe4, 0x03, 0xc0, 0x21, 0x02, 0x01,
 	0x00, 0x04, 0x1c, 0x90,
 };
 
-static u8_t ppp_recv_data5[] = {
+static uint8_t ppp_recv_data5[] = {
 	/* Multiple valid packets here */
 	/* 1st */
 	0x7e, 0xff, 0x7d, 0x23, 0xc0, 0x21, 0x7d, 0x21,
@@ -116,35 +116,35 @@ static u8_t ppp_recv_data5[] = {
 	0x8f, 0x4e, 0x7e,
 };
 
-static u8_t ppp_expect_data5[] = {
+static uint8_t ppp_expect_data5[] = {
 	0xc0, 0x21, 0x01, 0x03, 0x00, 0x14, 0x02, 0x06,
 	0x00, 0x00, 0x00, 0x00, 0x05, 0x06, 0x66, 0x06,
 	0xbe, 0x70, 0x07, 0x02, 0x08, 0x02,
 };
 
-static u8_t ppp_recv_data6[] = {
+static uint8_t ppp_recv_data6[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0xc0, 0x21, 0x7d, 0x22,
 	0x7d, 0x21, 0x7d, 0x20, 0x7d, 0x24, 0x7d, 0x3c,
 	0x90, 0x7e,
 };
 
-static u8_t ppp_expect_data6[] = {
+static uint8_t ppp_expect_data6[] = {
 	0xc0, 0x21, 0x02, 0x01, 0x00, 0x04,
 };
 
-static u8_t ppp_recv_data7[] = {
+static uint8_t ppp_recv_data7[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0x80, 0x21, 0x7d, 0x22,
 	0x7d, 0x22, 0x7d, 0x20, 0x7d, 0x2a, 0x7d, 0x23,
 	0x7d, 0x26, 0xc0, 0x7d, 0x20, 0x7d, 0x22, 0x7d,
 	0x22, 0x06, 0xa1, 0x7e,
 };
 
-static u8_t ppp_expect_data7[] = {
+static uint8_t ppp_expect_data7[] = {
 	0x80, 0x21, 0x02, 0x02, 0x00, 0x0a, 0x03, 0x06,
 	0xc0, 0x00, 0x02, 0x02,
 };
 
-static u8_t ppp_recv_data8[] = {
+static uint8_t ppp_recv_data8[] = {
 	0x7e, 0xff, 0x7d, 0x23, 0x00, 0x57, 0x60, 0x7d,
 	0x20, 0x7d, 0x20, 0x7d, 0x20, 0x7d, 0x20, 0x7d,
 	0x2c, 0x3a, 0x40, 0xfe, 0x80, 0x7d, 0x20, 0x7d,
@@ -158,7 +158,7 @@ static u8_t ppp_recv_data8[] = {
 	0x5b, 0x2c, 0x7d, 0x3d, 0x25, 0x20, 0x11, 0x7e,
 };
 
-static u8_t ppp_expect_data8[] = {
+static uint8_t ppp_expect_data8[] = {
 	0x60, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x3a, 0x40,
 	0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x5e, 0xff, 0xfe, 0x00, 0x53, 0x44,
@@ -168,7 +168,7 @@ static u8_t ppp_expect_data8[] = {
 	0x5b, 0x2c, 0x1d, 0x25,
 };
 
-static u8_t *receiving, *expecting;
+static uint8_t *receiving, *expecting;
 
 static enum net_verdict ppp_l2_recv(struct net_if *iface, struct net_pkt *pkt)
 {
@@ -223,8 +223,8 @@ static void test_iface_setup(void)
 }
 
 static bool send_iface(struct net_if *iface,
-		       u8_t *recv, size_t recv_len,
-		       u8_t *expect, size_t expect_len)
+		       uint8_t *recv, size_t recv_len,
+		       uint8_t *expect, size_t expect_len)
 {
 	receiving = recv;
 	expecting = expect;
@@ -265,10 +265,10 @@ static void test_send_ppp_pkt_with_full_and_partial(void)
 	zassert_true(ret, "iface");
 }
 
-static bool check_fcs(struct net_pkt *pkt, u16_t *fcs)
+static bool check_fcs(struct net_pkt *pkt, uint16_t *fcs)
 {
 	struct net_buf *buf;
-	u16_t crc;
+	uint16_t crc;
 
 	buf = pkt->buffer;
 	if (!buf) {
@@ -293,10 +293,10 @@ static bool check_fcs(struct net_pkt *pkt, u16_t *fcs)
 	return true;
 }
 
-static u8_t unescape(u8_t **ptr)
+static uint8_t unescape(uint8_t **ptr)
 {
-	u8_t *pos = *ptr;
-	u8_t val;
+	uint8_t *pos = *ptr;
+	uint8_t val;
 
 	if (*pos == 0x7d) {
 		pos++;
@@ -312,12 +312,12 @@ static u8_t unescape(u8_t **ptr)
 	return *pos;
 }
 
-static void ppp_verify_fcs(u8_t *buf, int len)
+static void ppp_verify_fcs(uint8_t *buf, int len)
 {
 	struct net_pkt *pkt;
-	u16_t addr_and_ctrl;
-	u16_t fcs = 0;
-	u8_t *ptr;
+	uint16_t addr_and_ctrl;
+	uint16_t fcs = 0;
+	uint8_t *ptr;
 	bool ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface, len, AF_UNSPEC, 0, K_NO_WAIT);
@@ -357,10 +357,10 @@ static void test_ppp_verify_fcs_1(void)
 	ppp_verify_fcs(ppp_recv_data1, sizeof(ppp_recv_data1));
 }
 
-static bool calc_fcs(struct net_pkt *pkt, u16_t *fcs)
+static bool calc_fcs(struct net_pkt *pkt, uint16_t *fcs)
 {
 	struct net_buf *buf;
-	u16_t crc;
+	uint16_t crc;
 
 	buf = pkt->buffer;
 	if (!buf) {
@@ -383,12 +383,12 @@ static bool calc_fcs(struct net_pkt *pkt, u16_t *fcs)
 	return true;
 }
 
-static void ppp_calc_fcs(u8_t *buf, int len)
+static void ppp_calc_fcs(uint8_t *buf, int len)
 {
 	struct net_pkt *pkt;
-	u16_t addr_and_ctrl;
-	u16_t pkt_fcs, fcs = 0;
-	u8_t *ptr;
+	uint16_t addr_and_ctrl;
+	uint16_t pkt_fcs, fcs = 0;
+	uint8_t *ptr;
 	bool ret;
 
 	pkt = net_pkt_alloc_with_buffer(iface, len, AF_UNSPEC, 0, K_NO_WAIT);
@@ -416,7 +416,7 @@ static void ppp_calc_fcs(u8_t *buf, int len)
 	len = net_pkt_get_len(pkt);
 
 	net_pkt_set_overwrite(pkt, true);
-	net_pkt_skip(pkt, len - sizeof(u16_t) - (2 + 1));
+	net_pkt_skip(pkt, len - sizeof(uint16_t) - (2 + 1));
 	net_pkt_read_le16(pkt, &pkt_fcs);
 
 	/* Skip FCS and sync bytes (2 + 1) */
diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c
index 75009d3338..748a3a2750 100644
--- a/tests/net/promiscuous/src/main.c
+++ b/tests/net/promiscuous/src/main.c
@@ -60,14 +60,14 @@ static struct net_if *iface2;
 #define WAIT_TIME 250
 
 struct net_if_test {
-	u8_t idx;
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx;
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 	bool promisc_mode;
 };
 
@@ -346,7 +346,7 @@ static void test_set_promisc_mode_off(void)
 
 static void _recv_data(struct net_if *iface, struct net_pkt **pkt)
 {
-	static u8_t data[] = { 't', 'e', 's', 't', '\0' };
+	static uint8_t data[] = { 't', 'e', 's', 't', '\0' };
 	int ret;
 
 	*pkt = net_pkt_rx_alloc_with_buffer(iface, sizeof(data),
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
index 19d473b9c1..085367cd0a 100644
--- a/tests/net/ptp/clock/src/main.c
+++ b/tests/net/ptp/clock/src/main.c
@@ -72,7 +72,7 @@ static K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
 	struct net_ptp_time time;
 	struct device *ptp_clock;
@@ -135,7 +135,7 @@ static struct ethernet_api api_funcs = {
 	.send = eth_tx,
 };
 
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
 	mac_addr[0] = 0x00;
@@ -167,7 +167,7 @@ ETH_NET_DEVICE_INIT(eth_test_3, "eth_test_3", eth_init, device_pm_control_nop,
 		    &eth_context_3, NULL, CONFIG_ETH_INIT_PRIORITY, &api_funcs,
 		    NET_ETH_MTU);
 
-static u64_t timestamp_to_nsec(struct net_ptp_time *ts)
+static uint64_t timestamp_to_nsec(struct net_ptp_time *ts)
 {
 	if (!ts) {
 		return 0;
@@ -426,7 +426,7 @@ static void test_ptp_clock_iface(int idx)
 		.nanosecond = 1,
 	};
 	struct device *clk;
-	u64_t orig, new_value;
+	uint64_t orig, new_value;
 
 	clk = net_eth_get_ptp_clock(eth_interfaces[idx]);
 
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index 4d9b772773..d78538616b 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -88,7 +88,7 @@ K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 #define WAIT_TIME K_MSEC(250)
 
 struct net_route_test {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -97,7 +97,7 @@ int net_route_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_route_get_mac(struct device *dev)
+static uint8_t *net_route_get_mac(struct device *dev)
 {
 	struct net_route_test *route = dev->driver_data;
 
@@ -119,7 +119,7 @@ static u8_t *net_route_get_mac(struct device *dev)
 
 static void net_route_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_route_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_route_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c
index b4b82ff990..095aba42fb 100644
--- a/tests/net/shell/src/main.c
+++ b/tests/net/shell/src/main.c
@@ -53,7 +53,7 @@ static bool test_failed;
 static struct k_sem recv_lock;
 
 struct net_udp_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -66,7 +66,7 @@ int net_udp_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_udp_get_mac(struct device *dev)
+static uint8_t *net_udp_get_mac(struct device *dev)
 {
 	struct net_udp_context *context = dev->driver_data;
 
@@ -85,7 +85,7 @@ static u8_t *net_udp_get_mac(struct device *dev)
 
 static void net_udp_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_udp_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_udp_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c
index ac3acf0738..2d9387df3e 100644
--- a/tests/net/socket/af_packet/src/main.c
+++ b/tests/net/socket/af_packet/src/main.c
@@ -20,12 +20,12 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #define DBG(fmt, ...)
 #endif
 
-static u8_t lladdr1[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 };
-static u8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 };
+static uint8_t lladdr1[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 };
+static uint8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 };
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t *mac_address;
+	uint8_t *mac_address;
 };
 
 static struct eth_fake_context eth_fake_data1 = {
diff --git a/tests/net/socket/getaddrinfo/src/main.c b/tests/net/socket/getaddrinfo/src/main.c
index 3249d8405d..db8aebf047 100644
--- a/tests/net/socket/getaddrinfo/src/main.c
+++ b/tests/net/socket/getaddrinfo/src/main.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #define THREAD_PRIORITY K_PRIO_COOP(8)
 #define WAIT_TIME K_MSEC(250)
 
-static u8_t recv_buf[MAX_BUF_SIZE];
+static uint8_t recv_buf[MAX_BUF_SIZE];
 
 static int sock_v4;
 static int sock_v6;
@@ -41,7 +41,7 @@ static ZTEST_BMEM SYS_MUTEX_DEFINE(wait_data);
 
 NET_BUF_POOL_DEFINE(test_dns_msg_pool, 1, 512, 0, NULL);
 
-static bool check_dns_query(u8_t *buf, int buf_len)
+static bool check_dns_query(uint8_t *buf, int buf_len)
 {
 	struct dns_msg_t dns_msg;
 	struct net_buf *result;
diff --git a/tests/net/socket/misc/src/main.c b/tests/net/socket/misc/src/main.c
index 5a5fc8203e..bcf59fed1b 100644
--- a/tests/net/socket/misc/src/main.c
+++ b/tests/net/socket/misc/src/main.c
@@ -28,7 +28,7 @@ void test_gethostname(void)
 void test_inet_pton(void)
 {
 	int res;
-	u8_t buf[32];
+	uint8_t buf[32];
 
 	res = inet_pton(AF_INET, "127.0.0.1", buf);
 	zassert_equal(res, 1, "");
diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c
index 2f9e87bc9f..a86a3eae3c 100644
--- a/tests/net/socket/net_mgmt/src/main.c
+++ b/tests/net/socket/net_mgmt/src/main.c
@@ -30,12 +30,12 @@ static ZTEST_DMEM struct in_addr addr_v4 = { { { 192, 0, 2, 3 } } };
 #define DBG(fmt, ...)
 #endif
 
-static const u8_t mac_addr_init[6] = { 0x01, 0x02, 0x03,
+static const uint8_t mac_addr_init[6] = { 0x01, 0x02, 0x03,
 				       0x04,  0x05,  0x06 };
 
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 
 	bool auto_negotiation;
 	bool full_duplex;
@@ -380,7 +380,7 @@ static void test_net_mgmt_catch_events(void)
 	struct sockaddr_nm event_addr;
 	socklen_t event_addr_len;
 	char ipaddr[INET6_ADDRSTRLEN];
-	u8_t buf[MAX_BUF_LEN];
+	uint8_t buf[MAX_BUF_LEN];
 	int event_count = 2;
 	int ret;
 
diff --git a/tests/net/socket/poll/src/main.c b/tests/net/socket/poll/src/main.c
index 3003240135..f22fa87ac2 100644
--- a/tests/net/socket/poll/src/main.c
+++ b/tests/net/socket/poll/src/main.c
@@ -38,7 +38,7 @@ void test_poll(void)
 	struct sockaddr_in6 s_addr;
 	struct pollfd pollfds[2];
 	struct pollfd pollout[1];
-	u32_t tstamp;
+	uint32_t tstamp;
 	ssize_t len;
 	char buf[10];
 
diff --git a/tests/net/socket/select/src/main.c b/tests/net/socket/select/src/main.c
index 9670a03939..896009a8f9 100644
--- a/tests/net/socket/select/src/main.c
+++ b/tests/net/socket/select/src/main.c
@@ -31,7 +31,7 @@ void test_fd_set(void)
 	fd_set set;
 
 	/* Relies on specific value of CONFIG_POSIX_MAX_FDS in prj.conf */
-	zassert_equal(sizeof(set.bitset), sizeof(u32_t) * 2, "");
+	zassert_equal(sizeof(set.bitset), sizeof(uint32_t) * 2, "");
 
 	FD_ZERO(&set);
 	zassert_equal(set.bitset[0], 0, "");
@@ -69,7 +69,7 @@ void test_select(void)
 	struct sockaddr_in6 c_addr;
 	struct sockaddr_in6 s_addr;
 	fd_set readfds;
-	u32_t tstamp;
+	uint32_t tstamp;
 	ssize_t len;
 	char buf[10];
 	struct timeval tval;
diff --git a/tests/net/socket/socket_helpers.h b/tests/net/socket/socket_helpers.h
index 3730f185cb..69bb20c14b 100644
--- a/tests/net/socket/socket_helpers.h
+++ b/tests/net/socket/socket_helpers.h
@@ -48,7 +48,7 @@ static inline int prepare_listen_sock_udp_v6(struct sockaddr_in6 *addr)
 	return sock;
 }
 
-static inline void prepare_sock_udp_v4(const char *addr, u16_t port,
+static inline void prepare_sock_udp_v4(const char *addr, uint16_t port,
 				       int *sock, struct sockaddr_in *sockaddr)
 {
 	int rv;
@@ -66,7 +66,7 @@ static inline void prepare_sock_udp_v4(const char *addr, u16_t port,
 	zassert_equal(rv, 1, "inet_pton failed");
 }
 
-static inline void prepare_sock_udp_v6(const char *addr, u16_t port,
+static inline void prepare_sock_udp_v6(const char *addr, uint16_t port,
 				       int *sock, struct sockaddr_in6 *sockaddr)
 {
 	int rv;
@@ -85,7 +85,7 @@ static inline void prepare_sock_udp_v6(const char *addr, u16_t port,
 	zassert_equal(rv, 1, "inet_pton failed");
 }
 
-static inline void prepare_sock_tcp_v4(const char *addr, u16_t port,
+static inline void prepare_sock_tcp_v4(const char *addr, uint16_t port,
 				       int *sock, struct sockaddr_in *sockaddr)
 {
 	int rv;
@@ -103,7 +103,7 @@ static inline void prepare_sock_tcp_v4(const char *addr, u16_t port,
 	zassert_equal(rv, 1, "inet_pton failed");
 }
 
-static inline void prepare_sock_tcp_v6(const char *addr, u16_t port,
+static inline void prepare_sock_tcp_v6(const char *addr, uint16_t port,
 				       int *sock, struct sockaddr_in6 *sockaddr)
 {
 	int rv;
diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c
index 9fcf9d880e..aa840c2168 100644
--- a/tests/net/socket/tcp/src/main.c
+++ b/tests/net/socket/tcp/src/main.c
@@ -424,7 +424,7 @@ void test_v4_accept_timeout(void)
 	/* Test if accept() will timeout properly */
 	int s_sock;
 	int new_sock;
-	u32_t tstamp;
+	uint32_t tstamp;
 	struct sockaddr_in s_saddr;
 	struct sockaddr addr;
 	socklen_t addrlen = sizeof(addr);
diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c
index 2a772c869c..5f36ba5cfe 100644
--- a/tests/net/socket/udp/src/main.c
+++ b/tests/net/socket/udp/src/main.c
@@ -316,7 +316,7 @@ void test_so_priority(void)
 	struct sockaddr_in bind_addr4;
 	struct sockaddr_in6 bind_addr6;
 	int sock1, sock2, rv;
-	u8_t optval;
+	uint8_t optval;
 
 	prepare_sock_udp_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, 55555,
 			    &sock1, &bind_addr4);
@@ -782,7 +782,7 @@ static void comm_sendmsg_with_txtime(int client_sock,
  */
 struct eth_fake_context {
 	struct net_if *iface;
-	u8_t mac_address[6];
+	uint8_t mac_address[6];
 };
 
 static struct eth_fake_context eth_fake_data;
@@ -796,7 +796,7 @@ static ZTEST_BMEM bool test_started;
 static ZTEST_BMEM bool test_failed;
 static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0,
 					0, 0, 0, 0, 0, 0, 0, 0x1 } } };
-static u8_t server_lladdr[] = { 0x01, 0x02, 0x03, 0xff, 0xfe,
+static uint8_t server_lladdr[] = { 0x01, 0x02, 0x03, 0xff, 0xfe,
 				0x04, 0x05, 0x06 };
 static struct net_linkaddr server_link_addr = {
 	.addr = server_lladdr,
@@ -823,7 +823,7 @@ static void eth_fake_iface_init(struct net_if *iface)
 
 static int eth_fake_send(struct device *dev, struct net_pkt *pkt)
 {
-	u64_t txtime;
+	uint64_t txtime;
 
 	ARG_UNUSED(dev);
 	ARG_UNUSED(pkt);
@@ -894,14 +894,14 @@ void test_v6_sendmsg_with_txtime(void)
 	int rv;
 	int client_sock;
 	bool optval;
-	u64_t txtime;
+	uint64_t txtime;
 	struct sockaddr_in6 client_addr;
 	struct msghdr msg;
 	struct cmsghdr *cmsg;
 	struct iovec io_vector[1];
 	union {
 		struct cmsghdr hdr;
-		unsigned char  buf[CMSG_SPACE(sizeof(u64_t))];
+		unsigned char  buf[CMSG_SPACE(sizeof(uint64_t))];
 	} cmsgbuf;
 
 	prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock,
@@ -929,7 +929,7 @@ void test_v6_sendmsg_with_txtime(void)
 	cmsg->cmsg_len = CMSG_LEN(sizeof(txtime));
 	cmsg->cmsg_level = SOL_SOCKET;
 	cmsg->cmsg_type = SCM_TXTIME;
-	*(u64_t *)CMSG_DATA(cmsg) = txtime;
+	*(uint64_t *)CMSG_DATA(cmsg) = txtime;
 
 	optval = true;
 	rv = setsockopt(client_sock, SOL_SOCKET, SO_TXTIME, &optval,
diff --git a/tests/net/socket/websocket/src/main.c b/tests/net/socket/websocket/src/main.c
index 8505aa775e..0646244205 100644
--- a/tests/net/socket/websocket/src/main.c
+++ b/tests/net/socket/websocket/src/main.c
@@ -41,27 +41,27 @@ static const char lorem_ipsum[] =
 	"\n";
 
 #define MAX_RECV_BUF_LEN 256
-static u8_t recv_buf[MAX(sizeof(lorem_ipsum), MAX_RECV_BUF_LEN)];
+static uint8_t recv_buf[MAX(sizeof(lorem_ipsum), MAX_RECV_BUF_LEN)];
 
 /* We need to allocate bigger buffer for the websocket data we receive so that
  * the websocket header fits into it.
  */
 #define EXTRA_BUF_SPACE 30
 
-static u8_t temp_recv_buf[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
-static u8_t feed_buf[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
+static uint8_t temp_recv_buf[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
+static uint8_t feed_buf[MAX_RECV_BUF_LEN + EXTRA_BUF_SPACE];
 static size_t test_msg_len;
 
 struct test_data {
-	u8_t *input_buf;
+	uint8_t *input_buf;
 	size_t input_len;
 	struct websocket_context *ctx;
 };
 
-static int test_recv_buf(u8_t *feed_buf, size_t feed_len,
+static int test_recv_buf(uint8_t *feed_buf, size_t feed_len,
 			 struct websocket_context *ctx,
-			 u32_t *msg_type, u64_t *remaining,
-			 u8_t *recv_buf, size_t recv_len)
+			 uint32_t *msg_type, uint64_t *remaining,
+			 uint8_t *recv_buf, size_t recv_len)
 {
 	static struct test_data test_data;
 	int ctx_ptr;
@@ -108,8 +108,8 @@ static const unsigned char frame2[] = {
 static void test_recv(int count)
 {
 	struct websocket_context ctx;
-	u32_t msg_type = -1;
-	u64_t remaining = -1;
+	uint32_t msg_type = -1;
+	uint64_t remaining = -1;
 	int total_read = 0;
 	int ret, i, left;
 
@@ -228,8 +228,8 @@ static void test_recv_whole_msg(void)
 static void test_recv_2(int count)
 {
 	struct websocket_context ctx;
-	u32_t msg_type = -1;
-	u64_t remaining = -1;
+	uint32_t msg_type = -1;
+	uint64_t remaining = -1;
 	int total_read = 0;
 	int ret;
 
@@ -272,8 +272,8 @@ static void test_recv_two_msg(void)
 int verify_sent_and_received_msg(struct msghdr *msg, bool split_msg)
 {
 	static struct websocket_context ctx;
-	u32_t msg_type = -1;
-	u64_t remaining = -1;
+	uint32_t msg_type = -1;
+	uint64_t remaining = -1;
 	size_t split_len = 0, total_read = 0;
 	int ret;
 
@@ -304,7 +304,7 @@ int verify_sent_and_received_msg(struct msghdr *msg, bool split_msg)
 
 	/* Then the data */
 	while (remaining > 0) {
-		ret = test_recv_buf((u8_t *)msg->msg_iov[1].iov_base +
+		ret = test_recv_buf((uint8_t *)msg->msg_iov[1].iov_base +
 								total_read,
 				    msg->msg_iov[1].iov_len - total_read,
 				    &ctx, &msg_type, &remaining,
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index c4c069d476..06f6a029bd 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -92,8 +92,8 @@ int net_tcp_dev_init(struct device *dev)
 
 static void net_tcp_iface_init(struct net_if *iface)
 {
-	static u8_t mac_addr_1[6];
-	static u8_t mac_addr_2[6];
+	static uint8_t mac_addr_1[6];
+	static uint8_t mac_addr_2[6];
 
 	if (mac_addr_1[0] == 0U) {
 		/* 00-00-5E-00-53-xx Documentation RFC 7042 */
@@ -287,8 +287,8 @@ static inline struct in_addr *if_get_addr(struct net_if *iface)
 struct ud {
 	const struct sockaddr *remote_addr;
 	const struct sockaddr *local_addr;
-	u16_t remote_port;
-	u16_t local_port;
+	uint16_t remote_port;
+	uint16_t local_port;
 	char *test;
 	struct net_conn_handle *handle;
 };
@@ -336,13 +336,13 @@ static enum net_verdict test_fail(struct net_conn *conn,
 	return NET_DROP;
 }
 
-static u8_t data[] = { 'f', 'o', 'o', 'b', 'a', 'r' };
+static uint8_t data[] = { 'f', 'o', 'o', 'b', 'a', 'r' };
 
 static struct net_pkt *setup_ipv6_tcp(struct net_if *iface,
 				      struct in6_addr *remote_addr,
 				      struct in6_addr *local_addr,
-				      u16_t remote_port,
-				      u16_t local_port)
+				      uint16_t remote_port,
+				      uint16_t local_port)
 {
 	struct net_pkt *pkt;
 	struct net_tcp_hdr tcp_hdr = { 0 };
@@ -373,8 +373,8 @@ static struct net_pkt *setup_ipv6_tcp(struct net_if *iface,
 static struct net_pkt *setup_ipv4_tcp(struct net_if *iface,
 				      struct in_addr *remote_addr,
 				      struct in_addr *local_addr,
-				      u16_t remote_port,
-				      u16_t local_port)
+				      uint16_t remote_port,
+				      uint16_t local_port)
 {
 	struct net_pkt *pkt;
 	struct net_tcp_hdr tcp_hdr = { 0 };
@@ -402,7 +402,7 @@ static struct net_pkt *setup_ipv4_tcp(struct net_if *iface,
 	return pkt;
 }
 
-u8_t ipv6_hop_by_hop_ext_hdr[] = {
+uint8_t ipv6_hop_by_hop_ext_hdr[] = {
 /* Next header TCP */
 0x06,
 /* Length (multiple of 8 octets) */
@@ -432,8 +432,8 @@ u8_t ipv6_hop_by_hop_ext_hdr[] = {
 static struct net_pkt *setup_ipv6_tcp_long(struct net_if *iface,
 					   struct in6_addr *remote_addr,
 					   struct in6_addr *local_addr,
-					   u16_t remote_port,
-					   u16_t local_port)
+					   uint16_t remote_port,
+					   uint16_t local_port)
 {
 	struct net_pkt *pkt;
 	struct net_tcp_hdr tcp_hdr = { 0 };
@@ -472,8 +472,8 @@ static struct net_pkt *setup_ipv6_tcp_long(struct net_if *iface,
 static bool send_ipv6_tcp_msg(struct net_if *iface,
 			      struct in6_addr *src,
 			      struct in6_addr *dst,
-			      u16_t src_port,
-			      u16_t dst_port,
+			      uint16_t src_port,
+			      uint16_t dst_port,
 			      struct ud *ud,
 			      bool expect_failure)
 {
@@ -512,8 +512,8 @@ static bool send_ipv6_tcp_msg(struct net_if *iface,
 static bool send_ipv4_tcp_msg(struct net_if *iface,
 			      struct in_addr *src,
 			      struct in_addr *dst,
-			      u16_t src_port,
-			      u16_t dst_port,
+			      uint16_t src_port,
+			      uint16_t dst_port,
 			      struct ud *ud,
 			      bool expect_failure)
 {
@@ -552,8 +552,8 @@ static bool send_ipv4_tcp_msg(struct net_if *iface,
 static bool send_ipv6_tcp_long_msg(struct net_if *iface,
 				   struct in6_addr *src,
 				   struct in6_addr *dst,
-				   u16_t src_port,
-				   u16_t dst_port,
+				   uint16_t src_port,
+				   uint16_t dst_port,
 				   struct ud *ud,
 				   bool expect_failure)
 {
@@ -590,8 +590,8 @@ static bool send_ipv6_tcp_long_msg(struct net_if *iface,
 }
 
 static void set_port(sa_family_t family, struct sockaddr *raddr,
-		     struct sockaddr *laddr, u16_t rport,
-		     u16_t lport)
+		     struct sockaddr *laddr, uint16_t rport,
+		     uint16_t lport)
 {
 	if (family == AF_INET6) {
 		if (raddr) {
@@ -880,7 +880,7 @@ static bool test_register(void)
 
 static bool v6_check_port_and_address(char *test_str, struct net_pkt *pkt,
 				      const struct in6_addr *expected_dst_addr,
-				      u16_t expected_dst_port)
+				      uint16_t expected_dst_port)
 {
 	struct net_tcp_hdr *tcp_hdr;
 
@@ -922,7 +922,7 @@ static bool v6_check_port_and_address(char *test_str, struct net_pkt *pkt,
 
 static bool v4_check_port_and_address(char *test_str, struct net_pkt *pkt,
 				      const struct in_addr *expected_dst_addr,
-				      u16_t expected_dst_port)
+				      uint16_t expected_dst_port)
 {
 	struct net_tcp_hdr *tcp_hdr;
 
@@ -965,7 +965,7 @@ static bool v4_check_port_and_address(char *test_str, struct net_pkt *pkt,
 static bool test_create_v6_reset_packet(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_RST;
+	uint8_t flags = NET_TCP_RST;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1002,7 +1002,7 @@ static bool test_create_v6_reset_packet(void)
 static bool test_create_v4_reset_packet(void)
 {
 	struct net_tcp *tcp = v4_ctx->tcp;
-	u8_t flags = NET_TCP_RST;
+	uint8_t flags = NET_TCP_RST;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1039,7 +1039,7 @@ static bool test_create_v4_reset_packet(void)
 static bool test_create_v6_syn_packet(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_SYN;
+	uint8_t flags = NET_TCP_SYN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1076,7 +1076,7 @@ static bool test_create_v6_syn_packet(void)
 static bool test_create_v4_syn_packet(void)
 {
 	struct net_tcp *tcp = v4_ctx->tcp;
-	u8_t flags = NET_TCP_SYN;
+	uint8_t flags = NET_TCP_SYN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1113,7 +1113,7 @@ static bool test_create_v4_syn_packet(void)
 static bool test_create_v6_synack_packet(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_SYN | NET_TCP_ACK;
+	uint8_t flags = NET_TCP_SYN | NET_TCP_ACK;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1151,7 +1151,7 @@ static bool test_create_v6_synack_packet(void)
 static bool test_create_v4_synack_packet(void)
 {
 	struct net_tcp *tcp = v4_ctx->tcp;
-	u8_t flags = NET_TCP_SYN | NET_TCP_ACK;
+	uint8_t flags = NET_TCP_SYN | NET_TCP_ACK;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1189,7 +1189,7 @@ static bool test_create_v4_synack_packet(void)
 static bool test_create_v6_fin_packet(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_FIN;
+	uint8_t flags = NET_TCP_FIN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1226,7 +1226,7 @@ static bool test_create_v6_fin_packet(void)
 static bool test_create_v4_fin_packet(void)
 {
 	struct net_tcp *tcp = v4_ctx->tcp;
-	u8_t flags = NET_TCP_FIN;
+	uint8_t flags = NET_TCP_FIN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
@@ -1263,10 +1263,10 @@ static bool test_create_v4_fin_packet(void)
 static bool test_v6_seq_check(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_SYN;
+	uint8_t flags = NET_TCP_SYN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr *tcp_hdr;
-	u32_t seq;
+	uint32_t seq;
 	int ret;
 
 	ret = net_tcp_prepare_segment(tcp, flags, NULL, 0, NULL,
@@ -1298,10 +1298,10 @@ static bool test_v6_seq_check(void)
 static bool test_v4_seq_check(void)
 {
 	struct net_tcp *tcp = v4_ctx->tcp;
-	u8_t flags = NET_TCP_SYN;
+	uint8_t flags = NET_TCP_SYN;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr *tcp_hdr;
-	u32_t seq;
+	uint32_t seq;
 	int ret;
 
 	ret = net_tcp_prepare_segment(tcp, flags, NULL, 0, NULL,
@@ -1474,7 +1474,7 @@ static bool test_init_tcp_context(void)
 }
 
 /* Receive window helper function copied from tcp.c */
-static inline u32_t get_recv_wnd(struct net_tcp *tcp)
+static inline uint32_t get_recv_wnd(struct net_tcp *tcp)
 {
 	ARG_UNUSED(tcp);
 
@@ -1490,7 +1490,7 @@ static inline u32_t get_recv_wnd(struct net_tcp *tcp)
 static bool test_tcp_seq_validity(void)
 {
 	struct net_tcp *tcp = v6_ctx->tcp;
-	u8_t flags = NET_TCP_RST;
+	uint8_t flags = NET_TCP_RST;
 	struct net_pkt *pkt = NULL;
 	struct net_tcp_hdr hdr, *tcp_hdr;
 	int ret;
diff --git a/tests/net/tcp2/src/main.c b/tests/net/tcp2/src/main.c
index 483f3daa91..77b2da59f1 100644
--- a/tests/net/tcp2/src/main.c
+++ b/tests/net/tcp2/src/main.c
@@ -64,9 +64,9 @@ static struct sockaddr_in6 peer_addr_v6_s = {
 };
 
 static struct net_if *iface;
-static u8_t test_case_no;
-static u32_t seq;
-static u32_t ack;
+static uint8_t test_case_no;
+static uint32_t seq;
+static uint32_t ack;
 
 static K_SEM_DEFINE(test_sem, 0, 1);
 static bool sem;
@@ -95,7 +95,7 @@ static void handle_syn_resend(void);
 static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th);
 static void handle_client_closing_test(sa_family_t af, struct tcphdr *th);
 
-static void verify_flags(struct tcphdr *th, u8_t flags,
+static void verify_flags(struct tcphdr *th, uint8_t flags,
 			 const char *fun, int line)
 {
 	if (!(th && FL(&th->th_flags, ==, flags))) {
@@ -107,7 +107,7 @@ static void verify_flags(struct tcphdr *th, u8_t flags,
 	verify_flags(_th, _flags, __func__, __LINE__)
 
 struct net_tcp_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -120,7 +120,7 @@ static int net_tcp_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_tcp_get_mac(struct device *dev)
+static uint8_t *net_tcp_get_mac(struct device *dev)
 {
 	struct net_tcp_context *context = dev->driver_data;
 
@@ -139,7 +139,7 @@ static u8_t *net_tcp_get_mac(struct device *dev)
 
 static void net_tcp_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_tcp_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_tcp_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
@@ -174,7 +174,7 @@ static void test_sem_take(k_timeout_t timeout, int line)
 	}
 }
 
-static u8_t tcp_options[20] = {
+static uint8_t tcp_options[20] = {
 	0x02, 0x04, 0x05, 0xb4, /* Max segment */
 	0x04, 0x02, /* SACK */
 	0x08, 0x0a, 0xc2, 0x7b, 0xef, 0x0f, 0x00, 0x00, 0x00, 0x00, /* Time */
@@ -182,14 +182,14 @@ static u8_t tcp_options[20] = {
 	0x03, 0x03, 0x07 /* Win scale*/ };
 
 static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af,
-					      u16_t src_port, u16_t dst_port,
-					      u8_t flags, u8_t *data,
+					      uint16_t src_port, uint16_t dst_port,
+					      uint8_t flags, uint8_t *data,
 					      size_t len)
 {
 	NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct tcphdr);
 	struct net_pkt *pkt;
 	struct tcphdr *th;
-	u8_t opts_len = 0;
+	uint8_t opts_len = 0;
 	int ret = -EINVAL;
 
 	if ((test_case_no == 4U) && (flags & SYN)) {
@@ -282,42 +282,42 @@ fail:
 	return NULL;
 }
 
-static struct net_pkt *prepare_syn_packet(sa_family_t af, u16_t src_port,
-					  u16_t dst_port)
+static struct net_pkt *prepare_syn_packet(sa_family_t af, uint16_t src_port,
+					  uint16_t dst_port)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, SYN, NULL, 0U);
 }
 
-static struct net_pkt *prepare_syn_ack_packet(sa_family_t af, u16_t src_port,
-					      u16_t dst_port)
+static struct net_pkt *prepare_syn_ack_packet(sa_family_t af, uint16_t src_port,
+					      uint16_t dst_port)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, SYN | ACK,
 				      NULL, 0U);
 }
 
-static struct net_pkt *prepare_ack_packet(sa_family_t af, u16_t src_port,
-					  u16_t dst_port)
+static struct net_pkt *prepare_ack_packet(sa_family_t af, uint16_t src_port,
+					  uint16_t dst_port)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, ACK, NULL, 0U);
 }
 
-static struct net_pkt *prepare_data_packet(sa_family_t af, u16_t src_port,
-					   u16_t dst_port, u8_t *data,
+static struct net_pkt *prepare_data_packet(sa_family_t af, uint16_t src_port,
+					   uint16_t dst_port, uint8_t *data,
 					   size_t len)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, PSH | ACK, data,
 				      len);
 }
 
-static struct net_pkt *prepare_fin_ack_packet(sa_family_t af, u16_t src_port,
-					      u16_t dst_port)
+static struct net_pkt *prepare_fin_ack_packet(sa_family_t af, uint16_t src_port,
+					      uint16_t dst_port)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, FIN | ACK,
 				      NULL, 0U);
 }
 
-static struct net_pkt *prepare_fin_packet(sa_family_t af, u16_t src_port,
-					  u16_t dst_port)
+static struct net_pkt *prepare_fin_packet(sa_family_t af, uint16_t src_port,
+					  uint16_t dst_port)
 {
 	return tester_prepare_tcp_pkt(af, src_port, dst_port, FIN, NULL, 0U);
 }
@@ -480,7 +480,7 @@ fail:
 static void test_client_ipv4(void)
 {
 	struct net_context *ctx;
-	u8_t data = 0x41; /* "A" */
+	uint8_t data = 0x41; /* "A" */
 	int ret;
 
 	t_state = T_SYN;
@@ -542,7 +542,7 @@ static void test_client_ipv4(void)
 static void test_client_ipv6(void)
 {
 	struct net_context *ctx;
-	u8_t data = 0x41; /* "A" */
+	uint8_t data = 0x41; /* "A" */
 	int ret;
 
 	t_state = T_SYN;
@@ -878,7 +878,7 @@ static void test_server_ipv6(void)
 
 static void handle_syn_resend(void)
 {
-	static u8_t syn_times;
+	static uint8_t syn_times;
 
 	syn_times++;
 
@@ -998,7 +998,7 @@ fail:
 static void test_client_fin_wait_2_ipv4(void)
 {
 	struct net_context *ctx;
-	u8_t data = 0x41; /* "A" */
+	uint8_t data = 0x41; /* "A" */
 	int ret;
 
 	t_state = T_SYN;
@@ -1119,7 +1119,7 @@ fail:
 static void test_client_closing_ipv6(void)
 {
 	struct net_context *ctx;
-	u8_t data = 0x41; /* "A" */
+	uint8_t data = 0x41; /* "A" */
 	int ret;
 
 	t_state = T_SYN;
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 26b667b526..1457572d42 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -96,9 +96,9 @@ static struct k_sem wait_data;
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
-	u16_t expecting_tag;
+	uint16_t expecting_tag;
 };
 
 static struct eth_context eth_context;
@@ -164,7 +164,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt)
 	if (start_receiving) {
 		struct in6_addr addr;
 		struct net_udp_hdr hdr, *udp_hdr;
-		u16_t port;
+		uint16_t port;
 
 		DBG("Packet %p received\n", pkt);
 
@@ -241,7 +241,7 @@ static struct dummy_api api_funcs = {
 	.send	= eth_tx,
 };
 
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
 	mac_addr[0] = 0x00;
@@ -404,7 +404,7 @@ static void test_traffic_class_general_setup(void)
 
 static void traffic_class_setup(enum net_priority *tc2prio, int count)
 {
-	u8_t priority;
+	uint8_t priority;
 	int i, ret;
 
 	for (i = 0; i < count; i++) {
@@ -459,7 +459,7 @@ static void traffic_class_send_packets_with_prio(enum net_priority prio,
 	/* Start to send data to each queue and verify that the data
 	 * is received in correct order.
 	 */
-	u8_t data[128];
+	uint8_t data[128];
 	int len, ret;
 	int tc = net_tx_priority2tc(prio);
 
@@ -737,7 +737,7 @@ static void traffic_class_recv_packets_with_prio(enum net_priority prio,
 	/* Start to receive data to each queue and verify that the data
 	 * is received in correct order.
 	 */
-	u8_t data[128];
+	uint8_t data[128];
 	int len, ret;
 	int tc = net_rx_priority2tc(prio);
 	const struct in6_addr *src_addr;
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index 1da006967e..ab42579259 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -79,7 +79,7 @@ static K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 };
 
 static struct eth_context eth_context;
@@ -132,7 +132,7 @@ static struct ethernet_api api_funcs = {
 	.send = eth_tx,
 };
 
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
 	mac_addr[0] = 0x00;
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 2bcc6efe53..5534dc096b 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -55,7 +55,7 @@ static struct k_sem recv_lock;
 static char payload[] = { 'f', 'o', 'o', 'b', 'a', 'r', '\0' };
 
 struct net_udp_context {
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -68,7 +68,7 @@ int net_udp_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_udp_get_mac(struct device *dev)
+static uint8_t *net_udp_get_mac(struct device *dev)
 {
 	struct net_udp_context *context = dev->driver_data;
 
@@ -87,7 +87,7 @@ static u8_t *net_udp_get_mac(struct device *dev)
 
 static void net_udp_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_udp_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_udp_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET);
 }
@@ -145,8 +145,8 @@ NET_DEVICE_INIT(net_udp_test, "net_udp_test",
 struct ud {
 	const struct sockaddr *remote_addr;
 	const struct sockaddr *local_addr;
-	u16_t remote_port;
-	u16_t local_port;
+	uint16_t remote_port;
+	uint16_t local_port;
 	char *test;
 	void *handle;
 };
@@ -194,7 +194,7 @@ static enum net_verdict test_fail(struct net_conn *conn,
 	return NET_DROP;
 }
 
-u8_t ipv6_hop_by_hop_ext_hdr[] = {
+uint8_t ipv6_hop_by_hop_ext_hdr[] = {
 /* Next header UDP */
 0x11,
 /* Length (multiple of 8 octets) */
@@ -230,8 +230,8 @@ u8_t ipv6_hop_by_hop_ext_hdr[] = {
 static bool send_ipv6_udp_msg(struct net_if *iface,
 			      struct in6_addr *src,
 			      struct in6_addr *dst,
-			      u16_t src_port,
-			      u16_t dst_port,
+			      uint16_t src_port,
+			      uint16_t dst_port,
 			      struct ud *ud,
 			      bool expect_failure)
 {
@@ -279,8 +279,8 @@ static bool send_ipv6_udp_msg(struct net_if *iface,
 static bool send_ipv6_udp_long_msg(struct net_if *iface,
 				   struct in6_addr *src,
 				   struct in6_addr *dst,
-				   u16_t src_port,
-				   u16_t dst_port,
+				   uint16_t src_port,
+				   uint16_t dst_port,
 				   struct ud *ud,
 				   bool expect_failure)
 {
@@ -298,7 +298,7 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface,
 		zassert_true(0, "exiting");
 	}
 
-	if (net_pkt_write(pkt, (u8_t *)ipv6_hop_by_hop_ext_hdr,
+	if (net_pkt_write(pkt, (uint8_t *)ipv6_hop_by_hop_ext_hdr,
 			      sizeof(ipv6_hop_by_hop_ext_hdr))) {
 		printk("Cannot write IPv6 ext header pkt %p", pkt);
 		zassert_true(0, "exiting");
@@ -312,7 +312,7 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface,
 		zassert_true(0, "exiting");
 	}
 
-	if (net_pkt_write(pkt, (u8_t *)payload, sizeof(payload))) {
+	if (net_pkt_write(pkt, (uint8_t *)payload, sizeof(payload))) {
 		printk("Cannot write IPv6 ext header pkt %p", pkt);
 		zassert_true(0, "exiting");
 	}
@@ -347,8 +347,8 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface,
 static bool send_ipv4_udp_msg(struct net_if *iface,
 			      struct in_addr *src,
 			      struct in_addr *dst,
-			      u16_t src_port,
-			      u16_t dst_port,
+			      uint16_t src_port,
+			      uint16_t dst_port,
 			      struct ud *ud,
 			      bool expect_failure)
 {
@@ -394,8 +394,8 @@ static bool send_ipv4_udp_msg(struct net_if *iface,
 }
 
 static void set_port(sa_family_t family, struct sockaddr *raddr,
-		     struct sockaddr *laddr, u16_t rport,
-		     u16_t lport)
+		     struct sockaddr *laddr, uint16_t rport,
+		     uint16_t lport)
 {
 	if (family == AF_INET6) {
 		if (raddr) {
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index ac14e2b890..76ef574f3a 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -86,9 +86,9 @@ static K_SEM_DEFINE(wait_data, 0, UINT_MAX);
 
 struct eth_context {
 	struct net_if *iface;
-	u8_t mac_addr[6];
+	uint8_t mac_addr[6];
 
-	u16_t expecting_tag;
+	uint16_t expecting_tag;
 };
 
 static struct eth_context eth_vlan_context;
@@ -150,7 +150,7 @@ static struct ethernet_api api_funcs = {
 	.send = eth_tx,
 };
 
-static void generate_mac(u8_t *mac_addr)
+static void generate_mac(uint8_t *mac_addr)
 {
 	/* 00-00-5E-00-53-xx Documentation RFC 7042 */
 	mac_addr[0] = 0x00;
@@ -194,8 +194,8 @@ NET_DEVICE_INIT(eth_test, "eth_test", eth_init, device_pm_control_nop,
 		NET_ETH_MTU);
 
 struct net_if_test {
-	u8_t idx; /* not used for anything, just a dummy value */
-	u8_t mac_addr[sizeof(struct net_eth_addr)];
+	uint8_t idx; /* not used for anything, just a dummy value */
+	uint8_t mac_addr[sizeof(struct net_eth_addr)];
 	struct net_linkaddr ll_addr;
 };
 
@@ -204,7 +204,7 @@ static int net_iface_dev_init(struct device *dev)
 	return 0;
 }
 
-static u8_t *net_iface_get_mac(struct device *dev)
+static uint8_t *net_iface_get_mac(struct device *dev)
 {
 	struct net_if_test *data = dev->driver_data;
 
@@ -226,7 +226,7 @@ static u8_t *net_iface_get_mac(struct device *dev)
 
 static void net_iface_init(struct net_if *iface)
 {
-	u8_t *mac = net_iface_get_mac(net_if_get_device(iface));
+	uint8_t *mac = net_iface_get_mac(net_if_get_device(iface));
 
 	net_if_set_link_addr(iface, mac, sizeof(struct net_eth_addr),
 			     NET_LINK_ETHERNET);
@@ -420,9 +420,9 @@ static void test_address_setup(void)
 static void test_vlan_tci(void)
 {
 	struct net_pkt *pkt;
-	u16_t tci;
-	u16_t tag;
-	u8_t priority;
+	uint16_t tci;
+	uint16_t tag;
+	uint8_t priority;
 	bool dei;
 
 	pkt = net_pkt_alloc(K_FOREVER);
diff --git a/tests/portability/cmsis_rtos_v1/src/kernel_apis.c b/tests/portability/cmsis_rtos_v1/src/kernel_apis.c
index 56cf9e45e1..63210a1286 100644
--- a/tests/portability/cmsis_rtos_v1/src/kernel_apis.c
+++ b/tests/portability/cmsis_rtos_v1/src/kernel_apis.c
@@ -39,13 +39,13 @@ void test_kernel_start(void)
  */
 void test_kernel_systick(void)
 {
-	u32_t start_time, stop_time, diff, max, min;
+	uint32_t start_time, stop_time, diff, max, min;
 
 	start_time = osKernelSysTick();
 	k_busy_wait(WAIT_TIME_US);
 	stop_time = osKernelSysTick();
 
-	diff = (u32_t)k_cyc_to_ns_floor64(stop_time -
+	diff = (uint32_t)k_cyc_to_ns_floor64(stop_time -
 					 start_time) / NSEC_PER_USEC;
 
 	/* Check that it's within 1%.  On some Zephyr platforms
diff --git a/tests/portability/cmsis_rtos_v1/src/msgq.c b/tests/portability/cmsis_rtos_v1/src/msgq.c
index 5f9f646652..916bf6c46c 100644
--- a/tests/portability/cmsis_rtos_v1/src/msgq.c
+++ b/tests/portability/cmsis_rtos_v1/src/msgq.c
@@ -14,14 +14,14 @@
 #define TIMEOUT 500
 #define Q_LEN 5
 
-osMessageQDef(message, Q_LEN, u32_t);
+osMessageQDef(message, Q_LEN, uint32_t);
 osMessageQId message_id;
 
 void send_msg_thread(void const *argument)
 {
 	int i;
 	osStatus status;
-	u32_t data = MESSAGE1;
+	uint32_t data = MESSAGE1;
 
 	/* Wait for message_recv to complete initial checks */
 	osDelay(TIMEOUT);
@@ -65,7 +65,7 @@ void message_recv(void)
 {
 	int i;
 	osEvent  evt;
-	u32_t data;
+	uint32_t data;
 
 	/* Try getting message immediately before the queue is populated */
 	evt = osMessageGet(message_id, 0);
diff --git a/tests/portability/cmsis_rtos_v1/src/signal.c b/tests/portability/cmsis_rtos_v1/src/signal.c
index aa3574aa59..4ae9439fc4 100644
--- a/tests/portability/cmsis_rtos_v1/src/signal.c
+++ b/tests/portability/cmsis_rtos_v1/src/signal.c
@@ -43,7 +43,7 @@ void test_multiple_signal_flags(void const *thread_id)
 
 	for (sig_cnt = 0; sig_cnt < max_signal_cnt; sig_cnt++) {
 		/* create unique signal flags to set one flag at a time */
-		s32_t signal_each_flag = SIGNAL_FLAG << sig_cnt;
+		int32_t signal_each_flag = SIGNAL_FLAG << sig_cnt;
 		/* check if each signal flag is set properly */
 		signals = osSignalSet((osThreadId)thread_id, signal_each_flag);
 		zassert_not_equal(signals, 0x80000000,
diff --git a/tests/portability/cmsis_rtos_v1/src/timer.c b/tests/portability/cmsis_rtos_v1/src/timer.c
index 2ec18b716d..042392a1d6 100644
--- a/tests/portability/cmsis_rtos_v1/src/timer.c
+++ b/tests/portability/cmsis_rtos_v1/src/timer.c
@@ -17,12 +17,12 @@ void Timer2_Callback(void const *arg);
 osTimerDef(Timer1, Timer1_Callback);
 osTimerDef(Timer2, Timer2_Callback);
 
-u32_t num_oneshots_executed;
-u32_t num_periods_executed;
+uint32_t num_oneshots_executed;
+uint32_t num_periods_executed;
 
 void Timer1_Callback(void const *arg)
 {
-	u32_t Tmr = *(u32_t *)arg;
+	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_oneshots_executed++;
 	TC_PRINT("oneshot_callback (Timer %d) = %d\n",
@@ -31,7 +31,7 @@ void Timer1_Callback(void const *arg)
 
 void Timer2_Callback(void const *arg)
 {
-	u32_t Tmr = *(u32_t *)arg;
+	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_periods_executed++;
 	TC_PRINT("periodic_callback (Timer %d) = %d\n",
@@ -42,10 +42,10 @@ void test_timer(void)
 {
 	osTimerId id1;
 	osTimerId id2;
-	u32_t  exec1;
-	u32_t  exec2;
+	uint32_t  exec1;
+	uint32_t  exec2;
 	osStatus status;
-	u32_t timerDelay;
+	uint32_t timerDelay;
 
 	/* Create one-shot timer */
 	exec1 = 1U;
diff --git a/tests/portability/cmsis_rtos_v2/src/event_flags.c b/tests/portability/cmsis_rtos_v2/src/event_flags.c
index 99e65d8b2c..1e430eb582 100644
--- a/tests/portability/cmsis_rtos_v2/src/event_flags.c
+++ b/tests/portability/cmsis_rtos_v2/src/event_flags.c
@@ -69,7 +69,7 @@ static osEventFlagsAttr_t event_flags_attrs = {
 void test_event_flags_no_wait_timeout(void)
 {
 	osThreadId_t id1;
-	u32_t flags;
+	uint32_t flags;
 	const char *name;
 	osEventFlagsId_t dummy_id = NULL;
 
@@ -120,7 +120,7 @@ void test_event_flags_no_wait_timeout(void)
 void test_event_flags_signalled(void)
 {
 	osThreadId_t id1, id2;
-	u32_t flags;
+	uint32_t flags;
 
 	id1 = osThreadNew(thread1, evt_id, &thread1_attr);
 	zassert_true(id1 != NULL, "Failed creating thread1");
diff --git a/tests/portability/cmsis_rtos_v2/src/kernel.c b/tests/portability/cmsis_rtos_v2/src/kernel.c
index 407f777009..36279a7d39 100644
--- a/tests/portability/cmsis_rtos_v2/src/kernel.c
+++ b/tests/portability/cmsis_rtos_v2/src/kernel.c
@@ -9,7 +9,7 @@
 #include <irq_offload.h>
 #include <kernel.h>
 
-u32_t tick;
+uint32_t tick;
 osStatus_t status_val;
 
 typedef struct {
diff --git a/tests/portability/cmsis_rtos_v2/src/thread_apis.c b/tests/portability/cmsis_rtos_v2/src/thread_apis.c
index 2d7abd247b..18db06863e 100644
--- a/tests/portability/cmsis_rtos_v2/src/thread_apis.c
+++ b/tests/portability/cmsis_rtos_v2/src/thread_apis.c
@@ -67,7 +67,7 @@ static void thread1(void *argument)
 
 static void thread2(void *argument)
 {
-	u32_t i, num_threads, max_num_threads = 5U;
+	uint32_t i, num_threads, max_num_threads = 5U;
 	osThreadId_t *thread_array;
 	int *yield_check = (int *)argument;
 
@@ -83,8 +83,8 @@ static void thread2(void *argument)
 		      "Incorrect number of cmsis rtos v2 threads");
 
 	for (i = 0U; i < num_threads; i++) {
-		u32_t size = osThreadGetStackSize(thread_array[i]);
-		u32_t space = osThreadGetStackSpace(thread_array[i]);
+		uint32_t size = osThreadGetStackSize(thread_array[i]);
+		uint32_t space = osThreadGetStackSpace(thread_array[i]);
 
 		zassert_true(space < size,
 			     "stack size remaining is not what is expected");
@@ -270,8 +270,8 @@ static void thread4(void *argument)
 void test_thread_join(void)
 {
 	osThreadAttr_t attr = { 0 };
-	s64_t time_stamp;
-	s64_t milliseconds_spent;
+	int64_t time_stamp;
+	int64_t milliseconds_spent;
 	osThreadId_t tA, tB;
 	osStatus_t status;
 
diff --git a/tests/portability/cmsis_rtos_v2/src/thread_flags.c b/tests/portability/cmsis_rtos_v2/src/thread_flags.c
index 8110d8fdeb..d9afedfc85 100644
--- a/tests/portability/cmsis_rtos_v2/src/thread_flags.c
+++ b/tests/portability/cmsis_rtos_v2/src/thread_flags.c
@@ -20,7 +20,7 @@
 
 static void thread1(void *arg)
 {
-	u32_t flags;
+	uint32_t flags;
 
 	/* wait for FLAG1. It should return immediately as it is
 	 * already triggered.
@@ -48,7 +48,7 @@ static void thread1(void *arg)
 
 static void thread2(void *arg)
 {
-	u32_t flags;
+	uint32_t flags;
 
 	flags = osThreadFlagsWait(FLAG, osFlagsWaitAll, TIMEOUT_TICKS);
 	zassert_equal(flags & FLAG, FLAG,
@@ -89,7 +89,7 @@ static osThreadAttr_t thread2_attr = {
 void test_thread_flags_no_wait_timeout(void)
 {
 	osThreadId_t id1;
-	u32_t flags;
+	uint32_t flags;
 
 	id1 = osThreadNew(thread1, NULL, &thread1_attr);
 	zassert_true(id1 != NULL, "Failed creating thread1");
@@ -104,7 +104,7 @@ void test_thread_flags_no_wait_timeout(void)
 void test_thread_flags_signalled(void)
 {
 	osThreadId_t id;
-	u32_t flags;
+	uint32_t flags;
 
 	id = osThreadNew(thread2, osThreadGetId(), &thread2_attr);
 	zassert_true(id != NULL, "Failed creating thread2");
@@ -140,7 +140,7 @@ static void offload_function(void *param)
 
 void test_thread_flags_from_isr(void *thread_id)
 {
-	u32_t flags;
+	uint32_t flags;
 
 	/**TESTPOINT: Offload to IRQ context*/
 	irq_offload(offload_function, (void *)osThreadGetId());
diff --git a/tests/portability/cmsis_rtos_v2/src/timer.c b/tests/portability/cmsis_rtos_v2/src/timer.c
index 25e3e60dc9..90395627ca 100644
--- a/tests/portability/cmsis_rtos_v2/src/timer.c
+++ b/tests/portability/cmsis_rtos_v2/src/timer.c
@@ -11,8 +11,8 @@
 #define PERIOD_TICKS            MAX(50, k_ms_to_ticks_ceil32(5))
 #define NUM_PERIODS             5
 
-u32_t num_oneshots_executed;
-u32_t num_periods_executed;
+uint32_t num_oneshots_executed;
+uint32_t num_periods_executed;
 
 const osTimerAttr_t timer_attr = {
 	"myTimer",
@@ -23,7 +23,7 @@ const osTimerAttr_t timer_attr = {
 
 void Timer1_Callback(void *arg)
 {
-	u32_t Tmr = *(u32_t *)arg;
+	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_oneshots_executed++;
 	TC_PRINT("oneshot_callback (Timer %d) = %d\n",
@@ -32,7 +32,7 @@ void Timer1_Callback(void *arg)
 
 void Timer2_Callback(void *arg)
 {
-	u32_t Tmr = *(u32_t *)arg;
+	uint32_t Tmr = *(uint32_t *)arg;
 
 	num_periods_executed++;
 	TC_PRINT("periodic_callback (Timer %d) = %d\n",
@@ -43,10 +43,10 @@ void test_timer(void)
 {
 	osTimerId_t id1;
 	osTimerId_t id2;
-	u32_t exec1;
-	u32_t exec2;
+	uint32_t exec1;
+	uint32_t exec2;
 	osStatus_t status;
-	u32_t timerDelay;
+	uint32_t timerDelay;
 	const char *name;
 
 	/* Create one-shot timer */
diff --git a/tests/posix/common/src/clock.c b/tests/posix/common/src/clock.c
index a477ceb81d..9d0d05d5b1 100644
--- a/tests/posix/common/src/clock.c
+++ b/tests/posix/common/src/clock.c
@@ -13,7 +13,7 @@
 
 void test_posix_clock(void)
 {
-	s64_t nsecs_elapsed, secs_elapsed;
+	int64_t nsecs_elapsed, secs_elapsed;
 	struct timespec ts, te;
 
 	printk("POSIX clock APIs\n");
@@ -97,22 +97,22 @@ void test_posix_realtime(void)
 	 * catch all of the boundary conditions of the clock to make
 	 * sure there are no errors in the arithmetic.
 	 */
-	s64_t last_delta = 0;
+	int64_t last_delta = 0;
 	for (int i = 1; i <= 20; i++) {
 		usleep(USEC_PER_MSEC * 90U);
 		ret = clock_gettime(CLOCK_REALTIME, &rts);
 		zassert_equal(ret, 0, "Fail to read realitime clock");
 
-		s64_t delta =
-			((s64_t)rts.tv_sec * NSEC_PER_SEC -
-			 (s64_t)nts.tv_sec * NSEC_PER_SEC) +
-			((s64_t)rts.tv_nsec - (s64_t)nts.tv_nsec);
+		int64_t delta =
+			((int64_t)rts.tv_sec * NSEC_PER_SEC -
+			 (int64_t)nts.tv_sec * NSEC_PER_SEC) +
+			((int64_t)rts.tv_nsec - (int64_t)nts.tv_nsec);
 
 		/* Make the delta milliseconds. */
 		delta /= (NSEC_PER_SEC / 1000U);
 
 		zassert_true(delta > last_delta, "Clock moved backward");
-		s64_t error = delta - last_delta;
+		int64_t error = delta - last_delta;
 
 		/* printk("Delta %d: %lld\n", i, delta); */
 
diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c
index db1e2a1ce8..873b517f0f 100644
--- a/tests/posix/common/src/mqueue.c
+++ b/tests/posix/common/src/mqueue.c
@@ -64,7 +64,7 @@ void test_posix_mqueue(void)
 {
 	mqd_t mqd;
 	struct mq_attr attrs;
-	s32_t mode = 0777, flags = O_RDWR | O_CREAT, ret, i;
+	int32_t mode = 0777, flags = O_RDWR | O_CREAT, ret, i;
 	void *retval;
 	pthread_attr_t attr[N_THR];
 	pthread_t newthread[N_THR];
diff --git a/tests/posix/common/src/posix_rwlock.c b/tests/posix/common/src/posix_rwlock.c
index a64461ba5d..519bfbb247 100644
--- a/tests/posix/common/src/posix_rwlock.c
+++ b/tests/posix/common/src/posix_rwlock.c
@@ -17,7 +17,7 @@ pthread_rwlock_t rwlock;
 static void *thread_top(void *p1)
 {
 	pthread_t pthread;
-	u32_t policy, ret = 0U;
+	uint32_t policy, ret = 0U;
 	struct sched_param param;
 	int id = POINTER_TO_INT(p1);
 
@@ -55,7 +55,7 @@ static void *thread_top(void *p1)
 
 void test_posix_rw_lock(void)
 {
-	s32_t i, ret;
+	int32_t i, ret;
 	pthread_attr_t attr[N_THR];
 	struct sched_param schedparam;
 	pthread_t newthread[N_THR];
diff --git a/tests/posix/common/src/pthread.c b/tests/posix/common/src/pthread.c
index 6b2808ce6d..da46c3afb2 100644
--- a/tests/posix/common/src/pthread.c
+++ b/tests/posix/common/src/pthread.c
@@ -404,7 +404,7 @@ void test_posix_pthread_execution(void)
 
 void test_posix_pthread_termination(void)
 {
-	s32_t i, ret;
+	int32_t i, ret;
 	int oldstate, policy;
 	pthread_attr_t attr[N_THR_T];
 	struct sched_param schedparam;
diff --git a/tests/posix/common/src/timer.c b/tests/posix/common/src/timer.c
index 2374315365..614139cce1 100644
--- a/tests/posix/common/src/timer.c
+++ b/tests/posix/common/src/timer.c
@@ -29,7 +29,7 @@ void test_posix_timer(void)
 	timer_t timerid;
 	struct itimerspec value, ovalue;
 	struct timespec ts, te;
-	s64_t nsecs_elapsed, secs_elapsed, total_secs_timer;
+	int64_t nsecs_elapsed, secs_elapsed, total_secs_timer;
 
 	sig.sigev_notify = SIGEV_SIGNAL;
 	sig.sigev_notify_function = handler;
@@ -78,7 +78,7 @@ void test_posix_timer(void)
 	}
 
 	total_secs_timer = (value.it_value.tv_sec * NSEC_PER_SEC +
-			    value.it_value.tv_nsec + (u64_t) exp_count *
+			    value.it_value.tv_nsec + (uint64_t) exp_count *
 			    (value.it_interval.tv_sec * NSEC_PER_SEC +
 			     value.it_interval.tv_nsec)) / NSEC_PER_SEC;
 
diff --git a/tests/subsys/canbus/frame/src/main.c b/tests/subsys/canbus/frame/src/main.c
index 63969c1789..b525e6f178 100644
--- a/tests/subsys/canbus/frame/src/main.c
+++ b/tests/subsys/canbus/frame/src/main.c
@@ -21,7 +21,7 @@ static void test_can_frame_to_zcan_frame(void)
 	struct can_frame frame = { 0 };
 	struct zcan_frame expected = { 0 };
 	struct zcan_frame msg;
-	const u8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
+	const uint8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
 					  0x05, 0x06, 0x07, 0x08 };
 
 	frame.can_id = BIT(31) | BIT(30) | 1234;
@@ -35,9 +35,9 @@ static void test_can_frame_to_zcan_frame(void)
 
 	can_copy_frame_to_zframe(&frame, &msg);
 
-	LOG_HEXDUMP_DBG((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_DBG((const u8_t *)&msg, sizeof(msg), "msg");
-	LOG_HEXDUMP_DBG((const u8_t *)&expected, sizeof(expected), "expected");
+	LOG_HEXDUMP_DBG((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_DBG((const uint8_t *)&msg, sizeof(msg), "msg");
+	LOG_HEXDUMP_DBG((const uint8_t *)&expected, sizeof(expected), "expected");
 
 	zassert_equal(msg.rtr, expected.rtr, "RTR bit not set");
 	zassert_equal(msg.id_type, expected.id_type, "Id-type bit not set");
@@ -50,7 +50,7 @@ static void test_zcan_frame_to_can_frame(void)
 	struct can_frame frame = { 0 };
 	struct can_frame expected = { 0 };
 	struct zcan_frame msg = { 0 };
-	const u8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
+	const uint8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
 					  0x05, 0x06, 0x07, 0x08 };
 
 	expected.can_id = BIT(31) | BIT(30) | 1234;
@@ -65,9 +65,9 @@ static void test_zcan_frame_to_can_frame(void)
 
 	can_copy_zframe_to_frame(&msg, &frame);
 
-	LOG_HEXDUMP_DBG((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_DBG((const u8_t *)&msg, sizeof(msg), "msg");
-	LOG_HEXDUMP_DBG((const u8_t *)&expected, sizeof(expected), "expected");
+	LOG_HEXDUMP_DBG((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_DBG((const uint8_t *)&msg, sizeof(msg), "msg");
+	LOG_HEXDUMP_DBG((const uint8_t *)&expected, sizeof(expected), "expected");
 
 	zassert_mem_equal(&frame.can_id, &expected.can_id, sizeof(frame.can_id),
 			  "CAN ID not same");
@@ -82,7 +82,7 @@ static void test_invalid_zcan_frame_to_can_frame(void)
 	struct can_frame frame = { 0 };
 	struct can_frame expected = { 0 };
 	struct zcan_frame msg = { 0 };
-	const u8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
+	const uint8_t data[CAN_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
 					  0x05, 0x06, 0x07, 0x08 };
 
 	expected.can_id = 0x678;
@@ -96,9 +96,9 @@ static void test_invalid_zcan_frame_to_can_frame(void)
 
 	can_copy_zframe_to_frame(&msg, &frame);
 
-	LOG_HEXDUMP_DBG((const u8_t *)&frame, sizeof(frame), "frame");
-	LOG_HEXDUMP_DBG((const u8_t *)&msg, sizeof(msg), "msg");
-	LOG_HEXDUMP_DBG((const u8_t *)&expected, sizeof(expected), "expected");
+	LOG_HEXDUMP_DBG((const uint8_t *)&frame, sizeof(frame), "frame");
+	LOG_HEXDUMP_DBG((const uint8_t *)&msg, sizeof(msg), "msg");
+	LOG_HEXDUMP_DBG((const uint8_t *)&expected, sizeof(expected), "expected");
 
 	zassert_mem_equal(&frame.can_id, &expected.can_id, sizeof(frame.can_id),
 			  "CAN ID not same");
@@ -126,10 +126,10 @@ static void test_can_filter_to_zcan_filter(void)
 
 	can_copy_filter_to_zfilter(&filter, &msg_filter);
 
-	LOG_HEXDUMP_DBG((const u8_t *)&msg_filter, sizeof(msg_filter),
+	LOG_HEXDUMP_DBG((const uint8_t *)&msg_filter, sizeof(msg_filter),
 			"msg_filter");
-	LOG_HEXDUMP_DBG((const u8_t *)&filter, sizeof(filter), "filter");
-	LOG_HEXDUMP_DBG((const u8_t *)&expected, sizeof(expected), "expected");
+	LOG_HEXDUMP_DBG((const uint8_t *)&filter, sizeof(filter), "filter");
+	LOG_HEXDUMP_DBG((const uint8_t *)&expected, sizeof(expected), "expected");
 
 	zassert_equal(msg_filter.rtr, expected.rtr, "RTR bit not set");
 	zassert_equal(msg_filter.id_type, expected.id_type,
@@ -159,10 +159,10 @@ static void test_zcan_filter_to_can_filter(void)
 
 	can_copy_zfilter_to_filter(&msg_filter, &filter);
 
-	LOG_HEXDUMP_DBG((const u8_t *)&msg_filter, sizeof(msg_filter),
+	LOG_HEXDUMP_DBG((const uint8_t *)&msg_filter, sizeof(msg_filter),
 			"msg_filter");
-	LOG_HEXDUMP_DBG((const u8_t *)&filter, sizeof(filter), "filter");
-	LOG_HEXDUMP_DBG((const u8_t *)&expected, sizeof(expected), "expected");
+	LOG_HEXDUMP_DBG((const uint8_t *)&filter, sizeof(filter), "filter");
+	LOG_HEXDUMP_DBG((const uint8_t *)&expected, sizeof(expected), "expected");
 
 	zassert_mem_equal(&filter.can_id, &expected.can_id,
 			  sizeof(filter.can_id), "CAN ID not same");
diff --git a/tests/subsys/canbus/isotp/conformance/src/main.c b/tests/subsys/canbus/isotp/conformance/src/main.c
index 929de91ef5..e7f77f789b 100644
--- a/tests/subsys/canbus/isotp/conformance/src/main.c
+++ b/tests/subsys/canbus/isotp/conformance/src/main.c
@@ -63,8 +63,8 @@
  */
 
 struct frame_desired {
-	u8_t data[8];
-	u8_t length;
+	uint8_t data[8];
+	uint8_t length;
 };
 
 struct frame_desired des_frames[CEIL((DATA_SEND_LENGTH - DATA_SIZE_FF),
@@ -107,7 +107,7 @@ const struct isotp_msg_id tx_addr_ext = {
 struct device *can_dev;
 struct isotp_recv_ctx recv_ctx;
 struct isotp_send_ctx send_ctx;
-u8_t data_buf[128];
+uint8_t data_buf[128];
 CAN_DEFINE_MSGQ(frame_msgq, 10);
 struct k_sem send_compl_sem;
 
@@ -121,7 +121,7 @@ void send_complette_cb(int error_nr, void *arg)
 	k_sem_give(&send_compl_sem);
 }
 
-static void print_hex(const u8_t *ptr, size_t len)
+static void print_hex(const uint8_t *ptr, size_t len)
 {
 	while (len--) {
 		printk("%02x ", *ptr++);
@@ -129,7 +129,7 @@ static void print_hex(const u8_t *ptr, size_t len)
 }
 
 
-static int check_data(const u8_t *frame, const u8_t *desired, size_t length)
+static int check_data(const uint8_t *frame, const uint8_t *desired, size_t length)
 {
 	int ret;
 
@@ -175,7 +175,7 @@ static void get_sf_ignore(struct isotp_recv_ctx *recv_ctx)
 	zassert_equal(ret, ISOTP_RECV_TIMEOUT, "recv returned %d", ret);
 }
 
-static void send_test_data(const u8_t *data, size_t len)
+static void send_test_data(const uint8_t *data, size_t len)
 {
 	int ret;
 
@@ -185,11 +185,11 @@ static void send_test_data(const u8_t *data, size_t len)
 }
 
 static void receive_test_data(struct isotp_recv_ctx *recv_ctx,
-			      const u8_t *data, size_t len, s32_t delay)
+			      const uint8_t *data, size_t len, int32_t delay)
 {
 	size_t remaining_len = len;
 	int ret, recv_len;
-	const u8_t *data_ptr = data;
+	const uint8_t *data_ptr = data;
 
 	do {
 		memset(data_buf, 0, sizeof(data_buf));
@@ -215,7 +215,7 @@ static void receive_test_data(struct isotp_recv_ctx *recv_ctx,
 }
 
 static void send_frame_series(struct frame_desired *frames, size_t length,
-			      u32_t id)
+			      uint32_t id)
 {
 	int i, ret;
 	struct zcan_frame frame = {
@@ -257,7 +257,7 @@ static void check_frame_series(struct frame_desired *frames, size_t length,
 	zassert_equal(ret, -EAGAIN, "Expected timeout, but received %d", ret);
 }
 
-static int attach_msgq(u32_t id)
+static int attach_msgq(uint32_t id)
 {
 	int filter_id;
 	struct zcan_filter filter = {
@@ -277,10 +277,10 @@ static int attach_msgq(u32_t id)
 }
 
 static void prepare_cf_frames(struct frame_desired *frames, size_t frames_cnt,
-			      const u8_t *data, size_t data_len)
+			      const uint8_t *data, size_t data_len)
 {
 	int i;
-	const u8_t *data_ptr = data;
+	const uint8_t *data_ptr = data;
 	size_t remaining_length = data_len;
 
 	for (i = 0; i < frames_cnt && remaining_length; i++) {
@@ -404,7 +404,7 @@ static void test_receive_sf_ext(void)
 static void test_send_data(void)
 {
 	struct frame_desired fc_frame, ff_frame;
-	const u8_t *data_ptr = random_data;
+	const uint8_t *data_ptr = random_data;
 	size_t remaining_length = DATA_SEND_LENGTH;
 	int filter_id;
 
@@ -440,7 +440,7 @@ static void test_send_data(void)
 
 static void test_send_data_blocks(void)
 {
-	const u8_t *data_ptr = random_data;
+	const uint8_t *data_ptr = random_data;
 	size_t remaining_length = DATA_SEND_LENGTH;
 	struct frame_desired *data_frame_ptr = des_frames;
 	int filter_id, ret;
@@ -505,7 +505,7 @@ static void test_send_data_blocks(void)
 
 static void test_receive_data(void)
 {
-	const u8_t *data_ptr = random_data;
+	const uint8_t *data_ptr = random_data;
 	size_t remaining_length = DATA_SEND_LENGTH;
 	int filter_id, ret;
 	struct frame_desired fc_frame, ff_frame;
@@ -545,7 +545,7 @@ static void test_receive_data(void)
 
 static void test_receive_data_blocks(void)
 {
-	const u8_t *data_ptr = random_data;
+	const uint8_t *data_ptr = random_data;
 	size_t remaining_length = DATA_SEND_LENGTH;
 	struct frame_desired *data_frame_ptr = des_frames;
 	int filter_id, ret;
@@ -609,7 +609,7 @@ static void test_receive_data_blocks(void)
 static void test_send_timeouts(void)
 {
 	int ret;
-	u32_t start_time, time_diff;
+	uint32_t start_time, time_diff;
 	struct frame_desired fc_cts_frame;
 
 	fc_cts_frame.data[0] = FC_PCI_BYTE_1(FC_PCI_CTS);
@@ -668,7 +668,7 @@ static void test_send_timeouts(void)
 static void test_receive_timeouts(void)
 {
 	int ret;
-	u32_t start_time, time_diff;
+	uint32_t start_time, time_diff;
 	struct frame_desired ff_frame;
 
 	ff_frame.data[0] = FF_PCI_BYTE_1(DATA_SEND_LENGTH);
@@ -704,7 +704,7 @@ static void test_stmin(void)
 	int filter_id, ret;
 	struct frame_desired fc_frame, ff_frame;
 	struct zcan_frame raw_frame;
-	u32_t start_time, time_diff;
+	uint32_t start_time, time_diff;
 
 	ff_frame.data[0] = FF_PCI_BYTE_1(DATA_SIZE_FF + DATA_SIZE_CF * 4);
 	ff_frame.data[1] = FF_PCI_BYTE_2(DATA_SIZE_FF + DATA_SIZE_CF * 4);
diff --git a/tests/subsys/canbus/isotp/conformance/src/random_data.h b/tests/subsys/canbus/isotp/conformance/src/random_data.h
index 87da9445ec..8deccfb724 100644
--- a/tests/subsys/canbus/isotp/conformance/src/random_data.h
+++ b/tests/subsys/canbus/isotp/conformance/src/random_data.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-static const u8_t random_data[] = {
+static const uint8_t random_data[] = {
 	0xdc, 0x70, 0xfa, 0x96, 0xbb, 0x71, 0x49, 0x06, 0x18, 0x75, 0x84, 0xaf,
 	0xe3, 0xd4, 0x60, 0x11, 0xf8, 0xf8, 0xfa, 0xc7, 0x67, 0xae, 0xa4, 0x36,
 	0x08, 0xe5, 0x76, 0xa6, 0x50, 0x98, 0x2e, 0xc1, 0x4f, 0x91, 0x90, 0x92,
diff --git a/tests/subsys/canbus/isotp/implementation/src/main.c b/tests/subsys/canbus/isotp/implementation/src/main.c
index 37b29e8a82..02881c6298 100644
--- a/tests/subsys/canbus/isotp/implementation/src/main.c
+++ b/tests/subsys/canbus/isotp/implementation/src/main.c
@@ -54,7 +54,7 @@ const struct isotp_msg_id tx_addr = {
 
 struct isotp_recv_ctx recv_ctx;
 struct isotp_send_ctx send_ctx;
-u8_t data_buf[128];
+uint8_t data_buf[128];
 
 void send_complette_cb(int error_nr, void *arg)
 {
@@ -90,7 +90,7 @@ static void get_sf_net(struct isotp_recv_ctx *recv_ctx)
 static void get_sf(struct isotp_recv_ctx *recv_ctx)
 {
 	int ret;
-	u8_t *data_buf_ptr = data_buf;
+	uint8_t *data_buf_ptr = data_buf;
 
 	memset(data_buf, 0, sizeof(data_buf));
 	ret = isotp_recv(recv_ctx, data_buf_ptr++, 1, K_MSEC(1000));
@@ -103,14 +103,14 @@ static void get_sf(struct isotp_recv_ctx *recv_ctx)
 	zassert_equal(ret, 0, "received data differ");
 }
 
-void print_hex(const u8_t *ptr, size_t len)
+void print_hex(const uint8_t *ptr, size_t len)
 {
 	while (len--) {
 		printk("%02x", *ptr++);
 	}
 }
 
-static void send_test_data(struct device *can_dev, const u8_t *data, size_t len)
+static void send_test_data(struct device *can_dev, const uint8_t *data, size_t len)
 {
 	int ret;
 
@@ -119,7 +119,7 @@ static void send_test_data(struct device *can_dev, const u8_t *data, size_t len)
 	zassert_equal(ret, 0, "Send returned %d", ret);
 }
 
-static const u8_t *check_frag(struct net_buf *frag, const u8_t *data)
+static const uint8_t *check_frag(struct net_buf *frag, const uint8_t *data)
 {
 	int ret;
 
@@ -136,11 +136,11 @@ static const u8_t *check_frag(struct net_buf *frag, const u8_t *data)
 }
 
 static void receive_test_data_net(struct isotp_recv_ctx *recv_ctx,
-				 const u8_t *data, size_t len, s32_t delay)
+				 const uint8_t *data, size_t len, int32_t delay)
 {
 	int remaining_len;
 	size_t received_len = 0;
-	const u8_t *data_ptr = data;
+	const uint8_t *data_ptr = data;
 	struct net_buf *buf;
 
 	do {
@@ -165,7 +165,7 @@ static void receive_test_data_net(struct isotp_recv_ctx *recv_ctx,
 		      "Expected timeout but got %d", remaining_len);
 }
 
-static void check_data(const u8_t *recv_data, const u8_t *send_data, size_t len)
+static void check_data(const uint8_t *recv_data, const uint8_t *send_data, size_t len)
 {
 	int ret;
 
@@ -181,11 +181,11 @@ static void check_data(const u8_t *recv_data, const u8_t *send_data, size_t len)
 }
 
 static void receive_test_data(struct isotp_recv_ctx *recv_ctx,
-			      const u8_t *data, size_t len, s32_t delay)
+			      const uint8_t *data, size_t len, int32_t delay)
 {
 	size_t remaining_len = len;
 	int ret;
-	const u8_t *data_ptr = data;
+	const uint8_t *data_ptr = data;
 
 	do {
 		memset(data_buf, 0, sizeof(data_buf));
@@ -281,7 +281,7 @@ static void test_send_receive_net_single_blocks(void)
 	int ret, i;
 	size_t buf_len;
 	struct net_buf *buf, *frag;
-	const u8_t *data_ptr;
+	const uint8_t *data_ptr;
 
 	ret = isotp_bind(&recv_ctx, can_dev, &rx_addr, &tx_addr,
 			 &fc_opts_single, K_NO_WAIT);
diff --git a/tests/subsys/canbus/isotp/implementation/src/random_data.h b/tests/subsys/canbus/isotp/implementation/src/random_data.h
index bfc6f7ca4e..64040abbc8 100644
--- a/tests/subsys/canbus/isotp/implementation/src/random_data.h
+++ b/tests/subsys/canbus/isotp/implementation/src/random_data.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-static const u8_t random_data[] = {
+static const uint8_t random_data[] = {
 	0x17, 0xee, 0x94, 0x6b, 0xb0, 0x3c, 0x0d, 0x75, 0x0f, 0x25, 0x49, 0x6a,
 	0x88, 0x08, 0x1d, 0x14, 0x65, 0x2a, 0xdb, 0x8d, 0xaa, 0xc8, 0x4e, 0x2e,
 	0x3a, 0x0e, 0xe8, 0x79, 0xcd, 0x0d, 0x8f, 0x20, 0xac, 0x18, 0xeb, 0x78,
diff --git a/tests/subsys/dfu/img_util/src/main.c b/tests/subsys/dfu/img_util/src/main.c
index 9e076713a2..bad13072b3 100644
--- a/tests/subsys/dfu/img_util/src/main.c
+++ b/tests/subsys/dfu/img_util/src/main.c
@@ -36,15 +36,15 @@ void test_collecting(void)
 {
 	const struct flash_area *fa;
 	struct flash_img_context ctx;
-	u32_t i, j;
-	u8_t data[5], temp, k;
+	uint32_t i, j;
+	uint8_t data[5], temp, k;
 	int ret;
 
 	ret = flash_img_init(&ctx);
 	zassert_true(ret == 0, "Flash img init");
 
 #ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
-	u8_t erase_buf[8];
+	uint8_t erase_buf[8];
 	(void)memset(erase_buf, 0xff, sizeof(erase_buf));
 
 	ret = flash_area_open(FLASH_AREA_ID(image_1), &fa);
@@ -98,7 +98,7 @@ void test_collecting(void)
 	}
 
 #ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
-	u8_t buf[sizeof(erase_buf)];
+	uint8_t buf[sizeof(erase_buf)];
 
 	ret = flash_area_read(fa, fa->fa_size - sizeof(buf), buf, sizeof(buf));
 	zassert_true(ret == 0, "Flash read failure (%d)", ret);
diff --git a/tests/subsys/dfu/mcuboot/src/main.c b/tests/subsys/dfu/mcuboot/src/main.c
index 571bc1cb51..586f20cd45 100644
--- a/tests/subsys/dfu/mcuboot/src/main.c
+++ b/tests/subsys/dfu/mcuboot/src/main.c
@@ -18,8 +18,8 @@
 void test_bank_erase(void)
 {
 	const struct flash_area *fa;
-	u32_t temp;
-	u32_t temp2 = 0x5a5a5a5a;
+	uint32_t temp;
+	uint32_t temp2 = 0x5a5a5a5a;
 	off_t offs;
 	int ret;
 
@@ -51,7 +51,7 @@ void test_bank_erase(void)
 void test_request_upgrade(void)
 {
 	const struct flash_area *fa;
-	const u32_t expectation[6] = {
+	const uint32_t expectation[6] = {
 		0xffffffff,
 		0xffffffff,
 		BOOT_MAGIC_VAL_W0,
@@ -59,7 +59,7 @@ void test_request_upgrade(void)
 		BOOT_MAGIC_VAL_W2,
 		BOOT_MAGIC_VAL_W3
 	};
-	u32_t readout[ARRAY_SIZE(expectation)];
+	uint32_t readout[ARRAY_SIZE(expectation)];
 	int ret;
 
 	ret = flash_area_open(FLASH_AREA_ID(image_1), &fa);
@@ -93,8 +93,8 @@ void test_request_upgrade(void)
 
 void test_write_confirm(void)
 {
-	const u32_t img_magic[4] = BOOT_MAGIC_VALUES;
-	u32_t readout[ARRAY_SIZE(img_magic)];
+	const uint32_t img_magic[4] = BOOT_MAGIC_VALUES;
+	uint32_t readout[ARRAY_SIZE(img_magic)];
 	const struct flash_area *fa;
 	int ret;
 
diff --git a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
index 0ee047335a..6c9c53ea67 100644
--- a/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
+++ b/tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
@@ -18,9 +18,9 @@
  * qemu testing (as it may exceed target's RAM limits).
  */
 #define RAMDISK_VOLUME_SIZE (192 * RAMDISK_SECTOR_SIZE)
-static u8_t ramdisk_buf[RAMDISK_VOLUME_SIZE];
+static uint8_t ramdisk_buf[RAMDISK_VOLUME_SIZE];
 
-static void *lba_to_address(u32_t lba)
+static void *lba_to_address(uint32_t lba)
 {
 	__ASSERT(((lba * RAMDISK_SECTOR_SIZE) < RAMDISK_VOLUME_SIZE),
 		 "FS bound error");
@@ -38,35 +38,35 @@ static int disk_ram_access_init(struct disk_info *disk)
 	return 0;
 }
 
-static int disk_ram_access_read(struct disk_info *disk, u8_t *buff,
-				u32_t sector, u32_t count)
+static int disk_ram_access_read(struct disk_info *disk, uint8_t *buff,
+				uint32_t sector, uint32_t count)
 {
 	memcpy(buff, lba_to_address(sector), count * RAMDISK_SECTOR_SIZE);
 
 	return 0;
 }
 
-static int disk_ram_access_write(struct disk_info *disk, const u8_t *buff,
-				 u32_t sector, u32_t count)
+static int disk_ram_access_write(struct disk_info *disk, const uint8_t *buff,
+				 uint32_t sector, uint32_t count)
 {
 	memcpy(lba_to_address(sector), buff, count * RAMDISK_SECTOR_SIZE);
 
 	return 0;
 }
 
-static int disk_ram_access_ioctl(struct disk_info *disk, u8_t cmd, void *buff)
+static int disk_ram_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
 {
 	switch (cmd) {
 	case DISK_IOCTL_CTRL_SYNC:
 		break;
 	case DISK_IOCTL_GET_SECTOR_COUNT:
-		*(u32_t *)buff = RAMDISK_VOLUME_SIZE / RAMDISK_SECTOR_SIZE;
+		*(uint32_t *)buff = RAMDISK_VOLUME_SIZE / RAMDISK_SECTOR_SIZE;
 		break;
 	case DISK_IOCTL_GET_SECTOR_SIZE:
-		*(u32_t *)buff = RAMDISK_SECTOR_SIZE;
+		*(uint32_t *)buff = RAMDISK_SECTOR_SIZE;
 		break;
 	case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
-		*(u32_t *)buff  = 1U;
+		*(uint32_t *)buff  = 1U;
 		break;
 	default:
 		return -EINVAL;
diff --git a/tests/subsys/fs/fcb/src/fcb_test_append.c b/tests/subsys/fs/fcb/src/fcb_test_append.c
index b6192a5a8e..db0c6e0dd4 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_append.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_append.c
@@ -12,7 +12,7 @@ void test_fcb_append(void)
 	int rc;
 	struct fcb *fcb;
 	struct fcb_entry loc;
-	u8_t test_data[128];
+	uint8_t test_data[128];
 	int i;
 	int j;
 	int var_cnt;
diff --git a/tests/subsys/fs/fcb/src/fcb_test_append_fill.c b/tests/subsys/fs/fcb/src/fcb_test_append_fill.c
index 1a10a7e04c..e1ed96dbcf 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_append_fill.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_append_fill.c
@@ -13,7 +13,7 @@ void test_fcb_append_fill(void)
 	int rc;
 	int i;
 	struct fcb_entry loc;
-	u8_t test_data[128];
+	uint8_t test_data[128];
 	int elem_cnts[2] = {0, 0};
 	int aa_together_cnts[2];
 	struct append_arg aa_together = {
diff --git a/tests/subsys/fs/fcb/src/fcb_test_last_of_n.c b/tests/subsys/fs/fcb/src/fcb_test_last_of_n.c
index dbaa26a4e4..6ac8499bd4 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_last_of_n.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_last_of_n.c
@@ -9,13 +9,13 @@
 
 void test_fcb_last_of_n(void)
 {
-	const u8_t ENTRIES = 5U;
+	const uint8_t ENTRIES = 5U;
 	struct fcb *fcb;
 	int rc;
 	struct fcb_entry loc;
 	struct fcb_entry areas[ENTRIES];
-	u8_t test_data[128] = {0};
-	u8_t i;
+	uint8_t test_data[128] = {0};
+	uint8_t i;
 
 	fcb = &test_fcb;
 	fcb->f_scratch_cnt = 1U;
diff --git a/tests/subsys/fs/fcb/src/fcb_test_len.c b/tests/subsys/fs/fcb/src/fcb_test_len.c
index aadf9f4714..8b84116763 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_len.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_len.c
@@ -9,9 +9,9 @@
 
 void test_fcb_len(void)
 {
-	u8_t buf[3];
-	u16_t len;
-	u16_t len2;
+	uint8_t buf[3];
+	uint16_t len;
+	uint16_t len2;
 	int rc;
 	int rc2;
 
diff --git a/tests/subsys/fs/fcb/src/fcb_test_multiple_scratch.c b/tests/subsys/fs/fcb/src/fcb_test_multiple_scratch.c
index 6714068c66..2b93a445ce 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_multiple_scratch.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_multiple_scratch.c
@@ -12,7 +12,7 @@ void test_fcb_multi_scratch(void)
 	struct fcb *fcb;
 	int rc;
 	struct fcb_entry loc;
-	u8_t test_data[128] = {0};
+	uint8_t test_data[128] = {0};
 	int elem_cnts[4];
 	int idx;
 	int cnts[4];
diff --git a/tests/subsys/fs/fcb/src/fcb_test_reset.c b/tests/subsys/fs/fcb/src/fcb_test_reset.c
index 87f8803c52..a8a8613e8f 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_reset.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_reset.c
@@ -13,7 +13,7 @@ void test_fcb_reset(void)
 	int rc;
 	int i;
 	struct fcb_entry loc;
-	u8_t test_data[128];
+	uint8_t test_data[128];
 	int var_cnt;
 
 	fcb = &test_fcb;
diff --git a/tests/subsys/fs/fcb/src/fcb_test_rotate.c b/tests/subsys/fs/fcb/src/fcb_test_rotate.c
index 85bcca2435..6ee24e3560 100644
--- a/tests/subsys/fs/fcb/src/fcb_test_rotate.c
+++ b/tests/subsys/fs/fcb/src/fcb_test_rotate.c
@@ -13,7 +13,7 @@ void test_fcb_rotate(void)
 	int rc;
 	int old_id;
 	struct fcb_entry loc;
-	u8_t test_data[128] = {0};
+	uint8_t test_data[128] = {0};
 	int elem_cnts[2] = {0, 0};
 	int cnts[2];
 	struct append_arg aa_arg = {
diff --git a/tests/subsys/fs/fcb/src/main.c b/tests/subsys/fs/fcb/src/main.c
index 2b5920e4f3..c22505e9e0 100644
--- a/tests/subsys/fs/fcb/src/main.c
+++ b/tests/subsys/fs/fcb/src/main.c
@@ -59,15 +59,15 @@ int fcb_test_empty_walk_cb(struct fcb_entry_ctx *entry_ctx, void *arg)
 	return 0;
 }
 
-u8_t fcb_test_append_data(int msg_len, int off)
+uint8_t fcb_test_append_data(int msg_len, int off)
 {
 	return (msg_len ^ off);
 }
 
 int fcb_test_data_walk_cb(struct fcb_entry_ctx *entry_ctx, void *arg)
 {
-	u16_t len;
-	u8_t test_data[128];
+	uint16_t len;
+	uint8_t test_data[128];
 	int rc;
 	int i;
 	int *var_cnt = (int *)arg;
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_basic.c b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
index 80448267ec..cfa3d1fd31 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_basic.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_basic.c
@@ -367,7 +367,7 @@ static int sync_goodbye(const struct fs_mount_t *mp)
 	zassert_equal(fs_stat(path.path, &stat),
 		      0,
 		      "stat existing hello failed");
-	printk("sync size %u\n", (u32_t)stat.size);
+	printk("sync size %u\n", (uint32_t)stat.size);
 
 	zassert_equal(stat.size, TESTFS_BUFFER_SIZE,
 		      "stat synced goodbye not correct");
diff --git a/tests/subsys/fs/littlefs/src/test_lfs_perf.c b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
index a4a843e177..43b73dce5e 100644
--- a/tests/subsys/fs/littlefs/src/test_lfs_perf.c
+++ b/tests/subsys/fs/littlefs/src/test_lfs_perf.c
@@ -30,9 +30,9 @@ static int write_read(const char *tag,
 	struct fs_dirent stat;
 	struct fs_file_t file;
 	size_t total = nbuf * buf_size;
-	u32_t t0;
-	u32_t t1;
-	u8_t *buf;
+	uint32_t t0;
+	uint32_t t1;
+	uint8_t *buf;
 	int rc;
 	int rv = TC_FAIL;
 
@@ -64,7 +64,7 @@ static int write_read(const char *tag,
 			 "data",
 			 TESTFS_PATH_END);
 
-	buf = calloc(buf_size, sizeof(u8_t));
+	buf = calloc(buf_size, sizeof(uint8_t));
 	if (buf == NULL) {
 		TC_PRINT("Failed to allocate %zu-byte buffer\n", buf_size);
 		goto out_mnt;
@@ -113,8 +113,8 @@ static int write_read(const char *tag,
 	TC_PRINT("%s write %zu * %zu = %zu bytes in %u ms: "
 		 "%u By/s, %u KiBy/s\n",
 		 tag, nbuf, buf_size, total, (t1 - t0),
-		 (u32_t)(total * 1000U / (t1 - t0)),
-		 (u32_t)(total * 1000U / (t1 - t0) / 1024U));
+		 (uint32_t)(total * 1000U / (t1 - t0)),
+		 (uint32_t)(total * 1000U / (t1 - t0) / 1024U));
 
 	rc = fs_open(&file, path.path);
 	if (rc != 0) {
@@ -139,8 +139,8 @@ static int write_read(const char *tag,
 	TC_PRINT("%s read %zu * %zu = %zu bytes in %u ms: "
 		 "%u By/s, %u KiBy/s\n",
 		 tag, nbuf, buf_size, total, (t1 - t0),
-		 (u32_t)(total * 1000U / (t1 - t0)),
-		 (u32_t)(total * 1000U / (t1 - t0) / 1024U));
+		 (uint32_t)(total * 1000U / (t1 - t0)),
+		 (uint32_t)(total * 1000U / (t1 - t0) / 1024U));
 
 	rv = TC_PASS;
 
diff --git a/tests/subsys/fs/littlefs/src/testfs_lfs.c b/tests/subsys/fs/littlefs/src/testfs_lfs.c
index 15d67179df..65cf9c9cda 100644
--- a/tests/subsys/fs/littlefs/src/testfs_lfs.c
+++ b/tests/subsys/fs/littlefs/src/testfs_lfs.c
@@ -26,9 +26,9 @@ struct fs_mount_t testfs_medium_mnt = {
 	.mnt_point = TESTFS_MNT_POINT_MEDIUM,
 };
 
-static u8_t large_read_buffer[LARGE_CACHE_SIZE];
-static u8_t large_prog_buffer[LARGE_CACHE_SIZE];
-static u32_t large_lookahead_buffer[LARGE_LOOKAHEAD_SIZE / 4U];
+static uint8_t large_read_buffer[LARGE_CACHE_SIZE];
+static uint8_t large_prog_buffer[LARGE_CACHE_SIZE];
+static uint32_t large_lookahead_buffer[LARGE_LOOKAHEAD_SIZE / 4U];
 static struct fs_littlefs large = {
 	.cfg = {
 		.read_size = LARGE_IO_SIZE,
diff --git a/tests/subsys/fs/littlefs/src/testfs_util.c b/tests/subsys/fs/littlefs/src/testfs_util.c
index 1381735a09..2079ae6dae 100644
--- a/tests/subsys/fs/littlefs/src/testfs_util.c
+++ b/tests/subsys/fs/littlefs/src/testfs_util.c
@@ -85,10 +85,10 @@ const char *testfs_path_extend(struct testfs_path *pp,
 }
 
 int testfs_write_constant(struct fs_file_t *fp,
-			  u8_t value,
+			  uint8_t value,
 			  unsigned int len)
 {
-	u8_t buffer[TESTFS_BUFFER_SIZE];
+	uint8_t buffer[TESTFS_BUFFER_SIZE];
 	unsigned int rem = len;
 
 	memset(buffer, value, sizeof(buffer));
@@ -113,10 +113,10 @@ int testfs_write_constant(struct fs_file_t *fp,
 }
 
 int testfs_verify_constant(struct fs_file_t *fp,
-			   u8_t value,
+			   uint8_t value,
 			   unsigned int len)
 {
-	u8_t buffer[TESTFS_BUFFER_SIZE];
+	uint8_t buffer[TESTFS_BUFFER_SIZE];
 	unsigned int match = 0;
 
 	while (len > 0) {
@@ -153,10 +153,10 @@ int testfs_verify_constant(struct fs_file_t *fp,
 }
 
 int testfs_write_incrementing(struct fs_file_t *fp,
-			      u8_t value,
+			      uint8_t value,
 			      unsigned int len)
 {
-	u8_t buffer[TESTFS_BUFFER_SIZE];
+	uint8_t buffer[TESTFS_BUFFER_SIZE];
 	unsigned int rem = len;
 
 	while (rem > 0) {
@@ -183,10 +183,10 @@ int testfs_write_incrementing(struct fs_file_t *fp,
 }
 
 int testfs_verify_incrementing(struct fs_file_t *fp,
-			       u8_t value,
+			       uint8_t value,
 			       unsigned int len)
 {
-	u8_t buffer[TESTFS_BUFFER_SIZE];
+	uint8_t buffer[TESTFS_BUFFER_SIZE];
 	unsigned int match = 0;
 
 	while (len > 0) {
diff --git a/tests/subsys/fs/littlefs/src/testfs_util.h b/tests/subsys/fs/littlefs/src/testfs_util.h
index 48eb096b40..15822c2903 100644
--- a/tests/subsys/fs/littlefs/src/testfs_util.h
+++ b/tests/subsys/fs/littlefs/src/testfs_util.h
@@ -110,7 +110,7 @@ static inline struct testfs_path *testfs_path_copy(struct testfs_path *dp,
  * @return number of octets written, or a negative error code.
  */
 int testfs_write_constant(struct fs_file_t *fp,
-			  u8_t value,
+			  uint8_t value,
 			  unsigned int len);
 
 /** Verify that the file contains a sequence of constant data.
@@ -128,7 +128,7 @@ int testfs_write_constant(struct fs_file_t *fp,
  * read failure.
  */
 int testfs_verify_constant(struct fs_file_t *fp,
-			   u8_t value,
+			   uint8_t value,
 			   unsigned int len);
 
 /** Write an increasing sequence of bytes to the file.
@@ -144,7 +144,7 @@ int testfs_verify_constant(struct fs_file_t *fp,
  * @return number of octets written, or a negative error code.
  */
 int testfs_write_incrementing(struct fs_file_t *fp,
-			      u8_t value,
+			      uint8_t value,
 			      unsigned int len);
 
 /** Verify that the file contains a sequence of increasing data.
@@ -162,15 +162,15 @@ int testfs_write_incrementing(struct fs_file_t *fp,
  * read failure.
  */
 int testfs_verify_incrementing(struct fs_file_t *fp,
-			       u8_t value,
+			       uint8_t value,
 			       unsigned int len);
 
 /** Structure used to describe a filesystem layout. */
 struct testfs_bcmd {
 	enum fs_dir_entry_type type;
 	const char *name;
-	u32_t size;
-	u8_t value;
+	uint32_t size;
+	uint8_t value;
 	bool matched;
 };
 
diff --git a/tests/subsys/fs/multi-fs/src/test_ram_backend.c b/tests/subsys/fs/multi-fs/src/test_ram_backend.c
index ffa77fda25..744f3701ab 100644
--- a/tests/subsys/fs/multi-fs/src/test_ram_backend.c
+++ b/tests/subsys/fs/multi-fs/src/test_ram_backend.c
@@ -12,7 +12,7 @@
 #include <zephyr/types.h>
 #include <ztest_assert.h>
 
-static u8_t rambuf[FLASH_AREA_SIZE(storage)];
+static uint8_t rambuf[FLASH_AREA_SIZE(storage)];
 
 static int test_ram_flash_init(struct device *dev)
 {
diff --git a/tests/subsys/fs/nvs/src/main.c b/tests/subsys/fs/nvs/src/main.c
index c82ef97477..7f2578939c 100644
--- a/tests/subsys/fs/nvs/src/main.c
+++ b/tests/subsys/fs/nvs/src/main.c
@@ -78,7 +78,7 @@ void test_nvs_init(void)
 	zassert_true(err == 0,  "nvs_init call failure: %d", err);
 }
 
-static void execute_long_pattern_write(u16_t id)
+static void execute_long_pattern_write(uint16_t id)
 {
 	char rd_buf[512];
 	char wr_buf[512];
@@ -117,8 +117,8 @@ static int flash_sim_write_calls_find(struct stats_hdr *hdr, void *arg,
 				      const char *name, uint16_t off)
 {
 	if (!strcmp(name, "flash_write_calls")) {
-		u32_t **flash_write_stat = (u32_t **) arg;
-		*flash_write_stat = (u32_t *)((u8_t *)hdr + off);
+		uint32_t **flash_write_stat = (uint32_t **) arg;
+		*flash_write_stat = (uint32_t *)((uint8_t *)hdr + off);
 	}
 
 	return 0;
@@ -128,8 +128,8 @@ static int flash_sim_max_write_calls_find(struct stats_hdr *hdr, void *arg,
 					  const char *name, uint16_t off)
 {
 	if (!strcmp(name, "max_write_calls")) {
-		u32_t **max_write_calls = (u32_t **) arg;
-		*max_write_calls = (u32_t *)((u8_t *)hdr + off);
+		uint32_t **max_write_calls = (uint32_t **) arg;
+		*max_write_calls = (uint32_t *)((uint8_t *)hdr + off);
 	}
 
 	return 0;
@@ -144,8 +144,8 @@ void test_nvs_corrupted_write(void)
 	char wr_buf_2[512];
 	char pattern_1[] = {0xDE, 0xAD, 0xBE, 0xEF};
 	char pattern_2[] = {0x03, 0xAA, 0x85, 0x6F};
-	u32_t *flash_write_stat;
-	u32_t *flash_max_write_calls;
+	uint32_t *flash_write_stat;
+	uint32_t *flash_max_write_calls;
 
 	err = nvs_init(&fs, DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
 	zassert_true(err == 0,  "nvs_init call failure: %d", err);
@@ -208,21 +208,21 @@ void test_nvs_gc(void)
 {
 	int err;
 	int len;
-	u8_t buf[32];
-	u8_t rd_buf[32];
+	uint8_t buf[32];
+	uint8_t rd_buf[32];
 
-	const u16_t max_id = 10;
+	const uint16_t max_id = 10;
 	/* 25th write will trigger GC. */
-	const u16_t max_writes = 26;
+	const uint16_t max_writes = 26;
 
 	fs.sector_count = 2;
 
 	err = nvs_init(&fs, DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
 	zassert_true(err == 0,  "nvs_init call failure: %d", err);
 
-	for (u16_t i = 0; i < max_writes; i++) {
-		u8_t id = (i % max_id);
-		u8_t id_data = id + max_id * (i / max_id);
+	for (uint16_t i = 0; i < max_writes; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
 
 		memset(buf, id_data, sizeof(buf));
 
@@ -230,12 +230,12 @@ void test_nvs_gc(void)
 		zassert_true(len == sizeof(buf), "nvs_write failed: %d", len);
 	}
 
-	for (u16_t id = 0; id < max_id; id++) {
+	for (uint16_t id = 0; id < max_id; id++) {
 		len = nvs_read(&fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf),
 			     "nvs_read unexpected failure: %d", len);
 
-		for (u16_t i = 0; i < sizeof(rd_buf); i++) {
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -247,12 +247,12 @@ void test_nvs_gc(void)
 	err = nvs_init(&fs, DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
 	zassert_true(err == 0,  "nvs_init call failure: %d", err);
 
-	for (u16_t id = 0; id < max_id; id++) {
+	for (uint16_t id = 0; id < max_id; id++) {
 		len = nvs_read(&fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf),
 			     "nvs_read unexpected failure: %d", len);
 
-		for (u16_t i = 0; i < sizeof(rd_buf); i++) {
+		for (uint16_t i = 0; i < sizeof(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -262,15 +262,15 @@ void test_nvs_gc(void)
 	}
 }
 
-static void write_content(u16_t max_id, u16_t begin, u16_t end,
+static void write_content(uint16_t max_id, uint16_t begin, uint16_t end,
 			     struct nvs_fs *fs)
 {
-	u8_t buf[32];
+	uint8_t buf[32];
 	ssize_t len;
 
-	for (u16_t i = begin; i < end; i++) {
-		u8_t id = (i % max_id);
-		u8_t id_data = id + max_id * (i / max_id);
+	for (uint16_t i = begin; i < end; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
 
 		memset(buf, id_data, sizeof(buf));
 
@@ -279,18 +279,18 @@ static void write_content(u16_t max_id, u16_t begin, u16_t end,
 	}
 }
 
-static void check_content(u16_t max_id, struct nvs_fs *fs)
+static void check_content(uint16_t max_id, struct nvs_fs *fs)
 {
-	u8_t rd_buf[32];
-	u8_t buf[32];
+	uint8_t rd_buf[32];
+	uint8_t buf[32];
 	ssize_t len;
 
-	for (u16_t id = 0; id < max_id; id++) {
+	for (uint16_t id = 0; id < max_id; id++) {
 		len = nvs_read(fs, id, rd_buf, sizeof(buf));
 		zassert_true(len == sizeof(rd_buf),
 			     "nvs_read unexpected failure: %d", len);
 
-		for (u16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
+		for (uint16_t i = 0; i < ARRAY_SIZE(rd_buf); i++) {
 			rd_buf[i] = rd_buf[i] % max_id;
 			buf[i] = id;
 		}
@@ -307,15 +307,15 @@ void test_nvs_gc_3sectors(void)
 {
 	int err;
 
-	const u16_t max_id = 10;
+	const uint16_t max_id = 10;
 	/* 50th write will trigger 1st GC. */
-	const u16_t max_writes = 51;
+	const uint16_t max_writes = 51;
 	/* 75th write will trigger 2st GC. */
-	const u16_t max_writes_2 = 51 + 25;
+	const uint16_t max_writes_2 = 51 + 25;
 	/* 100th write will trigger 3st GC. */
-	const u16_t max_writes_3 = 51 + 25 + 25;
+	const uint16_t max_writes_3 = 51 + 25 + 25;
 	/* 125th write will trigger 4st GC. */
-	const u16_t max_writes_4 = 51 + 25 + 25 + 25;
+	const uint16_t max_writes_4 = 51 + 25 + 25 + 25;
 
 	fs.sector_count = 3;
 
@@ -389,8 +389,8 @@ static int flash_sim_erase_calls_find(struct stats_hdr *hdr, void *arg,
 				      const char *name, uint16_t off)
 {
 	if (!strcmp(name, "flash_erase_calls")) {
-		u32_t **flash_erase_stat = (u32_t **) arg;
-		*flash_erase_stat = (u32_t *)((u8_t *)hdr + off);
+		uint32_t **flash_erase_stat = (uint32_t **) arg;
+		*flash_erase_stat = (uint32_t *)((uint8_t *)hdr + off);
 	}
 
 	return 0;
@@ -400,8 +400,8 @@ static int flash_sim_max_erase_calls_find(struct stats_hdr *hdr, void *arg,
 					  const char *name, uint16_t off)
 {
 	if (!strcmp(name, "max_erase_calls")) {
-		u32_t **max_erase_calls = (u32_t **) arg;
-		*max_erase_calls = (u32_t *)((u8_t *)hdr + off);
+		uint32_t **max_erase_calls = (uint32_t **) arg;
+		*max_erase_calls = (uint32_t *)((uint8_t *)hdr + off);
 	}
 
 	return 0;
@@ -411,8 +411,8 @@ static int flash_sim_max_len_find(struct stats_hdr *hdr, void *arg,
 				  const char *name, uint16_t off)
 {
 	if (!strcmp(name, "max_len")) {
-		u32_t **max_len = (u32_t **) arg;
-		*max_len = (u32_t *)((u8_t *)hdr + off);
+		uint32_t **max_len = (uint32_t **) arg;
+		*max_len = (uint32_t *)((uint8_t *)hdr + off);
 	}
 
 	return 0;
@@ -422,16 +422,16 @@ void test_nvs_corrupted_sector_close_operation(void)
 {
 	int err;
 	int len;
-	u8_t buf[32];
-	u32_t *flash_write_stat;
-	u32_t *flash_erase_stat;
-	u32_t *flash_max_write_calls;
-	u32_t *flash_max_erase_calls;
-	u32_t *flash_max_len;
+	uint8_t buf[32];
+	uint32_t *flash_write_stat;
+	uint32_t *flash_erase_stat;
+	uint32_t *flash_max_write_calls;
+	uint32_t *flash_max_erase_calls;
+	uint32_t *flash_max_len;
 
-	const u16_t max_id = 10;
+	const uint16_t max_id = 10;
 	/* 25th write will trigger GC. */
-	const u16_t max_writes = 26;
+	const uint16_t max_writes = 26;
 
 	/* Get the address of simulator parameters. */
 	stats_walk(sim_thresholds, flash_sim_max_write_calls_find,
@@ -446,9 +446,9 @@ void test_nvs_corrupted_sector_close_operation(void)
 	err = nvs_init(&fs, DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
 	zassert_true(err == 0,  "nvs_init call failure: %d", err);
 
-	for (u16_t i = 0; i < max_writes; i++) {
-		u8_t id = (i % max_id);
-		u8_t id_data = id + max_id * (i / max_id);
+	for (uint16_t i = 0; i < max_writes; i++) {
+		uint8_t id = (i % max_id);
+		uint8_t id_data = id + max_id * (i / max_id);
 
 		memset(buf, id_data, sizeof(buf));
 
@@ -491,8 +491,8 @@ void test_nvs_full_sector(void)
 {
 	int err;
 	ssize_t len;
-	u16_t filling_id = 0;
-	u16_t i, data_read;
+	uint16_t filling_id = 0;
+	uint16_t i, data_read;
 
 	fs.sector_count = 3;
 
@@ -542,8 +542,8 @@ void test_delete(void)
 {
 	int err;
 	ssize_t len;
-	u16_t filling_id, data_read;
-	u32_t ate_wra, data_wra;
+	uint16_t filling_id, data_read;
+	uint32_t ate_wra, data_wra;
 
 	fs.sector_count = 3;
 
diff --git a/tests/subsys/logging/log_core/src/log_core_test.c b/tests/subsys/logging/log_core/src/log_core_test.c
index 43b63c1b3b..6c2c710ad6 100644
--- a/tests/subsys/logging/log_core/src/log_core_test.c
+++ b/tests/subsys/logging/log_core/src/log_core_test.c
@@ -33,26 +33,26 @@ struct backend_cb {
 	bool panic;
 	bool keep_msgs;
 	bool check_id;
-	u32_t exp_id[100];
+	uint32_t exp_id[100];
 	bool check_timestamp;
-	u32_t exp_timestamps[100];
+	uint32_t exp_timestamps[100];
 	bool check_args;
-	u32_t exp_nargs[100];
+	uint32_t exp_nargs[100];
 	bool check_strdup;
 	bool exp_strdup[100];
 	custom_put_callback_t callback;
-	u32_t total_drops;
+	uint32_t total_drops;
 };
 
 static void put(struct log_backend const *const backend,
 		struct log_msg *msg)
 {
 	log_msg_get(msg);
-	u32_t nargs = log_msg_nargs_get(msg);
+	uint32_t nargs = log_msg_nargs_get(msg);
 	struct backend_cb *cb = (struct backend_cb *)backend->cb->ctx;
 
 	if (cb->check_id) {
-		u32_t exp_id = cb->exp_id[cb->counter];
+		uint32_t exp_id = cb->exp_id[cb->counter];
 
 		zassert_equal(log_msg_source_id_get(msg),
 			      exp_id,
@@ -60,7 +60,7 @@ static void put(struct log_backend const *const backend,
 	}
 
 	if (cb->check_timestamp) {
-		u32_t exp_timestamp = cb->exp_timestamps[cb->counter];
+		uint32_t exp_timestamp = cb->exp_timestamps[cb->counter];
 
 		zassert_equal(log_msg_timestamp_get(msg),
 			      exp_timestamp,
@@ -70,7 +70,7 @@ static void put(struct log_backend const *const backend,
 	/* Arguments in the test are fixed, 1,2,3,4,5,... */
 	if (cb->check_args && log_msg_is_std(msg) && nargs > 0) {
 		for (int i = 0; i < nargs; i++) {
-			u32_t arg = log_msg_arg_get(msg, i);
+			uint32_t arg = log_msg_arg_get(msg, i);
 
 			zassert_equal(i+1, arg,
 				      "Unexpected argument in the message");
@@ -101,7 +101,7 @@ static void panic(struct log_backend const *const backend)
 	cb->panic = true;
 }
 
-static void dropped(struct log_backend const *const backend, u32_t cnt)
+static void dropped(struct log_backend const *const backend, uint32_t cnt)
 {
 	struct backend_cb *cb = (struct backend_cb *)backend->cb->ctx;
 
@@ -120,11 +120,11 @@ struct backend_cb backend1_cb;
 LOG_BACKEND_DEFINE(backend2, log_backend_test_api, false);
 struct backend_cb backend2_cb;
 
-static u32_t stamp;
+static uint32_t stamp;
 
-static u32_t test_source_id;
+static uint32_t test_source_id;
 
-static u32_t timestamp_get(void)
+static uint32_t timestamp_get(void)
 {
 	return stamp++;
 }
@@ -222,13 +222,13 @@ static void test_log_backend_runtime_filtering(void)
  * there is no room. However, if after discarding all messages there is still no
  * room then current log is discarded.
  */
-u8_t data[CONFIG_LOG_BUFFER_SIZE];
+uint8_t data[CONFIG_LOG_BUFFER_SIZE];
 static void test_log_overflow(void)
 {
-	u32_t msgs_in_buf = CONFIG_LOG_BUFFER_SIZE/sizeof(union log_msg_chunk);
-	u32_t max_hexdump_len = LOG_MSG_HEXDUMP_BYTES_HEAD_CHUNK +
+	uint32_t msgs_in_buf = CONFIG_LOG_BUFFER_SIZE/sizeof(union log_msg_chunk);
+	uint32_t max_hexdump_len = LOG_MSG_HEXDUMP_BYTES_HEAD_CHUNK +
 			    HEXDUMP_BYTES_CONT_MSG * (msgs_in_buf - 1);
-	u32_t hexdump_len = max_hexdump_len - HEXDUMP_BYTES_CONT_MSG;
+	uint32_t hexdump_len = max_hexdump_len - HEXDUMP_BYTES_CONT_MSG;
 
 
 	zassert_true(IS_ENABLED(CONFIG_LOG_MODE_OVERFLOW),
@@ -367,7 +367,7 @@ static void test_log_strdup_gc(void)
 #define DETECT_STRDUP_MISSED(str, do_strdup, ...) \
 	{\
 		char tmp[] = "tmp";\
-		u32_t exp_cnt = backend1_cb.counter + 1 + (do_strdup ? 0 : 1); \
+		uint32_t exp_cnt = backend1_cb.counter + 1 + (do_strdup ? 0 : 1); \
 		LOG_ERR(str, ##__VA_ARGS__, do_strdup ? log_strdup(tmp) : tmp); \
 		\
 		while (log_process(false)) { \
@@ -435,7 +435,7 @@ static void test_strdup_trimming(void)
 		      "Unexpected amount of messages received by the backend.");
 }
 
-static void log_n_messages(u32_t n_msg, u32_t exp_dropped)
+static void log_n_messages(uint32_t n_msg, uint32_t exp_dropped)
 {
 	int i;
 
@@ -461,7 +461,7 @@ static void test_log_msg_dropped_notification(void)
 {
 	__ASSERT_NO_MSG(CONFIG_LOG_MODE_OVERFLOW);
 
-	u32_t capacity = CONFIG_LOG_BUFFER_SIZE/sizeof(struct log_msg);
+	uint32_t capacity = CONFIG_LOG_BUFFER_SIZE/sizeof(struct log_msg);
 
 	log_setup(false);
 
@@ -477,10 +477,10 @@ static void test_log_msg_dropped_notification(void)
 	k_sched_unlock();
 }
 
-static void test_single_z_log_get_s_mask(const char *str, u32_t nargs,
-					 u32_t exp_mask)
+static void test_single_z_log_get_s_mask(const char *str, uint32_t nargs,
+					 uint32_t exp_mask)
 {
-	u32_t mask = z_log_get_s_mask(str, nargs);
+	uint32_t mask = z_log_get_s_mask(str, nargs);
 
 	zassert_equal(mask, exp_mask, "Unexpected mask %x (expected %x)",
 								mask, exp_mask);
diff --git a/tests/subsys/logging/log_immediate/src/log_immediate_test.c b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
index 124457432b..7b26513197 100644
--- a/tests/subsys/logging/log_immediate/src/log_immediate_test.c
+++ b/tests/subsys/logging/log_immediate/src/log_immediate_test.c
@@ -39,7 +39,7 @@ static void thread_func(void *p1, void *p2, void *p3)
 {
 	intptr_t id = (intptr_t)p1;
 	int buf_len = 8*id + 8;
-	u8_t *buf = alloca(buf_len);
+	uint8_t *buf = alloca(buf_len);
 
 	while (1) {
 		LOG_INF("test string printed %d %d %p", 1, 2, k_current_get());
diff --git a/tests/subsys/logging/log_msg/src/log_msg_test.c b/tests/subsys/logging/log_msg/src/log_msg_test.c
index 15d5323696..90ebe87c60 100644
--- a/tests/subsys/logging/log_msg/src/log_msg_test.c
+++ b/tests/subsys/logging/log_msg/src/log_msg_test.c
@@ -24,7 +24,7 @@ void test_log_std_msg(void)
 		      IS_ENABLED(CONFIG_64BIT) ? 4 : 3,
 		      "test assumes following setting");
 
-	u32_t used_slabs = k_mem_slab_num_used_get(&log_msg_pool);
+	uint32_t used_slabs = k_mem_slab_num_used_get(&log_msg_pool);
 	log_arg_t args[] = {1, 2, 3, 4, 5, 6};
 	struct log_msg *msg;
 
@@ -65,9 +65,9 @@ void test_log_std_msg(void)
 void test_log_hexdump_msg(void)
 {
 
-	u32_t used_slabs = k_mem_slab_num_used_get(&log_msg_pool);
+	uint32_t used_slabs = k_mem_slab_num_used_get(&log_msg_pool);
 	struct log_msg *msg;
-	u8_t data[128];
+	uint8_t data[128];
 
 	for (int i = 0; i < sizeof(data); i++) {
 		data[i] = i;
@@ -142,10 +142,10 @@ void test_log_hexdump_msg(void)
 void test_log_hexdump_data_get_single_chunk(void)
 {
 	struct log_msg *msg;
-	u8_t data[128];
-	u8_t read_data[128];
+	uint8_t data[128];
+	uint8_t read_data[128];
 	size_t offset;
-	u32_t wr_length;
+	uint32_t wr_length;
 	size_t rd_length;
 	size_t rd_req_length;
 
@@ -241,10 +241,10 @@ void test_log_hexdump_data_get_single_chunk(void)
 void test_log_hexdump_data_get_two_chunks(void)
 {
 	struct log_msg *msg;
-	u8_t data[128];
-	u8_t read_data[128];
+	uint8_t data[128];
+	uint8_t read_data[128];
 	size_t offset;
-	u32_t wr_length;
+	uint32_t wr_length;
 	size_t rd_length;
 	size_t rd_req_length;
 
@@ -334,10 +334,10 @@ void test_log_hexdump_data_get_two_chunks(void)
 void test_log_hexdump_data_get_multiple_chunks(void)
 {
 	struct log_msg *msg;
-	u8_t data[128];
-	u8_t read_data[128];
+	uint8_t data[128];
+	uint8_t read_data[128];
 	size_t offset;
-	u32_t wr_length;
+	uint32_t wr_length;
 	size_t rd_length;
 	size_t rd_req_length;
 
diff --git a/tests/subsys/logging/log_output/src/log_output_test.c b/tests/subsys/logging/log_output/src/log_output_test.c
index 7823222b6c..0cab604629 100644
--- a/tests/subsys/logging/log_output/src/log_output_test.c
+++ b/tests/subsys/logging/log_output/src/log_output_test.c
@@ -20,9 +20,9 @@
 #define LOG_MODULE_NAME test
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-static u8_t mock_buffer[512];
-static u8_t log_output_buf[8];
-static u32_t mock_len;
+static uint8_t mock_buffer[512];
+static uint8_t log_output_buf[8];
+static uint32_t mock_len;
 
 static void reset_mock_buffer(void)
 {
@@ -40,7 +40,7 @@ static void teardown(void)
 
 }
 
-static int mock_output_func(u8_t *buf, size_t size, void *ctx)
+static int mock_output_func(uint8_t *buf, size_t size, void *ctx)
 {
 	memcpy(&mock_buffer[mock_len], buf, size);
 	mock_len += size;
@@ -61,8 +61,8 @@ static void validate_output_string(const char *exp)
 }
 
 static void log_output_string_varg(const struct log_output *log_output,
-		       struct log_msg_ids src_level, u32_t timestamp,
-		       u32_t flags, const char *fmt, ...)
+		       struct log_msg_ids src_level, uint32_t timestamp,
+		       uint32_t flags, const char *fmt, ...)
 {
 	va_list ap;
 
diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c
index 9d9933d5bf..007b07602b 100644
--- a/tests/subsys/openthread/radio_test.c
+++ b/tests/subsys/openthread/radio_test.c
@@ -38,15 +38,15 @@ energy_scan_done_cb_t scan_done_cb;
 otInstance *ot = (otInstance *)0xAAAA;
 
 /* forward declarations */
-static int scan_mock(struct device *dev, u16_t duration,
+static int scan_mock(struct device *dev, uint16_t duration,
 		     energy_scan_done_cb_t done_cb);
 static enum ieee802154_hw_caps get_capabilities(struct device *dev);
 static int cca_mock(struct device *dev);
-static int set_channel_mock(struct device *dev, u16_t channel);
+static int set_channel_mock(struct device *dev, uint16_t channel);
 static int filter_mock(struct device *dev, bool set,
 		       enum ieee802154_filter_type type,
 		       const struct ieee802154_filter *filter);
-static int set_txpower_mock(struct device *dev, s16_t dbm);
+static int set_txpower_mock(struct device *dev, int16_t dbm);
 static int tx_mock(struct device *dev, enum ieee802154_tx_mode mode,
 		   struct net_pkt *pkt, struct net_buf *frag);
 static int start_mock(struct device *dev);
@@ -73,7 +73,7 @@ static struct ieee802154_radio_api rapi = {
 
 static struct device radio = { .driver_api = &rapi };
 
-static int scan_mock(struct device *dev, u16_t duration,
+static int scan_mock(struct device *dev, uint16_t duration,
 		     energy_scan_done_cb_t done_cb)
 {
 	zassert_equal(dev, &radio, "Device handle incorrect.");
@@ -82,7 +82,7 @@ static int scan_mock(struct device *dev, u16_t duration,
 	return ztest_get_return_value();
 }
 
-static int rssi_scan_mock(struct device *dev, u16_t duration,
+static int rssi_scan_mock(struct device *dev, uint16_t duration,
 			  energy_scan_done_cb_t done_cb)
 {
 	zassert_equal(dev, &radio, "Device handle incorrect.");
@@ -95,7 +95,7 @@ static int rssi_scan_mock(struct device *dev, u16_t duration,
 	return 0;
 }
 
-static int set_channel_mock(struct device *dev, u16_t channel)
+static int set_channel_mock(struct device *dev, uint16_t channel)
 {
 	zassert_equal(dev, &radio, "Device handle incorrect.");
 	ztest_check_expected_value(channel);
@@ -239,7 +239,7 @@ static int filter_mock(struct device *dev, bool set,
 	return 0;
 }
 
-static int set_txpower_mock(struct device *dev, s16_t dbm)
+static int set_txpower_mock(struct device *dev, int16_t dbm)
 {
 	zassert_equal(dev, &radio, "Device handle incorrect.");
 	ztest_check_expected_value(dbm);
@@ -285,9 +285,9 @@ void otPlatRadioTxStarted(otInstance *aInstance, otRadioFrame *aFrame)
  */
 static void test_energy_scan_immediate_test(void)
 {
-	const u8_t chan = 10;
-	const u8_t dur = 100;
-	const s16_t energy = -94;
+	const uint8_t chan = 10;
+	const uint8_t dur = 100;
+	const int16_t energy = -94;
 
 	scan_done_cb = NULL;
 
@@ -317,9 +317,9 @@ static void test_energy_scan_immediate_test(void)
  */
 static void test_energy_scan_delayed_test(void)
 {
-	const u8_t chan = 10;
-	const u8_t dur = 100;
-	const s16_t energy = -94;
+	const uint8_t chan = 10;
+	const uint8_t dur = 100;
+	const int16_t energy = -94;
 
 	scan_done_cb = NULL;
 
@@ -357,8 +357,8 @@ static void create_ack_frame(void)
 {
 	struct net_pkt *packet;
 	struct net_buf *buf;
-	const u8_t lqi = 230;
-	const s8_t rssi = -80;
+	const uint8_t lqi = 230;
+	const int8_t rssi = -80;
 
 	packet = net_pkt_alloc(K_NO_WAIT);
 	buf = net_pkt_get_reserve_tx_data(K_NO_WAIT);
@@ -382,9 +382,9 @@ static void create_ack_frame(void)
  */
 static void test_tx_test(void)
 {
-	const u8_t chan = 20;
-	u8_t chan2 = chan - 1;
-	const s8_t power = -3;
+	const uint8_t chan = 20;
+	uint8_t chan2 = chan - 1;
+	const int8_t power = -3;
 
 	otRadioFrame *frm = otPlatRadioGetTransmitBuffer(ot);
 
@@ -455,7 +455,7 @@ static void test_tx_test(void)
  */
 static void test_tx_power_test(void)
 {
-	s8_t out_power = 0;
+	int8_t out_power = 0;
 
 	otPlatRadioSetTransmitPower(ot, -3);
 	otPlatRadioGetTransmitPower(ot, &out_power);
@@ -486,7 +486,7 @@ static void test_sensitivity_test(void)
 }
 
 static void set_expected_match_values(enum ieee802154_config_type type,
-				      u8_t *addr, bool extended, bool enabled)
+				      uint8_t *addr, bool extended, bool enabled)
 {
 	ztest_expect_value(configure_match_mock, type, type);
 	switch (type) {
@@ -667,7 +667,7 @@ static void test_get_caps_test(void)
  */
 static void test_get_rssi_test(void)
 {
-	const s8_t rssi = -103;
+	const int8_t rssi = -103;
 
 	rapi.ed_scan = rssi_scan_mock;
 
@@ -685,8 +685,8 @@ static void test_get_rssi_test(void)
  */
 static void test_radio_state_test(void)
 {
-	const u8_t channel = 12;
-	const u8_t power = 10;
+	const uint8_t channel = 12;
+	const uint8_t power = 10;
 
 	otPlatRadioSetTransmitPower(ot, power);
 	zassert_equal(otPlatRadioDisable(ot), OT_ERROR_NONE,
@@ -727,8 +727,8 @@ static void test_radio_state_test(void)
  */
 static void test_address_test(void)
 {
-	const u16_t pan_id = 0xDEAD;
-	const u16_t short_add = 0xCAFE;
+	const uint16_t pan_id = 0xDEAD;
+	const uint16_t short_add = 0xCAFE;
 	otExtAddress ieee_addr;
 
 	for (int i = 0; i < sizeof(ieee_addr.m8); i++) {
@@ -761,11 +761,11 @@ static void test_receive_test(void)
 {
 	struct net_pkt *packet;
 	struct net_buf *buf;
-	const u8_t channel = 21;
-	const s8_t power = -5;
-	const u8_t lqi = 240;
-	const s8_t rssi = -90;
-	u8_t len;
+	const uint8_t channel = 21;
+	const int8_t power = -5;
+	const uint8_t lqi = 240;
+	const int8_t rssi = -90;
+	uint8_t len;
 
 	packet = net_pkt_alloc(K_NO_WAIT);
 	buf = net_pkt_get_reserve_tx_data(K_NO_WAIT);
diff --git a/tests/subsys/settings/fcb/src/settings_test.h b/tests/subsys/settings/fcb/src/settings_test.h
index 20382f51b5..fbd927cf83 100644
--- a/tests/subsys/settings/fcb/src/settings_test.h
+++ b/tests/subsys/settings/fcb/src/settings_test.h
@@ -23,10 +23,10 @@ extern "C" {
 #define SETTINGS_TEST_FCB_FLASH_CNT   4
 
 
-extern u8_t val8;
-extern u8_t val8_un;
-extern u32_t val32;
-extern u64_t val64;
+extern uint8_t val8;
+extern uint8_t val8_un;
+extern uint32_t val32;
+extern uint64_t val64;
 
 extern int test_get_called;
 extern int test_set_called;
diff --git a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
index be0e0130b9..c635ae59cf 100644
--- a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
+++ b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
@@ -23,10 +23,10 @@ struct flash_sector fcb_small_sectors[2] = {
 
 struct deletable_s {
 	bool valid;
-	u32_t val32;
+	uint32_t val32;
 } deletable_val;
 
-u32_t val4v2;
+uint32_t val4v2;
 
 int c4_handle_export(int (*cb)(const char *name, const void *value, size_t val_len));
 
diff --git a/tests/subsys/settings/fcb/src/settings_test_fcb.c b/tests/subsys/settings/fcb/src/settings_test_fcb.c
index d8bc0fcc05..8764cb98cc 100644
--- a/tests/subsys/settings/fcb/src/settings_test_fcb.c
+++ b/tests/subsys/settings/fcb/src/settings_test_fcb.c
@@ -11,10 +11,10 @@
 #include "settings_priv.h"
 #include <storage/flash_map.h>
 
-u8_t val8;
-u8_t val8_un;
-u32_t val32;
-u64_t val64;
+uint8_t val8;
+uint8_t val8_un;
+uint32_t val32;
+uint64_t val64;
 
 int test_get_called;
 int test_set_called;
@@ -345,7 +345,7 @@ void tests_settings_check_target(void)
 {
 	const struct flash_area *fap;
 	int rc;
-	u8_t wbs;
+	uint8_t wbs;
 
 	rc = flash_area_open(FLASH_AREA_ID(storage), &fap);
 	zassert_true(rc == 0, "Can't open storage flash area");
diff --git a/tests/subsys/settings/fcb/src/settings_test_save_one_fcb.c b/tests/subsys/settings/fcb/src/settings_test_save_one_fcb.c
index a1505b978d..15072e40b4 100644
--- a/tests/subsys/settings/fcb/src/settings_test_save_one_fcb.c
+++ b/tests/subsys/settings/fcb/src/settings_test_save_one_fcb.c
@@ -8,7 +8,7 @@
 #include "settings_test.h"
 #include "settings/settings_fcb.h"
 
-static int test_config_save_one_byte_value(const char *name, u8_t val)
+static int test_config_save_one_byte_value(const char *name, uint8_t val)
 {
 	return settings_save_one(name, &val, 1);
 }
diff --git a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
index e73b4ca80d..d1b24c2906 100644
--- a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
+++ b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c
@@ -15,7 +15,7 @@
 #include <storage/flash_map.h>
 #include <drivers/flash.h>
 
-static u32_t val32;
+static uint32_t val32;
 
 #if defined(CONFIG_SOC_SERIES_STM32L0X) || defined(CONFIG_SOC_SERIES_STM32L0X)
 #define ERASED_VAL 0x00
@@ -29,7 +29,7 @@ static u32_t val32;
 	DT_PROP(DT_CHOSEN(zephyr_flash), write_block_size)
 static const volatile __attribute__((section(".rodata")))
 __aligned(FLASH_WRITE_BLOCK_SIZE)
-u8_t prepared_mark[FLASH_WRITE_BLOCK_SIZE] = {ERASED_VAL};
+uint8_t prepared_mark[FLASH_WRITE_BLOCK_SIZE] = {ERASED_VAL};
 #endif
 
 static int c1_set(const char *name, size_t len, settings_read_cb read_cb,
@@ -64,7 +64,7 @@ static struct settings_handler c1_settings = {
 void test_init(void)
 {
 	int err;
-	u32_t prev_int;
+	uint32_t prev_int;
 
 	val32++;
 
@@ -90,7 +90,7 @@ void test_prepare_storage(void)
 	int err;
 	const struct flash_area *fa;
 	struct device *dev;
-	u8_t new_val[FLASH_WRITE_BLOCK_SIZE];
+	uint8_t new_val[FLASH_WRITE_BLOCK_SIZE];
 
 	if (prepared_mark[0] == ERASED_VAL) {
 		TC_PRINT("First run: erasing the storage\r\n");
diff --git a/tests/subsys/settings/fs/include/settings_test_fs.h b/tests/subsys/settings/fs/include/settings_test_fs.h
index bbcc539840..cfa05f3882 100644
--- a/tests/subsys/settings/fs/include/settings_test_fs.h
+++ b/tests/subsys/settings/fs/include/settings_test_fs.h
@@ -18,10 +18,10 @@
 extern "C" {
 #endif
 
-extern u8_t val8;
-extern u16_t val16;
-extern u32_t val32;
-extern u64_t val64;
+extern uint8_t val8;
+extern uint16_t val16;
+extern uint32_t val32;
+extern uint64_t val64;
 
 extern int test_get_called;
 extern int test_set_called;
diff --git a/tests/subsys/settings/fs/src/settings_test_compress_file.c b/tests/subsys/settings/fs/src/settings_test_compress_file.c
index f5856d3432..1fdc342aea 100644
--- a/tests/subsys/settings/fs/src/settings_test_compress_file.c
+++ b/tests/subsys/settings/fs/src/settings_test_compress_file.c
@@ -95,7 +95,7 @@ void test_config_compress_file(void)
 int file_str_cmp(const char *fname, char const *string, size_t pattern_len)
 {
 	int rc;
-	u32_t len;
+	uint32_t len;
 	size_t rlen;
 	char *buf;
 	struct fs_dirent entry;
diff --git a/tests/subsys/settings/fs/src/settings_test_fs.c b/tests/subsys/settings/fs/src/settings_test_fs.c
index 993a1dacce..d6ee8f00f6 100644
--- a/tests/subsys/settings/fs/src/settings_test_fs.c
+++ b/tests/subsys/settings/fs/src/settings_test_fs.c
@@ -10,9 +10,9 @@
 #include "settings_priv.h"
 
 
-u8_t val8;
-u16_t val16;
-u64_t val64;
+uint8_t val8;
+uint16_t val16;
+uint64_t val64;
 
 int test_get_called;
 int test_set_called;
@@ -205,7 +205,7 @@ int settings_test_file_strstr(const char *fname, char const *string,
 			      size_t str_len)
 {
 	int rc;
-	u32_t len;
+	uint32_t len;
 	size_t rlen;
 	char *buf;
 	struct fs_dirent entry;
diff --git a/tests/subsys/settings/fs/src/settings_test_save_one_file.c b/tests/subsys/settings/fs/src/settings_test_save_one_file.c
index e076a0d081..faa3389bb8 100644
--- a/tests/subsys/settings/fs/src/settings_test_save_one_file.c
+++ b/tests/subsys/settings/fs/src/settings_test_save_one_file.c
@@ -8,7 +8,7 @@
 #include "settings_test.h"
 #include "settings/settings_file.h"
 
-static int test_config_save_one_byte_value(const char *name, u8_t val)
+static int test_config_save_one_byte_value(const char *name, uint8_t val)
 {
 	return settings_save_one(name, &val, 1);
 }
diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c
index 19f0de6c71..b05a363182 100644
--- a/tests/subsys/settings/functional/src/settings_basic_test.c
+++ b/tests/subsys/settings/functional/src/settings_basic_test.c
@@ -157,9 +157,9 @@ static void test_support_rtn(void)
 }
 
 struct stored_data {
-	u8_t val1;
-	u8_t val2;
-	u8_t val3;
+	uint8_t val1;
+	uint8_t val2;
+	uint8_t val3;
 	bool en1;
 	bool en2;
 	bool en3;
@@ -229,13 +229,13 @@ int settings_deregister(struct settings_handler *handler)
 static void test_register_and_loading(void)
 {
 	int rc, err;
-	u8_t val = 0;
+	uint8_t val = 0;
 
 	rc = settings_subsys_init();
 	zassert_true(rc == 0, "subsys init failed");
 
 
-	settings_save_one("ps/ss/ss/val2", &val, sizeof(u8_t));
+	settings_save_one("ps/ss/ss/val2", &val, sizeof(uint8_t));
 
 	memset(&data, 0, sizeof(struct stored_data));
 
@@ -269,7 +269,7 @@ static void test_register_and_loading(void)
 	err = (data.en1) && (data.en2) && (!data.en3);
 	zassert_true(err, "wrong data enable found");
 
-	settings_save_one("ps/ss/val3", &val, sizeof(u8_t));
+	settings_save_one("ps/ss/val3", &val, sizeof(uint8_t));
 	memset(&data, 0, sizeof(struct stored_data));
 	/* when we load settings now data.val2 and data.val1 should receive a
 	 * value
@@ -300,7 +300,7 @@ static void test_register_and_loading(void)
 	err = (data.en1) && (data.en2) && (data.en3);
 	zassert_true(err, "wrong data enable found");
 
-	settings_save_one("ps/val1", &val, sizeof(u8_t));
+	settings_save_one("ps/val1", &val, sizeof(uint8_t));
 	memset(&data, 0, sizeof(struct stored_data));
 	/* when we load settings all data should receive a value loaded */
 	rc = settings_load();
@@ -350,7 +350,7 @@ int val123_set(const char *key, size_t len,
 	       settings_read_cb read_cb, void *cb_arg)
 {
 	int rc;
-	u8_t val;
+	uint8_t val;
 
 	zassert_equal(1, len, "Unexpected size");
 
@@ -384,7 +384,7 @@ static struct settings_handler val123_settings = {
 };
 
 unsigned int direct_load_cnt;
-u8_t val_directly_loaded;
+uint8_t val_directly_loaded;
 
 int direct_loader(
 	const char *key,
@@ -394,7 +394,7 @@ int direct_loader(
 	void *param)
 {
 	int rc;
-	u8_t val;
+	uint8_t val;
 
 	zassert_equal(0x1234, (size_t)param, NULL);
 
@@ -415,14 +415,14 @@ int direct_loader(
 static void test_direct_loading(void)
 {
 	int rc;
-	u8_t val;
+	uint8_t val;
 
 	val = 11;
-	settings_save_one("val/1", &val, sizeof(u8_t));
+	settings_save_one("val/1", &val, sizeof(uint8_t));
 	val = 23;
-	settings_save_one("val/2", &val, sizeof(u8_t));
+	settings_save_one("val/2", &val, sizeof(uint8_t));
 	val = 35;
-	settings_save_one("val/3", &val, sizeof(u8_t));
+	settings_save_one("val/3", &val, sizeof(uint8_t));
 
 	rc = settings_register(&val123_settings);
 	zassert_true(rc == 0, NULL);
diff --git a/tests/subsys/settings/nvs/src/settings_test.h b/tests/subsys/settings/nvs/src/settings_test.h
index 3ee04e45cb..b60d3900bf 100644
--- a/tests/subsys/settings/nvs/src/settings_test.h
+++ b/tests/subsys/settings/nvs/src/settings_test.h
@@ -21,10 +21,10 @@ extern "C" {
 #define SETTINGS_TEST_NVS_FLASH_CNT   4
 
 
-extern u8_t val8;
-extern u8_t val8_un;
-extern u32_t val32;
-extern u64_t val64;
+extern uint8_t val8;
+extern uint8_t val8_un;
+extern uint32_t val32;
+extern uint64_t val64;
 
 extern int test_get_called;
 extern int test_set_called;
diff --git a/tests/subsys/settings/nvs/src/settings_test_nvs.c b/tests/subsys/settings/nvs/src/settings_test_nvs.c
index 0fa870061b..2052917d87 100644
--- a/tests/subsys/settings/nvs/src/settings_test_nvs.c
+++ b/tests/subsys/settings/nvs/src/settings_test_nvs.c
@@ -9,10 +9,10 @@
 #include "settings_priv.h"
 #include "settings_test.h"
 
-u8_t val8;
-u8_t val8_un;
-u32_t val32;
-u64_t val64;
+uint8_t val8;
+uint8_t val8_un;
+uint32_t val32;
+uint64_t val64;
 
 int test_get_called;
 int test_set_called;
diff --git a/tests/subsys/settings/src/settings_enc.c b/tests/subsys/settings/src/settings_enc.c
index 74b3c11741..801997eb52 100644
--- a/tests/subsys/settings/src/settings_enc.c
+++ b/tests/subsys/settings/src/settings_enc.c
@@ -9,7 +9,7 @@
 
 static char enc_buf[128];
 static int enc_buf_cnt;
-static u8_t test_rwbs = 1U;
+static uint8_t test_rwbs = 1U;
 #define ENC_CTX_VAL 0x2018
 
 static int write_handler(void *ctx, off_t off, char const *buf, size_t len)
@@ -26,7 +26,7 @@ static int write_handler(void *ctx, off_t off, char const *buf, size_t len)
 }
 
 static void test_encoding_iteration(char const *name, char const *value,
-				    char const *pattern, int exp_len, u8_t wbs)
+				    char const *pattern, int exp_len, uint8_t wbs)
 {
 	int rc;
 
@@ -93,7 +93,7 @@ static int read_handle(void *ctx, off_t off, char *buf, size_t *len)
 
 char read_buf[128+10];
 
-static void test_raw_read_iteration(u8_t rbs, size_t off, size_t len)
+static void test_raw_read_iteration(uint8_t rbs, size_t off, size_t len)
 {
 	test_rwbs = rbs;
 	size_t len_read;
@@ -147,7 +147,7 @@ void test_setting_raw_read(void)
 
 static void test_val_read_iteration(char const *src, size_t src_len,
 				    char const *pattern, size_t pattern_len,
-				    size_t len, u8_t rbs, size_t off,
+				    size_t len, uint8_t rbs, size_t off,
 				    size_t val_off)
 {
 	size_t len_read;
diff --git a/tests/subsys/settings/src/settings_test_getset_int.c b/tests/subsys/settings/src/settings_test_getset_int.c
index 60606d5f6a..7b96fca10e 100644
--- a/tests/subsys/settings/src/settings_test_getset_int.c
+++ b/tests/subsys/settings/src/settings_test_getset_int.c
@@ -12,7 +12,7 @@ void test_config_getset_int(void)
 	char name[80];
 	char tmp[64];
 	int rc;
-	u8_t small_value;
+	uint8_t small_value;
 
 	small_value = 42U;
 	strcpy(name, "myfoo/mybar");
diff --git a/tests/subsys/settings/src/settings_test_getset_int64.c b/tests/subsys/settings/src/settings_test_getset_int64.c
index b61b99b37f..e2b3ebfe9e 100644
--- a/tests/subsys/settings/src/settings_test_getset_int64.c
+++ b/tests/subsys/settings/src/settings_test_getset_int64.c
@@ -12,11 +12,11 @@ void test_config_getset_int64(void)
 	char name[80];
 	char tmp[64];
 	int rc;
-	s64_t new_val64;
+	int64_t new_val64;
 
 	new_val64 = 0x8012345678901234;
 	strcpy(name, "myfoo/mybar64");
-	rc = settings_runtime_set(name, &new_val64, sizeof(s64_t));
+	rc = settings_runtime_set(name, &new_val64, sizeof(int64_t));
 	zassert_true(rc == 0, "can't set value");
 	zassert_true(test_set_called == 1, "the SET handler wasn't called");
 	zassert_equal(val64, 0x8012345678901234,
@@ -25,16 +25,16 @@ void test_config_getset_int64(void)
 
 	strcpy(name, "myfoo/mybar64");
 	rc = settings_runtime_get(name, tmp, sizeof(tmp));
-	zassert_equal(rc, sizeof(s64_t), "the key value should been available");
+	zassert_equal(rc, sizeof(int64_t), "the key value should been available");
 	zassert_true(test_get_called == 1, "the GET handler wasn't called");
-	memcpy(&new_val64, tmp, sizeof(s64_t));
+	memcpy(&new_val64, tmp, sizeof(int64_t));
 	zassert_equal(new_val64, 0x8012345678901234,
 		      "unexpected value fetched %d", tmp);
 	ctest_clear_call_state();
 
 	new_val64 = 1;
 	strcpy(name, "myfoo/mybar64");
-	rc = settings_runtime_set(name, &new_val64, sizeof(s64_t));
+	rc = settings_runtime_set(name, &new_val64, sizeof(int64_t));
 	zassert_true(rc == 0, "can't set value");
 	zassert_true(test_set_called == 1, "the SET handler wasn't called");
 	zassert_equal(val64, 1,
@@ -43,9 +43,9 @@ void test_config_getset_int64(void)
 
 	strcpy(name, "myfoo/mybar64");
 	rc = settings_runtime_get(name, tmp, sizeof(tmp));
-	zassert_equal(rc, sizeof(s64_t), "the key value should been available");
+	zassert_equal(rc, sizeof(int64_t), "the key value should been available");
 	zassert_true(test_get_called == 1, "the GET handler wasn't called");
-	memcpy(&new_val64, tmp, sizeof(s64_t));
+	memcpy(&new_val64, tmp, sizeof(int64_t));
 	zassert_equal(new_val64, 1,
 		      "unexpected value fetched %d", tmp);
 	ctest_clear_call_state();
diff --git a/tests/subsys/shell/shell_history/src/shell_history_test.c b/tests/subsys/shell/shell_history/src/shell_history_test.c
index f52f0ef5d3..f40bf8fee7 100644
--- a/tests/subsys/shell/shell_history/src/shell_history_test.c
+++ b/tests/subsys/shell/shell_history/src/shell_history_test.c
@@ -17,7 +17,7 @@
 #define HIST_BUF_SIZE 160
 SHELL_HISTORY_DEFINE(history, HIST_BUF_SIZE);
 
-static void init_test_buf(u8_t *buf, size_t len, u8_t offset)
+static void init_test_buf(uint8_t *buf, size_t len, uint8_t offset)
 {
 	for (int i = 0; i < len; i++) {
 		buf[i] = offset + i;
@@ -28,11 +28,11 @@ static void init_test_buf(u8_t *buf, size_t len, u8_t offset)
  * Function tests getting line from history and compares it against expected
  * result.
  */
-static void test_get(bool ok, bool up, u8_t *exp_buf, u16_t exp_len)
+static void test_get(bool ok, bool up, uint8_t *exp_buf, uint16_t exp_len)
 {
 	bool res;
-	u8_t out_buf[HIST_BUF_SIZE];
-	u16_t out_len;
+	uint8_t out_buf[HIST_BUF_SIZE];
+	uint16_t out_len;
 
 	out_len = sizeof(out_buf);
 
@@ -60,7 +60,7 @@ static void test_get(bool ok, bool up, u8_t *exp_buf, u16_t exp_len)
  */
 static void test_history_add_get(void)
 {
-	u8_t exp_buf[HIST_BUF_SIZE];
+	uint8_t exp_buf[HIST_BUF_SIZE];
 
 	init_test_buf(exp_buf, sizeof(exp_buf), 0);
 
@@ -78,7 +78,7 @@ static void test_history_add_get(void)
 /* Test verifies that after purging there is no line in the history. */
 static void test_history_purge(void)
 {
-	u8_t exp_buf[HIST_BUF_SIZE];
+	uint8_t exp_buf[HIST_BUF_SIZE];
 
 	init_test_buf(exp_buf, sizeof(exp_buf), 0);
 
@@ -109,9 +109,9 @@ static void test_history_purge(void)
  */
 static void test_history_get_up_and_down(void)
 {
-	u8_t exp1_buf[HIST_BUF_SIZE];
-	u8_t exp2_buf[HIST_BUF_SIZE];
-	u8_t exp3_buf[HIST_BUF_SIZE];
+	uint8_t exp1_buf[HIST_BUF_SIZE];
+	uint8_t exp2_buf[HIST_BUF_SIZE];
+	uint8_t exp3_buf[HIST_BUF_SIZE];
 
 	init_test_buf(exp1_buf, sizeof(exp1_buf), 0);
 	init_test_buf(exp2_buf, sizeof(exp2_buf), 10);
@@ -138,10 +138,10 @@ static void test_history_get_up_and_down(void)
 /* Function for getting maximal buffer size that can be stored in the history */
 static int get_max_buffer_len(void)
 {
-	u8_t buf[HIST_BUF_SIZE];
-	u8_t out_buf[HIST_BUF_SIZE];
+	uint8_t buf[HIST_BUF_SIZE];
+	uint8_t out_buf[HIST_BUF_SIZE];
 	int len = sizeof(buf);
-	u16_t out_len;
+	uint16_t out_len;
 
 	shell_history_init(&history);
 
@@ -168,7 +168,7 @@ static int get_max_buffer_len(void)
  */
 static void test_too_long_line_not_stored(void)
 {
-	u8_t exp1_buf[HIST_BUF_SIZE];
+	uint8_t exp1_buf[HIST_BUF_SIZE];
 	int max_len = get_max_buffer_len();
 
 	init_test_buf(exp1_buf, sizeof(exp1_buf), 0);
@@ -199,7 +199,7 @@ static void test_too_long_line_not_stored(void)
  */
 static void test_no_duplicates_in_a_row(void)
 {
-	u8_t exp1_buf[HIST_BUF_SIZE];
+	uint8_t exp1_buf[HIST_BUF_SIZE];
 
 	init_test_buf(exp1_buf, sizeof(exp1_buf), 0);
 	shell_history_init(&history);
@@ -227,9 +227,9 @@ static void test_no_duplicates_in_a_row(void)
  */
 static void test_storing_long_buffers(void)
 {
-	u8_t exp1_buf[HIST_BUF_SIZE];
-	u8_t exp2_buf[HIST_BUF_SIZE];
-	u8_t exp3_buf[HIST_BUF_SIZE];
+	uint8_t exp1_buf[HIST_BUF_SIZE];
+	uint8_t exp2_buf[HIST_BUF_SIZE];
+	uint8_t exp3_buf[HIST_BUF_SIZE];
 	int max_len = get_max_buffer_len();
 
 	init_test_buf(exp1_buf, sizeof(exp1_buf), 0);
diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c
index 6b38737f91..ba823b4de8 100644
--- a/tests/subsys/storage/flash_map/src/main.c
+++ b/tests/subsys/storage/flash_map/src/main.c
@@ -18,12 +18,12 @@ struct flash_sector fs_sectors[256];
 void test_flash_area_get_sectors(void)
 {
 	const struct flash_area *fa;
-	u32_t sec_cnt;
+	uint32_t sec_cnt;
 	int i;
 	int rc;
 	off_t off;
-	u8_t wd[256];
-	u8_t rd[256];
+	uint8_t wd[256];
+	uint8_t rd[256];
 	struct device *flash_dev;
 
 	rc = flash_area_open(FLASH_AREA_ID(image_1), &fa);
diff --git a/tests/subsys/storage/stream/stream_flash/src/main.c b/tests/subsys/storage/stream/stream_flash/src/main.c
index abe43d115f..b0cb842fff 100644
--- a/tests/subsys/storage/stream/stream_flash/src/main.c
+++ b/tests/subsys/storage/stream/stream_flash/src/main.c
@@ -30,16 +30,16 @@ static const struct flash_pages_layout *layout;
 static size_t layout_size;
 static struct stream_flash_ctx ctx;
 static int page_size;
-static u8_t *cb_buf;
+static uint8_t *cb_buf;
 static size_t cb_len;
 static size_t cb_offset;
 static int cb_ret;
 
-static u8_t buf[BUF_LEN];
-static u8_t read_buf[TESTBUF_SIZE];
-const static u8_t write_buf[TESTBUF_SIZE] = {[0 ... TESTBUF_SIZE - 1] = 0xaa};
-static u8_t written_pattern[TESTBUF_SIZE] = {[0 ... TESTBUF_SIZE - 1] = 0xaa};
-static u8_t erased_pattern[TESTBUF_SIZE]  = {[0 ... TESTBUF_SIZE - 1] = 0xff};
+static uint8_t buf[BUF_LEN];
+static uint8_t read_buf[TESTBUF_SIZE];
+const static uint8_t write_buf[TESTBUF_SIZE] = {[0 ... TESTBUF_SIZE - 1] = 0xaa};
+static uint8_t written_pattern[TESTBUF_SIZE] = {[0 ... TESTBUF_SIZE - 1] = 0xaa};
+static uint8_t erased_pattern[TESTBUF_SIZE]  = {[0 ... TESTBUF_SIZE - 1] = 0xff};
 
 #define VERIFY_BUF(start, size, buf) \
 do { \
@@ -51,7 +51,7 @@ do { \
 #define VERIFY_WRITTEN(start, size) VERIFY_BUF(start, size, written_pattern)
 #define VERIFY_ERASED(start, size) VERIFY_BUF(start, size, erased_pattern)
 
-int stream_flash_callback(u8_t *buf, size_t len, size_t offset)
+int stream_flash_callback(uint8_t *buf, size_t len, size_t offset)
 {
 	if (cb_buf) {
 		zassert_equal(cb_buf, buf, "incorrect buf");
diff --git a/tests/subsys/usb/bos/src/test_bos.c b/tests/subsys/usb/bos/src/test_bos.c
index 11ab147be3..34007bc84e 100644
--- a/tests/subsys/usb/bos/src/test_bos.c
+++ b/tests/subsys/usb/bos/src/test_bos.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(test_main, LOG_LEVEL_DBG);
  * Compare old style USB BOS definition with section aligned
  */
 
-static const u8_t dummy_descriptor[] = {
+static const uint8_t dummy_descriptor[] = {
 	0x00, 0x01, 0x02
 };
 
@@ -197,8 +197,8 @@ static void test_usb_bos_macros(void)
 static void test_usb_bos(void)
 {
 	struct usb_setup_packet setup;
-	s32_t len = 0;
-	u8_t *data = NULL;
+	int32_t len = 0;
+	uint8_t *data = NULL;
 	int ret;
 
 	/* Already registered due to previous test */
diff --git a/tests/subsys/usb/desc_sections/src/desc_sections.c b/tests/subsys/usb/desc_sections/src/desc_sections.c
index 88804fa1e6..0941130f55 100644
--- a/tests/subsys/usb/desc_sections/src/desc_sections.c
+++ b/tests/subsys/usb/desc_sections/src/desc_sections.c
@@ -25,7 +25,7 @@ extern struct usb_desc_header __usb_descriptor_end[];
 extern struct usb_cfg_data __usb_data_start[];
 extern struct usb_cfg_data __usb_data_end[];
 
-u8_t *usb_get_device_descriptor(void);
+uint8_t *usb_get_device_descriptor(void);
 
 struct usb_test_config {
 	struct usb_if_descriptor if0;
@@ -108,7 +108,7 @@ struct usb_test_config {
 #define NUM_INSTANCES 2
 
 static void interface_config(struct usb_desc_header *head,
-			     u8_t iface_num)
+			     uint8_t iface_num)
 {
 	struct usb_if_descriptor *if_desc = (struct usb_if_descriptor *)head;
 
@@ -136,7 +136,7 @@ static struct usb_cfg_data *usb_get_cfg_data(struct usb_if_descriptor *iface)
 
 static bool find_cfg_data_ep(const struct usb_ep_descriptor * const ep_descr,
 			     const struct usb_cfg_data * const cfg_data,
-			     u8_t ep_count)
+			     uint8_t ep_count)
 {
 	for (int i = 0; i < cfg_data->num_endpoints; i++) {
 		if (cfg_data->endpoint[i].ep_addr ==
@@ -159,8 +159,8 @@ static bool find_cfg_data_ep(const struct usb_ep_descriptor * const ep_descr,
 static void check_endpoint_allocation(struct usb_desc_header *head)
 {
 	struct usb_cfg_data *cfg_data = NULL;
-	static u8_t interfaces;
-	u8_t ep_count = 0;
+	static uint8_t interfaces;
+	uint8_t ep_count = 0;
 
 	while (head->bLength != 0) {
 		if (head->bDescriptorType == USB_INTERFACE_DESC) {
@@ -193,7 +193,7 @@ static void check_endpoint_allocation(struct usb_desc_header *head)
 			ep_count++;
 		}
 
-		head = (struct usb_desc_header *)((u8_t *)head + head->bLength);
+		head = (struct usb_desc_header *)((uint8_t *)head + head->bLength);
 	}
 }
 
@@ -220,11 +220,11 @@ static void test_desc_sections(void)
 
 	LOG_DBG("Starting logs");
 
-	LOG_HEXDUMP_DBG((u8_t *)__usb_descriptor_start,
+	LOG_HEXDUMP_DBG((uint8_t *)__usb_descriptor_start,
 			SYMBOL_SPAN(__usb_descriptor_end, __usb_descriptor_start),
 			"USB Descriptor table section");
 
-	LOG_HEXDUMP_DBG((u8_t *)__usb_data_start,
+	LOG_HEXDUMP_DBG((uint8_t *)__usb_data_start,
 			SYMBOL_SPAN(__usb_data_end, __usb_data_start),
 			"USB Configuratio structures section");
 
diff --git a/tests/subsys/usb/device/src/main.c b/tests/subsys/usb/device/src/main.c
index b4b38eaed1..a85bea6a48 100644
--- a/tests/subsys/usb/device/src/main.c
+++ b/tests/subsys/usb/device/src/main.c
@@ -55,7 +55,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0) struct usb_device_desc dev_desc = {
 
 static void status_cb(struct usb_cfg_data *cfg,
 		      enum usb_dc_status_code status,
-		      const u8_t *param)
+		      const uint8_t *param)
 {
 	ARG_UNUSED(cfg);
 	ARG_UNUSED(status);
@@ -63,7 +63,7 @@ static void status_cb(struct usb_cfg_data *cfg,
 }
 
 /* EP Bulk IN handler, used to send data to the Host */
-static void bulk_in(u8_t ep, enum usb_dc_ep_cb_status_code ep_status)
+static void bulk_in(uint8_t ep, enum usb_dc_ep_cb_status_code ep_status)
 {
 }
 
@@ -115,8 +115,8 @@ static void test_usb_dc_api(void)
 /* Test USB Device Cotnroller API for invalid parameters */
 static void test_usb_dc_api_invalid(void)
 {
-	u32_t size;
-	u8_t byte;
+	uint32_t size;
+	uint8_t byte;
 
 	/* Set stall to invalid EP */
 	zassert_not_equal(usb_dc_ep_set_stall(INVALID_EP), TC_PASS,
@@ -174,8 +174,8 @@ static void test_usb_dc_api_invalid(void)
 
 static void test_usb_dc_api_read_write(void)
 {
-	u32_t size;
-	u8_t byte;
+	uint32_t size;
+	uint8_t byte;
 
 	/* Read invalid EP */
 	zassert_not_equal(usb_read(INVALID_EP, &byte, sizeof(byte), &size),
diff --git a/tests/subsys/usb/os_desc/src/usb_osdesc.c b/tests/subsys/usb/os_desc/src/usb_osdesc.c
index 89592e5121..b5bf15e88b 100644
--- a/tests/subsys/usb/os_desc/src/usb_osdesc.c
+++ b/tests/subsys/usb/os_desc/src/usb_osdesc.c
@@ -14,11 +14,11 @@
 
 #define MSOS_STRING_LENGTH	18
 static struct string_desc {
-	u8_t bLength;
-	u8_t bDescriptorType;
-	u8_t bString[MSOS_STRING_LENGTH - 4];
-	u8_t bMS_VendorCode;
-	u8_t bPad;
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bString[MSOS_STRING_LENGTH - 4];
+	uint8_t bMS_VendorCode;
+	uint8_t bPad;
 } __packed msosv1_string_descriptor = {
 	.bLength = MSOS_STRING_LENGTH,
 	.bDescriptorType = USB_STRING_DESC,
@@ -33,18 +33,18 @@ static struct string_desc {
 
 static struct compat_id_desc {
 	/* MS OS 1.0 Header Section */
-	u32_t dwLength;
-	u16_t bcdVersion;
-	u16_t wIndex;
-	u8_t bCount;
-	u8_t Reserved[7];
+	uint32_t dwLength;
+	uint16_t bcdVersion;
+	uint16_t wIndex;
+	uint8_t bCount;
+	uint8_t Reserved[7];
 	/* MS OS 1.0 Function Section */
 	struct compat_id_func {
-		u8_t bFirstInterfaceNumber;
-		u8_t Reserved1;
-		u8_t compatibleID[8];
-		u8_t subCompatibleID[8];
-		u8_t Reserved2[6];
+		uint8_t bFirstInterfaceNumber;
+		uint8_t Reserved1;
+		uint8_t compatibleID[8];
+		uint8_t subCompatibleID[8];
+		uint8_t Reserved2[6];
 	} __packed func[1];
 } __packed msosv1_compatid_descriptor = {
 	.dwLength = sys_cpu_to_le32(40),
@@ -73,10 +73,10 @@ static struct compat_id_desc {
 };
 
 static struct usb_os_descriptor os_desc = {
-	.string = (u8_t *)&msosv1_string_descriptor,
+	.string = (uint8_t *)&msosv1_string_descriptor,
 	.string_len = sizeof(msosv1_string_descriptor),
 	.vendor_code = 0x03,
-	.compat_id = (u8_t *)&msosv1_compatid_descriptor,
+	.compat_id = (uint8_t *)&msosv1_compatid_descriptor,
 	.compat_id_len = sizeof(msosv1_compatid_descriptor),
 };
 
@@ -90,8 +90,8 @@ void test_register_osdesc(void)
 static void test_handle_os_desc(void)
 {
 	struct usb_setup_packet setup;
-	s32_t len = 0;
-	u8_t *data = NULL;
+	int32_t len = 0;
+	uint8_t *data = NULL;
 	int ret;
 
 	setup.wValue = (USB_STRING_DESC & 0xFF) << 8;
@@ -110,8 +110,8 @@ static void test_handle_os_desc(void)
 static void test_handle_os_desc_feature(void)
 {
 	struct usb_setup_packet setup;
-	s32_t len = 0;
-	u8_t *data = NULL;
+	int32_t len = 0;
+	uint8_t *data = NULL;
 	int ret;
 
 	setup.bRequest = os_desc.vendor_code;
diff --git a/tests/unit/crc/main.c b/tests/unit/crc/main.c
index 2294ed4814..4b8ee95ec1 100644
--- a/tests/unit/crc/main.c
+++ b/tests/unit/crc/main.c
@@ -14,9 +14,9 @@
 
 void test_crc32_ieee(void)
 {
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
-	u8_t test3[] = { 'Z', 'e', 'p', 'h', 'y', 'r' };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test3[] = { 'Z', 'e', 'p', 'h', 'y', 'r' };
 
 	zassert_equal(crc32_ieee(test1, sizeof(test1)), 0xD3D99E8B, NULL);
 	zassert_equal(crc32_ieee(test2, sizeof(test2)), 0xCBF43926, NULL);
@@ -25,9 +25,9 @@ void test_crc32_ieee(void)
 
 void test_crc16(void)
 {
-	u8_t test0[] = { };
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test0[] = { };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert_equal(crc16(test0, sizeof(test0), 0x1021, 0xffff, true),
 		      0x1d0f, NULL);
@@ -39,9 +39,9 @@ void test_crc16(void)
 
 void test_crc16_ansi(void)
 {
-	u8_t test0[] = { };
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test0[] = { };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert(crc16_ansi(test0, sizeof(test0)) == 0x800d, "pass", "fail");
 	zassert(crc16_ansi(test1, sizeof(test1)) == 0x8f85, "pass", "fail");
@@ -50,11 +50,11 @@ void test_crc16_ansi(void)
 
 void test_crc16_ccitt(void)
 {
-	u8_t test0[] = { };
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
-	u8_t test3[] = { 'Z', 'e', 'p', 'h', 'y', 'r', 0, 0 };
-	u16_t crc;
+	uint8_t test0[] = { };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test3[] = { 'Z', 'e', 'p', 'h', 'y', 'r', 0, 0 };
+	uint16_t crc;
 
 	zassert_equal(crc16_ccitt(0, test0, sizeof(test0)), 0x0, NULL);
 	zassert_equal(crc16_ccitt(0, test1, sizeof(test1)), 0x538d, NULL);
@@ -63,9 +63,9 @@ void test_crc16_ccitt(void)
 	/* Appending the CRC to a buffer and computing the CRC over
 	 * the extended buffer leaves a residual of zero.
 	 */
-	crc = crc16_ccitt(0, test3, sizeof(test3) - sizeof(u16_t));
-	test3[sizeof(test3)-2] = (u8_t)(crc >> 0);
-	test3[sizeof(test3)-1] = (u8_t)(crc >> 8);
+	crc = crc16_ccitt(0, test3, sizeof(test3) - sizeof(uint16_t));
+	test3[sizeof(test3)-2] = (uint8_t)(crc >> 0);
+	test3[sizeof(test3)-1] = (uint8_t)(crc >> 8);
 
 	zassert_equal(crc16_ccitt(0, test3, sizeof(test3)), 0, NULL);
 }
@@ -75,13 +75,13 @@ void test_crc16_ccitt_for_ppp(void)
 	/* Example capture including FCS from
 	 * https://www.horo.ch/techno/ppp-fcs/examples_en.html
 	 */
-	u8_t test0[] = {
+	uint8_t test0[] = {
 		0xff, 0x03, 0xc0, 0x21, 0x01, 0x01, 0x00, 0x17,
 		0x02, 0x06, 0x00, 0x0a, 0x00, 0x00, 0x05, 0x06,
 		0x00, 0x2a, 0x2b, 0x78, 0x07, 0x02, 0x08, 0x02,
 		0x0d, 0x03, 0x06, 0xa5, 0xf8
 	};
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert_equal(crc16_ccitt(0xffff, test0, sizeof(test0)),
 		      0xf0b8, NULL);
@@ -91,7 +91,7 @@ void test_crc16_ccitt_for_ppp(void)
 
 void test_crc16_itu_t(void)
 {
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert_equal(crc16_itu_t(0, test2, sizeof(test2)),
 		      0x31c3, NULL);
@@ -99,9 +99,9 @@ void test_crc16_itu_t(void)
 
 void test_crc8_ccitt(void)
 {
-	u8_t test0[] = { 0 };
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test0[] = { 0 };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert(crc8_ccitt(CRC8_CCITT_INITIAL_VALUE, test0,
 			   sizeof(test0)) == 0xF3, "pass", "fail");
@@ -113,9 +113,9 @@ void test_crc8_ccitt(void)
 
 void test_crc7_be(void)
 {
-	u8_t test0[] = { 0 };
-	u8_t test1[] = { 'A' };
-	u8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	uint8_t test0[] = { 0 };
+	uint8_t test1[] = { 'A' };
+	uint8_t test2[] = { '1', '2', '3', '4', '5', '6', '7', '8', '9' };
 
 	zassert_equal(crc7_be(0, test0, sizeof(test0)), 0, NULL);
 	zassert_equal(crc7_be(0, test1, sizeof(test1)), 0xDA, NULL);
@@ -124,14 +124,14 @@ void test_crc7_be(void)
 
 void test_crc8(void)
 {
-	u8_t fcs, expected;
+	uint8_t fcs, expected;
 
-	u8_t test0[] = { 0x00 };
-	u8_t test1[] = { 0xBE, 0xEF };
-	u8_t test2[] = { 0x07, 0x3F };        /* GSM 07.10 example */
-	u8_t test3[] = { 0x07, 0x3F, 0x89 };  /* GSM 07.10 example */
-	u8_t test4[] = { 0x03, 0x02, 0x0A, 0x38, 0x17, 0x00 };
-	u8_t test5[] = { 0x03, 0x3f, 0x01, 0x1c };  /* Our GSM 07.10 calc */
+	uint8_t test0[] = { 0x00 };
+	uint8_t test1[] = { 0xBE, 0xEF };
+	uint8_t test2[] = { 0x07, 0x3F };        /* GSM 07.10 example */
+	uint8_t test3[] = { 0x07, 0x3F, 0x89 };  /* GSM 07.10 example */
+	uint8_t test4[] = { 0x03, 0x02, 0x0A, 0x38, 0x17, 0x00 };
+	uint8_t test5[] = { 0x03, 0x3f, 0x01, 0x1c };  /* Our GSM 07.10 calc */
 
 	fcs = crc8(test0, sizeof(test0), 0x00, 0x00, false);
 	expected = 0x00;
diff --git a/tests/unit/intmath/main.c b/tests/unit/intmath/main.c
index 47e29cdf51..eb940de9de 100644
--- a/tests/unit/intmath/main.c
+++ b/tests/unit/intmath/main.c
@@ -77,8 +77,8 @@ void test_intmath(void)
 	 * Declaring volatile so the compiler doesn't try to optimize any
 	 * of the math away at build time
 	 */
-	volatile u64_t bignum, ba, bb;
-	volatile u32_t num, a, b;
+	volatile uint64_t bignum, ba, bb;
+	volatile uint32_t num, a, b;
 
 	ba = 0x00000012ABCDEF12ULL;
 	bb = 0x0000001000000111ULL;
diff --git a/tests/unit/math_extras/tests.inc b/tests/unit/math_extras/tests.inc
index 8f36852100..f685d8a789 100644
--- a/tests/unit/math_extras/tests.inc
+++ b/tests/unit/math_extras/tests.inc
@@ -10,7 +10,7 @@
 
 static void VNAME(u32_add)(void)
 {
-	u32_t result = 42;
+	uint32_t result = 42;
 
 	zassert_false(u32_add_overflow(2, 3, &result), NULL);
 	zassert_equal(result, 5, NULL);
@@ -34,7 +34,7 @@ static void VNAME(u32_add)(void)
 
 static void VNAME(u32_mul)(void)
 {
-	u32_t result = 42;
+	uint32_t result = 42;
 
 	zassert_false(u32_mul_overflow(2, 3, &result), NULL);
 	zassert_equal(result, 6, NULL);
@@ -52,7 +52,7 @@ static void VNAME(u32_mul)(void)
 
 static void VNAME(u64_add)(void)
 {
-	u64_t result = 42;
+	uint64_t result = 42;
 
 	zassert_false(u64_add_overflow(2, 3, &result), NULL);
 	zassert_equal(result, 5, NULL);
@@ -76,7 +76,7 @@ static void VNAME(u64_add)(void)
 
 static void VNAME(u64_mul)(void)
 {
-	u64_t result = 42;
+	uint64_t result = 42;
 
 	zassert_false(u64_mul_overflow(2, 3, &result), NULL);
 	zassert_equal(result, 6, NULL);
diff --git a/tests/unit/timeutil/test_s64.c b/tests/unit/timeutil/test_s64.c
index 1980b3fcf5..4dce98545a 100644
--- a/tests/unit/timeutil/test_s64.c
+++ b/tests/unit/timeutil/test_s64.c
@@ -267,7 +267,7 @@ static void test_time32_epochm1(void)
 
 static void test_time32_underflow(void)
 {
-	const s64_t unix64 = -2147483649;
+	const int64_t unix64 = -2147483649;
 	const struct timeutil_test_data *tp = &(const struct timeutil_test_data){
 		.civil = "1901-12-13 20:45:51 Fri 347",
 		.tm = {
@@ -296,7 +296,7 @@ static void test_time32_underflow(void)
 
 static void test_time32_overflow(void)
 {
-	const s64_t unix64 = 2147483648;
+	const int64_t unix64 = 2147483648;
 	const struct timeutil_test_data *tp = &(const struct timeutil_test_data){
 		.civil = "2038-01-19 03:14:08 Tue 019",
 		.tm = {
diff --git a/tests/unit/util/main.c b/tests/unit/util/main.c
index b32f24db7c..ba3f9a6f2b 100644
--- a/tests/unit/util/main.c
+++ b/tests/unit/util/main.c
@@ -17,7 +17,7 @@
 static void test_u8_to_dec(void)
 {
 	char text[4];
-	u8_t len;
+	uint8_t len;
 
 	len = u8_to_dec(text, sizeof(text), 0);
 	zassert_equal(len, 1, "Length of 0 is not 1");
@@ -79,16 +79,16 @@ void test_COND_CODE_1(void)
 	/* Test validates that expected code has been injected. Failure would
 	 * be seen in compilation (lack of variable or ununsed variable.
 	 */
-	COND_CODE_1(1, (u32_t x0 = 1;), (u32_t y0;))
+	COND_CODE_1(1, (uint32_t x0 = 1;), (uint32_t y0;))
 	zassert_true((x0 == 1), NULL);
 
-	COND_CODE_1(NOT_EXISTING_DEFINE, (u32_t x1 = 1;), (u32_t y1 = 1;))
+	COND_CODE_1(NOT_EXISTING_DEFINE, (uint32_t x1 = 1;), (uint32_t y1 = 1;))
 	zassert_true((y1 == 1), NULL);
 
-	COND_CODE_1(TEST_DEFINE_1, (u32_t x2 = 1;), (u32_t y2 = 1;))
+	COND_CODE_1(TEST_DEFINE_1, (uint32_t x2 = 1;), (uint32_t y2 = 1;))
 	zassert_true((x2 == 1), NULL);
 
-	COND_CODE_1(2, (u32_t x3 = 1;), (u32_t y3 = 1;))
+	COND_CODE_1(2, (uint32_t x3 = 1;), (uint32_t y3 = 1;))
 	zassert_true((y3 == 1), NULL);
 }
 
@@ -97,16 +97,16 @@ void test_COND_CODE_0(void)
 	/* Test validates that expected code has been injected. Failure would
 	 * be seen in compilation (lack of variable or ununsed variable.
 	 */
-	COND_CODE_0(0, (u32_t x0 = 1;), (u32_t y0;))
+	COND_CODE_0(0, (uint32_t x0 = 1;), (uint32_t y0;))
 	zassert_true((x0 == 1), NULL);
 
-	COND_CODE_0(NOT_EXISTING_DEFINE, (u32_t x1 = 1;), (u32_t y1 = 1;))
+	COND_CODE_0(NOT_EXISTING_DEFINE, (uint32_t x1 = 1;), (uint32_t y1 = 1;))
 	zassert_true((y1 == 1), NULL);
 
-	COND_CODE_0(TEST_DEFINE_0, (u32_t x2 = 1;), (u32_t y2 = 1;))
+	COND_CODE_0(TEST_DEFINE_0, (uint32_t x2 = 1;), (uint32_t y2 = 1;))
 	zassert_true((x2 == 1), NULL);
 
-	COND_CODE_0(2, (u32_t x3 = 1;), (u32_t y3 = 1;))
+	COND_CODE_0(2, (uint32_t x3 = 1;), (uint32_t y3 = 1;))
 	zassert_true((y3 == 1), NULL);
 }
 
@@ -221,8 +221,8 @@ static void test_FOR_EACH(void)
 {
 	#define FOR_EACH_MACRO_TEST(arg) *buf++ = arg;
 
-	u8_t array[3] = {0};
-	u8_t *buf = array;
+	uint8_t array[3] = {0};
+	uint8_t *buf = array;
 
 	FOR_EACH(FOR_EACH_MACRO_TEST, 1, 2, 3)
 
@@ -231,14 +231,14 @@ static void test_FOR_EACH(void)
 	zassert_equal(array[2], 3, "Unexpected value %d", array[2]);
 }
 
-static void fsum(u32_t incr, u32_t *sum)
+static void fsum(uint32_t incr, uint32_t *sum)
 {
 	*sum = *sum + incr;
 }
 
 static void test_FOR_EACH_FIXED_ARG(void)
 {
-	u32_t sum = 0;
+	uint32_t sum = 0;
 
 	FOR_EACH_FIXED_ARG(fsum, &sum, 1, 2, 3)
 
@@ -247,7 +247,7 @@ static void test_FOR_EACH_FIXED_ARG(void)
 
 static void test_FOR_EACH_IDX(void)
 {
-	#define FOR_EACH_IDX_MACRO_TEST(n, arg) u8_t a##n = arg;
+	#define FOR_EACH_IDX_MACRO_TEST(n, arg) uint8_t a##n = arg;
 
 	FOR_EACH_IDX(FOR_EACH_IDX_MACRO_TEST, 1, 2, 3)
 
@@ -256,7 +256,7 @@ static void test_FOR_EACH_IDX(void)
 	zassert_equal(a2, 3, "Unexpected value %d", a2);
 
 	#define FOR_EACH_IDX_MACRO_TEST2(n, arg) array[n] = arg;
-	u8_t array[32] = {0};
+	uint8_t array[32] = {0};
 
 	FOR_EACH_IDX(FOR_EACH_IDX_MACRO_TEST2, 1, 2, 3, 4, 5, 6, 7, 8,
 						9, 10, 11, 12, 13, 14, 15);
@@ -268,7 +268,7 @@ static void test_FOR_EACH_IDX(void)
 
 	#define FOR_EACH_IDX_MACRO_TEST3(n, arg) &a##n,
 
-	u8_t *a[] = {
+	uint8_t *a[] = {
 		FOR_EACH_IDX(FOR_EACH_IDX_MACRO_TEST3, 1, 2, 3)
 	};
 
@@ -279,7 +279,7 @@ static void test_FOR_EACH_IDX_FIXED_ARG(void)
 {
 	#undef FOO
 	#define FOO(n, arg, fixed_arg) \
-		u8_t fixed_arg##n = arg;
+		uint8_t fixed_arg##n = arg;
 
 	FOR_EACH_IDX_FIXED_ARG(FOO, a, 1, 2, 3)